All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <AANLkTiniMu1Y_q5W=Fui0CNc99MJB5eCkeiVe8JJoO_D@mail.gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index 84f1e24..28553b9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,16 +5,16 @@ On Sun, Jan 23, 2011 at 6:01 PM, Colin Cross <ccross@android.com> wrote:
 >
 > Signed-off-by: Colin Cross <ccross@android.com>
 > ---
->  arch/arm/mach-tegra/irq.c |   18 +++++++++---------
->  1 files changed, 9 insertions(+), 9 deletions(-)
+> ?arch/arm/mach-tegra/irq.c | ? 18 +++++++++---------
+> ?1 files changed, 9 insertions(+), 9 deletions(-)
 >
 > diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
 > index de7dfad..17c74d2 100644
 > --- a/arch/arm/mach-tegra/irq.c
 > +++ b/arch/arm/mach-tegra/irq.c
 > @@ -46,24 +46,24 @@
->  #define ICTLR_COP_IER_CLR      0x38
->  #define ICTLR_COP_IEP_CLASS    0x3c
+> ?#define ICTLR_COP_IER_CLR ? ? ?0x38
+> ?#define ICTLR_COP_IEP_CLASS ? ?0x3c
 >
 > -static void (*gic_mask_irq)(struct irq_data *d);
 > -static void (*gic_unmask_irq)(struct irq_data *d);
@@ -23,38 +23,38 @@ On Sun, Jan 23, 2011 at 6:01 PM, Colin Cross <ccross@android.com> wrote:
 >
 > -#define irq_to_ictlr(irq) (((irq)-32) >> 5)
 > +#define irq_to_ictlr(irq) (((irq) - 32) >> 5)
->  static void __iomem *tegra_ictlr_base = IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE);
+> ?static void __iomem *tegra_ictlr_base = IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE);
 > -#define ictlr_to_virt(ictlr) (tegra_ictlr_base + (ictlr)*0x100)
 > +#define ictlr_to_virt(ictlr) (tegra_ictlr_base + (ictlr) * 0x100)
 >
->  static void tegra_mask(struct irq_data *d)
->  {
->        void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));
-> -       gic_mask_irq(d);
-> -       writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_CLR);
-> +       tegra_gic_mask_irq(d);
-> +       writel(1 << (d->irq & 31), addr+ICTLR_CPU_IER_CLR);
->  }
->
->  static void tegra_unmask(struct irq_data *d)
->  {
->        void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));
-> -       gic_unmask_irq(d);
-> +       tegra_gic_unmask_irq(d);
->        writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_SET);
->  }
+> ?static void tegra_mask(struct irq_data *d)
+> ?{
+> ? ? ? ?void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));
+> - ? ? ? gic_mask_irq(d);
+> - ? ? ? writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_CLR);
+> + ? ? ? tegra_gic_mask_irq(d);
+> + ? ? ? writel(1 << (d->irq & 31), addr+ICTLR_CPU_IER_CLR);
+> ?}
+>
+> ?static void tegra_unmask(struct irq_data *d)
+> ?{
+> ? ? ? ?void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));
+> - ? ? ? gic_unmask_irq(d);
+> + ? ? ? tegra_gic_unmask_irq(d);
+> ? ? ? ?writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_SET);
+> ?}
 >
 > @@ -98,8 +98,8 @@ void __init tegra_init_irq(void)
->                 IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));
->
->        gic = get_irq_chip(29);
-> -       gic_unmask_irq = gic->irq_unmask;
-> -       gic_mask_irq = gic->irq_mask;
-> +       tegra_gic_unmask_irq = gic->irq_unmask;
-> +       tegra_gic_mask_irq = gic->irq_mask;
->        tegra_irq.irq_ack = gic->irq_ack;
->  #ifdef CONFIG_SMP
->        tegra_irq.irq_set_affinity = gic->irq_set_affinity;
+> ? ? ? ? ? ? ? ? IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));
+>
+> ? ? ? ?gic = get_irq_chip(29);
+> - ? ? ? gic_unmask_irq = gic->irq_unmask;
+> - ? ? ? gic_mask_irq = gic->irq_mask;
+> + ? ? ? tegra_gic_unmask_irq = gic->irq_unmask;
+> + ? ? ? tegra_gic_mask_irq = gic->irq_mask;
+> ? ? ? ?tegra_irq.irq_ack = gic->irq_ack;
+> ?#ifdef CONFIG_SMP
+> ? ? ? ?tegra_irq.irq_set_affinity = gic->irq_set_affinity;
 > --
 > 1.7.3.1
 
