diff options
author | Robert Richter <robert.richter@amd.com> | 2010-07-21 13:03:58 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-08-12 17:01:38 -0400 |
commit | f6e9456c9272bb570df6e217cdbe007e270b1c4e (patch) | |
tree | 3ca098c924e8abf7231ab89e9f02ba9b3494fddb /arch/x86/kernel/apic/io_apic.c | |
parent | ad41a1e0cab07c5125456e8d38e5b1ab148d04aa (diff) |
x86, cleanup: Remove obsolete boot_cpu_id variable
boot_cpu_id is there for historical reasons and was renamed to
boot_cpu_physical_apicid in patch:
c70dcb7 x86: change boot_cpu_id to boot_cpu_physical_apicid
However, there are some remaining occurrences of boot_cpu_id that are
never touched in the kernel and thus its value is always 0.
This patch removes boot_cpu_id completely.
Signed-off-by: Robert Richter <robert.richter@amd.com>
LKML-Reference: <1279731838-1522-8-git-send-email-robert.richter@amd.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 4dc0084ec1b1..8884928d7bc1 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -162,7 +162,7 @@ int __init arch_early_irq_init(void) | |||
162 | 162 | ||
163 | cfg = irq_cfgx; | 163 | cfg = irq_cfgx; |
164 | count = ARRAY_SIZE(irq_cfgx); | 164 | count = ARRAY_SIZE(irq_cfgx); |
165 | node= cpu_to_node(boot_cpu_id); | 165 | node = cpu_to_node(0); |
166 | 166 | ||
167 | for (i = 0; i < count; i++) { | 167 | for (i = 0; i < count; i++) { |
168 | desc = irq_to_desc(i); | 168 | desc = irq_to_desc(i); |
@@ -1483,7 +1483,7 @@ static void __init setup_IO_APIC_irqs(void) | |||
1483 | int notcon = 0; | 1483 | int notcon = 0; |
1484 | struct irq_desc *desc; | 1484 | struct irq_desc *desc; |
1485 | struct irq_cfg *cfg; | 1485 | struct irq_cfg *cfg; |
1486 | int node = cpu_to_node(boot_cpu_id); | 1486 | int node = cpu_to_node(0); |
1487 | 1487 | ||
1488 | apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n"); | 1488 | apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n"); |
1489 | 1489 | ||
@@ -1548,7 +1548,7 @@ static void __init setup_IO_APIC_irqs(void) | |||
1548 | void setup_IO_APIC_irq_extra(u32 gsi) | 1548 | void setup_IO_APIC_irq_extra(u32 gsi) |
1549 | { | 1549 | { |
1550 | int apic_id = 0, pin, idx, irq; | 1550 | int apic_id = 0, pin, idx, irq; |
1551 | int node = cpu_to_node(boot_cpu_id); | 1551 | int node = cpu_to_node(0); |
1552 | struct irq_desc *desc; | 1552 | struct irq_desc *desc; |
1553 | struct irq_cfg *cfg; | 1553 | struct irq_cfg *cfg; |
1554 | 1554 | ||
@@ -2925,7 +2925,7 @@ static inline void __init check_timer(void) | |||
2925 | { | 2925 | { |
2926 | struct irq_desc *desc = irq_to_desc(0); | 2926 | struct irq_desc *desc = irq_to_desc(0); |
2927 | struct irq_cfg *cfg = desc->chip_data; | 2927 | struct irq_cfg *cfg = desc->chip_data; |
2928 | int node = cpu_to_node(boot_cpu_id); | 2928 | int node = cpu_to_node(0); |
2929 | int apic1, pin1, apic2, pin2; | 2929 | int apic1, pin1, apic2, pin2; |
2930 | unsigned long flags; | 2930 | unsigned long flags; |
2931 | int no_pin1 = 0; | 2931 | int no_pin1 = 0; |
@@ -3279,7 +3279,7 @@ unsigned int create_irq_nr(unsigned int irq_want, int node) | |||
3279 | 3279 | ||
3280 | int create_irq(void) | 3280 | int create_irq(void) |
3281 | { | 3281 | { |
3282 | int node = cpu_to_node(boot_cpu_id); | 3282 | int node = cpu_to_node(0); |
3283 | unsigned int irq_want; | 3283 | unsigned int irq_want; |
3284 | int irq; | 3284 | int irq; |
3285 | 3285 | ||
@@ -3901,7 +3901,7 @@ static int __io_apic_set_pci_routing(struct device *dev, int irq, | |||
3901 | if (dev) | 3901 | if (dev) |
3902 | node = dev_to_node(dev); | 3902 | node = dev_to_node(dev); |
3903 | else | 3903 | else |
3904 | node = cpu_to_node(boot_cpu_id); | 3904 | node = cpu_to_node(0); |
3905 | 3905 | ||
3906 | desc = irq_to_desc_alloc_node(irq, node); | 3906 | desc = irq_to_desc_alloc_node(irq, node); |
3907 | if (!desc) { | 3907 | if (!desc) { |