From cd9d2b91d5d0fe4e3dc6f4ca987fa24c24d727c3 Mon Sep 17 00:00:00 2001 From: Ravikiran G Thirumalai Date: Tue, 8 May 2007 00:29:13 -0700 Subject: [PATCH] --- yaml --- r: 54663 b: refs/heads/master c: e729aa16b168fb202d1a20f936028cb7c2a0278d h: refs/heads/master i: 54661: be1bda003da5b0cb50263bcf701c939fff93e7aa 54659: f3ae10b92301294988d784a76e70219a9119a38b 54655: 96fa05069e3b6ca1b42e1f7d6995a4d86d1772a6 v: v3 --- [refs] | 2 +- trunk/include/linux/irq.h | 4 +--- trunk/kernel/irq/handle.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d7a9fb20cfc9..89a1be7cea80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 428e6ce023c5890cfecc8ad10335da3f28dbf893 +refs/heads/master: e729aa16b168fb202d1a20f936028cb7c2a0278d diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index a6899402b522..1695054e8c63 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/include/linux/irq.h @@ -147,8 +147,6 @@ struct irq_chip { * @dir: /proc/irq/ procfs entry * @affinity_entry: /proc/irq/smp_affinity procfs entry on SMP * @name: flow handler name for /proc/interrupts output - * - * Pad this out to 32 bytes for cache and indexing reasons. */ struct irq_desc { irq_flow_handler_t handle_irq; @@ -175,7 +173,7 @@ struct irq_desc { struct proc_dir_entry *dir; #endif const char *name; -} ____cacheline_aligned; +} ____cacheline_internodealigned_in_smp; extern struct irq_desc irq_desc[NR_IRQS]; diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c index aff1f0fabb0d..515ad40bde15 100644 --- a/trunk/kernel/irq/handle.c +++ b/trunk/kernel/irq/handle.c @@ -48,7 +48,7 @@ handle_bad_irq(unsigned int irq, struct irq_desc *desc) * * Controller mappings for all interrupt sources: */ -struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = { +struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = { [0 ... NR_IRQS-1] = { .status = IRQ_DISABLED, .chip = &no_irq_chip,