diff --git a/a/content_digest b/N1/content_digest
index dacda08..88c6236 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,24 +5,16 @@
   "ref\0001295834493-5019-2-git-send-email-ccross\@android.com\0"
 ]
 [
-  "From\0Colin Cross <ccross\@android.com>\0"
+  "From\0ccross\@android.com (Colin Cross)\0"
 ]
 [
-  "Subject\0Re: [PATCH v2 01/28] ARM: tegra: irq: Rename gic pointers to avoid conflicts\0"
+  "Subject\0[PATCH v2 01/28] ARM: tegra: irq: Rename gic pointers to avoid conflicts\0"
 ]
 [
   "Date\0Tue, 25 Jan 2011 23:10:37 -0800\0"
 ]
 [
-  "To\0linux-tegra\@vger.kernel.org\0"
-]
-[
-  "Cc\0linux-arm-kernel\@lists.infradead.org",
-  " olof\@lixom.net",
-  " konkers\@android.com",
-  " Colin Cross <ccross\@android.com>",
-  " Russell King <linux\@arm.linux.org.uk>",
-  " linux-kernel\@vger.kernel.org\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -38,16 +30,16 @@
   ">\n",
   "> Signed-off-by: Colin Cross <ccross\@android.com>\n",
   "> ---\n",
-  "> \302\240arch/arm/mach-tegra/irq.c | \302\240 18 +++++++++---------\n",
-  "> \302\2401 files changed, 9 insertions(+), 9 deletions(-)\n",
+  "> ?arch/arm/mach-tegra/irq.c | ? 18 +++++++++---------\n",
+  "> ?1 files changed, 9 insertions(+), 9 deletions(-)\n",
   ">\n",
   "> diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c\n",
   "> index de7dfad..17c74d2 100644\n",
   "> --- a/arch/arm/mach-tegra/irq.c\n",
   "> +++ b/arch/arm/mach-tegra/irq.c\n",
   "> \@\@ -46,24 +46,24 \@\@\n",
-  "> \302\240#define ICTLR_COP_IER_CLR \302\240 \302\240 \302\2400x38\n",
-  "> \302\240#define ICTLR_COP_IEP_CLASS \302\240 \302\2400x3c\n",
+  "> ?#define ICTLR_COP_IER_CLR ? ? ?0x38\n",
+  "> ?#define ICTLR_COP_IEP_CLASS ? ?0x3c\n",
   ">\n",
   "> -static void (*gic_mask_irq)(struct irq_data *d);\n",
   "> -static void (*gic_unmask_irq)(struct irq_data *d);\n",
@@ -56,38 +48,38 @@
   ">\n",
   "> -#define irq_to_ictlr(irq) (((irq)-32) >> 5)\n",
   "> +#define irq_to_ictlr(irq) (((irq) - 32) >> 5)\n",
-  "> \302\240static void __iomem *tegra_ictlr_base = IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE);\n",
+  "> ?static void __iomem *tegra_ictlr_base = IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE);\n",
   "> -#define ictlr_to_virt(ictlr) (tegra_ictlr_base + (ictlr)*0x100)\n",
   "> +#define ictlr_to_virt(ictlr) (tegra_ictlr_base + (ictlr) * 0x100)\n",
   ">\n",
-  "> \302\240static void tegra_mask(struct irq_data *d)\n",
-  "> \302\240{\n",
-  "> \302\240 \302\240 \302\240 \302\240void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));\n",
-  "> - \302\240 \302\240 \302\240 gic_mask_irq(d);\n",
-  "> - \302\240 \302\240 \302\240 writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_CLR);\n",
-  "> + \302\240 \302\240 \302\240 tegra_gic_mask_irq(d);\n",
-  "> + \302\240 \302\240 \302\240 writel(1 << (d->irq & 31), addr+ICTLR_CPU_IER_CLR);\n",
-  "> \302\240}\n",
+  "> ?static void tegra_mask(struct irq_data *d)\n",
+  "> ?{\n",
+  "> ? ? ? ?void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));\n",
+  "> - ? ? ? gic_mask_irq(d);\n",
+  "> - ? ? ? writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_CLR);\n",
+  "> + ? ? ? tegra_gic_mask_irq(d);\n",
+  "> + ? ? ? writel(1 << (d->irq & 31), addr+ICTLR_CPU_IER_CLR);\n",
+  "> ?}\n",
   ">\n",
-  "> \302\240static void tegra_unmask(struct irq_data *d)\n",
-  "> \302\240{\n",
-  "> \302\240 \302\240 \302\240 \302\240void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));\n",
-  "> - \302\240 \302\240 \302\240 gic_unmask_irq(d);\n",
-  "> + \302\240 \302\240 \302\240 tegra_gic_unmask_irq(d);\n",
-  "> \302\240 \302\240 \302\240 \302\240writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_SET);\n",
-  "> \302\240}\n",
+  "> ?static void tegra_unmask(struct irq_data *d)\n",
+  "> ?{\n",
+  "> ? ? ? ?void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));\n",
+  "> - ? ? ? gic_unmask_irq(d);\n",
+  "> + ? ? ? tegra_gic_unmask_irq(d);\n",
+  "> ? ? ? ?writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_SET);\n",
+  "> ?}\n",
   ">\n",
   "> \@\@ -98,8 +98,8 \@\@ void __init tegra_init_irq(void)\n",
-  "> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));\n",
+  "> ? ? ? ? ? ? ? ? IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));\n",
   ">\n",
-  "> \302\240 \302\240 \302\240 \302\240gic = get_irq_chip(29);\n",
-  "> - \302\240 \302\240 \302\240 gic_unmask_irq = gic->irq_unmask;\n",
-  "> - \302\240 \302\240 \302\240 gic_mask_irq = gic->irq_mask;\n",
-  "> + \302\240 \302\240 \302\240 tegra_gic_unmask_irq = gic->irq_unmask;\n",
-  "> + \302\240 \302\240 \302\240 tegra_gic_mask_irq = gic->irq_mask;\n",
-  "> \302\240 \302\240 \302\240 \302\240tegra_irq.irq_ack = gic->irq_ack;\n",
-  "> \302\240#ifdef CONFIG_SMP\n",
-  "> \302\240 \302\240 \302\240 \302\240tegra_irq.irq_set_affinity = gic->irq_set_affinity;\n",
+  "> ? ? ? ?gic = get_irq_chip(29);\n",
+  "> - ? ? ? gic_unmask_irq = gic->irq_unmask;\n",
+  "> - ? ? ? gic_mask_irq = gic->irq_mask;\n",
+  "> + ? ? ? tegra_gic_unmask_irq = gic->irq_unmask;\n",
+  "> + ? ? ? tegra_gic_mask_irq = gic->irq_mask;\n",
+  "> ? ? ? ?tegra_irq.irq_ack = gic->irq_ack;\n",
+  "> ?#ifdef CONFIG_SMP\n",
+  "> ? ? ? ?tegra_irq.irq_set_affinity = gic->irq_set_affinity;\n",
   "> --\n",
   "> 1.7.3.1\n",
   "\n",
@@ -95,4 +87,4 @@
   "tegra/for-linus for a pull request for 2.6.38-rc3."
 ]
 
-640fa8a9629816a4a771c9d64e779616e29c1283dac88c2b6c812af926a6331c
+dc9e4f93cfa37b66b19b83ae3f9df267db0e2e339c595df20eb29bc400ca2ad6
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.