diff options
Diffstat (limited to 'arch')
471 files changed, 11243 insertions, 5848 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 8977d99987cb..471e72dbaf8b 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
@@ -79,8 +79,6 @@ config HAVE_KRETPROBES | |||
79 | # task_pt_regs() in asm/processor.h or asm/ptrace.h | 79 | # task_pt_regs() in asm/processor.h or asm/ptrace.h |
80 | # arch_has_single_step() if there is hardware single-step support | 80 | # arch_has_single_step() if there is hardware single-step support |
81 | # arch_has_block_step() if there is hardware block-step support | 81 | # arch_has_block_step() if there is hardware block-step support |
82 | # arch_ptrace() and not #define __ARCH_SYS_PTRACE | ||
83 | # compat_arch_ptrace() and #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
84 | # asm/syscall.h supplying asm-generic/syscall.h interface | 82 | # asm/syscall.h supplying asm-generic/syscall.h interface |
85 | # linux/regset.h user_regset interfaces | 83 | # linux/regset.h user_regset interfaces |
86 | # CORE_DUMP_USE_REGSET #define'd in linux/elf.h | 84 | # CORE_DUMP_USE_REGSET #define'd in linux/elf.h |
diff --git a/arch/alpha/include/asm/smp.h b/arch/alpha/include/asm/smp.h index 544c69af8168..547e90951cec 100644 --- a/arch/alpha/include/asm/smp.h +++ b/arch/alpha/include/asm/smp.h | |||
@@ -45,7 +45,6 @@ extern struct cpuinfo_alpha cpu_data[NR_CPUS]; | |||
45 | #define raw_smp_processor_id() (current_thread_info()->cpu) | 45 | #define raw_smp_processor_id() (current_thread_info()->cpu) |
46 | 46 | ||
47 | extern int smp_num_cpus; | 47 | extern int smp_num_cpus; |
48 | #define cpu_possible_map cpu_present_map | ||
49 | 48 | ||
50 | extern void arch_send_call_function_single_ipi(int cpu); | 49 | extern void arch_send_call_function_single_ipi(int cpu); |
51 | extern void arch_send_call_function_ipi(cpumask_t mask); | 50 | extern void arch_send_call_function_ipi(cpumask_t mask); |
diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c index c626a821cdcb..d0f1620007f7 100644 --- a/arch/alpha/kernel/irq.c +++ b/arch/alpha/kernel/irq.c | |||
@@ -55,7 +55,7 @@ int irq_select_affinity(unsigned int irq) | |||
55 | last_cpu = cpu; | 55 | last_cpu = cpu; |
56 | 56 | ||
57 | irq_desc[irq].affinity = cpumask_of_cpu(cpu); | 57 | irq_desc[irq].affinity = cpumask_of_cpu(cpu); |
58 | irq_desc[irq].chip->set_affinity(irq, cpumask_of_cpu(cpu)); | 58 | irq_desc[irq].chip->set_affinity(irq, cpumask_of(cpu)); |
59 | return 0; | 59 | return 0; |
60 | } | 60 | } |
61 | #endif /* CONFIG_SMP */ | 61 | #endif /* CONFIG_SMP */ |
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 5cf45fc51343..ff8cb638472e 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
@@ -338,7 +338,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp) | |||
338 | return PCI_SLOT(dev->devfn); | 338 | return PCI_SLOT(dev->devfn); |
339 | } | 339 | } |
340 | 340 | ||
341 | void __devinit | 341 | void |
342 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, | 342 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, |
343 | struct resource *res) | 343 | struct resource *res) |
344 | { | 344 | { |
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index 351407e07e71..f238370c907d 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c | |||
@@ -94,6 +94,7 @@ common_shutdown_1(void *generic_ptr) | |||
94 | flags |= 0x00040000UL; /* "remain halted" */ | 94 | flags |= 0x00040000UL; /* "remain halted" */ |
95 | *pflags = flags; | 95 | *pflags = flags; |
96 | cpu_clear(cpuid, cpu_present_map); | 96 | cpu_clear(cpuid, cpu_present_map); |
97 | cpu_clear(cpuid, cpu_possible_map); | ||
97 | halt(); | 98 | halt(); |
98 | } | 99 | } |
99 | #endif | 100 | #endif |
@@ -120,6 +121,7 @@ common_shutdown_1(void *generic_ptr) | |||
120 | #ifdef CONFIG_SMP | 121 | #ifdef CONFIG_SMP |
121 | /* Wait for the secondaries to halt. */ | 122 | /* Wait for the secondaries to halt. */ |
122 | cpu_clear(boot_cpuid, cpu_present_map); | 123 | cpu_clear(boot_cpuid, cpu_present_map); |
124 | cpu_clear(boot_cpuid, cpu_possible_map); | ||
123 | while (cpus_weight(cpu_present_map)) | 125 | while (cpus_weight(cpu_present_map)) |
124 | barrier(); | 126 | barrier(); |
125 | #endif | 127 | #endif |
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index e657c45d91d2..d953e510f68d 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c | |||
@@ -70,11 +70,6 @@ enum ipi_message_type { | |||
70 | /* Set to a secondary's cpuid when it comes online. */ | 70 | /* Set to a secondary's cpuid when it comes online. */ |
71 | static int smp_secondary_alive __devinitdata = 0; | 71 | static int smp_secondary_alive __devinitdata = 0; |
72 | 72 | ||
73 | /* Which cpus ids came online. */ | ||
74 | cpumask_t cpu_online_map; | ||
75 | |||
76 | EXPORT_SYMBOL(cpu_online_map); | ||
77 | |||
78 | int smp_num_probed; /* Internal processor count */ | 73 | int smp_num_probed; /* Internal processor count */ |
79 | int smp_num_cpus = 1; /* Number that came online. */ | 74 | int smp_num_cpus = 1; /* Number that came online. */ |
80 | EXPORT_SYMBOL(smp_num_cpus); | 75 | EXPORT_SYMBOL(smp_num_cpus); |
@@ -121,7 +116,7 @@ wait_boot_cpu_to_stop(int cpuid) | |||
121 | /* | 116 | /* |
122 | * Where secondaries begin a life of C. | 117 | * Where secondaries begin a life of C. |
123 | */ | 118 | */ |
124 | void __init | 119 | void __cpuinit |
125 | smp_callin(void) | 120 | smp_callin(void) |
126 | { | 121 | { |
127 | int cpuid = hard_smp_processor_id(); | 122 | int cpuid = hard_smp_processor_id(); |
@@ -198,7 +193,7 @@ wait_for_txrdy (unsigned long cpumask) | |||
198 | * Send a message to a secondary's console. "START" is one such | 193 | * Send a message to a secondary's console. "START" is one such |
199 | * interesting message. ;-) | 194 | * interesting message. ;-) |
200 | */ | 195 | */ |
201 | static void __init | 196 | static void __cpuinit |
202 | send_secondary_console_msg(char *str, int cpuid) | 197 | send_secondary_console_msg(char *str, int cpuid) |
203 | { | 198 | { |
204 | struct percpu_struct *cpu; | 199 | struct percpu_struct *cpu; |
@@ -289,7 +284,7 @@ recv_secondary_console_msg(void) | |||
289 | /* | 284 | /* |
290 | * Convince the console to have a secondary cpu begin execution. | 285 | * Convince the console to have a secondary cpu begin execution. |
291 | */ | 286 | */ |
292 | static int __init | 287 | static int __cpuinit |
293 | secondary_cpu_start(int cpuid, struct task_struct *idle) | 288 | secondary_cpu_start(int cpuid, struct task_struct *idle) |
294 | { | 289 | { |
295 | struct percpu_struct *cpu; | 290 | struct percpu_struct *cpu; |
@@ -440,6 +435,7 @@ setup_smp(void) | |||
440 | ((char *)cpubase + i*hwrpb->processor_size); | 435 | ((char *)cpubase + i*hwrpb->processor_size); |
441 | if ((cpu->flags & 0x1cc) == 0x1cc) { | 436 | if ((cpu->flags & 0x1cc) == 0x1cc) { |
442 | smp_num_probed++; | 437 | smp_num_probed++; |
438 | cpu_set(i, cpu_possible_map); | ||
443 | cpu_set(i, cpu_present_map); | 439 | cpu_set(i, cpu_present_map); |
444 | cpu->pal_revision = boot_cpu_palrev; | 440 | cpu->pal_revision = boot_cpu_palrev; |
445 | } | 441 | } |
@@ -473,6 +469,7 @@ smp_prepare_cpus(unsigned int max_cpus) | |||
473 | 469 | ||
474 | /* Nothing to do on a UP box, or when told not to. */ | 470 | /* Nothing to do on a UP box, or when told not to. */ |
475 | if (smp_num_probed == 1 || max_cpus == 0) { | 471 | if (smp_num_probed == 1 || max_cpus == 0) { |
472 | cpu_possible_map = cpumask_of_cpu(boot_cpuid); | ||
476 | cpu_present_map = cpumask_of_cpu(boot_cpuid); | 473 | cpu_present_map = cpumask_of_cpu(boot_cpuid); |
477 | printk(KERN_INFO "SMP mode deactivated.\n"); | 474 | printk(KERN_INFO "SMP mode deactivated.\n"); |
478 | return; | 475 | return; |
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c index c71b0fd7a61f..ab44c164d9d4 100644 --- a/arch/alpha/kernel/sys_dp264.c +++ b/arch/alpha/kernel/sys_dp264.c | |||
@@ -177,19 +177,19 @@ cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) | |||
177 | } | 177 | } |
178 | 178 | ||
179 | static void | 179 | static void |
180 | dp264_set_affinity(unsigned int irq, cpumask_t affinity) | 180 | dp264_set_affinity(unsigned int irq, const struct cpumask *affinity) |
181 | { | 181 | { |
182 | spin_lock(&dp264_irq_lock); | 182 | spin_lock(&dp264_irq_lock); |
183 | cpu_set_irq_affinity(irq, affinity); | 183 | cpu_set_irq_affinity(irq, *affinity); |
184 | tsunami_update_irq_hw(cached_irq_mask); | 184 | tsunami_update_irq_hw(cached_irq_mask); |
185 | spin_unlock(&dp264_irq_lock); | 185 | spin_unlock(&dp264_irq_lock); |
186 | } | 186 | } |
187 | 187 | ||
188 | static void | 188 | static void |
189 | clipper_set_affinity(unsigned int irq, cpumask_t affinity) | 189 | clipper_set_affinity(unsigned int irq, const struct cpumask *affinity) |
190 | { | 190 | { |
191 | spin_lock(&dp264_irq_lock); | 191 | spin_lock(&dp264_irq_lock); |
192 | cpu_set_irq_affinity(irq - 16, affinity); | 192 | cpu_set_irq_affinity(irq - 16, *affinity); |
193 | tsunami_update_irq_hw(cached_irq_mask); | 193 | tsunami_update_irq_hw(cached_irq_mask); |
194 | spin_unlock(&dp264_irq_lock); | 194 | spin_unlock(&dp264_irq_lock); |
195 | } | 195 | } |
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index 52c91ccc1648..27f840a4ad3d 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c | |||
@@ -158,10 +158,10 @@ titan_cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) | |||
158 | } | 158 | } |
159 | 159 | ||
160 | static void | 160 | static void |
161 | titan_set_irq_affinity(unsigned int irq, cpumask_t affinity) | 161 | titan_set_irq_affinity(unsigned int irq, const struct cpumask *affinity) |
162 | { | 162 | { |
163 | spin_lock(&titan_irq_lock); | 163 | spin_lock(&titan_irq_lock); |
164 | titan_cpu_set_irq_affinity(irq - 16, affinity); | 164 | titan_cpu_set_irq_affinity(irq - 16, *affinity); |
165 | titan_update_irq_hw(titan_cached_irq_mask); | 165 | titan_update_irq_hw(titan_cached_irq_mask); |
166 | spin_unlock(&titan_irq_lock); | 166 | spin_unlock(&titan_irq_lock); |
167 | } | 167 | } |
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index c778779007fc..cefc5a355ef9 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | static int opDEC_fix; | 32 | static int opDEC_fix; |
33 | 33 | ||
34 | static void __init | 34 | static void __cpuinit |
35 | opDEC_check(void) | 35 | opDEC_check(void) |
36 | { | 36 | { |
37 | __asm__ __volatile__ ( | 37 | __asm__ __volatile__ ( |
@@ -1072,7 +1072,7 @@ give_sigbus: | |||
1072 | return; | 1072 | return; |
1073 | } | 1073 | } |
1074 | 1074 | ||
1075 | void __init | 1075 | void __cpuinit |
1076 | trap_init(void) | 1076 | trap_init(void) |
1077 | { | 1077 | { |
1078 | /* Tell PAL-code what global pointer we want in the kernel. */ | 1078 | /* Tell PAL-code what global pointer we want in the kernel. */ |
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 7fc9860a97d7..c6884ba1d5ed 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c | |||
@@ -109,11 +109,11 @@ static void gic_unmask_irq(unsigned int irq) | |||
109 | } | 109 | } |
110 | 110 | ||
111 | #ifdef CONFIG_SMP | 111 | #ifdef CONFIG_SMP |
112 | static void gic_set_cpu(unsigned int irq, cpumask_t mask_val) | 112 | static void gic_set_cpu(unsigned int irq, const struct cpumask *mask_val) |
113 | { | 113 | { |
114 | void __iomem *reg = gic_dist_base(irq) + GIC_DIST_TARGET + (gic_irq(irq) & ~3); | 114 | void __iomem *reg = gic_dist_base(irq) + GIC_DIST_TARGET + (gic_irq(irq) & ~3); |
115 | unsigned int shift = (irq % 4) * 8; | 115 | unsigned int shift = (irq % 4) * 8; |
116 | unsigned int cpu = first_cpu(mask_val); | 116 | unsigned int cpu = cpumask_first(mask_val); |
117 | u32 val; | 117 | u32 val; |
118 | 118 | ||
119 | spin_lock(&irq_controller_lock); | 119 | spin_lock(&irq_controller_lock); |
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 47ccec95f3e8..ef12794c3c68 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
@@ -630,7 +630,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) | |||
630 | return -ENOMEM; | 630 | return -ENOMEM; |
631 | 631 | ||
632 | sachip->clk = clk_get(me, "SA1111_CLK"); | 632 | sachip->clk = clk_get(me, "SA1111_CLK"); |
633 | if (!sachip->clk) { | 633 | if (IS_ERR(sachip->clk)) { |
634 | ret = PTR_ERR(sachip->clk); | 634 | ret = PTR_ERR(sachip->clk); |
635 | goto err_free; | 635 | goto err_free; |
636 | } | 636 | } |
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index f3af0b593eb0..98765438048d 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig | |||
@@ -179,7 +179,7 @@ CONFIG_MACH_HUSKY=y | |||
179 | # CONFIG_MACH_AKITA is not set | 179 | # CONFIG_MACH_AKITA is not set |
180 | # CONFIG_MACH_SPITZ is not set | 180 | # CONFIG_MACH_SPITZ is not set |
181 | # CONFIG_MACH_BORZOI is not set | 181 | # CONFIG_MACH_BORZOI is not set |
182 | CONFIG_MACH_TOSA=y | 182 | # CONFIG_MACH_TOSA is not set |
183 | # CONFIG_ARCH_VIPER is not set | 183 | # CONFIG_ARCH_VIPER is not set |
184 | # CONFIG_ARCH_PXA_ESERIES is not set | 184 | # CONFIG_ARCH_PXA_ESERIES is not set |
185 | # CONFIG_TRIZEPS_PXA is not set | 185 | # CONFIG_TRIZEPS_PXA is not set |
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index 9a1db20e032a..63a481fbbed4 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h | |||
@@ -237,6 +237,7 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); | |||
237 | #if __LINUX_ARM_ARCH__ < 5 | 237 | #if __LINUX_ARM_ARCH__ < 5 |
238 | 238 | ||
239 | #include <asm-generic/bitops/ffz.h> | 239 | #include <asm-generic/bitops/ffz.h> |
240 | #include <asm-generic/bitops/__fls.h> | ||
240 | #include <asm-generic/bitops/__ffs.h> | 241 | #include <asm-generic/bitops/__ffs.h> |
241 | #include <asm-generic/bitops/fls.h> | 242 | #include <asm-generic/bitops/fls.h> |
242 | #include <asm-generic/bitops/ffs.h> | 243 | #include <asm-generic/bitops/ffs.h> |
@@ -277,16 +278,19 @@ static inline int constant_fls(int x) | |||
277 | * the clz instruction for much better code efficiency. | 278 | * the clz instruction for much better code efficiency. |
278 | */ | 279 | */ |
279 | 280 | ||
280 | #define __fls(x) \ | ||
281 | ( __builtin_constant_p(x) ? constant_fls(x) : \ | ||
282 | ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) | ||
283 | |||
284 | /* Implement fls() in C so that 64-bit args are suitably truncated */ | ||
285 | static inline int fls(int x) | 281 | static inline int fls(int x) |
286 | { | 282 | { |
287 | return __fls(x); | 283 | int ret; |
284 | |||
285 | if (__builtin_constant_p(x)) | ||
286 | return constant_fls(x); | ||
287 | |||
288 | asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc"); | ||
289 | ret = 32 - ret; | ||
290 | return ret; | ||
288 | } | 291 | } |
289 | 292 | ||
293 | #define __fls(x) (fls(x) - 1) | ||
290 | #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) | 294 | #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) |
291 | #define __ffs(x) (ffs(x) - 1) | 295 | #define __ffs(x) (ffs(x) - 1) |
292 | #define ffz(x) __ffs( ~(x) ) | 296 | #define ffz(x) __ffs( ~(x) ) |
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 1cb8602dd9d5..4ed149cbb32a 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h | |||
@@ -256,8 +256,17 @@ int dmabounce_sync_for_cpu(struct device *, dma_addr_t, unsigned long, | |||
256 | int dmabounce_sync_for_device(struct device *, dma_addr_t, unsigned long, | 256 | int dmabounce_sync_for_device(struct device *, dma_addr_t, unsigned long, |
257 | size_t, enum dma_data_direction); | 257 | size_t, enum dma_data_direction); |
258 | #else | 258 | #else |
259 | #define dmabounce_sync_for_cpu(dev,dma,off,sz,dir) (1) | 259 | static inline int dmabounce_sync_for_cpu(struct device *d, dma_addr_t addr, |
260 | #define dmabounce_sync_for_device(dev,dma,off,sz,dir) (1) | 260 | unsigned long offset, size_t size, enum dma_data_direction dir) |
261 | { | ||
262 | return 1; | ||
263 | } | ||
264 | |||
265 | static inline int dmabounce_sync_for_device(struct device *d, dma_addr_t addr, | ||
266 | unsigned long offset, size_t size, enum dma_data_direction dir) | ||
267 | { | ||
268 | return 1; | ||
269 | } | ||
261 | 270 | ||
262 | 271 | ||
263 | /** | 272 | /** |
diff --git a/arch/arm/include/asm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h index 87bff09633aa..83e6ba338e2c 100644 --- a/arch/arm/include/asm/hardware/iop3xx-adma.h +++ b/arch/arm/include/asm/hardware/iop3xx-adma.h | |||
@@ -730,7 +730,8 @@ static inline void iop_desc_set_next_desc(struct iop_adma_desc_slot *desc, | |||
730 | { | 730 | { |
731 | /* hw_desc->next_desc is the same location for all channels */ | 731 | /* hw_desc->next_desc is the same location for all channels */ |
732 | union iop3xx_desc hw_desc = { .ptr = desc->hw_desc, }; | 732 | union iop3xx_desc hw_desc = { .ptr = desc->hw_desc, }; |
733 | BUG_ON(hw_desc.dma->next_desc); | 733 | |
734 | iop_paranoia(hw_desc.dma->next_desc); | ||
734 | hw_desc.dma->next_desc = next_desc_addr; | 735 | hw_desc.dma->next_desc = next_desc_addr; |
735 | } | 736 | } |
736 | 737 | ||
@@ -760,7 +761,7 @@ static inline int iop_desc_get_zero_result(struct iop_adma_desc_slot *desc) | |||
760 | struct iop3xx_desc_aau *hw_desc = desc->hw_desc; | 761 | struct iop3xx_desc_aau *hw_desc = desc->hw_desc; |
761 | struct iop3xx_aau_desc_ctrl desc_ctrl = hw_desc->desc_ctrl_field; | 762 | struct iop3xx_aau_desc_ctrl desc_ctrl = hw_desc->desc_ctrl_field; |
762 | 763 | ||
763 | BUG_ON(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en)); | 764 | iop_paranoia(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en)); |
764 | return desc_ctrl.zero_result_err; | 765 | return desc_ctrl.zero_result_err; |
765 | } | 766 | } |
766 | 767 | ||
diff --git a/arch/arm/include/asm/hardware/iop_adma.h b/arch/arm/include/asm/hardware/iop_adma.h index cb7e3611bcba..385c6e8cbbd2 100644 --- a/arch/arm/include/asm/hardware/iop_adma.h +++ b/arch/arm/include/asm/hardware/iop_adma.h | |||
@@ -23,6 +23,12 @@ | |||
23 | 23 | ||
24 | #define IOP_ADMA_SLOT_SIZE 32 | 24 | #define IOP_ADMA_SLOT_SIZE 32 |
25 | #define IOP_ADMA_THRESHOLD 4 | 25 | #define IOP_ADMA_THRESHOLD 4 |
26 | #ifdef DEBUG | ||
27 | #define IOP_PARANOIA 1 | ||
28 | #else | ||
29 | #define IOP_PARANOIA 0 | ||
30 | #endif | ||
31 | #define iop_paranoia(x) BUG_ON(IOP_PARANOIA && (x)) | ||
26 | 32 | ||
27 | /** | 33 | /** |
28 | * struct iop_adma_device - internal representation of an ADMA device | 34 | * struct iop_adma_device - internal representation of an ADMA device |
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h index cb1139ac1943..39d949b63e80 100644 --- a/arch/arm/include/asm/mach/map.h +++ b/arch/arm/include/asm/mach/map.h | |||
@@ -19,12 +19,13 @@ struct map_desc { | |||
19 | }; | 19 | }; |
20 | 20 | ||
21 | /* types 0-3 are defined in asm/io.h */ | 21 | /* types 0-3 are defined in asm/io.h */ |
22 | #define MT_CACHECLEAN 4 | 22 | #define MT_UNCACHED 4 |
23 | #define MT_MINICLEAN 5 | 23 | #define MT_CACHECLEAN 5 |
24 | #define MT_LOW_VECTORS 6 | 24 | #define MT_MINICLEAN 6 |
25 | #define MT_HIGH_VECTORS 7 | 25 | #define MT_LOW_VECTORS 7 |
26 | #define MT_MEMORY 8 | 26 | #define MT_HIGH_VECTORS 8 |
27 | #define MT_ROM 9 | 27 | #define MT_MEMORY 9 |
28 | #define MT_ROM 10 | ||
28 | 29 | ||
29 | #ifdef CONFIG_MMU | 30 | #ifdef CONFIG_MMU |
30 | extern void iotable_init(struct map_desc *, int); | 31 | extern void iotable_init(struct map_desc *, int); |
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 517a4d6ffc74..6ff33790f47b 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <asm/types.h> | 23 | #include <asm/types.h> |
24 | 24 | ||
25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #define STACK_TOP ((current->personality == PER_LINUX_32BIT) ? \ | 26 | #define STACK_TOP ((current->personality & ADDR_LIMIT_32BIT) ? \ |
27 | TASK_SIZE : TASK_SIZE_26) | 27 | TASK_SIZE : TASK_SIZE_26) |
28 | #define STACK_TOP_MAX TASK_SIZE | 28 | #define STACK_TOP_MAX TASK_SIZE |
29 | #endif | 29 | #endif |
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index c74f766ffc12..23af3c972c9a 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
@@ -115,6 +115,8 @@ EXPORT_SYMBOL(__strnlen_user); | |||
115 | EXPORT_SYMBOL(__strncpy_from_user); | 115 | EXPORT_SYMBOL(__strncpy_from_user); |
116 | 116 | ||
117 | #ifdef CONFIG_MMU | 117 | #ifdef CONFIG_MMU |
118 | EXPORT_SYMBOL(copy_page); | ||
119 | |||
118 | EXPORT_SYMBOL(__copy_from_user); | 120 | EXPORT_SYMBOL(__copy_from_user); |
119 | EXPORT_SYMBOL(__copy_to_user); | 121 | EXPORT_SYMBOL(__copy_to_user); |
120 | EXPORT_SYMBOL(__clear_user); | 122 | EXPORT_SYMBOL(__clear_user); |
@@ -181,8 +183,6 @@ EXPORT_SYMBOL(_find_first_bit_be); | |||
181 | EXPORT_SYMBOL(_find_next_bit_be); | 183 | EXPORT_SYMBOL(_find_next_bit_be); |
182 | #endif | 184 | #endif |
183 | 185 | ||
184 | EXPORT_SYMBOL(copy_page); | ||
185 | |||
186 | #ifdef CONFIG_FUNCTION_TRACER | 186 | #ifdef CONFIG_FUNCTION_TRACER |
187 | EXPORT_SYMBOL(mcount); | 187 | EXPORT_SYMBOL(mcount); |
188 | #endif | 188 | #endif |
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 2f3eb795fa6e..7141cee1fab7 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
@@ -174,7 +174,7 @@ static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu) | |||
174 | pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu); | 174 | pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu); |
175 | 175 | ||
176 | spin_lock_irq(&desc->lock); | 176 | spin_lock_irq(&desc->lock); |
177 | desc->chip->set_affinity(irq, cpumask_of_cpu(cpu)); | 177 | desc->chip->set_affinity(irq, cpumask_of(cpu)); |
178 | spin_unlock_irq(&desc->lock); | 178 | spin_unlock_irq(&desc->lock); |
179 | } | 179 | } |
180 | 180 | ||
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index e42a749a56dd..bd905c0a7365 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -34,16 +34,6 @@ | |||
34 | #include <asm/ptrace.h> | 34 | #include <asm/ptrace.h> |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * bitmask of present and online CPUs. | ||
38 | * The present bitmask indicates that the CPU is physically present. | ||
39 | * The online bitmask indicates that the CPU is up and running. | ||
40 | */ | ||
41 | cpumask_t cpu_possible_map; | ||
42 | EXPORT_SYMBOL(cpu_possible_map); | ||
43 | cpumask_t cpu_online_map; | ||
44 | EXPORT_SYMBOL(cpu_online_map); | ||
45 | |||
46 | /* | ||
47 | * as from 2.5, kernels no longer have an init_tasks structure | 37 | * as from 2.5, kernels no longer have an init_tasks structure |
48 | * so we need some other way of telling a new secondary core | 38 | * so we need some other way of telling a new secondary core |
49 | * where to place its SVC stack | 39 | * where to place its SVC stack |
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 57e6874d0b80..79abc4ddc0cf 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/personality.h> | 18 | #include <linux/personality.h> |
19 | #include <linux/kallsyms.h> | 19 | #include <linux/kallsyms.h> |
20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
21 | #include <linux/hardirq.h> | ||
21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
22 | #include <linux/uaccess.h> | 23 | #include <linux/uaccess.h> |
23 | 24 | ||
diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c index a72e798a2a40..72f51d39202c 100644 --- a/arch/arm/mach-at91/at91rm9200_time.c +++ b/arch/arm/mach-at91/at91rm9200_time.c | |||
@@ -169,7 +169,6 @@ static struct clock_event_device clkevt = { | |||
169 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, | 169 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, |
170 | .shift = 32, | 170 | .shift = 32, |
171 | .rating = 150, | 171 | .rating = 150, |
172 | .cpumask = CPU_MASK_CPU0, | ||
173 | .set_next_event = clkevt32k_next_event, | 172 | .set_next_event = clkevt32k_next_event, |
174 | .set_mode = clkevt32k_mode, | 173 | .set_mode = clkevt32k_mode, |
175 | }; | 174 | }; |
@@ -197,7 +196,7 @@ void __init at91rm9200_timer_init(void) | |||
197 | clkevt.mult = div_sc(AT91_SLOW_CLOCK, NSEC_PER_SEC, clkevt.shift); | 196 | clkevt.mult = div_sc(AT91_SLOW_CLOCK, NSEC_PER_SEC, clkevt.shift); |
198 | clkevt.max_delta_ns = clockevent_delta2ns(AT91_ST_ALMV, &clkevt); | 197 | clkevt.max_delta_ns = clockevent_delta2ns(AT91_ST_ALMV, &clkevt); |
199 | clkevt.min_delta_ns = clockevent_delta2ns(2, &clkevt) + 1; | 198 | clkevt.min_delta_ns = clockevent_delta2ns(2, &clkevt) + 1; |
200 | clkevt.cpumask = cpumask_of_cpu(0); | 199 | clkevt.cpumask = cpumask_of(0); |
201 | clockevents_register_device(&clkevt); | 200 | clockevents_register_device(&clkevt); |
202 | 201 | ||
203 | /* register clocksource */ | 202 | /* register clocksource */ |
diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c index 122fd77ed580..b63e1d5f1bad 100644 --- a/arch/arm/mach-at91/at91sam926x_time.c +++ b/arch/arm/mach-at91/at91sam926x_time.c | |||
@@ -91,7 +91,6 @@ static struct clock_event_device pit_clkevt = { | |||
91 | .features = CLOCK_EVT_FEAT_PERIODIC, | 91 | .features = CLOCK_EVT_FEAT_PERIODIC, |
92 | .shift = 32, | 92 | .shift = 32, |
93 | .rating = 100, | 93 | .rating = 100, |
94 | .cpumask = CPU_MASK_CPU0, | ||
95 | .set_mode = pit_clkevt_mode, | 94 | .set_mode = pit_clkevt_mode, |
96 | }; | 95 | }; |
97 | 96 | ||
@@ -173,6 +172,7 @@ static void __init at91sam926x_pit_init(void) | |||
173 | 172 | ||
174 | /* Set up and register clockevents */ | 173 | /* Set up and register clockevents */ |
175 | pit_clkevt.mult = div_sc(pit_rate, NSEC_PER_SEC, pit_clkevt.shift); | 174 | pit_clkevt.mult = div_sc(pit_rate, NSEC_PER_SEC, pit_clkevt.shift); |
175 | pit_clkevt.cpumask = cpumask_of(0); | ||
176 | clockevents_register_device(&pit_clkevt); | 176 | clockevents_register_device(&pit_clkevt); |
177 | } | 177 | } |
178 | 178 | ||
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h index 4c3e101b96c9..b3ebe9e4871f 100644 --- a/arch/arm/mach-clps711x/include/mach/hardware.h +++ b/arch/arm/mach-clps711x/include/mach/hardware.h | |||
@@ -94,20 +94,6 @@ | |||
94 | #include <asm/hardware/ep7212.h> | 94 | #include <asm/hardware/ep7212.h> |
95 | #include <asm/hardware/cs89712.h> | 95 | #include <asm/hardware/cs89712.h> |
96 | 96 | ||
97 | /* dynamic ioremap() areas */ | ||
98 | #define FLASH_START 0x00000000 | ||
99 | #define FLASH_SIZE 0x800000 | ||
100 | #define FLASH_WIDTH 4 | ||
101 | |||
102 | #define SRAM_START 0x60000000 | ||
103 | #define SRAM_SIZE 0xc000 | ||
104 | #define SRAM_WIDTH 4 | ||
105 | |||
106 | #define BOOTROM_START 0x70000000 | ||
107 | #define BOOTROM_SIZE 0x80 | ||
108 | #define BOOTROM_WIDTH 4 | ||
109 | |||
110 | |||
111 | /* static cdb89712_map_io() areas */ | 97 | /* static cdb89712_map_io() areas */ |
112 | #define REGISTER_START 0x80000000 | 98 | #define REGISTER_START 0x80000000 |
113 | #define REGISTER_SIZE 0x4000 | 99 | #define REGISTER_SIZE 0x4000 |
@@ -198,14 +184,6 @@ | |||
198 | #define CEIVA_FLASH_SIZE 0x100000 | 184 | #define CEIVA_FLASH_SIZE 0x100000 |
199 | #define CEIVA_FLASH_WIDTH 2 | 185 | #define CEIVA_FLASH_WIDTH 2 |
200 | 186 | ||
201 | #define SRAM_START 0x60000000 | ||
202 | #define SRAM_SIZE 0xc000 | ||
203 | #define SRAM_WIDTH 4 | ||
204 | |||
205 | #define BOOTROM_START 0x70000000 | ||
206 | #define BOOTROM_SIZE 0x80 | ||
207 | #define BOOTROM_WIDTH 4 | ||
208 | |||
209 | /* | 187 | /* |
210 | * SED1355 LCD controller | 188 | * SED1355 LCD controller |
211 | */ | 189 | */ |
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c index c3a33b8a5aac..7e247c04d41c 100644 --- a/arch/arm/mach-clps7500/core.c +++ b/arch/arm/mach-clps7500/core.c | |||
@@ -275,9 +275,9 @@ static struct map_desc cl7500_io_desc[] __initdata = { | |||
275 | .length = ISA_SIZE, | 275 | .length = ISA_SIZE, |
276 | .type = MT_DEVICE | 276 | .type = MT_DEVICE |
277 | }, { /* Flash */ | 277 | }, { /* Flash */ |
278 | .virtual = FLASH_BASE, | 278 | .virtual = CLPS7500_FLASH_BASE, |
279 | .pfn = __phys_to_pfn(FLASH_START), | 279 | .pfn = __phys_to_pfn(CLPS7500_FLASH_START), |
280 | .length = FLASH_SIZE, | 280 | .length = CLPS7500_FLASH_SIZE, |
281 | .type = MT_DEVICE | 281 | .type = MT_DEVICE |
282 | }, { /* LED */ | 282 | }, { /* LED */ |
283 | .virtual = LED_BASE, | 283 | .virtual = LED_BASE, |
diff --git a/arch/arm/mach-clps7500/include/mach/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h index d66578a3371c..a6ad1d44badf 100644 --- a/arch/arm/mach-clps7500/include/mach/hardware.h +++ b/arch/arm/mach-clps7500/include/mach/hardware.h | |||
@@ -39,9 +39,9 @@ | |||
39 | #define ISA_SIZE 0x00010000 | 39 | #define ISA_SIZE 0x00010000 |
40 | #define ISA_BASE 0xe1000000 | 40 | #define ISA_BASE 0xe1000000 |
41 | 41 | ||
42 | #define FLASH_START 0x01000000 /* XXX */ | 42 | #define CLPS7500_FLASH_START 0x01000000 /* XXX */ |
43 | #define FLASH_SIZE 0x01000000 | 43 | #define CLPS7500_FLASH_SIZE 0x01000000 |
44 | #define FLASH_BASE 0xe2000000 | 44 | #define CLPS7500_FLASH_BASE 0xe2000000 |
45 | 45 | ||
46 | #define LED_START 0x0302B000 | 46 | #define LED_START 0x0302B000 |
47 | #define LED_SIZE 0x00001000 | 47 | #define LED_SIZE 0x00001000 |
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 3b9a296b5c4b..f8bcd29d17a6 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c | |||
@@ -322,7 +322,7 @@ static void __init davinci_timer_init(void) | |||
322 | clockevent_davinci.min_delta_ns = | 322 | clockevent_davinci.min_delta_ns = |
323 | clockevent_delta2ns(1, &clockevent_davinci); | 323 | clockevent_delta2ns(1, &clockevent_davinci); |
324 | 324 | ||
325 | clockevent_davinci.cpumask = cpumask_of_cpu(0); | 325 | clockevent_davinci.cpumask = cpumask_of(0); |
326 | clockevents_register_device(&clockevent_davinci); | 326 | clockevents_register_device(&clockevent_davinci); |
327 | } | 327 | } |
328 | 328 | ||
diff --git a/arch/arm/mach-h720x/include/mach/boards.h b/arch/arm/mach-h720x/include/mach/boards.h index 079b279e1242..38b8e0d61fbf 100644 --- a/arch/arm/mach-h720x/include/mach/boards.h +++ b/arch/arm/mach-h720x/include/mach/boards.h | |||
@@ -19,9 +19,9 @@ | |||
19 | #ifdef CONFIG_ARCH_H7202 | 19 | #ifdef CONFIG_ARCH_H7202 |
20 | 20 | ||
21 | /* FLASH */ | 21 | /* FLASH */ |
22 | #define FLASH_VIRT 0xd0000000 | 22 | #define H720X_FLASH_VIRT 0xd0000000 |
23 | #define FLASH_PHYS 0x00000000 | 23 | #define H720X_FLASH_PHYS 0x00000000 |
24 | #define FLASH_SIZE 0x02000000 | 24 | #define H720X_FLASH_SIZE 0x02000000 |
25 | 25 | ||
26 | /* onboard LAN controller */ | 26 | /* onboard LAN controller */ |
27 | # define ETH0_PHYS 0x08000000 | 27 | # define ETH0_PHYS 0x08000000 |
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index a11765f5f23b..aff0ebcfa847 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c | |||
@@ -184,7 +184,7 @@ static int __init imx_clockevent_init(unsigned long rate) | |||
184 | clockevent_imx.min_delta_ns = | 184 | clockevent_imx.min_delta_ns = |
185 | clockevent_delta2ns(0xf, &clockevent_imx); | 185 | clockevent_delta2ns(0xf, &clockevent_imx); |
186 | 186 | ||
187 | clockevent_imx.cpumask = cpumask_of_cpu(0); | 187 | clockevent_imx.cpumask = cpumask_of(0); |
188 | 188 | ||
189 | clockevents_register_device(&clockevent_imx); | 189 | clockevents_register_device(&clockevent_imx); |
190 | 190 | ||
diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h index 028b87839c0f..e00a2624f269 100644 --- a/arch/arm/mach-integrator/include/mach/platform.h +++ b/arch/arm/mach-integrator/include/mach/platform.h | |||
@@ -408,27 +408,10 @@ | |||
408 | #define uHAL_MEMORY_SIZE INTEGRATOR_SSRAM_SIZE | 408 | #define uHAL_MEMORY_SIZE INTEGRATOR_SSRAM_SIZE |
409 | 409 | ||
410 | /* | 410 | /* |
411 | * Application Flash | ||
412 | * | ||
413 | */ | ||
414 | #define FLASH_BASE INTEGRATOR_FLASH_BASE | ||
415 | #define FLASH_SIZE INTEGRATOR_FLASH_SIZE | ||
416 | #define FLASH_END (FLASH_BASE + FLASH_SIZE - 1) | ||
417 | #define FLASH_BLOCK_SIZE SZ_128K | ||
418 | |||
419 | /* | ||
420 | * Boot Flash | ||
421 | * | ||
422 | */ | ||
423 | #define EPROM_BASE INTEGRATOR_BOOT_ROM_HI | ||
424 | #define EPROM_SIZE INTEGRATOR_BOOT_ROM_SIZE | ||
425 | #define EPROM_END (EPROM_BASE + EPROM_SIZE - 1) | ||
426 | |||
427 | /* | ||
428 | * Clean base - dummy | 411 | * Clean base - dummy |
429 | * | 412 | * |
430 | */ | 413 | */ |
431 | #define CLEAN_BASE EPROM_BASE | 414 | #define CLEAN_BASE INTEGRATOR_BOOT_ROM_HI |
432 | 415 | ||
433 | /* | 416 | /* |
434 | * Timer definitions | 417 | * Timer definitions |
diff --git a/arch/arm/mach-iop13xx/include/mach/adma.h b/arch/arm/mach-iop13xx/include/mach/adma.h index 60019c8e6465..5722e86f2174 100644 --- a/arch/arm/mach-iop13xx/include/mach/adma.h +++ b/arch/arm/mach-iop13xx/include/mach/adma.h | |||
@@ -404,7 +404,8 @@ static inline void iop_desc_set_next_desc(struct iop_adma_desc_slot *desc, | |||
404 | u32 next_desc_addr) | 404 | u32 next_desc_addr) |
405 | { | 405 | { |
406 | struct iop13xx_adma_desc_hw *hw_desc = desc->hw_desc; | 406 | struct iop13xx_adma_desc_hw *hw_desc = desc->hw_desc; |
407 | BUG_ON(hw_desc->next_desc); | 407 | |
408 | iop_paranoia(hw_desc->next_desc); | ||
408 | hw_desc->next_desc = next_desc_addr; | 409 | hw_desc->next_desc = next_desc_addr; |
409 | } | 410 | } |
410 | 411 | ||
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 7766f469456b..f4656d2ac8a8 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -487,7 +487,7 @@ static int __init ixp4xx_clockevent_init(void) | |||
487 | clockevent_delta2ns(0xfffffffe, &clockevent_ixp4xx); | 487 | clockevent_delta2ns(0xfffffffe, &clockevent_ixp4xx); |
488 | clockevent_ixp4xx.min_delta_ns = | 488 | clockevent_ixp4xx.min_delta_ns = |
489 | clockevent_delta2ns(0xf, &clockevent_ixp4xx); | 489 | clockevent_delta2ns(0xf, &clockevent_ixp4xx); |
490 | clockevent_ixp4xx.cpumask = cpumask_of_cpu(0); | 490 | clockevent_ixp4xx.cpumask = cpumask_of(0); |
491 | 491 | ||
492 | clockevents_register_device(&clockevent_ixp4xx); | 492 | clockevents_register_device(&clockevent_ixp4xx); |
493 | return 0; | 493 | return 0; |
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 345a14cb73c3..444d9c0f5ca6 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c | |||
@@ -182,7 +182,7 @@ static void __init msm_timer_init(void) | |||
182 | clockevent_delta2ns(0xf0000000 >> clock->shift, ce); | 182 | clockevent_delta2ns(0xf0000000 >> clock->shift, ce); |
183 | /* 4 gets rounded down to 3 */ | 183 | /* 4 gets rounded down to 3 */ |
184 | ce->min_delta_ns = clockevent_delta2ns(4, ce); | 184 | ce->min_delta_ns = clockevent_delta2ns(4, ce); |
185 | ce->cpumask = cpumask_of_cpu(0); | 185 | ce->cpumask = cpumask_of(0); |
186 | 186 | ||
187 | cs->mult = clocksource_hz2mult(clock->freq, cs->shift); | 187 | cs->mult = clocksource_hz2mult(clock->freq, cs->shift); |
188 | res = clocksource_register(cs); | 188 | res = clocksource_register(cs); |
diff --git a/arch/arm/mach-ns9xxx/time-ns9360.c b/arch/arm/mach-ns9xxx/time-ns9360.c index a63424d083d9..41df69721769 100644 --- a/arch/arm/mach-ns9xxx/time-ns9360.c +++ b/arch/arm/mach-ns9xxx/time-ns9360.c | |||
@@ -173,7 +173,7 @@ static void __init ns9360_timer_init(void) | |||
173 | ns9360_clockevent_device.min_delta_ns = | 173 | ns9360_clockevent_device.min_delta_ns = |
174 | clockevent_delta2ns(1, &ns9360_clockevent_device); | 174 | clockevent_delta2ns(1, &ns9360_clockevent_device); |
175 | 175 | ||
176 | ns9360_clockevent_device.cpumask = cpumask_of_cpu(0); | 176 | ns9360_clockevent_device.cpumask = cpumask_of(0); |
177 | clockevents_register_device(&ns9360_clockevent_device); | 177 | clockevents_register_device(&ns9360_clockevent_device); |
178 | 178 | ||
179 | setup_irq(IRQ_NS9360_TIMER0 + TIMER_CLOCKEVENT, | 179 | setup_irq(IRQ_NS9360_TIMER0 + TIMER_CLOCKEVENT, |
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index b3bd8ca85118..4c3e582f3d3c 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c | |||
@@ -128,7 +128,7 @@ void __init omap1_map_common_io(void) | |||
128 | * Common low-level hardware init for omap1. This should only get called from | 128 | * Common low-level hardware init for omap1. This should only get called from |
129 | * board specific init. | 129 | * board specific init. |
130 | */ | 130 | */ |
131 | void __init omap1_init_common_hw() | 131 | void __init omap1_init_common_hw(void) |
132 | { | 132 | { |
133 | /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort | 133 | /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort |
134 | * on a Posted Write in the TIPB Bridge". | 134 | * on a Posted Write in the TIPB Bridge". |
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 2cf7e32bd293..495a32c287b4 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c | |||
@@ -173,7 +173,7 @@ static __init void omap_init_mpu_timer(unsigned long rate) | |||
173 | clockevent_mpu_timer1.min_delta_ns = | 173 | clockevent_mpu_timer1.min_delta_ns = |
174 | clockevent_delta2ns(1, &clockevent_mpu_timer1); | 174 | clockevent_delta2ns(1, &clockevent_mpu_timer1); |
175 | 175 | ||
176 | clockevent_mpu_timer1.cpumask = cpumask_of_cpu(0); | 176 | clockevent_mpu_timer1.cpumask = cpumask_of(0); |
177 | clockevents_register_device(&clockevent_mpu_timer1); | 177 | clockevents_register_device(&clockevent_mpu_timer1); |
178 | } | 178 | } |
179 | 179 | ||
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 705367ece174..fd3f7396e162 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c | |||
@@ -187,7 +187,7 @@ static __init void omap_init_32k_timer(void) | |||
187 | clockevent_32k_timer.min_delta_ns = | 187 | clockevent_32k_timer.min_delta_ns = |
188 | clockevent_delta2ns(1, &clockevent_32k_timer); | 188 | clockevent_delta2ns(1, &clockevent_32k_timer); |
189 | 189 | ||
190 | clockevent_32k_timer.cpumask = cpumask_of_cpu(0); | 190 | clockevent_32k_timer.cpumask = cpumask_of(0); |
191 | clockevents_register_device(&clockevent_32k_timer); | 191 | clockevents_register_device(&clockevent_32k_timer); |
192 | } | 192 | } |
193 | 193 | ||
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 589393bedade..ae6036300f60 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c | |||
@@ -120,7 +120,7 @@ static void __init omap2_gp_clockevent_init(void) | |||
120 | clockevent_gpt.min_delta_ns = | 120 | clockevent_gpt.min_delta_ns = |
121 | clockevent_delta2ns(1, &clockevent_gpt); | 121 | clockevent_delta2ns(1, &clockevent_gpt); |
122 | 122 | ||
123 | clockevent_gpt.cpumask = cpumask_of_cpu(0); | 123 | clockevent_gpt.cpumask = cpumask_of(0); |
124 | clockevents_register_device(&clockevent_gpt); | 124 | clockevents_register_device(&clockevent_gpt); |
125 | } | 125 | } |
126 | 126 | ||
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h index 8e591118371e..cbda4d35c421 100644 --- a/arch/arm/mach-pxa/include/mach/pxafb.h +++ b/arch/arm/mach-pxa/include/mach/pxafb.h | |||
@@ -33,6 +33,7 @@ | |||
33 | #define LCD_CONN_TYPE(_x) ((_x) & 0x0f) | 33 | #define LCD_CONN_TYPE(_x) ((_x) & 0x0f) |
34 | #define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f) | 34 | #define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f) |
35 | 35 | ||
36 | #define LCD_TYPE_MASK 0xf | ||
36 | #define LCD_TYPE_UNKNOWN 0 | 37 | #define LCD_TYPE_UNKNOWN 0 |
37 | #define LCD_TYPE_MONO_STN 1 | 38 | #define LCD_TYPE_MONO_STN 1 |
38 | #define LCD_TYPE_MONO_DSTN 2 | 39 | #define LCD_TYPE_MONO_DSTN 2 |
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h index 7b8842cfa5fc..31e6a7b6ad80 100644 --- a/arch/arm/mach-pxa/include/mach/reset.h +++ b/arch/arm/mach-pxa/include/mach/reset.h | |||
@@ -12,9 +12,8 @@ extern void clear_reset_status(unsigned int mask); | |||
12 | 12 | ||
13 | /** | 13 | /** |
14 | * init_gpio_reset() - register GPIO as reset generator | 14 | * init_gpio_reset() - register GPIO as reset generator |
15 | * | 15 | * @gpio: gpio nr |
16 | * @gpio - gpio nr | 16 | * @output: set gpio as out/low instead of input during normal work |
17 | * @output - set gpio as out/low instead of input during normal work | ||
18 | */ | 17 | */ |
19 | extern int init_gpio_reset(int gpio, int output); | 18 | extern int init_gpio_reset(int gpio, int output); |
20 | 19 | ||
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 0842c531ee4d..782903fe9c6c 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -565,7 +565,7 @@ static int mioa701_sys_suspend(struct sys_device *sysdev, pm_message_t state) | |||
565 | u32 *mem_resume_unknown = phys_to_virt(RESUME_UNKNOWN_ADDR); | 565 | u32 *mem_resume_unknown = phys_to_virt(RESUME_UNKNOWN_ADDR); |
566 | 566 | ||
567 | /* Devices prepare suspend */ | 567 | /* Devices prepare suspend */ |
568 | is_bt_on = gpio_get_value(GPIO83_BT_ON); | 568 | is_bt_on = !!gpio_get_value(GPIO83_BT_ON); |
569 | pxa2xx_mfp_set_lpm(GPIO83_BT_ON, | 569 | pxa2xx_mfp_set_lpm(GPIO83_BT_ON, |
570 | is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW); | 570 | is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW); |
571 | 571 | ||
diff --git a/arch/arm/mach-pxa/mioa701_bootresume.S b/arch/arm/mach-pxa/mioa701_bootresume.S index a647693d9856..324d25a48c85 100644 --- a/arch/arm/mach-pxa/mioa701_bootresume.S +++ b/arch/arm/mach-pxa/mioa701_bootresume.S | |||
@@ -24,6 +24,7 @@ ENTRY(mioa701_jumpaddr) | |||
24 | 1: | 24 | 1: |
25 | mov r0, #0xa0000000 @ Don't suppose memory access works | 25 | mov r0, #0xa0000000 @ Don't suppose memory access works |
26 | orr r0, r0, #0x00200000 @ even if it's supposed to | 26 | orr r0, r0, #0x00200000 @ even if it's supposed to |
27 | orr r0, r0, #0x0000b000 | ||
27 | mov r1, #0 | 28 | mov r1, #0 |
28 | str r1, [r0] @ Early disable resume for next boot | 29 | str r1, [r0] @ Early disable resume for next boot |
29 | ldr r0, mioa701_jumpaddr @ (Murphy's Law) | 30 | ldr r0, mioa701_jumpaddr @ (Murphy's Law) |
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 4447711c9fc6..a9d94f5dbec4 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
@@ -56,6 +56,9 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
56 | GPIO110_MMC_DAT_2, | 56 | GPIO110_MMC_DAT_2, |
57 | GPIO111_MMC_DAT_3, | 57 | GPIO111_MMC_DAT_3, |
58 | GPIO112_MMC_CMD, | 58 | GPIO112_MMC_CMD, |
59 | GPIO14_GPIO, /* SD detect */ | ||
60 | GPIO114_GPIO, /* SD power */ | ||
61 | GPIO115_GPIO, /* SD r/o switch */ | ||
59 | 62 | ||
60 | /* AC97 */ | 63 | /* AC97 */ |
61 | GPIO28_AC97_BITCLK, | 64 | GPIO28_AC97_BITCLK, |
@@ -64,6 +67,7 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
64 | GPIO31_AC97_SYNC, | 67 | GPIO31_AC97_SYNC, |
65 | 68 | ||
66 | /* IrDA */ | 69 | /* IrDA */ |
70 | GPIO40_GPIO, /* ir disable */ | ||
67 | GPIO46_FICP_RXD, | 71 | GPIO46_FICP_RXD, |
68 | GPIO47_FICP_TXD, | 72 | GPIO47_FICP_TXD, |
69 | 73 | ||
@@ -71,7 +75,8 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
71 | GPIO16_PWM0_OUT, | 75 | GPIO16_PWM0_OUT, |
72 | 76 | ||
73 | /* USB */ | 77 | /* USB */ |
74 | GPIO13_GPIO, | 78 | GPIO13_GPIO, /* usb detect */ |
79 | GPIO95_GPIO, /* usb power */ | ||
75 | 80 | ||
76 | /* PCMCIA */ | 81 | /* PCMCIA */ |
77 | GPIO48_nPOE, | 82 | GPIO48_nPOE, |
@@ -84,6 +89,45 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
84 | GPIO55_nPREG, | 89 | GPIO55_nPREG, |
85 | GPIO56_nPWAIT, | 90 | GPIO56_nPWAIT, |
86 | GPIO57_nIOIS16, | 91 | GPIO57_nIOIS16, |
92 | GPIO94_GPIO, /* wifi power 1 */ | ||
93 | GPIO108_GPIO, /* wifi power 2 */ | ||
94 | GPIO116_GPIO, /* wifi ready */ | ||
95 | |||
96 | /* MATRIX KEYPAD */ | ||
97 | GPIO100_KP_MKIN_0, | ||
98 | GPIO101_KP_MKIN_1, | ||
99 | GPIO102_KP_MKIN_2, | ||
100 | GPIO97_KP_MKIN_3, | ||
101 | GPIO103_KP_MKOUT_0, | ||
102 | GPIO104_KP_MKOUT_1, | ||
103 | GPIO105_KP_MKOUT_2, | ||
104 | |||
105 | /* LCD */ | ||
106 | GPIO58_LCD_LDD_0, | ||
107 | GPIO59_LCD_LDD_1, | ||
108 | GPIO60_LCD_LDD_2, | ||
109 | GPIO61_LCD_LDD_3, | ||
110 | GPIO62_LCD_LDD_4, | ||
111 | GPIO63_LCD_LDD_5, | ||
112 | GPIO64_LCD_LDD_6, | ||
113 | GPIO65_LCD_LDD_7, | ||
114 | GPIO66_LCD_LDD_8, | ||
115 | GPIO67_LCD_LDD_9, | ||
116 | GPIO68_LCD_LDD_10, | ||
117 | GPIO69_LCD_LDD_11, | ||
118 | GPIO70_LCD_LDD_12, | ||
119 | GPIO71_LCD_LDD_13, | ||
120 | GPIO72_LCD_LDD_14, | ||
121 | GPIO73_LCD_LDD_15, | ||
122 | GPIO74_LCD_FCLK, | ||
123 | GPIO75_LCD_LCLK, | ||
124 | GPIO76_LCD_PCLK, | ||
125 | GPIO77_LCD_BIAS, | ||
126 | |||
127 | /* MISC. */ | ||
128 | GPIO10_GPIO, /* hotsync button */ | ||
129 | GPIO12_GPIO, /* power detect */ | ||
130 | GPIO107_GPIO, /* earphone detect */ | ||
87 | }; | 131 | }; |
88 | 132 | ||
89 | /****************************************************************************** | 133 | /****************************************************************************** |
@@ -95,32 +139,49 @@ static int palmtx_mci_init(struct device *dev, irq_handler_t palmtx_detect_int, | |||
95 | int err = 0; | 139 | int err = 0; |
96 | 140 | ||
97 | /* Setup an interrupt for detecting card insert/remove events */ | 141 | /* Setup an interrupt for detecting card insert/remove events */ |
98 | err = request_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, palmtx_detect_int, | 142 | err = gpio_request(GPIO_NR_PALMTX_SD_DETECT_N, "SD IRQ"); |
99 | IRQF_DISABLED | IRQF_SAMPLE_RANDOM | | 143 | if (err) |
144 | goto err; | ||
145 | err = gpio_direction_input(GPIO_NR_PALMTX_SD_DETECT_N); | ||
146 | if (err) | ||
147 | goto err2; | ||
148 | err = request_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), | ||
149 | palmtx_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM | | ||
100 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, | 150 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, |
101 | "SD/MMC card detect", data); | 151 | "SD/MMC card detect", data); |
102 | if (err) { | 152 | if (err) { |
103 | printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n", | 153 | printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n", |
104 | __func__); | 154 | __func__); |
105 | return err; | 155 | goto err2; |
106 | } | 156 | } |
107 | 157 | ||
108 | err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER"); | 158 | err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER"); |
109 | if (err) | 159 | if (err) |
110 | goto pwr_err; | 160 | goto err3; |
161 | err = gpio_direction_output(GPIO_NR_PALMTX_SD_POWER, 0); | ||
162 | if (err) | ||
163 | goto err4; | ||
111 | 164 | ||
112 | err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY"); | 165 | err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY"); |
113 | if (err) | 166 | if (err) |
114 | goto ro_err; | 167 | goto err4; |
168 | err = gpio_direction_input(GPIO_NR_PALMTX_SD_READONLY); | ||
169 | if (err) | ||
170 | goto err5; | ||
115 | 171 | ||
116 | printk(KERN_DEBUG "%s: irq registered\n", __func__); | 172 | printk(KERN_DEBUG "%s: irq registered\n", __func__); |
117 | 173 | ||
118 | return 0; | 174 | return 0; |
119 | 175 | ||
120 | ro_err: | 176 | err5: |
177 | gpio_free(GPIO_NR_PALMTX_SD_READONLY); | ||
178 | err4: | ||
121 | gpio_free(GPIO_NR_PALMTX_SD_POWER); | 179 | gpio_free(GPIO_NR_PALMTX_SD_POWER); |
122 | pwr_err: | 180 | err3: |
123 | free_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, data); | 181 | free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data); |
182 | err2: | ||
183 | gpio_free(GPIO_NR_PALMTX_SD_DETECT_N); | ||
184 | err: | ||
124 | return err; | 185 | return err; |
125 | } | 186 | } |
126 | 187 | ||
@@ -128,7 +189,8 @@ static void palmtx_mci_exit(struct device *dev, void *data) | |||
128 | { | 189 | { |
129 | gpio_free(GPIO_NR_PALMTX_SD_READONLY); | 190 | gpio_free(GPIO_NR_PALMTX_SD_READONLY); |
130 | gpio_free(GPIO_NR_PALMTX_SD_POWER); | 191 | gpio_free(GPIO_NR_PALMTX_SD_POWER); |
131 | free_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, data); | 192 | free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data); |
193 | gpio_free(GPIO_NR_PALMTX_SD_DETECT_N); | ||
132 | } | 194 | } |
133 | 195 | ||
134 | static void palmtx_mci_power(struct device *dev, unsigned int vdd) | 196 | static void palmtx_mci_power(struct device *dev, unsigned int vdd) |
@@ -167,7 +229,6 @@ static unsigned int palmtx_matrix_keys[] = { | |||
167 | 229 | ||
168 | KEY(3, 0, KEY_RIGHT), | 230 | KEY(3, 0, KEY_RIGHT), |
169 | KEY(3, 2, KEY_LEFT), | 231 | KEY(3, 2, KEY_LEFT), |
170 | |||
171 | }; | 232 | }; |
172 | 233 | ||
173 | static struct pxa27x_keypad_platform_data palmtx_keypad_platform_data = { | 234 | static struct pxa27x_keypad_platform_data palmtx_keypad_platform_data = { |
@@ -209,11 +270,19 @@ static int palmtx_backlight_init(struct device *dev) | |||
209 | ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER"); | 270 | ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER"); |
210 | if (ret) | 271 | if (ret) |
211 | goto err; | 272 | goto err; |
273 | ret = gpio_direction_output(GPIO_NR_PALMTX_BL_POWER, 0); | ||
274 | if (ret) | ||
275 | goto err2; | ||
212 | ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER"); | 276 | ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER"); |
213 | if (ret) | 277 | if (ret) |
214 | goto err2; | 278 | goto err2; |
279 | ret = gpio_direction_output(GPIO_NR_PALMTX_LCD_POWER, 0); | ||
280 | if (ret) | ||
281 | goto err3; | ||
215 | 282 | ||
216 | return 0; | 283 | return 0; |
284 | err3: | ||
285 | gpio_free(GPIO_NR_PALMTX_LCD_POWER); | ||
217 | err2: | 286 | err2: |
218 | gpio_free(GPIO_NR_PALMTX_BL_POWER); | 287 | gpio_free(GPIO_NR_PALMTX_BL_POWER); |
219 | err: | 288 | err: |
@@ -254,6 +323,24 @@ static struct platform_device palmtx_backlight = { | |||
254 | /****************************************************************************** | 323 | /****************************************************************************** |
255 | * IrDA | 324 | * IrDA |
256 | ******************************************************************************/ | 325 | ******************************************************************************/ |
326 | static int palmtx_irda_startup(struct device *dev) | ||
327 | { | ||
328 | int err; | ||
329 | err = gpio_request(GPIO_NR_PALMTX_IR_DISABLE, "IR DISABLE"); | ||
330 | if (err) | ||
331 | goto err; | ||
332 | err = gpio_direction_output(GPIO_NR_PALMTX_IR_DISABLE, 1); | ||
333 | if (err) | ||
334 | gpio_free(GPIO_NR_PALMTX_IR_DISABLE); | ||
335 | err: | ||
336 | return err; | ||
337 | } | ||
338 | |||
339 | static void palmtx_irda_shutdown(struct device *dev) | ||
340 | { | ||
341 | gpio_free(GPIO_NR_PALMTX_IR_DISABLE); | ||
342 | } | ||
343 | |||
257 | static void palmtx_irda_transceiver_mode(struct device *dev, int mode) | 344 | static void palmtx_irda_transceiver_mode(struct device *dev, int mode) |
258 | { | 345 | { |
259 | gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF); | 346 | gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF); |
@@ -261,6 +348,8 @@ static void palmtx_irda_transceiver_mode(struct device *dev, int mode) | |||
261 | } | 348 | } |
262 | 349 | ||
263 | static struct pxaficp_platform_data palmtx_ficp_platform_data = { | 350 | static struct pxaficp_platform_data palmtx_ficp_platform_data = { |
351 | .startup = palmtx_irda_startup, | ||
352 | .shutdown = palmtx_irda_shutdown, | ||
264 | .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, | 353 | .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, |
265 | .transceiver_mode = palmtx_irda_transceiver_mode, | 354 | .transceiver_mode = palmtx_irda_transceiver_mode, |
266 | }; | 355 | }; |
@@ -268,17 +357,11 @@ static struct pxaficp_platform_data palmtx_ficp_platform_data = { | |||
268 | /****************************************************************************** | 357 | /****************************************************************************** |
269 | * UDC | 358 | * UDC |
270 | ******************************************************************************/ | 359 | ******************************************************************************/ |
271 | static void palmtx_udc_command(int cmd) | ||
272 | { | ||
273 | gpio_set_value(GPIO_NR_PALMTX_USB_POWER, !cmd); | ||
274 | udelay(50); | ||
275 | gpio_set_value(GPIO_NR_PALMTX_USB_PULLUP, !cmd); | ||
276 | } | ||
277 | |||
278 | static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = { | 360 | static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = { |
279 | .gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N, | 361 | .gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N, |
280 | .gpio_vbus_inverted = 1, | 362 | .gpio_vbus_inverted = 1, |
281 | .udc_command = palmtx_udc_command, | 363 | .gpio_pullup = GPIO_NR_PALMTX_USB_POWER, |
364 | .gpio_pullup_inverted = 0, | ||
282 | }; | 365 | }; |
283 | 366 | ||
284 | /****************************************************************************** | 367 | /****************************************************************************** |
@@ -290,17 +373,16 @@ static int power_supply_init(struct device *dev) | |||
290 | 373 | ||
291 | ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC"); | 374 | ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC"); |
292 | if (ret) | 375 | if (ret) |
293 | goto err_cs_ac; | 376 | goto err1; |
294 | 377 | ret = gpio_direction_input(GPIO_NR_PALMTX_POWER_DETECT); | |
295 | ret = gpio_request(GPIO_NR_PALMTX_USB_DETECT_N, "CABLE_STATE_USB"); | ||
296 | if (ret) | 378 | if (ret) |
297 | goto err_cs_usb; | 379 | goto err2; |
298 | 380 | ||
299 | return 0; | 381 | return 0; |
300 | 382 | ||
301 | err_cs_usb: | 383 | err2: |
302 | gpio_free(GPIO_NR_PALMTX_POWER_DETECT); | 384 | gpio_free(GPIO_NR_PALMTX_POWER_DETECT); |
303 | err_cs_ac: | 385 | err1: |
304 | return ret; | 386 | return ret; |
305 | } | 387 | } |
306 | 388 | ||
@@ -309,14 +391,8 @@ static int palmtx_is_ac_online(void) | |||
309 | return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT); | 391 | return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT); |
310 | } | 392 | } |
311 | 393 | ||
312 | static int palmtx_is_usb_online(void) | ||
313 | { | ||
314 | return !gpio_get_value(GPIO_NR_PALMTX_USB_DETECT_N); | ||
315 | } | ||
316 | |||
317 | static void power_supply_exit(struct device *dev) | 394 | static void power_supply_exit(struct device *dev) |
318 | { | 395 | { |
319 | gpio_free(GPIO_NR_PALMTX_USB_DETECT_N); | ||
320 | gpio_free(GPIO_NR_PALMTX_POWER_DETECT); | 396 | gpio_free(GPIO_NR_PALMTX_POWER_DETECT); |
321 | } | 397 | } |
322 | 398 | ||
@@ -327,7 +403,6 @@ static char *palmtx_supplicants[] = { | |||
327 | static struct pda_power_pdata power_supply_info = { | 403 | static struct pda_power_pdata power_supply_info = { |
328 | .init = power_supply_init, | 404 | .init = power_supply_init, |
329 | .is_ac_online = palmtx_is_ac_online, | 405 | .is_ac_online = palmtx_is_ac_online, |
330 | .is_usb_online = palmtx_is_usb_online, | ||
331 | .exit = power_supply_exit, | 406 | .exit = power_supply_exit, |
332 | .supplied_to = palmtx_supplicants, | 407 | .supplied_to = palmtx_supplicants, |
333 | .num_supplicants = ARRAY_SIZE(palmtx_supplicants), | 408 | .num_supplicants = ARRAY_SIZE(palmtx_supplicants), |
@@ -410,12 +485,23 @@ static void __init palmtx_map_io(void) | |||
410 | iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc)); | 485 | iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc)); |
411 | } | 486 | } |
412 | 487 | ||
488 | /* setup udc GPIOs initial state */ | ||
489 | static void __init palmtx_udc_init(void) | ||
490 | { | ||
491 | if (!gpio_request(GPIO_NR_PALMTX_USB_POWER, "UDC Vbus")) { | ||
492 | gpio_direction_output(GPIO_NR_PALMTX_USB_POWER, 1); | ||
493 | gpio_free(GPIO_NR_PALMTX_USB_POWER); | ||
494 | } | ||
495 | } | ||
496 | |||
497 | |||
413 | static void __init palmtx_init(void) | 498 | static void __init palmtx_init(void) |
414 | { | 499 | { |
415 | pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config)); | 500 | pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config)); |
416 | 501 | ||
417 | set_pxa_fb_info(&palmtx_lcd_screen); | 502 | set_pxa_fb_info(&palmtx_lcd_screen); |
418 | pxa_set_mci_info(&palmtx_mci_platform_data); | 503 | pxa_set_mci_info(&palmtx_mci_platform_data); |
504 | palmtx_udc_init(); | ||
419 | pxa_set_udc_info(&palmtx_udc_info); | 505 | pxa_set_udc_info(&palmtx_udc_info); |
420 | pxa_set_ac97_info(NULL); | 506 | pxa_set_ac97_info(NULL); |
421 | pxa_set_ficp_info(&palmtx_ficp_platform_data); | 507 | pxa_set_ficp_info(&palmtx_ficp_platform_data); |
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index f601425f1b1e..b36cec5c9eed 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
@@ -385,6 +385,7 @@ static struct soc_camera_link iclink[] = { | |||
385 | .gpio = NR_BUILTIN_GPIO + 1, | 385 | .gpio = NR_BUILTIN_GPIO + 1, |
386 | }, { | 386 | }, { |
387 | .bus_id = 0, /* Must match with the camera ID above */ | 387 | .bus_id = 0, /* Must match with the camera ID above */ |
388 | .gpio = -ENXIO, | ||
388 | } | 389 | } |
389 | }; | 390 | }; |
390 | 391 | ||
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index 1b2af575c40f..00b2dc2a1074 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c | |||
@@ -90,12 +90,13 @@ void arch_reset(char mode) | |||
90 | /* Jump into ROM at address 0 */ | 90 | /* Jump into ROM at address 0 */ |
91 | cpu_reset(0); | 91 | cpu_reset(0); |
92 | break; | 92 | break; |
93 | case 'h': | ||
94 | do_hw_reset(); | ||
95 | break; | ||
96 | case 'g': | 93 | case 'g': |
97 | do_gpio_reset(); | 94 | do_gpio_reset(); |
98 | break; | 95 | break; |
96 | case 'h': | ||
97 | default: | ||
98 | do_hw_reset(); | ||
99 | break; | ||
99 | } | 100 | } |
100 | } | 101 | } |
101 | 102 | ||
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index f0a5bbae0b45..3be76ee2bdbf 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -67,6 +67,7 @@ | |||
67 | static unsigned long spitz_pin_config[] __initdata = { | 67 | static unsigned long spitz_pin_config[] __initdata = { |
68 | /* Chip Selects */ | 68 | /* Chip Selects */ |
69 | GPIO78_nCS_2, /* SCOOP #2 */ | 69 | GPIO78_nCS_2, /* SCOOP #2 */ |
70 | GPIO79_nCS_3, /* NAND */ | ||
70 | GPIO80_nCS_4, /* SCOOP #1 */ | 71 | GPIO80_nCS_4, /* SCOOP #1 */ |
71 | 72 | ||
72 | /* LCD - 16bpp Active TFT */ | 73 | /* LCD - 16bpp Active TFT */ |
@@ -97,10 +98,10 @@ static unsigned long spitz_pin_config[] __initdata = { | |||
97 | GPIO51_nPIOW, | 98 | GPIO51_nPIOW, |
98 | GPIO85_nPCE_1, | 99 | GPIO85_nPCE_1, |
99 | GPIO54_nPCE_2, | 100 | GPIO54_nPCE_2, |
100 | GPIO79_PSKTSEL, | ||
101 | GPIO55_nPREG, | 101 | GPIO55_nPREG, |
102 | GPIO56_nPWAIT, | 102 | GPIO56_nPWAIT, |
103 | GPIO57_nIOIS16, | 103 | GPIO57_nIOIS16, |
104 | GPIO104_PSKTSEL, | ||
104 | 105 | ||
105 | /* MMC */ | 106 | /* MMC */ |
106 | GPIO32_MMC_CLK, | 107 | GPIO32_MMC_CLK, |
@@ -686,7 +687,6 @@ static void __init akita_init(void) | |||
686 | spitz_pcmcia_config.num_devs = 1; | 687 | spitz_pcmcia_config.num_devs = 1; |
687 | platform_scoop_config = &spitz_pcmcia_config; | 688 | platform_scoop_config = &spitz_pcmcia_config; |
688 | 689 | ||
689 | pxa_set_i2c_info(NULL); | ||
690 | i2c_register_board_info(0, ARRAY_AND_SIZE(akita_i2c_board_info)); | 690 | i2c_register_board_info(0, ARRAY_AND_SIZE(akita_i2c_board_info)); |
691 | 691 | ||
692 | common_init(); | 692 | common_init(); |
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index f8a9a62959e5..bf3c9a4aad50 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -122,7 +122,6 @@ static struct clock_event_device ckevt_pxa_osmr0 = { | |||
122 | .features = CLOCK_EVT_FEAT_ONESHOT, | 122 | .features = CLOCK_EVT_FEAT_ONESHOT, |
123 | .shift = 32, | 123 | .shift = 32, |
124 | .rating = 200, | 124 | .rating = 200, |
125 | .cpumask = CPU_MASK_CPU0, | ||
126 | .set_next_event = pxa_osmr0_set_next_event, | 125 | .set_next_event = pxa_osmr0_set_next_event, |
127 | .set_mode = pxa_osmr0_set_mode, | 126 | .set_mode = pxa_osmr0_set_mode, |
128 | }; | 127 | }; |
@@ -170,6 +169,7 @@ static void __init pxa_timer_init(void) | |||
170 | clockevent_delta2ns(0x7fffffff, &ckevt_pxa_osmr0); | 169 | clockevent_delta2ns(0x7fffffff, &ckevt_pxa_osmr0); |
171 | ckevt_pxa_osmr0.min_delta_ns = | 170 | ckevt_pxa_osmr0.min_delta_ns = |
172 | clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_pxa_osmr0) + 1; | 171 | clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_pxa_osmr0) + 1; |
172 | ckevt_pxa_osmr0.cpumask = cpumask_of(0); | ||
173 | 173 | ||
174 | cksrc_pxa_oscr0.mult = | 174 | cksrc_pxa_oscr0.mult = |
175 | clocksource_hz2mult(clock_tick_rate, cksrc_pxa_oscr0.shift); | 175 | clocksource_hz2mult(clock_tick_rate, cksrc_pxa_oscr0.shift); |
diff --git a/arch/arm/mach-realview/clock.c b/arch/arm/mach-realview/clock.c index 3e706c57833a..3347c4236a60 100644 --- a/arch/arm/mach-realview/clock.c +++ b/arch/arm/mach-realview/clock.c | |||
@@ -104,7 +104,7 @@ static struct clk uart_clk = { | |||
104 | 104 | ||
105 | static struct clk mmci_clk = { | 105 | static struct clk mmci_clk = { |
106 | .name = "MCLK", | 106 | .name = "MCLK", |
107 | .rate = 33000000, | 107 | .rate = 24000000, |
108 | }; | 108 | }; |
109 | 109 | ||
110 | int clk_register(struct clk *clk) | 110 | int clk_register(struct clk *clk) |
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 2f04d54711e7..b07cb9b7adb1 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -511,7 +511,7 @@ static struct clock_event_device timer0_clockevent = { | |||
511 | .set_mode = timer_set_mode, | 511 | .set_mode = timer_set_mode, |
512 | .set_next_event = timer_set_next_event, | 512 | .set_next_event = timer_set_next_event, |
513 | .rating = 300, | 513 | .rating = 300, |
514 | .cpumask = CPU_MASK_ALL, | 514 | .cpumask = cpu_all_mask, |
515 | }; | 515 | }; |
516 | 516 | ||
517 | static void __init realview_clockevents_init(unsigned int timer_irq) | 517 | static void __init realview_clockevents_init(unsigned int timer_irq) |
diff --git a/arch/arm/mach-realview/include/mach/platform.h b/arch/arm/mach-realview/include/mach/platform.h index 4034b54950c2..793a3a332712 100644 --- a/arch/arm/mach-realview/include/mach/platform.h +++ b/arch/arm/mach-realview/include/mach/platform.h | |||
@@ -239,27 +239,10 @@ | |||
239 | #define REALVIEW_DECODE_OFFSET 0xC /* Fitted logic modules */ | 239 | #define REALVIEW_DECODE_OFFSET 0xC /* Fitted logic modules */ |
240 | 240 | ||
241 | /* | 241 | /* |
242 | * Application Flash | ||
243 | * | ||
244 | */ | ||
245 | #define FLASH_BASE REALVIEW_FLASH_BASE | ||
246 | #define FLASH_SIZE REALVIEW_FLASH_SIZE | ||
247 | #define FLASH_END (FLASH_BASE + FLASH_SIZE - 1) | ||
248 | #define FLASH_BLOCK_SIZE SZ_128K | ||
249 | |||
250 | /* | ||
251 | * Boot Flash | ||
252 | * | ||
253 | */ | ||
254 | #define EPROM_BASE REALVIEW_BOOT_ROM_HI | ||
255 | #define EPROM_SIZE REALVIEW_BOOT_ROM_SIZE | ||
256 | #define EPROM_END (EPROM_BASE + EPROM_SIZE - 1) | ||
257 | |||
258 | /* | ||
259 | * Clean base - dummy | 242 | * Clean base - dummy |
260 | * | 243 | * |
261 | */ | 244 | */ |
262 | #define CLEAN_BASE EPROM_BASE | 245 | #define CLEAN_BASE REALVIEW_BOOT_ROM_HI |
263 | 246 | ||
264 | /* | 247 | /* |
265 | * System controller bit assignment | 248 | * System controller bit assignment |
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c index 44d178cd5733..504961ef343c 100644 --- a/arch/arm/mach-realview/localtimer.c +++ b/arch/arm/mach-realview/localtimer.c | |||
@@ -161,7 +161,7 @@ void __cpuinit local_timer_setup(unsigned int cpu) | |||
161 | clk->set_mode = local_timer_set_mode; | 161 | clk->set_mode = local_timer_set_mode; |
162 | clk->set_next_event = local_timer_set_next_event; | 162 | clk->set_next_event = local_timer_set_next_event; |
163 | clk->irq = IRQ_LOCALTIMER; | 163 | clk->irq = IRQ_LOCALTIMER; |
164 | clk->cpumask = cpumask_of_cpu(cpu); | 164 | clk->cpumask = cpumask_of(cpu); |
165 | clk->shift = 20; | 165 | clk->shift = 20; |
166 | clk->mult = div_sc(mpcore_timer_rate, NSEC_PER_SEC, clk->shift); | 166 | clk->mult = div_sc(mpcore_timer_rate, NSEC_PER_SEC, clk->shift); |
167 | clk->max_delta_ns = clockevent_delta2ns(0xffffffff, clk); | 167 | clk->max_delta_ns = clockevent_delta2ns(0xffffffff, clk); |
@@ -199,7 +199,7 @@ void __cpuinit local_timer_setup(unsigned int cpu) | |||
199 | clk->rating = 200; | 199 | clk->rating = 200; |
200 | clk->set_mode = dummy_timer_set_mode; | 200 | clk->set_mode = dummy_timer_set_mode; |
201 | clk->broadcast = smp_timer_broadcast; | 201 | clk->broadcast = smp_timer_broadcast; |
202 | clk->cpumask = cpumask_of_cpu(cpu); | 202 | clk->cpumask = cpumask_of(cpu); |
203 | 203 | ||
204 | clockevents_register_device(clk); | 204 | clockevents_register_device(clk); |
205 | } | 205 | } |
diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h index 3fe8be9ca110..980a099e209c 100644 --- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h | |||
@@ -18,6 +18,7 @@ struct s3c2410_spigpio_info { | |||
18 | unsigned long pin_mosi; | 18 | unsigned long pin_mosi; |
19 | unsigned long pin_miso; | 19 | unsigned long pin_miso; |
20 | 20 | ||
21 | int num_chipselect; | ||
21 | int bus_num; | 22 | int bus_num; |
22 | 23 | ||
23 | void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs); | 24 | void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs); |
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 24c0a4bae850..1cac4ac0b4b8 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c | |||
@@ -73,7 +73,6 @@ static struct clock_event_device ckevt_sa1100_osmr0 = { | |||
73 | .features = CLOCK_EVT_FEAT_ONESHOT, | 73 | .features = CLOCK_EVT_FEAT_ONESHOT, |
74 | .shift = 32, | 74 | .shift = 32, |
75 | .rating = 200, | 75 | .rating = 200, |
76 | .cpumask = CPU_MASK_CPU0, | ||
77 | .set_next_event = sa1100_osmr0_set_next_event, | 76 | .set_next_event = sa1100_osmr0_set_next_event, |
78 | .set_mode = sa1100_osmr0_set_mode, | 77 | .set_mode = sa1100_osmr0_set_mode, |
79 | }; | 78 | }; |
@@ -110,6 +109,7 @@ static void __init sa1100_timer_init(void) | |||
110 | clockevent_delta2ns(0x7fffffff, &ckevt_sa1100_osmr0); | 109 | clockevent_delta2ns(0x7fffffff, &ckevt_sa1100_osmr0); |
111 | ckevt_sa1100_osmr0.min_delta_ns = | 110 | ckevt_sa1100_osmr0.min_delta_ns = |
112 | clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_sa1100_osmr0) + 1; | 111 | clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_sa1100_osmr0) + 1; |
112 | ckevt_sa1100_osmr0.cpumask = cpumask_of(0); | ||
113 | 113 | ||
114 | cksrc_sa1100_oscr.mult = | 114 | cksrc_sa1100_oscr.mult = |
115 | clocksource_hz2mult(CLOCK_TICK_RATE, cksrc_sa1100_oscr.shift); | 115 | clocksource_hz2mult(CLOCK_TICK_RATE, cksrc_sa1100_oscr.shift); |
diff --git a/arch/arm/mach-versatile/clock.c b/arch/arm/mach-versatile/clock.c index 9336508ec0b2..58937f1fb38c 100644 --- a/arch/arm/mach-versatile/clock.c +++ b/arch/arm/mach-versatile/clock.c | |||
@@ -105,7 +105,7 @@ static struct clk uart_clk = { | |||
105 | 105 | ||
106 | static struct clk mmci_clk = { | 106 | static struct clk mmci_clk = { |
107 | .name = "MCLK", | 107 | .name = "MCLK", |
108 | .rate = 33000000, | 108 | .rate = 24000000, |
109 | }; | 109 | }; |
110 | 110 | ||
111 | int clk_register(struct clk *clk) | 111 | int clk_register(struct clk *clk) |
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 565e0ba0d67e..a3f1933434e2 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -965,7 +965,7 @@ static void __init versatile_timer_init(void) | |||
965 | timer0_clockevent.min_delta_ns = | 965 | timer0_clockevent.min_delta_ns = |
966 | clockevent_delta2ns(0xf, &timer0_clockevent); | 966 | clockevent_delta2ns(0xf, &timer0_clockevent); |
967 | 967 | ||
968 | timer0_clockevent.cpumask = cpumask_of_cpu(0); | 968 | timer0_clockevent.cpumask = cpumask_of(0); |
969 | clockevents_register_device(&timer0_clockevent); | 969 | clockevents_register_device(&timer0_clockevent); |
970 | } | 970 | } |
971 | 971 | ||
diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/arch/arm/mach-versatile/include/mach/platform.h index 27cbe6a3f220..f91ba930ca8a 100644 --- a/arch/arm/mach-versatile/include/mach/platform.h +++ b/arch/arm/mach-versatile/include/mach/platform.h | |||
@@ -436,28 +436,12 @@ | |||
436 | #define SIC_INTMASK_PCI1 (1 << SIC_INT_PCI1) | 436 | #define SIC_INTMASK_PCI1 (1 << SIC_INT_PCI1) |
437 | #define SIC_INTMASK_PCI2 (1 << SIC_INT_PCI2) | 437 | #define SIC_INTMASK_PCI2 (1 << SIC_INT_PCI2) |
438 | #define SIC_INTMASK_PCI3 (1 << SIC_INT_PCI3) | 438 | #define SIC_INTMASK_PCI3 (1 << SIC_INT_PCI3) |
439 | /* | ||
440 | * Application Flash | ||
441 | * | ||
442 | */ | ||
443 | #define FLASH_BASE VERSATILE_FLASH_BASE | ||
444 | #define FLASH_SIZE VERSATILE_FLASH_SIZE | ||
445 | #define FLASH_END (FLASH_BASE + FLASH_SIZE - 1) | ||
446 | #define FLASH_BLOCK_SIZE SZ_128K | ||
447 | |||
448 | /* | ||
449 | * Boot Flash | ||
450 | * | ||
451 | */ | ||
452 | #define EPROM_BASE VERSATILE_BOOT_ROM_HI | ||
453 | #define EPROM_SIZE VERSATILE_BOOT_ROM_SIZE | ||
454 | #define EPROM_END (EPROM_BASE + EPROM_SIZE - 1) | ||
455 | 439 | ||
456 | /* | 440 | /* |
457 | * Clean base - dummy | 441 | * Clean base - dummy |
458 | * | 442 | * |
459 | */ | 443 | */ |
460 | #define CLEAN_BASE EPROM_BASE | 444 | #define CLEAN_BASE VERSATILE_BOOT_ROM_HI |
461 | 445 | ||
462 | /* | 446 | /* |
463 | * System controller bit assignment | 447 | * System controller bit assignment |
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 133e65d166b3..2d5884ce0435 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
@@ -70,6 +70,10 @@ static unsigned long ai_dword; | |||
70 | static unsigned long ai_multi; | 70 | static unsigned long ai_multi; |
71 | static int ai_usermode; | 71 | static int ai_usermode; |
72 | 72 | ||
73 | #define UM_WARN (1 << 0) | ||
74 | #define UM_FIXUP (1 << 1) | ||
75 | #define UM_SIGNAL (1 << 2) | ||
76 | |||
73 | #ifdef CONFIG_PROC_FS | 77 | #ifdef CONFIG_PROC_FS |
74 | static const char *usermode_action[] = { | 78 | static const char *usermode_action[] = { |
75 | "ignored", | 79 | "ignored", |
@@ -754,7 +758,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
754 | user: | 758 | user: |
755 | ai_user += 1; | 759 | ai_user += 1; |
756 | 760 | ||
757 | if (ai_usermode & 1) | 761 | if (ai_usermode & UM_WARN) |
758 | printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx " | 762 | printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx " |
759 | "Address=0x%08lx FSR 0x%03x\n", current->comm, | 763 | "Address=0x%08lx FSR 0x%03x\n", current->comm, |
760 | task_pid_nr(current), instrptr, | 764 | task_pid_nr(current), instrptr, |
@@ -762,10 +766,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
762 | thumb_mode(regs) ? tinstr : instr, | 766 | thumb_mode(regs) ? tinstr : instr, |
763 | addr, fsr); | 767 | addr, fsr); |
764 | 768 | ||
765 | if (ai_usermode & 2) | 769 | if (ai_usermode & UM_FIXUP) |
766 | goto fixup; | 770 | goto fixup; |
767 | 771 | ||
768 | if (ai_usermode & 4) | 772 | if (ai_usermode & UM_SIGNAL) |
769 | force_sig(SIGBUS, current); | 773 | force_sig(SIGBUS, current); |
770 | else | 774 | else |
771 | set_cr(cr_no_alignment); | 775 | set_cr(cr_no_alignment); |
@@ -796,6 +800,22 @@ static int __init alignment_init(void) | |||
796 | res->write_proc = proc_alignment_write; | 800 | res->write_proc = proc_alignment_write; |
797 | #endif | 801 | #endif |
798 | 802 | ||
803 | /* | ||
804 | * ARMv6 and later CPUs can perform unaligned accesses for | ||
805 | * most single load and store instructions up to word size. | ||
806 | * LDM, STM, LDRD and STRD still need to be handled. | ||
807 | * | ||
808 | * Ignoring the alignment fault is not an option on these | ||
809 | * CPUs since we spin re-faulting the instruction without | ||
810 | * making any progress. | ||
811 | */ | ||
812 | if (cpu_architecture() >= CPU_ARCH_ARMv6 && (cr_alignment & CR_U)) { | ||
813 | cr_alignment &= ~CR_A; | ||
814 | cr_no_alignment &= ~CR_A; | ||
815 | set_cr(cr_alignment); | ||
816 | ai_usermode = UM_FIXUP; | ||
817 | } | ||
818 | |||
799 | hook_fault_code(1, do_alignment, SIGILL, "alignment exception"); | 819 | hook_fault_code(1, do_alignment, SIGILL, "alignment exception"); |
800 | hook_fault_code(3, do_alignment, SIGILL, "alignment exception"); | 820 | hook_fault_code(3, do_alignment, SIGILL, "alignment exception"); |
801 | 821 | ||
diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c index 13cdae8b0d44..80cd207cbaea 100644 --- a/arch/arm/mm/cache-feroceon-l2.c +++ b/arch/arm/mm/cache-feroceon-l2.c | |||
@@ -150,7 +150,7 @@ static void feroceon_l2_inv_range(unsigned long start, unsigned long end) | |||
150 | /* | 150 | /* |
151 | * Clean and invalidate partial last cache line. | 151 | * Clean and invalidate partial last cache line. |
152 | */ | 152 | */ |
153 | if (end & (CACHE_LINE_SIZE - 1)) { | 153 | if (start < end && end & (CACHE_LINE_SIZE - 1)) { |
154 | l2_clean_inv_pa(end & ~(CACHE_LINE_SIZE - 1)); | 154 | l2_clean_inv_pa(end & ~(CACHE_LINE_SIZE - 1)); |
155 | end &= ~(CACHE_LINE_SIZE - 1); | 155 | end &= ~(CACHE_LINE_SIZE - 1); |
156 | } | 156 | } |
@@ -158,7 +158,7 @@ static void feroceon_l2_inv_range(unsigned long start, unsigned long end) | |||
158 | /* | 158 | /* |
159 | * Invalidate all full cache lines between 'start' and 'end'. | 159 | * Invalidate all full cache lines between 'start' and 'end'. |
160 | */ | 160 | */ |
161 | while (start != end) { | 161 | while (start < end) { |
162 | unsigned long range_end = calc_range_end(start, end); | 162 | unsigned long range_end = calc_range_end(start, end); |
163 | l2_inv_pa_range(start, range_end - CACHE_LINE_SIZE); | 163 | l2_inv_pa_range(start, range_end - CACHE_LINE_SIZE); |
164 | start = range_end; | 164 | start = range_end; |
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 2df8d9facf57..22c9530e91e2 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
14 | #include <linux/hardirq.h> | ||
14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
15 | #include <linux/kprobes.h> | 16 | #include <linux/kprobes.h> |
16 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index e63db11f16a8..7f36c825718d 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -208,6 +208,12 @@ static struct mem_type mem_types[] = { | |||
208 | .prot_sect = PROT_SECT_DEVICE, | 208 | .prot_sect = PROT_SECT_DEVICE, |
209 | .domain = DOMAIN_IO, | 209 | .domain = DOMAIN_IO, |
210 | }, | 210 | }, |
211 | [MT_UNCACHED] = { | ||
212 | .prot_pte = PROT_PTE_DEVICE, | ||
213 | .prot_l1 = PMD_TYPE_TABLE, | ||
214 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, | ||
215 | .domain = DOMAIN_IO, | ||
216 | }, | ||
211 | [MT_CACHECLEAN] = { | 217 | [MT_CACHECLEAN] = { |
212 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, | 218 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, |
213 | .domain = DOMAIN_KERNEL, | 219 | .domain = DOMAIN_KERNEL, |
diff --git a/arch/arm/oprofile/op_model_mpcore.c b/arch/arm/oprofile/op_model_mpcore.c index 4de366e8b4c5..6d6bd5899240 100644 --- a/arch/arm/oprofile/op_model_mpcore.c +++ b/arch/arm/oprofile/op_model_mpcore.c | |||
@@ -260,10 +260,10 @@ static void em_stop(void) | |||
260 | static void em_route_irq(int irq, unsigned int cpu) | 260 | static void em_route_irq(int irq, unsigned int cpu) |
261 | { | 261 | { |
262 | struct irq_desc *desc = irq_desc + irq; | 262 | struct irq_desc *desc = irq_desc + irq; |
263 | cpumask_t mask = cpumask_of_cpu(cpu); | 263 | const struct cpumask *mask = cpumask_of(cpu); |
264 | 264 | ||
265 | spin_lock_irq(&desc->lock); | 265 | spin_lock_irq(&desc->lock); |
266 | desc->affinity = mask; | 266 | desc->affinity = *mask; |
267 | desc->chip->set_affinity(irq, mask); | 267 | desc->chip->set_affinity(irq, mask); |
268 | spin_unlock_irq(&desc->lock); | 268 | spin_unlock_irq(&desc->lock); |
269 | } | 269 | } |
diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c index 4689db638e95..9e573e78176a 100644 --- a/arch/arm/plat-iop/setup.c +++ b/arch/arm/plat-iop/setup.c | |||
@@ -16,14 +16,15 @@ | |||
16 | #include <asm/hardware/iop3xx.h> | 16 | #include <asm/hardware/iop3xx.h> |
17 | 17 | ||
18 | /* | 18 | /* |
19 | * Standard IO mapping for all IOP3xx based systems | 19 | * Standard IO mapping for all IOP3xx based systems. Note that |
20 | * the IOP3xx OCCDR must be mapped uncached and unbuffered. | ||
20 | */ | 21 | */ |
21 | static struct map_desc iop3xx_std_desc[] __initdata = { | 22 | static struct map_desc iop3xx_std_desc[] __initdata = { |
22 | { /* mem mapped registers */ | 23 | { /* mem mapped registers */ |
23 | .virtual = IOP3XX_PERIPHERAL_VIRT_BASE, | 24 | .virtual = IOP3XX_PERIPHERAL_VIRT_BASE, |
24 | .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE), | 25 | .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE), |
25 | .length = IOP3XX_PERIPHERAL_SIZE, | 26 | .length = IOP3XX_PERIPHERAL_SIZE, |
26 | .type = MT_DEVICE, | 27 | .type = MT_UNCACHED, |
27 | }, { /* PCI IO space */ | 28 | }, { /* PCI IO space */ |
28 | .virtual = IOP3XX_PCI_LOWER_IO_VA, | 29 | .virtual = IOP3XX_PCI_LOWER_IO_VA, |
29 | .pfn = __phys_to_pfn(IOP3XX_PCI_LOWER_IO_PA), | 30 | .pfn = __phys_to_pfn(IOP3XX_PCI_LOWER_IO_PA), |
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c index fd28f5194f71..758a1293bcfa 100644 --- a/arch/arm/plat-mxc/time.c +++ b/arch/arm/plat-mxc/time.c | |||
@@ -190,7 +190,7 @@ static int __init mxc_clockevent_init(void) | |||
190 | clockevent_mxc.min_delta_ns = | 190 | clockevent_mxc.min_delta_ns = |
191 | clockevent_delta2ns(0xff, &clockevent_mxc); | 191 | clockevent_delta2ns(0xff, &clockevent_mxc); |
192 | 192 | ||
193 | clockevent_mxc.cpumask = cpumask_of_cpu(0); | 193 | clockevent_mxc.cpumask = cpumask_of(0); |
194 | 194 | ||
195 | clockevents_register_device(&clockevent_mxc); | 195 | clockevents_register_device(&clockevent_mxc); |
196 | 196 | ||
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 8679fbca6bbe..424049d83fbe 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
@@ -101,6 +101,7 @@ | |||
101 | #define OMAP24XX_GPIO_IRQSTATUS2 0x0028 | 101 | #define OMAP24XX_GPIO_IRQSTATUS2 0x0028 |
102 | #define OMAP24XX_GPIO_IRQENABLE2 0x002c | 102 | #define OMAP24XX_GPIO_IRQENABLE2 0x002c |
103 | #define OMAP24XX_GPIO_IRQENABLE1 0x001c | 103 | #define OMAP24XX_GPIO_IRQENABLE1 0x001c |
104 | #define OMAP24XX_GPIO_WAKE_EN 0x0020 | ||
104 | #define OMAP24XX_GPIO_CTRL 0x0030 | 105 | #define OMAP24XX_GPIO_CTRL 0x0030 |
105 | #define OMAP24XX_GPIO_OE 0x0034 | 106 | #define OMAP24XX_GPIO_OE 0x0034 |
106 | #define OMAP24XX_GPIO_DATAIN 0x0038 | 107 | #define OMAP24XX_GPIO_DATAIN 0x0038 |
@@ -1551,7 +1552,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) | |||
1551 | #endif | 1552 | #endif |
1552 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1553 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) |
1553 | case METHOD_GPIO_24XX: | 1554 | case METHOD_GPIO_24XX: |
1554 | wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA; | 1555 | wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN; |
1555 | wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; | 1556 | wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; |
1556 | wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; | 1557 | wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; |
1557 | break; | 1558 | break; |
@@ -1574,7 +1575,7 @@ static int omap_gpio_resume(struct sys_device *dev) | |||
1574 | { | 1575 | { |
1575 | int i; | 1576 | int i; |
1576 | 1577 | ||
1577 | if (!cpu_is_omap24xx() && !cpu_is_omap16xx()) | 1578 | if (!cpu_class_is_omap2() && !cpu_is_omap16xx()) |
1578 | return 0; | 1579 | return 0; |
1579 | 1580 | ||
1580 | for (i = 0; i < gpio_bank_count; i++) { | 1581 | for (i = 0; i < gpio_bank_count; i++) { |
diff --git a/arch/arm/plat-omap/include/mach/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h index ec67fb428607..7b74d1255e0b 100644 --- a/arch/arm/plat-omap/include/mach/omapfb.h +++ b/arch/arm/plat-omap/include/mach/omapfb.h | |||
@@ -353,8 +353,8 @@ struct omapfb_device { | |||
353 | u32 pseudo_palette[17]; | 353 | u32 pseudo_palette[17]; |
354 | 354 | ||
355 | struct lcd_panel *panel; /* LCD panel */ | 355 | struct lcd_panel *panel; /* LCD panel */ |
356 | struct lcd_ctrl *ctrl; /* LCD controller */ | 356 | const struct lcd_ctrl *ctrl; /* LCD controller */ |
357 | struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ | 357 | const struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ |
358 | struct lcd_ctrl_extif *ext_if; /* LCD ctrl external | 358 | struct lcd_ctrl_extif *ext_if; /* LCD ctrl external |
359 | interface */ | 359 | interface */ |
360 | struct device *dev; | 360 | struct device *dev; |
diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h index 768eb6e7abcf..2a9c27ad4c37 100644 --- a/arch/arm/plat-omap/include/mach/pm.h +++ b/arch/arm/plat-omap/include/mach/pm.h | |||
@@ -128,7 +128,7 @@ void clk_deny_idle(struct clk *clk); | |||
128 | * clk_allow_idle - Counters previous clk_deny_idle | 128 | * clk_allow_idle - Counters previous clk_deny_idle |
129 | * @clk: clock signal handle | 129 | * @clk: clock signal handle |
130 | */ | 130 | */ |
131 | void clk_deny_idle(struct clk *clk); | 131 | void clk_allow_idle(struct clk *clk); |
132 | 132 | ||
133 | extern void omap_pm_idle(void); | 133 | extern void omap_pm_idle(void); |
134 | extern void omap_pm_suspend(void); | 134 | extern void omap_pm_suspend(void); |
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 9f9a921829c0..dcd9d16da2e9 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
@@ -255,7 +255,7 @@ void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl) | |||
255 | if (!_omap_sram_reprogram_clock) | 255 | if (!_omap_sram_reprogram_clock) |
256 | omap_sram_error(); | 256 | omap_sram_error(); |
257 | 257 | ||
258 | return _omap_sram_reprogram_clock(dpllctl, ckctl); | 258 | _omap_sram_reprogram_clock(dpllctl, ckctl); |
259 | } | 259 | } |
260 | 260 | ||
261 | int __init omap1_sram_init(void) | 261 | int __init omap1_sram_init(void) |
@@ -282,8 +282,8 @@ void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, | |||
282 | if (!_omap2_sram_ddr_init) | 282 | if (!_omap2_sram_ddr_init) |
283 | omap_sram_error(); | 283 | omap_sram_error(); |
284 | 284 | ||
285 | return _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, | 285 | _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, |
286 | base_cs, force_unlock); | 286 | base_cs, force_unlock); |
287 | } | 287 | } |
288 | 288 | ||
289 | static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val, | 289 | static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val, |
@@ -294,7 +294,7 @@ void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type) | |||
294 | if (!_omap2_sram_reprogram_sdrc) | 294 | if (!_omap2_sram_reprogram_sdrc) |
295 | omap_sram_error(); | 295 | omap_sram_error(); |
296 | 296 | ||
297 | return _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); | 297 | _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); |
298 | } | 298 | } |
299 | 299 | ||
300 | static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); | 300 | static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); |
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c index 883902fead89..d41d41d78ad9 100644 --- a/arch/arm/plat-orion/pcie.c +++ b/arch/arm/plat-orion/pcie.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #define PCIE_CONF_REG(r) ((((r) & 0xf00) << 16) | ((r) & 0xfc)) | 35 | #define PCIE_CONF_REG(r) ((((r) & 0xf00) << 16) | ((r) & 0xfc)) |
36 | #define PCIE_CONF_BUS(b) (((b) & 0xff) << 16) | 36 | #define PCIE_CONF_BUS(b) (((b) & 0xff) << 16) |
37 | #define PCIE_CONF_DEV(d) (((d) & 0x1f) << 11) | 37 | #define PCIE_CONF_DEV(d) (((d) & 0x1f) << 11) |
38 | #define PCIE_CONF_FUNC(f) (((f) & 0x3) << 8) | 38 | #define PCIE_CONF_FUNC(f) (((f) & 0x7) << 8) |
39 | #define PCIE_CONF_DATA_OFF 0x18fc | 39 | #define PCIE_CONF_DATA_OFF 0x18fc |
40 | #define PCIE_MASK_OFF 0x1910 | 40 | #define PCIE_MASK_OFF 0x1910 |
41 | #define PCIE_CTRL_OFF 0x1a00 | 41 | #define PCIE_CTRL_OFF 0x1a00 |
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index 544d6b327f3a..6fa2923e6dca 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c | |||
@@ -149,7 +149,6 @@ static struct clock_event_device orion_clkevt = { | |||
149 | .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC, | 149 | .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC, |
150 | .shift = 32, | 150 | .shift = 32, |
151 | .rating = 300, | 151 | .rating = 300, |
152 | .cpumask = CPU_MASK_CPU0, | ||
153 | .set_next_event = orion_clkevt_next_event, | 152 | .set_next_event = orion_clkevt_next_event, |
154 | .set_mode = orion_clkevt_mode, | 153 | .set_mode = orion_clkevt_mode, |
155 | }; | 154 | }; |
@@ -199,5 +198,6 @@ void __init orion_time_init(unsigned int irq, unsigned int tclk) | |||
199 | orion_clkevt.mult = div_sc(tclk, NSEC_PER_SEC, orion_clkevt.shift); | 198 | orion_clkevt.mult = div_sc(tclk, NSEC_PER_SEC, orion_clkevt.shift); |
200 | orion_clkevt.max_delta_ns = clockevent_delta2ns(0xfffffffe, &orion_clkevt); | 199 | orion_clkevt.max_delta_ns = clockevent_delta2ns(0xfffffffe, &orion_clkevt); |
201 | orion_clkevt.min_delta_ns = clockevent_delta2ns(1, &orion_clkevt); | 200 | orion_clkevt.min_delta_ns = clockevent_delta2ns(1, &orion_clkevt); |
201 | orion_clkevt.cpumask = cpumask_of(0); | ||
202 | clockevents_register_device(&orion_clkevt); | 202 | clockevents_register_device(&orion_clkevt); |
203 | } | 203 | } |
diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c index 283481d74a5b..0ff46bf873b0 100644 --- a/arch/avr32/kernel/time.c +++ b/arch/avr32/kernel/time.c | |||
@@ -106,7 +106,6 @@ static struct clock_event_device comparator = { | |||
106 | .features = CLOCK_EVT_FEAT_ONESHOT, | 106 | .features = CLOCK_EVT_FEAT_ONESHOT, |
107 | .shift = 16, | 107 | .shift = 16, |
108 | .rating = 50, | 108 | .rating = 50, |
109 | .cpumask = CPU_MASK_CPU0, | ||
110 | .set_next_event = comparator_next_event, | 109 | .set_next_event = comparator_next_event, |
111 | .set_mode = comparator_mode, | 110 | .set_mode = comparator_mode, |
112 | }; | 111 | }; |
@@ -134,6 +133,7 @@ void __init time_init(void) | |||
134 | comparator.mult = div_sc(counter_hz, NSEC_PER_SEC, comparator.shift); | 133 | comparator.mult = div_sc(counter_hz, NSEC_PER_SEC, comparator.shift); |
135 | comparator.max_delta_ns = clockevent_delta2ns((u32)~0, &comparator); | 134 | comparator.max_delta_ns = clockevent_delta2ns((u32)~0, &comparator); |
136 | comparator.min_delta_ns = clockevent_delta2ns(50, &comparator) + 1; | 135 | comparator.min_delta_ns = clockevent_delta2ns(50, &comparator) + 1; |
136 | comparator.cpumask = cpumask_of(0); | ||
137 | 137 | ||
138 | sysreg_write(COMPARE, 0); | 138 | sysreg_write(COMPARE, 0); |
139 | timer_irqaction.dev_id = &comparator; | 139 | timer_irqaction.dev_id = &comparator; |
diff --git a/arch/blackfin/include/asm/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h index 56dcb0a2d244..77295666c34b 100644 --- a/arch/blackfin/include/asm/bfin-global.h +++ b/arch/blackfin/include/asm/bfin-global.h | |||
@@ -101,7 +101,7 @@ extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */ | |||
101 | extern unsigned long _ramstart, _ramend, _rambase; | 101 | extern unsigned long _ramstart, _ramend, _rambase; |
102 | extern unsigned long memory_start, memory_end, physical_mem_end; | 102 | extern unsigned long memory_start, memory_end, physical_mem_end; |
103 | extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[], | 103 | extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[], |
104 | _ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _ebss_b_l1[], | 104 | _ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _sbss_b_l1[], _ebss_b_l1[], |
105 | _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[], | 105 | _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[], |
106 | _ebss_l2[], _l2_lma_start[]; | 106 | _ebss_l2[], _l2_lma_start[]; |
107 | 107 | ||
diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index ede748d67efd..d7d9148e433c 100644 --- a/arch/blackfin/include/asm/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h | |||
@@ -15,7 +15,11 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, | |||
15 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | 15 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) |
16 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | 16 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
17 | 17 | ||
18 | #define dma_mapping_error | 18 | static inline |
19 | int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | ||
20 | { | ||
21 | return 0; | ||
22 | } | ||
19 | 23 | ||
20 | /* | 24 | /* |
21 | * Map a single buffer of the indicated size for DMA in streaming mode. | 25 | * Map a single buffer of the indicated size for DMA in streaming mode. |
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 6e08f425bb44..5c0800adb4dd 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -218,7 +218,7 @@ inline int check_gpio(unsigned gpio) | |||
218 | if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15 | 218 | if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15 |
219 | || gpio == GPIO_PH14 || gpio == GPIO_PH15 | 219 | || gpio == GPIO_PH14 || gpio == GPIO_PH15 |
220 | || gpio == GPIO_PJ14 || gpio == GPIO_PJ15 | 220 | || gpio == GPIO_PJ14 || gpio == GPIO_PJ15 |
221 | || gpio > MAX_BLACKFIN_GPIOS) | 221 | || gpio >= MAX_BLACKFIN_GPIOS) |
222 | return -EINVAL; | 222 | return -EINVAL; |
223 | return 0; | 223 | return 0; |
224 | } | 224 | } |
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index 512f8c92ead5..2debc900e246 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c | |||
@@ -188,10 +188,11 @@ static struct cplb_desc cplb_data[] = { | |||
188 | 188 | ||
189 | static u16 __init lock_kernel_check(u32 start, u32 end) | 189 | static u16 __init lock_kernel_check(u32 start, u32 end) |
190 | { | 190 | { |
191 | if ((end <= (u32) _end && end >= (u32)_stext) || | 191 | if (start >= (u32)_end || end <= (u32)_stext) |
192 | (start <= (u32) _end && start >= (u32)_stext)) | 192 | return 0; |
193 | return IN_KERNEL; | 193 | |
194 | return 0; | 194 | /* This cplb block overlapped with kernel area. */ |
195 | return IN_KERNEL; | ||
195 | } | 196 | } |
196 | 197 | ||
197 | static unsigned short __init | 198 | static unsigned short __init |
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c index 77800dd83e57..0c3ea118b657 100644 --- a/arch/blackfin/kernel/process.c +++ b/arch/blackfin/kernel/process.c | |||
@@ -351,10 +351,15 @@ int _access_ok(unsigned long addr, unsigned long size) | |||
351 | return 1; | 351 | return 1; |
352 | #endif | 352 | #endif |
353 | #if L1_DATA_B_LENGTH != 0 | 353 | #if L1_DATA_B_LENGTH != 0 |
354 | if (addr >= L1_DATA_B_START | 354 | if (addr >= L1_DATA_B_START + (_ebss_b_l1 - _sdata_b_l1) |
355 | && addr + size <= L1_DATA_B_START + L1_DATA_B_LENGTH) | 355 | && addr + size <= L1_DATA_B_START + L1_DATA_B_LENGTH) |
356 | return 1; | 356 | return 1; |
357 | #endif | 357 | #endif |
358 | #if L2_LENGTH != 0 | ||
359 | if (addr >= L2_START + (_ebss_l2 - _stext_l2) | ||
360 | && addr + size <= L2_START + L2_LENGTH) | ||
361 | return 1; | ||
362 | #endif | ||
358 | return 0; | 363 | return 0; |
359 | } | 364 | } |
360 | EXPORT_SYMBOL(_access_ok); | 365 | EXPORT_SYMBOL(_access_ok); |
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 7f35d1046cd8..71a9a8c53cea 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -119,23 +119,23 @@ void __init bfin_relocate_l1_mem(void) | |||
119 | /* Copy _stext_l1 to _etext_l1 to L1 instruction SRAM */ | 119 | /* Copy _stext_l1 to _etext_l1 to L1 instruction SRAM */ |
120 | dma_memcpy(_stext_l1, _l1_lma_start, l1_code_length); | 120 | dma_memcpy(_stext_l1, _l1_lma_start, l1_code_length); |
121 | 121 | ||
122 | l1_data_a_length = _ebss_l1 - _sdata_l1; | 122 | l1_data_a_length = _sbss_l1 - _sdata_l1; |
123 | if (l1_data_a_length > L1_DATA_A_LENGTH) | 123 | if (l1_data_a_length > L1_DATA_A_LENGTH) |
124 | panic("L1 Data SRAM Bank A Overflow\n"); | 124 | panic("L1 Data SRAM Bank A Overflow\n"); |
125 | 125 | ||
126 | /* Copy _sdata_l1 to _ebss_l1 to L1 data bank A SRAM */ | 126 | /* Copy _sdata_l1 to _sbss_l1 to L1 data bank A SRAM */ |
127 | dma_memcpy(_sdata_l1, _l1_lma_start + l1_code_length, l1_data_a_length); | 127 | dma_memcpy(_sdata_l1, _l1_lma_start + l1_code_length, l1_data_a_length); |
128 | 128 | ||
129 | l1_data_b_length = _ebss_b_l1 - _sdata_b_l1; | 129 | l1_data_b_length = _sbss_b_l1 - _sdata_b_l1; |
130 | if (l1_data_b_length > L1_DATA_B_LENGTH) | 130 | if (l1_data_b_length > L1_DATA_B_LENGTH) |
131 | panic("L1 Data SRAM Bank B Overflow\n"); | 131 | panic("L1 Data SRAM Bank B Overflow\n"); |
132 | 132 | ||
133 | /* Copy _sdata_b_l1 to _ebss_b_l1 to L1 data bank B SRAM */ | 133 | /* Copy _sdata_b_l1 to _sbss_b_l1 to L1 data bank B SRAM */ |
134 | dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length + | 134 | dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length + |
135 | l1_data_a_length, l1_data_b_length); | 135 | l1_data_a_length, l1_data_b_length); |
136 | 136 | ||
137 | if (L2_LENGTH != 0) { | 137 | if (L2_LENGTH != 0) { |
138 | l2_length = _ebss_l2 - _stext_l2; | 138 | l2_length = _sbss_l2 - _stext_l2; |
139 | if (l2_length > L2_LENGTH) | 139 | if (l2_length > L2_LENGTH) |
140 | panic("L2 SRAM Overflow\n"); | 140 | panic("L2 SRAM Overflow\n"); |
141 | 141 | ||
@@ -827,7 +827,7 @@ void __init setup_arch(char **cmdline_p) | |||
827 | printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n", | 827 | printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n", |
828 | bfin_compiled_revid(), bfin_revid()); | 828 | bfin_compiled_revid(), bfin_revid()); |
829 | } | 829 | } |
830 | if (bfin_revid() <= CONFIG_BF_REV_MIN || bfin_revid() > CONFIG_BF_REV_MAX) | 830 | if (bfin_revid() < CONFIG_BF_REV_MIN || bfin_revid() > CONFIG_BF_REV_MAX) |
831 | printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n", | 831 | printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n", |
832 | CPU, bfin_revid()); | 832 | CPU, bfin_revid()); |
833 | } | 833 | } |
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c index e887efc86c29..0ed2badfd746 100644 --- a/arch/blackfin/kernel/time-ts.c +++ b/arch/blackfin/kernel/time-ts.c | |||
@@ -162,7 +162,6 @@ static struct clock_event_device clockevent_bfin = { | |||
162 | .name = "bfin_core_timer", | 162 | .name = "bfin_core_timer", |
163 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, | 163 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, |
164 | .shift = 32, | 164 | .shift = 32, |
165 | .cpumask = CPU_MASK_CPU0, | ||
166 | .set_next_event = bfin_timer_set_next_event, | 165 | .set_next_event = bfin_timer_set_next_event, |
167 | .set_mode = bfin_timer_set_mode, | 166 | .set_mode = bfin_timer_set_mode, |
168 | }; | 167 | }; |
@@ -193,6 +192,7 @@ static int __init bfin_clockevent_init(void) | |||
193 | clockevent_bfin.mult = div_sc(timer_clk, NSEC_PER_SEC, clockevent_bfin.shift); | 192 | clockevent_bfin.mult = div_sc(timer_clk, NSEC_PER_SEC, clockevent_bfin.shift); |
194 | clockevent_bfin.max_delta_ns = clockevent_delta2ns(-1, &clockevent_bfin); | 193 | clockevent_bfin.max_delta_ns = clockevent_delta2ns(-1, &clockevent_bfin); |
195 | clockevent_bfin.min_delta_ns = clockevent_delta2ns(100, &clockevent_bfin); | 194 | clockevent_bfin.min_delta_ns = clockevent_delta2ns(100, &clockevent_bfin); |
195 | clockevent_bfin.cpumask = cpumask_of(0); | ||
196 | clockevents_register_device(&clockevent_bfin); | 196 | clockevents_register_device(&clockevent_bfin); |
197 | 197 | ||
198 | return 0; | 198 | return 0; |
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 1aa2c788e228..bef025b07443 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
@@ -59,7 +59,7 @@ | |||
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | 61 | ||
62 | #ifdef CONFIG_VERBOSE_DEBUG | 62 | #ifdef CONFIG_DEBUG_VERBOSE |
63 | #define verbose_printk(fmt, arg...) \ | 63 | #define verbose_printk(fmt, arg...) \ |
64 | printk(fmt, ##arg) | 64 | printk(fmt, ##arg) |
65 | #else | 65 | #else |
@@ -147,9 +147,12 @@ static void decode_address(char *buf, unsigned long address) | |||
147 | char *name = p->comm; | 147 | char *name = p->comm; |
148 | struct file *file = vma->vm_file; | 148 | struct file *file = vma->vm_file; |
149 | 149 | ||
150 | if (file) | 150 | if (file) { |
151 | name = d_path(&file->f_path, _tmpbuf, | 151 | char *d_name = d_path(&file->f_path, _tmpbuf, |
152 | sizeof(_tmpbuf)); | 152 | sizeof(_tmpbuf)); |
153 | if (!IS_ERR(d_name)) | ||
154 | name = d_name; | ||
155 | } | ||
153 | 156 | ||
154 | /* FLAT does not have its text aligned to the start of | 157 | /* FLAT does not have its text aligned to the start of |
155 | * the map while FDPIC ELF does ... | 158 | * the map while FDPIC ELF does ... |
@@ -571,7 +574,7 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
571 | #endif | 574 | #endif |
572 | panic("Kernel exception"); | 575 | panic("Kernel exception"); |
573 | } else { | 576 | } else { |
574 | #ifdef CONFIG_VERBOSE_DEBUG | 577 | #ifdef CONFIG_DEBUG_VERBOSE |
575 | unsigned long *stack; | 578 | unsigned long *stack; |
576 | /* Dump the user space stack */ | 579 | /* Dump the user space stack */ |
577 | stack = (unsigned long *)rdusp(); | 580 | stack = (unsigned long *)rdusp(); |
diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S index db532181fbde..a028e9450419 100644 --- a/arch/blackfin/mach-common/cache.S +++ b/arch/blackfin/mach-common/cache.S | |||
@@ -25,9 +25,13 @@ | |||
25 | */ | 25 | */ |
26 | .macro do_flush flushins:req optflushins optnopins label | 26 | .macro do_flush flushins:req optflushins optnopins label |
27 | 27 | ||
28 | R2 = -L1_CACHE_BYTES; | ||
29 | |||
30 | /* start = (start & -L1_CACHE_BYTES) */ | ||
31 | R0 = R0 & R2; | ||
32 | |||
28 | /* end = ((end - 1) & -L1_CACHE_BYTES) + L1_CACHE_BYTES; */ | 33 | /* end = ((end - 1) & -L1_CACHE_BYTES) + L1_CACHE_BYTES; */ |
29 | R1 += -1; | 34 | R1 += -1; |
30 | R2 = -L1_CACHE_BYTES; | ||
31 | R1 = R1 & R2; | 35 | R1 = R1 & R2; |
32 | R1 += L1_CACHE_BYTES; | 36 | R1 += L1_CACHE_BYTES; |
33 | 37 | ||
@@ -63,7 +67,7 @@ ENDPROC(_blackfin_icache_flush_range) | |||
63 | 67 | ||
64 | /* Flush all cache lines assocoiated with this area of memory. */ | 68 | /* Flush all cache lines assocoiated with this area of memory. */ |
65 | ENTRY(_blackfin_icache_dcache_flush_range) | 69 | ENTRY(_blackfin_icache_dcache_flush_range) |
66 | do_flush IFLUSH, FLUSH | 70 | do_flush FLUSH, IFLUSH |
67 | ENDPROC(_blackfin_icache_dcache_flush_range) | 71 | ENDPROC(_blackfin_icache_dcache_flush_range) |
68 | 72 | ||
69 | /* Throw away all D-cached data in specified region without any obligation to | 73 | /* Throw away all D-cached data in specified region without any obligation to |
diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c index c22c47b60127..dda5443b37ed 100644 --- a/arch/blackfin/mach-common/cpufreq.c +++ b/arch/blackfin/mach-common/cpufreq.c | |||
@@ -72,13 +72,13 @@ unsigned int __bfin_cycles_mod; | |||
72 | 72 | ||
73 | /**************************************************************************/ | 73 | /**************************************************************************/ |
74 | 74 | ||
75 | static unsigned int bfin_getfreq(unsigned int cpu) | 75 | static unsigned int bfin_getfreq_khz(unsigned int cpu) |
76 | { | 76 | { |
77 | /* The driver only support single cpu */ | 77 | /* The driver only support single cpu */ |
78 | if (cpu != 0) | 78 | if (cpu != 0) |
79 | return -1; | 79 | return -1; |
80 | 80 | ||
81 | return get_cclk(); | 81 | return get_cclk() / 1000; |
82 | } | 82 | } |
83 | 83 | ||
84 | 84 | ||
@@ -96,7 +96,7 @@ static int bfin_target(struct cpufreq_policy *policy, | |||
96 | 96 | ||
97 | cclk_hz = bfin_freq_table[index].frequency; | 97 | cclk_hz = bfin_freq_table[index].frequency; |
98 | 98 | ||
99 | freqs.old = bfin_getfreq(0); | 99 | freqs.old = bfin_getfreq_khz(0); |
100 | freqs.new = cclk_hz; | 100 | freqs.new = cclk_hz; |
101 | freqs.cpu = 0; | 101 | freqs.cpu = 0; |
102 | 102 | ||
@@ -137,8 +137,8 @@ static int __init __bfin_cpu_init(struct cpufreq_policy *policy) | |||
137 | if (policy->cpu != 0) | 137 | if (policy->cpu != 0) |
138 | return -EINVAL; | 138 | return -EINVAL; |
139 | 139 | ||
140 | cclk = get_cclk(); | 140 | cclk = get_cclk() / 1000; |
141 | sclk = get_sclk(); | 141 | sclk = get_sclk() / 1000; |
142 | 142 | ||
143 | #if ANOMALY_05000273 || (!defined(CONFIG_BF54x) && defined(CONFIG_BFIN_DCACHE)) | 143 | #if ANOMALY_05000273 || (!defined(CONFIG_BF54x) && defined(CONFIG_BFIN_DCACHE)) |
144 | min_cclk = sclk * 2; | 144 | min_cclk = sclk * 2; |
@@ -152,7 +152,7 @@ static int __init __bfin_cpu_init(struct cpufreq_policy *policy) | |||
152 | dpm_state_table[index].csel = csel << 4; /* Shift now into PLL_DIV bitpos */ | 152 | dpm_state_table[index].csel = csel << 4; /* Shift now into PLL_DIV bitpos */ |
153 | dpm_state_table[index].tscale = (TIME_SCALE / (1 << csel)) - 1; | 153 | dpm_state_table[index].tscale = (TIME_SCALE / (1 << csel)) - 1; |
154 | 154 | ||
155 | pr_debug("cpufreq: freq:%d csel:%d tscale:%d\n", | 155 | pr_debug("cpufreq: freq:%d csel:0x%x tscale:%d\n", |
156 | bfin_freq_table[index].frequency, | 156 | bfin_freq_table[index].frequency, |
157 | dpm_state_table[index].csel, | 157 | dpm_state_table[index].csel, |
158 | dpm_state_table[index].tscale); | 158 | dpm_state_table[index].tscale); |
@@ -173,7 +173,7 @@ static struct freq_attr *bfin_freq_attr[] = { | |||
173 | static struct cpufreq_driver bfin_driver = { | 173 | static struct cpufreq_driver bfin_driver = { |
174 | .verify = bfin_verify_speed, | 174 | .verify = bfin_verify_speed, |
175 | .target = bfin_target, | 175 | .target = bfin_target, |
176 | .get = bfin_getfreq, | 176 | .get = bfin_getfreq_khz, |
177 | .init = __bfin_cpu_init, | 177 | .init = __bfin_cpu_init, |
178 | .name = "bfin cpufreq", | 178 | .name = "bfin cpufreq", |
179 | .owner = THIS_MODULE, | 179 | .owner = THIS_MODULE, |
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index c13fa8da28c7..bde6dc4e2614 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
@@ -277,7 +277,7 @@ ENTRY(_bfin_return_from_exception) | |||
277 | p5.h = hi(ILAT); | 277 | p5.h = hi(ILAT); |
278 | r6 = [p5]; | 278 | r6 = [p5]; |
279 | r7 = 0x20; /* Did I just cause anther HW error? */ | 279 | r7 = 0x20; /* Did I just cause anther HW error? */ |
280 | r7 = r7 & r1; | 280 | r6 = r7 & r6; |
281 | CC = R7 == R6; | 281 | CC = R7 == R6; |
282 | if CC JUMP _double_fault; | 282 | if CC JUMP _double_fault; |
283 | #endif | 283 | #endif |
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 0f1ca6930c16..cc6f336e7313 100644 --- a/arch/blackfin/mm/sram-alloc.c +++ b/arch/blackfin/mm/sram-alloc.c | |||
@@ -183,10 +183,10 @@ static void __init l2_sram_init(void) | |||
183 | return; | 183 | return; |
184 | } | 184 | } |
185 | 185 | ||
186 | free_l2_sram_head.next->paddr = (void *)L2_START + | 186 | free_l2_sram_head.next->paddr = |
187 | (_etext_l2 - _stext_l2) + (_edata_l2 - _sdata_l2); | 187 | (void *)L2_START + (_ebss_l2 - _stext_l2); |
188 | free_l2_sram_head.next->size = L2_LENGTH - | 188 | free_l2_sram_head.next->size = |
189 | (_etext_l2 - _stext_l2) + (_edata_l2 - _sdata_l2); | 189 | L2_LENGTH - (_ebss_l2 - _stext_l2); |
190 | free_l2_sram_head.next->pid = 0; | 190 | free_l2_sram_head.next->pid = 0; |
191 | free_l2_sram_head.next->next = NULL; | 191 | free_l2_sram_head.next->next = NULL; |
192 | 192 | ||
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index 173c141ac9ba..295131fee710 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c | |||
@@ -325,11 +325,11 @@ static void end_crisv32_irq(unsigned int irq) | |||
325 | { | 325 | { |
326 | } | 326 | } |
327 | 327 | ||
328 | void set_affinity_crisv32_irq(unsigned int irq, cpumask_t dest) | 328 | void set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) |
329 | { | 329 | { |
330 | unsigned long flags; | 330 | unsigned long flags; |
331 | spin_lock_irqsave(&irq_lock, flags); | 331 | spin_lock_irqsave(&irq_lock, flags); |
332 | irq_allocations[irq - FIRST_IRQ].mask = dest; | 332 | irq_allocations[irq - FIRST_IRQ].mask = *dest; |
333 | spin_unlock_irqrestore(&irq_lock, flags); | 333 | spin_unlock_irqrestore(&irq_lock, flags); |
334 | } | 334 | } |
335 | 335 | ||
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c index 52e16c6436f9..9dac17334640 100644 --- a/arch/cris/arch-v32/kernel/smp.c +++ b/arch/cris/arch-v32/kernel/smp.c | |||
@@ -29,11 +29,7 @@ | |||
29 | spinlock_t cris_atomic_locks[] = { [0 ... LOCK_COUNT - 1] = SPIN_LOCK_UNLOCKED}; | 29 | spinlock_t cris_atomic_locks[] = { [0 ... LOCK_COUNT - 1] = SPIN_LOCK_UNLOCKED}; |
30 | 30 | ||
31 | /* CPU masks */ | 31 | /* CPU masks */ |
32 | cpumask_t cpu_online_map = CPU_MASK_NONE; | ||
33 | EXPORT_SYMBOL(cpu_online_map); | ||
34 | cpumask_t phys_cpu_present_map = CPU_MASK_NONE; | 32 | cpumask_t phys_cpu_present_map = CPU_MASK_NONE; |
35 | cpumask_t cpu_possible_map; | ||
36 | EXPORT_SYMBOL(cpu_possible_map); | ||
37 | EXPORT_SYMBOL(phys_cpu_present_map); | 33 | EXPORT_SYMBOL(phys_cpu_present_map); |
38 | 34 | ||
39 | /* Variables used during SMP boot */ | 35 | /* Variables used during SMP boot */ |
diff --git a/arch/cris/include/asm/smp.h b/arch/cris/include/asm/smp.h index dba33aba3e95..c615a06dd757 100644 --- a/arch/cris/include/asm/smp.h +++ b/arch/cris/include/asm/smp.h | |||
@@ -4,7 +4,6 @@ | |||
4 | #include <linux/cpumask.h> | 4 | #include <linux/cpumask.h> |
5 | 5 | ||
6 | extern cpumask_t phys_cpu_present_map; | 6 | extern cpumask_t phys_cpu_present_map; |
7 | extern cpumask_t cpu_possible_map; | ||
8 | 7 | ||
9 | #define raw_smp_processor_id() (current_thread_info()->cpu) | 8 | #define raw_smp_processor_id() (current_thread_info()->cpu) |
10 | 9 | ||
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c index 49b2cf2c38f3..baadc97f8627 100644 --- a/arch/frv/kernel/sys_frv.c +++ b/arch/frv/kernel/sys_frv.c | |||
@@ -35,22 +35,21 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | |||
35 | int error = -EBADF; | 35 | int error = -EBADF; |
36 | struct file * file = NULL; | 36 | struct file * file = NULL; |
37 | 37 | ||
38 | flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); | ||
39 | if (!(flags & MAP_ANONYMOUS)) { | ||
40 | file = fget(fd); | ||
41 | if (!file) | ||
42 | goto out; | ||
43 | } | ||
44 | |||
45 | /* As with sparc32, make sure the shift for mmap2 is constant | 38 | /* As with sparc32, make sure the shift for mmap2 is constant |
46 | (12), no matter what PAGE_SIZE we have.... */ | 39 | (12), no matter what PAGE_SIZE we have.... */ |
47 | 40 | ||
48 | /* But unlike sparc32, don't just silently break if we're | 41 | /* But unlike sparc32, don't just silently break if we're |
49 | trying to map something we can't */ | 42 | trying to map something we can't */ |
50 | if (pgoff & ((1<<(PAGE_SHIFT-12))-1)) | 43 | if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1)) |
51 | return -EINVAL; | 44 | return -EINVAL; |
45 | pgoff >>= PAGE_SHIFT - 12; | ||
52 | 46 | ||
53 | pgoff >>= (PAGE_SHIFT - 12); | 47 | flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); |
48 | if (!(flags & MAP_ANONYMOUS)) { | ||
49 | file = fget(fd); | ||
50 | if (!file) | ||
51 | goto out; | ||
52 | } | ||
54 | 53 | ||
55 | down_write(¤t->mm->mmap_sem); | 54 | down_write(¤t->mm->mmap_sem); |
56 | error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); | 55 | error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 6bd91ed7cd03..7fa8f615ba6e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -99,7 +99,7 @@ config GENERIC_IOMAP | |||
99 | bool | 99 | bool |
100 | default y | 100 | default y |
101 | 101 | ||
102 | config SCHED_NO_NO_OMIT_FRAME_POINTER | 102 | config SCHED_OMIT_FRAME_POINTER |
103 | bool | 103 | bool |
104 | default y | 104 | default y |
105 | 105 | ||
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index e05f9e1d3faa..27eb67604c53 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc1 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Mon Aug 4 15:38:01 2008 | 4 | # Mon Dec 8 08:12:07 2008 |
5 | # | 5 | # |
6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
7 | 7 | ||
@@ -26,6 +26,7 @@ CONFIG_LOG_BUF_SHIFT=20 | |||
26 | CONFIG_CGROUPS=y | 26 | CONFIG_CGROUPS=y |
27 | # CONFIG_CGROUP_DEBUG is not set | 27 | # CONFIG_CGROUP_DEBUG is not set |
28 | # CONFIG_CGROUP_NS is not set | 28 | # CONFIG_CGROUP_NS is not set |
29 | # CONFIG_CGROUP_FREEZER is not set | ||
29 | # CONFIG_CGROUP_DEVICE is not set | 30 | # CONFIG_CGROUP_DEVICE is not set |
30 | CONFIG_CPUSETS=y | 31 | CONFIG_CPUSETS=y |
31 | # CONFIG_GROUP_SCHED is not set | 32 | # CONFIG_GROUP_SCHED is not set |
@@ -46,7 +47,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
46 | CONFIG_SYSCTL=y | 47 | CONFIG_SYSCTL=y |
47 | # CONFIG_EMBEDDED is not set | 48 | # CONFIG_EMBEDDED is not set |
48 | CONFIG_SYSCTL_SYSCALL=y | 49 | CONFIG_SYSCTL_SYSCALL=y |
49 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
50 | CONFIG_KALLSYMS=y | 50 | CONFIG_KALLSYMS=y |
51 | CONFIG_KALLSYMS_ALL=y | 51 | CONFIG_KALLSYMS_ALL=y |
52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -63,7 +63,9 @@ CONFIG_SIGNALFD=y | |||
63 | CONFIG_TIMERFD=y | 63 | CONFIG_TIMERFD=y |
64 | CONFIG_EVENTFD=y | 64 | CONFIG_EVENTFD=y |
65 | CONFIG_SHMEM=y | 65 | CONFIG_SHMEM=y |
66 | CONFIG_AIO=y | ||
66 | CONFIG_VM_EVENT_COUNTERS=y | 67 | CONFIG_VM_EVENT_COUNTERS=y |
68 | CONFIG_PCI_QUIRKS=y | ||
67 | CONFIG_SLUB_DEBUG=y | 69 | CONFIG_SLUB_DEBUG=y |
68 | # CONFIG_SLAB is not set | 70 | # CONFIG_SLAB is not set |
69 | CONFIG_SLUB=y | 71 | CONFIG_SLUB=y |
@@ -72,15 +74,11 @@ CONFIG_SLUB=y | |||
72 | # CONFIG_MARKERS is not set | 74 | # CONFIG_MARKERS is not set |
73 | CONFIG_HAVE_OPROFILE=y | 75 | CONFIG_HAVE_OPROFILE=y |
74 | # CONFIG_KPROBES is not set | 76 | # CONFIG_KPROBES is not set |
75 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
76 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
77 | CONFIG_HAVE_KPROBES=y | 77 | CONFIG_HAVE_KPROBES=y |
78 | CONFIG_HAVE_KRETPROBES=y | 78 | CONFIG_HAVE_KRETPROBES=y |
79 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | 79 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
80 | CONFIG_HAVE_DMA_ATTRS=y | 80 | CONFIG_HAVE_DMA_ATTRS=y |
81 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 81 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
82 | # CONFIG_HAVE_CLK is not set | ||
83 | CONFIG_PROC_PAGE_MONITOR=y | ||
84 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 82 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
85 | CONFIG_SLABINFO=y | 83 | CONFIG_SLABINFO=y |
86 | CONFIG_RT_MUTEXES=y | 84 | CONFIG_RT_MUTEXES=y |
@@ -113,6 +111,7 @@ CONFIG_DEFAULT_AS=y | |||
113 | # CONFIG_DEFAULT_NOOP is not set | 111 | # CONFIG_DEFAULT_NOOP is not set |
114 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 112 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
115 | CONFIG_CLASSIC_RCU=y | 113 | CONFIG_CLASSIC_RCU=y |
114 | # CONFIG_FREEZER is not set | ||
116 | 115 | ||
117 | # | 116 | # |
118 | # Processor type and features | 117 | # Processor type and features |
@@ -125,8 +124,6 @@ CONFIG_MMU=y | |||
125 | CONFIG_SWIOTLB=y | 124 | CONFIG_SWIOTLB=y |
126 | CONFIG_IOMMU_HELPER=y | 125 | CONFIG_IOMMU_HELPER=y |
127 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 126 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
128 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
129 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
130 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 127 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
131 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 128 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
132 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 129 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
@@ -139,13 +136,16 @@ CONFIG_GENERIC_IOMAP=y | |||
139 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 136 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
140 | CONFIG_IA64_UNCACHED_ALLOCATOR=y | 137 | CONFIG_IA64_UNCACHED_ALLOCATOR=y |
141 | CONFIG_AUDIT_ARCH=y | 138 | CONFIG_AUDIT_ARCH=y |
139 | # CONFIG_PARAVIRT_GUEST is not set | ||
142 | CONFIG_IA64_GENERIC=y | 140 | CONFIG_IA64_GENERIC=y |
143 | # CONFIG_IA64_DIG is not set | 141 | # CONFIG_IA64_DIG is not set |
142 | # CONFIG_IA64_DIG_VTD is not set | ||
144 | # CONFIG_IA64_HP_ZX1 is not set | 143 | # CONFIG_IA64_HP_ZX1 is not set |
145 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set | 144 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set |
146 | # CONFIG_IA64_SGI_SN2 is not set | 145 | # CONFIG_IA64_SGI_SN2 is not set |
147 | # CONFIG_IA64_SGI_UV is not set | 146 | # CONFIG_IA64_SGI_UV is not set |
148 | # CONFIG_IA64_HP_SIM is not set | 147 | # CONFIG_IA64_HP_SIM is not set |
148 | # CONFIG_IA64_XEN_GUEST is not set | ||
149 | # CONFIG_ITANIUM is not set | 149 | # CONFIG_ITANIUM is not set |
150 | CONFIG_MCKINLEY=y | 150 | CONFIG_MCKINLEY=y |
151 | # CONFIG_IA64_PAGE_SIZE_4KB is not set | 151 | # CONFIG_IA64_PAGE_SIZE_4KB is not set |
@@ -182,16 +182,17 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
182 | CONFIG_DISCONTIGMEM=y | 182 | CONFIG_DISCONTIGMEM=y |
183 | CONFIG_FLAT_NODE_MEM_MAP=y | 183 | CONFIG_FLAT_NODE_MEM_MAP=y |
184 | CONFIG_NEED_MULTIPLE_NODES=y | 184 | CONFIG_NEED_MULTIPLE_NODES=y |
185 | # CONFIG_SPARSEMEM_STATIC is not set | ||
186 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 185 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
187 | CONFIG_PAGEFLAGS_EXTENDED=y | 186 | CONFIG_PAGEFLAGS_EXTENDED=y |
188 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 187 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
189 | CONFIG_MIGRATION=y | 188 | CONFIG_MIGRATION=y |
190 | CONFIG_RESOURCES_64BIT=y | 189 | CONFIG_RESOURCES_64BIT=y |
190 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
191 | CONFIG_ZONE_DMA_FLAG=1 | 191 | CONFIG_ZONE_DMA_FLAG=1 |
192 | CONFIG_BOUNCE=y | 192 | CONFIG_BOUNCE=y |
193 | CONFIG_NR_QUICK=1 | 193 | CONFIG_NR_QUICK=1 |
194 | CONFIG_VIRT_TO_BUS=y | 194 | CONFIG_VIRT_TO_BUS=y |
195 | CONFIG_UNEVICTABLE_LRU=y | ||
195 | CONFIG_MMU_NOTIFIER=y | 196 | CONFIG_MMU_NOTIFIER=y |
196 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 197 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
197 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 198 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
@@ -231,12 +232,12 @@ CONFIG_EFI_VARS=y | |||
231 | CONFIG_EFI_PCDP=y | 232 | CONFIG_EFI_PCDP=y |
232 | CONFIG_DMIID=y | 233 | CONFIG_DMIID=y |
233 | CONFIG_BINFMT_ELF=y | 234 | CONFIG_BINFMT_ELF=y |
235 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
236 | # CONFIG_HAVE_AOUT is not set | ||
234 | CONFIG_BINFMT_MISC=m | 237 | CONFIG_BINFMT_MISC=m |
235 | 238 | ||
236 | # CONFIG_DMAR is not set | ||
237 | |||
238 | # | 239 | # |
239 | # Power management and ACPI | 240 | # Power management and ACPI options |
240 | # | 241 | # |
241 | CONFIG_PM=y | 242 | CONFIG_PM=y |
242 | # CONFIG_PM_DEBUG is not set | 243 | # CONFIG_PM_DEBUG is not set |
@@ -248,7 +249,6 @@ CONFIG_ACPI_PROC_EVENT=y | |||
248 | CONFIG_ACPI_BUTTON=m | 249 | CONFIG_ACPI_BUTTON=m |
249 | CONFIG_ACPI_FAN=m | 250 | CONFIG_ACPI_FAN=m |
250 | CONFIG_ACPI_DOCK=y | 251 | CONFIG_ACPI_DOCK=y |
251 | # CONFIG_ACPI_BAY is not set | ||
252 | CONFIG_ACPI_PROCESSOR=m | 252 | CONFIG_ACPI_PROCESSOR=m |
253 | CONFIG_ACPI_HOTPLUG_CPU=y | 253 | CONFIG_ACPI_HOTPLUG_CPU=y |
254 | CONFIG_ACPI_THERMAL=m | 254 | CONFIG_ACPI_THERMAL=m |
@@ -256,9 +256,7 @@ CONFIG_ACPI_NUMA=y | |||
256 | # CONFIG_ACPI_CUSTOM_DSDT is not set | 256 | # CONFIG_ACPI_CUSTOM_DSDT is not set |
257 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 257 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
258 | # CONFIG_ACPI_DEBUG is not set | 258 | # CONFIG_ACPI_DEBUG is not set |
259 | CONFIG_ACPI_EC=y | ||
260 | # CONFIG_ACPI_PCI_SLOT is not set | 259 | # CONFIG_ACPI_PCI_SLOT is not set |
261 | CONFIG_ACPI_POWER=y | ||
262 | CONFIG_ACPI_SYSTEM=y | 260 | CONFIG_ACPI_SYSTEM=y |
263 | CONFIG_ACPI_CONTAINER=m | 261 | CONFIG_ACPI_CONTAINER=m |
264 | 262 | ||
@@ -275,7 +273,7 @@ CONFIG_PCI_DOMAINS=y | |||
275 | CONFIG_PCI_SYSCALL=y | 273 | CONFIG_PCI_SYSCALL=y |
276 | # CONFIG_PCIEPORTBUS is not set | 274 | # CONFIG_PCIEPORTBUS is not set |
277 | CONFIG_ARCH_SUPPORTS_MSI=y | 275 | CONFIG_ARCH_SUPPORTS_MSI=y |
278 | # CONFIG_PCI_MSI is not set | 276 | CONFIG_PCI_MSI=y |
279 | CONFIG_PCI_LEGACY=y | 277 | CONFIG_PCI_LEGACY=y |
280 | # CONFIG_PCI_DEBUG is not set | 278 | # CONFIG_PCI_DEBUG is not set |
281 | CONFIG_HOTPLUG_PCI=m | 279 | CONFIG_HOTPLUG_PCI=m |
@@ -286,6 +284,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m | |||
286 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 284 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
287 | # CONFIG_HOTPLUG_PCI_SGI is not set | 285 | # CONFIG_HOTPLUG_PCI_SGI is not set |
288 | # CONFIG_PCCARD is not set | 286 | # CONFIG_PCCARD is not set |
287 | CONFIG_DMAR=y | ||
289 | CONFIG_NET=y | 288 | CONFIG_NET=y |
290 | 289 | ||
291 | # | 290 | # |
@@ -333,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
333 | # CONFIG_TIPC is not set | 332 | # CONFIG_TIPC is not set |
334 | # CONFIG_ATM is not set | 333 | # CONFIG_ATM is not set |
335 | # CONFIG_BRIDGE is not set | 334 | # CONFIG_BRIDGE is not set |
335 | # CONFIG_NET_DSA is not set | ||
336 | # CONFIG_VLAN_8021Q is not set | 336 | # CONFIG_VLAN_8021Q is not set |
337 | # CONFIG_DECNET is not set | 337 | # CONFIG_DECNET is not set |
338 | # CONFIG_LLC2 is not set | 338 | # CONFIG_LLC2 is not set |
@@ -353,11 +353,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
353 | # CONFIG_IRDA is not set | 353 | # CONFIG_IRDA is not set |
354 | # CONFIG_BT is not set | 354 | # CONFIG_BT is not set |
355 | # CONFIG_AF_RXRPC is not set | 355 | # CONFIG_AF_RXRPC is not set |
356 | 356 | # CONFIG_PHONET is not set | |
357 | # | 357 | CONFIG_WIRELESS=y |
358 | # Wireless | ||
359 | # | ||
360 | # CONFIG_CFG80211 is not set | 358 | # CONFIG_CFG80211 is not set |
359 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
361 | # CONFIG_WIRELESS_EXT is not set | 360 | # CONFIG_WIRELESS_EXT is not set |
362 | # CONFIG_MAC80211 is not set | 361 | # CONFIG_MAC80211 is not set |
363 | # CONFIG_IEEE80211 is not set | 362 | # CONFIG_IEEE80211 is not set |
@@ -385,7 +384,7 @@ CONFIG_PROC_EVENTS=y | |||
385 | # CONFIG_MTD is not set | 384 | # CONFIG_MTD is not set |
386 | # CONFIG_PARPORT is not set | 385 | # CONFIG_PARPORT is not set |
387 | CONFIG_PNP=y | 386 | CONFIG_PNP=y |
388 | # CONFIG_PNP_DEBUG is not set | 387 | # CONFIG_PNP_DEBUG_MESSAGES is not set |
389 | 388 | ||
390 | # | 389 | # |
391 | # Protocols | 390 | # Protocols |
@@ -419,10 +418,9 @@ CONFIG_SGI_XP=m | |||
419 | # CONFIG_HP_ILO is not set | 418 | # CONFIG_HP_ILO is not set |
420 | CONFIG_SGI_GRU=m | 419 | CONFIG_SGI_GRU=m |
421 | # CONFIG_SGI_GRU_DEBUG is not set | 420 | # CONFIG_SGI_GRU_DEBUG is not set |
421 | # CONFIG_C2PORT is not set | ||
422 | CONFIG_HAVE_IDE=y | 422 | CONFIG_HAVE_IDE=y |
423 | CONFIG_IDE=y | 423 | CONFIG_IDE=y |
424 | CONFIG_IDE_MAX_HWIFS=4 | ||
425 | CONFIG_BLK_DEV_IDE=y | ||
426 | 424 | ||
427 | # | 425 | # |
428 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 426 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
@@ -430,12 +428,12 @@ CONFIG_BLK_DEV_IDE=y | |||
430 | CONFIG_IDE_TIMINGS=y | 428 | CONFIG_IDE_TIMINGS=y |
431 | CONFIG_IDE_ATAPI=y | 429 | CONFIG_IDE_ATAPI=y |
432 | # CONFIG_BLK_DEV_IDE_SATA is not set | 430 | # CONFIG_BLK_DEV_IDE_SATA is not set |
433 | CONFIG_BLK_DEV_IDEDISK=y | 431 | CONFIG_IDE_GD=y |
434 | # CONFIG_IDEDISK_MULTI_MODE is not set | 432 | CONFIG_IDE_GD_ATA=y |
433 | # CONFIG_IDE_GD_ATAPI is not set | ||
435 | CONFIG_BLK_DEV_IDECD=y | 434 | CONFIG_BLK_DEV_IDECD=y |
436 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 435 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
437 | # CONFIG_BLK_DEV_IDETAPE is not set | 436 | # CONFIG_BLK_DEV_IDETAPE is not set |
438 | CONFIG_BLK_DEV_IDEFLOPPY=y | ||
439 | CONFIG_BLK_DEV_IDESCSI=m | 437 | CONFIG_BLK_DEV_IDESCSI=m |
440 | # CONFIG_BLK_DEV_IDEACPI is not set | 438 | # CONFIG_BLK_DEV_IDEACPI is not set |
441 | # CONFIG_IDE_TASK_IOCTL is not set | 439 | # CONFIG_IDE_TASK_IOCTL is not set |
@@ -705,6 +703,9 @@ CONFIG_TULIP=m | |||
705 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 703 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
706 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 704 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
707 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 705 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
706 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
707 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
708 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
708 | CONFIG_NET_PCI=y | 709 | CONFIG_NET_PCI=y |
709 | # CONFIG_PCNET32 is not set | 710 | # CONFIG_PCNET32 is not set |
710 | # CONFIG_AMD8111_ETH is not set | 711 | # CONFIG_AMD8111_ETH is not set |
@@ -725,11 +726,11 @@ CONFIG_E100=m | |||
725 | # CONFIG_TLAN is not set | 726 | # CONFIG_TLAN is not set |
726 | # CONFIG_VIA_RHINE is not set | 727 | # CONFIG_VIA_RHINE is not set |
727 | # CONFIG_SC92031 is not set | 728 | # CONFIG_SC92031 is not set |
729 | # CONFIG_ATL2 is not set | ||
728 | CONFIG_NETDEV_1000=y | 730 | CONFIG_NETDEV_1000=y |
729 | # CONFIG_ACENIC is not set | 731 | # CONFIG_ACENIC is not set |
730 | # CONFIG_DL2K is not set | 732 | # CONFIG_DL2K is not set |
731 | CONFIG_E1000=y | 733 | CONFIG_E1000=y |
732 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
733 | # CONFIG_E1000E is not set | 734 | # CONFIG_E1000E is not set |
734 | # CONFIG_IP1000 is not set | 735 | # CONFIG_IP1000 is not set |
735 | CONFIG_IGB=y | 736 | CONFIG_IGB=y |
@@ -747,18 +748,22 @@ CONFIG_TIGON3=y | |||
747 | # CONFIG_QLA3XXX is not set | 748 | # CONFIG_QLA3XXX is not set |
748 | # CONFIG_ATL1 is not set | 749 | # CONFIG_ATL1 is not set |
749 | # CONFIG_ATL1E is not set | 750 | # CONFIG_ATL1E is not set |
751 | # CONFIG_JME is not set | ||
750 | CONFIG_NETDEV_10000=y | 752 | CONFIG_NETDEV_10000=y |
751 | # CONFIG_CHELSIO_T1 is not set | 753 | # CONFIG_CHELSIO_T1 is not set |
752 | # CONFIG_CHELSIO_T3 is not set | 754 | # CONFIG_CHELSIO_T3 is not set |
755 | # CONFIG_ENIC is not set | ||
753 | # CONFIG_IXGBE is not set | 756 | # CONFIG_IXGBE is not set |
754 | # CONFIG_IXGB is not set | 757 | # CONFIG_IXGB is not set |
755 | # CONFIG_S2IO is not set | 758 | # CONFIG_S2IO is not set |
756 | # CONFIG_MYRI10GE is not set | 759 | # CONFIG_MYRI10GE is not set |
757 | # CONFIG_NETXEN_NIC is not set | 760 | # CONFIG_NETXEN_NIC is not set |
758 | # CONFIG_NIU is not set | 761 | # CONFIG_NIU is not set |
762 | # CONFIG_MLX4_EN is not set | ||
759 | # CONFIG_MLX4_CORE is not set | 763 | # CONFIG_MLX4_CORE is not set |
760 | # CONFIG_TEHUTI is not set | 764 | # CONFIG_TEHUTI is not set |
761 | # CONFIG_BNX2X is not set | 765 | # CONFIG_BNX2X is not set |
766 | # CONFIG_QLGE is not set | ||
762 | # CONFIG_SFC is not set | 767 | # CONFIG_SFC is not set |
763 | # CONFIG_TR is not set | 768 | # CONFIG_TR is not set |
764 | 769 | ||
@@ -826,9 +831,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
826 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 831 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
827 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 832 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
828 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 833 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
834 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
829 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 835 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
830 | # CONFIG_MOUSE_SERIAL is not set | 836 | # CONFIG_MOUSE_SERIAL is not set |
831 | # CONFIG_MOUSE_APPLETOUCH is not set | 837 | # CONFIG_MOUSE_APPLETOUCH is not set |
838 | # CONFIG_MOUSE_BCM5974 is not set | ||
832 | # CONFIG_MOUSE_VSXXXAA is not set | 839 | # CONFIG_MOUSE_VSXXXAA is not set |
833 | # CONFIG_INPUT_JOYSTICK is not set | 840 | # CONFIG_INPUT_JOYSTICK is not set |
834 | # CONFIG_INPUT_TABLET is not set | 841 | # CONFIG_INPUT_TABLET is not set |
@@ -942,15 +949,16 @@ CONFIG_HWMON=y | |||
942 | # CONFIG_SENSORS_VT8231 is not set | 949 | # CONFIG_SENSORS_VT8231 is not set |
943 | # CONFIG_SENSORS_W83627HF is not set | 950 | # CONFIG_SENSORS_W83627HF is not set |
944 | # CONFIG_SENSORS_W83627EHF is not set | 951 | # CONFIG_SENSORS_W83627EHF is not set |
952 | # CONFIG_SENSORS_LIS3LV02D is not set | ||
945 | # CONFIG_HWMON_DEBUG_CHIP is not set | 953 | # CONFIG_HWMON_DEBUG_CHIP is not set |
946 | CONFIG_THERMAL=m | 954 | CONFIG_THERMAL=m |
947 | # CONFIG_THERMAL_HWMON is not set | 955 | # CONFIG_THERMAL_HWMON is not set |
948 | # CONFIG_WATCHDOG is not set | 956 | # CONFIG_WATCHDOG is not set |
957 | CONFIG_SSB_POSSIBLE=y | ||
949 | 958 | ||
950 | # | 959 | # |
951 | # Sonics Silicon Backplane | 960 | # Sonics Silicon Backplane |
952 | # | 961 | # |
953 | CONFIG_SSB_POSSIBLE=y | ||
954 | # CONFIG_SSB is not set | 962 | # CONFIG_SSB is not set |
955 | 963 | ||
956 | # | 964 | # |
@@ -959,6 +967,8 @@ CONFIG_SSB_POSSIBLE=y | |||
959 | # CONFIG_MFD_CORE is not set | 967 | # CONFIG_MFD_CORE is not set |
960 | # CONFIG_MFD_SM501 is not set | 968 | # CONFIG_MFD_SM501 is not set |
961 | # CONFIG_HTC_PASIC3 is not set | 969 | # CONFIG_HTC_PASIC3 is not set |
970 | # CONFIG_MFD_TMIO is not set | ||
971 | # CONFIG_REGULATOR is not set | ||
962 | 972 | ||
963 | # | 973 | # |
964 | # Multimedia devices | 974 | # Multimedia devices |
@@ -1009,6 +1019,7 @@ CONFIG_VGA_CONSOLE=y | |||
1009 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1019 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
1010 | CONFIG_DUMMY_CONSOLE=y | 1020 | CONFIG_DUMMY_CONSOLE=y |
1011 | CONFIG_SOUND=m | 1021 | CONFIG_SOUND=m |
1022 | CONFIG_SOUND_OSS_CORE=y | ||
1012 | CONFIG_SND=m | 1023 | CONFIG_SND=m |
1013 | CONFIG_SND_TIMER=m | 1024 | CONFIG_SND_TIMER=m |
1014 | CONFIG_SND_PCM=m | 1025 | CONFIG_SND_PCM=m |
@@ -1113,8 +1124,7 @@ CONFIG_HID=y | |||
1113 | # USB Input Devices | 1124 | # USB Input Devices |
1114 | # | 1125 | # |
1115 | CONFIG_USB_HID=m | 1126 | CONFIG_USB_HID=m |
1116 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1127 | # CONFIG_HID_PID is not set |
1117 | # CONFIG_HID_FF is not set | ||
1118 | # CONFIG_USB_HIDDEV is not set | 1128 | # CONFIG_USB_HIDDEV is not set |
1119 | 1129 | ||
1120 | # | 1130 | # |
@@ -1122,6 +1132,34 @@ CONFIG_USB_HID=m | |||
1122 | # | 1132 | # |
1123 | # CONFIG_USB_KBD is not set | 1133 | # CONFIG_USB_KBD is not set |
1124 | # CONFIG_USB_MOUSE is not set | 1134 | # CONFIG_USB_MOUSE is not set |
1135 | |||
1136 | # | ||
1137 | # Special HID drivers | ||
1138 | # | ||
1139 | CONFIG_HID_COMPAT=y | ||
1140 | CONFIG_HID_A4TECH=m | ||
1141 | CONFIG_HID_APPLE=m | ||
1142 | CONFIG_HID_BELKIN=m | ||
1143 | CONFIG_HID_BRIGHT=m | ||
1144 | CONFIG_HID_CHERRY=m | ||
1145 | CONFIG_HID_CHICONY=m | ||
1146 | CONFIG_HID_CYPRESS=m | ||
1147 | CONFIG_HID_DELL=m | ||
1148 | CONFIG_HID_EZKEY=m | ||
1149 | CONFIG_HID_GYRATION=m | ||
1150 | CONFIG_HID_LOGITECH=m | ||
1151 | # CONFIG_LOGITECH_FF is not set | ||
1152 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
1153 | CONFIG_HID_MICROSOFT=m | ||
1154 | CONFIG_HID_MONTEREY=m | ||
1155 | CONFIG_HID_PANTHERLORD=m | ||
1156 | # CONFIG_PANTHERLORD_FF is not set | ||
1157 | CONFIG_HID_PETALYNX=m | ||
1158 | CONFIG_HID_SAMSUNG=m | ||
1159 | CONFIG_HID_SONY=m | ||
1160 | CONFIG_HID_SUNPLUS=m | ||
1161 | # CONFIG_THRUSTMASTER_FF is not set | ||
1162 | # CONFIG_ZEROPLUS_FF is not set | ||
1125 | CONFIG_USB_SUPPORT=y | 1163 | CONFIG_USB_SUPPORT=y |
1126 | CONFIG_USB_ARCH_HAS_HCD=y | 1164 | CONFIG_USB_ARCH_HAS_HCD=y |
1127 | CONFIG_USB_ARCH_HAS_OHCI=y | 1165 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1138,6 +1176,9 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1138 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1176 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1139 | # CONFIG_USB_SUSPEND is not set | 1177 | # CONFIG_USB_SUSPEND is not set |
1140 | # CONFIG_USB_OTG is not set | 1178 | # CONFIG_USB_OTG is not set |
1179 | CONFIG_USB_MON=y | ||
1180 | # CONFIG_USB_WUSB is not set | ||
1181 | # CONFIG_USB_WUSB_CBAF is not set | ||
1141 | 1182 | ||
1142 | # | 1183 | # |
1143 | # USB Host Controller Drivers | 1184 | # USB Host Controller Drivers |
@@ -1155,6 +1196,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1155 | CONFIG_USB_UHCI_HCD=m | 1196 | CONFIG_USB_UHCI_HCD=m |
1156 | # CONFIG_USB_SL811_HCD is not set | 1197 | # CONFIG_USB_SL811_HCD is not set |
1157 | # CONFIG_USB_R8A66597_HCD is not set | 1198 | # CONFIG_USB_R8A66597_HCD is not set |
1199 | # CONFIG_USB_WHCI_HCD is not set | ||
1200 | # CONFIG_USB_HWA_HCD is not set | ||
1201 | |||
1202 | # | ||
1203 | # Enable Host or Gadget support to see Inventra options | ||
1204 | # | ||
1158 | 1205 | ||
1159 | # | 1206 | # |
1160 | # USB Device Class drivers | 1207 | # USB Device Class drivers |
@@ -1162,13 +1209,14 @@ CONFIG_USB_UHCI_HCD=m | |||
1162 | # CONFIG_USB_ACM is not set | 1209 | # CONFIG_USB_ACM is not set |
1163 | # CONFIG_USB_PRINTER is not set | 1210 | # CONFIG_USB_PRINTER is not set |
1164 | # CONFIG_USB_WDM is not set | 1211 | # CONFIG_USB_WDM is not set |
1212 | # CONFIG_USB_TMC is not set | ||
1165 | 1213 | ||
1166 | # | 1214 | # |
1167 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1215 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
1168 | # | 1216 | # |
1169 | 1217 | ||
1170 | # | 1218 | # |
1171 | # may also be needed; see USB_STORAGE Help for more information | 1219 | # see USB_STORAGE Help for more information |
1172 | # | 1220 | # |
1173 | CONFIG_USB_STORAGE=m | 1221 | CONFIG_USB_STORAGE=m |
1174 | # CONFIG_USB_STORAGE_DEBUG is not set | 1222 | # CONFIG_USB_STORAGE_DEBUG is not set |
@@ -1191,7 +1239,6 @@ CONFIG_USB_STORAGE=m | |||
1191 | # | 1239 | # |
1192 | # CONFIG_USB_MDC800 is not set | 1240 | # CONFIG_USB_MDC800 is not set |
1193 | # CONFIG_USB_MICROTEK is not set | 1241 | # CONFIG_USB_MICROTEK is not set |
1194 | CONFIG_USB_MON=y | ||
1195 | 1242 | ||
1196 | # | 1243 | # |
1197 | # USB port drivers | 1244 | # USB port drivers |
@@ -1204,7 +1251,7 @@ CONFIG_USB_MON=y | |||
1204 | # CONFIG_USB_EMI62 is not set | 1251 | # CONFIG_USB_EMI62 is not set |
1205 | # CONFIG_USB_EMI26 is not set | 1252 | # CONFIG_USB_EMI26 is not set |
1206 | # CONFIG_USB_ADUTUX is not set | 1253 | # CONFIG_USB_ADUTUX is not set |
1207 | # CONFIG_USB_AUERSWALD is not set | 1254 | # CONFIG_USB_SEVSEG is not set |
1208 | # CONFIG_USB_RIO500 is not set | 1255 | # CONFIG_USB_RIO500 is not set |
1209 | # CONFIG_USB_LEGOTOWER is not set | 1256 | # CONFIG_USB_LEGOTOWER is not set |
1210 | # CONFIG_USB_LCD is not set | 1257 | # CONFIG_USB_LCD is not set |
@@ -1222,7 +1269,9 @@ CONFIG_USB_MON=y | |||
1222 | # CONFIG_USB_IOWARRIOR is not set | 1269 | # CONFIG_USB_IOWARRIOR is not set |
1223 | # CONFIG_USB_TEST is not set | 1270 | # CONFIG_USB_TEST is not set |
1224 | # CONFIG_USB_ISIGHTFW is not set | 1271 | # CONFIG_USB_ISIGHTFW is not set |
1272 | # CONFIG_USB_VST is not set | ||
1225 | # CONFIG_USB_GADGET is not set | 1273 | # CONFIG_USB_GADGET is not set |
1274 | # CONFIG_UWB is not set | ||
1226 | # CONFIG_MMC is not set | 1275 | # CONFIG_MMC is not set |
1227 | # CONFIG_MEMSTICK is not set | 1276 | # CONFIG_MEMSTICK is not set |
1228 | # CONFIG_NEW_LEDS is not set | 1277 | # CONFIG_NEW_LEDS is not set |
@@ -1246,6 +1295,15 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
1246 | # CONFIG_RTC_CLASS is not set | 1295 | # CONFIG_RTC_CLASS is not set |
1247 | # CONFIG_DMADEVICES is not set | 1296 | # CONFIG_DMADEVICES is not set |
1248 | # CONFIG_UIO is not set | 1297 | # CONFIG_UIO is not set |
1298 | # CONFIG_STAGING is not set | ||
1299 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
1300 | |||
1301 | # | ||
1302 | # HP Simulator drivers | ||
1303 | # | ||
1304 | # CONFIG_HP_SIMETH is not set | ||
1305 | # CONFIG_HP_SIMSERIAL is not set | ||
1306 | # CONFIG_HP_SIMSCSI is not set | ||
1249 | CONFIG_MSPEC=m | 1307 | CONFIG_MSPEC=m |
1250 | 1308 | ||
1251 | # | 1309 | # |
@@ -1260,7 +1318,7 @@ CONFIG_EXT3_FS=y | |||
1260 | CONFIG_EXT3_FS_XATTR=y | 1318 | CONFIG_EXT3_FS_XATTR=y |
1261 | CONFIG_EXT3_FS_POSIX_ACL=y | 1319 | CONFIG_EXT3_FS_POSIX_ACL=y |
1262 | CONFIG_EXT3_FS_SECURITY=y | 1320 | CONFIG_EXT3_FS_SECURITY=y |
1263 | # CONFIG_EXT4DEV_FS is not set | 1321 | # CONFIG_EXT4_FS is not set |
1264 | CONFIG_JBD=y | 1322 | CONFIG_JBD=y |
1265 | CONFIG_FS_MBCACHE=y | 1323 | CONFIG_FS_MBCACHE=y |
1266 | CONFIG_REISERFS_FS=y | 1324 | CONFIG_REISERFS_FS=y |
@@ -1271,6 +1329,7 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
1271 | CONFIG_REISERFS_FS_SECURITY=y | 1329 | CONFIG_REISERFS_FS_SECURITY=y |
1272 | # CONFIG_JFS_FS is not set | 1330 | # CONFIG_JFS_FS is not set |
1273 | CONFIG_FS_POSIX_ACL=y | 1331 | CONFIG_FS_POSIX_ACL=y |
1332 | CONFIG_FILE_LOCKING=y | ||
1274 | CONFIG_XFS_FS=y | 1333 | CONFIG_XFS_FS=y |
1275 | # CONFIG_XFS_QUOTA is not set | 1334 | # CONFIG_XFS_QUOTA is not set |
1276 | # CONFIG_XFS_POSIX_ACL is not set | 1335 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -1282,8 +1341,8 @@ CONFIG_DNOTIFY=y | |||
1282 | CONFIG_INOTIFY=y | 1341 | CONFIG_INOTIFY=y |
1283 | CONFIG_INOTIFY_USER=y | 1342 | CONFIG_INOTIFY_USER=y |
1284 | # CONFIG_QUOTA is not set | 1343 | # CONFIG_QUOTA is not set |
1285 | CONFIG_AUTOFS_FS=y | 1344 | CONFIG_AUTOFS_FS=m |
1286 | CONFIG_AUTOFS4_FS=y | 1345 | CONFIG_AUTOFS4_FS=m |
1287 | # CONFIG_FUSE_FS is not set | 1346 | # CONFIG_FUSE_FS is not set |
1288 | 1347 | ||
1289 | # | 1348 | # |
@@ -1314,6 +1373,7 @@ CONFIG_PROC_FS=y | |||
1314 | CONFIG_PROC_KCORE=y | 1373 | CONFIG_PROC_KCORE=y |
1315 | CONFIG_PROC_VMCORE=y | 1374 | CONFIG_PROC_VMCORE=y |
1316 | CONFIG_PROC_SYSCTL=y | 1375 | CONFIG_PROC_SYSCTL=y |
1376 | CONFIG_PROC_PAGE_MONITOR=y | ||
1317 | CONFIG_SYSFS=y | 1377 | CONFIG_SYSFS=y |
1318 | CONFIG_TMPFS=y | 1378 | CONFIG_TMPFS=y |
1319 | # CONFIG_TMPFS_POSIX_ACL is not set | 1379 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -1356,6 +1416,7 @@ CONFIG_NFS_COMMON=y | |||
1356 | CONFIG_SUNRPC=m | 1416 | CONFIG_SUNRPC=m |
1357 | CONFIG_SUNRPC_GSS=m | 1417 | CONFIG_SUNRPC_GSS=m |
1358 | CONFIG_SUNRPC_XPRT_RDMA=m | 1418 | CONFIG_SUNRPC_XPRT_RDMA=m |
1419 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1359 | CONFIG_RPCSEC_GSS_KRB5=m | 1420 | CONFIG_RPCSEC_GSS_KRB5=m |
1360 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1421 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1361 | CONFIG_SMB_FS=m | 1422 | CONFIG_SMB_FS=m |
@@ -1433,38 +1494,6 @@ CONFIG_NLS_KOI8_R=m | |||
1433 | CONFIG_NLS_KOI8_U=m | 1494 | CONFIG_NLS_KOI8_U=m |
1434 | CONFIG_NLS_UTF8=m | 1495 | CONFIG_NLS_UTF8=m |
1435 | # CONFIG_DLM is not set | 1496 | # CONFIG_DLM is not set |
1436 | CONFIG_HAVE_KVM=y | ||
1437 | CONFIG_VIRTUALIZATION=y | ||
1438 | # CONFIG_KVM is not set | ||
1439 | |||
1440 | # | ||
1441 | # Library routines | ||
1442 | # | ||
1443 | CONFIG_BITREVERSE=y | ||
1444 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1445 | # CONFIG_CRC_CCITT is not set | ||
1446 | # CONFIG_CRC16 is not set | ||
1447 | CONFIG_CRC_T10DIF=y | ||
1448 | CONFIG_CRC_ITU_T=m | ||
1449 | CONFIG_CRC32=y | ||
1450 | # CONFIG_CRC7 is not set | ||
1451 | # CONFIG_LIBCRC32C is not set | ||
1452 | CONFIG_GENERIC_ALLOCATOR=y | ||
1453 | CONFIG_PLIST=y | ||
1454 | CONFIG_HAS_IOMEM=y | ||
1455 | CONFIG_HAS_IOPORT=y | ||
1456 | CONFIG_HAS_DMA=y | ||
1457 | CONFIG_GENERIC_HARDIRQS=y | ||
1458 | CONFIG_GENERIC_IRQ_PROBE=y | ||
1459 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1460 | CONFIG_IRQ_PER_CPU=y | ||
1461 | |||
1462 | # | ||
1463 | # HP Simulator drivers | ||
1464 | # | ||
1465 | # CONFIG_HP_SIMETH is not set | ||
1466 | # CONFIG_HP_SIMSERIAL is not set | ||
1467 | # CONFIG_HP_SIMSCSI is not set | ||
1468 | 1497 | ||
1469 | # | 1498 | # |
1470 | # Kernel hacking | 1499 | # Kernel hacking |
@@ -1503,8 +1532,19 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
1503 | # CONFIG_DEBUG_SG is not set | 1532 | # CONFIG_DEBUG_SG is not set |
1504 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1533 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1505 | # CONFIG_RCU_TORTURE_TEST is not set | 1534 | # CONFIG_RCU_TORTURE_TEST is not set |
1535 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1506 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1536 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1537 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1507 | # CONFIG_FAULT_INJECTION is not set | 1538 | # CONFIG_FAULT_INJECTION is not set |
1539 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1540 | |||
1541 | # | ||
1542 | # Tracers | ||
1543 | # | ||
1544 | # CONFIG_SCHED_TRACER is not set | ||
1545 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1546 | # CONFIG_BOOT_TRACER is not set | ||
1547 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1508 | # CONFIG_SAMPLES is not set | 1548 | # CONFIG_SAMPLES is not set |
1509 | CONFIG_IA64_GRANULE_16MB=y | 1549 | CONFIG_IA64_GRANULE_16MB=y |
1510 | # CONFIG_IA64_GRANULE_64MB is not set | 1550 | # CONFIG_IA64_GRANULE_64MB is not set |
@@ -1519,14 +1559,19 @@ CONFIG_SYSVIPC_COMPAT=y | |||
1519 | # | 1559 | # |
1520 | # CONFIG_KEYS is not set | 1560 | # CONFIG_KEYS is not set |
1521 | # CONFIG_SECURITY is not set | 1561 | # CONFIG_SECURITY is not set |
1562 | # CONFIG_SECURITYFS is not set | ||
1522 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1563 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1523 | CONFIG_CRYPTO=y | 1564 | CONFIG_CRYPTO=y |
1524 | 1565 | ||
1525 | # | 1566 | # |
1526 | # Crypto core or helper | 1567 | # Crypto core or helper |
1527 | # | 1568 | # |
1569 | # CONFIG_CRYPTO_FIPS is not set | ||
1528 | CONFIG_CRYPTO_ALGAPI=y | 1570 | CONFIG_CRYPTO_ALGAPI=y |
1571 | CONFIG_CRYPTO_AEAD=m | ||
1529 | CONFIG_CRYPTO_BLKCIPHER=m | 1572 | CONFIG_CRYPTO_BLKCIPHER=m |
1573 | CONFIG_CRYPTO_HASH=m | ||
1574 | CONFIG_CRYPTO_RNG=m | ||
1530 | CONFIG_CRYPTO_MANAGER=m | 1575 | CONFIG_CRYPTO_MANAGER=m |
1531 | # CONFIG_CRYPTO_GF128MUL is not set | 1576 | # CONFIG_CRYPTO_GF128MUL is not set |
1532 | # CONFIG_CRYPTO_NULL is not set | 1577 | # CONFIG_CRYPTO_NULL is not set |
@@ -1599,5 +1644,36 @@ CONFIG_CRYPTO_DES=m | |||
1599 | # | 1644 | # |
1600 | # CONFIG_CRYPTO_DEFLATE is not set | 1645 | # CONFIG_CRYPTO_DEFLATE is not set |
1601 | # CONFIG_CRYPTO_LZO is not set | 1646 | # CONFIG_CRYPTO_LZO is not set |
1647 | |||
1648 | # | ||
1649 | # Random Number Generation | ||
1650 | # | ||
1651 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1602 | CONFIG_CRYPTO_HW=y | 1652 | CONFIG_CRYPTO_HW=y |
1603 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1653 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1654 | CONFIG_HAVE_KVM=y | ||
1655 | CONFIG_VIRTUALIZATION=y | ||
1656 | # CONFIG_KVM is not set | ||
1657 | # CONFIG_VIRTIO_PCI is not set | ||
1658 | # CONFIG_VIRTIO_BALLOON is not set | ||
1659 | |||
1660 | # | ||
1661 | # Library routines | ||
1662 | # | ||
1663 | CONFIG_BITREVERSE=y | ||
1664 | # CONFIG_CRC_CCITT is not set | ||
1665 | # CONFIG_CRC16 is not set | ||
1666 | CONFIG_CRC_T10DIF=y | ||
1667 | CONFIG_CRC_ITU_T=m | ||
1668 | CONFIG_CRC32=y | ||
1669 | # CONFIG_CRC7 is not set | ||
1670 | # CONFIG_LIBCRC32C is not set | ||
1671 | CONFIG_GENERIC_ALLOCATOR=y | ||
1672 | CONFIG_PLIST=y | ||
1673 | CONFIG_HAS_IOMEM=y | ||
1674 | CONFIG_HAS_IOPORT=y | ||
1675 | CONFIG_HAS_DMA=y | ||
1676 | CONFIG_GENERIC_HARDIRQS=y | ||
1677 | CONFIG_GENERIC_IRQ_PROBE=y | ||
1678 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1679 | CONFIG_IRQ_PER_CPU=y | ||
diff --git a/arch/ia64/hp/sim/Kconfig b/arch/ia64/hp/sim/Kconfig index f92306bbedb8..8d513a8c5266 100644 --- a/arch/ia64/hp/sim/Kconfig +++ b/arch/ia64/hp/sim/Kconfig | |||
@@ -4,6 +4,7 @@ menu "HP Simulator drivers" | |||
4 | 4 | ||
5 | config HP_SIMETH | 5 | config HP_SIMETH |
6 | bool "Simulated Ethernet " | 6 | bool "Simulated Ethernet " |
7 | depends on NET | ||
7 | 8 | ||
8 | config HP_SIMSERIAL | 9 | config HP_SIMSERIAL |
9 | bool "Simulated serial driver support" | 10 | bool "Simulated serial driver support" |
diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c index c2f58ff364e7..cc0a3182db3c 100644 --- a/arch/ia64/hp/sim/hpsim_irq.c +++ b/arch/ia64/hp/sim/hpsim_irq.c | |||
@@ -22,7 +22,7 @@ hpsim_irq_noop (unsigned int irq) | |||
22 | } | 22 | } |
23 | 23 | ||
24 | static void | 24 | static void |
25 | hpsim_set_affinity_noop (unsigned int a, cpumask_t b) | 25 | hpsim_set_affinity_noop(unsigned int a, const struct cpumask *b) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
diff --git a/arch/ia64/include/asm/intrinsics.h b/arch/ia64/include/asm/intrinsics.h index 47d686dba1eb..a3e44a5ed497 100644 --- a/arch/ia64/include/asm/intrinsics.h +++ b/arch/ia64/include/asm/intrinsics.h | |||
@@ -226,7 +226,7 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); | |||
226 | /************************************************/ | 226 | /************************************************/ |
227 | #define ia64_ssm IA64_INTRINSIC_MACRO(ssm) | 227 | #define ia64_ssm IA64_INTRINSIC_MACRO(ssm) |
228 | #define ia64_rsm IA64_INTRINSIC_MACRO(rsm) | 228 | #define ia64_rsm IA64_INTRINSIC_MACRO(rsm) |
229 | #define ia64_getreg IA64_INTRINSIC_API(getreg) | 229 | #define ia64_getreg IA64_INTRINSIC_MACRO(getreg) |
230 | #define ia64_setreg IA64_INTRINSIC_API(setreg) | 230 | #define ia64_setreg IA64_INTRINSIC_API(setreg) |
231 | #define ia64_set_rr IA64_INTRINSIC_API(set_rr) | 231 | #define ia64_set_rr IA64_INTRINSIC_API(set_rr) |
232 | #define ia64_get_rr IA64_INTRINSIC_API(get_rr) | 232 | #define ia64_get_rr IA64_INTRINSIC_API(get_rr) |
diff --git a/arch/ia64/include/asm/paravirt_privop.h b/arch/ia64/include/asm/paravirt_privop.h index d577aac11835..33c8e55f5775 100644 --- a/arch/ia64/include/asm/paravirt_privop.h +++ b/arch/ia64/include/asm/paravirt_privop.h | |||
@@ -78,6 +78,18 @@ extern unsigned long ia64_native_getreg_func(int regnum); | |||
78 | ia64_native_rsm(mask); \ | 78 | ia64_native_rsm(mask); \ |
79 | } while (0) | 79 | } while (0) |
80 | 80 | ||
81 | /* returned ip value should be the one in the caller, | ||
82 | * not in __paravirt_getreg() */ | ||
83 | #define paravirt_getreg(reg) \ | ||
84 | ({ \ | ||
85 | unsigned long res; \ | ||
86 | if ((reg) == _IA64_REG_IP) \ | ||
87 | res = ia64_native_getreg(_IA64_REG_IP); \ | ||
88 | else \ | ||
89 | res = pv_cpu_ops.getreg(reg); \ | ||
90 | res; \ | ||
91 | }) | ||
92 | |||
81 | /****************************************************************************** | 93 | /****************************************************************************** |
82 | * replacement of hand written assembly codes. | 94 | * replacement of hand written assembly codes. |
83 | */ | 95 | */ |
diff --git a/arch/ia64/include/asm/ptrace.h b/arch/ia64/include/asm/ptrace.h index 6417c1ecb44e..14055c636adf 100644 --- a/arch/ia64/include/asm/ptrace.h +++ b/arch/ia64/include/asm/ptrace.h | |||
@@ -325,8 +325,6 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) | |||
325 | #define arch_has_block_step() (1) | 325 | #define arch_has_block_step() (1) |
326 | extern void user_enable_block_step(struct task_struct *); | 326 | extern void user_enable_block_step(struct task_struct *); |
327 | 327 | ||
328 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
329 | |||
330 | #endif /* !__KERNEL__ */ | 328 | #endif /* !__KERNEL__ */ |
331 | 329 | ||
332 | /* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */ | 330 | /* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */ |
diff --git a/arch/ia64/include/asm/smp.h b/arch/ia64/include/asm/smp.h index 12d96e0cd513..21c402365d0e 100644 --- a/arch/ia64/include/asm/smp.h +++ b/arch/ia64/include/asm/smp.h | |||
@@ -57,7 +57,6 @@ extern struct smp_boot_data { | |||
57 | 57 | ||
58 | extern char no_int_routing __devinitdata; | 58 | extern char no_int_routing __devinitdata; |
59 | 59 | ||
60 | extern cpumask_t cpu_online_map; | ||
61 | extern cpumask_t cpu_core_map[NR_CPUS]; | 60 | extern cpumask_t cpu_core_map[NR_CPUS]; |
62 | DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); | 61 | DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); |
63 | extern int smp_num_siblings; | 62 | extern int smp_num_siblings; |
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index 35bcb641c9e5..a3cc9f65f954 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h | |||
@@ -55,7 +55,6 @@ | |||
55 | void build_cpu_to_node_map(void); | 55 | void build_cpu_to_node_map(void); |
56 | 56 | ||
57 | #define SD_CPU_INIT (struct sched_domain) { \ | 57 | #define SD_CPU_INIT (struct sched_domain) { \ |
58 | .span = CPU_MASK_NONE, \ | ||
59 | .parent = NULL, \ | 58 | .parent = NULL, \ |
60 | .child = NULL, \ | 59 | .child = NULL, \ |
61 | .groups = NULL, \ | 60 | .groups = NULL, \ |
@@ -80,7 +79,6 @@ void build_cpu_to_node_map(void); | |||
80 | 79 | ||
81 | /* sched_domains SD_NODE_INIT for IA64 NUMA machines */ | 80 | /* sched_domains SD_NODE_INIT for IA64 NUMA machines */ |
82 | #define SD_NODE_INIT (struct sched_domain) { \ | 81 | #define SD_NODE_INIT (struct sched_domain) { \ |
83 | .span = CPU_MASK_NONE, \ | ||
84 | .parent = NULL, \ | 82 | .parent = NULL, \ |
85 | .child = NULL, \ | 83 | .child = NULL, \ |
86 | .groups = NULL, \ | 84 | .groups = NULL, \ |
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 7ef0c594f5ed..d435f4a7a96c 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -499,6 +499,7 @@ GLOBAL_ENTRY(prefetch_stack) | |||
499 | END(prefetch_stack) | 499 | END(prefetch_stack) |
500 | 500 | ||
501 | GLOBAL_ENTRY(kernel_execve) | 501 | GLOBAL_ENTRY(kernel_execve) |
502 | rum psr.ac | ||
502 | mov r15=__NR_execve // put syscall number in place | 503 | mov r15=__NR_execve // put syscall number in place |
503 | break __BREAK_SYSCALL | 504 | break __BREAK_SYSCALL |
504 | br.ret.sptk.many rp | 505 | br.ret.sptk.many rp |
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S index 66e491d8baac..59301c472800 100644 --- a/arch/ia64/kernel/head.S +++ b/arch/ia64/kernel/head.S | |||
@@ -260,7 +260,7 @@ start_ap: | |||
260 | * Switch into virtual mode: | 260 | * Switch into virtual mode: |
261 | */ | 261 | */ |
262 | movl r16=(IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH|IA64_PSR_BN \ | 262 | movl r16=(IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH|IA64_PSR_BN \ |
263 | |IA64_PSR_DI) | 263 | |IA64_PSR_DI|IA64_PSR_AC) |
264 | ;; | 264 | ;; |
265 | mov cr.ipsr=r16 | 265 | mov cr.ipsr=r16 |
266 | movl r17=1f | 266 | movl r17=1f |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 5c4674ae8aea..c8adecd5b416 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -330,25 +330,25 @@ unmask_irq (unsigned int irq) | |||
330 | 330 | ||
331 | 331 | ||
332 | static void | 332 | static void |
333 | iosapic_set_affinity (unsigned int irq, cpumask_t mask) | 333 | iosapic_set_affinity(unsigned int irq, const struct cpumask *mask) |
334 | { | 334 | { |
335 | #ifdef CONFIG_SMP | 335 | #ifdef CONFIG_SMP |
336 | u32 high32, low32; | 336 | u32 high32, low32; |
337 | int dest, rte_index; | 337 | int cpu, dest, rte_index; |
338 | int redir = (irq & IA64_IRQ_REDIRECTED) ? 1 : 0; | 338 | int redir = (irq & IA64_IRQ_REDIRECTED) ? 1 : 0; |
339 | struct iosapic_rte_info *rte; | 339 | struct iosapic_rte_info *rte; |
340 | struct iosapic *iosapic; | 340 | struct iosapic *iosapic; |
341 | 341 | ||
342 | irq &= (~IA64_IRQ_REDIRECTED); | 342 | irq &= (~IA64_IRQ_REDIRECTED); |
343 | 343 | ||
344 | cpus_and(mask, mask, cpu_online_map); | 344 | cpu = cpumask_first_and(cpu_online_mask, mask); |
345 | if (cpus_empty(mask)) | 345 | if (cpu >= nr_cpu_ids) |
346 | return; | 346 | return; |
347 | 347 | ||
348 | if (irq_prepare_move(irq, first_cpu(mask))) | 348 | if (irq_prepare_move(irq, cpu)) |
349 | return; | 349 | return; |
350 | 350 | ||
351 | dest = cpu_physical_id(first_cpu(mask)); | 351 | dest = cpu_physical_id(cpu); |
352 | 352 | ||
353 | if (!iosapic_intr_info[irq].count) | 353 | if (!iosapic_intr_info[irq].count) |
354 | return; /* not an IOSAPIC interrupt */ | 354 | return; /* not an IOSAPIC interrupt */ |
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 7fd18f54c056..0b6db53fedcf 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c | |||
@@ -133,7 +133,6 @@ unsigned int vectors_in_migration[NR_IRQS]; | |||
133 | */ | 133 | */ |
134 | static void migrate_irqs(void) | 134 | static void migrate_irqs(void) |
135 | { | 135 | { |
136 | cpumask_t mask; | ||
137 | irq_desc_t *desc; | 136 | irq_desc_t *desc; |
138 | int irq, new_cpu; | 137 | int irq, new_cpu; |
139 | 138 | ||
@@ -152,15 +151,14 @@ static void migrate_irqs(void) | |||
152 | if (desc->status == IRQ_PER_CPU) | 151 | if (desc->status == IRQ_PER_CPU) |
153 | continue; | 152 | continue; |
154 | 153 | ||
155 | cpus_and(mask, irq_desc[irq].affinity, cpu_online_map); | 154 | if (cpumask_any_and(&irq_desc[irq].affinity, cpu_online_mask) |
156 | if (any_online_cpu(mask) == NR_CPUS) { | 155 | >= nr_cpu_ids) { |
157 | /* | 156 | /* |
158 | * Save it for phase 2 processing | 157 | * Save it for phase 2 processing |
159 | */ | 158 | */ |
160 | vectors_in_migration[irq] = irq; | 159 | vectors_in_migration[irq] = irq; |
161 | 160 | ||
162 | new_cpu = any_online_cpu(cpu_online_map); | 161 | new_cpu = any_online_cpu(cpu_online_map); |
163 | mask = cpumask_of_cpu(new_cpu); | ||
164 | 162 | ||
165 | /* | 163 | /* |
166 | * Al three are essential, currently WARN_ON.. maybe panic? | 164 | * Al three are essential, currently WARN_ON.. maybe panic? |
@@ -168,7 +166,8 @@ static void migrate_irqs(void) | |||
168 | if (desc->chip && desc->chip->disable && | 166 | if (desc->chip && desc->chip->disable && |
169 | desc->chip->enable && desc->chip->set_affinity) { | 167 | desc->chip->enable && desc->chip->set_affinity) { |
170 | desc->chip->disable(irq); | 168 | desc->chip->disable(irq); |
171 | desc->chip->set_affinity(irq, mask); | 169 | desc->chip->set_affinity(irq, |
170 | cpumask_of(new_cpu)); | ||
172 | desc->chip->enable(irq); | 171 | desc->chip->enable(irq); |
173 | } else { | 172 | } else { |
174 | WARN_ON((!(desc->chip) || !(desc->chip->disable) || | 173 | WARN_ON((!(desc->chip) || !(desc->chip->disable) || |
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 7dd96c127177..bab1de2d2f6a 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
@@ -1139,7 +1139,7 @@ ia64_mca_modify_original_stack(struct pt_regs *regs, | |||
1139 | return previous_current; | 1139 | return previous_current; |
1140 | 1140 | ||
1141 | no_mod: | 1141 | no_mod: |
1142 | printk(KERN_INFO "cpu %d, %s %s, original stack not modified\n", | 1142 | mprintk(KERN_INFO "cpu %d, %s %s, original stack not modified\n", |
1143 | smp_processor_id(), type, msg); | 1143 | smp_processor_id(), type, msg); |
1144 | return previous_current; | 1144 | return previous_current; |
1145 | } | 1145 | } |
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c index 702a09c13238..890339339035 100644 --- a/arch/ia64/kernel/msi_ia64.c +++ b/arch/ia64/kernel/msi_ia64.c | |||
@@ -49,11 +49,12 @@ | |||
49 | static struct irq_chip ia64_msi_chip; | 49 | static struct irq_chip ia64_msi_chip; |
50 | 50 | ||
51 | #ifdef CONFIG_SMP | 51 | #ifdef CONFIG_SMP |
52 | static void ia64_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask) | 52 | static void ia64_set_msi_irq_affinity(unsigned int irq, |
53 | const cpumask_t *cpu_mask) | ||
53 | { | 54 | { |
54 | struct msi_msg msg; | 55 | struct msi_msg msg; |
55 | u32 addr, data; | 56 | u32 addr, data; |
56 | int cpu = first_cpu(cpu_mask); | 57 | int cpu = first_cpu(*cpu_mask); |
57 | 58 | ||
58 | if (!cpu_online(cpu)) | 59 | if (!cpu_online(cpu)) |
59 | return; | 60 | return; |
@@ -166,12 +167,11 @@ void arch_teardown_msi_irq(unsigned int irq) | |||
166 | 167 | ||
167 | #ifdef CONFIG_DMAR | 168 | #ifdef CONFIG_DMAR |
168 | #ifdef CONFIG_SMP | 169 | #ifdef CONFIG_SMP |
169 | static void dmar_msi_set_affinity(unsigned int irq, cpumask_t mask) | 170 | static void dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask) |
170 | { | 171 | { |
171 | struct irq_cfg *cfg = irq_cfg + irq; | 172 | struct irq_cfg *cfg = irq_cfg + irq; |
172 | struct msi_msg msg; | 173 | struct msi_msg msg; |
173 | int cpu = first_cpu(mask); | 174 | int cpu = cpumask_first(mask); |
174 | |||
175 | 175 | ||
176 | if (!cpu_online(cpu)) | 176 | if (!cpu_online(cpu)) |
177 | return; | 177 | return; |
@@ -187,7 +187,7 @@ static void dmar_msi_set_affinity(unsigned int irq, cpumask_t mask) | |||
187 | msg.address_lo |= MSI_ADDR_DESTID_CPU(cpu_physical_id(cpu)); | 187 | msg.address_lo |= MSI_ADDR_DESTID_CPU(cpu_physical_id(cpu)); |
188 | 188 | ||
189 | dmar_msi_write(irq, &msg); | 189 | dmar_msi_write(irq, &msg); |
190 | irq_desc[irq].affinity = mask; | 190 | irq_desc[irq].affinity = *mask; |
191 | } | 191 | } |
192 | #endif /* CONFIG_SMP */ | 192 | #endif /* CONFIG_SMP */ |
193 | 193 | ||
diff --git a/arch/ia64/kernel/paravirt.c b/arch/ia64/kernel/paravirt.c index de35d8e8b7d2..9f14c16f6369 100644 --- a/arch/ia64/kernel/paravirt.c +++ b/arch/ia64/kernel/paravirt.c | |||
@@ -130,7 +130,7 @@ ia64_native_getreg_func(int regnum) | |||
130 | unsigned long res = -1; | 130 | unsigned long res = -1; |
131 | switch (regnum) { | 131 | switch (regnum) { |
132 | CASE_GET_REG(GP); | 132 | CASE_GET_REG(GP); |
133 | CASE_GET_REG(IP); | 133 | /*CASE_GET_REG(IP);*/ /* returned ip value shouldn't be constant */ |
134 | CASE_GET_REG(PSR); | 134 | CASE_GET_REG(PSR); |
135 | CASE_GET_REG(TP); | 135 | CASE_GET_REG(TP); |
136 | CASE_GET_REG(SP); | 136 | CASE_GET_REG(SP); |
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index dbdb778efa05..2a92f637431d 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | 20 | ||
21 | #include <asm/page.h> | 21 | #include <asm/page.h> |
22 | #include <asm/iommu.h> | ||
23 | 22 | ||
24 | dma_addr_t bad_dma_address __read_mostly; | 23 | dma_addr_t bad_dma_address __read_mostly; |
25 | EXPORT_SYMBOL(bad_dma_address); | 24 | EXPORT_SYMBOL(bad_dma_address); |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 1dcbb85fc4ee..11463994a7d5 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -131,12 +131,6 @@ struct task_struct *task_for_booting_cpu; | |||
131 | */ | 131 | */ |
132 | DEFINE_PER_CPU(int, cpu_state); | 132 | DEFINE_PER_CPU(int, cpu_state); |
133 | 133 | ||
134 | /* Bitmasks of currently online, and possible CPUs */ | ||
135 | cpumask_t cpu_online_map; | ||
136 | EXPORT_SYMBOL(cpu_online_map); | ||
137 | cpumask_t cpu_possible_map = CPU_MASK_NONE; | ||
138 | EXPORT_SYMBOL(cpu_possible_map); | ||
139 | |||
140 | cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned; | 134 | cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned; |
141 | EXPORT_SYMBOL(cpu_core_map); | 135 | EXPORT_SYMBOL(cpu_core_map); |
142 | DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); | 136 | DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); |
@@ -688,7 +682,7 @@ int migrate_platform_irqs(unsigned int cpu) | |||
688 | { | 682 | { |
689 | int new_cpei_cpu; | 683 | int new_cpei_cpu; |
690 | irq_desc_t *desc = NULL; | 684 | irq_desc_t *desc = NULL; |
691 | cpumask_t mask; | 685 | const struct cpumask *mask; |
692 | int retval = 0; | 686 | int retval = 0; |
693 | 687 | ||
694 | /* | 688 | /* |
@@ -701,7 +695,7 @@ int migrate_platform_irqs(unsigned int cpu) | |||
701 | * Now re-target the CPEI to a different processor | 695 | * Now re-target the CPEI to a different processor |
702 | */ | 696 | */ |
703 | new_cpei_cpu = any_online_cpu(cpu_online_map); | 697 | new_cpei_cpu = any_online_cpu(cpu_online_map); |
704 | mask = cpumask_of_cpu(new_cpei_cpu); | 698 | mask = cpumask_of(new_cpei_cpu); |
705 | set_cpei_target_cpu(new_cpei_cpu); | 699 | set_cpei_target_cpu(new_cpei_cpu); |
706 | desc = irq_desc + ia64_cpe_irq; | 700 | desc = irq_desc + ia64_cpe_irq; |
707 | /* | 701 | /* |
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 26228e2d01ae..a8d61a3e9a94 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
@@ -53,10 +53,12 @@ int __ref arch_register_cpu(int num) | |||
53 | } | 53 | } |
54 | EXPORT_SYMBOL(arch_register_cpu); | 54 | EXPORT_SYMBOL(arch_register_cpu); |
55 | 55 | ||
56 | void arch_unregister_cpu(int num) | 56 | void __ref arch_unregister_cpu(int num) |
57 | { | 57 | { |
58 | unregister_cpu(&sysfs_cpus[num].cpu); | 58 | unregister_cpu(&sysfs_cpus[num].cpu); |
59 | #ifdef CONFIG_ACPI | ||
59 | unmap_cpu_from_node(num, cpu_to_node(num)); | 60 | unmap_cpu_from_node(num, cpu_to_node(num)); |
61 | #endif | ||
60 | } | 62 | } |
61 | EXPORT_SYMBOL(arch_unregister_cpu); | 63 | EXPORT_SYMBOL(arch_unregister_cpu); |
62 | #else | 64 | #else |
@@ -217,7 +219,7 @@ static ssize_t show_shared_cpu_map(struct cache_info *this_leaf, char *buf) | |||
217 | cpumask_t shared_cpu_map; | 219 | cpumask_t shared_cpu_map; |
218 | 220 | ||
219 | cpus_and(shared_cpu_map, this_leaf->shared_cpu_map, cpu_online_map); | 221 | cpus_and(shared_cpu_map, this_leaf->shared_cpu_map, cpu_online_map); |
220 | len = cpumask_scnprintf(buf, NR_CPUS+1, shared_cpu_map); | 222 | len = cpumask_scnprintf(buf, NR_CPUS+1, &shared_cpu_map); |
221 | len += sprintf(buf+len, "\n"); | 223 | len += sprintf(buf+len, "\n"); |
222 | return len; | 224 | return len; |
223 | } | 225 | } |
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig index 8e99fed6b3fd..f833a0b4188d 100644 --- a/arch/ia64/kvm/Kconfig +++ b/arch/ia64/kvm/Kconfig | |||
@@ -20,6 +20,8 @@ if VIRTUALIZATION | |||
20 | config KVM | 20 | config KVM |
21 | tristate "Kernel-based Virtual Machine (KVM) support" | 21 | tristate "Kernel-based Virtual Machine (KVM) support" |
22 | depends on HAVE_KVM && EXPERIMENTAL | 22 | depends on HAVE_KVM && EXPERIMENTAL |
23 | # for device assignment: | ||
24 | depends on PCI | ||
23 | select PREEMPT_NOTIFIERS | 25 | select PREEMPT_NOTIFIERS |
24 | select ANON_INODES | 26 | select ANON_INODES |
25 | ---help--- | 27 | ---help--- |
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 3ab4d6d50704..92cef66ca268 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile | |||
@@ -58,7 +58,7 @@ endif | |||
58 | kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o | 58 | kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o |
59 | obj-$(CONFIG_KVM) += kvm.o | 59 | obj-$(CONFIG_KVM) += kvm.o |
60 | 60 | ||
61 | EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 | 61 | CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 |
62 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ | 62 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ |
63 | vtlb.o process.o | 63 | vtlb.o process.o |
64 | #Add link memcpy and memset to avoid possible structure assignment error | 64 | #Add link memcpy and memset to avoid possible structure assignment error |
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 3caac477de9e..af1464f7a6ad 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -673,16 +673,16 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
673 | 673 | ||
674 | vcpu_load(vcpu); | 674 | vcpu_load(vcpu); |
675 | 675 | ||
676 | if (vcpu->sigset_active) | ||
677 | sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved); | ||
678 | |||
676 | if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) { | 679 | if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) { |
677 | kvm_vcpu_block(vcpu); | 680 | kvm_vcpu_block(vcpu); |
678 | clear_bit(KVM_REQ_UNHALT, &vcpu->requests); | 681 | clear_bit(KVM_REQ_UNHALT, &vcpu->requests); |
679 | vcpu_put(vcpu); | 682 | r = -EAGAIN; |
680 | return -EAGAIN; | 683 | goto out; |
681 | } | 684 | } |
682 | 685 | ||
683 | if (vcpu->sigset_active) | ||
684 | sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved); | ||
685 | |||
686 | if (vcpu->mmio_needed) { | 686 | if (vcpu->mmio_needed) { |
687 | memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); | 687 | memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); |
688 | kvm_set_mmio_data(vcpu); | 688 | kvm_set_mmio_data(vcpu); |
@@ -690,7 +690,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
690 | vcpu->mmio_needed = 0; | 690 | vcpu->mmio_needed = 0; |
691 | } | 691 | } |
692 | r = __vcpu_run(vcpu, kvm_run); | 692 | r = __vcpu_run(vcpu, kvm_run); |
693 | 693 | out: | |
694 | if (vcpu->sigset_active) | 694 | if (vcpu->sigset_active) |
695 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); | 695 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); |
696 | 696 | ||
diff --git a/arch/ia64/kvm/optvfault.S b/arch/ia64/kvm/optvfault.S index 634abad979b5..32254ce9a1bd 100644 --- a/arch/ia64/kvm/optvfault.S +++ b/arch/ia64/kvm/optvfault.S | |||
@@ -107,10 +107,10 @@ END(kvm_vps_resume_normal) | |||
107 | GLOBAL_ENTRY(kvm_vps_resume_handler) | 107 | GLOBAL_ENTRY(kvm_vps_resume_handler) |
108 | movl r30 = PAL_VPS_RESUME_HANDLER | 108 | movl r30 = PAL_VPS_RESUME_HANDLER |
109 | ;; | 109 | ;; |
110 | ld8 r27=[r25] | 110 | ld8 r26=[r25] |
111 | shr r17=r17,IA64_ISR_IR_BIT | 111 | shr r17=r17,IA64_ISR_IR_BIT |
112 | ;; | 112 | ;; |
113 | dep r27=r17,r27,63,1 // bit 63 of r27 indicate whether enable CFLE | 113 | dep r26=r17,r26,63,1 // bit 63 of r26 indicate whether enable CFLE |
114 | mov pr=r23,-2 | 114 | mov pr=r23,-2 |
115 | br.sptk.many kvm_vps_entry | 115 | br.sptk.many kvm_vps_entry |
116 | END(kvm_vps_resume_handler) | 116 | END(kvm_vps_resume_handler) |
@@ -894,12 +894,15 @@ ENTRY(kvm_resume_to_guest) | |||
894 | ;; | 894 | ;; |
895 | ld8 r19=[r19] | 895 | ld8 r19=[r19] |
896 | mov b0=r29 | 896 | mov b0=r29 |
897 | cmp.ne p6,p7 = r0,r0 | 897 | mov r27=cr.isr |
898 | ;; | 898 | ;; |
899 | tbit.z p6,p7 = r19,IA64_PSR_IC_BIT // p1=vpsr.ic | 899 | tbit.z p6,p7 = r19,IA64_PSR_IC_BIT // p7=vpsr.ic |
900 | shr r27=r27,IA64_ISR_IR_BIT | ||
900 | ;; | 901 | ;; |
901 | (p6) ld8 r26=[r25] | 902 | (p6) ld8 r26=[r25] |
902 | (p7) mov b0=r28 | 903 | (p7) mov b0=r28 |
904 | ;; | ||
905 | (p6) dep r26=r27,r26,63,1 | ||
903 | mov pr=r31,-2 | 906 | mov pr=r31,-2 |
904 | br.sptk.many b0 // call pal service | 907 | br.sptk.many b0 // call pal service |
905 | ;; | 908 | ;; |
diff --git a/arch/ia64/kvm/vcpu.h b/arch/ia64/kvm/vcpu.h index 341e3fee280c..e9b2a4e121c0 100644 --- a/arch/ia64/kvm/vcpu.h +++ b/arch/ia64/kvm/vcpu.h | |||
@@ -384,6 +384,10 @@ static inline u64 __gpfn_is_io(u64 gpfn) | |||
384 | #define MODE_IND(psr) \ | 384 | #define MODE_IND(psr) \ |
385 | (((psr).it << 2) + ((psr).dt << 1) + (psr).rt) | 385 | (((psr).it << 2) + ((psr).dt << 1) + (psr).rt) |
386 | 386 | ||
387 | #ifndef CONFIG_SMP | ||
388 | #define _vmm_raw_spin_lock(x) do {}while(0) | ||
389 | #define _vmm_raw_spin_unlock(x) do {}while(0) | ||
390 | #else | ||
387 | #define _vmm_raw_spin_lock(x) \ | 391 | #define _vmm_raw_spin_lock(x) \ |
388 | do { \ | 392 | do { \ |
389 | __u32 *ia64_spinlock_ptr = (__u32 *) (x); \ | 393 | __u32 *ia64_spinlock_ptr = (__u32 *) (x); \ |
@@ -403,6 +407,7 @@ static inline u64 __gpfn_is_io(u64 gpfn) | |||
403 | do { barrier(); \ | 407 | do { barrier(); \ |
404 | ((spinlock_t *)x)->raw_lock.lock = 0; } \ | 408 | ((spinlock_t *)x)->raw_lock.lock = 0; } \ |
405 | while (0) | 409 | while (0) |
410 | #endif | ||
406 | 411 | ||
407 | void vmm_spin_lock(spinlock_t *lock); | 412 | void vmm_spin_lock(spinlock_t *lock); |
408 | void vmm_spin_unlock(spinlock_t *lock); | 413 | void vmm_spin_unlock(spinlock_t *lock); |
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index c3aa851d1ca6..4e1801bad83a 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c | |||
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(sn_io_slot_fixup); | |||
292 | * sn_pci_controller_fixup() - This routine sets up a bus's resources | 292 | * sn_pci_controller_fixup() - This routine sets up a bus's resources |
293 | * consistent with the Linux PCI abstraction layer. | 293 | * consistent with the Linux PCI abstraction layer. |
294 | */ | 294 | */ |
295 | static void | 295 | static void __init |
296 | sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) | 296 | sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) |
297 | { | 297 | { |
298 | s64 status = 0; | 298 | s64 status = 0; |
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 96c31b4180c3..66fd705e82c0 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * License. See the file "COPYING" in the main directory of this archive | 5 | * License. See the file "COPYING" in the main directory of this archive |
6 | * for more details. | 6 | * for more details. |
7 | * | 7 | * |
8 | * Copyright (c) 2000-2007 Silicon Graphics, Inc. All Rights Reserved. | 8 | * Copyright (c) 2000-2008 Silicon Graphics, Inc. All Rights Reserved. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
@@ -227,14 +227,14 @@ finish_up: | |||
227 | return new_irq_info; | 227 | return new_irq_info; |
228 | } | 228 | } |
229 | 229 | ||
230 | static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask) | 230 | static void sn_set_affinity_irq(unsigned int irq, const struct cpumask *mask) |
231 | { | 231 | { |
232 | struct sn_irq_info *sn_irq_info, *sn_irq_info_safe; | 232 | struct sn_irq_info *sn_irq_info, *sn_irq_info_safe; |
233 | nasid_t nasid; | 233 | nasid_t nasid; |
234 | int slice; | 234 | int slice; |
235 | 235 | ||
236 | nasid = cpuid_to_nasid(first_cpu(mask)); | 236 | nasid = cpuid_to_nasid(cpumask_first(mask)); |
237 | slice = cpuid_to_slice(first_cpu(mask)); | 237 | slice = cpuid_to_slice(cpumask_first(mask)); |
238 | 238 | ||
239 | list_for_each_entry_safe(sn_irq_info, sn_irq_info_safe, | 239 | list_for_each_entry_safe(sn_irq_info, sn_irq_info_safe, |
240 | sn_irq_lh[irq], list) | 240 | sn_irq_lh[irq], list) |
@@ -375,6 +375,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
375 | int cpu = nasid_slice_to_cpuid(nasid, slice); | 375 | int cpu = nasid_slice_to_cpuid(nasid, slice); |
376 | #ifdef CONFIG_SMP | 376 | #ifdef CONFIG_SMP |
377 | int cpuphys; | 377 | int cpuphys; |
378 | irq_desc_t *desc; | ||
378 | #endif | 379 | #endif |
379 | 380 | ||
380 | pci_dev_get(pci_dev); | 381 | pci_dev_get(pci_dev); |
@@ -391,6 +392,12 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
391 | #ifdef CONFIG_SMP | 392 | #ifdef CONFIG_SMP |
392 | cpuphys = cpu_physical_id(cpu); | 393 | cpuphys = cpu_physical_id(cpu); |
393 | set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); | 394 | set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); |
395 | desc = irq_to_desc(sn_irq_info->irq_irq); | ||
396 | /* | ||
397 | * Affinity was set by the PROM, prevent it from | ||
398 | * being reset by the request_irq() path. | ||
399 | */ | ||
400 | desc->status |= IRQ_AFFINITY_SET; | ||
394 | #endif | 401 | #endif |
395 | } | 402 | } |
396 | 403 | ||
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c index 83f190ffe350..ca553b0429ce 100644 --- a/arch/ia64/sn/kernel/msi_sn.c +++ b/arch/ia64/sn/kernel/msi_sn.c | |||
@@ -151,7 +151,8 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry) | |||
151 | } | 151 | } |
152 | 152 | ||
153 | #ifdef CONFIG_SMP | 153 | #ifdef CONFIG_SMP |
154 | static void sn_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask) | 154 | static void sn_set_msi_irq_affinity(unsigned int irq, |
155 | const struct cpumask *cpu_mask) | ||
155 | { | 156 | { |
156 | struct msi_msg msg; | 157 | struct msi_msg msg; |
157 | int slice; | 158 | int slice; |
@@ -164,7 +165,7 @@ static void sn_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask) | |||
164 | struct sn_pcibus_provider *provider; | 165 | struct sn_pcibus_provider *provider; |
165 | unsigned int cpu; | 166 | unsigned int cpu; |
166 | 167 | ||
167 | cpu = first_cpu(cpu_mask); | 168 | cpu = cpumask_first(cpu_mask); |
168 | sn_irq_info = sn_msi_info[irq].sn_irq_info; | 169 | sn_irq_info = sn_msi_info[irq].sn_irq_info; |
169 | if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0) | 170 | if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0) |
170 | return; | 171 | return; |
@@ -204,7 +205,7 @@ static void sn_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask) | |||
204 | msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff); | 205 | msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff); |
205 | 206 | ||
206 | write_msi_msg(irq, &msg); | 207 | write_msi_msg(irq, &msg); |
207 | irq_desc[irq].affinity = cpu_mask; | 208 | irq_desc[irq].affinity = *cpu_mask; |
208 | } | 209 | } |
209 | #endif /* CONFIG_SMP */ | 210 | #endif /* CONFIG_SMP */ |
210 | 211 | ||
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index bb1d24929640..02c5b8a9fb60 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
@@ -200,7 +200,7 @@ static int __cpuinitdata shub_1_1_found; | |||
200 | * Set flag for enabling shub specific wars | 200 | * Set flag for enabling shub specific wars |
201 | */ | 201 | */ |
202 | 202 | ||
203 | static inline int __init is_shub_1_1(int nasid) | 203 | static inline int __cpuinit is_shub_1_1(int nasid) |
204 | { | 204 | { |
205 | unsigned long id; | 205 | unsigned long id; |
206 | int rev; | 206 | int rev; |
@@ -212,7 +212,7 @@ static inline int __init is_shub_1_1(int nasid) | |||
212 | return rev <= 2; | 212 | return rev <= 2; |
213 | } | 213 | } |
214 | 214 | ||
215 | static void __init sn_check_for_wars(void) | 215 | static void __cpuinit sn_check_for_wars(void) |
216 | { | 216 | { |
217 | int cnode; | 217 | int cnode; |
218 | 218 | ||
@@ -512,7 +512,6 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
512 | for_each_online_node(cnode) { | 512 | for_each_online_node(cnode) { |
513 | nodepdaindr[cnode] = | 513 | nodepdaindr[cnode] = |
514 | alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); | 514 | alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); |
515 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | ||
516 | memset(nodepdaindr[cnode]->phys_cpuid, -1, | 515 | memset(nodepdaindr[cnode]->phys_cpuid, -1, |
517 | sizeof(nodepdaindr[cnode]->phys_cpuid)); | 516 | sizeof(nodepdaindr[cnode]->phys_cpuid)); |
518 | spin_lock_init(&nodepdaindr[cnode]->ptc_lock); | 517 | spin_lock_init(&nodepdaindr[cnode]->ptc_lock); |
@@ -521,11 +520,9 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
521 | /* | 520 | /* |
522 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. | 521 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. |
523 | */ | 522 | */ |
524 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) { | 523 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) |
525 | nodepdaindr[cnode] = | 524 | nodepdaindr[cnode] = |
526 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); | 525 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); |
527 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | ||
528 | } | ||
529 | 526 | ||
530 | /* | 527 | /* |
531 | * Now copy the array of nodepda pointers to each nodepda. | 528 | * Now copy the array of nodepda pointers to each nodepda. |
diff --git a/arch/ia64/xen/hypercall.S b/arch/ia64/xen/hypercall.S index d4ff0b9e79f1..45e02bb64a92 100644 --- a/arch/ia64/xen/hypercall.S +++ b/arch/ia64/xen/hypercall.S | |||
@@ -58,7 +58,7 @@ __HCALL2(xen_set_rr, HYPERPRIVOP_SET_RR) | |||
58 | __HCALL2(xen_set_kr, HYPERPRIVOP_SET_KR) | 58 | __HCALL2(xen_set_kr, HYPERPRIVOP_SET_KR) |
59 | 59 | ||
60 | #ifdef CONFIG_IA32_SUPPORT | 60 | #ifdef CONFIG_IA32_SUPPORT |
61 | __HCALL1(xen_get_eflag, HYPERPRIVOP_GET_EFLAG) | 61 | __HCALL0(xen_get_eflag, HYPERPRIVOP_GET_EFLAG) |
62 | __HCALL1(xen_set_eflag, HYPERPRIVOP_SET_EFLAG) // refer SDM vol1 3.1.8 | 62 | __HCALL1(xen_set_eflag, HYPERPRIVOP_SET_EFLAG) // refer SDM vol1 3.1.8 |
63 | #endif /* CONFIG_IA32_SUPPORT */ | 63 | #endif /* CONFIG_IA32_SUPPORT */ |
64 | 64 | ||
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index dbaed4a63815..cabba332cc48 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
@@ -10,6 +10,7 @@ config M32R | |||
10 | default y | 10 | default y |
11 | select HAVE_IDE | 11 | select HAVE_IDE |
12 | select HAVE_OPROFILE | 12 | select HAVE_OPROFILE |
13 | select INIT_ALL_POSSIBLE | ||
13 | 14 | ||
14 | config SBUS | 15 | config SBUS |
15 | bool | 16 | bool |
@@ -273,7 +274,7 @@ config GENERIC_CALIBRATE_DELAY | |||
273 | bool | 274 | bool |
274 | default y | 275 | default y |
275 | 276 | ||
276 | config SCHED_NO_NO_OMIT_FRAME_POINTER | 277 | config SCHED_OMIT_FRAME_POINTER |
277 | bool | 278 | bool |
278 | default y | 279 | default y |
279 | 280 | ||
diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S index 40180778a5c7..90916067b9c1 100644 --- a/arch/m32r/kernel/head.S +++ b/arch/m32r/kernel/head.S | |||
@@ -23,7 +23,7 @@ __INITDATA | |||
23 | /* | 23 | /* |
24 | * References to members of the boot_cpu_data structure. | 24 | * References to members of the boot_cpu_data structure. |
25 | */ | 25 | */ |
26 | .text | 26 | .section .text.head, "ax" |
27 | .global start_kernel | 27 | .global start_kernel |
28 | .global __bss_start | 28 | .global __bss_start |
29 | .global _end | 29 | .global _end |
@@ -133,7 +133,6 @@ loop1: | |||
133 | /* | 133 | /* |
134 | * AP startup routine | 134 | * AP startup routine |
135 | */ | 135 | */ |
136 | .text | ||
137 | .global eit_vector | 136 | .global eit_vector |
138 | ENTRY(startup_AP) | 137 | ENTRY(startup_AP) |
139 | ;; setup EVB | 138 | ;; setup EVB |
@@ -230,6 +229,7 @@ ENTRY(startup_AP) | |||
230 | nop | 229 | nop |
231 | #endif /* CONFIG_SMP */ | 230 | #endif /* CONFIG_SMP */ |
232 | 231 | ||
232 | .text | ||
233 | ENTRY(stack_start) | 233 | ENTRY(stack_start) |
234 | .long init_thread_union+8192 | 234 | .long init_thread_union+8192 |
235 | .long __KERNEL_DS | 235 | .long __KERNEL_DS |
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index 39cb6da72dcb..0f06b3722e96 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c | |||
@@ -73,17 +73,11 @@ static unsigned int bsp_phys_id = -1; | |||
73 | /* Bitmask of physically existing CPUs */ | 73 | /* Bitmask of physically existing CPUs */ |
74 | physid_mask_t phys_cpu_present_map; | 74 | physid_mask_t phys_cpu_present_map; |
75 | 75 | ||
76 | /* Bitmask of currently online CPUs */ | ||
77 | cpumask_t cpu_online_map; | ||
78 | EXPORT_SYMBOL(cpu_online_map); | ||
79 | |||
80 | cpumask_t cpu_bootout_map; | 76 | cpumask_t cpu_bootout_map; |
81 | cpumask_t cpu_bootin_map; | 77 | cpumask_t cpu_bootin_map; |
82 | static cpumask_t cpu_callin_map; | 78 | static cpumask_t cpu_callin_map; |
83 | cpumask_t cpu_callout_map; | 79 | cpumask_t cpu_callout_map; |
84 | EXPORT_SYMBOL(cpu_callout_map); | 80 | EXPORT_SYMBOL(cpu_callout_map); |
85 | cpumask_t cpu_possible_map = CPU_MASK_ALL; | ||
86 | EXPORT_SYMBOL(cpu_possible_map); | ||
87 | 81 | ||
88 | /* Per CPU bogomips and other parameters */ | 82 | /* Per CPU bogomips and other parameters */ |
89 | struct cpuinfo_m32r cpu_data[NR_CPUS] __cacheline_aligned; | 83 | struct cpuinfo_m32r cpu_data[NR_CPUS] __cacheline_aligned; |
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 15a6f36c06db..9db05df20c0e 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S | |||
@@ -27,6 +27,7 @@ SECTIONS | |||
27 | _text = .; /* Text and read-only data */ | 27 | _text = .; /* Text and read-only data */ |
28 | .boot : { *(.boot) } = 0 | 28 | .boot : { *(.boot) } = 0 |
29 | .text : { | 29 | .text : { |
30 | *(.text.head) | ||
30 | TEXT_TEXT | 31 | TEXT_TEXT |
31 | SCHED_TEXT | 32 | SCHED_TEXT |
32 | LOCK_TEXT | 33 | LOCK_TEXT |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 8bd61a640fc9..23597beb66c1 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:00 2008 | 4 | # Tue Dec 2 20:27:42 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | CONFIG_AMIGA=y | 113 | CONFIG_AMIGA=y |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
148 | CONFIG_UNEVICTABLE_LRU=y | ||
159 | 149 | ||
160 | # | 150 | # |
161 | # General setup | 151 | # General setup |
162 | # | 152 | # |
163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
155 | CONFIG_HAVE_AOUT=y | ||
164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
166 | CONFIG_ZORRO=y | 158 | CONFIG_ZORRO=y |
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
215 | # CONFIG_IP_VS is not set | ||
216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
256 | # CONFIG_NETFILTER_TPROXY is not set | ||
265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
306 | 301 | ||
307 | # | 302 | # |
308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
309 | # | 304 | # |
305 | CONFIG_NF_DEFRAG_IPV4=m | ||
310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
315 | CONFIG_IP_NF_MATCH_ECN=m | ||
316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
312 | CONFIG_IP_NF_MATCH_ECN=m | ||
317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
359 | CONFIG_IP6_NF_MATCH_AH=m | ||
360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
362 | CONFIG_IP6_NF_FILTER=m | ||
363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
358 | CONFIG_IP6_NF_FILTER=m | ||
364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
385 | # CONFIG_NET_DSA is not set | ||
390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
413 | 409 | # CONFIG_PHONET is not set | |
414 | # | 410 | # CONFIG_WIRELESS is not set |
415 | # Wireless | ||
416 | # | ||
417 | # CONFIG_CFG80211 is not set | ||
418 | CONFIG_WIRELESS_EXT=y | ||
419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
420 | # CONFIG_MAC80211 is not set | ||
421 | CONFIG_IEEE80211=m | ||
422 | # CONFIG_IEEE80211_DEBUG is not set | ||
423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
428 | 413 | ||
@@ -470,21 +455,20 @@ CONFIG_ATA_OVER_ETH=m | |||
470 | CONFIG_MISC_DEVICES=y | 455 | CONFIG_MISC_DEVICES=y |
471 | # CONFIG_EEPROM_93CX6 is not set | 456 | # CONFIG_EEPROM_93CX6 is not set |
472 | # CONFIG_ENCLOSURE_SERVICES is not set | 457 | # CONFIG_ENCLOSURE_SERVICES is not set |
458 | # CONFIG_C2PORT is not set | ||
473 | CONFIG_HAVE_IDE=y | 459 | CONFIG_HAVE_IDE=y |
474 | CONFIG_IDE=y | 460 | CONFIG_IDE=y |
475 | CONFIG_BLK_DEV_IDE=y | ||
476 | 461 | ||
477 | # | 462 | # |
478 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 463 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
479 | # | 464 | # |
480 | CONFIG_IDE_ATAPI=y | ||
481 | # CONFIG_BLK_DEV_IDE_SATA is not set | 465 | # CONFIG_BLK_DEV_IDE_SATA is not set |
482 | CONFIG_BLK_DEV_IDEDISK=y | 466 | CONFIG_IDE_GD=y |
483 | # CONFIG_IDEDISK_MULTI_MODE is not set | 467 | CONFIG_IDE_GD_ATA=y |
468 | # CONFIG_IDE_GD_ATAPI is not set | ||
484 | CONFIG_BLK_DEV_IDECD=y | 469 | CONFIG_BLK_DEV_IDECD=y |
485 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 470 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
486 | # CONFIG_BLK_DEV_IDETAPE is not set | 471 | # CONFIG_BLK_DEV_IDETAPE is not set |
487 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
488 | # CONFIG_BLK_DEV_IDESCSI is not set | 472 | # CONFIG_BLK_DEV_IDESCSI is not set |
489 | # CONFIG_IDE_TASK_IOCTL is not set | 473 | # CONFIG_IDE_TASK_IOCTL is not set |
490 | CONFIG_IDE_PROC_FS=y | 474 | CONFIG_IDE_PROC_FS=y |
@@ -609,8 +593,12 @@ CONFIG_APNE=m | |||
609 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 593 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
610 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 594 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
611 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 595 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
596 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
597 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
598 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
612 | # CONFIG_NET_PCI is not set | 599 | # CONFIG_NET_PCI is not set |
613 | # CONFIG_B44 is not set | 600 | # CONFIG_B44 is not set |
601 | # CONFIG_CS89x0 is not set | ||
614 | # CONFIG_NET_POCKET is not set | 602 | # CONFIG_NET_POCKET is not set |
615 | # CONFIG_NETDEV_1000 is not set | 603 | # CONFIG_NETDEV_1000 is not set |
616 | # CONFIG_NETDEV_10000 is not set | 604 | # CONFIG_NETDEV_10000 is not set |
@@ -763,11 +751,11 @@ CONFIG_GEN_RTC_X=y | |||
763 | # CONFIG_THERMAL is not set | 751 | # CONFIG_THERMAL is not set |
764 | # CONFIG_THERMAL_HWMON is not set | 752 | # CONFIG_THERMAL_HWMON is not set |
765 | # CONFIG_WATCHDOG is not set | 753 | # CONFIG_WATCHDOG is not set |
754 | CONFIG_SSB_POSSIBLE=y | ||
766 | 755 | ||
767 | # | 756 | # |
768 | # Sonics Silicon Backplane | 757 | # Sonics Silicon Backplane |
769 | # | 758 | # |
770 | CONFIG_SSB_POSSIBLE=y | ||
771 | # CONFIG_SSB is not set | 759 | # CONFIG_SSB is not set |
772 | 760 | ||
773 | # | 761 | # |
@@ -777,6 +765,7 @@ CONFIG_SSB_POSSIBLE=y | |||
777 | # CONFIG_MFD_SM501 is not set | 765 | # CONFIG_MFD_SM501 is not set |
778 | # CONFIG_HTC_PASIC3 is not set | 766 | # CONFIG_HTC_PASIC3 is not set |
779 | # CONFIG_MFD_TMIO is not set | 767 | # CONFIG_MFD_TMIO is not set |
768 | # CONFIG_REGULATOR is not set | ||
780 | 769 | ||
781 | # | 770 | # |
782 | # Multimedia devices | 771 | # Multimedia devices |
@@ -802,6 +791,7 @@ CONFIG_SSB_POSSIBLE=y | |||
802 | CONFIG_FB=y | 791 | CONFIG_FB=y |
803 | # CONFIG_FIRMWARE_EDID is not set | 792 | # CONFIG_FIRMWARE_EDID is not set |
804 | # CONFIG_FB_DDC is not set | 793 | # CONFIG_FB_DDC is not set |
794 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
805 | CONFIG_FB_CFB_FILLRECT=y | 795 | CONFIG_FB_CFB_FILLRECT=y |
806 | CONFIG_FB_CFB_COPYAREA=y | 796 | CONFIG_FB_CFB_COPYAREA=y |
807 | CONFIG_FB_CFB_IMAGEBLIT=y | 797 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -829,6 +819,8 @@ CONFIG_FB_FM2=y | |||
829 | # CONFIG_FB_UVESA is not set | 819 | # CONFIG_FB_UVESA is not set |
830 | # CONFIG_FB_S1D13XXX is not set | 820 | # CONFIG_FB_S1D13XXX is not set |
831 | # CONFIG_FB_VIRTUAL is not set | 821 | # CONFIG_FB_VIRTUAL is not set |
822 | # CONFIG_FB_METRONOME is not set | ||
823 | # CONFIG_FB_MB862XX is not set | ||
832 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 824 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
833 | 825 | ||
834 | # | 826 | # |
@@ -852,12 +844,19 @@ CONFIG_LOGO_LINUX_MONO=y | |||
852 | CONFIG_LOGO_LINUX_VGA16=y | 844 | CONFIG_LOGO_LINUX_VGA16=y |
853 | CONFIG_LOGO_LINUX_CLUT224=y | 845 | CONFIG_LOGO_LINUX_CLUT224=y |
854 | CONFIG_SOUND=m | 846 | CONFIG_SOUND=m |
847 | CONFIG_SOUND_OSS_CORE=y | ||
855 | CONFIG_DMASOUND_PAULA=m | 848 | CONFIG_DMASOUND_PAULA=m |
856 | CONFIG_DMASOUND=m | 849 | CONFIG_DMASOUND=m |
857 | CONFIG_HID_SUPPORT=y | 850 | CONFIG_HID_SUPPORT=y |
858 | CONFIG_HID=m | 851 | CONFIG_HID=m |
859 | # CONFIG_HID_DEBUG is not set | 852 | # CONFIG_HID_DEBUG is not set |
860 | CONFIG_HIDRAW=y | 853 | CONFIG_HIDRAW=y |
854 | # CONFIG_HID_PID is not set | ||
855 | |||
856 | # | ||
857 | # Special HID drivers | ||
858 | # | ||
859 | CONFIG_HID_COMPAT=y | ||
861 | # CONFIG_USB_SUPPORT is not set | 860 | # CONFIG_USB_SUPPORT is not set |
862 | # CONFIG_MMC is not set | 861 | # CONFIG_MMC is not set |
863 | # CONFIG_MEMSTICK is not set | 862 | # CONFIG_MEMSTICK is not set |
@@ -867,6 +866,8 @@ CONFIG_HIDRAW=y | |||
867 | # CONFIG_DMADEVICES is not set | 866 | # CONFIG_DMADEVICES is not set |
868 | # CONFIG_AUXDISPLAY is not set | 867 | # CONFIG_AUXDISPLAY is not set |
869 | # CONFIG_UIO is not set | 868 | # CONFIG_UIO is not set |
869 | # CONFIG_STAGING is not set | ||
870 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
870 | 871 | ||
871 | # | 872 | # |
872 | # Character devices | 873 | # Character devices |
@@ -883,8 +884,9 @@ CONFIG_EXT2_FS=y | |||
883 | # CONFIG_EXT2_FS_XIP is not set | 884 | # CONFIG_EXT2_FS_XIP is not set |
884 | CONFIG_EXT3_FS=y | 885 | CONFIG_EXT3_FS=y |
885 | # CONFIG_EXT3_FS_XATTR is not set | 886 | # CONFIG_EXT3_FS_XATTR is not set |
886 | # CONFIG_EXT4DEV_FS is not set | 887 | # CONFIG_EXT4_FS is not set |
887 | CONFIG_JBD=y | 888 | CONFIG_JBD=y |
889 | CONFIG_JBD2=m | ||
888 | CONFIG_REISERFS_FS=m | 890 | CONFIG_REISERFS_FS=m |
889 | # CONFIG_REISERFS_CHECK is not set | 891 | # CONFIG_REISERFS_CHECK is not set |
890 | # CONFIG_REISERFS_PROC_INFO is not set | 892 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -895,6 +897,7 @@ CONFIG_JFS_FS=m | |||
895 | # CONFIG_JFS_DEBUG is not set | 897 | # CONFIG_JFS_DEBUG is not set |
896 | # CONFIG_JFS_STATISTICS is not set | 898 | # CONFIG_JFS_STATISTICS is not set |
897 | # CONFIG_FS_POSIX_ACL is not set | 899 | # CONFIG_FS_POSIX_ACL is not set |
900 | CONFIG_FILE_LOCKING=y | ||
898 | CONFIG_XFS_FS=m | 901 | CONFIG_XFS_FS=m |
899 | # CONFIG_XFS_QUOTA is not set | 902 | # CONFIG_XFS_QUOTA is not set |
900 | # CONFIG_XFS_POSIX_ACL is not set | 903 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -906,6 +909,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
906 | # CONFIG_OCFS2_FS_STATS is not set | 909 | # CONFIG_OCFS2_FS_STATS is not set |
907 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 910 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
908 | # CONFIG_OCFS2_DEBUG_FS is not set | 911 | # CONFIG_OCFS2_DEBUG_FS is not set |
912 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
909 | CONFIG_DNOTIFY=y | 913 | CONFIG_DNOTIFY=y |
910 | CONFIG_INOTIFY=y | 914 | CONFIG_INOTIFY=y |
911 | CONFIG_INOTIFY_USER=y | 915 | CONFIG_INOTIFY_USER=y |
@@ -944,6 +948,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
944 | CONFIG_PROC_FS=y | 948 | CONFIG_PROC_FS=y |
945 | CONFIG_PROC_KCORE=y | 949 | CONFIG_PROC_KCORE=y |
946 | CONFIG_PROC_SYSCTL=y | 950 | CONFIG_PROC_SYSCTL=y |
951 | CONFIG_PROC_PAGE_MONITOR=y | ||
947 | CONFIG_SYSFS=y | 952 | CONFIG_SYSFS=y |
948 | CONFIG_TMPFS=y | 953 | CONFIG_TMPFS=y |
949 | # CONFIG_TMPFS_POSIX_ACL is not set | 954 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -986,6 +991,7 @@ CONFIG_EXPORTFS=m | |||
986 | CONFIG_NFS_COMMON=y | 991 | CONFIG_NFS_COMMON=y |
987 | CONFIG_SUNRPC=m | 992 | CONFIG_SUNRPC=m |
988 | CONFIG_SUNRPC_GSS=m | 993 | CONFIG_SUNRPC_GSS=m |
994 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
989 | CONFIG_RPCSEC_GSS_KRB5=m | 995 | CONFIG_RPCSEC_GSS_KRB5=m |
990 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 996 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
991 | CONFIG_SMB_FS=m | 997 | CONFIG_SMB_FS=m |
@@ -1059,7 +1065,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
1059 | # CONFIG_DEBUG_KERNEL is not set | 1065 | # CONFIG_DEBUG_KERNEL is not set |
1060 | CONFIG_DEBUG_BUGVERBOSE=y | 1066 | CONFIG_DEBUG_BUGVERBOSE=y |
1061 | CONFIG_DEBUG_MEMORY_INIT=y | 1067 | CONFIG_DEBUG_MEMORY_INIT=y |
1068 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1062 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1069 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1070 | |||
1071 | # | ||
1072 | # Tracers | ||
1073 | # | ||
1074 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1063 | # CONFIG_SAMPLES is not set | 1075 | # CONFIG_SAMPLES is not set |
1064 | 1076 | ||
1065 | # | 1077 | # |
@@ -1067,6 +1079,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
1067 | # | 1079 | # |
1068 | # CONFIG_KEYS is not set | 1080 | # CONFIG_KEYS is not set |
1069 | # CONFIG_SECURITY is not set | 1081 | # CONFIG_SECURITY is not set |
1082 | # CONFIG_SECURITYFS is not set | ||
1070 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1083 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1071 | CONFIG_XOR_BLOCKS=m | 1084 | CONFIG_XOR_BLOCKS=m |
1072 | CONFIG_ASYNC_CORE=m | 1085 | CONFIG_ASYNC_CORE=m |
@@ -1077,10 +1090,12 @@ CONFIG_CRYPTO=y | |||
1077 | # | 1090 | # |
1078 | # Crypto core or helper | 1091 | # Crypto core or helper |
1079 | # | 1092 | # |
1093 | # CONFIG_CRYPTO_FIPS is not set | ||
1080 | CONFIG_CRYPTO_ALGAPI=y | 1094 | CONFIG_CRYPTO_ALGAPI=y |
1081 | CONFIG_CRYPTO_AEAD=m | 1095 | CONFIG_CRYPTO_AEAD=y |
1082 | CONFIG_CRYPTO_BLKCIPHER=m | 1096 | CONFIG_CRYPTO_BLKCIPHER=y |
1083 | CONFIG_CRYPTO_HASH=y | 1097 | CONFIG_CRYPTO_HASH=y |
1098 | CONFIG_CRYPTO_RNG=y | ||
1084 | CONFIG_CRYPTO_MANAGER=y | 1099 | CONFIG_CRYPTO_MANAGER=y |
1085 | CONFIG_CRYPTO_GF128MUL=m | 1100 | CONFIG_CRYPTO_GF128MUL=m |
1086 | CONFIG_CRYPTO_NULL=m | 1101 | CONFIG_CRYPTO_NULL=m |
@@ -1154,14 +1169,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1154 | # | 1169 | # |
1155 | CONFIG_CRYPTO_DEFLATE=m | 1170 | CONFIG_CRYPTO_DEFLATE=m |
1156 | CONFIG_CRYPTO_LZO=m | 1171 | CONFIG_CRYPTO_LZO=m |
1172 | |||
1173 | # | ||
1174 | # Random Number Generation | ||
1175 | # | ||
1176 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1157 | # CONFIG_CRYPTO_HW is not set | 1177 | # CONFIG_CRYPTO_HW is not set |
1158 | 1178 | ||
1159 | # | 1179 | # |
1160 | # Library routines | 1180 | # Library routines |
1161 | # | 1181 | # |
1162 | CONFIG_BITREVERSE=y | 1182 | CONFIG_BITREVERSE=y |
1163 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1164 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1165 | CONFIG_CRC_CCITT=m | 1183 | CONFIG_CRC_CCITT=m |
1166 | CONFIG_CRC16=m | 1184 | CONFIG_CRC16=m |
1167 | CONFIG_CRC_T10DIF=y | 1185 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index c41b854c0284..935108d115a0 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:01 2008 | 4 | # Tue Dec 2 20:27:43 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
148 | CONFIG_UNEVICTABLE_LRU=y | ||
159 | 149 | ||
160 | # | 150 | # |
161 | # General setup | 151 | # General setup |
162 | # | 152 | # |
163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
155 | CONFIG_HAVE_AOUT=y | ||
164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
166 | CONFIG_HEARTBEAT=y | 158 | CONFIG_HEARTBEAT=y |
@@ -210,7 +202,6 @@ CONFIG_INET_TCP_DIAG=m | |||
210 | CONFIG_TCP_CONG_CUBIC=y | 202 | CONFIG_TCP_CONG_CUBIC=y |
211 | CONFIG_DEFAULT_TCP_CONG="cubic" | 203 | CONFIG_DEFAULT_TCP_CONG="cubic" |
212 | # CONFIG_TCP_MD5SIG is not set | 204 | # CONFIG_TCP_MD5SIG is not set |
213 | # CONFIG_IP_VS is not set | ||
214 | CONFIG_IPV6=m | 205 | CONFIG_IPV6=m |
215 | CONFIG_IPV6_PRIVACY=y | 206 | CONFIG_IPV6_PRIVACY=y |
216 | CONFIG_IPV6_ROUTER_PREF=y | 207 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -260,13 +251,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
260 | CONFIG_NF_CONNTRACK_SIP=m | 251 | CONFIG_NF_CONNTRACK_SIP=m |
261 | CONFIG_NF_CONNTRACK_TFTP=m | 252 | CONFIG_NF_CONNTRACK_TFTP=m |
262 | # CONFIG_NF_CT_NETLINK is not set | 253 | # CONFIG_NF_CT_NETLINK is not set |
254 | # CONFIG_NETFILTER_TPROXY is not set | ||
263 | CONFIG_NETFILTER_XTABLES=m | 255 | CONFIG_NETFILTER_XTABLES=m |
264 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 256 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
265 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 257 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
266 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 258 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
267 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
268 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
269 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 260 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
261 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
270 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 262 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
271 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 263 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
272 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 264 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -280,19 +272,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
280 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 272 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
281 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 273 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
282 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 274 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
275 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 276 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
284 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 277 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
285 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 278 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
286 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 279 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
287 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 280 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
288 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 281 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
282 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 283 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
290 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 284 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
291 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 285 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
293 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 286 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
294 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 287 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
295 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 288 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
289 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
290 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
296 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 291 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
297 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 292 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
298 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 293 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -300,20 +295,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
300 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 295 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
301 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 296 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
302 | CONFIG_NETFILTER_XT_MATCH_U32=m | 297 | CONFIG_NETFILTER_XT_MATCH_U32=m |
303 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 298 | # CONFIG_IP_VS is not set |
304 | 299 | ||
305 | # | 300 | # |
306 | # IP: Netfilter Configuration | 301 | # IP: Netfilter Configuration |
307 | # | 302 | # |
303 | CONFIG_NF_DEFRAG_IPV4=m | ||
308 | CONFIG_NF_CONNTRACK_IPV4=m | 304 | CONFIG_NF_CONNTRACK_IPV4=m |
309 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 305 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
310 | CONFIG_IP_NF_QUEUE=m | 306 | CONFIG_IP_NF_QUEUE=m |
311 | CONFIG_IP_NF_IPTABLES=m | 307 | CONFIG_IP_NF_IPTABLES=m |
312 | CONFIG_IP_NF_MATCH_RECENT=m | 308 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
313 | CONFIG_IP_NF_MATCH_ECN=m | ||
314 | CONFIG_IP_NF_MATCH_AH=m | 309 | CONFIG_IP_NF_MATCH_AH=m |
310 | CONFIG_IP_NF_MATCH_ECN=m | ||
315 | CONFIG_IP_NF_MATCH_TTL=m | 311 | CONFIG_IP_NF_MATCH_TTL=m |
316 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
317 | CONFIG_IP_NF_FILTER=m | 312 | CONFIG_IP_NF_FILTER=m |
318 | CONFIG_IP_NF_TARGET_REJECT=m | 313 | CONFIG_IP_NF_TARGET_REJECT=m |
319 | CONFIG_IP_NF_TARGET_LOG=m | 314 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -321,8 +316,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
321 | CONFIG_NF_NAT=m | 316 | CONFIG_NF_NAT=m |
322 | CONFIG_NF_NAT_NEEDED=y | 317 | CONFIG_NF_NAT_NEEDED=y |
323 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 318 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
324 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
325 | CONFIG_IP_NF_TARGET_NETMAP=m | 319 | CONFIG_IP_NF_TARGET_NETMAP=m |
320 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
326 | CONFIG_NF_NAT_SNMP_BASIC=m | 321 | CONFIG_NF_NAT_SNMP_BASIC=m |
327 | CONFIG_NF_NAT_PROTO_GRE=m | 322 | CONFIG_NF_NAT_PROTO_GRE=m |
328 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 323 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -335,9 +330,9 @@ CONFIG_NF_NAT_PPTP=m | |||
335 | CONFIG_NF_NAT_H323=m | 330 | CONFIG_NF_NAT_H323=m |
336 | CONFIG_NF_NAT_SIP=m | 331 | CONFIG_NF_NAT_SIP=m |
337 | CONFIG_IP_NF_MANGLE=m | 332 | CONFIG_IP_NF_MANGLE=m |
333 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
338 | CONFIG_IP_NF_TARGET_ECN=m | 334 | CONFIG_IP_NF_TARGET_ECN=m |
339 | CONFIG_IP_NF_TARGET_TTL=m | 335 | CONFIG_IP_NF_TARGET_TTL=m |
340 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
341 | CONFIG_IP_NF_RAW=m | 336 | CONFIG_IP_NF_RAW=m |
342 | CONFIG_IP_NF_ARPTABLES=m | 337 | CONFIG_IP_NF_ARPTABLES=m |
343 | CONFIG_IP_NF_ARPFILTER=m | 338 | CONFIG_IP_NF_ARPFILTER=m |
@@ -349,16 +344,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
349 | CONFIG_NF_CONNTRACK_IPV6=m | 344 | CONFIG_NF_CONNTRACK_IPV6=m |
350 | CONFIG_IP6_NF_QUEUE=m | 345 | CONFIG_IP6_NF_QUEUE=m |
351 | CONFIG_IP6_NF_IPTABLES=m | 346 | CONFIG_IP6_NF_IPTABLES=m |
352 | CONFIG_IP6_NF_MATCH_RT=m | 347 | CONFIG_IP6_NF_MATCH_AH=m |
353 | CONFIG_IP6_NF_MATCH_OPTS=m | 348 | CONFIG_IP6_NF_MATCH_EUI64=m |
354 | CONFIG_IP6_NF_MATCH_FRAG=m | 349 | CONFIG_IP6_NF_MATCH_FRAG=m |
350 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
355 | CONFIG_IP6_NF_MATCH_HL=m | 351 | CONFIG_IP6_NF_MATCH_HL=m |
356 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 352 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
357 | CONFIG_IP6_NF_MATCH_AH=m | ||
358 | CONFIG_IP6_NF_MATCH_MH=m | 353 | CONFIG_IP6_NF_MATCH_MH=m |
359 | CONFIG_IP6_NF_MATCH_EUI64=m | 354 | CONFIG_IP6_NF_MATCH_RT=m |
360 | CONFIG_IP6_NF_FILTER=m | ||
361 | CONFIG_IP6_NF_TARGET_LOG=m | 355 | CONFIG_IP6_NF_TARGET_LOG=m |
356 | CONFIG_IP6_NF_FILTER=m | ||
362 | CONFIG_IP6_NF_TARGET_REJECT=m | 357 | CONFIG_IP6_NF_TARGET_REJECT=m |
363 | CONFIG_IP6_NF_MANGLE=m | 358 | CONFIG_IP6_NF_MANGLE=m |
364 | CONFIG_IP6_NF_TARGET_HL=m | 359 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -385,6 +380,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
385 | # CONFIG_TIPC is not set | 380 | # CONFIG_TIPC is not set |
386 | # CONFIG_ATM is not set | 381 | # CONFIG_ATM is not set |
387 | # CONFIG_BRIDGE is not set | 382 | # CONFIG_BRIDGE is not set |
383 | # CONFIG_NET_DSA is not set | ||
388 | # CONFIG_VLAN_8021Q is not set | 384 | # CONFIG_VLAN_8021Q is not set |
389 | # CONFIG_DECNET is not set | 385 | # CONFIG_DECNET is not set |
390 | CONFIG_LLC=m | 386 | CONFIG_LLC=m |
@@ -408,19 +404,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
408 | # CONFIG_IRDA is not set | 404 | # CONFIG_IRDA is not set |
409 | # CONFIG_BT is not set | 405 | # CONFIG_BT is not set |
410 | # CONFIG_AF_RXRPC is not set | 406 | # CONFIG_AF_RXRPC is not set |
411 | 407 | # CONFIG_PHONET is not set | |
412 | # | 408 | # CONFIG_WIRELESS is not set |
413 | # Wireless | ||
414 | # | ||
415 | # CONFIG_CFG80211 is not set | ||
416 | CONFIG_WIRELESS_EXT=y | ||
417 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
418 | # CONFIG_MAC80211 is not set | ||
419 | CONFIG_IEEE80211=m | ||
420 | # CONFIG_IEEE80211_DEBUG is not set | ||
421 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
422 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
423 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
424 | # CONFIG_RFKILL is not set | 409 | # CONFIG_RFKILL is not set |
425 | # CONFIG_NET_9P is not set | 410 | # CONFIG_NET_9P is not set |
426 | 411 | ||
@@ -458,6 +443,7 @@ CONFIG_ATA_OVER_ETH=m | |||
458 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
459 | # CONFIG_EEPROM_93CX6 is not set | 444 | # CONFIG_EEPROM_93CX6 is not set |
460 | # CONFIG_ENCLOSURE_SERVICES is not set | 445 | # CONFIG_ENCLOSURE_SERVICES is not set |
446 | # CONFIG_C2PORT is not set | ||
461 | CONFIG_HAVE_IDE=y | 447 | CONFIG_HAVE_IDE=y |
462 | # CONFIG_IDE is not set | 448 | # CONFIG_IDE is not set |
463 | 449 | ||
@@ -540,6 +526,9 @@ CONFIG_NET_ETHERNET=y | |||
540 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 526 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
541 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 527 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
542 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 528 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
529 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
530 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
531 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
543 | # CONFIG_B44 is not set | 532 | # CONFIG_B44 is not set |
544 | # CONFIG_NETDEV_1000 is not set | 533 | # CONFIG_NETDEV_1000 is not set |
545 | # CONFIG_NETDEV_10000 is not set | 534 | # CONFIG_NETDEV_10000 is not set |
@@ -609,6 +598,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
609 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 598 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
610 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 599 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
611 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 600 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
601 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
612 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 602 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
613 | CONFIG_MOUSE_SERIAL=m | 603 | CONFIG_MOUSE_SERIAL=m |
614 | # CONFIG_MOUSE_VSXXXAA is not set | 604 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -663,11 +653,11 @@ CONFIG_GEN_RTC_X=y | |||
663 | # CONFIG_THERMAL is not set | 653 | # CONFIG_THERMAL is not set |
664 | # CONFIG_THERMAL_HWMON is not set | 654 | # CONFIG_THERMAL_HWMON is not set |
665 | # CONFIG_WATCHDOG is not set | 655 | # CONFIG_WATCHDOG is not set |
656 | CONFIG_SSB_POSSIBLE=y | ||
666 | 657 | ||
667 | # | 658 | # |
668 | # Sonics Silicon Backplane | 659 | # Sonics Silicon Backplane |
669 | # | 660 | # |
670 | CONFIG_SSB_POSSIBLE=y | ||
671 | # CONFIG_SSB is not set | 661 | # CONFIG_SSB is not set |
672 | 662 | ||
673 | # | 663 | # |
@@ -677,6 +667,7 @@ CONFIG_SSB_POSSIBLE=y | |||
677 | # CONFIG_MFD_SM501 is not set | 667 | # CONFIG_MFD_SM501 is not set |
678 | # CONFIG_HTC_PASIC3 is not set | 668 | # CONFIG_HTC_PASIC3 is not set |
679 | # CONFIG_MFD_TMIO is not set | 669 | # CONFIG_MFD_TMIO is not set |
670 | # CONFIG_REGULATOR is not set | ||
680 | 671 | ||
681 | # | 672 | # |
682 | # Multimedia devices | 673 | # Multimedia devices |
@@ -702,6 +693,7 @@ CONFIG_SSB_POSSIBLE=y | |||
702 | CONFIG_FB=y | 693 | CONFIG_FB=y |
703 | # CONFIG_FIRMWARE_EDID is not set | 694 | # CONFIG_FIRMWARE_EDID is not set |
704 | # CONFIG_FB_DDC is not set | 695 | # CONFIG_FB_DDC is not set |
696 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
705 | CONFIG_FB_CFB_FILLRECT=y | 697 | CONFIG_FB_CFB_FILLRECT=y |
706 | # CONFIG_FB_CFB_COPYAREA is not set | 698 | # CONFIG_FB_CFB_COPYAREA is not set |
707 | CONFIG_FB_CFB_IMAGEBLIT=y | 699 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -724,6 +716,8 @@ CONFIG_FB_APOLLO=y | |||
724 | # CONFIG_FB_UVESA is not set | 716 | # CONFIG_FB_UVESA is not set |
725 | # CONFIG_FB_S1D13XXX is not set | 717 | # CONFIG_FB_S1D13XXX is not set |
726 | # CONFIG_FB_VIRTUAL is not set | 718 | # CONFIG_FB_VIRTUAL is not set |
719 | # CONFIG_FB_METRONOME is not set | ||
720 | # CONFIG_FB_MB862XX is not set | ||
727 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
728 | 722 | ||
729 | # | 723 | # |
@@ -750,6 +744,12 @@ CONFIG_HID_SUPPORT=y | |||
750 | CONFIG_HID=m | 744 | CONFIG_HID=m |
751 | # CONFIG_HID_DEBUG is not set | 745 | # CONFIG_HID_DEBUG is not set |
752 | CONFIG_HIDRAW=y | 746 | CONFIG_HIDRAW=y |
747 | # CONFIG_HID_PID is not set | ||
748 | |||
749 | # | ||
750 | # Special HID drivers | ||
751 | # | ||
752 | CONFIG_HID_COMPAT=y | ||
753 | # CONFIG_USB_SUPPORT is not set | 753 | # CONFIG_USB_SUPPORT is not set |
754 | # CONFIG_MMC is not set | 754 | # CONFIG_MMC is not set |
755 | # CONFIG_MEMSTICK is not set | 755 | # CONFIG_MEMSTICK is not set |
@@ -758,6 +758,8 @@ CONFIG_HIDRAW=y | |||
758 | # CONFIG_RTC_CLASS is not set | 758 | # CONFIG_RTC_CLASS is not set |
759 | # CONFIG_DMADEVICES is not set | 759 | # CONFIG_DMADEVICES is not set |
760 | # CONFIG_UIO is not set | 760 | # CONFIG_UIO is not set |
761 | # CONFIG_STAGING is not set | ||
762 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
761 | 763 | ||
762 | # | 764 | # |
763 | # Character devices | 765 | # Character devices |
@@ -773,8 +775,9 @@ CONFIG_EXT2_FS=y | |||
773 | # CONFIG_EXT2_FS_XIP is not set | 775 | # CONFIG_EXT2_FS_XIP is not set |
774 | CONFIG_EXT3_FS=y | 776 | CONFIG_EXT3_FS=y |
775 | # CONFIG_EXT3_FS_XATTR is not set | 777 | # CONFIG_EXT3_FS_XATTR is not set |
776 | # CONFIG_EXT4DEV_FS is not set | 778 | # CONFIG_EXT4_FS is not set |
777 | CONFIG_JBD=y | 779 | CONFIG_JBD=y |
780 | CONFIG_JBD2=m | ||
778 | CONFIG_REISERFS_FS=m | 781 | CONFIG_REISERFS_FS=m |
779 | # CONFIG_REISERFS_CHECK is not set | 782 | # CONFIG_REISERFS_CHECK is not set |
780 | # CONFIG_REISERFS_PROC_INFO is not set | 783 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -785,6 +788,7 @@ CONFIG_JFS_FS=m | |||
785 | # CONFIG_JFS_DEBUG is not set | 788 | # CONFIG_JFS_DEBUG is not set |
786 | # CONFIG_JFS_STATISTICS is not set | 789 | # CONFIG_JFS_STATISTICS is not set |
787 | # CONFIG_FS_POSIX_ACL is not set | 790 | # CONFIG_FS_POSIX_ACL is not set |
791 | CONFIG_FILE_LOCKING=y | ||
788 | CONFIG_XFS_FS=m | 792 | CONFIG_XFS_FS=m |
789 | # CONFIG_XFS_QUOTA is not set | 793 | # CONFIG_XFS_QUOTA is not set |
790 | # CONFIG_XFS_POSIX_ACL is not set | 794 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -796,6 +800,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
796 | # CONFIG_OCFS2_FS_STATS is not set | 800 | # CONFIG_OCFS2_FS_STATS is not set |
797 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 801 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
798 | # CONFIG_OCFS2_DEBUG_FS is not set | 802 | # CONFIG_OCFS2_DEBUG_FS is not set |
803 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
799 | CONFIG_DNOTIFY=y | 804 | CONFIG_DNOTIFY=y |
800 | CONFIG_INOTIFY=y | 805 | CONFIG_INOTIFY=y |
801 | CONFIG_INOTIFY_USER=y | 806 | CONFIG_INOTIFY_USER=y |
@@ -834,6 +839,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
834 | CONFIG_PROC_FS=y | 839 | CONFIG_PROC_FS=y |
835 | CONFIG_PROC_KCORE=y | 840 | CONFIG_PROC_KCORE=y |
836 | CONFIG_PROC_SYSCTL=y | 841 | CONFIG_PROC_SYSCTL=y |
842 | CONFIG_PROC_PAGE_MONITOR=y | ||
837 | CONFIG_SYSFS=y | 843 | CONFIG_SYSFS=y |
838 | CONFIG_TMPFS=y | 844 | CONFIG_TMPFS=y |
839 | # CONFIG_TMPFS_POSIX_ACL is not set | 845 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -877,6 +883,7 @@ CONFIG_EXPORTFS=m | |||
877 | CONFIG_NFS_COMMON=y | 883 | CONFIG_NFS_COMMON=y |
878 | CONFIG_SUNRPC=y | 884 | CONFIG_SUNRPC=y |
879 | CONFIG_SUNRPC_GSS=y | 885 | CONFIG_SUNRPC_GSS=y |
886 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
880 | CONFIG_RPCSEC_GSS_KRB5=y | 887 | CONFIG_RPCSEC_GSS_KRB5=y |
881 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 888 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
882 | CONFIG_SMB_FS=m | 889 | CONFIG_SMB_FS=m |
@@ -949,7 +956,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
949 | # CONFIG_DEBUG_KERNEL is not set | 956 | # CONFIG_DEBUG_KERNEL is not set |
950 | CONFIG_DEBUG_BUGVERBOSE=y | 957 | CONFIG_DEBUG_BUGVERBOSE=y |
951 | CONFIG_DEBUG_MEMORY_INIT=y | 958 | CONFIG_DEBUG_MEMORY_INIT=y |
959 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
952 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 960 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
961 | |||
962 | # | ||
963 | # Tracers | ||
964 | # | ||
965 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
953 | # CONFIG_SAMPLES is not set | 966 | # CONFIG_SAMPLES is not set |
954 | 967 | ||
955 | # | 968 | # |
@@ -957,6 +970,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
957 | # | 970 | # |
958 | # CONFIG_KEYS is not set | 971 | # CONFIG_KEYS is not set |
959 | # CONFIG_SECURITY is not set | 972 | # CONFIG_SECURITY is not set |
973 | # CONFIG_SECURITYFS is not set | ||
960 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 974 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
961 | CONFIG_XOR_BLOCKS=m | 975 | CONFIG_XOR_BLOCKS=m |
962 | CONFIG_ASYNC_CORE=m | 976 | CONFIG_ASYNC_CORE=m |
@@ -967,10 +981,12 @@ CONFIG_CRYPTO=y | |||
967 | # | 981 | # |
968 | # Crypto core or helper | 982 | # Crypto core or helper |
969 | # | 983 | # |
984 | # CONFIG_CRYPTO_FIPS is not set | ||
970 | CONFIG_CRYPTO_ALGAPI=y | 985 | CONFIG_CRYPTO_ALGAPI=y |
971 | CONFIG_CRYPTO_AEAD=m | 986 | CONFIG_CRYPTO_AEAD=y |
972 | CONFIG_CRYPTO_BLKCIPHER=y | 987 | CONFIG_CRYPTO_BLKCIPHER=y |
973 | CONFIG_CRYPTO_HASH=y | 988 | CONFIG_CRYPTO_HASH=y |
989 | CONFIG_CRYPTO_RNG=y | ||
974 | CONFIG_CRYPTO_MANAGER=y | 990 | CONFIG_CRYPTO_MANAGER=y |
975 | CONFIG_CRYPTO_GF128MUL=m | 991 | CONFIG_CRYPTO_GF128MUL=m |
976 | CONFIG_CRYPTO_NULL=m | 992 | CONFIG_CRYPTO_NULL=m |
@@ -1044,14 +1060,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1044 | # | 1060 | # |
1045 | CONFIG_CRYPTO_DEFLATE=m | 1061 | CONFIG_CRYPTO_DEFLATE=m |
1046 | CONFIG_CRYPTO_LZO=m | 1062 | CONFIG_CRYPTO_LZO=m |
1063 | |||
1064 | # | ||
1065 | # Random Number Generation | ||
1066 | # | ||
1067 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1047 | # CONFIG_CRYPTO_HW is not set | 1068 | # CONFIG_CRYPTO_HW is not set |
1048 | 1069 | ||
1049 | # | 1070 | # |
1050 | # Library routines | 1071 | # Library routines |
1051 | # | 1072 | # |
1052 | CONFIG_BITREVERSE=y | 1073 | CONFIG_BITREVERSE=y |
1053 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1054 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1055 | CONFIG_CRC_CCITT=m | 1074 | CONFIG_CRC_CCITT=m |
1056 | CONFIG_CRC16=m | 1075 | CONFIG_CRC16=m |
1057 | CONFIG_CRC_T10DIF=y | 1076 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 654c5acb9e86..a594a1d47b62 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:02 2008 | 4 | # Tue Dec 2 20:27:44 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | CONFIG_ATARI=y | 114 | CONFIG_ATARI=y |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
148 | CONFIG_UNEVICTABLE_LRU=y | ||
159 | 149 | ||
160 | # | 150 | # |
161 | # General setup | 151 | # General setup |
162 | # | 152 | # |
163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
155 | CONFIG_HAVE_AOUT=y | ||
164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
166 | CONFIG_STRAM_PROC=y | 158 | CONFIG_STRAM_PROC=y |
@@ -208,7 +200,6 @@ CONFIG_INET_TCP_DIAG=m | |||
208 | CONFIG_TCP_CONG_CUBIC=y | 200 | CONFIG_TCP_CONG_CUBIC=y |
209 | CONFIG_DEFAULT_TCP_CONG="cubic" | 201 | CONFIG_DEFAULT_TCP_CONG="cubic" |
210 | # CONFIG_TCP_MD5SIG is not set | 202 | # CONFIG_TCP_MD5SIG is not set |
211 | # CONFIG_IP_VS is not set | ||
212 | CONFIG_IPV6=m | 203 | CONFIG_IPV6=m |
213 | CONFIG_IPV6_PRIVACY=y | 204 | CONFIG_IPV6_PRIVACY=y |
214 | CONFIG_IPV6_ROUTER_PREF=y | 205 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -258,13 +249,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
258 | CONFIG_NF_CONNTRACK_SIP=m | 249 | CONFIG_NF_CONNTRACK_SIP=m |
259 | CONFIG_NF_CONNTRACK_TFTP=m | 250 | CONFIG_NF_CONNTRACK_TFTP=m |
260 | # CONFIG_NF_CT_NETLINK is not set | 251 | # CONFIG_NF_CT_NETLINK is not set |
252 | # CONFIG_NETFILTER_TPROXY is not set | ||
261 | CONFIG_NETFILTER_XTABLES=m | 253 | CONFIG_NETFILTER_XTABLES=m |
262 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 254 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
263 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 255 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
264 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 256 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
265 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 257 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
266 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
267 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 258 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
259 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
268 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 260 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
269 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 261 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
270 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 262 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -278,19 +270,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
278 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 270 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
279 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
280 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 272 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
273 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 274 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
282 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 275 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
283 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 276 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
284 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 277 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
285 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 278 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
286 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 279 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
280 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 281 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
288 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 282 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
289 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 283 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
291 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 284 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
292 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 285 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
293 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 286 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
287 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
288 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
294 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 289 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
295 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 290 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
296 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -298,20 +293,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
298 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 293 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
299 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 294 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
300 | CONFIG_NETFILTER_XT_MATCH_U32=m | 295 | CONFIG_NETFILTER_XT_MATCH_U32=m |
301 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 296 | # CONFIG_IP_VS is not set |
302 | 297 | ||
303 | # | 298 | # |
304 | # IP: Netfilter Configuration | 299 | # IP: Netfilter Configuration |
305 | # | 300 | # |
301 | CONFIG_NF_DEFRAG_IPV4=m | ||
306 | CONFIG_NF_CONNTRACK_IPV4=m | 302 | CONFIG_NF_CONNTRACK_IPV4=m |
307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 303 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
308 | CONFIG_IP_NF_QUEUE=m | 304 | CONFIG_IP_NF_QUEUE=m |
309 | CONFIG_IP_NF_IPTABLES=m | 305 | CONFIG_IP_NF_IPTABLES=m |
310 | CONFIG_IP_NF_MATCH_RECENT=m | 306 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
311 | CONFIG_IP_NF_MATCH_ECN=m | ||
312 | CONFIG_IP_NF_MATCH_AH=m | 307 | CONFIG_IP_NF_MATCH_AH=m |
308 | CONFIG_IP_NF_MATCH_ECN=m | ||
313 | CONFIG_IP_NF_MATCH_TTL=m | 309 | CONFIG_IP_NF_MATCH_TTL=m |
314 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
315 | CONFIG_IP_NF_FILTER=m | 310 | CONFIG_IP_NF_FILTER=m |
316 | CONFIG_IP_NF_TARGET_REJECT=m | 311 | CONFIG_IP_NF_TARGET_REJECT=m |
317 | CONFIG_IP_NF_TARGET_LOG=m | 312 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -319,8 +314,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
319 | CONFIG_NF_NAT=m | 314 | CONFIG_NF_NAT=m |
320 | CONFIG_NF_NAT_NEEDED=y | 315 | CONFIG_NF_NAT_NEEDED=y |
321 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 316 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
323 | CONFIG_IP_NF_TARGET_NETMAP=m | 317 | CONFIG_IP_NF_TARGET_NETMAP=m |
318 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
324 | CONFIG_NF_NAT_SNMP_BASIC=m | 319 | CONFIG_NF_NAT_SNMP_BASIC=m |
325 | CONFIG_NF_NAT_PROTO_GRE=m | 320 | CONFIG_NF_NAT_PROTO_GRE=m |
326 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 321 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -333,9 +328,9 @@ CONFIG_NF_NAT_PPTP=m | |||
333 | CONFIG_NF_NAT_H323=m | 328 | CONFIG_NF_NAT_H323=m |
334 | CONFIG_NF_NAT_SIP=m | 329 | CONFIG_NF_NAT_SIP=m |
335 | CONFIG_IP_NF_MANGLE=m | 330 | CONFIG_IP_NF_MANGLE=m |
331 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
336 | CONFIG_IP_NF_TARGET_ECN=m | 332 | CONFIG_IP_NF_TARGET_ECN=m |
337 | CONFIG_IP_NF_TARGET_TTL=m | 333 | CONFIG_IP_NF_TARGET_TTL=m |
338 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
339 | CONFIG_IP_NF_RAW=m | 334 | CONFIG_IP_NF_RAW=m |
340 | CONFIG_IP_NF_ARPTABLES=m | 335 | CONFIG_IP_NF_ARPTABLES=m |
341 | CONFIG_IP_NF_ARPFILTER=m | 336 | CONFIG_IP_NF_ARPFILTER=m |
@@ -347,16 +342,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
347 | CONFIG_NF_CONNTRACK_IPV6=m | 342 | CONFIG_NF_CONNTRACK_IPV6=m |
348 | CONFIG_IP6_NF_QUEUE=m | 343 | CONFIG_IP6_NF_QUEUE=m |
349 | CONFIG_IP6_NF_IPTABLES=m | 344 | CONFIG_IP6_NF_IPTABLES=m |
350 | CONFIG_IP6_NF_MATCH_RT=m | 345 | CONFIG_IP6_NF_MATCH_AH=m |
351 | CONFIG_IP6_NF_MATCH_OPTS=m | 346 | CONFIG_IP6_NF_MATCH_EUI64=m |
352 | CONFIG_IP6_NF_MATCH_FRAG=m | 347 | CONFIG_IP6_NF_MATCH_FRAG=m |
348 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
353 | CONFIG_IP6_NF_MATCH_HL=m | 349 | CONFIG_IP6_NF_MATCH_HL=m |
354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 350 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
355 | CONFIG_IP6_NF_MATCH_AH=m | ||
356 | CONFIG_IP6_NF_MATCH_MH=m | 351 | CONFIG_IP6_NF_MATCH_MH=m |
357 | CONFIG_IP6_NF_MATCH_EUI64=m | 352 | CONFIG_IP6_NF_MATCH_RT=m |
358 | CONFIG_IP6_NF_FILTER=m | ||
359 | CONFIG_IP6_NF_TARGET_LOG=m | 353 | CONFIG_IP6_NF_TARGET_LOG=m |
354 | CONFIG_IP6_NF_FILTER=m | ||
360 | CONFIG_IP6_NF_TARGET_REJECT=m | 355 | CONFIG_IP6_NF_TARGET_REJECT=m |
361 | CONFIG_IP6_NF_MANGLE=m | 356 | CONFIG_IP6_NF_MANGLE=m |
362 | CONFIG_IP6_NF_TARGET_HL=m | 357 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -383,6 +378,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
383 | # CONFIG_TIPC is not set | 378 | # CONFIG_TIPC is not set |
384 | # CONFIG_ATM is not set | 379 | # CONFIG_ATM is not set |
385 | # CONFIG_BRIDGE is not set | 380 | # CONFIG_BRIDGE is not set |
381 | # CONFIG_NET_DSA is not set | ||
386 | # CONFIG_VLAN_8021Q is not set | 382 | # CONFIG_VLAN_8021Q is not set |
387 | # CONFIG_DECNET is not set | 383 | # CONFIG_DECNET is not set |
388 | CONFIG_LLC=m | 384 | CONFIG_LLC=m |
@@ -406,19 +402,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
406 | # CONFIG_IRDA is not set | 402 | # CONFIG_IRDA is not set |
407 | # CONFIG_BT is not set | 403 | # CONFIG_BT is not set |
408 | # CONFIG_AF_RXRPC is not set | 404 | # CONFIG_AF_RXRPC is not set |
409 | 405 | # CONFIG_PHONET is not set | |
410 | # | 406 | # CONFIG_WIRELESS is not set |
411 | # Wireless | ||
412 | # | ||
413 | # CONFIG_CFG80211 is not set | ||
414 | CONFIG_WIRELESS_EXT=y | ||
415 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
416 | # CONFIG_MAC80211 is not set | ||
417 | CONFIG_IEEE80211=m | ||
418 | # CONFIG_IEEE80211_DEBUG is not set | ||
419 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
420 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
421 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
422 | # CONFIG_RFKILL is not set | 407 | # CONFIG_RFKILL is not set |
423 | # CONFIG_NET_9P is not set | 408 | # CONFIG_NET_9P is not set |
424 | 409 | ||
@@ -462,21 +447,20 @@ CONFIG_ATA_OVER_ETH=m | |||
462 | CONFIG_MISC_DEVICES=y | 447 | CONFIG_MISC_DEVICES=y |
463 | # CONFIG_EEPROM_93CX6 is not set | 448 | # CONFIG_EEPROM_93CX6 is not set |
464 | # CONFIG_ENCLOSURE_SERVICES is not set | 449 | # CONFIG_ENCLOSURE_SERVICES is not set |
450 | # CONFIG_C2PORT is not set | ||
465 | CONFIG_HAVE_IDE=y | 451 | CONFIG_HAVE_IDE=y |
466 | CONFIG_IDE=y | 452 | CONFIG_IDE=y |
467 | CONFIG_BLK_DEV_IDE=y | ||
468 | 453 | ||
469 | # | 454 | # |
470 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 455 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
471 | # | 456 | # |
472 | CONFIG_IDE_ATAPI=y | ||
473 | # CONFIG_BLK_DEV_IDE_SATA is not set | 457 | # CONFIG_BLK_DEV_IDE_SATA is not set |
474 | CONFIG_BLK_DEV_IDEDISK=y | 458 | CONFIG_IDE_GD=y |
475 | # CONFIG_IDEDISK_MULTI_MODE is not set | 459 | CONFIG_IDE_GD_ATA=y |
460 | # CONFIG_IDE_GD_ATAPI is not set | ||
476 | CONFIG_BLK_DEV_IDECD=y | 461 | CONFIG_BLK_DEV_IDECD=y |
477 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 462 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
478 | # CONFIG_BLK_DEV_IDETAPE is not set | 463 | # CONFIG_BLK_DEV_IDETAPE is not set |
479 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
480 | # CONFIG_BLK_DEV_IDESCSI is not set | 464 | # CONFIG_BLK_DEV_IDESCSI is not set |
481 | # CONFIG_IDE_TASK_IOCTL is not set | 465 | # CONFIG_IDE_TASK_IOCTL is not set |
482 | CONFIG_IDE_PROC_FS=y | 466 | CONFIG_IDE_PROC_FS=y |
@@ -565,12 +549,15 @@ CONFIG_EQUALIZER=m | |||
565 | CONFIG_VETH=m | 549 | CONFIG_VETH=m |
566 | # CONFIG_PHYLIB is not set | 550 | # CONFIG_PHYLIB is not set |
567 | CONFIG_NET_ETHERNET=y | 551 | CONFIG_NET_ETHERNET=y |
568 | CONFIG_MII=m | 552 | CONFIG_MII=y |
569 | CONFIG_ATARILANCE=m | 553 | CONFIG_ATARILANCE=m |
570 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 554 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
571 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 555 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
572 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 556 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
573 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 557 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
558 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
559 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
560 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
574 | # CONFIG_B44 is not set | 561 | # CONFIG_B44 is not set |
575 | # CONFIG_NET_POCKET is not set | 562 | # CONFIG_NET_POCKET is not set |
576 | # CONFIG_NETDEV_1000 is not set | 563 | # CONFIG_NETDEV_1000 is not set |
@@ -644,6 +631,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
644 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 631 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
645 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 632 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
646 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 633 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
634 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
647 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 635 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
648 | # CONFIG_MOUSE_SERIAL is not set | 636 | # CONFIG_MOUSE_SERIAL is not set |
649 | CONFIG_MOUSE_ATARI=m | 637 | CONFIG_MOUSE_ATARI=m |
@@ -706,11 +694,11 @@ CONFIG_GEN_RTC_X=y | |||
706 | # CONFIG_THERMAL is not set | 694 | # CONFIG_THERMAL is not set |
707 | # CONFIG_THERMAL_HWMON is not set | 695 | # CONFIG_THERMAL_HWMON is not set |
708 | # CONFIG_WATCHDOG is not set | 696 | # CONFIG_WATCHDOG is not set |
697 | CONFIG_SSB_POSSIBLE=y | ||
709 | 698 | ||
710 | # | 699 | # |
711 | # Sonics Silicon Backplane | 700 | # Sonics Silicon Backplane |
712 | # | 701 | # |
713 | CONFIG_SSB_POSSIBLE=y | ||
714 | # CONFIG_SSB is not set | 702 | # CONFIG_SSB is not set |
715 | 703 | ||
716 | # | 704 | # |
@@ -720,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y | |||
720 | # CONFIG_MFD_SM501 is not set | 708 | # CONFIG_MFD_SM501 is not set |
721 | # CONFIG_HTC_PASIC3 is not set | 709 | # CONFIG_HTC_PASIC3 is not set |
722 | # CONFIG_MFD_TMIO is not set | 710 | # CONFIG_MFD_TMIO is not set |
711 | # CONFIG_REGULATOR is not set | ||
723 | 712 | ||
724 | # | 713 | # |
725 | # Multimedia devices | 714 | # Multimedia devices |
@@ -745,6 +734,7 @@ CONFIG_SSB_POSSIBLE=y | |||
745 | CONFIG_FB=y | 734 | CONFIG_FB=y |
746 | # CONFIG_FIRMWARE_EDID is not set | 735 | # CONFIG_FIRMWARE_EDID is not set |
747 | # CONFIG_FB_DDC is not set | 736 | # CONFIG_FB_DDC is not set |
737 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
748 | CONFIG_FB_CFB_FILLRECT=y | 738 | CONFIG_FB_CFB_FILLRECT=y |
749 | CONFIG_FB_CFB_COPYAREA=y | 739 | CONFIG_FB_CFB_COPYAREA=y |
750 | CONFIG_FB_CFB_IMAGEBLIT=y | 740 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -768,6 +758,8 @@ CONFIG_FB_ATARI=y | |||
768 | # CONFIG_FB_S1D13XXX is not set | 758 | # CONFIG_FB_S1D13XXX is not set |
769 | # CONFIG_FB_ATY is not set | 759 | # CONFIG_FB_ATY is not set |
770 | # CONFIG_FB_VIRTUAL is not set | 760 | # CONFIG_FB_VIRTUAL is not set |
761 | # CONFIG_FB_METRONOME is not set | ||
762 | # CONFIG_FB_MB862XX is not set | ||
771 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 763 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
772 | 764 | ||
773 | # | 765 | # |
@@ -790,12 +782,19 @@ CONFIG_LOGO_LINUX_MONO=y | |||
790 | CONFIG_LOGO_LINUX_VGA16=y | 782 | CONFIG_LOGO_LINUX_VGA16=y |
791 | CONFIG_LOGO_LINUX_CLUT224=y | 783 | CONFIG_LOGO_LINUX_CLUT224=y |
792 | CONFIG_SOUND=m | 784 | CONFIG_SOUND=m |
785 | CONFIG_SOUND_OSS_CORE=y | ||
793 | CONFIG_DMASOUND_ATARI=m | 786 | CONFIG_DMASOUND_ATARI=m |
794 | CONFIG_DMASOUND=m | 787 | CONFIG_DMASOUND=m |
795 | CONFIG_HID_SUPPORT=y | 788 | CONFIG_HID_SUPPORT=y |
796 | CONFIG_HID=m | 789 | CONFIG_HID=m |
797 | # CONFIG_HID_DEBUG is not set | 790 | # CONFIG_HID_DEBUG is not set |
798 | CONFIG_HIDRAW=y | 791 | CONFIG_HIDRAW=y |
792 | # CONFIG_HID_PID is not set | ||
793 | |||
794 | # | ||
795 | # Special HID drivers | ||
796 | # | ||
797 | CONFIG_HID_COMPAT=y | ||
799 | # CONFIG_USB_SUPPORT is not set | 798 | # CONFIG_USB_SUPPORT is not set |
800 | # CONFIG_MMC is not set | 799 | # CONFIG_MMC is not set |
801 | # CONFIG_MEMSTICK is not set | 800 | # CONFIG_MEMSTICK is not set |
@@ -805,6 +804,8 @@ CONFIG_HIDRAW=y | |||
805 | # CONFIG_DMADEVICES is not set | 804 | # CONFIG_DMADEVICES is not set |
806 | # CONFIG_AUXDISPLAY is not set | 805 | # CONFIG_AUXDISPLAY is not set |
807 | # CONFIG_UIO is not set | 806 | # CONFIG_UIO is not set |
807 | # CONFIG_STAGING is not set | ||
808 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
808 | 809 | ||
809 | # | 810 | # |
810 | # Character devices | 811 | # Character devices |
@@ -821,10 +822,9 @@ CONFIG_EXT2_FS=y | |||
821 | # CONFIG_EXT2_FS_XIP is not set | 822 | # CONFIG_EXT2_FS_XIP is not set |
822 | CONFIG_EXT3_FS=y | 823 | CONFIG_EXT3_FS=y |
823 | # CONFIG_EXT3_FS_XATTR is not set | 824 | # CONFIG_EXT3_FS_XATTR is not set |
824 | CONFIG_EXT4DEV_FS=y | 825 | # CONFIG_EXT4_FS is not set |
825 | # CONFIG_EXT4DEV_FS_XATTR is not set | ||
826 | CONFIG_JBD=y | 826 | CONFIG_JBD=y |
827 | CONFIG_JBD2=y | 827 | CONFIG_JBD2=m |
828 | CONFIG_REISERFS_FS=m | 828 | CONFIG_REISERFS_FS=m |
829 | # CONFIG_REISERFS_CHECK is not set | 829 | # CONFIG_REISERFS_CHECK is not set |
830 | # CONFIG_REISERFS_PROC_INFO is not set | 830 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -835,6 +835,7 @@ CONFIG_JFS_FS=m | |||
835 | # CONFIG_JFS_DEBUG is not set | 835 | # CONFIG_JFS_DEBUG is not set |
836 | # CONFIG_JFS_STATISTICS is not set | 836 | # CONFIG_JFS_STATISTICS is not set |
837 | # CONFIG_FS_POSIX_ACL is not set | 837 | # CONFIG_FS_POSIX_ACL is not set |
838 | CONFIG_FILE_LOCKING=y | ||
838 | CONFIG_XFS_FS=m | 839 | CONFIG_XFS_FS=m |
839 | # CONFIG_XFS_QUOTA is not set | 840 | # CONFIG_XFS_QUOTA is not set |
840 | # CONFIG_XFS_POSIX_ACL is not set | 841 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -846,6 +847,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
846 | # CONFIG_OCFS2_FS_STATS is not set | 847 | # CONFIG_OCFS2_FS_STATS is not set |
847 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 848 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
848 | # CONFIG_OCFS2_DEBUG_FS is not set | 849 | # CONFIG_OCFS2_DEBUG_FS is not set |
850 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
849 | CONFIG_DNOTIFY=y | 851 | CONFIG_DNOTIFY=y |
850 | CONFIG_INOTIFY=y | 852 | CONFIG_INOTIFY=y |
851 | CONFIG_INOTIFY_USER=y | 853 | CONFIG_INOTIFY_USER=y |
@@ -884,6 +886,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
884 | CONFIG_PROC_FS=y | 886 | CONFIG_PROC_FS=y |
885 | CONFIG_PROC_KCORE=y | 887 | CONFIG_PROC_KCORE=y |
886 | CONFIG_PROC_SYSCTL=y | 888 | CONFIG_PROC_SYSCTL=y |
889 | CONFIG_PROC_PAGE_MONITOR=y | ||
887 | CONFIG_SYSFS=y | 890 | CONFIG_SYSFS=y |
888 | CONFIG_TMPFS=y | 891 | CONFIG_TMPFS=y |
889 | # CONFIG_TMPFS_POSIX_ACL is not set | 892 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -925,6 +928,7 @@ CONFIG_LOCKD_V4=y | |||
925 | CONFIG_EXPORTFS=m | 928 | CONFIG_EXPORTFS=m |
926 | CONFIG_NFS_COMMON=y | 929 | CONFIG_NFS_COMMON=y |
927 | CONFIG_SUNRPC=m | 930 | CONFIG_SUNRPC=m |
931 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
928 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 932 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
929 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 933 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
930 | CONFIG_SMB_FS=m | 934 | CONFIG_SMB_FS=m |
@@ -998,7 +1002,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
998 | # CONFIG_DEBUG_KERNEL is not set | 1002 | # CONFIG_DEBUG_KERNEL is not set |
999 | CONFIG_DEBUG_BUGVERBOSE=y | 1003 | CONFIG_DEBUG_BUGVERBOSE=y |
1000 | CONFIG_DEBUG_MEMORY_INIT=y | 1004 | CONFIG_DEBUG_MEMORY_INIT=y |
1005 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1001 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1006 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1007 | |||
1008 | # | ||
1009 | # Tracers | ||
1010 | # | ||
1011 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1002 | # CONFIG_SAMPLES is not set | 1012 | # CONFIG_SAMPLES is not set |
1003 | 1013 | ||
1004 | # | 1014 | # |
@@ -1006,6 +1016,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
1006 | # | 1016 | # |
1007 | # CONFIG_KEYS is not set | 1017 | # CONFIG_KEYS is not set |
1008 | # CONFIG_SECURITY is not set | 1018 | # CONFIG_SECURITY is not set |
1019 | # CONFIG_SECURITYFS is not set | ||
1009 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1020 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1010 | CONFIG_XOR_BLOCKS=m | 1021 | CONFIG_XOR_BLOCKS=m |
1011 | CONFIG_ASYNC_CORE=m | 1022 | CONFIG_ASYNC_CORE=m |
@@ -1016,10 +1027,12 @@ CONFIG_CRYPTO=y | |||
1016 | # | 1027 | # |
1017 | # Crypto core or helper | 1028 | # Crypto core or helper |
1018 | # | 1029 | # |
1030 | # CONFIG_CRYPTO_FIPS is not set | ||
1019 | CONFIG_CRYPTO_ALGAPI=y | 1031 | CONFIG_CRYPTO_ALGAPI=y |
1020 | CONFIG_CRYPTO_AEAD=m | 1032 | CONFIG_CRYPTO_AEAD=y |
1021 | CONFIG_CRYPTO_BLKCIPHER=m | 1033 | CONFIG_CRYPTO_BLKCIPHER=y |
1022 | CONFIG_CRYPTO_HASH=y | 1034 | CONFIG_CRYPTO_HASH=y |
1035 | CONFIG_CRYPTO_RNG=y | ||
1023 | CONFIG_CRYPTO_MANAGER=y | 1036 | CONFIG_CRYPTO_MANAGER=y |
1024 | CONFIG_CRYPTO_GF128MUL=m | 1037 | CONFIG_CRYPTO_GF128MUL=m |
1025 | CONFIG_CRYPTO_NULL=m | 1038 | CONFIG_CRYPTO_NULL=m |
@@ -1093,14 +1106,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1093 | # | 1106 | # |
1094 | CONFIG_CRYPTO_DEFLATE=m | 1107 | CONFIG_CRYPTO_DEFLATE=m |
1095 | CONFIG_CRYPTO_LZO=m | 1108 | CONFIG_CRYPTO_LZO=m |
1109 | |||
1110 | # | ||
1111 | # Random Number Generation | ||
1112 | # | ||
1113 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1096 | # CONFIG_CRYPTO_HW is not set | 1114 | # CONFIG_CRYPTO_HW is not set |
1097 | 1115 | ||
1098 | # | 1116 | # |
1099 | # Library routines | 1117 | # Library routines |
1100 | # | 1118 | # |
1101 | CONFIG_BITREVERSE=y | 1119 | CONFIG_BITREVERSE=y |
1102 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1103 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1104 | CONFIG_CRC_CCITT=m | 1120 | CONFIG_CRC_CCITT=m |
1105 | CONFIG_CRC16=y | 1121 | CONFIG_CRC16=y |
1106 | CONFIG_CRC_T10DIF=y | 1122 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 2e44af0fe54a..d3d9814a91de 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:03 2008 | 4 | # Tue Dec 2 20:27:45 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
151 | CONFIG_DISCONTIGMEM=y | 141 | CONFIG_DISCONTIGMEM=y |
152 | CONFIG_FLAT_NODE_MEM_MAP=y | 142 | CONFIG_FLAT_NODE_MEM_MAP=y |
153 | CONFIG_NEED_MULTIPLE_NODES=y | 143 | CONFIG_NEED_MULTIPLE_NODES=y |
154 | # CONFIG_SPARSEMEM_STATIC is not set | ||
155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
156 | CONFIG_PAGEFLAGS_EXTENDED=y | 144 | CONFIG_PAGEFLAGS_EXTENDED=y |
157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
158 | # CONFIG_RESOURCES_64BIT is not set | 146 | # CONFIG_RESOURCES_64BIT is not set |
147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
159 | CONFIG_ZONE_DMA_FLAG=1 | 148 | CONFIG_ZONE_DMA_FLAG=1 |
160 | CONFIG_BOUNCE=y | 149 | CONFIG_BOUNCE=y |
161 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
151 | CONFIG_UNEVICTABLE_LRU=y | ||
162 | 152 | ||
163 | # | 153 | # |
164 | # General setup | 154 | # General setup |
165 | # | 155 | # |
166 | CONFIG_BINFMT_ELF=y | 156 | CONFIG_BINFMT_ELF=y |
157 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
158 | CONFIG_HAVE_AOUT=y | ||
167 | CONFIG_BINFMT_AOUT=m | 159 | CONFIG_BINFMT_AOUT=m |
168 | CONFIG_BINFMT_MISC=m | 160 | CONFIG_BINFMT_MISC=m |
169 | CONFIG_PROC_HARDWARE=y | 161 | CONFIG_PROC_HARDWARE=y |
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
215 | # CONFIG_IP_VS is not set | ||
216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
256 | # CONFIG_NETFILTER_TPROXY is not set | ||
265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
306 | 301 | ||
307 | # | 302 | # |
308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
309 | # | 304 | # |
305 | CONFIG_NF_DEFRAG_IPV4=m | ||
310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
315 | CONFIG_IP_NF_MATCH_ECN=m | ||
316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
312 | CONFIG_IP_NF_MATCH_ECN=m | ||
317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
359 | CONFIG_IP6_NF_MATCH_AH=m | ||
360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
362 | CONFIG_IP6_NF_FILTER=m | ||
363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
358 | CONFIG_IP6_NF_FILTER=m | ||
364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
385 | # CONFIG_NET_DSA is not set | ||
390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
413 | 409 | # CONFIG_PHONET is not set | |
414 | # | 410 | # CONFIG_WIRELESS is not set |
415 | # Wireless | ||
416 | # | ||
417 | # CONFIG_CFG80211 is not set | ||
418 | CONFIG_WIRELESS_EXT=y | ||
419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
420 | # CONFIG_MAC80211 is not set | ||
421 | CONFIG_IEEE80211=m | ||
422 | # CONFIG_IEEE80211_DEBUG is not set | ||
423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
428 | 413 | ||
@@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m | |||
460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
448 | # CONFIG_C2PORT is not set | ||
463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
464 | # CONFIG_IDE is not set | 450 | # CONFIG_IDE is not set |
465 | 451 | ||
@@ -545,6 +531,9 @@ CONFIG_BVME6000_NET=y | |||
545 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
546 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
547 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
534 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
535 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
536 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
548 | # CONFIG_B44 is not set | 537 | # CONFIG_B44 is not set |
549 | # CONFIG_NETDEV_1000 is not set | 538 | # CONFIG_NETDEV_1000 is not set |
550 | # CONFIG_NETDEV_10000 is not set | 539 | # CONFIG_NETDEV_10000 is not set |
@@ -614,6 +603,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
614 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 603 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
615 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 604 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
616 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 605 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
606 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
617 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 607 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
618 | CONFIG_MOUSE_SERIAL=m | 608 | CONFIG_MOUSE_SERIAL=m |
619 | # CONFIG_MOUSE_VSXXXAA is not set | 609 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -668,11 +658,11 @@ CONFIG_GEN_RTC_X=y | |||
668 | # CONFIG_THERMAL is not set | 658 | # CONFIG_THERMAL is not set |
669 | # CONFIG_THERMAL_HWMON is not set | 659 | # CONFIG_THERMAL_HWMON is not set |
670 | # CONFIG_WATCHDOG is not set | 660 | # CONFIG_WATCHDOG is not set |
661 | CONFIG_SSB_POSSIBLE=y | ||
671 | 662 | ||
672 | # | 663 | # |
673 | # Sonics Silicon Backplane | 664 | # Sonics Silicon Backplane |
674 | # | 665 | # |
675 | CONFIG_SSB_POSSIBLE=y | ||
676 | # CONFIG_SSB is not set | 666 | # CONFIG_SSB is not set |
677 | 667 | ||
678 | # | 668 | # |
@@ -682,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y | |||
682 | # CONFIG_MFD_SM501 is not set | 672 | # CONFIG_MFD_SM501 is not set |
683 | # CONFIG_HTC_PASIC3 is not set | 673 | # CONFIG_HTC_PASIC3 is not set |
684 | # CONFIG_MFD_TMIO is not set | 674 | # CONFIG_MFD_TMIO is not set |
675 | # CONFIG_REGULATOR is not set | ||
685 | 676 | ||
686 | # | 677 | # |
687 | # Multimedia devices | 678 | # Multimedia devices |
@@ -721,6 +712,12 @@ CONFIG_HID_SUPPORT=y | |||
721 | CONFIG_HID=m | 712 | CONFIG_HID=m |
722 | # CONFIG_HID_DEBUG is not set | 713 | # CONFIG_HID_DEBUG is not set |
723 | CONFIG_HIDRAW=y | 714 | CONFIG_HIDRAW=y |
715 | # CONFIG_HID_PID is not set | ||
716 | |||
717 | # | ||
718 | # Special HID drivers | ||
719 | # | ||
720 | CONFIG_HID_COMPAT=y | ||
724 | # CONFIG_USB_SUPPORT is not set | 721 | # CONFIG_USB_SUPPORT is not set |
725 | # CONFIG_MMC is not set | 722 | # CONFIG_MMC is not set |
726 | # CONFIG_MEMSTICK is not set | 723 | # CONFIG_MEMSTICK is not set |
@@ -729,6 +726,8 @@ CONFIG_HIDRAW=y | |||
729 | # CONFIG_RTC_CLASS is not set | 726 | # CONFIG_RTC_CLASS is not set |
730 | # CONFIG_DMADEVICES is not set | 727 | # CONFIG_DMADEVICES is not set |
731 | # CONFIG_UIO is not set | 728 | # CONFIG_UIO is not set |
729 | # CONFIG_STAGING is not set | ||
730 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
732 | 731 | ||
733 | # | 732 | # |
734 | # Character devices | 733 | # Character devices |
@@ -744,8 +743,9 @@ CONFIG_EXT2_FS=y | |||
744 | # CONFIG_EXT2_FS_XIP is not set | 743 | # CONFIG_EXT2_FS_XIP is not set |
745 | CONFIG_EXT3_FS=y | 744 | CONFIG_EXT3_FS=y |
746 | # CONFIG_EXT3_FS_XATTR is not set | 745 | # CONFIG_EXT3_FS_XATTR is not set |
747 | # CONFIG_EXT4DEV_FS is not set | 746 | # CONFIG_EXT4_FS is not set |
748 | CONFIG_JBD=y | 747 | CONFIG_JBD=y |
748 | CONFIG_JBD2=m | ||
749 | CONFIG_REISERFS_FS=m | 749 | CONFIG_REISERFS_FS=m |
750 | # CONFIG_REISERFS_CHECK is not set | 750 | # CONFIG_REISERFS_CHECK is not set |
751 | # CONFIG_REISERFS_PROC_INFO is not set | 751 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -756,6 +756,7 @@ CONFIG_JFS_FS=m | |||
756 | # CONFIG_JFS_DEBUG is not set | 756 | # CONFIG_JFS_DEBUG is not set |
757 | # CONFIG_JFS_STATISTICS is not set | 757 | # CONFIG_JFS_STATISTICS is not set |
758 | # CONFIG_FS_POSIX_ACL is not set | 758 | # CONFIG_FS_POSIX_ACL is not set |
759 | CONFIG_FILE_LOCKING=y | ||
759 | CONFIG_XFS_FS=m | 760 | CONFIG_XFS_FS=m |
760 | # CONFIG_XFS_QUOTA is not set | 761 | # CONFIG_XFS_QUOTA is not set |
761 | # CONFIG_XFS_POSIX_ACL is not set | 762 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -767,6 +768,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
767 | # CONFIG_OCFS2_FS_STATS is not set | 768 | # CONFIG_OCFS2_FS_STATS is not set |
768 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 769 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
769 | # CONFIG_OCFS2_DEBUG_FS is not set | 770 | # CONFIG_OCFS2_DEBUG_FS is not set |
771 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
770 | CONFIG_DNOTIFY=y | 772 | CONFIG_DNOTIFY=y |
771 | CONFIG_INOTIFY=y | 773 | CONFIG_INOTIFY=y |
772 | CONFIG_INOTIFY_USER=y | 774 | CONFIG_INOTIFY_USER=y |
@@ -805,6 +807,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
805 | CONFIG_PROC_FS=y | 807 | CONFIG_PROC_FS=y |
806 | CONFIG_PROC_KCORE=y | 808 | CONFIG_PROC_KCORE=y |
807 | CONFIG_PROC_SYSCTL=y | 809 | CONFIG_PROC_SYSCTL=y |
810 | CONFIG_PROC_PAGE_MONITOR=y | ||
808 | CONFIG_SYSFS=y | 811 | CONFIG_SYSFS=y |
809 | CONFIG_TMPFS=y | 812 | CONFIG_TMPFS=y |
810 | # CONFIG_TMPFS_POSIX_ACL is not set | 813 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -848,6 +851,7 @@ CONFIG_EXPORTFS=m | |||
848 | CONFIG_NFS_COMMON=y | 851 | CONFIG_NFS_COMMON=y |
849 | CONFIG_SUNRPC=y | 852 | CONFIG_SUNRPC=y |
850 | CONFIG_SUNRPC_GSS=y | 853 | CONFIG_SUNRPC_GSS=y |
854 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
851 | CONFIG_RPCSEC_GSS_KRB5=y | 855 | CONFIG_RPCSEC_GSS_KRB5=y |
852 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 856 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
853 | CONFIG_SMB_FS=m | 857 | CONFIG_SMB_FS=m |
@@ -921,7 +925,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
921 | # CONFIG_DEBUG_KERNEL is not set | 925 | # CONFIG_DEBUG_KERNEL is not set |
922 | CONFIG_DEBUG_BUGVERBOSE=y | 926 | CONFIG_DEBUG_BUGVERBOSE=y |
923 | CONFIG_DEBUG_MEMORY_INIT=y | 927 | CONFIG_DEBUG_MEMORY_INIT=y |
928 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
924 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 929 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
930 | |||
931 | # | ||
932 | # Tracers | ||
933 | # | ||
934 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
925 | # CONFIG_SAMPLES is not set | 935 | # CONFIG_SAMPLES is not set |
926 | 936 | ||
927 | # | 937 | # |
@@ -929,6 +939,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
929 | # | 939 | # |
930 | # CONFIG_KEYS is not set | 940 | # CONFIG_KEYS is not set |
931 | # CONFIG_SECURITY is not set | 941 | # CONFIG_SECURITY is not set |
942 | # CONFIG_SECURITYFS is not set | ||
932 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 943 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
933 | CONFIG_XOR_BLOCKS=m | 944 | CONFIG_XOR_BLOCKS=m |
934 | CONFIG_ASYNC_CORE=m | 945 | CONFIG_ASYNC_CORE=m |
@@ -939,10 +950,12 @@ CONFIG_CRYPTO=y | |||
939 | # | 950 | # |
940 | # Crypto core or helper | 951 | # Crypto core or helper |
941 | # | 952 | # |
953 | # CONFIG_CRYPTO_FIPS is not set | ||
942 | CONFIG_CRYPTO_ALGAPI=y | 954 | CONFIG_CRYPTO_ALGAPI=y |
943 | CONFIG_CRYPTO_AEAD=m | 955 | CONFIG_CRYPTO_AEAD=y |
944 | CONFIG_CRYPTO_BLKCIPHER=y | 956 | CONFIG_CRYPTO_BLKCIPHER=y |
945 | CONFIG_CRYPTO_HASH=y | 957 | CONFIG_CRYPTO_HASH=y |
958 | CONFIG_CRYPTO_RNG=y | ||
946 | CONFIG_CRYPTO_MANAGER=y | 959 | CONFIG_CRYPTO_MANAGER=y |
947 | CONFIG_CRYPTO_GF128MUL=m | 960 | CONFIG_CRYPTO_GF128MUL=m |
948 | CONFIG_CRYPTO_NULL=m | 961 | CONFIG_CRYPTO_NULL=m |
@@ -1016,14 +1029,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1016 | # | 1029 | # |
1017 | CONFIG_CRYPTO_DEFLATE=m | 1030 | CONFIG_CRYPTO_DEFLATE=m |
1018 | CONFIG_CRYPTO_LZO=m | 1031 | CONFIG_CRYPTO_LZO=m |
1032 | |||
1033 | # | ||
1034 | # Random Number Generation | ||
1035 | # | ||
1036 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1019 | # CONFIG_CRYPTO_HW is not set | 1037 | # CONFIG_CRYPTO_HW is not set |
1020 | 1038 | ||
1021 | # | 1039 | # |
1022 | # Library routines | 1040 | # Library routines |
1023 | # | 1041 | # |
1024 | CONFIG_BITREVERSE=m | 1042 | CONFIG_BITREVERSE=m |
1025 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1026 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1027 | CONFIG_CRC_CCITT=m | 1043 | CONFIG_CRC_CCITT=m |
1028 | CONFIG_CRC16=m | 1044 | CONFIG_CRC16=m |
1029 | CONFIG_CRC_T10DIF=y | 1045 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 3570fc89b089..5556ef088d04 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:04 2008 | 4 | # Tue Dec 2 20:27:46 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -149,19 +139,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
149 | CONFIG_DISCONTIGMEM=y | 139 | CONFIG_DISCONTIGMEM=y |
150 | CONFIG_FLAT_NODE_MEM_MAP=y | 140 | CONFIG_FLAT_NODE_MEM_MAP=y |
151 | CONFIG_NEED_MULTIPLE_NODES=y | 141 | CONFIG_NEED_MULTIPLE_NODES=y |
152 | # CONFIG_SPARSEMEM_STATIC is not set | ||
153 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
154 | CONFIG_PAGEFLAGS_EXTENDED=y | 142 | CONFIG_PAGEFLAGS_EXTENDED=y |
155 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 143 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
156 | # CONFIG_RESOURCES_64BIT is not set | 144 | # CONFIG_RESOURCES_64BIT is not set |
145 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
157 | CONFIG_ZONE_DMA_FLAG=1 | 146 | CONFIG_ZONE_DMA_FLAG=1 |
158 | CONFIG_BOUNCE=y | 147 | CONFIG_BOUNCE=y |
159 | CONFIG_VIRT_TO_BUS=y | 148 | CONFIG_VIRT_TO_BUS=y |
149 | CONFIG_UNEVICTABLE_LRU=y | ||
160 | 150 | ||
161 | # | 151 | # |
162 | # General setup | 152 | # General setup |
163 | # | 153 | # |
164 | CONFIG_BINFMT_ELF=y | 154 | CONFIG_BINFMT_ELF=y |
155 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
156 | CONFIG_HAVE_AOUT=y | ||
165 | CONFIG_BINFMT_AOUT=m | 157 | CONFIG_BINFMT_AOUT=m |
166 | CONFIG_BINFMT_MISC=m | 158 | CONFIG_BINFMT_MISC=m |
167 | CONFIG_HEARTBEAT=y | 159 | CONFIG_HEARTBEAT=y |
@@ -211,7 +203,6 @@ CONFIG_INET_TCP_DIAG=m | |||
211 | CONFIG_TCP_CONG_CUBIC=y | 203 | CONFIG_TCP_CONG_CUBIC=y |
212 | CONFIG_DEFAULT_TCP_CONG="cubic" | 204 | CONFIG_DEFAULT_TCP_CONG="cubic" |
213 | # CONFIG_TCP_MD5SIG is not set | 205 | # CONFIG_TCP_MD5SIG is not set |
214 | # CONFIG_IP_VS is not set | ||
215 | CONFIG_IPV6=m | 206 | CONFIG_IPV6=m |
216 | CONFIG_IPV6_PRIVACY=y | 207 | CONFIG_IPV6_PRIVACY=y |
217 | CONFIG_IPV6_ROUTER_PREF=y | 208 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -261,13 +252,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
261 | CONFIG_NF_CONNTRACK_SIP=m | 252 | CONFIG_NF_CONNTRACK_SIP=m |
262 | CONFIG_NF_CONNTRACK_TFTP=m | 253 | CONFIG_NF_CONNTRACK_TFTP=m |
263 | # CONFIG_NF_CT_NETLINK is not set | 254 | # CONFIG_NF_CT_NETLINK is not set |
255 | # CONFIG_NETFILTER_TPROXY is not set | ||
264 | CONFIG_NETFILTER_XTABLES=m | 256 | CONFIG_NETFILTER_XTABLES=m |
265 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 257 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
266 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 258 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
267 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 259 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
268 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 260 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
269 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
270 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 261 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
262 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
271 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 263 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
272 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 264 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
273 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 265 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -281,19 +273,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
281 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 273 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
282 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
283 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 275 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
276 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 277 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
285 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 278 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
286 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 279 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
287 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 280 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
288 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 281 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
289 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 282 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
283 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 284 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
291 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 285 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
292 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
293 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 286 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
294 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 287 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
295 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 288 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
296 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 289 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
290 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
291 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
297 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 292 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
298 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 293 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
299 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -301,20 +296,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
301 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 296 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
302 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 297 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
303 | CONFIG_NETFILTER_XT_MATCH_U32=m | 298 | CONFIG_NETFILTER_XT_MATCH_U32=m |
304 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 299 | # CONFIG_IP_VS is not set |
305 | 300 | ||
306 | # | 301 | # |
307 | # IP: Netfilter Configuration | 302 | # IP: Netfilter Configuration |
308 | # | 303 | # |
304 | CONFIG_NF_DEFRAG_IPV4=m | ||
309 | CONFIG_NF_CONNTRACK_IPV4=m | 305 | CONFIG_NF_CONNTRACK_IPV4=m |
310 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 306 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
311 | CONFIG_IP_NF_QUEUE=m | 307 | CONFIG_IP_NF_QUEUE=m |
312 | CONFIG_IP_NF_IPTABLES=m | 308 | CONFIG_IP_NF_IPTABLES=m |
313 | CONFIG_IP_NF_MATCH_RECENT=m | 309 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
314 | CONFIG_IP_NF_MATCH_ECN=m | ||
315 | CONFIG_IP_NF_MATCH_AH=m | 310 | CONFIG_IP_NF_MATCH_AH=m |
311 | CONFIG_IP_NF_MATCH_ECN=m | ||
316 | CONFIG_IP_NF_MATCH_TTL=m | 312 | CONFIG_IP_NF_MATCH_TTL=m |
317 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
318 | CONFIG_IP_NF_FILTER=m | 313 | CONFIG_IP_NF_FILTER=m |
319 | CONFIG_IP_NF_TARGET_REJECT=m | 314 | CONFIG_IP_NF_TARGET_REJECT=m |
320 | CONFIG_IP_NF_TARGET_LOG=m | 315 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -322,8 +317,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
322 | CONFIG_NF_NAT=m | 317 | CONFIG_NF_NAT=m |
323 | CONFIG_NF_NAT_NEEDED=y | 318 | CONFIG_NF_NAT_NEEDED=y |
324 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 319 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
325 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
326 | CONFIG_IP_NF_TARGET_NETMAP=m | 320 | CONFIG_IP_NF_TARGET_NETMAP=m |
321 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
327 | CONFIG_NF_NAT_SNMP_BASIC=m | 322 | CONFIG_NF_NAT_SNMP_BASIC=m |
328 | CONFIG_NF_NAT_PROTO_GRE=m | 323 | CONFIG_NF_NAT_PROTO_GRE=m |
329 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 324 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -336,9 +331,9 @@ CONFIG_NF_NAT_PPTP=m | |||
336 | CONFIG_NF_NAT_H323=m | 331 | CONFIG_NF_NAT_H323=m |
337 | CONFIG_NF_NAT_SIP=m | 332 | CONFIG_NF_NAT_SIP=m |
338 | CONFIG_IP_NF_MANGLE=m | 333 | CONFIG_IP_NF_MANGLE=m |
334 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
339 | CONFIG_IP_NF_TARGET_ECN=m | 335 | CONFIG_IP_NF_TARGET_ECN=m |
340 | CONFIG_IP_NF_TARGET_TTL=m | 336 | CONFIG_IP_NF_TARGET_TTL=m |
341 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
342 | CONFIG_IP_NF_RAW=m | 337 | CONFIG_IP_NF_RAW=m |
343 | CONFIG_IP_NF_ARPTABLES=m | 338 | CONFIG_IP_NF_ARPTABLES=m |
344 | CONFIG_IP_NF_ARPFILTER=m | 339 | CONFIG_IP_NF_ARPFILTER=m |
@@ -350,16 +345,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
350 | CONFIG_NF_CONNTRACK_IPV6=m | 345 | CONFIG_NF_CONNTRACK_IPV6=m |
351 | CONFIG_IP6_NF_QUEUE=m | 346 | CONFIG_IP6_NF_QUEUE=m |
352 | CONFIG_IP6_NF_IPTABLES=m | 347 | CONFIG_IP6_NF_IPTABLES=m |
353 | CONFIG_IP6_NF_MATCH_RT=m | 348 | CONFIG_IP6_NF_MATCH_AH=m |
354 | CONFIG_IP6_NF_MATCH_OPTS=m | 349 | CONFIG_IP6_NF_MATCH_EUI64=m |
355 | CONFIG_IP6_NF_MATCH_FRAG=m | 350 | CONFIG_IP6_NF_MATCH_FRAG=m |
351 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
356 | CONFIG_IP6_NF_MATCH_HL=m | 352 | CONFIG_IP6_NF_MATCH_HL=m |
357 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 353 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
358 | CONFIG_IP6_NF_MATCH_AH=m | ||
359 | CONFIG_IP6_NF_MATCH_MH=m | 354 | CONFIG_IP6_NF_MATCH_MH=m |
360 | CONFIG_IP6_NF_MATCH_EUI64=m | 355 | CONFIG_IP6_NF_MATCH_RT=m |
361 | CONFIG_IP6_NF_FILTER=m | ||
362 | CONFIG_IP6_NF_TARGET_LOG=m | 356 | CONFIG_IP6_NF_TARGET_LOG=m |
357 | CONFIG_IP6_NF_FILTER=m | ||
363 | CONFIG_IP6_NF_TARGET_REJECT=m | 358 | CONFIG_IP6_NF_TARGET_REJECT=m |
364 | CONFIG_IP6_NF_MANGLE=m | 359 | CONFIG_IP6_NF_MANGLE=m |
365 | CONFIG_IP6_NF_TARGET_HL=m | 360 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -386,6 +381,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
386 | # CONFIG_TIPC is not set | 381 | # CONFIG_TIPC is not set |
387 | # CONFIG_ATM is not set | 382 | # CONFIG_ATM is not set |
388 | # CONFIG_BRIDGE is not set | 383 | # CONFIG_BRIDGE is not set |
384 | # CONFIG_NET_DSA is not set | ||
389 | # CONFIG_VLAN_8021Q is not set | 385 | # CONFIG_VLAN_8021Q is not set |
390 | # CONFIG_DECNET is not set | 386 | # CONFIG_DECNET is not set |
391 | CONFIG_LLC=m | 387 | CONFIG_LLC=m |
@@ -409,19 +405,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
409 | # CONFIG_IRDA is not set | 405 | # CONFIG_IRDA is not set |
410 | # CONFIG_BT is not set | 406 | # CONFIG_BT is not set |
411 | # CONFIG_AF_RXRPC is not set | 407 | # CONFIG_AF_RXRPC is not set |
412 | 408 | # CONFIG_PHONET is not set | |
413 | # | 409 | # CONFIG_WIRELESS is not set |
414 | # Wireless | ||
415 | # | ||
416 | # CONFIG_CFG80211 is not set | ||
417 | CONFIG_WIRELESS_EXT=y | ||
418 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
419 | # CONFIG_MAC80211 is not set | ||
420 | CONFIG_IEEE80211=m | ||
421 | # CONFIG_IEEE80211_DEBUG is not set | ||
422 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
423 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
424 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
425 | # CONFIG_RFKILL is not set | 410 | # CONFIG_RFKILL is not set |
426 | # CONFIG_NET_9P is not set | 411 | # CONFIG_NET_9P is not set |
427 | 412 | ||
@@ -459,6 +444,7 @@ CONFIG_ATA_OVER_ETH=m | |||
459 | CONFIG_MISC_DEVICES=y | 444 | CONFIG_MISC_DEVICES=y |
460 | # CONFIG_EEPROM_93CX6 is not set | 445 | # CONFIG_EEPROM_93CX6 is not set |
461 | # CONFIG_ENCLOSURE_SERVICES is not set | 446 | # CONFIG_ENCLOSURE_SERVICES is not set |
447 | # CONFIG_C2PORT is not set | ||
462 | CONFIG_HAVE_IDE=y | 448 | CONFIG_HAVE_IDE=y |
463 | # CONFIG_IDE is not set | 449 | # CONFIG_IDE is not set |
464 | 450 | ||
@@ -542,6 +528,9 @@ CONFIG_HPLANCE=y | |||
542 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 528 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
543 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 529 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
544 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 530 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
531 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
532 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
533 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
545 | # CONFIG_B44 is not set | 534 | # CONFIG_B44 is not set |
546 | # CONFIG_NETDEV_1000 is not set | 535 | # CONFIG_NETDEV_1000 is not set |
547 | # CONFIG_NETDEV_10000 is not set | 536 | # CONFIG_NETDEV_10000 is not set |
@@ -613,6 +602,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
613 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 602 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
614 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 603 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
615 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 604 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
605 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
616 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 606 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
617 | CONFIG_MOUSE_SERIAL=m | 607 | CONFIG_MOUSE_SERIAL=m |
618 | # CONFIG_MOUSE_VSXXXAA is not set | 608 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -673,11 +663,11 @@ CONFIG_GEN_RTC_X=y | |||
673 | # CONFIG_THERMAL is not set | 663 | # CONFIG_THERMAL is not set |
674 | # CONFIG_THERMAL_HWMON is not set | 664 | # CONFIG_THERMAL_HWMON is not set |
675 | # CONFIG_WATCHDOG is not set | 665 | # CONFIG_WATCHDOG is not set |
666 | CONFIG_SSB_POSSIBLE=y | ||
676 | 667 | ||
677 | # | 668 | # |
678 | # Sonics Silicon Backplane | 669 | # Sonics Silicon Backplane |
679 | # | 670 | # |
680 | CONFIG_SSB_POSSIBLE=y | ||
681 | # CONFIG_SSB is not set | 671 | # CONFIG_SSB is not set |
682 | 672 | ||
683 | # | 673 | # |
@@ -687,6 +677,7 @@ CONFIG_SSB_POSSIBLE=y | |||
687 | # CONFIG_MFD_SM501 is not set | 677 | # CONFIG_MFD_SM501 is not set |
688 | # CONFIG_HTC_PASIC3 is not set | 678 | # CONFIG_HTC_PASIC3 is not set |
689 | # CONFIG_MFD_TMIO is not set | 679 | # CONFIG_MFD_TMIO is not set |
680 | # CONFIG_REGULATOR is not set | ||
690 | 681 | ||
691 | # | 682 | # |
692 | # Multimedia devices | 683 | # Multimedia devices |
@@ -712,6 +703,7 @@ CONFIG_SSB_POSSIBLE=y | |||
712 | CONFIG_FB=y | 703 | CONFIG_FB=y |
713 | # CONFIG_FIRMWARE_EDID is not set | 704 | # CONFIG_FIRMWARE_EDID is not set |
714 | # CONFIG_FB_DDC is not set | 705 | # CONFIG_FB_DDC is not set |
706 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
715 | # CONFIG_FB_CFB_FILLRECT is not set | 707 | # CONFIG_FB_CFB_FILLRECT is not set |
716 | # CONFIG_FB_CFB_COPYAREA is not set | 708 | # CONFIG_FB_CFB_COPYAREA is not set |
717 | CONFIG_FB_CFB_IMAGEBLIT=y | 709 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -734,6 +726,8 @@ CONFIG_FB_HP300=y | |||
734 | # CONFIG_FB_UVESA is not set | 726 | # CONFIG_FB_UVESA is not set |
735 | # CONFIG_FB_S1D13XXX is not set | 727 | # CONFIG_FB_S1D13XXX is not set |
736 | # CONFIG_FB_VIRTUAL is not set | 728 | # CONFIG_FB_VIRTUAL is not set |
729 | # CONFIG_FB_METRONOME is not set | ||
730 | # CONFIG_FB_MB862XX is not set | ||
737 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 731 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
738 | 732 | ||
739 | # | 733 | # |
@@ -760,6 +754,12 @@ CONFIG_HID_SUPPORT=y | |||
760 | CONFIG_HID=m | 754 | CONFIG_HID=m |
761 | # CONFIG_HID_DEBUG is not set | 755 | # CONFIG_HID_DEBUG is not set |
762 | CONFIG_HIDRAW=y | 756 | CONFIG_HIDRAW=y |
757 | # CONFIG_HID_PID is not set | ||
758 | |||
759 | # | ||
760 | # Special HID drivers | ||
761 | # | ||
762 | CONFIG_HID_COMPAT=y | ||
763 | # CONFIG_USB_SUPPORT is not set | 763 | # CONFIG_USB_SUPPORT is not set |
764 | # CONFIG_MMC is not set | 764 | # CONFIG_MMC is not set |
765 | # CONFIG_MEMSTICK is not set | 765 | # CONFIG_MEMSTICK is not set |
@@ -768,6 +768,8 @@ CONFIG_HIDRAW=y | |||
768 | # CONFIG_RTC_CLASS is not set | 768 | # CONFIG_RTC_CLASS is not set |
769 | # CONFIG_DMADEVICES is not set | 769 | # CONFIG_DMADEVICES is not set |
770 | # CONFIG_UIO is not set | 770 | # CONFIG_UIO is not set |
771 | # CONFIG_STAGING is not set | ||
772 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
771 | 773 | ||
772 | # | 774 | # |
773 | # Character devices | 775 | # Character devices |
@@ -781,8 +783,9 @@ CONFIG_EXT2_FS=y | |||
781 | # CONFIG_EXT2_FS_XIP is not set | 783 | # CONFIG_EXT2_FS_XIP is not set |
782 | CONFIG_EXT3_FS=y | 784 | CONFIG_EXT3_FS=y |
783 | # CONFIG_EXT3_FS_XATTR is not set | 785 | # CONFIG_EXT3_FS_XATTR is not set |
784 | # CONFIG_EXT4DEV_FS is not set | 786 | # CONFIG_EXT4_FS is not set |
785 | CONFIG_JBD=y | 787 | CONFIG_JBD=y |
788 | CONFIG_JBD2=m | ||
786 | CONFIG_REISERFS_FS=m | 789 | CONFIG_REISERFS_FS=m |
787 | # CONFIG_REISERFS_CHECK is not set | 790 | # CONFIG_REISERFS_CHECK is not set |
788 | # CONFIG_REISERFS_PROC_INFO is not set | 791 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -793,6 +796,7 @@ CONFIG_JFS_FS=m | |||
793 | # CONFIG_JFS_DEBUG is not set | 796 | # CONFIG_JFS_DEBUG is not set |
794 | # CONFIG_JFS_STATISTICS is not set | 797 | # CONFIG_JFS_STATISTICS is not set |
795 | # CONFIG_FS_POSIX_ACL is not set | 798 | # CONFIG_FS_POSIX_ACL is not set |
799 | CONFIG_FILE_LOCKING=y | ||
796 | CONFIG_XFS_FS=m | 800 | CONFIG_XFS_FS=m |
797 | # CONFIG_XFS_QUOTA is not set | 801 | # CONFIG_XFS_QUOTA is not set |
798 | # CONFIG_XFS_POSIX_ACL is not set | 802 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -804,6 +808,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
804 | # CONFIG_OCFS2_FS_STATS is not set | 808 | # CONFIG_OCFS2_FS_STATS is not set |
805 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 809 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
806 | # CONFIG_OCFS2_DEBUG_FS is not set | 810 | # CONFIG_OCFS2_DEBUG_FS is not set |
811 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
807 | CONFIG_DNOTIFY=y | 812 | CONFIG_DNOTIFY=y |
808 | CONFIG_INOTIFY=y | 813 | CONFIG_INOTIFY=y |
809 | CONFIG_INOTIFY_USER=y | 814 | CONFIG_INOTIFY_USER=y |
@@ -842,6 +847,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
842 | CONFIG_PROC_FS=y | 847 | CONFIG_PROC_FS=y |
843 | CONFIG_PROC_KCORE=y | 848 | CONFIG_PROC_KCORE=y |
844 | CONFIG_PROC_SYSCTL=y | 849 | CONFIG_PROC_SYSCTL=y |
850 | CONFIG_PROC_PAGE_MONITOR=y | ||
845 | CONFIG_SYSFS=y | 851 | CONFIG_SYSFS=y |
846 | CONFIG_TMPFS=y | 852 | CONFIG_TMPFS=y |
847 | # CONFIG_TMPFS_POSIX_ACL is not set | 853 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -885,6 +891,7 @@ CONFIG_EXPORTFS=m | |||
885 | CONFIG_NFS_COMMON=y | 891 | CONFIG_NFS_COMMON=y |
886 | CONFIG_SUNRPC=y | 892 | CONFIG_SUNRPC=y |
887 | CONFIG_SUNRPC_GSS=y | 893 | CONFIG_SUNRPC_GSS=y |
894 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
888 | CONFIG_RPCSEC_GSS_KRB5=y | 895 | CONFIG_RPCSEC_GSS_KRB5=y |
889 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 896 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
890 | CONFIG_SMB_FS=m | 897 | CONFIG_SMB_FS=m |
@@ -957,7 +964,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
957 | # CONFIG_DEBUG_KERNEL is not set | 964 | # CONFIG_DEBUG_KERNEL is not set |
958 | CONFIG_DEBUG_BUGVERBOSE=y | 965 | CONFIG_DEBUG_BUGVERBOSE=y |
959 | CONFIG_DEBUG_MEMORY_INIT=y | 966 | CONFIG_DEBUG_MEMORY_INIT=y |
967 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
960 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 968 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
969 | |||
970 | # | ||
971 | # Tracers | ||
972 | # | ||
973 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
961 | # CONFIG_SAMPLES is not set | 974 | # CONFIG_SAMPLES is not set |
962 | 975 | ||
963 | # | 976 | # |
@@ -965,6 +978,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
965 | # | 978 | # |
966 | # CONFIG_KEYS is not set | 979 | # CONFIG_KEYS is not set |
967 | # CONFIG_SECURITY is not set | 980 | # CONFIG_SECURITY is not set |
981 | # CONFIG_SECURITYFS is not set | ||
968 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 982 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
969 | CONFIG_XOR_BLOCKS=m | 983 | CONFIG_XOR_BLOCKS=m |
970 | CONFIG_ASYNC_CORE=m | 984 | CONFIG_ASYNC_CORE=m |
@@ -975,10 +989,12 @@ CONFIG_CRYPTO=y | |||
975 | # | 989 | # |
976 | # Crypto core or helper | 990 | # Crypto core or helper |
977 | # | 991 | # |
992 | # CONFIG_CRYPTO_FIPS is not set | ||
978 | CONFIG_CRYPTO_ALGAPI=y | 993 | CONFIG_CRYPTO_ALGAPI=y |
979 | CONFIG_CRYPTO_AEAD=m | 994 | CONFIG_CRYPTO_AEAD=y |
980 | CONFIG_CRYPTO_BLKCIPHER=y | 995 | CONFIG_CRYPTO_BLKCIPHER=y |
981 | CONFIG_CRYPTO_HASH=y | 996 | CONFIG_CRYPTO_HASH=y |
997 | CONFIG_CRYPTO_RNG=y | ||
982 | CONFIG_CRYPTO_MANAGER=y | 998 | CONFIG_CRYPTO_MANAGER=y |
983 | CONFIG_CRYPTO_GF128MUL=m | 999 | CONFIG_CRYPTO_GF128MUL=m |
984 | CONFIG_CRYPTO_NULL=m | 1000 | CONFIG_CRYPTO_NULL=m |
@@ -1052,14 +1068,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1052 | # | 1068 | # |
1053 | CONFIG_CRYPTO_DEFLATE=m | 1069 | CONFIG_CRYPTO_DEFLATE=m |
1054 | CONFIG_CRYPTO_LZO=m | 1070 | CONFIG_CRYPTO_LZO=m |
1071 | |||
1072 | # | ||
1073 | # Random Number Generation | ||
1074 | # | ||
1075 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1055 | # CONFIG_CRYPTO_HW is not set | 1076 | # CONFIG_CRYPTO_HW is not set |
1056 | 1077 | ||
1057 | # | 1078 | # |
1058 | # Library routines | 1079 | # Library routines |
1059 | # | 1080 | # |
1060 | CONFIG_BITREVERSE=y | 1081 | CONFIG_BITREVERSE=y |
1061 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1062 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1063 | CONFIG_CRC_CCITT=m | 1082 | CONFIG_CRC_CCITT=m |
1064 | CONFIG_CRC16=m | 1083 | CONFIG_CRC16=m |
1065 | CONFIG_CRC_T10DIF=y | 1084 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index db6e8822594a..c6de25724a25 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:06 2008 | 4 | # Tue Dec 2 20:27:47 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | CONFIG_MAC=y | 115 | CONFIG_MAC=y |
@@ -150,19 +140,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
150 | CONFIG_DISCONTIGMEM=y | 140 | CONFIG_DISCONTIGMEM=y |
151 | CONFIG_FLAT_NODE_MEM_MAP=y | 141 | CONFIG_FLAT_NODE_MEM_MAP=y |
152 | CONFIG_NEED_MULTIPLE_NODES=y | 142 | CONFIG_NEED_MULTIPLE_NODES=y |
153 | # CONFIG_SPARSEMEM_STATIC is not set | ||
154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
155 | CONFIG_PAGEFLAGS_EXTENDED=y | 143 | CONFIG_PAGEFLAGS_EXTENDED=y |
156 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 144 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
157 | # CONFIG_RESOURCES_64BIT is not set | 145 | # CONFIG_RESOURCES_64BIT is not set |
146 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
158 | CONFIG_ZONE_DMA_FLAG=1 | 147 | CONFIG_ZONE_DMA_FLAG=1 |
159 | CONFIG_BOUNCE=y | 148 | CONFIG_BOUNCE=y |
160 | CONFIG_VIRT_TO_BUS=y | 149 | CONFIG_VIRT_TO_BUS=y |
150 | CONFIG_UNEVICTABLE_LRU=y | ||
161 | 151 | ||
162 | # | 152 | # |
163 | # General setup | 153 | # General setup |
164 | # | 154 | # |
165 | CONFIG_BINFMT_ELF=y | 155 | CONFIG_BINFMT_ELF=y |
156 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
157 | CONFIG_HAVE_AOUT=y | ||
166 | CONFIG_BINFMT_AOUT=m | 158 | CONFIG_BINFMT_AOUT=m |
167 | CONFIG_BINFMT_MISC=m | 159 | CONFIG_BINFMT_MISC=m |
168 | # CONFIG_HEARTBEAT is not set | 160 | # CONFIG_HEARTBEAT is not set |
@@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m | |||
209 | CONFIG_TCP_CONG_CUBIC=y | 201 | CONFIG_TCP_CONG_CUBIC=y |
210 | CONFIG_DEFAULT_TCP_CONG="cubic" | 202 | CONFIG_DEFAULT_TCP_CONG="cubic" |
211 | # CONFIG_TCP_MD5SIG is not set | 203 | # CONFIG_TCP_MD5SIG is not set |
212 | # CONFIG_IP_VS is not set | ||
213 | CONFIG_IPV6=m | 204 | CONFIG_IPV6=m |
214 | CONFIG_IPV6_PRIVACY=y | 205 | CONFIG_IPV6_PRIVACY=y |
215 | CONFIG_IPV6_ROUTER_PREF=y | 206 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
259 | CONFIG_NF_CONNTRACK_SIP=m | 250 | CONFIG_NF_CONNTRACK_SIP=m |
260 | CONFIG_NF_CONNTRACK_TFTP=m | 251 | CONFIG_NF_CONNTRACK_TFTP=m |
261 | # CONFIG_NF_CT_NETLINK is not set | 252 | # CONFIG_NF_CT_NETLINK is not set |
253 | # CONFIG_NETFILTER_TPROXY is not set | ||
262 | CONFIG_NETFILTER_XTABLES=m | 254 | CONFIG_NETFILTER_XTABLES=m |
263 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
264 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
265 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
266 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
267 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
268 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
269 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 261 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
270 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 262 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
271 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
279 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
280 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 272 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
281 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
283 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
284 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
285 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
286 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 279 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
287 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 280 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
281 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 282 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
289 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 283 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
290 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
292 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
293 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
294 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 287 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
288 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
289 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
295 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 290 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
296 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
297 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 292 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
299 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 294 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
300 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 295 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
301 | CONFIG_NETFILTER_XT_MATCH_U32=m | 296 | CONFIG_NETFILTER_XT_MATCH_U32=m |
302 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 297 | # CONFIG_IP_VS is not set |
303 | 298 | ||
304 | # | 299 | # |
305 | # IP: Netfilter Configuration | 300 | # IP: Netfilter Configuration |
306 | # | 301 | # |
302 | CONFIG_NF_DEFRAG_IPV4=m | ||
307 | CONFIG_NF_CONNTRACK_IPV4=m | 303 | CONFIG_NF_CONNTRACK_IPV4=m |
308 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 304 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
309 | CONFIG_IP_NF_QUEUE=m | 305 | CONFIG_IP_NF_QUEUE=m |
310 | CONFIG_IP_NF_IPTABLES=m | 306 | CONFIG_IP_NF_IPTABLES=m |
311 | CONFIG_IP_NF_MATCH_RECENT=m | 307 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
312 | CONFIG_IP_NF_MATCH_ECN=m | ||
313 | CONFIG_IP_NF_MATCH_AH=m | 308 | CONFIG_IP_NF_MATCH_AH=m |
309 | CONFIG_IP_NF_MATCH_ECN=m | ||
314 | CONFIG_IP_NF_MATCH_TTL=m | 310 | CONFIG_IP_NF_MATCH_TTL=m |
315 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
316 | CONFIG_IP_NF_FILTER=m | 311 | CONFIG_IP_NF_FILTER=m |
317 | CONFIG_IP_NF_TARGET_REJECT=m | 312 | CONFIG_IP_NF_TARGET_REJECT=m |
318 | CONFIG_IP_NF_TARGET_LOG=m | 313 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
320 | CONFIG_NF_NAT=m | 315 | CONFIG_NF_NAT=m |
321 | CONFIG_NF_NAT_NEEDED=y | 316 | CONFIG_NF_NAT_NEEDED=y |
322 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 317 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
323 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
324 | CONFIG_IP_NF_TARGET_NETMAP=m | 318 | CONFIG_IP_NF_TARGET_NETMAP=m |
319 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
325 | CONFIG_NF_NAT_SNMP_BASIC=m | 320 | CONFIG_NF_NAT_SNMP_BASIC=m |
326 | CONFIG_NF_NAT_PROTO_GRE=m | 321 | CONFIG_NF_NAT_PROTO_GRE=m |
327 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 322 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m | |||
334 | CONFIG_NF_NAT_H323=m | 329 | CONFIG_NF_NAT_H323=m |
335 | CONFIG_NF_NAT_SIP=m | 330 | CONFIG_NF_NAT_SIP=m |
336 | CONFIG_IP_NF_MANGLE=m | 331 | CONFIG_IP_NF_MANGLE=m |
332 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
337 | CONFIG_IP_NF_TARGET_ECN=m | 333 | CONFIG_IP_NF_TARGET_ECN=m |
338 | CONFIG_IP_NF_TARGET_TTL=m | 334 | CONFIG_IP_NF_TARGET_TTL=m |
339 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
340 | CONFIG_IP_NF_RAW=m | 335 | CONFIG_IP_NF_RAW=m |
341 | CONFIG_IP_NF_ARPTABLES=m | 336 | CONFIG_IP_NF_ARPTABLES=m |
342 | CONFIG_IP_NF_ARPFILTER=m | 337 | CONFIG_IP_NF_ARPFILTER=m |
@@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
348 | CONFIG_NF_CONNTRACK_IPV6=m | 343 | CONFIG_NF_CONNTRACK_IPV6=m |
349 | CONFIG_IP6_NF_QUEUE=m | 344 | CONFIG_IP6_NF_QUEUE=m |
350 | CONFIG_IP6_NF_IPTABLES=m | 345 | CONFIG_IP6_NF_IPTABLES=m |
351 | CONFIG_IP6_NF_MATCH_RT=m | 346 | CONFIG_IP6_NF_MATCH_AH=m |
352 | CONFIG_IP6_NF_MATCH_OPTS=m | 347 | CONFIG_IP6_NF_MATCH_EUI64=m |
353 | CONFIG_IP6_NF_MATCH_FRAG=m | 348 | CONFIG_IP6_NF_MATCH_FRAG=m |
349 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
354 | CONFIG_IP6_NF_MATCH_HL=m | 350 | CONFIG_IP6_NF_MATCH_HL=m |
355 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
356 | CONFIG_IP6_NF_MATCH_AH=m | ||
357 | CONFIG_IP6_NF_MATCH_MH=m | 352 | CONFIG_IP6_NF_MATCH_MH=m |
358 | CONFIG_IP6_NF_MATCH_EUI64=m | 353 | CONFIG_IP6_NF_MATCH_RT=m |
359 | CONFIG_IP6_NF_FILTER=m | ||
360 | CONFIG_IP6_NF_TARGET_LOG=m | 354 | CONFIG_IP6_NF_TARGET_LOG=m |
355 | CONFIG_IP6_NF_FILTER=m | ||
361 | CONFIG_IP6_NF_TARGET_REJECT=m | 356 | CONFIG_IP6_NF_TARGET_REJECT=m |
362 | CONFIG_IP6_NF_MANGLE=m | 357 | CONFIG_IP6_NF_MANGLE=m |
363 | CONFIG_IP6_NF_TARGET_HL=m | 358 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
384 | # CONFIG_TIPC is not set | 379 | # CONFIG_TIPC is not set |
385 | # CONFIG_ATM is not set | 380 | # CONFIG_ATM is not set |
386 | # CONFIG_BRIDGE is not set | 381 | # CONFIG_BRIDGE is not set |
382 | # CONFIG_NET_DSA is not set | ||
387 | # CONFIG_VLAN_8021Q is not set | 383 | # CONFIG_VLAN_8021Q is not set |
388 | # CONFIG_DECNET is not set | 384 | # CONFIG_DECNET is not set |
389 | CONFIG_LLC=m | 385 | CONFIG_LLC=m |
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
413 | 409 | # CONFIG_PHONET is not set | |
414 | # | 410 | # CONFIG_WIRELESS is not set |
415 | # Wireless | ||
416 | # | ||
417 | # CONFIG_CFG80211 is not set | ||
418 | CONFIG_WIRELESS_EXT=y | ||
419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
420 | # CONFIG_MAC80211 is not set | ||
421 | CONFIG_IEEE80211=m | ||
422 | # CONFIG_IEEE80211_DEBUG is not set | ||
423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
428 | 413 | ||
@@ -460,21 +445,20 @@ CONFIG_ATA_OVER_ETH=m | |||
460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
448 | # CONFIG_C2PORT is not set | ||
463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
464 | CONFIG_IDE=y | 450 | CONFIG_IDE=y |
465 | CONFIG_BLK_DEV_IDE=y | ||
466 | 451 | ||
467 | # | 452 | # |
468 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 453 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
469 | # | 454 | # |
470 | CONFIG_IDE_ATAPI=y | ||
471 | # CONFIG_BLK_DEV_IDE_SATA is not set | 455 | # CONFIG_BLK_DEV_IDE_SATA is not set |
472 | CONFIG_BLK_DEV_IDEDISK=y | 456 | CONFIG_IDE_GD=y |
473 | # CONFIG_IDEDISK_MULTI_MODE is not set | 457 | CONFIG_IDE_GD_ATA=y |
458 | # CONFIG_IDE_GD_ATAPI is not set | ||
474 | CONFIG_BLK_DEV_IDECD=y | 459 | CONFIG_BLK_DEV_IDECD=y |
475 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 460 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
476 | # CONFIG_BLK_DEV_IDETAPE is not set | 461 | # CONFIG_BLK_DEV_IDETAPE is not set |
477 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
478 | # CONFIG_BLK_DEV_IDESCSI is not set | 462 | # CONFIG_BLK_DEV_IDESCSI is not set |
479 | # CONFIG_IDE_TASK_IOCTL is not set | 463 | # CONFIG_IDE_TASK_IOCTL is not set |
480 | CONFIG_IDE_PROC_FS=y | 464 | CONFIG_IDE_PROC_FS=y |
@@ -581,6 +565,9 @@ CONFIG_MACMACE=y | |||
581 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 565 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
582 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 566 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
583 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 567 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
568 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
569 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
570 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
584 | # CONFIG_B44 is not set | 571 | # CONFIG_B44 is not set |
585 | # CONFIG_NETDEV_1000 is not set | 572 | # CONFIG_NETDEV_1000 is not set |
586 | # CONFIG_NETDEV_10000 is not set | 573 | # CONFIG_NETDEV_10000 is not set |
@@ -650,6 +637,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
650 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 637 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
651 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 638 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
652 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 639 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
640 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
653 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 641 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
654 | CONFIG_MOUSE_SERIAL=m | 642 | CONFIG_MOUSE_SERIAL=m |
655 | # CONFIG_MOUSE_VSXXXAA is not set | 643 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -706,11 +694,11 @@ CONFIG_GEN_RTC_X=y | |||
706 | # CONFIG_THERMAL is not set | 694 | # CONFIG_THERMAL is not set |
707 | # CONFIG_THERMAL_HWMON is not set | 695 | # CONFIG_THERMAL_HWMON is not set |
708 | # CONFIG_WATCHDOG is not set | 696 | # CONFIG_WATCHDOG is not set |
697 | CONFIG_SSB_POSSIBLE=y | ||
709 | 698 | ||
710 | # | 699 | # |
711 | # Sonics Silicon Backplane | 700 | # Sonics Silicon Backplane |
712 | # | 701 | # |
713 | CONFIG_SSB_POSSIBLE=y | ||
714 | # CONFIG_SSB is not set | 702 | # CONFIG_SSB is not set |
715 | 703 | ||
716 | # | 704 | # |
@@ -720,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y | |||
720 | # CONFIG_MFD_SM501 is not set | 708 | # CONFIG_MFD_SM501 is not set |
721 | # CONFIG_HTC_PASIC3 is not set | 709 | # CONFIG_HTC_PASIC3 is not set |
722 | # CONFIG_MFD_TMIO is not set | 710 | # CONFIG_MFD_TMIO is not set |
711 | # CONFIG_REGULATOR is not set | ||
723 | 712 | ||
724 | # | 713 | # |
725 | # Multimedia devices | 714 | # Multimedia devices |
@@ -745,6 +734,7 @@ CONFIG_SSB_POSSIBLE=y | |||
745 | CONFIG_FB=y | 734 | CONFIG_FB=y |
746 | # CONFIG_FIRMWARE_EDID is not set | 735 | # CONFIG_FIRMWARE_EDID is not set |
747 | # CONFIG_FB_DDC is not set | 736 | # CONFIG_FB_DDC is not set |
737 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
748 | CONFIG_FB_CFB_FILLRECT=y | 738 | CONFIG_FB_CFB_FILLRECT=y |
749 | CONFIG_FB_CFB_COPYAREA=y | 739 | CONFIG_FB_CFB_COPYAREA=y |
750 | CONFIG_FB_CFB_IMAGEBLIT=y | 740 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -768,6 +758,8 @@ CONFIG_FB_MAC=y | |||
768 | # CONFIG_FB_UVESA is not set | 758 | # CONFIG_FB_UVESA is not set |
769 | # CONFIG_FB_S1D13XXX is not set | 759 | # CONFIG_FB_S1D13XXX is not set |
770 | # CONFIG_FB_VIRTUAL is not set | 760 | # CONFIG_FB_VIRTUAL is not set |
761 | # CONFIG_FB_METRONOME is not set | ||
762 | # CONFIG_FB_MB862XX is not set | ||
771 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 763 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
772 | 764 | ||
773 | # | 765 | # |
@@ -796,6 +788,12 @@ CONFIG_HID_SUPPORT=y | |||
796 | CONFIG_HID=m | 788 | CONFIG_HID=m |
797 | # CONFIG_HID_DEBUG is not set | 789 | # CONFIG_HID_DEBUG is not set |
798 | CONFIG_HIDRAW=y | 790 | CONFIG_HIDRAW=y |
791 | # CONFIG_HID_PID is not set | ||
792 | |||
793 | # | ||
794 | # Special HID drivers | ||
795 | # | ||
796 | CONFIG_HID_COMPAT=y | ||
799 | # CONFIG_USB_SUPPORT is not set | 797 | # CONFIG_USB_SUPPORT is not set |
800 | # CONFIG_MMC is not set | 798 | # CONFIG_MMC is not set |
801 | # CONFIG_MEMSTICK is not set | 799 | # CONFIG_MEMSTICK is not set |
@@ -804,6 +802,8 @@ CONFIG_HIDRAW=y | |||
804 | # CONFIG_RTC_CLASS is not set | 802 | # CONFIG_RTC_CLASS is not set |
805 | # CONFIG_DMADEVICES is not set | 803 | # CONFIG_DMADEVICES is not set |
806 | # CONFIG_UIO is not set | 804 | # CONFIG_UIO is not set |
805 | # CONFIG_STAGING is not set | ||
806 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
807 | 807 | ||
808 | # | 808 | # |
809 | # Character devices | 809 | # Character devices |
@@ -820,8 +820,9 @@ CONFIG_EXT2_FS=y | |||
820 | # CONFIG_EXT2_FS_XIP is not set | 820 | # CONFIG_EXT2_FS_XIP is not set |
821 | CONFIG_EXT3_FS=y | 821 | CONFIG_EXT3_FS=y |
822 | # CONFIG_EXT3_FS_XATTR is not set | 822 | # CONFIG_EXT3_FS_XATTR is not set |
823 | # CONFIG_EXT4DEV_FS is not set | 823 | # CONFIG_EXT4_FS is not set |
824 | CONFIG_JBD=y | 824 | CONFIG_JBD=y |
825 | CONFIG_JBD2=m | ||
825 | CONFIG_REISERFS_FS=m | 826 | CONFIG_REISERFS_FS=m |
826 | # CONFIG_REISERFS_CHECK is not set | 827 | # CONFIG_REISERFS_CHECK is not set |
827 | # CONFIG_REISERFS_PROC_INFO is not set | 828 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -832,6 +833,7 @@ CONFIG_JFS_FS=m | |||
832 | # CONFIG_JFS_DEBUG is not set | 833 | # CONFIG_JFS_DEBUG is not set |
833 | # CONFIG_JFS_STATISTICS is not set | 834 | # CONFIG_JFS_STATISTICS is not set |
834 | # CONFIG_FS_POSIX_ACL is not set | 835 | # CONFIG_FS_POSIX_ACL is not set |
836 | CONFIG_FILE_LOCKING=y | ||
835 | CONFIG_XFS_FS=m | 837 | CONFIG_XFS_FS=m |
836 | # CONFIG_XFS_QUOTA is not set | 838 | # CONFIG_XFS_QUOTA is not set |
837 | # CONFIG_XFS_POSIX_ACL is not set | 839 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -843,6 +845,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
843 | # CONFIG_OCFS2_FS_STATS is not set | 845 | # CONFIG_OCFS2_FS_STATS is not set |
844 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 846 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
845 | # CONFIG_OCFS2_DEBUG_FS is not set | 847 | # CONFIG_OCFS2_DEBUG_FS is not set |
848 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
846 | CONFIG_DNOTIFY=y | 849 | CONFIG_DNOTIFY=y |
847 | CONFIG_INOTIFY=y | 850 | CONFIG_INOTIFY=y |
848 | CONFIG_INOTIFY_USER=y | 851 | CONFIG_INOTIFY_USER=y |
@@ -881,6 +884,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
881 | CONFIG_PROC_FS=y | 884 | CONFIG_PROC_FS=y |
882 | CONFIG_PROC_KCORE=y | 885 | CONFIG_PROC_KCORE=y |
883 | CONFIG_PROC_SYSCTL=y | 886 | CONFIG_PROC_SYSCTL=y |
887 | CONFIG_PROC_PAGE_MONITOR=y | ||
884 | CONFIG_SYSFS=y | 888 | CONFIG_SYSFS=y |
885 | CONFIG_TMPFS=y | 889 | CONFIG_TMPFS=y |
886 | # CONFIG_TMPFS_POSIX_ACL is not set | 890 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -923,6 +927,7 @@ CONFIG_EXPORTFS=m | |||
923 | CONFIG_NFS_COMMON=y | 927 | CONFIG_NFS_COMMON=y |
924 | CONFIG_SUNRPC=m | 928 | CONFIG_SUNRPC=m |
925 | CONFIG_SUNRPC_GSS=m | 929 | CONFIG_SUNRPC_GSS=m |
930 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
926 | CONFIG_RPCSEC_GSS_KRB5=m | 931 | CONFIG_RPCSEC_GSS_KRB5=m |
927 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 932 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
928 | CONFIG_SMB_FS=m | 933 | CONFIG_SMB_FS=m |
@@ -996,7 +1001,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
996 | # CONFIG_DEBUG_KERNEL is not set | 1001 | # CONFIG_DEBUG_KERNEL is not set |
997 | CONFIG_DEBUG_BUGVERBOSE=y | 1002 | CONFIG_DEBUG_BUGVERBOSE=y |
998 | CONFIG_DEBUG_MEMORY_INIT=y | 1003 | CONFIG_DEBUG_MEMORY_INIT=y |
1004 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
999 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1005 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1006 | |||
1007 | # | ||
1008 | # Tracers | ||
1009 | # | ||
1010 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1000 | # CONFIG_SAMPLES is not set | 1011 | # CONFIG_SAMPLES is not set |
1001 | 1012 | ||
1002 | # | 1013 | # |
@@ -1004,6 +1015,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
1004 | # | 1015 | # |
1005 | # CONFIG_KEYS is not set | 1016 | # CONFIG_KEYS is not set |
1006 | # CONFIG_SECURITY is not set | 1017 | # CONFIG_SECURITY is not set |
1018 | # CONFIG_SECURITYFS is not set | ||
1007 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1019 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1008 | CONFIG_XOR_BLOCKS=m | 1020 | CONFIG_XOR_BLOCKS=m |
1009 | CONFIG_ASYNC_CORE=m | 1021 | CONFIG_ASYNC_CORE=m |
@@ -1014,10 +1026,12 @@ CONFIG_CRYPTO=y | |||
1014 | # | 1026 | # |
1015 | # Crypto core or helper | 1027 | # Crypto core or helper |
1016 | # | 1028 | # |
1029 | # CONFIG_CRYPTO_FIPS is not set | ||
1017 | CONFIG_CRYPTO_ALGAPI=y | 1030 | CONFIG_CRYPTO_ALGAPI=y |
1018 | CONFIG_CRYPTO_AEAD=m | 1031 | CONFIG_CRYPTO_AEAD=y |
1019 | CONFIG_CRYPTO_BLKCIPHER=m | 1032 | CONFIG_CRYPTO_BLKCIPHER=y |
1020 | CONFIG_CRYPTO_HASH=y | 1033 | CONFIG_CRYPTO_HASH=y |
1034 | CONFIG_CRYPTO_RNG=y | ||
1021 | CONFIG_CRYPTO_MANAGER=y | 1035 | CONFIG_CRYPTO_MANAGER=y |
1022 | CONFIG_CRYPTO_GF128MUL=m | 1036 | CONFIG_CRYPTO_GF128MUL=m |
1023 | CONFIG_CRYPTO_NULL=m | 1037 | CONFIG_CRYPTO_NULL=m |
@@ -1091,14 +1105,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1091 | # | 1105 | # |
1092 | CONFIG_CRYPTO_DEFLATE=m | 1106 | CONFIG_CRYPTO_DEFLATE=m |
1093 | CONFIG_CRYPTO_LZO=m | 1107 | CONFIG_CRYPTO_LZO=m |
1108 | |||
1109 | # | ||
1110 | # Random Number Generation | ||
1111 | # | ||
1112 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1094 | # CONFIG_CRYPTO_HW is not set | 1113 | # CONFIG_CRYPTO_HW is not set |
1095 | 1114 | ||
1096 | # | 1115 | # |
1097 | # Library routines | 1116 | # Library routines |
1098 | # | 1117 | # |
1099 | CONFIG_BITREVERSE=y | 1118 | CONFIG_BITREVERSE=y |
1100 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1101 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1102 | CONFIG_CRC_CCITT=m | 1119 | CONFIG_CRC_CCITT=m |
1103 | CONFIG_CRC16=m | 1120 | CONFIG_CRC16=m |
1104 | CONFIG_CRC_T10DIF=y | 1121 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 1a806102b999..70693588031e 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:07 2008 | 4 | # Tue Dec 2 20:27:48 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | CONFIG_AMIGA=y | 113 | CONFIG_AMIGA=y |
124 | CONFIG_ATARI=y | 114 | CONFIG_ATARI=y |
125 | CONFIG_MAC=y | 115 | CONFIG_MAC=y |
@@ -154,19 +144,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
154 | CONFIG_DISCONTIGMEM=y | 144 | CONFIG_DISCONTIGMEM=y |
155 | CONFIG_FLAT_NODE_MEM_MAP=y | 145 | CONFIG_FLAT_NODE_MEM_MAP=y |
156 | CONFIG_NEED_MULTIPLE_NODES=y | 146 | CONFIG_NEED_MULTIPLE_NODES=y |
157 | # CONFIG_SPARSEMEM_STATIC is not set | ||
158 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
159 | CONFIG_PAGEFLAGS_EXTENDED=y | 147 | CONFIG_PAGEFLAGS_EXTENDED=y |
160 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 148 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
161 | # CONFIG_RESOURCES_64BIT is not set | 149 | # CONFIG_RESOURCES_64BIT is not set |
150 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
162 | CONFIG_ZONE_DMA_FLAG=1 | 151 | CONFIG_ZONE_DMA_FLAG=1 |
163 | CONFIG_BOUNCE=y | 152 | CONFIG_BOUNCE=y |
164 | CONFIG_VIRT_TO_BUS=y | 153 | CONFIG_VIRT_TO_BUS=y |
154 | CONFIG_UNEVICTABLE_LRU=y | ||
165 | 155 | ||
166 | # | 156 | # |
167 | # General setup | 157 | # General setup |
168 | # | 158 | # |
169 | CONFIG_BINFMT_ELF=y | 159 | CONFIG_BINFMT_ELF=y |
160 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
161 | CONFIG_HAVE_AOUT=y | ||
170 | CONFIG_BINFMT_AOUT=m | 162 | CONFIG_BINFMT_AOUT=m |
171 | CONFIG_BINFMT_MISC=m | 163 | CONFIG_BINFMT_MISC=m |
172 | CONFIG_ZORRO=y | 164 | CONFIG_ZORRO=y |
@@ -222,7 +214,6 @@ CONFIG_INET_TCP_DIAG=m | |||
222 | CONFIG_TCP_CONG_CUBIC=y | 214 | CONFIG_TCP_CONG_CUBIC=y |
223 | CONFIG_DEFAULT_TCP_CONG="cubic" | 215 | CONFIG_DEFAULT_TCP_CONG="cubic" |
224 | # CONFIG_TCP_MD5SIG is not set | 216 | # CONFIG_TCP_MD5SIG is not set |
225 | # CONFIG_IP_VS is not set | ||
226 | CONFIG_IPV6=m | 217 | CONFIG_IPV6=m |
227 | CONFIG_IPV6_PRIVACY=y | 218 | CONFIG_IPV6_PRIVACY=y |
228 | CONFIG_IPV6_ROUTER_PREF=y | 219 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -272,13 +263,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
272 | CONFIG_NF_CONNTRACK_SIP=m | 263 | CONFIG_NF_CONNTRACK_SIP=m |
273 | CONFIG_NF_CONNTRACK_TFTP=m | 264 | CONFIG_NF_CONNTRACK_TFTP=m |
274 | # CONFIG_NF_CT_NETLINK is not set | 265 | # CONFIG_NF_CT_NETLINK is not set |
266 | # CONFIG_NETFILTER_TPROXY is not set | ||
275 | CONFIG_NETFILTER_XTABLES=m | 267 | CONFIG_NETFILTER_XTABLES=m |
276 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 268 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
277 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 269 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
278 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 270 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
279 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 271 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
280 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
281 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 272 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
273 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
282 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 274 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
283 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 275 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
284 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 276 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -292,19 +284,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
292 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 284 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
293 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 285 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
294 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 286 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
287 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
295 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 288 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
296 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 289 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
297 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 290 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
298 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 291 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
299 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 292 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
300 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 293 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
294 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
301 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 295 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
302 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 296 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
303 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
304 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 297 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
305 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 298 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
306 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 299 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
307 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 300 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
301 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
302 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
308 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 303 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
309 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 304 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
310 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 305 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -312,20 +307,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
312 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 307 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
313 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 308 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
314 | CONFIG_NETFILTER_XT_MATCH_U32=m | 309 | CONFIG_NETFILTER_XT_MATCH_U32=m |
315 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 310 | # CONFIG_IP_VS is not set |
316 | 311 | ||
317 | # | 312 | # |
318 | # IP: Netfilter Configuration | 313 | # IP: Netfilter Configuration |
319 | # | 314 | # |
315 | CONFIG_NF_DEFRAG_IPV4=m | ||
320 | CONFIG_NF_CONNTRACK_IPV4=m | 316 | CONFIG_NF_CONNTRACK_IPV4=m |
321 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 317 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
322 | CONFIG_IP_NF_QUEUE=m | 318 | CONFIG_IP_NF_QUEUE=m |
323 | CONFIG_IP_NF_IPTABLES=m | 319 | CONFIG_IP_NF_IPTABLES=m |
324 | CONFIG_IP_NF_MATCH_RECENT=m | 320 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
325 | CONFIG_IP_NF_MATCH_ECN=m | ||
326 | CONFIG_IP_NF_MATCH_AH=m | 321 | CONFIG_IP_NF_MATCH_AH=m |
322 | CONFIG_IP_NF_MATCH_ECN=m | ||
327 | CONFIG_IP_NF_MATCH_TTL=m | 323 | CONFIG_IP_NF_MATCH_TTL=m |
328 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
329 | CONFIG_IP_NF_FILTER=m | 324 | CONFIG_IP_NF_FILTER=m |
330 | CONFIG_IP_NF_TARGET_REJECT=m | 325 | CONFIG_IP_NF_TARGET_REJECT=m |
331 | CONFIG_IP_NF_TARGET_LOG=m | 326 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -333,8 +328,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
333 | CONFIG_NF_NAT=m | 328 | CONFIG_NF_NAT=m |
334 | CONFIG_NF_NAT_NEEDED=y | 329 | CONFIG_NF_NAT_NEEDED=y |
335 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 330 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
336 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
337 | CONFIG_IP_NF_TARGET_NETMAP=m | 331 | CONFIG_IP_NF_TARGET_NETMAP=m |
332 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
338 | CONFIG_NF_NAT_SNMP_BASIC=m | 333 | CONFIG_NF_NAT_SNMP_BASIC=m |
339 | CONFIG_NF_NAT_PROTO_GRE=m | 334 | CONFIG_NF_NAT_PROTO_GRE=m |
340 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 335 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -347,9 +342,9 @@ CONFIG_NF_NAT_PPTP=m | |||
347 | CONFIG_NF_NAT_H323=m | 342 | CONFIG_NF_NAT_H323=m |
348 | CONFIG_NF_NAT_SIP=m | 343 | CONFIG_NF_NAT_SIP=m |
349 | CONFIG_IP_NF_MANGLE=m | 344 | CONFIG_IP_NF_MANGLE=m |
345 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
350 | CONFIG_IP_NF_TARGET_ECN=m | 346 | CONFIG_IP_NF_TARGET_ECN=m |
351 | CONFIG_IP_NF_TARGET_TTL=m | 347 | CONFIG_IP_NF_TARGET_TTL=m |
352 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
353 | CONFIG_IP_NF_RAW=m | 348 | CONFIG_IP_NF_RAW=m |
354 | CONFIG_IP_NF_ARPTABLES=m | 349 | CONFIG_IP_NF_ARPTABLES=m |
355 | CONFIG_IP_NF_ARPFILTER=m | 350 | CONFIG_IP_NF_ARPFILTER=m |
@@ -361,16 +356,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
361 | CONFIG_NF_CONNTRACK_IPV6=m | 356 | CONFIG_NF_CONNTRACK_IPV6=m |
362 | CONFIG_IP6_NF_QUEUE=m | 357 | CONFIG_IP6_NF_QUEUE=m |
363 | CONFIG_IP6_NF_IPTABLES=m | 358 | CONFIG_IP6_NF_IPTABLES=m |
364 | CONFIG_IP6_NF_MATCH_RT=m | 359 | CONFIG_IP6_NF_MATCH_AH=m |
365 | CONFIG_IP6_NF_MATCH_OPTS=m | 360 | CONFIG_IP6_NF_MATCH_EUI64=m |
366 | CONFIG_IP6_NF_MATCH_FRAG=m | 361 | CONFIG_IP6_NF_MATCH_FRAG=m |
362 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
367 | CONFIG_IP6_NF_MATCH_HL=m | 363 | CONFIG_IP6_NF_MATCH_HL=m |
368 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 364 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
369 | CONFIG_IP6_NF_MATCH_AH=m | ||
370 | CONFIG_IP6_NF_MATCH_MH=m | 365 | CONFIG_IP6_NF_MATCH_MH=m |
371 | CONFIG_IP6_NF_MATCH_EUI64=m | 366 | CONFIG_IP6_NF_MATCH_RT=m |
372 | CONFIG_IP6_NF_FILTER=m | ||
373 | CONFIG_IP6_NF_TARGET_LOG=m | 367 | CONFIG_IP6_NF_TARGET_LOG=m |
368 | CONFIG_IP6_NF_FILTER=m | ||
374 | CONFIG_IP6_NF_TARGET_REJECT=m | 369 | CONFIG_IP6_NF_TARGET_REJECT=m |
375 | CONFIG_IP6_NF_MANGLE=m | 370 | CONFIG_IP6_NF_MANGLE=m |
376 | CONFIG_IP6_NF_TARGET_HL=m | 371 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -397,6 +392,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
397 | # CONFIG_TIPC is not set | 392 | # CONFIG_TIPC is not set |
398 | # CONFIG_ATM is not set | 393 | # CONFIG_ATM is not set |
399 | # CONFIG_BRIDGE is not set | 394 | # CONFIG_BRIDGE is not set |
395 | # CONFIG_NET_DSA is not set | ||
400 | # CONFIG_VLAN_8021Q is not set | 396 | # CONFIG_VLAN_8021Q is not set |
401 | # CONFIG_DECNET is not set | 397 | # CONFIG_DECNET is not set |
402 | CONFIG_LLC=m | 398 | CONFIG_LLC=m |
@@ -424,19 +420,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
424 | # CONFIG_IRDA is not set | 420 | # CONFIG_IRDA is not set |
425 | # CONFIG_BT is not set | 421 | # CONFIG_BT is not set |
426 | # CONFIG_AF_RXRPC is not set | 422 | # CONFIG_AF_RXRPC is not set |
427 | 423 | # CONFIG_PHONET is not set | |
428 | # | 424 | # CONFIG_WIRELESS is not set |
429 | # Wireless | ||
430 | # | ||
431 | # CONFIG_CFG80211 is not set | ||
432 | CONFIG_WIRELESS_EXT=y | ||
433 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
434 | # CONFIG_MAC80211 is not set | ||
435 | CONFIG_IEEE80211=m | ||
436 | # CONFIG_IEEE80211_DEBUG is not set | ||
437 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
438 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
439 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
440 | # CONFIG_RFKILL is not set | 425 | # CONFIG_RFKILL is not set |
441 | # CONFIG_NET_9P is not set | 426 | # CONFIG_NET_9P is not set |
442 | 427 | ||
@@ -486,21 +471,20 @@ CONFIG_ATA_OVER_ETH=m | |||
486 | CONFIG_MISC_DEVICES=y | 471 | CONFIG_MISC_DEVICES=y |
487 | # CONFIG_EEPROM_93CX6 is not set | 472 | # CONFIG_EEPROM_93CX6 is not set |
488 | # CONFIG_ENCLOSURE_SERVICES is not set | 473 | # CONFIG_ENCLOSURE_SERVICES is not set |
474 | # CONFIG_C2PORT is not set | ||
489 | CONFIG_HAVE_IDE=y | 475 | CONFIG_HAVE_IDE=y |
490 | CONFIG_IDE=y | 476 | CONFIG_IDE=y |
491 | CONFIG_BLK_DEV_IDE=y | ||
492 | 477 | ||
493 | # | 478 | # |
494 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 479 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
495 | # | 480 | # |
496 | CONFIG_IDE_ATAPI=y | ||
497 | # CONFIG_BLK_DEV_IDE_SATA is not set | 481 | # CONFIG_BLK_DEV_IDE_SATA is not set |
498 | CONFIG_BLK_DEV_IDEDISK=y | 482 | CONFIG_IDE_GD=y |
499 | # CONFIG_IDEDISK_MULTI_MODE is not set | 483 | CONFIG_IDE_GD_ATA=y |
484 | # CONFIG_IDE_GD_ATAPI is not set | ||
500 | CONFIG_BLK_DEV_IDECD=y | 485 | CONFIG_BLK_DEV_IDECD=y |
501 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 486 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
502 | # CONFIG_BLK_DEV_IDETAPE is not set | 487 | # CONFIG_BLK_DEV_IDETAPE is not set |
503 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
504 | # CONFIG_BLK_DEV_IDESCSI is not set | 488 | # CONFIG_BLK_DEV_IDESCSI is not set |
505 | # CONFIG_IDE_TASK_IOCTL is not set | 489 | # CONFIG_IDE_TASK_IOCTL is not set |
506 | CONFIG_IDE_PROC_FS=y | 490 | CONFIG_IDE_PROC_FS=y |
@@ -629,7 +613,7 @@ CONFIG_VETH=m | |||
629 | # CONFIG_ARCNET is not set | 613 | # CONFIG_ARCNET is not set |
630 | # CONFIG_PHYLIB is not set | 614 | # CONFIG_PHYLIB is not set |
631 | CONFIG_NET_ETHERNET=y | 615 | CONFIG_NET_ETHERNET=y |
632 | CONFIG_MII=m | 616 | CONFIG_MII=y |
633 | CONFIG_ARIADNE=m | 617 | CONFIG_ARIADNE=m |
634 | CONFIG_A2065=m | 618 | CONFIG_A2065=m |
635 | CONFIG_HYDRA=m | 619 | CONFIG_HYDRA=m |
@@ -657,8 +641,12 @@ CONFIG_NE2000=m | |||
657 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 641 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
658 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 642 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
659 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 643 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
644 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
645 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
646 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
660 | # CONFIG_NET_PCI is not set | 647 | # CONFIG_NET_PCI is not set |
661 | # CONFIG_B44 is not set | 648 | # CONFIG_B44 is not set |
649 | # CONFIG_CS89x0 is not set | ||
662 | # CONFIG_NET_POCKET is not set | 650 | # CONFIG_NET_POCKET is not set |
663 | # CONFIG_NETDEV_1000 is not set | 651 | # CONFIG_NETDEV_1000 is not set |
664 | # CONFIG_NETDEV_10000 is not set | 652 | # CONFIG_NETDEV_10000 is not set |
@@ -735,6 +723,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
735 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 723 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
736 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 724 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
737 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 725 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
726 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
738 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 727 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
739 | CONFIG_MOUSE_SERIAL=m | 728 | CONFIG_MOUSE_SERIAL=m |
740 | # CONFIG_MOUSE_INPORT is not set | 729 | # CONFIG_MOUSE_INPORT is not set |
@@ -832,11 +821,11 @@ CONFIG_GEN_RTC_X=y | |||
832 | # CONFIG_THERMAL is not set | 821 | # CONFIG_THERMAL is not set |
833 | # CONFIG_THERMAL_HWMON is not set | 822 | # CONFIG_THERMAL_HWMON is not set |
834 | # CONFIG_WATCHDOG is not set | 823 | # CONFIG_WATCHDOG is not set |
824 | CONFIG_SSB_POSSIBLE=y | ||
835 | 825 | ||
836 | # | 826 | # |
837 | # Sonics Silicon Backplane | 827 | # Sonics Silicon Backplane |
838 | # | 828 | # |
839 | CONFIG_SSB_POSSIBLE=y | ||
840 | # CONFIG_SSB is not set | 829 | # CONFIG_SSB is not set |
841 | 830 | ||
842 | # | 831 | # |
@@ -846,6 +835,7 @@ CONFIG_SSB_POSSIBLE=y | |||
846 | # CONFIG_MFD_SM501 is not set | 835 | # CONFIG_MFD_SM501 is not set |
847 | # CONFIG_HTC_PASIC3 is not set | 836 | # CONFIG_HTC_PASIC3 is not set |
848 | # CONFIG_MFD_TMIO is not set | 837 | # CONFIG_MFD_TMIO is not set |
838 | # CONFIG_REGULATOR is not set | ||
849 | 839 | ||
850 | # | 840 | # |
851 | # Multimedia devices | 841 | # Multimedia devices |
@@ -871,6 +861,7 @@ CONFIG_SSB_POSSIBLE=y | |||
871 | CONFIG_FB=y | 861 | CONFIG_FB=y |
872 | # CONFIG_FIRMWARE_EDID is not set | 862 | # CONFIG_FIRMWARE_EDID is not set |
873 | # CONFIG_FB_DDC is not set | 863 | # CONFIG_FB_DDC is not set |
864 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
874 | CONFIG_FB_CFB_FILLRECT=y | 865 | CONFIG_FB_CFB_FILLRECT=y |
875 | CONFIG_FB_CFB_COPYAREA=y | 866 | CONFIG_FB_CFB_COPYAREA=y |
876 | CONFIG_FB_CFB_IMAGEBLIT=y | 867 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -905,6 +896,8 @@ CONFIG_FB_HP300=y | |||
905 | # CONFIG_FB_S1D13XXX is not set | 896 | # CONFIG_FB_S1D13XXX is not set |
906 | # CONFIG_FB_ATY is not set | 897 | # CONFIG_FB_ATY is not set |
907 | # CONFIG_FB_VIRTUAL is not set | 898 | # CONFIG_FB_VIRTUAL is not set |
899 | # CONFIG_FB_METRONOME is not set | ||
900 | # CONFIG_FB_MB862XX is not set | ||
908 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 901 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
909 | 902 | ||
910 | # | 903 | # |
@@ -930,6 +923,7 @@ CONFIG_LOGO_LINUX_VGA16=y | |||
930 | CONFIG_LOGO_LINUX_CLUT224=y | 923 | CONFIG_LOGO_LINUX_CLUT224=y |
931 | CONFIG_LOGO_MAC_CLUT224=y | 924 | CONFIG_LOGO_MAC_CLUT224=y |
932 | CONFIG_SOUND=m | 925 | CONFIG_SOUND=m |
926 | CONFIG_SOUND_OSS_CORE=y | ||
933 | CONFIG_DMASOUND_ATARI=m | 927 | CONFIG_DMASOUND_ATARI=m |
934 | CONFIG_DMASOUND_PAULA=m | 928 | CONFIG_DMASOUND_PAULA=m |
935 | CONFIG_DMASOUND_Q40=m | 929 | CONFIG_DMASOUND_Q40=m |
@@ -938,6 +932,12 @@ CONFIG_HID_SUPPORT=y | |||
938 | CONFIG_HID=m | 932 | CONFIG_HID=m |
939 | # CONFIG_HID_DEBUG is not set | 933 | # CONFIG_HID_DEBUG is not set |
940 | CONFIG_HIDRAW=y | 934 | CONFIG_HIDRAW=y |
935 | # CONFIG_HID_PID is not set | ||
936 | |||
937 | # | ||
938 | # Special HID drivers | ||
939 | # | ||
940 | CONFIG_HID_COMPAT=y | ||
941 | # CONFIG_USB_SUPPORT is not set | 941 | # CONFIG_USB_SUPPORT is not set |
942 | # CONFIG_MMC is not set | 942 | # CONFIG_MMC is not set |
943 | # CONFIG_MEMSTICK is not set | 943 | # CONFIG_MEMSTICK is not set |
@@ -947,6 +947,8 @@ CONFIG_HIDRAW=y | |||
947 | # CONFIG_DMADEVICES is not set | 947 | # CONFIG_DMADEVICES is not set |
948 | # CONFIG_AUXDISPLAY is not set | 948 | # CONFIG_AUXDISPLAY is not set |
949 | # CONFIG_UIO is not set | 949 | # CONFIG_UIO is not set |
950 | # CONFIG_STAGING is not set | ||
951 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
950 | 952 | ||
951 | # | 953 | # |
952 | # Character devices | 954 | # Character devices |
@@ -973,10 +975,9 @@ CONFIG_EXT2_FS=y | |||
973 | # CONFIG_EXT2_FS_XIP is not set | 975 | # CONFIG_EXT2_FS_XIP is not set |
974 | CONFIG_EXT3_FS=y | 976 | CONFIG_EXT3_FS=y |
975 | # CONFIG_EXT3_FS_XATTR is not set | 977 | # CONFIG_EXT3_FS_XATTR is not set |
976 | CONFIG_EXT4DEV_FS=y | 978 | # CONFIG_EXT4_FS is not set |
977 | # CONFIG_EXT4DEV_FS_XATTR is not set | ||
978 | CONFIG_JBD=y | 979 | CONFIG_JBD=y |
979 | CONFIG_JBD2=y | 980 | CONFIG_JBD2=m |
980 | CONFIG_REISERFS_FS=m | 981 | CONFIG_REISERFS_FS=m |
981 | # CONFIG_REISERFS_CHECK is not set | 982 | # CONFIG_REISERFS_CHECK is not set |
982 | # CONFIG_REISERFS_PROC_INFO is not set | 983 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -987,6 +988,7 @@ CONFIG_JFS_FS=m | |||
987 | # CONFIG_JFS_DEBUG is not set | 988 | # CONFIG_JFS_DEBUG is not set |
988 | # CONFIG_JFS_STATISTICS is not set | 989 | # CONFIG_JFS_STATISTICS is not set |
989 | # CONFIG_FS_POSIX_ACL is not set | 990 | # CONFIG_FS_POSIX_ACL is not set |
991 | CONFIG_FILE_LOCKING=y | ||
990 | CONFIG_XFS_FS=m | 992 | CONFIG_XFS_FS=m |
991 | # CONFIG_XFS_QUOTA is not set | 993 | # CONFIG_XFS_QUOTA is not set |
992 | # CONFIG_XFS_POSIX_ACL is not set | 994 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -998,6 +1000,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
998 | # CONFIG_OCFS2_FS_STATS is not set | 1000 | # CONFIG_OCFS2_FS_STATS is not set |
999 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 1001 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
1000 | # CONFIG_OCFS2_DEBUG_FS is not set | 1002 | # CONFIG_OCFS2_DEBUG_FS is not set |
1003 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
1001 | CONFIG_DNOTIFY=y | 1004 | CONFIG_DNOTIFY=y |
1002 | CONFIG_INOTIFY=y | 1005 | CONFIG_INOTIFY=y |
1003 | CONFIG_INOTIFY_USER=y | 1006 | CONFIG_INOTIFY_USER=y |
@@ -1036,6 +1039,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1036 | CONFIG_PROC_FS=y | 1039 | CONFIG_PROC_FS=y |
1037 | CONFIG_PROC_KCORE=y | 1040 | CONFIG_PROC_KCORE=y |
1038 | CONFIG_PROC_SYSCTL=y | 1041 | CONFIG_PROC_SYSCTL=y |
1042 | CONFIG_PROC_PAGE_MONITOR=y | ||
1039 | CONFIG_SYSFS=y | 1043 | CONFIG_SYSFS=y |
1040 | CONFIG_TMPFS=y | 1044 | CONFIG_TMPFS=y |
1041 | # CONFIG_TMPFS_POSIX_ACL is not set | 1045 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -1079,6 +1083,7 @@ CONFIG_EXPORTFS=m | |||
1079 | CONFIG_NFS_COMMON=y | 1083 | CONFIG_NFS_COMMON=y |
1080 | CONFIG_SUNRPC=y | 1084 | CONFIG_SUNRPC=y |
1081 | CONFIG_SUNRPC_GSS=y | 1085 | CONFIG_SUNRPC_GSS=y |
1086 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1082 | CONFIG_RPCSEC_GSS_KRB5=y | 1087 | CONFIG_RPCSEC_GSS_KRB5=y |
1083 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1088 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1084 | CONFIG_SMB_FS=m | 1089 | CONFIG_SMB_FS=m |
@@ -1156,7 +1161,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
1156 | # CONFIG_DEBUG_KERNEL is not set | 1161 | # CONFIG_DEBUG_KERNEL is not set |
1157 | CONFIG_DEBUG_BUGVERBOSE=y | 1162 | CONFIG_DEBUG_BUGVERBOSE=y |
1158 | CONFIG_DEBUG_MEMORY_INIT=y | 1163 | CONFIG_DEBUG_MEMORY_INIT=y |
1164 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1159 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1165 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1166 | |||
1167 | # | ||
1168 | # Tracers | ||
1169 | # | ||
1170 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1160 | # CONFIG_SAMPLES is not set | 1171 | # CONFIG_SAMPLES is not set |
1161 | 1172 | ||
1162 | # | 1173 | # |
@@ -1164,6 +1175,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
1164 | # | 1175 | # |
1165 | # CONFIG_KEYS is not set | 1176 | # CONFIG_KEYS is not set |
1166 | # CONFIG_SECURITY is not set | 1177 | # CONFIG_SECURITY is not set |
1178 | # CONFIG_SECURITYFS is not set | ||
1167 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1179 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1168 | CONFIG_XOR_BLOCKS=m | 1180 | CONFIG_XOR_BLOCKS=m |
1169 | CONFIG_ASYNC_CORE=m | 1181 | CONFIG_ASYNC_CORE=m |
@@ -1174,10 +1186,12 @@ CONFIG_CRYPTO=y | |||
1174 | # | 1186 | # |
1175 | # Crypto core or helper | 1187 | # Crypto core or helper |
1176 | # | 1188 | # |
1189 | # CONFIG_CRYPTO_FIPS is not set | ||
1177 | CONFIG_CRYPTO_ALGAPI=y | 1190 | CONFIG_CRYPTO_ALGAPI=y |
1178 | CONFIG_CRYPTO_AEAD=m | 1191 | CONFIG_CRYPTO_AEAD=y |
1179 | CONFIG_CRYPTO_BLKCIPHER=y | 1192 | CONFIG_CRYPTO_BLKCIPHER=y |
1180 | CONFIG_CRYPTO_HASH=y | 1193 | CONFIG_CRYPTO_HASH=y |
1194 | CONFIG_CRYPTO_RNG=y | ||
1181 | CONFIG_CRYPTO_MANAGER=y | 1195 | CONFIG_CRYPTO_MANAGER=y |
1182 | CONFIG_CRYPTO_GF128MUL=m | 1196 | CONFIG_CRYPTO_GF128MUL=m |
1183 | CONFIG_CRYPTO_NULL=m | 1197 | CONFIG_CRYPTO_NULL=m |
@@ -1251,14 +1265,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1251 | # | 1265 | # |
1252 | CONFIG_CRYPTO_DEFLATE=m | 1266 | CONFIG_CRYPTO_DEFLATE=m |
1253 | CONFIG_CRYPTO_LZO=m | 1267 | CONFIG_CRYPTO_LZO=m |
1268 | |||
1269 | # | ||
1270 | # Random Number Generation | ||
1271 | # | ||
1272 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1254 | # CONFIG_CRYPTO_HW is not set | 1273 | # CONFIG_CRYPTO_HW is not set |
1255 | 1274 | ||
1256 | # | 1275 | # |
1257 | # Library routines | 1276 | # Library routines |
1258 | # | 1277 | # |
1259 | CONFIG_BITREVERSE=y | 1278 | CONFIG_BITREVERSE=y |
1260 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1261 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1262 | CONFIG_CRC_CCITT=m | 1279 | CONFIG_CRC_CCITT=m |
1263 | CONFIG_CRC16=y | 1280 | CONFIG_CRC16=y |
1264 | CONFIG_CRC_T10DIF=y | 1281 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index cacb5aef6a37..52d42715bd0b 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:08 2008 | 4 | # Tue Dec 2 20:27:50 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
151 | CONFIG_DISCONTIGMEM=y | 141 | CONFIG_DISCONTIGMEM=y |
152 | CONFIG_FLAT_NODE_MEM_MAP=y | 142 | CONFIG_FLAT_NODE_MEM_MAP=y |
153 | CONFIG_NEED_MULTIPLE_NODES=y | 143 | CONFIG_NEED_MULTIPLE_NODES=y |
154 | # CONFIG_SPARSEMEM_STATIC is not set | ||
155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
156 | CONFIG_PAGEFLAGS_EXTENDED=y | 144 | CONFIG_PAGEFLAGS_EXTENDED=y |
157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
158 | # CONFIG_RESOURCES_64BIT is not set | 146 | # CONFIG_RESOURCES_64BIT is not set |
147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
159 | CONFIG_ZONE_DMA_FLAG=1 | 148 | CONFIG_ZONE_DMA_FLAG=1 |
160 | CONFIG_BOUNCE=y | 149 | CONFIG_BOUNCE=y |
161 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
151 | CONFIG_UNEVICTABLE_LRU=y | ||
162 | 152 | ||
163 | # | 153 | # |
164 | # General setup | 154 | # General setup |
165 | # | 155 | # |
166 | CONFIG_BINFMT_ELF=y | 156 | CONFIG_BINFMT_ELF=y |
157 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
158 | CONFIG_HAVE_AOUT=y | ||
167 | CONFIG_BINFMT_AOUT=m | 159 | CONFIG_BINFMT_AOUT=m |
168 | CONFIG_BINFMT_MISC=m | 160 | CONFIG_BINFMT_MISC=m |
169 | CONFIG_PROC_HARDWARE=y | 161 | CONFIG_PROC_HARDWARE=y |
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
215 | # CONFIG_IP_VS is not set | ||
216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
256 | # CONFIG_NETFILTER_TPROXY is not set | ||
265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
306 | 301 | ||
307 | # | 302 | # |
308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
309 | # | 304 | # |
305 | CONFIG_NF_DEFRAG_IPV4=m | ||
310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
315 | CONFIG_IP_NF_MATCH_ECN=m | ||
316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
312 | CONFIG_IP_NF_MATCH_ECN=m | ||
317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
359 | CONFIG_IP6_NF_MATCH_AH=m | ||
360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
362 | CONFIG_IP6_NF_FILTER=m | ||
363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
358 | CONFIG_IP6_NF_FILTER=m | ||
364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
385 | # CONFIG_NET_DSA is not set | ||
390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
413 | 409 | # CONFIG_PHONET is not set | |
414 | # | 410 | # CONFIG_WIRELESS is not set |
415 | # Wireless | ||
416 | # | ||
417 | # CONFIG_CFG80211 is not set | ||
418 | CONFIG_WIRELESS_EXT=y | ||
419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
420 | # CONFIG_MAC80211 is not set | ||
421 | CONFIG_IEEE80211=m | ||
422 | # CONFIG_IEEE80211_DEBUG is not set | ||
423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
428 | 413 | ||
@@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m | |||
460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
448 | # CONFIG_C2PORT is not set | ||
463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
464 | # CONFIG_IDE is not set | 450 | # CONFIG_IDE is not set |
465 | 451 | ||
@@ -544,6 +530,9 @@ CONFIG_MVME147_NET=y | |||
544 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 530 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
545 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 531 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
546 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 532 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
533 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
534 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
535 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
547 | # CONFIG_B44 is not set | 536 | # CONFIG_B44 is not set |
548 | # CONFIG_NETDEV_1000 is not set | 537 | # CONFIG_NETDEV_1000 is not set |
549 | # CONFIG_NETDEV_10000 is not set | 538 | # CONFIG_NETDEV_10000 is not set |
@@ -613,6 +602,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
613 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 602 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
614 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 603 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
615 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 604 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
605 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
616 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 606 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
617 | CONFIG_MOUSE_SERIAL=m | 607 | CONFIG_MOUSE_SERIAL=m |
618 | # CONFIG_MOUSE_VSXXXAA is not set | 608 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -667,11 +657,11 @@ CONFIG_GEN_RTC_X=y | |||
667 | # CONFIG_THERMAL is not set | 657 | # CONFIG_THERMAL is not set |
668 | # CONFIG_THERMAL_HWMON is not set | 658 | # CONFIG_THERMAL_HWMON is not set |
669 | # CONFIG_WATCHDOG is not set | 659 | # CONFIG_WATCHDOG is not set |
660 | CONFIG_SSB_POSSIBLE=y | ||
670 | 661 | ||
671 | # | 662 | # |
672 | # Sonics Silicon Backplane | 663 | # Sonics Silicon Backplane |
673 | # | 664 | # |
674 | CONFIG_SSB_POSSIBLE=y | ||
675 | # CONFIG_SSB is not set | 665 | # CONFIG_SSB is not set |
676 | 666 | ||
677 | # | 667 | # |
@@ -681,6 +671,7 @@ CONFIG_SSB_POSSIBLE=y | |||
681 | # CONFIG_MFD_SM501 is not set | 671 | # CONFIG_MFD_SM501 is not set |
682 | # CONFIG_HTC_PASIC3 is not set | 672 | # CONFIG_HTC_PASIC3 is not set |
683 | # CONFIG_MFD_TMIO is not set | 673 | # CONFIG_MFD_TMIO is not set |
674 | # CONFIG_REGULATOR is not set | ||
684 | 675 | ||
685 | # | 676 | # |
686 | # Multimedia devices | 677 | # Multimedia devices |
@@ -720,6 +711,12 @@ CONFIG_HID_SUPPORT=y | |||
720 | CONFIG_HID=m | 711 | CONFIG_HID=m |
721 | # CONFIG_HID_DEBUG is not set | 712 | # CONFIG_HID_DEBUG is not set |
722 | CONFIG_HIDRAW=y | 713 | CONFIG_HIDRAW=y |
714 | # CONFIG_HID_PID is not set | ||
715 | |||
716 | # | ||
717 | # Special HID drivers | ||
718 | # | ||
719 | CONFIG_HID_COMPAT=y | ||
723 | # CONFIG_USB_SUPPORT is not set | 720 | # CONFIG_USB_SUPPORT is not set |
724 | # CONFIG_MMC is not set | 721 | # CONFIG_MMC is not set |
725 | # CONFIG_MEMSTICK is not set | 722 | # CONFIG_MEMSTICK is not set |
@@ -728,6 +725,8 @@ CONFIG_HIDRAW=y | |||
728 | # CONFIG_RTC_CLASS is not set | 725 | # CONFIG_RTC_CLASS is not set |
729 | # CONFIG_DMADEVICES is not set | 726 | # CONFIG_DMADEVICES is not set |
730 | # CONFIG_UIO is not set | 727 | # CONFIG_UIO is not set |
728 | # CONFIG_STAGING is not set | ||
729 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
731 | 730 | ||
732 | # | 731 | # |
733 | # Character devices | 732 | # Character devices |
@@ -743,8 +742,9 @@ CONFIG_EXT2_FS=y | |||
743 | # CONFIG_EXT2_FS_XIP is not set | 742 | # CONFIG_EXT2_FS_XIP is not set |
744 | CONFIG_EXT3_FS=y | 743 | CONFIG_EXT3_FS=y |
745 | # CONFIG_EXT3_FS_XATTR is not set | 744 | # CONFIG_EXT3_FS_XATTR is not set |
746 | # CONFIG_EXT4DEV_FS is not set | 745 | # CONFIG_EXT4_FS is not set |
747 | CONFIG_JBD=y | 746 | CONFIG_JBD=y |
747 | CONFIG_JBD2=m | ||
748 | CONFIG_REISERFS_FS=m | 748 | CONFIG_REISERFS_FS=m |
749 | # CONFIG_REISERFS_CHECK is not set | 749 | # CONFIG_REISERFS_CHECK is not set |
750 | # CONFIG_REISERFS_PROC_INFO is not set | 750 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -755,6 +755,7 @@ CONFIG_JFS_FS=m | |||
755 | # CONFIG_JFS_DEBUG is not set | 755 | # CONFIG_JFS_DEBUG is not set |
756 | # CONFIG_JFS_STATISTICS is not set | 756 | # CONFIG_JFS_STATISTICS is not set |
757 | # CONFIG_FS_POSIX_ACL is not set | 757 | # CONFIG_FS_POSIX_ACL is not set |
758 | CONFIG_FILE_LOCKING=y | ||
758 | CONFIG_XFS_FS=m | 759 | CONFIG_XFS_FS=m |
759 | # CONFIG_XFS_QUOTA is not set | 760 | # CONFIG_XFS_QUOTA is not set |
760 | # CONFIG_XFS_POSIX_ACL is not set | 761 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -766,6 +767,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
766 | # CONFIG_OCFS2_FS_STATS is not set | 767 | # CONFIG_OCFS2_FS_STATS is not set |
767 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 768 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
768 | # CONFIG_OCFS2_DEBUG_FS is not set | 769 | # CONFIG_OCFS2_DEBUG_FS is not set |
770 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
769 | CONFIG_DNOTIFY=y | 771 | CONFIG_DNOTIFY=y |
770 | CONFIG_INOTIFY=y | 772 | CONFIG_INOTIFY=y |
771 | CONFIG_INOTIFY_USER=y | 773 | CONFIG_INOTIFY_USER=y |
@@ -804,6 +806,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
804 | CONFIG_PROC_FS=y | 806 | CONFIG_PROC_FS=y |
805 | CONFIG_PROC_KCORE=y | 807 | CONFIG_PROC_KCORE=y |
806 | CONFIG_PROC_SYSCTL=y | 808 | CONFIG_PROC_SYSCTL=y |
809 | CONFIG_PROC_PAGE_MONITOR=y | ||
807 | CONFIG_SYSFS=y | 810 | CONFIG_SYSFS=y |
808 | CONFIG_TMPFS=y | 811 | CONFIG_TMPFS=y |
809 | # CONFIG_TMPFS_POSIX_ACL is not set | 812 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -847,6 +850,7 @@ CONFIG_EXPORTFS=m | |||
847 | CONFIG_NFS_COMMON=y | 850 | CONFIG_NFS_COMMON=y |
848 | CONFIG_SUNRPC=y | 851 | CONFIG_SUNRPC=y |
849 | CONFIG_SUNRPC_GSS=y | 852 | CONFIG_SUNRPC_GSS=y |
853 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
850 | CONFIG_RPCSEC_GSS_KRB5=y | 854 | CONFIG_RPCSEC_GSS_KRB5=y |
851 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 855 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
852 | CONFIG_SMB_FS=m | 856 | CONFIG_SMB_FS=m |
@@ -920,7 +924,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
920 | # CONFIG_DEBUG_KERNEL is not set | 924 | # CONFIG_DEBUG_KERNEL is not set |
921 | CONFIG_DEBUG_BUGVERBOSE=y | 925 | CONFIG_DEBUG_BUGVERBOSE=y |
922 | CONFIG_DEBUG_MEMORY_INIT=y | 926 | CONFIG_DEBUG_MEMORY_INIT=y |
927 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
923 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 928 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
929 | |||
930 | # | ||
931 | # Tracers | ||
932 | # | ||
933 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
924 | # CONFIG_SAMPLES is not set | 934 | # CONFIG_SAMPLES is not set |
925 | 935 | ||
926 | # | 936 | # |
@@ -928,6 +938,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
928 | # | 938 | # |
929 | # CONFIG_KEYS is not set | 939 | # CONFIG_KEYS is not set |
930 | # CONFIG_SECURITY is not set | 940 | # CONFIG_SECURITY is not set |
941 | # CONFIG_SECURITYFS is not set | ||
931 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 942 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
932 | CONFIG_XOR_BLOCKS=m | 943 | CONFIG_XOR_BLOCKS=m |
933 | CONFIG_ASYNC_CORE=m | 944 | CONFIG_ASYNC_CORE=m |
@@ -938,10 +949,12 @@ CONFIG_CRYPTO=y | |||
938 | # | 949 | # |
939 | # Crypto core or helper | 950 | # Crypto core or helper |
940 | # | 951 | # |
952 | # CONFIG_CRYPTO_FIPS is not set | ||
941 | CONFIG_CRYPTO_ALGAPI=y | 953 | CONFIG_CRYPTO_ALGAPI=y |
942 | CONFIG_CRYPTO_AEAD=m | 954 | CONFIG_CRYPTO_AEAD=y |
943 | CONFIG_CRYPTO_BLKCIPHER=y | 955 | CONFIG_CRYPTO_BLKCIPHER=y |
944 | CONFIG_CRYPTO_HASH=y | 956 | CONFIG_CRYPTO_HASH=y |
957 | CONFIG_CRYPTO_RNG=y | ||
945 | CONFIG_CRYPTO_MANAGER=y | 958 | CONFIG_CRYPTO_MANAGER=y |
946 | CONFIG_CRYPTO_GF128MUL=m | 959 | CONFIG_CRYPTO_GF128MUL=m |
947 | CONFIG_CRYPTO_NULL=m | 960 | CONFIG_CRYPTO_NULL=m |
@@ -1015,14 +1028,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1015 | # | 1028 | # |
1016 | CONFIG_CRYPTO_DEFLATE=m | 1029 | CONFIG_CRYPTO_DEFLATE=m |
1017 | CONFIG_CRYPTO_LZO=m | 1030 | CONFIG_CRYPTO_LZO=m |
1031 | |||
1032 | # | ||
1033 | # Random Number Generation | ||
1034 | # | ||
1035 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1018 | # CONFIG_CRYPTO_HW is not set | 1036 | # CONFIG_CRYPTO_HW is not set |
1019 | 1037 | ||
1020 | # | 1038 | # |
1021 | # Library routines | 1039 | # Library routines |
1022 | # | 1040 | # |
1023 | CONFIG_BITREVERSE=y | 1041 | CONFIG_BITREVERSE=y |
1024 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1025 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1026 | CONFIG_CRC_CCITT=m | 1042 | CONFIG_CRC_CCITT=m |
1027 | CONFIG_CRC16=m | 1043 | CONFIG_CRC16=m |
1028 | CONFIG_CRC_T10DIF=y | 1044 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index a183e25e348d..3403ed2eda79 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:09 2008 | 4 | # Tue Dec 2 20:27:51 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
151 | CONFIG_DISCONTIGMEM=y | 141 | CONFIG_DISCONTIGMEM=y |
152 | CONFIG_FLAT_NODE_MEM_MAP=y | 142 | CONFIG_FLAT_NODE_MEM_MAP=y |
153 | CONFIG_NEED_MULTIPLE_NODES=y | 143 | CONFIG_NEED_MULTIPLE_NODES=y |
154 | # CONFIG_SPARSEMEM_STATIC is not set | ||
155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
156 | CONFIG_PAGEFLAGS_EXTENDED=y | 144 | CONFIG_PAGEFLAGS_EXTENDED=y |
157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
158 | # CONFIG_RESOURCES_64BIT is not set | 146 | # CONFIG_RESOURCES_64BIT is not set |
147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
159 | CONFIG_ZONE_DMA_FLAG=1 | 148 | CONFIG_ZONE_DMA_FLAG=1 |
160 | CONFIG_BOUNCE=y | 149 | CONFIG_BOUNCE=y |
161 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
151 | CONFIG_UNEVICTABLE_LRU=y | ||
162 | 152 | ||
163 | # | 153 | # |
164 | # General setup | 154 | # General setup |
165 | # | 155 | # |
166 | CONFIG_BINFMT_ELF=y | 156 | CONFIG_BINFMT_ELF=y |
157 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
158 | CONFIG_HAVE_AOUT=y | ||
167 | CONFIG_BINFMT_AOUT=m | 159 | CONFIG_BINFMT_AOUT=m |
168 | CONFIG_BINFMT_MISC=m | 160 | CONFIG_BINFMT_MISC=m |
169 | CONFIG_PROC_HARDWARE=y | 161 | CONFIG_PROC_HARDWARE=y |
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
215 | # CONFIG_IP_VS is not set | ||
216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
256 | # CONFIG_NETFILTER_TPROXY is not set | ||
265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
306 | 301 | ||
307 | # | 302 | # |
308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
309 | # | 304 | # |
305 | CONFIG_NF_DEFRAG_IPV4=m | ||
310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
315 | CONFIG_IP_NF_MATCH_ECN=m | ||
316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
312 | CONFIG_IP_NF_MATCH_ECN=m | ||
317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
359 | CONFIG_IP6_NF_MATCH_AH=m | ||
360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
362 | CONFIG_IP6_NF_FILTER=m | ||
363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
358 | CONFIG_IP6_NF_FILTER=m | ||
364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
385 | # CONFIG_NET_DSA is not set | ||
390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
413 | 409 | # CONFIG_PHONET is not set | |
414 | # | 410 | # CONFIG_WIRELESS is not set |
415 | # Wireless | ||
416 | # | ||
417 | # CONFIG_CFG80211 is not set | ||
418 | CONFIG_WIRELESS_EXT=y | ||
419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
420 | # CONFIG_MAC80211 is not set | ||
421 | CONFIG_IEEE80211=m | ||
422 | # CONFIG_IEEE80211_DEBUG is not set | ||
423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
428 | 413 | ||
@@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m | |||
460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
448 | # CONFIG_C2PORT is not set | ||
463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
464 | # CONFIG_IDE is not set | 450 | # CONFIG_IDE is not set |
465 | 451 | ||
@@ -545,6 +531,9 @@ CONFIG_MVME16x_NET=y | |||
545 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
546 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
547 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
534 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
535 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
536 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
548 | # CONFIG_B44 is not set | 537 | # CONFIG_B44 is not set |
549 | # CONFIG_NETDEV_1000 is not set | 538 | # CONFIG_NETDEV_1000 is not set |
550 | # CONFIG_NETDEV_10000 is not set | 539 | # CONFIG_NETDEV_10000 is not set |
@@ -614,6 +603,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
614 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 603 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
615 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 604 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
616 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 605 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
606 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
617 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 607 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
618 | CONFIG_MOUSE_SERIAL=m | 608 | CONFIG_MOUSE_SERIAL=m |
619 | # CONFIG_MOUSE_VSXXXAA is not set | 609 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -668,11 +658,11 @@ CONFIG_GEN_RTC_X=y | |||
668 | # CONFIG_THERMAL is not set | 658 | # CONFIG_THERMAL is not set |
669 | # CONFIG_THERMAL_HWMON is not set | 659 | # CONFIG_THERMAL_HWMON is not set |
670 | # CONFIG_WATCHDOG is not set | 660 | # CONFIG_WATCHDOG is not set |
661 | CONFIG_SSB_POSSIBLE=y | ||
671 | 662 | ||
672 | # | 663 | # |
673 | # Sonics Silicon Backplane | 664 | # Sonics Silicon Backplane |
674 | # | 665 | # |
675 | CONFIG_SSB_POSSIBLE=y | ||
676 | # CONFIG_SSB is not set | 666 | # CONFIG_SSB is not set |
677 | 667 | ||
678 | # | 668 | # |
@@ -682,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y | |||
682 | # CONFIG_MFD_SM501 is not set | 672 | # CONFIG_MFD_SM501 is not set |
683 | # CONFIG_HTC_PASIC3 is not set | 673 | # CONFIG_HTC_PASIC3 is not set |
684 | # CONFIG_MFD_TMIO is not set | 674 | # CONFIG_MFD_TMIO is not set |
675 | # CONFIG_REGULATOR is not set | ||
685 | 676 | ||
686 | # | 677 | # |
687 | # Multimedia devices | 678 | # Multimedia devices |
@@ -721,6 +712,12 @@ CONFIG_HID_SUPPORT=y | |||
721 | CONFIG_HID=m | 712 | CONFIG_HID=m |
722 | # CONFIG_HID_DEBUG is not set | 713 | # CONFIG_HID_DEBUG is not set |
723 | CONFIG_HIDRAW=y | 714 | CONFIG_HIDRAW=y |
715 | # CONFIG_HID_PID is not set | ||
716 | |||
717 | # | ||
718 | # Special HID drivers | ||
719 | # | ||
720 | CONFIG_HID_COMPAT=y | ||
724 | # CONFIG_USB_SUPPORT is not set | 721 | # CONFIG_USB_SUPPORT is not set |
725 | # CONFIG_MMC is not set | 722 | # CONFIG_MMC is not set |
726 | # CONFIG_MEMSTICK is not set | 723 | # CONFIG_MEMSTICK is not set |
@@ -729,6 +726,8 @@ CONFIG_HIDRAW=y | |||
729 | # CONFIG_RTC_CLASS is not set | 726 | # CONFIG_RTC_CLASS is not set |
730 | # CONFIG_DMADEVICES is not set | 727 | # CONFIG_DMADEVICES is not set |
731 | # CONFIG_UIO is not set | 728 | # CONFIG_UIO is not set |
729 | # CONFIG_STAGING is not set | ||
730 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
732 | 731 | ||
733 | # | 732 | # |
734 | # Character devices | 733 | # Character devices |
@@ -745,8 +744,9 @@ CONFIG_EXT2_FS=y | |||
745 | # CONFIG_EXT2_FS_XIP is not set | 744 | # CONFIG_EXT2_FS_XIP is not set |
746 | CONFIG_EXT3_FS=y | 745 | CONFIG_EXT3_FS=y |
747 | # CONFIG_EXT3_FS_XATTR is not set | 746 | # CONFIG_EXT3_FS_XATTR is not set |
748 | # CONFIG_EXT4DEV_FS is not set | 747 | # CONFIG_EXT4_FS is not set |
749 | CONFIG_JBD=y | 748 | CONFIG_JBD=y |
749 | CONFIG_JBD2=m | ||
750 | CONFIG_REISERFS_FS=m | 750 | CONFIG_REISERFS_FS=m |
751 | # CONFIG_REISERFS_CHECK is not set | 751 | # CONFIG_REISERFS_CHECK is not set |
752 | # CONFIG_REISERFS_PROC_INFO is not set | 752 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -757,6 +757,7 @@ CONFIG_JFS_FS=m | |||
757 | # CONFIG_JFS_DEBUG is not set | 757 | # CONFIG_JFS_DEBUG is not set |
758 | # CONFIG_JFS_STATISTICS is not set | 758 | # CONFIG_JFS_STATISTICS is not set |
759 | # CONFIG_FS_POSIX_ACL is not set | 759 | # CONFIG_FS_POSIX_ACL is not set |
760 | CONFIG_FILE_LOCKING=y | ||
760 | CONFIG_XFS_FS=m | 761 | CONFIG_XFS_FS=m |
761 | # CONFIG_XFS_QUOTA is not set | 762 | # CONFIG_XFS_QUOTA is not set |
762 | # CONFIG_XFS_POSIX_ACL is not set | 763 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -768,6 +769,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
768 | # CONFIG_OCFS2_FS_STATS is not set | 769 | # CONFIG_OCFS2_FS_STATS is not set |
769 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 770 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
770 | # CONFIG_OCFS2_DEBUG_FS is not set | 771 | # CONFIG_OCFS2_DEBUG_FS is not set |
772 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
771 | CONFIG_DNOTIFY=y | 773 | CONFIG_DNOTIFY=y |
772 | CONFIG_INOTIFY=y | 774 | CONFIG_INOTIFY=y |
773 | CONFIG_INOTIFY_USER=y | 775 | CONFIG_INOTIFY_USER=y |
@@ -806,6 +808,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
806 | CONFIG_PROC_FS=y | 808 | CONFIG_PROC_FS=y |
807 | CONFIG_PROC_KCORE=y | 809 | CONFIG_PROC_KCORE=y |
808 | CONFIG_PROC_SYSCTL=y | 810 | CONFIG_PROC_SYSCTL=y |
811 | CONFIG_PROC_PAGE_MONITOR=y | ||
809 | CONFIG_SYSFS=y | 812 | CONFIG_SYSFS=y |
810 | CONFIG_TMPFS=y | 813 | CONFIG_TMPFS=y |
811 | # CONFIG_TMPFS_POSIX_ACL is not set | 814 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -849,6 +852,7 @@ CONFIG_EXPORTFS=m | |||
849 | CONFIG_NFS_COMMON=y | 852 | CONFIG_NFS_COMMON=y |
850 | CONFIG_SUNRPC=y | 853 | CONFIG_SUNRPC=y |
851 | CONFIG_SUNRPC_GSS=y | 854 | CONFIG_SUNRPC_GSS=y |
855 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
852 | CONFIG_RPCSEC_GSS_KRB5=y | 856 | CONFIG_RPCSEC_GSS_KRB5=y |
853 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 857 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
854 | CONFIG_SMB_FS=m | 858 | CONFIG_SMB_FS=m |
@@ -922,7 +926,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
922 | # CONFIG_DEBUG_KERNEL is not set | 926 | # CONFIG_DEBUG_KERNEL is not set |
923 | CONFIG_DEBUG_BUGVERBOSE=y | 927 | CONFIG_DEBUG_BUGVERBOSE=y |
924 | CONFIG_DEBUG_MEMORY_INIT=y | 928 | CONFIG_DEBUG_MEMORY_INIT=y |
929 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
925 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 930 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
931 | |||
932 | # | ||
933 | # Tracers | ||
934 | # | ||
935 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
926 | # CONFIG_SAMPLES is not set | 936 | # CONFIG_SAMPLES is not set |
927 | 937 | ||
928 | # | 938 | # |
@@ -930,6 +940,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
930 | # | 940 | # |
931 | # CONFIG_KEYS is not set | 941 | # CONFIG_KEYS is not set |
932 | # CONFIG_SECURITY is not set | 942 | # CONFIG_SECURITY is not set |
943 | # CONFIG_SECURITYFS is not set | ||
933 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 944 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
934 | CONFIG_XOR_BLOCKS=m | 945 | CONFIG_XOR_BLOCKS=m |
935 | CONFIG_ASYNC_CORE=m | 946 | CONFIG_ASYNC_CORE=m |
@@ -940,10 +951,12 @@ CONFIG_CRYPTO=y | |||
940 | # | 951 | # |
941 | # Crypto core or helper | 952 | # Crypto core or helper |
942 | # | 953 | # |
954 | # CONFIG_CRYPTO_FIPS is not set | ||
943 | CONFIG_CRYPTO_ALGAPI=y | 955 | CONFIG_CRYPTO_ALGAPI=y |
944 | CONFIG_CRYPTO_AEAD=m | 956 | CONFIG_CRYPTO_AEAD=y |
945 | CONFIG_CRYPTO_BLKCIPHER=y | 957 | CONFIG_CRYPTO_BLKCIPHER=y |
946 | CONFIG_CRYPTO_HASH=y | 958 | CONFIG_CRYPTO_HASH=y |
959 | CONFIG_CRYPTO_RNG=y | ||
947 | CONFIG_CRYPTO_MANAGER=y | 960 | CONFIG_CRYPTO_MANAGER=y |
948 | CONFIG_CRYPTO_GF128MUL=m | 961 | CONFIG_CRYPTO_GF128MUL=m |
949 | CONFIG_CRYPTO_NULL=m | 962 | CONFIG_CRYPTO_NULL=m |
@@ -1017,14 +1030,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1017 | # | 1030 | # |
1018 | CONFIG_CRYPTO_DEFLATE=m | 1031 | CONFIG_CRYPTO_DEFLATE=m |
1019 | CONFIG_CRYPTO_LZO=m | 1032 | CONFIG_CRYPTO_LZO=m |
1033 | |||
1034 | # | ||
1035 | # Random Number Generation | ||
1036 | # | ||
1037 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1020 | # CONFIG_CRYPTO_HW is not set | 1038 | # CONFIG_CRYPTO_HW is not set |
1021 | 1039 | ||
1022 | # | 1040 | # |
1023 | # Library routines | 1041 | # Library routines |
1024 | # | 1042 | # |
1025 | CONFIG_BITREVERSE=y | 1043 | CONFIG_BITREVERSE=y |
1026 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1027 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1028 | CONFIG_CRC_CCITT=m | 1044 | CONFIG_CRC_CCITT=m |
1029 | CONFIG_CRC16=m | 1045 | CONFIG_CRC16=m |
1030 | CONFIG_CRC_T10DIF=y | 1046 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 72eaff0776b8..3459c594194b 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:10 2008 | 4 | # Tue Dec 2 20:27:52 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
148 | CONFIG_UNEVICTABLE_LRU=y | ||
159 | 149 | ||
160 | # | 150 | # |
161 | # General setup | 151 | # General setup |
162 | # | 152 | # |
163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
155 | CONFIG_HAVE_AOUT=y | ||
164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
166 | CONFIG_HEARTBEAT=y | 158 | CONFIG_HEARTBEAT=y |
@@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m | |||
209 | CONFIG_TCP_CONG_CUBIC=y | 201 | CONFIG_TCP_CONG_CUBIC=y |
210 | CONFIG_DEFAULT_TCP_CONG="cubic" | 202 | CONFIG_DEFAULT_TCP_CONG="cubic" |
211 | # CONFIG_TCP_MD5SIG is not set | 203 | # CONFIG_TCP_MD5SIG is not set |
212 | # CONFIG_IP_VS is not set | ||
213 | CONFIG_IPV6=m | 204 | CONFIG_IPV6=m |
214 | CONFIG_IPV6_PRIVACY=y | 205 | CONFIG_IPV6_PRIVACY=y |
215 | CONFIG_IPV6_ROUTER_PREF=y | 206 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
259 | CONFIG_NF_CONNTRACK_SIP=m | 250 | CONFIG_NF_CONNTRACK_SIP=m |
260 | CONFIG_NF_CONNTRACK_TFTP=m | 251 | CONFIG_NF_CONNTRACK_TFTP=m |
261 | # CONFIG_NF_CT_NETLINK is not set | 252 | # CONFIG_NF_CT_NETLINK is not set |
253 | # CONFIG_NETFILTER_TPROXY is not set | ||
262 | CONFIG_NETFILTER_XTABLES=m | 254 | CONFIG_NETFILTER_XTABLES=m |
263 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
264 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
265 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
266 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
267 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
268 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
269 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 261 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
270 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 262 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
271 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
279 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
280 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 272 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
281 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
283 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
284 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
285 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
286 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 279 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
287 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 280 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
281 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 282 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
289 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 283 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
290 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
292 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
293 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
294 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 287 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
288 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
289 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
295 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 290 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
296 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
297 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 292 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
299 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 294 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
300 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 295 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
301 | CONFIG_NETFILTER_XT_MATCH_U32=m | 296 | CONFIG_NETFILTER_XT_MATCH_U32=m |
302 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 297 | # CONFIG_IP_VS is not set |
303 | 298 | ||
304 | # | 299 | # |
305 | # IP: Netfilter Configuration | 300 | # IP: Netfilter Configuration |
306 | # | 301 | # |
302 | CONFIG_NF_DEFRAG_IPV4=m | ||
307 | CONFIG_NF_CONNTRACK_IPV4=m | 303 | CONFIG_NF_CONNTRACK_IPV4=m |
308 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 304 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
309 | CONFIG_IP_NF_QUEUE=m | 305 | CONFIG_IP_NF_QUEUE=m |
310 | CONFIG_IP_NF_IPTABLES=m | 306 | CONFIG_IP_NF_IPTABLES=m |
311 | CONFIG_IP_NF_MATCH_RECENT=m | 307 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
312 | CONFIG_IP_NF_MATCH_ECN=m | ||
313 | CONFIG_IP_NF_MATCH_AH=m | 308 | CONFIG_IP_NF_MATCH_AH=m |
309 | CONFIG_IP_NF_MATCH_ECN=m | ||
314 | CONFIG_IP_NF_MATCH_TTL=m | 310 | CONFIG_IP_NF_MATCH_TTL=m |
315 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
316 | CONFIG_IP_NF_FILTER=m | 311 | CONFIG_IP_NF_FILTER=m |
317 | CONFIG_IP_NF_TARGET_REJECT=m | 312 | CONFIG_IP_NF_TARGET_REJECT=m |
318 | CONFIG_IP_NF_TARGET_LOG=m | 313 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
320 | CONFIG_NF_NAT=m | 315 | CONFIG_NF_NAT=m |
321 | CONFIG_NF_NAT_NEEDED=y | 316 | CONFIG_NF_NAT_NEEDED=y |
322 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 317 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
323 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
324 | CONFIG_IP_NF_TARGET_NETMAP=m | 318 | CONFIG_IP_NF_TARGET_NETMAP=m |
319 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
325 | CONFIG_NF_NAT_SNMP_BASIC=m | 320 | CONFIG_NF_NAT_SNMP_BASIC=m |
326 | CONFIG_NF_NAT_PROTO_GRE=m | 321 | CONFIG_NF_NAT_PROTO_GRE=m |
327 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 322 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m | |||
334 | CONFIG_NF_NAT_H323=m | 329 | CONFIG_NF_NAT_H323=m |
335 | CONFIG_NF_NAT_SIP=m | 330 | CONFIG_NF_NAT_SIP=m |
336 | CONFIG_IP_NF_MANGLE=m | 331 | CONFIG_IP_NF_MANGLE=m |
332 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
337 | CONFIG_IP_NF_TARGET_ECN=m | 333 | CONFIG_IP_NF_TARGET_ECN=m |
338 | CONFIG_IP_NF_TARGET_TTL=m | 334 | CONFIG_IP_NF_TARGET_TTL=m |
339 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
340 | CONFIG_IP_NF_RAW=m | 335 | CONFIG_IP_NF_RAW=m |
341 | CONFIG_IP_NF_ARPTABLES=m | 336 | CONFIG_IP_NF_ARPTABLES=m |
342 | CONFIG_IP_NF_ARPFILTER=m | 337 | CONFIG_IP_NF_ARPFILTER=m |
@@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
348 | CONFIG_NF_CONNTRACK_IPV6=m | 343 | CONFIG_NF_CONNTRACK_IPV6=m |
349 | CONFIG_IP6_NF_QUEUE=m | 344 | CONFIG_IP6_NF_QUEUE=m |
350 | CONFIG_IP6_NF_IPTABLES=m | 345 | CONFIG_IP6_NF_IPTABLES=m |
351 | CONFIG_IP6_NF_MATCH_RT=m | 346 | CONFIG_IP6_NF_MATCH_AH=m |
352 | CONFIG_IP6_NF_MATCH_OPTS=m | 347 | CONFIG_IP6_NF_MATCH_EUI64=m |
353 | CONFIG_IP6_NF_MATCH_FRAG=m | 348 | CONFIG_IP6_NF_MATCH_FRAG=m |
349 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
354 | CONFIG_IP6_NF_MATCH_HL=m | 350 | CONFIG_IP6_NF_MATCH_HL=m |
355 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
356 | CONFIG_IP6_NF_MATCH_AH=m | ||
357 | CONFIG_IP6_NF_MATCH_MH=m | 352 | CONFIG_IP6_NF_MATCH_MH=m |
358 | CONFIG_IP6_NF_MATCH_EUI64=m | 353 | CONFIG_IP6_NF_MATCH_RT=m |
359 | CONFIG_IP6_NF_FILTER=m | ||
360 | CONFIG_IP6_NF_TARGET_LOG=m | 354 | CONFIG_IP6_NF_TARGET_LOG=m |
355 | CONFIG_IP6_NF_FILTER=m | ||
361 | CONFIG_IP6_NF_TARGET_REJECT=m | 356 | CONFIG_IP6_NF_TARGET_REJECT=m |
362 | CONFIG_IP6_NF_MANGLE=m | 357 | CONFIG_IP6_NF_MANGLE=m |
363 | CONFIG_IP6_NF_TARGET_HL=m | 358 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
384 | # CONFIG_TIPC is not set | 379 | # CONFIG_TIPC is not set |
385 | # CONFIG_ATM is not set | 380 | # CONFIG_ATM is not set |
386 | # CONFIG_BRIDGE is not set | 381 | # CONFIG_BRIDGE is not set |
382 | # CONFIG_NET_DSA is not set | ||
387 | # CONFIG_VLAN_8021Q is not set | 383 | # CONFIG_VLAN_8021Q is not set |
388 | # CONFIG_DECNET is not set | 384 | # CONFIG_DECNET is not set |
389 | CONFIG_LLC=m | 385 | CONFIG_LLC=m |
@@ -407,19 +403,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
407 | # CONFIG_IRDA is not set | 403 | # CONFIG_IRDA is not set |
408 | # CONFIG_BT is not set | 404 | # CONFIG_BT is not set |
409 | # CONFIG_AF_RXRPC is not set | 405 | # CONFIG_AF_RXRPC is not set |
410 | 406 | # CONFIG_PHONET is not set | |
411 | # | 407 | # CONFIG_WIRELESS is not set |
412 | # Wireless | ||
413 | # | ||
414 | # CONFIG_CFG80211 is not set | ||
415 | CONFIG_WIRELESS_EXT=y | ||
416 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
417 | # CONFIG_MAC80211 is not set | ||
418 | CONFIG_IEEE80211=m | ||
419 | # CONFIG_IEEE80211_DEBUG is not set | ||
420 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
421 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
422 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
423 | # CONFIG_RFKILL is not set | 408 | # CONFIG_RFKILL is not set |
424 | # CONFIG_NET_9P is not set | 409 | # CONFIG_NET_9P is not set |
425 | 410 | ||
@@ -458,21 +443,20 @@ CONFIG_ATA_OVER_ETH=m | |||
458 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
459 | # CONFIG_EEPROM_93CX6 is not set | 444 | # CONFIG_EEPROM_93CX6 is not set |
460 | # CONFIG_ENCLOSURE_SERVICES is not set | 445 | # CONFIG_ENCLOSURE_SERVICES is not set |
446 | # CONFIG_C2PORT is not set | ||
461 | CONFIG_HAVE_IDE=y | 447 | CONFIG_HAVE_IDE=y |
462 | CONFIG_IDE=y | 448 | CONFIG_IDE=y |
463 | CONFIG_BLK_DEV_IDE=y | ||
464 | 449 | ||
465 | # | 450 | # |
466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 451 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
467 | # | 452 | # |
468 | CONFIG_IDE_ATAPI=y | ||
469 | # CONFIG_BLK_DEV_IDE_SATA is not set | 453 | # CONFIG_BLK_DEV_IDE_SATA is not set |
470 | CONFIG_BLK_DEV_IDEDISK=y | 454 | CONFIG_IDE_GD=y |
471 | # CONFIG_IDEDISK_MULTI_MODE is not set | 455 | CONFIG_IDE_GD_ATA=y |
456 | # CONFIG_IDE_GD_ATAPI is not set | ||
472 | CONFIG_BLK_DEV_IDECD=y | 457 | CONFIG_BLK_DEV_IDECD=y |
473 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 458 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
474 | # CONFIG_BLK_DEV_IDETAPE is not set | 459 | # CONFIG_BLK_DEV_IDETAPE is not set |
475 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
476 | # CONFIG_BLK_DEV_IDESCSI is not set | 460 | # CONFIG_BLK_DEV_IDESCSI is not set |
477 | # CONFIG_IDE_TASK_IOCTL is not set | 461 | # CONFIG_IDE_TASK_IOCTL is not set |
478 | CONFIG_IDE_PROC_FS=y | 462 | CONFIG_IDE_PROC_FS=y |
@@ -585,8 +569,12 @@ CONFIG_NE2000=m | |||
585 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 569 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
586 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 570 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
587 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 571 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
572 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
573 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
574 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
588 | # CONFIG_NET_PCI is not set | 575 | # CONFIG_NET_PCI is not set |
589 | # CONFIG_B44 is not set | 576 | # CONFIG_B44 is not set |
577 | # CONFIG_CS89x0 is not set | ||
590 | # CONFIG_NETDEV_1000 is not set | 578 | # CONFIG_NETDEV_1000 is not set |
591 | # CONFIG_NETDEV_10000 is not set | 579 | # CONFIG_NETDEV_10000 is not set |
592 | # CONFIG_TR is not set | 580 | # CONFIG_TR is not set |
@@ -656,6 +644,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
656 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 644 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
657 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 645 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
658 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 646 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
647 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
659 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 648 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
660 | CONFIG_MOUSE_SERIAL=m | 649 | CONFIG_MOUSE_SERIAL=m |
661 | # CONFIG_MOUSE_INPORT is not set | 650 | # CONFIG_MOUSE_INPORT is not set |
@@ -717,11 +706,11 @@ CONFIG_GEN_RTC_X=y | |||
717 | # CONFIG_THERMAL is not set | 706 | # CONFIG_THERMAL is not set |
718 | # CONFIG_THERMAL_HWMON is not set | 707 | # CONFIG_THERMAL_HWMON is not set |
719 | # CONFIG_WATCHDOG is not set | 708 | # CONFIG_WATCHDOG is not set |
709 | CONFIG_SSB_POSSIBLE=y | ||
720 | 710 | ||
721 | # | 711 | # |
722 | # Sonics Silicon Backplane | 712 | # Sonics Silicon Backplane |
723 | # | 713 | # |
724 | CONFIG_SSB_POSSIBLE=y | ||
725 | # CONFIG_SSB is not set | 714 | # CONFIG_SSB is not set |
726 | 715 | ||
727 | # | 716 | # |
@@ -731,6 +720,7 @@ CONFIG_SSB_POSSIBLE=y | |||
731 | # CONFIG_MFD_SM501 is not set | 720 | # CONFIG_MFD_SM501 is not set |
732 | # CONFIG_HTC_PASIC3 is not set | 721 | # CONFIG_HTC_PASIC3 is not set |
733 | # CONFIG_MFD_TMIO is not set | 722 | # CONFIG_MFD_TMIO is not set |
723 | # CONFIG_REGULATOR is not set | ||
734 | 724 | ||
735 | # | 725 | # |
736 | # Multimedia devices | 726 | # Multimedia devices |
@@ -756,6 +746,7 @@ CONFIG_SSB_POSSIBLE=y | |||
756 | CONFIG_FB=y | 746 | CONFIG_FB=y |
757 | # CONFIG_FIRMWARE_EDID is not set | 747 | # CONFIG_FIRMWARE_EDID is not set |
758 | # CONFIG_FB_DDC is not set | 748 | # CONFIG_FB_DDC is not set |
749 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
759 | CONFIG_FB_CFB_FILLRECT=y | 750 | CONFIG_FB_CFB_FILLRECT=y |
760 | CONFIG_FB_CFB_COPYAREA=y | 751 | CONFIG_FB_CFB_COPYAREA=y |
761 | CONFIG_FB_CFB_IMAGEBLIT=y | 752 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -778,6 +769,8 @@ CONFIG_FB_Q40=y | |||
778 | # CONFIG_FB_UVESA is not set | 769 | # CONFIG_FB_UVESA is not set |
779 | # CONFIG_FB_S1D13XXX is not set | 770 | # CONFIG_FB_S1D13XXX is not set |
780 | # CONFIG_FB_VIRTUAL is not set | 771 | # CONFIG_FB_VIRTUAL is not set |
772 | # CONFIG_FB_METRONOME is not set | ||
773 | # CONFIG_FB_MB862XX is not set | ||
781 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 774 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
782 | 775 | ||
783 | # | 776 | # |
@@ -800,12 +793,19 @@ CONFIG_LOGO_LINUX_MONO=y | |||
800 | CONFIG_LOGO_LINUX_VGA16=y | 793 | CONFIG_LOGO_LINUX_VGA16=y |
801 | CONFIG_LOGO_LINUX_CLUT224=y | 794 | CONFIG_LOGO_LINUX_CLUT224=y |
802 | CONFIG_SOUND=m | 795 | CONFIG_SOUND=m |
796 | CONFIG_SOUND_OSS_CORE=y | ||
803 | CONFIG_DMASOUND_Q40=m | 797 | CONFIG_DMASOUND_Q40=m |
804 | CONFIG_DMASOUND=m | 798 | CONFIG_DMASOUND=m |
805 | CONFIG_HID_SUPPORT=y | 799 | CONFIG_HID_SUPPORT=y |
806 | CONFIG_HID=m | 800 | CONFIG_HID=m |
807 | # CONFIG_HID_DEBUG is not set | 801 | # CONFIG_HID_DEBUG is not set |
808 | CONFIG_HIDRAW=y | 802 | CONFIG_HIDRAW=y |
803 | # CONFIG_HID_PID is not set | ||
804 | |||
805 | # | ||
806 | # Special HID drivers | ||
807 | # | ||
808 | CONFIG_HID_COMPAT=y | ||
809 | # CONFIG_USB_SUPPORT is not set | 809 | # CONFIG_USB_SUPPORT is not set |
810 | # CONFIG_MMC is not set | 810 | # CONFIG_MMC is not set |
811 | # CONFIG_MEMSTICK is not set | 811 | # CONFIG_MEMSTICK is not set |
@@ -814,6 +814,8 @@ CONFIG_HIDRAW=y | |||
814 | # CONFIG_RTC_CLASS is not set | 814 | # CONFIG_RTC_CLASS is not set |
815 | # CONFIG_DMADEVICES is not set | 815 | # CONFIG_DMADEVICES is not set |
816 | # CONFIG_UIO is not set | 816 | # CONFIG_UIO is not set |
817 | # CONFIG_STAGING is not set | ||
818 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
817 | 819 | ||
818 | # | 820 | # |
819 | # Character devices | 821 | # Character devices |
@@ -827,8 +829,9 @@ CONFIG_EXT2_FS=y | |||
827 | # CONFIG_EXT2_FS_XIP is not set | 829 | # CONFIG_EXT2_FS_XIP is not set |
828 | CONFIG_EXT3_FS=y | 830 | CONFIG_EXT3_FS=y |
829 | # CONFIG_EXT3_FS_XATTR is not set | 831 | # CONFIG_EXT3_FS_XATTR is not set |
830 | # CONFIG_EXT4DEV_FS is not set | 832 | # CONFIG_EXT4_FS is not set |
831 | CONFIG_JBD=y | 833 | CONFIG_JBD=y |
834 | CONFIG_JBD2=m | ||
832 | CONFIG_REISERFS_FS=m | 835 | CONFIG_REISERFS_FS=m |
833 | # CONFIG_REISERFS_CHECK is not set | 836 | # CONFIG_REISERFS_CHECK is not set |
834 | # CONFIG_REISERFS_PROC_INFO is not set | 837 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -839,6 +842,7 @@ CONFIG_JFS_FS=m | |||
839 | # CONFIG_JFS_DEBUG is not set | 842 | # CONFIG_JFS_DEBUG is not set |
840 | # CONFIG_JFS_STATISTICS is not set | 843 | # CONFIG_JFS_STATISTICS is not set |
841 | # CONFIG_FS_POSIX_ACL is not set | 844 | # CONFIG_FS_POSIX_ACL is not set |
845 | CONFIG_FILE_LOCKING=y | ||
842 | CONFIG_XFS_FS=m | 846 | CONFIG_XFS_FS=m |
843 | # CONFIG_XFS_QUOTA is not set | 847 | # CONFIG_XFS_QUOTA is not set |
844 | # CONFIG_XFS_POSIX_ACL is not set | 848 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -850,6 +854,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
850 | # CONFIG_OCFS2_FS_STATS is not set | 854 | # CONFIG_OCFS2_FS_STATS is not set |
851 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 855 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
852 | # CONFIG_OCFS2_DEBUG_FS is not set | 856 | # CONFIG_OCFS2_DEBUG_FS is not set |
857 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
853 | CONFIG_DNOTIFY=y | 858 | CONFIG_DNOTIFY=y |
854 | CONFIG_INOTIFY=y | 859 | CONFIG_INOTIFY=y |
855 | CONFIG_INOTIFY_USER=y | 860 | CONFIG_INOTIFY_USER=y |
@@ -888,6 +893,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
888 | CONFIG_PROC_FS=y | 893 | CONFIG_PROC_FS=y |
889 | CONFIG_PROC_KCORE=y | 894 | CONFIG_PROC_KCORE=y |
890 | CONFIG_PROC_SYSCTL=y | 895 | CONFIG_PROC_SYSCTL=y |
896 | CONFIG_PROC_PAGE_MONITOR=y | ||
891 | CONFIG_SYSFS=y | 897 | CONFIG_SYSFS=y |
892 | CONFIG_TMPFS=y | 898 | CONFIG_TMPFS=y |
893 | # CONFIG_TMPFS_POSIX_ACL is not set | 899 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -930,6 +936,7 @@ CONFIG_EXPORTFS=m | |||
930 | CONFIG_NFS_COMMON=y | 936 | CONFIG_NFS_COMMON=y |
931 | CONFIG_SUNRPC=y | 937 | CONFIG_SUNRPC=y |
932 | CONFIG_SUNRPC_GSS=y | 938 | CONFIG_SUNRPC_GSS=y |
939 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
933 | CONFIG_RPCSEC_GSS_KRB5=y | 940 | CONFIG_RPCSEC_GSS_KRB5=y |
934 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 941 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
935 | CONFIG_SMB_FS=m | 942 | CONFIG_SMB_FS=m |
@@ -1002,7 +1009,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
1002 | # CONFIG_DEBUG_KERNEL is not set | 1009 | # CONFIG_DEBUG_KERNEL is not set |
1003 | CONFIG_DEBUG_BUGVERBOSE=y | 1010 | CONFIG_DEBUG_BUGVERBOSE=y |
1004 | CONFIG_DEBUG_MEMORY_INIT=y | 1011 | CONFIG_DEBUG_MEMORY_INIT=y |
1012 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1005 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1013 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1014 | |||
1015 | # | ||
1016 | # Tracers | ||
1017 | # | ||
1018 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1006 | # CONFIG_SAMPLES is not set | 1019 | # CONFIG_SAMPLES is not set |
1007 | 1020 | ||
1008 | # | 1021 | # |
@@ -1010,6 +1023,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
1010 | # | 1023 | # |
1011 | # CONFIG_KEYS is not set | 1024 | # CONFIG_KEYS is not set |
1012 | # CONFIG_SECURITY is not set | 1025 | # CONFIG_SECURITY is not set |
1026 | # CONFIG_SECURITYFS is not set | ||
1013 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1027 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1014 | CONFIG_XOR_BLOCKS=m | 1028 | CONFIG_XOR_BLOCKS=m |
1015 | CONFIG_ASYNC_CORE=m | 1029 | CONFIG_ASYNC_CORE=m |
@@ -1020,10 +1034,12 @@ CONFIG_CRYPTO=y | |||
1020 | # | 1034 | # |
1021 | # Crypto core or helper | 1035 | # Crypto core or helper |
1022 | # | 1036 | # |
1037 | # CONFIG_CRYPTO_FIPS is not set | ||
1023 | CONFIG_CRYPTO_ALGAPI=y | 1038 | CONFIG_CRYPTO_ALGAPI=y |
1024 | CONFIG_CRYPTO_AEAD=m | 1039 | CONFIG_CRYPTO_AEAD=y |
1025 | CONFIG_CRYPTO_BLKCIPHER=y | 1040 | CONFIG_CRYPTO_BLKCIPHER=y |
1026 | CONFIG_CRYPTO_HASH=y | 1041 | CONFIG_CRYPTO_HASH=y |
1042 | CONFIG_CRYPTO_RNG=y | ||
1027 | CONFIG_CRYPTO_MANAGER=y | 1043 | CONFIG_CRYPTO_MANAGER=y |
1028 | CONFIG_CRYPTO_GF128MUL=m | 1044 | CONFIG_CRYPTO_GF128MUL=m |
1029 | CONFIG_CRYPTO_NULL=m | 1045 | CONFIG_CRYPTO_NULL=m |
@@ -1097,14 +1113,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1097 | # | 1113 | # |
1098 | CONFIG_CRYPTO_DEFLATE=m | 1114 | CONFIG_CRYPTO_DEFLATE=m |
1099 | CONFIG_CRYPTO_LZO=m | 1115 | CONFIG_CRYPTO_LZO=m |
1116 | |||
1117 | # | ||
1118 | # Random Number Generation | ||
1119 | # | ||
1120 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1100 | # CONFIG_CRYPTO_HW is not set | 1121 | # CONFIG_CRYPTO_HW is not set |
1101 | 1122 | ||
1102 | # | 1123 | # |
1103 | # Library routines | 1124 | # Library routines |
1104 | # | 1125 | # |
1105 | CONFIG_BITREVERSE=y | 1126 | CONFIG_BITREVERSE=y |
1106 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1107 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1108 | CONFIG_CRC_CCITT=m | 1127 | CONFIG_CRC_CCITT=m |
1109 | CONFIG_CRC16=m | 1128 | CONFIG_CRC16=m |
1110 | CONFIG_CRC_T10DIF=y | 1129 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index cb62b96d766e..f404917429fa 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:11 2008 | 4 | # Tue Dec 2 20:27:53 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | CONFIG_NO_DMA=y | 16 | CONFIG_NO_DMA=y |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,10 +105,19 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
113 | # CONFIG_AMIGA is not set | ||
114 | # CONFIG_ATARI is not set | ||
115 | # CONFIG_MAC is not set | ||
116 | # CONFIG_APOLLO is not set | ||
117 | # CONFIG_VME is not set | ||
118 | # CONFIG_HP300 is not set | ||
119 | # CONFIG_SUN3X is not set | ||
120 | # CONFIG_Q40 is not set | ||
122 | CONFIG_SUN3=y | 121 | CONFIG_SUN3=y |
123 | 122 | ||
124 | # | 123 | # |
@@ -137,19 +136,21 @@ CONFIG_FLATMEM_MANUAL=y | |||
137 | CONFIG_FLATMEM=y | 136 | CONFIG_FLATMEM=y |
138 | CONFIG_FLAT_NODE_MEM_MAP=y | 137 | CONFIG_FLAT_NODE_MEM_MAP=y |
139 | CONFIG_NEED_MULTIPLE_NODES=y | 138 | CONFIG_NEED_MULTIPLE_NODES=y |
140 | # CONFIG_SPARSEMEM_STATIC is not set | ||
141 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
142 | CONFIG_PAGEFLAGS_EXTENDED=y | 139 | CONFIG_PAGEFLAGS_EXTENDED=y |
143 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 140 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
144 | # CONFIG_RESOURCES_64BIT is not set | 141 | # CONFIG_RESOURCES_64BIT is not set |
142 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
145 | CONFIG_ZONE_DMA_FLAG=1 | 143 | CONFIG_ZONE_DMA_FLAG=1 |
146 | CONFIG_BOUNCE=y | 144 | CONFIG_BOUNCE=y |
147 | CONFIG_VIRT_TO_BUS=y | 145 | CONFIG_VIRT_TO_BUS=y |
146 | CONFIG_UNEVICTABLE_LRU=y | ||
148 | 147 | ||
149 | # | 148 | # |
150 | # General setup | 149 | # General setup |
151 | # | 150 | # |
152 | CONFIG_BINFMT_ELF=y | 151 | CONFIG_BINFMT_ELF=y |
152 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
153 | CONFIG_HAVE_AOUT=y | ||
153 | CONFIG_BINFMT_AOUT=m | 154 | CONFIG_BINFMT_AOUT=m |
154 | CONFIG_BINFMT_MISC=m | 155 | CONFIG_BINFMT_MISC=m |
155 | CONFIG_PROC_HARDWARE=y | 156 | CONFIG_PROC_HARDWARE=y |
@@ -198,7 +199,6 @@ CONFIG_INET_TCP_DIAG=m | |||
198 | CONFIG_TCP_CONG_CUBIC=y | 199 | CONFIG_TCP_CONG_CUBIC=y |
199 | CONFIG_DEFAULT_TCP_CONG="cubic" | 200 | CONFIG_DEFAULT_TCP_CONG="cubic" |
200 | # CONFIG_TCP_MD5SIG is not set | 201 | # CONFIG_TCP_MD5SIG is not set |
201 | # CONFIG_IP_VS is not set | ||
202 | CONFIG_IPV6=m | 202 | CONFIG_IPV6=m |
203 | CONFIG_IPV6_PRIVACY=y | 203 | CONFIG_IPV6_PRIVACY=y |
204 | CONFIG_IPV6_ROUTER_PREF=y | 204 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -248,13 +248,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
248 | CONFIG_NF_CONNTRACK_SIP=m | 248 | CONFIG_NF_CONNTRACK_SIP=m |
249 | CONFIG_NF_CONNTRACK_TFTP=m | 249 | CONFIG_NF_CONNTRACK_TFTP=m |
250 | # CONFIG_NF_CT_NETLINK is not set | 250 | # CONFIG_NF_CT_NETLINK is not set |
251 | # CONFIG_NETFILTER_TPROXY is not set | ||
251 | CONFIG_NETFILTER_XTABLES=m | 252 | CONFIG_NETFILTER_XTABLES=m |
252 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 253 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
253 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 254 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
254 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 255 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
255 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 256 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
256 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 257 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
258 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 259 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
259 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 260 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
260 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 261 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -268,19 +269,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
268 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 269 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
269 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 270 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
270 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 271 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
272 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 273 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
272 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 274 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
273 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 275 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
274 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 276 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
275 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 277 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
276 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 278 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
279 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 280 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
278 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 281 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
279 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 282 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
281 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 283 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
282 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 284 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
283 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 285 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
286 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
287 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
284 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 288 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
285 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 289 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
286 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 290 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -288,20 +292,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
288 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 292 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
289 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 293 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
290 | CONFIG_NETFILTER_XT_MATCH_U32=m | 294 | CONFIG_NETFILTER_XT_MATCH_U32=m |
291 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 295 | # CONFIG_IP_VS is not set |
292 | 296 | ||
293 | # | 297 | # |
294 | # IP: Netfilter Configuration | 298 | # IP: Netfilter Configuration |
295 | # | 299 | # |
300 | CONFIG_NF_DEFRAG_IPV4=m | ||
296 | CONFIG_NF_CONNTRACK_IPV4=m | 301 | CONFIG_NF_CONNTRACK_IPV4=m |
297 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 302 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
298 | CONFIG_IP_NF_QUEUE=m | 303 | CONFIG_IP_NF_QUEUE=m |
299 | CONFIG_IP_NF_IPTABLES=m | 304 | CONFIG_IP_NF_IPTABLES=m |
300 | CONFIG_IP_NF_MATCH_RECENT=m | 305 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
301 | CONFIG_IP_NF_MATCH_ECN=m | ||
302 | CONFIG_IP_NF_MATCH_AH=m | 306 | CONFIG_IP_NF_MATCH_AH=m |
307 | CONFIG_IP_NF_MATCH_ECN=m | ||
303 | CONFIG_IP_NF_MATCH_TTL=m | 308 | CONFIG_IP_NF_MATCH_TTL=m |
304 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
305 | CONFIG_IP_NF_FILTER=m | 309 | CONFIG_IP_NF_FILTER=m |
306 | CONFIG_IP_NF_TARGET_REJECT=m | 310 | CONFIG_IP_NF_TARGET_REJECT=m |
307 | CONFIG_IP_NF_TARGET_LOG=m | 311 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -309,8 +313,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
309 | CONFIG_NF_NAT=m | 313 | CONFIG_NF_NAT=m |
310 | CONFIG_NF_NAT_NEEDED=y | 314 | CONFIG_NF_NAT_NEEDED=y |
311 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 315 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
312 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
313 | CONFIG_IP_NF_TARGET_NETMAP=m | 316 | CONFIG_IP_NF_TARGET_NETMAP=m |
317 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
314 | CONFIG_NF_NAT_SNMP_BASIC=m | 318 | CONFIG_NF_NAT_SNMP_BASIC=m |
315 | CONFIG_NF_NAT_PROTO_GRE=m | 319 | CONFIG_NF_NAT_PROTO_GRE=m |
316 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 320 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -323,9 +327,9 @@ CONFIG_NF_NAT_PPTP=m | |||
323 | CONFIG_NF_NAT_H323=m | 327 | CONFIG_NF_NAT_H323=m |
324 | CONFIG_NF_NAT_SIP=m | 328 | CONFIG_NF_NAT_SIP=m |
325 | CONFIG_IP_NF_MANGLE=m | 329 | CONFIG_IP_NF_MANGLE=m |
330 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
326 | CONFIG_IP_NF_TARGET_ECN=m | 331 | CONFIG_IP_NF_TARGET_ECN=m |
327 | CONFIG_IP_NF_TARGET_TTL=m | 332 | CONFIG_IP_NF_TARGET_TTL=m |
328 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
329 | CONFIG_IP_NF_RAW=m | 333 | CONFIG_IP_NF_RAW=m |
330 | CONFIG_IP_NF_ARPTABLES=m | 334 | CONFIG_IP_NF_ARPTABLES=m |
331 | CONFIG_IP_NF_ARPFILTER=m | 335 | CONFIG_IP_NF_ARPFILTER=m |
@@ -337,16 +341,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
337 | CONFIG_NF_CONNTRACK_IPV6=m | 341 | CONFIG_NF_CONNTRACK_IPV6=m |
338 | CONFIG_IP6_NF_QUEUE=m | 342 | CONFIG_IP6_NF_QUEUE=m |
339 | CONFIG_IP6_NF_IPTABLES=m | 343 | CONFIG_IP6_NF_IPTABLES=m |
340 | CONFIG_IP6_NF_MATCH_RT=m | 344 | CONFIG_IP6_NF_MATCH_AH=m |
341 | CONFIG_IP6_NF_MATCH_OPTS=m | 345 | CONFIG_IP6_NF_MATCH_EUI64=m |
342 | CONFIG_IP6_NF_MATCH_FRAG=m | 346 | CONFIG_IP6_NF_MATCH_FRAG=m |
347 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
343 | CONFIG_IP6_NF_MATCH_HL=m | 348 | CONFIG_IP6_NF_MATCH_HL=m |
344 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 349 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
345 | CONFIG_IP6_NF_MATCH_AH=m | ||
346 | CONFIG_IP6_NF_MATCH_MH=m | 350 | CONFIG_IP6_NF_MATCH_MH=m |
347 | CONFIG_IP6_NF_MATCH_EUI64=m | 351 | CONFIG_IP6_NF_MATCH_RT=m |
348 | CONFIG_IP6_NF_FILTER=m | ||
349 | CONFIG_IP6_NF_TARGET_LOG=m | 352 | CONFIG_IP6_NF_TARGET_LOG=m |
353 | CONFIG_IP6_NF_FILTER=m | ||
350 | CONFIG_IP6_NF_TARGET_REJECT=m | 354 | CONFIG_IP6_NF_TARGET_REJECT=m |
351 | CONFIG_IP6_NF_MANGLE=m | 355 | CONFIG_IP6_NF_MANGLE=m |
352 | CONFIG_IP6_NF_TARGET_HL=m | 356 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -373,6 +377,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
373 | # CONFIG_TIPC is not set | 377 | # CONFIG_TIPC is not set |
374 | # CONFIG_ATM is not set | 378 | # CONFIG_ATM is not set |
375 | # CONFIG_BRIDGE is not set | 379 | # CONFIG_BRIDGE is not set |
380 | # CONFIG_NET_DSA is not set | ||
376 | # CONFIG_VLAN_8021Q is not set | 381 | # CONFIG_VLAN_8021Q is not set |
377 | # CONFIG_DECNET is not set | 382 | # CONFIG_DECNET is not set |
378 | CONFIG_LLC=m | 383 | CONFIG_LLC=m |
@@ -396,19 +401,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
396 | # CONFIG_IRDA is not set | 401 | # CONFIG_IRDA is not set |
397 | # CONFIG_BT is not set | 402 | # CONFIG_BT is not set |
398 | # CONFIG_AF_RXRPC is not set | 403 | # CONFIG_AF_RXRPC is not set |
399 | 404 | # CONFIG_PHONET is not set | |
400 | # | 405 | # CONFIG_WIRELESS is not set |
401 | # Wireless | ||
402 | # | ||
403 | # CONFIG_CFG80211 is not set | ||
404 | CONFIG_WIRELESS_EXT=y | ||
405 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
406 | # CONFIG_MAC80211 is not set | ||
407 | CONFIG_IEEE80211=m | ||
408 | # CONFIG_IEEE80211_DEBUG is not set | ||
409 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
410 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
411 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
412 | # CONFIG_RFKILL is not set | 406 | # CONFIG_RFKILL is not set |
413 | # CONFIG_NET_9P is not set | 407 | # CONFIG_NET_9P is not set |
414 | 408 | ||
@@ -446,6 +440,7 @@ CONFIG_ATA_OVER_ETH=m | |||
446 | CONFIG_MISC_DEVICES=y | 440 | CONFIG_MISC_DEVICES=y |
447 | # CONFIG_EEPROM_93CX6 is not set | 441 | # CONFIG_EEPROM_93CX6 is not set |
448 | # CONFIG_ENCLOSURE_SERVICES is not set | 442 | # CONFIG_ENCLOSURE_SERVICES is not set |
443 | # CONFIG_C2PORT is not set | ||
449 | CONFIG_HAVE_IDE=y | 444 | CONFIG_HAVE_IDE=y |
450 | # CONFIG_IDE is not set | 445 | # CONFIG_IDE is not set |
451 | 446 | ||
@@ -531,6 +526,9 @@ CONFIG_SUN3_82586=y | |||
531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 526 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
532 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 527 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 528 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
529 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
530 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
531 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
534 | # CONFIG_NETDEV_1000 is not set | 532 | # CONFIG_NETDEV_1000 is not set |
535 | # CONFIG_NETDEV_10000 is not set | 533 | # CONFIG_NETDEV_10000 is not set |
536 | 534 | ||
@@ -599,6 +597,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
599 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 597 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
600 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 598 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
601 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 599 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
600 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
602 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 601 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
603 | CONFIG_MOUSE_SERIAL=m | 602 | CONFIG_MOUSE_SERIAL=m |
604 | # CONFIG_MOUSE_VSXXXAA is not set | 603 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -655,16 +654,13 @@ CONFIG_GEN_RTC_X=y | |||
655 | # CONFIG_WATCHDOG is not set | 654 | # CONFIG_WATCHDOG is not set |
656 | 655 | ||
657 | # | 656 | # |
658 | # Sonics Silicon Backplane | ||
659 | # | ||
660 | |||
661 | # | ||
662 | # Multifunction device drivers | 657 | # Multifunction device drivers |
663 | # | 658 | # |
664 | # CONFIG_MFD_CORE is not set | 659 | # CONFIG_MFD_CORE is not set |
665 | # CONFIG_MFD_SM501 is not set | 660 | # CONFIG_MFD_SM501 is not set |
666 | # CONFIG_HTC_PASIC3 is not set | 661 | # CONFIG_HTC_PASIC3 is not set |
667 | # CONFIG_MFD_TMIO is not set | 662 | # CONFIG_MFD_TMIO is not set |
663 | # CONFIG_REGULATOR is not set | ||
668 | 664 | ||
669 | # | 665 | # |
670 | # Multimedia devices | 666 | # Multimedia devices |
@@ -690,6 +686,7 @@ CONFIG_GEN_RTC_X=y | |||
690 | CONFIG_FB=y | 686 | CONFIG_FB=y |
691 | # CONFIG_FIRMWARE_EDID is not set | 687 | # CONFIG_FIRMWARE_EDID is not set |
692 | # CONFIG_FB_DDC is not set | 688 | # CONFIG_FB_DDC is not set |
689 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
693 | # CONFIG_FB_CFB_FILLRECT is not set | 690 | # CONFIG_FB_CFB_FILLRECT is not set |
694 | # CONFIG_FB_CFB_COPYAREA is not set | 691 | # CONFIG_FB_CFB_COPYAREA is not set |
695 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 692 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
@@ -711,6 +708,8 @@ CONFIG_FB=y | |||
711 | # CONFIG_FB_UVESA is not set | 708 | # CONFIG_FB_UVESA is not set |
712 | # CONFIG_FB_S1D13XXX is not set | 709 | # CONFIG_FB_S1D13XXX is not set |
713 | # CONFIG_FB_VIRTUAL is not set | 710 | # CONFIG_FB_VIRTUAL is not set |
711 | # CONFIG_FB_METRONOME is not set | ||
712 | # CONFIG_FB_MB862XX is not set | ||
714 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 713 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
715 | 714 | ||
716 | # | 715 | # |
@@ -737,6 +736,12 @@ CONFIG_HID_SUPPORT=y | |||
737 | CONFIG_HID=m | 736 | CONFIG_HID=m |
738 | # CONFIG_HID_DEBUG is not set | 737 | # CONFIG_HID_DEBUG is not set |
739 | CONFIG_HIDRAW=y | 738 | CONFIG_HIDRAW=y |
739 | # CONFIG_HID_PID is not set | ||
740 | |||
741 | # | ||
742 | # Special HID drivers | ||
743 | # | ||
744 | CONFIG_HID_COMPAT=y | ||
740 | # CONFIG_USB_SUPPORT is not set | 745 | # CONFIG_USB_SUPPORT is not set |
741 | # CONFIG_MMC is not set | 746 | # CONFIG_MMC is not set |
742 | # CONFIG_MEMSTICK is not set | 747 | # CONFIG_MEMSTICK is not set |
@@ -744,6 +749,8 @@ CONFIG_HIDRAW=y | |||
744 | # CONFIG_ACCESSIBILITY is not set | 749 | # CONFIG_ACCESSIBILITY is not set |
745 | # CONFIG_RTC_CLASS is not set | 750 | # CONFIG_RTC_CLASS is not set |
746 | # CONFIG_UIO is not set | 751 | # CONFIG_UIO is not set |
752 | # CONFIG_STAGING is not set | ||
753 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
747 | 754 | ||
748 | # | 755 | # |
749 | # Character devices | 756 | # Character devices |
@@ -757,8 +764,9 @@ CONFIG_EXT2_FS=y | |||
757 | # CONFIG_EXT2_FS_XIP is not set | 764 | # CONFIG_EXT2_FS_XIP is not set |
758 | CONFIG_EXT3_FS=y | 765 | CONFIG_EXT3_FS=y |
759 | # CONFIG_EXT3_FS_XATTR is not set | 766 | # CONFIG_EXT3_FS_XATTR is not set |
760 | # CONFIG_EXT4DEV_FS is not set | 767 | # CONFIG_EXT4_FS is not set |
761 | CONFIG_JBD=y | 768 | CONFIG_JBD=y |
769 | CONFIG_JBD2=m | ||
762 | CONFIG_REISERFS_FS=m | 770 | CONFIG_REISERFS_FS=m |
763 | # CONFIG_REISERFS_CHECK is not set | 771 | # CONFIG_REISERFS_CHECK is not set |
764 | # CONFIG_REISERFS_PROC_INFO is not set | 772 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -769,6 +777,7 @@ CONFIG_JFS_FS=m | |||
769 | # CONFIG_JFS_DEBUG is not set | 777 | # CONFIG_JFS_DEBUG is not set |
770 | # CONFIG_JFS_STATISTICS is not set | 778 | # CONFIG_JFS_STATISTICS is not set |
771 | # CONFIG_FS_POSIX_ACL is not set | 779 | # CONFIG_FS_POSIX_ACL is not set |
780 | CONFIG_FILE_LOCKING=y | ||
772 | CONFIG_XFS_FS=m | 781 | CONFIG_XFS_FS=m |
773 | # CONFIG_XFS_QUOTA is not set | 782 | # CONFIG_XFS_QUOTA is not set |
774 | # CONFIG_XFS_POSIX_ACL is not set | 783 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -780,6 +789,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
780 | # CONFIG_OCFS2_FS_STATS is not set | 789 | # CONFIG_OCFS2_FS_STATS is not set |
781 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 790 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
782 | # CONFIG_OCFS2_DEBUG_FS is not set | 791 | # CONFIG_OCFS2_DEBUG_FS is not set |
792 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
783 | CONFIG_DNOTIFY=y | 793 | CONFIG_DNOTIFY=y |
784 | CONFIG_INOTIFY=y | 794 | CONFIG_INOTIFY=y |
785 | CONFIG_INOTIFY_USER=y | 795 | CONFIG_INOTIFY_USER=y |
@@ -818,6 +828,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
818 | CONFIG_PROC_FS=y | 828 | CONFIG_PROC_FS=y |
819 | CONFIG_PROC_KCORE=y | 829 | CONFIG_PROC_KCORE=y |
820 | CONFIG_PROC_SYSCTL=y | 830 | CONFIG_PROC_SYSCTL=y |
831 | CONFIG_PROC_PAGE_MONITOR=y | ||
821 | CONFIG_SYSFS=y | 832 | CONFIG_SYSFS=y |
822 | CONFIG_TMPFS=y | 833 | CONFIG_TMPFS=y |
823 | # CONFIG_TMPFS_POSIX_ACL is not set | 834 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -861,6 +872,7 @@ CONFIG_EXPORTFS=m | |||
861 | CONFIG_NFS_COMMON=y | 872 | CONFIG_NFS_COMMON=y |
862 | CONFIG_SUNRPC=y | 873 | CONFIG_SUNRPC=y |
863 | CONFIG_SUNRPC_GSS=y | 874 | CONFIG_SUNRPC_GSS=y |
875 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
864 | CONFIG_RPCSEC_GSS_KRB5=y | 876 | CONFIG_RPCSEC_GSS_KRB5=y |
865 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 877 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
866 | CONFIG_SMB_FS=m | 878 | CONFIG_SMB_FS=m |
@@ -934,7 +946,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
934 | # CONFIG_DEBUG_KERNEL is not set | 946 | # CONFIG_DEBUG_KERNEL is not set |
935 | CONFIG_DEBUG_BUGVERBOSE=y | 947 | CONFIG_DEBUG_BUGVERBOSE=y |
936 | CONFIG_DEBUG_MEMORY_INIT=y | 948 | CONFIG_DEBUG_MEMORY_INIT=y |
949 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
937 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 950 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
951 | |||
952 | # | ||
953 | # Tracers | ||
954 | # | ||
955 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
938 | # CONFIG_SAMPLES is not set | 956 | # CONFIG_SAMPLES is not set |
939 | 957 | ||
940 | # | 958 | # |
@@ -942,6 +960,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
942 | # | 960 | # |
943 | # CONFIG_KEYS is not set | 961 | # CONFIG_KEYS is not set |
944 | # CONFIG_SECURITY is not set | 962 | # CONFIG_SECURITY is not set |
963 | # CONFIG_SECURITYFS is not set | ||
945 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 964 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
946 | CONFIG_XOR_BLOCKS=m | 965 | CONFIG_XOR_BLOCKS=m |
947 | CONFIG_ASYNC_CORE=m | 966 | CONFIG_ASYNC_CORE=m |
@@ -952,10 +971,12 @@ CONFIG_CRYPTO=y | |||
952 | # | 971 | # |
953 | # Crypto core or helper | 972 | # Crypto core or helper |
954 | # | 973 | # |
974 | # CONFIG_CRYPTO_FIPS is not set | ||
955 | CONFIG_CRYPTO_ALGAPI=y | 975 | CONFIG_CRYPTO_ALGAPI=y |
956 | CONFIG_CRYPTO_AEAD=m | 976 | CONFIG_CRYPTO_AEAD=y |
957 | CONFIG_CRYPTO_BLKCIPHER=y | 977 | CONFIG_CRYPTO_BLKCIPHER=y |
958 | CONFIG_CRYPTO_HASH=y | 978 | CONFIG_CRYPTO_HASH=y |
979 | CONFIG_CRYPTO_RNG=y | ||
959 | CONFIG_CRYPTO_MANAGER=y | 980 | CONFIG_CRYPTO_MANAGER=y |
960 | CONFIG_CRYPTO_GF128MUL=m | 981 | CONFIG_CRYPTO_GF128MUL=m |
961 | CONFIG_CRYPTO_NULL=m | 982 | CONFIG_CRYPTO_NULL=m |
@@ -1029,14 +1050,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1029 | # | 1050 | # |
1030 | CONFIG_CRYPTO_DEFLATE=m | 1051 | CONFIG_CRYPTO_DEFLATE=m |
1031 | CONFIG_CRYPTO_LZO=m | 1052 | CONFIG_CRYPTO_LZO=m |
1053 | |||
1054 | # | ||
1055 | # Random Number Generation | ||
1056 | # | ||
1057 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1032 | # CONFIG_CRYPTO_HW is not set | 1058 | # CONFIG_CRYPTO_HW is not set |
1033 | 1059 | ||
1034 | # | 1060 | # |
1035 | # Library routines | 1061 | # Library routines |
1036 | # | 1062 | # |
1037 | CONFIG_BITREVERSE=y | 1063 | CONFIG_BITREVERSE=y |
1038 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1039 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1040 | CONFIG_CRC_CCITT=m | 1064 | CONFIG_CRC_CCITT=m |
1041 | CONFIG_CRC16=m | 1065 | CONFIG_CRC16=m |
1042 | CONFIG_CRC_T10DIF=y | 1066 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 04b4363a7050..4d8a1e84e39f 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:12 2008 | 4 | # Tue Dec 2 20:27:54 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | # CONFIG_ATARI is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
148 | CONFIG_UNEVICTABLE_LRU=y | ||
159 | 149 | ||
160 | # | 150 | # |
161 | # General setup | 151 | # General setup |
162 | # | 152 | # |
163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
155 | CONFIG_HAVE_AOUT=y | ||
164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
166 | CONFIG_PROC_HARDWARE=y | 158 | CONFIG_PROC_HARDWARE=y |
@@ -209,7 +201,6 @@ CONFIG_INET_TCP_DIAG=m | |||
209 | CONFIG_TCP_CONG_CUBIC=y | 201 | CONFIG_TCP_CONG_CUBIC=y |
210 | CONFIG_DEFAULT_TCP_CONG="cubic" | 202 | CONFIG_DEFAULT_TCP_CONG="cubic" |
211 | # CONFIG_TCP_MD5SIG is not set | 203 | # CONFIG_TCP_MD5SIG is not set |
212 | # CONFIG_IP_VS is not set | ||
213 | CONFIG_IPV6=m | 204 | CONFIG_IPV6=m |
214 | CONFIG_IPV6_PRIVACY=y | 205 | CONFIG_IPV6_PRIVACY=y |
215 | CONFIG_IPV6_ROUTER_PREF=y | 206 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -259,13 +250,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
259 | CONFIG_NF_CONNTRACK_SIP=m | 250 | CONFIG_NF_CONNTRACK_SIP=m |
260 | CONFIG_NF_CONNTRACK_TFTP=m | 251 | CONFIG_NF_CONNTRACK_TFTP=m |
261 | # CONFIG_NF_CT_NETLINK is not set | 252 | # CONFIG_NF_CT_NETLINK is not set |
253 | # CONFIG_NETFILTER_TPROXY is not set | ||
262 | CONFIG_NETFILTER_XTABLES=m | 254 | CONFIG_NETFILTER_XTABLES=m |
263 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
264 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
265 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
266 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
267 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
268 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
269 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 261 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
270 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 262 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
271 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -279,19 +271,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
279 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
280 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 272 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
281 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
283 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
284 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
285 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
286 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 279 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
287 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 280 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
281 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 282 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
289 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 283 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
290 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
292 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
293 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
294 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 287 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
288 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
289 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
295 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 290 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
296 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
297 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 292 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -299,20 +294,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
299 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 294 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
300 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 295 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
301 | CONFIG_NETFILTER_XT_MATCH_U32=m | 296 | CONFIG_NETFILTER_XT_MATCH_U32=m |
302 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 297 | # CONFIG_IP_VS is not set |
303 | 298 | ||
304 | # | 299 | # |
305 | # IP: Netfilter Configuration | 300 | # IP: Netfilter Configuration |
306 | # | 301 | # |
302 | CONFIG_NF_DEFRAG_IPV4=m | ||
307 | CONFIG_NF_CONNTRACK_IPV4=m | 303 | CONFIG_NF_CONNTRACK_IPV4=m |
308 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 304 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
309 | CONFIG_IP_NF_QUEUE=m | 305 | CONFIG_IP_NF_QUEUE=m |
310 | CONFIG_IP_NF_IPTABLES=m | 306 | CONFIG_IP_NF_IPTABLES=m |
311 | CONFIG_IP_NF_MATCH_RECENT=m | 307 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
312 | CONFIG_IP_NF_MATCH_ECN=m | ||
313 | CONFIG_IP_NF_MATCH_AH=m | 308 | CONFIG_IP_NF_MATCH_AH=m |
309 | CONFIG_IP_NF_MATCH_ECN=m | ||
314 | CONFIG_IP_NF_MATCH_TTL=m | 310 | CONFIG_IP_NF_MATCH_TTL=m |
315 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
316 | CONFIG_IP_NF_FILTER=m | 311 | CONFIG_IP_NF_FILTER=m |
317 | CONFIG_IP_NF_TARGET_REJECT=m | 312 | CONFIG_IP_NF_TARGET_REJECT=m |
318 | CONFIG_IP_NF_TARGET_LOG=m | 313 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -320,8 +315,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
320 | CONFIG_NF_NAT=m | 315 | CONFIG_NF_NAT=m |
321 | CONFIG_NF_NAT_NEEDED=y | 316 | CONFIG_NF_NAT_NEEDED=y |
322 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 317 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
323 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
324 | CONFIG_IP_NF_TARGET_NETMAP=m | 318 | CONFIG_IP_NF_TARGET_NETMAP=m |
319 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
325 | CONFIG_NF_NAT_SNMP_BASIC=m | 320 | CONFIG_NF_NAT_SNMP_BASIC=m |
326 | CONFIG_NF_NAT_PROTO_GRE=m | 321 | CONFIG_NF_NAT_PROTO_GRE=m |
327 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 322 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -334,9 +329,9 @@ CONFIG_NF_NAT_PPTP=m | |||
334 | CONFIG_NF_NAT_H323=m | 329 | CONFIG_NF_NAT_H323=m |
335 | CONFIG_NF_NAT_SIP=m | 330 | CONFIG_NF_NAT_SIP=m |
336 | CONFIG_IP_NF_MANGLE=m | 331 | CONFIG_IP_NF_MANGLE=m |
332 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
337 | CONFIG_IP_NF_TARGET_ECN=m | 333 | CONFIG_IP_NF_TARGET_ECN=m |
338 | CONFIG_IP_NF_TARGET_TTL=m | 334 | CONFIG_IP_NF_TARGET_TTL=m |
339 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
340 | CONFIG_IP_NF_RAW=m | 335 | CONFIG_IP_NF_RAW=m |
341 | CONFIG_IP_NF_ARPTABLES=m | 336 | CONFIG_IP_NF_ARPTABLES=m |
342 | CONFIG_IP_NF_ARPFILTER=m | 337 | CONFIG_IP_NF_ARPFILTER=m |
@@ -348,16 +343,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
348 | CONFIG_NF_CONNTRACK_IPV6=m | 343 | CONFIG_NF_CONNTRACK_IPV6=m |
349 | CONFIG_IP6_NF_QUEUE=m | 344 | CONFIG_IP6_NF_QUEUE=m |
350 | CONFIG_IP6_NF_IPTABLES=m | 345 | CONFIG_IP6_NF_IPTABLES=m |
351 | CONFIG_IP6_NF_MATCH_RT=m | 346 | CONFIG_IP6_NF_MATCH_AH=m |
352 | CONFIG_IP6_NF_MATCH_OPTS=m | 347 | CONFIG_IP6_NF_MATCH_EUI64=m |
353 | CONFIG_IP6_NF_MATCH_FRAG=m | 348 | CONFIG_IP6_NF_MATCH_FRAG=m |
349 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
354 | CONFIG_IP6_NF_MATCH_HL=m | 350 | CONFIG_IP6_NF_MATCH_HL=m |
355 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
356 | CONFIG_IP6_NF_MATCH_AH=m | ||
357 | CONFIG_IP6_NF_MATCH_MH=m | 352 | CONFIG_IP6_NF_MATCH_MH=m |
358 | CONFIG_IP6_NF_MATCH_EUI64=m | 353 | CONFIG_IP6_NF_MATCH_RT=m |
359 | CONFIG_IP6_NF_FILTER=m | ||
360 | CONFIG_IP6_NF_TARGET_LOG=m | 354 | CONFIG_IP6_NF_TARGET_LOG=m |
355 | CONFIG_IP6_NF_FILTER=m | ||
361 | CONFIG_IP6_NF_TARGET_REJECT=m | 356 | CONFIG_IP6_NF_TARGET_REJECT=m |
362 | CONFIG_IP6_NF_MANGLE=m | 357 | CONFIG_IP6_NF_MANGLE=m |
363 | CONFIG_IP6_NF_TARGET_HL=m | 358 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -384,6 +379,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
384 | # CONFIG_TIPC is not set | 379 | # CONFIG_TIPC is not set |
385 | # CONFIG_ATM is not set | 380 | # CONFIG_ATM is not set |
386 | # CONFIG_BRIDGE is not set | 381 | # CONFIG_BRIDGE is not set |
382 | # CONFIG_NET_DSA is not set | ||
387 | # CONFIG_VLAN_8021Q is not set | 383 | # CONFIG_VLAN_8021Q is not set |
388 | # CONFIG_DECNET is not set | 384 | # CONFIG_DECNET is not set |
389 | CONFIG_LLC=m | 385 | CONFIG_LLC=m |
@@ -407,19 +403,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
407 | # CONFIG_IRDA is not set | 403 | # CONFIG_IRDA is not set |
408 | # CONFIG_BT is not set | 404 | # CONFIG_BT is not set |
409 | # CONFIG_AF_RXRPC is not set | 405 | # CONFIG_AF_RXRPC is not set |
410 | 406 | # CONFIG_PHONET is not set | |
411 | # | 407 | # CONFIG_WIRELESS is not set |
412 | # Wireless | ||
413 | # | ||
414 | # CONFIG_CFG80211 is not set | ||
415 | CONFIG_WIRELESS_EXT=y | ||
416 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
417 | # CONFIG_MAC80211 is not set | ||
418 | CONFIG_IEEE80211=m | ||
419 | # CONFIG_IEEE80211_DEBUG is not set | ||
420 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
421 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
422 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
423 | # CONFIG_RFKILL is not set | 408 | # CONFIG_RFKILL is not set |
424 | # CONFIG_NET_9P is not set | 409 | # CONFIG_NET_9P is not set |
425 | 410 | ||
@@ -457,6 +442,7 @@ CONFIG_ATA_OVER_ETH=m | |||
457 | CONFIG_MISC_DEVICES=y | 442 | CONFIG_MISC_DEVICES=y |
458 | # CONFIG_EEPROM_93CX6 is not set | 443 | # CONFIG_EEPROM_93CX6 is not set |
459 | # CONFIG_ENCLOSURE_SERVICES is not set | 444 | # CONFIG_ENCLOSURE_SERVICES is not set |
445 | # CONFIG_C2PORT is not set | ||
460 | CONFIG_HAVE_IDE=y | 446 | CONFIG_HAVE_IDE=y |
461 | # CONFIG_IDE is not set | 447 | # CONFIG_IDE is not set |
462 | 448 | ||
@@ -541,6 +527,9 @@ CONFIG_SUN3LANCE=y | |||
541 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 527 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
542 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 528 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
543 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 529 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
530 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
531 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
532 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
544 | # CONFIG_B44 is not set | 533 | # CONFIG_B44 is not set |
545 | # CONFIG_NETDEV_1000 is not set | 534 | # CONFIG_NETDEV_1000 is not set |
546 | # CONFIG_NETDEV_10000 is not set | 535 | # CONFIG_NETDEV_10000 is not set |
@@ -610,6 +599,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
610 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 599 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
611 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 600 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
612 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 601 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
602 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
613 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 603 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
614 | CONFIG_MOUSE_SERIAL=m | 604 | CONFIG_MOUSE_SERIAL=m |
615 | # CONFIG_MOUSE_VSXXXAA is not set | 605 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -664,11 +654,11 @@ CONFIG_GEN_RTC_X=y | |||
664 | # CONFIG_THERMAL is not set | 654 | # CONFIG_THERMAL is not set |
665 | # CONFIG_THERMAL_HWMON is not set | 655 | # CONFIG_THERMAL_HWMON is not set |
666 | # CONFIG_WATCHDOG is not set | 656 | # CONFIG_WATCHDOG is not set |
657 | CONFIG_SSB_POSSIBLE=y | ||
667 | 658 | ||
668 | # | 659 | # |
669 | # Sonics Silicon Backplane | 660 | # Sonics Silicon Backplane |
670 | # | 661 | # |
671 | CONFIG_SSB_POSSIBLE=y | ||
672 | # CONFIG_SSB is not set | 662 | # CONFIG_SSB is not set |
673 | 663 | ||
674 | # | 664 | # |
@@ -678,6 +668,7 @@ CONFIG_SSB_POSSIBLE=y | |||
678 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
679 | # CONFIG_HTC_PASIC3 is not set | 669 | # CONFIG_HTC_PASIC3 is not set |
680 | # CONFIG_MFD_TMIO is not set | 670 | # CONFIG_MFD_TMIO is not set |
671 | # CONFIG_REGULATOR is not set | ||
681 | 672 | ||
682 | # | 673 | # |
683 | # Multimedia devices | 674 | # Multimedia devices |
@@ -703,6 +694,7 @@ CONFIG_SSB_POSSIBLE=y | |||
703 | CONFIG_FB=y | 694 | CONFIG_FB=y |
704 | # CONFIG_FIRMWARE_EDID is not set | 695 | # CONFIG_FIRMWARE_EDID is not set |
705 | # CONFIG_FB_DDC is not set | 696 | # CONFIG_FB_DDC is not set |
697 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
706 | # CONFIG_FB_CFB_FILLRECT is not set | 698 | # CONFIG_FB_CFB_FILLRECT is not set |
707 | # CONFIG_FB_CFB_COPYAREA is not set | 699 | # CONFIG_FB_CFB_COPYAREA is not set |
708 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 700 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
@@ -724,6 +716,8 @@ CONFIG_FB=y | |||
724 | # CONFIG_FB_UVESA is not set | 716 | # CONFIG_FB_UVESA is not set |
725 | # CONFIG_FB_S1D13XXX is not set | 717 | # CONFIG_FB_S1D13XXX is not set |
726 | # CONFIG_FB_VIRTUAL is not set | 718 | # CONFIG_FB_VIRTUAL is not set |
719 | # CONFIG_FB_METRONOME is not set | ||
720 | # CONFIG_FB_MB862XX is not set | ||
727 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
728 | 722 | ||
729 | # | 723 | # |
@@ -750,6 +744,12 @@ CONFIG_HID_SUPPORT=y | |||
750 | CONFIG_HID=m | 744 | CONFIG_HID=m |
751 | # CONFIG_HID_DEBUG is not set | 745 | # CONFIG_HID_DEBUG is not set |
752 | CONFIG_HIDRAW=y | 746 | CONFIG_HIDRAW=y |
747 | # CONFIG_HID_PID is not set | ||
748 | |||
749 | # | ||
750 | # Special HID drivers | ||
751 | # | ||
752 | CONFIG_HID_COMPAT=y | ||
753 | # CONFIG_USB_SUPPORT is not set | 753 | # CONFIG_USB_SUPPORT is not set |
754 | # CONFIG_MMC is not set | 754 | # CONFIG_MMC is not set |
755 | # CONFIG_MEMSTICK is not set | 755 | # CONFIG_MEMSTICK is not set |
@@ -758,6 +758,8 @@ CONFIG_HIDRAW=y | |||
758 | # CONFIG_RTC_CLASS is not set | 758 | # CONFIG_RTC_CLASS is not set |
759 | # CONFIG_DMADEVICES is not set | 759 | # CONFIG_DMADEVICES is not set |
760 | # CONFIG_UIO is not set | 760 | # CONFIG_UIO is not set |
761 | # CONFIG_STAGING is not set | ||
762 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
761 | 763 | ||
762 | # | 764 | # |
763 | # Character devices | 765 | # Character devices |
@@ -771,8 +773,9 @@ CONFIG_EXT2_FS=y | |||
771 | # CONFIG_EXT2_FS_XIP is not set | 773 | # CONFIG_EXT2_FS_XIP is not set |
772 | CONFIG_EXT3_FS=y | 774 | CONFIG_EXT3_FS=y |
773 | # CONFIG_EXT3_FS_XATTR is not set | 775 | # CONFIG_EXT3_FS_XATTR is not set |
774 | # CONFIG_EXT4DEV_FS is not set | 776 | # CONFIG_EXT4_FS is not set |
775 | CONFIG_JBD=y | 777 | CONFIG_JBD=y |
778 | CONFIG_JBD2=m | ||
776 | CONFIG_REISERFS_FS=m | 779 | CONFIG_REISERFS_FS=m |
777 | # CONFIG_REISERFS_CHECK is not set | 780 | # CONFIG_REISERFS_CHECK is not set |
778 | # CONFIG_REISERFS_PROC_INFO is not set | 781 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -783,6 +786,7 @@ CONFIG_JFS_FS=m | |||
783 | # CONFIG_JFS_DEBUG is not set | 786 | # CONFIG_JFS_DEBUG is not set |
784 | # CONFIG_JFS_STATISTICS is not set | 787 | # CONFIG_JFS_STATISTICS is not set |
785 | # CONFIG_FS_POSIX_ACL is not set | 788 | # CONFIG_FS_POSIX_ACL is not set |
789 | CONFIG_FILE_LOCKING=y | ||
786 | CONFIG_XFS_FS=m | 790 | CONFIG_XFS_FS=m |
787 | # CONFIG_XFS_QUOTA is not set | 791 | # CONFIG_XFS_QUOTA is not set |
788 | # CONFIG_XFS_POSIX_ACL is not set | 792 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -794,6 +798,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
794 | # CONFIG_OCFS2_FS_STATS is not set | 798 | # CONFIG_OCFS2_FS_STATS is not set |
795 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 799 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
796 | # CONFIG_OCFS2_DEBUG_FS is not set | 800 | # CONFIG_OCFS2_DEBUG_FS is not set |
801 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
797 | CONFIG_DNOTIFY=y | 802 | CONFIG_DNOTIFY=y |
798 | CONFIG_INOTIFY=y | 803 | CONFIG_INOTIFY=y |
799 | CONFIG_INOTIFY_USER=y | 804 | CONFIG_INOTIFY_USER=y |
@@ -832,6 +837,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
832 | CONFIG_PROC_FS=y | 837 | CONFIG_PROC_FS=y |
833 | CONFIG_PROC_KCORE=y | 838 | CONFIG_PROC_KCORE=y |
834 | CONFIG_PROC_SYSCTL=y | 839 | CONFIG_PROC_SYSCTL=y |
840 | CONFIG_PROC_PAGE_MONITOR=y | ||
835 | CONFIG_SYSFS=y | 841 | CONFIG_SYSFS=y |
836 | CONFIG_TMPFS=y | 842 | CONFIG_TMPFS=y |
837 | # CONFIG_TMPFS_POSIX_ACL is not set | 843 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -875,6 +881,7 @@ CONFIG_EXPORTFS=m | |||
875 | CONFIG_NFS_COMMON=y | 881 | CONFIG_NFS_COMMON=y |
876 | CONFIG_SUNRPC=y | 882 | CONFIG_SUNRPC=y |
877 | CONFIG_SUNRPC_GSS=y | 883 | CONFIG_SUNRPC_GSS=y |
884 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
878 | CONFIG_RPCSEC_GSS_KRB5=y | 885 | CONFIG_RPCSEC_GSS_KRB5=y |
879 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 886 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
880 | CONFIG_SMB_FS=m | 887 | CONFIG_SMB_FS=m |
@@ -948,7 +955,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
948 | # CONFIG_DEBUG_KERNEL is not set | 955 | # CONFIG_DEBUG_KERNEL is not set |
949 | CONFIG_DEBUG_BUGVERBOSE=y | 956 | CONFIG_DEBUG_BUGVERBOSE=y |
950 | CONFIG_DEBUG_MEMORY_INIT=y | 957 | CONFIG_DEBUG_MEMORY_INIT=y |
958 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
951 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 959 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
960 | |||
961 | # | ||
962 | # Tracers | ||
963 | # | ||
964 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
952 | # CONFIG_SAMPLES is not set | 965 | # CONFIG_SAMPLES is not set |
953 | 966 | ||
954 | # | 967 | # |
@@ -956,6 +969,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
956 | # | 969 | # |
957 | # CONFIG_KEYS is not set | 970 | # CONFIG_KEYS is not set |
958 | # CONFIG_SECURITY is not set | 971 | # CONFIG_SECURITY is not set |
972 | # CONFIG_SECURITYFS is not set | ||
959 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 973 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
960 | CONFIG_XOR_BLOCKS=m | 974 | CONFIG_XOR_BLOCKS=m |
961 | CONFIG_ASYNC_CORE=m | 975 | CONFIG_ASYNC_CORE=m |
@@ -966,10 +980,12 @@ CONFIG_CRYPTO=y | |||
966 | # | 980 | # |
967 | # Crypto core or helper | 981 | # Crypto core or helper |
968 | # | 982 | # |
983 | # CONFIG_CRYPTO_FIPS is not set | ||
969 | CONFIG_CRYPTO_ALGAPI=y | 984 | CONFIG_CRYPTO_ALGAPI=y |
970 | CONFIG_CRYPTO_AEAD=m | 985 | CONFIG_CRYPTO_AEAD=y |
971 | CONFIG_CRYPTO_BLKCIPHER=y | 986 | CONFIG_CRYPTO_BLKCIPHER=y |
972 | CONFIG_CRYPTO_HASH=y | 987 | CONFIG_CRYPTO_HASH=y |
988 | CONFIG_CRYPTO_RNG=y | ||
973 | CONFIG_CRYPTO_MANAGER=y | 989 | CONFIG_CRYPTO_MANAGER=y |
974 | CONFIG_CRYPTO_GF128MUL=m | 990 | CONFIG_CRYPTO_GF128MUL=m |
975 | CONFIG_CRYPTO_NULL=m | 991 | CONFIG_CRYPTO_NULL=m |
@@ -1043,14 +1059,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1043 | # | 1059 | # |
1044 | CONFIG_CRYPTO_DEFLATE=m | 1060 | CONFIG_CRYPTO_DEFLATE=m |
1045 | CONFIG_CRYPTO_LZO=m | 1061 | CONFIG_CRYPTO_LZO=m |
1062 | |||
1063 | # | ||
1064 | # Random Number Generation | ||
1065 | # | ||
1066 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1046 | # CONFIG_CRYPTO_HW is not set | 1067 | # CONFIG_CRYPTO_HW is not set |
1047 | 1068 | ||
1048 | # | 1069 | # |
1049 | # Library routines | 1070 | # Library routines |
1050 | # | 1071 | # |
1051 | CONFIG_BITREVERSE=y | 1072 | CONFIG_BITREVERSE=y |
1052 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1053 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1054 | CONFIG_CRC_CCITT=m | 1073 | CONFIG_CRC_CCITT=m |
1055 | CONFIG_CRC16=m | 1074 | CONFIG_CRC16=m |
1056 | CONFIG_CRC_T10DIF=y | 1075 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 7e8a0d394e61..761ee0440c99 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c | |||
@@ -133,7 +133,7 @@ void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt, | |||
133 | { | 133 | { |
134 | int i; | 134 | int i; |
135 | 135 | ||
136 | BUG_ON(IRQ_USER + cnt >= NR_IRQS); | 136 | BUG_ON(IRQ_USER + cnt > NR_IRQS); |
137 | m68k_first_user_vec = vec; | 137 | m68k_first_user_vec = vec; |
138 | for (i = 0; i < cnt; i++) | 138 | for (i = 0; i < cnt; i++) |
139 | irq_controller[IRQ_USER + i] = &user_irq_controller; | 139 | irq_controller[IRQ_USER + i] = &user_irq_controller; |
diff --git a/arch/m68knommu/platform/coldfire/pit.c b/arch/m68knommu/platform/coldfire/pit.c index c5b916700b22..2a12e7fa9748 100644 --- a/arch/m68knommu/platform/coldfire/pit.c +++ b/arch/m68knommu/platform/coldfire/pit.c | |||
@@ -156,7 +156,7 @@ void hw_timer_init(void) | |||
156 | { | 156 | { |
157 | u32 imr; | 157 | u32 imr; |
158 | 158 | ||
159 | cf_pit_clockevent.cpumask = cpumask_of_cpu(smp_processor_id()); | 159 | cf_pit_clockevent.cpumask = cpumask_of(smp_processor_id()); |
160 | cf_pit_clockevent.mult = div_sc(FREQ, NSEC_PER_SEC, 32); | 160 | cf_pit_clockevent.mult = div_sc(FREQ, NSEC_PER_SEC, 32); |
161 | cf_pit_clockevent.max_delta_ns = | 161 | cf_pit_clockevent.max_delta_ns = |
162 | clockevent_delta2ns(0xFFFF, &cf_pit_clockevent); | 162 | clockevent_delta2ns(0xFFFF, &cf_pit_clockevent); |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index f4af967a6b30..a5255e7c79e0 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -653,7 +653,7 @@ config GENERIC_CMOS_UPDATE | |||
653 | bool | 653 | bool |
654 | default y | 654 | default y |
655 | 655 | ||
656 | config SCHED_NO_NO_OMIT_FRAME_POINTER | 656 | config SCHED_OMIT_FRAME_POINTER |
657 | bool | 657 | bool |
658 | default y | 658 | default y |
659 | 659 | ||
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 765c8e287d2b..364ca8938807 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug | |||
@@ -48,7 +48,7 @@ config RUNTIME_DEBUG | |||
48 | help | 48 | help |
49 | If you say Y here, some debugging macros will do run-time checking. | 49 | If you say Y here, some debugging macros will do run-time checking. |
50 | If you say N here, those macros will mostly turn to no-ops. See | 50 | If you say N here, those macros will mostly turn to no-ops. See |
51 | include/asm-mips/debug.h for debuging macros. | 51 | arch/mips/include/asm/debug.h for debugging macros. |
52 | If unsure, say N. | 52 | If unsure, say N. |
53 | 53 | ||
54 | endmenu | 54 | endmenu |
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig index 620980081a30..b6698a232ae9 100644 --- a/arch/mips/configs/fulong_defconfig +++ b/arch/mips/configs/fulong_defconfig | |||
@@ -1,63 +1,78 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.22-rc4 | 3 | # Linux kernel version: 2.6.28-rc6 |
4 | # Mon Jun 11 00:23:51 2007 | 4 | # Fri Nov 28 17:53:48 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_LEMOTE_FULONG=y | ||
12 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
13 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
13 | # CONFIG_BCM47XX is not set | ||
14 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
15 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
16 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LASAT is not set | ||
18 | CONFIG_LEMOTE_FULONG=y | ||
17 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
18 | # CONFIG_WR_PPMC is not set | ||
19 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
21 | # CONFIG_MACH_EMMA is not set | ||
22 | # CONFIG_MACH_VR41XX is not set | ||
23 | # CONFIG_NXP_STB220 is not set | ||
24 | # CONFIG_NXP_STB225 is not set | ||
20 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
21 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
22 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
23 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
24 | # CONFIG_MARKEINS is not set | ||
25 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
26 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
31 | # CONFIG_SGI_IP28 is not set | ||
27 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
28 | # CONFIG_SIBYTE_BIGSUR is not set | ||
29 | # CONFIG_SIBYTE_SWARM is not set | ||
30 | # CONFIG_SIBYTE_SENTOSA is not set | ||
31 | # CONFIG_SIBYTE_RHONE is not set | ||
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
34 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
34 | # CONFIG_SIBYTE_CARMEL is not set | ||
35 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
36 | # CONFIG_SIBYTE_RHONE is not set | ||
37 | # CONFIG_SIBYTE_SWARM is not set | ||
38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
36 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
37 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
38 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
39 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
45 | # CONFIG_WR_PPMC is not set | ||
40 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
41 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
42 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
46 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
47 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
48 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 57 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
58 | CONFIG_CEVT_R4K=y | ||
59 | CONFIG_CSRC_R4K=y | ||
49 | CONFIG_DMA_NONCOHERENT=y | 60 | CONFIG_DMA_NONCOHERENT=y |
50 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 61 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
51 | CONFIG_EARLY_PRINTK=y | 62 | CONFIG_EARLY_PRINTK=y |
52 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 63 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
64 | # CONFIG_HOTPLUG_CPU is not set | ||
53 | CONFIG_I8259=y | 65 | CONFIG_I8259=y |
54 | # CONFIG_NO_IOPORT is not set | 66 | # CONFIG_NO_IOPORT is not set |
67 | CONFIG_GENERIC_ISA_DMA=y | ||
68 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y | ||
55 | # CONFIG_CPU_BIG_ENDIAN is not set | 69 | # CONFIG_CPU_BIG_ENDIAN is not set |
56 | CONFIG_CPU_LITTLE_ENDIAN=y | 70 | CONFIG_CPU_LITTLE_ENDIAN=y |
57 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 71 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
58 | CONFIG_IRQ_CPU=y | 72 | CONFIG_IRQ_CPU=y |
59 | CONFIG_BOOT_ELF32=y | 73 | CONFIG_BOOT_ELF32=y |
60 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 74 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
75 | CONFIG_HAVE_STD_PC_SERIAL_PORT=y | ||
61 | 76 | ||
62 | # | 77 | # |
63 | # CPU selection | 78 | # CPU selection |
@@ -75,6 +90,7 @@ CONFIG_CPU_LOONGSON2=y | |||
75 | # CONFIG_CPU_TX49XX is not set | 90 | # CONFIG_CPU_TX49XX is not set |
76 | # CONFIG_CPU_R5000 is not set | 91 | # CONFIG_CPU_R5000 is not set |
77 | # CONFIG_CPU_R5432 is not set | 92 | # CONFIG_CPU_R5432 is not set |
93 | # CONFIG_CPU_R5500 is not set | ||
78 | # CONFIG_CPU_R6000 is not set | 94 | # CONFIG_CPU_R6000 is not set |
79 | # CONFIG_CPU_NEVADA is not set | 95 | # CONFIG_CPU_NEVADA is not set |
80 | # CONFIG_CPU_R8000 is not set | 96 | # CONFIG_CPU_R8000 is not set |
@@ -101,7 +117,6 @@ CONFIG_BOARD_SCACHE=y | |||
101 | CONFIG_MIPS_MT_DISABLED=y | 117 | CONFIG_MIPS_MT_DISABLED=y |
102 | # CONFIG_MIPS_MT_SMP is not set | 118 | # CONFIG_MIPS_MT_SMP is not set |
103 | # CONFIG_MIPS_MT_SMTC is not set | 119 | # CONFIG_MIPS_MT_SMTC is not set |
104 | # CONFIG_MIPS_VPE_LOADER is not set | ||
105 | CONFIG_CPU_HAS_WB=y | 120 | CONFIG_CPU_HAS_WB=y |
106 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
107 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
@@ -109,6 +124,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
109 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 124 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
110 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | 125 | CONFIG_SYS_SUPPORTS_HIGHMEM=y |
111 | CONFIG_ARCH_FLATMEM_ENABLE=y | 126 | CONFIG_ARCH_FLATMEM_ENABLE=y |
127 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
112 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 128 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
113 | CONFIG_SELECT_MEMORY_MODEL=y | 129 | CONFIG_SELECT_MEMORY_MODEL=y |
114 | CONFIG_FLATMEM_MANUAL=y | 130 | CONFIG_FLATMEM_MANUAL=y |
@@ -117,9 +133,17 @@ CONFIG_FLATMEM_MANUAL=y | |||
117 | CONFIG_FLATMEM=y | 133 | CONFIG_FLATMEM=y |
118 | CONFIG_FLAT_NODE_MEM_MAP=y | 134 | CONFIG_FLAT_NODE_MEM_MAP=y |
119 | CONFIG_SPARSEMEM_STATIC=y | 135 | CONFIG_SPARSEMEM_STATIC=y |
136 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
120 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 137 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
121 | CONFIG_RESOURCES_64BIT=y | 138 | CONFIG_RESOURCES_64BIT=y |
139 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
122 | CONFIG_ZONE_DMA_FLAG=0 | 140 | CONFIG_ZONE_DMA_FLAG=0 |
141 | CONFIG_VIRT_TO_BUS=y | ||
142 | CONFIG_UNEVICTABLE_LRU=y | ||
143 | CONFIG_TICK_ONESHOT=y | ||
144 | CONFIG_NO_HZ=y | ||
145 | CONFIG_HIGH_RES_TIMERS=y | ||
146 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
123 | # CONFIG_HZ_48 is not set | 147 | # CONFIG_HZ_48 is not set |
124 | # CONFIG_HZ_100 is not set | 148 | # CONFIG_HZ_100 is not set |
125 | # CONFIG_HZ_128 is not set | 149 | # CONFIG_HZ_128 is not set |
@@ -133,37 +157,40 @@ CONFIG_HZ=250 | |||
133 | CONFIG_PREEMPT_VOLUNTARY=y | 157 | CONFIG_PREEMPT_VOLUNTARY=y |
134 | # CONFIG_PREEMPT is not set | 158 | # CONFIG_PREEMPT is not set |
135 | # CONFIG_KEXEC is not set | 159 | # CONFIG_KEXEC is not set |
160 | CONFIG_SECCOMP=y | ||
136 | CONFIG_LOCKDEP_SUPPORT=y | 161 | CONFIG_LOCKDEP_SUPPORT=y |
137 | CONFIG_STACKTRACE_SUPPORT=y | 162 | CONFIG_STACKTRACE_SUPPORT=y |
138 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 163 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
139 | 164 | ||
140 | # | 165 | # |
141 | # Code maturity level options | 166 | # General setup |
142 | # | 167 | # |
143 | CONFIG_EXPERIMENTAL=y | 168 | CONFIG_EXPERIMENTAL=y |
144 | CONFIG_BROKEN_ON_SMP=y | 169 | CONFIG_BROKEN_ON_SMP=y |
145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 170 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
146 | |||
147 | # | ||
148 | # General setup | ||
149 | # | ||
150 | CONFIG_LOCALVERSION="lm32" | 171 | CONFIG_LOCALVERSION="lm32" |
151 | # CONFIG_LOCALVERSION_AUTO is not set | 172 | # CONFIG_LOCALVERSION_AUTO is not set |
152 | CONFIG_SWAP=y | 173 | CONFIG_SWAP=y |
153 | CONFIG_SYSVIPC=y | 174 | CONFIG_SYSVIPC=y |
154 | # CONFIG_IPC_NS is not set | ||
155 | CONFIG_SYSVIPC_SYSCTL=y | 175 | CONFIG_SYSVIPC_SYSCTL=y |
156 | CONFIG_POSIX_MQUEUE=y | 176 | CONFIG_POSIX_MQUEUE=y |
157 | CONFIG_BSD_PROCESS_ACCT=y | 177 | CONFIG_BSD_PROCESS_ACCT=y |
158 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 178 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
159 | # CONFIG_TASKSTATS is not set | 179 | # CONFIG_TASKSTATS is not set |
160 | # CONFIG_UTS_NS is not set | ||
161 | # CONFIG_AUDIT is not set | 180 | # CONFIG_AUDIT is not set |
162 | CONFIG_IKCONFIG=y | 181 | CONFIG_IKCONFIG=y |
163 | CONFIG_IKCONFIG_PROC=y | 182 | CONFIG_IKCONFIG_PROC=y |
164 | CONFIG_LOG_BUF_SHIFT=14 | 183 | CONFIG_LOG_BUF_SHIFT=14 |
184 | # CONFIG_CGROUPS is not set | ||
185 | # CONFIG_GROUP_SCHED is not set | ||
165 | CONFIG_SYSFS_DEPRECATED=y | 186 | CONFIG_SYSFS_DEPRECATED=y |
187 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
166 | # CONFIG_RELAY is not set | 188 | # CONFIG_RELAY is not set |
189 | CONFIG_NAMESPACES=y | ||
190 | # CONFIG_UTS_NS is not set | ||
191 | # CONFIG_IPC_NS is not set | ||
192 | CONFIG_USER_NS=y | ||
193 | CONFIG_PID_NS=y | ||
167 | # CONFIG_BLK_DEV_INITRD is not set | 194 | # CONFIG_BLK_DEV_INITRD is not set |
168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 195 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
169 | CONFIG_SYSCTL=y | 196 | CONFIG_SYSCTL=y |
@@ -175,6 +202,8 @@ CONFIG_HOTPLUG=y | |||
175 | CONFIG_PRINTK=y | 202 | CONFIG_PRINTK=y |
176 | CONFIG_BUG=y | 203 | CONFIG_BUG=y |
177 | CONFIG_ELF_CORE=y | 204 | CONFIG_ELF_CORE=y |
205 | # CONFIG_PCSPKR_PLATFORM is not set | ||
206 | # CONFIG_COMPAT_BRK is not set | ||
178 | CONFIG_BASE_FULL=y | 207 | CONFIG_BASE_FULL=y |
179 | CONFIG_FUTEX=y | 208 | CONFIG_FUTEX=y |
180 | CONFIG_ANON_INODES=y | 209 | CONFIG_ANON_INODES=y |
@@ -183,29 +212,33 @@ CONFIG_SIGNALFD=y | |||
183 | CONFIG_TIMERFD=y | 212 | CONFIG_TIMERFD=y |
184 | CONFIG_EVENTFD=y | 213 | CONFIG_EVENTFD=y |
185 | CONFIG_SHMEM=y | 214 | CONFIG_SHMEM=y |
215 | CONFIG_AIO=y | ||
186 | CONFIG_VM_EVENT_COUNTERS=y | 216 | CONFIG_VM_EVENT_COUNTERS=y |
217 | CONFIG_PCI_QUIRKS=y | ||
187 | CONFIG_SLAB=y | 218 | CONFIG_SLAB=y |
188 | # CONFIG_SLUB is not set | 219 | # CONFIG_SLUB is not set |
189 | # CONFIG_SLOB is not set | 220 | # CONFIG_SLOB is not set |
221 | CONFIG_PROFILING=y | ||
222 | # CONFIG_MARKERS is not set | ||
223 | CONFIG_OPROFILE=m | ||
224 | CONFIG_HAVE_OPROFILE=y | ||
225 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
226 | CONFIG_SLABINFO=y | ||
190 | CONFIG_RT_MUTEXES=y | 227 | CONFIG_RT_MUTEXES=y |
191 | # CONFIG_TINY_SHMEM is not set | 228 | # CONFIG_TINY_SHMEM is not set |
192 | CONFIG_BASE_SMALL=0 | 229 | CONFIG_BASE_SMALL=0 |
193 | |||
194 | # | ||
195 | # Loadable module support | ||
196 | # | ||
197 | CONFIG_MODULES=y | 230 | CONFIG_MODULES=y |
231 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
198 | CONFIG_MODULE_UNLOAD=y | 232 | CONFIG_MODULE_UNLOAD=y |
199 | CONFIG_MODULE_FORCE_UNLOAD=y | 233 | CONFIG_MODULE_FORCE_UNLOAD=y |
200 | # CONFIG_MODVERSIONS is not set | 234 | # CONFIG_MODVERSIONS is not set |
201 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 235 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
202 | CONFIG_KMOD=y | 236 | CONFIG_KMOD=y |
203 | |||
204 | # | ||
205 | # Block layer | ||
206 | # | ||
207 | CONFIG_BLOCK=y | 237 | CONFIG_BLOCK=y |
208 | # CONFIG_BLK_DEV_IO_TRACE is not set | 238 | # CONFIG_BLK_DEV_IO_TRACE is not set |
239 | CONFIG_BLK_DEV_BSG=y | ||
240 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
241 | CONFIG_BLOCK_COMPAT=y | ||
209 | 242 | ||
210 | # | 243 | # |
211 | # IO Schedulers | 244 | # IO Schedulers |
@@ -219,19 +252,19 @@ CONFIG_IOSCHED_CFQ=y | |||
219 | CONFIG_DEFAULT_CFQ=y | 252 | CONFIG_DEFAULT_CFQ=y |
220 | # CONFIG_DEFAULT_NOOP is not set | 253 | # CONFIG_DEFAULT_NOOP is not set |
221 | CONFIG_DEFAULT_IOSCHED="cfq" | 254 | CONFIG_DEFAULT_IOSCHED="cfq" |
255 | CONFIG_CLASSIC_RCU=y | ||
256 | CONFIG_FREEZER=y | ||
222 | 257 | ||
223 | # | 258 | # |
224 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 259 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
225 | # | 260 | # |
226 | CONFIG_HW_HAS_PCI=y | 261 | CONFIG_HW_HAS_PCI=y |
227 | CONFIG_PCI=y | 262 | CONFIG_PCI=y |
263 | CONFIG_PCI_DOMAINS=y | ||
228 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 264 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
265 | CONFIG_PCI_LEGACY=y | ||
229 | CONFIG_ISA=y | 266 | CONFIG_ISA=y |
230 | CONFIG_MMU=y | 267 | CONFIG_MMU=y |
231 | |||
232 | # | ||
233 | # PCCARD (PCMCIA/CardBus) support | ||
234 | # | ||
235 | # CONFIG_PCCARD is not set | 268 | # CONFIG_PCCARD is not set |
236 | # CONFIG_HOTPLUG_PCI is not set | 269 | # CONFIG_HOTPLUG_PCI is not set |
237 | 270 | ||
@@ -239,8 +272,9 @@ CONFIG_MMU=y | |||
239 | # Executable file formats | 272 | # Executable file formats |
240 | # | 273 | # |
241 | CONFIG_BINFMT_ELF=y | 274 | CONFIG_BINFMT_ELF=y |
275 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
276 | # CONFIG_HAVE_AOUT is not set | ||
242 | CONFIG_BINFMT_MISC=y | 277 | CONFIG_BINFMT_MISC=y |
243 | # CONFIG_BUILD_ELF64 is not set | ||
244 | CONFIG_MIPS32_COMPAT=y | 278 | CONFIG_MIPS32_COMPAT=y |
245 | CONFIG_COMPAT=y | 279 | CONFIG_COMPAT=y |
246 | CONFIG_SYSVIPC_COMPAT=y | 280 | CONFIG_SYSVIPC_COMPAT=y |
@@ -251,14 +285,12 @@ CONFIG_BINFMT_ELF32=y | |||
251 | # | 285 | # |
252 | # Power management options | 286 | # Power management options |
253 | # | 287 | # |
288 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
254 | CONFIG_PM=y | 289 | CONFIG_PM=y |
255 | # CONFIG_PM_LEGACY is not set | ||
256 | # CONFIG_PM_DEBUG is not set | 290 | # CONFIG_PM_DEBUG is not set |
257 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 291 | CONFIG_PM_SLEEP=y |
258 | 292 | CONFIG_SUSPEND=y | |
259 | # | 293 | CONFIG_SUSPEND_FREEZER=y |
260 | # Networking | ||
261 | # | ||
262 | CONFIG_NET=y | 294 | CONFIG_NET=y |
263 | 295 | ||
264 | # | 296 | # |
@@ -271,6 +303,7 @@ CONFIG_XFRM=y | |||
271 | # CONFIG_XFRM_USER is not set | 303 | # CONFIG_XFRM_USER is not set |
272 | # CONFIG_XFRM_SUB_POLICY is not set | 304 | # CONFIG_XFRM_SUB_POLICY is not set |
273 | # CONFIG_XFRM_MIGRATE is not set | 305 | # CONFIG_XFRM_MIGRATE is not set |
306 | # CONFIG_XFRM_STATISTICS is not set | ||
274 | # CONFIG_NET_KEY is not set | 307 | # CONFIG_NET_KEY is not set |
275 | CONFIG_INET=y | 308 | CONFIG_INET=y |
276 | CONFIG_IP_MULTICAST=y | 309 | CONFIG_IP_MULTICAST=y |
@@ -294,18 +327,17 @@ CONFIG_INET_TUNNEL=m | |||
294 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 327 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
295 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 328 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
296 | CONFIG_INET_XFRM_MODE_BEET=y | 329 | CONFIG_INET_XFRM_MODE_BEET=y |
330 | # CONFIG_INET_LRO is not set | ||
297 | # CONFIG_INET_DIAG is not set | 331 | # CONFIG_INET_DIAG is not set |
298 | # CONFIG_TCP_CONG_ADVANCED is not set | 332 | # CONFIG_TCP_CONG_ADVANCED is not set |
299 | CONFIG_TCP_CONG_CUBIC=y | 333 | CONFIG_TCP_CONG_CUBIC=y |
300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 334 | CONFIG_DEFAULT_TCP_CONG="cubic" |
301 | # CONFIG_TCP_MD5SIG is not set | 335 | # CONFIG_TCP_MD5SIG is not set |
302 | # CONFIG_IP_VS is not set | ||
303 | # CONFIG_IPV6 is not set | 336 | # CONFIG_IPV6 is not set |
304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
305 | # CONFIG_INET6_TUNNEL is not set | ||
306 | # CONFIG_NETWORK_SECMARK is not set | 337 | # CONFIG_NETWORK_SECMARK is not set |
307 | CONFIG_NETFILTER=y | 338 | CONFIG_NETFILTER=y |
308 | # CONFIG_NETFILTER_DEBUG is not set | 339 | # CONFIG_NETFILTER_DEBUG is not set |
340 | CONFIG_NETFILTER_ADVANCED=y | ||
309 | 341 | ||
310 | # | 342 | # |
311 | # Core Netfilter Configuration | 343 | # Core Netfilter Configuration |
@@ -313,53 +345,59 @@ CONFIG_NETFILTER=y | |||
313 | CONFIG_NETFILTER_NETLINK=m | 345 | CONFIG_NETFILTER_NETLINK=m |
314 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 346 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
315 | CONFIG_NETFILTER_NETLINK_LOG=m | 347 | CONFIG_NETFILTER_NETLINK_LOG=m |
316 | # CONFIG_NF_CONNTRACK_ENABLED is not set | ||
317 | # CONFIG_NF_CONNTRACK is not set | 348 | # CONFIG_NF_CONNTRACK is not set |
318 | CONFIG_NETFILTER_XTABLES=m | 349 | CONFIG_NETFILTER_XTABLES=m |
319 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 350 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
320 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 351 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
321 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 352 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
322 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
323 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | 353 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
354 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
355 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
356 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
324 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | 357 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set |
358 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
325 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 359 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
326 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 360 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
327 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 361 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
328 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 362 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
363 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
364 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
329 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 365 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
330 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 366 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
331 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 367 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
332 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 368 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
333 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
334 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 369 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
370 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
371 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
335 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 372 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
336 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 373 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
374 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
337 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 375 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
376 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
377 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
338 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 378 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
339 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 379 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
340 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 380 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
341 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 381 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
342 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 382 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
383 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
384 | # CONFIG_IP_VS is not set | ||
343 | 385 | ||
344 | # | 386 | # |
345 | # IP: Netfilter Configuration | 387 | # IP: Netfilter Configuration |
346 | # | 388 | # |
389 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
347 | CONFIG_IP_NF_QUEUE=m | 390 | CONFIG_IP_NF_QUEUE=m |
348 | CONFIG_IP_NF_IPTABLES=m | 391 | CONFIG_IP_NF_IPTABLES=m |
349 | CONFIG_IP_NF_MATCH_IPRANGE=m | 392 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
350 | CONFIG_IP_NF_MATCH_TOS=m | ||
351 | CONFIG_IP_NF_MATCH_RECENT=m | ||
352 | CONFIG_IP_NF_MATCH_ECN=m | ||
353 | CONFIG_IP_NF_MATCH_AH=m | 393 | CONFIG_IP_NF_MATCH_AH=m |
394 | CONFIG_IP_NF_MATCH_ECN=m | ||
354 | CONFIG_IP_NF_MATCH_TTL=m | 395 | CONFIG_IP_NF_MATCH_TTL=m |
355 | CONFIG_IP_NF_MATCH_OWNER=m | ||
356 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
357 | CONFIG_IP_NF_FILTER=m | 396 | CONFIG_IP_NF_FILTER=m |
358 | CONFIG_IP_NF_TARGET_REJECT=m | 397 | CONFIG_IP_NF_TARGET_REJECT=m |
359 | CONFIG_IP_NF_TARGET_LOG=m | 398 | CONFIG_IP_NF_TARGET_LOG=m |
360 | CONFIG_IP_NF_TARGET_ULOG=m | 399 | CONFIG_IP_NF_TARGET_ULOG=m |
361 | CONFIG_IP_NF_MANGLE=m | 400 | CONFIG_IP_NF_MANGLE=m |
362 | CONFIG_IP_NF_TARGET_TOS=m | ||
363 | CONFIG_IP_NF_TARGET_ECN=m | 401 | CONFIG_IP_NF_TARGET_ECN=m |
364 | CONFIG_IP_NF_TARGET_TTL=m | 402 | CONFIG_IP_NF_TARGET_TTL=m |
365 | CONFIG_IP_NF_RAW=m | 403 | CONFIG_IP_NF_RAW=m |
@@ -371,6 +409,7 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
371 | # CONFIG_TIPC is not set | 409 | # CONFIG_TIPC is not set |
372 | # CONFIG_ATM is not set | 410 | # CONFIG_ATM is not set |
373 | # CONFIG_BRIDGE is not set | 411 | # CONFIG_BRIDGE is not set |
412 | # CONFIG_NET_DSA is not set | ||
374 | # CONFIG_VLAN_8021Q is not set | 413 | # CONFIG_VLAN_8021Q is not set |
375 | # CONFIG_DECNET is not set | 414 | # CONFIG_DECNET is not set |
376 | # CONFIG_LLC2 is not set | 415 | # CONFIG_LLC2 is not set |
@@ -380,10 +419,6 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
380 | # CONFIG_LAPB is not set | 419 | # CONFIG_LAPB is not set |
381 | # CONFIG_ECONET is not set | 420 | # CONFIG_ECONET is not set |
382 | # CONFIG_WAN_ROUTER is not set | 421 | # CONFIG_WAN_ROUTER is not set |
383 | |||
384 | # | ||
385 | # QoS and/or fair queueing | ||
386 | # | ||
387 | # CONFIG_NET_SCHED is not set | 422 | # CONFIG_NET_SCHED is not set |
388 | CONFIG_NET_CLS_ROUTE=y | 423 | CONFIG_NET_CLS_ROUTE=y |
389 | 424 | ||
@@ -392,23 +427,25 @@ CONFIG_NET_CLS_ROUTE=y | |||
392 | # | 427 | # |
393 | # CONFIG_NET_PKTGEN is not set | 428 | # CONFIG_NET_PKTGEN is not set |
394 | # CONFIG_HAMRADIO is not set | 429 | # CONFIG_HAMRADIO is not set |
430 | # CONFIG_CAN is not set | ||
395 | # CONFIG_IRDA is not set | 431 | # CONFIG_IRDA is not set |
396 | # CONFIG_BT is not set | 432 | # CONFIG_BT is not set |
397 | # CONFIG_AF_RXRPC is not set | 433 | # CONFIG_AF_RXRPC is not set |
398 | 434 | CONFIG_PHONET=m | |
399 | # | 435 | CONFIG_WIRELESS=y |
400 | # Wireless | ||
401 | # | ||
402 | # CONFIG_CFG80211 is not set | 436 | # CONFIG_CFG80211 is not set |
437 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
403 | CONFIG_WIRELESS_EXT=y | 438 | CONFIG_WIRELESS_EXT=y |
439 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
404 | # CONFIG_MAC80211 is not set | 440 | # CONFIG_MAC80211 is not set |
405 | CONFIG_IEEE80211=m | 441 | CONFIG_IEEE80211=m |
406 | # CONFIG_IEEE80211_DEBUG is not set | 442 | # CONFIG_IEEE80211_DEBUG is not set |
407 | CONFIG_IEEE80211_CRYPT_WEP=m | 443 | CONFIG_IEEE80211_CRYPT_WEP=m |
408 | # CONFIG_IEEE80211_CRYPT_CCMP is not set | 444 | # CONFIG_IEEE80211_CRYPT_CCMP is not set |
409 | # CONFIG_IEEE80211_CRYPT_TKIP is not set | 445 | # CONFIG_IEEE80211_CRYPT_TKIP is not set |
410 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
411 | # CONFIG_RFKILL is not set | 446 | # CONFIG_RFKILL is not set |
447 | CONFIG_NET_9P=m | ||
448 | # CONFIG_NET_9P_DEBUG is not set | ||
412 | 449 | ||
413 | # | 450 | # |
414 | # Device Drivers | 451 | # Device Drivers |
@@ -417,14 +454,13 @@ CONFIG_IEEE80211_CRYPT_WEP=m | |||
417 | # | 454 | # |
418 | # Generic Driver Options | 455 | # Generic Driver Options |
419 | # | 456 | # |
457 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
420 | CONFIG_STANDALONE=y | 458 | CONFIG_STANDALONE=y |
421 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 459 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
422 | CONFIG_FW_LOADER=m | 460 | CONFIG_FW_LOADER=m |
461 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
462 | CONFIG_EXTRA_FIRMWARE="" | ||
423 | # CONFIG_SYS_HYPERVISOR is not set | 463 | # CONFIG_SYS_HYPERVISOR is not set |
424 | |||
425 | # | ||
426 | # Connector - unified userspace <-> kernelspace linker | ||
427 | # | ||
428 | # CONFIG_CONNECTOR is not set | 464 | # CONFIG_CONNECTOR is not set |
429 | CONFIG_MTD=m | 465 | CONFIG_MTD=m |
430 | # CONFIG_MTD_DEBUG is not set | 466 | # CONFIG_MTD_DEBUG is not set |
@@ -443,6 +479,7 @@ CONFIG_MTD_BLOCK=m | |||
443 | # CONFIG_INFTL is not set | 479 | # CONFIG_INFTL is not set |
444 | # CONFIG_RFD_FTL is not set | 480 | # CONFIG_RFD_FTL is not set |
445 | # CONFIG_SSFDC is not set | 481 | # CONFIG_SSFDC is not set |
482 | # CONFIG_MTD_OOPS is not set | ||
446 | 483 | ||
447 | # | 484 | # |
448 | # RAM/ROM/Flash chip drivers | 485 | # RAM/ROM/Flash chip drivers |
@@ -482,6 +519,7 @@ CONFIG_MTD_PHYSMAP=m | |||
482 | CONFIG_MTD_PHYSMAP_START=0x1fc00000 | 519 | CONFIG_MTD_PHYSMAP_START=0x1fc00000 |
483 | CONFIG_MTD_PHYSMAP_LEN=0x80000 | 520 | CONFIG_MTD_PHYSMAP_LEN=0x80000 |
484 | CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | 521 | CONFIG_MTD_PHYSMAP_BANKWIDTH=1 |
522 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
485 | # CONFIG_MTD_PLATRAM is not set | 523 | # CONFIG_MTD_PLATRAM is not set |
486 | 524 | ||
487 | # | 525 | # |
@@ -506,21 +544,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
506 | # UBI - Unsorted block images | 544 | # UBI - Unsorted block images |
507 | # | 545 | # |
508 | # CONFIG_MTD_UBI is not set | 546 | # CONFIG_MTD_UBI is not set |
509 | |||
510 | # | ||
511 | # Parallel port support | ||
512 | # | ||
513 | # CONFIG_PARPORT is not set | 547 | # CONFIG_PARPORT is not set |
514 | |||
515 | # | ||
516 | # Plug and Play support | ||
517 | # | ||
518 | # CONFIG_PNP is not set | 548 | # CONFIG_PNP is not set |
519 | # CONFIG_PNPACPI is not set | 549 | CONFIG_BLK_DEV=y |
520 | |||
521 | # | ||
522 | # Block devices | ||
523 | # | ||
524 | # CONFIG_BLK_CPQ_DA is not set | 550 | # CONFIG_BLK_CPQ_DA is not set |
525 | # CONFIG_BLK_CPQ_CISS_DA is not set | 551 | # CONFIG_BLK_CPQ_CISS_DA is not set |
526 | # CONFIG_BLK_DEV_DAC960 is not set | 552 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -534,32 +560,28 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
534 | CONFIG_BLK_DEV_RAM=m | 560 | CONFIG_BLK_DEV_RAM=m |
535 | CONFIG_BLK_DEV_RAM_COUNT=16 | 561 | CONFIG_BLK_DEV_RAM_COUNT=16 |
536 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 562 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
537 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 563 | # CONFIG_BLK_DEV_XIP is not set |
538 | CONFIG_CDROM_PKTCDVD=m | 564 | CONFIG_CDROM_PKTCDVD=m |
539 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 565 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
540 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 566 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
541 | CONFIG_ATA_OVER_ETH=m | 567 | CONFIG_ATA_OVER_ETH=m |
542 | 568 | # CONFIG_BLK_DEV_HD is not set | |
543 | # | 569 | # CONFIG_MISC_DEVICES is not set |
544 | # Misc devices | 570 | CONFIG_HAVE_IDE=y |
545 | # | ||
546 | # CONFIG_PHANTOM is not set | ||
547 | # CONFIG_SGI_IOC4 is not set | ||
548 | # CONFIG_TIFM_CORE is not set | ||
549 | # CONFIG_BLINK is not set | ||
550 | CONFIG_IDE=y | 571 | CONFIG_IDE=y |
551 | CONFIG_IDE_MAX_HWIFS=4 | ||
552 | CONFIG_BLK_DEV_IDE=y | ||
553 | 572 | ||
554 | # | 573 | # |
555 | # Please see Documentation/ide.txt for help/info on IDE drives | 574 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
556 | # | 575 | # |
576 | CONFIG_IDE_TIMINGS=y | ||
577 | CONFIG_IDE_ATAPI=y | ||
557 | # CONFIG_BLK_DEV_IDE_SATA is not set | 578 | # CONFIG_BLK_DEV_IDE_SATA is not set |
558 | CONFIG_BLK_DEV_IDEDISK=y | 579 | CONFIG_IDE_GD=y |
559 | CONFIG_IDEDISK_MULTI_MODE=y | 580 | CONFIG_IDE_GD_ATA=y |
581 | # CONFIG_IDE_GD_ATAPI is not set | ||
560 | CONFIG_BLK_DEV_IDECD=y | 582 | CONFIG_BLK_DEV_IDECD=y |
583 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
561 | # CONFIG_BLK_DEV_IDETAPE is not set | 584 | # CONFIG_BLK_DEV_IDETAPE is not set |
562 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
563 | CONFIG_BLK_DEV_IDESCSI=y | 585 | CONFIG_BLK_DEV_IDESCSI=y |
564 | CONFIG_IDE_TASK_IOCTL=y | 586 | CONFIG_IDE_TASK_IOCTL=y |
565 | CONFIG_IDE_PROC_FS=y | 587 | CONFIG_IDE_PROC_FS=y |
@@ -568,24 +590,25 @@ CONFIG_IDE_PROC_FS=y | |||
568 | # IDE chipset support/bugfixes | 590 | # IDE chipset support/bugfixes |
569 | # | 591 | # |
570 | CONFIG_IDE_GENERIC=y | 592 | CONFIG_IDE_GENERIC=y |
593 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
594 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
595 | |||
596 | # | ||
597 | # PCI IDE chipsets support | ||
598 | # | ||
571 | CONFIG_BLK_DEV_IDEPCI=y | 599 | CONFIG_BLK_DEV_IDEPCI=y |
572 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
573 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 600 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
574 | # CONFIG_BLK_DEV_OFFBOARD is not set | 601 | # CONFIG_BLK_DEV_OFFBOARD is not set |
575 | CONFIG_BLK_DEV_GENERIC=y | 602 | CONFIG_BLK_DEV_GENERIC=y |
576 | # CONFIG_BLK_DEV_OPTI621 is not set | 603 | # CONFIG_BLK_DEV_OPTI621 is not set |
577 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 604 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
578 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
579 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
580 | # CONFIG_BLK_DEV_AEC62XX is not set | 605 | # CONFIG_BLK_DEV_AEC62XX is not set |
581 | # CONFIG_BLK_DEV_ALI15X3 is not set | 606 | # CONFIG_BLK_DEV_ALI15X3 is not set |
582 | # CONFIG_BLK_DEV_AMD74XX is not set | 607 | # CONFIG_BLK_DEV_AMD74XX is not set |
583 | # CONFIG_BLK_DEV_CMD64X is not set | 608 | # CONFIG_BLK_DEV_CMD64X is not set |
584 | # CONFIG_BLK_DEV_TRIFLEX is not set | 609 | # CONFIG_BLK_DEV_TRIFLEX is not set |
585 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
586 | # CONFIG_BLK_DEV_CS5520 is not set | 610 | # CONFIG_BLK_DEV_CS5520 is not set |
587 | # CONFIG_BLK_DEV_CS5530 is not set | 611 | # CONFIG_BLK_DEV_CS5530 is not set |
588 | # CONFIG_BLK_DEV_HPT34X is not set | ||
589 | # CONFIG_BLK_DEV_HPT366 is not set | 612 | # CONFIG_BLK_DEV_HPT366 is not set |
590 | # CONFIG_BLK_DEV_JMICRON is not set | 613 | # CONFIG_BLK_DEV_JMICRON is not set |
591 | # CONFIG_BLK_DEV_SC1200 is not set | 614 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -601,17 +624,28 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
601 | # CONFIG_BLK_DEV_TRM290 is not set | 624 | # CONFIG_BLK_DEV_TRM290 is not set |
602 | CONFIG_BLK_DEV_VIA82CXXX=y | 625 | CONFIG_BLK_DEV_VIA82CXXX=y |
603 | # CONFIG_BLK_DEV_TC86C001 is not set | 626 | # CONFIG_BLK_DEV_TC86C001 is not set |
604 | # CONFIG_IDE_ARM is not set | 627 | |
605 | # CONFIG_IDE_CHIPSETS is not set | 628 | # |
629 | # Other IDE chipsets support | ||
630 | # | ||
631 | |||
632 | # | ||
633 | # Note: most of these also require special kernel boot parameters | ||
634 | # | ||
635 | # CONFIG_BLK_DEV_4DRIVES is not set | ||
636 | # CONFIG_BLK_DEV_ALI14XX is not set | ||
637 | # CONFIG_BLK_DEV_DTC2278 is not set | ||
638 | # CONFIG_BLK_DEV_HT6560B is not set | ||
639 | # CONFIG_BLK_DEV_QD65XX is not set | ||
640 | # CONFIG_BLK_DEV_UMC8672 is not set | ||
606 | CONFIG_BLK_DEV_IDEDMA=y | 641 | CONFIG_BLK_DEV_IDEDMA=y |
607 | # CONFIG_IDEDMA_IVB is not set | ||
608 | # CONFIG_BLK_DEV_HD is not set | ||
609 | 642 | ||
610 | # | 643 | # |
611 | # SCSI device support | 644 | # SCSI device support |
612 | # | 645 | # |
613 | # CONFIG_RAID_ATTRS is not set | 646 | # CONFIG_RAID_ATTRS is not set |
614 | CONFIG_SCSI=y | 647 | CONFIG_SCSI=y |
648 | CONFIG_SCSI_DMA=y | ||
615 | # CONFIG_SCSI_TGT is not set | 649 | # CONFIG_SCSI_TGT is not set |
616 | # CONFIG_SCSI_NETLINK is not set | 650 | # CONFIG_SCSI_NETLINK is not set |
617 | CONFIG_SCSI_PROC_FS=y | 651 | CONFIG_SCSI_PROC_FS=y |
@@ -644,88 +678,30 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
644 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 678 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
645 | # CONFIG_SCSI_SAS_ATTRS is not set | 679 | # CONFIG_SCSI_SAS_ATTRS is not set |
646 | # CONFIG_SCSI_SAS_LIBSAS is not set | 680 | # CONFIG_SCSI_SAS_LIBSAS is not set |
647 | 681 | # CONFIG_SCSI_SRP_ATTRS is not set | |
648 | # | 682 | # CONFIG_SCSI_LOWLEVEL is not set |
649 | # SCSI low-level drivers | 683 | # CONFIG_SCSI_DH is not set |
650 | # | ||
651 | # CONFIG_ISCSI_TCP is not set | ||
652 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
653 | # CONFIG_SCSI_3W_9XXX is not set | ||
654 | # CONFIG_SCSI_ACARD is not set | ||
655 | # CONFIG_SCSI_AACRAID is not set | ||
656 | # CONFIG_SCSI_AIC7XXX is not set | ||
657 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
658 | # CONFIG_SCSI_AIC79XX is not set | ||
659 | # CONFIG_SCSI_AIC94XX is not set | ||
660 | # CONFIG_SCSI_IN2000 is not set | ||
661 | # CONFIG_SCSI_ARCMSR is not set | ||
662 | # CONFIG_MEGARAID_NEWGEN is not set | ||
663 | # CONFIG_MEGARAID_LEGACY is not set | ||
664 | # CONFIG_MEGARAID_SAS is not set | ||
665 | # CONFIG_SCSI_HPTIOP is not set | ||
666 | # CONFIG_SCSI_DMX3191D is not set | ||
667 | # CONFIG_SCSI_DTC3280 is not set | ||
668 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
669 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | ||
670 | # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set | ||
671 | # CONFIG_SCSI_IPS is not set | ||
672 | # CONFIG_SCSI_INITIO is not set | ||
673 | # CONFIG_SCSI_INIA100 is not set | ||
674 | # CONFIG_SCSI_NCR53C406A is not set | ||
675 | # CONFIG_SCSI_STEX is not set | ||
676 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
677 | # CONFIG_SCSI_PAS16 is not set | ||
678 | # CONFIG_SCSI_PSI240I is not set | ||
679 | # CONFIG_SCSI_QLOGIC_FAS is not set | ||
680 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
681 | # CONFIG_SCSI_QLA_FC is not set | ||
682 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
683 | # CONFIG_SCSI_LPFC is not set | ||
684 | # CONFIG_SCSI_SYM53C416 is not set | ||
685 | # CONFIG_SCSI_DC395x is not set | ||
686 | # CONFIG_SCSI_DC390T is not set | ||
687 | # CONFIG_SCSI_T128 is not set | ||
688 | # CONFIG_SCSI_DEBUG is not set | ||
689 | # CONFIG_SCSI_SRP is not set | ||
690 | # CONFIG_ATA is not set | 684 | # CONFIG_ATA is not set |
691 | |||
692 | # | ||
693 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
694 | # | ||
695 | # CONFIG_CD_NO_IDESCSI is not set | ||
696 | |||
697 | # | ||
698 | # Multi-device support (RAID and LVM) | ||
699 | # | ||
700 | # CONFIG_MD is not set | 685 | # CONFIG_MD is not set |
701 | |||
702 | # | ||
703 | # Fusion MPT device support | ||
704 | # | ||
705 | # CONFIG_FUSION is not set | 686 | # CONFIG_FUSION is not set |
706 | # CONFIG_FUSION_SPI is not set | ||
707 | # CONFIG_FUSION_FC is not set | ||
708 | # CONFIG_FUSION_SAS is not set | ||
709 | 687 | ||
710 | # | 688 | # |
711 | # IEEE 1394 (FireWire) support | 689 | # IEEE 1394 (FireWire) support |
712 | # | 690 | # |
713 | # CONFIG_FIREWIRE is not set | ||
714 | # CONFIG_IEEE1394 is not set | ||
715 | 691 | ||
716 | # | 692 | # |
717 | # I2O device support | 693 | # Enable only one of the two stacks, unless you know what you are doing |
718 | # | 694 | # |
695 | # CONFIG_FIREWIRE is not set | ||
696 | # CONFIG_IEEE1394 is not set | ||
719 | # CONFIG_I2O is not set | 697 | # CONFIG_I2O is not set |
720 | |||
721 | # | ||
722 | # Network device support | ||
723 | # | ||
724 | CONFIG_NETDEVICES=y | 698 | CONFIG_NETDEVICES=y |
725 | # CONFIG_DUMMY is not set | 699 | # CONFIG_DUMMY is not set |
726 | # CONFIG_BONDING is not set | 700 | # CONFIG_BONDING is not set |
701 | CONFIG_MACVLAN=m | ||
727 | # CONFIG_EQUALIZER is not set | 702 | # CONFIG_EQUALIZER is not set |
728 | # CONFIG_TUN is not set | 703 | # CONFIG_TUN is not set |
704 | CONFIG_VETH=m | ||
729 | # CONFIG_ARCNET is not set | 705 | # CONFIG_ARCNET is not set |
730 | CONFIG_PHYLIB=m | 706 | CONFIG_PHYLIB=m |
731 | 707 | ||
@@ -740,29 +716,32 @@ CONFIG_CICADA_PHY=m | |||
740 | # CONFIG_VITESSE_PHY is not set | 716 | # CONFIG_VITESSE_PHY is not set |
741 | # CONFIG_SMSC_PHY is not set | 717 | # CONFIG_SMSC_PHY is not set |
742 | # CONFIG_BROADCOM_PHY is not set | 718 | # CONFIG_BROADCOM_PHY is not set |
743 | # CONFIG_FIXED_PHY is not set | 719 | # CONFIG_ICPLUS_PHY is not set |
744 | 720 | # CONFIG_REALTEK_PHY is not set | |
745 | # | 721 | # CONFIG_MDIO_BITBANG is not set |
746 | # Ethernet (10 or 100Mbit) | ||
747 | # | ||
748 | CONFIG_NET_ETHERNET=y | 722 | CONFIG_NET_ETHERNET=y |
749 | CONFIG_MII=y | 723 | CONFIG_MII=y |
724 | # CONFIG_AX88796 is not set | ||
750 | # CONFIG_HAPPYMEAL is not set | 725 | # CONFIG_HAPPYMEAL is not set |
751 | # CONFIG_SUNGEM is not set | 726 | # CONFIG_SUNGEM is not set |
752 | # CONFIG_CASSINI is not set | 727 | # CONFIG_CASSINI is not set |
753 | # CONFIG_NET_VENDOR_3COM is not set | 728 | # CONFIG_NET_VENDOR_3COM is not set |
754 | # CONFIG_NET_VENDOR_SMC is not set | 729 | # CONFIG_NET_VENDOR_SMC is not set |
730 | # CONFIG_SMC91X is not set | ||
755 | # CONFIG_DM9000 is not set | 731 | # CONFIG_DM9000 is not set |
756 | # CONFIG_NET_VENDOR_RACAL is not set | 732 | # CONFIG_NET_VENDOR_RACAL is not set |
757 | |||
758 | # | ||
759 | # Tulip family network device support | ||
760 | # | ||
761 | # CONFIG_NET_TULIP is not set | 733 | # CONFIG_NET_TULIP is not set |
762 | # CONFIG_AT1700 is not set | 734 | # CONFIG_AT1700 is not set |
763 | # CONFIG_DEPCA is not set | 735 | # CONFIG_DEPCA is not set |
764 | # CONFIG_HP100 is not set | 736 | # CONFIG_HP100 is not set |
765 | # CONFIG_NET_ISA is not set | 737 | # CONFIG_NET_ISA is not set |
738 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
739 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
740 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
741 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
742 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
743 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
744 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
766 | CONFIG_NET_PCI=y | 745 | CONFIG_NET_PCI=y |
767 | # CONFIG_PCNET32 is not set | 746 | # CONFIG_PCNET32 is not set |
768 | # CONFIG_AMD8111_ETH is not set | 747 | # CONFIG_AMD8111_ETH is not set |
@@ -773,7 +752,6 @@ CONFIG_NET_PCI=y | |||
773 | # CONFIG_FORCEDETH is not set | 752 | # CONFIG_FORCEDETH is not set |
774 | # CONFIG_CS89x0 is not set | 753 | # CONFIG_CS89x0 is not set |
775 | # CONFIG_TC35815 is not set | 754 | # CONFIG_TC35815 is not set |
776 | # CONFIG_DGRS is not set | ||
777 | # CONFIG_EEPRO100 is not set | 755 | # CONFIG_EEPRO100 is not set |
778 | # CONFIG_E100 is not set | 756 | # CONFIG_E100 is not set |
779 | # CONFIG_FEALNX is not set | 757 | # CONFIG_FEALNX is not set |
@@ -785,15 +763,21 @@ CONFIG_8139TOO=y | |||
785 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 763 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
786 | # CONFIG_8139TOO_8129 is not set | 764 | # CONFIG_8139TOO_8129 is not set |
787 | # CONFIG_8139_OLD_RX_RESET is not set | 765 | # CONFIG_8139_OLD_RX_RESET is not set |
766 | # CONFIG_R6040 is not set | ||
788 | # CONFIG_SIS900 is not set | 767 | # CONFIG_SIS900 is not set |
789 | # CONFIG_EPIC100 is not set | 768 | # CONFIG_EPIC100 is not set |
790 | # CONFIG_SUNDANCE is not set | 769 | # CONFIG_SUNDANCE is not set |
770 | # CONFIG_TLAN is not set | ||
791 | # CONFIG_VIA_RHINE is not set | 771 | # CONFIG_VIA_RHINE is not set |
792 | # CONFIG_SC92031 is not set | 772 | # CONFIG_SC92031 is not set |
773 | # CONFIG_ATL2 is not set | ||
793 | CONFIG_NETDEV_1000=y | 774 | CONFIG_NETDEV_1000=y |
794 | # CONFIG_ACENIC is not set | 775 | # CONFIG_ACENIC is not set |
795 | # CONFIG_DL2K is not set | 776 | # CONFIG_DL2K is not set |
796 | # CONFIG_E1000 is not set | 777 | # CONFIG_E1000 is not set |
778 | # CONFIG_E1000E is not set | ||
779 | # CONFIG_IP1000 is not set | ||
780 | # CONFIG_IGB is not set | ||
797 | # CONFIG_NS83820 is not set | 781 | # CONFIG_NS83820 is not set |
798 | # CONFIG_HAMACHI is not set | 782 | # CONFIG_HAMACHI is not set |
799 | # CONFIG_YELLOWFIN is not set | 783 | # CONFIG_YELLOWFIN is not set |
@@ -801,20 +785,29 @@ CONFIG_NETDEV_1000=y | |||
801 | # CONFIG_SIS190 is not set | 785 | # CONFIG_SIS190 is not set |
802 | # CONFIG_SKGE is not set | 786 | # CONFIG_SKGE is not set |
803 | # CONFIG_SKY2 is not set | 787 | # CONFIG_SKY2 is not set |
804 | # CONFIG_SK98LIN is not set | ||
805 | # CONFIG_VIA_VELOCITY is not set | 788 | # CONFIG_VIA_VELOCITY is not set |
806 | # CONFIG_TIGON3 is not set | 789 | # CONFIG_TIGON3 is not set |
807 | # CONFIG_BNX2 is not set | 790 | # CONFIG_BNX2 is not set |
808 | # CONFIG_QLA3XXX is not set | 791 | # CONFIG_QLA3XXX is not set |
809 | # CONFIG_ATL1 is not set | 792 | # CONFIG_ATL1 is not set |
793 | # CONFIG_ATL1E is not set | ||
794 | # CONFIG_JME is not set | ||
810 | CONFIG_NETDEV_10000=y | 795 | CONFIG_NETDEV_10000=y |
811 | # CONFIG_CHELSIO_T1 is not set | 796 | # CONFIG_CHELSIO_T1 is not set |
812 | # CONFIG_CHELSIO_T3 is not set | 797 | # CONFIG_CHELSIO_T3 is not set |
798 | # CONFIG_ENIC is not set | ||
799 | # CONFIG_IXGBE is not set | ||
813 | # CONFIG_IXGB is not set | 800 | # CONFIG_IXGB is not set |
814 | # CONFIG_S2IO is not set | 801 | # CONFIG_S2IO is not set |
815 | # CONFIG_MYRI10GE is not set | 802 | # CONFIG_MYRI10GE is not set |
816 | # CONFIG_NETXEN_NIC is not set | 803 | # CONFIG_NETXEN_NIC is not set |
804 | # CONFIG_NIU is not set | ||
805 | # CONFIG_MLX4_EN is not set | ||
817 | # CONFIG_MLX4_CORE is not set | 806 | # CONFIG_MLX4_CORE is not set |
807 | # CONFIG_TEHUTI is not set | ||
808 | # CONFIG_BNX2X is not set | ||
809 | # CONFIG_QLGE is not set | ||
810 | # CONFIG_SFC is not set | ||
818 | # CONFIG_TR is not set | 811 | # CONFIG_TR is not set |
819 | 812 | ||
820 | # | 813 | # |
@@ -822,6 +815,7 @@ CONFIG_NETDEV_10000=y | |||
822 | # | 815 | # |
823 | # CONFIG_WLAN_PRE80211 is not set | 816 | # CONFIG_WLAN_PRE80211 is not set |
824 | # CONFIG_WLAN_80211 is not set | 817 | # CONFIG_WLAN_80211 is not set |
818 | # CONFIG_IWLWIFI_LEDS is not set | ||
825 | 819 | ||
826 | # | 820 | # |
827 | # USB Network Adapters | 821 | # USB Network Adapters |
@@ -830,7 +824,6 @@ CONFIG_NETDEV_10000=y | |||
830 | # CONFIG_USB_KAWETH is not set | 824 | # CONFIG_USB_KAWETH is not set |
831 | # CONFIG_USB_PEGASUS is not set | 825 | # CONFIG_USB_PEGASUS is not set |
832 | # CONFIG_USB_RTL8150 is not set | 826 | # CONFIG_USB_RTL8150 is not set |
833 | # CONFIG_USB_USBNET_MII is not set | ||
834 | # CONFIG_USB_USBNET is not set | 827 | # CONFIG_USB_USBNET is not set |
835 | # CONFIG_WAN is not set | 828 | # CONFIG_WAN is not set |
836 | # CONFIG_FDDI is not set | 829 | # CONFIG_FDDI is not set |
@@ -844,25 +837,17 @@ CONFIG_PPP_DEFLATE=m | |||
844 | CONFIG_PPP_BSDCOMP=m | 837 | CONFIG_PPP_BSDCOMP=m |
845 | CONFIG_PPP_MPPE=m | 838 | CONFIG_PPP_MPPE=m |
846 | CONFIG_PPPOE=m | 839 | CONFIG_PPPOE=m |
840 | CONFIG_PPPOL2TP=m | ||
847 | CONFIG_SLIP=m | 841 | CONFIG_SLIP=m |
848 | CONFIG_SLIP_COMPRESSED=y | 842 | CONFIG_SLIP_COMPRESSED=y |
849 | CONFIG_SLHC=m | 843 | CONFIG_SLHC=m |
850 | CONFIG_SLIP_SMART=y | 844 | CONFIG_SLIP_SMART=y |
851 | CONFIG_SLIP_MODE_SLIP6=y | 845 | CONFIG_SLIP_MODE_SLIP6=y |
852 | CONFIG_NET_FC=y | 846 | CONFIG_NET_FC=y |
853 | # CONFIG_SHAPER is not set | ||
854 | # CONFIG_NETCONSOLE is not set | 847 | # CONFIG_NETCONSOLE is not set |
855 | # CONFIG_NETPOLL is not set | 848 | # CONFIG_NETPOLL is not set |
856 | # CONFIG_NET_POLL_CONTROLLER is not set | 849 | # CONFIG_NET_POLL_CONTROLLER is not set |
857 | |||
858 | # | ||
859 | # ISDN subsystem | ||
860 | # | ||
861 | # CONFIG_ISDN is not set | 850 | # CONFIG_ISDN is not set |
862 | |||
863 | # | ||
864 | # Telephony Support | ||
865 | # | ||
866 | # CONFIG_PHONE is not set | 851 | # CONFIG_PHONE is not set |
867 | 852 | ||
868 | # | 853 | # |
@@ -870,6 +855,7 @@ CONFIG_NET_FC=y | |||
870 | # | 855 | # |
871 | CONFIG_INPUT=y | 856 | CONFIG_INPUT=y |
872 | CONFIG_INPUT_FF_MEMLESS=y | 857 | CONFIG_INPUT_FF_MEMLESS=y |
858 | # CONFIG_INPUT_POLLDEV is not set | ||
873 | 859 | ||
874 | # | 860 | # |
875 | # Userland interfaces | 861 | # Userland interfaces |
@@ -879,7 +865,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
879 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 865 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
880 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 866 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
881 | # CONFIG_INPUT_JOYDEV is not set | 867 | # CONFIG_INPUT_JOYDEV is not set |
882 | # CONFIG_INPUT_TSDEV is not set | ||
883 | # CONFIG_INPUT_EVDEV is not set | 868 | # CONFIG_INPUT_EVDEV is not set |
884 | # CONFIG_INPUT_EVBUG is not set | 869 | # CONFIG_INPUT_EVBUG is not set |
885 | 870 | ||
@@ -900,9 +885,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
900 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 885 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
901 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 886 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
902 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 887 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
888 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
903 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 889 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
904 | CONFIG_MOUSE_SERIAL=y | 890 | CONFIG_MOUSE_SERIAL=y |
905 | # CONFIG_MOUSE_APPLETOUCH is not set | 891 | # CONFIG_MOUSE_APPLETOUCH is not set |
892 | # CONFIG_MOUSE_BCM5974 is not set | ||
906 | # CONFIG_MOUSE_INPORT is not set | 893 | # CONFIG_MOUSE_INPORT is not set |
907 | # CONFIG_MOUSE_LOGIBM is not set | 894 | # CONFIG_MOUSE_LOGIBM is not set |
908 | # CONFIG_MOUSE_PC110PAD is not set | 895 | # CONFIG_MOUSE_PC110PAD is not set |
@@ -927,10 +914,13 @@ CONFIG_SERIO_LIBPS2=y | |||
927 | # Character devices | 914 | # Character devices |
928 | # | 915 | # |
929 | CONFIG_VT=y | 916 | CONFIG_VT=y |
917 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
930 | CONFIG_VT_CONSOLE=y | 918 | CONFIG_VT_CONSOLE=y |
931 | CONFIG_HW_CONSOLE=y | 919 | CONFIG_HW_CONSOLE=y |
932 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 920 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
921 | CONFIG_DEVKMEM=y | ||
933 | # CONFIG_SERIAL_NONSTANDARD is not set | 922 | # CONFIG_SERIAL_NONSTANDARD is not set |
923 | # CONFIG_NOZOMI is not set | ||
934 | 924 | ||
935 | # | 925 | # |
936 | # Serial drivers | 926 | # Serial drivers |
@@ -951,105 +941,152 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
951 | CONFIG_UNIX98_PTYS=y | 941 | CONFIG_UNIX98_PTYS=y |
952 | CONFIG_LEGACY_PTYS=y | 942 | CONFIG_LEGACY_PTYS=y |
953 | CONFIG_LEGACY_PTY_COUNT=256 | 943 | CONFIG_LEGACY_PTY_COUNT=256 |
954 | |||
955 | # | ||
956 | # IPMI | ||
957 | # | ||
958 | # CONFIG_IPMI_HANDLER is not set | 944 | # CONFIG_IPMI_HANDLER is not set |
959 | # CONFIG_WATCHDOG is not set | ||
960 | CONFIG_HW_RANDOM=y | 945 | CONFIG_HW_RANDOM=y |
961 | CONFIG_RTC=y | ||
962 | # CONFIG_DTLK is not set | 946 | # CONFIG_DTLK is not set |
963 | # CONFIG_R3964 is not set | 947 | # CONFIG_R3964 is not set |
964 | # CONFIG_APPLICOM is not set | 948 | # CONFIG_APPLICOM is not set |
965 | # CONFIG_DRM is not set | ||
966 | # CONFIG_RAW_DRIVER is not set | 949 | # CONFIG_RAW_DRIVER is not set |
967 | |||
968 | # | ||
969 | # TPM devices | ||
970 | # | ||
971 | # CONFIG_TCG_TPM is not set | 950 | # CONFIG_TCG_TPM is not set |
972 | CONFIG_DEVPORT=y | 951 | CONFIG_DEVPORT=y |
973 | CONFIG_I2C=m | 952 | CONFIG_I2C=m |
974 | CONFIG_I2C_BOARDINFO=y | 953 | CONFIG_I2C_BOARDINFO=y |
975 | CONFIG_I2C_CHARDEV=m | 954 | CONFIG_I2C_CHARDEV=m |
955 | CONFIG_I2C_HELPER_AUTO=y | ||
976 | 956 | ||
977 | # | 957 | # |
978 | # I2C Algorithms | 958 | # I2C Hardware Bus support |
979 | # | 959 | # |
980 | # CONFIG_I2C_ALGOBIT is not set | ||
981 | # CONFIG_I2C_ALGOPCF is not set | ||
982 | # CONFIG_I2C_ALGOPCA is not set | ||
983 | 960 | ||
984 | # | 961 | # |
985 | # I2C Hardware Bus support | 962 | # PC SMBus host controller drivers |
986 | # | 963 | # |
987 | # CONFIG_I2C_ALI1535 is not set | 964 | # CONFIG_I2C_ALI1535 is not set |
988 | # CONFIG_I2C_ALI1563 is not set | 965 | # CONFIG_I2C_ALI1563 is not set |
989 | # CONFIG_I2C_ALI15X3 is not set | 966 | # CONFIG_I2C_ALI15X3 is not set |
990 | # CONFIG_I2C_AMD756 is not set | 967 | # CONFIG_I2C_AMD756 is not set |
991 | # CONFIG_I2C_AMD8111 is not set | 968 | # CONFIG_I2C_AMD8111 is not set |
992 | # CONFIG_I2C_ELEKTOR is not set | ||
993 | # CONFIG_I2C_I801 is not set | 969 | # CONFIG_I2C_I801 is not set |
994 | # CONFIG_I2C_I810 is not set | 970 | # CONFIG_I2C_ISCH is not set |
995 | # CONFIG_I2C_PIIX4 is not set | 971 | # CONFIG_I2C_PIIX4 is not set |
996 | # CONFIG_I2C_NFORCE2 is not set | 972 | # CONFIG_I2C_NFORCE2 is not set |
997 | # CONFIG_I2C_OCORES is not set | ||
998 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
999 | # CONFIG_I2C_PROSAVAGE is not set | ||
1000 | # CONFIG_I2C_SAVAGE4 is not set | ||
1001 | # CONFIG_I2C_SIMTEC is not set | ||
1002 | # CONFIG_I2C_SIS5595 is not set | 973 | # CONFIG_I2C_SIS5595 is not set |
1003 | # CONFIG_I2C_SIS630 is not set | 974 | # CONFIG_I2C_SIS630 is not set |
1004 | # CONFIG_I2C_SIS96X is not set | 975 | # CONFIG_I2C_SIS96X is not set |
1005 | # CONFIG_I2C_STUB is not set | ||
1006 | # CONFIG_I2C_TINY_USB is not set | ||
1007 | # CONFIG_I2C_VIA is not set | 976 | # CONFIG_I2C_VIA is not set |
1008 | CONFIG_I2C_VIAPRO=m | 977 | CONFIG_I2C_VIAPRO=m |
978 | |||
979 | # | ||
980 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
981 | # | ||
982 | # CONFIG_I2C_OCORES is not set | ||
983 | # CONFIG_I2C_SIMTEC is not set | ||
984 | |||
985 | # | ||
986 | # External I2C/SMBus adapter drivers | ||
987 | # | ||
988 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
989 | # CONFIG_I2C_TAOS_EVM is not set | ||
990 | # CONFIG_I2C_TINY_USB is not set | ||
991 | |||
992 | # | ||
993 | # Graphics adapter I2C/DDC channel drivers | ||
994 | # | ||
1009 | # CONFIG_I2C_VOODOO3 is not set | 995 | # CONFIG_I2C_VOODOO3 is not set |
996 | |||
997 | # | ||
998 | # Other I2C/SMBus bus drivers | ||
999 | # | ||
1000 | # CONFIG_I2C_ELEKTOR is not set | ||
1010 | # CONFIG_I2C_PCA_ISA is not set | 1001 | # CONFIG_I2C_PCA_ISA is not set |
1002 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1003 | # CONFIG_I2C_STUB is not set | ||
1011 | 1004 | ||
1012 | # | 1005 | # |
1013 | # Miscellaneous I2C Chip support | 1006 | # Miscellaneous I2C Chip support |
1014 | # | 1007 | # |
1015 | # CONFIG_SENSORS_DS1337 is not set | 1008 | # CONFIG_DS1682 is not set |
1016 | # CONFIG_SENSORS_DS1374 is not set | 1009 | # CONFIG_AT24 is not set |
1017 | # CONFIG_SENSORS_EEPROM is not set | 1010 | # CONFIG_SENSORS_EEPROM is not set |
1018 | # CONFIG_SENSORS_PCF8574 is not set | 1011 | # CONFIG_SENSORS_PCF8574 is not set |
1012 | # CONFIG_PCF8575 is not set | ||
1019 | # CONFIG_SENSORS_PCA9539 is not set | 1013 | # CONFIG_SENSORS_PCA9539 is not set |
1020 | # CONFIG_SENSORS_PCF8591 is not set | 1014 | # CONFIG_SENSORS_PCF8591 is not set |
1021 | # CONFIG_SENSORS_MAX6875 is not set | 1015 | # CONFIG_SENSORS_MAX6875 is not set |
1016 | # CONFIG_SENSORS_TSL2550 is not set | ||
1022 | # CONFIG_I2C_DEBUG_CORE is not set | 1017 | # CONFIG_I2C_DEBUG_CORE is not set |
1023 | # CONFIG_I2C_DEBUG_ALGO is not set | 1018 | # CONFIG_I2C_DEBUG_ALGO is not set |
1024 | # CONFIG_I2C_DEBUG_BUS is not set | 1019 | # CONFIG_I2C_DEBUG_BUS is not set |
1025 | # CONFIG_I2C_DEBUG_CHIP is not set | 1020 | # CONFIG_I2C_DEBUG_CHIP is not set |
1026 | |||
1027 | # | ||
1028 | # SPI support | ||
1029 | # | ||
1030 | # CONFIG_SPI is not set | 1021 | # CONFIG_SPI is not set |
1031 | # CONFIG_SPI_MASTER is not set | 1022 | # CONFIG_W1 is not set |
1023 | # CONFIG_POWER_SUPPLY is not set | ||
1024 | # CONFIG_HWMON is not set | ||
1025 | # CONFIG_THERMAL is not set | ||
1026 | # CONFIG_THERMAL_HWMON is not set | ||
1027 | # CONFIG_WATCHDOG is not set | ||
1028 | CONFIG_SSB_POSSIBLE=y | ||
1032 | 1029 | ||
1033 | # | 1030 | # |
1034 | # Dallas's 1-wire bus | 1031 | # Sonics Silicon Backplane |
1035 | # | 1032 | # |
1036 | # CONFIG_W1 is not set | 1033 | # CONFIG_SSB is not set |
1037 | # CONFIG_HWMON is not set | ||
1038 | 1034 | ||
1039 | # | 1035 | # |
1040 | # Multifunction device drivers | 1036 | # Multifunction device drivers |
1041 | # | 1037 | # |
1038 | # CONFIG_MFD_CORE is not set | ||
1042 | # CONFIG_MFD_SM501 is not set | 1039 | # CONFIG_MFD_SM501 is not set |
1040 | # CONFIG_HTC_PASIC3 is not set | ||
1041 | # CONFIG_MFD_TMIO is not set | ||
1042 | # CONFIG_MFD_WM8400 is not set | ||
1043 | # CONFIG_MFD_WM8350_I2C is not set | ||
1044 | # CONFIG_REGULATOR is not set | ||
1043 | 1045 | ||
1044 | # | 1046 | # |
1045 | # Multimedia devices | 1047 | # Multimedia devices |
1046 | # | 1048 | # |
1049 | |||
1050 | # | ||
1051 | # Multimedia core support | ||
1052 | # | ||
1047 | CONFIG_VIDEO_DEV=m | 1053 | CONFIG_VIDEO_DEV=m |
1048 | CONFIG_VIDEO_V4L1=y | 1054 | CONFIG_VIDEO_V4L2_COMMON=m |
1055 | CONFIG_VIDEO_ALLOW_V4L1=y | ||
1049 | CONFIG_VIDEO_V4L1_COMPAT=y | 1056 | CONFIG_VIDEO_V4L1_COMPAT=y |
1050 | CONFIG_VIDEO_V4L2=y | 1057 | # CONFIG_DVB_CORE is not set |
1058 | CONFIG_VIDEO_MEDIA=m | ||
1059 | |||
1060 | # | ||
1061 | # Multimedia drivers | ||
1062 | # | ||
1063 | CONFIG_MEDIA_ATTACH=y | ||
1064 | CONFIG_MEDIA_TUNER=m | ||
1065 | CONFIG_MEDIA_TUNER_CUSTOMIZE=y | ||
1066 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
1067 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
1068 | CONFIG_MEDIA_TUNER_TDA827X=m | ||
1069 | CONFIG_MEDIA_TUNER_TDA18271=m | ||
1070 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
1071 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
1072 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
1073 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
1074 | CONFIG_MEDIA_TUNER_MT2060=m | ||
1075 | CONFIG_MEDIA_TUNER_MT2266=m | ||
1076 | CONFIG_MEDIA_TUNER_MT2131=m | ||
1077 | CONFIG_MEDIA_TUNER_QT1010=m | ||
1078 | CONFIG_MEDIA_TUNER_XC2028=m | ||
1079 | CONFIG_MEDIA_TUNER_XC5000=m | ||
1080 | CONFIG_MEDIA_TUNER_MXL5005S=m | ||
1081 | CONFIG_MEDIA_TUNER_MXL5007T=m | ||
1082 | CONFIG_VIDEO_V4L2=m | ||
1083 | CONFIG_VIDEO_V4L1=m | ||
1084 | CONFIG_VIDEOBUF_GEN=m | ||
1085 | CONFIG_VIDEOBUF_VMALLOC=m | ||
1086 | CONFIG_VIDEOBUF_DMA_CONTIG=m | ||
1051 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | 1087 | CONFIG_VIDEO_CAPTURE_DRIVERS=y |
1052 | # CONFIG_VIDEO_ADV_DEBUG is not set | 1088 | # CONFIG_VIDEO_ADV_DEBUG is not set |
1089 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
1053 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 1090 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
1054 | # CONFIG_VIDEO_VIVI is not set | 1091 | # CONFIG_VIDEO_VIVI is not set |
1055 | # CONFIG_VIDEO_BT848 is not set | 1092 | # CONFIG_VIDEO_BT848 is not set |
@@ -1058,17 +1095,46 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | |||
1058 | # CONFIG_VIDEO_CPIA2 is not set | 1095 | # CONFIG_VIDEO_CPIA2 is not set |
1059 | # CONFIG_VIDEO_SAA5246A is not set | 1096 | # CONFIG_VIDEO_SAA5246A is not set |
1060 | # CONFIG_VIDEO_SAA5249 is not set | 1097 | # CONFIG_VIDEO_SAA5249 is not set |
1061 | # CONFIG_TUNER_3036 is not set | ||
1062 | # CONFIG_VIDEO_STRADIS is not set | 1098 | # CONFIG_VIDEO_STRADIS is not set |
1063 | # CONFIG_VIDEO_SAA7134 is not set | 1099 | # CONFIG_VIDEO_SAA7134 is not set |
1064 | # CONFIG_VIDEO_MXB is not set | 1100 | # CONFIG_VIDEO_MXB is not set |
1065 | # CONFIG_VIDEO_DPC is not set | ||
1066 | # CONFIG_VIDEO_HEXIUM_ORION is not set | 1101 | # CONFIG_VIDEO_HEXIUM_ORION is not set |
1067 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set | 1102 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set |
1068 | # CONFIG_VIDEO_CX88 is not set | 1103 | # CONFIG_VIDEO_CX88 is not set |
1069 | # CONFIG_VIDEO_IVTV is not set | 1104 | # CONFIG_VIDEO_IVTV is not set |
1070 | # CONFIG_VIDEO_CAFE_CCIC is not set | 1105 | # CONFIG_VIDEO_CAFE_CCIC is not set |
1106 | CONFIG_SOC_CAMERA=m | ||
1107 | CONFIG_SOC_CAMERA_MT9M001=m | ||
1108 | CONFIG_SOC_CAMERA_MT9M111=m | ||
1109 | CONFIG_SOC_CAMERA_MT9V022=m | ||
1110 | CONFIG_SOC_CAMERA_PLATFORM=m | ||
1111 | CONFIG_VIDEO_SH_MOBILE_CEU=m | ||
1071 | CONFIG_V4L_USB_DRIVERS=y | 1112 | CONFIG_V4L_USB_DRIVERS=y |
1113 | CONFIG_USB_VIDEO_CLASS=m | ||
1114 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | ||
1115 | CONFIG_USB_GSPCA=m | ||
1116 | CONFIG_USB_M5602=m | ||
1117 | CONFIG_USB_GSPCA_CONEX=m | ||
1118 | CONFIG_USB_GSPCA_ETOMS=m | ||
1119 | CONFIG_USB_GSPCA_FINEPIX=m | ||
1120 | CONFIG_USB_GSPCA_MARS=m | ||
1121 | CONFIG_USB_GSPCA_OV519=m | ||
1122 | CONFIG_USB_GSPCA_PAC207=m | ||
1123 | CONFIG_USB_GSPCA_PAC7311=m | ||
1124 | CONFIG_USB_GSPCA_SONIXB=m | ||
1125 | CONFIG_USB_GSPCA_SONIXJ=m | ||
1126 | CONFIG_USB_GSPCA_SPCA500=m | ||
1127 | CONFIG_USB_GSPCA_SPCA501=m | ||
1128 | CONFIG_USB_GSPCA_SPCA505=m | ||
1129 | CONFIG_USB_GSPCA_SPCA506=m | ||
1130 | CONFIG_USB_GSPCA_SPCA508=m | ||
1131 | CONFIG_USB_GSPCA_SPCA561=m | ||
1132 | CONFIG_USB_GSPCA_STK014=m | ||
1133 | CONFIG_USB_GSPCA_SUNPLUS=m | ||
1134 | CONFIG_USB_GSPCA_T613=m | ||
1135 | CONFIG_USB_GSPCA_TV8532=m | ||
1136 | CONFIG_USB_GSPCA_VC032X=m | ||
1137 | CONFIG_USB_GSPCA_ZC3XX=m | ||
1072 | # CONFIG_VIDEO_PVRUSB2 is not set | 1138 | # CONFIG_VIDEO_PVRUSB2 is not set |
1073 | # CONFIG_VIDEO_EM28XX is not set | 1139 | # CONFIG_VIDEO_EM28XX is not set |
1074 | # CONFIG_VIDEO_USBVISION is not set | 1140 | # CONFIG_VIDEO_USBVISION is not set |
@@ -1079,7 +1145,6 @@ CONFIG_USB_KONICAWC=m | |||
1079 | CONFIG_USB_QUICKCAM_MESSENGER=m | 1145 | CONFIG_USB_QUICKCAM_MESSENGER=m |
1080 | CONFIG_USB_ET61X251=m | 1146 | CONFIG_USB_ET61X251=m |
1081 | # CONFIG_VIDEO_OVCAMCHIP is not set | 1147 | # CONFIG_VIDEO_OVCAMCHIP is not set |
1082 | # CONFIG_USB_W9968CF is not set | ||
1083 | CONFIG_USB_OV511=m | 1148 | CONFIG_USB_OV511=m |
1084 | CONFIG_USB_SE401=m | 1149 | CONFIG_USB_SE401=m |
1085 | CONFIG_USB_SN9C102=m | 1150 | CONFIG_USB_SN9C102=m |
@@ -1088,6 +1153,8 @@ CONFIG_USB_ZC0301=m | |||
1088 | CONFIG_USB_PWC=m | 1153 | CONFIG_USB_PWC=m |
1089 | # CONFIG_USB_PWC_DEBUG is not set | 1154 | # CONFIG_USB_PWC_DEBUG is not set |
1090 | # CONFIG_USB_ZR364XX is not set | 1155 | # CONFIG_USB_ZR364XX is not set |
1156 | CONFIG_USB_STKWEBCAM=m | ||
1157 | CONFIG_USB_S2255=m | ||
1091 | CONFIG_RADIO_ADAPTERS=y | 1158 | CONFIG_RADIO_ADAPTERS=y |
1092 | # CONFIG_RADIO_CADET is not set | 1159 | # CONFIG_RADIO_CADET is not set |
1093 | # CONFIG_RADIO_RTRACK is not set | 1160 | # CONFIG_RADIO_RTRACK is not set |
@@ -1104,33 +1171,30 @@ CONFIG_RADIO_ADAPTERS=y | |||
1104 | # CONFIG_RADIO_TYPHOON is not set | 1171 | # CONFIG_RADIO_TYPHOON is not set |
1105 | # CONFIG_RADIO_ZOLTRIX is not set | 1172 | # CONFIG_RADIO_ZOLTRIX is not set |
1106 | # CONFIG_USB_DSBR is not set | 1173 | # CONFIG_USB_DSBR is not set |
1107 | # CONFIG_DVB_CORE is not set | 1174 | CONFIG_USB_SI470X=m |
1175 | CONFIG_USB_MR800=m | ||
1108 | CONFIG_DAB=y | 1176 | CONFIG_DAB=y |
1109 | # CONFIG_USB_DABUSB is not set | 1177 | # CONFIG_USB_DABUSB is not set |
1110 | 1178 | ||
1111 | # | 1179 | # |
1112 | # Graphics support | 1180 | # Graphics support |
1113 | # | 1181 | # |
1114 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1182 | # CONFIG_DRM is not set |
1115 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
1116 | CONFIG_LCD_CLASS_DEVICE=m | ||
1117 | |||
1118 | # | ||
1119 | # Display device support | ||
1120 | # | ||
1121 | # CONFIG_DISPLAY_SUPPORT is not set | ||
1122 | # CONFIG_VGASTATE is not set | 1183 | # CONFIG_VGASTATE is not set |
1184 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
1123 | CONFIG_FB=y | 1185 | CONFIG_FB=y |
1124 | # CONFIG_FIRMWARE_EDID is not set | 1186 | # CONFIG_FIRMWARE_EDID is not set |
1125 | # CONFIG_FB_DDC is not set | 1187 | # CONFIG_FB_DDC is not set |
1188 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
1126 | CONFIG_FB_CFB_FILLRECT=y | 1189 | CONFIG_FB_CFB_FILLRECT=y |
1127 | CONFIG_FB_CFB_COPYAREA=y | 1190 | CONFIG_FB_CFB_COPYAREA=y |
1128 | CONFIG_FB_CFB_IMAGEBLIT=y | 1191 | CONFIG_FB_CFB_IMAGEBLIT=y |
1192 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
1129 | # CONFIG_FB_SYS_FILLRECT is not set | 1193 | # CONFIG_FB_SYS_FILLRECT is not set |
1130 | # CONFIG_FB_SYS_COPYAREA is not set | 1194 | # CONFIG_FB_SYS_COPYAREA is not set |
1131 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1195 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1196 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1132 | # CONFIG_FB_SYS_FOPS is not set | 1197 | # CONFIG_FB_SYS_FOPS is not set |
1133 | CONFIG_FB_DEFERRED_IO=y | ||
1134 | # CONFIG_FB_SVGALIB is not set | 1198 | # CONFIG_FB_SVGALIB is not set |
1135 | # CONFIG_FB_MACMODES is not set | 1199 | # CONFIG_FB_MACMODES is not set |
1136 | CONFIG_FB_BACKLIGHT=y | 1200 | CONFIG_FB_BACKLIGHT=y |
@@ -1158,16 +1222,30 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
1158 | # CONFIG_FB_S3 is not set | 1222 | # CONFIG_FB_S3 is not set |
1159 | # CONFIG_FB_SAVAGE is not set | 1223 | # CONFIG_FB_SAVAGE is not set |
1160 | # CONFIG_FB_SIS is not set | 1224 | # CONFIG_FB_SIS is not set |
1225 | # CONFIG_FB_VIA is not set | ||
1161 | # CONFIG_FB_NEOMAGIC is not set | 1226 | # CONFIG_FB_NEOMAGIC is not set |
1162 | # CONFIG_FB_KYRO is not set | 1227 | # CONFIG_FB_KYRO is not set |
1163 | # CONFIG_FB_3DFX is not set | 1228 | # CONFIG_FB_3DFX is not set |
1164 | # CONFIG_FB_VOODOO1 is not set | 1229 | # CONFIG_FB_VOODOO1 is not set |
1165 | # CONFIG_FB_SMIVGX is not set | ||
1166 | # CONFIG_FB_VT8623 is not set | 1230 | # CONFIG_FB_VT8623 is not set |
1167 | # CONFIG_FB_TRIDENT is not set | 1231 | # CONFIG_FB_TRIDENT is not set |
1168 | # CONFIG_FB_ARK is not set | 1232 | # CONFIG_FB_ARK is not set |
1169 | # CONFIG_FB_PM3 is not set | 1233 | # CONFIG_FB_PM3 is not set |
1234 | # CONFIG_FB_CARMINE is not set | ||
1170 | # CONFIG_FB_VIRTUAL is not set | 1235 | # CONFIG_FB_VIRTUAL is not set |
1236 | # CONFIG_FB_METRONOME is not set | ||
1237 | # CONFIG_FB_MB862XX is not set | ||
1238 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
1239 | CONFIG_LCD_CLASS_DEVICE=m | ||
1240 | # CONFIG_LCD_ILI9320 is not set | ||
1241 | # CONFIG_LCD_PLATFORM is not set | ||
1242 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
1243 | # CONFIG_BACKLIGHT_CORGI is not set | ||
1244 | |||
1245 | # | ||
1246 | # Display device support | ||
1247 | # | ||
1248 | # CONFIG_DISPLAY_SUPPORT is not set | ||
1171 | 1249 | ||
1172 | # | 1250 | # |
1173 | # Console display driver support | 1251 | # Console display driver support |
@@ -1176,20 +1254,14 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
1176 | # CONFIG_MDA_CONSOLE is not set | 1254 | # CONFIG_MDA_CONSOLE is not set |
1177 | CONFIG_DUMMY_CONSOLE=y | 1255 | CONFIG_DUMMY_CONSOLE=y |
1178 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1256 | CONFIG_FRAMEBUFFER_CONSOLE=y |
1257 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
1179 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1258 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
1180 | # CONFIG_FONTS is not set | 1259 | # CONFIG_FONTS is not set |
1181 | CONFIG_FONT_8x8=y | 1260 | CONFIG_FONT_8x8=y |
1182 | CONFIG_FONT_8x16=y | 1261 | CONFIG_FONT_8x16=y |
1183 | # CONFIG_LOGO is not set | 1262 | # CONFIG_LOGO is not set |
1184 | |||
1185 | # | ||
1186 | # Sound | ||
1187 | # | ||
1188 | CONFIG_SOUND=y | 1263 | CONFIG_SOUND=y |
1189 | 1264 | CONFIG_SOUND_OSS_CORE=y | |
1190 | # | ||
1191 | # Advanced Linux Sound Architecture | ||
1192 | # | ||
1193 | CONFIG_SND=m | 1265 | CONFIG_SND=m |
1194 | CONFIG_SND_TIMER=m | 1266 | CONFIG_SND_TIMER=m |
1195 | CONFIG_SND_PCM=m | 1267 | CONFIG_SND_PCM=m |
@@ -1201,28 +1273,22 @@ CONFIG_SND_MIXER_OSS=m | |||
1201 | CONFIG_SND_PCM_OSS=m | 1273 | CONFIG_SND_PCM_OSS=m |
1202 | CONFIG_SND_PCM_OSS_PLUGINS=y | 1274 | CONFIG_SND_PCM_OSS_PLUGINS=y |
1203 | CONFIG_SND_SEQUENCER_OSS=y | 1275 | CONFIG_SND_SEQUENCER_OSS=y |
1204 | CONFIG_SND_RTCTIMER=m | ||
1205 | CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y | ||
1206 | # CONFIG_SND_DYNAMIC_MINORS is not set | 1276 | # CONFIG_SND_DYNAMIC_MINORS is not set |
1207 | CONFIG_SND_SUPPORT_OLD_API=y | 1277 | CONFIG_SND_SUPPORT_OLD_API=y |
1208 | CONFIG_SND_VERBOSE_PROCFS=y | 1278 | CONFIG_SND_VERBOSE_PROCFS=y |
1209 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1279 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1210 | # CONFIG_SND_DEBUG is not set | 1280 | # CONFIG_SND_DEBUG is not set |
1211 | 1281 | CONFIG_SND_VMASTER=y | |
1212 | # | ||
1213 | # Generic devices | ||
1214 | # | ||
1215 | CONFIG_SND_MPU401_UART=m | 1282 | CONFIG_SND_MPU401_UART=m |
1216 | CONFIG_SND_AC97_CODEC=m | 1283 | CONFIG_SND_AC97_CODEC=m |
1284 | CONFIG_SND_DRIVERS=y | ||
1217 | # CONFIG_SND_DUMMY is not set | 1285 | # CONFIG_SND_DUMMY is not set |
1218 | # CONFIG_SND_VIRMIDI is not set | 1286 | # CONFIG_SND_VIRMIDI is not set |
1219 | # CONFIG_SND_MTPAV is not set | 1287 | # CONFIG_SND_MTPAV is not set |
1220 | # CONFIG_SND_SERIAL_U16550 is not set | 1288 | # CONFIG_SND_SERIAL_U16550 is not set |
1221 | # CONFIG_SND_MPU401 is not set | 1289 | # CONFIG_SND_MPU401 is not set |
1222 | 1290 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
1223 | # | 1291 | CONFIG_SND_PCI=y |
1224 | # PCI devices | ||
1225 | # | ||
1226 | # CONFIG_SND_AD1889 is not set | 1292 | # CONFIG_SND_AD1889 is not set |
1227 | # CONFIG_SND_ALS300 is not set | 1293 | # CONFIG_SND_ALS300 is not set |
1228 | # CONFIG_SND_ALI5451 is not set | 1294 | # CONFIG_SND_ALI5451 is not set |
@@ -1231,10 +1297,12 @@ CONFIG_SND_AC97_CODEC=m | |||
1231 | # CONFIG_SND_AU8810 is not set | 1297 | # CONFIG_SND_AU8810 is not set |
1232 | # CONFIG_SND_AU8820 is not set | 1298 | # CONFIG_SND_AU8820 is not set |
1233 | # CONFIG_SND_AU8830 is not set | 1299 | # CONFIG_SND_AU8830 is not set |
1300 | # CONFIG_SND_AW2 is not set | ||
1234 | # CONFIG_SND_AZT3328 is not set | 1301 | # CONFIG_SND_AZT3328 is not set |
1235 | # CONFIG_SND_BT87X is not set | 1302 | # CONFIG_SND_BT87X is not set |
1236 | # CONFIG_SND_CA0106 is not set | 1303 | # CONFIG_SND_CA0106 is not set |
1237 | # CONFIG_SND_CMIPCI is not set | 1304 | # CONFIG_SND_CMIPCI is not set |
1305 | # CONFIG_SND_OXYGEN is not set | ||
1238 | # CONFIG_SND_CS4281 is not set | 1306 | # CONFIG_SND_CS4281 is not set |
1239 | # CONFIG_SND_CS46XX is not set | 1307 | # CONFIG_SND_CS46XX is not set |
1240 | # CONFIG_SND_DARLA20 is not set | 1308 | # CONFIG_SND_DARLA20 is not set |
@@ -1259,6 +1327,7 @@ CONFIG_SND_AC97_CODEC=m | |||
1259 | # CONFIG_SND_HDA_INTEL is not set | 1327 | # CONFIG_SND_HDA_INTEL is not set |
1260 | # CONFIG_SND_HDSP is not set | 1328 | # CONFIG_SND_HDSP is not set |
1261 | # CONFIG_SND_HDSPM is not set | 1329 | # CONFIG_SND_HDSPM is not set |
1330 | # CONFIG_SND_HIFIER is not set | ||
1262 | # CONFIG_SND_ICE1712 is not set | 1331 | # CONFIG_SND_ICE1712 is not set |
1263 | # CONFIG_SND_ICE1724 is not set | 1332 | # CONFIG_SND_ICE1724 is not set |
1264 | # CONFIG_SND_INTEL8X0 is not set | 1333 | # CONFIG_SND_INTEL8X0 is not set |
@@ -1276,43 +1345,26 @@ CONFIG_SND_AC97_CODEC=m | |||
1276 | # CONFIG_SND_TRIDENT is not set | 1345 | # CONFIG_SND_TRIDENT is not set |
1277 | CONFIG_SND_VIA82XX=m | 1346 | CONFIG_SND_VIA82XX=m |
1278 | # CONFIG_SND_VIA82XX_MODEM is not set | 1347 | # CONFIG_SND_VIA82XX_MODEM is not set |
1348 | # CONFIG_SND_VIRTUOSO is not set | ||
1279 | # CONFIG_SND_VX222 is not set | 1349 | # CONFIG_SND_VX222 is not set |
1280 | # CONFIG_SND_YMFPCI is not set | 1350 | # CONFIG_SND_YMFPCI is not set |
1281 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1351 | CONFIG_SND_MIPS=y |
1282 | 1352 | CONFIG_SND_USB=y | |
1283 | # | ||
1284 | # ALSA MIPS devices | ||
1285 | # | ||
1286 | |||
1287 | # | ||
1288 | # USB devices | ||
1289 | # | ||
1290 | # CONFIG_SND_USB_AUDIO is not set | 1353 | # CONFIG_SND_USB_AUDIO is not set |
1291 | # CONFIG_SND_USB_CAIAQ is not set | 1354 | # CONFIG_SND_USB_CAIAQ is not set |
1292 | |||
1293 | # | ||
1294 | # System on Chip audio support | ||
1295 | # | ||
1296 | # CONFIG_SND_SOC is not set | 1355 | # CONFIG_SND_SOC is not set |
1297 | |||
1298 | # | ||
1299 | # Open Sound System | ||
1300 | # | ||
1301 | # CONFIG_SOUND_PRIME is not set | 1356 | # CONFIG_SOUND_PRIME is not set |
1302 | CONFIG_AC97_BUS=m | 1357 | CONFIG_AC97_BUS=m |
1303 | 1358 | CONFIG_HID_SUPPORT=y | |
1304 | # | ||
1305 | # HID Devices | ||
1306 | # | ||
1307 | CONFIG_HID=y | 1359 | CONFIG_HID=y |
1308 | # CONFIG_HID_DEBUG is not set | 1360 | # CONFIG_HID_DEBUG is not set |
1361 | CONFIG_HIDRAW=y | ||
1309 | 1362 | ||
1310 | # | 1363 | # |
1311 | # USB Input Devices | 1364 | # USB Input Devices |
1312 | # | 1365 | # |
1313 | CONFIG_USB_HID=m | 1366 | CONFIG_USB_HID=m |
1314 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1367 | CONFIG_HID_PID=y |
1315 | # CONFIG_HID_FF is not set | ||
1316 | CONFIG_USB_HIDDEV=y | 1368 | CONFIG_USB_HIDDEV=y |
1317 | 1369 | ||
1318 | # | 1370 | # |
@@ -1322,13 +1374,39 @@ CONFIG_USB_HIDDEV=y | |||
1322 | # CONFIG_USB_MOUSE is not set | 1374 | # CONFIG_USB_MOUSE is not set |
1323 | 1375 | ||
1324 | # | 1376 | # |
1325 | # USB support | 1377 | # Special HID drivers |
1326 | # | 1378 | # |
1379 | CONFIG_HID_COMPAT=y | ||
1380 | CONFIG_HID_A4TECH=m | ||
1381 | CONFIG_HID_APPLE=m | ||
1382 | CONFIG_HID_BELKIN=m | ||
1383 | CONFIG_HID_BRIGHT=m | ||
1384 | CONFIG_HID_CHERRY=m | ||
1385 | CONFIG_HID_CHICONY=m | ||
1386 | CONFIG_HID_CYPRESS=m | ||
1387 | CONFIG_HID_DELL=m | ||
1388 | CONFIG_HID_EZKEY=m | ||
1389 | CONFIG_HID_GYRATION=m | ||
1390 | CONFIG_HID_LOGITECH=m | ||
1391 | CONFIG_LOGITECH_FF=y | ||
1392 | CONFIG_LOGIRUMBLEPAD2_FF=y | ||
1393 | CONFIG_HID_MICROSOFT=m | ||
1394 | CONFIG_HID_MONTEREY=m | ||
1395 | CONFIG_HID_PANTHERLORD=m | ||
1396 | # CONFIG_PANTHERLORD_FF is not set | ||
1397 | CONFIG_HID_PETALYNX=m | ||
1398 | CONFIG_HID_SAMSUNG=m | ||
1399 | CONFIG_HID_SONY=m | ||
1400 | CONFIG_HID_SUNPLUS=m | ||
1401 | # CONFIG_THRUSTMASTER_FF is not set | ||
1402 | CONFIG_ZEROPLUS_FF=m | ||
1403 | CONFIG_USB_SUPPORT=y | ||
1327 | CONFIG_USB_ARCH_HAS_HCD=y | 1404 | CONFIG_USB_ARCH_HAS_HCD=y |
1328 | CONFIG_USB_ARCH_HAS_OHCI=y | 1405 | CONFIG_USB_ARCH_HAS_OHCI=y |
1329 | CONFIG_USB_ARCH_HAS_EHCI=y | 1406 | CONFIG_USB_ARCH_HAS_EHCI=y |
1330 | CONFIG_USB=y | 1407 | CONFIG_USB=y |
1331 | # CONFIG_USB_DEBUG is not set | 1408 | # CONFIG_USB_DEBUG is not set |
1409 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
1332 | 1410 | ||
1333 | # | 1411 | # |
1334 | # Miscellaneous USB options | 1412 | # Miscellaneous USB options |
@@ -1338,35 +1416,46 @@ CONFIG_USB_DEVICEFS=y | |||
1338 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1416 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1339 | # CONFIG_USB_SUSPEND is not set | 1417 | # CONFIG_USB_SUSPEND is not set |
1340 | # CONFIG_USB_OTG is not set | 1418 | # CONFIG_USB_OTG is not set |
1419 | CONFIG_USB_OTG_WHITELIST=y | ||
1420 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1421 | # CONFIG_USB_MON is not set | ||
1422 | # CONFIG_USB_WUSB is not set | ||
1423 | CONFIG_USB_WUSB_CBAF=m | ||
1424 | # CONFIG_USB_WUSB_CBAF_DEBUG is not set | ||
1341 | 1425 | ||
1342 | # | 1426 | # |
1343 | # USB Host Controller Drivers | 1427 | # USB Host Controller Drivers |
1344 | # | 1428 | # |
1429 | CONFIG_USB_C67X00_HCD=m | ||
1345 | CONFIG_USB_EHCI_HCD=y | 1430 | CONFIG_USB_EHCI_HCD=y |
1346 | CONFIG_USB_EHCI_SPLIT_ISO=y | ||
1347 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1431 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1348 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1432 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
1349 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
1350 | # CONFIG_USB_ISP116X_HCD is not set | 1433 | # CONFIG_USB_ISP116X_HCD is not set |
1434 | CONFIG_USB_ISP1760_HCD=m | ||
1351 | CONFIG_USB_OHCI_HCD=y | 1435 | CONFIG_USB_OHCI_HCD=y |
1352 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1436 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
1353 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1437 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
1354 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1438 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
1355 | CONFIG_USB_UHCI_HCD=m | 1439 | CONFIG_USB_UHCI_HCD=m |
1356 | # CONFIG_USB_SL811_HCD is not set | 1440 | # CONFIG_USB_SL811_HCD is not set |
1441 | CONFIG_USB_R8A66597_HCD=m | ||
1442 | # CONFIG_USB_WHCI_HCD is not set | ||
1443 | # CONFIG_USB_HWA_HCD is not set | ||
1357 | 1444 | ||
1358 | # | 1445 | # |
1359 | # USB Device Class drivers | 1446 | # USB Device Class drivers |
1360 | # | 1447 | # |
1361 | CONFIG_USB_ACM=y | 1448 | CONFIG_USB_ACM=y |
1362 | CONFIG_USB_PRINTER=y | 1449 | CONFIG_USB_PRINTER=y |
1450 | CONFIG_USB_WDM=m | ||
1451 | CONFIG_USB_TMC=m | ||
1363 | 1452 | ||
1364 | # | 1453 | # |
1365 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1454 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
1366 | # | 1455 | # |
1367 | 1456 | ||
1368 | # | 1457 | # |
1369 | # may also be needed; see USB_STORAGE Help for more information | 1458 | # see USB_STORAGE Help for more information |
1370 | # | 1459 | # |
1371 | CONFIG_USB_STORAGE=y | 1460 | CONFIG_USB_STORAGE=y |
1372 | # CONFIG_USB_STORAGE_DEBUG is not set | 1461 | # CONFIG_USB_STORAGE_DEBUG is not set |
@@ -1379,7 +1468,9 @@ CONFIG_USB_STORAGE=y | |||
1379 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1468 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1380 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1469 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1381 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1470 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1471 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
1382 | # CONFIG_USB_STORAGE_KARMA is not set | 1472 | # CONFIG_USB_STORAGE_KARMA is not set |
1473 | CONFIG_USB_STORAGE_CYPRESS_ATACB=y | ||
1383 | CONFIG_USB_LIBUSUAL=y | 1474 | CONFIG_USB_LIBUSUAL=y |
1384 | 1475 | ||
1385 | # | 1476 | # |
@@ -1387,15 +1478,10 @@ CONFIG_USB_LIBUSUAL=y | |||
1387 | # | 1478 | # |
1388 | # CONFIG_USB_MDC800 is not set | 1479 | # CONFIG_USB_MDC800 is not set |
1389 | # CONFIG_USB_MICROTEK is not set | 1480 | # CONFIG_USB_MICROTEK is not set |
1390 | # CONFIG_USB_MON is not set | ||
1391 | 1481 | ||
1392 | # | 1482 | # |
1393 | # USB port drivers | 1483 | # USB port drivers |
1394 | # | 1484 | # |
1395 | |||
1396 | # | ||
1397 | # USB Serial Converter support | ||
1398 | # | ||
1399 | # CONFIG_USB_SERIAL is not set | 1485 | # CONFIG_USB_SERIAL is not set |
1400 | 1486 | ||
1401 | # | 1487 | # |
@@ -1404,7 +1490,7 @@ CONFIG_USB_LIBUSUAL=y | |||
1404 | # CONFIG_USB_EMI62 is not set | 1490 | # CONFIG_USB_EMI62 is not set |
1405 | # CONFIG_USB_EMI26 is not set | 1491 | # CONFIG_USB_EMI26 is not set |
1406 | # CONFIG_USB_ADUTUX is not set | 1492 | # CONFIG_USB_ADUTUX is not set |
1407 | # CONFIG_USB_AUERSWALD is not set | 1493 | CONFIG_USB_SEVSEG=m |
1408 | # CONFIG_USB_RIO500 is not set | 1494 | # CONFIG_USB_RIO500 is not set |
1409 | # CONFIG_USB_LEGOTOWER is not set | 1495 | # CONFIG_USB_LEGOTOWER is not set |
1410 | # CONFIG_USB_LCD is not set | 1496 | # CONFIG_USB_LCD is not set |
@@ -1421,56 +1507,75 @@ CONFIG_USB_LIBUSUAL=y | |||
1421 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1507 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1422 | # CONFIG_USB_IOWARRIOR is not set | 1508 | # CONFIG_USB_IOWARRIOR is not set |
1423 | # CONFIG_USB_TEST is not set | 1509 | # CONFIG_USB_TEST is not set |
1424 | 1510 | CONFIG_USB_ISIGHTFW=m | |
1425 | # | 1511 | CONFIG_USB_VST=m |
1426 | # USB DSL modem support | ||
1427 | # | ||
1428 | |||
1429 | # | ||
1430 | # USB Gadget Support | ||
1431 | # | ||
1432 | # CONFIG_USB_GADGET is not set | 1512 | # CONFIG_USB_GADGET is not set |
1513 | # CONFIG_UWB is not set | ||
1433 | # CONFIG_MMC is not set | 1514 | # CONFIG_MMC is not set |
1434 | 1515 | # CONFIG_MEMSTICK is not set | |
1435 | # | ||
1436 | # LED devices | ||
1437 | # | ||
1438 | # CONFIG_NEW_LEDS is not set | 1516 | # CONFIG_NEW_LEDS is not set |
1439 | 1517 | # CONFIG_ACCESSIBILITY is not set | |
1440 | # | ||
1441 | # LED drivers | ||
1442 | # | ||
1443 | |||
1444 | # | ||
1445 | # LED Triggers | ||
1446 | # | ||
1447 | |||
1448 | # | ||
1449 | # InfiniBand support | ||
1450 | # | ||
1451 | # CONFIG_INFINIBAND is not set | 1518 | # CONFIG_INFINIBAND is not set |
1519 | CONFIG_RTC_LIB=y | ||
1520 | CONFIG_RTC_CLASS=m | ||
1452 | 1521 | ||
1453 | # | 1522 | # |
1454 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1523 | # RTC interfaces |
1455 | # | 1524 | # |
1525 | CONFIG_RTC_INTF_SYSFS=y | ||
1526 | CONFIG_RTC_INTF_PROC=y | ||
1527 | CONFIG_RTC_INTF_DEV=y | ||
1528 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | ||
1529 | # CONFIG_RTC_DRV_TEST is not set | ||
1456 | 1530 | ||
1457 | # | 1531 | # |
1458 | # Real Time Clock | 1532 | # I2C RTC drivers |
1459 | # | 1533 | # |
1460 | # CONFIG_RTC_CLASS is not set | 1534 | # CONFIG_RTC_DRV_DS1307 is not set |
1535 | # CONFIG_RTC_DRV_DS1374 is not set | ||
1536 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1537 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1538 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1539 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1540 | # CONFIG_RTC_DRV_X1205 is not set | ||
1541 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1542 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1543 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1544 | # CONFIG_RTC_DRV_S35390A is not set | ||
1545 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1546 | # CONFIG_RTC_DRV_RX8581 is not set | ||
1461 | 1547 | ||
1462 | # | 1548 | # |
1463 | # DMA Engine support | 1549 | # SPI RTC drivers |
1464 | # | 1550 | # |
1465 | # CONFIG_DMA_ENGINE is not set | ||
1466 | 1551 | ||
1467 | # | 1552 | # |
1468 | # DMA Clients | 1553 | # Platform RTC drivers |
1469 | # | 1554 | # |
1555 | CONFIG_RTC_DRV_CMOS=m | ||
1556 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1557 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1558 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1559 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1560 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1561 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1562 | # CONFIG_RTC_DRV_M48T35 is not set | ||
1563 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1564 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
1565 | # CONFIG_RTC_DRV_V3020 is not set | ||
1470 | 1566 | ||
1471 | # | 1567 | # |
1472 | # DMA Devices | 1568 | # on-CPU RTC drivers |
1473 | # | 1569 | # |
1570 | # CONFIG_DMADEVICES is not set | ||
1571 | CONFIG_UIO=m | ||
1572 | CONFIG_UIO_CIF=m | ||
1573 | # CONFIG_UIO_PDRV is not set | ||
1574 | # CONFIG_UIO_PDRV_GENIRQ is not set | ||
1575 | # CONFIG_UIO_SMX is not set | ||
1576 | # CONFIG_UIO_SERCOS3 is not set | ||
1577 | # CONFIG_STAGING is not set | ||
1578 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
1474 | 1579 | ||
1475 | # | 1580 | # |
1476 | # File systems | 1581 | # File systems |
@@ -1478,27 +1583,31 @@ CONFIG_USB_LIBUSUAL=y | |||
1478 | CONFIG_EXT2_FS=y | 1583 | CONFIG_EXT2_FS=y |
1479 | # CONFIG_EXT2_FS_XATTR is not set | 1584 | # CONFIG_EXT2_FS_XATTR is not set |
1480 | CONFIG_EXT2_FS_XIP=y | 1585 | CONFIG_EXT2_FS_XIP=y |
1481 | CONFIG_FS_XIP=y | ||
1482 | CONFIG_EXT3_FS=y | 1586 | CONFIG_EXT3_FS=y |
1483 | # CONFIG_EXT3_FS_XATTR is not set | 1587 | # CONFIG_EXT3_FS_XATTR is not set |
1484 | # CONFIG_EXT4DEV_FS is not set | 1588 | CONFIG_EXT4_FS=m |
1589 | CONFIG_EXT4DEV_COMPAT=y | ||
1590 | CONFIG_EXT4_FS_XATTR=y | ||
1591 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
1592 | CONFIG_EXT4_FS_SECURITY=y | ||
1593 | CONFIG_FS_XIP=y | ||
1485 | CONFIG_JBD=y | 1594 | CONFIG_JBD=y |
1486 | # CONFIG_JBD_DEBUG is not set | 1595 | CONFIG_JBD2=m |
1596 | CONFIG_FS_MBCACHE=m | ||
1487 | CONFIG_REISERFS_FS=m | 1597 | CONFIG_REISERFS_FS=m |
1488 | # CONFIG_REISERFS_CHECK is not set | 1598 | # CONFIG_REISERFS_CHECK is not set |
1489 | # CONFIG_REISERFS_PROC_INFO is not set | 1599 | # CONFIG_REISERFS_PROC_INFO is not set |
1490 | # CONFIG_REISERFS_FS_XATTR is not set | 1600 | # CONFIG_REISERFS_FS_XATTR is not set |
1491 | # CONFIG_JFS_FS is not set | 1601 | # CONFIG_JFS_FS is not set |
1492 | CONFIG_FS_POSIX_ACL=y | 1602 | CONFIG_FS_POSIX_ACL=y |
1603 | CONFIG_FILE_LOCKING=y | ||
1493 | # CONFIG_XFS_FS is not set | 1604 | # CONFIG_XFS_FS is not set |
1494 | # CONFIG_GFS2_FS is not set | 1605 | # CONFIG_GFS2_FS is not set |
1495 | # CONFIG_OCFS2_FS is not set | 1606 | # CONFIG_OCFS2_FS is not set |
1496 | # CONFIG_MINIX_FS is not set | 1607 | CONFIG_DNOTIFY=y |
1497 | # CONFIG_ROMFS_FS is not set | ||
1498 | CONFIG_INOTIFY=y | 1608 | CONFIG_INOTIFY=y |
1499 | CONFIG_INOTIFY_USER=y | 1609 | CONFIG_INOTIFY_USER=y |
1500 | # CONFIG_QUOTA is not set | 1610 | # CONFIG_QUOTA is not set |
1501 | CONFIG_DNOTIFY=y | ||
1502 | CONFIG_AUTOFS_FS=y | 1611 | CONFIG_AUTOFS_FS=y |
1503 | CONFIG_AUTOFS4_FS=y | 1612 | CONFIG_AUTOFS4_FS=y |
1504 | CONFIG_FUSE_FS=y | 1613 | CONFIG_FUSE_FS=y |
@@ -1530,11 +1639,11 @@ CONFIG_NTFS_RW=y | |||
1530 | CONFIG_PROC_FS=y | 1639 | CONFIG_PROC_FS=y |
1531 | CONFIG_PROC_KCORE=y | 1640 | CONFIG_PROC_KCORE=y |
1532 | CONFIG_PROC_SYSCTL=y | 1641 | CONFIG_PROC_SYSCTL=y |
1642 | CONFIG_PROC_PAGE_MONITOR=y | ||
1533 | CONFIG_SYSFS=y | 1643 | CONFIG_SYSFS=y |
1534 | CONFIG_TMPFS=y | 1644 | CONFIG_TMPFS=y |
1535 | # CONFIG_TMPFS_POSIX_ACL is not set | 1645 | # CONFIG_TMPFS_POSIX_ACL is not set |
1536 | # CONFIG_HUGETLB_PAGE is not set | 1646 | # CONFIG_HUGETLB_PAGE is not set |
1537 | CONFIG_RAMFS=y | ||
1538 | # CONFIG_CONFIGFS_FS is not set | 1647 | # CONFIG_CONFIGFS_FS is not set |
1539 | 1648 | ||
1540 | # | 1649 | # |
@@ -1550,25 +1659,23 @@ CONFIG_RAMFS=y | |||
1550 | # CONFIG_JFFS2_FS is not set | 1659 | # CONFIG_JFFS2_FS is not set |
1551 | # CONFIG_CRAMFS is not set | 1660 | # CONFIG_CRAMFS is not set |
1552 | # CONFIG_VXFS_FS is not set | 1661 | # CONFIG_VXFS_FS is not set |
1662 | # CONFIG_MINIX_FS is not set | ||
1663 | CONFIG_OMFS_FS=m | ||
1553 | # CONFIG_HPFS_FS is not set | 1664 | # CONFIG_HPFS_FS is not set |
1554 | # CONFIG_QNX4FS_FS is not set | 1665 | # CONFIG_QNX4FS_FS is not set |
1666 | # CONFIG_ROMFS_FS is not set | ||
1555 | # CONFIG_SYSV_FS is not set | 1667 | # CONFIG_SYSV_FS is not set |
1556 | # CONFIG_UFS_FS is not set | 1668 | # CONFIG_UFS_FS is not set |
1557 | 1669 | CONFIG_NETWORK_FILESYSTEMS=y | |
1558 | # | ||
1559 | # Network File Systems | ||
1560 | # | ||
1561 | CONFIG_NFS_FS=m | 1670 | CONFIG_NFS_FS=m |
1562 | CONFIG_NFS_V3=y | 1671 | CONFIG_NFS_V3=y |
1563 | CONFIG_NFS_V3_ACL=y | 1672 | CONFIG_NFS_V3_ACL=y |
1564 | CONFIG_NFS_V4=y | 1673 | CONFIG_NFS_V4=y |
1565 | CONFIG_NFS_DIRECTIO=y | ||
1566 | CONFIG_NFSD=m | 1674 | CONFIG_NFSD=m |
1567 | CONFIG_NFSD_V2_ACL=y | 1675 | CONFIG_NFSD_V2_ACL=y |
1568 | CONFIG_NFSD_V3=y | 1676 | CONFIG_NFSD_V3=y |
1569 | CONFIG_NFSD_V3_ACL=y | 1677 | CONFIG_NFSD_V3_ACL=y |
1570 | CONFIG_NFSD_V4=y | 1678 | CONFIG_NFSD_V4=y |
1571 | CONFIG_NFSD_TCP=y | ||
1572 | CONFIG_LOCKD=m | 1679 | CONFIG_LOCKD=m |
1573 | CONFIG_LOCKD_V4=y | 1680 | CONFIG_LOCKD_V4=y |
1574 | CONFIG_EXPORTFS=m | 1681 | CONFIG_EXPORTFS=m |
@@ -1576,7 +1683,7 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
1576 | CONFIG_NFS_COMMON=y | 1683 | CONFIG_NFS_COMMON=y |
1577 | CONFIG_SUNRPC=m | 1684 | CONFIG_SUNRPC=m |
1578 | CONFIG_SUNRPC_GSS=m | 1685 | CONFIG_SUNRPC_GSS=m |
1579 | # CONFIG_SUNRPC_BIND34 is not set | 1686 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
1580 | CONFIG_RPCSEC_GSS_KRB5=m | 1687 | CONFIG_RPCSEC_GSS_KRB5=m |
1581 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1688 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1582 | CONFIG_SMB_FS=m | 1689 | CONFIG_SMB_FS=m |
@@ -1616,10 +1723,6 @@ CONFIG_MSDOS_PARTITION=y | |||
1616 | # CONFIG_KARMA_PARTITION is not set | 1723 | # CONFIG_KARMA_PARTITION is not set |
1617 | # CONFIG_EFI_PARTITION is not set | 1724 | # CONFIG_EFI_PARTITION is not set |
1618 | # CONFIG_SYSV68_PARTITION is not set | 1725 | # CONFIG_SYSV68_PARTITION is not set |
1619 | |||
1620 | # | ||
1621 | # Native Language Support | ||
1622 | # | ||
1623 | CONFIG_NLS=y | 1726 | CONFIG_NLS=y |
1624 | CONFIG_NLS_DEFAULT="utf8" | 1727 | CONFIG_NLS_DEFAULT="utf8" |
1625 | # CONFIG_NLS_CODEPAGE_437 is not set | 1728 | # CONFIG_NLS_CODEPAGE_437 is not set |
@@ -1660,30 +1763,31 @@ CONFIG_NLS_ISO8859_1=y | |||
1660 | # CONFIG_NLS_KOI8_R is not set | 1763 | # CONFIG_NLS_KOI8_R is not set |
1661 | # CONFIG_NLS_KOI8_U is not set | 1764 | # CONFIG_NLS_KOI8_U is not set |
1662 | CONFIG_NLS_UTF8=y | 1765 | CONFIG_NLS_UTF8=y |
1663 | |||
1664 | # | ||
1665 | # Distributed Lock Manager | ||
1666 | # | ||
1667 | # CONFIG_DLM is not set | 1766 | # CONFIG_DLM is not set |
1668 | 1767 | ||
1669 | # | 1768 | # |
1670 | # Profiling support | ||
1671 | # | ||
1672 | CONFIG_PROFILING=y | ||
1673 | CONFIG_OPROFILE=m | ||
1674 | |||
1675 | # | ||
1676 | # Kernel hacking | 1769 | # Kernel hacking |
1677 | # | 1770 | # |
1678 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1771 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
1679 | # CONFIG_PRINTK_TIME is not set | 1772 | # CONFIG_PRINTK_TIME is not set |
1773 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1680 | # CONFIG_ENABLE_MUST_CHECK is not set | 1774 | # CONFIG_ENABLE_MUST_CHECK is not set |
1775 | CONFIG_FRAME_WARN=2048 | ||
1681 | # CONFIG_MAGIC_SYSRQ is not set | 1776 | # CONFIG_MAGIC_SYSRQ is not set |
1682 | # CONFIG_UNUSED_SYMBOLS is not set | 1777 | # CONFIG_UNUSED_SYMBOLS is not set |
1683 | # CONFIG_DEBUG_FS is not set | 1778 | # CONFIG_DEBUG_FS is not set |
1684 | # CONFIG_HEADERS_CHECK is not set | 1779 | # CONFIG_HEADERS_CHECK is not set |
1685 | # CONFIG_DEBUG_KERNEL is not set | 1780 | # CONFIG_DEBUG_KERNEL is not set |
1686 | CONFIG_CROSSCOMPILE=y | 1781 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1782 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1783 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1784 | |||
1785 | # | ||
1786 | # Tracers | ||
1787 | # | ||
1788 | CONFIG_DYNAMIC_PRINTK_DEBUG=y | ||
1789 | # CONFIG_SAMPLES is not set | ||
1790 | CONFIG_HAVE_ARCH_KGDB=y | ||
1687 | CONFIG_CMDLINE="" | 1791 | CONFIG_CMDLINE="" |
1688 | 1792 | ||
1689 | # | 1793 | # |
@@ -1691,64 +1795,113 @@ CONFIG_CMDLINE="" | |||
1691 | # | 1795 | # |
1692 | # CONFIG_KEYS is not set | 1796 | # CONFIG_KEYS is not set |
1693 | # CONFIG_SECURITY is not set | 1797 | # CONFIG_SECURITY is not set |
1798 | # CONFIG_SECURITYFS is not set | ||
1799 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
1800 | CONFIG_CRYPTO=y | ||
1694 | 1801 | ||
1695 | # | 1802 | # |
1696 | # Cryptographic options | 1803 | # Crypto core or helper |
1697 | # | 1804 | # |
1698 | CONFIG_CRYPTO=y | 1805 | CONFIG_CRYPTO_FIPS=y |
1699 | CONFIG_CRYPTO_ALGAPI=y | 1806 | CONFIG_CRYPTO_ALGAPI=y |
1700 | CONFIG_CRYPTO_BLKCIPHER=m | 1807 | CONFIG_CRYPTO_AEAD=y |
1808 | CONFIG_CRYPTO_BLKCIPHER=y | ||
1701 | CONFIG_CRYPTO_HASH=y | 1809 | CONFIG_CRYPTO_HASH=y |
1810 | CONFIG_CRYPTO_RNG=y | ||
1702 | CONFIG_CRYPTO_MANAGER=y | 1811 | CONFIG_CRYPTO_MANAGER=y |
1812 | CONFIG_CRYPTO_GF128MUL=m | ||
1813 | # CONFIG_CRYPTO_NULL is not set | ||
1814 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1815 | CONFIG_CRYPTO_AUTHENC=m | ||
1816 | # CONFIG_CRYPTO_TEST is not set | ||
1817 | |||
1818 | # | ||
1819 | # Authenticated Encryption with Associated Data | ||
1820 | # | ||
1821 | CONFIG_CRYPTO_CCM=m | ||
1822 | CONFIG_CRYPTO_GCM=m | ||
1823 | CONFIG_CRYPTO_SEQIV=m | ||
1824 | |||
1825 | # | ||
1826 | # Block modes | ||
1827 | # | ||
1828 | CONFIG_CRYPTO_CBC=m | ||
1829 | CONFIG_CRYPTO_CTR=m | ||
1830 | CONFIG_CRYPTO_CTS=m | ||
1831 | CONFIG_CRYPTO_ECB=m | ||
1832 | # CONFIG_CRYPTO_LRW is not set | ||
1833 | CONFIG_CRYPTO_PCBC=m | ||
1834 | CONFIG_CRYPTO_XTS=m | ||
1835 | |||
1836 | # | ||
1837 | # Hash modes | ||
1838 | # | ||
1703 | CONFIG_CRYPTO_HMAC=y | 1839 | CONFIG_CRYPTO_HMAC=y |
1704 | # CONFIG_CRYPTO_XCBC is not set | 1840 | # CONFIG_CRYPTO_XCBC is not set |
1705 | # CONFIG_CRYPTO_NULL is not set | 1841 | |
1842 | # | ||
1843 | # Digest | ||
1844 | # | ||
1845 | # CONFIG_CRYPTO_CRC32C is not set | ||
1706 | # CONFIG_CRYPTO_MD4 is not set | 1846 | # CONFIG_CRYPTO_MD4 is not set |
1707 | CONFIG_CRYPTO_MD5=m | 1847 | CONFIG_CRYPTO_MD5=m |
1848 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1849 | CONFIG_CRYPTO_RMD128=m | ||
1850 | CONFIG_CRYPTO_RMD160=m | ||
1851 | CONFIG_CRYPTO_RMD256=m | ||
1852 | CONFIG_CRYPTO_RMD320=m | ||
1708 | CONFIG_CRYPTO_SHA1=m | 1853 | CONFIG_CRYPTO_SHA1=m |
1709 | # CONFIG_CRYPTO_SHA256 is not set | 1854 | # CONFIG_CRYPTO_SHA256 is not set |
1710 | # CONFIG_CRYPTO_SHA512 is not set | 1855 | # CONFIG_CRYPTO_SHA512 is not set |
1711 | # CONFIG_CRYPTO_WP512 is not set | ||
1712 | # CONFIG_CRYPTO_TGR192 is not set | 1856 | # CONFIG_CRYPTO_TGR192 is not set |
1713 | # CONFIG_CRYPTO_GF128MUL is not set | 1857 | # CONFIG_CRYPTO_WP512 is not set |
1714 | CONFIG_CRYPTO_ECB=m | 1858 | |
1715 | CONFIG_CRYPTO_CBC=m | 1859 | # |
1716 | CONFIG_CRYPTO_PCBC=m | 1860 | # Ciphers |
1717 | # CONFIG_CRYPTO_LRW is not set | 1861 | # |
1718 | # CONFIG_CRYPTO_CRYPTD is not set | 1862 | CONFIG_CRYPTO_AES=m |
1719 | CONFIG_CRYPTO_DES=m | 1863 | # CONFIG_CRYPTO_ANUBIS is not set |
1720 | # CONFIG_CRYPTO_FCRYPT is not set | 1864 | CONFIG_CRYPTO_ARC4=m |
1721 | # CONFIG_CRYPTO_BLOWFISH is not set | 1865 | # CONFIG_CRYPTO_BLOWFISH is not set |
1722 | # CONFIG_CRYPTO_TWOFISH is not set | 1866 | # CONFIG_CRYPTO_CAMELLIA is not set |
1723 | # CONFIG_CRYPTO_SERPENT is not set | ||
1724 | # CONFIG_CRYPTO_AES is not set | ||
1725 | # CONFIG_CRYPTO_CAST5 is not set | 1867 | # CONFIG_CRYPTO_CAST5 is not set |
1726 | # CONFIG_CRYPTO_CAST6 is not set | 1868 | # CONFIG_CRYPTO_CAST6 is not set |
1727 | # CONFIG_CRYPTO_TEA is not set | 1869 | CONFIG_CRYPTO_DES=m |
1728 | CONFIG_CRYPTO_ARC4=m | 1870 | # CONFIG_CRYPTO_FCRYPT is not set |
1729 | # CONFIG_CRYPTO_KHAZAD is not set | 1871 | # CONFIG_CRYPTO_KHAZAD is not set |
1730 | # CONFIG_CRYPTO_ANUBIS is not set | 1872 | CONFIG_CRYPTO_SALSA20=m |
1873 | CONFIG_CRYPTO_SEED=m | ||
1874 | # CONFIG_CRYPTO_SERPENT is not set | ||
1875 | # CONFIG_CRYPTO_TEA is not set | ||
1876 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1877 | |||
1878 | # | ||
1879 | # Compression | ||
1880 | # | ||
1731 | CONFIG_CRYPTO_DEFLATE=m | 1881 | CONFIG_CRYPTO_DEFLATE=m |
1732 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1882 | CONFIG_CRYPTO_LZO=m |
1733 | # CONFIG_CRYPTO_CRC32C is not set | ||
1734 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1735 | # CONFIG_CRYPTO_TEST is not set | ||
1736 | 1883 | ||
1737 | # | 1884 | # |
1738 | # Hardware crypto devices | 1885 | # Random Number Generation |
1739 | # | 1886 | # |
1887 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
1888 | # CONFIG_CRYPTO_HW is not set | ||
1740 | 1889 | ||
1741 | # | 1890 | # |
1742 | # Library routines | 1891 | # Library routines |
1743 | # | 1892 | # |
1744 | CONFIG_BITREVERSE=y | 1893 | CONFIG_BITREVERSE=y |
1745 | CONFIG_CRC_CCITT=y | 1894 | CONFIG_CRC_CCITT=y |
1746 | # CONFIG_CRC16 is not set | 1895 | CONFIG_CRC16=m |
1747 | # CONFIG_CRC_ITU_T is not set | 1896 | # CONFIG_CRC_T10DIF is not set |
1897 | CONFIG_CRC_ITU_T=m | ||
1748 | CONFIG_CRC32=y | 1898 | CONFIG_CRC32=y |
1899 | CONFIG_CRC7=m | ||
1749 | # CONFIG_LIBCRC32C is not set | 1900 | # CONFIG_LIBCRC32C is not set |
1750 | CONFIG_ZLIB_INFLATE=m | 1901 | CONFIG_ZLIB_INFLATE=m |
1751 | CONFIG_ZLIB_DEFLATE=m | 1902 | CONFIG_ZLIB_DEFLATE=m |
1903 | CONFIG_LZO_COMPRESS=m | ||
1904 | CONFIG_LZO_DECOMPRESS=m | ||
1752 | CONFIG_TEXTSEARCH=y | 1905 | CONFIG_TEXTSEARCH=y |
1753 | CONFIG_TEXTSEARCH_KMP=m | 1906 | CONFIG_TEXTSEARCH_KMP=m |
1754 | CONFIG_TEXTSEARCH_BM=m | 1907 | CONFIG_TEXTSEARCH_BM=m |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index f719bf5e01aa..115822876417 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
@@ -1,30 +1,34 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.28-rc6 |
4 | # Tue Aug 7 12:39:49 2007 | 4 | # Fri Nov 28 15:41:33 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | ||
12 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
13 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
13 | # CONFIG_BCM47XX is not set | ||
14 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
15 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
16 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LASAT is not set | ||
17 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
18 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
19 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
20 | # CONFIG_MARKEINS is not set | 21 | # CONFIG_MACH_EMMA is not set |
21 | # CONFIG_MACH_VR41XX is not set | 22 | # CONFIG_MACH_VR41XX is not set |
23 | # CONFIG_NXP_STB220 is not set | ||
24 | # CONFIG_NXP_STB225 is not set | ||
22 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
23 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
24 | # CONFIG_PMC_MSP is not set | 27 | # CONFIG_PMC_MSP is not set |
25 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
26 | CONFIG_SGI_IP22=y | 29 | CONFIG_SGI_IP22=y |
27 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
31 | # CONFIG_SGI_IP28 is not set | ||
28 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
29 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
30 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
@@ -35,34 +39,49 @@ CONFIG_SGI_IP22=y | |||
35 | # CONFIG_SIBYTE_SENTOSA is not set | 39 | # CONFIG_SIBYTE_SENTOSA is not set |
36 | # CONFIG_SIBYTE_BIGSUR is not set | 40 | # CONFIG_SIBYTE_BIGSUR is not set |
37 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
38 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
39 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
40 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
41 | # CONFIG_WR_PPMC is not set | 45 | # CONFIG_WR_PPMC is not set |
42 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
43 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
44 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
46 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
47 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
48 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
49 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
50 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 57 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
51 | CONFIG_ARC=y | 58 | CONFIG_ARC=y |
59 | CONFIG_CEVT_R4K=y | ||
60 | CONFIG_CSRC_R4K=y | ||
52 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
53 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
54 | CONFIG_EARLY_PRINTK=y | 63 | CONFIG_EARLY_PRINTK=y |
55 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 64 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
65 | # CONFIG_HOTPLUG_CPU is not set | ||
66 | CONFIG_I8259=y | ||
56 | # CONFIG_NO_IOPORT is not set | 67 | # CONFIG_NO_IOPORT is not set |
68 | CONFIG_GENERIC_ISA_DMA=y | ||
57 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y | 69 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y |
58 | CONFIG_CPU_BIG_ENDIAN=y | 70 | CONFIG_CPU_BIG_ENDIAN=y |
59 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 71 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
60 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 72 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
61 | CONFIG_IRQ_CPU=y | 73 | CONFIG_IRQ_CPU=y |
62 | CONFIG_SWAP_IO_SPACE=y | 74 | CONFIG_SWAP_IO_SPACE=y |
75 | CONFIG_SGI_HAS_INDYDOG=y | ||
76 | CONFIG_SGI_HAS_HAL2=y | ||
77 | CONFIG_SGI_HAS_SEEQ=y | ||
78 | CONFIG_SGI_HAS_WD93=y | ||
79 | CONFIG_SGI_HAS_ZILOG=y | ||
80 | CONFIG_SGI_HAS_I8042=y | ||
81 | CONFIG_DEFAULT_SGI_PARTITION=y | ||
63 | CONFIG_ARC32=y | 82 | CONFIG_ARC32=y |
64 | CONFIG_BOOT_ELF32=y | 83 | CONFIG_BOOT_ELF32=y |
65 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 84 | CONFIG_MIPS_L1_CACHE_SHIFT=7 |
66 | CONFIG_ARC_CONSOLE=y | 85 | CONFIG_ARC_CONSOLE=y |
67 | CONFIG_ARC_PROMLIB=y | 86 | CONFIG_ARC_PROMLIB=y |
68 | 87 | ||
@@ -82,6 +101,7 @@ CONFIG_ARC_PROMLIB=y | |||
82 | # CONFIG_CPU_TX49XX is not set | 101 | # CONFIG_CPU_TX49XX is not set |
83 | CONFIG_CPU_R5000=y | 102 | CONFIG_CPU_R5000=y |
84 | # CONFIG_CPU_R5432 is not set | 103 | # CONFIG_CPU_R5432 is not set |
104 | # CONFIG_CPU_R5500 is not set | ||
85 | # CONFIG_CPU_R6000 is not set | 105 | # CONFIG_CPU_R6000 is not set |
86 | # CONFIG_CPU_NEVADA is not set | 106 | # CONFIG_CPU_NEVADA is not set |
87 | # CONFIG_CPU_R8000 is not set | 107 | # CONFIG_CPU_R8000 is not set |
@@ -115,18 +135,24 @@ CONFIG_CPU_HAS_SYNC=y | |||
115 | CONFIG_GENERIC_HARDIRQS=y | 135 | CONFIG_GENERIC_HARDIRQS=y |
116 | CONFIG_GENERIC_IRQ_PROBE=y | 136 | CONFIG_GENERIC_IRQ_PROBE=y |
117 | CONFIG_ARCH_FLATMEM_ENABLE=y | 137 | CONFIG_ARCH_FLATMEM_ENABLE=y |
138 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
118 | CONFIG_SELECT_MEMORY_MODEL=y | 139 | CONFIG_SELECT_MEMORY_MODEL=y |
119 | CONFIG_FLATMEM_MANUAL=y | 140 | CONFIG_FLATMEM_MANUAL=y |
120 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 141 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
121 | # CONFIG_SPARSEMEM_MANUAL is not set | 142 | # CONFIG_SPARSEMEM_MANUAL is not set |
122 | CONFIG_FLATMEM=y | 143 | CONFIG_FLATMEM=y |
123 | CONFIG_FLAT_NODE_MEM_MAP=y | 144 | CONFIG_FLAT_NODE_MEM_MAP=y |
124 | # CONFIG_SPARSEMEM_STATIC is not set | 145 | CONFIG_PAGEFLAGS_EXTENDED=y |
125 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 146 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
126 | # CONFIG_RESOURCES_64BIT is not set | 147 | # CONFIG_RESOURCES_64BIT is not set |
127 | CONFIG_ZONE_DMA_FLAG=1 | 148 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
128 | CONFIG_BOUNCE=y | 149 | CONFIG_ZONE_DMA_FLAG=0 |
129 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
151 | CONFIG_UNEVICTABLE_LRU=y | ||
152 | CONFIG_TICK_ONESHOT=y | ||
153 | CONFIG_NO_HZ=y | ||
154 | CONFIG_HIGH_RES_TIMERS=y | ||
155 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
130 | # CONFIG_HZ_48 is not set | 156 | # CONFIG_HZ_48 is not set |
131 | # CONFIG_HZ_100 is not set | 157 | # CONFIG_HZ_100 is not set |
132 | # CONFIG_HZ_128 is not set | 158 | # CONFIG_HZ_128 is not set |
@@ -159,13 +185,20 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
159 | # CONFIG_POSIX_MQUEUE is not set | 185 | # CONFIG_POSIX_MQUEUE is not set |
160 | # CONFIG_BSD_PROCESS_ACCT is not set | 186 | # CONFIG_BSD_PROCESS_ACCT is not set |
161 | # CONFIG_TASKSTATS is not set | 187 | # CONFIG_TASKSTATS is not set |
162 | # CONFIG_USER_NS is not set | ||
163 | # CONFIG_AUDIT is not set | 188 | # CONFIG_AUDIT is not set |
164 | CONFIG_IKCONFIG=y | 189 | CONFIG_IKCONFIG=y |
165 | CONFIG_IKCONFIG_PROC=y | 190 | CONFIG_IKCONFIG_PROC=y |
166 | CONFIG_LOG_BUF_SHIFT=14 | 191 | CONFIG_LOG_BUF_SHIFT=14 |
192 | # CONFIG_CGROUPS is not set | ||
193 | # CONFIG_GROUP_SCHED is not set | ||
167 | CONFIG_SYSFS_DEPRECATED=y | 194 | CONFIG_SYSFS_DEPRECATED=y |
195 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
168 | CONFIG_RELAY=y | 196 | CONFIG_RELAY=y |
197 | CONFIG_NAMESPACES=y | ||
198 | CONFIG_UTS_NS=y | ||
199 | CONFIG_IPC_NS=y | ||
200 | CONFIG_USER_NS=y | ||
201 | CONFIG_PID_NS=y | ||
169 | # CONFIG_BLK_DEV_INITRD is not set | 202 | # CONFIG_BLK_DEV_INITRD is not set |
170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 203 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
171 | CONFIG_SYSCTL=y | 204 | CONFIG_SYSCTL=y |
@@ -177,6 +210,8 @@ CONFIG_KALLSYMS=y | |||
177 | CONFIG_PRINTK=y | 210 | CONFIG_PRINTK=y |
178 | CONFIG_BUG=y | 211 | CONFIG_BUG=y |
179 | CONFIG_ELF_CORE=y | 212 | CONFIG_ELF_CORE=y |
213 | # CONFIG_PCSPKR_PLATFORM is not set | ||
214 | # CONFIG_COMPAT_BRK is not set | ||
180 | CONFIG_BASE_FULL=y | 215 | CONFIG_BASE_FULL=y |
181 | CONFIG_FUTEX=y | 216 | CONFIG_FUTEX=y |
182 | CONFIG_ANON_INODES=y | 217 | CONFIG_ANON_INODES=y |
@@ -185,14 +220,21 @@ CONFIG_SIGNALFD=y | |||
185 | CONFIG_TIMERFD=y | 220 | CONFIG_TIMERFD=y |
186 | CONFIG_EVENTFD=y | 221 | CONFIG_EVENTFD=y |
187 | CONFIG_SHMEM=y | 222 | CONFIG_SHMEM=y |
223 | CONFIG_AIO=y | ||
188 | CONFIG_VM_EVENT_COUNTERS=y | 224 | CONFIG_VM_EVENT_COUNTERS=y |
189 | CONFIG_SLAB=y | 225 | CONFIG_SLAB=y |
190 | # CONFIG_SLUB is not set | 226 | # CONFIG_SLUB is not set |
191 | # CONFIG_SLOB is not set | 227 | # CONFIG_SLOB is not set |
228 | # CONFIG_PROFILING is not set | ||
229 | # CONFIG_MARKERS is not set | ||
230 | CONFIG_HAVE_OPROFILE=y | ||
231 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
232 | CONFIG_SLABINFO=y | ||
192 | CONFIG_RT_MUTEXES=y | 233 | CONFIG_RT_MUTEXES=y |
193 | # CONFIG_TINY_SHMEM is not set | 234 | # CONFIG_TINY_SHMEM is not set |
194 | CONFIG_BASE_SMALL=0 | 235 | CONFIG_BASE_SMALL=0 |
195 | CONFIG_MODULES=y | 236 | CONFIG_MODULES=y |
237 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
196 | CONFIG_MODULE_UNLOAD=y | 238 | CONFIG_MODULE_UNLOAD=y |
197 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 239 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
198 | CONFIG_MODVERSIONS=y | 240 | CONFIG_MODVERSIONS=y |
@@ -203,6 +245,7 @@ CONFIG_BLOCK=y | |||
203 | # CONFIG_BLK_DEV_IO_TRACE is not set | 245 | # CONFIG_BLK_DEV_IO_TRACE is not set |
204 | # CONFIG_LSF is not set | 246 | # CONFIG_LSF is not set |
205 | # CONFIG_BLK_DEV_BSG is not set | 247 | # CONFIG_BLK_DEV_BSG is not set |
248 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
206 | 249 | ||
207 | # | 250 | # |
208 | # IO Schedulers | 251 | # IO Schedulers |
@@ -216,6 +259,8 @@ CONFIG_DEFAULT_AS=y | |||
216 | # CONFIG_DEFAULT_CFQ is not set | 259 | # CONFIG_DEFAULT_CFQ is not set |
217 | # CONFIG_DEFAULT_NOOP is not set | 260 | # CONFIG_DEFAULT_NOOP is not set |
218 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 261 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
262 | CONFIG_CLASSIC_RCU=y | ||
263 | # CONFIG_FREEZER is not set | ||
219 | 264 | ||
220 | # | 265 | # |
221 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 266 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
@@ -224,29 +269,24 @@ CONFIG_HW_HAS_EISA=y | |||
224 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 269 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
225 | # CONFIG_EISA is not set | 270 | # CONFIG_EISA is not set |
226 | CONFIG_MMU=y | 271 | CONFIG_MMU=y |
227 | 272 | CONFIG_I8253=y | |
228 | # | ||
229 | # PCCARD (PCMCIA/CardBus) support | ||
230 | # | ||
231 | 273 | ||
232 | # | 274 | # |
233 | # Executable file formats | 275 | # Executable file formats |
234 | # | 276 | # |
235 | CONFIG_BINFMT_ELF=y | 277 | CONFIG_BINFMT_ELF=y |
278 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
279 | # CONFIG_HAVE_AOUT is not set | ||
236 | CONFIG_BINFMT_MISC=m | 280 | CONFIG_BINFMT_MISC=m |
237 | CONFIG_TRAD_SIGNALS=y | 281 | CONFIG_TRAD_SIGNALS=y |
238 | 282 | ||
239 | # | 283 | # |
240 | # Power management options | 284 | # Power management options |
241 | # | 285 | # |
286 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
242 | CONFIG_PM=y | 287 | CONFIG_PM=y |
243 | # CONFIG_PM_LEGACY is not set | ||
244 | # CONFIG_PM_DEBUG is not set | 288 | # CONFIG_PM_DEBUG is not set |
245 | # CONFIG_SUSPEND is not set | 289 | # CONFIG_SUSPEND is not set |
246 | |||
247 | # | ||
248 | # Networking | ||
249 | # | ||
250 | CONFIG_NET=y | 290 | CONFIG_NET=y |
251 | 291 | ||
252 | # | 292 | # |
@@ -259,6 +299,8 @@ CONFIG_XFRM=y | |||
259 | CONFIG_XFRM_USER=m | 299 | CONFIG_XFRM_USER=m |
260 | # CONFIG_XFRM_SUB_POLICY is not set | 300 | # CONFIG_XFRM_SUB_POLICY is not set |
261 | CONFIG_XFRM_MIGRATE=y | 301 | CONFIG_XFRM_MIGRATE=y |
302 | # CONFIG_XFRM_STATISTICS is not set | ||
303 | CONFIG_XFRM_IPCOMP=m | ||
262 | CONFIG_NET_KEY=y | 304 | CONFIG_NET_KEY=y |
263 | CONFIG_NET_KEY_MIGRATE=y | 305 | CONFIG_NET_KEY_MIGRATE=y |
264 | CONFIG_INET=y | 306 | CONFIG_INET=y |
@@ -282,42 +324,13 @@ CONFIG_INET_TUNNEL=m | |||
282 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 324 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
283 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 325 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
284 | CONFIG_INET_XFRM_MODE_BEET=m | 326 | CONFIG_INET_XFRM_MODE_BEET=m |
327 | # CONFIG_INET_LRO is not set | ||
285 | CONFIG_INET_DIAG=y | 328 | CONFIG_INET_DIAG=y |
286 | CONFIG_INET_TCP_DIAG=y | 329 | CONFIG_INET_TCP_DIAG=y |
287 | # CONFIG_TCP_CONG_ADVANCED is not set | 330 | # CONFIG_TCP_CONG_ADVANCED is not set |
288 | CONFIG_TCP_CONG_CUBIC=y | 331 | CONFIG_TCP_CONG_CUBIC=y |
289 | CONFIG_DEFAULT_TCP_CONG="cubic" | 332 | CONFIG_DEFAULT_TCP_CONG="cubic" |
290 | CONFIG_TCP_MD5SIG=y | 333 | CONFIG_TCP_MD5SIG=y |
291 | CONFIG_IP_VS=m | ||
292 | # CONFIG_IP_VS_DEBUG is not set | ||
293 | CONFIG_IP_VS_TAB_BITS=12 | ||
294 | |||
295 | # | ||
296 | # IPVS transport protocol load balancing support | ||
297 | # | ||
298 | CONFIG_IP_VS_PROTO_TCP=y | ||
299 | CONFIG_IP_VS_PROTO_UDP=y | ||
300 | CONFIG_IP_VS_PROTO_ESP=y | ||
301 | CONFIG_IP_VS_PROTO_AH=y | ||
302 | |||
303 | # | ||
304 | # IPVS scheduler | ||
305 | # | ||
306 | CONFIG_IP_VS_RR=m | ||
307 | CONFIG_IP_VS_WRR=m | ||
308 | CONFIG_IP_VS_LC=m | ||
309 | CONFIG_IP_VS_WLC=m | ||
310 | CONFIG_IP_VS_LBLC=m | ||
311 | CONFIG_IP_VS_LBLCR=m | ||
312 | CONFIG_IP_VS_DH=m | ||
313 | CONFIG_IP_VS_SH=m | ||
314 | CONFIG_IP_VS_SED=m | ||
315 | CONFIG_IP_VS_NQ=m | ||
316 | |||
317 | # | ||
318 | # IPVS application helper | ||
319 | # | ||
320 | CONFIG_IP_VS_FTP=m | ||
321 | CONFIG_IPV6=m | 334 | CONFIG_IPV6=m |
322 | CONFIG_IPV6_PRIVACY=y | 335 | CONFIG_IPV6_PRIVACY=y |
323 | CONFIG_IPV6_ROUTER_PREF=y | 336 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -334,12 +347,16 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
334 | CONFIG_INET6_XFRM_MODE_BEET=m | 347 | CONFIG_INET6_XFRM_MODE_BEET=m |
335 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 348 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m |
336 | CONFIG_IPV6_SIT=m | 349 | CONFIG_IPV6_SIT=m |
350 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
337 | CONFIG_IPV6_TUNNEL=m | 351 | CONFIG_IPV6_TUNNEL=m |
338 | CONFIG_IPV6_MULTIPLE_TABLES=y | 352 | CONFIG_IPV6_MULTIPLE_TABLES=y |
339 | CONFIG_IPV6_SUBTREES=y | 353 | CONFIG_IPV6_SUBTREES=y |
354 | CONFIG_IPV6_MROUTE=y | ||
355 | CONFIG_IPV6_PIMSM_V2=y | ||
340 | CONFIG_NETWORK_SECMARK=y | 356 | CONFIG_NETWORK_SECMARK=y |
341 | CONFIG_NETFILTER=y | 357 | CONFIG_NETFILTER=y |
342 | # CONFIG_NETFILTER_DEBUG is not set | 358 | # CONFIG_NETFILTER_DEBUG is not set |
359 | CONFIG_NETFILTER_ADVANCED=y | ||
343 | 360 | ||
344 | # | 361 | # |
345 | # Core Netfilter Configuration | 362 | # Core Netfilter Configuration |
@@ -347,12 +364,12 @@ CONFIG_NETFILTER=y | |||
347 | CONFIG_NETFILTER_NETLINK=m | 364 | CONFIG_NETFILTER_NETLINK=m |
348 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 365 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
349 | CONFIG_NETFILTER_NETLINK_LOG=m | 366 | CONFIG_NETFILTER_NETLINK_LOG=m |
350 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
351 | CONFIG_NF_CONNTRACK=m | 367 | CONFIG_NF_CONNTRACK=m |
352 | CONFIG_NF_CT_ACCT=y | 368 | CONFIG_NF_CT_ACCT=y |
353 | CONFIG_NF_CONNTRACK_MARK=y | 369 | CONFIG_NF_CONNTRACK_MARK=y |
354 | CONFIG_NF_CONNTRACK_SECMARK=y | 370 | CONFIG_NF_CONNTRACK_SECMARK=y |
355 | CONFIG_NF_CONNTRACK_EVENTS=y | 371 | CONFIG_NF_CONNTRACK_EVENTS=y |
372 | CONFIG_NF_CT_PROTO_DCCP=m | ||
356 | CONFIG_NF_CT_PROTO_GRE=m | 373 | CONFIG_NF_CT_PROTO_GRE=m |
357 | CONFIG_NF_CT_PROTO_SCTP=m | 374 | CONFIG_NF_CT_PROTO_SCTP=m |
358 | CONFIG_NF_CT_PROTO_UDPLITE=m | 375 | CONFIG_NF_CT_PROTO_UDPLITE=m |
@@ -366,18 +383,22 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
366 | CONFIG_NF_CONNTRACK_SIP=m | 383 | CONFIG_NF_CONNTRACK_SIP=m |
367 | CONFIG_NF_CONNTRACK_TFTP=m | 384 | CONFIG_NF_CONNTRACK_TFTP=m |
368 | CONFIG_NF_CT_NETLINK=m | 385 | CONFIG_NF_CT_NETLINK=m |
386 | CONFIG_NETFILTER_TPROXY=m | ||
369 | CONFIG_NETFILTER_XTABLES=m | 387 | CONFIG_NETFILTER_XTABLES=m |
370 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 388 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
371 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 389 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
390 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
372 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 391 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
373 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 392 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
374 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
375 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 393 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
394 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
376 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 395 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
396 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
397 | CONFIG_NETFILTER_XT_TARGET_TPROXY=m | ||
377 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 398 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
378 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 399 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
379 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
380 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 400 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
401 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
381 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 402 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
382 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 403 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
383 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 404 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
@@ -386,39 +407,75 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
386 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 407 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
387 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 408 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
388 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 409 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
410 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
389 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 411 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
412 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
390 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 413 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
391 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 414 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
392 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 415 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
393 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 416 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
394 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
395 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 417 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
418 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
419 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
396 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 420 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
397 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 421 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
422 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
398 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 423 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
424 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
425 | CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y | ||
399 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 426 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
427 | CONFIG_NETFILTER_XT_MATCH_SOCKET=m | ||
400 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 428 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
401 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 429 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
402 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 430 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
403 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 431 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
432 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
404 | CONFIG_NETFILTER_XT_MATCH_U32=m | 433 | CONFIG_NETFILTER_XT_MATCH_U32=m |
405 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 434 | CONFIG_IP_VS=m |
435 | CONFIG_IP_VS_IPV6=y | ||
436 | # CONFIG_IP_VS_DEBUG is not set | ||
437 | CONFIG_IP_VS_TAB_BITS=12 | ||
438 | |||
439 | # | ||
440 | # IPVS transport protocol load balancing support | ||
441 | # | ||
442 | CONFIG_IP_VS_PROTO_TCP=y | ||
443 | CONFIG_IP_VS_PROTO_UDP=y | ||
444 | CONFIG_IP_VS_PROTO_AH_ESP=y | ||
445 | CONFIG_IP_VS_PROTO_ESP=y | ||
446 | CONFIG_IP_VS_PROTO_AH=y | ||
447 | |||
448 | # | ||
449 | # IPVS scheduler | ||
450 | # | ||
451 | CONFIG_IP_VS_RR=m | ||
452 | CONFIG_IP_VS_WRR=m | ||
453 | CONFIG_IP_VS_LC=m | ||
454 | CONFIG_IP_VS_WLC=m | ||
455 | CONFIG_IP_VS_LBLC=m | ||
456 | CONFIG_IP_VS_LBLCR=m | ||
457 | CONFIG_IP_VS_DH=m | ||
458 | CONFIG_IP_VS_SH=m | ||
459 | CONFIG_IP_VS_SED=m | ||
460 | CONFIG_IP_VS_NQ=m | ||
461 | |||
462 | # | ||
463 | # IPVS application helper | ||
464 | # | ||
465 | CONFIG_IP_VS_FTP=m | ||
406 | 466 | ||
407 | # | 467 | # |
408 | # IP: Netfilter Configuration | 468 | # IP: Netfilter Configuration |
409 | # | 469 | # |
470 | CONFIG_NF_DEFRAG_IPV4=m | ||
410 | CONFIG_NF_CONNTRACK_IPV4=m | 471 | CONFIG_NF_CONNTRACK_IPV4=m |
411 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 472 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
412 | CONFIG_IP_NF_QUEUE=m | 473 | CONFIG_IP_NF_QUEUE=m |
413 | CONFIG_IP_NF_IPTABLES=m | 474 | CONFIG_IP_NF_IPTABLES=m |
414 | CONFIG_IP_NF_MATCH_IPRANGE=m | 475 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
415 | CONFIG_IP_NF_MATCH_TOS=m | ||
416 | CONFIG_IP_NF_MATCH_RECENT=m | ||
417 | CONFIG_IP_NF_MATCH_ECN=m | ||
418 | CONFIG_IP_NF_MATCH_AH=m | 476 | CONFIG_IP_NF_MATCH_AH=m |
477 | CONFIG_IP_NF_MATCH_ECN=m | ||
419 | CONFIG_IP_NF_MATCH_TTL=m | 478 | CONFIG_IP_NF_MATCH_TTL=m |
420 | CONFIG_IP_NF_MATCH_OWNER=m | ||
421 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
422 | CONFIG_IP_NF_FILTER=m | 479 | CONFIG_IP_NF_FILTER=m |
423 | CONFIG_IP_NF_TARGET_REJECT=m | 480 | CONFIG_IP_NF_TARGET_REJECT=m |
424 | CONFIG_IP_NF_TARGET_LOG=m | 481 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -426,11 +483,13 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
426 | CONFIG_NF_NAT=m | 483 | CONFIG_NF_NAT=m |
427 | CONFIG_NF_NAT_NEEDED=y | 484 | CONFIG_NF_NAT_NEEDED=y |
428 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 485 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
429 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
430 | CONFIG_IP_NF_TARGET_NETMAP=m | 486 | CONFIG_IP_NF_TARGET_NETMAP=m |
431 | CONFIG_IP_NF_TARGET_SAME=m | 487 | CONFIG_IP_NF_TARGET_REDIRECT=m |
432 | CONFIG_NF_NAT_SNMP_BASIC=m | 488 | CONFIG_NF_NAT_SNMP_BASIC=m |
489 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
433 | CONFIG_NF_NAT_PROTO_GRE=m | 490 | CONFIG_NF_NAT_PROTO_GRE=m |
491 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
492 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
434 | CONFIG_NF_NAT_FTP=m | 493 | CONFIG_NF_NAT_FTP=m |
435 | CONFIG_NF_NAT_IRC=m | 494 | CONFIG_NF_NAT_IRC=m |
436 | CONFIG_NF_NAT_TFTP=m | 495 | CONFIG_NF_NAT_TFTP=m |
@@ -439,32 +498,30 @@ CONFIG_NF_NAT_PPTP=m | |||
439 | CONFIG_NF_NAT_H323=m | 498 | CONFIG_NF_NAT_H323=m |
440 | CONFIG_NF_NAT_SIP=m | 499 | CONFIG_NF_NAT_SIP=m |
441 | CONFIG_IP_NF_MANGLE=m | 500 | CONFIG_IP_NF_MANGLE=m |
442 | CONFIG_IP_NF_TARGET_TOS=m | 501 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
443 | CONFIG_IP_NF_TARGET_ECN=m | 502 | CONFIG_IP_NF_TARGET_ECN=m |
444 | CONFIG_IP_NF_TARGET_TTL=m | 503 | CONFIG_IP_NF_TARGET_TTL=m |
445 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
446 | CONFIG_IP_NF_RAW=m | 504 | CONFIG_IP_NF_RAW=m |
447 | CONFIG_IP_NF_ARPTABLES=m | 505 | CONFIG_IP_NF_ARPTABLES=m |
448 | CONFIG_IP_NF_ARPFILTER=m | 506 | CONFIG_IP_NF_ARPFILTER=m |
449 | CONFIG_IP_NF_ARP_MANGLE=m | 507 | CONFIG_IP_NF_ARP_MANGLE=m |
450 | 508 | ||
451 | # | 509 | # |
452 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 510 | # IPv6: Netfilter Configuration |
453 | # | 511 | # |
454 | CONFIG_NF_CONNTRACK_IPV6=m | 512 | CONFIG_NF_CONNTRACK_IPV6=m |
455 | CONFIG_IP6_NF_QUEUE=m | 513 | CONFIG_IP6_NF_QUEUE=m |
456 | CONFIG_IP6_NF_IPTABLES=m | 514 | CONFIG_IP6_NF_IPTABLES=m |
457 | CONFIG_IP6_NF_MATCH_RT=m | 515 | CONFIG_IP6_NF_MATCH_AH=m |
458 | CONFIG_IP6_NF_MATCH_OPTS=m | 516 | CONFIG_IP6_NF_MATCH_EUI64=m |
459 | CONFIG_IP6_NF_MATCH_FRAG=m | 517 | CONFIG_IP6_NF_MATCH_FRAG=m |
518 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
460 | CONFIG_IP6_NF_MATCH_HL=m | 519 | CONFIG_IP6_NF_MATCH_HL=m |
461 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
462 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 520 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
463 | CONFIG_IP6_NF_MATCH_AH=m | ||
464 | CONFIG_IP6_NF_MATCH_MH=m | 521 | CONFIG_IP6_NF_MATCH_MH=m |
465 | CONFIG_IP6_NF_MATCH_EUI64=m | 522 | CONFIG_IP6_NF_MATCH_RT=m |
466 | CONFIG_IP6_NF_FILTER=m | ||
467 | CONFIG_IP6_NF_TARGET_LOG=m | 523 | CONFIG_IP6_NF_TARGET_LOG=m |
524 | CONFIG_IP6_NF_FILTER=m | ||
468 | CONFIG_IP6_NF_TARGET_REJECT=m | 525 | CONFIG_IP6_NF_TARGET_REJECT=m |
469 | CONFIG_IP6_NF_MANGLE=m | 526 | CONFIG_IP6_NF_MANGLE=m |
470 | CONFIG_IP6_NF_TARGET_HL=m | 527 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -479,6 +536,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
479 | # CONFIG_TIPC is not set | 536 | # CONFIG_TIPC is not set |
480 | # CONFIG_ATM is not set | 537 | # CONFIG_ATM is not set |
481 | # CONFIG_BRIDGE is not set | 538 | # CONFIG_BRIDGE is not set |
539 | # CONFIG_NET_DSA is not set | ||
482 | # CONFIG_VLAN_8021Q is not set | 540 | # CONFIG_VLAN_8021Q is not set |
483 | # CONFIG_DECNET is not set | 541 | # CONFIG_DECNET is not set |
484 | # CONFIG_LLC2 is not set | 542 | # CONFIG_LLC2 is not set |
@@ -488,12 +546,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
488 | # CONFIG_LAPB is not set | 546 | # CONFIG_LAPB is not set |
489 | # CONFIG_ECONET is not set | 547 | # CONFIG_ECONET is not set |
490 | # CONFIG_WAN_ROUTER is not set | 548 | # CONFIG_WAN_ROUTER is not set |
491 | |||
492 | # | ||
493 | # QoS and/or fair queueing | ||
494 | # | ||
495 | CONFIG_NET_SCHED=y | 549 | CONFIG_NET_SCHED=y |
496 | CONFIG_NET_SCH_FIFO=y | ||
497 | 550 | ||
498 | # | 551 | # |
499 | # Queueing/Scheduling | 552 | # Queueing/Scheduling |
@@ -502,7 +555,7 @@ CONFIG_NET_SCH_CBQ=m | |||
502 | CONFIG_NET_SCH_HTB=m | 555 | CONFIG_NET_SCH_HTB=m |
503 | CONFIG_NET_SCH_HFSC=m | 556 | CONFIG_NET_SCH_HFSC=m |
504 | CONFIG_NET_SCH_PRIO=m | 557 | CONFIG_NET_SCH_PRIO=m |
505 | CONFIG_NET_SCH_RR=m | 558 | # CONFIG_NET_SCH_MULTIQ is not set |
506 | CONFIG_NET_SCH_RED=m | 559 | CONFIG_NET_SCH_RED=m |
507 | CONFIG_NET_SCH_SFQ=m | 560 | CONFIG_NET_SCH_SFQ=m |
508 | CONFIG_NET_SCH_TEQL=m | 561 | CONFIG_NET_SCH_TEQL=m |
@@ -526,6 +579,7 @@ CONFIG_NET_CLS_U32=m | |||
526 | # CONFIG_CLS_U32_MARK is not set | 579 | # CONFIG_CLS_U32_MARK is not set |
527 | CONFIG_NET_CLS_RSVP=m | 580 | CONFIG_NET_CLS_RSVP=m |
528 | CONFIG_NET_CLS_RSVP6=m | 581 | CONFIG_NET_CLS_RSVP6=m |
582 | CONFIG_NET_CLS_FLOW=m | ||
529 | # CONFIG_NET_EMATCH is not set | 583 | # CONFIG_NET_EMATCH is not set |
530 | CONFIG_NET_CLS_ACT=y | 584 | CONFIG_NET_CLS_ACT=y |
531 | CONFIG_NET_ACT_POLICE=y | 585 | CONFIG_NET_ACT_POLICE=y |
@@ -533,35 +587,28 @@ CONFIG_NET_ACT_GACT=m | |||
533 | CONFIG_GACT_PROB=y | 587 | CONFIG_GACT_PROB=y |
534 | CONFIG_NET_ACT_MIRRED=m | 588 | CONFIG_NET_ACT_MIRRED=m |
535 | CONFIG_NET_ACT_IPT=m | 589 | CONFIG_NET_ACT_IPT=m |
590 | CONFIG_NET_ACT_NAT=m | ||
536 | CONFIG_NET_ACT_PEDIT=m | 591 | CONFIG_NET_ACT_PEDIT=m |
537 | CONFIG_NET_ACT_SIMP=m | 592 | CONFIG_NET_ACT_SIMP=m |
538 | CONFIG_NET_CLS_POLICE=y | 593 | CONFIG_NET_ACT_SKBEDIT=m |
539 | # CONFIG_NET_CLS_IND is not set | 594 | # CONFIG_NET_CLS_IND is not set |
595 | CONFIG_NET_SCH_FIFO=y | ||
540 | 596 | ||
541 | # | 597 | # |
542 | # Network testing | 598 | # Network testing |
543 | # | 599 | # |
544 | # CONFIG_NET_PKTGEN is not set | 600 | # CONFIG_NET_PKTGEN is not set |
545 | # CONFIG_HAMRADIO is not set | 601 | # CONFIG_HAMRADIO is not set |
602 | # CONFIG_CAN is not set | ||
546 | # CONFIG_IRDA is not set | 603 | # CONFIG_IRDA is not set |
547 | # CONFIG_BT is not set | 604 | # CONFIG_BT is not set |
548 | # CONFIG_AF_RXRPC is not set | 605 | # CONFIG_AF_RXRPC is not set |
606 | CONFIG_PHONET=m | ||
549 | CONFIG_FIB_RULES=y | 607 | CONFIG_FIB_RULES=y |
550 | 608 | # CONFIG_WIRELESS is not set | |
551 | # | ||
552 | # Wireless | ||
553 | # | ||
554 | CONFIG_CFG80211=m | ||
555 | CONFIG_WIRELESS_EXT=y | 609 | CONFIG_WIRELESS_EXT=y |
556 | CONFIG_MAC80211=m | ||
557 | # CONFIG_MAC80211_DEBUG is not set | ||
558 | CONFIG_IEEE80211=m | 610 | CONFIG_IEEE80211=m |
559 | # CONFIG_IEEE80211_DEBUG is not set | ||
560 | CONFIG_IEEE80211_CRYPT_WEP=m | 611 | CONFIG_IEEE80211_CRYPT_WEP=m |
561 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
562 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
563 | CONFIG_IEEE80211_SOFTMAC=m | ||
564 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
565 | CONFIG_RFKILL=m | 612 | CONFIG_RFKILL=m |
566 | CONFIG_RFKILL_INPUT=m | 613 | CONFIG_RFKILL_INPUT=m |
567 | # CONFIG_NET_9P is not set | 614 | # CONFIG_NET_9P is not set |
@@ -588,7 +635,9 @@ CONFIG_CDROM_PKTCDVD=m | |||
588 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 635 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
589 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 636 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
590 | CONFIG_ATA_OVER_ETH=m | 637 | CONFIG_ATA_OVER_ETH=m |
638 | # CONFIG_BLK_DEV_HD is not set | ||
591 | # CONFIG_MISC_DEVICES is not set | 639 | # CONFIG_MISC_DEVICES is not set |
640 | CONFIG_HAVE_IDE=y | ||
592 | # CONFIG_IDE is not set | 641 | # CONFIG_IDE is not set |
593 | 642 | ||
594 | # | 643 | # |
@@ -628,20 +677,22 @@ CONFIG_SCSI_SPI_ATTRS=m | |||
628 | # CONFIG_SCSI_FC_ATTRS is not set | 677 | # CONFIG_SCSI_FC_ATTRS is not set |
629 | CONFIG_SCSI_ISCSI_ATTRS=m | 678 | CONFIG_SCSI_ISCSI_ATTRS=m |
630 | # CONFIG_SCSI_SAS_LIBSAS is not set | 679 | # CONFIG_SCSI_SAS_LIBSAS is not set |
680 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
631 | CONFIG_SCSI_LOWLEVEL=y | 681 | CONFIG_SCSI_LOWLEVEL=y |
632 | CONFIG_ISCSI_TCP=m | 682 | CONFIG_ISCSI_TCP=m |
633 | CONFIG_SGIWD93_SCSI=y | 683 | CONFIG_SGIWD93_SCSI=y |
634 | # CONFIG_SCSI_DEBUG is not set | 684 | # CONFIG_SCSI_DEBUG is not set |
685 | # CONFIG_SCSI_DH is not set | ||
635 | # CONFIG_ATA is not set | 686 | # CONFIG_ATA is not set |
636 | # CONFIG_MD is not set | 687 | # CONFIG_MD is not set |
637 | CONFIG_NETDEVICES=y | 688 | CONFIG_NETDEVICES=y |
638 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
639 | # CONFIG_IFB is not set | 689 | # CONFIG_IFB is not set |
640 | CONFIG_DUMMY=m | 690 | CONFIG_DUMMY=m |
641 | CONFIG_BONDING=m | 691 | CONFIG_BONDING=m |
642 | CONFIG_MACVLAN=m | 692 | CONFIG_MACVLAN=m |
643 | CONFIG_EQUALIZER=m | 693 | CONFIG_EQUALIZER=m |
644 | CONFIG_TUN=m | 694 | CONFIG_TUN=m |
695 | CONFIG_VETH=m | ||
645 | CONFIG_PHYLIB=m | 696 | CONFIG_PHYLIB=m |
646 | 697 | ||
647 | # | 698 | # |
@@ -656,11 +707,21 @@ CONFIG_CICADA_PHY=m | |||
656 | # CONFIG_SMSC_PHY is not set | 707 | # CONFIG_SMSC_PHY is not set |
657 | # CONFIG_BROADCOM_PHY is not set | 708 | # CONFIG_BROADCOM_PHY is not set |
658 | # CONFIG_ICPLUS_PHY is not set | 709 | # CONFIG_ICPLUS_PHY is not set |
659 | # CONFIG_FIXED_PHY is not set | 710 | CONFIG_REALTEK_PHY=m |
711 | CONFIG_MDIO_BITBANG=m | ||
660 | CONFIG_NET_ETHERNET=y | 712 | CONFIG_NET_ETHERNET=y |
661 | # CONFIG_MII is not set | 713 | CONFIG_MII=m |
662 | # CONFIG_AX88796 is not set | 714 | # CONFIG_AX88796 is not set |
715 | CONFIG_SMC91X=m | ||
663 | # CONFIG_DM9000 is not set | 716 | # CONFIG_DM9000 is not set |
717 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
718 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
719 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
720 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
721 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
722 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
723 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
724 | # CONFIG_B44 is not set | ||
664 | CONFIG_SGISEEQ=y | 725 | CONFIG_SGISEEQ=y |
665 | # CONFIG_NETDEV_1000 is not set | 726 | # CONFIG_NETDEV_1000 is not set |
666 | # CONFIG_NETDEV_10000 is not set | 727 | # CONFIG_NETDEV_10000 is not set |
@@ -672,12 +733,12 @@ CONFIG_WLAN_PRE80211=y | |||
672 | CONFIG_STRIP=m | 733 | CONFIG_STRIP=m |
673 | CONFIG_WLAN_80211=y | 734 | CONFIG_WLAN_80211=y |
674 | # CONFIG_LIBERTAS is not set | 735 | # CONFIG_LIBERTAS is not set |
736 | # CONFIG_IWLWIFI_LEDS is not set | ||
675 | CONFIG_HOSTAP=m | 737 | CONFIG_HOSTAP=m |
676 | # CONFIG_HOSTAP_FIRMWARE is not set | 738 | # CONFIG_HOSTAP_FIRMWARE is not set |
677 | # CONFIG_WAN is not set | 739 | # CONFIG_WAN is not set |
678 | # CONFIG_PPP is not set | 740 | # CONFIG_PPP is not set |
679 | # CONFIG_SLIP is not set | 741 | # CONFIG_SLIP is not set |
680 | # CONFIG_SHAPER is not set | ||
681 | # CONFIG_NETCONSOLE is not set | 742 | # CONFIG_NETCONSOLE is not set |
682 | # CONFIG_NETPOLL is not set | 743 | # CONFIG_NETPOLL is not set |
683 | # CONFIG_NET_POLL_CONTROLLER is not set | 744 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -699,7 +760,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
699 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 760 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
700 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 761 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
701 | # CONFIG_INPUT_JOYDEV is not set | 762 | # CONFIG_INPUT_JOYDEV is not set |
702 | # CONFIG_INPUT_TSDEV is not set | ||
703 | # CONFIG_INPUT_EVDEV is not set | 763 | # CONFIG_INPUT_EVDEV is not set |
704 | # CONFIG_INPUT_EVBUG is not set | 764 | # CONFIG_INPUT_EVBUG is not set |
705 | 765 | ||
@@ -720,6 +780,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
720 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set | 780 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set |
721 | # CONFIG_MOUSE_PS2_LIFEBOOK is not set | 781 | # CONFIG_MOUSE_PS2_LIFEBOOK is not set |
722 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 782 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
783 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
723 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 784 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
724 | CONFIG_MOUSE_SERIAL=m | 785 | CONFIG_MOUSE_SERIAL=m |
725 | # CONFIG_MOUSE_VSXXXAA is not set | 786 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -742,9 +803,11 @@ CONFIG_SERIO_RAW=m | |||
742 | # Character devices | 803 | # Character devices |
743 | # | 804 | # |
744 | CONFIG_VT=y | 805 | CONFIG_VT=y |
806 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
745 | CONFIG_VT_CONSOLE=y | 807 | CONFIG_VT_CONSOLE=y |
746 | CONFIG_HW_CONSOLE=y | 808 | CONFIG_HW_CONSOLE=y |
747 | CONFIG_VT_HW_CONSOLE_BINDING=y | 809 | CONFIG_VT_HW_CONSOLE_BINDING=y |
810 | CONFIG_DEVKMEM=y | ||
748 | # CONFIG_SERIAL_NONSTANDARD is not set | 811 | # CONFIG_SERIAL_NONSTANDARD is not set |
749 | 812 | ||
750 | # | 813 | # |
@@ -761,6 +824,17 @@ CONFIG_UNIX98_PTYS=y | |||
761 | CONFIG_LEGACY_PTYS=y | 824 | CONFIG_LEGACY_PTYS=y |
762 | CONFIG_LEGACY_PTY_COUNT=256 | 825 | CONFIG_LEGACY_PTY_COUNT=256 |
763 | # CONFIG_IPMI_HANDLER is not set | 826 | # CONFIG_IPMI_HANDLER is not set |
827 | # CONFIG_HW_RANDOM is not set | ||
828 | # CONFIG_R3964 is not set | ||
829 | CONFIG_RAW_DRIVER=m | ||
830 | CONFIG_MAX_RAW_DEVS=256 | ||
831 | # CONFIG_TCG_TPM is not set | ||
832 | # CONFIG_I2C is not set | ||
833 | # CONFIG_SPI is not set | ||
834 | # CONFIG_W1 is not set | ||
835 | # CONFIG_POWER_SUPPLY is not set | ||
836 | # CONFIG_HWMON is not set | ||
837 | CONFIG_THERMAL=m | ||
764 | CONFIG_WATCHDOG=y | 838 | CONFIG_WATCHDOG=y |
765 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 839 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
766 | 840 | ||
@@ -769,47 +843,50 @@ CONFIG_WATCHDOG=y | |||
769 | # | 843 | # |
770 | # CONFIG_SOFT_WATCHDOG is not set | 844 | # CONFIG_SOFT_WATCHDOG is not set |
771 | CONFIG_INDYDOG=m | 845 | CONFIG_INDYDOG=m |
772 | # CONFIG_HW_RANDOM is not set | 846 | CONFIG_SSB_POSSIBLE=y |
773 | # CONFIG_RTC is not set | ||
774 | # CONFIG_R3964 is not set | ||
775 | CONFIG_RAW_DRIVER=m | ||
776 | CONFIG_MAX_RAW_DEVS=256 | ||
777 | # CONFIG_TCG_TPM is not set | ||
778 | # CONFIG_I2C is not set | ||
779 | 847 | ||
780 | # | 848 | # |
781 | # SPI support | 849 | # Sonics Silicon Backplane |
782 | # | 850 | # |
783 | # CONFIG_SPI is not set | 851 | # CONFIG_SSB is not set |
784 | # CONFIG_SPI_MASTER is not set | ||
785 | # CONFIG_W1 is not set | ||
786 | # CONFIG_POWER_SUPPLY is not set | ||
787 | # CONFIG_HWMON is not set | ||
788 | 852 | ||
789 | # | 853 | # |
790 | # Multifunction device drivers | 854 | # Multifunction device drivers |
791 | # | 855 | # |
856 | # CONFIG_MFD_CORE is not set | ||
792 | # CONFIG_MFD_SM501 is not set | 857 | # CONFIG_MFD_SM501 is not set |
858 | # CONFIG_HTC_PASIC3 is not set | ||
859 | # CONFIG_MFD_TMIO is not set | ||
860 | # CONFIG_REGULATOR is not set | ||
793 | 861 | ||
794 | # | 862 | # |
795 | # Multimedia devices | 863 | # Multimedia devices |
796 | # | 864 | # |
865 | |||
866 | # | ||
867 | # Multimedia core support | ||
868 | # | ||
797 | # CONFIG_VIDEO_DEV is not set | 869 | # CONFIG_VIDEO_DEV is not set |
798 | # CONFIG_DVB_CORE is not set | 870 | # CONFIG_DVB_CORE is not set |
871 | # CONFIG_VIDEO_MEDIA is not set | ||
872 | |||
873 | # | ||
874 | # Multimedia drivers | ||
875 | # | ||
799 | # CONFIG_DAB is not set | 876 | # CONFIG_DAB is not set |
800 | 877 | ||
801 | # | 878 | # |
802 | # Graphics support | 879 | # Graphics support |
803 | # | 880 | # |
881 | # CONFIG_VGASTATE is not set | ||
882 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
883 | # CONFIG_FB is not set | ||
804 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 884 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
805 | 885 | ||
806 | # | 886 | # |
807 | # Display device support | 887 | # Display device support |
808 | # | 888 | # |
809 | # CONFIG_DISPLAY_SUPPORT is not set | 889 | # CONFIG_DISPLAY_SUPPORT is not set |
810 | # CONFIG_VGASTATE is not set | ||
811 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
812 | # CONFIG_FB is not set | ||
813 | 890 | ||
814 | # | 891 | # |
815 | # Console display driver support | 892 | # Console display driver support |
@@ -823,48 +900,77 @@ CONFIG_LOGO=y | |||
823 | # CONFIG_LOGO_LINUX_VGA16 is not set | 900 | # CONFIG_LOGO_LINUX_VGA16 is not set |
824 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 901 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
825 | CONFIG_LOGO_SGI_CLUT224=y | 902 | CONFIG_LOGO_SGI_CLUT224=y |
826 | |||
827 | # | ||
828 | # Sound | ||
829 | # | ||
830 | # CONFIG_SOUND is not set | 903 | # CONFIG_SOUND is not set |
831 | CONFIG_HID_SUPPORT=y | 904 | CONFIG_HID_SUPPORT=y |
832 | CONFIG_HID=y | 905 | CONFIG_HID=y |
833 | # CONFIG_HID_DEBUG is not set | 906 | # CONFIG_HID_DEBUG is not set |
907 | CONFIG_HIDRAW=y | ||
908 | CONFIG_HID_PID=y | ||
909 | |||
910 | # | ||
911 | # Special HID drivers | ||
912 | # | ||
913 | CONFIG_HID_COMPAT=y | ||
834 | CONFIG_USB_SUPPORT=y | 914 | CONFIG_USB_SUPPORT=y |
835 | # CONFIG_USB_ARCH_HAS_HCD is not set | 915 | # CONFIG_USB_ARCH_HAS_HCD is not set |
836 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 916 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
837 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 917 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
918 | # CONFIG_USB_OTG_WHITELIST is not set | ||
919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
838 | 920 | ||
839 | # | 921 | # |
840 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 922 | # Enable Host or Gadget support to see Inventra options |
841 | # | 923 | # |
842 | 924 | ||
843 | # | 925 | # |
844 | # USB Gadget Support | 926 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
845 | # | 927 | # |
846 | # CONFIG_USB_GADGET is not set | 928 | # CONFIG_USB_GADGET is not set |
847 | # CONFIG_MMC is not set | 929 | # CONFIG_MMC is not set |
930 | # CONFIG_MEMSTICK is not set | ||
848 | # CONFIG_NEW_LEDS is not set | 931 | # CONFIG_NEW_LEDS is not set |
849 | # CONFIG_RTC_CLASS is not set | 932 | # CONFIG_ACCESSIBILITY is not set |
933 | CONFIG_RTC_LIB=y | ||
934 | CONFIG_RTC_CLASS=y | ||
935 | CONFIG_RTC_HCTOSYS=y | ||
936 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
937 | # CONFIG_RTC_DEBUG is not set | ||
850 | 938 | ||
851 | # | 939 | # |
852 | # DMA Engine support | 940 | # RTC interfaces |
853 | # | 941 | # |
854 | # CONFIG_DMA_ENGINE is not set | 942 | CONFIG_RTC_INTF_SYSFS=y |
943 | CONFIG_RTC_INTF_PROC=y | ||
944 | CONFIG_RTC_INTF_DEV=y | ||
945 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | ||
946 | # CONFIG_RTC_DRV_TEST is not set | ||
855 | 947 | ||
856 | # | 948 | # |
857 | # DMA Clients | 949 | # SPI RTC drivers |
858 | # | 950 | # |
859 | 951 | ||
860 | # | 952 | # |
861 | # DMA Devices | 953 | # Platform RTC drivers |
862 | # | 954 | # |
955 | # CONFIG_RTC_DRV_CMOS is not set | ||
956 | CONFIG_RTC_DRV_DS1286=y | ||
957 | # CONFIG_RTC_DRV_DS1511 is not set | ||
958 | # CONFIG_RTC_DRV_DS1553 is not set | ||
959 | # CONFIG_RTC_DRV_DS1742 is not set | ||
960 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
961 | # CONFIG_RTC_DRV_M48T86 is not set | ||
962 | # CONFIG_RTC_DRV_M48T35 is not set | ||
963 | # CONFIG_RTC_DRV_M48T59 is not set | ||
964 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
965 | # CONFIG_RTC_DRV_V3020 is not set | ||
863 | 966 | ||
864 | # | 967 | # |
865 | # Userspace I/O | 968 | # on-CPU RTC drivers |
866 | # | 969 | # |
970 | # CONFIG_DMADEVICES is not set | ||
867 | # CONFIG_UIO is not set | 971 | # CONFIG_UIO is not set |
972 | # CONFIG_STAGING is not set | ||
973 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
868 | 974 | ||
869 | # | 975 | # |
870 | # File systems | 976 | # File systems |
@@ -876,29 +982,33 @@ CONFIG_EXT3_FS=y | |||
876 | CONFIG_EXT3_FS_XATTR=y | 982 | CONFIG_EXT3_FS_XATTR=y |
877 | CONFIG_EXT3_FS_POSIX_ACL=y | 983 | CONFIG_EXT3_FS_POSIX_ACL=y |
878 | CONFIG_EXT3_FS_SECURITY=y | 984 | CONFIG_EXT3_FS_SECURITY=y |
879 | # CONFIG_EXT4DEV_FS is not set | 985 | CONFIG_EXT4_FS=m |
986 | CONFIG_EXT4DEV_COMPAT=y | ||
987 | CONFIG_EXT4_FS_XATTR=y | ||
988 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
989 | CONFIG_EXT4_FS_SECURITY=y | ||
880 | CONFIG_JBD=y | 990 | CONFIG_JBD=y |
881 | # CONFIG_JBD_DEBUG is not set | 991 | CONFIG_JBD2=m |
882 | CONFIG_FS_MBCACHE=y | 992 | CONFIG_FS_MBCACHE=y |
883 | # CONFIG_REISERFS_FS is not set | 993 | # CONFIG_REISERFS_FS is not set |
884 | # CONFIG_JFS_FS is not set | 994 | # CONFIG_JFS_FS is not set |
885 | CONFIG_FS_POSIX_ACL=y | 995 | CONFIG_FS_POSIX_ACL=y |
996 | CONFIG_FILE_LOCKING=y | ||
886 | CONFIG_XFS_FS=m | 997 | CONFIG_XFS_FS=m |
887 | CONFIG_XFS_QUOTA=y | 998 | CONFIG_XFS_QUOTA=y |
888 | CONFIG_XFS_SECURITY=y | ||
889 | # CONFIG_XFS_POSIX_ACL is not set | 999 | # CONFIG_XFS_POSIX_ACL is not set |
890 | # CONFIG_XFS_RT is not set | 1000 | # CONFIG_XFS_RT is not set |
891 | # CONFIG_GFS2_FS is not set | 1001 | # CONFIG_XFS_DEBUG is not set |
892 | # CONFIG_OCFS2_FS is not set | 1002 | # CONFIG_OCFS2_FS is not set |
893 | CONFIG_MINIX_FS=m | 1003 | CONFIG_DNOTIFY=y |
894 | # CONFIG_ROMFS_FS is not set | ||
895 | CONFIG_INOTIFY=y | 1004 | CONFIG_INOTIFY=y |
896 | CONFIG_INOTIFY_USER=y | 1005 | CONFIG_INOTIFY_USER=y |
897 | CONFIG_QUOTA=y | 1006 | CONFIG_QUOTA=y |
1007 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
1008 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
898 | # CONFIG_QFMT_V1 is not set | 1009 | # CONFIG_QFMT_V1 is not set |
899 | CONFIG_QFMT_V2=m | 1010 | CONFIG_QFMT_V2=m |
900 | CONFIG_QUOTACTL=y | 1011 | CONFIG_QUOTACTL=y |
901 | CONFIG_DNOTIFY=y | ||
902 | CONFIG_AUTOFS_FS=m | 1012 | CONFIG_AUTOFS_FS=m |
903 | CONFIG_AUTOFS4_FS=m | 1013 | CONFIG_AUTOFS4_FS=m |
904 | CONFIG_FUSE_FS=m | 1014 | CONFIG_FUSE_FS=m |
@@ -929,11 +1039,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
929 | CONFIG_PROC_FS=y | 1039 | CONFIG_PROC_FS=y |
930 | CONFIG_PROC_KCORE=y | 1040 | CONFIG_PROC_KCORE=y |
931 | CONFIG_PROC_SYSCTL=y | 1041 | CONFIG_PROC_SYSCTL=y |
1042 | CONFIG_PROC_PAGE_MONITOR=y | ||
932 | CONFIG_SYSFS=y | 1043 | CONFIG_SYSFS=y |
933 | CONFIG_TMPFS=y | 1044 | CONFIG_TMPFS=y |
934 | CONFIG_TMPFS_POSIX_ACL=y | 1045 | CONFIG_TMPFS_POSIX_ACL=y |
935 | # CONFIG_HUGETLB_PAGE is not set | 1046 | # CONFIG_HUGETLB_PAGE is not set |
936 | CONFIG_RAMFS=y | ||
937 | CONFIG_CONFIGFS_FS=m | 1047 | CONFIG_CONFIGFS_FS=m |
938 | 1048 | ||
939 | # | 1049 | # |
@@ -949,27 +1059,25 @@ CONFIG_CONFIGFS_FS=m | |||
949 | CONFIG_EFS_FS=m | 1059 | CONFIG_EFS_FS=m |
950 | # CONFIG_CRAMFS is not set | 1060 | # CONFIG_CRAMFS is not set |
951 | # CONFIG_VXFS_FS is not set | 1061 | # CONFIG_VXFS_FS is not set |
1062 | CONFIG_MINIX_FS=m | ||
1063 | CONFIG_OMFS_FS=m | ||
952 | # CONFIG_HPFS_FS is not set | 1064 | # CONFIG_HPFS_FS is not set |
953 | # CONFIG_QNX4FS_FS is not set | 1065 | # CONFIG_QNX4FS_FS is not set |
1066 | # CONFIG_ROMFS_FS is not set | ||
954 | # CONFIG_SYSV_FS is not set | 1067 | # CONFIG_SYSV_FS is not set |
955 | CONFIG_UFS_FS=m | 1068 | CONFIG_UFS_FS=m |
956 | # CONFIG_UFS_FS_WRITE is not set | 1069 | # CONFIG_UFS_FS_WRITE is not set |
957 | # CONFIG_UFS_DEBUG is not set | 1070 | # CONFIG_UFS_DEBUG is not set |
958 | 1071 | CONFIG_NETWORK_FILESYSTEMS=y | |
959 | # | ||
960 | # Network File Systems | ||
961 | # | ||
962 | CONFIG_NFS_FS=m | 1072 | CONFIG_NFS_FS=m |
963 | CONFIG_NFS_V3=y | 1073 | CONFIG_NFS_V3=y |
964 | CONFIG_NFS_V3_ACL=y | 1074 | CONFIG_NFS_V3_ACL=y |
965 | # CONFIG_NFS_V4 is not set | 1075 | # CONFIG_NFS_V4 is not set |
966 | # CONFIG_NFS_DIRECTIO is not set | ||
967 | CONFIG_NFSD=m | 1076 | CONFIG_NFSD=m |
968 | CONFIG_NFSD_V2_ACL=y | 1077 | CONFIG_NFSD_V2_ACL=y |
969 | CONFIG_NFSD_V3=y | 1078 | CONFIG_NFSD_V3=y |
970 | CONFIG_NFSD_V3_ACL=y | 1079 | CONFIG_NFSD_V3_ACL=y |
971 | # CONFIG_NFSD_V4 is not set | 1080 | # CONFIG_NFSD_V4 is not set |
972 | CONFIG_NFSD_TCP=y | ||
973 | CONFIG_LOCKD=m | 1081 | CONFIG_LOCKD=m |
974 | CONFIG_LOCKD_V4=y | 1082 | CONFIG_LOCKD_V4=y |
975 | CONFIG_EXPORTFS=m | 1083 | CONFIG_EXPORTFS=m |
@@ -977,7 +1085,7 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
977 | CONFIG_NFS_COMMON=y | 1085 | CONFIG_NFS_COMMON=y |
978 | CONFIG_SUNRPC=m | 1086 | CONFIG_SUNRPC=m |
979 | CONFIG_SUNRPC_GSS=m | 1087 | CONFIG_SUNRPC_GSS=m |
980 | # CONFIG_SUNRPC_BIND34 is not set | 1088 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
981 | CONFIG_RPCSEC_GSS_KRB5=m | 1089 | CONFIG_RPCSEC_GSS_KRB5=m |
982 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1090 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
983 | CONFIG_SMB_FS=m | 1091 | CONFIG_SMB_FS=m |
@@ -986,12 +1094,12 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
986 | CONFIG_CIFS=m | 1094 | CONFIG_CIFS=m |
987 | # CONFIG_CIFS_STATS is not set | 1095 | # CONFIG_CIFS_STATS is not set |
988 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1096 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
1097 | CONFIG_CIFS_UPCALL=y | ||
989 | # CONFIG_CIFS_XATTR is not set | 1098 | # CONFIG_CIFS_XATTR is not set |
990 | # CONFIG_CIFS_DEBUG2 is not set | 1099 | # CONFIG_CIFS_DEBUG2 is not set |
991 | # CONFIG_CIFS_EXPERIMENTAL is not set | 1100 | # CONFIG_CIFS_EXPERIMENTAL is not set |
992 | # CONFIG_NCP_FS is not set | 1101 | # CONFIG_NCP_FS is not set |
993 | CONFIG_CODA_FS=m | 1102 | CONFIG_CODA_FS=m |
994 | # CONFIG_CODA_FS_OLD_API is not set | ||
995 | # CONFIG_AFS_FS is not set | 1103 | # CONFIG_AFS_FS is not set |
996 | 1104 | ||
997 | # | 1105 | # |
@@ -1015,10 +1123,6 @@ CONFIG_SGI_PARTITION=y | |||
1015 | # CONFIG_KARMA_PARTITION is not set | 1123 | # CONFIG_KARMA_PARTITION is not set |
1016 | # CONFIG_EFI_PARTITION is not set | 1124 | # CONFIG_EFI_PARTITION is not set |
1017 | # CONFIG_SYSV68_PARTITION is not set | 1125 | # CONFIG_SYSV68_PARTITION is not set |
1018 | |||
1019 | # | ||
1020 | # Native Language Support | ||
1021 | # | ||
1022 | CONFIG_NLS=m | 1126 | CONFIG_NLS=m |
1023 | CONFIG_NLS_DEFAULT="iso8859-1" | 1127 | CONFIG_NLS_DEFAULT="iso8859-1" |
1024 | CONFIG_NLS_CODEPAGE_437=m | 1128 | CONFIG_NLS_CODEPAGE_437=m |
@@ -1059,30 +1163,32 @@ CONFIG_NLS_ISO8859_15=m | |||
1059 | CONFIG_NLS_KOI8_R=m | 1163 | CONFIG_NLS_KOI8_R=m |
1060 | CONFIG_NLS_KOI8_U=m | 1164 | CONFIG_NLS_KOI8_U=m |
1061 | CONFIG_NLS_UTF8=m | 1165 | CONFIG_NLS_UTF8=m |
1062 | |||
1063 | # | ||
1064 | # Distributed Lock Manager | ||
1065 | # | ||
1066 | CONFIG_DLM=m | 1166 | CONFIG_DLM=m |
1067 | # CONFIG_DLM_DEBUG is not set | 1167 | # CONFIG_DLM_DEBUG is not set |
1068 | 1168 | ||
1069 | # | 1169 | # |
1070 | # Profiling support | ||
1071 | # | ||
1072 | # CONFIG_PROFILING is not set | ||
1073 | |||
1074 | # | ||
1075 | # Kernel hacking | 1170 | # Kernel hacking |
1076 | # | 1171 | # |
1077 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1172 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
1078 | # CONFIG_PRINTK_TIME is not set | 1173 | # CONFIG_PRINTK_TIME is not set |
1174 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1079 | CONFIG_ENABLE_MUST_CHECK=y | 1175 | CONFIG_ENABLE_MUST_CHECK=y |
1176 | CONFIG_FRAME_WARN=1024 | ||
1080 | # CONFIG_MAGIC_SYSRQ is not set | 1177 | # CONFIG_MAGIC_SYSRQ is not set |
1081 | # CONFIG_UNUSED_SYMBOLS is not set | 1178 | # CONFIG_UNUSED_SYMBOLS is not set |
1082 | # CONFIG_DEBUG_FS is not set | 1179 | # CONFIG_DEBUG_FS is not set |
1083 | # CONFIG_HEADERS_CHECK is not set | 1180 | # CONFIG_HEADERS_CHECK is not set |
1084 | # CONFIG_DEBUG_KERNEL is not set | 1181 | # CONFIG_DEBUG_KERNEL is not set |
1085 | CONFIG_CROSSCOMPILE=y | 1182 | CONFIG_DEBUG_MEMORY_INIT=y |
1183 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1184 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
1185 | |||
1186 | # | ||
1187 | # Tracers | ||
1188 | # | ||
1189 | CONFIG_DYNAMIC_PRINTK_DEBUG=y | ||
1190 | # CONFIG_SAMPLES is not set | ||
1191 | CONFIG_HAVE_ARCH_KGDB=y | ||
1086 | CONFIG_CMDLINE="" | 1192 | CONFIG_CMDLINE="" |
1087 | 1193 | ||
1088 | # | 1194 | # |
@@ -1091,46 +1197,97 @@ CONFIG_CMDLINE="" | |||
1091 | CONFIG_KEYS=y | 1197 | CONFIG_KEYS=y |
1092 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1198 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1093 | # CONFIG_SECURITY is not set | 1199 | # CONFIG_SECURITY is not set |
1200 | # CONFIG_SECURITYFS is not set | ||
1201 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
1094 | CONFIG_CRYPTO=y | 1202 | CONFIG_CRYPTO=y |
1203 | |||
1204 | # | ||
1205 | # Crypto core or helper | ||
1206 | # | ||
1207 | CONFIG_CRYPTO_FIPS=y | ||
1095 | CONFIG_CRYPTO_ALGAPI=y | 1208 | CONFIG_CRYPTO_ALGAPI=y |
1096 | CONFIG_CRYPTO_ABLKCIPHER=m | 1209 | CONFIG_CRYPTO_AEAD=y |
1097 | CONFIG_CRYPTO_BLKCIPHER=m | 1210 | CONFIG_CRYPTO_BLKCIPHER=y |
1098 | CONFIG_CRYPTO_HASH=y | 1211 | CONFIG_CRYPTO_HASH=y |
1212 | CONFIG_CRYPTO_RNG=y | ||
1099 | CONFIG_CRYPTO_MANAGER=y | 1213 | CONFIG_CRYPTO_MANAGER=y |
1214 | CONFIG_CRYPTO_GF128MUL=m | ||
1215 | CONFIG_CRYPTO_NULL=m | ||
1216 | CONFIG_CRYPTO_CRYPTD=m | ||
1217 | CONFIG_CRYPTO_AUTHENC=m | ||
1218 | # CONFIG_CRYPTO_TEST is not set | ||
1219 | |||
1220 | # | ||
1221 | # Authenticated Encryption with Associated Data | ||
1222 | # | ||
1223 | CONFIG_CRYPTO_CCM=m | ||
1224 | CONFIG_CRYPTO_GCM=m | ||
1225 | CONFIG_CRYPTO_SEQIV=m | ||
1226 | |||
1227 | # | ||
1228 | # Block modes | ||
1229 | # | ||
1230 | CONFIG_CRYPTO_CBC=m | ||
1231 | CONFIG_CRYPTO_CTR=m | ||
1232 | CONFIG_CRYPTO_CTS=m | ||
1233 | CONFIG_CRYPTO_ECB=m | ||
1234 | CONFIG_CRYPTO_LRW=m | ||
1235 | CONFIG_CRYPTO_PCBC=m | ||
1236 | CONFIG_CRYPTO_XTS=m | ||
1237 | |||
1238 | # | ||
1239 | # Hash modes | ||
1240 | # | ||
1100 | CONFIG_CRYPTO_HMAC=y | 1241 | CONFIG_CRYPTO_HMAC=y |
1101 | CONFIG_CRYPTO_XCBC=m | 1242 | CONFIG_CRYPTO_XCBC=m |
1102 | CONFIG_CRYPTO_NULL=m | 1243 | |
1244 | # | ||
1245 | # Digest | ||
1246 | # | ||
1247 | CONFIG_CRYPTO_CRC32C=m | ||
1103 | CONFIG_CRYPTO_MD4=m | 1248 | CONFIG_CRYPTO_MD4=m |
1104 | CONFIG_CRYPTO_MD5=y | 1249 | CONFIG_CRYPTO_MD5=y |
1250 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1251 | CONFIG_CRYPTO_RMD128=m | ||
1252 | CONFIG_CRYPTO_RMD160=m | ||
1253 | CONFIG_CRYPTO_RMD256=m | ||
1254 | CONFIG_CRYPTO_RMD320=m | ||
1105 | CONFIG_CRYPTO_SHA1=m | 1255 | CONFIG_CRYPTO_SHA1=m |
1106 | CONFIG_CRYPTO_SHA256=m | 1256 | CONFIG_CRYPTO_SHA256=m |
1107 | CONFIG_CRYPTO_SHA512=m | 1257 | CONFIG_CRYPTO_SHA512=m |
1108 | CONFIG_CRYPTO_WP512=m | ||
1109 | CONFIG_CRYPTO_TGR192=m | 1258 | CONFIG_CRYPTO_TGR192=m |
1110 | CONFIG_CRYPTO_GF128MUL=m | 1259 | CONFIG_CRYPTO_WP512=m |
1111 | CONFIG_CRYPTO_ECB=m | 1260 | |
1112 | CONFIG_CRYPTO_CBC=m | 1261 | # |
1113 | CONFIG_CRYPTO_PCBC=m | 1262 | # Ciphers |
1114 | CONFIG_CRYPTO_LRW=m | 1263 | # |
1115 | CONFIG_CRYPTO_CRYPTD=m | ||
1116 | CONFIG_CRYPTO_DES=m | ||
1117 | CONFIG_CRYPTO_FCRYPT=m | ||
1118 | CONFIG_CRYPTO_BLOWFISH=m | ||
1119 | CONFIG_CRYPTO_TWOFISH=m | ||
1120 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1121 | CONFIG_CRYPTO_SERPENT=m | ||
1122 | CONFIG_CRYPTO_AES=m | 1264 | CONFIG_CRYPTO_AES=m |
1265 | CONFIG_CRYPTO_ANUBIS=m | ||
1266 | CONFIG_CRYPTO_ARC4=m | ||
1267 | CONFIG_CRYPTO_BLOWFISH=m | ||
1268 | CONFIG_CRYPTO_CAMELLIA=m | ||
1123 | CONFIG_CRYPTO_CAST5=m | 1269 | CONFIG_CRYPTO_CAST5=m |
1124 | CONFIG_CRYPTO_CAST6=m | 1270 | CONFIG_CRYPTO_CAST6=m |
1125 | CONFIG_CRYPTO_TEA=m | 1271 | CONFIG_CRYPTO_DES=m |
1126 | CONFIG_CRYPTO_ARC4=m | 1272 | CONFIG_CRYPTO_FCRYPT=m |
1127 | CONFIG_CRYPTO_KHAZAD=m | 1273 | CONFIG_CRYPTO_KHAZAD=m |
1128 | CONFIG_CRYPTO_ANUBIS=m | 1274 | CONFIG_CRYPTO_SALSA20=m |
1275 | CONFIG_CRYPTO_SEED=m | ||
1276 | CONFIG_CRYPTO_SERPENT=m | ||
1277 | CONFIG_CRYPTO_TEA=m | ||
1278 | CONFIG_CRYPTO_TWOFISH=m | ||
1279 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1280 | |||
1281 | # | ||
1282 | # Compression | ||
1283 | # | ||
1129 | CONFIG_CRYPTO_DEFLATE=m | 1284 | CONFIG_CRYPTO_DEFLATE=m |
1130 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1285 | CONFIG_CRYPTO_LZO=m |
1131 | CONFIG_CRYPTO_CRC32C=m | 1286 | |
1132 | CONFIG_CRYPTO_CAMELLIA=m | 1287 | # |
1133 | # CONFIG_CRYPTO_TEST is not set | 1288 | # Random Number Generation |
1289 | # | ||
1290 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
1134 | # CONFIG_CRYPTO_HW is not set | 1291 | # CONFIG_CRYPTO_HW is not set |
1135 | 1292 | ||
1136 | # | 1293 | # |
@@ -1139,12 +1296,15 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
1139 | CONFIG_BITREVERSE=m | 1296 | CONFIG_BITREVERSE=m |
1140 | # CONFIG_CRC_CCITT is not set | 1297 | # CONFIG_CRC_CCITT is not set |
1141 | CONFIG_CRC16=m | 1298 | CONFIG_CRC16=m |
1142 | # CONFIG_CRC_ITU_T is not set | 1299 | CONFIG_CRC_T10DIF=m |
1300 | CONFIG_CRC_ITU_T=m | ||
1143 | CONFIG_CRC32=m | 1301 | CONFIG_CRC32=m |
1144 | # CONFIG_CRC7 is not set | 1302 | # CONFIG_CRC7 is not set |
1145 | CONFIG_LIBCRC32C=m | 1303 | CONFIG_LIBCRC32C=m |
1146 | CONFIG_ZLIB_INFLATE=m | 1304 | CONFIG_ZLIB_INFLATE=m |
1147 | CONFIG_ZLIB_DEFLATE=m | 1305 | CONFIG_ZLIB_DEFLATE=m |
1306 | CONFIG_LZO_COMPRESS=m | ||
1307 | CONFIG_LZO_DECOMPRESS=m | ||
1148 | CONFIG_TEXTSEARCH=y | 1308 | CONFIG_TEXTSEARCH=y |
1149 | CONFIG_TEXTSEARCH_KMP=m | 1309 | CONFIG_TEXTSEARCH_KMP=m |
1150 | CONFIG_TEXTSEARCH_BM=m | 1310 | CONFIG_TEXTSEARCH_BM=m |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index fe4699df9626..de4c7a0a96dd 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
@@ -1,71 +1,71 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Tue Feb 20 21:47:33 2007 | 4 | # Wed Dec 10 14:39:08 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
13 | # CONFIG_BCM47XX is not set | ||
26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LASAT is not set | ||
18 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
30 | # CONFIG_WR_PPMC is not set | ||
31 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
32 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MACH_EMMA is not set |
33 | # CONFIG_MIPS_XXS1500 is not set | 22 | # CONFIG_MACH_VR41XX is not set |
23 | # CONFIG_NXP_STB220 is not set | ||
24 | # CONFIG_NXP_STB225 is not set | ||
34 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
35 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
36 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
37 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
38 | # CONFIG_MARKEINS is not set | ||
39 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
40 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
31 | # CONFIG_SGI_IP28 is not set | ||
41 | CONFIG_SGI_IP32=y | 32 | CONFIG_SGI_IP32=y |
42 | # CONFIG_SIBYTE_BIGSUR is not set | ||
43 | # CONFIG_SIBYTE_SWARM is not set | ||
44 | # CONFIG_SIBYTE_SENTOSA is not set | ||
45 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_CARMEL is not set | ||
47 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
48 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
34 | # CONFIG_SIBYTE_CARMEL is not set | ||
49 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
36 | # CONFIG_SIBYTE_RHONE is not set | ||
37 | # CONFIG_SIBYTE_SWARM is not set | ||
38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
50 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
51 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
52 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
53 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
45 | # CONFIG_WR_PPMC is not set | ||
54 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
55 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
56 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
57 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
58 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
59 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
60 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
61 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
62 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 57 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
63 | CONFIG_ARC=y | 58 | CONFIG_ARC=y |
59 | CONFIG_CEVT_R4K=y | ||
60 | CONFIG_CSRC_R4K=y | ||
64 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
65 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
63 | # CONFIG_HOTPLUG_CPU is not set | ||
64 | # CONFIG_NO_IOPORT is not set | ||
66 | CONFIG_CPU_BIG_ENDIAN=y | 65 | CONFIG_CPU_BIG_ENDIAN=y |
67 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 66 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
68 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 67 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
68 | CONFIG_IRQ_CPU=y | ||
69 | CONFIG_ARC32=y | 69 | CONFIG_ARC32=y |
70 | CONFIG_BOOT_ELF32=y | 70 | CONFIG_BOOT_ELF32=y |
71 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 71 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
@@ -75,6 +75,7 @@ CONFIG_ARC_PROMLIB=y | |||
75 | # | 75 | # |
76 | # CPU selection | 76 | # CPU selection |
77 | # | 77 | # |
78 | # CONFIG_CPU_LOONGSON2 is not set | ||
78 | # CONFIG_CPU_MIPS32_R1 is not set | 79 | # CONFIG_CPU_MIPS32_R1 is not set |
79 | # CONFIG_CPU_MIPS32_R2 is not set | 80 | # CONFIG_CPU_MIPS32_R2 is not set |
80 | # CONFIG_CPU_MIPS64_R1 is not set | 81 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -87,6 +88,7 @@ CONFIG_ARC_PROMLIB=y | |||
87 | # CONFIG_CPU_TX49XX is not set | 88 | # CONFIG_CPU_TX49XX is not set |
88 | CONFIG_CPU_R5000=y | 89 | CONFIG_CPU_R5000=y |
89 | # CONFIG_CPU_R5432 is not set | 90 | # CONFIG_CPU_R5432 is not set |
91 | # CONFIG_CPU_R5500 is not set | ||
90 | # CONFIG_CPU_R6000 is not set | 92 | # CONFIG_CPU_R6000 is not set |
91 | # CONFIG_CPU_NEVADA is not set | 93 | # CONFIG_CPU_NEVADA is not set |
92 | # CONFIG_CPU_R8000 is not set | 94 | # CONFIG_CPU_R8000 is not set |
@@ -116,65 +118,73 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
116 | CONFIG_MIPS_MT_DISABLED=y | 118 | CONFIG_MIPS_MT_DISABLED=y |
117 | # CONFIG_MIPS_MT_SMP is not set | 119 | # CONFIG_MIPS_MT_SMP is not set |
118 | # CONFIG_MIPS_MT_SMTC is not set | 120 | # CONFIG_MIPS_MT_SMTC is not set |
119 | # CONFIG_MIPS_VPE_LOADER is not set | ||
120 | CONFIG_CPU_HAS_LLSC=y | 121 | CONFIG_CPU_HAS_LLSC=y |
121 | CONFIG_CPU_HAS_SYNC=y | 122 | CONFIG_CPU_HAS_SYNC=y |
122 | CONFIG_GENERIC_HARDIRQS=y | 123 | CONFIG_GENERIC_HARDIRQS=y |
123 | CONFIG_GENERIC_IRQ_PROBE=y | 124 | CONFIG_GENERIC_IRQ_PROBE=y |
124 | CONFIG_ARCH_FLATMEM_ENABLE=y | 125 | CONFIG_ARCH_FLATMEM_ENABLE=y |
126 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
125 | CONFIG_SELECT_MEMORY_MODEL=y | 127 | CONFIG_SELECT_MEMORY_MODEL=y |
126 | CONFIG_FLATMEM_MANUAL=y | 128 | CONFIG_FLATMEM_MANUAL=y |
127 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 129 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
128 | # CONFIG_SPARSEMEM_MANUAL is not set | 130 | # CONFIG_SPARSEMEM_MANUAL is not set |
129 | CONFIG_FLATMEM=y | 131 | CONFIG_FLATMEM=y |
130 | CONFIG_FLAT_NODE_MEM_MAP=y | 132 | CONFIG_FLAT_NODE_MEM_MAP=y |
131 | # CONFIG_SPARSEMEM_STATIC is not set | 133 | CONFIG_PAGEFLAGS_EXTENDED=y |
132 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
133 | CONFIG_RESOURCES_64BIT=y | 135 | CONFIG_RESOURCES_64BIT=y |
134 | CONFIG_ZONE_DMA_FLAG=1 | 136 | CONFIG_PHYS_ADDR_T_64BIT=y |
137 | CONFIG_ZONE_DMA_FLAG=0 | ||
138 | CONFIG_VIRT_TO_BUS=y | ||
139 | CONFIG_UNEVICTABLE_LRU=y | ||
140 | # CONFIG_NO_HZ is not set | ||
141 | # CONFIG_HIGH_RES_TIMERS is not set | ||
142 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
135 | # CONFIG_HZ_48 is not set | 143 | # CONFIG_HZ_48 is not set |
136 | # CONFIG_HZ_100 is not set | 144 | # CONFIG_HZ_100 is not set |
137 | # CONFIG_HZ_128 is not set | 145 | # CONFIG_HZ_128 is not set |
138 | # CONFIG_HZ_250 is not set | 146 | CONFIG_HZ_250=y |
139 | # CONFIG_HZ_256 is not set | 147 | # CONFIG_HZ_256 is not set |
140 | CONFIG_HZ_1000=y | 148 | # CONFIG_HZ_1000 is not set |
141 | # CONFIG_HZ_1024 is not set | 149 | # CONFIG_HZ_1024 is not set |
142 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 150 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
143 | CONFIG_HZ=1000 | 151 | CONFIG_HZ=250 |
144 | # CONFIG_PREEMPT_NONE is not set | 152 | CONFIG_PREEMPT_NONE=y |
145 | CONFIG_PREEMPT_VOLUNTARY=y | 153 | # CONFIG_PREEMPT_VOLUNTARY is not set |
146 | # CONFIG_PREEMPT is not set | 154 | # CONFIG_PREEMPT is not set |
147 | # CONFIG_KEXEC is not set | 155 | # CONFIG_KEXEC is not set |
156 | # CONFIG_SECCOMP is not set | ||
148 | CONFIG_LOCKDEP_SUPPORT=y | 157 | CONFIG_LOCKDEP_SUPPORT=y |
149 | CONFIG_STACKTRACE_SUPPORT=y | 158 | CONFIG_STACKTRACE_SUPPORT=y |
150 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 159 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
151 | 160 | ||
152 | # | 161 | # |
153 | # Code maturity level options | 162 | # General setup |
154 | # | 163 | # |
155 | CONFIG_EXPERIMENTAL=y | 164 | CONFIG_EXPERIMENTAL=y |
156 | CONFIG_BROKEN_ON_SMP=y | 165 | CONFIG_BROKEN_ON_SMP=y |
157 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 166 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
158 | |||
159 | # | ||
160 | # General setup | ||
161 | # | ||
162 | CONFIG_LOCALVERSION="" | 167 | CONFIG_LOCALVERSION="" |
163 | CONFIG_LOCALVERSION_AUTO=y | 168 | CONFIG_LOCALVERSION_AUTO=y |
164 | CONFIG_SWAP=y | 169 | CONFIG_SWAP=y |
165 | CONFIG_SYSVIPC=y | 170 | CONFIG_SYSVIPC=y |
166 | # CONFIG_IPC_NS is not set | ||
167 | CONFIG_SYSVIPC_SYSCTL=y | 171 | CONFIG_SYSVIPC_SYSCTL=y |
168 | # CONFIG_POSIX_MQUEUE is not set | 172 | CONFIG_POSIX_MQUEUE=y |
169 | CONFIG_BSD_PROCESS_ACCT=y | 173 | CONFIG_BSD_PROCESS_ACCT=y |
170 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 174 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
171 | # CONFIG_TASKSTATS is not set | 175 | # CONFIG_TASKSTATS is not set |
172 | # CONFIG_UTS_NS is not set | 176 | CONFIG_AUDIT=y |
173 | # CONFIG_AUDIT is not set | 177 | CONFIG_IKCONFIG=y |
174 | # CONFIG_IKCONFIG is not set | 178 | CONFIG_IKCONFIG_PROC=y |
179 | CONFIG_LOG_BUF_SHIFT=14 | ||
180 | # CONFIG_CGROUPS is not set | ||
181 | # CONFIG_GROUP_SCHED is not set | ||
175 | CONFIG_SYSFS_DEPRECATED=y | 182 | CONFIG_SYSFS_DEPRECATED=y |
183 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
176 | CONFIG_RELAY=y | 184 | CONFIG_RELAY=y |
177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 185 | # CONFIG_NAMESPACES is not set |
186 | # CONFIG_BLK_DEV_INITRD is not set | ||
187 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
178 | CONFIG_SYSCTL=y | 188 | CONFIG_SYSCTL=y |
179 | CONFIG_EMBEDDED=y | 189 | CONFIG_EMBEDDED=y |
180 | CONFIG_SYSCTL_SYSCALL=y | 190 | CONFIG_SYSCTL_SYSCALL=y |
@@ -184,27 +194,43 @@ CONFIG_HOTPLUG=y | |||
184 | CONFIG_PRINTK=y | 194 | CONFIG_PRINTK=y |
185 | CONFIG_BUG=y | 195 | CONFIG_BUG=y |
186 | CONFIG_ELF_CORE=y | 196 | CONFIG_ELF_CORE=y |
197 | CONFIG_PCSPKR_PLATFORM=y | ||
198 | CONFIG_COMPAT_BRK=y | ||
187 | CONFIG_BASE_FULL=y | 199 | CONFIG_BASE_FULL=y |
188 | CONFIG_FUTEX=y | 200 | CONFIG_FUTEX=y |
201 | CONFIG_ANON_INODES=y | ||
189 | CONFIG_EPOLL=y | 202 | CONFIG_EPOLL=y |
203 | CONFIG_SIGNALFD=y | ||
204 | CONFIG_TIMERFD=y | ||
205 | CONFIG_EVENTFD=y | ||
190 | CONFIG_SHMEM=y | 206 | CONFIG_SHMEM=y |
191 | CONFIG_SLAB=y | 207 | CONFIG_AIO=y |
192 | CONFIG_VM_EVENT_COUNTERS=y | 208 | CONFIG_VM_EVENT_COUNTERS=y |
209 | CONFIG_PCI_QUIRKS=y | ||
210 | CONFIG_SLAB=y | ||
211 | # CONFIG_SLUB is not set | ||
212 | # CONFIG_SLOB is not set | ||
213 | CONFIG_PROFILING=y | ||
214 | # CONFIG_MARKERS is not set | ||
215 | CONFIG_OPROFILE=m | ||
216 | CONFIG_HAVE_OPROFILE=y | ||
217 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
218 | CONFIG_SLABINFO=y | ||
193 | CONFIG_RT_MUTEXES=y | 219 | CONFIG_RT_MUTEXES=y |
194 | # CONFIG_TINY_SHMEM is not set | 220 | # CONFIG_TINY_SHMEM is not set |
195 | CONFIG_BASE_SMALL=0 | 221 | CONFIG_BASE_SMALL=0 |
196 | # CONFIG_SLOB is not set | 222 | CONFIG_MODULES=y |
197 | 223 | # CONFIG_MODULE_FORCE_LOAD is not set | |
198 | # | 224 | CONFIG_MODULE_UNLOAD=y |
199 | # Loadable module support | 225 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
200 | # | 226 | # CONFIG_MODVERSIONS is not set |
201 | # CONFIG_MODULES is not set | 227 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
202 | 228 | CONFIG_KMOD=y | |
203 | # | ||
204 | # Block layer | ||
205 | # | ||
206 | CONFIG_BLOCK=y | 229 | CONFIG_BLOCK=y |
207 | # CONFIG_BLK_DEV_IO_TRACE is not set | 230 | # CONFIG_BLK_DEV_IO_TRACE is not set |
231 | # CONFIG_BLK_DEV_BSG is not set | ||
232 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
233 | CONFIG_BLOCK_COMPAT=y | ||
208 | 234 | ||
209 | # | 235 | # |
210 | # IO Schedulers | 236 | # IO Schedulers |
@@ -213,59 +239,50 @@ CONFIG_IOSCHED_NOOP=y | |||
213 | CONFIG_IOSCHED_AS=y | 239 | CONFIG_IOSCHED_AS=y |
214 | CONFIG_IOSCHED_DEADLINE=y | 240 | CONFIG_IOSCHED_DEADLINE=y |
215 | CONFIG_IOSCHED_CFQ=y | 241 | CONFIG_IOSCHED_CFQ=y |
216 | CONFIG_DEFAULT_AS=y | 242 | # CONFIG_DEFAULT_AS is not set |
217 | # CONFIG_DEFAULT_DEADLINE is not set | 243 | # CONFIG_DEFAULT_DEADLINE is not set |
218 | # CONFIG_DEFAULT_CFQ is not set | 244 | CONFIG_DEFAULT_CFQ=y |
219 | # CONFIG_DEFAULT_NOOP is not set | 245 | # CONFIG_DEFAULT_NOOP is not set |
220 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 246 | CONFIG_DEFAULT_IOSCHED="cfq" |
247 | CONFIG_CLASSIC_RCU=y | ||
248 | # CONFIG_FREEZER is not set | ||
221 | 249 | ||
222 | # | 250 | # |
223 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 251 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
224 | # | 252 | # |
225 | CONFIG_HW_HAS_PCI=y | 253 | CONFIG_HW_HAS_PCI=y |
226 | CONFIG_PCI=y | 254 | CONFIG_PCI=y |
255 | CONFIG_PCI_DOMAINS=y | ||
256 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
257 | # CONFIG_PCI_LEGACY is not set | ||
227 | CONFIG_MMU=y | 258 | CONFIG_MMU=y |
228 | |||
229 | # | ||
230 | # PCCARD (PCMCIA/CardBus) support | ||
231 | # | ||
232 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
233 | |||
234 | # | ||
235 | # PCI Hotplug Support | ||
236 | # | ||
237 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
238 | 261 | ||
239 | # | 262 | # |
240 | # Executable file formats | 263 | # Executable file formats |
241 | # | 264 | # |
242 | CONFIG_BINFMT_ELF=y | 265 | CONFIG_BINFMT_ELF=y |
266 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
267 | # CONFIG_HAVE_AOUT is not set | ||
243 | CONFIG_BINFMT_MISC=y | 268 | CONFIG_BINFMT_MISC=y |
244 | # CONFIG_BUILD_ELF64 is not set | ||
245 | CONFIG_MIPS32_COMPAT=y | 269 | CONFIG_MIPS32_COMPAT=y |
246 | CONFIG_COMPAT=y | 270 | CONFIG_COMPAT=y |
247 | CONFIG_SYSVIPC_COMPAT=y | 271 | CONFIG_SYSVIPC_COMPAT=y |
248 | CONFIG_MIPS32_O32=y | 272 | CONFIG_MIPS32_O32=y |
249 | # CONFIG_MIPS32_N32 is not set | 273 | CONFIG_MIPS32_N32=y |
250 | CONFIG_BINFMT_ELF32=y | 274 | CONFIG_BINFMT_ELF32=y |
251 | 275 | ||
252 | # | 276 | # |
253 | # Power management options | 277 | # Power management options |
254 | # | 278 | # |
255 | CONFIG_PM=y | 279 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
256 | # CONFIG_PM_LEGACY is not set | 280 | # CONFIG_PM is not set |
257 | # CONFIG_PM_DEBUG is not set | ||
258 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
259 | |||
260 | # | ||
261 | # Networking | ||
262 | # | ||
263 | CONFIG_NET=y | 281 | CONFIG_NET=y |
264 | 282 | ||
265 | # | 283 | # |
266 | # Networking options | 284 | # Networking options |
267 | # | 285 | # |
268 | # CONFIG_NETDEBUG is not set | ||
269 | CONFIG_PACKET=y | 286 | CONFIG_PACKET=y |
270 | CONFIG_PACKET_MMAP=y | 287 | CONFIG_PACKET_MMAP=y |
271 | CONFIG_UNIX=y | 288 | CONFIG_UNIX=y |
@@ -273,56 +290,83 @@ CONFIG_XFRM=y | |||
273 | CONFIG_XFRM_USER=y | 290 | CONFIG_XFRM_USER=y |
274 | # CONFIG_XFRM_SUB_POLICY is not set | 291 | # CONFIG_XFRM_SUB_POLICY is not set |
275 | CONFIG_XFRM_MIGRATE=y | 292 | CONFIG_XFRM_MIGRATE=y |
293 | # CONFIG_XFRM_STATISTICS is not set | ||
294 | CONFIG_XFRM_IPCOMP=m | ||
276 | CONFIG_NET_KEY=y | 295 | CONFIG_NET_KEY=y |
277 | CONFIG_NET_KEY_MIGRATE=y | 296 | CONFIG_NET_KEY_MIGRATE=y |
278 | CONFIG_INET=y | 297 | CONFIG_INET=y |
279 | # CONFIG_IP_MULTICAST is not set | 298 | CONFIG_IP_MULTICAST=y |
280 | # CONFIG_IP_ADVANCED_ROUTER is not set | 299 | # CONFIG_IP_ADVANCED_ROUTER is not set |
281 | CONFIG_IP_FIB_HASH=y | 300 | CONFIG_IP_FIB_HASH=y |
282 | CONFIG_IP_PNP=y | 301 | CONFIG_IP_PNP=y |
283 | # CONFIG_IP_PNP_DHCP is not set | 302 | CONFIG_IP_PNP_DHCP=y |
284 | CONFIG_IP_PNP_BOOTP=y | 303 | CONFIG_IP_PNP_BOOTP=y |
285 | # CONFIG_IP_PNP_RARP is not set | 304 | # CONFIG_IP_PNP_RARP is not set |
286 | # CONFIG_NET_IPIP is not set | 305 | CONFIG_NET_IPIP=m |
287 | # CONFIG_NET_IPGRE is not set | 306 | CONFIG_NET_IPGRE=m |
307 | # CONFIG_NET_IPGRE_BROADCAST is not set | ||
308 | # CONFIG_IP_MROUTE is not set | ||
288 | # CONFIG_ARPD is not set | 309 | # CONFIG_ARPD is not set |
289 | # CONFIG_SYN_COOKIES is not set | 310 | # CONFIG_SYN_COOKIES is not set |
290 | # CONFIG_INET_AH is not set | 311 | CONFIG_INET_AH=m |
291 | # CONFIG_INET_ESP is not set | 312 | CONFIG_INET_ESP=m |
292 | # CONFIG_INET_IPCOMP is not set | 313 | CONFIG_INET_IPCOMP=m |
293 | # CONFIG_INET_XFRM_TUNNEL is not set | 314 | CONFIG_INET_XFRM_TUNNEL=m |
294 | # CONFIG_INET_TUNNEL is not set | 315 | CONFIG_INET_TUNNEL=m |
295 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 316 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
296 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 317 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
297 | CONFIG_INET_XFRM_MODE_BEET=y | 318 | CONFIG_INET_XFRM_MODE_BEET=y |
319 | # CONFIG_INET_LRO is not set | ||
298 | CONFIG_INET_DIAG=y | 320 | CONFIG_INET_DIAG=y |
299 | CONFIG_INET_TCP_DIAG=y | 321 | CONFIG_INET_TCP_DIAG=y |
300 | # CONFIG_TCP_CONG_ADVANCED is not set | 322 | CONFIG_TCP_CONG_ADVANCED=y |
323 | CONFIG_TCP_CONG_BIC=m | ||
301 | CONFIG_TCP_CONG_CUBIC=y | 324 | CONFIG_TCP_CONG_CUBIC=y |
325 | CONFIG_TCP_CONG_WESTWOOD=m | ||
326 | CONFIG_TCP_CONG_HTCP=m | ||
327 | # CONFIG_TCP_CONG_HSTCP is not set | ||
328 | # CONFIG_TCP_CONG_HYBLA is not set | ||
329 | # CONFIG_TCP_CONG_VEGAS is not set | ||
330 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
331 | # CONFIG_TCP_CONG_LP is not set | ||
332 | # CONFIG_TCP_CONG_VENO is not set | ||
333 | # CONFIG_TCP_CONG_YEAH is not set | ||
334 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
335 | # CONFIG_DEFAULT_BIC is not set | ||
336 | CONFIG_DEFAULT_CUBIC=y | ||
337 | # CONFIG_DEFAULT_HTCP is not set | ||
338 | # CONFIG_DEFAULT_VEGAS is not set | ||
339 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
340 | # CONFIG_DEFAULT_RENO is not set | ||
302 | CONFIG_DEFAULT_TCP_CONG="cubic" | 341 | CONFIG_DEFAULT_TCP_CONG="cubic" |
303 | CONFIG_TCP_MD5SIG=y | 342 | CONFIG_TCP_MD5SIG=y |
304 | # CONFIG_IPV6 is not set | 343 | CONFIG_IPV6=m |
305 | # CONFIG_INET6_XFRM_TUNNEL is not set | 344 | # CONFIG_IPV6_PRIVACY is not set |
306 | # CONFIG_INET6_TUNNEL is not set | 345 | # CONFIG_IPV6_ROUTER_PREF is not set |
346 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
347 | CONFIG_INET6_AH=m | ||
348 | CONFIG_INET6_ESP=m | ||
349 | CONFIG_INET6_IPCOMP=m | ||
350 | # CONFIG_IPV6_MIP6 is not set | ||
351 | CONFIG_INET6_XFRM_TUNNEL=m | ||
352 | CONFIG_INET6_TUNNEL=m | ||
353 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
354 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
355 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
356 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
357 | CONFIG_IPV6_SIT=m | ||
358 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
359 | CONFIG_IPV6_TUNNEL=m | ||
360 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
361 | # CONFIG_IPV6_MROUTE is not set | ||
307 | CONFIG_NETWORK_SECMARK=y | 362 | CONFIG_NETWORK_SECMARK=y |
308 | # CONFIG_NETFILTER is not set | 363 | # CONFIG_NETFILTER is not set |
309 | |||
310 | # | ||
311 | # DCCP Configuration (EXPERIMENTAL) | ||
312 | # | ||
313 | # CONFIG_IP_DCCP is not set | 364 | # CONFIG_IP_DCCP is not set |
314 | |||
315 | # | ||
316 | # SCTP Configuration (EXPERIMENTAL) | ||
317 | # | ||
318 | # CONFIG_IP_SCTP is not set | 365 | # CONFIG_IP_SCTP is not set |
319 | |||
320 | # | ||
321 | # TIPC Configuration (EXPERIMENTAL) | ||
322 | # | ||
323 | # CONFIG_TIPC is not set | 366 | # CONFIG_TIPC is not set |
324 | # CONFIG_ATM is not set | 367 | # CONFIG_ATM is not set |
325 | # CONFIG_BRIDGE is not set | 368 | # CONFIG_BRIDGE is not set |
369 | # CONFIG_NET_DSA is not set | ||
326 | # CONFIG_VLAN_8021Q is not set | 370 | # CONFIG_VLAN_8021Q is not set |
327 | # CONFIG_DECNET is not set | 371 | # CONFIG_DECNET is not set |
328 | # CONFIG_LLC2 is not set | 372 | # CONFIG_LLC2 is not set |
@@ -332,10 +376,6 @@ CONFIG_NETWORK_SECMARK=y | |||
332 | # CONFIG_LAPB is not set | 376 | # CONFIG_LAPB is not set |
333 | # CONFIG_ECONET is not set | 377 | # CONFIG_ECONET is not set |
334 | # CONFIG_WAN_ROUTER is not set | 378 | # CONFIG_WAN_ROUTER is not set |
335 | |||
336 | # | ||
337 | # QoS and/or fair queueing | ||
338 | # | ||
339 | # CONFIG_NET_SCHED is not set | 379 | # CONFIG_NET_SCHED is not set |
340 | 380 | ||
341 | # | 381 | # |
@@ -343,15 +383,14 @@ CONFIG_NETWORK_SECMARK=y | |||
343 | # | 383 | # |
344 | # CONFIG_NET_PKTGEN is not set | 384 | # CONFIG_NET_PKTGEN is not set |
345 | # CONFIG_HAMRADIO is not set | 385 | # CONFIG_HAMRADIO is not set |
386 | # CONFIG_CAN is not set | ||
346 | # CONFIG_IRDA is not set | 387 | # CONFIG_IRDA is not set |
347 | # CONFIG_BT is not set | 388 | # CONFIG_BT is not set |
348 | CONFIG_IEEE80211=y | 389 | # CONFIG_AF_RXRPC is not set |
349 | # CONFIG_IEEE80211_DEBUG is not set | 390 | # CONFIG_PHONET is not set |
350 | CONFIG_IEEE80211_CRYPT_WEP=y | 391 | # CONFIG_WIRELESS is not set |
351 | CONFIG_IEEE80211_CRYPT_CCMP=y | 392 | # CONFIG_RFKILL is not set |
352 | CONFIG_IEEE80211_SOFTMAC=y | 393 | # CONFIG_NET_9P is not set |
353 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
354 | CONFIG_WIRELESS_EXT=y | ||
355 | 394 | ||
356 | # | 395 | # |
357 | # Device Drivers | 396 | # Device Drivers |
@@ -360,60 +399,40 @@ CONFIG_WIRELESS_EXT=y | |||
360 | # | 399 | # |
361 | # Generic Driver Options | 400 | # Generic Driver Options |
362 | # | 401 | # |
402 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
363 | CONFIG_STANDALONE=y | 403 | CONFIG_STANDALONE=y |
364 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
365 | CONFIG_FW_LOADER=y | 405 | CONFIG_FW_LOADER=y |
406 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
407 | CONFIG_EXTRA_FIRMWARE="" | ||
366 | # CONFIG_SYS_HYPERVISOR is not set | 408 | # CONFIG_SYS_HYPERVISOR is not set |
367 | |||
368 | # | ||
369 | # Connector - unified userspace <-> kernelspace linker | ||
370 | # | ||
371 | CONFIG_CONNECTOR=y | 409 | CONFIG_CONNECTOR=y |
372 | CONFIG_PROC_EVENTS=y | 410 | CONFIG_PROC_EVENTS=y |
373 | |||
374 | # | ||
375 | # Memory Technology Devices (MTD) | ||
376 | # | ||
377 | # CONFIG_MTD is not set | 411 | # CONFIG_MTD is not set |
378 | |||
379 | # | ||
380 | # Parallel port support | ||
381 | # | ||
382 | # CONFIG_PARPORT is not set | 412 | # CONFIG_PARPORT is not set |
383 | 413 | CONFIG_BLK_DEV=y | |
384 | # | ||
385 | # Plug and Play support | ||
386 | # | ||
387 | # CONFIG_PNPACPI is not set | ||
388 | |||
389 | # | ||
390 | # Block devices | ||
391 | # | ||
392 | # CONFIG_BLK_CPQ_DA is not set | 414 | # CONFIG_BLK_CPQ_DA is not set |
393 | # CONFIG_BLK_CPQ_CISS_DA is not set | 415 | # CONFIG_BLK_CPQ_CISS_DA is not set |
394 | # CONFIG_BLK_DEV_DAC960 is not set | 416 | # CONFIG_BLK_DEV_DAC960 is not set |
395 | # CONFIG_BLK_DEV_UMEM is not set | 417 | # CONFIG_BLK_DEV_UMEM is not set |
396 | # CONFIG_BLK_DEV_COW_COMMON is not set | 418 | # CONFIG_BLK_DEV_COW_COMMON is not set |
397 | CONFIG_BLK_DEV_LOOP=y | 419 | CONFIG_BLK_DEV_LOOP=m |
398 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 420 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
399 | # CONFIG_BLK_DEV_NBD is not set | 421 | CONFIG_BLK_DEV_NBD=m |
400 | # CONFIG_BLK_DEV_SX8 is not set | 422 | # CONFIG_BLK_DEV_SX8 is not set |
401 | # CONFIG_BLK_DEV_RAM is not set | 423 | # CONFIG_BLK_DEV_RAM is not set |
402 | # CONFIG_BLK_DEV_INITRD is not set | 424 | # CONFIG_CDROM_PKTCDVD is not set |
403 | CONFIG_CDROM_PKTCDVD=y | 425 | # CONFIG_ATA_OVER_ETH is not set |
404 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 426 | # CONFIG_BLK_DEV_HD is not set |
405 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 427 | CONFIG_MISC_DEVICES=y |
406 | CONFIG_ATA_OVER_ETH=y | 428 | # CONFIG_PHANTOM is not set |
407 | 429 | # CONFIG_EEPROM_93CX6 is not set | |
408 | # | ||
409 | # Misc devices | ||
410 | # | ||
411 | CONFIG_SGI_IOC4=y | 430 | CONFIG_SGI_IOC4=y |
412 | # CONFIG_TIFM_CORE is not set | 431 | # CONFIG_TIFM_CORE is not set |
413 | 432 | # CONFIG_ENCLOSURE_SERVICES is not set | |
414 | # | 433 | # CONFIG_HP_ILO is not set |
415 | # ATA/ATAPI/MFM/RLL support | 434 | # CONFIG_C2PORT is not set |
416 | # | 435 | CONFIG_HAVE_IDE=y |
417 | # CONFIG_IDE is not set | 436 | # CONFIG_IDE is not set |
418 | 437 | ||
419 | # | 438 | # |
@@ -421,19 +440,20 @@ CONFIG_SGI_IOC4=y | |||
421 | # | 440 | # |
422 | CONFIG_RAID_ATTRS=y | 441 | CONFIG_RAID_ATTRS=y |
423 | CONFIG_SCSI=y | 442 | CONFIG_SCSI=y |
443 | CONFIG_SCSI_DMA=y | ||
424 | CONFIG_SCSI_TGT=y | 444 | CONFIG_SCSI_TGT=y |
425 | CONFIG_SCSI_NETLINK=y | 445 | # CONFIG_SCSI_NETLINK is not set |
426 | CONFIG_SCSI_PROC_FS=y | 446 | CONFIG_SCSI_PROC_FS=y |
427 | 447 | ||
428 | # | 448 | # |
429 | # SCSI support type (disk, tape, CD-ROM) | 449 | # SCSI support type (disk, tape, CD-ROM) |
430 | # | 450 | # |
431 | CONFIG_BLK_DEV_SD=y | 451 | CONFIG_BLK_DEV_SD=y |
432 | CONFIG_CHR_DEV_ST=y | 452 | # CONFIG_CHR_DEV_ST is not set |
433 | CONFIG_CHR_DEV_OSST=y | 453 | # CONFIG_CHR_DEV_OSST is not set |
434 | CONFIG_BLK_DEV_SR=y | 454 | CONFIG_BLK_DEV_SR=y |
435 | CONFIG_BLK_DEV_SR_VENDOR=y | 455 | CONFIG_BLK_DEV_SR_VENDOR=y |
436 | CONFIG_CHR_DEV_SG=y | 456 | CONFIG_CHR_DEV_SG=m |
437 | # CONFIG_CHR_DEV_SCH is not set | 457 | # CONFIG_CHR_DEV_SCH is not set |
438 | 458 | ||
439 | # | 459 | # |
@@ -443,35 +463,36 @@ CONFIG_SCSI_MULTI_LUN=y | |||
443 | CONFIG_SCSI_CONSTANTS=y | 463 | CONFIG_SCSI_CONSTANTS=y |
444 | CONFIG_SCSI_LOGGING=y | 464 | CONFIG_SCSI_LOGGING=y |
445 | CONFIG_SCSI_SCAN_ASYNC=y | 465 | CONFIG_SCSI_SCAN_ASYNC=y |
466 | CONFIG_SCSI_WAIT_SCAN=m | ||
446 | 467 | ||
447 | # | 468 | # |
448 | # SCSI Transports | 469 | # SCSI Transports |
449 | # | 470 | # |
450 | CONFIG_SCSI_SPI_ATTRS=y | 471 | CONFIG_SCSI_SPI_ATTRS=y |
451 | CONFIG_SCSI_FC_ATTRS=y | 472 | # CONFIG_SCSI_FC_ATTRS is not set |
452 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 473 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
453 | CONFIG_SCSI_SAS_ATTRS=y | 474 | CONFIG_SCSI_SAS_ATTRS=y |
454 | CONFIG_SCSI_SAS_LIBSAS=y | 475 | CONFIG_SCSI_SAS_LIBSAS=y |
476 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
455 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 477 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
456 | 478 | # CONFIG_SCSI_SRP_ATTRS is not set | |
457 | # | 479 | CONFIG_SCSI_LOWLEVEL=y |
458 | # SCSI low-level drivers | ||
459 | # | ||
460 | # CONFIG_ISCSI_TCP is not set | 480 | # CONFIG_ISCSI_TCP is not set |
461 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 481 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
462 | # CONFIG_SCSI_3W_9XXX is not set | 482 | # CONFIG_SCSI_3W_9XXX is not set |
463 | # CONFIG_SCSI_ACARD is not set | 483 | # CONFIG_SCSI_ACARD is not set |
464 | # CONFIG_SCSI_AACRAID is not set | 484 | # CONFIG_SCSI_AACRAID is not set |
465 | CONFIG_SCSI_AIC7XXX=y | 485 | CONFIG_SCSI_AIC7XXX=y |
466 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=8 | 486 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 |
467 | CONFIG_AIC7XXX_RESET_DELAY_MS=15000 | 487 | CONFIG_AIC7XXX_RESET_DELAY_MS=15000 |
468 | CONFIG_AIC7XXX_DEBUG_ENABLE=y | 488 | CONFIG_AIC7XXX_DEBUG_ENABLE=y |
469 | CONFIG_AIC7XXX_DEBUG_MASK=0 | 489 | CONFIG_AIC7XXX_DEBUG_MASK=0 |
470 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | 490 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y |
471 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 491 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
472 | # CONFIG_SCSI_AIC79XX is not set | 492 | # CONFIG_SCSI_AIC79XX is not set |
473 | CONFIG_SCSI_AIC94XX=y | 493 | # CONFIG_SCSI_AIC94XX is not set |
474 | # CONFIG_AIC94XX_DEBUG is not set | 494 | # CONFIG_SCSI_DPT_I2O is not set |
495 | # CONFIG_SCSI_ADVANSYS is not set | ||
475 | # CONFIG_SCSI_ARCMSR is not set | 496 | # CONFIG_SCSI_ARCMSR is not set |
476 | # CONFIG_MEGARAID_NEWGEN is not set | 497 | # CONFIG_MEGARAID_NEWGEN is not set |
477 | # CONFIG_MEGARAID_LEGACY is not set | 498 | # CONFIG_MEGARAID_LEGACY is not set |
@@ -482,6 +503,7 @@ CONFIG_SCSI_AIC94XX=y | |||
482 | # CONFIG_SCSI_IPS is not set | 503 | # CONFIG_SCSI_IPS is not set |
483 | # CONFIG_SCSI_INITIO is not set | 504 | # CONFIG_SCSI_INITIO is not set |
484 | # CONFIG_SCSI_INIA100 is not set | 505 | # CONFIG_SCSI_INIA100 is not set |
506 | # CONFIG_SCSI_MVSAS is not set | ||
485 | # CONFIG_SCSI_STEX is not set | 507 | # CONFIG_SCSI_STEX is not set |
486 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 508 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
487 | # CONFIG_SCSI_QLOGIC_1280 is not set | 509 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -492,147 +514,81 @@ CONFIG_SCSI_AIC94XX=y | |||
492 | # CONFIG_SCSI_DC390T is not set | 514 | # CONFIG_SCSI_DC390T is not set |
493 | # CONFIG_SCSI_DEBUG is not set | 515 | # CONFIG_SCSI_DEBUG is not set |
494 | # CONFIG_SCSI_SRP is not set | 516 | # CONFIG_SCSI_SRP is not set |
495 | 517 | # CONFIG_SCSI_DH is not set | |
496 | # | ||
497 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
498 | # | ||
499 | # CONFIG_ATA is not set | 518 | # CONFIG_ATA is not set |
500 | |||
501 | # | ||
502 | # Multi-device support (RAID and LVM) | ||
503 | # | ||
504 | # CONFIG_MD is not set | 519 | # CONFIG_MD is not set |
505 | |||
506 | # | ||
507 | # Fusion MPT device support | ||
508 | # | ||
509 | # CONFIG_FUSION is not set | 520 | # CONFIG_FUSION is not set |
510 | # CONFIG_FUSION_SPI is not set | ||
511 | # CONFIG_FUSION_FC is not set | ||
512 | # CONFIG_FUSION_SAS is not set | ||
513 | 521 | ||
514 | # | 522 | # |
515 | # IEEE 1394 (FireWire) support | 523 | # IEEE 1394 (FireWire) support |
516 | # | 524 | # |
517 | # CONFIG_IEEE1394 is not set | ||
518 | 525 | ||
519 | # | 526 | # |
520 | # I2O device support | 527 | # Enable only one of the two stacks, unless you know what you are doing |
521 | # | 528 | # |
529 | # CONFIG_FIREWIRE is not set | ||
530 | # CONFIG_IEEE1394 is not set | ||
522 | # CONFIG_I2O is not set | 531 | # CONFIG_I2O is not set |
523 | |||
524 | # | ||
525 | # Network device support | ||
526 | # | ||
527 | CONFIG_NETDEVICES=y | 532 | CONFIG_NETDEVICES=y |
528 | # CONFIG_DUMMY is not set | 533 | CONFIG_DUMMY=m |
529 | # CONFIG_BONDING is not set | 534 | CONFIG_BONDING=m |
535 | # CONFIG_MACVLAN is not set | ||
530 | # CONFIG_EQUALIZER is not set | 536 | # CONFIG_EQUALIZER is not set |
531 | # CONFIG_TUN is not set | 537 | # CONFIG_TUN is not set |
532 | 538 | # CONFIG_VETH is not set | |
533 | # | ||
534 | # ARCnet devices | ||
535 | # | ||
536 | # CONFIG_ARCNET is not set | 539 | # CONFIG_ARCNET is not set |
537 | 540 | # CONFIG_PHYLIB is not set | |
538 | # | ||
539 | # PHY device support | ||
540 | # | ||
541 | CONFIG_PHYLIB=y | ||
542 | |||
543 | # | ||
544 | # MII PHY device drivers | ||
545 | # | ||
546 | CONFIG_MARVELL_PHY=y | ||
547 | CONFIG_DAVICOM_PHY=y | ||
548 | CONFIG_QSEMI_PHY=y | ||
549 | CONFIG_LXT_PHY=y | ||
550 | CONFIG_CICADA_PHY=y | ||
551 | CONFIG_VITESSE_PHY=y | ||
552 | CONFIG_SMSC_PHY=y | ||
553 | # CONFIG_BROADCOM_PHY is not set | ||
554 | # CONFIG_FIXED_PHY is not set | ||
555 | |||
556 | # | ||
557 | # Ethernet (10 or 100Mbit) | ||
558 | # | ||
559 | CONFIG_NET_ETHERNET=y | 541 | CONFIG_NET_ETHERNET=y |
560 | # CONFIG_MII is not set | 542 | CONFIG_MII=y |
543 | # CONFIG_AX88796 is not set | ||
561 | CONFIG_SGI_O2MACE_ETH=y | 544 | CONFIG_SGI_O2MACE_ETH=y |
562 | # CONFIG_HAPPYMEAL is not set | 545 | # CONFIG_HAPPYMEAL is not set |
563 | # CONFIG_SUNGEM is not set | 546 | # CONFIG_SUNGEM is not set |
564 | # CONFIG_CASSINI is not set | 547 | # CONFIG_CASSINI is not set |
565 | # CONFIG_NET_VENDOR_3COM is not set | 548 | # CONFIG_NET_VENDOR_3COM is not set |
549 | # CONFIG_SMC91X is not set | ||
566 | # CONFIG_DM9000 is not set | 550 | # CONFIG_DM9000 is not set |
567 | 551 | CONFIG_NET_TULIP=y | |
568 | # | 552 | CONFIG_DE2104X=m |
569 | # Tulip family network device support | 553 | CONFIG_TULIP=m |
570 | # | 554 | # CONFIG_TULIP_MWI is not set |
571 | # CONFIG_NET_TULIP is not set | 555 | CONFIG_TULIP_MMIO=y |
556 | # CONFIG_TULIP_NAPI is not set | ||
557 | # CONFIG_DE4X5 is not set | ||
558 | # CONFIG_WINBOND_840 is not set | ||
559 | # CONFIG_DM9102 is not set | ||
560 | # CONFIG_ULI526X is not set | ||
572 | # CONFIG_HP100 is not set | 561 | # CONFIG_HP100 is not set |
562 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
563 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
564 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
565 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
566 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
567 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
568 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
573 | # CONFIG_NET_PCI is not set | 569 | # CONFIG_NET_PCI is not set |
574 | 570 | # CONFIG_B44 is not set | |
575 | # | 571 | # CONFIG_ATL2 is not set |
576 | # Ethernet (1000 Mbit) | 572 | # CONFIG_NETDEV_1000 is not set |
577 | # | 573 | # CONFIG_NETDEV_10000 is not set |
578 | # CONFIG_ACENIC is not set | ||
579 | # CONFIG_DL2K is not set | ||
580 | # CONFIG_E1000 is not set | ||
581 | # CONFIG_NS83820 is not set | ||
582 | # CONFIG_HAMACHI is not set | ||
583 | # CONFIG_YELLOWFIN is not set | ||
584 | # CONFIG_R8169 is not set | ||
585 | # CONFIG_SIS190 is not set | ||
586 | # CONFIG_SKGE is not set | ||
587 | # CONFIG_SKY2 is not set | ||
588 | # CONFIG_SK98LIN is not set | ||
589 | # CONFIG_TIGON3 is not set | ||
590 | # CONFIG_BNX2 is not set | ||
591 | CONFIG_QLA3XXX=y | ||
592 | # CONFIG_ATL1 is not set | ||
593 | |||
594 | # | ||
595 | # Ethernet (10000 Mbit) | ||
596 | # | ||
597 | # CONFIG_CHELSIO_T1 is not set | ||
598 | CONFIG_CHELSIO_T3=y | ||
599 | # CONFIG_IXGB is not set | ||
600 | # CONFIG_S2IO is not set | ||
601 | # CONFIG_MYRI10GE is not set | ||
602 | CONFIG_NETXEN_NIC=y | ||
603 | |||
604 | # | ||
605 | # Token Ring devices | ||
606 | # | ||
607 | # CONFIG_TR is not set | 574 | # CONFIG_TR is not set |
608 | 575 | ||
609 | # | 576 | # |
610 | # Wireless LAN (non-hamradio) | 577 | # Wireless LAN |
611 | # | ||
612 | # CONFIG_NET_RADIO is not set | ||
613 | |||
614 | # | ||
615 | # Wan interfaces | ||
616 | # | 578 | # |
579 | # CONFIG_WLAN_PRE80211 is not set | ||
580 | # CONFIG_WLAN_80211 is not set | ||
581 | # CONFIG_IWLWIFI_LEDS is not set | ||
617 | # CONFIG_WAN is not set | 582 | # CONFIG_WAN is not set |
618 | # CONFIG_FDDI is not set | 583 | # CONFIG_FDDI is not set |
619 | # CONFIG_HIPPI is not set | 584 | # CONFIG_HIPPI is not set |
620 | # CONFIG_PPP is not set | 585 | # CONFIG_PPP is not set |
621 | # CONFIG_SLIP is not set | 586 | # CONFIG_SLIP is not set |
622 | # CONFIG_NET_FC is not set | 587 | # CONFIG_NET_FC is not set |
623 | # CONFIG_SHAPER is not set | ||
624 | # CONFIG_NETCONSOLE is not set | 588 | # CONFIG_NETCONSOLE is not set |
625 | # CONFIG_NETPOLL is not set | 589 | # CONFIG_NETPOLL is not set |
626 | # CONFIG_NET_POLL_CONTROLLER is not set | 590 | # CONFIG_NET_POLL_CONTROLLER is not set |
627 | |||
628 | # | ||
629 | # ISDN subsystem | ||
630 | # | ||
631 | # CONFIG_ISDN is not set | 591 | # CONFIG_ISDN is not set |
632 | |||
633 | # | ||
634 | # Telephony Support | ||
635 | # | ||
636 | # CONFIG_PHONE is not set | 592 | # CONFIG_PHONE is not set |
637 | 593 | ||
638 | # | 594 | # |
@@ -640,6 +596,7 @@ CONFIG_NETXEN_NIC=y | |||
640 | # | 596 | # |
641 | CONFIG_INPUT=y | 597 | CONFIG_INPUT=y |
642 | # CONFIG_INPUT_FF_MEMLESS is not set | 598 | # CONFIG_INPUT_FF_MEMLESS is not set |
599 | # CONFIG_INPUT_POLLDEV is not set | ||
643 | 600 | ||
644 | # | 601 | # |
645 | # Userland interfaces | 602 | # Userland interfaces |
@@ -649,16 +606,32 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
649 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 606 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
650 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 607 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
651 | # CONFIG_INPUT_JOYDEV is not set | 608 | # CONFIG_INPUT_JOYDEV is not set |
652 | # CONFIG_INPUT_TSDEV is not set | 609 | CONFIG_INPUT_EVDEV=m |
653 | # CONFIG_INPUT_EVDEV is not set | ||
654 | # CONFIG_INPUT_EVBUG is not set | 610 | # CONFIG_INPUT_EVBUG is not set |
655 | 611 | ||
656 | # | 612 | # |
657 | # Input Device Drivers | 613 | # Input Device Drivers |
658 | # | 614 | # |
659 | # CONFIG_INPUT_KEYBOARD is not set | 615 | CONFIG_INPUT_KEYBOARD=y |
660 | # CONFIG_INPUT_MOUSE is not set | 616 | CONFIG_KEYBOARD_ATKBD=y |
617 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
618 | # CONFIG_KEYBOARD_LKKBD is not set | ||
619 | # CONFIG_KEYBOARD_XTKBD is not set | ||
620 | # CONFIG_KEYBOARD_NEWTON is not set | ||
621 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
622 | CONFIG_INPUT_MOUSE=y | ||
623 | CONFIG_MOUSE_PS2=y | ||
624 | CONFIG_MOUSE_PS2_ALPS=y | ||
625 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
626 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
627 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
628 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
629 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
630 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
631 | # CONFIG_MOUSE_SERIAL is not set | ||
632 | # CONFIG_MOUSE_VSXXXAA is not set | ||
661 | # CONFIG_INPUT_JOYSTICK is not set | 633 | # CONFIG_INPUT_JOYSTICK is not set |
634 | # CONFIG_INPUT_TABLET is not set | ||
662 | # CONFIG_INPUT_TOUCHSCREEN is not set | 635 | # CONFIG_INPUT_TOUCHSCREEN is not set |
663 | # CONFIG_INPUT_MISC is not set | 636 | # CONFIG_INPUT_MISC is not set |
664 | 637 | ||
@@ -669,8 +642,8 @@ CONFIG_SERIO=y | |||
669 | # CONFIG_SERIO_I8042 is not set | 642 | # CONFIG_SERIO_I8042 is not set |
670 | CONFIG_SERIO_SERPORT=y | 643 | CONFIG_SERIO_SERPORT=y |
671 | # CONFIG_SERIO_PCIPS2 is not set | 644 | # CONFIG_SERIO_PCIPS2 is not set |
672 | # CONFIG_SERIO_MACEPS2 is not set | 645 | CONFIG_SERIO_MACEPS2=y |
673 | # CONFIG_SERIO_LIBPS2 is not set | 646 | CONFIG_SERIO_LIBPS2=y |
674 | CONFIG_SERIO_RAW=y | 647 | CONFIG_SERIO_RAW=y |
675 | # CONFIG_GAMEPORT is not set | 648 | # CONFIG_GAMEPORT is not set |
676 | 649 | ||
@@ -678,10 +651,13 @@ CONFIG_SERIO_RAW=y | |||
678 | # Character devices | 651 | # Character devices |
679 | # | 652 | # |
680 | CONFIG_VT=y | 653 | CONFIG_VT=y |
654 | # CONFIG_CONSOLE_TRANSLATIONS is not set | ||
681 | CONFIG_VT_CONSOLE=y | 655 | CONFIG_VT_CONSOLE=y |
682 | CONFIG_HW_CONSOLE=y | 656 | CONFIG_HW_CONSOLE=y |
683 | CONFIG_VT_HW_CONSOLE_BINDING=y | 657 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
658 | CONFIG_DEVKMEM=y | ||
684 | # CONFIG_SERIAL_NONSTANDARD is not set | 659 | # CONFIG_SERIAL_NONSTANDARD is not set |
660 | # CONFIG_NOZOMI is not set | ||
685 | 661 | ||
686 | # | 662 | # |
687 | # Serial drivers | 663 | # Serial drivers |
@@ -702,192 +678,304 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
702 | CONFIG_UNIX98_PTYS=y | 678 | CONFIG_UNIX98_PTYS=y |
703 | CONFIG_LEGACY_PTYS=y | 679 | CONFIG_LEGACY_PTYS=y |
704 | CONFIG_LEGACY_PTY_COUNT=256 | 680 | CONFIG_LEGACY_PTY_COUNT=256 |
705 | |||
706 | # | ||
707 | # IPMI | ||
708 | # | ||
709 | # CONFIG_IPMI_HANDLER is not set | 681 | # CONFIG_IPMI_HANDLER is not set |
710 | 682 | CONFIG_HW_RANDOM=y | |
711 | # | ||
712 | # Watchdog Cards | ||
713 | # | ||
714 | # CONFIG_WATCHDOG is not set | ||
715 | # CONFIG_HW_RANDOM is not set | ||
716 | # CONFIG_RTC is not set | ||
717 | # CONFIG_GEN_RTC is not set | ||
718 | # CONFIG_DTLK is not set | ||
719 | # CONFIG_R3964 is not set | 683 | # CONFIG_R3964 is not set |
720 | # CONFIG_APPLICOM is not set | 684 | # CONFIG_APPLICOM is not set |
721 | # CONFIG_DRM is not set | ||
722 | # CONFIG_RAW_DRIVER is not set | 685 | # CONFIG_RAW_DRIVER is not set |
723 | |||
724 | # | ||
725 | # TPM devices | ||
726 | # | ||
727 | # CONFIG_TCG_TPM is not set | 686 | # CONFIG_TCG_TPM is not set |
687 | CONFIG_DEVPORT=y | ||
688 | # CONFIG_I2C is not set | ||
689 | # CONFIG_SPI is not set | ||
690 | # CONFIG_W1 is not set | ||
691 | # CONFIG_POWER_SUPPLY is not set | ||
692 | CONFIG_HWMON=y | ||
693 | # CONFIG_HWMON_VID is not set | ||
694 | # CONFIG_SENSORS_I5K_AMB is not set | ||
695 | # CONFIG_SENSORS_F71805F is not set | ||
696 | # CONFIG_SENSORS_F71882FG is not set | ||
697 | # CONFIG_SENSORS_IT87 is not set | ||
698 | # CONFIG_SENSORS_PC87360 is not set | ||
699 | # CONFIG_SENSORS_PC87427 is not set | ||
700 | # CONFIG_SENSORS_SIS5595 is not set | ||
701 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
702 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
703 | # CONFIG_SENSORS_VIA686A is not set | ||
704 | # CONFIG_SENSORS_VT1211 is not set | ||
705 | # CONFIG_SENSORS_VT8231 is not set | ||
706 | # CONFIG_SENSORS_W83627HF is not set | ||
707 | # CONFIG_SENSORS_W83627EHF is not set | ||
708 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
709 | # CONFIG_THERMAL is not set | ||
710 | # CONFIG_THERMAL_HWMON is not set | ||
711 | CONFIG_WATCHDOG=y | ||
712 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
728 | 713 | ||
729 | # | 714 | # |
730 | # I2C support | 715 | # Watchdog Device Drivers |
731 | # | 716 | # |
732 | # CONFIG_I2C is not set | 717 | # CONFIG_SOFT_WATCHDOG is not set |
718 | # CONFIG_ALIM7101_WDT is not set | ||
733 | 719 | ||
734 | # | 720 | # |
735 | # SPI support | 721 | # PCI-based Watchdog Cards |
736 | # | 722 | # |
737 | # CONFIG_SPI is not set | 723 | # CONFIG_PCIPCWATCHDOG is not set |
738 | # CONFIG_SPI_MASTER is not set | 724 | # CONFIG_WDTPCI is not set |
725 | CONFIG_SSB_POSSIBLE=y | ||
739 | 726 | ||
740 | # | 727 | # |
741 | # Dallas's 1-wire bus | 728 | # Sonics Silicon Backplane |
742 | # | 729 | # |
743 | # CONFIG_W1 is not set | 730 | # CONFIG_SSB is not set |
744 | 731 | ||
745 | # | 732 | # |
746 | # Hardware Monitoring support | 733 | # Multifunction device drivers |
747 | # | 734 | # |
748 | # CONFIG_HWMON is not set | 735 | # CONFIG_MFD_CORE is not set |
749 | # CONFIG_HWMON_VID is not set | 736 | # CONFIG_MFD_SM501 is not set |
737 | # CONFIG_HTC_PASIC3 is not set | ||
738 | # CONFIG_MFD_TMIO is not set | ||
739 | # CONFIG_REGULATOR is not set | ||
750 | 740 | ||
751 | # | 741 | # |
752 | # Multimedia devices | 742 | # Multimedia devices |
753 | # | 743 | # |
754 | # CONFIG_VIDEO_DEV is not set | ||
755 | 744 | ||
756 | # | 745 | # |
757 | # Digital Video Broadcasting Devices | 746 | # Multimedia core support |
758 | # | 747 | # |
759 | # CONFIG_DVB is not set | 748 | CONFIG_VIDEO_DEV=m |
749 | CONFIG_VIDEO_V4L2_COMMON=m | ||
750 | CONFIG_VIDEO_ALLOW_V4L1=y | ||
751 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
752 | # CONFIG_DVB_CORE is not set | ||
753 | CONFIG_VIDEO_MEDIA=m | ||
760 | 754 | ||
761 | # | 755 | # |
762 | # Graphics support | 756 | # Multimedia drivers |
763 | # | 757 | # |
764 | # CONFIG_FIRMWARE_EDID is not set | 758 | # CONFIG_MEDIA_ATTACH is not set |
765 | # CONFIG_FB is not set | 759 | CONFIG_VIDEO_V4L2=m |
760 | CONFIG_VIDEO_V4L1=m | ||
761 | CONFIG_VIDEOBUF_GEN=m | ||
762 | CONFIG_VIDEOBUF_VMALLOC=m | ||
763 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
764 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
765 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
766 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | ||
767 | CONFIG_VIDEO_VIVI=m | ||
768 | # CONFIG_VIDEO_CPIA is not set | ||
769 | # CONFIG_VIDEO_STRADIS is not set | ||
770 | # CONFIG_SOC_CAMERA is not set | ||
771 | CONFIG_RADIO_ADAPTERS=y | ||
772 | # CONFIG_RADIO_GEMTEK_PCI is not set | ||
773 | # CONFIG_RADIO_MAXIRADIO is not set | ||
774 | # CONFIG_RADIO_MAESTRO is not set | ||
775 | CONFIG_DAB=y | ||
766 | 776 | ||
767 | # | 777 | # |
768 | # Console display driver support | 778 | # Graphics support |
769 | # | 779 | # |
770 | # CONFIG_VGA_CONSOLE is not set | 780 | # CONFIG_DRM is not set |
771 | CONFIG_DUMMY_CONSOLE=y | 781 | # CONFIG_VGASTATE is not set |
782 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
783 | CONFIG_FB=y | ||
784 | CONFIG_FIRMWARE_EDID=y | ||
785 | # CONFIG_FB_DDC is not set | ||
786 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
787 | CONFIG_FB_CFB_FILLRECT=y | ||
788 | CONFIG_FB_CFB_COPYAREA=y | ||
789 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
790 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
791 | # CONFIG_FB_SYS_FILLRECT is not set | ||
792 | # CONFIG_FB_SYS_COPYAREA is not set | ||
793 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
794 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
795 | # CONFIG_FB_SYS_FOPS is not set | ||
796 | # CONFIG_FB_SVGALIB is not set | ||
797 | # CONFIG_FB_MACMODES is not set | ||
798 | # CONFIG_FB_BACKLIGHT is not set | ||
799 | # CONFIG_FB_MODE_HELPERS is not set | ||
800 | # CONFIG_FB_TILEBLITTING is not set | ||
801 | |||
802 | # | ||
803 | # Frame buffer hardware drivers | ||
804 | # | ||
805 | # CONFIG_FB_CIRRUS is not set | ||
806 | # CONFIG_FB_PM2 is not set | ||
807 | # CONFIG_FB_CYBER2000 is not set | ||
808 | # CONFIG_FB_ASILIANT is not set | ||
809 | # CONFIG_FB_IMSTT is not set | ||
810 | # CONFIG_FB_UVESA is not set | ||
811 | CONFIG_FB_GBE=y | ||
812 | CONFIG_FB_GBE_MEM=4 | ||
813 | # CONFIG_FB_S1D13XXX is not set | ||
814 | # CONFIG_FB_NVIDIA is not set | ||
815 | # CONFIG_FB_RIVA is not set | ||
816 | # CONFIG_FB_MATROX is not set | ||
817 | # CONFIG_FB_RADEON is not set | ||
818 | # CONFIG_FB_ATY128 is not set | ||
819 | # CONFIG_FB_ATY is not set | ||
820 | # CONFIG_FB_S3 is not set | ||
821 | # CONFIG_FB_SAVAGE is not set | ||
822 | # CONFIG_FB_SIS is not set | ||
823 | # CONFIG_FB_VIA is not set | ||
824 | # CONFIG_FB_NEOMAGIC is not set | ||
825 | # CONFIG_FB_KYRO is not set | ||
826 | # CONFIG_FB_3DFX is not set | ||
827 | # CONFIG_FB_VOODOO1 is not set | ||
828 | # CONFIG_FB_VT8623 is not set | ||
829 | # CONFIG_FB_TRIDENT is not set | ||
830 | # CONFIG_FB_ARK is not set | ||
831 | # CONFIG_FB_PM3 is not set | ||
832 | # CONFIG_FB_CARMINE is not set | ||
833 | # CONFIG_FB_VIRTUAL is not set | ||
834 | # CONFIG_FB_METRONOME is not set | ||
835 | # CONFIG_FB_MB862XX is not set | ||
772 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 836 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
773 | 837 | ||
774 | # | 838 | # |
775 | # Sound | 839 | # Display device support |
776 | # | 840 | # |
777 | # CONFIG_SOUND is not set | 841 | # CONFIG_DISPLAY_SUPPORT is not set |
778 | 842 | ||
779 | # | 843 | # |
780 | # HID Devices | 844 | # Console display driver support |
781 | # | 845 | # |
846 | # CONFIG_VGA_CONSOLE is not set | ||
847 | CONFIG_DUMMY_CONSOLE=y | ||
848 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
849 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
850 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
851 | CONFIG_FONTS=y | ||
852 | CONFIG_FONT_8x8=y | ||
853 | CONFIG_FONT_8x16=y | ||
854 | # CONFIG_FONT_6x11 is not set | ||
855 | # CONFIG_FONT_7x14 is not set | ||
856 | # CONFIG_FONT_PEARL_8x8 is not set | ||
857 | # CONFIG_FONT_ACORN_8x8 is not set | ||
858 | # CONFIG_FONT_MINI_4x6 is not set | ||
859 | # CONFIG_FONT_SUN8x16 is not set | ||
860 | # CONFIG_FONT_SUN12x22 is not set | ||
861 | # CONFIG_FONT_10x18 is not set | ||
862 | CONFIG_LOGO=y | ||
863 | # CONFIG_LOGO_LINUX_MONO is not set | ||
864 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
865 | # CONFIG_LOGO_LINUX_CLUT224 is not set | ||
866 | CONFIG_LOGO_SGI_CLUT224=y | ||
867 | # CONFIG_SOUND is not set | ||
868 | CONFIG_HID_SUPPORT=y | ||
782 | CONFIG_HID=y | 869 | CONFIG_HID=y |
783 | # CONFIG_HID_DEBUG is not set | 870 | # CONFIG_HID_DEBUG is not set |
871 | # CONFIG_HIDRAW is not set | ||
872 | # CONFIG_HID_PID is not set | ||
784 | 873 | ||
785 | # | 874 | # |
786 | # USB support | 875 | # Special HID drivers |
787 | # | ||
788 | CONFIG_USB_ARCH_HAS_HCD=y | ||
789 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
790 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
791 | # CONFIG_USB is not set | ||
792 | |||
793 | # | ||
794 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
795 | # | ||
796 | |||
797 | # | ||
798 | # USB Gadget Support | ||
799 | # | ||
800 | # CONFIG_USB_GADGET is not set | ||
801 | |||
802 | # | ||
803 | # MMC/SD Card support | ||
804 | # | 876 | # |
877 | CONFIG_HID_COMPAT=y | ||
878 | # CONFIG_USB_SUPPORT is not set | ||
879 | # CONFIG_UWB is not set | ||
805 | # CONFIG_MMC is not set | 880 | # CONFIG_MMC is not set |
806 | 881 | # CONFIG_MEMSTICK is not set | |
807 | # | ||
808 | # LED devices | ||
809 | # | ||
810 | # CONFIG_NEW_LEDS is not set | 882 | # CONFIG_NEW_LEDS is not set |
811 | 883 | # CONFIG_ACCESSIBILITY is not set | |
812 | # | ||
813 | # LED drivers | ||
814 | # | ||
815 | |||
816 | # | ||
817 | # LED Triggers | ||
818 | # | ||
819 | |||
820 | # | ||
821 | # InfiniBand support | ||
822 | # | ||
823 | # CONFIG_INFINIBAND is not set | 884 | # CONFIG_INFINIBAND is not set |
885 | CONFIG_RTC_LIB=y | ||
886 | CONFIG_RTC_CLASS=y | ||
887 | # CONFIG_RTC_HCTOSYS is not set | ||
888 | # CONFIG_RTC_DEBUG is not set | ||
824 | 889 | ||
825 | # | 890 | # |
826 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 891 | # RTC interfaces |
827 | # | 892 | # |
893 | # CONFIG_RTC_INTF_SYSFS is not set | ||
894 | # CONFIG_RTC_INTF_PROC is not set | ||
895 | CONFIG_RTC_INTF_DEV=y | ||
896 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
897 | # CONFIG_RTC_DRV_TEST is not set | ||
828 | 898 | ||
829 | # | 899 | # |
830 | # Real Time Clock | 900 | # SPI RTC drivers |
831 | # | 901 | # |
832 | # CONFIG_RTC_CLASS is not set | ||
833 | 902 | ||
834 | # | 903 | # |
835 | # DMA Engine support | 904 | # Platform RTC drivers |
836 | # | 905 | # |
837 | # CONFIG_DMA_ENGINE is not set | 906 | CONFIG_RTC_DRV_CMOS=y |
907 | # CONFIG_RTC_DRV_DS1286 is not set | ||
908 | # CONFIG_RTC_DRV_DS1511 is not set | ||
909 | # CONFIG_RTC_DRV_DS1553 is not set | ||
910 | # CONFIG_RTC_DRV_DS1742 is not set | ||
911 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
912 | # CONFIG_RTC_DRV_M48T86 is not set | ||
913 | # CONFIG_RTC_DRV_M48T35 is not set | ||
914 | # CONFIG_RTC_DRV_M48T59 is not set | ||
915 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
916 | # CONFIG_RTC_DRV_V3020 is not set | ||
838 | 917 | ||
839 | # | 918 | # |
840 | # DMA Clients | 919 | # on-CPU RTC drivers |
841 | # | ||
842 | |||
843 | # | ||
844 | # DMA Devices | ||
845 | # | ||
846 | |||
847 | # | ||
848 | # Auxiliary Display support | ||
849 | # | ||
850 | |||
851 | # | ||
852 | # Virtualization | ||
853 | # | 920 | # |
921 | # CONFIG_DMADEVICES is not set | ||
922 | # CONFIG_UIO is not set | ||
923 | # CONFIG_STAGING is not set | ||
924 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
854 | 925 | ||
855 | # | 926 | # |
856 | # File systems | 927 | # File systems |
857 | # | 928 | # |
858 | CONFIG_EXT2_FS=y | 929 | CONFIG_EXT2_FS=y |
859 | # CONFIG_EXT2_FS_XATTR is not set | 930 | CONFIG_EXT2_FS_XATTR=y |
931 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
932 | CONFIG_EXT2_FS_SECURITY=y | ||
860 | # CONFIG_EXT2_FS_XIP is not set | 933 | # CONFIG_EXT2_FS_XIP is not set |
861 | # CONFIG_EXT3_FS is not set | 934 | CONFIG_EXT3_FS=y |
862 | # CONFIG_EXT4DEV_FS is not set | 935 | CONFIG_EXT3_FS_XATTR=y |
936 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
937 | CONFIG_EXT3_FS_SECURITY=y | ||
938 | # CONFIG_EXT4_FS is not set | ||
939 | CONFIG_JBD=y | ||
940 | CONFIG_FS_MBCACHE=y | ||
863 | # CONFIG_REISERFS_FS is not set | 941 | # CONFIG_REISERFS_FS is not set |
864 | # CONFIG_JFS_FS is not set | 942 | # CONFIG_JFS_FS is not set |
865 | CONFIG_FS_POSIX_ACL=y | 943 | CONFIG_FS_POSIX_ACL=y |
944 | CONFIG_FILE_LOCKING=y | ||
866 | # CONFIG_XFS_FS is not set | 945 | # CONFIG_XFS_FS is not set |
867 | # CONFIG_GFS2_FS is not set | 946 | # CONFIG_GFS2_FS is not set |
868 | # CONFIG_OCFS2_FS is not set | 947 | # CONFIG_OCFS2_FS is not set |
869 | # CONFIG_MINIX_FS is not set | 948 | CONFIG_DNOTIFY=y |
870 | # CONFIG_ROMFS_FS is not set | ||
871 | CONFIG_INOTIFY=y | 949 | CONFIG_INOTIFY=y |
872 | CONFIG_INOTIFY_USER=y | 950 | CONFIG_INOTIFY_USER=y |
873 | # CONFIG_QUOTA is not set | 951 | CONFIG_QUOTA=y |
874 | CONFIG_DNOTIFY=y | 952 | # CONFIG_QUOTA_NETLINK_INTERFACE is not set |
875 | # CONFIG_AUTOFS_FS is not set | 953 | CONFIG_PRINT_QUOTA_WARNING=y |
876 | # CONFIG_AUTOFS4_FS is not set | 954 | CONFIG_QFMT_V1=m |
877 | CONFIG_FUSE_FS=y | 955 | CONFIG_QFMT_V2=m |
956 | CONFIG_QUOTACTL=y | ||
957 | CONFIG_AUTOFS_FS=m | ||
958 | CONFIG_AUTOFS4_FS=m | ||
959 | CONFIG_FUSE_FS=m | ||
878 | CONFIG_GENERIC_ACL=y | 960 | CONFIG_GENERIC_ACL=y |
879 | 961 | ||
880 | # | 962 | # |
881 | # CD-ROM/DVD Filesystems | 963 | # CD-ROM/DVD Filesystems |
882 | # | 964 | # |
883 | # CONFIG_ISO9660_FS is not set | 965 | CONFIG_ISO9660_FS=m |
884 | # CONFIG_UDF_FS is not set | 966 | CONFIG_JOLIET=y |
967 | CONFIG_ZISOFS=y | ||
968 | CONFIG_UDF_FS=m | ||
969 | CONFIG_UDF_NLS=y | ||
885 | 970 | ||
886 | # | 971 | # |
887 | # DOS/FAT/NT Filesystems | 972 | # DOS/FAT/NT Filesystems |
888 | # | 973 | # |
889 | # CONFIG_MSDOS_FS is not set | 974 | CONFIG_FAT_FS=m |
890 | # CONFIG_VFAT_FS is not set | 975 | CONFIG_MSDOS_FS=m |
976 | CONFIG_VFAT_FS=m | ||
977 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
978 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
891 | # CONFIG_NTFS_FS is not set | 979 | # CONFIG_NTFS_FS is not set |
892 | 980 | ||
893 | # | 981 | # |
@@ -896,11 +984,11 @@ CONFIG_GENERIC_ACL=y | |||
896 | CONFIG_PROC_FS=y | 984 | CONFIG_PROC_FS=y |
897 | CONFIG_PROC_KCORE=y | 985 | CONFIG_PROC_KCORE=y |
898 | CONFIG_PROC_SYSCTL=y | 986 | CONFIG_PROC_SYSCTL=y |
987 | CONFIG_PROC_PAGE_MONITOR=y | ||
899 | CONFIG_SYSFS=y | 988 | CONFIG_SYSFS=y |
900 | CONFIG_TMPFS=y | 989 | CONFIG_TMPFS=y |
901 | CONFIG_TMPFS_POSIX_ACL=y | 990 | CONFIG_TMPFS_POSIX_ACL=y |
902 | # CONFIG_HUGETLB_PAGE is not set | 991 | # CONFIG_HUGETLB_PAGE is not set |
903 | CONFIG_RAMFS=y | ||
904 | CONFIG_CONFIGFS_FS=y | 992 | CONFIG_CONFIGFS_FS=y |
905 | 993 | ||
906 | # | 994 | # |
@@ -916,33 +1004,42 @@ CONFIG_CONFIGFS_FS=y | |||
916 | # CONFIG_EFS_FS is not set | 1004 | # CONFIG_EFS_FS is not set |
917 | # CONFIG_CRAMFS is not set | 1005 | # CONFIG_CRAMFS is not set |
918 | # CONFIG_VXFS_FS is not set | 1006 | # CONFIG_VXFS_FS is not set |
1007 | # CONFIG_MINIX_FS is not set | ||
1008 | # CONFIG_OMFS_FS is not set | ||
919 | # CONFIG_HPFS_FS is not set | 1009 | # CONFIG_HPFS_FS is not set |
920 | # CONFIG_QNX4FS_FS is not set | 1010 | # CONFIG_QNX4FS_FS is not set |
1011 | # CONFIG_ROMFS_FS is not set | ||
921 | # CONFIG_SYSV_FS is not set | 1012 | # CONFIG_SYSV_FS is not set |
922 | # CONFIG_UFS_FS is not set | 1013 | # CONFIG_UFS_FS is not set |
923 | 1014 | CONFIG_NETWORK_FILESYSTEMS=y | |
924 | # | ||
925 | # Network File Systems | ||
926 | # | ||
927 | CONFIG_NFS_FS=y | 1015 | CONFIG_NFS_FS=y |
928 | CONFIG_NFS_V3=y | 1016 | CONFIG_NFS_V3=y |
929 | # CONFIG_NFS_V3_ACL is not set | 1017 | # CONFIG_NFS_V3_ACL is not set |
930 | # CONFIG_NFS_V4 is not set | 1018 | # CONFIG_NFS_V4 is not set |
931 | # CONFIG_NFS_DIRECTIO is not set | ||
932 | # CONFIG_NFSD is not set | ||
933 | CONFIG_ROOT_NFS=y | 1019 | CONFIG_ROOT_NFS=y |
1020 | CONFIG_NFSD=m | ||
1021 | CONFIG_NFSD_V3=y | ||
1022 | # CONFIG_NFSD_V3_ACL is not set | ||
1023 | # CONFIG_NFSD_V4 is not set | ||
934 | CONFIG_LOCKD=y | 1024 | CONFIG_LOCKD=y |
935 | CONFIG_LOCKD_V4=y | 1025 | CONFIG_LOCKD_V4=y |
1026 | CONFIG_EXPORTFS=m | ||
936 | CONFIG_NFS_COMMON=y | 1027 | CONFIG_NFS_COMMON=y |
937 | CONFIG_SUNRPC=y | 1028 | CONFIG_SUNRPC=y |
1029 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
938 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1030 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
939 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1031 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
940 | # CONFIG_SMB_FS is not set | 1032 | # CONFIG_SMB_FS is not set |
941 | # CONFIG_CIFS is not set | 1033 | CONFIG_CIFS=m |
1034 | # CONFIG_CIFS_STATS is not set | ||
1035 | # CONFIG_CIFS_WEAK_PW_HASH is not set | ||
1036 | # CONFIG_CIFS_UPCALL is not set | ||
1037 | # CONFIG_CIFS_XATTR is not set | ||
1038 | # CONFIG_CIFS_DEBUG2 is not set | ||
1039 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
942 | # CONFIG_NCP_FS is not set | 1040 | # CONFIG_NCP_FS is not set |
943 | # CONFIG_CODA_FS is not set | 1041 | # CONFIG_CODA_FS is not set |
944 | # CONFIG_AFS_FS is not set | 1042 | # CONFIG_AFS_FS is not set |
945 | # CONFIG_9P_FS is not set | ||
946 | 1043 | ||
947 | # | 1044 | # |
948 | # Partition Types | 1045 | # Partition Types |
@@ -953,45 +1050,83 @@ CONFIG_PARTITION_ADVANCED=y | |||
953 | # CONFIG_AMIGA_PARTITION is not set | 1050 | # CONFIG_AMIGA_PARTITION is not set |
954 | # CONFIG_ATARI_PARTITION is not set | 1051 | # CONFIG_ATARI_PARTITION is not set |
955 | # CONFIG_MAC_PARTITION is not set | 1052 | # CONFIG_MAC_PARTITION is not set |
956 | # CONFIG_MSDOS_PARTITION is not set | 1053 | CONFIG_MSDOS_PARTITION=y |
1054 | # CONFIG_BSD_DISKLABEL is not set | ||
1055 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1056 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1057 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
957 | # CONFIG_LDM_PARTITION is not set | 1058 | # CONFIG_LDM_PARTITION is not set |
958 | CONFIG_SGI_PARTITION=y | 1059 | CONFIG_SGI_PARTITION=y |
959 | # CONFIG_ULTRIX_PARTITION is not set | 1060 | # CONFIG_ULTRIX_PARTITION is not set |
960 | # CONFIG_SUN_PARTITION is not set | 1061 | # CONFIG_SUN_PARTITION is not set |
961 | # CONFIG_KARMA_PARTITION is not set | 1062 | # CONFIG_KARMA_PARTITION is not set |
962 | # CONFIG_EFI_PARTITION is not set | 1063 | # CONFIG_EFI_PARTITION is not set |
963 | 1064 | # CONFIG_SYSV68_PARTITION is not set | |
964 | # | 1065 | CONFIG_NLS=y |
965 | # Native Language Support | 1066 | CONFIG_NLS_DEFAULT="iso8859-1" |
966 | # | 1067 | CONFIG_NLS_CODEPAGE_437=m |
967 | # CONFIG_NLS is not set | 1068 | CONFIG_NLS_CODEPAGE_737=m |
968 | 1069 | CONFIG_NLS_CODEPAGE_775=m | |
969 | # | 1070 | CONFIG_NLS_CODEPAGE_850=m |
970 | # Distributed Lock Manager | 1071 | CONFIG_NLS_CODEPAGE_852=m |
971 | # | 1072 | CONFIG_NLS_CODEPAGE_855=m |
972 | CONFIG_DLM=y | 1073 | CONFIG_NLS_CODEPAGE_857=m |
973 | CONFIG_DLM_TCP=y | 1074 | CONFIG_NLS_CODEPAGE_860=m |
974 | # CONFIG_DLM_SCTP is not set | 1075 | CONFIG_NLS_CODEPAGE_861=m |
975 | # CONFIG_DLM_DEBUG is not set | 1076 | CONFIG_NLS_CODEPAGE_862=m |
976 | 1077 | CONFIG_NLS_CODEPAGE_863=m | |
977 | # | 1078 | CONFIG_NLS_CODEPAGE_864=m |
978 | # Profiling support | 1079 | CONFIG_NLS_CODEPAGE_865=m |
979 | # | 1080 | CONFIG_NLS_CODEPAGE_866=m |
980 | # CONFIG_PROFILING is not set | 1081 | CONFIG_NLS_CODEPAGE_869=m |
1082 | CONFIG_NLS_CODEPAGE_936=m | ||
1083 | CONFIG_NLS_CODEPAGE_950=m | ||
1084 | CONFIG_NLS_CODEPAGE_932=m | ||
1085 | CONFIG_NLS_CODEPAGE_949=m | ||
1086 | CONFIG_NLS_CODEPAGE_874=m | ||
1087 | CONFIG_NLS_ISO8859_8=m | ||
1088 | CONFIG_NLS_CODEPAGE_1250=m | ||
1089 | CONFIG_NLS_CODEPAGE_1251=m | ||
1090 | CONFIG_NLS_ASCII=m | ||
1091 | CONFIG_NLS_ISO8859_1=m | ||
1092 | CONFIG_NLS_ISO8859_2=m | ||
1093 | CONFIG_NLS_ISO8859_3=m | ||
1094 | CONFIG_NLS_ISO8859_4=m | ||
1095 | CONFIG_NLS_ISO8859_5=m | ||
1096 | CONFIG_NLS_ISO8859_6=m | ||
1097 | CONFIG_NLS_ISO8859_7=m | ||
1098 | CONFIG_NLS_ISO8859_9=m | ||
1099 | CONFIG_NLS_ISO8859_13=m | ||
1100 | CONFIG_NLS_ISO8859_14=m | ||
1101 | CONFIG_NLS_ISO8859_15=m | ||
1102 | CONFIG_NLS_KOI8_R=m | ||
1103 | CONFIG_NLS_KOI8_U=m | ||
1104 | CONFIG_NLS_UTF8=m | ||
1105 | # CONFIG_DLM is not set | ||
981 | 1106 | ||
982 | # | 1107 | # |
983 | # Kernel hacking | 1108 | # Kernel hacking |
984 | # | 1109 | # |
985 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1110 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
986 | # CONFIG_PRINTK_TIME is not set | 1111 | # CONFIG_PRINTK_TIME is not set |
1112 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
987 | CONFIG_ENABLE_MUST_CHECK=y | 1113 | CONFIG_ENABLE_MUST_CHECK=y |
988 | # CONFIG_MAGIC_SYSRQ is not set | 1114 | CONFIG_FRAME_WARN=2048 |
1115 | CONFIG_MAGIC_SYSRQ=y | ||
989 | # CONFIG_UNUSED_SYMBOLS is not set | 1116 | # CONFIG_UNUSED_SYMBOLS is not set |
990 | # CONFIG_DEBUG_FS is not set | 1117 | # CONFIG_DEBUG_FS is not set |
991 | # CONFIG_HEADERS_CHECK is not set | 1118 | # CONFIG_HEADERS_CHECK is not set |
992 | # CONFIG_DEBUG_KERNEL is not set | 1119 | # CONFIG_DEBUG_KERNEL is not set |
993 | CONFIG_LOG_BUF_SHIFT=14 | 1120 | # CONFIG_DEBUG_MEMORY_INIT is not set |
994 | CONFIG_CROSSCOMPILE=y | 1121 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1122 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1123 | |||
1124 | # | ||
1125 | # Tracers | ||
1126 | # | ||
1127 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1128 | # CONFIG_SAMPLES is not set | ||
1129 | CONFIG_HAVE_ARCH_KGDB=y | ||
995 | CONFIG_CMDLINE="" | 1130 | CONFIG_CMDLINE="" |
996 | 1131 | ||
997 | # | 1132 | # |
@@ -1000,51 +1135,99 @@ CONFIG_CMDLINE="" | |||
1000 | CONFIG_KEYS=y | 1135 | CONFIG_KEYS=y |
1001 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1136 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1002 | # CONFIG_SECURITY is not set | 1137 | # CONFIG_SECURITY is not set |
1138 | # CONFIG_SECURITYFS is not set | ||
1139 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1140 | CONFIG_CRYPTO=y | ||
1003 | 1141 | ||
1004 | # | 1142 | # |
1005 | # Cryptographic options | 1143 | # Crypto core or helper |
1006 | # | 1144 | # |
1007 | CONFIG_CRYPTO=y | 1145 | # CONFIG_CRYPTO_FIPS is not set |
1008 | CONFIG_CRYPTO_ALGAPI=y | 1146 | CONFIG_CRYPTO_ALGAPI=y |
1147 | CONFIG_CRYPTO_AEAD=y | ||
1009 | CONFIG_CRYPTO_BLKCIPHER=y | 1148 | CONFIG_CRYPTO_BLKCIPHER=y |
1010 | CONFIG_CRYPTO_HASH=y | 1149 | CONFIG_CRYPTO_HASH=y |
1150 | CONFIG_CRYPTO_RNG=y | ||
1011 | CONFIG_CRYPTO_MANAGER=y | 1151 | CONFIG_CRYPTO_MANAGER=y |
1152 | CONFIG_CRYPTO_GF128MUL=y | ||
1153 | CONFIG_CRYPTO_NULL=y | ||
1154 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1155 | CONFIG_CRYPTO_AUTHENC=m | ||
1156 | # CONFIG_CRYPTO_TEST is not set | ||
1157 | |||
1158 | # | ||
1159 | # Authenticated Encryption with Associated Data | ||
1160 | # | ||
1161 | # CONFIG_CRYPTO_CCM is not set | ||
1162 | # CONFIG_CRYPTO_GCM is not set | ||
1163 | # CONFIG_CRYPTO_SEQIV is not set | ||
1164 | |||
1165 | # | ||
1166 | # Block modes | ||
1167 | # | ||
1168 | CONFIG_CRYPTO_CBC=y | ||
1169 | # CONFIG_CRYPTO_CTR is not set | ||
1170 | # CONFIG_CRYPTO_CTS is not set | ||
1171 | CONFIG_CRYPTO_ECB=y | ||
1172 | CONFIG_CRYPTO_LRW=y | ||
1173 | CONFIG_CRYPTO_PCBC=y | ||
1174 | # CONFIG_CRYPTO_XTS is not set | ||
1175 | |||
1176 | # | ||
1177 | # Hash modes | ||
1178 | # | ||
1012 | CONFIG_CRYPTO_HMAC=y | 1179 | CONFIG_CRYPTO_HMAC=y |
1013 | CONFIG_CRYPTO_XCBC=y | 1180 | CONFIG_CRYPTO_XCBC=y |
1014 | CONFIG_CRYPTO_NULL=y | 1181 | |
1182 | # | ||
1183 | # Digest | ||
1184 | # | ||
1185 | CONFIG_CRYPTO_CRC32C=y | ||
1015 | CONFIG_CRYPTO_MD4=y | 1186 | CONFIG_CRYPTO_MD4=y |
1016 | CONFIG_CRYPTO_MD5=y | 1187 | CONFIG_CRYPTO_MD5=y |
1188 | CONFIG_CRYPTO_MICHAEL_MIC=y | ||
1189 | # CONFIG_CRYPTO_RMD128 is not set | ||
1190 | # CONFIG_CRYPTO_RMD160 is not set | ||
1191 | # CONFIG_CRYPTO_RMD256 is not set | ||
1192 | # CONFIG_CRYPTO_RMD320 is not set | ||
1017 | CONFIG_CRYPTO_SHA1=y | 1193 | CONFIG_CRYPTO_SHA1=y |
1018 | CONFIG_CRYPTO_SHA256=y | 1194 | CONFIG_CRYPTO_SHA256=y |
1019 | CONFIG_CRYPTO_SHA512=y | 1195 | CONFIG_CRYPTO_SHA512=y |
1020 | CONFIG_CRYPTO_WP512=y | ||
1021 | CONFIG_CRYPTO_TGR192=y | 1196 | CONFIG_CRYPTO_TGR192=y |
1022 | CONFIG_CRYPTO_GF128MUL=y | 1197 | CONFIG_CRYPTO_WP512=y |
1023 | CONFIG_CRYPTO_ECB=y | 1198 | |
1024 | CONFIG_CRYPTO_CBC=y | 1199 | # |
1025 | CONFIG_CRYPTO_PCBC=y | 1200 | # Ciphers |
1026 | CONFIG_CRYPTO_LRW=y | 1201 | # |
1027 | CONFIG_CRYPTO_DES=y | ||
1028 | CONFIG_CRYPTO_FCRYPT=y | ||
1029 | CONFIG_CRYPTO_BLOWFISH=y | ||
1030 | CONFIG_CRYPTO_TWOFISH=y | ||
1031 | CONFIG_CRYPTO_TWOFISH_COMMON=y | ||
1032 | CONFIG_CRYPTO_SERPENT=y | ||
1033 | CONFIG_CRYPTO_AES=y | 1202 | CONFIG_CRYPTO_AES=y |
1203 | CONFIG_CRYPTO_ANUBIS=y | ||
1204 | CONFIG_CRYPTO_ARC4=y | ||
1205 | CONFIG_CRYPTO_BLOWFISH=y | ||
1206 | CONFIG_CRYPTO_CAMELLIA=y | ||
1034 | CONFIG_CRYPTO_CAST5=y | 1207 | CONFIG_CRYPTO_CAST5=y |
1035 | CONFIG_CRYPTO_CAST6=y | 1208 | CONFIG_CRYPTO_CAST6=y |
1036 | CONFIG_CRYPTO_TEA=y | 1209 | CONFIG_CRYPTO_DES=y |
1037 | CONFIG_CRYPTO_ARC4=y | 1210 | CONFIG_CRYPTO_FCRYPT=y |
1038 | CONFIG_CRYPTO_KHAZAD=y | 1211 | CONFIG_CRYPTO_KHAZAD=y |
1039 | CONFIG_CRYPTO_ANUBIS=y | 1212 | # CONFIG_CRYPTO_SALSA20 is not set |
1213 | # CONFIG_CRYPTO_SEED is not set | ||
1214 | CONFIG_CRYPTO_SERPENT=y | ||
1215 | CONFIG_CRYPTO_TEA=y | ||
1216 | CONFIG_CRYPTO_TWOFISH=y | ||
1217 | CONFIG_CRYPTO_TWOFISH_COMMON=y | ||
1218 | |||
1219 | # | ||
1220 | # Compression | ||
1221 | # | ||
1040 | CONFIG_CRYPTO_DEFLATE=y | 1222 | CONFIG_CRYPTO_DEFLATE=y |
1041 | CONFIG_CRYPTO_MICHAEL_MIC=y | 1223 | # CONFIG_CRYPTO_LZO is not set |
1042 | CONFIG_CRYPTO_CRC32C=y | ||
1043 | CONFIG_CRYPTO_CAMELLIA=y | ||
1044 | 1224 | ||
1045 | # | 1225 | # |
1046 | # Hardware crypto devices | 1226 | # Random Number Generation |
1047 | # | 1227 | # |
1228 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1229 | CONFIG_CRYPTO_HW=y | ||
1230 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1048 | 1231 | ||
1049 | # | 1232 | # |
1050 | # Library routines | 1233 | # Library routines |
@@ -1052,10 +1235,15 @@ CONFIG_CRYPTO_CAMELLIA=y | |||
1052 | CONFIG_BITREVERSE=y | 1235 | CONFIG_BITREVERSE=y |
1053 | # CONFIG_CRC_CCITT is not set | 1236 | # CONFIG_CRC_CCITT is not set |
1054 | CONFIG_CRC16=y | 1237 | CONFIG_CRC16=y |
1238 | CONFIG_CRC_T10DIF=y | ||
1239 | CONFIG_CRC_ITU_T=m | ||
1055 | CONFIG_CRC32=y | 1240 | CONFIG_CRC32=y |
1241 | # CONFIG_CRC7 is not set | ||
1056 | CONFIG_LIBCRC32C=y | 1242 | CONFIG_LIBCRC32C=y |
1243 | CONFIG_AUDIT_GENERIC=y | ||
1057 | CONFIG_ZLIB_INFLATE=y | 1244 | CONFIG_ZLIB_INFLATE=y |
1058 | CONFIG_ZLIB_DEFLATE=y | 1245 | CONFIG_ZLIB_DEFLATE=y |
1059 | CONFIG_PLIST=y | 1246 | CONFIG_PLIST=y |
1060 | CONFIG_HAS_IOMEM=y | 1247 | CONFIG_HAS_IOMEM=y |
1061 | CONFIG_HAS_IOPORT=y | 1248 | CONFIG_HAS_IOPORT=y |
1249 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 74daa0cf87e6..1ecdd3b65dc7 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.28-rc6 |
4 | # Tue Aug 7 12:59:29 2007 | 4 | # Mon Dec 1 08:08:19 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -11,20 +11,25 @@ CONFIG_MIPS=y | |||
11 | CONFIG_ZONE_DMA=y | 11 | CONFIG_ZONE_DMA=y |
12 | # CONFIG_MACH_ALCHEMY is not set | 12 | # CONFIG_MACH_ALCHEMY is not set |
13 | # CONFIG_BASLER_EXCITE is not set | 13 | # CONFIG_BASLER_EXCITE is not set |
14 | # CONFIG_BCM47XX is not set | ||
14 | # CONFIG_MIPS_COBALT is not set | 15 | # CONFIG_MIPS_COBALT is not set |
15 | # CONFIG_MACH_DECSTATION is not set | 16 | # CONFIG_MACH_DECSTATION is not set |
16 | # CONFIG_MACH_JAZZ is not set | 17 | # CONFIG_MACH_JAZZ is not set |
18 | # CONFIG_LASAT is not set | ||
17 | # CONFIG_LEMOTE_FULONG is not set | 19 | # CONFIG_LEMOTE_FULONG is not set |
18 | CONFIG_MIPS_MALTA=y | 20 | CONFIG_MIPS_MALTA=y |
19 | # CONFIG_MIPS_SIM is not set | 21 | # CONFIG_MIPS_SIM is not set |
20 | # CONFIG_MARKEINS is not set | 22 | # CONFIG_MACH_EMMA is not set |
21 | # CONFIG_MACH_VR41XX is not set | 23 | # CONFIG_MACH_VR41XX is not set |
24 | # CONFIG_NXP_STB220 is not set | ||
25 | # CONFIG_NXP_STB225 is not set | ||
22 | # CONFIG_PNX8550_JBS is not set | 26 | # CONFIG_PNX8550_JBS is not set |
23 | # CONFIG_PNX8550_STB810 is not set | 27 | # CONFIG_PNX8550_STB810 is not set |
24 | # CONFIG_PMC_MSP is not set | 28 | # CONFIG_PMC_MSP is not set |
25 | # CONFIG_PMC_YOSEMITE is not set | 29 | # CONFIG_PMC_YOSEMITE is not set |
26 | # CONFIG_SGI_IP22 is not set | 30 | # CONFIG_SGI_IP22 is not set |
27 | # CONFIG_SGI_IP27 is not set | 31 | # CONFIG_SGI_IP27 is not set |
32 | # CONFIG_SGI_IP28 is not set | ||
28 | # CONFIG_SGI_IP32 is not set | 33 | # CONFIG_SGI_IP32 is not set |
29 | # CONFIG_SIBYTE_CRHINE is not set | 34 | # CONFIG_SIBYTE_CRHINE is not set |
30 | # CONFIG_SIBYTE_CARMEL is not set | 35 | # CONFIG_SIBYTE_CARMEL is not set |
@@ -35,13 +40,14 @@ CONFIG_MIPS_MALTA=y | |||
35 | # CONFIG_SIBYTE_SENTOSA is not set | 40 | # CONFIG_SIBYTE_SENTOSA is not set |
36 | # CONFIG_SIBYTE_BIGSUR is not set | 41 | # CONFIG_SIBYTE_BIGSUR is not set |
37 | # CONFIG_SNI_RM is not set | 42 | # CONFIG_SNI_RM is not set |
38 | # CONFIG_TOSHIBA_JMR3927 is not set | 43 | # CONFIG_MACH_TX39XX is not set |
39 | # CONFIG_TOSHIBA_RBTX4927 is not set | 44 | # CONFIG_MACH_TX49XX is not set |
40 | # CONFIG_TOSHIBA_RBTX4938 is not set | 45 | # CONFIG_MIKROTIK_RB532 is not set |
41 | # CONFIG_WR_PPMC is not set | 46 | # CONFIG_WR_PPMC is not set |
42 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 47 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
43 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
44 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 49 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
50 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 51 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
46 | CONFIG_GENERIC_HWEIGHT=y | 52 | CONFIG_GENERIC_HWEIGHT=y |
47 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 53 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
@@ -51,21 +57,26 @@ CONFIG_GENERIC_CMOS_UPDATE=y | |||
51 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 57 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
52 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 58 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
53 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 59 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
60 | CONFIG_BOOT_RAW=y | ||
54 | CONFIG_CEVT_R4K=y | 61 | CONFIG_CEVT_R4K=y |
62 | CONFIG_CSRC_R4K=y | ||
55 | CONFIG_DMA_NONCOHERENT=y | 63 | CONFIG_DMA_NONCOHERENT=y |
56 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 64 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
57 | CONFIG_EARLY_PRINTK=y | 65 | CONFIG_EARLY_PRINTK=y |
58 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 66 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
59 | CONFIG_GENERIC_ISA_DMA=y | 67 | # CONFIG_HOTPLUG_CPU is not set |
60 | CONFIG_I8259=y | 68 | CONFIG_I8259=y |
61 | CONFIG_MIPS_BONITO64=y | 69 | CONFIG_MIPS_BONITO64=y |
62 | CONFIG_MIPS_MSC=y | 70 | CONFIG_MIPS_MSC=y |
63 | # CONFIG_NO_IOPORT is not set | 71 | # CONFIG_NO_IOPORT is not set |
72 | CONFIG_GENERIC_ISA_DMA=y | ||
64 | # CONFIG_CPU_BIG_ENDIAN is not set | 73 | # CONFIG_CPU_BIG_ENDIAN is not set |
65 | CONFIG_CPU_LITTLE_ENDIAN=y | 74 | CONFIG_CPU_LITTLE_ENDIAN=y |
66 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 75 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
67 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 76 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
68 | CONFIG_IRQ_CPU=y | 77 | CONFIG_IRQ_CPU=y |
78 | CONFIG_IRQ_GIC=y | ||
79 | CONFIG_MIPS_BOARDS_GEN=y | ||
69 | CONFIG_PCI_GT64XXX_PCI0=y | 80 | CONFIG_PCI_GT64XXX_PCI0=y |
70 | CONFIG_SWAP_IO_SPACE=y | 81 | CONFIG_SWAP_IO_SPACE=y |
71 | CONFIG_BOOT_ELF32=y | 82 | CONFIG_BOOT_ELF32=y |
@@ -74,10 +85,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
74 | # | 85 | # |
75 | # CPU selection | 86 | # CPU selection |
76 | # | 87 | # |
77 | CONFIG_TICK_ONESHOT=y | ||
78 | CONFIG_NO_HZ=y | ||
79 | CONFIG_HIGH_RES_TIMERS=y | ||
80 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
81 | # CONFIG_CPU_LOONGSON2 is not set | 88 | # CONFIG_CPU_LOONGSON2 is not set |
82 | # CONFIG_CPU_MIPS32_R1 is not set | 89 | # CONFIG_CPU_MIPS32_R1 is not set |
83 | CONFIG_CPU_MIPS32_R2=y | 90 | CONFIG_CPU_MIPS32_R2=y |
@@ -91,6 +98,7 @@ CONFIG_CPU_MIPS32_R2=y | |||
91 | # CONFIG_CPU_TX49XX is not set | 98 | # CONFIG_CPU_TX49XX is not set |
92 | # CONFIG_CPU_R5000 is not set | 99 | # CONFIG_CPU_R5000 is not set |
93 | # CONFIG_CPU_R5432 is not set | 100 | # CONFIG_CPU_R5432 is not set |
101 | # CONFIG_CPU_R5500 is not set | ||
94 | # CONFIG_CPU_R6000 is not set | 102 | # CONFIG_CPU_R6000 is not set |
95 | # CONFIG_CPU_NEVADA is not set | 103 | # CONFIG_CPU_NEVADA is not set |
96 | # CONFIG_CPU_R8000 is not set | 104 | # CONFIG_CPU_R8000 is not set |
@@ -108,6 +116,7 @@ CONFIG_CPU_MIPSR2=y | |||
108 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 116 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
109 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | 117 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y |
110 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 118 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
119 | CONFIG_HARDWARE_WATCHPOINTS=y | ||
111 | 120 | ||
112 | # | 121 | # |
113 | # Kernel type | 122 | # Kernel type |
@@ -125,6 +134,8 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
125 | CONFIG_MIPS_MT_SMP=y | 134 | CONFIG_MIPS_MT_SMP=y |
126 | # CONFIG_MIPS_MT_SMTC is not set | 135 | # CONFIG_MIPS_MT_SMTC is not set |
127 | CONFIG_MIPS_MT=y | 136 | CONFIG_MIPS_MT=y |
137 | # CONFIG_SCHED_SMT is not set | ||
138 | CONFIG_SYS_SUPPORTS_SCHED_SMT=y | ||
128 | CONFIG_SYS_SUPPORTS_MULTITHREADING=y | 139 | CONFIG_SYS_SUPPORTS_MULTITHREADING=y |
129 | CONFIG_MIPS_MT_FPAFF=y | 140 | CONFIG_MIPS_MT_FPAFF=y |
130 | # CONFIG_MIPS_VPE_LOADER is not set | 141 | # CONFIG_MIPS_VPE_LOADER is not set |
@@ -132,7 +143,6 @@ CONFIG_CPU_HAS_LLSC=y | |||
132 | # CONFIG_CPU_HAS_SMARTMIPS is not set | 143 | # CONFIG_CPU_HAS_SMARTMIPS is not set |
133 | CONFIG_CPU_MIPSR2_IRQ_VI=y | 144 | CONFIG_CPU_MIPSR2_IRQ_VI=y |
134 | CONFIG_CPU_MIPSR2_IRQ_EI=y | 145 | CONFIG_CPU_MIPSR2_IRQ_EI=y |
135 | CONFIG_CPU_MIPSR2_SRS=y | ||
136 | CONFIG_CPU_HAS_SYNC=y | 146 | CONFIG_CPU_HAS_SYNC=y |
137 | CONFIG_GENERIC_HARDIRQS=y | 147 | CONFIG_GENERIC_HARDIRQS=y |
138 | CONFIG_GENERIC_IRQ_PROBE=y | 148 | CONFIG_GENERIC_IRQ_PROBE=y |
@@ -140,22 +150,30 @@ CONFIG_IRQ_PER_CPU=y | |||
140 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 150 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
141 | CONFIG_SYS_SUPPORTS_SMARTMIPS=y | 151 | CONFIG_SYS_SUPPORTS_SMARTMIPS=y |
142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 152 | CONFIG_ARCH_FLATMEM_ENABLE=y |
153 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
143 | CONFIG_SELECT_MEMORY_MODEL=y | 154 | CONFIG_SELECT_MEMORY_MODEL=y |
144 | CONFIG_FLATMEM_MANUAL=y | 155 | CONFIG_FLATMEM_MANUAL=y |
145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 156 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
146 | # CONFIG_SPARSEMEM_MANUAL is not set | 157 | # CONFIG_SPARSEMEM_MANUAL is not set |
147 | CONFIG_FLATMEM=y | 158 | CONFIG_FLATMEM=y |
148 | CONFIG_FLAT_NODE_MEM_MAP=y | 159 | CONFIG_FLAT_NODE_MEM_MAP=y |
149 | # CONFIG_SPARSEMEM_STATIC is not set | 160 | CONFIG_PAGEFLAGS_EXTENDED=y |
150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 161 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
151 | # CONFIG_RESOURCES_64BIT is not set | 162 | # CONFIG_RESOURCES_64BIT is not set |
163 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
152 | CONFIG_ZONE_DMA_FLAG=1 | 164 | CONFIG_ZONE_DMA_FLAG=1 |
153 | CONFIG_BOUNCE=y | 165 | CONFIG_BOUNCE=y |
154 | CONFIG_VIRT_TO_BUS=y | 166 | CONFIG_VIRT_TO_BUS=y |
167 | CONFIG_UNEVICTABLE_LRU=y | ||
155 | CONFIG_SMP=y | 168 | CONFIG_SMP=y |
169 | CONFIG_SMP_UP=y | ||
156 | CONFIG_SYS_SUPPORTS_SMP=y | 170 | CONFIG_SYS_SUPPORTS_SMP=y |
157 | CONFIG_NR_CPUS_DEFAULT_2=y | 171 | CONFIG_NR_CPUS_DEFAULT_2=y |
158 | CONFIG_NR_CPUS=2 | 172 | CONFIG_NR_CPUS=2 |
173 | CONFIG_TICK_ONESHOT=y | ||
174 | CONFIG_NO_HZ=y | ||
175 | CONFIG_HIGH_RES_TIMERS=y | ||
176 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
159 | # CONFIG_HZ_48 is not set | 177 | # CONFIG_HZ_48 is not set |
160 | CONFIG_HZ_100=y | 178 | CONFIG_HZ_100=y |
161 | # CONFIG_HZ_128 is not set | 179 | # CONFIG_HZ_128 is not set |
@@ -168,7 +186,6 @@ CONFIG_HZ=100 | |||
168 | CONFIG_PREEMPT_NONE=y | 186 | CONFIG_PREEMPT_NONE=y |
169 | # CONFIG_PREEMPT_VOLUNTARY is not set | 187 | # CONFIG_PREEMPT_VOLUNTARY is not set |
170 | # CONFIG_PREEMPT is not set | 188 | # CONFIG_PREEMPT is not set |
171 | CONFIG_PREEMPT_BKL=y | ||
172 | # CONFIG_KEXEC is not set | 189 | # CONFIG_KEXEC is not set |
173 | CONFIG_SECCOMP=y | 190 | CONFIG_SECCOMP=y |
174 | CONFIG_LOCKDEP_SUPPORT=y | 191 | CONFIG_LOCKDEP_SUPPORT=y |
@@ -189,13 +206,19 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
189 | # CONFIG_POSIX_MQUEUE is not set | 206 | # CONFIG_POSIX_MQUEUE is not set |
190 | # CONFIG_BSD_PROCESS_ACCT is not set | 207 | # CONFIG_BSD_PROCESS_ACCT is not set |
191 | # CONFIG_TASKSTATS is not set | 208 | # CONFIG_TASKSTATS is not set |
192 | # CONFIG_USER_NS is not set | ||
193 | # CONFIG_AUDIT is not set | 209 | # CONFIG_AUDIT is not set |
194 | # CONFIG_IKCONFIG is not set | 210 | # CONFIG_IKCONFIG is not set |
195 | CONFIG_LOG_BUF_SHIFT=15 | 211 | CONFIG_LOG_BUF_SHIFT=15 |
196 | # CONFIG_CPUSETS is not set | 212 | # CONFIG_CGROUPS is not set |
213 | # CONFIG_GROUP_SCHED is not set | ||
197 | CONFIG_SYSFS_DEPRECATED=y | 214 | CONFIG_SYSFS_DEPRECATED=y |
215 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
198 | CONFIG_RELAY=y | 216 | CONFIG_RELAY=y |
217 | CONFIG_NAMESPACES=y | ||
218 | CONFIG_UTS_NS=y | ||
219 | CONFIG_IPC_NS=y | ||
220 | # CONFIG_USER_NS is not set | ||
221 | CONFIG_PID_NS=y | ||
199 | # CONFIG_BLK_DEV_INITRD is not set | 222 | # CONFIG_BLK_DEV_INITRD is not set |
200 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 223 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
201 | CONFIG_SYSCTL=y | 224 | CONFIG_SYSCTL=y |
@@ -207,6 +230,8 @@ CONFIG_HOTPLUG=y | |||
207 | CONFIG_PRINTK=y | 230 | CONFIG_PRINTK=y |
208 | CONFIG_BUG=y | 231 | CONFIG_BUG=y |
209 | CONFIG_ELF_CORE=y | 232 | CONFIG_ELF_CORE=y |
233 | CONFIG_PCSPKR_PLATFORM=y | ||
234 | # CONFIG_COMPAT_BRK is not set | ||
210 | CONFIG_BASE_FULL=y | 235 | CONFIG_BASE_FULL=y |
211 | CONFIG_FUTEX=y | 236 | CONFIG_FUTEX=y |
212 | CONFIG_ANON_INODES=y | 237 | CONFIG_ANON_INODES=y |
@@ -215,14 +240,23 @@ CONFIG_SIGNALFD=y | |||
215 | CONFIG_TIMERFD=y | 240 | CONFIG_TIMERFD=y |
216 | CONFIG_EVENTFD=y | 241 | CONFIG_EVENTFD=y |
217 | CONFIG_SHMEM=y | 242 | CONFIG_SHMEM=y |
243 | CONFIG_AIO=y | ||
218 | CONFIG_VM_EVENT_COUNTERS=y | 244 | CONFIG_VM_EVENT_COUNTERS=y |
245 | CONFIG_PCI_QUIRKS=y | ||
219 | CONFIG_SLAB=y | 246 | CONFIG_SLAB=y |
220 | # CONFIG_SLUB is not set | 247 | # CONFIG_SLUB is not set |
221 | # CONFIG_SLOB is not set | 248 | # CONFIG_SLOB is not set |
249 | # CONFIG_PROFILING is not set | ||
250 | # CONFIG_MARKERS is not set | ||
251 | CONFIG_HAVE_OPROFILE=y | ||
252 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
253 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
254 | CONFIG_SLABINFO=y | ||
222 | CONFIG_RT_MUTEXES=y | 255 | CONFIG_RT_MUTEXES=y |
223 | # CONFIG_TINY_SHMEM is not set | 256 | # CONFIG_TINY_SHMEM is not set |
224 | CONFIG_BASE_SMALL=0 | 257 | CONFIG_BASE_SMALL=0 |
225 | CONFIG_MODULES=y | 258 | CONFIG_MODULES=y |
259 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
226 | CONFIG_MODULE_UNLOAD=y | 260 | CONFIG_MODULE_UNLOAD=y |
227 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 261 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
228 | CONFIG_MODVERSIONS=y | 262 | CONFIG_MODVERSIONS=y |
@@ -234,6 +268,7 @@ CONFIG_BLOCK=y | |||
234 | # CONFIG_BLK_DEV_IO_TRACE is not set | 268 | # CONFIG_BLK_DEV_IO_TRACE is not set |
235 | # CONFIG_LSF is not set | 269 | # CONFIG_LSF is not set |
236 | # CONFIG_BLK_DEV_BSG is not set | 270 | # CONFIG_BLK_DEV_BSG is not set |
271 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
237 | 272 | ||
238 | # | 273 | # |
239 | # IO Schedulers | 274 | # IO Schedulers |
@@ -247,19 +282,19 @@ CONFIG_DEFAULT_AS=y | |||
247 | # CONFIG_DEFAULT_CFQ is not set | 282 | # CONFIG_DEFAULT_CFQ is not set |
248 | # CONFIG_DEFAULT_NOOP is not set | 283 | # CONFIG_DEFAULT_NOOP is not set |
249 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 284 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
285 | CONFIG_CLASSIC_RCU=y | ||
286 | # CONFIG_FREEZER is not set | ||
250 | 287 | ||
251 | # | 288 | # |
252 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 289 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
253 | # | 290 | # |
254 | CONFIG_HW_HAS_PCI=y | 291 | CONFIG_HW_HAS_PCI=y |
255 | CONFIG_PCI=y | 292 | CONFIG_PCI=y |
293 | CONFIG_PCI_DOMAINS=y | ||
256 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 294 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
295 | CONFIG_PCI_LEGACY=y | ||
257 | CONFIG_MMU=y | 296 | CONFIG_MMU=y |
258 | CONFIG_I8253=y | 297 | CONFIG_I8253=y |
259 | |||
260 | # | ||
261 | # PCCARD (PCMCIA/CardBus) support | ||
262 | # | ||
263 | # CONFIG_PCCARD is not set | 298 | # CONFIG_PCCARD is not set |
264 | # CONFIG_HOTPLUG_PCI is not set | 299 | # CONFIG_HOTPLUG_PCI is not set |
265 | 300 | ||
@@ -267,6 +302,8 @@ CONFIG_I8253=y | |||
267 | # Executable file formats | 302 | # Executable file formats |
268 | # | 303 | # |
269 | CONFIG_BINFMT_ELF=y | 304 | CONFIG_BINFMT_ELF=y |
305 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
306 | # CONFIG_HAVE_AOUT is not set | ||
270 | # CONFIG_BINFMT_MISC is not set | 307 | # CONFIG_BINFMT_MISC is not set |
271 | CONFIG_TRAD_SIGNALS=y | 308 | CONFIG_TRAD_SIGNALS=y |
272 | 309 | ||
@@ -274,12 +311,7 @@ CONFIG_TRAD_SIGNALS=y | |||
274 | # Power management options | 311 | # Power management options |
275 | # | 312 | # |
276 | CONFIG_PM=y | 313 | CONFIG_PM=y |
277 | # CONFIG_PM_LEGACY is not set | ||
278 | # CONFIG_PM_DEBUG is not set | 314 | # CONFIG_PM_DEBUG is not set |
279 | |||
280 | # | ||
281 | # Networking | ||
282 | # | ||
283 | CONFIG_NET=y | 315 | CONFIG_NET=y |
284 | 316 | ||
285 | # | 317 | # |
@@ -292,6 +324,8 @@ CONFIG_XFRM=y | |||
292 | CONFIG_XFRM_USER=m | 324 | CONFIG_XFRM_USER=m |
293 | # CONFIG_XFRM_SUB_POLICY is not set | 325 | # CONFIG_XFRM_SUB_POLICY is not set |
294 | CONFIG_XFRM_MIGRATE=y | 326 | CONFIG_XFRM_MIGRATE=y |
327 | # CONFIG_XFRM_STATISTICS is not set | ||
328 | CONFIG_XFRM_IPCOMP=m | ||
295 | CONFIG_NET_KEY=y | 329 | CONFIG_NET_KEY=y |
296 | CONFIG_NET_KEY_MIGRATE=y | 330 | CONFIG_NET_KEY_MIGRATE=y |
297 | CONFIG_INET=y | 331 | CONFIG_INET=y |
@@ -323,42 +357,13 @@ CONFIG_INET_TUNNEL=m | |||
323 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 357 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
324 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 358 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
325 | CONFIG_INET_XFRM_MODE_BEET=y | 359 | CONFIG_INET_XFRM_MODE_BEET=y |
360 | CONFIG_INET_LRO=m | ||
326 | CONFIG_INET_DIAG=y | 361 | CONFIG_INET_DIAG=y |
327 | CONFIG_INET_TCP_DIAG=y | 362 | CONFIG_INET_TCP_DIAG=y |
328 | # CONFIG_TCP_CONG_ADVANCED is not set | 363 | # CONFIG_TCP_CONG_ADVANCED is not set |
329 | CONFIG_TCP_CONG_CUBIC=y | 364 | CONFIG_TCP_CONG_CUBIC=y |
330 | CONFIG_DEFAULT_TCP_CONG="cubic" | 365 | CONFIG_DEFAULT_TCP_CONG="cubic" |
331 | CONFIG_TCP_MD5SIG=y | 366 | CONFIG_TCP_MD5SIG=y |
332 | CONFIG_IP_VS=m | ||
333 | # CONFIG_IP_VS_DEBUG is not set | ||
334 | CONFIG_IP_VS_TAB_BITS=12 | ||
335 | |||
336 | # | ||
337 | # IPVS transport protocol load balancing support | ||
338 | # | ||
339 | CONFIG_IP_VS_PROTO_TCP=y | ||
340 | CONFIG_IP_VS_PROTO_UDP=y | ||
341 | CONFIG_IP_VS_PROTO_ESP=y | ||
342 | CONFIG_IP_VS_PROTO_AH=y | ||
343 | |||
344 | # | ||
345 | # IPVS scheduler | ||
346 | # | ||
347 | CONFIG_IP_VS_RR=m | ||
348 | CONFIG_IP_VS_WRR=m | ||
349 | CONFIG_IP_VS_LC=m | ||
350 | CONFIG_IP_VS_WLC=m | ||
351 | CONFIG_IP_VS_LBLC=m | ||
352 | CONFIG_IP_VS_LBLCR=m | ||
353 | CONFIG_IP_VS_DH=m | ||
354 | CONFIG_IP_VS_SH=m | ||
355 | CONFIG_IP_VS_SED=m | ||
356 | CONFIG_IP_VS_NQ=m | ||
357 | |||
358 | # | ||
359 | # IPVS application helper | ||
360 | # | ||
361 | CONFIG_IP_VS_FTP=m | ||
362 | CONFIG_IPV6=m | 367 | CONFIG_IPV6=m |
363 | CONFIG_IPV6_PRIVACY=y | 368 | CONFIG_IPV6_PRIVACY=y |
364 | CONFIG_IPV6_ROUTER_PREF=y | 369 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -375,11 +380,15 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
375 | CONFIG_INET6_XFRM_MODE_BEET=m | 380 | CONFIG_INET6_XFRM_MODE_BEET=m |
376 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 381 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
377 | CONFIG_IPV6_SIT=m | 382 | CONFIG_IPV6_SIT=m |
383 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
378 | CONFIG_IPV6_TUNNEL=m | 384 | CONFIG_IPV6_TUNNEL=m |
379 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 385 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
386 | CONFIG_IPV6_MROUTE=y | ||
387 | CONFIG_IPV6_PIMSM_V2=y | ||
380 | CONFIG_NETWORK_SECMARK=y | 388 | CONFIG_NETWORK_SECMARK=y |
381 | CONFIG_NETFILTER=y | 389 | CONFIG_NETFILTER=y |
382 | # CONFIG_NETFILTER_DEBUG is not set | 390 | # CONFIG_NETFILTER_DEBUG is not set |
391 | CONFIG_NETFILTER_ADVANCED=y | ||
383 | CONFIG_BRIDGE_NETFILTER=y | 392 | CONFIG_BRIDGE_NETFILTER=y |
384 | 393 | ||
385 | # | 394 | # |
@@ -388,12 +397,12 @@ CONFIG_BRIDGE_NETFILTER=y | |||
388 | CONFIG_NETFILTER_NETLINK=m | 397 | CONFIG_NETFILTER_NETLINK=m |
389 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 398 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
390 | CONFIG_NETFILTER_NETLINK_LOG=m | 399 | CONFIG_NETFILTER_NETLINK_LOG=m |
391 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
392 | CONFIG_NF_CONNTRACK=m | 400 | CONFIG_NF_CONNTRACK=m |
393 | CONFIG_NF_CT_ACCT=y | 401 | CONFIG_NF_CT_ACCT=y |
394 | CONFIG_NF_CONNTRACK_MARK=y | 402 | CONFIG_NF_CONNTRACK_MARK=y |
395 | CONFIG_NF_CONNTRACK_SECMARK=y | 403 | CONFIG_NF_CONNTRACK_SECMARK=y |
396 | CONFIG_NF_CONNTRACK_EVENTS=y | 404 | CONFIG_NF_CONNTRACK_EVENTS=y |
405 | CONFIG_NF_CT_PROTO_DCCP=m | ||
397 | CONFIG_NF_CT_PROTO_GRE=m | 406 | CONFIG_NF_CT_PROTO_GRE=m |
398 | CONFIG_NF_CT_PROTO_SCTP=m | 407 | CONFIG_NF_CT_PROTO_SCTP=m |
399 | CONFIG_NF_CT_PROTO_UDPLITE=m | 408 | CONFIG_NF_CT_PROTO_UDPLITE=m |
@@ -407,18 +416,22 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
407 | CONFIG_NF_CONNTRACK_SIP=m | 416 | CONFIG_NF_CONNTRACK_SIP=m |
408 | CONFIG_NF_CONNTRACK_TFTP=m | 417 | CONFIG_NF_CONNTRACK_TFTP=m |
409 | CONFIG_NF_CT_NETLINK=m | 418 | CONFIG_NF_CT_NETLINK=m |
419 | CONFIG_NETFILTER_TPROXY=m | ||
410 | CONFIG_NETFILTER_XTABLES=m | 420 | CONFIG_NETFILTER_XTABLES=m |
411 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 421 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
412 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 422 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
423 | # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set | ||
413 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 424 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
414 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 425 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
415 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
416 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 426 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
427 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
417 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 428 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
429 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
430 | CONFIG_NETFILTER_XT_TARGET_TPROXY=m | ||
418 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 431 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
419 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 432 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
420 | # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set | ||
421 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 433 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
434 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
422 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 435 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
423 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 436 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
424 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 437 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
@@ -427,40 +440,76 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
427 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 440 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
428 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 441 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
429 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 442 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
443 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
430 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 444 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
445 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
431 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 446 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
432 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 447 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
433 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 448 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
434 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 449 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
435 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
436 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 450 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
451 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
452 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
437 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | 453 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set |
438 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 454 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
439 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 455 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
456 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
440 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 457 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
458 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
459 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
441 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 460 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
461 | CONFIG_NETFILTER_XT_MATCH_SOCKET=m | ||
442 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 462 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
443 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 463 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
444 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 464 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
445 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 465 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
466 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
446 | CONFIG_NETFILTER_XT_MATCH_U32=m | 467 | CONFIG_NETFILTER_XT_MATCH_U32=m |
447 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 468 | CONFIG_IP_VS=m |
469 | CONFIG_IP_VS_IPV6=y | ||
470 | # CONFIG_IP_VS_DEBUG is not set | ||
471 | CONFIG_IP_VS_TAB_BITS=12 | ||
472 | |||
473 | # | ||
474 | # IPVS transport protocol load balancing support | ||
475 | # | ||
476 | CONFIG_IP_VS_PROTO_TCP=y | ||
477 | CONFIG_IP_VS_PROTO_UDP=y | ||
478 | CONFIG_IP_VS_PROTO_AH_ESP=y | ||
479 | CONFIG_IP_VS_PROTO_ESP=y | ||
480 | CONFIG_IP_VS_PROTO_AH=y | ||
481 | |||
482 | # | ||
483 | # IPVS scheduler | ||
484 | # | ||
485 | CONFIG_IP_VS_RR=m | ||
486 | CONFIG_IP_VS_WRR=m | ||
487 | CONFIG_IP_VS_LC=m | ||
488 | CONFIG_IP_VS_WLC=m | ||
489 | CONFIG_IP_VS_LBLC=m | ||
490 | CONFIG_IP_VS_LBLCR=m | ||
491 | CONFIG_IP_VS_DH=m | ||
492 | CONFIG_IP_VS_SH=m | ||
493 | CONFIG_IP_VS_SED=m | ||
494 | CONFIG_IP_VS_NQ=m | ||
495 | |||
496 | # | ||
497 | # IPVS application helper | ||
498 | # | ||
499 | CONFIG_IP_VS_FTP=m | ||
448 | 500 | ||
449 | # | 501 | # |
450 | # IP: Netfilter Configuration | 502 | # IP: Netfilter Configuration |
451 | # | 503 | # |
504 | CONFIG_NF_DEFRAG_IPV4=m | ||
452 | CONFIG_NF_CONNTRACK_IPV4=m | 505 | CONFIG_NF_CONNTRACK_IPV4=m |
453 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 506 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
454 | CONFIG_IP_NF_QUEUE=m | 507 | CONFIG_IP_NF_QUEUE=m |
455 | CONFIG_IP_NF_IPTABLES=m | 508 | CONFIG_IP_NF_IPTABLES=m |
456 | CONFIG_IP_NF_MATCH_IPRANGE=m | 509 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
457 | CONFIG_IP_NF_MATCH_TOS=m | ||
458 | CONFIG_IP_NF_MATCH_RECENT=m | ||
459 | CONFIG_IP_NF_MATCH_ECN=m | ||
460 | CONFIG_IP_NF_MATCH_AH=m | 510 | CONFIG_IP_NF_MATCH_AH=m |
511 | CONFIG_IP_NF_MATCH_ECN=m | ||
461 | CONFIG_IP_NF_MATCH_TTL=m | 512 | CONFIG_IP_NF_MATCH_TTL=m |
462 | CONFIG_IP_NF_MATCH_OWNER=m | ||
463 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
464 | CONFIG_IP_NF_FILTER=m | 513 | CONFIG_IP_NF_FILTER=m |
465 | CONFIG_IP_NF_TARGET_REJECT=m | 514 | CONFIG_IP_NF_TARGET_REJECT=m |
466 | CONFIG_IP_NF_TARGET_LOG=m | 515 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -468,11 +517,13 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
468 | CONFIG_NF_NAT=m | 517 | CONFIG_NF_NAT=m |
469 | CONFIG_NF_NAT_NEEDED=y | 518 | CONFIG_NF_NAT_NEEDED=y |
470 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 519 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
471 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
472 | CONFIG_IP_NF_TARGET_NETMAP=m | 520 | CONFIG_IP_NF_TARGET_NETMAP=m |
473 | CONFIG_IP_NF_TARGET_SAME=m | 521 | CONFIG_IP_NF_TARGET_REDIRECT=m |
474 | CONFIG_NF_NAT_SNMP_BASIC=m | 522 | CONFIG_NF_NAT_SNMP_BASIC=m |
523 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
475 | CONFIG_NF_NAT_PROTO_GRE=m | 524 | CONFIG_NF_NAT_PROTO_GRE=m |
525 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
526 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
476 | CONFIG_NF_NAT_FTP=m | 527 | CONFIG_NF_NAT_FTP=m |
477 | CONFIG_NF_NAT_IRC=m | 528 | CONFIG_NF_NAT_IRC=m |
478 | CONFIG_NF_NAT_TFTP=m | 529 | CONFIG_NF_NAT_TFTP=m |
@@ -481,40 +532,34 @@ CONFIG_NF_NAT_PPTP=m | |||
481 | CONFIG_NF_NAT_H323=m | 532 | CONFIG_NF_NAT_H323=m |
482 | CONFIG_NF_NAT_SIP=m | 533 | CONFIG_NF_NAT_SIP=m |
483 | CONFIG_IP_NF_MANGLE=m | 534 | CONFIG_IP_NF_MANGLE=m |
484 | CONFIG_IP_NF_TARGET_TOS=m | 535 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
485 | CONFIG_IP_NF_TARGET_ECN=m | 536 | CONFIG_IP_NF_TARGET_ECN=m |
486 | CONFIG_IP_NF_TARGET_TTL=m | 537 | CONFIG_IP_NF_TARGET_TTL=m |
487 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
488 | CONFIG_IP_NF_RAW=m | 538 | CONFIG_IP_NF_RAW=m |
489 | CONFIG_IP_NF_ARPTABLES=m | 539 | CONFIG_IP_NF_ARPTABLES=m |
490 | CONFIG_IP_NF_ARPFILTER=m | 540 | CONFIG_IP_NF_ARPFILTER=m |
491 | CONFIG_IP_NF_ARP_MANGLE=m | 541 | CONFIG_IP_NF_ARP_MANGLE=m |
492 | 542 | ||
493 | # | 543 | # |
494 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 544 | # IPv6: Netfilter Configuration |
495 | # | 545 | # |
496 | CONFIG_NF_CONNTRACK_IPV6=m | 546 | CONFIG_NF_CONNTRACK_IPV6=m |
497 | CONFIG_IP6_NF_QUEUE=m | 547 | CONFIG_IP6_NF_QUEUE=m |
498 | CONFIG_IP6_NF_IPTABLES=m | 548 | CONFIG_IP6_NF_IPTABLES=m |
499 | CONFIG_IP6_NF_MATCH_RT=m | 549 | CONFIG_IP6_NF_MATCH_AH=m |
500 | CONFIG_IP6_NF_MATCH_OPTS=m | 550 | CONFIG_IP6_NF_MATCH_EUI64=m |
501 | CONFIG_IP6_NF_MATCH_FRAG=m | 551 | CONFIG_IP6_NF_MATCH_FRAG=m |
552 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
502 | CONFIG_IP6_NF_MATCH_HL=m | 553 | CONFIG_IP6_NF_MATCH_HL=m |
503 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
504 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 554 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
505 | CONFIG_IP6_NF_MATCH_AH=m | ||
506 | CONFIG_IP6_NF_MATCH_MH=m | 555 | CONFIG_IP6_NF_MATCH_MH=m |
507 | CONFIG_IP6_NF_MATCH_EUI64=m | 556 | CONFIG_IP6_NF_MATCH_RT=m |
508 | CONFIG_IP6_NF_FILTER=m | ||
509 | CONFIG_IP6_NF_TARGET_LOG=m | 557 | CONFIG_IP6_NF_TARGET_LOG=m |
558 | CONFIG_IP6_NF_FILTER=m | ||
510 | CONFIG_IP6_NF_TARGET_REJECT=m | 559 | CONFIG_IP6_NF_TARGET_REJECT=m |
511 | CONFIG_IP6_NF_MANGLE=m | 560 | CONFIG_IP6_NF_MANGLE=m |
512 | CONFIG_IP6_NF_TARGET_HL=m | 561 | CONFIG_IP6_NF_TARGET_HL=m |
513 | CONFIG_IP6_NF_RAW=m | 562 | CONFIG_IP6_NF_RAW=m |
514 | |||
515 | # | ||
516 | # Bridge: Netfilter Configuration | ||
517 | # | ||
518 | CONFIG_BRIDGE_NF_EBTABLES=m | 563 | CONFIG_BRIDGE_NF_EBTABLES=m |
519 | CONFIG_BRIDGE_EBT_BROUTE=m | 564 | CONFIG_BRIDGE_EBT_BROUTE=m |
520 | CONFIG_BRIDGE_EBT_T_FILTER=m | 565 | CONFIG_BRIDGE_EBT_T_FILTER=m |
@@ -523,6 +568,7 @@ CONFIG_BRIDGE_EBT_802_3=m | |||
523 | CONFIG_BRIDGE_EBT_AMONG=m | 568 | CONFIG_BRIDGE_EBT_AMONG=m |
524 | CONFIG_BRIDGE_EBT_ARP=m | 569 | CONFIG_BRIDGE_EBT_ARP=m |
525 | CONFIG_BRIDGE_EBT_IP=m | 570 | CONFIG_BRIDGE_EBT_IP=m |
571 | CONFIG_BRIDGE_EBT_IP6=m | ||
526 | CONFIG_BRIDGE_EBT_LIMIT=m | 572 | CONFIG_BRIDGE_EBT_LIMIT=m |
527 | CONFIG_BRIDGE_EBT_MARK=m | 573 | CONFIG_BRIDGE_EBT_MARK=m |
528 | CONFIG_BRIDGE_EBT_PKTTYPE=m | 574 | CONFIG_BRIDGE_EBT_PKTTYPE=m |
@@ -535,6 +581,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m | |||
535 | CONFIG_BRIDGE_EBT_SNAT=m | 581 | CONFIG_BRIDGE_EBT_SNAT=m |
536 | CONFIG_BRIDGE_EBT_LOG=m | 582 | CONFIG_BRIDGE_EBT_LOG=m |
537 | CONFIG_BRIDGE_EBT_ULOG=m | 583 | CONFIG_BRIDGE_EBT_ULOG=m |
584 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
538 | # CONFIG_IP_DCCP is not set | 585 | # CONFIG_IP_DCCP is not set |
539 | CONFIG_IP_SCTP=m | 586 | CONFIG_IP_SCTP=m |
540 | # CONFIG_SCTP_DBG_MSG is not set | 587 | # CONFIG_SCTP_DBG_MSG is not set |
@@ -544,8 +591,12 @@ CONFIG_IP_SCTP=m | |||
544 | CONFIG_SCTP_HMAC_MD5=y | 591 | CONFIG_SCTP_HMAC_MD5=y |
545 | # CONFIG_TIPC is not set | 592 | # CONFIG_TIPC is not set |
546 | # CONFIG_ATM is not set | 593 | # CONFIG_ATM is not set |
594 | CONFIG_STP=m | ||
595 | CONFIG_GARP=m | ||
547 | CONFIG_BRIDGE=m | 596 | CONFIG_BRIDGE=m |
597 | # CONFIG_NET_DSA is not set | ||
548 | CONFIG_VLAN_8021Q=m | 598 | CONFIG_VLAN_8021Q=m |
599 | CONFIG_VLAN_8021Q_GVRP=y | ||
549 | # CONFIG_DECNET is not set | 600 | # CONFIG_DECNET is not set |
550 | CONFIG_LLC=m | 601 | CONFIG_LLC=m |
551 | # CONFIG_LLC2 is not set | 602 | # CONFIG_LLC2 is not set |
@@ -559,12 +610,7 @@ CONFIG_IPDDP_DECAP=y | |||
559 | # CONFIG_LAPB is not set | 610 | # CONFIG_LAPB is not set |
560 | # CONFIG_ECONET is not set | 611 | # CONFIG_ECONET is not set |
561 | # CONFIG_WAN_ROUTER is not set | 612 | # CONFIG_WAN_ROUTER is not set |
562 | |||
563 | # | ||
564 | # QoS and/or fair queueing | ||
565 | # | ||
566 | CONFIG_NET_SCHED=y | 613 | CONFIG_NET_SCHED=y |
567 | CONFIG_NET_SCH_FIFO=y | ||
568 | 614 | ||
569 | # | 615 | # |
570 | # Queueing/Scheduling | 616 | # Queueing/Scheduling |
@@ -573,7 +619,7 @@ CONFIG_NET_SCH_CBQ=m | |||
573 | CONFIG_NET_SCH_HTB=m | 619 | CONFIG_NET_SCH_HTB=m |
574 | CONFIG_NET_SCH_HFSC=m | 620 | CONFIG_NET_SCH_HFSC=m |
575 | CONFIG_NET_SCH_PRIO=m | 621 | CONFIG_NET_SCH_PRIO=m |
576 | CONFIG_NET_SCH_RR=m | 622 | # CONFIG_NET_SCH_MULTIQ is not set |
577 | CONFIG_NET_SCH_RED=m | 623 | CONFIG_NET_SCH_RED=m |
578 | CONFIG_NET_SCH_SFQ=m | 624 | CONFIG_NET_SCH_SFQ=m |
579 | CONFIG_NET_SCH_TEQL=m | 625 | CONFIG_NET_SCH_TEQL=m |
@@ -597,6 +643,7 @@ CONFIG_NET_CLS_U32=m | |||
597 | # CONFIG_CLS_U32_MARK is not set | 643 | # CONFIG_CLS_U32_MARK is not set |
598 | CONFIG_NET_CLS_RSVP=m | 644 | CONFIG_NET_CLS_RSVP=m |
599 | CONFIG_NET_CLS_RSVP6=m | 645 | CONFIG_NET_CLS_RSVP6=m |
646 | CONFIG_NET_CLS_FLOW=m | ||
600 | # CONFIG_NET_EMATCH is not set | 647 | # CONFIG_NET_EMATCH is not set |
601 | CONFIG_NET_CLS_ACT=y | 648 | CONFIG_NET_CLS_ACT=y |
602 | CONFIG_NET_ACT_POLICE=y | 649 | CONFIG_NET_ACT_POLICE=y |
@@ -604,37 +651,51 @@ CONFIG_NET_ACT_GACT=m | |||
604 | CONFIG_GACT_PROB=y | 651 | CONFIG_GACT_PROB=y |
605 | CONFIG_NET_ACT_MIRRED=m | 652 | CONFIG_NET_ACT_MIRRED=m |
606 | CONFIG_NET_ACT_IPT=m | 653 | CONFIG_NET_ACT_IPT=m |
654 | CONFIG_NET_ACT_NAT=m | ||
607 | CONFIG_NET_ACT_PEDIT=m | 655 | CONFIG_NET_ACT_PEDIT=m |
608 | CONFIG_NET_ACT_SIMP=m | 656 | CONFIG_NET_ACT_SIMP=m |
609 | CONFIG_NET_CLS_POLICE=y | 657 | CONFIG_NET_ACT_SKBEDIT=m |
610 | CONFIG_NET_CLS_IND=y | 658 | CONFIG_NET_CLS_IND=y |
659 | CONFIG_NET_SCH_FIFO=y | ||
611 | 660 | ||
612 | # | 661 | # |
613 | # Network testing | 662 | # Network testing |
614 | # | 663 | # |
615 | # CONFIG_NET_PKTGEN is not set | 664 | # CONFIG_NET_PKTGEN is not set |
616 | # CONFIG_HAMRADIO is not set | 665 | # CONFIG_HAMRADIO is not set |
666 | # CONFIG_CAN is not set | ||
617 | # CONFIG_IRDA is not set | 667 | # CONFIG_IRDA is not set |
618 | # CONFIG_BT is not set | 668 | # CONFIG_BT is not set |
619 | # CONFIG_AF_RXRPC is not set | 669 | # CONFIG_AF_RXRPC is not set |
670 | CONFIG_PHONET=m | ||
620 | CONFIG_FIB_RULES=y | 671 | CONFIG_FIB_RULES=y |
621 | 672 | CONFIG_WIRELESS=y | |
622 | # | ||
623 | # Wireless | ||
624 | # | ||
625 | CONFIG_CFG80211=m | 673 | CONFIG_CFG80211=m |
674 | CONFIG_NL80211=y | ||
675 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
626 | CONFIG_WIRELESS_EXT=y | 676 | CONFIG_WIRELESS_EXT=y |
677 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
627 | CONFIG_MAC80211=m | 678 | CONFIG_MAC80211=m |
628 | # CONFIG_MAC80211_DEBUG is not set | 679 | |
680 | # | ||
681 | # Rate control algorithm selection | ||
682 | # | ||
683 | CONFIG_MAC80211_RC_PID=y | ||
684 | CONFIG_MAC80211_RC_MINSTREL=y | ||
685 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
686 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | ||
687 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
688 | CONFIG_MAC80211_MESH=y | ||
689 | CONFIG_MAC80211_LEDS=y | ||
690 | # CONFIG_MAC80211_DEBUG_MENU is not set | ||
629 | CONFIG_IEEE80211=m | 691 | CONFIG_IEEE80211=m |
630 | # CONFIG_IEEE80211_DEBUG is not set | 692 | # CONFIG_IEEE80211_DEBUG is not set |
631 | CONFIG_IEEE80211_CRYPT_WEP=m | 693 | CONFIG_IEEE80211_CRYPT_WEP=m |
632 | CONFIG_IEEE80211_CRYPT_CCMP=m | 694 | CONFIG_IEEE80211_CRYPT_CCMP=m |
633 | CONFIG_IEEE80211_CRYPT_TKIP=m | 695 | CONFIG_IEEE80211_CRYPT_TKIP=m |
634 | CONFIG_IEEE80211_SOFTMAC=m | ||
635 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
636 | CONFIG_RFKILL=m | 696 | CONFIG_RFKILL=m |
637 | CONFIG_RFKILL_INPUT=m | 697 | CONFIG_RFKILL_INPUT=m |
698 | CONFIG_RFKILL_LEDS=y | ||
638 | # CONFIG_NET_9P is not set | 699 | # CONFIG_NET_9P is not set |
639 | 700 | ||
640 | # | 701 | # |
@@ -644,9 +705,12 @@ CONFIG_RFKILL_INPUT=m | |||
644 | # | 705 | # |
645 | # Generic Driver Options | 706 | # Generic Driver Options |
646 | # | 707 | # |
708 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
647 | CONFIG_STANDALONE=y | 709 | CONFIG_STANDALONE=y |
648 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 710 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
649 | CONFIG_FW_LOADER=y | 711 | CONFIG_FW_LOADER=y |
712 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
713 | CONFIG_EXTRA_FIRMWARE="" | ||
650 | # CONFIG_SYS_HYPERVISOR is not set | 714 | # CONFIG_SYS_HYPERVISOR is not set |
651 | CONFIG_CONNECTOR=m | 715 | CONFIG_CONNECTOR=m |
652 | CONFIG_MTD=y | 716 | CONFIG_MTD=y |
@@ -655,6 +719,7 @@ CONFIG_MTD=y | |||
655 | CONFIG_MTD_PARTITIONS=y | 719 | CONFIG_MTD_PARTITIONS=y |
656 | # CONFIG_MTD_REDBOOT_PARTS is not set | 720 | # CONFIG_MTD_REDBOOT_PARTS is not set |
657 | # CONFIG_MTD_CMDLINE_PARTS is not set | 721 | # CONFIG_MTD_CMDLINE_PARTS is not set |
722 | # CONFIG_MTD_AR7_PARTS is not set | ||
658 | 723 | ||
659 | # | 724 | # |
660 | # User Modules And Translation Layers | 725 | # User Modules And Translation Layers |
@@ -667,6 +732,7 @@ CONFIG_MTD_BLOCK=y | |||
667 | # CONFIG_INFTL is not set | 732 | # CONFIG_INFTL is not set |
668 | # CONFIG_RFD_FTL is not set | 733 | # CONFIG_RFD_FTL is not set |
669 | # CONFIG_SSFDC is not set | 734 | # CONFIG_SSFDC is not set |
735 | CONFIG_MTD_OOPS=m | ||
670 | 736 | ||
671 | # | 737 | # |
672 | # RAM/ROM/Flash chip drivers | 738 | # RAM/ROM/Flash chip drivers |
@@ -701,6 +767,7 @@ CONFIG_MTD_PHYSMAP=y | |||
701 | CONFIG_MTD_PHYSMAP_START=0x0 | 767 | CONFIG_MTD_PHYSMAP_START=0x0 |
702 | CONFIG_MTD_PHYSMAP_LEN=0x0 | 768 | CONFIG_MTD_PHYSMAP_LEN=0x0 |
703 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | 769 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 |
770 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
704 | # CONFIG_MTD_PLATRAM is not set | 771 | # CONFIG_MTD_PLATRAM is not set |
705 | 772 | ||
706 | # | 773 | # |
@@ -748,25 +815,26 @@ CONFIG_BLK_DEV_NBD=m | |||
748 | CONFIG_BLK_DEV_RAM=y | 815 | CONFIG_BLK_DEV_RAM=y |
749 | CONFIG_BLK_DEV_RAM_COUNT=16 | 816 | CONFIG_BLK_DEV_RAM_COUNT=16 |
750 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 817 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
751 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 818 | # CONFIG_BLK_DEV_XIP is not set |
752 | CONFIG_CDROM_PKTCDVD=m | 819 | CONFIG_CDROM_PKTCDVD=m |
753 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 820 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
754 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 821 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
755 | CONFIG_ATA_OVER_ETH=m | 822 | CONFIG_ATA_OVER_ETH=m |
823 | # CONFIG_BLK_DEV_HD is not set | ||
756 | # CONFIG_MISC_DEVICES is not set | 824 | # CONFIG_MISC_DEVICES is not set |
825 | CONFIG_HAVE_IDE=y | ||
757 | CONFIG_IDE=y | 826 | CONFIG_IDE=y |
758 | CONFIG_IDE_MAX_HWIFS=4 | ||
759 | CONFIG_BLK_DEV_IDE=y | ||
760 | 827 | ||
761 | # | 828 | # |
762 | # Please see Documentation/ide.txt for help/info on IDE drives | 829 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
763 | # | 830 | # |
764 | # CONFIG_BLK_DEV_IDE_SATA is not set | 831 | # CONFIG_BLK_DEV_IDE_SATA is not set |
765 | CONFIG_BLK_DEV_IDEDISK=y | 832 | CONFIG_IDE_GD=y |
766 | # CONFIG_IDEDISK_MULTI_MODE is not set | 833 | CONFIG_IDE_GD_ATA=y |
834 | # CONFIG_IDE_GD_ATAPI is not set | ||
767 | CONFIG_BLK_DEV_IDECD=y | 835 | CONFIG_BLK_DEV_IDECD=y |
836 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
768 | # CONFIG_BLK_DEV_IDETAPE is not set | 837 | # CONFIG_BLK_DEV_IDETAPE is not set |
769 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
770 | # CONFIG_BLK_DEV_IDESCSI is not set | 838 | # CONFIG_BLK_DEV_IDESCSI is not set |
771 | # CONFIG_IDE_TASK_IOCTL is not set | 839 | # CONFIG_IDE_TASK_IOCTL is not set |
772 | CONFIG_IDE_PROC_FS=y | 840 | CONFIG_IDE_PROC_FS=y |
@@ -775,24 +843,25 @@ CONFIG_IDE_PROC_FS=y | |||
775 | # IDE chipset support/bugfixes | 843 | # IDE chipset support/bugfixes |
776 | # | 844 | # |
777 | CONFIG_IDE_GENERIC=y | 845 | CONFIG_IDE_GENERIC=y |
846 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
847 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
848 | |||
849 | # | ||
850 | # PCI IDE chipsets support | ||
851 | # | ||
778 | CONFIG_BLK_DEV_IDEPCI=y | 852 | CONFIG_BLK_DEV_IDEPCI=y |
779 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
780 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 853 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
781 | # CONFIG_BLK_DEV_OFFBOARD is not set | 854 | # CONFIG_BLK_DEV_OFFBOARD is not set |
782 | CONFIG_BLK_DEV_GENERIC=y | 855 | CONFIG_BLK_DEV_GENERIC=y |
783 | # CONFIG_BLK_DEV_OPTI621 is not set | 856 | # CONFIG_BLK_DEV_OPTI621 is not set |
784 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 857 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
785 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
786 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
787 | # CONFIG_BLK_DEV_AEC62XX is not set | 858 | # CONFIG_BLK_DEV_AEC62XX is not set |
788 | # CONFIG_BLK_DEV_ALI15X3 is not set | 859 | # CONFIG_BLK_DEV_ALI15X3 is not set |
789 | # CONFIG_BLK_DEV_AMD74XX is not set | 860 | # CONFIG_BLK_DEV_AMD74XX is not set |
790 | # CONFIG_BLK_DEV_CMD64X is not set | 861 | # CONFIG_BLK_DEV_CMD64X is not set |
791 | # CONFIG_BLK_DEV_TRIFLEX is not set | 862 | # CONFIG_BLK_DEV_TRIFLEX is not set |
792 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
793 | # CONFIG_BLK_DEV_CS5520 is not set | 863 | # CONFIG_BLK_DEV_CS5520 is not set |
794 | # CONFIG_BLK_DEV_CS5530 is not set | 864 | # CONFIG_BLK_DEV_CS5530 is not set |
795 | # CONFIG_BLK_DEV_HPT34X is not set | ||
796 | # CONFIG_BLK_DEV_HPT366 is not set | 865 | # CONFIG_BLK_DEV_HPT366 is not set |
797 | # CONFIG_BLK_DEV_JMICRON is not set | 866 | # CONFIG_BLK_DEV_JMICRON is not set |
798 | # CONFIG_BLK_DEV_SC1200 is not set | 867 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -808,10 +877,7 @@ CONFIG_BLK_DEV_IT8213=m | |||
808 | # CONFIG_BLK_DEV_TRM290 is not set | 877 | # CONFIG_BLK_DEV_TRM290 is not set |
809 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 878 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
810 | CONFIG_BLK_DEV_TC86C001=m | 879 | CONFIG_BLK_DEV_TC86C001=m |
811 | # CONFIG_IDE_ARM is not set | ||
812 | CONFIG_BLK_DEV_IDEDMA=y | 880 | CONFIG_BLK_DEV_IDEDMA=y |
813 | # CONFIG_IDEDMA_IVB is not set | ||
814 | # CONFIG_BLK_DEV_HD is not set | ||
815 | 881 | ||
816 | # | 882 | # |
817 | # SCSI device support | 883 | # SCSI device support |
@@ -848,8 +914,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
848 | # | 914 | # |
849 | CONFIG_SCSI_SPI_ATTRS=m | 915 | CONFIG_SCSI_SPI_ATTRS=m |
850 | CONFIG_SCSI_FC_ATTRS=m | 916 | CONFIG_SCSI_FC_ATTRS=m |
917 | # CONFIG_SCSI_FC_TGT_ATTRS is not set | ||
851 | CONFIG_SCSI_ISCSI_ATTRS=m | 918 | CONFIG_SCSI_ISCSI_ATTRS=m |
852 | # CONFIG_SCSI_SAS_LIBSAS is not set | 919 | # CONFIG_SCSI_SAS_LIBSAS is not set |
920 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
853 | CONFIG_SCSI_LOWLEVEL=y | 921 | CONFIG_SCSI_LOWLEVEL=y |
854 | CONFIG_ISCSI_TCP=m | 922 | CONFIG_ISCSI_TCP=m |
855 | CONFIG_BLK_DEV_3W_XXXX_RAID=m | 923 | CONFIG_BLK_DEV_3W_XXXX_RAID=m |
@@ -866,6 +934,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
866 | # CONFIG_SCSI_AIC79XX is not set | 934 | # CONFIG_SCSI_AIC79XX is not set |
867 | # CONFIG_SCSI_AIC94XX is not set | 935 | # CONFIG_SCSI_AIC94XX is not set |
868 | # CONFIG_SCSI_DPT_I2O is not set | 936 | # CONFIG_SCSI_DPT_I2O is not set |
937 | # CONFIG_SCSI_ADVANSYS is not set | ||
869 | # CONFIG_SCSI_ARCMSR is not set | 938 | # CONFIG_SCSI_ARCMSR is not set |
870 | # CONFIG_MEGARAID_NEWGEN is not set | 939 | # CONFIG_MEGARAID_NEWGEN is not set |
871 | # CONFIG_MEGARAID_LEGACY is not set | 940 | # CONFIG_MEGARAID_LEGACY is not set |
@@ -876,6 +945,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
876 | # CONFIG_SCSI_IPS is not set | 945 | # CONFIG_SCSI_IPS is not set |
877 | # CONFIG_SCSI_INITIO is not set | 946 | # CONFIG_SCSI_INITIO is not set |
878 | # CONFIG_SCSI_INIA100 is not set | 947 | # CONFIG_SCSI_INIA100 is not set |
948 | # CONFIG_SCSI_MVSAS is not set | ||
879 | # CONFIG_SCSI_STEX is not set | 949 | # CONFIG_SCSI_STEX is not set |
880 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 950 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
881 | # CONFIG_SCSI_QLOGIC_1280 is not set | 951 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -887,6 +957,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
887 | # CONFIG_SCSI_NSP32 is not set | 957 | # CONFIG_SCSI_NSP32 is not set |
888 | # CONFIG_SCSI_DEBUG is not set | 958 | # CONFIG_SCSI_DEBUG is not set |
889 | # CONFIG_SCSI_SRP is not set | 959 | # CONFIG_SCSI_SRP is not set |
960 | # CONFIG_SCSI_DH is not set | ||
890 | # CONFIG_ATA is not set | 961 | # CONFIG_ATA is not set |
891 | CONFIG_MD=y | 962 | CONFIG_MD=y |
892 | CONFIG_BLK_DEV_MD=m | 963 | CONFIG_BLK_DEV_MD=m |
@@ -905,32 +976,28 @@ CONFIG_DM_SNAPSHOT=m | |||
905 | CONFIG_DM_MIRROR=m | 976 | CONFIG_DM_MIRROR=m |
906 | CONFIG_DM_ZERO=m | 977 | CONFIG_DM_ZERO=m |
907 | CONFIG_DM_MULTIPATH=m | 978 | CONFIG_DM_MULTIPATH=m |
908 | CONFIG_DM_MULTIPATH_EMC=m | ||
909 | CONFIG_DM_MULTIPATH_RDAC=m | ||
910 | # CONFIG_DM_DELAY is not set | 979 | # CONFIG_DM_DELAY is not set |
980 | # CONFIG_DM_UEVENT is not set | ||
981 | # CONFIG_FUSION is not set | ||
911 | 982 | ||
912 | # | 983 | # |
913 | # Fusion MPT device support | 984 | # IEEE 1394 (FireWire) support |
914 | # | 985 | # |
915 | # CONFIG_FUSION is not set | ||
916 | # CONFIG_FUSION_SPI is not set | ||
917 | # CONFIG_FUSION_FC is not set | ||
918 | # CONFIG_FUSION_SAS is not set | ||
919 | 986 | ||
920 | # | 987 | # |
921 | # IEEE 1394 (FireWire) support | 988 | # Enable only one of the two stacks, unless you know what you are doing |
922 | # | 989 | # |
923 | # CONFIG_FIREWIRE is not set | 990 | # CONFIG_FIREWIRE is not set |
924 | # CONFIG_IEEE1394 is not set | 991 | # CONFIG_IEEE1394 is not set |
925 | # CONFIG_I2O is not set | 992 | # CONFIG_I2O is not set |
926 | CONFIG_NETDEVICES=y | 993 | CONFIG_NETDEVICES=y |
927 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
928 | CONFIG_IFB=m | 994 | CONFIG_IFB=m |
929 | CONFIG_DUMMY=m | 995 | CONFIG_DUMMY=m |
930 | CONFIG_BONDING=m | 996 | CONFIG_BONDING=m |
931 | CONFIG_MACVLAN=m | 997 | CONFIG_MACVLAN=m |
932 | CONFIG_EQUALIZER=m | 998 | CONFIG_EQUALIZER=m |
933 | CONFIG_TUN=m | 999 | CONFIG_TUN=m |
1000 | CONFIG_VETH=m | ||
934 | # CONFIG_ARCNET is not set | 1001 | # CONFIG_ARCNET is not set |
935 | CONFIG_PHYLIB=m | 1002 | CONFIG_PHYLIB=m |
936 | 1003 | ||
@@ -946,26 +1013,34 @@ CONFIG_VITESSE_PHY=m | |||
946 | CONFIG_SMSC_PHY=m | 1013 | CONFIG_SMSC_PHY=m |
947 | CONFIG_BROADCOM_PHY=m | 1014 | CONFIG_BROADCOM_PHY=m |
948 | CONFIG_ICPLUS_PHY=m | 1015 | CONFIG_ICPLUS_PHY=m |
949 | # CONFIG_FIXED_PHY is not set | 1016 | CONFIG_REALTEK_PHY=m |
1017 | CONFIG_MDIO_BITBANG=m | ||
950 | CONFIG_NET_ETHERNET=y | 1018 | CONFIG_NET_ETHERNET=y |
951 | CONFIG_MII=y | 1019 | CONFIG_MII=y |
952 | CONFIG_AX88796=m | 1020 | CONFIG_AX88796=m |
1021 | # CONFIG_AX88796_93CX6 is not set | ||
953 | # CONFIG_HAPPYMEAL is not set | 1022 | # CONFIG_HAPPYMEAL is not set |
954 | # CONFIG_SUNGEM is not set | 1023 | # CONFIG_SUNGEM is not set |
955 | # CONFIG_CASSINI is not set | 1024 | # CONFIG_CASSINI is not set |
956 | # CONFIG_NET_VENDOR_3COM is not set | 1025 | # CONFIG_NET_VENDOR_3COM is not set |
1026 | # CONFIG_SMC91X is not set | ||
957 | # CONFIG_DM9000 is not set | 1027 | # CONFIG_DM9000 is not set |
958 | # CONFIG_NET_TULIP is not set | 1028 | # CONFIG_NET_TULIP is not set |
959 | # CONFIG_HP100 is not set | 1029 | # CONFIG_HP100 is not set |
1030 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
1031 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
1032 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
1033 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
1034 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
1035 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
1036 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
960 | CONFIG_NET_PCI=y | 1037 | CONFIG_NET_PCI=y |
961 | CONFIG_PCNET32=y | 1038 | CONFIG_PCNET32=y |
962 | # CONFIG_PCNET32_NAPI is not set | ||
963 | # CONFIG_AMD8111_ETH is not set | 1039 | # CONFIG_AMD8111_ETH is not set |
964 | # CONFIG_ADAPTEC_STARFIRE is not set | 1040 | # CONFIG_ADAPTEC_STARFIRE is not set |
965 | # CONFIG_B44 is not set | 1041 | # CONFIG_B44 is not set |
966 | # CONFIG_FORCEDETH is not set | 1042 | # CONFIG_FORCEDETH is not set |
967 | CONFIG_TC35815=m | 1043 | CONFIG_TC35815=m |
968 | # CONFIG_DGRS is not set | ||
969 | # CONFIG_EEPRO100 is not set | 1044 | # CONFIG_EEPRO100 is not set |
970 | # CONFIG_E100 is not set | 1045 | # CONFIG_E100 is not set |
971 | # CONFIG_FEALNX is not set | 1046 | # CONFIG_FEALNX is not set |
@@ -973,16 +1048,21 @@ CONFIG_TC35815=m | |||
973 | # CONFIG_NE2K_PCI is not set | 1048 | # CONFIG_NE2K_PCI is not set |
974 | # CONFIG_8139CP is not set | 1049 | # CONFIG_8139CP is not set |
975 | # CONFIG_8139TOO is not set | 1050 | # CONFIG_8139TOO is not set |
1051 | # CONFIG_R6040 is not set | ||
976 | # CONFIG_SIS900 is not set | 1052 | # CONFIG_SIS900 is not set |
977 | # CONFIG_EPIC100 is not set | 1053 | # CONFIG_EPIC100 is not set |
978 | # CONFIG_SUNDANCE is not set | 1054 | # CONFIG_SUNDANCE is not set |
979 | # CONFIG_TLAN is not set | 1055 | # CONFIG_TLAN is not set |
980 | # CONFIG_VIA_RHINE is not set | 1056 | # CONFIG_VIA_RHINE is not set |
981 | # CONFIG_SC92031 is not set | 1057 | # CONFIG_SC92031 is not set |
1058 | # CONFIG_ATL2 is not set | ||
982 | CONFIG_NETDEV_1000=y | 1059 | CONFIG_NETDEV_1000=y |
983 | # CONFIG_ACENIC is not set | 1060 | # CONFIG_ACENIC is not set |
984 | # CONFIG_DL2K is not set | 1061 | # CONFIG_DL2K is not set |
985 | # CONFIG_E1000 is not set | 1062 | # CONFIG_E1000 is not set |
1063 | # CONFIG_E1000E is not set | ||
1064 | # CONFIG_IP1000 is not set | ||
1065 | # CONFIG_IGB is not set | ||
986 | # CONFIG_NS83820 is not set | 1066 | # CONFIG_NS83820 is not set |
987 | # CONFIG_HAMACHI is not set | 1067 | # CONFIG_HAMACHI is not set |
988 | # CONFIG_YELLOWFIN is not set | 1068 | # CONFIG_YELLOWFIN is not set |
@@ -995,14 +1075,24 @@ CONFIG_NETDEV_1000=y | |||
995 | # CONFIG_BNX2 is not set | 1075 | # CONFIG_BNX2 is not set |
996 | # CONFIG_QLA3XXX is not set | 1076 | # CONFIG_QLA3XXX is not set |
997 | # CONFIG_ATL1 is not set | 1077 | # CONFIG_ATL1 is not set |
1078 | # CONFIG_ATL1E is not set | ||
1079 | # CONFIG_JME is not set | ||
998 | CONFIG_NETDEV_10000=y | 1080 | CONFIG_NETDEV_10000=y |
999 | # CONFIG_CHELSIO_T1 is not set | 1081 | # CONFIG_CHELSIO_T1 is not set |
1000 | CONFIG_CHELSIO_T3=m | 1082 | CONFIG_CHELSIO_T3=m |
1083 | # CONFIG_ENIC is not set | ||
1084 | # CONFIG_IXGBE is not set | ||
1001 | # CONFIG_IXGB is not set | 1085 | # CONFIG_IXGB is not set |
1002 | # CONFIG_S2IO is not set | 1086 | # CONFIG_S2IO is not set |
1003 | # CONFIG_MYRI10GE is not set | 1087 | # CONFIG_MYRI10GE is not set |
1004 | CONFIG_NETXEN_NIC=m | 1088 | CONFIG_NETXEN_NIC=m |
1089 | # CONFIG_NIU is not set | ||
1090 | # CONFIG_MLX4_EN is not set | ||
1005 | # CONFIG_MLX4_CORE is not set | 1091 | # CONFIG_MLX4_CORE is not set |
1092 | # CONFIG_TEHUTI is not set | ||
1093 | # CONFIG_BNX2X is not set | ||
1094 | # CONFIG_QLGE is not set | ||
1095 | # CONFIG_SFC is not set | ||
1006 | # CONFIG_TR is not set | 1096 | # CONFIG_TR is not set |
1007 | 1097 | ||
1008 | # | 1098 | # |
@@ -1022,6 +1112,7 @@ CONFIG_IPW2200_QOS=y | |||
1022 | # CONFIG_IPW2200_DEBUG is not set | 1112 | # CONFIG_IPW2200_DEBUG is not set |
1023 | CONFIG_LIBERTAS=m | 1113 | CONFIG_LIBERTAS=m |
1024 | # CONFIG_LIBERTAS_DEBUG is not set | 1114 | # CONFIG_LIBERTAS_DEBUG is not set |
1115 | # CONFIG_LIBERTAS_THINFIRM is not set | ||
1025 | CONFIG_HERMES=m | 1116 | CONFIG_HERMES=m |
1026 | CONFIG_PLX_HERMES=m | 1117 | CONFIG_PLX_HERMES=m |
1027 | CONFIG_TMD_HERMES=m | 1118 | CONFIG_TMD_HERMES=m |
@@ -1030,25 +1121,30 @@ CONFIG_PCI_HERMES=m | |||
1030 | CONFIG_ATMEL=m | 1121 | CONFIG_ATMEL=m |
1031 | CONFIG_PCI_ATMEL=m | 1122 | CONFIG_PCI_ATMEL=m |
1032 | CONFIG_PRISM54=m | 1123 | CONFIG_PRISM54=m |
1124 | # CONFIG_RTL8180 is not set | ||
1125 | # CONFIG_ADM8211 is not set | ||
1126 | # CONFIG_MAC80211_HWSIM is not set | ||
1127 | # CONFIG_P54_COMMON is not set | ||
1128 | # CONFIG_ATH5K is not set | ||
1129 | # CONFIG_ATH9K is not set | ||
1130 | # CONFIG_IWLCORE is not set | ||
1131 | # CONFIG_IWLWIFI_LEDS is not set | ||
1132 | # CONFIG_IWLAGN is not set | ||
1133 | # CONFIG_IWL3945 is not set | ||
1033 | CONFIG_HOSTAP=m | 1134 | CONFIG_HOSTAP=m |
1034 | CONFIG_HOSTAP_FIRMWARE=y | 1135 | CONFIG_HOSTAP_FIRMWARE=y |
1035 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y | 1136 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y |
1036 | CONFIG_HOSTAP_PLX=m | 1137 | CONFIG_HOSTAP_PLX=m |
1037 | CONFIG_HOSTAP_PCI=m | 1138 | CONFIG_HOSTAP_PCI=m |
1038 | CONFIG_BCM43XX=m | 1139 | # CONFIG_B43 is not set |
1039 | CONFIG_BCM43XX_DEBUG=y | 1140 | # CONFIG_B43LEGACY is not set |
1040 | CONFIG_BCM43XX_DMA=y | 1141 | # CONFIG_RT2X00 is not set |
1041 | CONFIG_BCM43XX_PIO=y | ||
1042 | CONFIG_BCM43XX_DMA_AND_PIO_MODE=y | ||
1043 | # CONFIG_BCM43XX_DMA_MODE is not set | ||
1044 | # CONFIG_BCM43XX_PIO_MODE is not set | ||
1045 | # CONFIG_WAN is not set | 1142 | # CONFIG_WAN is not set |
1046 | # CONFIG_FDDI is not set | 1143 | # CONFIG_FDDI is not set |
1047 | # CONFIG_HIPPI is not set | 1144 | # CONFIG_HIPPI is not set |
1048 | # CONFIG_PPP is not set | 1145 | # CONFIG_PPP is not set |
1049 | # CONFIG_SLIP is not set | 1146 | # CONFIG_SLIP is not set |
1050 | # CONFIG_NET_FC is not set | 1147 | # CONFIG_NET_FC is not set |
1051 | # CONFIG_SHAPER is not set | ||
1052 | # CONFIG_NETCONSOLE is not set | 1148 | # CONFIG_NETCONSOLE is not set |
1053 | # CONFIG_NETPOLL is not set | 1149 | # CONFIG_NETPOLL is not set |
1054 | # CONFIG_NET_POLL_CONTROLLER is not set | 1150 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -1070,7 +1166,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
1070 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1166 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
1071 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1167 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
1072 | # CONFIG_INPUT_JOYDEV is not set | 1168 | # CONFIG_INPUT_JOYDEV is not set |
1073 | # CONFIG_INPUT_TSDEV is not set | ||
1074 | # CONFIG_INPUT_EVDEV is not set | 1169 | # CONFIG_INPUT_EVDEV is not set |
1075 | # CONFIG_INPUT_EVBUG is not set | 1170 | # CONFIG_INPUT_EVBUG is not set |
1076 | 1171 | ||
@@ -1099,10 +1194,13 @@ CONFIG_SERIO_SERPORT=y | |||
1099 | # Character devices | 1194 | # Character devices |
1100 | # | 1195 | # |
1101 | CONFIG_VT=y | 1196 | CONFIG_VT=y |
1197 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
1102 | CONFIG_VT_CONSOLE=y | 1198 | CONFIG_VT_CONSOLE=y |
1103 | CONFIG_HW_CONSOLE=y | 1199 | CONFIG_HW_CONSOLE=y |
1104 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1200 | CONFIG_VT_HW_CONSOLE_BINDING=y |
1201 | CONFIG_DEVKMEM=y | ||
1105 | # CONFIG_SERIAL_NONSTANDARD is not set | 1202 | # CONFIG_SERIAL_NONSTANDARD is not set |
1203 | # CONFIG_NOZOMI is not set | ||
1106 | 1204 | ||
1107 | # | 1205 | # |
1108 | # Serial drivers | 1206 | # Serial drivers |
@@ -1124,101 +1222,165 @@ CONFIG_UNIX98_PTYS=y | |||
1124 | CONFIG_LEGACY_PTYS=y | 1222 | CONFIG_LEGACY_PTYS=y |
1125 | CONFIG_LEGACY_PTY_COUNT=256 | 1223 | CONFIG_LEGACY_PTY_COUNT=256 |
1126 | # CONFIG_IPMI_HANDLER is not set | 1224 | # CONFIG_IPMI_HANDLER is not set |
1127 | # CONFIG_WATCHDOG is not set | ||
1128 | CONFIG_HW_RANDOM=m | 1225 | CONFIG_HW_RANDOM=m |
1129 | CONFIG_RTC=y | ||
1130 | # CONFIG_R3964 is not set | 1226 | # CONFIG_R3964 is not set |
1131 | # CONFIG_APPLICOM is not set | 1227 | # CONFIG_APPLICOM is not set |
1132 | # CONFIG_DRM is not set | ||
1133 | # CONFIG_RAW_DRIVER is not set | 1228 | # CONFIG_RAW_DRIVER is not set |
1134 | # CONFIG_TCG_TPM is not set | 1229 | # CONFIG_TCG_TPM is not set |
1135 | CONFIG_DEVPORT=y | 1230 | CONFIG_DEVPORT=y |
1136 | # CONFIG_I2C is not set | 1231 | # CONFIG_I2C is not set |
1137 | |||
1138 | # | ||
1139 | # SPI support | ||
1140 | # | ||
1141 | # CONFIG_SPI is not set | 1232 | # CONFIG_SPI is not set |
1142 | # CONFIG_SPI_MASTER is not set | ||
1143 | # CONFIG_W1 is not set | 1233 | # CONFIG_W1 is not set |
1144 | # CONFIG_POWER_SUPPLY is not set | 1234 | # CONFIG_POWER_SUPPLY is not set |
1145 | # CONFIG_HWMON is not set | 1235 | # CONFIG_HWMON is not set |
1236 | # CONFIG_THERMAL is not set | ||
1237 | # CONFIG_THERMAL_HWMON is not set | ||
1238 | # CONFIG_WATCHDOG is not set | ||
1239 | CONFIG_SSB_POSSIBLE=y | ||
1240 | |||
1241 | # | ||
1242 | # Sonics Silicon Backplane | ||
1243 | # | ||
1244 | # CONFIG_SSB is not set | ||
1146 | 1245 | ||
1147 | # | 1246 | # |
1148 | # Multifunction device drivers | 1247 | # Multifunction device drivers |
1149 | # | 1248 | # |
1249 | # CONFIG_MFD_CORE is not set | ||
1150 | # CONFIG_MFD_SM501 is not set | 1250 | # CONFIG_MFD_SM501 is not set |
1251 | # CONFIG_HTC_PASIC3 is not set | ||
1252 | # CONFIG_MFD_TMIO is not set | ||
1253 | # CONFIG_REGULATOR is not set | ||
1151 | 1254 | ||
1152 | # | 1255 | # |
1153 | # Multimedia devices | 1256 | # Multimedia devices |
1154 | # | 1257 | # |
1258 | |||
1259 | # | ||
1260 | # Multimedia core support | ||
1261 | # | ||
1155 | # CONFIG_VIDEO_DEV is not set | 1262 | # CONFIG_VIDEO_DEV is not set |
1156 | # CONFIG_DVB_CORE is not set | 1263 | # CONFIG_DVB_CORE is not set |
1264 | # CONFIG_VIDEO_MEDIA is not set | ||
1265 | |||
1266 | # | ||
1267 | # Multimedia drivers | ||
1268 | # | ||
1157 | # CONFIG_DAB is not set | 1269 | # CONFIG_DAB is not set |
1158 | 1270 | ||
1159 | # | 1271 | # |
1160 | # Graphics support | 1272 | # Graphics support |
1161 | # | 1273 | # |
1274 | # CONFIG_DRM is not set | ||
1275 | # CONFIG_VGASTATE is not set | ||
1276 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
1277 | # CONFIG_FB is not set | ||
1162 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1278 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
1163 | 1279 | ||
1164 | # | 1280 | # |
1165 | # Display device support | 1281 | # Display device support |
1166 | # | 1282 | # |
1167 | # CONFIG_DISPLAY_SUPPORT is not set | 1283 | # CONFIG_DISPLAY_SUPPORT is not set |
1168 | # CONFIG_VGASTATE is not set | ||
1169 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
1170 | # CONFIG_FB is not set | ||
1171 | 1284 | ||
1172 | # | 1285 | # |
1173 | # Console display driver support | 1286 | # Console display driver support |
1174 | # | 1287 | # |
1175 | # CONFIG_VGA_CONSOLE is not set | 1288 | # CONFIG_VGA_CONSOLE is not set |
1176 | CONFIG_DUMMY_CONSOLE=y | 1289 | CONFIG_DUMMY_CONSOLE=y |
1177 | |||
1178 | # | ||
1179 | # Sound | ||
1180 | # | ||
1181 | # CONFIG_SOUND is not set | 1290 | # CONFIG_SOUND is not set |
1182 | CONFIG_HID_SUPPORT=y | 1291 | CONFIG_HID_SUPPORT=y |
1183 | CONFIG_HID=m | 1292 | CONFIG_HID=m |
1184 | # CONFIG_HID_DEBUG is not set | 1293 | # CONFIG_HID_DEBUG is not set |
1294 | # CONFIG_HIDRAW is not set | ||
1295 | # CONFIG_HID_PID is not set | ||
1296 | |||
1297 | # | ||
1298 | # Special HID drivers | ||
1299 | # | ||
1300 | CONFIG_HID_COMPAT=y | ||
1185 | CONFIG_USB_SUPPORT=y | 1301 | CONFIG_USB_SUPPORT=y |
1186 | CONFIG_USB_ARCH_HAS_HCD=y | 1302 | CONFIG_USB_ARCH_HAS_HCD=y |
1187 | CONFIG_USB_ARCH_HAS_OHCI=y | 1303 | CONFIG_USB_ARCH_HAS_OHCI=y |
1188 | CONFIG_USB_ARCH_HAS_EHCI=y | 1304 | CONFIG_USB_ARCH_HAS_EHCI=y |
1189 | # CONFIG_USB is not set | 1305 | # CONFIG_USB is not set |
1306 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1307 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1190 | 1308 | ||
1191 | # | 1309 | # |
1192 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1310 | # Enable Host or Gadget support to see Inventra options |
1193 | # | 1311 | # |
1194 | 1312 | ||
1195 | # | 1313 | # |
1196 | # USB Gadget Support | 1314 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
1197 | # | 1315 | # |
1198 | # CONFIG_USB_GADGET is not set | 1316 | # CONFIG_USB_GADGET is not set |
1317 | # CONFIG_UWB is not set | ||
1199 | # CONFIG_MMC is not set | 1318 | # CONFIG_MMC is not set |
1200 | # CONFIG_NEW_LEDS is not set | 1319 | # CONFIG_MEMSTICK is not set |
1320 | CONFIG_NEW_LEDS=y | ||
1321 | CONFIG_LEDS_CLASS=m | ||
1322 | |||
1323 | # | ||
1324 | # LED drivers | ||
1325 | # | ||
1326 | |||
1327 | # | ||
1328 | # LED Triggers | ||
1329 | # | ||
1330 | CONFIG_LEDS_TRIGGERS=y | ||
1331 | CONFIG_LEDS_TRIGGER_TIMER=m | ||
1332 | CONFIG_LEDS_TRIGGER_IDE_DISK=y | ||
1333 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | ||
1334 | CONFIG_LEDS_TRIGGER_BACKLIGHT=m | ||
1335 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | ||
1336 | # CONFIG_ACCESSIBILITY is not set | ||
1201 | # CONFIG_INFINIBAND is not set | 1337 | # CONFIG_INFINIBAND is not set |
1202 | # CONFIG_RTC_CLASS is not set | 1338 | CONFIG_RTC_LIB=y |
1339 | CONFIG_RTC_CLASS=y | ||
1340 | CONFIG_RTC_HCTOSYS=y | ||
1341 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
1342 | # CONFIG_RTC_DEBUG is not set | ||
1203 | 1343 | ||
1204 | # | 1344 | # |
1205 | # DMA Engine support | 1345 | # RTC interfaces |
1206 | # | 1346 | # |
1207 | # CONFIG_DMA_ENGINE is not set | 1347 | CONFIG_RTC_INTF_SYSFS=y |
1348 | CONFIG_RTC_INTF_PROC=y | ||
1349 | CONFIG_RTC_INTF_DEV=y | ||
1350 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
1351 | # CONFIG_RTC_DRV_TEST is not set | ||
1208 | 1352 | ||
1209 | # | 1353 | # |
1210 | # DMA Clients | 1354 | # SPI RTC drivers |
1211 | # | 1355 | # |
1212 | 1356 | ||
1213 | # | 1357 | # |
1214 | # DMA Devices | 1358 | # Platform RTC drivers |
1215 | # | 1359 | # |
1360 | CONFIG_RTC_DRV_CMOS=y | ||
1361 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1362 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1363 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1364 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1365 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1366 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1367 | # CONFIG_RTC_DRV_M48T35 is not set | ||
1368 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1369 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
1370 | # CONFIG_RTC_DRV_V3020 is not set | ||
1216 | 1371 | ||
1217 | # | 1372 | # |
1218 | # Userspace I/O | 1373 | # on-CPU RTC drivers |
1219 | # | 1374 | # |
1375 | # CONFIG_DMADEVICES is not set | ||
1220 | CONFIG_UIO=m | 1376 | CONFIG_UIO=m |
1221 | CONFIG_UIO_CIF=m | 1377 | CONFIG_UIO_CIF=m |
1378 | # CONFIG_UIO_PDRV is not set | ||
1379 | # CONFIG_UIO_PDRV_GENIRQ is not set | ||
1380 | # CONFIG_UIO_SMX is not set | ||
1381 | # CONFIG_UIO_SERCOS3 is not set | ||
1382 | # CONFIG_STAGING is not set | ||
1383 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
1222 | 1384 | ||
1223 | # | 1385 | # |
1224 | # File systems | 1386 | # File systems |
@@ -1230,9 +1392,8 @@ CONFIG_EXT3_FS=y | |||
1230 | CONFIG_EXT3_FS_XATTR=y | 1392 | CONFIG_EXT3_FS_XATTR=y |
1231 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1393 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
1232 | # CONFIG_EXT3_FS_SECURITY is not set | 1394 | # CONFIG_EXT3_FS_SECURITY is not set |
1233 | # CONFIG_EXT4DEV_FS is not set | 1395 | # CONFIG_EXT4_FS is not set |
1234 | CONFIG_JBD=y | 1396 | CONFIG_JBD=y |
1235 | # CONFIG_JBD_DEBUG is not set | ||
1236 | CONFIG_FS_MBCACHE=y | 1397 | CONFIG_FS_MBCACHE=y |
1237 | CONFIG_REISERFS_FS=m | 1398 | CONFIG_REISERFS_FS=m |
1238 | # CONFIG_REISERFS_CHECK is not set | 1399 | # CONFIG_REISERFS_CHECK is not set |
@@ -1246,22 +1407,22 @@ CONFIG_JFS_SECURITY=y | |||
1246 | # CONFIG_JFS_DEBUG is not set | 1407 | # CONFIG_JFS_DEBUG is not set |
1247 | # CONFIG_JFS_STATISTICS is not set | 1408 | # CONFIG_JFS_STATISTICS is not set |
1248 | CONFIG_FS_POSIX_ACL=y | 1409 | CONFIG_FS_POSIX_ACL=y |
1410 | CONFIG_FILE_LOCKING=y | ||
1249 | CONFIG_XFS_FS=m | 1411 | CONFIG_XFS_FS=m |
1250 | CONFIG_XFS_QUOTA=y | 1412 | CONFIG_XFS_QUOTA=y |
1251 | CONFIG_XFS_SECURITY=y | ||
1252 | CONFIG_XFS_POSIX_ACL=y | 1413 | CONFIG_XFS_POSIX_ACL=y |
1253 | # CONFIG_XFS_RT is not set | 1414 | # CONFIG_XFS_RT is not set |
1254 | # CONFIG_GFS2_FS is not set | 1415 | # CONFIG_XFS_DEBUG is not set |
1255 | # CONFIG_OCFS2_FS is not set | 1416 | # CONFIG_OCFS2_FS is not set |
1256 | CONFIG_MINIX_FS=m | 1417 | CONFIG_DNOTIFY=y |
1257 | CONFIG_ROMFS_FS=m | ||
1258 | CONFIG_INOTIFY=y | 1418 | CONFIG_INOTIFY=y |
1259 | CONFIG_INOTIFY_USER=y | 1419 | CONFIG_INOTIFY_USER=y |
1260 | CONFIG_QUOTA=y | 1420 | CONFIG_QUOTA=y |
1421 | # CONFIG_QUOTA_NETLINK_INTERFACE is not set | ||
1422 | CONFIG_PRINT_QUOTA_WARNING=y | ||
1261 | # CONFIG_QFMT_V1 is not set | 1423 | # CONFIG_QFMT_V1 is not set |
1262 | CONFIG_QFMT_V2=y | 1424 | CONFIG_QFMT_V2=y |
1263 | CONFIG_QUOTACTL=y | 1425 | CONFIG_QUOTACTL=y |
1264 | CONFIG_DNOTIFY=y | ||
1265 | CONFIG_AUTOFS_FS=y | 1426 | CONFIG_AUTOFS_FS=y |
1266 | # CONFIG_AUTOFS4_FS is not set | 1427 | # CONFIG_AUTOFS4_FS is not set |
1267 | CONFIG_FUSE_FS=m | 1428 | CONFIG_FUSE_FS=m |
@@ -1291,11 +1452,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1291 | CONFIG_PROC_FS=y | 1452 | CONFIG_PROC_FS=y |
1292 | CONFIG_PROC_KCORE=y | 1453 | CONFIG_PROC_KCORE=y |
1293 | CONFIG_PROC_SYSCTL=y | 1454 | CONFIG_PROC_SYSCTL=y |
1455 | CONFIG_PROC_PAGE_MONITOR=y | ||
1294 | CONFIG_SYSFS=y | 1456 | CONFIG_SYSFS=y |
1295 | CONFIG_TMPFS=y | 1457 | CONFIG_TMPFS=y |
1296 | # CONFIG_TMPFS_POSIX_ACL is not set | 1458 | # CONFIG_TMPFS_POSIX_ACL is not set |
1297 | # CONFIG_HUGETLB_PAGE is not set | 1459 | # CONFIG_HUGETLB_PAGE is not set |
1298 | CONFIG_RAMFS=y | ||
1299 | # CONFIG_CONFIGFS_FS is not set | 1460 | # CONFIG_CONFIGFS_FS is not set |
1300 | 1461 | ||
1301 | # | 1462 | # |
@@ -1312,46 +1473,48 @@ CONFIG_EFS_FS=m | |||
1312 | CONFIG_JFFS2_FS=m | 1473 | CONFIG_JFFS2_FS=m |
1313 | CONFIG_JFFS2_FS_DEBUG=0 | 1474 | CONFIG_JFFS2_FS_DEBUG=0 |
1314 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1475 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
1476 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1315 | # CONFIG_JFFS2_SUMMARY is not set | 1477 | # CONFIG_JFFS2_SUMMARY is not set |
1316 | CONFIG_JFFS2_FS_XATTR=y | 1478 | CONFIG_JFFS2_FS_XATTR=y |
1317 | CONFIG_JFFS2_FS_POSIX_ACL=y | 1479 | CONFIG_JFFS2_FS_POSIX_ACL=y |
1318 | CONFIG_JFFS2_FS_SECURITY=y | 1480 | CONFIG_JFFS2_FS_SECURITY=y |
1319 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | 1481 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y |
1320 | CONFIG_JFFS2_ZLIB=y | 1482 | CONFIG_JFFS2_ZLIB=y |
1483 | # CONFIG_JFFS2_LZO is not set | ||
1321 | CONFIG_JFFS2_RTIME=y | 1484 | CONFIG_JFFS2_RTIME=y |
1322 | CONFIG_JFFS2_RUBIN=y | 1485 | CONFIG_JFFS2_RUBIN=y |
1323 | # CONFIG_JFFS2_CMODE_NONE is not set | 1486 | # CONFIG_JFFS2_CMODE_NONE is not set |
1324 | CONFIG_JFFS2_CMODE_PRIORITY=y | 1487 | CONFIG_JFFS2_CMODE_PRIORITY=y |
1325 | # CONFIG_JFFS2_CMODE_SIZE is not set | 1488 | # CONFIG_JFFS2_CMODE_SIZE is not set |
1489 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
1490 | # CONFIG_UBIFS_FS is not set | ||
1326 | CONFIG_CRAMFS=m | 1491 | CONFIG_CRAMFS=m |
1327 | CONFIG_VXFS_FS=m | 1492 | CONFIG_VXFS_FS=m |
1493 | CONFIG_MINIX_FS=m | ||
1494 | # CONFIG_OMFS_FS is not set | ||
1328 | # CONFIG_HPFS_FS is not set | 1495 | # CONFIG_HPFS_FS is not set |
1329 | # CONFIG_QNX4FS_FS is not set | 1496 | # CONFIG_QNX4FS_FS is not set |
1497 | CONFIG_ROMFS_FS=m | ||
1330 | CONFIG_SYSV_FS=m | 1498 | CONFIG_SYSV_FS=m |
1331 | CONFIG_UFS_FS=m | 1499 | CONFIG_UFS_FS=m |
1332 | # CONFIG_UFS_FS_WRITE is not set | 1500 | # CONFIG_UFS_FS_WRITE is not set |
1333 | # CONFIG_UFS_DEBUG is not set | 1501 | # CONFIG_UFS_DEBUG is not set |
1334 | 1502 | CONFIG_NETWORK_FILESYSTEMS=y | |
1335 | # | ||
1336 | # Network File Systems | ||
1337 | # | ||
1338 | CONFIG_NFS_FS=y | 1503 | CONFIG_NFS_FS=y |
1339 | CONFIG_NFS_V3=y | 1504 | CONFIG_NFS_V3=y |
1340 | # CONFIG_NFS_V3_ACL is not set | 1505 | # CONFIG_NFS_V3_ACL is not set |
1341 | # CONFIG_NFS_V4 is not set | 1506 | # CONFIG_NFS_V4 is not set |
1342 | # CONFIG_NFS_DIRECTIO is not set | 1507 | CONFIG_ROOT_NFS=y |
1343 | CONFIG_NFSD=y | 1508 | CONFIG_NFSD=y |
1344 | CONFIG_NFSD_V3=y | 1509 | CONFIG_NFSD_V3=y |
1345 | # CONFIG_NFSD_V3_ACL is not set | 1510 | # CONFIG_NFSD_V3_ACL is not set |
1346 | # CONFIG_NFSD_V4 is not set | 1511 | # CONFIG_NFSD_V4 is not set |
1347 | # CONFIG_NFSD_TCP is not set | ||
1348 | CONFIG_ROOT_NFS=y | ||
1349 | CONFIG_LOCKD=y | 1512 | CONFIG_LOCKD=y |
1350 | CONFIG_LOCKD_V4=y | 1513 | CONFIG_LOCKD_V4=y |
1351 | CONFIG_EXPORTFS=y | 1514 | CONFIG_EXPORTFS=y |
1352 | CONFIG_NFS_COMMON=y | 1515 | CONFIG_NFS_COMMON=y |
1353 | CONFIG_SUNRPC=y | 1516 | CONFIG_SUNRPC=y |
1354 | # CONFIG_SUNRPC_BIND34 is not set | 1517 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
1355 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1518 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1356 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1519 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1357 | # CONFIG_SMB_FS is not set | 1520 | # CONFIG_SMB_FS is not set |
@@ -1365,10 +1528,6 @@ CONFIG_SUNRPC=y | |||
1365 | # | 1528 | # |
1366 | # CONFIG_PARTITION_ADVANCED is not set | 1529 | # CONFIG_PARTITION_ADVANCED is not set |
1367 | CONFIG_MSDOS_PARTITION=y | 1530 | CONFIG_MSDOS_PARTITION=y |
1368 | |||
1369 | # | ||
1370 | # Native Language Support | ||
1371 | # | ||
1372 | CONFIG_NLS=m | 1531 | CONFIG_NLS=m |
1373 | CONFIG_NLS_DEFAULT="iso8859-1" | 1532 | CONFIG_NLS_DEFAULT="iso8859-1" |
1374 | CONFIG_NLS_CODEPAGE_437=m | 1533 | CONFIG_NLS_CODEPAGE_437=m |
@@ -1409,29 +1568,30 @@ CONFIG_NLS_ISO8859_15=m | |||
1409 | CONFIG_NLS_KOI8_R=m | 1568 | CONFIG_NLS_KOI8_R=m |
1410 | CONFIG_NLS_KOI8_U=m | 1569 | CONFIG_NLS_KOI8_U=m |
1411 | CONFIG_NLS_UTF8=m | 1570 | CONFIG_NLS_UTF8=m |
1412 | |||
1413 | # | ||
1414 | # Distributed Lock Manager | ||
1415 | # | ||
1416 | # CONFIG_DLM is not set | 1571 | # CONFIG_DLM is not set |
1417 | 1572 | ||
1418 | # | 1573 | # |
1419 | # Profiling support | ||
1420 | # | ||
1421 | # CONFIG_PROFILING is not set | ||
1422 | |||
1423 | # | ||
1424 | # Kernel hacking | 1574 | # Kernel hacking |
1425 | # | 1575 | # |
1426 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1576 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
1427 | # CONFIG_PRINTK_TIME is not set | 1577 | # CONFIG_PRINTK_TIME is not set |
1578 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1428 | CONFIG_ENABLE_MUST_CHECK=y | 1579 | CONFIG_ENABLE_MUST_CHECK=y |
1580 | CONFIG_FRAME_WARN=1024 | ||
1429 | # CONFIG_MAGIC_SYSRQ is not set | 1581 | # CONFIG_MAGIC_SYSRQ is not set |
1430 | # CONFIG_UNUSED_SYMBOLS is not set | 1582 | # CONFIG_UNUSED_SYMBOLS is not set |
1431 | # CONFIG_DEBUG_FS is not set | 1583 | # CONFIG_DEBUG_FS is not set |
1432 | # CONFIG_HEADERS_CHECK is not set | 1584 | # CONFIG_HEADERS_CHECK is not set |
1433 | # CONFIG_DEBUG_KERNEL is not set | 1585 | # CONFIG_DEBUG_KERNEL is not set |
1434 | CONFIG_CROSSCOMPILE=y | 1586 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1587 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1588 | |||
1589 | # | ||
1590 | # Tracers | ||
1591 | # | ||
1592 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1593 | # CONFIG_SAMPLES is not set | ||
1594 | CONFIG_HAVE_ARCH_KGDB=y | ||
1435 | CONFIG_CMDLINE="" | 1595 | CONFIG_CMDLINE="" |
1436 | 1596 | ||
1437 | # | 1597 | # |
@@ -1439,51 +1599,103 @@ CONFIG_CMDLINE="" | |||
1439 | # | 1599 | # |
1440 | # CONFIG_KEYS is not set | 1600 | # CONFIG_KEYS is not set |
1441 | # CONFIG_SECURITY is not set | 1601 | # CONFIG_SECURITY is not set |
1602 | # CONFIG_SECURITYFS is not set | ||
1603 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1442 | CONFIG_XOR_BLOCKS=m | 1604 | CONFIG_XOR_BLOCKS=m |
1443 | CONFIG_ASYNC_CORE=m | 1605 | CONFIG_ASYNC_CORE=m |
1444 | CONFIG_ASYNC_MEMCPY=m | 1606 | CONFIG_ASYNC_MEMCPY=m |
1445 | CONFIG_ASYNC_XOR=m | 1607 | CONFIG_ASYNC_XOR=m |
1446 | CONFIG_CRYPTO=y | 1608 | CONFIG_CRYPTO=y |
1609 | |||
1610 | # | ||
1611 | # Crypto core or helper | ||
1612 | # | ||
1613 | # CONFIG_CRYPTO_FIPS is not set | ||
1447 | CONFIG_CRYPTO_ALGAPI=y | 1614 | CONFIG_CRYPTO_ALGAPI=y |
1448 | CONFIG_CRYPTO_ABLKCIPHER=m | 1615 | CONFIG_CRYPTO_AEAD=y |
1449 | CONFIG_CRYPTO_BLKCIPHER=m | 1616 | CONFIG_CRYPTO_BLKCIPHER=y |
1450 | CONFIG_CRYPTO_HASH=y | 1617 | CONFIG_CRYPTO_HASH=y |
1618 | CONFIG_CRYPTO_RNG=y | ||
1451 | CONFIG_CRYPTO_MANAGER=y | 1619 | CONFIG_CRYPTO_MANAGER=y |
1620 | CONFIG_CRYPTO_GF128MUL=m | ||
1621 | CONFIG_CRYPTO_NULL=m | ||
1622 | CONFIG_CRYPTO_CRYPTD=m | ||
1623 | CONFIG_CRYPTO_AUTHENC=m | ||
1624 | # CONFIG_CRYPTO_TEST is not set | ||
1625 | |||
1626 | # | ||
1627 | # Authenticated Encryption with Associated Data | ||
1628 | # | ||
1629 | # CONFIG_CRYPTO_CCM is not set | ||
1630 | # CONFIG_CRYPTO_GCM is not set | ||
1631 | # CONFIG_CRYPTO_SEQIV is not set | ||
1632 | |||
1633 | # | ||
1634 | # Block modes | ||
1635 | # | ||
1636 | CONFIG_CRYPTO_CBC=m | ||
1637 | # CONFIG_CRYPTO_CTR is not set | ||
1638 | # CONFIG_CRYPTO_CTS is not set | ||
1639 | CONFIG_CRYPTO_ECB=m | ||
1640 | CONFIG_CRYPTO_LRW=m | ||
1641 | CONFIG_CRYPTO_PCBC=m | ||
1642 | # CONFIG_CRYPTO_XTS is not set | ||
1643 | |||
1644 | # | ||
1645 | # Hash modes | ||
1646 | # | ||
1452 | CONFIG_CRYPTO_HMAC=y | 1647 | CONFIG_CRYPTO_HMAC=y |
1453 | CONFIG_CRYPTO_XCBC=m | 1648 | CONFIG_CRYPTO_XCBC=m |
1454 | CONFIG_CRYPTO_NULL=m | 1649 | |
1650 | # | ||
1651 | # Digest | ||
1652 | # | ||
1653 | CONFIG_CRYPTO_CRC32C=m | ||
1455 | CONFIG_CRYPTO_MD4=m | 1654 | CONFIG_CRYPTO_MD4=m |
1456 | CONFIG_CRYPTO_MD5=y | 1655 | CONFIG_CRYPTO_MD5=y |
1656 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1657 | # CONFIG_CRYPTO_RMD128 is not set | ||
1658 | # CONFIG_CRYPTO_RMD160 is not set | ||
1659 | # CONFIG_CRYPTO_RMD256 is not set | ||
1660 | # CONFIG_CRYPTO_RMD320 is not set | ||
1457 | CONFIG_CRYPTO_SHA1=m | 1661 | CONFIG_CRYPTO_SHA1=m |
1458 | CONFIG_CRYPTO_SHA256=m | 1662 | CONFIG_CRYPTO_SHA256=m |
1459 | CONFIG_CRYPTO_SHA512=m | 1663 | CONFIG_CRYPTO_SHA512=m |
1460 | CONFIG_CRYPTO_WP512=m | ||
1461 | CONFIG_CRYPTO_TGR192=m | 1664 | CONFIG_CRYPTO_TGR192=m |
1462 | CONFIG_CRYPTO_GF128MUL=m | 1665 | CONFIG_CRYPTO_WP512=m |
1463 | CONFIG_CRYPTO_ECB=m | 1666 | |
1464 | CONFIG_CRYPTO_CBC=m | 1667 | # |
1465 | CONFIG_CRYPTO_PCBC=m | 1668 | # Ciphers |
1466 | CONFIG_CRYPTO_LRW=m | 1669 | # |
1467 | CONFIG_CRYPTO_CRYPTD=m | ||
1468 | CONFIG_CRYPTO_DES=m | ||
1469 | CONFIG_CRYPTO_FCRYPT=m | ||
1470 | CONFIG_CRYPTO_BLOWFISH=m | ||
1471 | CONFIG_CRYPTO_TWOFISH=m | ||
1472 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1473 | CONFIG_CRYPTO_SERPENT=m | ||
1474 | CONFIG_CRYPTO_AES=m | 1670 | CONFIG_CRYPTO_AES=m |
1671 | CONFIG_CRYPTO_ANUBIS=m | ||
1672 | CONFIG_CRYPTO_ARC4=m | ||
1673 | CONFIG_CRYPTO_BLOWFISH=m | ||
1674 | CONFIG_CRYPTO_CAMELLIA=m | ||
1475 | CONFIG_CRYPTO_CAST5=m | 1675 | CONFIG_CRYPTO_CAST5=m |
1476 | CONFIG_CRYPTO_CAST6=m | 1676 | CONFIG_CRYPTO_CAST6=m |
1477 | CONFIG_CRYPTO_TEA=m | 1677 | CONFIG_CRYPTO_DES=m |
1478 | CONFIG_CRYPTO_ARC4=m | 1678 | CONFIG_CRYPTO_FCRYPT=m |
1479 | CONFIG_CRYPTO_KHAZAD=m | 1679 | CONFIG_CRYPTO_KHAZAD=m |
1480 | CONFIG_CRYPTO_ANUBIS=m | 1680 | # CONFIG_CRYPTO_SALSA20 is not set |
1681 | # CONFIG_CRYPTO_SEED is not set | ||
1682 | CONFIG_CRYPTO_SERPENT=m | ||
1683 | CONFIG_CRYPTO_TEA=m | ||
1684 | CONFIG_CRYPTO_TWOFISH=m | ||
1685 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1686 | |||
1687 | # | ||
1688 | # Compression | ||
1689 | # | ||
1481 | CONFIG_CRYPTO_DEFLATE=m | 1690 | CONFIG_CRYPTO_DEFLATE=m |
1482 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1691 | # CONFIG_CRYPTO_LZO is not set |
1483 | CONFIG_CRYPTO_CRC32C=m | 1692 | |
1484 | CONFIG_CRYPTO_CAMELLIA=m | 1693 | # |
1485 | # CONFIG_CRYPTO_TEST is not set | 1694 | # Random Number Generation |
1695 | # | ||
1696 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1486 | CONFIG_CRYPTO_HW=y | 1697 | CONFIG_CRYPTO_HW=y |
1698 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1487 | 1699 | ||
1488 | # | 1700 | # |
1489 | # Library routines | 1701 | # Library routines |
@@ -1491,7 +1703,8 @@ CONFIG_CRYPTO_HW=y | |||
1491 | CONFIG_BITREVERSE=y | 1703 | CONFIG_BITREVERSE=y |
1492 | # CONFIG_CRC_CCITT is not set | 1704 | # CONFIG_CRC_CCITT is not set |
1493 | CONFIG_CRC16=m | 1705 | CONFIG_CRC16=m |
1494 | # CONFIG_CRC_ITU_T is not set | 1706 | # CONFIG_CRC_T10DIF is not set |
1707 | CONFIG_CRC_ITU_T=m | ||
1495 | CONFIG_CRC32=y | 1708 | CONFIG_CRC32=y |
1496 | # CONFIG_CRC7 is not set | 1709 | # CONFIG_CRC7 is not set |
1497 | CONFIG_LIBCRC32C=m | 1710 | CONFIG_LIBCRC32C=m |
diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h index 7a881755800f..6c8342ae74db 100644 --- a/arch/mips/include/asm/asmmacro.h +++ b/arch/mips/include/asm/asmmacro.h | |||
@@ -35,6 +35,16 @@ | |||
35 | mtc0 \reg, CP0_TCSTATUS | 35 | mtc0 \reg, CP0_TCSTATUS |
36 | _ehb | 36 | _ehb |
37 | .endm | 37 | .endm |
38 | #elif defined(CONFIG_CPU_MIPSR2) | ||
39 | .macro local_irq_enable reg=t0 | ||
40 | ei | ||
41 | irq_enable_hazard | ||
42 | .endm | ||
43 | |||
44 | .macro local_irq_disable reg=t0 | ||
45 | di | ||
46 | irq_disable_hazard | ||
47 | .endm | ||
38 | #else | 48 | #else |
39 | .macro local_irq_enable reg=t0 | 49 | .macro local_irq_enable reg=t0 |
40 | mfc0 \reg, CP0_STATUS | 50 | mfc0 \reg, CP0_STATUS |
diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h index 7eb63de808bc..08ea46863fe5 100644 --- a/arch/mips/include/asm/bug.h +++ b/arch/mips/include/asm/bug.h | |||
@@ -7,20 +7,31 @@ | |||
7 | 7 | ||
8 | #include <asm/break.h> | 8 | #include <asm/break.h> |
9 | 9 | ||
10 | #define BUG() \ | 10 | static inline void __noreturn BUG(void) |
11 | do { \ | 11 | { |
12 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ | 12 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); |
13 | } while (0) | 13 | /* Fool GCC into thinking the function doesn't return. */ |
14 | while (1) | ||
15 | ; | ||
16 | } | ||
14 | 17 | ||
15 | #define HAVE_ARCH_BUG | 18 | #define HAVE_ARCH_BUG |
16 | 19 | ||
17 | #if (_MIPS_ISA > _MIPS_ISA_MIPS1) | 20 | #if (_MIPS_ISA > _MIPS_ISA_MIPS1) |
18 | 21 | ||
19 | #define BUG_ON(condition) \ | 22 | static inline void __BUG_ON(unsigned long condition) |
20 | do { \ | 23 | { |
21 | __asm__ __volatile__("tne $0, %0, %1" \ | 24 | if (__builtin_constant_p(condition)) { |
22 | : : "r" (condition), "i" (BRK_BUG)); \ | 25 | if (condition) |
23 | } while (0) | 26 | BUG(); |
27 | else | ||
28 | return; | ||
29 | } | ||
30 | __asm__ __volatile__("tne $0, %0, %1" | ||
31 | : : "r" (condition), "i" (BRK_BUG)); | ||
32 | } | ||
33 | |||
34 | #define BUG_ON(C) __BUG_ON((unsigned long)(C)) | ||
24 | 35 | ||
25 | #define HAVE_ARCH_BUG_ON | 36 | #define HAVE_ARCH_BUG_ON |
26 | 37 | ||
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index a58f0eecc68f..abc62aa744ac 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h | |||
@@ -49,7 +49,8 @@ static inline void smtc_im_ack_irq(unsigned int irq) | |||
49 | #ifdef CONFIG_MIPS_MT_SMTC_IRQAFF | 49 | #ifdef CONFIG_MIPS_MT_SMTC_IRQAFF |
50 | #include <linux/cpumask.h> | 50 | #include <linux/cpumask.h> |
51 | 51 | ||
52 | extern void plat_set_irq_affinity(unsigned int irq, cpumask_t affinity); | 52 | extern void plat_set_irq_affinity(unsigned int irq, |
53 | const struct cpumask *affinity); | ||
53 | extern void smtc_forward_irq(unsigned int irq); | 54 | extern void smtc_forward_irq(unsigned int irq); |
54 | 55 | ||
55 | /* | 56 | /* |
diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h index 7785bec732f2..1fb959f98982 100644 --- a/arch/mips/include/asm/mach-ip27/topology.h +++ b/arch/mips/include/asm/mach-ip27/topology.h | |||
@@ -37,7 +37,6 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; | |||
37 | 37 | ||
38 | /* sched_domains SD_NODE_INIT for SGI IP27 machines */ | 38 | /* sched_domains SD_NODE_INIT for SGI IP27 machines */ |
39 | #define SD_NODE_INIT (struct sched_domain) { \ | 39 | #define SD_NODE_INIT (struct sched_domain) { \ |
40 | .span = CPU_MASK_NONE, \ | ||
41 | .parent = NULL, \ | 40 | .parent = NULL, \ |
42 | .child = NULL, \ | 41 | .child = NULL, \ |
43 | .groups = NULL, \ | 42 | .groups = NULL, \ |
diff --git a/arch/mips/include/asm/mach-rc32434/gpio.h b/arch/mips/include/asm/mach-rc32434/gpio.h index c8e554eafce3..b5cf6457305a 100644 --- a/arch/mips/include/asm/mach-rc32434/gpio.h +++ b/arch/mips/include/asm/mach-rc32434/gpio.h | |||
@@ -84,5 +84,7 @@ extern void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned | |||
84 | extern unsigned get_434_reg(unsigned reg_offs); | 84 | extern unsigned get_434_reg(unsigned reg_offs); |
85 | extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask); | 85 | extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask); |
86 | extern unsigned char get_latch_u5(void); | 86 | extern unsigned char get_latch_u5(void); |
87 | extern void rb532_gpio_set_ilevel(int bit, unsigned gpio); | ||
88 | extern void rb532_gpio_set_istat(int bit, unsigned gpio); | ||
87 | 89 | ||
88 | #endif /* _RC32434_GPIO_H_ */ | 90 | #endif /* _RC32434_GPIO_H_ */ |
diff --git a/arch/mips/include/asm/mach-rc32434/rb.h b/arch/mips/include/asm/mach-rc32434/rb.h index 79e8ef67d0d3..f25a84916703 100644 --- a/arch/mips/include/asm/mach-rc32434/rb.h +++ b/arch/mips/include/asm/mach-rc32434/rb.h | |||
@@ -40,12 +40,14 @@ | |||
40 | #define BTCS 0x010040 | 40 | #define BTCS 0x010040 |
41 | #define BTCOMPARE 0x010044 | 41 | #define BTCOMPARE 0x010044 |
42 | #define GPIOBASE 0x050000 | 42 | #define GPIOBASE 0x050000 |
43 | #define GPIOCFG 0x050004 | 43 | /* Offsets relative to GPIOBASE */ |
44 | #define GPIOD 0x050008 | 44 | #define GPIOFUNC 0x00 |
45 | #define GPIOILEVEL 0x05000C | 45 | #define GPIOCFG 0x04 |
46 | #define GPIOISTAT 0x050010 | 46 | #define GPIOD 0x08 |
47 | #define GPIONMIEN 0x050014 | 47 | #define GPIOILEVEL 0x0C |
48 | #define IMASK6 0x038038 | 48 | #define GPIOISTAT 0x10 |
49 | #define GPIONMIEN 0x14 | ||
50 | #define IMASK6 0x38 | ||
49 | #define LO_WPX (1 << 0) | 51 | #define LO_WPX (1 << 0) |
50 | #define LO_ALE (1 << 1) | 52 | #define LO_ALE (1 << 1) |
51 | #define LO_CLE (1 << 2) | 53 | #define LO_CLE (1 << 2) |
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 5510c53b7feb..053e4634acee 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h | |||
@@ -79,6 +79,11 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
79 | /* We don't do dynamic PCI IRQ allocation */ | 79 | /* We don't do dynamic PCI IRQ allocation */ |
80 | } | 80 | } |
81 | 81 | ||
82 | #define HAVE_PCI_MMAP | ||
83 | |||
84 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | ||
85 | enum pci_mmap_state mmap_state, int write_combine); | ||
86 | |||
82 | /* | 87 | /* |
83 | * Dynamic DMA mapping stuff. | 88 | * Dynamic DMA mapping stuff. |
84 | * MIPS has everything mapped statically. | 89 | * MIPS has everything mapped statically. |
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index 813abd16255d..c2c8bac43307 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h | |||
@@ -9,10 +9,6 @@ | |||
9 | #ifndef _ASM_PTRACE_H | 9 | #ifndef _ASM_PTRACE_H |
10 | #define _ASM_PTRACE_H | 10 | #define _ASM_PTRACE_H |
11 | 11 | ||
12 | #ifdef CONFIG_64BIT | ||
13 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
14 | #endif | ||
15 | |||
16 | /* 0 - 31 are integer registers, 32 - 63 are fp registers. */ | 12 | /* 0 - 31 are integer registers, 32 - 63 are fp registers. */ |
17 | #define FPR_BASE 32 | 13 | #define FPR_BASE 32 |
18 | #define PC 64 | 14 | #define PC 64 |
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h index 0ff5b523ea77..86557b5d1b3f 100644 --- a/arch/mips/include/asm/smp.h +++ b/arch/mips/include/asm/smp.h | |||
@@ -38,9 +38,6 @@ extern int __cpu_logical_map[NR_CPUS]; | |||
38 | #define SMP_RESCHEDULE_YOURSELF 0x1 /* XXX braindead */ | 38 | #define SMP_RESCHEDULE_YOURSELF 0x1 /* XXX braindead */ |
39 | #define SMP_CALL_FUNCTION 0x2 | 39 | #define SMP_CALL_FUNCTION 0x2 |
40 | 40 | ||
41 | extern cpumask_t phys_cpu_present_map; | ||
42 | #define cpu_possible_map phys_cpu_present_map | ||
43 | |||
44 | extern void asmlinkage smp_bootstrap(void); | 41 | extern void asmlinkage smp_bootstrap(void); |
45 | 42 | ||
46 | /* | 43 | /* |
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index d3bd5c5aa2ec..9601ea950542 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h | |||
@@ -63,7 +63,7 @@ static inline int mips_clockevent_init(void) | |||
63 | /* | 63 | /* |
64 | * Initialize the count register as a clocksource | 64 | * Initialize the count register as a clocksource |
65 | */ | 65 | */ |
66 | #ifdef CONFIG_CEVT_R4K | 66 | #ifdef CONFIG_CSRC_R4K |
67 | extern int init_mips_clocksource(void); | 67 | extern int init_mips_clocksource(void); |
68 | #else | 68 | #else |
69 | static inline int init_mips_clocksource(void) | 69 | static inline int init_mips_clocksource(void) |
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index d7f8a782aae4..03965cb1b252 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c | |||
@@ -146,7 +146,7 @@ void __init plat_time_init(void) | |||
146 | 146 | ||
147 | BUG_ON(HZ != 100); | 147 | BUG_ON(HZ != 100); |
148 | 148 | ||
149 | cd->cpumask = cpumask_of_cpu(cpu); | 149 | cd->cpumask = cpumask_of(cpu); |
150 | clockevents_register_device(cd); | 150 | clockevents_register_device(cd); |
151 | action->dev_id = cd; | 151 | action->dev_id = cd; |
152 | setup_irq(JAZZ_TIMER_IRQ, action); | 152 | setup_irq(JAZZ_TIMER_IRQ, action); |
diff --git a/arch/mips/kernel/cevt-bcm1480.c b/arch/mips/kernel/cevt-bcm1480.c index 0a57f86945f1..b820661678b0 100644 --- a/arch/mips/kernel/cevt-bcm1480.c +++ b/arch/mips/kernel/cevt-bcm1480.c | |||
@@ -126,7 +126,7 @@ void __cpuinit sb1480_clockevent_init(void) | |||
126 | cd->min_delta_ns = clockevent_delta2ns(2, cd); | 126 | cd->min_delta_ns = clockevent_delta2ns(2, cd); |
127 | cd->rating = 200; | 127 | cd->rating = 200; |
128 | cd->irq = irq; | 128 | cd->irq = irq; |
129 | cd->cpumask = cpumask_of_cpu(cpu); | 129 | cd->cpumask = cpumask_of(cpu); |
130 | cd->set_next_event = sibyte_next_event; | 130 | cd->set_next_event = sibyte_next_event; |
131 | cd->set_mode = sibyte_set_mode; | 131 | cd->set_mode = sibyte_set_mode; |
132 | clockevents_register_device(cd); | 132 | clockevents_register_device(cd); |
@@ -148,6 +148,6 @@ void __cpuinit sb1480_clockevent_init(void) | |||
148 | action->name = name; | 148 | action->name = name; |
149 | action->dev_id = cd; | 149 | action->dev_id = cd; |
150 | 150 | ||
151 | irq_set_affinity(irq, cpumask_of_cpu(cpu)); | 151 | irq_set_affinity(irq, cpumask_of(cpu)); |
152 | setup_irq(irq, action); | 152 | setup_irq(irq, action); |
153 | } | 153 | } |
diff --git a/arch/mips/kernel/cevt-ds1287.c b/arch/mips/kernel/cevt-ds1287.c index df4acb68bfb5..1ada45ea0700 100644 --- a/arch/mips/kernel/cevt-ds1287.c +++ b/arch/mips/kernel/cevt-ds1287.c | |||
@@ -88,7 +88,6 @@ static void ds1287_event_handler(struct clock_event_device *dev) | |||
88 | static struct clock_event_device ds1287_clockevent = { | 88 | static struct clock_event_device ds1287_clockevent = { |
89 | .name = "ds1287", | 89 | .name = "ds1287", |
90 | .features = CLOCK_EVT_FEAT_PERIODIC, | 90 | .features = CLOCK_EVT_FEAT_PERIODIC, |
91 | .cpumask = CPU_MASK_CPU0, | ||
92 | .set_next_event = ds1287_set_next_event, | 91 | .set_next_event = ds1287_set_next_event, |
93 | .set_mode = ds1287_set_mode, | 92 | .set_mode = ds1287_set_mode, |
94 | .event_handler = ds1287_event_handler, | 93 | .event_handler = ds1287_event_handler, |
@@ -122,6 +121,7 @@ int __init ds1287_clockevent_init(int irq) | |||
122 | clockevent_set_clock(cd, 32768); | 121 | clockevent_set_clock(cd, 32768); |
123 | cd->max_delta_ns = clockevent_delta2ns(0x7fffffff, cd); | 122 | cd->max_delta_ns = clockevent_delta2ns(0x7fffffff, cd); |
124 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); | 123 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); |
124 | cd->cpumask = cpumask_of(0); | ||
125 | 125 | ||
126 | clockevents_register_device(&ds1287_clockevent); | 126 | clockevents_register_device(&ds1287_clockevent); |
127 | 127 | ||
diff --git a/arch/mips/kernel/cevt-gt641xx.c b/arch/mips/kernel/cevt-gt641xx.c index 6e2f58520afb..e9b787feedcb 100644 --- a/arch/mips/kernel/cevt-gt641xx.c +++ b/arch/mips/kernel/cevt-gt641xx.c | |||
@@ -96,7 +96,6 @@ static void gt641xx_timer0_event_handler(struct clock_event_device *dev) | |||
96 | static struct clock_event_device gt641xx_timer0_clockevent = { | 96 | static struct clock_event_device gt641xx_timer0_clockevent = { |
97 | .name = "gt641xx-timer0", | 97 | .name = "gt641xx-timer0", |
98 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, | 98 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, |
99 | .cpumask = CPU_MASK_CPU0, | ||
100 | .irq = GT641XX_TIMER0_IRQ, | 99 | .irq = GT641XX_TIMER0_IRQ, |
101 | .set_next_event = gt641xx_timer0_set_next_event, | 100 | .set_next_event = gt641xx_timer0_set_next_event, |
102 | .set_mode = gt641xx_timer0_set_mode, | 101 | .set_mode = gt641xx_timer0_set_mode, |
@@ -132,6 +131,7 @@ static int __init gt641xx_timer0_clockevent_init(void) | |||
132 | clockevent_set_clock(cd, gt641xx_base_clock); | 131 | clockevent_set_clock(cd, gt641xx_base_clock); |
133 | cd->max_delta_ns = clockevent_delta2ns(0x7fffffff, cd); | 132 | cd->max_delta_ns = clockevent_delta2ns(0x7fffffff, cd); |
134 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); | 133 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); |
134 | cd->cpumask = cpumask_of(0); | ||
135 | 135 | ||
136 | clockevents_register_device(>641xx_timer0_clockevent); | 136 | clockevents_register_device(>641xx_timer0_clockevent); |
137 | 137 | ||
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index 4a4c59f2737a..e1ec83b68031 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c | |||
@@ -195,7 +195,7 @@ int __cpuinit mips_clockevent_init(void) | |||
195 | 195 | ||
196 | cd->rating = 300; | 196 | cd->rating = 300; |
197 | cd->irq = irq; | 197 | cd->irq = irq; |
198 | cd->cpumask = cpumask_of_cpu(cpu); | 198 | cd->cpumask = cpumask_of(cpu); |
199 | cd->set_next_event = mips_next_event; | 199 | cd->set_next_event = mips_next_event; |
200 | cd->set_mode = mips_set_clock_mode; | 200 | cd->set_mode = mips_set_clock_mode; |
201 | cd->event_handler = mips_event_handler; | 201 | cd->event_handler = mips_event_handler; |
diff --git a/arch/mips/kernel/cevt-sb1250.c b/arch/mips/kernel/cevt-sb1250.c index 63ac3ad462bc..a2eebaafda52 100644 --- a/arch/mips/kernel/cevt-sb1250.c +++ b/arch/mips/kernel/cevt-sb1250.c | |||
@@ -125,7 +125,7 @@ void __cpuinit sb1250_clockevent_init(void) | |||
125 | cd->min_delta_ns = clockevent_delta2ns(2, cd); | 125 | cd->min_delta_ns = clockevent_delta2ns(2, cd); |
126 | cd->rating = 200; | 126 | cd->rating = 200; |
127 | cd->irq = irq; | 127 | cd->irq = irq; |
128 | cd->cpumask = cpumask_of_cpu(cpu); | 128 | cd->cpumask = cpumask_of(cpu); |
129 | cd->set_next_event = sibyte_next_event; | 129 | cd->set_next_event = sibyte_next_event; |
130 | cd->set_mode = sibyte_set_mode; | 130 | cd->set_mode = sibyte_set_mode; |
131 | clockevents_register_device(cd); | 131 | clockevents_register_device(cd); |
@@ -147,6 +147,6 @@ void __cpuinit sb1250_clockevent_init(void) | |||
147 | action->name = name; | 147 | action->name = name; |
148 | action->dev_id = cd; | 148 | action->dev_id = cd; |
149 | 149 | ||
150 | irq_set_affinity(irq, cpumask_of_cpu(cpu)); | 150 | irq_set_affinity(irq, cpumask_of(cpu)); |
151 | setup_irq(irq, action); | 151 | setup_irq(irq, action); |
152 | } | 152 | } |
diff --git a/arch/mips/kernel/cevt-smtc.c b/arch/mips/kernel/cevt-smtc.c index 5162fe4b5952..6d45e24db5bf 100644 --- a/arch/mips/kernel/cevt-smtc.c +++ b/arch/mips/kernel/cevt-smtc.c | |||
@@ -292,7 +292,7 @@ int __cpuinit mips_clockevent_init(void) | |||
292 | 292 | ||
293 | cd->rating = 300; | 293 | cd->rating = 300; |
294 | cd->irq = irq; | 294 | cd->irq = irq; |
295 | cd->cpumask = cpumask_of_cpu(cpu); | 295 | cd->cpumask = cpumask_of(cpu); |
296 | cd->set_next_event = mips_next_event; | 296 | cd->set_next_event = mips_next_event; |
297 | cd->set_mode = mips_set_clock_mode; | 297 | cd->set_mode = mips_set_clock_mode; |
298 | cd->event_handler = mips_event_handler; | 298 | cd->event_handler = mips_event_handler; |
diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c index b5fc4eb412d2..eccf7d6096bd 100644 --- a/arch/mips/kernel/cevt-txx9.c +++ b/arch/mips/kernel/cevt-txx9.c | |||
@@ -112,7 +112,6 @@ static struct clock_event_device txx9tmr_clock_event_device = { | |||
112 | .name = "TXx9", | 112 | .name = "TXx9", |
113 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, | 113 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, |
114 | .rating = 200, | 114 | .rating = 200, |
115 | .cpumask = CPU_MASK_CPU0, | ||
116 | .set_mode = txx9tmr_set_mode, | 115 | .set_mode = txx9tmr_set_mode, |
117 | .set_next_event = txx9tmr_set_next_event, | 116 | .set_next_event = txx9tmr_set_next_event, |
118 | }; | 117 | }; |
@@ -150,6 +149,7 @@ void __init txx9_clockevent_init(unsigned long baseaddr, int irq, | |||
150 | clockevent_delta2ns(0xffffffff >> (32 - TXX9_TIMER_BITS), cd); | 149 | clockevent_delta2ns(0xffffffff >> (32 - TXX9_TIMER_BITS), cd); |
151 | cd->min_delta_ns = clockevent_delta2ns(0xf, cd); | 150 | cd->min_delta_ns = clockevent_delta2ns(0xf, cd); |
152 | cd->irq = irq; | 151 | cd->irq = irq; |
152 | cd->cpumask = cpumask_of(0), | ||
153 | clockevents_register_device(cd); | 153 | clockevents_register_device(cd); |
154 | setup_irq(irq, &txx9tmr_irq); | 154 | setup_irq(irq, &txx9tmr_irq); |
155 | printk(KERN_INFO "TXx9: clockevent device at 0x%lx, irq %d\n", | 155 | printk(KERN_INFO "TXx9: clockevent device at 0x%lx, irq %d\n", |
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index 86e026f067bc..74fb74583b4e 100644 --- a/arch/mips/kernel/csrc-r4k.c +++ b/arch/mips/kernel/csrc-r4k.c | |||
@@ -27,7 +27,7 @@ int __init init_mips_clocksource(void) | |||
27 | if (!cpu_has_counter || !mips_hpt_frequency) | 27 | if (!cpu_has_counter || !mips_hpt_frequency) |
28 | return -ENXIO; | 28 | return -ENXIO; |
29 | 29 | ||
30 | /* Calclate a somewhat reasonable rating value */ | 30 | /* Calculate a somewhat reasonable rating value */ |
31 | clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000; | 31 | clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000; |
32 | 32 | ||
33 | clocksource_set_clock(&clocksource_mips, mips_hpt_frequency); | 33 | clocksource_set_clock(&clocksource_mips, mips_hpt_frequency); |
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c index b6ac55162b9a..f4d187825f96 100644 --- a/arch/mips/kernel/i8253.c +++ b/arch/mips/kernel/i8253.c | |||
@@ -115,7 +115,7 @@ void __init setup_pit_timer(void) | |||
115 | * Start pit with the boot cpu mask and make it global after the | 115 | * Start pit with the boot cpu mask and make it global after the |
116 | * IO_APIC has been initialized. | 116 | * IO_APIC has been initialized. |
117 | */ | 117 | */ |
118 | cd->cpumask = cpumask_of_cpu(cpu); | 118 | cd->cpumask = cpumask_of(cpu); |
119 | clockevent_set_clock(cd, CLOCK_TICK_RATE); | 119 | clockevent_set_clock(cd, CLOCK_TICK_RATE); |
120 | cd->max_delta_ns = clockevent_delta2ns(0x7FFF, cd); | 120 | cd->max_delta_ns = clockevent_delta2ns(0x7FFF, cd); |
121 | cd->min_delta_ns = clockevent_delta2ns(0xF, cd); | 121 | cd->min_delta_ns = clockevent_delta2ns(0xF, cd); |
diff --git a/arch/mips/kernel/irq-gic.c b/arch/mips/kernel/irq-gic.c index f0a4bb19e096..494a49a317e9 100644 --- a/arch/mips/kernel/irq-gic.c +++ b/arch/mips/kernel/irq-gic.c | |||
@@ -155,7 +155,7 @@ static void gic_unmask_irq(unsigned int irq) | |||
155 | 155 | ||
156 | static DEFINE_SPINLOCK(gic_lock); | 156 | static DEFINE_SPINLOCK(gic_lock); |
157 | 157 | ||
158 | static void gic_set_affinity(unsigned int irq, cpumask_t cpumask) | 158 | static void gic_set_affinity(unsigned int irq, const struct cpumask *cpumask) |
159 | { | 159 | { |
160 | cpumask_t tmp = CPU_MASK_NONE; | 160 | cpumask_t tmp = CPU_MASK_NONE; |
161 | unsigned long flags; | 161 | unsigned long flags; |
@@ -164,7 +164,7 @@ static void gic_set_affinity(unsigned int irq, cpumask_t cpumask) | |||
164 | pr_debug(KERN_DEBUG "%s called\n", __func__); | 164 | pr_debug(KERN_DEBUG "%s called\n", __func__); |
165 | irq -= _irqbase; | 165 | irq -= _irqbase; |
166 | 166 | ||
167 | cpus_and(tmp, cpumask, cpu_online_map); | 167 | cpumask_and(&tmp, cpumask, cpu_online_mask); |
168 | if (cpus_empty(tmp)) | 168 | if (cpus_empty(tmp)) |
169 | return; | 169 | return; |
170 | 170 | ||
@@ -187,7 +187,7 @@ static void gic_set_affinity(unsigned int irq, cpumask_t cpumask) | |||
187 | set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask); | 187 | set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask); |
188 | 188 | ||
189 | } | 189 | } |
190 | irq_desc[irq].affinity = cpumask; | 190 | irq_desc[irq].affinity = *cpumask; |
191 | spin_unlock_irqrestore(&gic_lock, flags); | 191 | spin_unlock_irqrestore(&gic_lock, flags); |
192 | 192 | ||
193 | } | 193 | } |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 759f68066b5d..d0916a55cd77 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
@@ -262,14 +262,11 @@ bad_alignment: | |||
262 | LEAF(sys_syscall) | 262 | LEAF(sys_syscall) |
263 | subu t0, a0, __NR_O32_Linux # check syscall number | 263 | subu t0, a0, __NR_O32_Linux # check syscall number |
264 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 | 264 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 |
265 | beqz t0, einval # do not recurse | ||
265 | sll t1, t0, 3 | 266 | sll t1, t0, 3 |
266 | beqz v0, einval | 267 | beqz v0, einval |
267 | |||
268 | lw t2, sys_call_table(t1) # syscall routine | 268 | lw t2, sys_call_table(t1) # syscall routine |
269 | 269 | ||
270 | li v1, 4000 - __NR_O32_Linux # index of sys_syscall | ||
271 | beq t0, v1, einval # do not recurse | ||
272 | |||
273 | /* Some syscalls like execve get their arguments from struct pt_regs | 270 | /* Some syscalls like execve get their arguments from struct pt_regs |
274 | and claim zero arguments in the syscall table. Thus we have to | 271 | and claim zero arguments in the syscall table. Thus we have to |
275 | assume the worst case and shuffle around all potential arguments. | 272 | assume the worst case and shuffle around all potential arguments. |
@@ -627,7 +624,7 @@ einval: li v0, -ENOSYS | |||
627 | sys sys_pselect6 6 | 624 | sys sys_pselect6 6 |
628 | sys sys_ppoll 5 | 625 | sys sys_ppoll 5 |
629 | sys sys_unshare 1 | 626 | sys sys_unshare 1 |
630 | sys sys_splice 4 | 627 | sys sys_splice 6 |
631 | sys sys_sync_file_range 7 /* 4305 */ | 628 | sys sys_sync_file_range 7 /* 4305 */ |
632 | sys sys_tee 4 | 629 | sys sys_tee 4 |
633 | sys sys_vmsplice 4 | 630 | sys sys_vmsplice 4 |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index e266b3aa6560..30f3b6317a83 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
@@ -390,7 +390,7 @@ EXPORT(sysn32_call_table) | |||
390 | PTR sys_splice | 390 | PTR sys_splice |
391 | PTR sys_sync_file_range | 391 | PTR sys_sync_file_range |
392 | PTR sys_tee | 392 | PTR sys_tee |
393 | PTR sys_vmsplice /* 6270 */ | 393 | PTR compat_sys_vmsplice /* 6270 */ |
394 | PTR sys_move_pages | 394 | PTR sys_move_pages |
395 | PTR compat_sys_set_robust_list | 395 | PTR compat_sys_set_robust_list |
396 | PTR compat_sys_get_robust_list | 396 | PTR compat_sys_get_robust_list |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 6c7ef8313ebd..fefef4af8595 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -174,14 +174,12 @@ not_o32_scall: | |||
174 | END(handle_sys) | 174 | END(handle_sys) |
175 | 175 | ||
176 | LEAF(sys32_syscall) | 176 | LEAF(sys32_syscall) |
177 | sltu v0, a0, __NR_O32_Linux + __NR_O32_Linux_syscalls + 1 | 177 | subu t0, a0, __NR_O32_Linux # check syscall number |
178 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 | ||
179 | beqz t0, einval # do not recurse | ||
180 | dsll t1, t0, 3 | ||
178 | beqz v0, einval | 181 | beqz v0, einval |
179 | 182 | ld t2, sys_call_table(t1) # syscall routine | |
180 | dsll v0, a0, 3 | ||
181 | ld t2, (sys_call_table - (__NR_O32_Linux * 8))(v0) | ||
182 | |||
183 | li v1, 4000 # indirect syscall number | ||
184 | beq a0, v1, einval # do not recurse | ||
185 | 183 | ||
186 | move a0, a1 # shift argument registers | 184 | move a0, a1 # shift argument registers |
187 | move a1, a2 | 185 | move a1, a2 |
@@ -198,7 +196,7 @@ LEAF(sys32_syscall) | |||
198 | jr t2 | 196 | jr t2 |
199 | /* Unreached */ | 197 | /* Unreached */ |
200 | 198 | ||
201 | einval: li v0, -EINVAL | 199 | einval: li v0, -ENOSYS |
202 | jr ra | 200 | jr ra |
203 | END(sys32_syscall) | 201 | END(sys32_syscall) |
204 | 202 | ||
@@ -512,7 +510,7 @@ sys_call_table: | |||
512 | PTR sys_splice | 510 | PTR sys_splice |
513 | PTR sys32_sync_file_range /* 4305 */ | 511 | PTR sys32_sync_file_range /* 4305 */ |
514 | PTR sys_tee | 512 | PTR sys_tee |
515 | PTR sys_vmsplice | 513 | PTR compat_sys_vmsplice |
516 | PTR compat_sys_move_pages | 514 | PTR compat_sys_move_pages |
517 | PTR compat_sys_set_robust_list | 515 | PTR compat_sys_set_robust_list |
518 | PTR compat_sys_get_robust_list /* 4310 */ | 516 | PTR compat_sys_get_robust_list /* 4310 */ |
diff --git a/arch/mips/kernel/smp-cmp.c b/arch/mips/kernel/smp-cmp.c index ca476c4f62a5..f27beca4b26d 100644 --- a/arch/mips/kernel/smp-cmp.c +++ b/arch/mips/kernel/smp-cmp.c | |||
@@ -51,10 +51,10 @@ static int __init allowcpus(char *str) | |||
51 | int len; | 51 | int len; |
52 | 52 | ||
53 | cpus_clear(cpu_allow_map); | 53 | cpus_clear(cpu_allow_map); |
54 | if (cpulist_parse(str, cpu_allow_map) == 0) { | 54 | if (cpulist_parse(str, &cpu_allow_map) == 0) { |
55 | cpu_set(0, cpu_allow_map); | 55 | cpu_set(0, cpu_allow_map); |
56 | cpus_and(cpu_possible_map, cpu_possible_map, cpu_allow_map); | 56 | cpus_and(cpu_possible_map, cpu_possible_map, cpu_allow_map); |
57 | len = cpulist_scnprintf(buf, sizeof(buf)-1, cpu_possible_map); | 57 | len = cpulist_scnprintf(buf, sizeof(buf)-1, &cpu_possible_map); |
58 | buf[len] = '\0'; | 58 | buf[len] = '\0'; |
59 | pr_debug("Allowable CPUs: %s\n", buf); | 59 | pr_debug("Allowable CPUs: %s\n", buf); |
60 | return 1; | 60 | return 1; |
@@ -226,7 +226,7 @@ void __init cmp_smp_setup(void) | |||
226 | 226 | ||
227 | for (i = 1; i < NR_CPUS; i++) { | 227 | for (i = 1; i < NR_CPUS; i++) { |
228 | if (amon_cpu_avail(i)) { | 228 | if (amon_cpu_avail(i)) { |
229 | cpu_set(i, phys_cpu_present_map); | 229 | cpu_set(i, cpu_possible_map); |
230 | __cpu_number_map[i] = ++ncpu; | 230 | __cpu_number_map[i] = ++ncpu; |
231 | __cpu_logical_map[ncpu] = i; | 231 | __cpu_logical_map[ncpu] = i; |
232 | } | 232 | } |
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c index 87a1816c1f45..6f7ee5ac46ee 100644 --- a/arch/mips/kernel/smp-mt.c +++ b/arch/mips/kernel/smp-mt.c | |||
@@ -70,7 +70,7 @@ static unsigned int __init smvp_vpe_init(unsigned int tc, unsigned int mvpconf0, | |||
70 | write_vpe_c0_vpeconf0(tmp); | 70 | write_vpe_c0_vpeconf0(tmp); |
71 | 71 | ||
72 | /* Record this as available CPU */ | 72 | /* Record this as available CPU */ |
73 | cpu_set(tc, phys_cpu_present_map); | 73 | cpu_set(tc, cpu_possible_map); |
74 | __cpu_number_map[tc] = ++ncpu; | 74 | __cpu_number_map[tc] = ++ncpu; |
75 | __cpu_logical_map[ncpu] = tc; | 75 | __cpu_logical_map[ncpu] = tc; |
76 | } | 76 | } |
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 8bf88faf5afd..3da94704f816 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
@@ -44,15 +44,10 @@ | |||
44 | #include <asm/mipsmtregs.h> | 44 | #include <asm/mipsmtregs.h> |
45 | #endif /* CONFIG_MIPS_MT_SMTC */ | 45 | #endif /* CONFIG_MIPS_MT_SMTC */ |
46 | 46 | ||
47 | cpumask_t phys_cpu_present_map; /* Bitmask of available CPUs */ | ||
48 | volatile cpumask_t cpu_callin_map; /* Bitmask of started secondaries */ | 47 | volatile cpumask_t cpu_callin_map; /* Bitmask of started secondaries */ |
49 | cpumask_t cpu_online_map; /* Bitmask of currently online CPUs */ | ||
50 | int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ | 48 | int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ |
51 | int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */ | 49 | int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */ |
52 | 50 | ||
53 | EXPORT_SYMBOL(phys_cpu_present_map); | ||
54 | EXPORT_SYMBOL(cpu_online_map); | ||
55 | |||
56 | extern void cpu_idle(void); | 51 | extern void cpu_idle(void); |
57 | 52 | ||
58 | /* Number of TCs (or siblings in Intel speak) per CPU core */ | 53 | /* Number of TCs (or siblings in Intel speak) per CPU core */ |
@@ -195,7 +190,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
195 | /* preload SMP state for boot cpu */ | 190 | /* preload SMP state for boot cpu */ |
196 | void __devinit smp_prepare_boot_cpu(void) | 191 | void __devinit smp_prepare_boot_cpu(void) |
197 | { | 192 | { |
198 | cpu_set(0, phys_cpu_present_map); | 193 | cpu_set(0, cpu_possible_map); |
199 | cpu_set(0, cpu_online_map); | 194 | cpu_set(0, cpu_online_map); |
200 | cpu_set(0, cpu_callin_map); | 195 | cpu_set(0, cpu_callin_map); |
201 | } | 196 | } |
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 897fb2b4751c..b6cca01ff82b 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -290,7 +290,7 @@ static void smtc_configure_tlb(void) | |||
290 | * possibly leave some TCs/VPEs as "slave" processors. | 290 | * possibly leave some TCs/VPEs as "slave" processors. |
291 | * | 291 | * |
292 | * Use c0_MVPConf0 to find out how many TCs are available, setting up | 292 | * Use c0_MVPConf0 to find out how many TCs are available, setting up |
293 | * phys_cpu_present_map and the logical/physical mappings. | 293 | * cpu_possible_map and the logical/physical mappings. |
294 | */ | 294 | */ |
295 | 295 | ||
296 | int __init smtc_build_cpu_map(int start_cpu_slot) | 296 | int __init smtc_build_cpu_map(int start_cpu_slot) |
@@ -304,7 +304,7 @@ int __init smtc_build_cpu_map(int start_cpu_slot) | |||
304 | */ | 304 | */ |
305 | ntcs = ((read_c0_mvpconf0() & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; | 305 | ntcs = ((read_c0_mvpconf0() & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; |
306 | for (i=start_cpu_slot; i<NR_CPUS && i<ntcs; i++) { | 306 | for (i=start_cpu_slot; i<NR_CPUS && i<ntcs; i++) { |
307 | cpu_set(i, phys_cpu_present_map); | 307 | cpu_set(i, cpu_possible_map); |
308 | __cpu_number_map[i] = i; | 308 | __cpu_number_map[i] = i; |
309 | __cpu_logical_map[i] = i; | 309 | __cpu_logical_map[i] = i; |
310 | } | 310 | } |
@@ -521,7 +521,7 @@ void smtc_prepare_cpus(int cpus) | |||
521 | * Pull any physically present but unused TCs out of circulation. | 521 | * Pull any physically present but unused TCs out of circulation. |
522 | */ | 522 | */ |
523 | while (tc < (((val & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1)) { | 523 | while (tc < (((val & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1)) { |
524 | cpu_clear(tc, phys_cpu_present_map); | 524 | cpu_clear(tc, cpu_possible_map); |
525 | cpu_clear(tc, cpu_present_map); | 525 | cpu_clear(tc, cpu_present_map); |
526 | tc++; | 526 | tc++; |
527 | } | 527 | } |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 972b2d2b8401..a1b3da6bad5c 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
@@ -1134,7 +1134,7 @@ static int vpe_release(struct inode *inode, struct file *filp) | |||
1134 | 1134 | ||
1135 | /* It's good to be able to run the SP and if it chokes have a look at | 1135 | /* It's good to be able to run the SP and if it chokes have a look at |
1136 | the /dev/rt?. But if we reset the pointer to the shared struct we | 1136 | the /dev/rt?. But if we reset the pointer to the shared struct we |
1137 | loose what has happened. So perhaps if garbage is sent to the vpe | 1137 | lose what has happened. So perhaps if garbage is sent to the vpe |
1138 | device, use it as a trigger for the reset. Hopefully a nice | 1138 | device, use it as a trigger for the reset. Hopefully a nice |
1139 | executable will be along shortly. */ | 1139 | executable will be along shortly. */ |
1140 | if (ret < 0) | 1140 | if (ret < 0) |
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index 5b98d0e731c2..e6708b3ad343 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c | |||
@@ -111,6 +111,7 @@ EXPORT_SYMBOL(dma_alloc_coherent); | |||
111 | void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, | 111 | void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, |
112 | dma_addr_t dma_handle) | 112 | dma_addr_t dma_handle) |
113 | { | 113 | { |
114 | plat_unmap_dma_mem(dma_handle); | ||
114 | free_pages((unsigned long) vaddr, get_order(size)); | 115 | free_pages((unsigned long) vaddr, get_order(size)); |
115 | } | 116 | } |
116 | 117 | ||
@@ -121,6 +122,8 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, | |||
121 | { | 122 | { |
122 | unsigned long addr = (unsigned long) vaddr; | 123 | unsigned long addr = (unsigned long) vaddr; |
123 | 124 | ||
125 | plat_unmap_dma_mem(dma_handle); | ||
126 | |||
124 | if (!plat_device_is_coherent(dev)) | 127 | if (!plat_device_is_coherent(dev)) |
125 | addr = CAC_ADDR(addr); | 128 | addr = CAC_ADDR(addr); |
126 | 129 | ||
diff --git a/arch/mips/mm/sc-ip22.c b/arch/mips/mm/sc-ip22.c index 1f602a110e10..13adb5782110 100644 --- a/arch/mips/mm/sc-ip22.c +++ b/arch/mips/mm/sc-ip22.c | |||
@@ -161,7 +161,7 @@ static inline int __init indy_sc_probe(void) | |||
161 | 161 | ||
162 | /* XXX Check with wje if the Indy caches can differenciate between | 162 | /* XXX Check with wje if the Indy caches can differenciate between |
163 | writeback + invalidate and just invalidate. */ | 163 | writeback + invalidate and just invalidate. */ |
164 | struct bcache_ops indy_sc_ops = { | 164 | static struct bcache_ops indy_sc_ops = { |
165 | .bc_enable = indy_sc_enable, | 165 | .bc_enable = indy_sc_enable, |
166 | .bc_disable = indy_sc_disable, | 166 | .bc_disable = indy_sc_disable, |
167 | .bc_wback_inv = indy_sc_wback_invalidate, | 167 | .bc_wback_inv = indy_sc_wback_invalidate, |
diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile index cef2db8d2225..32e847808df1 100644 --- a/arch/mips/mti-malta/Makefile +++ b/arch/mips/mti-malta/Makefile | |||
@@ -7,9 +7,8 @@ | |||
7 | # | 7 | # |
8 | obj-y := malta-amon.o malta-cmdline.o \ | 8 | obj-y := malta-amon.o malta-cmdline.o \ |
9 | malta-display.o malta-init.o malta-int.o \ | 9 | malta-display.o malta-init.o malta-int.o \ |
10 | malta-memory.o malta-mtd.o \ | 10 | malta-memory.o malta-platform.o \ |
11 | malta-platform.o malta-reset.o \ | 11 | malta-reset.o malta-setup.o malta-time.o |
12 | malta-setup.o malta-time.o | ||
13 | 12 | ||
14 | obj-$(CONFIG_EARLY_PRINTK) += malta-console.o | 13 | obj-$(CONFIG_EARLY_PRINTK) += malta-console.o |
15 | obj-$(CONFIG_PCI) += malta-pci.o | 14 | obj-$(CONFIG_PCI) += malta-pci.o |
diff --git a/arch/mips/mti-malta/malta-amon.c b/arch/mips/mti-malta/malta-amon.c index 96236bf33838..df9e526312a2 100644 --- a/arch/mips/mti-malta/malta-amon.c +++ b/arch/mips/mti-malta/malta-amon.c | |||
@@ -22,9 +22,9 @@ | |||
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/smp.h> | 23 | #include <linux/smp.h> |
24 | 24 | ||
25 | #include <asm-mips/addrspace.h> | 25 | #include <asm/addrspace.h> |
26 | #include <asm-mips/mips-boards/launch.h> | 26 | #include <asm/mips-boards/launch.h> |
27 | #include <asm-mips/mipsmtregs.h> | 27 | #include <asm/mipsmtregs.h> |
28 | 28 | ||
29 | int amon_cpu_avail(int cpu) | 29 | int amon_cpu_avail(int cpu) |
30 | { | 30 | { |
diff --git a/arch/mips/mti-malta/malta-mtd.c b/arch/mips/mti-malta/malta-mtd.c deleted file mode 100644 index 8ad9bdf25dce..000000000000 --- a/arch/mips/mti-malta/malta-mtd.c +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2006 MIPS Technologies, Inc. | ||
7 | * written by Ralf Baechle <ralf@linux-mips.org> | ||
8 | */ | ||
9 | |||
10 | #include <linux/init.h> | ||
11 | #include <linux/platform_device.h> | ||
12 | #include <linux/mtd/partitions.h> | ||
13 | #include <linux/mtd/physmap.h> | ||
14 | #include <mtd/mtd-abi.h> | ||
15 | |||
16 | static struct mtd_partition malta_mtd_partitions[] = { | ||
17 | { | ||
18 | .name = "YAMON", | ||
19 | .offset = 0x0, | ||
20 | .size = 0x100000, | ||
21 | .mask_flags = MTD_WRITEABLE | ||
22 | }, { | ||
23 | .name = "User FS", | ||
24 | .offset = 0x100000, | ||
25 | .size = 0x2e0000 | ||
26 | }, { | ||
27 | .name = "Board Config", | ||
28 | .offset = 0x3e0000, | ||
29 | .size = 0x020000, | ||
30 | .mask_flags = MTD_WRITEABLE | ||
31 | } | ||
32 | }; | ||
33 | |||
34 | static struct physmap_flash_data malta_flash_data = { | ||
35 | .width = 4, | ||
36 | .nr_parts = ARRAY_SIZE(malta_mtd_partitions), | ||
37 | .parts = malta_mtd_partitions | ||
38 | }; | ||
39 | |||
40 | static struct resource malta_flash_resource = { | ||
41 | .start = 0x1e000000, | ||
42 | .end = 0x1e3fffff, | ||
43 | .flags = IORESOURCE_MEM | ||
44 | }; | ||
45 | |||
46 | static struct platform_device malta_flash = { | ||
47 | .name = "physmap-flash", | ||
48 | .id = 0, | ||
49 | .dev = { | ||
50 | .platform_data = &malta_flash_data, | ||
51 | }, | ||
52 | .num_resources = 1, | ||
53 | .resource = &malta_flash_resource, | ||
54 | }; | ||
55 | |||
56 | static int __init malta_mtd_init(void) | ||
57 | { | ||
58 | platform_device_register(&malta_flash); | ||
59 | |||
60 | return 0; | ||
61 | } | ||
62 | |||
63 | module_init(malta_mtd_init) | ||
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c index 83b9bab3cd3f..72e32a7715be 100644 --- a/arch/mips/mti-malta/malta-platform.c +++ b/arch/mips/mti-malta/malta-platform.c | |||
@@ -3,10 +3,14 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 2007 MIPS Technologies, Inc. | 6 | * Copyright (C) 2006, 07 MIPS Technologies, Inc. |
7 | * written by Ralf Baechle (ralf@linux-mips.org) | 7 | * written by Ralf Baechle (ralf@linux-mips.org) |
8 | * written by Ralf Baechle <ralf@linux-mips.org> | ||
8 | * | 9 | * |
9 | * Probe driver for the Malta's UART ports: | 10 | * Copyright (C) 2008 Wind River Systems, Inc. |
11 | * updated by Tiejun Chen <tiejun.chen@windriver.com> | ||
12 | * | ||
13 | * 1. Probe driver for the Malta's UART ports: | ||
10 | * | 14 | * |
11 | * o 2 ports in the SMC SuperIO | 15 | * o 2 ports in the SMC SuperIO |
12 | * o 1 port in the CBUS UART, a discrete 16550 which normally is only used | 16 | * o 1 port in the CBUS UART, a discrete 16550 which normally is only used |
@@ -14,10 +18,17 @@ | |||
14 | * | 18 | * |
15 | * We don't use 8250_platform.c on Malta as it would result in the CBUS | 19 | * We don't use 8250_platform.c on Malta as it would result in the CBUS |
16 | * UART becoming ttyS0. | 20 | * UART becoming ttyS0. |
21 | * | ||
22 | * 2. Register RTC-CMOS platform device on Malta. | ||
17 | */ | 23 | */ |
18 | #include <linux/module.h> | ||
19 | #include <linux/init.h> | 24 | #include <linux/init.h> |
20 | #include <linux/serial_8250.h> | 25 | #include <linux/serial_8250.h> |
26 | #include <linux/mc146818rtc.h> | ||
27 | #include <linux/module.h> | ||
28 | #include <linux/mtd/partitions.h> | ||
29 | #include <linux/mtd/physmap.h> | ||
30 | #include <linux/platform_device.h> | ||
31 | #include <mtd/mtd-abi.h> | ||
21 | 32 | ||
22 | #define SMC_PORT(base, int) \ | 33 | #define SMC_PORT(base, int) \ |
23 | { \ | 34 | { \ |
@@ -45,21 +56,93 @@ static struct plat_serial8250_port uart8250_data[] = { | |||
45 | { }, | 56 | { }, |
46 | }; | 57 | }; |
47 | 58 | ||
48 | static struct platform_device uart8250_device = { | 59 | static struct platform_device malta_uart8250_device = { |
49 | .name = "serial8250", | 60 | .name = "serial8250", |
50 | .id = PLAT8250_DEV_PLATFORM2, | 61 | .id = PLAT8250_DEV_PLATFORM, |
51 | .dev = { | 62 | .dev = { |
52 | .platform_data = uart8250_data, | 63 | .platform_data = uart8250_data, |
53 | }, | 64 | }, |
54 | }; | 65 | }; |
55 | 66 | ||
56 | static int __init uart8250_init(void) | 67 | struct resource malta_rtc_resources[] = { |
68 | { | ||
69 | .start = RTC_PORT(0), | ||
70 | .end = RTC_PORT(7), | ||
71 | .flags = IORESOURCE_IO, | ||
72 | }, { | ||
73 | .start = RTC_IRQ, | ||
74 | .end = RTC_IRQ, | ||
75 | .flags = IORESOURCE_IRQ, | ||
76 | } | ||
77 | }; | ||
78 | |||
79 | static struct platform_device malta_rtc_device = { | ||
80 | .name = "rtc_cmos", | ||
81 | .id = -1, | ||
82 | .resource = malta_rtc_resources, | ||
83 | .num_resources = ARRAY_SIZE(malta_rtc_resources), | ||
84 | }; | ||
85 | |||
86 | static struct mtd_partition malta_mtd_partitions[] = { | ||
87 | { | ||
88 | .name = "YAMON", | ||
89 | .offset = 0x0, | ||
90 | .size = 0x100000, | ||
91 | .mask_flags = MTD_WRITEABLE | ||
92 | }, { | ||
93 | .name = "User FS", | ||
94 | .offset = 0x100000, | ||
95 | .size = 0x2e0000 | ||
96 | }, { | ||
97 | .name = "Board Config", | ||
98 | .offset = 0x3e0000, | ||
99 | .size = 0x020000, | ||
100 | .mask_flags = MTD_WRITEABLE | ||
101 | } | ||
102 | }; | ||
103 | |||
104 | static struct physmap_flash_data malta_flash_data = { | ||
105 | .width = 4, | ||
106 | .nr_parts = ARRAY_SIZE(malta_mtd_partitions), | ||
107 | .parts = malta_mtd_partitions | ||
108 | }; | ||
109 | |||
110 | static struct resource malta_flash_resource = { | ||
111 | .start = 0x1e000000, | ||
112 | .end = 0x1e3fffff, | ||
113 | .flags = IORESOURCE_MEM | ||
114 | }; | ||
115 | |||
116 | static struct platform_device malta_flash_device = { | ||
117 | .name = "physmap-flash", | ||
118 | .id = 0, | ||
119 | .dev = { | ||
120 | .platform_data = &malta_flash_data, | ||
121 | }, | ||
122 | .num_resources = 1, | ||
123 | .resource = &malta_flash_resource, | ||
124 | }; | ||
125 | |||
126 | static struct platform_device *malta_devices[] __initdata = { | ||
127 | &malta_uart8250_device, | ||
128 | &malta_rtc_device, | ||
129 | &malta_flash_device, | ||
130 | }; | ||
131 | |||
132 | static int __init malta_add_devices(void) | ||
57 | { | 133 | { |
58 | return platform_device_register(&uart8250_device); | 134 | int err; |
59 | } | ||
60 | 135 | ||
61 | module_init(uart8250_init); | 136 | err = platform_add_devices(malta_devices, ARRAY_SIZE(malta_devices)); |
137 | if (err) | ||
138 | return err; | ||
139 | |||
140 | /* | ||
141 | * Set RTC to BCD mode to support current alarm code. | ||
142 | */ | ||
143 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) & ~RTC_DM_BINARY, RTC_CONTROL); | ||
144 | |||
145 | return 0; | ||
146 | } | ||
62 | 147 | ||
63 | MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>"); | 148 | device_initcall(malta_add_devices); |
64 | MODULE_LICENSE("GPL"); | ||
65 | MODULE_DESCRIPTION("8250 UART probe driver for the Malta CBUS UART"); | ||
diff --git a/arch/mips/mti-malta/malta-smtc.c b/arch/mips/mti-malta/malta-smtc.c index f84a46a8ae6e..aabd7274507b 100644 --- a/arch/mips/mti-malta/malta-smtc.c +++ b/arch/mips/mti-malta/malta-smtc.c | |||
@@ -114,9 +114,9 @@ struct plat_smp_ops msmtc_smp_ops = { | |||
114 | */ | 114 | */ |
115 | 115 | ||
116 | 116 | ||
117 | void plat_set_irq_affinity(unsigned int irq, cpumask_t affinity) | 117 | void plat_set_irq_affinity(unsigned int irq, const struct cpumask *affinity) |
118 | { | 118 | { |
119 | cpumask_t tmask = affinity; | 119 | cpumask_t tmask = *affinity; |
120 | int cpu = 0; | 120 | int cpu = 0; |
121 | void smtc_set_irq_affinity(unsigned int irq, cpumask_t aff); | 121 | void smtc_set_irq_affinity(unsigned int irq, cpumask_t aff); |
122 | 122 | ||
@@ -139,7 +139,7 @@ void plat_set_irq_affinity(unsigned int irq, cpumask_t affinity) | |||
139 | * be made to forward to an offline "CPU". | 139 | * be made to forward to an offline "CPU". |
140 | */ | 140 | */ |
141 | 141 | ||
142 | for_each_cpu_mask(cpu, affinity) { | 142 | for_each_cpu(cpu, affinity) { |
143 | if ((cpu_data[cpu].vpe_id != 0) || !cpu_online(cpu)) | 143 | if ((cpu_data[cpu].vpe_id != 0) || !cpu_online(cpu)) |
144 | cpu_clear(cpu, tmask); | 144 | cpu_clear(cpu, tmask); |
145 | } | 145 | } |
diff --git a/arch/mips/nxp/pnx8550/common/time.c b/arch/mips/nxp/pnx8550/common/time.c index 62f495b57f93..cf293b279098 100644 --- a/arch/mips/nxp/pnx8550/common/time.c +++ b/arch/mips/nxp/pnx8550/common/time.c | |||
@@ -102,6 +102,7 @@ __init void plat_time_init(void) | |||
102 | unsigned int p; | 102 | unsigned int p; |
103 | unsigned int pow2p; | 103 | unsigned int pow2p; |
104 | 104 | ||
105 | pnx8xxx_clockevent.cpumask = cpu_none_mask; | ||
105 | clockevents_register_device(&pnx8xxx_clockevent); | 106 | clockevents_register_device(&pnx8xxx_clockevent); |
106 | clocksource_register(&pnx_clocksource); | 107 | clocksource_register(&pnx_clocksource); |
107 | 108 | ||
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index a377e9d2d029..62cae740e250 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
@@ -354,6 +354,30 @@ EXPORT_SYMBOL(PCIBIOS_MIN_IO); | |||
354 | EXPORT_SYMBOL(PCIBIOS_MIN_MEM); | 354 | EXPORT_SYMBOL(PCIBIOS_MIN_MEM); |
355 | #endif | 355 | #endif |
356 | 356 | ||
357 | int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | ||
358 | enum pci_mmap_state mmap_state, int write_combine) | ||
359 | { | ||
360 | unsigned long prot; | ||
361 | |||
362 | /* | ||
363 | * I/O space can be accessed via normal processor loads and stores on | ||
364 | * this platform but for now we elect not to do this and portable | ||
365 | * drivers should not do this anyway. | ||
366 | */ | ||
367 | if (mmap_state == pci_mmap_io) | ||
368 | return -EINVAL; | ||
369 | |||
370 | /* | ||
371 | * Ignore write-combine; for now only return uncached mappings. | ||
372 | */ | ||
373 | prot = pgprot_val(vma->vm_page_prot); | ||
374 | prot = (prot & ~_CACHE_MASK) | _CACHE_UNCACHED; | ||
375 | vma->vm_page_prot = __pgprot(prot); | ||
376 | |||
377 | return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, | ||
378 | vma->vm_end - vma->vm_start, vma->vm_page_prot); | ||
379 | } | ||
380 | |||
357 | char * (*pcibios_plat_setup)(char *str) __devinitdata; | 381 | char * (*pcibios_plat_setup)(char *str) __devinitdata; |
358 | 382 | ||
359 | char *__devinit pcibios_setup(char *str) | 383 | char *__devinit pcibios_setup(char *str) |
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c index 3a7df647ca77..f78c29b68d77 100644 --- a/arch/mips/pmc-sierra/yosemite/smp.c +++ b/arch/mips/pmc-sierra/yosemite/smp.c | |||
@@ -141,7 +141,7 @@ static void __cpuinit yos_boot_secondary(int cpu, struct task_struct *idle) | |||
141 | } | 141 | } |
142 | 142 | ||
143 | /* | 143 | /* |
144 | * Detect available CPUs, populate phys_cpu_present_map before smp_init | 144 | * Detect available CPUs, populate cpu_possible_map before smp_init |
145 | * | 145 | * |
146 | * We don't want to start the secondary CPU yet nor do we have a nice probing | 146 | * We don't want to start the secondary CPU yet nor do we have a nice probing |
147 | * feature in PMON so we just assume presence of the secondary core. | 147 | * feature in PMON so we just assume presence of the secondary core. |
@@ -150,10 +150,10 @@ static void __init yos_smp_setup(void) | |||
150 | { | 150 | { |
151 | int i; | 151 | int i; |
152 | 152 | ||
153 | cpus_clear(phys_cpu_present_map); | 153 | cpus_clear(cpu_possible_map); |
154 | 154 | ||
155 | for (i = 0; i < 2; i++) { | 155 | for (i = 0; i < 2; i++) { |
156 | cpu_set(i, phys_cpu_present_map); | 156 | cpu_set(i, cpu_possible_map); |
157 | __cpu_number_map[i] = i; | 157 | __cpu_number_map[i] = i; |
158 | __cpu_logical_map[i] = i; | 158 | __cpu_logical_map[i] = i; |
159 | } | 159 | } |
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index 2f22d714d5b0..c1c29181bd46 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c | |||
@@ -118,7 +118,7 @@ static struct platform_device cf_slot0 = { | |||
118 | /* Resources and device for NAND */ | 118 | /* Resources and device for NAND */ |
119 | static int rb532_dev_ready(struct mtd_info *mtd) | 119 | static int rb532_dev_ready(struct mtd_info *mtd) |
120 | { | 120 | { |
121 | return readl(IDT434_REG_BASE + GPIOD) & GPIO_RDY; | 121 | return gpio_get_value(GPIO_RDY); |
122 | } | 122 | } |
123 | 123 | ||
124 | static void rb532_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) | 124 | static void rb532_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) |
diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c index 70c4a6726377..0e84c8ab6a39 100644 --- a/arch/mips/rb532/gpio.c +++ b/arch/mips/rb532/gpio.c | |||
@@ -39,10 +39,6 @@ | |||
39 | struct rb532_gpio_chip { | 39 | struct rb532_gpio_chip { |
40 | struct gpio_chip chip; | 40 | struct gpio_chip chip; |
41 | void __iomem *regbase; | 41 | void __iomem *regbase; |
42 | void (*set_int_level)(struct gpio_chip *chip, unsigned offset, int value); | ||
43 | int (*get_int_level)(struct gpio_chip *chip, unsigned offset); | ||
44 | void (*set_int_status)(struct gpio_chip *chip, unsigned offset, int value); | ||
45 | int (*get_int_status)(struct gpio_chip *chip, unsigned offset); | ||
46 | }; | 42 | }; |
47 | 43 | ||
48 | struct mpmc_device dev3; | 44 | struct mpmc_device dev3; |
@@ -111,15 +107,47 @@ unsigned char get_latch_u5(void) | |||
111 | } | 107 | } |
112 | EXPORT_SYMBOL(get_latch_u5); | 108 | EXPORT_SYMBOL(get_latch_u5); |
113 | 109 | ||
110 | /* rb532_set_bit - sanely set a bit | ||
111 | * | ||
112 | * bitval: new value for the bit | ||
113 | * offset: bit index in the 4 byte address range | ||
114 | * ioaddr: 4 byte aligned address being altered | ||
115 | */ | ||
116 | static inline void rb532_set_bit(unsigned bitval, | ||
117 | unsigned offset, void __iomem *ioaddr) | ||
118 | { | ||
119 | unsigned long flags; | ||
120 | u32 val; | ||
121 | |||
122 | bitval = !!bitval; /* map parameter to {0,1} */ | ||
123 | |||
124 | local_irq_save(flags); | ||
125 | |||
126 | val = readl(ioaddr); | ||
127 | val &= ~( ~bitval << offset ); /* unset bit if bitval == 0 */ | ||
128 | val |= ( bitval << offset ); /* set bit if bitval == 1 */ | ||
129 | writel(val, ioaddr); | ||
130 | |||
131 | local_irq_restore(flags); | ||
132 | } | ||
133 | |||
134 | /* rb532_get_bit - read a bit | ||
135 | * | ||
136 | * returns the boolean state of the bit, which may be > 1 | ||
137 | */ | ||
138 | static inline int rb532_get_bit(unsigned offset, void __iomem *ioaddr) | ||
139 | { | ||
140 | return (readl(ioaddr) & (1 << offset)); | ||
141 | } | ||
142 | |||
114 | /* | 143 | /* |
115 | * Return GPIO level */ | 144 | * Return GPIO level */ |
116 | static int rb532_gpio_get(struct gpio_chip *chip, unsigned offset) | 145 | static int rb532_gpio_get(struct gpio_chip *chip, unsigned offset) |
117 | { | 146 | { |
118 | u32 mask = 1 << offset; | ||
119 | struct rb532_gpio_chip *gpch; | 147 | struct rb532_gpio_chip *gpch; |
120 | 148 | ||
121 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | 149 | gpch = container_of(chip, struct rb532_gpio_chip, chip); |
122 | return readl(gpch->regbase + GPIOD) & mask; | 150 | return rb532_get_bit(offset, gpch->regbase + GPIOD); |
123 | } | 151 | } |
124 | 152 | ||
125 | /* | 153 | /* |
@@ -128,23 +156,10 @@ static int rb532_gpio_get(struct gpio_chip *chip, unsigned offset) | |||
128 | static void rb532_gpio_set(struct gpio_chip *chip, | 156 | static void rb532_gpio_set(struct gpio_chip *chip, |
129 | unsigned offset, int value) | 157 | unsigned offset, int value) |
130 | { | 158 | { |
131 | unsigned long flags; | ||
132 | u32 mask = 1 << offset; | ||
133 | u32 tmp; | ||
134 | struct rb532_gpio_chip *gpch; | 159 | struct rb532_gpio_chip *gpch; |
135 | void __iomem *gpvr; | ||
136 | 160 | ||
137 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | 161 | gpch = container_of(chip, struct rb532_gpio_chip, chip); |
138 | gpvr = gpch->regbase + GPIOD; | 162 | rb532_set_bit(value, offset, gpch->regbase + GPIOD); |
139 | |||
140 | local_irq_save(flags); | ||
141 | tmp = readl(gpvr); | ||
142 | if (value) | ||
143 | tmp |= mask; | ||
144 | else | ||
145 | tmp &= ~mask; | ||
146 | writel(tmp, gpvr); | ||
147 | local_irq_restore(flags); | ||
148 | } | 163 | } |
149 | 164 | ||
150 | /* | 165 | /* |
@@ -152,21 +167,14 @@ static void rb532_gpio_set(struct gpio_chip *chip, | |||
152 | */ | 167 | */ |
153 | static int rb532_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | 168 | static int rb532_gpio_direction_input(struct gpio_chip *chip, unsigned offset) |
154 | { | 169 | { |
155 | unsigned long flags; | ||
156 | u32 mask = 1 << offset; | ||
157 | u32 value; | ||
158 | struct rb532_gpio_chip *gpch; | 170 | struct rb532_gpio_chip *gpch; |
159 | void __iomem *gpdr; | ||
160 | 171 | ||
161 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | 172 | gpch = container_of(chip, struct rb532_gpio_chip, chip); |
162 | gpdr = gpch->regbase + GPIOCFG; | ||
163 | 173 | ||
164 | local_irq_save(flags); | 174 | if (rb532_get_bit(offset, gpch->regbase + GPIOFUNC)) |
165 | value = readl(gpdr); | 175 | return 1; /* alternate function, GPIOCFG is ignored */ |
166 | value &= ~mask; | ||
167 | writel(value, gpdr); | ||
168 | local_irq_restore(flags); | ||
169 | 176 | ||
177 | rb532_set_bit(0, offset, gpch->regbase + GPIOCFG); | ||
170 | return 0; | 178 | return 0; |
171 | } | 179 | } |
172 | 180 | ||
@@ -176,117 +184,60 @@ static int rb532_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | |||
176 | static int rb532_gpio_direction_output(struct gpio_chip *chip, | 184 | static int rb532_gpio_direction_output(struct gpio_chip *chip, |
177 | unsigned offset, int value) | 185 | unsigned offset, int value) |
178 | { | 186 | { |
179 | unsigned long flags; | ||
180 | u32 mask = 1 << offset; | ||
181 | u32 tmp; | ||
182 | struct rb532_gpio_chip *gpch; | 187 | struct rb532_gpio_chip *gpch; |
183 | void __iomem *gpdr; | ||
184 | 188 | ||
185 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | 189 | gpch = container_of(chip, struct rb532_gpio_chip, chip); |
186 | writel(mask, gpch->regbase + GPIOD); | ||
187 | gpdr = gpch->regbase + GPIOCFG; | ||
188 | 190 | ||
189 | local_irq_save(flags); | 191 | if (rb532_get_bit(offset, gpch->regbase + GPIOFUNC)) |
190 | tmp = readl(gpdr); | 192 | return 1; /* alternate function, GPIOCFG is ignored */ |
191 | tmp |= mask; | ||
192 | writel(tmp, gpdr); | ||
193 | local_irq_restore(flags); | ||
194 | 193 | ||
194 | /* set the initial output value */ | ||
195 | rb532_set_bit(value, offset, gpch->regbase + GPIOD); | ||
196 | |||
197 | rb532_set_bit(1, offset, gpch->regbase + GPIOCFG); | ||
195 | return 0; | 198 | return 0; |
196 | } | 199 | } |
197 | 200 | ||
198 | /* | 201 | static struct rb532_gpio_chip rb532_gpio_chip[] = { |
199 | * Set the GPIO interrupt level | 202 | [0] = { |
200 | */ | 203 | .chip = { |
201 | static void rb532_gpio_set_int_level(struct gpio_chip *chip, | 204 | .label = "gpio0", |
202 | unsigned offset, int value) | 205 | .direction_input = rb532_gpio_direction_input, |
203 | { | 206 | .direction_output = rb532_gpio_direction_output, |
204 | unsigned long flags; | 207 | .get = rb532_gpio_get, |
205 | u32 mask = 1 << offset; | 208 | .set = rb532_gpio_set, |
206 | u32 tmp; | 209 | .base = 0, |
207 | struct rb532_gpio_chip *gpch; | 210 | .ngpio = 32, |
208 | void __iomem *gpil; | 211 | }, |
209 | 212 | }, | |
210 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | 213 | }; |
211 | gpil = gpch->regbase + GPIOILEVEL; | ||
212 | |||
213 | local_irq_save(flags); | ||
214 | tmp = readl(gpil); | ||
215 | if (value) | ||
216 | tmp |= mask; | ||
217 | else | ||
218 | tmp &= ~mask; | ||
219 | writel(tmp, gpil); | ||
220 | local_irq_restore(flags); | ||
221 | } | ||
222 | 214 | ||
223 | /* | 215 | /* |
224 | * Get the GPIO interrupt level | 216 | * Set GPIO interrupt level |
225 | */ | 217 | */ |
226 | static int rb532_gpio_get_int_level(struct gpio_chip *chip, unsigned offset) | 218 | void rb532_gpio_set_ilevel(int bit, unsigned gpio) |
227 | { | 219 | { |
228 | u32 mask = 1 << offset; | 220 | rb532_set_bit(bit, gpio, rb532_gpio_chip->regbase + GPIOILEVEL); |
229 | struct rb532_gpio_chip *gpch; | ||
230 | |||
231 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | ||
232 | return readl(gpch->regbase + GPIOILEVEL) & mask; | ||
233 | } | 221 | } |
222 | EXPORT_SYMBOL(rb532_gpio_set_ilevel); | ||
234 | 223 | ||
235 | /* | 224 | /* |
236 | * Set the GPIO interrupt status | 225 | * Set GPIO interrupt status |
237 | */ | 226 | */ |
238 | static void rb532_gpio_set_int_status(struct gpio_chip *chip, | 227 | void rb532_gpio_set_istat(int bit, unsigned gpio) |
239 | unsigned offset, int value) | ||
240 | { | 228 | { |
241 | unsigned long flags; | 229 | rb532_set_bit(bit, gpio, rb532_gpio_chip->regbase + GPIOISTAT); |
242 | u32 mask = 1 << offset; | ||
243 | u32 tmp; | ||
244 | struct rb532_gpio_chip *gpch; | ||
245 | void __iomem *gpis; | ||
246 | |||
247 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | ||
248 | gpis = gpch->regbase + GPIOISTAT; | ||
249 | |||
250 | local_irq_save(flags); | ||
251 | tmp = readl(gpis); | ||
252 | if (value) | ||
253 | tmp |= mask; | ||
254 | else | ||
255 | tmp &= ~mask; | ||
256 | writel(tmp, gpis); | ||
257 | local_irq_restore(flags); | ||
258 | } | 230 | } |
231 | EXPORT_SYMBOL(rb532_gpio_set_istat); | ||
259 | 232 | ||
260 | /* | 233 | /* |
261 | * Get the GPIO interrupt status | 234 | * Configure GPIO alternate function |
262 | */ | 235 | */ |
263 | static int rb532_gpio_get_int_status(struct gpio_chip *chip, unsigned offset) | 236 | static void rb532_gpio_set_func(int bit, unsigned gpio) |
264 | { | 237 | { |
265 | u32 mask = 1 << offset; | 238 | rb532_set_bit(bit, gpio, rb532_gpio_chip->regbase + GPIOFUNC); |
266 | struct rb532_gpio_chip *gpch; | ||
267 | |||
268 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | ||
269 | return readl(gpch->regbase + GPIOISTAT) & mask; | ||
270 | } | 239 | } |
271 | 240 | ||
272 | static struct rb532_gpio_chip rb532_gpio_chip[] = { | ||
273 | [0] = { | ||
274 | .chip = { | ||
275 | .label = "gpio0", | ||
276 | .direction_input = rb532_gpio_direction_input, | ||
277 | .direction_output = rb532_gpio_direction_output, | ||
278 | .get = rb532_gpio_get, | ||
279 | .set = rb532_gpio_set, | ||
280 | .base = 0, | ||
281 | .ngpio = 32, | ||
282 | }, | ||
283 | .get_int_level = rb532_gpio_get_int_level, | ||
284 | .set_int_level = rb532_gpio_set_int_level, | ||
285 | .get_int_status = rb532_gpio_get_int_status, | ||
286 | .set_int_status = rb532_gpio_set_int_status, | ||
287 | }, | ||
288 | }; | ||
289 | |||
290 | int __init rb532_gpio_init(void) | 241 | int __init rb532_gpio_init(void) |
291 | { | 242 | { |
292 | struct resource *r; | 243 | struct resource *r; |
@@ -310,9 +261,11 @@ int __init rb532_gpio_init(void) | |||
310 | return -ENXIO; | 261 | return -ENXIO; |
311 | } | 262 | } |
312 | 263 | ||
313 | /* Set the interrupt status and level for the CF pin */ | 264 | /* configure CF_GPIO_NUM as CFRDY IRQ source */ |
314 | rb532_gpio_set_int_level(&rb532_gpio_chip->chip, CF_GPIO_NUM, 1); | 265 | rb532_gpio_set_func(0, CF_GPIO_NUM); |
315 | rb532_gpio_set_int_status(&rb532_gpio_chip->chip, CF_GPIO_NUM, 0); | 266 | rb532_gpio_direction_input(&rb532_gpio_chip->chip, CF_GPIO_NUM); |
267 | rb532_gpio_set_ilevel(1, CF_GPIO_NUM); | ||
268 | rb532_gpio_set_istat(0, CF_GPIO_NUM); | ||
316 | 269 | ||
317 | return 0; | 270 | return 0; |
318 | } | 271 | } |
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c index ba5cdebeaf0d..5b47d6b65275 100644 --- a/arch/mips/sgi-ip27/ip27-smp.c +++ b/arch/mips/sgi-ip27/ip27-smp.c | |||
@@ -76,7 +76,7 @@ static int do_cpumask(cnodeid_t cnode, nasid_t nasid, int highest) | |||
76 | /* Only let it join in if it's marked enabled */ | 76 | /* Only let it join in if it's marked enabled */ |
77 | if ((acpu->cpu_info.flags & KLINFO_ENABLE) && | 77 | if ((acpu->cpu_info.flags & KLINFO_ENABLE) && |
78 | (tot_cpus_found != NR_CPUS)) { | 78 | (tot_cpus_found != NR_CPUS)) { |
79 | cpu_set(cpuid, phys_cpu_present_map); | 79 | cpu_set(cpuid, cpu_possible_map); |
80 | alloc_cpupda(cpuid, tot_cpus_found); | 80 | alloc_cpupda(cpuid, tot_cpus_found); |
81 | cpus_found++; | 81 | cpus_found++; |
82 | tot_cpus_found++; | 82 | tot_cpus_found++; |
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index 1327c2746fb7..f024057a35f8 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c | |||
@@ -134,7 +134,7 @@ void __cpuinit hub_rt_clock_event_init(void) | |||
134 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); | 134 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); |
135 | cd->rating = 200; | 135 | cd->rating = 200; |
136 | cd->irq = irq; | 136 | cd->irq = irq; |
137 | cd->cpumask = cpumask_of_cpu(cpu); | 137 | cd->cpumask = cpumask_of(cpu); |
138 | cd->set_next_event = rt_next_event; | 138 | cd->set_next_event = rt_next_event; |
139 | cd->set_mode = rt_set_mode; | 139 | cd->set_mode = rt_set_mode; |
140 | clockevents_register_device(cd); | 140 | clockevents_register_device(cd); |
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index a35818ed4263..12b465d404df 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
@@ -50,7 +50,7 @@ static void enable_bcm1480_irq(unsigned int irq); | |||
50 | static void disable_bcm1480_irq(unsigned int irq); | 50 | static void disable_bcm1480_irq(unsigned int irq); |
51 | static void ack_bcm1480_irq(unsigned int irq); | 51 | static void ack_bcm1480_irq(unsigned int irq); |
52 | #ifdef CONFIG_SMP | 52 | #ifdef CONFIG_SMP |
53 | static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask); | 53 | static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask); |
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | #ifdef CONFIG_PCI | 56 | #ifdef CONFIG_PCI |
@@ -109,7 +109,7 @@ void bcm1480_unmask_irq(int cpu, int irq) | |||
109 | } | 109 | } |
110 | 110 | ||
111 | #ifdef CONFIG_SMP | 111 | #ifdef CONFIG_SMP |
112 | static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask) | 112 | static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask) |
113 | { | 113 | { |
114 | int i = 0, old_cpu, cpu, int_on, k; | 114 | int i = 0, old_cpu, cpu, int_on, k; |
115 | u64 cur_ints; | 115 | u64 cur_ints; |
@@ -117,11 +117,11 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask) | |||
117 | unsigned long flags; | 117 | unsigned long flags; |
118 | unsigned int irq_dirty; | 118 | unsigned int irq_dirty; |
119 | 119 | ||
120 | if (cpus_weight(mask) != 1) { | 120 | if (cpumask_weight(mask) != 1) { |
121 | printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq); | 121 | printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq); |
122 | return; | 122 | return; |
123 | } | 123 | } |
124 | i = first_cpu(mask); | 124 | i = cpumask_first(mask); |
125 | 125 | ||
126 | /* Convert logical CPU to physical CPU */ | 126 | /* Convert logical CPU to physical CPU */ |
127 | cpu = cpu_logical_map(i); | 127 | cpu = cpu_logical_map(i); |
diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c index bd9eeb43ed0e..dddfda8e8294 100644 --- a/arch/mips/sibyte/bcm1480/smp.c +++ b/arch/mips/sibyte/bcm1480/smp.c | |||
@@ -136,7 +136,7 @@ static void __cpuinit bcm1480_boot_secondary(int cpu, struct task_struct *idle) | |||
136 | 136 | ||
137 | /* | 137 | /* |
138 | * Use CFE to find out how many CPUs are available, setting up | 138 | * Use CFE to find out how many CPUs are available, setting up |
139 | * phys_cpu_present_map and the logical/physical mappings. | 139 | * cpu_possible_map and the logical/physical mappings. |
140 | * XXXKW will the boot CPU ever not be physical 0? | 140 | * XXXKW will the boot CPU ever not be physical 0? |
141 | * | 141 | * |
142 | * Common setup before any secondaries are started | 142 | * Common setup before any secondaries are started |
@@ -145,14 +145,14 @@ static void __init bcm1480_smp_setup(void) | |||
145 | { | 145 | { |
146 | int i, num; | 146 | int i, num; |
147 | 147 | ||
148 | cpus_clear(phys_cpu_present_map); | 148 | cpus_clear(cpu_possible_map); |
149 | cpu_set(0, phys_cpu_present_map); | 149 | cpu_set(0, cpu_possible_map); |
150 | __cpu_number_map[0] = 0; | 150 | __cpu_number_map[0] = 0; |
151 | __cpu_logical_map[0] = 0; | 151 | __cpu_logical_map[0] = 0; |
152 | 152 | ||
153 | for (i = 1, num = 0; i < NR_CPUS; i++) { | 153 | for (i = 1, num = 0; i < NR_CPUS; i++) { |
154 | if (cfe_cpu_stop(i) == 0) { | 154 | if (cfe_cpu_stop(i) == 0) { |
155 | cpu_set(i, phys_cpu_present_map); | 155 | cpu_set(i, cpu_possible_map); |
156 | __cpu_number_map[i] = ++num; | 156 | __cpu_number_map[i] = ++num; |
157 | __cpu_logical_map[num] = i; | 157 | __cpu_logical_map[num] = i; |
158 | } | 158 | } |
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index a5158483986e..808ac2959b8c 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
@@ -50,7 +50,7 @@ static void enable_sb1250_irq(unsigned int irq); | |||
50 | static void disable_sb1250_irq(unsigned int irq); | 50 | static void disable_sb1250_irq(unsigned int irq); |
51 | static void ack_sb1250_irq(unsigned int irq); | 51 | static void ack_sb1250_irq(unsigned int irq); |
52 | #ifdef CONFIG_SMP | 52 | #ifdef CONFIG_SMP |
53 | static void sb1250_set_affinity(unsigned int irq, cpumask_t mask); | 53 | static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask); |
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | #ifdef CONFIG_SIBYTE_HAS_LDT | 56 | #ifdef CONFIG_SIBYTE_HAS_LDT |
@@ -103,16 +103,16 @@ void sb1250_unmask_irq(int cpu, int irq) | |||
103 | } | 103 | } |
104 | 104 | ||
105 | #ifdef CONFIG_SMP | 105 | #ifdef CONFIG_SMP |
106 | static void sb1250_set_affinity(unsigned int irq, cpumask_t mask) | 106 | static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask) |
107 | { | 107 | { |
108 | int i = 0, old_cpu, cpu, int_on; | 108 | int i = 0, old_cpu, cpu, int_on; |
109 | u64 cur_ints; | 109 | u64 cur_ints; |
110 | struct irq_desc *desc = irq_desc + irq; | 110 | struct irq_desc *desc = irq_desc + irq; |
111 | unsigned long flags; | 111 | unsigned long flags; |
112 | 112 | ||
113 | i = first_cpu(mask); | 113 | i = cpumask_first(mask); |
114 | 114 | ||
115 | if (cpus_weight(mask) > 1) { | 115 | if (cpumask_weight(mask) > 1) { |
116 | printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq); | 116 | printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq); |
117 | return; | 117 | return; |
118 | } | 118 | } |
diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c index 0734b933e969..5950a288a7da 100644 --- a/arch/mips/sibyte/sb1250/smp.c +++ b/arch/mips/sibyte/sb1250/smp.c | |||
@@ -124,7 +124,7 @@ static void __cpuinit sb1250_boot_secondary(int cpu, struct task_struct *idle) | |||
124 | 124 | ||
125 | /* | 125 | /* |
126 | * Use CFE to find out how many CPUs are available, setting up | 126 | * Use CFE to find out how many CPUs are available, setting up |
127 | * phys_cpu_present_map and the logical/physical mappings. | 127 | * cpu_possible_map and the logical/physical mappings. |
128 | * XXXKW will the boot CPU ever not be physical 0? | 128 | * XXXKW will the boot CPU ever not be physical 0? |
129 | * | 129 | * |
130 | * Common setup before any secondaries are started | 130 | * Common setup before any secondaries are started |
@@ -133,14 +133,14 @@ static void __init sb1250_smp_setup(void) | |||
133 | { | 133 | { |
134 | int i, num; | 134 | int i, num; |
135 | 135 | ||
136 | cpus_clear(phys_cpu_present_map); | 136 | cpus_clear(cpu_possible_map); |
137 | cpu_set(0, phys_cpu_present_map); | 137 | cpu_set(0, cpu_possible_map); |
138 | __cpu_number_map[0] = 0; | 138 | __cpu_number_map[0] = 0; |
139 | __cpu_logical_map[0] = 0; | 139 | __cpu_logical_map[0] = 0; |
140 | 140 | ||
141 | for (i = 1, num = 0; i < NR_CPUS; i++) { | 141 | for (i = 1, num = 0; i < NR_CPUS; i++) { |
142 | if (cfe_cpu_stop(i) == 0) { | 142 | if (cfe_cpu_stop(i) == 0) { |
143 | cpu_set(i, phys_cpu_present_map); | 143 | cpu_set(i, cpu_possible_map); |
144 | __cpu_number_map[i] = ++num; | 144 | __cpu_number_map[i] = ++num; |
145 | __cpu_logical_map[num] = i; | 145 | __cpu_logical_map[num] = i; |
146 | } | 146 | } |
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c index 796e3ce28720..69f5f88711cc 100644 --- a/arch/mips/sni/time.c +++ b/arch/mips/sni/time.c | |||
@@ -80,7 +80,7 @@ static void __init sni_a20r_timer_setup(void) | |||
80 | struct irqaction *action = &a20r_irqaction; | 80 | struct irqaction *action = &a20r_irqaction; |
81 | unsigned int cpu = smp_processor_id(); | 81 | unsigned int cpu = smp_processor_id(); |
82 | 82 | ||
83 | cd->cpumask = cpumask_of_cpu(cpu); | 83 | cd->cpumask = cpumask_of(cpu); |
84 | clockevents_register_device(cd); | 84 | clockevents_register_device(cd); |
85 | action->dev_id = cd; | 85 | action->dev_id = cd; |
86 | setup_irq(SNI_A20R_IRQ_TIMER, &a20r_irqaction); | 86 | setup_irq(SNI_A20R_IRQ_TIMER, &a20r_irqaction); |
diff --git a/arch/mn10300/Kconfig.debug b/arch/mn10300/Kconfig.debug index 524e33819f32..ff80e86b9bd2 100644 --- a/arch/mn10300/Kconfig.debug +++ b/arch/mn10300/Kconfig.debug | |||
@@ -15,6 +15,15 @@ config DEBUG_DECOMPRESS_KERNEL | |||
15 | decompressing Linux seeing "Uncompressing Linux... " and | 15 | decompressing Linux seeing "Uncompressing Linux... " and |
16 | "Ok, booting the kernel.\n" on console. | 16 | "Ok, booting the kernel.\n" on console. |
17 | 17 | ||
18 | config TEST_MISALIGNMENT_HANDLER | ||
19 | bool "Run tests on the misalignment handler" | ||
20 | depends on DEBUG_KERNEL | ||
21 | default n | ||
22 | help | ||
23 | If you say Y here the kernel will execute a list of misaligned memory | ||
24 | accesses to make sure the misalignment handler deals them with | ||
25 | correctly. If it does not, the kernel will throw a BUG. | ||
26 | |||
18 | config KPROBES | 27 | config KPROBES |
19 | bool "Kprobes" | 28 | bool "Kprobes" |
20 | depends on DEBUG_KERNEL | 29 | depends on DEBUG_KERNEL |
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index b7cbb1487af4..62fba8aa9b6e 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S | |||
@@ -180,6 +180,7 @@ ENTRY(resume_userspace) | |||
180 | 180 | ||
181 | #ifdef CONFIG_PREEMPT | 181 | #ifdef CONFIG_PREEMPT |
182 | ENTRY(resume_kernel) | 182 | ENTRY(resume_kernel) |
183 | __cli | ||
183 | mov (TI_preempt_count,a2),d0 # non-zero preempt_count ? | 184 | mov (TI_preempt_count,a2),d0 # non-zero preempt_count ? |
184 | cmp 0,d0 | 185 | cmp 0,d0 |
185 | bne restore_all | 186 | bne restore_all |
@@ -190,7 +191,7 @@ need_resched: | |||
190 | mov (REG_EPSW,fp),d0 | 191 | mov (REG_EPSW,fp),d0 |
191 | and EPSW_IM,d0 | 192 | and EPSW_IM,d0 |
192 | cmp EPSW_IM_7,d0 # interrupts off (exception path) ? | 193 | cmp EPSW_IM_7,d0 # interrupts off (exception path) ? |
193 | beq restore_all | 194 | bne restore_all |
194 | call preempt_schedule_irq[],0 | 195 | call preempt_schedule_irq[],0 |
195 | jmp need_resched | 196 | jmp need_resched |
196 | #endif | 197 | #endif |
diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c index 9a6d4e8ebe73..11584c51acd9 100644 --- a/arch/mn10300/kernel/gdb-io-serial.c +++ b/arch/mn10300/kernel/gdb-io-serial.c | |||
@@ -99,6 +99,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock) | |||
99 | try_again: | 99 | try_again: |
100 | /* pull chars out of the buffer */ | 100 | /* pull chars out of the buffer */ |
101 | ix = gdbstub_rx_outp; | 101 | ix = gdbstub_rx_outp; |
102 | barrier(); | ||
102 | if (ix == gdbstub_rx_inp) { | 103 | if (ix == gdbstub_rx_inp) { |
103 | if (nonblock) | 104 | if (nonblock) |
104 | return -EAGAIN; | 105 | return -EAGAIN; |
@@ -110,6 +111,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock) | |||
110 | 111 | ||
111 | ch = gdbstub_rx_buffer[ix++]; | 112 | ch = gdbstub_rx_buffer[ix++]; |
112 | st = gdbstub_rx_buffer[ix++]; | 113 | st = gdbstub_rx_buffer[ix++]; |
114 | barrier(); | ||
113 | gdbstub_rx_outp = ix & 0x00000fff; | 115 | gdbstub_rx_outp = ix & 0x00000fff; |
114 | 116 | ||
115 | if (st & UART_LSR_BI) { | 117 | if (st & UART_LSR_BI) { |
diff --git a/arch/mn10300/kernel/gdb-stub.c b/arch/mn10300/kernel/gdb-stub.c index 54be6afb5555..0ea7482c1522 100644 --- a/arch/mn10300/kernel/gdb-stub.c +++ b/arch/mn10300/kernel/gdb-stub.c | |||
@@ -522,17 +522,7 @@ static int gdbstub_single_step(struct pt_regs *regs) | |||
522 | } else { | 522 | } else { |
523 | switch (cur) { | 523 | switch (cur) { |
524 | /* Bxx (d8,PC) */ | 524 | /* Bxx (d8,PC) */ |
525 | case 0xc0: | 525 | case 0xc0 ... 0xca: |
526 | case 0xc1: | ||
527 | case 0xc2: | ||
528 | case 0xc3: | ||
529 | case 0xc4: | ||
530 | case 0xc5: | ||
531 | case 0xc6: | ||
532 | case 0xc7: | ||
533 | case 0xc8: | ||
534 | case 0xc9: | ||
535 | case 0xca: | ||
536 | if (gdbstub_read_byte(pc + 1, (u8 *) &x) < 0) | 526 | if (gdbstub_read_byte(pc + 1, (u8 *) &x) < 0) |
537 | goto fault; | 527 | goto fault; |
538 | if (!__gdbstub_mark_bp(pc + 2, 0)) | 528 | if (!__gdbstub_mark_bp(pc + 2, 0)) |
@@ -543,17 +533,7 @@ static int gdbstub_single_step(struct pt_regs *regs) | |||
543 | break; | 533 | break; |
544 | 534 | ||
545 | /* LXX (d8,PC) */ | 535 | /* LXX (d8,PC) */ |
546 | case 0xd0: | 536 | case 0xd0 ... 0xda: |
547 | case 0xd1: | ||
548 | case 0xd2: | ||
549 | case 0xd3: | ||
550 | case 0xd4: | ||
551 | case 0xd5: | ||
552 | case 0xd6: | ||
553 | case 0xd7: | ||
554 | case 0xd8: | ||
555 | case 0xd9: | ||
556 | case 0xda: | ||
557 | if (!__gdbstub_mark_bp(pc + 1, 0)) | 537 | if (!__gdbstub_mark_bp(pc + 1, 0)) |
558 | goto fault; | 538 | goto fault; |
559 | if (regs->pc != regs->lar && | 539 | if (regs->pc != regs->lar && |
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index aa07d0cd1905..59b9c4bf9583 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c | |||
@@ -566,6 +566,11 @@ static void mn10300_serial_transmit_interrupt(struct mn10300_serial_port *port) | |||
566 | { | 566 | { |
567 | _enter("%s", port->name); | 567 | _enter("%s", port->name); |
568 | 568 | ||
569 | if (!port->uart.info || !port->uart.info->port.tty) { | ||
570 | mn10300_serial_dis_tx_intr(port); | ||
571 | return; | ||
572 | } | ||
573 | |||
569 | if (uart_tx_stopped(&port->uart) || | 574 | if (uart_tx_stopped(&port->uart) || |
570 | uart_circ_empty(&port->uart.info->xmit)) | 575 | uart_circ_empty(&port->uart.info->xmit)) |
571 | mn10300_serial_dis_tx_intr(port); | 576 | mn10300_serial_dis_tx_intr(port); |
diff --git a/arch/mn10300/kernel/module.c b/arch/mn10300/kernel/module.c index 8fa36893df7a..6b287f2e8e84 100644 --- a/arch/mn10300/kernel/module.c +++ b/arch/mn10300/kernel/module.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* MN10300 Kernel module helper routines | 1 | /* MN10300 Kernel module helper routines |
2 | * | 2 | * |
3 | * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2007, 2008 Red Hat, Inc. All Rights Reserved. |
4 | * Written by Mark Salter (msalter@redhat.com) | 4 | * Written by Mark Salter (msalter@redhat.com) |
5 | * - Derived from arch/i386/kernel/module.c | 5 | * - Derived from arch/i386/kernel/module.c |
6 | * | 6 | * |
@@ -64,21 +64,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, | |||
64 | return 0; | 64 | return 0; |
65 | } | 65 | } |
66 | 66 | ||
67 | static uint32_t reloc_get16(uint8_t *p) | ||
68 | { | ||
69 | return p[0] | (p[1] << 8); | ||
70 | } | ||
71 | |||
72 | static uint32_t reloc_get24(uint8_t *p) | ||
73 | { | ||
74 | return reloc_get16(p) | (p[2] << 16); | ||
75 | } | ||
76 | |||
77 | static uint32_t reloc_get32(uint8_t *p) | ||
78 | { | ||
79 | return reloc_get16(p) | (reloc_get16(p+2) << 16); | ||
80 | } | ||
81 | |||
82 | static void reloc_put16(uint8_t *p, uint32_t val) | 67 | static void reloc_put16(uint8_t *p, uint32_t val) |
83 | { | 68 | { |
84 | p[0] = val & 0xff; | 69 | p[0] = val & 0xff; |
@@ -144,25 +129,19 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
144 | relocation = sym->st_value + rel[i].r_addend; | 129 | relocation = sym->st_value + rel[i].r_addend; |
145 | 130 | ||
146 | switch (ELF32_R_TYPE(rel[i].r_info)) { | 131 | switch (ELF32_R_TYPE(rel[i].r_info)) { |
147 | /* for the first four relocation types, we add the | 132 | /* for the first four relocation types, we simply |
148 | * adjustment into the value at the location given */ | 133 | * store the adjustment at the location given */ |
149 | case R_MN10300_32: | 134 | case R_MN10300_32: |
150 | value = reloc_get32(location); | 135 | reloc_put32(location, relocation); |
151 | value += relocation; | ||
152 | reloc_put32(location, value); | ||
153 | break; | 136 | break; |
154 | case R_MN10300_24: | 137 | case R_MN10300_24: |
155 | value = reloc_get24(location); | 138 | reloc_put24(location, relocation); |
156 | value += relocation; | ||
157 | reloc_put24(location, value); | ||
158 | break; | 139 | break; |
159 | case R_MN10300_16: | 140 | case R_MN10300_16: |
160 | value = reloc_get16(location); | 141 | reloc_put16(location, relocation); |
161 | value += relocation; | ||
162 | reloc_put16(location, value); | ||
163 | break; | 142 | break; |
164 | case R_MN10300_8: | 143 | case R_MN10300_8: |
165 | *location += relocation; | 144 | *location = relocation; |
166 | break; | 145 | break; |
167 | 146 | ||
168 | /* for the next three relocation types, we write the | 147 | /* for the next three relocation types, we write the |
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 017121ce896f..e1d88ab51008 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
@@ -161,7 +161,7 @@ void __init setup_arch(char **cmdline_p) | |||
161 | reserve the page it is occupying. */ | 161 | reserve the page it is occupying. */ |
162 | if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS && | 162 | if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS && |
163 | CONFIG_INTERRUPT_VECTOR_BASE < memory_end) | 163 | CONFIG_INTERRUPT_VECTOR_BASE < memory_end) |
164 | reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, 1, | 164 | reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, PAGE_SIZE, |
165 | BOOTMEM_DEFAULT); | 165 | BOOTMEM_DEFAULT); |
166 | 166 | ||
167 | reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size, | 167 | reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size, |
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index a3e80f444f55..b8259668f7dc 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
@@ -11,6 +11,7 @@ | |||
11 | #define __VMLINUX_LDS__ | 11 | #define __VMLINUX_LDS__ |
12 | #include <asm-generic/vmlinux.lds.h> | 12 | #include <asm-generic/vmlinux.lds.h> |
13 | #include <asm/thread_info.h> | 13 | #include <asm/thread_info.h> |
14 | #include <asm/page.h> | ||
14 | 15 | ||
15 | OUTPUT_FORMAT("elf32-am33lin", "elf32-am33lin", "elf32-am33lin") | 16 | OUTPUT_FORMAT("elf32-am33lin", "elf32-am33lin", "elf32-am33lin") |
16 | OUTPUT_ARCH(mn10300) | 17 | OUTPUT_ARCH(mn10300) |
@@ -55,13 +56,13 @@ SECTIONS | |||
55 | CONSTRUCTORS | 56 | CONSTRUCTORS |
56 | } | 57 | } |
57 | 58 | ||
58 | . = ALIGN(4096); | 59 | . = ALIGN(PAGE_SIZE); |
59 | __nosave_begin = .; | 60 | __nosave_begin = .; |
60 | .data_nosave : { *(.data.nosave) } | 61 | .data_nosave : { *(.data.nosave) } |
61 | . = ALIGN(4096); | 62 | . = ALIGN(PAGE_SIZE); |
62 | __nosave_end = .; | 63 | __nosave_end = .; |
63 | 64 | ||
64 | . = ALIGN(4096); | 65 | . = ALIGN(PAGE_SIZE); |
65 | .data.page_aligned : { *(.data.idt) } | 66 | .data.page_aligned : { *(.data.idt) } |
66 | 67 | ||
67 | . = ALIGN(32); | 68 | . = ALIGN(32); |
@@ -78,7 +79,7 @@ SECTIONS | |||
78 | .data.init_task : { *(.data.init_task) } | 79 | .data.init_task : { *(.data.init_task) } |
79 | 80 | ||
80 | /* might get freed after init */ | 81 | /* might get freed after init */ |
81 | . = ALIGN(4096); | 82 | . = ALIGN(PAGE_SIZE); |
82 | .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { | 83 | .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { |
83 | __smp_locks = .; | 84 | __smp_locks = .; |
84 | *(.smp_locks) | 85 | *(.smp_locks) |
@@ -86,7 +87,7 @@ SECTIONS | |||
86 | } | 87 | } |
87 | 88 | ||
88 | /* will be freed after init */ | 89 | /* will be freed after init */ |
89 | . = ALIGN(4096); /* Init code and data */ | 90 | . = ALIGN(PAGE_SIZE); /* Init code and data */ |
90 | __init_begin = .; | 91 | __init_begin = .; |
91 | .init.text : { | 92 | .init.text : { |
92 | _sinittext = .; | 93 | _sinittext = .; |
@@ -120,17 +121,14 @@ SECTIONS | |||
120 | .exit.data : { *(.exit.data) } | 121 | .exit.data : { *(.exit.data) } |
121 | 122 | ||
122 | #ifdef CONFIG_BLK_DEV_INITRD | 123 | #ifdef CONFIG_BLK_DEV_INITRD |
123 | . = ALIGN(4096); | 124 | . = ALIGN(PAGE_SIZE); |
124 | __initramfs_start = .; | 125 | __initramfs_start = .; |
125 | .init.ramfs : { *(.init.ramfs) } | 126 | .init.ramfs : { *(.init.ramfs) } |
126 | __initramfs_end = .; | 127 | __initramfs_end = .; |
127 | #endif | 128 | #endif |
128 | 129 | ||
129 | . = ALIGN(32); | 130 | PERCPU(32) |
130 | __per_cpu_start = .; | 131 | . = ALIGN(PAGE_SIZE); |
131 | .data.percpu : { *(.data.percpu) } | ||
132 | __per_cpu_end = .; | ||
133 | . = ALIGN(4096); | ||
134 | __init_end = .; | 132 | __init_end = .; |
135 | /* freed after init ends here */ | 133 | /* freed after init ends here */ |
136 | 134 | ||
@@ -145,7 +143,7 @@ SECTIONS | |||
145 | _end = . ; | 143 | _end = . ; |
146 | 144 | ||
147 | /* This is where the kernel creates the early boot page tables */ | 145 | /* This is where the kernel creates the early boot page tables */ |
148 | . = ALIGN(4096); | 146 | . = ALIGN(PAGE_SIZE); |
149 | pg0 = .; | 147 | pg0 = .; |
150 | 148 | ||
151 | /* Sections to be discarded */ | 149 | /* Sections to be discarded */ |
diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c index 32aa89dc3848..94c4a4358065 100644 --- a/arch/mn10300/mm/misalignment.c +++ b/arch/mn10300/mm/misalignment.c | |||
@@ -37,26 +37,22 @@ | |||
37 | #include <asm/asm-offsets.h> | 37 | #include <asm/asm-offsets.h> |
38 | 38 | ||
39 | #if 0 | 39 | #if 0 |
40 | #define kdebug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__) | 40 | #define kdebug(FMT, ...) printk(KERN_DEBUG "MISALIGN: "FMT"\n", ##__VA_ARGS__) |
41 | #else | 41 | #else |
42 | #define kdebug(FMT, ...) do {} while (0) | 42 | #define kdebug(FMT, ...) do {} while (0) |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | static int misalignment_addr(unsigned long *registers, unsigned params, | 45 | static int misalignment_addr(unsigned long *registers, unsigned long sp, |
46 | unsigned opcode, unsigned disp, | 46 | unsigned params, unsigned opcode, |
47 | void **_address, unsigned long **_postinc); | 47 | unsigned long disp, |
48 | void **_address, unsigned long **_postinc, | ||
49 | unsigned long *_inc); | ||
48 | 50 | ||
49 | static int misalignment_reg(unsigned long *registers, unsigned params, | 51 | static int misalignment_reg(unsigned long *registers, unsigned params, |
50 | unsigned opcode, unsigned disp, | 52 | unsigned opcode, unsigned long disp, |
51 | unsigned long **_register); | 53 | unsigned long **_register); |
52 | 54 | ||
53 | static inline unsigned int_log2(unsigned x) | 55 | static void misalignment_MOV_Lcc(struct pt_regs *regs, uint32_t opcode); |
54 | { | ||
55 | unsigned y; | ||
56 | asm("bsch %1,%0" : "=r"(y) : "r"(x), "0"(0)); | ||
57 | return y; | ||
58 | } | ||
59 | #define log2(x) int_log2(x) | ||
60 | 56 | ||
61 | static const unsigned Dreg_index[] = { | 57 | static const unsigned Dreg_index[] = { |
62 | REG_D0 >> 2, REG_D1 >> 2, REG_D2 >> 2, REG_D3 >> 2 | 58 | REG_D0 >> 2, REG_D1 >> 2, REG_D2 >> 2, REG_D3 >> 2 |
@@ -86,9 +82,10 @@ enum format_id { | |||
86 | FMT_D7, | 82 | FMT_D7, |
87 | FMT_D8, | 83 | FMT_D8, |
88 | FMT_D9, | 84 | FMT_D9, |
85 | FMT_D10, | ||
89 | }; | 86 | }; |
90 | 87 | ||
91 | struct { | 88 | static const struct { |
92 | u_int8_t opsz, dispsz; | 89 | u_int8_t opsz, dispsz; |
93 | } format_tbl[16] = { | 90 | } format_tbl[16] = { |
94 | [FMT_S0] = { 8, 0 }, | 91 | [FMT_S0] = { 8, 0 }, |
@@ -103,6 +100,7 @@ struct { | |||
103 | [FMT_D7] = { 24, 8 }, | 100 | [FMT_D7] = { 24, 8 }, |
104 | [FMT_D8] = { 24, 24 }, | 101 | [FMT_D8] = { 24, 24 }, |
105 | [FMT_D9] = { 24, 32 }, | 102 | [FMT_D9] = { 24, 32 }, |
103 | [FMT_D10] = { 32, 0 }, | ||
106 | }; | 104 | }; |
107 | 105 | ||
108 | enum value_id { | 106 | enum value_id { |
@@ -128,9 +126,14 @@ enum value_id { | |||
128 | SD24, /* 24-bit signed displacement */ | 126 | SD24, /* 24-bit signed displacement */ |
129 | SIMM4_2, /* 4-bit signed displacement in opcode bits 4-7 */ | 127 | SIMM4_2, /* 4-bit signed displacement in opcode bits 4-7 */ |
130 | SIMM8, /* 8-bit signed immediate */ | 128 | SIMM8, /* 8-bit signed immediate */ |
129 | IMM8, /* 8-bit unsigned immediate */ | ||
130 | IMM16, /* 16-bit unsigned immediate */ | ||
131 | IMM24, /* 24-bit unsigned immediate */ | 131 | IMM24, /* 24-bit unsigned immediate */ |
132 | IMM32, /* 32-bit unsigned immediate */ | 132 | IMM32, /* 32-bit unsigned immediate */ |
133 | IMM32_HIGH8, /* 32-bit unsigned immediate, high 8-bits in opcode */ | 133 | IMM32_HIGH8, /* 32-bit unsigned immediate, LSB in opcode */ |
134 | |||
135 | IMM32_MEM, /* 32-bit unsigned displacement */ | ||
136 | IMM32_HIGH8_MEM, /* 32-bit unsigned displacement, LSB in opcode */ | ||
134 | 137 | ||
135 | DN0 = DM0, | 138 | DN0 = DM0, |
136 | DN1 = DM1, | 139 | DN1 = DM1, |
@@ -149,7 +152,7 @@ enum value_id { | |||
149 | }; | 152 | }; |
150 | 153 | ||
151 | struct mn10300_opcode { | 154 | struct mn10300_opcode { |
152 | const char *name; | 155 | const char name[8]; |
153 | u_int32_t opcode; | 156 | u_int32_t opcode; |
154 | u_int32_t opmask; | 157 | u_int32_t opmask; |
155 | unsigned exclusion; | 158 | unsigned exclusion; |
@@ -185,6 +188,10 @@ struct mn10300_opcode { | |||
185 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 188 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
186 | */ | 189 | */ |
187 | static const struct mn10300_opcode mn10300_opcodes[] = { | 190 | static const struct mn10300_opcode mn10300_opcodes[] = { |
191 | { "mov", 0x4200, 0xf300, 0, FMT_S1, 0, {DM1, MEM2(IMM8, SP)}}, | ||
192 | { "mov", 0x4300, 0xf300, 0, FMT_S1, 0, {AM1, MEM2(IMM8, SP)}}, | ||
193 | { "mov", 0x5800, 0xfc00, 0, FMT_S1, 0, {MEM2(IMM8, SP), DN0}}, | ||
194 | { "mov", 0x5c00, 0xfc00, 0, FMT_S1, 0, {MEM2(IMM8, SP), AN0}}, | ||
188 | { "mov", 0x60, 0xf0, 0, FMT_S0, 0, {DM1, MEM(AN0)}}, | 195 | { "mov", 0x60, 0xf0, 0, FMT_S0, 0, {DM1, MEM(AN0)}}, |
189 | { "mov", 0x70, 0xf0, 0, FMT_S0, 0, {MEM(AM0), DN1}}, | 196 | { "mov", 0x70, 0xf0, 0, FMT_S0, 0, {MEM(AM0), DN1}}, |
190 | { "mov", 0xf000, 0xfff0, 0, FMT_D0, 0, {MEM(AM0), AN1}}, | 197 | { "mov", 0xf000, 0xfff0, 0, FMT_D0, 0, {MEM(AM0), AN1}}, |
@@ -197,8 +204,6 @@ static const struct mn10300_opcode mn10300_opcodes[] = { | |||
197 | { "mov", 0xf81000, 0xfff000, 0, FMT_D1, 0, {DM1, MEM2(SD8, AN0)}}, | 204 | { "mov", 0xf81000, 0xfff000, 0, FMT_D1, 0, {DM1, MEM2(SD8, AN0)}}, |
198 | { "mov", 0xf82000, 0xfff000, 0, FMT_D1, 0, {MEM2(SD8,AM0), AN1}}, | 205 | { "mov", 0xf82000, 0xfff000, 0, FMT_D1, 0, {MEM2(SD8,AM0), AN1}}, |
199 | { "mov", 0xf83000, 0xfff000, 0, FMT_D1, 0, {AM1, MEM2(SD8, AN0)}}, | 206 | { "mov", 0xf83000, 0xfff000, 0, FMT_D1, 0, {AM1, MEM2(SD8, AN0)}}, |
200 | { "mov", 0xf8f000, 0xfffc00, 0, FMT_D1, AM33, {MEM2(SD8, AM0), SP}}, | ||
201 | { "mov", 0xf8f400, 0xfffc00, 0, FMT_D1, AM33, {SP, MEM2(SD8, AN0)}}, | ||
202 | { "mov", 0xf90a00, 0xffff00, 0, FMT_D6, AM33, {MEM(RM0), RN2}}, | 207 | { "mov", 0xf90a00, 0xffff00, 0, FMT_D6, AM33, {MEM(RM0), RN2}}, |
203 | { "mov", 0xf91a00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEM(RN0)}}, | 208 | { "mov", 0xf91a00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEM(RN0)}}, |
204 | { "mov", 0xf96a00, 0xffff00, 0x12, FMT_D6, AM33, {MEMINC(RM0), RN2}}, | 209 | { "mov", 0xf96a00, 0xffff00, 0x12, FMT_D6, AM33, {MEMINC(RM0), RN2}}, |
@@ -207,24 +212,46 @@ static const struct mn10300_opcode mn10300_opcodes[] = { | |||
207 | { "mov", 0xfa100000, 0xfff00000, 0, FMT_D2, 0, {DM1, MEM2(SD16, AN0)}}, | 212 | { "mov", 0xfa100000, 0xfff00000, 0, FMT_D2, 0, {DM1, MEM2(SD16, AN0)}}, |
208 | { "mov", 0xfa200000, 0xfff00000, 0, FMT_D2, 0, {MEM2(SD16, AM0), AN1}}, | 213 | { "mov", 0xfa200000, 0xfff00000, 0, FMT_D2, 0, {MEM2(SD16, AM0), AN1}}, |
209 | { "mov", 0xfa300000, 0xfff00000, 0, FMT_D2, 0, {AM1, MEM2(SD16, AN0)}}, | 214 | { "mov", 0xfa300000, 0xfff00000, 0, FMT_D2, 0, {AM1, MEM2(SD16, AN0)}}, |
215 | { "mov", 0xfa900000, 0xfff30000, 0, FMT_D2, 0, {AM1, MEM2(IMM16, SP)}}, | ||
216 | { "mov", 0xfa910000, 0xfff30000, 0, FMT_D2, 0, {DM1, MEM2(IMM16, SP)}}, | ||
217 | { "mov", 0xfab00000, 0xfffc0000, 0, FMT_D2, 0, {MEM2(IMM16, SP), AN0}}, | ||
218 | { "mov", 0xfab40000, 0xfffc0000, 0, FMT_D2, 0, {MEM2(IMM16, SP), DN0}}, | ||
210 | { "mov", 0xfb0a0000, 0xffff0000, 0, FMT_D7, AM33, {MEM2(SD8, RM0), RN2}}, | 219 | { "mov", 0xfb0a0000, 0xffff0000, 0, FMT_D7, AM33, {MEM2(SD8, RM0), RN2}}, |
211 | { "mov", 0xfb1a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}}, | 220 | { "mov", 0xfb1a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}}, |
212 | { "mov", 0xfb6a0000, 0xffff0000, 0x22, FMT_D7, AM33, {MEMINC2 (RM0, SIMM8), RN2}}, | 221 | { "mov", 0xfb6a0000, 0xffff0000, 0x22, FMT_D7, AM33, {MEMINC2 (RM0, SIMM8), RN2}}, |
213 | { "mov", 0xfb7a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEMINC2 (RN0, SIMM8)}}, | 222 | { "mov", 0xfb7a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEMINC2 (RN0, SIMM8)}}, |
223 | { "mov", 0xfb8a0000, 0xffff0f00, 0, FMT_D7, AM33, {MEM2(IMM8, SP), RN2}}, | ||
214 | { "mov", 0xfb8e0000, 0xffff000f, 0, FMT_D7, AM33, {MEM2(RI, RM0), RD2}}, | 224 | { "mov", 0xfb8e0000, 0xffff000f, 0, FMT_D7, AM33, {MEM2(RI, RM0), RD2}}, |
225 | { "mov", 0xfb9a0000, 0xffff0f00, 0, FMT_D7, AM33, {RM2, MEM2(IMM8, SP)}}, | ||
215 | { "mov", 0xfb9e0000, 0xffff000f, 0, FMT_D7, AM33, {RD2, MEM2(RI, RN0)}}, | 226 | { "mov", 0xfb9e0000, 0xffff000f, 0, FMT_D7, AM33, {RD2, MEM2(RI, RN0)}}, |
216 | { "mov", 0xfc000000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), DN1}}, | 227 | { "mov", 0xfc000000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), DN1}}, |
217 | { "mov", 0xfc100000, 0xfff00000, 0, FMT_D4, 0, {DM1, MEM2(IMM32,AN0)}}, | 228 | { "mov", 0xfc100000, 0xfff00000, 0, FMT_D4, 0, {DM1, MEM2(IMM32,AN0)}}, |
218 | { "mov", 0xfc200000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), AN1}}, | 229 | { "mov", 0xfc200000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), AN1}}, |
219 | { "mov", 0xfc300000, 0xfff00000, 0, FMT_D4, 0, {AM1, MEM2(IMM32,AN0)}}, | 230 | { "mov", 0xfc300000, 0xfff00000, 0, FMT_D4, 0, {AM1, MEM2(IMM32,AN0)}}, |
231 | { "mov", 0xfc800000, 0xfff30000, 0, FMT_D4, 0, {AM1, MEM(IMM32_MEM)}}, | ||
232 | { "mov", 0xfc810000, 0xfff30000, 0, FMT_D4, 0, {DM1, MEM(IMM32_MEM)}}, | ||
233 | { "mov", 0xfc900000, 0xfff30000, 0, FMT_D4, 0, {AM1, MEM2(IMM32, SP)}}, | ||
234 | { "mov", 0xfc910000, 0xfff30000, 0, FMT_D4, 0, {DM1, MEM2(IMM32, SP)}}, | ||
235 | { "mov", 0xfca00000, 0xfffc0000, 0, FMT_D4, 0, {MEM(IMM32_MEM), AN0}}, | ||
236 | { "mov", 0xfca40000, 0xfffc0000, 0, FMT_D4, 0, {MEM(IMM32_MEM), DN0}}, | ||
237 | { "mov", 0xfcb00000, 0xfffc0000, 0, FMT_D4, 0, {MEM2(IMM32, SP), AN0}}, | ||
238 | { "mov", 0xfcb40000, 0xfffc0000, 0, FMT_D4, 0, {MEM2(IMM32, SP), DN0}}, | ||
220 | { "mov", 0xfd0a0000, 0xffff0000, 0, FMT_D8, AM33, {MEM2(SD24, RM0), RN2}}, | 239 | { "mov", 0xfd0a0000, 0xffff0000, 0, FMT_D8, AM33, {MEM2(SD24, RM0), RN2}}, |
221 | { "mov", 0xfd1a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}}, | 240 | { "mov", 0xfd1a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}}, |
222 | { "mov", 0xfd6a0000, 0xffff0000, 0x22, FMT_D8, AM33, {MEMINC2 (RM0, IMM24), RN2}}, | 241 | { "mov", 0xfd6a0000, 0xffff0000, 0x22, FMT_D8, AM33, {MEMINC2 (RM0, IMM24), RN2}}, |
223 | { "mov", 0xfd7a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEMINC2 (RN0, IMM24)}}, | 242 | { "mov", 0xfd7a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEMINC2 (RN0, IMM24)}}, |
243 | { "mov", 0xfd8a0000, 0xffff0f00, 0, FMT_D8, AM33, {MEM2(IMM24, SP), RN2}}, | ||
244 | { "mov", 0xfd9a0000, 0xffff0f00, 0, FMT_D8, AM33, {RM2, MEM2(IMM24, SP)}}, | ||
224 | { "mov", 0xfe0a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}}, | 245 | { "mov", 0xfe0a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}}, |
246 | { "mov", 0xfe0a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}}, | ||
247 | { "mov", 0xfe0e0000, 0xffff0f00, 0, FMT_D9, AM33, {MEM(IMM32_HIGH8_MEM), RN2}}, | ||
248 | { "mov", 0xfe1a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}}, | ||
225 | { "mov", 0xfe1a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}}, | 249 | { "mov", 0xfe1a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}}, |
250 | { "mov", 0xfe1e0000, 0xffff0f00, 0, FMT_D9, AM33, {RM2, MEM(IMM32_HIGH8_MEM)}}, | ||
226 | { "mov", 0xfe6a0000, 0xffff0000, 0x22, FMT_D9, AM33, {MEMINC2 (RM0, IMM32_HIGH8), RN2}}, | 251 | { "mov", 0xfe6a0000, 0xffff0000, 0x22, FMT_D9, AM33, {MEMINC2 (RM0, IMM32_HIGH8), RN2}}, |
227 | { "mov", 0xfe7a0000, 0xffff0000, 0, FMT_D9, AM33, {RN2, MEMINC2 (RM0, IMM32_HIGH8)}}, | 252 | { "mov", 0xfe7a0000, 0xffff0000, 0, FMT_D9, AM33, {RN2, MEMINC2 (RM0, IMM32_HIGH8)}}, |
253 | { "mov", 0xfe8a0000, 0xffff0f00, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8, SP), RN2}}, | ||
254 | { "mov", 0xfe9a0000, 0xffff0f00, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, SP)}}, | ||
228 | 255 | ||
229 | { "movhu", 0xf060, 0xfff0, 0, FMT_D0, 0, {MEM(AM0), DN1}}, | 256 | { "movhu", 0xf060, 0xfff0, 0, FMT_D0, 0, {MEM(AM0), DN1}}, |
230 | { "movhu", 0xf070, 0xfff0, 0, FMT_D0, 0, {DM1, MEM(AN0)}}, | 257 | { "movhu", 0xf070, 0xfff0, 0, FMT_D0, 0, {DM1, MEM(AN0)}}, |
@@ -232,29 +259,58 @@ static const struct mn10300_opcode mn10300_opcodes[] = { | |||
232 | { "movhu", 0xf4c0, 0xffc0, 0, FMT_D0, 0, {DM2, MEM2(DI, AN0)}}, | 259 | { "movhu", 0xf4c0, 0xffc0, 0, FMT_D0, 0, {DM2, MEM2(DI, AN0)}}, |
233 | { "movhu", 0xf86000, 0xfff000, 0, FMT_D1, 0, {MEM2(SD8, AM0), DN1}}, | 260 | { "movhu", 0xf86000, 0xfff000, 0, FMT_D1, 0, {MEM2(SD8, AM0), DN1}}, |
234 | { "movhu", 0xf87000, 0xfff000, 0, FMT_D1, 0, {DM1, MEM2(SD8, AN0)}}, | 261 | { "movhu", 0xf87000, 0xfff000, 0, FMT_D1, 0, {DM1, MEM2(SD8, AN0)}}, |
262 | { "movhu", 0xf89300, 0xfff300, 0, FMT_D1, 0, {DM1, MEM2(IMM8, SP)}}, | ||
263 | { "movhu", 0xf8bc00, 0xfffc00, 0, FMT_D1, 0, {MEM2(IMM8, SP), DN0}}, | ||
235 | { "movhu", 0xf94a00, 0xffff00, 0, FMT_D6, AM33, {MEM(RM0), RN2}}, | 264 | { "movhu", 0xf94a00, 0xffff00, 0, FMT_D6, AM33, {MEM(RM0), RN2}}, |
236 | { "movhu", 0xf95a00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEM(RN0)}}, | 265 | { "movhu", 0xf95a00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEM(RN0)}}, |
237 | { "movhu", 0xf9ea00, 0xffff00, 0x12, FMT_D6, AM33, {MEMINC(RM0), RN2}}, | 266 | { "movhu", 0xf9ea00, 0xffff00, 0x12, FMT_D6, AM33, {MEMINC(RM0), RN2}}, |
238 | { "movhu", 0xf9fa00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEMINC(RN0)}}, | 267 | { "movhu", 0xf9fa00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEMINC(RN0)}}, |
239 | { "movhu", 0xfa600000, 0xfff00000, 0, FMT_D2, 0, {MEM2(SD16, AM0), DN1}}, | 268 | { "movhu", 0xfa600000, 0xfff00000, 0, FMT_D2, 0, {MEM2(SD16, AM0), DN1}}, |
240 | { "movhu", 0xfa700000, 0xfff00000, 0, FMT_D2, 0, {DM1, MEM2(SD16, AN0)}}, | 269 | { "movhu", 0xfa700000, 0xfff00000, 0, FMT_D2, 0, {DM1, MEM2(SD16, AN0)}}, |
270 | { "movhu", 0xfa930000, 0xfff30000, 0, FMT_D2, 0, {DM1, MEM2(IMM16, SP)}}, | ||
271 | { "movhu", 0xfabc0000, 0xfffc0000, 0, FMT_D2, 0, {MEM2(IMM16, SP), DN0}}, | ||
241 | { "movhu", 0xfb4a0000, 0xffff0000, 0, FMT_D7, AM33, {MEM2(SD8, RM0), RN2}}, | 272 | { "movhu", 0xfb4a0000, 0xffff0000, 0, FMT_D7, AM33, {MEM2(SD8, RM0), RN2}}, |
242 | { "movhu", 0xfb5a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}}, | 273 | { "movhu", 0xfb5a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}}, |
274 | { "movhu", 0xfbca0000, 0xffff0f00, 0, FMT_D7, AM33, {MEM2(IMM8, SP), RN2}}, | ||
243 | { "movhu", 0xfbce0000, 0xffff000f, 0, FMT_D7, AM33, {MEM2(RI, RM0), RD2}}, | 275 | { "movhu", 0xfbce0000, 0xffff000f, 0, FMT_D7, AM33, {MEM2(RI, RM0), RD2}}, |
276 | { "movhu", 0xfbda0000, 0xffff0f00, 0, FMT_D7, AM33, {RM2, MEM2(IMM8, SP)}}, | ||
244 | { "movhu", 0xfbde0000, 0xffff000f, 0, FMT_D7, AM33, {RD2, MEM2(RI, RN0)}}, | 277 | { "movhu", 0xfbde0000, 0xffff000f, 0, FMT_D7, AM33, {RD2, MEM2(RI, RN0)}}, |
245 | { "movhu", 0xfbea0000, 0xffff0000, 0x22, FMT_D7, AM33, {MEMINC2 (RM0, SIMM8), RN2}}, | 278 | { "movhu", 0xfbea0000, 0xffff0000, 0x22, FMT_D7, AM33, {MEMINC2 (RM0, SIMM8), RN2}}, |
246 | { "movhu", 0xfbfa0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEMINC2 (RN0, SIMM8)}}, | 279 | { "movhu", 0xfbfa0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEMINC2 (RN0, SIMM8)}}, |
247 | { "movhu", 0xfc600000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), DN1}}, | 280 | { "movhu", 0xfc600000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), DN1}}, |
248 | { "movhu", 0xfc700000, 0xfff00000, 0, FMT_D4, 0, {DM1, MEM2(IMM32,AN0)}}, | 281 | { "movhu", 0xfc700000, 0xfff00000, 0, FMT_D4, 0, {DM1, MEM2(IMM32,AN0)}}, |
282 | { "movhu", 0xfc830000, 0xfff30000, 0, FMT_D4, 0, {DM1, MEM(IMM32_MEM)}}, | ||
283 | { "movhu", 0xfc930000, 0xfff30000, 0, FMT_D4, 0, {DM1, MEM2(IMM32, SP)}}, | ||
284 | { "movhu", 0xfcac0000, 0xfffc0000, 0, FMT_D4, 0, {MEM(IMM32_MEM), DN0}}, | ||
285 | { "movhu", 0xfcbc0000, 0xfffc0000, 0, FMT_D4, 0, {MEM2(IMM32, SP), DN0}}, | ||
249 | { "movhu", 0xfd4a0000, 0xffff0000, 0, FMT_D8, AM33, {MEM2(SD24, RM0), RN2}}, | 286 | { "movhu", 0xfd4a0000, 0xffff0000, 0, FMT_D8, AM33, {MEM2(SD24, RM0), RN2}}, |
250 | { "movhu", 0xfd5a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}}, | 287 | { "movhu", 0xfd5a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}}, |
288 | { "movhu", 0xfdca0000, 0xffff0f00, 0, FMT_D8, AM33, {MEM2(IMM24, SP), RN2}}, | ||
289 | { "movhu", 0xfdda0000, 0xffff0f00, 0, FMT_D8, AM33, {RM2, MEM2(IMM24, SP)}}, | ||
251 | { "movhu", 0xfdea0000, 0xffff0000, 0x22, FMT_D8, AM33, {MEMINC2 (RM0, IMM24), RN2}}, | 290 | { "movhu", 0xfdea0000, 0xffff0000, 0x22, FMT_D8, AM33, {MEMINC2 (RM0, IMM24), RN2}}, |
252 | { "movhu", 0xfdfa0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEMINC2 (RN0, IMM24)}}, | 291 | { "movhu", 0xfdfa0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEMINC2 (RN0, IMM24)}}, |
253 | { "movhu", 0xfe4a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}}, | 292 | { "movhu", 0xfe4a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}}, |
293 | { "movhu", 0xfe4e0000, 0xffff0f00, 0, FMT_D9, AM33, {MEM(IMM32_HIGH8_MEM), RN2}}, | ||
254 | { "movhu", 0xfe5a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}}, | 294 | { "movhu", 0xfe5a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}}, |
295 | { "movhu", 0xfe5e0000, 0xffff0f00, 0, FMT_D9, AM33, {RM2, MEM(IMM32_HIGH8_MEM)}}, | ||
296 | { "movhu", 0xfeca0000, 0xffff0f00, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8, SP), RN2}}, | ||
297 | { "movhu", 0xfeda0000, 0xffff0f00, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, SP)}}, | ||
255 | { "movhu", 0xfeea0000, 0xffff0000, 0x22, FMT_D9, AM33, {MEMINC2 (RM0, IMM32_HIGH8), RN2}}, | 298 | { "movhu", 0xfeea0000, 0xffff0000, 0x22, FMT_D9, AM33, {MEMINC2 (RM0, IMM32_HIGH8), RN2}}, |
256 | { "movhu", 0xfefa0000, 0xffff0000, 0, FMT_D9, AM33, {RN2, MEMINC2 (RM0, IMM32_HIGH8)}}, | 299 | { "movhu", 0xfefa0000, 0xffff0000, 0, FMT_D9, AM33, {RN2, MEMINC2 (RM0, IMM32_HIGH8)}}, |
257 | { 0, 0, 0, 0, 0, 0, {0}}, | 300 | |
301 | { "mov_llt", 0xf7e00000, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
302 | { "mov_lgt", 0xf7e00001, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
303 | { "mov_lge", 0xf7e00002, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
304 | { "mov_lle", 0xf7e00003, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
305 | { "mov_lcs", 0xf7e00004, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
306 | { "mov_lhi", 0xf7e00005, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
307 | { "mov_lcc", 0xf7e00006, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
308 | { "mov_lls", 0xf7e00007, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
309 | { "mov_leq", 0xf7e00008, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
310 | { "mov_lne", 0xf7e00009, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
311 | { "mov_lra", 0xf7e0000a, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}}, | ||
312 | |||
313 | { "", 0, 0, 0, 0, 0, {0}}, | ||
258 | }; | 314 | }; |
259 | 315 | ||
260 | /* | 316 | /* |
@@ -265,18 +321,21 @@ asmlinkage void misalignment(struct pt_regs *regs, enum exception_code code) | |||
265 | const struct exception_table_entry *fixup; | 321 | const struct exception_table_entry *fixup; |
266 | const struct mn10300_opcode *pop; | 322 | const struct mn10300_opcode *pop; |
267 | unsigned long *registers = (unsigned long *) regs; | 323 | unsigned long *registers = (unsigned long *) regs; |
268 | unsigned long data, *store, *postinc; | 324 | unsigned long data, *store, *postinc, disp, inc, sp; |
269 | mm_segment_t seg; | 325 | mm_segment_t seg; |
270 | siginfo_t info; | 326 | siginfo_t info; |
271 | uint32_t opcode, disp, noc, xo, xm; | 327 | uint32_t opcode, noc, xo, xm; |
272 | uint8_t *pc, byte; | 328 | uint8_t *pc, byte, datasz; |
273 | void *address; | 329 | void *address; |
274 | unsigned tmp, npop; | 330 | unsigned tmp, npop, dispsz, loop; |
331 | |||
332 | /* we don't fix up userspace misalignment faults */ | ||
333 | if (user_mode(regs)) | ||
334 | goto bus_error; | ||
275 | 335 | ||
276 | kdebug("MISALIGN at %lx\n", regs->pc); | 336 | sp = (unsigned long) regs + sizeof(*regs); |
277 | 337 | ||
278 | if (in_interrupt()) | 338 | kdebug("==>misalignment({pc=%lx,sp=%lx})", regs->pc, sp); |
279 | die("Misalignment trap in interrupt context", regs, code); | ||
280 | 339 | ||
281 | if (regs->epsw & EPSW_IE) | 340 | if (regs->epsw & EPSW_IE) |
282 | asm volatile("or %0,epsw" : : "i"(EPSW_IE)); | 341 | asm volatile("or %0,epsw" : : "i"(EPSW_IE)); |
@@ -294,8 +353,8 @@ asmlinkage void misalignment(struct pt_regs *regs, enum exception_code code) | |||
294 | opcode = byte; | 353 | opcode = byte; |
295 | noc = 8; | 354 | noc = 8; |
296 | 355 | ||
297 | for (pop = mn10300_opcodes; pop->name; pop++) { | 356 | for (pop = mn10300_opcodes; pop->name[0]; pop++) { |
298 | npop = log2(pop->opcode | pop->opmask); | 357 | npop = ilog2(pop->opcode | pop->opmask); |
299 | if (npop <= 0 || npop > 31) | 358 | if (npop <= 0 || npop > 31) |
300 | continue; | 359 | continue; |
301 | npop = (npop + 8) & ~7; | 360 | npop = (npop + 8) & ~7; |
@@ -328,15 +387,15 @@ asmlinkage void misalignment(struct pt_regs *regs, enum exception_code code) | |||
328 | } | 387 | } |
329 | 388 | ||
330 | /* didn't manage to find a fixup */ | 389 | /* didn't manage to find a fixup */ |
331 | if (!user_mode(regs)) | 390 | printk(KERN_CRIT "MISALIGN: %lx: unsupported instruction %x\n", |
332 | printk(KERN_CRIT "MISALIGN: %lx: unsupported instruction %x\n", | 391 | regs->pc, opcode); |
333 | regs->pc, opcode); | ||
334 | 392 | ||
335 | failed: | 393 | failed: |
336 | set_fs(seg); | 394 | set_fs(seg); |
337 | if (die_if_no_fixup("misalignment error", regs, code)) | 395 | if (die_if_no_fixup("misalignment error", regs, code)) |
338 | return; | 396 | return; |
339 | 397 | ||
398 | bus_error: | ||
340 | info.si_signo = SIGBUS; | 399 | info.si_signo = SIGBUS; |
341 | info.si_errno = 0; | 400 | info.si_errno = 0; |
342 | info.si_code = BUS_ADRALN; | 401 | info.si_code = BUS_ADRALN; |
@@ -346,31 +405,27 @@ failed: | |||
346 | 405 | ||
347 | /* error reading opcodes */ | 406 | /* error reading opcodes */ |
348 | fetch_error: | 407 | fetch_error: |
349 | if (!user_mode(regs)) | 408 | printk(KERN_CRIT |
350 | printk(KERN_CRIT | 409 | "MISALIGN: %p: fault whilst reading instruction data\n", |
351 | "MISALIGN: %p: fault whilst reading instruction data\n", | 410 | pc); |
352 | pc); | ||
353 | goto failed; | 411 | goto failed; |
354 | 412 | ||
355 | bad_addr_mode: | 413 | bad_addr_mode: |
356 | if (!user_mode(regs)) | 414 | printk(KERN_CRIT |
357 | printk(KERN_CRIT | 415 | "MISALIGN: %lx: unsupported addressing mode %x\n", |
358 | "MISALIGN: %lx: unsupported addressing mode %x\n", | 416 | regs->pc, opcode); |
359 | regs->pc, opcode); | ||
360 | goto failed; | 417 | goto failed; |
361 | 418 | ||
362 | bad_reg_mode: | 419 | bad_reg_mode: |
363 | if (!user_mode(regs)) | 420 | printk(KERN_CRIT |
364 | printk(KERN_CRIT | 421 | "MISALIGN: %lx: unsupported register mode %x\n", |
365 | "MISALIGN: %lx: unsupported register mode %x\n", | 422 | regs->pc, opcode); |
366 | regs->pc, opcode); | ||
367 | goto failed; | 423 | goto failed; |
368 | 424 | ||
369 | unsupported_instruction: | 425 | unsupported_instruction: |
370 | if (!user_mode(regs)) | 426 | printk(KERN_CRIT |
371 | printk(KERN_CRIT | 427 | "MISALIGN: %lx: unsupported instruction %x (%s)\n", |
372 | "MISALIGN: %lx: unsupported instruction %x (%s)\n", | 428 | regs->pc, opcode, pop->name); |
373 | regs->pc, opcode, pop->name); | ||
374 | goto failed; | 429 | goto failed; |
375 | 430 | ||
376 | transfer_failed: | 431 | transfer_failed: |
@@ -391,7 +446,7 @@ transfer_failed: | |||
391 | 446 | ||
392 | /* we matched the opcode */ | 447 | /* we matched the opcode */ |
393 | found_opcode: | 448 | found_opcode: |
394 | kdebug("MISALIGN: %lx: %x==%x { %x, %x }\n", | 449 | kdebug("%lx: %x==%x { %x, %x }", |
395 | regs->pc, opcode, pop->opcode, pop->params[0], pop->params[1]); | 450 | regs->pc, opcode, pop->opcode, pop->params[0], pop->params[1]); |
396 | 451 | ||
397 | tmp = format_tbl[pop->format].opsz; | 452 | tmp = format_tbl[pop->format].opsz; |
@@ -406,106 +461,108 @@ found_opcode: | |||
406 | 461 | ||
407 | /* grab the extra displacement (note it's LSB first) */ | 462 | /* grab the extra displacement (note it's LSB first) */ |
408 | disp = 0; | 463 | disp = 0; |
409 | tmp = format_tbl[pop->format].dispsz >> 3; | 464 | dispsz = format_tbl[pop->format].dispsz; |
410 | while (tmp > 0) { | 465 | for (loop = 0; loop < dispsz; loop += 8) { |
411 | tmp--; | ||
412 | disp <<= 8; | ||
413 | |||
414 | pc++; | 466 | pc++; |
415 | if (__get_user(byte, pc) != 0) | 467 | if (__get_user(byte, pc) != 0) |
416 | goto fetch_error; | 468 | goto fetch_error; |
417 | disp |= byte; | 469 | disp |= byte << loop; |
470 | kdebug("{%p} disp[%02x]=%02x", pc, loop, byte); | ||
418 | } | 471 | } |
419 | 472 | ||
473 | kdebug("disp=%lx", disp); | ||
474 | |||
420 | set_fs(KERNEL_XDS); | 475 | set_fs(KERNEL_XDS); |
421 | if (fixup || regs->epsw & EPSW_nSL) | 476 | if (fixup) |
422 | set_fs(seg); | 477 | set_fs(seg); |
423 | 478 | ||
424 | tmp = (pop->params[0] ^ pop->params[1]) & 0x80000000; | 479 | tmp = (pop->params[0] ^ pop->params[1]) & 0x80000000; |
425 | if (!tmp) { | 480 | if (!tmp) { |
426 | if (!user_mode(regs)) | 481 | printk(KERN_CRIT |
427 | printk(KERN_CRIT | 482 | "MISALIGN: %lx: insn not move to/from memory %x\n", |
428 | "MISALIGN: %lx:" | 483 | regs->pc, opcode); |
429 | " insn not move to/from memory %x\n", | ||
430 | regs->pc, opcode); | ||
431 | goto failed; | 484 | goto failed; |
432 | } | 485 | } |
433 | 486 | ||
487 | /* determine the data transfer size of the move */ | ||
488 | if (pop->name[3] == 0 || /* "mov" */ | ||
489 | pop->name[4] == 'l') /* mov_lcc */ | ||
490 | inc = datasz = 4; | ||
491 | else if (pop->name[3] == 'h') /* movhu */ | ||
492 | inc = datasz = 2; | ||
493 | else | ||
494 | goto unsupported_instruction; | ||
495 | |||
434 | if (pop->params[0] & 0x80000000) { | 496 | if (pop->params[0] & 0x80000000) { |
435 | /* move memory to register */ | 497 | /* move memory to register */ |
436 | if (!misalignment_addr(registers, pop->params[0], opcode, disp, | 498 | if (!misalignment_addr(registers, sp, |
437 | &address, &postinc)) | 499 | pop->params[0], opcode, disp, |
500 | &address, &postinc, &inc)) | ||
438 | goto bad_addr_mode; | 501 | goto bad_addr_mode; |
439 | 502 | ||
440 | if (!misalignment_reg(registers, pop->params[1], opcode, disp, | 503 | if (!misalignment_reg(registers, pop->params[1], opcode, disp, |
441 | &store)) | 504 | &store)) |
442 | goto bad_reg_mode; | 505 | goto bad_reg_mode; |
443 | 506 | ||
444 | if (strcmp(pop->name, "mov") == 0) { | 507 | kdebug("mov%u (%p),DARn", datasz, address); |
445 | kdebug("FIXUP: mov (%p),DARn\n", address); | 508 | if (copy_from_user(&data, (void *) address, datasz) != 0) |
446 | if (copy_from_user(&data, (void *) address, 4) != 0) | 509 | goto transfer_failed; |
447 | goto transfer_failed; | 510 | if (pop->params[0] & 0x1000000) { |
448 | if (pop->params[0] & 0x1000000) | 511 | kdebug("inc=%lx", inc); |
449 | *postinc += 4; | 512 | *postinc += inc; |
450 | } else if (strcmp(pop->name, "movhu") == 0) { | ||
451 | kdebug("FIXUP: movhu (%p),DARn\n", address); | ||
452 | data = 0; | ||
453 | if (copy_from_user(&data, (void *) address, 2) != 0) | ||
454 | goto transfer_failed; | ||
455 | if (pop->params[0] & 0x1000000) | ||
456 | *postinc += 2; | ||
457 | } else { | ||
458 | goto unsupported_instruction; | ||
459 | } | 513 | } |
460 | 514 | ||
461 | *store = data; | 515 | *store = data; |
516 | kdebug("loaded %lx", data); | ||
462 | } else { | 517 | } else { |
463 | /* move register to memory */ | 518 | /* move register to memory */ |
464 | if (!misalignment_reg(registers, pop->params[0], opcode, disp, | 519 | if (!misalignment_reg(registers, pop->params[0], opcode, disp, |
465 | &store)) | 520 | &store)) |
466 | goto bad_reg_mode; | 521 | goto bad_reg_mode; |
467 | 522 | ||
468 | if (!misalignment_addr(registers, pop->params[1], opcode, disp, | 523 | if (!misalignment_addr(registers, sp, |
469 | &address, &postinc)) | 524 | pop->params[1], opcode, disp, |
525 | &address, &postinc, &inc)) | ||
470 | goto bad_addr_mode; | 526 | goto bad_addr_mode; |
471 | 527 | ||
472 | data = *store; | 528 | data = *store; |
473 | 529 | ||
474 | if (strcmp(pop->name, "mov") == 0) { | 530 | kdebug("mov%u %lx,(%p)", datasz, data, address); |
475 | kdebug("FIXUP: mov %lx,(%p)\n", data, address); | 531 | if (copy_to_user((void *) address, &data, datasz) != 0) |
476 | if (copy_to_user((void *) address, &data, 4) != 0) | 532 | goto transfer_failed; |
477 | goto transfer_failed; | 533 | if (pop->params[1] & 0x1000000) |
478 | if (pop->params[1] & 0x1000000) | 534 | *postinc += inc; |
479 | *postinc += 4; | ||
480 | } else if (strcmp(pop->name, "movhu") == 0) { | ||
481 | kdebug("FIXUP: movhu %hx,(%p)\n", | ||
482 | (uint16_t) data, address); | ||
483 | if (copy_to_user((void *) address, &data, 2) != 0) | ||
484 | goto transfer_failed; | ||
485 | if (pop->params[1] & 0x1000000) | ||
486 | *postinc += 2; | ||
487 | } else { | ||
488 | goto unsupported_instruction; | ||
489 | } | ||
490 | } | 535 | } |
491 | 536 | ||
492 | tmp = format_tbl[pop->format].opsz + format_tbl[pop->format].dispsz; | 537 | tmp = format_tbl[pop->format].opsz + format_tbl[pop->format].dispsz; |
493 | regs->pc += tmp >> 3; | 538 | regs->pc += tmp >> 3; |
494 | 539 | ||
540 | /* handle MOV_Lcc, which are currently the only FMT_D10 insns that | ||
541 | * access memory */ | ||
542 | if (pop->format == FMT_D10) | ||
543 | misalignment_MOV_Lcc(regs, opcode); | ||
544 | |||
495 | set_fs(seg); | 545 | set_fs(seg); |
496 | return; | ||
497 | } | 546 | } |
498 | 547 | ||
499 | /* | 548 | /* |
500 | * determine the address that was being accessed | 549 | * determine the address that was being accessed |
501 | */ | 550 | */ |
502 | static int misalignment_addr(unsigned long *registers, unsigned params, | 551 | static int misalignment_addr(unsigned long *registers, unsigned long sp, |
503 | unsigned opcode, unsigned disp, | 552 | unsigned params, unsigned opcode, |
504 | void **_address, unsigned long **_postinc) | 553 | unsigned long disp, |
554 | void **_address, unsigned long **_postinc, | ||
555 | unsigned long *_inc) | ||
505 | { | 556 | { |
506 | unsigned long *postinc = NULL, address = 0, tmp; | 557 | unsigned long *postinc = NULL, address = 0, tmp; |
507 | 558 | ||
508 | params &= 0x7fffffff; | 559 | if (!(params & 0x1000000)) { |
560 | kdebug("noinc"); | ||
561 | *_inc = 0; | ||
562 | _inc = NULL; | ||
563 | } | ||
564 | |||
565 | params &= 0x00ffffff; | ||
509 | 566 | ||
510 | do { | 567 | do { |
511 | switch (params & 0xff) { | 568 | switch (params & 0xff) { |
@@ -514,11 +571,11 @@ static int misalignment_addr(unsigned long *registers, unsigned params, | |||
514 | address += *postinc; | 571 | address += *postinc; |
515 | break; | 572 | break; |
516 | case DM1: | 573 | case DM1: |
517 | postinc = ®isters[Dreg_index[opcode >> 2 & 0x0c]]; | 574 | postinc = ®isters[Dreg_index[opcode >> 2 & 0x03]]; |
518 | address += *postinc; | 575 | address += *postinc; |
519 | break; | 576 | break; |
520 | case DM2: | 577 | case DM2: |
521 | postinc = ®isters[Dreg_index[opcode >> 4 & 0x30]]; | 578 | postinc = ®isters[Dreg_index[opcode >> 4 & 0x03]]; |
522 | address += *postinc; | 579 | address += *postinc; |
523 | break; | 580 | break; |
524 | case AM0: | 581 | case AM0: |
@@ -526,11 +583,11 @@ static int misalignment_addr(unsigned long *registers, unsigned params, | |||
526 | address += *postinc; | 583 | address += *postinc; |
527 | break; | 584 | break; |
528 | case AM1: | 585 | case AM1: |
529 | postinc = ®isters[Areg_index[opcode >> 2 & 0x0c]]; | 586 | postinc = ®isters[Areg_index[opcode >> 2 & 0x03]]; |
530 | address += *postinc; | 587 | address += *postinc; |
531 | break; | 588 | break; |
532 | case AM2: | 589 | case AM2: |
533 | postinc = ®isters[Areg_index[opcode >> 4 & 0x30]]; | 590 | postinc = ®isters[Areg_index[opcode >> 4 & 0x03]]; |
534 | address += *postinc; | 591 | address += *postinc; |
535 | break; | 592 | break; |
536 | case RM0: | 593 | case RM0: |
@@ -561,33 +618,53 @@ static int misalignment_addr(unsigned long *registers, unsigned params, | |||
561 | postinc = ®isters[Rreg_index[disp >> 4 & 0x0f]]; | 618 | postinc = ®isters[Rreg_index[disp >> 4 & 0x0f]]; |
562 | address += *postinc; | 619 | address += *postinc; |
563 | break; | 620 | break; |
621 | case SP: | ||
622 | address += sp; | ||
623 | break; | ||
564 | 624 | ||
625 | /* displacements are either to be added to the address | ||
626 | * before use, or, in the case of post-inc addressing, | ||
627 | * to be added into the base register after use */ | ||
565 | case SD8: | 628 | case SD8: |
566 | case SIMM8: | 629 | case SIMM8: |
567 | address += (int32_t) (int8_t) (disp & 0xff); | 630 | disp = (long) (int8_t) (disp & 0xff); |
568 | break; | 631 | goto displace_or_inc; |
569 | case SD16: | 632 | case SD16: |
570 | address += (int32_t) (int16_t) (disp & 0xffff); | 633 | disp = (long) (int16_t) (disp & 0xffff); |
571 | break; | 634 | goto displace_or_inc; |
572 | case SD24: | 635 | case SD24: |
573 | tmp = disp << 8; | 636 | tmp = disp << 8; |
574 | asm("asr 8,%0" : "=r"(tmp) : "0"(tmp)); | 637 | asm("asr 8,%0" : "=r"(tmp) : "0"(tmp)); |
575 | address += tmp; | 638 | disp = (long) tmp; |
576 | break; | 639 | goto displace_or_inc; |
577 | case SIMM4_2: | 640 | case SIMM4_2: |
578 | tmp = opcode >> 4 & 0x0f; | 641 | tmp = opcode >> 4 & 0x0f; |
579 | tmp <<= 28; | 642 | tmp <<= 28; |
580 | asm("asr 28,%0" : "=r"(tmp) : "0"(tmp)); | 643 | asm("asr 28,%0" : "=r"(tmp) : "0"(tmp)); |
581 | address += tmp; | 644 | disp = (long) tmp; |
582 | break; | 645 | goto displace_or_inc; |
646 | case IMM8: | ||
647 | disp &= 0x000000ff; | ||
648 | goto displace_or_inc; | ||
649 | case IMM16: | ||
650 | disp &= 0x0000ffff; | ||
651 | goto displace_or_inc; | ||
583 | case IMM24: | 652 | case IMM24: |
584 | address += disp & 0x00ffffff; | 653 | disp &= 0x00ffffff; |
585 | break; | 654 | goto displace_or_inc; |
586 | case IMM32: | 655 | case IMM32: |
656 | case IMM32_MEM: | ||
587 | case IMM32_HIGH8: | 657 | case IMM32_HIGH8: |
588 | address += disp; | 658 | case IMM32_HIGH8_MEM: |
659 | displace_or_inc: | ||
660 | kdebug("%s %lx", _inc ? "incr" : "disp", disp); | ||
661 | if (!_inc) | ||
662 | address += disp; | ||
663 | else | ||
664 | *_inc = disp; | ||
589 | break; | 665 | break; |
590 | default: | 666 | default: |
667 | BUG(); | ||
591 | return 0; | 668 | return 0; |
592 | } | 669 | } |
593 | } while ((params >>= 8)); | 670 | } while ((params >>= 8)); |
@@ -601,7 +678,7 @@ static int misalignment_addr(unsigned long *registers, unsigned params, | |||
601 | * determine the register that is acting as source/dest | 678 | * determine the register that is acting as source/dest |
602 | */ | 679 | */ |
603 | static int misalignment_reg(unsigned long *registers, unsigned params, | 680 | static int misalignment_reg(unsigned long *registers, unsigned params, |
604 | unsigned opcode, unsigned disp, | 681 | unsigned opcode, unsigned long disp, |
605 | unsigned long **_register) | 682 | unsigned long **_register) |
606 | { | 683 | { |
607 | params &= 0x7fffffff; | 684 | params &= 0x7fffffff; |
@@ -654,8 +731,239 @@ static int misalignment_reg(unsigned long *registers, unsigned params, | |||
654 | break; | 731 | break; |
655 | 732 | ||
656 | default: | 733 | default: |
734 | BUG(); | ||
657 | return 0; | 735 | return 0; |
658 | } | 736 | } |
659 | 737 | ||
660 | return 1; | 738 | return 1; |
661 | } | 739 | } |
740 | |||
741 | /* | ||
742 | * handle the conditional loop part of the move-and-loop instructions | ||
743 | */ | ||
744 | static void misalignment_MOV_Lcc(struct pt_regs *regs, uint32_t opcode) | ||
745 | { | ||
746 | unsigned long epsw = regs->epsw; | ||
747 | unsigned long NxorV; | ||
748 | |||
749 | kdebug("MOV_Lcc %x [flags=%lx]", opcode, epsw & 0xf); | ||
750 | |||
751 | /* calculate N^V and shift onto the same bit position as Z */ | ||
752 | NxorV = ((epsw >> 3) ^ epsw >> 1) & 1; | ||
753 | |||
754 | switch (opcode & 0xf) { | ||
755 | case 0x0: /* MOV_LLT: N^V */ | ||
756 | if (NxorV) | ||
757 | goto take_the_loop; | ||
758 | return; | ||
759 | case 0x1: /* MOV_LGT: ~(Z or (N^V))*/ | ||
760 | if (!((epsw & EPSW_FLAG_Z) | NxorV)) | ||
761 | goto take_the_loop; | ||
762 | return; | ||
763 | case 0x2: /* MOV_LGE: ~(N^V) */ | ||
764 | if (!NxorV) | ||
765 | goto take_the_loop; | ||
766 | return; | ||
767 | case 0x3: /* MOV_LLE: Z or (N^V) */ | ||
768 | if ((epsw & EPSW_FLAG_Z) | NxorV) | ||
769 | goto take_the_loop; | ||
770 | return; | ||
771 | |||
772 | case 0x4: /* MOV_LCS: C */ | ||
773 | if (epsw & EPSW_FLAG_C) | ||
774 | goto take_the_loop; | ||
775 | return; | ||
776 | case 0x5: /* MOV_LHI: ~(C or Z) */ | ||
777 | if (!(epsw & (EPSW_FLAG_C | EPSW_FLAG_Z))) | ||
778 | goto take_the_loop; | ||
779 | return; | ||
780 | case 0x6: /* MOV_LCC: ~C */ | ||
781 | if (!(epsw & EPSW_FLAG_C)) | ||
782 | goto take_the_loop; | ||
783 | return; | ||
784 | case 0x7: /* MOV_LLS: C or Z */ | ||
785 | if (epsw & (EPSW_FLAG_C | EPSW_FLAG_Z)) | ||
786 | goto take_the_loop; | ||
787 | return; | ||
788 | |||
789 | case 0x8: /* MOV_LEQ: Z */ | ||
790 | if (epsw & EPSW_FLAG_Z) | ||
791 | goto take_the_loop; | ||
792 | return; | ||
793 | case 0x9: /* MOV_LNE: ~Z */ | ||
794 | if (!(epsw & EPSW_FLAG_Z)) | ||
795 | goto take_the_loop; | ||
796 | return; | ||
797 | case 0xa: /* MOV_LRA: always */ | ||
798 | goto take_the_loop; | ||
799 | |||
800 | default: | ||
801 | BUG(); | ||
802 | } | ||
803 | |||
804 | take_the_loop: | ||
805 | /* wind the PC back to just after the SETLB insn */ | ||
806 | kdebug("loop LAR=%lx", regs->lar); | ||
807 | regs->pc = regs->lar - 4; | ||
808 | } | ||
809 | |||
810 | /* | ||
811 | * misalignment handler tests | ||
812 | */ | ||
813 | #ifdef CONFIG_TEST_MISALIGNMENT_HANDLER | ||
814 | static u8 __initdata testbuf[512] __attribute__((aligned(16))) = { | ||
815 | [257] = 0x11, | ||
816 | [258] = 0x22, | ||
817 | [259] = 0x33, | ||
818 | [260] = 0x44, | ||
819 | }; | ||
820 | |||
821 | #define ASSERTCMP(X, OP, Y) \ | ||
822 | do { \ | ||
823 | if (unlikely(!((X) OP (Y)))) { \ | ||
824 | printk(KERN_ERR "\n"); \ | ||
825 | printk(KERN_ERR "MISALIGN: Assertion failed at line %u\n", \ | ||
826 | __LINE__); \ | ||
827 | printk(KERN_ERR "0x%lx " #OP " 0x%lx is false\n", \ | ||
828 | (unsigned long)(X), (unsigned long)(Y)); \ | ||
829 | BUG(); \ | ||
830 | } \ | ||
831 | } while(0) | ||
832 | |||
833 | static int __init test_misalignment(void) | ||
834 | { | ||
835 | register void *r asm("e0"); | ||
836 | register u32 y asm("e1"); | ||
837 | void *p = testbuf, *q; | ||
838 | u32 tmp, tmp2, x; | ||
839 | |||
840 | printk(KERN_NOTICE "==>test_misalignment() [testbuf=%p]\n", p); | ||
841 | p++; | ||
842 | |||
843 | printk(KERN_NOTICE "___ MOV (Am),Dn ___\n"); | ||
844 | q = p + 256; | ||
845 | asm volatile("mov (%0),%1" : "+a"(q), "=d"(x)); | ||
846 | ASSERTCMP(q, ==, p + 256); | ||
847 | ASSERTCMP(x, ==, 0x44332211); | ||
848 | |||
849 | printk(KERN_NOTICE "___ MOV (256,Am),Dn ___\n"); | ||
850 | q = p; | ||
851 | asm volatile("mov (256,%0),%1" : "+a"(q), "=d"(x)); | ||
852 | ASSERTCMP(q, ==, p); | ||
853 | ASSERTCMP(x, ==, 0x44332211); | ||
854 | |||
855 | printk(KERN_NOTICE "___ MOV (Di,Am),Dn ___\n"); | ||
856 | tmp = 256; | ||
857 | q = p; | ||
858 | asm volatile("mov (%2,%0),%1" : "+a"(q), "=d"(x), "+d"(tmp)); | ||
859 | ASSERTCMP(q, ==, p); | ||
860 | ASSERTCMP(x, ==, 0x44332211); | ||
861 | ASSERTCMP(tmp, ==, 256); | ||
862 | |||
863 | printk(KERN_NOTICE "___ MOV (256,Rm),Rn ___\n"); | ||
864 | r = p; | ||
865 | asm volatile("mov (256,%0),%1" : "+r"(r), "=r"(y)); | ||
866 | ASSERTCMP(r, ==, p); | ||
867 | ASSERTCMP(y, ==, 0x44332211); | ||
868 | |||
869 | printk(KERN_NOTICE "___ MOV (Rm+),Rn ___\n"); | ||
870 | r = p + 256; | ||
871 | asm volatile("mov (%0+),%1" : "+r"(r), "=r"(y)); | ||
872 | ASSERTCMP(r, ==, p + 256 + 4); | ||
873 | ASSERTCMP(y, ==, 0x44332211); | ||
874 | |||
875 | printk(KERN_NOTICE "___ MOV (Rm+,8),Rn ___\n"); | ||
876 | r = p + 256; | ||
877 | asm volatile("mov (%0+,8),%1" : "+r"(r), "=r"(y)); | ||
878 | ASSERTCMP(r, ==, p + 256 + 8); | ||
879 | ASSERTCMP(y, ==, 0x44332211); | ||
880 | |||
881 | printk(KERN_NOTICE "___ MOV (7,SP),Rn ___\n"); | ||
882 | asm volatile( | ||
883 | "add -16,sp \n" | ||
884 | "mov +0x11,%0 \n" | ||
885 | "movbu %0,(7,sp) \n" | ||
886 | "mov +0x22,%0 \n" | ||
887 | "movbu %0,(8,sp) \n" | ||
888 | "mov +0x33,%0 \n" | ||
889 | "movbu %0,(9,sp) \n" | ||
890 | "mov +0x44,%0 \n" | ||
891 | "movbu %0,(10,sp) \n" | ||
892 | "mov (7,sp),%1 \n" | ||
893 | "add +16,sp \n" | ||
894 | : "+a"(q), "=d"(x)); | ||
895 | ASSERTCMP(x, ==, 0x44332211); | ||
896 | |||
897 | printk(KERN_NOTICE "___ MOV (259,SP),Rn ___\n"); | ||
898 | asm volatile( | ||
899 | "add -264,sp \n" | ||
900 | "mov +0x11,%0 \n" | ||
901 | "movbu %0,(259,sp) \n" | ||
902 | "mov +0x22,%0 \n" | ||
903 | "movbu %0,(260,sp) \n" | ||
904 | "mov +0x33,%0 \n" | ||
905 | "movbu %0,(261,sp) \n" | ||
906 | "mov +0x55,%0 \n" | ||
907 | "movbu %0,(262,sp) \n" | ||
908 | "mov (259,sp),%1 \n" | ||
909 | "add +264,sp \n" | ||
910 | : "+d"(tmp), "=d"(x)); | ||
911 | ASSERTCMP(x, ==, 0x55332211); | ||
912 | |||
913 | printk(KERN_NOTICE "___ MOV (260,SP),Rn ___\n"); | ||
914 | asm volatile( | ||
915 | "add -264,sp \n" | ||
916 | "mov +0x11,%0 \n" | ||
917 | "movbu %0,(260,sp) \n" | ||
918 | "mov +0x22,%0 \n" | ||
919 | "movbu %0,(261,sp) \n" | ||
920 | "mov +0x33,%0 \n" | ||
921 | "movbu %0,(262,sp) \n" | ||
922 | "mov +0x55,%0 \n" | ||
923 | "movbu %0,(263,sp) \n" | ||
924 | "mov (260,sp),%1 \n" | ||
925 | "add +264,sp \n" | ||
926 | : "+d"(tmp), "=d"(x)); | ||
927 | ASSERTCMP(x, ==, 0x55332211); | ||
928 | |||
929 | |||
930 | printk(KERN_NOTICE "___ MOV_LNE ___\n"); | ||
931 | tmp = 1; | ||
932 | tmp2 = 2; | ||
933 | q = p + 256; | ||
934 | asm volatile( | ||
935 | "setlb \n" | ||
936 | "mov %2,%3 \n" | ||
937 | "mov %1,%2 \n" | ||
938 | "cmp +0,%1 \n" | ||
939 | "mov_lne (%0+,4),%1" | ||
940 | : "+r"(q), "+d"(tmp), "+d"(tmp2), "=d"(x) | ||
941 | : | ||
942 | : "cc"); | ||
943 | ASSERTCMP(q, ==, p + 256 + 12); | ||
944 | ASSERTCMP(x, ==, 0x44332211); | ||
945 | |||
946 | printk(KERN_NOTICE "___ MOV in SETLB ___\n"); | ||
947 | tmp = 1; | ||
948 | tmp2 = 2; | ||
949 | q = p + 256; | ||
950 | asm volatile( | ||
951 | "setlb \n" | ||
952 | "mov %1,%3 \n" | ||
953 | "mov (%0+),%1 \n" | ||
954 | "cmp +0,%1 \n" | ||
955 | "lne " | ||
956 | : "+a"(q), "+d"(tmp), "+d"(tmp2), "=d"(x) | ||
957 | : | ||
958 | : "cc"); | ||
959 | |||
960 | ASSERTCMP(q, ==, p + 256 + 8); | ||
961 | ASSERTCMP(x, ==, 0x44332211); | ||
962 | |||
963 | printk(KERN_NOTICE "<==test_misalignment()\n"); | ||
964 | return 0; | ||
965 | } | ||
966 | |||
967 | arch_initcall(test_misalignment); | ||
968 | |||
969 | #endif /* CONFIG_TEST_MISALIGNMENT_HANDLER */ | ||
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 644a70b1b04e..aacf11d33723 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -11,6 +11,7 @@ config PARISC | |||
11 | select HAVE_OPROFILE | 11 | select HAVE_OPROFILE |
12 | select RTC_CLASS | 12 | select RTC_CLASS |
13 | select RTC_DRV_PARISC | 13 | select RTC_DRV_PARISC |
14 | select INIT_ALL_POSSIBLE | ||
14 | help | 15 | help |
15 | The PA-RISC microprocessor is designed by Hewlett-Packard and used | 16 | The PA-RISC microprocessor is designed by Hewlett-Packard and used |
16 | in many of their workstations & servers (HP9000 700 and 800 series, | 17 | in many of their workstations & servers (HP9000 700 and 800 series, |
diff --git a/arch/parisc/include/asm/parisc-device.h b/arch/parisc/include/asm/parisc-device.h index 7aa13f2add7a..9afdad6c2ffb 100644 --- a/arch/parisc/include/asm/parisc-device.h +++ b/arch/parisc/include/asm/parisc-device.h | |||
@@ -42,9 +42,9 @@ struct parisc_driver { | |||
42 | #define to_parisc_driver(d) container_of(d, struct parisc_driver, drv) | 42 | #define to_parisc_driver(d) container_of(d, struct parisc_driver, drv) |
43 | #define parisc_parent(d) to_parisc_device(d->dev.parent) | 43 | #define parisc_parent(d) to_parisc_device(d->dev.parent) |
44 | 44 | ||
45 | static inline char *parisc_pathname(struct parisc_device *d) | 45 | static inline const char *parisc_pathname(struct parisc_device *d) |
46 | { | 46 | { |
47 | return d->dev.bus_id; | 47 | return dev_name(&d->dev); |
48 | } | 48 | } |
49 | 49 | ||
50 | static inline void | 50 | static inline void |
diff --git a/arch/parisc/include/asm/posix_types.h b/arch/parisc/include/asm/posix_types.h index bb725a6630bb..00da29a340ba 100644 --- a/arch/parisc/include/asm/posix_types.h +++ b/arch/parisc/include/asm/posix_types.h | |||
@@ -24,13 +24,12 @@ typedef int __kernel_daddr_t; | |||
24 | typedef unsigned long __kernel_size_t; | 24 | typedef unsigned long __kernel_size_t; |
25 | typedef long __kernel_ssize_t; | 25 | typedef long __kernel_ssize_t; |
26 | typedef long __kernel_ptrdiff_t; | 26 | typedef long __kernel_ptrdiff_t; |
27 | typedef long __kernel_time_t; | ||
28 | #else | 27 | #else |
29 | typedef unsigned int __kernel_size_t; | 28 | typedef unsigned int __kernel_size_t; |
30 | typedef int __kernel_ssize_t; | 29 | typedef int __kernel_ssize_t; |
31 | typedef int __kernel_ptrdiff_t; | 30 | typedef int __kernel_ptrdiff_t; |
32 | typedef long __kernel_time_t; | ||
33 | #endif | 31 | #endif |
32 | typedef long __kernel_time_t; | ||
34 | typedef char * __kernel_caddr_t; | 33 | typedef char * __kernel_caddr_t; |
35 | 34 | ||
36 | typedef unsigned short __kernel_uid16_t; | 35 | typedef unsigned short __kernel_uid16_t; |
diff --git a/arch/parisc/include/asm/ptrace.h b/arch/parisc/include/asm/ptrace.h index afa5333187b4..302f68dc889c 100644 --- a/arch/parisc/include/asm/ptrace.h +++ b/arch/parisc/include/asm/ptrace.h | |||
@@ -47,8 +47,6 @@ struct pt_regs { | |||
47 | 47 | ||
48 | #define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS)) | 48 | #define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS)) |
49 | 49 | ||
50 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
51 | |||
52 | struct task_struct; | 50 | struct task_struct; |
53 | #define arch_has_single_step() 1 | 51 | #define arch_has_single_step() 1 |
54 | void user_disable_single_step(struct task_struct *task); | 52 | void user_disable_single_step(struct task_struct *task); |
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h index 398cdbaf4e54..409e698f4361 100644 --- a/arch/parisc/include/asm/smp.h +++ b/arch/parisc/include/asm/smp.h | |||
@@ -44,8 +44,6 @@ extern void arch_send_call_function_ipi(cpumask_t mask); | |||
44 | 44 | ||
45 | #define PROC_CHANGE_PENALTY 15 /* Schedule penalty */ | 45 | #define PROC_CHANGE_PENALTY 15 /* Schedule penalty */ |
46 | 46 | ||
47 | extern unsigned long cpu_present_mask; | ||
48 | |||
49 | #define raw_smp_processor_id() (current_thread_info()->cpu) | 47 | #define raw_smp_processor_id() (current_thread_info()->cpu) |
50 | 48 | ||
51 | #else /* CONFIG_SMP */ | 49 | #else /* CONFIG_SMP */ |
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index 2ca654bd6322..884b7ce16a3b 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c | |||
@@ -43,7 +43,7 @@ struct hppa_dma_ops *hppa_dma_ops __read_mostly; | |||
43 | EXPORT_SYMBOL(hppa_dma_ops); | 43 | EXPORT_SYMBOL(hppa_dma_ops); |
44 | 44 | ||
45 | static struct device root = { | 45 | static struct device root = { |
46 | .bus_id = "parisc", | 46 | .init_name = "parisc", |
47 | }; | 47 | }; |
48 | 48 | ||
49 | static inline int check_dev(struct device *dev) | 49 | static inline int check_dev(struct device *dev) |
@@ -393,7 +393,8 @@ EXPORT_SYMBOL(print_pci_hwpath); | |||
393 | static void setup_bus_id(struct parisc_device *padev) | 393 | static void setup_bus_id(struct parisc_device *padev) |
394 | { | 394 | { |
395 | struct hardware_path path; | 395 | struct hardware_path path; |
396 | char *output = padev->dev.bus_id; | 396 | char name[20]; |
397 | char *output = name; | ||
397 | int i; | 398 | int i; |
398 | 399 | ||
399 | get_node_path(padev->dev.parent, &path); | 400 | get_node_path(padev->dev.parent, &path); |
@@ -404,6 +405,7 @@ static void setup_bus_id(struct parisc_device *padev) | |||
404 | output += sprintf(output, "%u:", (unsigned char) path.bc[i]); | 405 | output += sprintf(output, "%u:", (unsigned char) path.bc[i]); |
405 | } | 406 | } |
406 | sprintf(output, "%u", (unsigned char) padev->hw_path); | 407 | sprintf(output, "%u", (unsigned char) padev->hw_path); |
408 | dev_set_name(&padev->dev, name); | ||
407 | } | 409 | } |
408 | 410 | ||
409 | struct parisc_device * create_tree_node(char id, struct device *parent) | 411 | struct parisc_device * create_tree_node(char id, struct device *parent) |
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 23ef950df008..4cea935e2f99 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c | |||
@@ -131,12 +131,12 @@ int cpu_check_affinity(unsigned int irq, cpumask_t *dest) | |||
131 | return 0; | 131 | return 0; |
132 | } | 132 | } |
133 | 133 | ||
134 | static void cpu_set_affinity_irq(unsigned int irq, cpumask_t dest) | 134 | static void cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest) |
135 | { | 135 | { |
136 | if (cpu_check_affinity(irq, &dest)) | 136 | if (cpu_check_affinity(irq, dest)) |
137 | return; | 137 | return; |
138 | 138 | ||
139 | irq_desc[irq].affinity = dest; | 139 | irq_desc[irq].affinity = *dest; |
140 | } | 140 | } |
141 | #endif | 141 | #endif |
142 | 142 | ||
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c index 90904f9dfc50..927db3668b6f 100644 --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c | |||
@@ -183,10 +183,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
183 | * being 64 bit in both cases. | 183 | * being 64 bit in both cases. |
184 | */ | 184 | */ |
185 | 185 | ||
186 | static long translate_usr_offset(long offset) | 186 | static compat_ulong_t translate_usr_offset(compat_ulong_t offset) |
187 | { | 187 | { |
188 | if (offset < 0) | 188 | if (offset < 0) |
189 | return -1; | 189 | return sizeof(struct pt_regs); |
190 | else if (offset <= 32*4) /* gr[0..31] */ | 190 | else if (offset <= 32*4) /* gr[0..31] */ |
191 | return offset * 2 + 4; | 191 | return offset * 2 + 4; |
192 | else if (offset <= 32*4+32*8) /* gr[0..31] + fr[0..31] */ | 192 | else if (offset <= 32*4+32*8) /* gr[0..31] + fr[0..31] */ |
@@ -194,7 +194,7 @@ static long translate_usr_offset(long offset) | |||
194 | else if (offset < sizeof(struct pt_regs)/2 + 32*4) | 194 | else if (offset < sizeof(struct pt_regs)/2 + 32*4) |
195 | return offset * 2 + 4 - 32*8; | 195 | return offset * 2 + 4 - 32*8; |
196 | else | 196 | else |
197 | return -1; | 197 | return sizeof(struct pt_regs); |
198 | } | 198 | } |
199 | 199 | ||
200 | long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | 200 | long compat_arch_ptrace(struct task_struct *child, compat_long_t request, |
@@ -209,7 +209,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | |||
209 | if (addr & (sizeof(compat_uint_t)-1)) | 209 | if (addr & (sizeof(compat_uint_t)-1)) |
210 | break; | 210 | break; |
211 | addr = translate_usr_offset(addr); | 211 | addr = translate_usr_offset(addr); |
212 | if (addr < 0) | 212 | if (addr >= sizeof(struct pt_regs)) |
213 | break; | 213 | break; |
214 | 214 | ||
215 | tmp = *(compat_uint_t *) ((char *) task_regs(child) + addr); | 215 | tmp = *(compat_uint_t *) ((char *) task_regs(child) + addr); |
@@ -236,7 +236,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | |||
236 | if (addr & (sizeof(compat_uint_t)-1)) | 236 | if (addr & (sizeof(compat_uint_t)-1)) |
237 | break; | 237 | break; |
238 | addr = translate_usr_offset(addr); | 238 | addr = translate_usr_offset(addr); |
239 | if (addr < 0) | 239 | if (addr >= sizeof(struct pt_regs)) |
240 | break; | 240 | break; |
241 | if (addr >= PT_FR0 && addr <= PT_FR31 + 4) { | 241 | if (addr >= PT_FR0 && addr <= PT_FR31 + 4) { |
242 | /* Special case, fp regs are 64 bits anyway */ | 242 | /* Special case, fp regs are 64 bits anyway */ |
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index d47f3975c9c6..80bc000523fa 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
@@ -67,21 +67,6 @@ static volatile int cpu_now_booting __read_mostly = 0; /* track which CPU is boo | |||
67 | 67 | ||
68 | static int parisc_max_cpus __read_mostly = 1; | 68 | static int parisc_max_cpus __read_mostly = 1; |
69 | 69 | ||
70 | /* online cpus are ones that we've managed to bring up completely | ||
71 | * possible cpus are all valid cpu | ||
72 | * present cpus are all detected cpu | ||
73 | * | ||
74 | * On startup we bring up the "possible" cpus. Since we discover | ||
75 | * CPUs later, we add them as hotplug, so the possible cpu mask is | ||
76 | * empty in the beginning. | ||
77 | */ | ||
78 | |||
79 | cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE; /* Bitmap of online CPUs */ | ||
80 | cpumask_t cpu_possible_map __read_mostly = CPU_MASK_ALL; /* Bitmap of Present CPUs */ | ||
81 | |||
82 | EXPORT_SYMBOL(cpu_online_map); | ||
83 | EXPORT_SYMBOL(cpu_possible_map); | ||
84 | |||
85 | DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED; | 70 | DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED; |
86 | 71 | ||
87 | enum ipi_message_type { | 72 | enum ipi_message_type { |
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 675f1d098f05..4c771cd580ec 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
26 | #include <linux/console.h> | 26 | #include <linux/console.h> |
27 | #include <linux/kallsyms.h> | ||
28 | #include <linux/bug.h> | 27 | #include <linux/bug.h> |
29 | 28 | ||
30 | #include <asm/assembly.h> | 29 | #include <asm/assembly.h> |
@@ -51,7 +50,7 @@ | |||
51 | DEFINE_SPINLOCK(pa_dbit_lock); | 50 | DEFINE_SPINLOCK(pa_dbit_lock); |
52 | #endif | 51 | #endif |
53 | 52 | ||
54 | void parisc_show_stack(struct task_struct *t, unsigned long *sp, | 53 | static void parisc_show_stack(struct task_struct *task, unsigned long *sp, |
55 | struct pt_regs *regs); | 54 | struct pt_regs *regs); |
56 | 55 | ||
57 | static int printbinary(char *buf, unsigned long x, int nbits) | 56 | static int printbinary(char *buf, unsigned long x, int nbits) |
@@ -121,18 +120,19 @@ static void print_fr(char *level, struct pt_regs *regs) | |||
121 | 120 | ||
122 | void show_regs(struct pt_regs *regs) | 121 | void show_regs(struct pt_regs *regs) |
123 | { | 122 | { |
124 | int i; | 123 | int i, user; |
125 | char *level; | 124 | char *level; |
126 | unsigned long cr30, cr31; | 125 | unsigned long cr30, cr31; |
127 | 126 | ||
128 | level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT; | 127 | user = user_mode(regs); |
128 | level = user ? KERN_DEBUG : KERN_CRIT; | ||
129 | 129 | ||
130 | print_gr(level, regs); | 130 | print_gr(level, regs); |
131 | 131 | ||
132 | for (i = 0; i < 8; i += 4) | 132 | for (i = 0; i < 8; i += 4) |
133 | PRINTREGS(level, regs->sr, "sr", RFMT, i); | 133 | PRINTREGS(level, regs->sr, "sr", RFMT, i); |
134 | 134 | ||
135 | if (user_mode(regs)) | 135 | if (user) |
136 | print_fr(level, regs); | 136 | print_fr(level, regs); |
137 | 137 | ||
138 | cr30 = mfctl(30); | 138 | cr30 = mfctl(30); |
@@ -145,14 +145,18 @@ void show_regs(struct pt_regs *regs) | |||
145 | printk("%s CPU: %8d CR30: " RFMT " CR31: " RFMT "\n", | 145 | printk("%s CPU: %8d CR30: " RFMT " CR31: " RFMT "\n", |
146 | level, current_thread_info()->cpu, cr30, cr31); | 146 | level, current_thread_info()->cpu, cr30, cr31); |
147 | printk("%s ORIG_R28: " RFMT "\n", level, regs->orig_r28); | 147 | printk("%s ORIG_R28: " RFMT "\n", level, regs->orig_r28); |
148 | printk(level); | 148 | |
149 | print_symbol(" IAOQ[0]: %s\n", regs->iaoq[0]); | 149 | if (user) { |
150 | printk(level); | 150 | printk("%s IAOQ[0]: " RFMT "\n", level, regs->iaoq[0]); |
151 | print_symbol(" IAOQ[1]: %s\n", regs->iaoq[1]); | 151 | printk("%s IAOQ[1]: " RFMT "\n", level, regs->iaoq[1]); |
152 | printk(level); | 152 | printk("%s RP(r2): " RFMT "\n", level, regs->gr[2]); |
153 | print_symbol(" RP(r2): %s\n", regs->gr[2]); | 153 | } else { |
154 | 154 | printk("%s IAOQ[0]: %pS\n", level, (void *) regs->iaoq[0]); | |
155 | parisc_show_stack(current, NULL, regs); | 155 | printk("%s IAOQ[1]: %pS\n", level, (void *) regs->iaoq[1]); |
156 | printk("%s RP(r2): %pS\n", level, (void *) regs->gr[2]); | ||
157 | |||
158 | parisc_show_stack(current, NULL, regs); | ||
159 | } | ||
156 | } | 160 | } |
157 | 161 | ||
158 | 162 | ||
@@ -173,20 +177,15 @@ static void do_show_stack(struct unwind_frame_info *info) | |||
173 | break; | 177 | break; |
174 | 178 | ||
175 | if (__kernel_text_address(info->ip)) { | 179 | if (__kernel_text_address(info->ip)) { |
176 | printk("%s [<" RFMT ">] ", (i&0x3)==1 ? KERN_CRIT : "", info->ip); | 180 | printk(KERN_CRIT " [<" RFMT ">] %pS\n", |
177 | #ifdef CONFIG_KALLSYMS | 181 | info->ip, (void *) info->ip); |
178 | print_symbol("%s\n", info->ip); | ||
179 | #else | ||
180 | if ((i & 0x03) == 0) | ||
181 | printk("\n"); | ||
182 | #endif | ||
183 | i++; | 182 | i++; |
184 | } | 183 | } |
185 | } | 184 | } |
186 | printk("\n"); | 185 | printk(KERN_CRIT "\n"); |
187 | } | 186 | } |
188 | 187 | ||
189 | void parisc_show_stack(struct task_struct *task, unsigned long *sp, | 188 | static void parisc_show_stack(struct task_struct *task, unsigned long *sp, |
190 | struct pt_regs *regs) | 189 | struct pt_regs *regs) |
191 | { | 190 | { |
192 | struct unwind_frame_info info; | 191 | struct unwind_frame_info info; |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 525c13a4de93..adb23ea1c1ef 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -141,7 +141,7 @@ config GENERIC_NVRAM | |||
141 | bool | 141 | bool |
142 | default y if PPC32 | 142 | default y if PPC32 |
143 | 143 | ||
144 | config SCHED_NO_NO_OMIT_FRAME_POINTER | 144 | config SCHED_OMIT_FRAME_POINTER |
145 | bool | 145 | bool |
146 | default y | 146 | default y |
147 | 147 | ||
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 8fc6d72849ae..3d3daa674299 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -41,6 +41,7 @@ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405 | |||
41 | $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 | 41 | $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 |
42 | $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 | 42 | $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 |
43 | $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 | 43 | $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 |
44 | $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 | ||
44 | $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 | 45 | $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 |
45 | $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 | 46 | $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 |
46 | 47 | ||
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 226ff066652b..dea30910c136 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
@@ -18,8 +18,8 @@ | |||
18 | #size-cells = <1>; | 18 | #size-cells = <1>; |
19 | 19 | ||
20 | aliases { | 20 | aliases { |
21 | ethernet0 = &enet0; | 21 | ethernet0 = &enet1; |
22 | ethernet1 = &enet1; | 22 | ethernet1 = &enet0; |
23 | serial0 = &serial0; | 23 | serial0 = &serial0; |
24 | serial1 = &serial1; | 24 | serial1 = &serial1; |
25 | pci0 = &pci0; | 25 | pci0 = &pci0; |
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index 2c9d54a35bc3..4bdbaf4993a1 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
@@ -91,6 +91,14 @@ | |||
91 | interrupts = <18 0x8>; | 91 | interrupts = <18 0x8>; |
92 | interrupt-parent = <&ipic>; | 92 | interrupt-parent = <&ipic>; |
93 | }; | 93 | }; |
94 | |||
95 | mcu_pio: mcu@a { | ||
96 | #gpio-cells = <2>; | ||
97 | compatible = "fsl,mc9s08qg8-mpc8349emitx", | ||
98 | "fsl,mcu-mpc8349emitx"; | ||
99 | reg = <0x0a>; | ||
100 | gpio-controller; | ||
101 | }; | ||
94 | }; | 102 | }; |
95 | 103 | ||
96 | spi@7000 { | 104 | spi@7000 { |
@@ -139,14 +147,6 @@ | |||
139 | interrupt-parent = <&ipic>; | 147 | interrupt-parent = <&ipic>; |
140 | interrupts = <71 8>; | 148 | interrupts = <71 8>; |
141 | }; | 149 | }; |
142 | |||
143 | mcu_pio: mcu@a { | ||
144 | #gpio-cells = <2>; | ||
145 | compatible = "fsl,mc9s08qg8-mpc8349emitx", | ||
146 | "fsl,mcu-mpc8349emitx"; | ||
147 | reg = <0x0a>; | ||
148 | gpio-controller; | ||
149 | }; | ||
150 | }; | 150 | }; |
151 | 151 | ||
152 | usb@22000 { | 152 | usb@22000 { |
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index cadd4652a695..5c69b2fafd32 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts | |||
@@ -90,7 +90,7 @@ | |||
90 | compatible = "fsl,mpc8572-l2-cache-controller"; | 90 | compatible = "fsl,mpc8572-l2-cache-controller"; |
91 | reg = <0x20000 0x1000>; | 91 | reg = <0x20000 0x1000>; |
92 | cache-line-size = <32>; // 32 bytes | 92 | cache-line-size = <32>; // 32 bytes |
93 | cache-size = <0x80000>; // L2, 512K | 93 | cache-size = <0x100000>; // L2, 1M |
94 | interrupt-parent = <&mpic>; | 94 | interrupt-parent = <&mpic>; |
95 | interrupts = <16 2>; | 95 | interrupts = <16 2>; |
96 | }; | 96 | }; |
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig new file mode 100644 index 000000000000..9a9350ded292 --- /dev/null +++ b/arch/powerpc/configs/40x/virtex_defconfig | |||
@@ -0,0 +1,1176 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.28-rc4 | ||
4 | # Fri Nov 14 10:49:16 2008 | ||
5 | # | ||
6 | # CONFIG_PPC64 is not set | ||
7 | |||
8 | # | ||
9 | # Processor support | ||
10 | # | ||
11 | # CONFIG_6xx is not set | ||
12 | # CONFIG_PPC_85xx is not set | ||
13 | # CONFIG_PPC_8xx is not set | ||
14 | CONFIG_40x=y | ||
15 | # CONFIG_44x is not set | ||
16 | # CONFIG_E200 is not set | ||
17 | CONFIG_4xx=y | ||
18 | # CONFIG_PPC_MM_SLICES is not set | ||
19 | CONFIG_NOT_COHERENT_CACHE=y | ||
20 | CONFIG_PPC32=y | ||
21 | CONFIG_WORD_SIZE=32 | ||
22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set | ||
23 | CONFIG_MMU=y | ||
24 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
25 | CONFIG_GENERIC_TIME=y | ||
26 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
27 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
28 | CONFIG_GENERIC_HARDIRQS=y | ||
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | ||
30 | CONFIG_IRQ_PER_CPU=y | ||
31 | CONFIG_STACKTRACE_SUPPORT=y | ||
32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
33 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
36 | CONFIG_GENERIC_HWEIGHT=y | ||
37 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
38 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
39 | CONFIG_GENERIC_GPIO=y | ||
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
41 | CONFIG_PPC=y | ||
42 | CONFIG_EARLY_PRINTK=y | ||
43 | CONFIG_GENERIC_NVRAM=y | ||
44 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
45 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
46 | CONFIG_PPC_OF=y | ||
47 | CONFIG_OF=y | ||
48 | CONFIG_PPC_UDBG_16550=y | ||
49 | # CONFIG_GENERIC_TBSYNC is not set | ||
50 | CONFIG_AUDIT_ARCH=y | ||
51 | CONFIG_GENERIC_BUG=y | ||
52 | # CONFIG_DEFAULT_UIMAGE is not set | ||
53 | CONFIG_PPC_DCR_NATIVE=y | ||
54 | # CONFIG_PPC_DCR_MMIO is not set | ||
55 | CONFIG_PPC_DCR=y | ||
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
57 | |||
58 | # | ||
59 | # General setup | ||
60 | # | ||
61 | CONFIG_EXPERIMENTAL=y | ||
62 | CONFIG_BROKEN_ON_SMP=y | ||
63 | CONFIG_LOCK_KERNEL=y | ||
64 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
65 | CONFIG_LOCALVERSION="" | ||
66 | # CONFIG_LOCALVERSION_AUTO is not set | ||
67 | CONFIG_SWAP=y | ||
68 | CONFIG_SYSVIPC=y | ||
69 | CONFIG_SYSVIPC_SYSCTL=y | ||
70 | CONFIG_POSIX_MQUEUE=y | ||
71 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
72 | # CONFIG_TASKSTATS is not set | ||
73 | # CONFIG_AUDIT is not set | ||
74 | CONFIG_IKCONFIG=y | ||
75 | CONFIG_IKCONFIG_PROC=y | ||
76 | CONFIG_LOG_BUF_SHIFT=14 | ||
77 | # CONFIG_CGROUPS is not set | ||
78 | # CONFIG_GROUP_SCHED is not set | ||
79 | CONFIG_SYSFS_DEPRECATED=y | ||
80 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
81 | # CONFIG_RELAY is not set | ||
82 | CONFIG_NAMESPACES=y | ||
83 | # CONFIG_UTS_NS is not set | ||
84 | # CONFIG_IPC_NS is not set | ||
85 | # CONFIG_USER_NS is not set | ||
86 | # CONFIG_PID_NS is not set | ||
87 | CONFIG_BLK_DEV_INITRD=y | ||
88 | CONFIG_INITRAMFS_SOURCE="" | ||
89 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
90 | CONFIG_SYSCTL=y | ||
91 | # CONFIG_EMBEDDED is not set | ||
92 | CONFIG_SYSCTL_SYSCALL=y | ||
93 | CONFIG_KALLSYMS=y | ||
94 | # CONFIG_KALLSYMS_ALL is not set | ||
95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
96 | CONFIG_HOTPLUG=y | ||
97 | CONFIG_PRINTK=y | ||
98 | CONFIG_BUG=y | ||
99 | CONFIG_ELF_CORE=y | ||
100 | CONFIG_COMPAT_BRK=y | ||
101 | CONFIG_BASE_FULL=y | ||
102 | CONFIG_FUTEX=y | ||
103 | CONFIG_ANON_INODES=y | ||
104 | CONFIG_EPOLL=y | ||
105 | CONFIG_SIGNALFD=y | ||
106 | CONFIG_TIMERFD=y | ||
107 | CONFIG_EVENTFD=y | ||
108 | CONFIG_SHMEM=y | ||
109 | CONFIG_AIO=y | ||
110 | CONFIG_VM_EVENT_COUNTERS=y | ||
111 | CONFIG_PCI_QUIRKS=y | ||
112 | CONFIG_SLAB=y | ||
113 | # CONFIG_SLUB is not set | ||
114 | # CONFIG_SLOB is not set | ||
115 | # CONFIG_PROFILING is not set | ||
116 | # CONFIG_MARKERS is not set | ||
117 | CONFIG_HAVE_OPROFILE=y | ||
118 | # CONFIG_KPROBES is not set | ||
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
121 | CONFIG_HAVE_KPROBES=y | ||
122 | CONFIG_HAVE_KRETPROBES=y | ||
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
125 | CONFIG_SLABINFO=y | ||
126 | CONFIG_RT_MUTEXES=y | ||
127 | # CONFIG_TINY_SHMEM is not set | ||
128 | CONFIG_BASE_SMALL=0 | ||
129 | CONFIG_MODULES=y | ||
130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
131 | CONFIG_MODULE_UNLOAD=y | ||
132 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
133 | CONFIG_MODVERSIONS=y | ||
134 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
135 | CONFIG_KMOD=y | ||
136 | CONFIG_BLOCK=y | ||
137 | # CONFIG_LBD is not set | ||
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
139 | # CONFIG_LSF is not set | ||
140 | # CONFIG_BLK_DEV_BSG is not set | ||
141 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
142 | |||
143 | # | ||
144 | # IO Schedulers | ||
145 | # | ||
146 | CONFIG_IOSCHED_NOOP=y | ||
147 | CONFIG_IOSCHED_AS=y | ||
148 | CONFIG_IOSCHED_DEADLINE=y | ||
149 | CONFIG_IOSCHED_CFQ=y | ||
150 | # CONFIG_DEFAULT_AS is not set | ||
151 | # CONFIG_DEFAULT_DEADLINE is not set | ||
152 | CONFIG_DEFAULT_CFQ=y | ||
153 | # CONFIG_DEFAULT_NOOP is not set | ||
154 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
155 | CONFIG_CLASSIC_RCU=y | ||
156 | # CONFIG_FREEZER is not set | ||
157 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | ||
158 | |||
159 | # | ||
160 | # Platform support | ||
161 | # | ||
162 | # CONFIG_PPC_CELL is not set | ||
163 | # CONFIG_PPC_CELL_NATIVE is not set | ||
164 | # CONFIG_PQ2ADS is not set | ||
165 | # CONFIG_PPC4xx_GPIO is not set | ||
166 | CONFIG_XILINX_VIRTEX=y | ||
167 | # CONFIG_ACADIA is not set | ||
168 | # CONFIG_EP405 is not set | ||
169 | # CONFIG_HCU4 is not set | ||
170 | # CONFIG_KILAUEA is not set | ||
171 | # CONFIG_MAKALU is not set | ||
172 | # CONFIG_WALNUT is not set | ||
173 | CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y | ||
174 | # CONFIG_PPC40x_SIMPLE is not set | ||
175 | CONFIG_XILINX_VIRTEX_II_PRO=y | ||
176 | CONFIG_XILINX_VIRTEX_4_FX=y | ||
177 | CONFIG_IBM405_ERR77=y | ||
178 | CONFIG_IBM405_ERR51=y | ||
179 | # CONFIG_IPIC is not set | ||
180 | # CONFIG_MPIC is not set | ||
181 | # CONFIG_MPIC_WEIRD is not set | ||
182 | # CONFIG_PPC_I8259 is not set | ||
183 | # CONFIG_PPC_RTAS is not set | ||
184 | # CONFIG_MMIO_NVRAM is not set | ||
185 | # CONFIG_PPC_MPC106 is not set | ||
186 | # CONFIG_PPC_970_NAP is not set | ||
187 | # CONFIG_PPC_INDIRECT_IO is not set | ||
188 | # CONFIG_GENERIC_IOMAP is not set | ||
189 | # CONFIG_CPU_FREQ is not set | ||
190 | # CONFIG_FSL_ULI1575 is not set | ||
191 | |||
192 | # | ||
193 | # Kernel options | ||
194 | # | ||
195 | # CONFIG_HIGHMEM is not set | ||
196 | # CONFIG_NO_HZ is not set | ||
197 | # CONFIG_HIGH_RES_TIMERS is not set | ||
198 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
199 | # CONFIG_HZ_100 is not set | ||
200 | CONFIG_HZ_250=y | ||
201 | # CONFIG_HZ_300 is not set | ||
202 | # CONFIG_HZ_1000 is not set | ||
203 | CONFIG_HZ=250 | ||
204 | # CONFIG_SCHED_HRTICK is not set | ||
205 | # CONFIG_PREEMPT_NONE is not set | ||
206 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
207 | CONFIG_PREEMPT=y | ||
208 | # CONFIG_PREEMPT_RCU is not set | ||
209 | CONFIG_BINFMT_ELF=y | ||
210 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
211 | # CONFIG_HAVE_AOUT is not set | ||
212 | # CONFIG_BINFMT_MISC is not set | ||
213 | CONFIG_MATH_EMULATION=y | ||
214 | # CONFIG_IOMMU_HELPER is not set | ||
215 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
216 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
217 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
218 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
219 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
220 | CONFIG_SELECT_MEMORY_MODEL=y | ||
221 | CONFIG_FLATMEM_MANUAL=y | ||
222 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
223 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
224 | CONFIG_FLATMEM=y | ||
225 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
228 | CONFIG_MIGRATION=y | ||
229 | CONFIG_RESOURCES_64BIT=y | ||
230 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
231 | CONFIG_ZONE_DMA_FLAG=1 | ||
232 | CONFIG_BOUNCE=y | ||
233 | CONFIG_VIRT_TO_BUS=y | ||
234 | CONFIG_UNEVICTABLE_LRU=y | ||
235 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
236 | CONFIG_PROC_DEVICETREE=y | ||
237 | CONFIG_CMDLINE_BOOL=y | ||
238 | CONFIG_CMDLINE="" | ||
239 | CONFIG_EXTRA_TARGETS="" | ||
240 | # CONFIG_PM is not set | ||
241 | CONFIG_SECCOMP=y | ||
242 | CONFIG_ISA_DMA_API=y | ||
243 | |||
244 | # | ||
245 | # Bus options | ||
246 | # | ||
247 | CONFIG_ZONE_DMA=y | ||
248 | CONFIG_PPC_INDIRECT_PCI=y | ||
249 | CONFIG_4xx_SOC=y | ||
250 | CONFIG_PPC_PCI_CHOICE=y | ||
251 | CONFIG_PCI=y | ||
252 | CONFIG_PCI_DOMAINS=y | ||
253 | CONFIG_PCI_SYSCALL=y | ||
254 | # CONFIG_PCIEPORTBUS is not set | ||
255 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
256 | # CONFIG_PCI_MSI is not set | ||
257 | CONFIG_PCI_LEGACY=y | ||
258 | # CONFIG_PCI_DEBUG is not set | ||
259 | # CONFIG_PCCARD is not set | ||
260 | # CONFIG_HOTPLUG_PCI is not set | ||
261 | # CONFIG_HAS_RAPIDIO is not set | ||
262 | |||
263 | # | ||
264 | # Advanced setup | ||
265 | # | ||
266 | # CONFIG_ADVANCED_OPTIONS is not set | ||
267 | |||
268 | # | ||
269 | # Default settings for advanced configuration options are used | ||
270 | # | ||
271 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
273 | CONFIG_KERNEL_START=0xc0000000 | ||
274 | CONFIG_PHYSICAL_START=0x00000000 | ||
275 | CONFIG_TASK_SIZE=0xc0000000 | ||
276 | CONFIG_CONSISTENT_START=0xff100000 | ||
277 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
278 | CONFIG_NET=y | ||
279 | |||
280 | # | ||
281 | # Networking options | ||
282 | # | ||
283 | CONFIG_PACKET=y | ||
284 | # CONFIG_PACKET_MMAP is not set | ||
285 | CONFIG_UNIX=y | ||
286 | CONFIG_XFRM=y | ||
287 | # CONFIG_XFRM_USER is not set | ||
288 | # CONFIG_XFRM_SUB_POLICY is not set | ||
289 | # CONFIG_XFRM_MIGRATE is not set | ||
290 | # CONFIG_XFRM_STATISTICS is not set | ||
291 | # CONFIG_NET_KEY is not set | ||
292 | CONFIG_INET=y | ||
293 | CONFIG_IP_MULTICAST=y | ||
294 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
295 | CONFIG_IP_FIB_HASH=y | ||
296 | CONFIG_IP_PNP=y | ||
297 | CONFIG_IP_PNP_DHCP=y | ||
298 | CONFIG_IP_PNP_BOOTP=y | ||
299 | # CONFIG_IP_PNP_RARP is not set | ||
300 | # CONFIG_NET_IPIP is not set | ||
301 | # CONFIG_NET_IPGRE is not set | ||
302 | # CONFIG_IP_MROUTE is not set | ||
303 | # CONFIG_ARPD is not set | ||
304 | # CONFIG_SYN_COOKIES is not set | ||
305 | # CONFIG_INET_AH is not set | ||
306 | # CONFIG_INET_ESP is not set | ||
307 | # CONFIG_INET_IPCOMP is not set | ||
308 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
309 | CONFIG_INET_TUNNEL=m | ||
310 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
311 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
312 | CONFIG_INET_XFRM_MODE_BEET=y | ||
313 | # CONFIG_INET_LRO is not set | ||
314 | CONFIG_INET_DIAG=y | ||
315 | CONFIG_INET_TCP_DIAG=y | ||
316 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
317 | CONFIG_TCP_CONG_CUBIC=y | ||
318 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
319 | # CONFIG_TCP_MD5SIG is not set | ||
320 | CONFIG_IPV6=m | ||
321 | # CONFIG_IPV6_PRIVACY is not set | ||
322 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
323 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
324 | # CONFIG_INET6_AH is not set | ||
325 | # CONFIG_INET6_ESP is not set | ||
326 | # CONFIG_INET6_IPCOMP is not set | ||
327 | # CONFIG_IPV6_MIP6 is not set | ||
328 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
329 | # CONFIG_INET6_TUNNEL is not set | ||
330 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
331 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
332 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
333 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
334 | CONFIG_IPV6_SIT=m | ||
335 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
336 | # CONFIG_IPV6_TUNNEL is not set | ||
337 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
338 | # CONFIG_IPV6_MROUTE is not set | ||
339 | # CONFIG_NETWORK_SECMARK is not set | ||
340 | CONFIG_NETFILTER=y | ||
341 | # CONFIG_NETFILTER_DEBUG is not set | ||
342 | CONFIG_NETFILTER_ADVANCED=y | ||
343 | |||
344 | # | ||
345 | # Core Netfilter Configuration | ||
346 | # | ||
347 | # CONFIG_NETFILTER_NETLINK_QUEUE is not set | ||
348 | # CONFIG_NETFILTER_NETLINK_LOG is not set | ||
349 | # CONFIG_NF_CONNTRACK is not set | ||
350 | CONFIG_NETFILTER_XTABLES=m | ||
351 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set | ||
352 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | ||
353 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set | ||
354 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | ||
355 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | ||
356 | # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set | ||
357 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | ||
358 | # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set | ||
359 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set | ||
360 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | ||
361 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | ||
362 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set | ||
363 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
364 | # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set | ||
365 | # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set | ||
366 | # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set | ||
367 | # CONFIG_NETFILTER_XT_MATCH_MAC is not set | ||
368 | # CONFIG_NETFILTER_XT_MATCH_MARK is not set | ||
369 | # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set | ||
370 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set | ||
371 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
372 | # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set | ||
373 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set | ||
374 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set | ||
375 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set | ||
376 | # CONFIG_NETFILTER_XT_MATCH_RECENT is not set | ||
377 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set | ||
378 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | ||
379 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set | ||
380 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set | ||
381 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set | ||
382 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
383 | # CONFIG_IP_VS is not set | ||
384 | |||
385 | # | ||
386 | # IP: Netfilter Configuration | ||
387 | # | ||
388 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
389 | # CONFIG_IP_NF_QUEUE is not set | ||
390 | CONFIG_IP_NF_IPTABLES=m | ||
391 | # CONFIG_IP_NF_MATCH_ADDRTYPE is not set | ||
392 | # CONFIG_IP_NF_MATCH_AH is not set | ||
393 | # CONFIG_IP_NF_MATCH_ECN is not set | ||
394 | # CONFIG_IP_NF_MATCH_TTL is not set | ||
395 | CONFIG_IP_NF_FILTER=m | ||
396 | # CONFIG_IP_NF_TARGET_REJECT is not set | ||
397 | # CONFIG_IP_NF_TARGET_LOG is not set | ||
398 | # CONFIG_IP_NF_TARGET_ULOG is not set | ||
399 | CONFIG_IP_NF_MANGLE=m | ||
400 | # CONFIG_IP_NF_TARGET_ECN is not set | ||
401 | # CONFIG_IP_NF_TARGET_TTL is not set | ||
402 | # CONFIG_IP_NF_RAW is not set | ||
403 | # CONFIG_IP_NF_ARPTABLES is not set | ||
404 | |||
405 | # | ||
406 | # IPv6: Netfilter Configuration | ||
407 | # | ||
408 | # CONFIG_IP6_NF_QUEUE is not set | ||
409 | # CONFIG_IP6_NF_IPTABLES is not set | ||
410 | # CONFIG_IP_DCCP is not set | ||
411 | # CONFIG_IP_SCTP is not set | ||
412 | # CONFIG_TIPC is not set | ||
413 | # CONFIG_ATM is not set | ||
414 | # CONFIG_BRIDGE is not set | ||
415 | # CONFIG_NET_DSA is not set | ||
416 | # CONFIG_VLAN_8021Q is not set | ||
417 | # CONFIG_DECNET is not set | ||
418 | # CONFIG_LLC2 is not set | ||
419 | # CONFIG_IPX is not set | ||
420 | # CONFIG_ATALK is not set | ||
421 | # CONFIG_X25 is not set | ||
422 | # CONFIG_LAPB is not set | ||
423 | # CONFIG_ECONET is not set | ||
424 | # CONFIG_WAN_ROUTER is not set | ||
425 | # CONFIG_NET_SCHED is not set | ||
426 | |||
427 | # | ||
428 | # Network testing | ||
429 | # | ||
430 | # CONFIG_NET_PKTGEN is not set | ||
431 | # CONFIG_HAMRADIO is not set | ||
432 | # CONFIG_CAN is not set | ||
433 | # CONFIG_IRDA is not set | ||
434 | # CONFIG_BT is not set | ||
435 | # CONFIG_AF_RXRPC is not set | ||
436 | # CONFIG_PHONET is not set | ||
437 | CONFIG_WIRELESS=y | ||
438 | # CONFIG_CFG80211 is not set | ||
439 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
440 | # CONFIG_WIRELESS_EXT is not set | ||
441 | # CONFIG_MAC80211 is not set | ||
442 | # CONFIG_IEEE80211 is not set | ||
443 | # CONFIG_RFKILL is not set | ||
444 | # CONFIG_NET_9P is not set | ||
445 | |||
446 | # | ||
447 | # Device Drivers | ||
448 | # | ||
449 | |||
450 | # | ||
451 | # Generic Driver Options | ||
452 | # | ||
453 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
454 | CONFIG_STANDALONE=y | ||
455 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
456 | CONFIG_FW_LOADER=y | ||
457 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
458 | CONFIG_EXTRA_FIRMWARE="" | ||
459 | # CONFIG_DEBUG_DRIVER is not set | ||
460 | # CONFIG_DEBUG_DEVRES is not set | ||
461 | # CONFIG_SYS_HYPERVISOR is not set | ||
462 | # CONFIG_CONNECTOR is not set | ||
463 | # CONFIG_MTD is not set | ||
464 | CONFIG_OF_DEVICE=y | ||
465 | CONFIG_OF_GPIO=y | ||
466 | # CONFIG_PARPORT is not set | ||
467 | CONFIG_BLK_DEV=y | ||
468 | # CONFIG_BLK_DEV_FD is not set | ||
469 | # CONFIG_BLK_CPQ_DA is not set | ||
470 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
471 | # CONFIG_BLK_DEV_DAC960 is not set | ||
472 | # CONFIG_BLK_DEV_UMEM is not set | ||
473 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
474 | CONFIG_BLK_DEV_LOOP=y | ||
475 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
476 | # CONFIG_BLK_DEV_NBD is not set | ||
477 | # CONFIG_BLK_DEV_SX8 is not set | ||
478 | CONFIG_BLK_DEV_RAM=y | ||
479 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
480 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
481 | # CONFIG_BLK_DEV_XIP is not set | ||
482 | # CONFIG_CDROM_PKTCDVD is not set | ||
483 | # CONFIG_ATA_OVER_ETH is not set | ||
484 | CONFIG_XILINX_SYSACE=y | ||
485 | # CONFIG_BLK_DEV_HD is not set | ||
486 | CONFIG_MISC_DEVICES=y | ||
487 | # CONFIG_PHANTOM is not set | ||
488 | # CONFIG_EEPROM_93CX6 is not set | ||
489 | # CONFIG_SGI_IOC4 is not set | ||
490 | # CONFIG_TIFM_CORE is not set | ||
491 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
492 | # CONFIG_HP_ILO is not set | ||
493 | # CONFIG_C2PORT is not set | ||
494 | CONFIG_HAVE_IDE=y | ||
495 | # CONFIG_IDE is not set | ||
496 | |||
497 | # | ||
498 | # SCSI device support | ||
499 | # | ||
500 | # CONFIG_RAID_ATTRS is not set | ||
501 | # CONFIG_SCSI is not set | ||
502 | # CONFIG_SCSI_DMA is not set | ||
503 | # CONFIG_SCSI_NETLINK is not set | ||
504 | # CONFIG_ATA is not set | ||
505 | # CONFIG_MD is not set | ||
506 | # CONFIG_FUSION is not set | ||
507 | |||
508 | # | ||
509 | # IEEE 1394 (FireWire) support | ||
510 | # | ||
511 | |||
512 | # | ||
513 | # Enable only one of the two stacks, unless you know what you are doing | ||
514 | # | ||
515 | # CONFIG_FIREWIRE is not set | ||
516 | # CONFIG_IEEE1394 is not set | ||
517 | # CONFIG_I2O is not set | ||
518 | # CONFIG_MACINTOSH_DRIVERS is not set | ||
519 | CONFIG_NETDEVICES=y | ||
520 | # CONFIG_DUMMY is not set | ||
521 | # CONFIG_BONDING is not set | ||
522 | # CONFIG_MACVLAN is not set | ||
523 | # CONFIG_EQUALIZER is not set | ||
524 | # CONFIG_TUN is not set | ||
525 | # CONFIG_VETH is not set | ||
526 | # CONFIG_ARCNET is not set | ||
527 | # CONFIG_PHYLIB is not set | ||
528 | CONFIG_NET_ETHERNET=y | ||
529 | CONFIG_MII=y | ||
530 | # CONFIG_HAPPYMEAL is not set | ||
531 | # CONFIG_SUNGEM is not set | ||
532 | # CONFIG_CASSINI is not set | ||
533 | # CONFIG_NET_VENDOR_3COM is not set | ||
534 | # CONFIG_NET_TULIP is not set | ||
535 | # CONFIG_HP100 is not set | ||
536 | # CONFIG_IBM_NEW_EMAC is not set | ||
537 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
538 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
539 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
540 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
541 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
542 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
543 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
544 | # CONFIG_NET_PCI is not set | ||
545 | # CONFIG_B44 is not set | ||
546 | # CONFIG_ATL2 is not set | ||
547 | CONFIG_NETDEV_1000=y | ||
548 | # CONFIG_ACENIC is not set | ||
549 | # CONFIG_DL2K is not set | ||
550 | # CONFIG_E1000 is not set | ||
551 | # CONFIG_E1000E is not set | ||
552 | # CONFIG_IP1000 is not set | ||
553 | # CONFIG_IGB is not set | ||
554 | # CONFIG_NS83820 is not set | ||
555 | # CONFIG_HAMACHI is not set | ||
556 | # CONFIG_YELLOWFIN is not set | ||
557 | # CONFIG_R8169 is not set | ||
558 | # CONFIG_SIS190 is not set | ||
559 | # CONFIG_SKGE is not set | ||
560 | # CONFIG_SKY2 is not set | ||
561 | # CONFIG_VIA_VELOCITY is not set | ||
562 | # CONFIG_TIGON3 is not set | ||
563 | # CONFIG_BNX2 is not set | ||
564 | # CONFIG_QLA3XXX is not set | ||
565 | # CONFIG_ATL1 is not set | ||
566 | # CONFIG_ATL1E is not set | ||
567 | # CONFIG_JME is not set | ||
568 | # CONFIG_NETDEV_10000 is not set | ||
569 | # CONFIG_TR is not set | ||
570 | |||
571 | # | ||
572 | # Wireless LAN | ||
573 | # | ||
574 | # CONFIG_WLAN_PRE80211 is not set | ||
575 | # CONFIG_WLAN_80211 is not set | ||
576 | # CONFIG_IWLWIFI_LEDS is not set | ||
577 | # CONFIG_WAN is not set | ||
578 | # CONFIG_FDDI is not set | ||
579 | # CONFIG_HIPPI is not set | ||
580 | # CONFIG_PPP is not set | ||
581 | # CONFIG_SLIP is not set | ||
582 | # CONFIG_NETCONSOLE is not set | ||
583 | # CONFIG_NETPOLL is not set | ||
584 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
585 | # CONFIG_ISDN is not set | ||
586 | # CONFIG_PHONE is not set | ||
587 | |||
588 | # | ||
589 | # Input device support | ||
590 | # | ||
591 | CONFIG_INPUT=y | ||
592 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
593 | # CONFIG_INPUT_POLLDEV is not set | ||
594 | |||
595 | # | ||
596 | # Userland interfaces | ||
597 | # | ||
598 | CONFIG_INPUT_MOUSEDEV=y | ||
599 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
600 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
601 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
602 | # CONFIG_INPUT_JOYDEV is not set | ||
603 | # CONFIG_INPUT_EVDEV is not set | ||
604 | # CONFIG_INPUT_EVBUG is not set | ||
605 | |||
606 | # | ||
607 | # Input Device Drivers | ||
608 | # | ||
609 | CONFIG_INPUT_KEYBOARD=y | ||
610 | CONFIG_KEYBOARD_ATKBD=y | ||
611 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
612 | # CONFIG_KEYBOARD_LKKBD is not set | ||
613 | # CONFIG_KEYBOARD_XTKBD is not set | ||
614 | # CONFIG_KEYBOARD_NEWTON is not set | ||
615 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
616 | # CONFIG_KEYBOARD_GPIO is not set | ||
617 | CONFIG_INPUT_MOUSE=y | ||
618 | CONFIG_MOUSE_PS2=y | ||
619 | CONFIG_MOUSE_PS2_ALPS=y | ||
620 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
621 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
622 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
623 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
624 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
625 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
626 | # CONFIG_MOUSE_SERIAL is not set | ||
627 | # CONFIG_MOUSE_VSXXXAA is not set | ||
628 | # CONFIG_MOUSE_GPIO is not set | ||
629 | # CONFIG_INPUT_JOYSTICK is not set | ||
630 | # CONFIG_INPUT_TABLET is not set | ||
631 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
632 | # CONFIG_INPUT_MISC is not set | ||
633 | |||
634 | # | ||
635 | # Hardware I/O ports | ||
636 | # | ||
637 | CONFIG_SERIO=y | ||
638 | # CONFIG_SERIO_I8042 is not set | ||
639 | # CONFIG_SERIO_SERPORT is not set | ||
640 | # CONFIG_SERIO_PCIPS2 is not set | ||
641 | CONFIG_SERIO_LIBPS2=y | ||
642 | # CONFIG_SERIO_RAW is not set | ||
643 | CONFIG_SERIO_XILINX_XPS_PS2=y | ||
644 | # CONFIG_GAMEPORT is not set | ||
645 | |||
646 | # | ||
647 | # Character devices | ||
648 | # | ||
649 | CONFIG_VT=y | ||
650 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
651 | CONFIG_VT_CONSOLE=y | ||
652 | CONFIG_HW_CONSOLE=y | ||
653 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
654 | CONFIG_DEVKMEM=y | ||
655 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
656 | # CONFIG_NOZOMI is not set | ||
657 | |||
658 | # | ||
659 | # Serial drivers | ||
660 | # | ||
661 | CONFIG_SERIAL_8250=y | ||
662 | CONFIG_SERIAL_8250_CONSOLE=y | ||
663 | CONFIG_SERIAL_8250_PCI=y | ||
664 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
665 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
666 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
667 | |||
668 | # | ||
669 | # Non-8250 serial port support | ||
670 | # | ||
671 | CONFIG_SERIAL_UARTLITE=y | ||
672 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | ||
673 | CONFIG_SERIAL_CORE=y | ||
674 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
675 | # CONFIG_SERIAL_JSM is not set | ||
676 | # CONFIG_SERIAL_OF_PLATFORM is not set | ||
677 | CONFIG_UNIX98_PTYS=y | ||
678 | CONFIG_LEGACY_PTYS=y | ||
679 | CONFIG_LEGACY_PTY_COUNT=256 | ||
680 | # CONFIG_IPMI_HANDLER is not set | ||
681 | CONFIG_HW_RANDOM=m | ||
682 | # CONFIG_NVRAM is not set | ||
683 | # CONFIG_GEN_RTC is not set | ||
684 | CONFIG_XILINX_HWICAP=y | ||
685 | # CONFIG_R3964 is not set | ||
686 | # CONFIG_APPLICOM is not set | ||
687 | # CONFIG_RAW_DRIVER is not set | ||
688 | # CONFIG_TCG_TPM is not set | ||
689 | CONFIG_DEVPORT=y | ||
690 | # CONFIG_I2C is not set | ||
691 | # CONFIG_SPI is not set | ||
692 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
693 | CONFIG_GPIOLIB=y | ||
694 | # CONFIG_DEBUG_GPIO is not set | ||
695 | CONFIG_GPIO_SYSFS=y | ||
696 | |||
697 | # | ||
698 | # Memory mapped GPIO expanders: | ||
699 | # | ||
700 | CONFIG_GPIO_XILINX=y | ||
701 | |||
702 | # | ||
703 | # I2C GPIO expanders: | ||
704 | # | ||
705 | |||
706 | # | ||
707 | # PCI GPIO expanders: | ||
708 | # | ||
709 | # CONFIG_GPIO_BT8XX is not set | ||
710 | |||
711 | # | ||
712 | # SPI GPIO expanders: | ||
713 | # | ||
714 | # CONFIG_W1 is not set | ||
715 | # CONFIG_POWER_SUPPLY is not set | ||
716 | # CONFIG_HWMON is not set | ||
717 | # CONFIG_THERMAL is not set | ||
718 | # CONFIG_THERMAL_HWMON is not set | ||
719 | # CONFIG_WATCHDOG is not set | ||
720 | CONFIG_SSB_POSSIBLE=y | ||
721 | |||
722 | # | ||
723 | # Sonics Silicon Backplane | ||
724 | # | ||
725 | # CONFIG_SSB is not set | ||
726 | |||
727 | # | ||
728 | # Multifunction device drivers | ||
729 | # | ||
730 | # CONFIG_MFD_CORE is not set | ||
731 | # CONFIG_MFD_SM501 is not set | ||
732 | # CONFIG_HTC_PASIC3 is not set | ||
733 | # CONFIG_MFD_TMIO is not set | ||
734 | # CONFIG_REGULATOR is not set | ||
735 | |||
736 | # | ||
737 | # Multimedia devices | ||
738 | # | ||
739 | |||
740 | # | ||
741 | # Multimedia core support | ||
742 | # | ||
743 | # CONFIG_VIDEO_DEV is not set | ||
744 | # CONFIG_DVB_CORE is not set | ||
745 | # CONFIG_VIDEO_MEDIA is not set | ||
746 | |||
747 | # | ||
748 | # Multimedia drivers | ||
749 | # | ||
750 | # CONFIG_DAB is not set | ||
751 | |||
752 | # | ||
753 | # Graphics support | ||
754 | # | ||
755 | # CONFIG_AGP is not set | ||
756 | # CONFIG_DRM is not set | ||
757 | # CONFIG_VGASTATE is not set | ||
758 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
759 | CONFIG_FB=y | ||
760 | # CONFIG_FIRMWARE_EDID is not set | ||
761 | # CONFIG_FB_DDC is not set | ||
762 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
763 | CONFIG_FB_CFB_FILLRECT=y | ||
764 | CONFIG_FB_CFB_COPYAREA=y | ||
765 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
766 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
767 | # CONFIG_FB_SYS_FILLRECT is not set | ||
768 | # CONFIG_FB_SYS_COPYAREA is not set | ||
769 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
770 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
771 | # CONFIG_FB_SYS_FOPS is not set | ||
772 | # CONFIG_FB_SVGALIB is not set | ||
773 | # CONFIG_FB_MACMODES is not set | ||
774 | # CONFIG_FB_BACKLIGHT is not set | ||
775 | # CONFIG_FB_MODE_HELPERS is not set | ||
776 | # CONFIG_FB_TILEBLITTING is not set | ||
777 | |||
778 | # | ||
779 | # Frame buffer hardware drivers | ||
780 | # | ||
781 | # CONFIG_FB_CIRRUS is not set | ||
782 | # CONFIG_FB_PM2 is not set | ||
783 | # CONFIG_FB_CYBER2000 is not set | ||
784 | # CONFIG_FB_OF is not set | ||
785 | # CONFIG_FB_CT65550 is not set | ||
786 | # CONFIG_FB_ASILIANT is not set | ||
787 | # CONFIG_FB_IMSTT is not set | ||
788 | # CONFIG_FB_VGA16 is not set | ||
789 | # CONFIG_FB_S1D13XXX is not set | ||
790 | # CONFIG_FB_NVIDIA is not set | ||
791 | # CONFIG_FB_RIVA is not set | ||
792 | # CONFIG_FB_MATROX is not set | ||
793 | # CONFIG_FB_RADEON is not set | ||
794 | # CONFIG_FB_ATY128 is not set | ||
795 | # CONFIG_FB_ATY is not set | ||
796 | # CONFIG_FB_S3 is not set | ||
797 | # CONFIG_FB_SAVAGE is not set | ||
798 | # CONFIG_FB_SIS is not set | ||
799 | # CONFIG_FB_VIA is not set | ||
800 | # CONFIG_FB_NEOMAGIC is not set | ||
801 | # CONFIG_FB_KYRO is not set | ||
802 | # CONFIG_FB_3DFX is not set | ||
803 | # CONFIG_FB_VOODOO1 is not set | ||
804 | # CONFIG_FB_VT8623 is not set | ||
805 | # CONFIG_FB_TRIDENT is not set | ||
806 | # CONFIG_FB_ARK is not set | ||
807 | # CONFIG_FB_PM3 is not set | ||
808 | # CONFIG_FB_CARMINE is not set | ||
809 | # CONFIG_FB_IBM_GXT4500 is not set | ||
810 | CONFIG_FB_XILINX=y | ||
811 | # CONFIG_FB_VIRTUAL is not set | ||
812 | # CONFIG_FB_METRONOME is not set | ||
813 | # CONFIG_FB_MB862XX is not set | ||
814 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
815 | |||
816 | # | ||
817 | # Display device support | ||
818 | # | ||
819 | # CONFIG_DISPLAY_SUPPORT is not set | ||
820 | |||
821 | # | ||
822 | # Console display driver support | ||
823 | # | ||
824 | CONFIG_DUMMY_CONSOLE=y | ||
825 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
826 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
827 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
828 | CONFIG_FONTS=y | ||
829 | CONFIG_FONT_8x8=y | ||
830 | CONFIG_FONT_8x16=y | ||
831 | # CONFIG_FONT_6x11 is not set | ||
832 | # CONFIG_FONT_7x14 is not set | ||
833 | # CONFIG_FONT_PEARL_8x8 is not set | ||
834 | # CONFIG_FONT_ACORN_8x8 is not set | ||
835 | # CONFIG_FONT_MINI_4x6 is not set | ||
836 | # CONFIG_FONT_SUN8x16 is not set | ||
837 | # CONFIG_FONT_SUN12x22 is not set | ||
838 | # CONFIG_FONT_10x18 is not set | ||
839 | CONFIG_LOGO=y | ||
840 | CONFIG_LOGO_LINUX_MONO=y | ||
841 | CONFIG_LOGO_LINUX_VGA16=y | ||
842 | CONFIG_LOGO_LINUX_CLUT224=y | ||
843 | # CONFIG_SOUND is not set | ||
844 | # CONFIG_HID_SUPPORT is not set | ||
845 | # CONFIG_USB_SUPPORT is not set | ||
846 | # CONFIG_UWB is not set | ||
847 | # CONFIG_MMC is not set | ||
848 | # CONFIG_MEMSTICK is not set | ||
849 | # CONFIG_NEW_LEDS is not set | ||
850 | # CONFIG_ACCESSIBILITY is not set | ||
851 | # CONFIG_INFINIBAND is not set | ||
852 | # CONFIG_EDAC is not set | ||
853 | # CONFIG_RTC_CLASS is not set | ||
854 | # CONFIG_DMADEVICES is not set | ||
855 | # CONFIG_UIO is not set | ||
856 | # CONFIG_STAGING is not set | ||
857 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
858 | |||
859 | # | ||
860 | # File systems | ||
861 | # | ||
862 | CONFIG_EXT2_FS=y | ||
863 | # CONFIG_EXT2_FS_XATTR is not set | ||
864 | # CONFIG_EXT2_FS_XIP is not set | ||
865 | # CONFIG_EXT3_FS is not set | ||
866 | # CONFIG_EXT4_FS is not set | ||
867 | # CONFIG_REISERFS_FS is not set | ||
868 | # CONFIG_JFS_FS is not set | ||
869 | # CONFIG_FS_POSIX_ACL is not set | ||
870 | CONFIG_FILE_LOCKING=y | ||
871 | # CONFIG_XFS_FS is not set | ||
872 | # CONFIG_OCFS2_FS is not set | ||
873 | CONFIG_DNOTIFY=y | ||
874 | CONFIG_INOTIFY=y | ||
875 | CONFIG_INOTIFY_USER=y | ||
876 | # CONFIG_QUOTA is not set | ||
877 | CONFIG_AUTOFS_FS=y | ||
878 | CONFIG_AUTOFS4_FS=y | ||
879 | # CONFIG_FUSE_FS is not set | ||
880 | |||
881 | # | ||
882 | # CD-ROM/DVD Filesystems | ||
883 | # | ||
884 | # CONFIG_ISO9660_FS is not set | ||
885 | # CONFIG_UDF_FS is not set | ||
886 | |||
887 | # | ||
888 | # DOS/FAT/NT Filesystems | ||
889 | # | ||
890 | CONFIG_FAT_FS=y | ||
891 | CONFIG_MSDOS_FS=y | ||
892 | CONFIG_VFAT_FS=y | ||
893 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
894 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
895 | # CONFIG_NTFS_FS is not set | ||
896 | |||
897 | # | ||
898 | # Pseudo filesystems | ||
899 | # | ||
900 | CONFIG_PROC_FS=y | ||
901 | # CONFIG_PROC_KCORE is not set | ||
902 | CONFIG_PROC_SYSCTL=y | ||
903 | CONFIG_PROC_PAGE_MONITOR=y | ||
904 | CONFIG_SYSFS=y | ||
905 | CONFIG_TMPFS=y | ||
906 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
907 | # CONFIG_HUGETLB_PAGE is not set | ||
908 | # CONFIG_CONFIGFS_FS is not set | ||
909 | |||
910 | # | ||
911 | # Miscellaneous filesystems | ||
912 | # | ||
913 | # CONFIG_ADFS_FS is not set | ||
914 | # CONFIG_AFFS_FS is not set | ||
915 | # CONFIG_HFS_FS is not set | ||
916 | # CONFIG_HFSPLUS_FS is not set | ||
917 | # CONFIG_BEFS_FS is not set | ||
918 | # CONFIG_BFS_FS is not set | ||
919 | # CONFIG_EFS_FS is not set | ||
920 | CONFIG_CRAMFS=y | ||
921 | # CONFIG_VXFS_FS is not set | ||
922 | # CONFIG_MINIX_FS is not set | ||
923 | # CONFIG_OMFS_FS is not set | ||
924 | # CONFIG_HPFS_FS is not set | ||
925 | # CONFIG_QNX4FS_FS is not set | ||
926 | CONFIG_ROMFS_FS=y | ||
927 | # CONFIG_SYSV_FS is not set | ||
928 | # CONFIG_UFS_FS is not set | ||
929 | CONFIG_NETWORK_FILESYSTEMS=y | ||
930 | CONFIG_NFS_FS=y | ||
931 | CONFIG_NFS_V3=y | ||
932 | # CONFIG_NFS_V3_ACL is not set | ||
933 | # CONFIG_NFS_V4 is not set | ||
934 | CONFIG_ROOT_NFS=y | ||
935 | # CONFIG_NFSD is not set | ||
936 | CONFIG_LOCKD=y | ||
937 | CONFIG_LOCKD_V4=y | ||
938 | CONFIG_NFS_COMMON=y | ||
939 | CONFIG_SUNRPC=y | ||
940 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
941 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
942 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
943 | # CONFIG_SMB_FS is not set | ||
944 | # CONFIG_CIFS is not set | ||
945 | # CONFIG_NCP_FS is not set | ||
946 | # CONFIG_CODA_FS is not set | ||
947 | # CONFIG_AFS_FS is not set | ||
948 | |||
949 | # | ||
950 | # Partition Types | ||
951 | # | ||
952 | # CONFIG_PARTITION_ADVANCED is not set | ||
953 | CONFIG_MSDOS_PARTITION=y | ||
954 | CONFIG_NLS=y | ||
955 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
956 | CONFIG_NLS_CODEPAGE_437=y | ||
957 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
958 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
959 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
960 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
961 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
962 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
963 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
964 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
965 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
966 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
967 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
968 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
969 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
970 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
971 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
972 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
973 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
974 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
975 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
976 | # CONFIG_NLS_ISO8859_8 is not set | ||
977 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
978 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
979 | CONFIG_NLS_ASCII=m | ||
980 | CONFIG_NLS_ISO8859_1=m | ||
981 | # CONFIG_NLS_ISO8859_2 is not set | ||
982 | # CONFIG_NLS_ISO8859_3 is not set | ||
983 | # CONFIG_NLS_ISO8859_4 is not set | ||
984 | # CONFIG_NLS_ISO8859_5 is not set | ||
985 | # CONFIG_NLS_ISO8859_6 is not set | ||
986 | # CONFIG_NLS_ISO8859_7 is not set | ||
987 | # CONFIG_NLS_ISO8859_9 is not set | ||
988 | # CONFIG_NLS_ISO8859_13 is not set | ||
989 | # CONFIG_NLS_ISO8859_14 is not set | ||
990 | # CONFIG_NLS_ISO8859_15 is not set | ||
991 | # CONFIG_NLS_KOI8_R is not set | ||
992 | # CONFIG_NLS_KOI8_U is not set | ||
993 | CONFIG_NLS_UTF8=m | ||
994 | # CONFIG_DLM is not set | ||
995 | |||
996 | # | ||
997 | # Library routines | ||
998 | # | ||
999 | CONFIG_BITREVERSE=y | ||
1000 | CONFIG_CRC_CCITT=y | ||
1001 | # CONFIG_CRC16 is not set | ||
1002 | # CONFIG_CRC_T10DIF is not set | ||
1003 | # CONFIG_CRC_ITU_T is not set | ||
1004 | CONFIG_CRC32=y | ||
1005 | # CONFIG_CRC7 is not set | ||
1006 | # CONFIG_LIBCRC32C is not set | ||
1007 | CONFIG_ZLIB_INFLATE=y | ||
1008 | CONFIG_PLIST=y | ||
1009 | CONFIG_HAS_IOMEM=y | ||
1010 | CONFIG_HAS_IOPORT=y | ||
1011 | CONFIG_HAS_DMA=y | ||
1012 | CONFIG_HAVE_LMB=y | ||
1013 | |||
1014 | # | ||
1015 | # Kernel hacking | ||
1016 | # | ||
1017 | CONFIG_PRINTK_TIME=y | ||
1018 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1019 | CONFIG_ENABLE_MUST_CHECK=y | ||
1020 | CONFIG_FRAME_WARN=1024 | ||
1021 | # CONFIG_MAGIC_SYSRQ is not set | ||
1022 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1023 | # CONFIG_DEBUG_FS is not set | ||
1024 | # CONFIG_HEADERS_CHECK is not set | ||
1025 | CONFIG_DEBUG_KERNEL=y | ||
1026 | # CONFIG_DEBUG_SHIRQ is not set | ||
1027 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1028 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1029 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1030 | CONFIG_SCHED_DEBUG=y | ||
1031 | # CONFIG_SCHEDSTATS is not set | ||
1032 | # CONFIG_TIMER_STATS is not set | ||
1033 | # CONFIG_DEBUG_OBJECTS is not set | ||
1034 | # CONFIG_DEBUG_SLAB is not set | ||
1035 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1036 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1037 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1038 | # CONFIG_DEBUG_MUTEXES is not set | ||
1039 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1040 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1041 | # CONFIG_DEBUG_KOBJECT is not set | ||
1042 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1043 | CONFIG_DEBUG_INFO=y | ||
1044 | # CONFIG_DEBUG_VM is not set | ||
1045 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1046 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1047 | # CONFIG_DEBUG_LIST is not set | ||
1048 | # CONFIG_DEBUG_SG is not set | ||
1049 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1050 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1051 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1052 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1053 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1054 | # CONFIG_FAULT_INJECTION is not set | ||
1055 | # CONFIG_LATENCYTOP is not set | ||
1056 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1057 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1058 | |||
1059 | # | ||
1060 | # Tracers | ||
1061 | # | ||
1062 | # CONFIG_FUNCTION_TRACER is not set | ||
1063 | # CONFIG_PREEMPT_TRACER is not set | ||
1064 | # CONFIG_SCHED_TRACER is not set | ||
1065 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1066 | # CONFIG_BOOT_TRACER is not set | ||
1067 | # CONFIG_STACK_TRACER is not set | ||
1068 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1069 | # CONFIG_SAMPLES is not set | ||
1070 | CONFIG_HAVE_ARCH_KGDB=y | ||
1071 | # CONFIG_KGDB is not set | ||
1072 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
1073 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1074 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
1075 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
1076 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1077 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1078 | # CONFIG_XMON is not set | ||
1079 | # CONFIG_IRQSTACKS is not set | ||
1080 | # CONFIG_BDI_SWITCH is not set | ||
1081 | # CONFIG_PPC_EARLY_DEBUG is not set | ||
1082 | |||
1083 | # | ||
1084 | # Security options | ||
1085 | # | ||
1086 | # CONFIG_KEYS is not set | ||
1087 | # CONFIG_SECURITY is not set | ||
1088 | # CONFIG_SECURITYFS is not set | ||
1089 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1090 | CONFIG_CRYPTO=y | ||
1091 | |||
1092 | # | ||
1093 | # Crypto core or helper | ||
1094 | # | ||
1095 | # CONFIG_CRYPTO_FIPS is not set | ||
1096 | # CONFIG_CRYPTO_MANAGER is not set | ||
1097 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1098 | # CONFIG_CRYPTO_NULL is not set | ||
1099 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1100 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1101 | # CONFIG_CRYPTO_TEST is not set | ||
1102 | |||
1103 | # | ||
1104 | # Authenticated Encryption with Associated Data | ||
1105 | # | ||
1106 | # CONFIG_CRYPTO_CCM is not set | ||
1107 | # CONFIG_CRYPTO_GCM is not set | ||
1108 | # CONFIG_CRYPTO_SEQIV is not set | ||
1109 | |||
1110 | # | ||
1111 | # Block modes | ||
1112 | # | ||
1113 | # CONFIG_CRYPTO_CBC is not set | ||
1114 | # CONFIG_CRYPTO_CTR is not set | ||
1115 | # CONFIG_CRYPTO_CTS is not set | ||
1116 | # CONFIG_CRYPTO_ECB is not set | ||
1117 | # CONFIG_CRYPTO_LRW is not set | ||
1118 | # CONFIG_CRYPTO_PCBC is not set | ||
1119 | # CONFIG_CRYPTO_XTS is not set | ||
1120 | |||
1121 | # | ||
1122 | # Hash modes | ||
1123 | # | ||
1124 | # CONFIG_CRYPTO_HMAC is not set | ||
1125 | # CONFIG_CRYPTO_XCBC is not set | ||
1126 | |||
1127 | # | ||
1128 | # Digest | ||
1129 | # | ||
1130 | # CONFIG_CRYPTO_CRC32C is not set | ||
1131 | # CONFIG_CRYPTO_MD4 is not set | ||
1132 | # CONFIG_CRYPTO_MD5 is not set | ||
1133 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1134 | # CONFIG_CRYPTO_RMD128 is not set | ||
1135 | # CONFIG_CRYPTO_RMD160 is not set | ||
1136 | # CONFIG_CRYPTO_RMD256 is not set | ||
1137 | # CONFIG_CRYPTO_RMD320 is not set | ||
1138 | # CONFIG_CRYPTO_SHA1 is not set | ||
1139 | # CONFIG_CRYPTO_SHA256 is not set | ||
1140 | # CONFIG_CRYPTO_SHA512 is not set | ||
1141 | # CONFIG_CRYPTO_TGR192 is not set | ||
1142 | # CONFIG_CRYPTO_WP512 is not set | ||
1143 | |||
1144 | # | ||
1145 | # Ciphers | ||
1146 | # | ||
1147 | # CONFIG_CRYPTO_AES is not set | ||
1148 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1149 | # CONFIG_CRYPTO_ARC4 is not set | ||
1150 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1151 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1152 | # CONFIG_CRYPTO_CAST5 is not set | ||
1153 | # CONFIG_CRYPTO_CAST6 is not set | ||
1154 | # CONFIG_CRYPTO_DES is not set | ||
1155 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1156 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1157 | # CONFIG_CRYPTO_SALSA20 is not set | ||
1158 | # CONFIG_CRYPTO_SEED is not set | ||
1159 | # CONFIG_CRYPTO_SERPENT is not set | ||
1160 | # CONFIG_CRYPTO_TEA is not set | ||
1161 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1162 | |||
1163 | # | ||
1164 | # Compression | ||
1165 | # | ||
1166 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1167 | # CONFIG_CRYPTO_LZO is not set | ||
1168 | |||
1169 | # | ||
1170 | # Random Number Generation | ||
1171 | # | ||
1172 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1173 | CONFIG_CRYPTO_HW=y | ||
1174 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1175 | # CONFIG_PPC_CLOCK is not set | ||
1176 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig index 663ec512b33b..7513d360e0b0 100644 --- a/arch/powerpc/configs/44x/virtex5_defconfig +++ b/arch/powerpc/configs/44x/virtex5_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc1 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Tue Aug 5 09:20:16 2008 | 4 | # Fri Nov 14 10:31:16 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y | |||
22 | CONFIG_NOT_COHERENT_CACHE=y | 22 | CONFIG_NOT_COHERENT_CACHE=y |
23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
25 | CONFIG_PPC_MERGE=y | 25 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
29 | CONFIG_GENERIC_TIME_VSYSCALL=y | 29 | CONFIG_GENERIC_TIME_VSYSCALL=y |
30 | CONFIG_GENERIC_CLOCKEVENTS=y | 30 | CONFIG_GENERIC_CLOCKEVENTS=y |
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_GET_USER_PAGES_FAST is not set | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
@@ -40,6 +39,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
40 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
42 | CONFIG_GENERIC_GPIO=y | ||
43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
44 | CONFIG_PPC=y | 44 | CONFIG_PPC=y |
45 | CONFIG_EARLY_PRINTK=y | 45 | CONFIG_EARLY_PRINTK=y |
@@ -93,8 +93,8 @@ CONFIG_INITRAMFS_SOURCE="" | |||
93 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
94 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
95 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
97 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
97 | # CONFIG_KALLSYMS_ALL is not set | ||
98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
99 | CONFIG_HOTPLUG=y | 99 | CONFIG_HOTPLUG=y |
100 | CONFIG_PRINTK=y | 100 | CONFIG_PRINTK=y |
@@ -109,7 +109,9 @@ CONFIG_SIGNALFD=y | |||
109 | CONFIG_TIMERFD=y | 109 | CONFIG_TIMERFD=y |
110 | CONFIG_EVENTFD=y | 110 | CONFIG_EVENTFD=y |
111 | CONFIG_SHMEM=y | 111 | CONFIG_SHMEM=y |
112 | CONFIG_AIO=y | ||
112 | CONFIG_VM_EVENT_COUNTERS=y | 113 | CONFIG_VM_EVENT_COUNTERS=y |
114 | CONFIG_PCI_QUIRKS=y | ||
113 | CONFIG_SLAB=y | 115 | CONFIG_SLAB=y |
114 | # CONFIG_SLUB is not set | 116 | # CONFIG_SLUB is not set |
115 | # CONFIG_SLOB is not set | 117 | # CONFIG_SLOB is not set |
@@ -122,10 +124,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
122 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
123 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 126 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
127 | # CONFIG_HAVE_CLK is not set | ||
128 | CONFIG_PROC_PAGE_MONITOR=y | ||
129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
130 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
131 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
@@ -158,6 +156,7 @@ CONFIG_DEFAULT_CFQ=y | |||
158 | # CONFIG_DEFAULT_NOOP is not set | 156 | # CONFIG_DEFAULT_NOOP is not set |
159 | CONFIG_DEFAULT_IOSCHED="cfq" | 157 | CONFIG_DEFAULT_IOSCHED="cfq" |
160 | CONFIG_CLASSIC_RCU=y | 158 | CONFIG_CLASSIC_RCU=y |
159 | # CONFIG_FREEZER is not set | ||
161 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 160 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
162 | 161 | ||
163 | # | 162 | # |
@@ -174,9 +173,13 @@ CONFIG_CLASSIC_RCU=y | |||
174 | # CONFIG_KATMAI is not set | 173 | # CONFIG_KATMAI is not set |
175 | # CONFIG_RAINIER is not set | 174 | # CONFIG_RAINIER is not set |
176 | # CONFIG_WARP is not set | 175 | # CONFIG_WARP is not set |
176 | # CONFIG_ARCHES is not set | ||
177 | # CONFIG_CANYONLANDS is not set | 177 | # CONFIG_CANYONLANDS is not set |
178 | # CONFIG_GLACIER is not set | ||
178 | # CONFIG_YOSEMITE is not set | 179 | # CONFIG_YOSEMITE is not set |
179 | CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y | 180 | CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y |
181 | # CONFIG_PPC44x_SIMPLE is not set | ||
182 | # CONFIG_PPC4xx_GPIO is not set | ||
180 | CONFIG_XILINX_VIRTEX=y | 183 | CONFIG_XILINX_VIRTEX=y |
181 | CONFIG_XILINX_VIRTEX_5_FXT=y | 184 | CONFIG_XILINX_VIRTEX_5_FXT=y |
182 | # CONFIG_IPIC is not set | 185 | # CONFIG_IPIC is not set |
@@ -196,7 +199,6 @@ CONFIG_XILINX_VIRTEX_5_FXT=y | |||
196 | # Kernel options | 199 | # Kernel options |
197 | # | 200 | # |
198 | # CONFIG_HIGHMEM is not set | 201 | # CONFIG_HIGHMEM is not set |
199 | # CONFIG_TICK_ONESHOT is not set | ||
200 | # CONFIG_NO_HZ is not set | 202 | # CONFIG_NO_HZ is not set |
201 | # CONFIG_HIGH_RES_TIMERS is not set | 203 | # CONFIG_HIGH_RES_TIMERS is not set |
202 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 204 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
@@ -211,6 +213,8 @@ CONFIG_HZ=250 | |||
211 | CONFIG_PREEMPT=y | 213 | CONFIG_PREEMPT=y |
212 | # CONFIG_PREEMPT_RCU is not set | 214 | # CONFIG_PREEMPT_RCU is not set |
213 | CONFIG_BINFMT_ELF=y | 215 | CONFIG_BINFMT_ELF=y |
216 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
217 | # CONFIG_HAVE_AOUT is not set | ||
214 | # CONFIG_BINFMT_MISC is not set | 218 | # CONFIG_BINFMT_MISC is not set |
215 | CONFIG_MATH_EMULATION=y | 219 | CONFIG_MATH_EMULATION=y |
216 | # CONFIG_IOMMU_HELPER is not set | 220 | # CONFIG_IOMMU_HELPER is not set |
@@ -225,15 +229,15 @@ CONFIG_FLATMEM_MANUAL=y | |||
225 | # CONFIG_SPARSEMEM_MANUAL is not set | 229 | # CONFIG_SPARSEMEM_MANUAL is not set |
226 | CONFIG_FLATMEM=y | 230 | CONFIG_FLATMEM=y |
227 | CONFIG_FLAT_NODE_MEM_MAP=y | 231 | CONFIG_FLAT_NODE_MEM_MAP=y |
228 | # CONFIG_SPARSEMEM_STATIC is not set | ||
229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
230 | CONFIG_PAGEFLAGS_EXTENDED=y | 232 | CONFIG_PAGEFLAGS_EXTENDED=y |
231 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 233 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
232 | CONFIG_MIGRATION=y | 234 | CONFIG_MIGRATION=y |
233 | CONFIG_RESOURCES_64BIT=y | 235 | CONFIG_RESOURCES_64BIT=y |
236 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
234 | CONFIG_ZONE_DMA_FLAG=1 | 237 | CONFIG_ZONE_DMA_FLAG=1 |
235 | CONFIG_BOUNCE=y | 238 | CONFIG_BOUNCE=y |
236 | CONFIG_VIRT_TO_BUS=y | 239 | CONFIG_VIRT_TO_BUS=y |
240 | CONFIG_UNEVICTABLE_LRU=y | ||
237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 241 | CONFIG_FORCE_MAX_ZONEORDER=11 |
238 | CONFIG_PROC_DEVICETREE=y | 242 | CONFIG_PROC_DEVICETREE=y |
239 | CONFIG_CMDLINE_BOOL=y | 243 | CONFIG_CMDLINE_BOOL=y |
@@ -256,6 +260,7 @@ CONFIG_PCI_SYSCALL=y | |||
256 | CONFIG_ARCH_SUPPORTS_MSI=y | 260 | CONFIG_ARCH_SUPPORTS_MSI=y |
257 | # CONFIG_PCI_MSI is not set | 261 | # CONFIG_PCI_MSI is not set |
258 | CONFIG_PCI_LEGACY=y | 262 | CONFIG_PCI_LEGACY=y |
263 | # CONFIG_PCI_DEBUG is not set | ||
259 | # CONFIG_PCCARD is not set | 264 | # CONFIG_PCCARD is not set |
260 | # CONFIG_HOTPLUG_PCI is not set | 265 | # CONFIG_HOTPLUG_PCI is not set |
261 | # CONFIG_HAS_RAPIDIO is not set | 266 | # CONFIG_HAS_RAPIDIO is not set |
@@ -317,7 +322,6 @@ CONFIG_INET_TCP_DIAG=y | |||
317 | CONFIG_TCP_CONG_CUBIC=y | 322 | CONFIG_TCP_CONG_CUBIC=y |
318 | CONFIG_DEFAULT_TCP_CONG="cubic" | 323 | CONFIG_DEFAULT_TCP_CONG="cubic" |
319 | # CONFIG_TCP_MD5SIG is not set | 324 | # CONFIG_TCP_MD5SIG is not set |
320 | # CONFIG_IP_VS is not set | ||
321 | CONFIG_IPV6=m | 325 | CONFIG_IPV6=m |
322 | # CONFIG_IPV6_PRIVACY is not set | 326 | # CONFIG_IPV6_PRIVACY is not set |
323 | # CONFIG_IPV6_ROUTER_PREF is not set | 327 | # CONFIG_IPV6_ROUTER_PREF is not set |
@@ -352,8 +356,8 @@ CONFIG_NETFILTER_XTABLES=m | |||
352 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set | 356 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set |
353 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 357 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
354 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set | 358 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set |
355 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | ||
356 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | 359 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
360 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | ||
357 | # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set | 361 | # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set |
358 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | 362 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set |
359 | # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set | 363 | # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set |
@@ -361,36 +365,38 @@ CONFIG_NETFILTER_XTABLES=m | |||
361 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 365 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
362 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 366 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
363 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set | 367 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set |
368 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
364 | # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set | 369 | # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set |
365 | # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set | 370 | # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set |
366 | # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set | 371 | # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set |
367 | # CONFIG_NETFILTER_XT_MATCH_MAC is not set | 372 | # CONFIG_NETFILTER_XT_MATCH_MAC is not set |
368 | # CONFIG_NETFILTER_XT_MATCH_MARK is not set | 373 | # CONFIG_NETFILTER_XT_MATCH_MARK is not set |
374 | # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set | ||
369 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set | 375 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set |
370 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | 376 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set |
371 | # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set | ||
372 | # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set | 377 | # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set |
373 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set | 378 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set |
374 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set | 379 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set |
375 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set | 380 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set |
381 | # CONFIG_NETFILTER_XT_MATCH_RECENT is not set | ||
376 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set | 382 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set |
377 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 383 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
378 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set | 384 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set |
379 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set | 385 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set |
380 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set | 386 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set |
381 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | 387 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set |
382 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 388 | # CONFIG_IP_VS is not set |
383 | 389 | ||
384 | # | 390 | # |
385 | # IP: Netfilter Configuration | 391 | # IP: Netfilter Configuration |
386 | # | 392 | # |
393 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
387 | # CONFIG_IP_NF_QUEUE is not set | 394 | # CONFIG_IP_NF_QUEUE is not set |
388 | CONFIG_IP_NF_IPTABLES=m | 395 | CONFIG_IP_NF_IPTABLES=m |
389 | # CONFIG_IP_NF_MATCH_RECENT is not set | 396 | # CONFIG_IP_NF_MATCH_ADDRTYPE is not set |
390 | # CONFIG_IP_NF_MATCH_ECN is not set | ||
391 | # CONFIG_IP_NF_MATCH_AH is not set | 397 | # CONFIG_IP_NF_MATCH_AH is not set |
398 | # CONFIG_IP_NF_MATCH_ECN is not set | ||
392 | # CONFIG_IP_NF_MATCH_TTL is not set | 399 | # CONFIG_IP_NF_MATCH_TTL is not set |
393 | # CONFIG_IP_NF_MATCH_ADDRTYPE is not set | ||
394 | CONFIG_IP_NF_FILTER=m | 400 | CONFIG_IP_NF_FILTER=m |
395 | # CONFIG_IP_NF_TARGET_REJECT is not set | 401 | # CONFIG_IP_NF_TARGET_REJECT is not set |
396 | # CONFIG_IP_NF_TARGET_LOG is not set | 402 | # CONFIG_IP_NF_TARGET_LOG is not set |
@@ -411,6 +417,7 @@ CONFIG_IP_NF_MANGLE=m | |||
411 | # CONFIG_TIPC is not set | 417 | # CONFIG_TIPC is not set |
412 | # CONFIG_ATM is not set | 418 | # CONFIG_ATM is not set |
413 | # CONFIG_BRIDGE is not set | 419 | # CONFIG_BRIDGE is not set |
420 | # CONFIG_NET_DSA is not set | ||
414 | # CONFIG_VLAN_8021Q is not set | 421 | # CONFIG_VLAN_8021Q is not set |
415 | # CONFIG_DECNET is not set | 422 | # CONFIG_DECNET is not set |
416 | # CONFIG_LLC2 is not set | 423 | # CONFIG_LLC2 is not set |
@@ -431,11 +438,10 @@ CONFIG_IP_NF_MANGLE=m | |||
431 | # CONFIG_IRDA is not set | 438 | # CONFIG_IRDA is not set |
432 | # CONFIG_BT is not set | 439 | # CONFIG_BT is not set |
433 | # CONFIG_AF_RXRPC is not set | 440 | # CONFIG_AF_RXRPC is not set |
434 | 441 | # CONFIG_PHONET is not set | |
435 | # | 442 | CONFIG_WIRELESS=y |
436 | # Wireless | ||
437 | # | ||
438 | # CONFIG_CFG80211 is not set | 443 | # CONFIG_CFG80211 is not set |
444 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
439 | # CONFIG_WIRELESS_EXT is not set | 445 | # CONFIG_WIRELESS_EXT is not set |
440 | # CONFIG_MAC80211 is not set | 446 | # CONFIG_MAC80211 is not set |
441 | # CONFIG_IEEE80211 is not set | 447 | # CONFIG_IEEE80211 is not set |
@@ -455,11 +461,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
455 | CONFIG_FW_LOADER=y | 461 | CONFIG_FW_LOADER=y |
456 | CONFIG_FIRMWARE_IN_KERNEL=y | 462 | CONFIG_FIRMWARE_IN_KERNEL=y |
457 | CONFIG_EXTRA_FIRMWARE="" | 463 | CONFIG_EXTRA_FIRMWARE="" |
464 | # CONFIG_DEBUG_DRIVER is not set | ||
465 | # CONFIG_DEBUG_DEVRES is not set | ||
458 | # CONFIG_SYS_HYPERVISOR is not set | 466 | # CONFIG_SYS_HYPERVISOR is not set |
459 | # CONFIG_CONNECTOR is not set | 467 | # CONFIG_CONNECTOR is not set |
460 | # CONFIG_MTD is not set | 468 | # CONFIG_MTD is not set |
461 | CONFIG_OF_DEVICE=y | 469 | CONFIG_OF_DEVICE=y |
462 | CONFIG_OF_I2C=y | 470 | CONFIG_OF_GPIO=y |
463 | # CONFIG_PARPORT is not set | 471 | # CONFIG_PARPORT is not set |
464 | CONFIG_BLK_DEV=y | 472 | CONFIG_BLK_DEV=y |
465 | # CONFIG_BLK_DEV_FD is not set | 473 | # CONFIG_BLK_DEV_FD is not set |
@@ -478,7 +486,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 | |||
478 | # CONFIG_BLK_DEV_XIP is not set | 486 | # CONFIG_BLK_DEV_XIP is not set |
479 | # CONFIG_CDROM_PKTCDVD is not set | 487 | # CONFIG_CDROM_PKTCDVD is not set |
480 | # CONFIG_ATA_OVER_ETH is not set | 488 | # CONFIG_ATA_OVER_ETH is not set |
481 | # CONFIG_XILINX_SYSACE is not set | 489 | CONFIG_XILINX_SYSACE=y |
482 | # CONFIG_BLK_DEV_HD is not set | 490 | # CONFIG_BLK_DEV_HD is not set |
483 | CONFIG_MISC_DEVICES=y | 491 | CONFIG_MISC_DEVICES=y |
484 | # CONFIG_PHANTOM is not set | 492 | # CONFIG_PHANTOM is not set |
@@ -487,6 +495,7 @@ CONFIG_MISC_DEVICES=y | |||
487 | # CONFIG_TIFM_CORE is not set | 495 | # CONFIG_TIFM_CORE is not set |
488 | # CONFIG_ENCLOSURE_SERVICES is not set | 496 | # CONFIG_ENCLOSURE_SERVICES is not set |
489 | # CONFIG_HP_ILO is not set | 497 | # CONFIG_HP_ILO is not set |
498 | # CONFIG_C2PORT is not set | ||
490 | CONFIG_HAVE_IDE=y | 499 | CONFIG_HAVE_IDE=y |
491 | # CONFIG_IDE is not set | 500 | # CONFIG_IDE is not set |
492 | 501 | ||
@@ -534,8 +543,12 @@ CONFIG_MII=y | |||
534 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 543 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
535 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 544 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
536 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 545 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
546 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
547 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
548 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
537 | # CONFIG_NET_PCI is not set | 549 | # CONFIG_NET_PCI is not set |
538 | # CONFIG_B44 is not set | 550 | # CONFIG_B44 is not set |
551 | # CONFIG_ATL2 is not set | ||
539 | CONFIG_NETDEV_1000=y | 552 | CONFIG_NETDEV_1000=y |
540 | # CONFIG_ACENIC is not set | 553 | # CONFIG_ACENIC is not set |
541 | # CONFIG_DL2K is not set | 554 | # CONFIG_DL2K is not set |
@@ -556,6 +569,7 @@ CONFIG_NETDEV_1000=y | |||
556 | # CONFIG_QLA3XXX is not set | 569 | # CONFIG_QLA3XXX is not set |
557 | # CONFIG_ATL1 is not set | 570 | # CONFIG_ATL1 is not set |
558 | # CONFIG_ATL1E is not set | 571 | # CONFIG_ATL1E is not set |
572 | # CONFIG_JME is not set | ||
559 | # CONFIG_NETDEV_10000 is not set | 573 | # CONFIG_NETDEV_10000 is not set |
560 | # CONFIG_TR is not set | 574 | # CONFIG_TR is not set |
561 | 575 | ||
@@ -604,6 +618,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
604 | # CONFIG_KEYBOARD_XTKBD is not set | 618 | # CONFIG_KEYBOARD_XTKBD is not set |
605 | # CONFIG_KEYBOARD_NEWTON is not set | 619 | # CONFIG_KEYBOARD_NEWTON is not set |
606 | # CONFIG_KEYBOARD_STOWAWAY is not set | 620 | # CONFIG_KEYBOARD_STOWAWAY is not set |
621 | # CONFIG_KEYBOARD_GPIO is not set | ||
607 | CONFIG_INPUT_MOUSE=y | 622 | CONFIG_INPUT_MOUSE=y |
608 | CONFIG_MOUSE_PS2=y | 623 | CONFIG_MOUSE_PS2=y |
609 | CONFIG_MOUSE_PS2_ALPS=y | 624 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -611,9 +626,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
611 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 626 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
612 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 627 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
613 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 628 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
629 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
614 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 630 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
615 | # CONFIG_MOUSE_SERIAL is not set | 631 | # CONFIG_MOUSE_SERIAL is not set |
616 | # CONFIG_MOUSE_VSXXXAA is not set | 632 | # CONFIG_MOUSE_VSXXXAA is not set |
633 | # CONFIG_MOUSE_GPIO is not set | ||
617 | # CONFIG_INPUT_JOYSTICK is not set | 634 | # CONFIG_INPUT_JOYSTICK is not set |
618 | # CONFIG_INPUT_TABLET is not set | 635 | # CONFIG_INPUT_TABLET is not set |
619 | # CONFIG_INPUT_TOUCHSCREEN is not set | 636 | # CONFIG_INPUT_TOUCHSCREEN is not set |
@@ -624,11 +641,11 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
624 | # | 641 | # |
625 | CONFIG_SERIO=y | 642 | CONFIG_SERIO=y |
626 | # CONFIG_SERIO_I8042 is not set | 643 | # CONFIG_SERIO_I8042 is not set |
627 | CONFIG_SERIO_SERPORT=y | 644 | # CONFIG_SERIO_SERPORT is not set |
628 | # CONFIG_SERIO_PCIPS2 is not set | 645 | # CONFIG_SERIO_PCIPS2 is not set |
629 | CONFIG_SERIO_LIBPS2=y | 646 | CONFIG_SERIO_LIBPS2=y |
630 | # CONFIG_SERIO_RAW is not set | 647 | # CONFIG_SERIO_RAW is not set |
631 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | 648 | CONFIG_SERIO_XILINX_XPS_PS2=y |
632 | # CONFIG_GAMEPORT is not set | 649 | # CONFIG_GAMEPORT is not set |
633 | 650 | ||
634 | # | 651 | # |
@@ -656,11 +673,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
656 | # | 673 | # |
657 | # Non-8250 serial port support | 674 | # Non-8250 serial port support |
658 | # | 675 | # |
659 | # CONFIG_SERIAL_UARTLITE is not set | 676 | CONFIG_SERIAL_UARTLITE=y |
677 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | ||
660 | CONFIG_SERIAL_CORE=y | 678 | CONFIG_SERIAL_CORE=y |
661 | CONFIG_SERIAL_CORE_CONSOLE=y | 679 | CONFIG_SERIAL_CORE_CONSOLE=y |
662 | # CONFIG_SERIAL_JSM is not set | 680 | # CONFIG_SERIAL_JSM is not set |
663 | CONFIG_SERIAL_OF_PLATFORM=y | 681 | # CONFIG_SERIAL_OF_PLATFORM is not set |
664 | CONFIG_UNIX98_PTYS=y | 682 | CONFIG_UNIX98_PTYS=y |
665 | CONFIG_LEGACY_PTYS=y | 683 | CONFIG_LEGACY_PTYS=y |
666 | CONFIG_LEGACY_PTY_COUNT=256 | 684 | CONFIG_LEGACY_PTY_COUNT=256 |
@@ -674,87 +692,41 @@ CONFIG_XILINX_HWICAP=y | |||
674 | # CONFIG_RAW_DRIVER is not set | 692 | # CONFIG_RAW_DRIVER is not set |
675 | # CONFIG_TCG_TPM is not set | 693 | # CONFIG_TCG_TPM is not set |
676 | CONFIG_DEVPORT=y | 694 | CONFIG_DEVPORT=y |
677 | CONFIG_I2C=y | 695 | # CONFIG_I2C is not set |
678 | CONFIG_I2C_BOARDINFO=y | 696 | # CONFIG_SPI is not set |
679 | CONFIG_I2C_CHARDEV=y | 697 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
680 | 698 | CONFIG_GPIOLIB=y | |
681 | # | 699 | # CONFIG_DEBUG_GPIO is not set |
682 | # I2C Hardware Bus support | 700 | CONFIG_GPIO_SYSFS=y |
683 | # | ||
684 | |||
685 | # | ||
686 | # PC SMBus host controller drivers | ||
687 | # | ||
688 | # CONFIG_I2C_ALI1535 is not set | ||
689 | # CONFIG_I2C_ALI1563 is not set | ||
690 | # CONFIG_I2C_ALI15X3 is not set | ||
691 | # CONFIG_I2C_AMD756 is not set | ||
692 | # CONFIG_I2C_AMD8111 is not set | ||
693 | # CONFIG_I2C_I801 is not set | ||
694 | # CONFIG_I2C_ISCH is not set | ||
695 | # CONFIG_I2C_PIIX4 is not set | ||
696 | # CONFIG_I2C_NFORCE2 is not set | ||
697 | # CONFIG_I2C_SIS5595 is not set | ||
698 | # CONFIG_I2C_SIS630 is not set | ||
699 | # CONFIG_I2C_SIS96X is not set | ||
700 | # CONFIG_I2C_VIA is not set | ||
701 | # CONFIG_I2C_VIAPRO is not set | ||
702 | 701 | ||
703 | # | 702 | # |
704 | # I2C system bus drivers (mostly embedded / system-on-chip) | 703 | # Memory mapped GPIO expanders: |
705 | # | 704 | # |
706 | # CONFIG_I2C_IBM_IIC is not set | 705 | CONFIG_GPIO_XILINX=y |
707 | # CONFIG_I2C_MPC is not set | ||
708 | # CONFIG_I2C_OCORES is not set | ||
709 | # CONFIG_I2C_SIMTEC is not set | ||
710 | 706 | ||
711 | # | 707 | # |
712 | # External I2C/SMBus adapter drivers | 708 | # I2C GPIO expanders: |
713 | # | 709 | # |
714 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
715 | # CONFIG_I2C_TAOS_EVM is not set | ||
716 | 710 | ||
717 | # | 711 | # |
718 | # Graphics adapter I2C/DDC channel drivers | 712 | # PCI GPIO expanders: |
719 | # | 713 | # |
720 | # CONFIG_I2C_VOODOO3 is not set | 714 | # CONFIG_GPIO_BT8XX is not set |
721 | 715 | ||
722 | # | 716 | # |
723 | # Other I2C/SMBus bus drivers | 717 | # SPI GPIO expanders: |
724 | # | 718 | # |
725 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
726 | # CONFIG_I2C_STUB is not set | ||
727 | |||
728 | # | ||
729 | # Miscellaneous I2C Chip support | ||
730 | # | ||
731 | # CONFIG_DS1682 is not set | ||
732 | # CONFIG_AT24 is not set | ||
733 | # CONFIG_SENSORS_EEPROM is not set | ||
734 | # CONFIG_SENSORS_PCF8574 is not set | ||
735 | # CONFIG_PCF8575 is not set | ||
736 | # CONFIG_SENSORS_PCA9539 is not set | ||
737 | # CONFIG_SENSORS_PCF8591 is not set | ||
738 | # CONFIG_SENSORS_MAX6875 is not set | ||
739 | # CONFIG_SENSORS_TSL2550 is not set | ||
740 | CONFIG_I2C_DEBUG_CORE=y | ||
741 | CONFIG_I2C_DEBUG_ALGO=y | ||
742 | # CONFIG_I2C_DEBUG_BUS is not set | ||
743 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
744 | # CONFIG_SPI is not set | ||
745 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
746 | # CONFIG_GPIOLIB is not set | ||
747 | # CONFIG_W1 is not set | 719 | # CONFIG_W1 is not set |
748 | # CONFIG_POWER_SUPPLY is not set | 720 | # CONFIG_POWER_SUPPLY is not set |
749 | # CONFIG_HWMON is not set | 721 | # CONFIG_HWMON is not set |
750 | # CONFIG_THERMAL is not set | 722 | # CONFIG_THERMAL is not set |
751 | # CONFIG_THERMAL_HWMON is not set | 723 | # CONFIG_THERMAL_HWMON is not set |
752 | # CONFIG_WATCHDOG is not set | 724 | # CONFIG_WATCHDOG is not set |
725 | CONFIG_SSB_POSSIBLE=y | ||
753 | 726 | ||
754 | # | 727 | # |
755 | # Sonics Silicon Backplane | 728 | # Sonics Silicon Backplane |
756 | # | 729 | # |
757 | CONFIG_SSB_POSSIBLE=y | ||
758 | # CONFIG_SSB is not set | 730 | # CONFIG_SSB is not set |
759 | 731 | ||
760 | # | 732 | # |
@@ -763,6 +735,8 @@ CONFIG_SSB_POSSIBLE=y | |||
763 | # CONFIG_MFD_CORE is not set | 735 | # CONFIG_MFD_CORE is not set |
764 | # CONFIG_MFD_SM501 is not set | 736 | # CONFIG_MFD_SM501 is not set |
765 | # CONFIG_HTC_PASIC3 is not set | 737 | # CONFIG_HTC_PASIC3 is not set |
738 | # CONFIG_MFD_TMIO is not set | ||
739 | # CONFIG_REGULATOR is not set | ||
766 | 740 | ||
767 | # | 741 | # |
768 | # Multimedia devices | 742 | # Multimedia devices |
@@ -790,6 +764,7 @@ CONFIG_SSB_POSSIBLE=y | |||
790 | CONFIG_FB=y | 764 | CONFIG_FB=y |
791 | # CONFIG_FIRMWARE_EDID is not set | 765 | # CONFIG_FIRMWARE_EDID is not set |
792 | # CONFIG_FB_DDC is not set | 766 | # CONFIG_FB_DDC is not set |
767 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
793 | CONFIG_FB_CFB_FILLRECT=y | 768 | CONFIG_FB_CFB_FILLRECT=y |
794 | CONFIG_FB_CFB_COPYAREA=y | 769 | CONFIG_FB_CFB_COPYAREA=y |
795 | CONFIG_FB_CFB_IMAGEBLIT=y | 770 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -826,6 +801,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
826 | # CONFIG_FB_S3 is not set | 801 | # CONFIG_FB_S3 is not set |
827 | # CONFIG_FB_SAVAGE is not set | 802 | # CONFIG_FB_SAVAGE is not set |
828 | # CONFIG_FB_SIS is not set | 803 | # CONFIG_FB_SIS is not set |
804 | # CONFIG_FB_VIA is not set | ||
829 | # CONFIG_FB_NEOMAGIC is not set | 805 | # CONFIG_FB_NEOMAGIC is not set |
830 | # CONFIG_FB_KYRO is not set | 806 | # CONFIG_FB_KYRO is not set |
831 | # CONFIG_FB_3DFX is not set | 807 | # CONFIG_FB_3DFX is not set |
@@ -838,6 +814,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
838 | # CONFIG_FB_IBM_GXT4500 is not set | 814 | # CONFIG_FB_IBM_GXT4500 is not set |
839 | CONFIG_FB_XILINX=y | 815 | CONFIG_FB_XILINX=y |
840 | # CONFIG_FB_VIRTUAL is not set | 816 | # CONFIG_FB_VIRTUAL is not set |
817 | # CONFIG_FB_METRONOME is not set | ||
818 | # CONFIG_FB_MB862XX is not set | ||
841 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 819 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
842 | 820 | ||
843 | # | 821 | # |
@@ -870,6 +848,7 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
870 | # CONFIG_SOUND is not set | 848 | # CONFIG_SOUND is not set |
871 | # CONFIG_HID_SUPPORT is not set | 849 | # CONFIG_HID_SUPPORT is not set |
872 | # CONFIG_USB_SUPPORT is not set | 850 | # CONFIG_USB_SUPPORT is not set |
851 | # CONFIG_UWB is not set | ||
873 | # CONFIG_MMC is not set | 852 | # CONFIG_MMC is not set |
874 | # CONFIG_MEMSTICK is not set | 853 | # CONFIG_MEMSTICK is not set |
875 | # CONFIG_NEW_LEDS is not set | 854 | # CONFIG_NEW_LEDS is not set |
@@ -879,6 +858,8 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
879 | # CONFIG_RTC_CLASS is not set | 858 | # CONFIG_RTC_CLASS is not set |
880 | # CONFIG_DMADEVICES is not set | 859 | # CONFIG_DMADEVICES is not set |
881 | # CONFIG_UIO is not set | 860 | # CONFIG_UIO is not set |
861 | # CONFIG_STAGING is not set | ||
862 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
882 | 863 | ||
883 | # | 864 | # |
884 | # File systems | 865 | # File systems |
@@ -887,10 +868,11 @@ CONFIG_EXT2_FS=y | |||
887 | # CONFIG_EXT2_FS_XATTR is not set | 868 | # CONFIG_EXT2_FS_XATTR is not set |
888 | # CONFIG_EXT2_FS_XIP is not set | 869 | # CONFIG_EXT2_FS_XIP is not set |
889 | # CONFIG_EXT3_FS is not set | 870 | # CONFIG_EXT3_FS is not set |
890 | # CONFIG_EXT4DEV_FS is not set | 871 | # CONFIG_EXT4_FS is not set |
891 | # CONFIG_REISERFS_FS is not set | 872 | # CONFIG_REISERFS_FS is not set |
892 | # CONFIG_JFS_FS is not set | 873 | # CONFIG_JFS_FS is not set |
893 | # CONFIG_FS_POSIX_ACL is not set | 874 | # CONFIG_FS_POSIX_ACL is not set |
875 | CONFIG_FILE_LOCKING=y | ||
894 | # CONFIG_XFS_FS is not set | 876 | # CONFIG_XFS_FS is not set |
895 | # CONFIG_OCFS2_FS is not set | 877 | # CONFIG_OCFS2_FS is not set |
896 | CONFIG_DNOTIFY=y | 878 | CONFIG_DNOTIFY=y |
@@ -899,7 +881,7 @@ CONFIG_INOTIFY_USER=y | |||
899 | # CONFIG_QUOTA is not set | 881 | # CONFIG_QUOTA is not set |
900 | CONFIG_AUTOFS_FS=y | 882 | CONFIG_AUTOFS_FS=y |
901 | CONFIG_AUTOFS4_FS=y | 883 | CONFIG_AUTOFS4_FS=y |
902 | CONFIG_FUSE_FS=m | 884 | # CONFIG_FUSE_FS is not set |
903 | 885 | ||
904 | # | 886 | # |
905 | # CD-ROM/DVD Filesystems | 887 | # CD-ROM/DVD Filesystems |
@@ -923,6 +905,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
923 | CONFIG_PROC_FS=y | 905 | CONFIG_PROC_FS=y |
924 | # CONFIG_PROC_KCORE is not set | 906 | # CONFIG_PROC_KCORE is not set |
925 | CONFIG_PROC_SYSCTL=y | 907 | CONFIG_PROC_SYSCTL=y |
908 | CONFIG_PROC_PAGE_MONITOR=y | ||
926 | CONFIG_SYSFS=y | 909 | CONFIG_SYSFS=y |
927 | CONFIG_TMPFS=y | 910 | CONFIG_TMPFS=y |
928 | # CONFIG_TMPFS_POSIX_ACL is not set | 911 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -954,19 +937,15 @@ CONFIG_NFS_V3=y | |||
954 | # CONFIG_NFS_V3_ACL is not set | 937 | # CONFIG_NFS_V3_ACL is not set |
955 | # CONFIG_NFS_V4 is not set | 938 | # CONFIG_NFS_V4 is not set |
956 | CONFIG_ROOT_NFS=y | 939 | CONFIG_ROOT_NFS=y |
957 | CONFIG_NFSD=y | 940 | # CONFIG_NFSD is not set |
958 | CONFIG_NFSD_V3=y | ||
959 | # CONFIG_NFSD_V3_ACL is not set | ||
960 | # CONFIG_NFSD_V4 is not set | ||
961 | CONFIG_LOCKD=y | 941 | CONFIG_LOCKD=y |
962 | CONFIG_LOCKD_V4=y | 942 | CONFIG_LOCKD_V4=y |
963 | CONFIG_EXPORTFS=y | ||
964 | CONFIG_NFS_COMMON=y | 943 | CONFIG_NFS_COMMON=y |
965 | CONFIG_SUNRPC=y | 944 | CONFIG_SUNRPC=y |
945 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
966 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 946 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
967 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 947 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
968 | CONFIG_SMB_FS=y | 948 | # CONFIG_SMB_FS is not set |
969 | # CONFIG_SMB_NLS_DEFAULT is not set | ||
970 | # CONFIG_CIFS is not set | 949 | # CONFIG_CIFS is not set |
971 | # CONFIG_NCP_FS is not set | 950 | # CONFIG_NCP_FS is not set |
972 | # CONFIG_CODA_FS is not set | 951 | # CONFIG_CODA_FS is not set |
@@ -1023,7 +1002,6 @@ CONFIG_NLS_UTF8=m | |||
1023 | # Library routines | 1002 | # Library routines |
1024 | # | 1003 | # |
1025 | CONFIG_BITREVERSE=y | 1004 | CONFIG_BITREVERSE=y |
1026 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1027 | CONFIG_CRC_CCITT=y | 1005 | CONFIG_CRC_CCITT=y |
1028 | # CONFIG_CRC16 is not set | 1006 | # CONFIG_CRC16 is not set |
1029 | # CONFIG_CRC_T10DIF is not set | 1007 | # CONFIG_CRC_T10DIF is not set |
@@ -1041,7 +1019,7 @@ CONFIG_HAVE_LMB=y | |||
1041 | # | 1019 | # |
1042 | # Kernel hacking | 1020 | # Kernel hacking |
1043 | # | 1021 | # |
1044 | # CONFIG_PRINTK_TIME is not set | 1022 | CONFIG_PRINTK_TIME=y |
1045 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1023 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1046 | CONFIG_ENABLE_MUST_CHECK=y | 1024 | CONFIG_ENABLE_MUST_CHECK=y |
1047 | CONFIG_FRAME_WARN=1024 | 1025 | CONFIG_FRAME_WARN=1024 |
@@ -1049,19 +1027,62 @@ CONFIG_FRAME_WARN=1024 | |||
1049 | # CONFIG_UNUSED_SYMBOLS is not set | 1027 | # CONFIG_UNUSED_SYMBOLS is not set |
1050 | # CONFIG_DEBUG_FS is not set | 1028 | # CONFIG_DEBUG_FS is not set |
1051 | # CONFIG_HEADERS_CHECK is not set | 1029 | # CONFIG_HEADERS_CHECK is not set |
1052 | # CONFIG_DEBUG_KERNEL is not set | 1030 | CONFIG_DEBUG_KERNEL=y |
1031 | # CONFIG_DEBUG_SHIRQ is not set | ||
1032 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1033 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1034 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1035 | CONFIG_SCHED_DEBUG=y | ||
1036 | # CONFIG_SCHEDSTATS is not set | ||
1037 | # CONFIG_TIMER_STATS is not set | ||
1038 | # CONFIG_DEBUG_OBJECTS is not set | ||
1039 | # CONFIG_DEBUG_SLAB is not set | ||
1040 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1041 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1042 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1043 | # CONFIG_DEBUG_MUTEXES is not set | ||
1044 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1045 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1046 | # CONFIG_DEBUG_KOBJECT is not set | ||
1053 | CONFIG_DEBUG_BUGVERBOSE=y | 1047 | CONFIG_DEBUG_BUGVERBOSE=y |
1048 | CONFIG_DEBUG_INFO=y | ||
1049 | # CONFIG_DEBUG_VM is not set | ||
1050 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1054 | CONFIG_DEBUG_MEMORY_INIT=y | 1051 | CONFIG_DEBUG_MEMORY_INIT=y |
1052 | # CONFIG_DEBUG_LIST is not set | ||
1053 | # CONFIG_DEBUG_SG is not set | ||
1054 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1055 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1056 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1057 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1058 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1059 | # CONFIG_FAULT_INJECTION is not set | ||
1055 | # CONFIG_LATENCYTOP is not set | 1060 | # CONFIG_LATENCYTOP is not set |
1056 | CONFIG_HAVE_FTRACE=y | 1061 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1057 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1062 | CONFIG_HAVE_FUNCTION_TRACER=y |
1058 | # CONFIG_FTRACE is not set | 1063 | |
1064 | # | ||
1065 | # Tracers | ||
1066 | # | ||
1067 | # CONFIG_FUNCTION_TRACER is not set | ||
1059 | # CONFIG_PREEMPT_TRACER is not set | 1068 | # CONFIG_PREEMPT_TRACER is not set |
1060 | # CONFIG_SCHED_TRACER is not set | 1069 | # CONFIG_SCHED_TRACER is not set |
1061 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1070 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1071 | # CONFIG_BOOT_TRACER is not set | ||
1072 | # CONFIG_STACK_TRACER is not set | ||
1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1062 | # CONFIG_SAMPLES is not set | 1074 | # CONFIG_SAMPLES is not set |
1063 | CONFIG_HAVE_ARCH_KGDB=y | 1075 | CONFIG_HAVE_ARCH_KGDB=y |
1076 | # CONFIG_KGDB is not set | ||
1077 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
1078 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1079 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
1080 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
1081 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1082 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1083 | # CONFIG_XMON is not set | ||
1064 | # CONFIG_IRQSTACKS is not set | 1084 | # CONFIG_IRQSTACKS is not set |
1085 | # CONFIG_BDI_SWITCH is not set | ||
1065 | # CONFIG_PPC_EARLY_DEBUG is not set | 1086 | # CONFIG_PPC_EARLY_DEBUG is not set |
1066 | 1087 | ||
1067 | # | 1088 | # |
@@ -1069,12 +1090,14 @@ CONFIG_HAVE_ARCH_KGDB=y | |||
1069 | # | 1090 | # |
1070 | # CONFIG_KEYS is not set | 1091 | # CONFIG_KEYS is not set |
1071 | # CONFIG_SECURITY is not set | 1092 | # CONFIG_SECURITY is not set |
1093 | # CONFIG_SECURITYFS is not set | ||
1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1094 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1073 | CONFIG_CRYPTO=y | 1095 | CONFIG_CRYPTO=y |
1074 | 1096 | ||
1075 | # | 1097 | # |
1076 | # Crypto core or helper | 1098 | # Crypto core or helper |
1077 | # | 1099 | # |
1100 | # CONFIG_CRYPTO_FIPS is not set | ||
1078 | # CONFIG_CRYPTO_MANAGER is not set | 1101 | # CONFIG_CRYPTO_MANAGER is not set |
1079 | # CONFIG_CRYPTO_GF128MUL is not set | 1102 | # CONFIG_CRYPTO_GF128MUL is not set |
1080 | # CONFIG_CRYPTO_NULL is not set | 1103 | # CONFIG_CRYPTO_NULL is not set |
@@ -1147,6 +1170,11 @@ CONFIG_CRYPTO=y | |||
1147 | # | 1170 | # |
1148 | # CONFIG_CRYPTO_DEFLATE is not set | 1171 | # CONFIG_CRYPTO_DEFLATE is not set |
1149 | # CONFIG_CRYPTO_LZO is not set | 1172 | # CONFIG_CRYPTO_LZO is not set |
1173 | |||
1174 | # | ||
1175 | # Random Number Generation | ||
1176 | # | ||
1177 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1150 | CONFIG_CRYPTO_HW=y | 1178 | CONFIG_CRYPTO_HW=y |
1151 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1179 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1152 | # CONFIG_PPC_CLOCK is not set | 1180 | # CONFIG_PPC_CLOCK is not set |
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig index c10f7395aa1b..3df627494b65 100644 --- a/arch/powerpc/configs/52xx/cm5200_defconfig +++ b/arch/powerpc/configs/52xx/cm5200_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Tue Apr 29 07:11:37 2008 | 4 | # Thu Nov 13 02:12:40 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y | |||
102 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
103 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
104 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
106 | CONFIG_AIO=y | ||
105 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
106 | CONFIG_SLUB_DEBUG=y | 108 | CONFIG_SLUB_DEBUG=y |
107 | # CONFIG_SLAB is not set | 109 | # CONFIG_SLAB is not set |
@@ -110,9 +112,13 @@ CONFIG_SLUB=y | |||
110 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
111 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
112 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
113 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
120 | CONFIG_HAVE_CLK=y | ||
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
@@ -123,6 +129,7 @@ CONFIG_BLOCK=y | |||
123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 129 | # CONFIG_BLK_DEV_IO_TRACE is not set |
124 | # CONFIG_LSF is not set | 130 | # CONFIG_LSF is not set |
125 | # CONFIG_BLK_DEV_BSG is not set | 131 | # CONFIG_BLK_DEV_BSG is not set |
132 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
126 | 133 | ||
127 | # | 134 | # |
128 | # IO Schedulers | 135 | # IO Schedulers |
@@ -137,19 +144,16 @@ CONFIG_DEFAULT_AS=y | |||
137 | # CONFIG_DEFAULT_NOOP is not set | 144 | # CONFIG_DEFAULT_NOOP is not set |
138 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 145 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
139 | CONFIG_CLASSIC_RCU=y | 146 | CONFIG_CLASSIC_RCU=y |
147 | # CONFIG_FREEZER is not set | ||
140 | 148 | ||
141 | # | 149 | # |
142 | # Platform support | 150 | # Platform support |
143 | # | 151 | # |
144 | CONFIG_PPC_MULTIPLATFORM=y | 152 | CONFIG_PPC_MULTIPLATFORM=y |
145 | # CONFIG_PPC_82xx is not set | ||
146 | # CONFIG_PPC_83xx is not set | ||
147 | # CONFIG_PPC_86xx is not set | ||
148 | CONFIG_CLASSIC32=y | 153 | CONFIG_CLASSIC32=y |
149 | # CONFIG_PPC_CHRP is not set | 154 | # CONFIG_PPC_CHRP is not set |
150 | # CONFIG_PPC_MPC512x is not set | ||
151 | # CONFIG_PPC_MPC5121 is not set | ||
152 | # CONFIG_MPC5121_ADS is not set | 155 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_MPC5121_GENERIC is not set | ||
153 | CONFIG_PPC_MPC52xx=y | 157 | CONFIG_PPC_MPC52xx=y |
154 | CONFIG_PPC_MPC5200_SIMPLE=y | 158 | CONFIG_PPC_MPC5200_SIMPLE=y |
155 | # CONFIG_PPC_EFIKA is not set | 159 | # CONFIG_PPC_EFIKA is not set |
@@ -159,7 +163,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
159 | # CONFIG_PPC_PMAC is not set | 163 | # CONFIG_PPC_PMAC is not set |
160 | # CONFIG_PPC_CELL is not set | 164 | # CONFIG_PPC_CELL is not set |
161 | # CONFIG_PPC_CELL_NATIVE is not set | 165 | # CONFIG_PPC_CELL_NATIVE is not set |
166 | # CONFIG_PPC_82xx is not set | ||
162 | # CONFIG_PQ2ADS is not set | 167 | # CONFIG_PQ2ADS is not set |
168 | # CONFIG_PPC_83xx is not set | ||
169 | # CONFIG_PPC_86xx is not set | ||
163 | # CONFIG_EMBEDDED6xx is not set | 170 | # CONFIG_EMBEDDED6xx is not set |
164 | # CONFIG_IPIC is not set | 171 | # CONFIG_IPIC is not set |
165 | # CONFIG_MPIC is not set | 172 | # CONFIG_MPIC is not set |
@@ -183,7 +190,6 @@ CONFIG_PPC_BESTCOMM_FEC=y | |||
183 | # Kernel options | 190 | # Kernel options |
184 | # | 191 | # |
185 | # CONFIG_HIGHMEM is not set | 192 | # CONFIG_HIGHMEM is not set |
186 | # CONFIG_TICK_ONESHOT is not set | ||
187 | # CONFIG_NO_HZ is not set | 193 | # CONFIG_NO_HZ is not set |
188 | # CONFIG_HIGH_RES_TIMERS is not set | 194 | # CONFIG_HIGH_RES_TIMERS is not set |
189 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 195 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
@@ -197,6 +203,8 @@ CONFIG_PREEMPT_NONE=y | |||
197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 203 | # CONFIG_PREEMPT_VOLUNTARY is not set |
198 | # CONFIG_PREEMPT is not set | 204 | # CONFIG_PREEMPT is not set |
199 | CONFIG_BINFMT_ELF=y | 205 | CONFIG_BINFMT_ELF=y |
206 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
207 | # CONFIG_HAVE_AOUT is not set | ||
200 | # CONFIG_BINFMT_MISC is not set | 208 | # CONFIG_BINFMT_MISC is not set |
201 | # CONFIG_IOMMU_HELPER is not set | 209 | # CONFIG_IOMMU_HELPER is not set |
202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 210 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -211,19 +219,20 @@ CONFIG_FLATMEM_MANUAL=y | |||
211 | # CONFIG_SPARSEMEM_MANUAL is not set | 219 | # CONFIG_SPARSEMEM_MANUAL is not set |
212 | CONFIG_FLATMEM=y | 220 | CONFIG_FLATMEM=y |
213 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
214 | # CONFIG_SPARSEMEM_STATIC is not set | ||
215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
216 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | ||
218 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
219 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
220 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
221 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
230 | CONFIG_UNEVICTABLE_LRU=y | ||
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
223 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
224 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
234 | CONFIG_EXTRA_TARGETS="" | ||
225 | CONFIG_PM=y | 235 | CONFIG_PM=y |
226 | # CONFIG_PM_LEGACY is not set | ||
227 | # CONFIG_PM_DEBUG is not set | 236 | # CONFIG_PM_DEBUG is not set |
228 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
229 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
@@ -233,7 +242,7 @@ CONFIG_ISA_DMA_API=y | |||
233 | # | 242 | # |
234 | CONFIG_ZONE_DMA=y | 243 | CONFIG_ZONE_DMA=y |
235 | CONFIG_GENERIC_ISA_DMA=y | 244 | CONFIG_GENERIC_ISA_DMA=y |
236 | CONFIG_FSL_SOC=y | 245 | CONFIG_PPC_PCI_CHOICE=y |
237 | # CONFIG_PCI is not set | 246 | # CONFIG_PCI is not set |
238 | # CONFIG_PCI_DOMAINS is not set | 247 | # CONFIG_PCI_DOMAINS is not set |
239 | # CONFIG_PCI_SYSCALL is not set | 248 | # CONFIG_PCI_SYSCALL is not set |
@@ -254,10 +263,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
254 | CONFIG_KERNEL_START=0xc0000000 | 263 | CONFIG_KERNEL_START=0xc0000000 |
255 | CONFIG_PHYSICAL_START=0x00000000 | 264 | CONFIG_PHYSICAL_START=0x00000000 |
256 | CONFIG_TASK_SIZE=0xc0000000 | 265 | CONFIG_TASK_SIZE=0xc0000000 |
257 | |||
258 | # | ||
259 | # Networking | ||
260 | # | ||
261 | CONFIG_NET=y | 266 | CONFIG_NET=y |
262 | 267 | ||
263 | # | 268 | # |
@@ -308,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
308 | # CONFIG_TIPC is not set | 313 | # CONFIG_TIPC is not set |
309 | # CONFIG_ATM is not set | 314 | # CONFIG_ATM is not set |
310 | # CONFIG_BRIDGE is not set | 315 | # CONFIG_BRIDGE is not set |
316 | # CONFIG_NET_DSA is not set | ||
311 | # CONFIG_VLAN_8021Q is not set | 317 | # CONFIG_VLAN_8021Q is not set |
312 | # CONFIG_DECNET is not set | 318 | # CONFIG_DECNET is not set |
313 | # CONFIG_LLC2 is not set | 319 | # CONFIG_LLC2 is not set |
@@ -328,14 +334,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
328 | # CONFIG_IRDA is not set | 334 | # CONFIG_IRDA is not set |
329 | # CONFIG_BT is not set | 335 | # CONFIG_BT is not set |
330 | # CONFIG_AF_RXRPC is not set | 336 | # CONFIG_AF_RXRPC is not set |
331 | 337 | # CONFIG_PHONET is not set | |
332 | # | 338 | # CONFIG_WIRELESS is not set |
333 | # Wireless | ||
334 | # | ||
335 | # CONFIG_CFG80211 is not set | ||
336 | # CONFIG_WIRELESS_EXT is not set | ||
337 | # CONFIG_MAC80211 is not set | ||
338 | # CONFIG_IEEE80211 is not set | ||
339 | # CONFIG_RFKILL is not set | 339 | # CONFIG_RFKILL is not set |
340 | # CONFIG_NET_9P is not set | 340 | # CONFIG_NET_9P is not set |
341 | 341 | ||
@@ -446,6 +446,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
446 | # CONFIG_BLK_DEV_XIP is not set | 446 | # CONFIG_BLK_DEV_XIP is not set |
447 | # CONFIG_CDROM_PKTCDVD is not set | 447 | # CONFIG_CDROM_PKTCDVD is not set |
448 | # CONFIG_ATA_OVER_ETH is not set | 448 | # CONFIG_ATA_OVER_ETH is not set |
449 | # CONFIG_BLK_DEV_HD is not set | ||
449 | # CONFIG_MISC_DEVICES is not set | 450 | # CONFIG_MISC_DEVICES is not set |
450 | CONFIG_HAVE_IDE=y | 451 | CONFIG_HAVE_IDE=y |
451 | # CONFIG_IDE is not set | 452 | # CONFIG_IDE is not set |
@@ -487,11 +488,11 @@ CONFIG_CHR_DEV_SG=y | |||
487 | # CONFIG_SCSI_SAS_LIBSAS is not set | 488 | # CONFIG_SCSI_SAS_LIBSAS is not set |
488 | # CONFIG_SCSI_SRP_ATTRS is not set | 489 | # CONFIG_SCSI_SRP_ATTRS is not set |
489 | # CONFIG_SCSI_LOWLEVEL is not set | 490 | # CONFIG_SCSI_LOWLEVEL is not set |
491 | # CONFIG_SCSI_DH is not set | ||
490 | # CONFIG_ATA is not set | 492 | # CONFIG_ATA is not set |
491 | # CONFIG_MD is not set | 493 | # CONFIG_MD is not set |
492 | # CONFIG_MACINTOSH_DRIVERS is not set | 494 | # CONFIG_MACINTOSH_DRIVERS is not set |
493 | CONFIG_NETDEVICES=y | 495 | CONFIG_NETDEVICES=y |
494 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
495 | # CONFIG_DUMMY is not set | 496 | # CONFIG_DUMMY is not set |
496 | # CONFIG_BONDING is not set | 497 | # CONFIG_BONDING is not set |
497 | # CONFIG_MACVLAN is not set | 498 | # CONFIG_MACVLAN is not set |
@@ -521,6 +522,9 @@ CONFIG_NET_ETHERNET=y | |||
521 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 522 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
522 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 523 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
523 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 524 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
525 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
526 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
527 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
524 | # CONFIG_B44 is not set | 528 | # CONFIG_B44 is not set |
525 | CONFIG_FEC_MPC52xx=y | 529 | CONFIG_FEC_MPC52xx=y |
526 | CONFIG_FEC_MPC52xx_MDIO=y | 530 | CONFIG_FEC_MPC52xx_MDIO=y |
@@ -532,7 +536,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
532 | # | 536 | # |
533 | # CONFIG_WLAN_PRE80211 is not set | 537 | # CONFIG_WLAN_PRE80211 is not set |
534 | # CONFIG_WLAN_80211 is not set | 538 | # CONFIG_WLAN_80211 is not set |
535 | # CONFIG_IWLWIFI is not set | ||
536 | # CONFIG_IWLWIFI_LEDS is not set | 539 | # CONFIG_IWLWIFI_LEDS is not set |
537 | 540 | ||
538 | # | 541 | # |
@@ -567,6 +570,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
567 | # Character devices | 570 | # Character devices |
568 | # | 571 | # |
569 | # CONFIG_VT is not set | 572 | # CONFIG_VT is not set |
573 | CONFIG_DEVKMEM=y | ||
570 | # CONFIG_SERIAL_NONSTANDARD is not set | 574 | # CONFIG_SERIAL_NONSTANDARD is not set |
571 | 575 | ||
572 | # | 576 | # |
@@ -596,25 +600,40 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
596 | CONFIG_I2C=y | 600 | CONFIG_I2C=y |
597 | CONFIG_I2C_BOARDINFO=y | 601 | CONFIG_I2C_BOARDINFO=y |
598 | CONFIG_I2C_CHARDEV=y | 602 | CONFIG_I2C_CHARDEV=y |
603 | CONFIG_I2C_HELPER_AUTO=y | ||
599 | 604 | ||
600 | # | 605 | # |
601 | # I2C Hardware Bus support | 606 | # I2C Hardware Bus support |
602 | # | 607 | # |
608 | |||
609 | # | ||
610 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
611 | # | ||
603 | CONFIG_I2C_MPC=y | 612 | CONFIG_I2C_MPC=y |
604 | # CONFIG_I2C_OCORES is not set | 613 | # CONFIG_I2C_OCORES is not set |
605 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
606 | # CONFIG_I2C_SIMTEC is not set | 614 | # CONFIG_I2C_SIMTEC is not set |
615 | |||
616 | # | ||
617 | # External I2C/SMBus adapter drivers | ||
618 | # | ||
619 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
607 | # CONFIG_I2C_TAOS_EVM is not set | 620 | # CONFIG_I2C_TAOS_EVM is not set |
608 | # CONFIG_I2C_TINY_USB is not set | 621 | # CONFIG_I2C_TINY_USB is not set |
622 | |||
623 | # | ||
624 | # Other I2C/SMBus bus drivers | ||
625 | # | ||
609 | # CONFIG_I2C_PCA_PLATFORM is not set | 626 | # CONFIG_I2C_PCA_PLATFORM is not set |
610 | 627 | ||
611 | # | 628 | # |
612 | # Miscellaneous I2C Chip support | 629 | # Miscellaneous I2C Chip support |
613 | # | 630 | # |
614 | # CONFIG_DS1682 is not set | 631 | # CONFIG_DS1682 is not set |
632 | # CONFIG_AT24 is not set | ||
615 | # CONFIG_SENSORS_EEPROM is not set | 633 | # CONFIG_SENSORS_EEPROM is not set |
616 | # CONFIG_SENSORS_PCF8574 is not set | 634 | # CONFIG_SENSORS_PCF8574 is not set |
617 | # CONFIG_PCF8575 is not set | 635 | # CONFIG_PCF8575 is not set |
636 | # CONFIG_SENSORS_PCA9539 is not set | ||
618 | # CONFIG_SENSORS_PCF8591 is not set | 637 | # CONFIG_SENSORS_PCF8591 is not set |
619 | # CONFIG_SENSORS_MAX6875 is not set | 638 | # CONFIG_SENSORS_MAX6875 is not set |
620 | # CONFIG_SENSORS_TSL2550 is not set | 639 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -623,10 +642,13 @@ CONFIG_I2C_MPC=y | |||
623 | # CONFIG_I2C_DEBUG_BUS is not set | 642 | # CONFIG_I2C_DEBUG_BUS is not set |
624 | # CONFIG_I2C_DEBUG_CHIP is not set | 643 | # CONFIG_I2C_DEBUG_CHIP is not set |
625 | # CONFIG_SPI is not set | 644 | # CONFIG_SPI is not set |
645 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
646 | # CONFIG_GPIOLIB is not set | ||
626 | # CONFIG_W1 is not set | 647 | # CONFIG_W1 is not set |
627 | # CONFIG_POWER_SUPPLY is not set | 648 | # CONFIG_POWER_SUPPLY is not set |
628 | # CONFIG_HWMON is not set | 649 | # CONFIG_HWMON is not set |
629 | # CONFIG_THERMAL is not set | 650 | # CONFIG_THERMAL is not set |
651 | # CONFIG_THERMAL_HWMON is not set | ||
630 | CONFIG_WATCHDOG=y | 652 | CONFIG_WATCHDOG=y |
631 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 653 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
632 | 654 | ||
@@ -640,24 +662,39 @@ CONFIG_WATCHDOG=y | |||
640 | # USB-based Watchdog Cards | 662 | # USB-based Watchdog Cards |
641 | # | 663 | # |
642 | # CONFIG_USBPCWATCHDOG is not set | 664 | # CONFIG_USBPCWATCHDOG is not set |
665 | CONFIG_SSB_POSSIBLE=y | ||
643 | 666 | ||
644 | # | 667 | # |
645 | # Sonics Silicon Backplane | 668 | # Sonics Silicon Backplane |
646 | # | 669 | # |
647 | CONFIG_SSB_POSSIBLE=y | ||
648 | # CONFIG_SSB is not set | 670 | # CONFIG_SSB is not set |
649 | 671 | ||
650 | # | 672 | # |
651 | # Multifunction device drivers | 673 | # Multifunction device drivers |
652 | # | 674 | # |
675 | # CONFIG_MFD_CORE is not set | ||
653 | # CONFIG_MFD_SM501 is not set | 676 | # CONFIG_MFD_SM501 is not set |
654 | # CONFIG_HTC_PASIC3 is not set | 677 | # CONFIG_HTC_PASIC3 is not set |
678 | # CONFIG_MFD_TMIO is not set | ||
679 | # CONFIG_PMIC_DA903X is not set | ||
680 | # CONFIG_MFD_WM8400 is not set | ||
681 | # CONFIG_MFD_WM8350_I2C is not set | ||
682 | # CONFIG_REGULATOR is not set | ||
655 | 683 | ||
656 | # | 684 | # |
657 | # Multimedia devices | 685 | # Multimedia devices |
658 | # | 686 | # |
687 | |||
688 | # | ||
689 | # Multimedia core support | ||
690 | # | ||
659 | # CONFIG_VIDEO_DEV is not set | 691 | # CONFIG_VIDEO_DEV is not set |
660 | # CONFIG_DVB_CORE is not set | 692 | # CONFIG_DVB_CORE is not set |
693 | # CONFIG_VIDEO_MEDIA is not set | ||
694 | |||
695 | # | ||
696 | # Multimedia drivers | ||
697 | # | ||
661 | # CONFIG_DAB is not set | 698 | # CONFIG_DAB is not set |
662 | 699 | ||
663 | # | 700 | # |
@@ -672,10 +709,6 @@ CONFIG_SSB_POSSIBLE=y | |||
672 | # Display device support | 709 | # Display device support |
673 | # | 710 | # |
674 | # CONFIG_DISPLAY_SUPPORT is not set | 711 | # CONFIG_DISPLAY_SUPPORT is not set |
675 | |||
676 | # | ||
677 | # Sound | ||
678 | # | ||
679 | # CONFIG_SOUND is not set | 712 | # CONFIG_SOUND is not set |
680 | CONFIG_USB_SUPPORT=y | 713 | CONFIG_USB_SUPPORT=y |
681 | CONFIG_USB_ARCH_HAS_HCD=y | 714 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -695,11 +728,16 @@ CONFIG_USB_DEVICEFS=y | |||
695 | # CONFIG_USB_OTG is not set | 728 | # CONFIG_USB_OTG is not set |
696 | # CONFIG_USB_OTG_WHITELIST is not set | 729 | # CONFIG_USB_OTG_WHITELIST is not set |
697 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 730 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
731 | # CONFIG_USB_MON is not set | ||
732 | # CONFIG_USB_WUSB is not set | ||
733 | # CONFIG_USB_WUSB_CBAF is not set | ||
698 | 734 | ||
699 | # | 735 | # |
700 | # USB Host Controller Drivers | 736 | # USB Host Controller Drivers |
701 | # | 737 | # |
738 | # CONFIG_USB_C67X00_HCD is not set | ||
702 | # CONFIG_USB_ISP116X_HCD is not set | 739 | # CONFIG_USB_ISP116X_HCD is not set |
740 | # CONFIG_USB_ISP1760_HCD is not set | ||
703 | CONFIG_USB_OHCI_HCD=y | 741 | CONFIG_USB_OHCI_HCD=y |
704 | CONFIG_USB_OHCI_HCD_PPC_SOC=y | 742 | CONFIG_USB_OHCI_HCD_PPC_SOC=y |
705 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 743 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
@@ -710,12 +748,16 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
710 | # CONFIG_USB_OHCI_LITTLE_ENDIAN is not set | 748 | # CONFIG_USB_OHCI_LITTLE_ENDIAN is not set |
711 | # CONFIG_USB_SL811_HCD is not set | 749 | # CONFIG_USB_SL811_HCD is not set |
712 | # CONFIG_USB_R8A66597_HCD is not set | 750 | # CONFIG_USB_R8A66597_HCD is not set |
751 | # CONFIG_USB_HWA_HCD is not set | ||
752 | # CONFIG_USB_MUSB_HDRC is not set | ||
713 | 753 | ||
714 | # | 754 | # |
715 | # USB Device Class drivers | 755 | # USB Device Class drivers |
716 | # | 756 | # |
717 | # CONFIG_USB_ACM is not set | 757 | # CONFIG_USB_ACM is not set |
718 | # CONFIG_USB_PRINTER is not set | 758 | # CONFIG_USB_PRINTER is not set |
759 | # CONFIG_USB_WDM is not set | ||
760 | # CONFIG_USB_TMC is not set | ||
719 | 761 | ||
720 | # | 762 | # |
721 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 763 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -744,7 +786,6 @@ CONFIG_USB_STORAGE=y | |||
744 | # | 786 | # |
745 | # CONFIG_USB_MDC800 is not set | 787 | # CONFIG_USB_MDC800 is not set |
746 | # CONFIG_USB_MICROTEK is not set | 788 | # CONFIG_USB_MICROTEK is not set |
747 | # CONFIG_USB_MON is not set | ||
748 | 789 | ||
749 | # | 790 | # |
750 | # USB port drivers | 791 | # USB port drivers |
@@ -757,7 +798,7 @@ CONFIG_USB_STORAGE=y | |||
757 | # CONFIG_USB_EMI62 is not set | 798 | # CONFIG_USB_EMI62 is not set |
758 | # CONFIG_USB_EMI26 is not set | 799 | # CONFIG_USB_EMI26 is not set |
759 | # CONFIG_USB_ADUTUX is not set | 800 | # CONFIG_USB_ADUTUX is not set |
760 | # CONFIG_USB_AUERSWALD is not set | 801 | # CONFIG_USB_SEVSEG is not set |
761 | # CONFIG_USB_RIO500 is not set | 802 | # CONFIG_USB_RIO500 is not set |
762 | # CONFIG_USB_LEGOTOWER is not set | 803 | # CONFIG_USB_LEGOTOWER is not set |
763 | # CONFIG_USB_LCD is not set | 804 | # CONFIG_USB_LCD is not set |
@@ -773,14 +814,19 @@ CONFIG_USB_STORAGE=y | |||
773 | # CONFIG_USB_TRANCEVIBRATOR is not set | 814 | # CONFIG_USB_TRANCEVIBRATOR is not set |
774 | # CONFIG_USB_IOWARRIOR is not set | 815 | # CONFIG_USB_IOWARRIOR is not set |
775 | # CONFIG_USB_TEST is not set | 816 | # CONFIG_USB_TEST is not set |
817 | # CONFIG_USB_ISIGHTFW is not set | ||
818 | # CONFIG_USB_VST is not set | ||
776 | # CONFIG_USB_GADGET is not set | 819 | # CONFIG_USB_GADGET is not set |
777 | # CONFIG_MMC is not set | 820 | # CONFIG_MMC is not set |
778 | # CONFIG_MEMSTICK is not set | 821 | # CONFIG_MEMSTICK is not set |
779 | # CONFIG_NEW_LEDS is not set | 822 | # CONFIG_NEW_LEDS is not set |
823 | # CONFIG_ACCESSIBILITY is not set | ||
780 | # CONFIG_EDAC is not set | 824 | # CONFIG_EDAC is not set |
781 | # CONFIG_RTC_CLASS is not set | 825 | # CONFIG_RTC_CLASS is not set |
782 | # CONFIG_DMADEVICES is not set | 826 | # CONFIG_DMADEVICES is not set |
783 | # CONFIG_UIO is not set | 827 | # CONFIG_UIO is not set |
828 | # CONFIG_STAGING is not set | ||
829 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
784 | 830 | ||
785 | # | 831 | # |
786 | # File systems | 832 | # File systems |
@@ -792,12 +838,13 @@ CONFIG_EXT3_FS=y | |||
792 | CONFIG_EXT3_FS_XATTR=y | 838 | CONFIG_EXT3_FS_XATTR=y |
793 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 839 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
794 | # CONFIG_EXT3_FS_SECURITY is not set | 840 | # CONFIG_EXT3_FS_SECURITY is not set |
795 | # CONFIG_EXT4DEV_FS is not set | 841 | # CONFIG_EXT4_FS is not set |
796 | CONFIG_JBD=y | 842 | CONFIG_JBD=y |
797 | CONFIG_FS_MBCACHE=y | 843 | CONFIG_FS_MBCACHE=y |
798 | # CONFIG_REISERFS_FS is not set | 844 | # CONFIG_REISERFS_FS is not set |
799 | # CONFIG_JFS_FS is not set | 845 | # CONFIG_JFS_FS is not set |
800 | # CONFIG_FS_POSIX_ACL is not set | 846 | # CONFIG_FS_POSIX_ACL is not set |
847 | CONFIG_FILE_LOCKING=y | ||
801 | # CONFIG_XFS_FS is not set | 848 | # CONFIG_XFS_FS is not set |
802 | # CONFIG_OCFS2_FS is not set | 849 | # CONFIG_OCFS2_FS is not set |
803 | CONFIG_DNOTIFY=y | 850 | CONFIG_DNOTIFY=y |
@@ -830,6 +877,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
830 | CONFIG_PROC_FS=y | 877 | CONFIG_PROC_FS=y |
831 | CONFIG_PROC_KCORE=y | 878 | CONFIG_PROC_KCORE=y |
832 | CONFIG_PROC_SYSCTL=y | 879 | CONFIG_PROC_SYSCTL=y |
880 | CONFIG_PROC_PAGE_MONITOR=y | ||
833 | CONFIG_SYSFS=y | 881 | CONFIG_SYSFS=y |
834 | CONFIG_TMPFS=y | 882 | CONFIG_TMPFS=y |
835 | # CONFIG_TMPFS_POSIX_ACL is not set | 883 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -860,6 +908,7 @@ CONFIG_JFFS2_RTIME=y | |||
860 | CONFIG_CRAMFS=y | 908 | CONFIG_CRAMFS=y |
861 | # CONFIG_VXFS_FS is not set | 909 | # CONFIG_VXFS_FS is not set |
862 | # CONFIG_MINIX_FS is not set | 910 | # CONFIG_MINIX_FS is not set |
911 | # CONFIG_OMFS_FS is not set | ||
863 | # CONFIG_HPFS_FS is not set | 912 | # CONFIG_HPFS_FS is not set |
864 | # CONFIG_QNX4FS_FS is not set | 913 | # CONFIG_QNX4FS_FS is not set |
865 | # CONFIG_ROMFS_FS is not set | 914 | # CONFIG_ROMFS_FS is not set |
@@ -870,14 +919,14 @@ CONFIG_NFS_FS=y | |||
870 | CONFIG_NFS_V3=y | 919 | CONFIG_NFS_V3=y |
871 | # CONFIG_NFS_V3_ACL is not set | 920 | # CONFIG_NFS_V3_ACL is not set |
872 | CONFIG_NFS_V4=y | 921 | CONFIG_NFS_V4=y |
873 | # CONFIG_NFSD is not set | ||
874 | CONFIG_ROOT_NFS=y | 922 | CONFIG_ROOT_NFS=y |
923 | # CONFIG_NFSD is not set | ||
875 | CONFIG_LOCKD=y | 924 | CONFIG_LOCKD=y |
876 | CONFIG_LOCKD_V4=y | 925 | CONFIG_LOCKD_V4=y |
877 | CONFIG_NFS_COMMON=y | 926 | CONFIG_NFS_COMMON=y |
878 | CONFIG_SUNRPC=y | 927 | CONFIG_SUNRPC=y |
879 | CONFIG_SUNRPC_GSS=y | 928 | CONFIG_SUNRPC_GSS=y |
880 | # CONFIG_SUNRPC_BIND34 is not set | 929 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
881 | CONFIG_RPCSEC_GSS_KRB5=y | 930 | CONFIG_RPCSEC_GSS_KRB5=y |
882 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 931 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
883 | # CONFIG_SMB_FS is not set | 932 | # CONFIG_SMB_FS is not set |
@@ -953,9 +1002,9 @@ CONFIG_NLS_ISO8859_1=y | |||
953 | # Library routines | 1002 | # Library routines |
954 | # | 1003 | # |
955 | CONFIG_BITREVERSE=y | 1004 | CONFIG_BITREVERSE=y |
956 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
957 | # CONFIG_CRC_CCITT is not set | 1005 | # CONFIG_CRC_CCITT is not set |
958 | # CONFIG_CRC16 is not set | 1006 | # CONFIG_CRC16 is not set |
1007 | # CONFIG_CRC_T10DIF is not set | ||
959 | # CONFIG_CRC_ITU_T is not set | 1008 | # CONFIG_CRC_ITU_T is not set |
960 | CONFIG_CRC32=y | 1009 | CONFIG_CRC32=y |
961 | # CONFIG_CRC7 is not set | 1010 | # CONFIG_CRC7 is not set |
@@ -982,9 +1031,12 @@ CONFIG_FRAME_WARN=1024 | |||
982 | CONFIG_DEBUG_KERNEL=y | 1031 | CONFIG_DEBUG_KERNEL=y |
983 | # CONFIG_DEBUG_SHIRQ is not set | 1032 | # CONFIG_DEBUG_SHIRQ is not set |
984 | CONFIG_DETECT_SOFTLOCKUP=y | 1033 | CONFIG_DETECT_SOFTLOCKUP=y |
1034 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1035 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
985 | CONFIG_SCHED_DEBUG=y | 1036 | CONFIG_SCHED_DEBUG=y |
986 | # CONFIG_SCHEDSTATS is not set | 1037 | # CONFIG_SCHEDSTATS is not set |
987 | # CONFIG_TIMER_STATS is not set | 1038 | # CONFIG_TIMER_STATS is not set |
1039 | # CONFIG_DEBUG_OBJECTS is not set | ||
988 | # CONFIG_SLUB_DEBUG_ON is not set | 1040 | # CONFIG_SLUB_DEBUG_ON is not set |
989 | # CONFIG_SLUB_STATS is not set | 1041 | # CONFIG_SLUB_STATS is not set |
990 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1042 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -998,16 +1050,37 @@ CONFIG_SCHED_DEBUG=y | |||
998 | # CONFIG_DEBUG_INFO is not set | 1050 | # CONFIG_DEBUG_INFO is not set |
999 | # CONFIG_DEBUG_VM is not set | 1051 | # CONFIG_DEBUG_VM is not set |
1000 | # CONFIG_DEBUG_WRITECOUNT is not set | 1052 | # CONFIG_DEBUG_WRITECOUNT is not set |
1053 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1001 | # CONFIG_DEBUG_LIST is not set | 1054 | # CONFIG_DEBUG_LIST is not set |
1002 | # CONFIG_DEBUG_SG is not set | 1055 | # CONFIG_DEBUG_SG is not set |
1003 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1056 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1057 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1058 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1004 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1059 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1060 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1005 | # CONFIG_FAULT_INJECTION is not set | 1061 | # CONFIG_FAULT_INJECTION is not set |
1062 | # CONFIG_LATENCYTOP is not set | ||
1063 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1064 | |||
1065 | # | ||
1066 | # Tracers | ||
1067 | # | ||
1068 | # CONFIG_FUNCTION_TRACER is not set | ||
1069 | # CONFIG_SCHED_TRACER is not set | ||
1070 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1071 | # CONFIG_BOOT_TRACER is not set | ||
1072 | # CONFIG_STACK_TRACER is not set | ||
1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1006 | # CONFIG_SAMPLES is not set | 1074 | # CONFIG_SAMPLES is not set |
1075 | CONFIG_HAVE_ARCH_KGDB=y | ||
1076 | # CONFIG_KGDB is not set | ||
1007 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1077 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1008 | # CONFIG_DEBUG_STACK_USAGE is not set | 1078 | # CONFIG_DEBUG_STACK_USAGE is not set |
1009 | # CONFIG_DEBUG_PAGEALLOC is not set | 1079 | # CONFIG_DEBUG_PAGEALLOC is not set |
1010 | # CONFIG_DEBUGGER is not set | 1080 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1081 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1082 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1083 | # CONFIG_XMON is not set | ||
1011 | # CONFIG_IRQSTACKS is not set | 1084 | # CONFIG_IRQSTACKS is not set |
1012 | # CONFIG_BDI_SWITCH is not set | 1085 | # CONFIG_BDI_SWITCH is not set |
1013 | # CONFIG_BOOTX_TEXT is not set | 1086 | # CONFIG_BOOTX_TEXT is not set |
@@ -1018,14 +1091,19 @@ CONFIG_SCHED_DEBUG=y | |||
1018 | # | 1091 | # |
1019 | # CONFIG_KEYS is not set | 1092 | # CONFIG_KEYS is not set |
1020 | # CONFIG_SECURITY is not set | 1093 | # CONFIG_SECURITY is not set |
1094 | # CONFIG_SECURITYFS is not set | ||
1021 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1095 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1022 | CONFIG_CRYPTO=y | 1096 | CONFIG_CRYPTO=y |
1023 | 1097 | ||
1024 | # | 1098 | # |
1025 | # Crypto core or helper | 1099 | # Crypto core or helper |
1026 | # | 1100 | # |
1101 | # CONFIG_CRYPTO_FIPS is not set | ||
1027 | CONFIG_CRYPTO_ALGAPI=y | 1102 | CONFIG_CRYPTO_ALGAPI=y |
1103 | CONFIG_CRYPTO_AEAD=y | ||
1028 | CONFIG_CRYPTO_BLKCIPHER=y | 1104 | CONFIG_CRYPTO_BLKCIPHER=y |
1105 | CONFIG_CRYPTO_HASH=y | ||
1106 | CONFIG_CRYPTO_RNG=y | ||
1029 | CONFIG_CRYPTO_MANAGER=y | 1107 | CONFIG_CRYPTO_MANAGER=y |
1030 | # CONFIG_CRYPTO_GF128MUL is not set | 1108 | # CONFIG_CRYPTO_GF128MUL is not set |
1031 | # CONFIG_CRYPTO_NULL is not set | 1109 | # CONFIG_CRYPTO_NULL is not set |
@@ -1063,6 +1141,10 @@ CONFIG_CRYPTO_PCBC=y | |||
1063 | # CONFIG_CRYPTO_MD4 is not set | 1141 | # CONFIG_CRYPTO_MD4 is not set |
1064 | CONFIG_CRYPTO_MD5=y | 1142 | CONFIG_CRYPTO_MD5=y |
1065 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1143 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1144 | # CONFIG_CRYPTO_RMD128 is not set | ||
1145 | # CONFIG_CRYPTO_RMD160 is not set | ||
1146 | # CONFIG_CRYPTO_RMD256 is not set | ||
1147 | # CONFIG_CRYPTO_RMD320 is not set | ||
1066 | # CONFIG_CRYPTO_SHA1 is not set | 1148 | # CONFIG_CRYPTO_SHA1 is not set |
1067 | # CONFIG_CRYPTO_SHA256 is not set | 1149 | # CONFIG_CRYPTO_SHA256 is not set |
1068 | # CONFIG_CRYPTO_SHA512 is not set | 1150 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1093,6 +1175,11 @@ CONFIG_CRYPTO_DES=y | |||
1093 | # | 1175 | # |
1094 | # CONFIG_CRYPTO_DEFLATE is not set | 1176 | # CONFIG_CRYPTO_DEFLATE is not set |
1095 | # CONFIG_CRYPTO_LZO is not set | 1177 | # CONFIG_CRYPTO_LZO is not set |
1178 | |||
1179 | # | ||
1180 | # Random Number Generation | ||
1181 | # | ||
1182 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1096 | CONFIG_CRYPTO_HW=y | 1183 | CONFIG_CRYPTO_HW=y |
1097 | CONFIG_PPC_CLOCK=y | 1184 | CONFIG_PPC_CLOCK=y |
1098 | CONFIG_PPC_LIB_RHEAP=y | 1185 | CONFIG_PPC_LIB_RHEAP=y |
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig index 1a8a250fa11b..5b969f9c925e 100644 --- a/arch/powerpc/configs/52xx/lite5200b_defconfig +++ b/arch/powerpc/configs/52xx/lite5200b_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Tue Apr 29 07:12:56 2008 | 4 | # Thu Nov 13 02:10:16 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -103,7 +104,9 @@ CONFIG_SIGNALFD=y | |||
103 | CONFIG_TIMERFD=y | 104 | CONFIG_TIMERFD=y |
104 | CONFIG_EVENTFD=y | 105 | CONFIG_EVENTFD=y |
105 | CONFIG_SHMEM=y | 106 | CONFIG_SHMEM=y |
107 | CONFIG_AIO=y | ||
106 | CONFIG_VM_EVENT_COUNTERS=y | 108 | CONFIG_VM_EVENT_COUNTERS=y |
109 | CONFIG_PCI_QUIRKS=y | ||
107 | CONFIG_SLUB_DEBUG=y | 110 | CONFIG_SLUB_DEBUG=y |
108 | # CONFIG_SLAB is not set | 111 | # CONFIG_SLAB is not set |
109 | CONFIG_SLUB=y | 112 | CONFIG_SLUB=y |
@@ -111,24 +114,30 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
116 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
122 | CONFIG_HAVE_CLK=y | ||
123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
117 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
118 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
119 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
120 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
121 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
122 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
123 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
124 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
125 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 133 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
126 | # CONFIG_KMOD is not set | 134 | CONFIG_KMOD=y |
127 | CONFIG_BLOCK=y | 135 | CONFIG_BLOCK=y |
128 | # CONFIG_LBD is not set | 136 | # CONFIG_LBD is not set |
129 | # CONFIG_BLK_DEV_IO_TRACE is not set | 137 | # CONFIG_BLK_DEV_IO_TRACE is not set |
130 | # CONFIG_LSF is not set | 138 | # CONFIG_LSF is not set |
131 | # CONFIG_BLK_DEV_BSG is not set | 139 | # CONFIG_BLK_DEV_BSG is not set |
140 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
132 | 141 | ||
133 | # | 142 | # |
134 | # IO Schedulers | 143 | # IO Schedulers |
@@ -143,19 +152,16 @@ CONFIG_DEFAULT_AS=y | |||
143 | # CONFIG_DEFAULT_NOOP is not set | 152 | # CONFIG_DEFAULT_NOOP is not set |
144 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 153 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
145 | CONFIG_CLASSIC_RCU=y | 154 | CONFIG_CLASSIC_RCU=y |
155 | CONFIG_FREEZER=y | ||
146 | 156 | ||
147 | # | 157 | # |
148 | # Platform support | 158 | # Platform support |
149 | # | 159 | # |
150 | CONFIG_PPC_MULTIPLATFORM=y | 160 | CONFIG_PPC_MULTIPLATFORM=y |
151 | # CONFIG_PPC_82xx is not set | ||
152 | # CONFIG_PPC_83xx is not set | ||
153 | # CONFIG_PPC_86xx is not set | ||
154 | CONFIG_CLASSIC32=y | 161 | CONFIG_CLASSIC32=y |
155 | # CONFIG_PPC_CHRP is not set | 162 | # CONFIG_PPC_CHRP is not set |
156 | # CONFIG_PPC_MPC512x is not set | ||
157 | # CONFIG_PPC_MPC5121 is not set | ||
158 | # CONFIG_MPC5121_ADS is not set | 163 | # CONFIG_MPC5121_ADS is not set |
164 | # CONFIG_MPC5121_GENERIC is not set | ||
159 | CONFIG_PPC_MPC52xx=y | 165 | CONFIG_PPC_MPC52xx=y |
160 | CONFIG_PPC_MPC5200_SIMPLE=y | 166 | CONFIG_PPC_MPC5200_SIMPLE=y |
161 | # CONFIG_PPC_EFIKA is not set | 167 | # CONFIG_PPC_EFIKA is not set |
@@ -165,7 +171,10 @@ CONFIG_PPC_LITE5200=y | |||
165 | # CONFIG_PPC_PMAC is not set | 171 | # CONFIG_PPC_PMAC is not set |
166 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
167 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | ||
168 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
176 | # CONFIG_PPC_83xx is not set | ||
177 | # CONFIG_PPC_86xx is not set | ||
169 | # CONFIG_EMBEDDED6xx is not set | 178 | # CONFIG_EMBEDDED6xx is not set |
170 | # CONFIG_IPIC is not set | 179 | # CONFIG_IPIC is not set |
171 | # CONFIG_MPIC is not set | 180 | # CONFIG_MPIC is not set |
@@ -198,11 +207,13 @@ CONFIG_HZ_250=y | |||
198 | # CONFIG_HZ_300 is not set | 207 | # CONFIG_HZ_300 is not set |
199 | # CONFIG_HZ_1000 is not set | 208 | # CONFIG_HZ_1000 is not set |
200 | CONFIG_HZ=250 | 209 | CONFIG_HZ=250 |
201 | # CONFIG_SCHED_HRTICK is not set | 210 | CONFIG_SCHED_HRTICK=y |
202 | CONFIG_PREEMPT_NONE=y | 211 | CONFIG_PREEMPT_NONE=y |
203 | # CONFIG_PREEMPT_VOLUNTARY is not set | 212 | # CONFIG_PREEMPT_VOLUNTARY is not set |
204 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
205 | CONFIG_BINFMT_ELF=y | 214 | CONFIG_BINFMT_ELF=y |
215 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
216 | # CONFIG_HAVE_AOUT is not set | ||
206 | # CONFIG_BINFMT_MISC is not set | 217 | # CONFIG_BINFMT_MISC is not set |
207 | # CONFIG_IOMMU_HELPER is not set | 218 | # CONFIG_IOMMU_HELPER is not set |
208 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 219 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -217,19 +228,20 @@ CONFIG_FLATMEM_MANUAL=y | |||
217 | # CONFIG_SPARSEMEM_MANUAL is not set | 228 | # CONFIG_SPARSEMEM_MANUAL is not set |
218 | CONFIG_FLATMEM=y | 229 | CONFIG_FLATMEM=y |
219 | CONFIG_FLAT_NODE_MEM_MAP=y | 230 | CONFIG_FLAT_NODE_MEM_MAP=y |
220 | # CONFIG_SPARSEMEM_STATIC is not set | ||
221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
222 | CONFIG_PAGEFLAGS_EXTENDED=y | 231 | CONFIG_PAGEFLAGS_EXTENDED=y |
223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
233 | CONFIG_MIGRATION=y | ||
224 | # CONFIG_RESOURCES_64BIT is not set | 234 | # CONFIG_RESOURCES_64BIT is not set |
235 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
225 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
226 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
227 | CONFIG_VIRT_TO_BUS=y | 238 | CONFIG_VIRT_TO_BUS=y |
239 | CONFIG_UNEVICTABLE_LRU=y | ||
228 | CONFIG_FORCE_MAX_ZONEORDER=11 | 240 | CONFIG_FORCE_MAX_ZONEORDER=11 |
229 | CONFIG_PROC_DEVICETREE=y | 241 | CONFIG_PROC_DEVICETREE=y |
230 | # CONFIG_CMDLINE_BOOL is not set | 242 | # CONFIG_CMDLINE_BOOL is not set |
243 | CONFIG_EXTRA_TARGETS="" | ||
231 | CONFIG_PM=y | 244 | CONFIG_PM=y |
232 | # CONFIG_PM_LEGACY is not set | ||
233 | # CONFIG_PM_DEBUG is not set | 245 | # CONFIG_PM_DEBUG is not set |
234 | CONFIG_PM_SLEEP=y | 246 | CONFIG_PM_SLEEP=y |
235 | CONFIG_SUSPEND=y | 247 | CONFIG_SUSPEND=y |
@@ -243,7 +255,7 @@ CONFIG_ISA_DMA_API=y | |||
243 | CONFIG_ZONE_DMA=y | 255 | CONFIG_ZONE_DMA=y |
244 | CONFIG_GENERIC_ISA_DMA=y | 256 | CONFIG_GENERIC_ISA_DMA=y |
245 | # CONFIG_PPC_INDIRECT_PCI is not set | 257 | # CONFIG_PPC_INDIRECT_PCI is not set |
246 | CONFIG_FSL_SOC=y | 258 | CONFIG_PPC_PCI_CHOICE=y |
247 | CONFIG_PCI=y | 259 | CONFIG_PCI=y |
248 | CONFIG_PCI_DOMAINS=y | 260 | CONFIG_PCI_DOMAINS=y |
249 | CONFIG_PCI_SYSCALL=y | 261 | CONFIG_PCI_SYSCALL=y |
@@ -269,10 +281,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
269 | CONFIG_KERNEL_START=0xc0000000 | 281 | CONFIG_KERNEL_START=0xc0000000 |
270 | CONFIG_PHYSICAL_START=0x00000000 | 282 | CONFIG_PHYSICAL_START=0x00000000 |
271 | CONFIG_TASK_SIZE=0xc0000000 | 283 | CONFIG_TASK_SIZE=0xc0000000 |
272 | |||
273 | # | ||
274 | # Networking | ||
275 | # | ||
276 | CONFIG_NET=y | 284 | CONFIG_NET=y |
277 | 285 | ||
278 | # | 286 | # |
@@ -323,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
323 | # CONFIG_TIPC is not set | 331 | # CONFIG_TIPC is not set |
324 | # CONFIG_ATM is not set | 332 | # CONFIG_ATM is not set |
325 | # CONFIG_BRIDGE is not set | 333 | # CONFIG_BRIDGE is not set |
334 | # CONFIG_NET_DSA is not set | ||
326 | # CONFIG_VLAN_8021Q is not set | 335 | # CONFIG_VLAN_8021Q is not set |
327 | # CONFIG_DECNET is not set | 336 | # CONFIG_DECNET is not set |
328 | # CONFIG_LLC2 is not set | 337 | # CONFIG_LLC2 is not set |
@@ -343,14 +352,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
343 | # CONFIG_IRDA is not set | 352 | # CONFIG_IRDA is not set |
344 | # CONFIG_BT is not set | 353 | # CONFIG_BT is not set |
345 | # CONFIG_AF_RXRPC is not set | 354 | # CONFIG_AF_RXRPC is not set |
346 | 355 | # CONFIG_PHONET is not set | |
347 | # | 356 | # CONFIG_WIRELESS is not set |
348 | # Wireless | ||
349 | # | ||
350 | # CONFIG_CFG80211 is not set | ||
351 | # CONFIG_WIRELESS_EXT is not set | ||
352 | # CONFIG_MAC80211 is not set | ||
353 | # CONFIG_IEEE80211 is not set | ||
354 | # CONFIG_RFKILL is not set | 357 | # CONFIG_RFKILL is not set |
355 | # CONFIG_NET_9P is not set | 358 | # CONFIG_NET_9P is not set |
356 | 359 | ||
@@ -390,12 +393,16 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
390 | # CONFIG_BLK_DEV_XIP is not set | 393 | # CONFIG_BLK_DEV_XIP is not set |
391 | # CONFIG_CDROM_PKTCDVD is not set | 394 | # CONFIG_CDROM_PKTCDVD is not set |
392 | # CONFIG_ATA_OVER_ETH is not set | 395 | # CONFIG_ATA_OVER_ETH is not set |
396 | # CONFIG_BLK_DEV_HD is not set | ||
393 | CONFIG_MISC_DEVICES=y | 397 | CONFIG_MISC_DEVICES=y |
394 | # CONFIG_PHANTOM is not set | 398 | # CONFIG_PHANTOM is not set |
395 | # CONFIG_EEPROM_93CX6 is not set | 399 | # CONFIG_EEPROM_93CX6 is not set |
396 | # CONFIG_SGI_IOC4 is not set | 400 | # CONFIG_SGI_IOC4 is not set |
397 | # CONFIG_TIFM_CORE is not set | 401 | # CONFIG_TIFM_CORE is not set |
402 | # CONFIG_ICS932S401 is not set | ||
398 | # CONFIG_ENCLOSURE_SERVICES is not set | 403 | # CONFIG_ENCLOSURE_SERVICES is not set |
404 | # CONFIG_HP_ILO is not set | ||
405 | # CONFIG_C2PORT is not set | ||
399 | CONFIG_HAVE_IDE=y | 406 | CONFIG_HAVE_IDE=y |
400 | # CONFIG_IDE is not set | 407 | # CONFIG_IDE is not set |
401 | 408 | ||
@@ -412,7 +419,7 @@ CONFIG_SCSI_DMA=y | |||
412 | # | 419 | # |
413 | # SCSI support type (disk, tape, CD-ROM) | 420 | # SCSI support type (disk, tape, CD-ROM) |
414 | # | 421 | # |
415 | # CONFIG_BLK_DEV_SD is not set | 422 | CONFIG_BLK_DEV_SD=y |
416 | # CONFIG_CHR_DEV_ST is not set | 423 | # CONFIG_CHR_DEV_ST is not set |
417 | # CONFIG_CHR_DEV_OSST is not set | 424 | # CONFIG_CHR_DEV_OSST is not set |
418 | # CONFIG_BLK_DEV_SR is not set | 425 | # CONFIG_BLK_DEV_SR is not set |
@@ -474,12 +481,12 @@ CONFIG_SCSI_LOWLEVEL=y | |||
474 | # CONFIG_SCSI_NSP32 is not set | 481 | # CONFIG_SCSI_NSP32 is not set |
475 | # CONFIG_SCSI_DEBUG is not set | 482 | # CONFIG_SCSI_DEBUG is not set |
476 | # CONFIG_SCSI_SRP is not set | 483 | # CONFIG_SCSI_SRP is not set |
484 | # CONFIG_SCSI_DH is not set | ||
477 | CONFIG_ATA=y | 485 | CONFIG_ATA=y |
478 | # CONFIG_ATA_NONSTANDARD is not set | 486 | # CONFIG_ATA_NONSTANDARD is not set |
479 | CONFIG_SATA_PMP=y | 487 | CONFIG_SATA_PMP=y |
480 | # CONFIG_SATA_AHCI is not set | 488 | # CONFIG_SATA_AHCI is not set |
481 | # CONFIG_SATA_SIL24 is not set | 489 | # CONFIG_SATA_SIL24 is not set |
482 | # CONFIG_SATA_FSL is not set | ||
483 | CONFIG_ATA_SFF=y | 490 | CONFIG_ATA_SFF=y |
484 | # CONFIG_SATA_SVW is not set | 491 | # CONFIG_SATA_SVW is not set |
485 | # CONFIG_ATA_PIIX is not set | 492 | # CONFIG_ATA_PIIX is not set |
@@ -535,18 +542,22 @@ CONFIG_PATA_MPC52xx=y | |||
535 | # CONFIG_PATA_VIA is not set | 542 | # CONFIG_PATA_VIA is not set |
536 | # CONFIG_PATA_WINBOND is not set | 543 | # CONFIG_PATA_WINBOND is not set |
537 | # CONFIG_PATA_PLATFORM is not set | 544 | # CONFIG_PATA_PLATFORM is not set |
545 | # CONFIG_PATA_SCH is not set | ||
538 | # CONFIG_MD is not set | 546 | # CONFIG_MD is not set |
539 | # CONFIG_FUSION is not set | 547 | # CONFIG_FUSION is not set |
540 | 548 | ||
541 | # | 549 | # |
542 | # IEEE 1394 (FireWire) support | 550 | # IEEE 1394 (FireWire) support |
543 | # | 551 | # |
552 | |||
553 | # | ||
554 | # Enable only one of the two stacks, unless you know what you are doing | ||
555 | # | ||
544 | # CONFIG_FIREWIRE is not set | 556 | # CONFIG_FIREWIRE is not set |
545 | # CONFIG_IEEE1394 is not set | 557 | # CONFIG_IEEE1394 is not set |
546 | # CONFIG_I2O is not set | 558 | # CONFIG_I2O is not set |
547 | # CONFIG_MACINTOSH_DRIVERS is not set | 559 | # CONFIG_MACINTOSH_DRIVERS is not set |
548 | CONFIG_NETDEVICES=y | 560 | CONFIG_NETDEVICES=y |
549 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
550 | # CONFIG_DUMMY is not set | 561 | # CONFIG_DUMMY is not set |
551 | # CONFIG_BONDING is not set | 562 | # CONFIG_BONDING is not set |
552 | # CONFIG_MACVLAN is not set | 563 | # CONFIG_MACVLAN is not set |
@@ -583,16 +594,19 @@ CONFIG_NET_ETHERNET=y | |||
583 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 594 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
584 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 595 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
585 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 596 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
597 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
598 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
599 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
586 | # CONFIG_NET_PCI is not set | 600 | # CONFIG_NET_PCI is not set |
587 | # CONFIG_B44 is not set | 601 | # CONFIG_B44 is not set |
588 | CONFIG_FEC_MPC52xx=y | 602 | CONFIG_FEC_MPC52xx=y |
589 | CONFIG_FEC_MPC52xx_MDIO=y | 603 | CONFIG_FEC_MPC52xx_MDIO=y |
604 | # CONFIG_ATL2 is not set | ||
590 | CONFIG_NETDEV_1000=y | 605 | CONFIG_NETDEV_1000=y |
591 | # CONFIG_ACENIC is not set | 606 | # CONFIG_ACENIC is not set |
592 | # CONFIG_DL2K is not set | 607 | # CONFIG_DL2K is not set |
593 | # CONFIG_E1000 is not set | 608 | # CONFIG_E1000 is not set |
594 | # CONFIG_E1000E is not set | 609 | # CONFIG_E1000E is not set |
595 | # CONFIG_E1000E_ENABLED is not set | ||
596 | # CONFIG_IP1000 is not set | 610 | # CONFIG_IP1000 is not set |
597 | # CONFIG_IGB is not set | 611 | # CONFIG_IGB is not set |
598 | # CONFIG_NS83820 is not set | 612 | # CONFIG_NS83820 is not set |
@@ -605,22 +619,27 @@ CONFIG_NETDEV_1000=y | |||
605 | # CONFIG_VIA_VELOCITY is not set | 619 | # CONFIG_VIA_VELOCITY is not set |
606 | # CONFIG_TIGON3 is not set | 620 | # CONFIG_TIGON3 is not set |
607 | # CONFIG_BNX2 is not set | 621 | # CONFIG_BNX2 is not set |
608 | # CONFIG_GIANFAR is not set | ||
609 | # CONFIG_MV643XX_ETH is not set | 622 | # CONFIG_MV643XX_ETH is not set |
610 | # CONFIG_QLA3XXX is not set | 623 | # CONFIG_QLA3XXX is not set |
611 | # CONFIG_ATL1 is not set | 624 | # CONFIG_ATL1 is not set |
625 | # CONFIG_ATL1E is not set | ||
626 | # CONFIG_JME is not set | ||
612 | CONFIG_NETDEV_10000=y | 627 | CONFIG_NETDEV_10000=y |
613 | # CONFIG_CHELSIO_T1 is not set | 628 | # CONFIG_CHELSIO_T1 is not set |
614 | # CONFIG_CHELSIO_T3 is not set | 629 | # CONFIG_CHELSIO_T3 is not set |
630 | # CONFIG_ENIC is not set | ||
615 | # CONFIG_IXGBE is not set | 631 | # CONFIG_IXGBE is not set |
616 | # CONFIG_IXGB is not set | 632 | # CONFIG_IXGB is not set |
617 | # CONFIG_S2IO is not set | 633 | # CONFIG_S2IO is not set |
618 | # CONFIG_MYRI10GE is not set | 634 | # CONFIG_MYRI10GE is not set |
619 | # CONFIG_NETXEN_NIC is not set | 635 | # CONFIG_NETXEN_NIC is not set |
620 | # CONFIG_NIU is not set | 636 | # CONFIG_NIU is not set |
637 | # CONFIG_MLX4_EN is not set | ||
621 | # CONFIG_MLX4_CORE is not set | 638 | # CONFIG_MLX4_CORE is not set |
622 | # CONFIG_TEHUTI is not set | 639 | # CONFIG_TEHUTI is not set |
623 | # CONFIG_BNX2X is not set | 640 | # CONFIG_BNX2X is not set |
641 | # CONFIG_QLGE is not set | ||
642 | # CONFIG_SFC is not set | ||
624 | # CONFIG_TR is not set | 643 | # CONFIG_TR is not set |
625 | 644 | ||
626 | # | 645 | # |
@@ -628,7 +647,6 @@ CONFIG_NETDEV_10000=y | |||
628 | # | 647 | # |
629 | # CONFIG_WLAN_PRE80211 is not set | 648 | # CONFIG_WLAN_PRE80211 is not set |
630 | # CONFIG_WLAN_80211 is not set | 649 | # CONFIG_WLAN_80211 is not set |
631 | # CONFIG_IWLWIFI is not set | ||
632 | # CONFIG_IWLWIFI_LEDS is not set | 650 | # CONFIG_IWLWIFI_LEDS is not set |
633 | # CONFIG_WAN is not set | 651 | # CONFIG_WAN is not set |
634 | # CONFIG_FDDI is not set | 652 | # CONFIG_FDDI is not set |
@@ -657,6 +675,7 @@ CONFIG_NETDEV_10000=y | |||
657 | # Character devices | 675 | # Character devices |
658 | # | 676 | # |
659 | # CONFIG_VT is not set | 677 | # CONFIG_VT is not set |
678 | CONFIG_DEVKMEM=y | ||
660 | # CONFIG_SERIAL_NONSTANDARD is not set | 679 | # CONFIG_SERIAL_NONSTANDARD is not set |
661 | # CONFIG_NOZOMI is not set | 680 | # CONFIG_NOZOMI is not set |
662 | 681 | ||
@@ -691,42 +710,63 @@ CONFIG_DEVPORT=y | |||
691 | CONFIG_I2C=y | 710 | CONFIG_I2C=y |
692 | CONFIG_I2C_BOARDINFO=y | 711 | CONFIG_I2C_BOARDINFO=y |
693 | CONFIG_I2C_CHARDEV=y | 712 | CONFIG_I2C_CHARDEV=y |
713 | CONFIG_I2C_HELPER_AUTO=y | ||
694 | 714 | ||
695 | # | 715 | # |
696 | # I2C Hardware Bus support | 716 | # I2C Hardware Bus support |
697 | # | 717 | # |
718 | |||
719 | # | ||
720 | # PC SMBus host controller drivers | ||
721 | # | ||
698 | # CONFIG_I2C_ALI1535 is not set | 722 | # CONFIG_I2C_ALI1535 is not set |
699 | # CONFIG_I2C_ALI1563 is not set | 723 | # CONFIG_I2C_ALI1563 is not set |
700 | # CONFIG_I2C_ALI15X3 is not set | 724 | # CONFIG_I2C_ALI15X3 is not set |
701 | # CONFIG_I2C_AMD756 is not set | 725 | # CONFIG_I2C_AMD756 is not set |
702 | # CONFIG_I2C_AMD8111 is not set | 726 | # CONFIG_I2C_AMD8111 is not set |
703 | # CONFIG_I2C_I801 is not set | 727 | # CONFIG_I2C_I801 is not set |
704 | # CONFIG_I2C_I810 is not set | 728 | # CONFIG_I2C_ISCH is not set |
705 | # CONFIG_I2C_PIIX4 is not set | 729 | # CONFIG_I2C_PIIX4 is not set |
706 | CONFIG_I2C_MPC=y | ||
707 | # CONFIG_I2C_NFORCE2 is not set | 730 | # CONFIG_I2C_NFORCE2 is not set |
708 | # CONFIG_I2C_OCORES is not set | ||
709 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
710 | # CONFIG_I2C_PROSAVAGE is not set | ||
711 | # CONFIG_I2C_SAVAGE4 is not set | ||
712 | # CONFIG_I2C_SIMTEC is not set | ||
713 | # CONFIG_I2C_SIS5595 is not set | 731 | # CONFIG_I2C_SIS5595 is not set |
714 | # CONFIG_I2C_SIS630 is not set | 732 | # CONFIG_I2C_SIS630 is not set |
715 | # CONFIG_I2C_SIS96X is not set | 733 | # CONFIG_I2C_SIS96X is not set |
716 | # CONFIG_I2C_TAOS_EVM is not set | ||
717 | # CONFIG_I2C_STUB is not set | ||
718 | # CONFIG_I2C_VIA is not set | 734 | # CONFIG_I2C_VIA is not set |
719 | # CONFIG_I2C_VIAPRO is not set | 735 | # CONFIG_I2C_VIAPRO is not set |
736 | |||
737 | # | ||
738 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
739 | # | ||
740 | CONFIG_I2C_MPC=y | ||
741 | # CONFIG_I2C_OCORES is not set | ||
742 | # CONFIG_I2C_SIMTEC is not set | ||
743 | |||
744 | # | ||
745 | # External I2C/SMBus adapter drivers | ||
746 | # | ||
747 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
748 | # CONFIG_I2C_TAOS_EVM is not set | ||
749 | |||
750 | # | ||
751 | # Graphics adapter I2C/DDC channel drivers | ||
752 | # | ||
720 | # CONFIG_I2C_VOODOO3 is not set | 753 | # CONFIG_I2C_VOODOO3 is not set |
754 | |||
755 | # | ||
756 | # Other I2C/SMBus bus drivers | ||
757 | # | ||
721 | # CONFIG_I2C_PCA_PLATFORM is not set | 758 | # CONFIG_I2C_PCA_PLATFORM is not set |
759 | # CONFIG_I2C_STUB is not set | ||
722 | 760 | ||
723 | # | 761 | # |
724 | # Miscellaneous I2C Chip support | 762 | # Miscellaneous I2C Chip support |
725 | # | 763 | # |
726 | # CONFIG_DS1682 is not set | 764 | # CONFIG_DS1682 is not set |
765 | # CONFIG_AT24 is not set | ||
727 | # CONFIG_SENSORS_EEPROM is not set | 766 | # CONFIG_SENSORS_EEPROM is not set |
728 | # CONFIG_SENSORS_PCF8574 is not set | 767 | # CONFIG_SENSORS_PCF8574 is not set |
729 | # CONFIG_PCF8575 is not set | 768 | # CONFIG_PCF8575 is not set |
769 | # CONFIG_SENSORS_PCA9539 is not set | ||
730 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
731 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
732 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -735,29 +775,47 @@ CONFIG_I2C_MPC=y | |||
735 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
736 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
737 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
778 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
779 | # CONFIG_GPIOLIB is not set | ||
738 | # CONFIG_W1 is not set | 780 | # CONFIG_W1 is not set |
739 | # CONFIG_POWER_SUPPLY is not set | 781 | # CONFIG_POWER_SUPPLY is not set |
740 | # CONFIG_HWMON is not set | 782 | # CONFIG_HWMON is not set |
741 | # CONFIG_THERMAL is not set | 783 | # CONFIG_THERMAL is not set |
784 | # CONFIG_THERMAL_HWMON is not set | ||
742 | # CONFIG_WATCHDOG is not set | 785 | # CONFIG_WATCHDOG is not set |
786 | CONFIG_SSB_POSSIBLE=y | ||
743 | 787 | ||
744 | # | 788 | # |
745 | # Sonics Silicon Backplane | 789 | # Sonics Silicon Backplane |
746 | # | 790 | # |
747 | CONFIG_SSB_POSSIBLE=y | ||
748 | # CONFIG_SSB is not set | 791 | # CONFIG_SSB is not set |
749 | 792 | ||
750 | # | 793 | # |
751 | # Multifunction device drivers | 794 | # Multifunction device drivers |
752 | # | 795 | # |
796 | # CONFIG_MFD_CORE is not set | ||
753 | # CONFIG_MFD_SM501 is not set | 797 | # CONFIG_MFD_SM501 is not set |
754 | # CONFIG_HTC_PASIC3 is not set | 798 | # CONFIG_HTC_PASIC3 is not set |
799 | # CONFIG_MFD_TMIO is not set | ||
800 | # CONFIG_PMIC_DA903X is not set | ||
801 | # CONFIG_MFD_WM8400 is not set | ||
802 | # CONFIG_MFD_WM8350_I2C is not set | ||
803 | # CONFIG_REGULATOR is not set | ||
755 | 804 | ||
756 | # | 805 | # |
757 | # Multimedia devices | 806 | # Multimedia devices |
758 | # | 807 | # |
808 | |||
809 | # | ||
810 | # Multimedia core support | ||
811 | # | ||
759 | # CONFIG_VIDEO_DEV is not set | 812 | # CONFIG_VIDEO_DEV is not set |
760 | # CONFIG_DVB_CORE is not set | 813 | # CONFIG_DVB_CORE is not set |
814 | # CONFIG_VIDEO_MEDIA is not set | ||
815 | |||
816 | # | ||
817 | # Multimedia drivers | ||
818 | # | ||
761 | # CONFIG_DAB is not set | 819 | # CONFIG_DAB is not set |
762 | 820 | ||
763 | # | 821 | # |
@@ -774,10 +832,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
774 | # Display device support | 832 | # Display device support |
775 | # | 833 | # |
776 | # CONFIG_DISPLAY_SUPPORT is not set | 834 | # CONFIG_DISPLAY_SUPPORT is not set |
777 | |||
778 | # | ||
779 | # Sound | ||
780 | # | ||
781 | # CONFIG_SOUND is not set | 835 | # CONFIG_SOUND is not set |
782 | CONFIG_USB_SUPPORT=y | 836 | CONFIG_USB_SUPPORT=y |
783 | CONFIG_USB_ARCH_HAS_HCD=y | 837 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -788,17 +842,25 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
788 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 842 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
789 | 843 | ||
790 | # | 844 | # |
845 | # Enable Host or Gadget support to see Inventra options | ||
846 | # | ||
847 | |||
848 | # | ||
791 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 849 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
792 | # | 850 | # |
793 | # CONFIG_USB_GADGET is not set | 851 | # CONFIG_USB_GADGET is not set |
852 | # CONFIG_UWB is not set | ||
794 | # CONFIG_MMC is not set | 853 | # CONFIG_MMC is not set |
795 | # CONFIG_MEMSTICK is not set | 854 | # CONFIG_MEMSTICK is not set |
796 | # CONFIG_NEW_LEDS is not set | 855 | # CONFIG_NEW_LEDS is not set |
856 | # CONFIG_ACCESSIBILITY is not set | ||
797 | # CONFIG_INFINIBAND is not set | 857 | # CONFIG_INFINIBAND is not set |
798 | # CONFIG_EDAC is not set | 858 | # CONFIG_EDAC is not set |
799 | # CONFIG_RTC_CLASS is not set | 859 | # CONFIG_RTC_CLASS is not set |
800 | # CONFIG_DMADEVICES is not set | 860 | # CONFIG_DMADEVICES is not set |
801 | # CONFIG_UIO is not set | 861 | # CONFIG_UIO is not set |
862 | # CONFIG_STAGING is not set | ||
863 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
802 | 864 | ||
803 | # | 865 | # |
804 | # File systems | 866 | # File systems |
@@ -810,12 +872,13 @@ CONFIG_EXT3_FS=y | |||
810 | CONFIG_EXT3_FS_XATTR=y | 872 | CONFIG_EXT3_FS_XATTR=y |
811 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 873 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
812 | # CONFIG_EXT3_FS_SECURITY is not set | 874 | # CONFIG_EXT3_FS_SECURITY is not set |
813 | # CONFIG_EXT4DEV_FS is not set | 875 | # CONFIG_EXT4_FS is not set |
814 | CONFIG_JBD=y | 876 | CONFIG_JBD=y |
815 | CONFIG_FS_MBCACHE=y | 877 | CONFIG_FS_MBCACHE=y |
816 | # CONFIG_REISERFS_FS is not set | 878 | # CONFIG_REISERFS_FS is not set |
817 | # CONFIG_JFS_FS is not set | 879 | # CONFIG_JFS_FS is not set |
818 | # CONFIG_FS_POSIX_ACL is not set | 880 | # CONFIG_FS_POSIX_ACL is not set |
881 | CONFIG_FILE_LOCKING=y | ||
819 | # CONFIG_XFS_FS is not set | 882 | # CONFIG_XFS_FS is not set |
820 | # CONFIG_OCFS2_FS is not set | 883 | # CONFIG_OCFS2_FS is not set |
821 | CONFIG_DNOTIFY=y | 884 | CONFIG_DNOTIFY=y |
@@ -845,6 +908,7 @@ CONFIG_INOTIFY_USER=y | |||
845 | CONFIG_PROC_FS=y | 908 | CONFIG_PROC_FS=y |
846 | CONFIG_PROC_KCORE=y | 909 | CONFIG_PROC_KCORE=y |
847 | CONFIG_PROC_SYSCTL=y | 910 | CONFIG_PROC_SYSCTL=y |
911 | CONFIG_PROC_PAGE_MONITOR=y | ||
848 | CONFIG_SYSFS=y | 912 | CONFIG_SYSFS=y |
849 | CONFIG_TMPFS=y | 913 | CONFIG_TMPFS=y |
850 | # CONFIG_TMPFS_POSIX_ACL is not set | 914 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -864,6 +928,7 @@ CONFIG_TMPFS=y | |||
864 | # CONFIG_CRAMFS is not set | 928 | # CONFIG_CRAMFS is not set |
865 | # CONFIG_VXFS_FS is not set | 929 | # CONFIG_VXFS_FS is not set |
866 | # CONFIG_MINIX_FS is not set | 930 | # CONFIG_MINIX_FS is not set |
931 | # CONFIG_OMFS_FS is not set | ||
867 | # CONFIG_HPFS_FS is not set | 932 | # CONFIG_HPFS_FS is not set |
868 | # CONFIG_QNX4FS_FS is not set | 933 | # CONFIG_QNX4FS_FS is not set |
869 | # CONFIG_ROMFS_FS is not set | 934 | # CONFIG_ROMFS_FS is not set |
@@ -874,14 +939,14 @@ CONFIG_NFS_FS=y | |||
874 | CONFIG_NFS_V3=y | 939 | CONFIG_NFS_V3=y |
875 | # CONFIG_NFS_V3_ACL is not set | 940 | # CONFIG_NFS_V3_ACL is not set |
876 | CONFIG_NFS_V4=y | 941 | CONFIG_NFS_V4=y |
877 | # CONFIG_NFSD is not set | ||
878 | CONFIG_ROOT_NFS=y | 942 | CONFIG_ROOT_NFS=y |
943 | # CONFIG_NFSD is not set | ||
879 | CONFIG_LOCKD=y | 944 | CONFIG_LOCKD=y |
880 | CONFIG_LOCKD_V4=y | 945 | CONFIG_LOCKD_V4=y |
881 | CONFIG_NFS_COMMON=y | 946 | CONFIG_NFS_COMMON=y |
882 | CONFIG_SUNRPC=y | 947 | CONFIG_SUNRPC=y |
883 | CONFIG_SUNRPC_GSS=y | 948 | CONFIG_SUNRPC_GSS=y |
884 | # CONFIG_SUNRPC_BIND34 is not set | 949 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
885 | CONFIG_RPCSEC_GSS_KRB5=y | 950 | CONFIG_RPCSEC_GSS_KRB5=y |
886 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 951 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
887 | # CONFIG_SMB_FS is not set | 952 | # CONFIG_SMB_FS is not set |
@@ -902,9 +967,9 @@ CONFIG_MSDOS_PARTITION=y | |||
902 | # Library routines | 967 | # Library routines |
903 | # | 968 | # |
904 | CONFIG_BITREVERSE=y | 969 | CONFIG_BITREVERSE=y |
905 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
906 | # CONFIG_CRC_CCITT is not set | 970 | # CONFIG_CRC_CCITT is not set |
907 | # CONFIG_CRC16 is not set | 971 | # CONFIG_CRC16 is not set |
972 | # CONFIG_CRC_T10DIF is not set | ||
908 | # CONFIG_CRC_ITU_T is not set | 973 | # CONFIG_CRC_ITU_T is not set |
909 | CONFIG_CRC32=y | 974 | CONFIG_CRC32=y |
910 | # CONFIG_CRC7 is not set | 975 | # CONFIG_CRC7 is not set |
@@ -929,9 +994,12 @@ CONFIG_FRAME_WARN=1024 | |||
929 | CONFIG_DEBUG_KERNEL=y | 994 | CONFIG_DEBUG_KERNEL=y |
930 | # CONFIG_DEBUG_SHIRQ is not set | 995 | # CONFIG_DEBUG_SHIRQ is not set |
931 | CONFIG_DETECT_SOFTLOCKUP=y | 996 | CONFIG_DETECT_SOFTLOCKUP=y |
997 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
998 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
932 | CONFIG_SCHED_DEBUG=y | 999 | CONFIG_SCHED_DEBUG=y |
933 | # CONFIG_SCHEDSTATS is not set | 1000 | # CONFIG_SCHEDSTATS is not set |
934 | # CONFIG_TIMER_STATS is not set | 1001 | # CONFIG_TIMER_STATS is not set |
1002 | # CONFIG_DEBUG_OBJECTS is not set | ||
935 | # CONFIG_SLUB_DEBUG_ON is not set | 1003 | # CONFIG_SLUB_DEBUG_ON is not set |
936 | # CONFIG_SLUB_STATS is not set | 1004 | # CONFIG_SLUB_STATS is not set |
937 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1005 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -945,17 +1013,37 @@ CONFIG_SCHED_DEBUG=y | |||
945 | CONFIG_DEBUG_INFO=y | 1013 | CONFIG_DEBUG_INFO=y |
946 | # CONFIG_DEBUG_VM is not set | 1014 | # CONFIG_DEBUG_VM is not set |
947 | # CONFIG_DEBUG_WRITECOUNT is not set | 1015 | # CONFIG_DEBUG_WRITECOUNT is not set |
1016 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
948 | # CONFIG_DEBUG_LIST is not set | 1017 | # CONFIG_DEBUG_LIST is not set |
949 | # CONFIG_DEBUG_SG is not set | 1018 | # CONFIG_DEBUG_SG is not set |
950 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1019 | # CONFIG_BOOT_PRINTK_DELAY is not set |
951 | # CONFIG_RCU_TORTURE_TEST is not set | 1020 | # CONFIG_RCU_TORTURE_TEST is not set |
1021 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
952 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1022 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1023 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
953 | # CONFIG_FAULT_INJECTION is not set | 1024 | # CONFIG_FAULT_INJECTION is not set |
1025 | # CONFIG_LATENCYTOP is not set | ||
1026 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1027 | |||
1028 | # | ||
1029 | # Tracers | ||
1030 | # | ||
1031 | # CONFIG_FUNCTION_TRACER is not set | ||
1032 | # CONFIG_SCHED_TRACER is not set | ||
1033 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1034 | # CONFIG_BOOT_TRACER is not set | ||
1035 | # CONFIG_STACK_TRACER is not set | ||
1036 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
954 | # CONFIG_SAMPLES is not set | 1037 | # CONFIG_SAMPLES is not set |
1038 | CONFIG_HAVE_ARCH_KGDB=y | ||
1039 | # CONFIG_KGDB is not set | ||
955 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1040 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
956 | # CONFIG_DEBUG_STACK_USAGE is not set | 1041 | # CONFIG_DEBUG_STACK_USAGE is not set |
957 | # CONFIG_DEBUG_PAGEALLOC is not set | 1042 | # CONFIG_DEBUG_PAGEALLOC is not set |
958 | # CONFIG_DEBUGGER is not set | 1043 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1044 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1045 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1046 | # CONFIG_XMON is not set | ||
959 | # CONFIG_IRQSTACKS is not set | 1047 | # CONFIG_IRQSTACKS is not set |
960 | # CONFIG_BDI_SWITCH is not set | 1048 | # CONFIG_BDI_SWITCH is not set |
961 | # CONFIG_BOOTX_TEXT is not set | 1049 | # CONFIG_BOOTX_TEXT is not set |
@@ -966,14 +1054,19 @@ CONFIG_DEBUG_INFO=y | |||
966 | # | 1054 | # |
967 | # CONFIG_KEYS is not set | 1055 | # CONFIG_KEYS is not set |
968 | # CONFIG_SECURITY is not set | 1056 | # CONFIG_SECURITY is not set |
1057 | # CONFIG_SECURITYFS is not set | ||
969 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1058 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
970 | CONFIG_CRYPTO=y | 1059 | CONFIG_CRYPTO=y |
971 | 1060 | ||
972 | # | 1061 | # |
973 | # Crypto core or helper | 1062 | # Crypto core or helper |
974 | # | 1063 | # |
1064 | # CONFIG_CRYPTO_FIPS is not set | ||
975 | CONFIG_CRYPTO_ALGAPI=y | 1065 | CONFIG_CRYPTO_ALGAPI=y |
1066 | CONFIG_CRYPTO_AEAD=y | ||
976 | CONFIG_CRYPTO_BLKCIPHER=y | 1067 | CONFIG_CRYPTO_BLKCIPHER=y |
1068 | CONFIG_CRYPTO_HASH=y | ||
1069 | CONFIG_CRYPTO_RNG=y | ||
977 | CONFIG_CRYPTO_MANAGER=y | 1070 | CONFIG_CRYPTO_MANAGER=y |
978 | # CONFIG_CRYPTO_GF128MUL is not set | 1071 | # CONFIG_CRYPTO_GF128MUL is not set |
979 | # CONFIG_CRYPTO_NULL is not set | 1072 | # CONFIG_CRYPTO_NULL is not set |
@@ -1012,6 +1105,10 @@ CONFIG_CRYPTO_CBC=y | |||
1012 | # CONFIG_CRYPTO_MD4 is not set | 1105 | # CONFIG_CRYPTO_MD4 is not set |
1013 | CONFIG_CRYPTO_MD5=y | 1106 | CONFIG_CRYPTO_MD5=y |
1014 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1107 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1108 | # CONFIG_CRYPTO_RMD128 is not set | ||
1109 | # CONFIG_CRYPTO_RMD160 is not set | ||
1110 | # CONFIG_CRYPTO_RMD256 is not set | ||
1111 | # CONFIG_CRYPTO_RMD320 is not set | ||
1015 | # CONFIG_CRYPTO_SHA1 is not set | 1112 | # CONFIG_CRYPTO_SHA1 is not set |
1016 | # CONFIG_CRYPTO_SHA256 is not set | 1113 | # CONFIG_CRYPTO_SHA256 is not set |
1017 | # CONFIG_CRYPTO_SHA512 is not set | 1114 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1042,6 +1139,11 @@ CONFIG_CRYPTO_DES=y | |||
1042 | # | 1139 | # |
1043 | # CONFIG_CRYPTO_DEFLATE is not set | 1140 | # CONFIG_CRYPTO_DEFLATE is not set |
1044 | # CONFIG_CRYPTO_LZO is not set | 1141 | # CONFIG_CRYPTO_LZO is not set |
1142 | |||
1143 | # | ||
1144 | # Random Number Generation | ||
1145 | # | ||
1146 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1045 | CONFIG_CRYPTO_HW=y | 1147 | CONFIG_CRYPTO_HW=y |
1046 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1148 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1047 | CONFIG_PPC_CLOCK=y | 1149 | CONFIG_PPC_CLOCK=y |
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig index 8c7ba7c6ba49..3c0d4e561726 100644 --- a/arch/powerpc/configs/52xx/motionpro_defconfig +++ b/arch/powerpc/configs/52xx/motionpro_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Tue Apr 29 07:12:22 2008 | 4 | # Thu Nov 13 02:11:02 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y | |||
102 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
103 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
104 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
106 | CONFIG_AIO=y | ||
105 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
106 | CONFIG_SLUB_DEBUG=y | 108 | CONFIG_SLUB_DEBUG=y |
107 | # CONFIG_SLAB is not set | 109 | # CONFIG_SLAB is not set |
@@ -110,9 +112,13 @@ CONFIG_SLUB=y | |||
110 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
111 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
112 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
113 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
120 | CONFIG_HAVE_CLK=y | ||
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
@@ -123,6 +129,7 @@ CONFIG_BLOCK=y | |||
123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 129 | # CONFIG_BLK_DEV_IO_TRACE is not set |
124 | # CONFIG_LSF is not set | 130 | # CONFIG_LSF is not set |
125 | # CONFIG_BLK_DEV_BSG is not set | 131 | # CONFIG_BLK_DEV_BSG is not set |
132 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
126 | 133 | ||
127 | # | 134 | # |
128 | # IO Schedulers | 135 | # IO Schedulers |
@@ -137,19 +144,16 @@ CONFIG_DEFAULT_AS=y | |||
137 | # CONFIG_DEFAULT_NOOP is not set | 144 | # CONFIG_DEFAULT_NOOP is not set |
138 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 145 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
139 | CONFIG_CLASSIC_RCU=y | 146 | CONFIG_CLASSIC_RCU=y |
147 | # CONFIG_FREEZER is not set | ||
140 | 148 | ||
141 | # | 149 | # |
142 | # Platform support | 150 | # Platform support |
143 | # | 151 | # |
144 | CONFIG_PPC_MULTIPLATFORM=y | 152 | CONFIG_PPC_MULTIPLATFORM=y |
145 | # CONFIG_PPC_82xx is not set | ||
146 | # CONFIG_PPC_83xx is not set | ||
147 | # CONFIG_PPC_86xx is not set | ||
148 | CONFIG_CLASSIC32=y | 153 | CONFIG_CLASSIC32=y |
149 | # CONFIG_PPC_CHRP is not set | 154 | # CONFIG_PPC_CHRP is not set |
150 | # CONFIG_PPC_MPC512x is not set | ||
151 | # CONFIG_PPC_MPC5121 is not set | ||
152 | # CONFIG_MPC5121_ADS is not set | 155 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_MPC5121_GENERIC is not set | ||
153 | CONFIG_PPC_MPC52xx=y | 157 | CONFIG_PPC_MPC52xx=y |
154 | CONFIG_PPC_MPC5200_SIMPLE=y | 158 | CONFIG_PPC_MPC5200_SIMPLE=y |
155 | # CONFIG_PPC_EFIKA is not set | 159 | # CONFIG_PPC_EFIKA is not set |
@@ -159,7 +163,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
159 | # CONFIG_PPC_PMAC is not set | 163 | # CONFIG_PPC_PMAC is not set |
160 | # CONFIG_PPC_CELL is not set | 164 | # CONFIG_PPC_CELL is not set |
161 | # CONFIG_PPC_CELL_NATIVE is not set | 165 | # CONFIG_PPC_CELL_NATIVE is not set |
166 | # CONFIG_PPC_82xx is not set | ||
162 | # CONFIG_PQ2ADS is not set | 167 | # CONFIG_PQ2ADS is not set |
168 | # CONFIG_PPC_83xx is not set | ||
169 | # CONFIG_PPC_86xx is not set | ||
163 | # CONFIG_EMBEDDED6xx is not set | 170 | # CONFIG_EMBEDDED6xx is not set |
164 | # CONFIG_IPIC is not set | 171 | # CONFIG_IPIC is not set |
165 | # CONFIG_MPIC is not set | 172 | # CONFIG_MPIC is not set |
@@ -183,7 +190,6 @@ CONFIG_PPC_BESTCOMM_FEC=y | |||
183 | # Kernel options | 190 | # Kernel options |
184 | # | 191 | # |
185 | # CONFIG_HIGHMEM is not set | 192 | # CONFIG_HIGHMEM is not set |
186 | # CONFIG_TICK_ONESHOT is not set | ||
187 | # CONFIG_NO_HZ is not set | 193 | # CONFIG_NO_HZ is not set |
188 | # CONFIG_HIGH_RES_TIMERS is not set | 194 | # CONFIG_HIGH_RES_TIMERS is not set |
189 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 195 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
@@ -197,6 +203,8 @@ CONFIG_PREEMPT_NONE=y | |||
197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 203 | # CONFIG_PREEMPT_VOLUNTARY is not set |
198 | # CONFIG_PREEMPT is not set | 204 | # CONFIG_PREEMPT is not set |
199 | CONFIG_BINFMT_ELF=y | 205 | CONFIG_BINFMT_ELF=y |
206 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
207 | # CONFIG_HAVE_AOUT is not set | ||
200 | # CONFIG_BINFMT_MISC is not set | 208 | # CONFIG_BINFMT_MISC is not set |
201 | # CONFIG_IOMMU_HELPER is not set | 209 | # CONFIG_IOMMU_HELPER is not set |
202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 210 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -211,19 +219,20 @@ CONFIG_FLATMEM_MANUAL=y | |||
211 | # CONFIG_SPARSEMEM_MANUAL is not set | 219 | # CONFIG_SPARSEMEM_MANUAL is not set |
212 | CONFIG_FLATMEM=y | 220 | CONFIG_FLATMEM=y |
213 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
214 | # CONFIG_SPARSEMEM_STATIC is not set | ||
215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
216 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | ||
218 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
219 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
220 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
221 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
230 | CONFIG_UNEVICTABLE_LRU=y | ||
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
223 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
224 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
234 | CONFIG_EXTRA_TARGETS="" | ||
225 | CONFIG_PM=y | 235 | CONFIG_PM=y |
226 | # CONFIG_PM_LEGACY is not set | ||
227 | # CONFIG_PM_DEBUG is not set | 236 | # CONFIG_PM_DEBUG is not set |
228 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
229 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
@@ -233,7 +242,7 @@ CONFIG_ISA_DMA_API=y | |||
233 | # | 242 | # |
234 | CONFIG_ZONE_DMA=y | 243 | CONFIG_ZONE_DMA=y |
235 | CONFIG_GENERIC_ISA_DMA=y | 244 | CONFIG_GENERIC_ISA_DMA=y |
236 | CONFIG_FSL_SOC=y | 245 | CONFIG_PPC_PCI_CHOICE=y |
237 | # CONFIG_PCI is not set | 246 | # CONFIG_PCI is not set |
238 | # CONFIG_PCI_DOMAINS is not set | 247 | # CONFIG_PCI_DOMAINS is not set |
239 | # CONFIG_PCI_SYSCALL is not set | 248 | # CONFIG_PCI_SYSCALL is not set |
@@ -254,10 +263,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
254 | CONFIG_KERNEL_START=0xc0000000 | 263 | CONFIG_KERNEL_START=0xc0000000 |
255 | CONFIG_PHYSICAL_START=0x00000000 | 264 | CONFIG_PHYSICAL_START=0x00000000 |
256 | CONFIG_TASK_SIZE=0xc0000000 | 265 | CONFIG_TASK_SIZE=0xc0000000 |
257 | |||
258 | # | ||
259 | # Networking | ||
260 | # | ||
261 | CONFIG_NET=y | 266 | CONFIG_NET=y |
262 | 267 | ||
263 | # | 268 | # |
@@ -308,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
308 | # CONFIG_TIPC is not set | 313 | # CONFIG_TIPC is not set |
309 | # CONFIG_ATM is not set | 314 | # CONFIG_ATM is not set |
310 | # CONFIG_BRIDGE is not set | 315 | # CONFIG_BRIDGE is not set |
316 | # CONFIG_NET_DSA is not set | ||
311 | # CONFIG_VLAN_8021Q is not set | 317 | # CONFIG_VLAN_8021Q is not set |
312 | # CONFIG_DECNET is not set | 318 | # CONFIG_DECNET is not set |
313 | # CONFIG_LLC2 is not set | 319 | # CONFIG_LLC2 is not set |
@@ -328,14 +334,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
328 | # CONFIG_IRDA is not set | 334 | # CONFIG_IRDA is not set |
329 | # CONFIG_BT is not set | 335 | # CONFIG_BT is not set |
330 | # CONFIG_AF_RXRPC is not set | 336 | # CONFIG_AF_RXRPC is not set |
331 | 337 | # CONFIG_PHONET is not set | |
332 | # | 338 | # CONFIG_WIRELESS is not set |
333 | # Wireless | ||
334 | # | ||
335 | # CONFIG_CFG80211 is not set | ||
336 | # CONFIG_WIRELESS_EXT is not set | ||
337 | # CONFIG_MAC80211 is not set | ||
338 | # CONFIG_IEEE80211 is not set | ||
339 | # CONFIG_RFKILL is not set | 339 | # CONFIG_RFKILL is not set |
340 | # CONFIG_NET_9P is not set | 340 | # CONFIG_NET_9P is not set |
341 | 341 | ||
@@ -445,9 +445,12 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
445 | # CONFIG_BLK_DEV_XIP is not set | 445 | # CONFIG_BLK_DEV_XIP is not set |
446 | # CONFIG_CDROM_PKTCDVD is not set | 446 | # CONFIG_CDROM_PKTCDVD is not set |
447 | # CONFIG_ATA_OVER_ETH is not set | 447 | # CONFIG_ATA_OVER_ETH is not set |
448 | # CONFIG_BLK_DEV_HD is not set | ||
448 | CONFIG_MISC_DEVICES=y | 449 | CONFIG_MISC_DEVICES=y |
449 | # CONFIG_EEPROM_93CX6 is not set | 450 | # CONFIG_EEPROM_93CX6 is not set |
451 | # CONFIG_ICS932S401 is not set | ||
450 | # CONFIG_ENCLOSURE_SERVICES is not set | 452 | # CONFIG_ENCLOSURE_SERVICES is not set |
453 | # CONFIG_C2PORT is not set | ||
451 | CONFIG_HAVE_IDE=y | 454 | CONFIG_HAVE_IDE=y |
452 | # CONFIG_IDE is not set | 455 | # CONFIG_IDE is not set |
453 | 456 | ||
@@ -490,10 +493,10 @@ CONFIG_CHR_DEV_SG=y | |||
490 | CONFIG_SCSI_LOWLEVEL=y | 493 | CONFIG_SCSI_LOWLEVEL=y |
491 | # CONFIG_ISCSI_TCP is not set | 494 | # CONFIG_ISCSI_TCP is not set |
492 | # CONFIG_SCSI_DEBUG is not set | 495 | # CONFIG_SCSI_DEBUG is not set |
496 | # CONFIG_SCSI_DH is not set | ||
493 | CONFIG_ATA=y | 497 | CONFIG_ATA=y |
494 | # CONFIG_ATA_NONSTANDARD is not set | 498 | # CONFIG_ATA_NONSTANDARD is not set |
495 | CONFIG_SATA_PMP=y | 499 | CONFIG_SATA_PMP=y |
496 | # CONFIG_SATA_FSL is not set | ||
497 | CONFIG_ATA_SFF=y | 500 | CONFIG_ATA_SFF=y |
498 | # CONFIG_SATA_MV is not set | 501 | # CONFIG_SATA_MV is not set |
499 | CONFIG_PATA_MPC52xx=y | 502 | CONFIG_PATA_MPC52xx=y |
@@ -501,7 +504,6 @@ CONFIG_PATA_MPC52xx=y | |||
501 | # CONFIG_MD is not set | 504 | # CONFIG_MD is not set |
502 | # CONFIG_MACINTOSH_DRIVERS is not set | 505 | # CONFIG_MACINTOSH_DRIVERS is not set |
503 | CONFIG_NETDEVICES=y | 506 | CONFIG_NETDEVICES=y |
504 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
505 | # CONFIG_DUMMY is not set | 507 | # CONFIG_DUMMY is not set |
506 | # CONFIG_BONDING is not set | 508 | # CONFIG_BONDING is not set |
507 | # CONFIG_MACVLAN is not set | 509 | # CONFIG_MACVLAN is not set |
@@ -531,6 +533,9 @@ CONFIG_MII=y | |||
531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 533 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
532 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 534 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 535 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
536 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
537 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
538 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
534 | # CONFIG_B44 is not set | 539 | # CONFIG_B44 is not set |
535 | CONFIG_FEC_MPC52xx=y | 540 | CONFIG_FEC_MPC52xx=y |
536 | CONFIG_FEC_MPC52xx_MDIO=y | 541 | CONFIG_FEC_MPC52xx_MDIO=y |
@@ -542,7 +547,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
542 | # | 547 | # |
543 | # CONFIG_WLAN_PRE80211 is not set | 548 | # CONFIG_WLAN_PRE80211 is not set |
544 | # CONFIG_WLAN_80211 is not set | 549 | # CONFIG_WLAN_80211 is not set |
545 | # CONFIG_IWLWIFI is not set | ||
546 | # CONFIG_IWLWIFI_LEDS is not set | 550 | # CONFIG_IWLWIFI_LEDS is not set |
547 | # CONFIG_WAN is not set | 551 | # CONFIG_WAN is not set |
548 | # CONFIG_PPP is not set | 552 | # CONFIG_PPP is not set |
@@ -568,6 +572,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
568 | # Character devices | 572 | # Character devices |
569 | # | 573 | # |
570 | # CONFIG_VT is not set | 574 | # CONFIG_VT is not set |
575 | CONFIG_DEVKMEM=y | ||
571 | # CONFIG_SERIAL_NONSTANDARD is not set | 576 | # CONFIG_SERIAL_NONSTANDARD is not set |
572 | 577 | ||
573 | # | 578 | # |
@@ -596,24 +601,39 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
596 | CONFIG_I2C=y | 601 | CONFIG_I2C=y |
597 | CONFIG_I2C_BOARDINFO=y | 602 | CONFIG_I2C_BOARDINFO=y |
598 | CONFIG_I2C_CHARDEV=y | 603 | CONFIG_I2C_CHARDEV=y |
604 | CONFIG_I2C_HELPER_AUTO=y | ||
599 | 605 | ||
600 | # | 606 | # |
601 | # I2C Hardware Bus support | 607 | # I2C Hardware Bus support |
602 | # | 608 | # |
609 | |||
610 | # | ||
611 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
612 | # | ||
603 | CONFIG_I2C_MPC=y | 613 | CONFIG_I2C_MPC=y |
604 | # CONFIG_I2C_OCORES is not set | 614 | # CONFIG_I2C_OCORES is not set |
605 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
606 | # CONFIG_I2C_SIMTEC is not set | 615 | # CONFIG_I2C_SIMTEC is not set |
616 | |||
617 | # | ||
618 | # External I2C/SMBus adapter drivers | ||
619 | # | ||
620 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
607 | # CONFIG_I2C_TAOS_EVM is not set | 621 | # CONFIG_I2C_TAOS_EVM is not set |
622 | |||
623 | # | ||
624 | # Other I2C/SMBus bus drivers | ||
625 | # | ||
608 | # CONFIG_I2C_PCA_PLATFORM is not set | 626 | # CONFIG_I2C_PCA_PLATFORM is not set |
609 | 627 | ||
610 | # | 628 | # |
611 | # Miscellaneous I2C Chip support | 629 | # Miscellaneous I2C Chip support |
612 | # | 630 | # |
613 | # CONFIG_DS1682 is not set | 631 | # CONFIG_DS1682 is not set |
632 | # CONFIG_AT24 is not set | ||
614 | CONFIG_SENSORS_EEPROM=y | 633 | CONFIG_SENSORS_EEPROM=y |
615 | # CONFIG_SENSORS_PCF8574 is not set | 634 | # CONFIG_SENSORS_PCF8574 is not set |
616 | # CONFIG_PCF8575 is not set | 635 | # CONFIG_PCF8575 is not set |
636 | # CONFIG_SENSORS_PCA9539 is not set | ||
617 | # CONFIG_SENSORS_PCF8591 is not set | 637 | # CONFIG_SENSORS_PCF8591 is not set |
618 | # CONFIG_SENSORS_MAX6875 is not set | 638 | # CONFIG_SENSORS_MAX6875 is not set |
619 | # CONFIG_SENSORS_TSL2550 is not set | 639 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -622,10 +642,13 @@ CONFIG_SENSORS_EEPROM=y | |||
622 | # CONFIG_I2C_DEBUG_BUS is not set | 642 | # CONFIG_I2C_DEBUG_BUS is not set |
623 | # CONFIG_I2C_DEBUG_CHIP is not set | 643 | # CONFIG_I2C_DEBUG_CHIP is not set |
624 | # CONFIG_SPI is not set | 644 | # CONFIG_SPI is not set |
645 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
646 | # CONFIG_GPIOLIB is not set | ||
625 | # CONFIG_W1 is not set | 647 | # CONFIG_W1 is not set |
626 | # CONFIG_POWER_SUPPLY is not set | 648 | # CONFIG_POWER_SUPPLY is not set |
627 | CONFIG_HWMON=y | 649 | CONFIG_HWMON=y |
628 | # CONFIG_HWMON_VID is not set | 650 | # CONFIG_HWMON_VID is not set |
651 | # CONFIG_SENSORS_AD7414 is not set | ||
629 | # CONFIG_SENSORS_AD7418 is not set | 652 | # CONFIG_SENSORS_AD7418 is not set |
630 | # CONFIG_SENSORS_ADM1021 is not set | 653 | # CONFIG_SENSORS_ADM1021 is not set |
631 | # CONFIG_SENSORS_ADM1025 is not set | 654 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -633,6 +656,7 @@ CONFIG_HWMON=y | |||
633 | # CONFIG_SENSORS_ADM1029 is not set | 656 | # CONFIG_SENSORS_ADM1029 is not set |
634 | # CONFIG_SENSORS_ADM1031 is not set | 657 | # CONFIG_SENSORS_ADM1031 is not set |
635 | # CONFIG_SENSORS_ADM9240 is not set | 658 | # CONFIG_SENSORS_ADM9240 is not set |
659 | # CONFIG_SENSORS_ADT7462 is not set | ||
636 | # CONFIG_SENSORS_ADT7470 is not set | 660 | # CONFIG_SENSORS_ADT7470 is not set |
637 | # CONFIG_SENSORS_ADT7473 is not set | 661 | # CONFIG_SENSORS_ADT7473 is not set |
638 | # CONFIG_SENSORS_ATXP1 is not set | 662 | # CONFIG_SENSORS_ATXP1 is not set |
@@ -675,6 +699,7 @@ CONFIG_HWMON=y | |||
675 | # CONFIG_SENSORS_W83627EHF is not set | 699 | # CONFIG_SENSORS_W83627EHF is not set |
676 | # CONFIG_HWMON_DEBUG_CHIP is not set | 700 | # CONFIG_HWMON_DEBUG_CHIP is not set |
677 | # CONFIG_THERMAL is not set | 701 | # CONFIG_THERMAL is not set |
702 | # CONFIG_THERMAL_HWMON is not set | ||
678 | CONFIG_WATCHDOG=y | 703 | CONFIG_WATCHDOG=y |
679 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 704 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
680 | 705 | ||
@@ -683,24 +708,39 @@ CONFIG_WATCHDOG=y | |||
683 | # | 708 | # |
684 | # CONFIG_SOFT_WATCHDOG is not set | 709 | # CONFIG_SOFT_WATCHDOG is not set |
685 | # CONFIG_MPC5200_WDT is not set | 710 | # CONFIG_MPC5200_WDT is not set |
711 | CONFIG_SSB_POSSIBLE=y | ||
686 | 712 | ||
687 | # | 713 | # |
688 | # Sonics Silicon Backplane | 714 | # Sonics Silicon Backplane |
689 | # | 715 | # |
690 | CONFIG_SSB_POSSIBLE=y | ||
691 | # CONFIG_SSB is not set | 716 | # CONFIG_SSB is not set |
692 | 717 | ||
693 | # | 718 | # |
694 | # Multifunction device drivers | 719 | # Multifunction device drivers |
695 | # | 720 | # |
721 | # CONFIG_MFD_CORE is not set | ||
696 | # CONFIG_MFD_SM501 is not set | 722 | # CONFIG_MFD_SM501 is not set |
697 | # CONFIG_HTC_PASIC3 is not set | 723 | # CONFIG_HTC_PASIC3 is not set |
724 | # CONFIG_MFD_TMIO is not set | ||
725 | # CONFIG_PMIC_DA903X is not set | ||
726 | # CONFIG_MFD_WM8400 is not set | ||
727 | # CONFIG_MFD_WM8350_I2C is not set | ||
728 | # CONFIG_REGULATOR is not set | ||
698 | 729 | ||
699 | # | 730 | # |
700 | # Multimedia devices | 731 | # Multimedia devices |
701 | # | 732 | # |
733 | |||
734 | # | ||
735 | # Multimedia core support | ||
736 | # | ||
702 | # CONFIG_VIDEO_DEV is not set | 737 | # CONFIG_VIDEO_DEV is not set |
703 | # CONFIG_DVB_CORE is not set | 738 | # CONFIG_DVB_CORE is not set |
739 | # CONFIG_VIDEO_MEDIA is not set | ||
740 | |||
741 | # | ||
742 | # Multimedia drivers | ||
743 | # | ||
704 | CONFIG_DAB=y | 744 | CONFIG_DAB=y |
705 | 745 | ||
706 | # | 746 | # |
@@ -715,10 +755,6 @@ CONFIG_DAB=y | |||
715 | # Display device support | 755 | # Display device support |
716 | # | 756 | # |
717 | # CONFIG_DISPLAY_SUPPORT is not set | 757 | # CONFIG_DISPLAY_SUPPORT is not set |
718 | |||
719 | # | ||
720 | # Sound | ||
721 | # | ||
722 | # CONFIG_SOUND is not set | 758 | # CONFIG_SOUND is not set |
723 | # CONFIG_USB_SUPPORT is not set | 759 | # CONFIG_USB_SUPPORT is not set |
724 | # CONFIG_MMC is not set | 760 | # CONFIG_MMC is not set |
@@ -729,6 +765,7 @@ CONFIG_LEDS_CLASS=y | |||
729 | # | 765 | # |
730 | # LED drivers | 766 | # LED drivers |
731 | # | 767 | # |
768 | # CONFIG_LEDS_PCA955X is not set | ||
732 | 769 | ||
733 | # | 770 | # |
734 | # LED Triggers | 771 | # LED Triggers |
@@ -736,7 +773,9 @@ CONFIG_LEDS_CLASS=y | |||
736 | CONFIG_LEDS_TRIGGERS=y | 773 | CONFIG_LEDS_TRIGGERS=y |
737 | CONFIG_LEDS_TRIGGER_TIMER=y | 774 | CONFIG_LEDS_TRIGGER_TIMER=y |
738 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 775 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
776 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
739 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | 777 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set |
778 | # CONFIG_ACCESSIBILITY is not set | ||
740 | # CONFIG_EDAC is not set | 779 | # CONFIG_EDAC is not set |
741 | CONFIG_RTC_LIB=y | 780 | CONFIG_RTC_LIB=y |
742 | CONFIG_RTC_CLASS=y | 781 | CONFIG_RTC_CLASS=y |
@@ -767,6 +806,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
767 | # CONFIG_RTC_DRV_PCF8583 is not set | 806 | # CONFIG_RTC_DRV_PCF8583 is not set |
768 | # CONFIG_RTC_DRV_M41T80 is not set | 807 | # CONFIG_RTC_DRV_M41T80 is not set |
769 | # CONFIG_RTC_DRV_S35390A is not set | 808 | # CONFIG_RTC_DRV_S35390A is not set |
809 | # CONFIG_RTC_DRV_FM3130 is not set | ||
810 | # CONFIG_RTC_DRV_RX8581 is not set | ||
770 | 811 | ||
771 | # | 812 | # |
772 | # SPI RTC drivers | 813 | # SPI RTC drivers |
@@ -776,19 +817,25 @@ CONFIG_RTC_DRV_DS1307=y | |||
776 | # Platform RTC drivers | 817 | # Platform RTC drivers |
777 | # | 818 | # |
778 | # CONFIG_RTC_DRV_CMOS is not set | 819 | # CONFIG_RTC_DRV_CMOS is not set |
820 | # CONFIG_RTC_DRV_DS1286 is not set | ||
779 | # CONFIG_RTC_DRV_DS1511 is not set | 821 | # CONFIG_RTC_DRV_DS1511 is not set |
780 | # CONFIG_RTC_DRV_DS1553 is not set | 822 | # CONFIG_RTC_DRV_DS1553 is not set |
781 | # CONFIG_RTC_DRV_DS1742 is not set | 823 | # CONFIG_RTC_DRV_DS1742 is not set |
782 | # CONFIG_RTC_DRV_STK17TA8 is not set | 824 | # CONFIG_RTC_DRV_STK17TA8 is not set |
783 | # CONFIG_RTC_DRV_M48T86 is not set | 825 | # CONFIG_RTC_DRV_M48T86 is not set |
826 | # CONFIG_RTC_DRV_M48T35 is not set | ||
784 | # CONFIG_RTC_DRV_M48T59 is not set | 827 | # CONFIG_RTC_DRV_M48T59 is not set |
828 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
785 | # CONFIG_RTC_DRV_V3020 is not set | 829 | # CONFIG_RTC_DRV_V3020 is not set |
786 | 830 | ||
787 | # | 831 | # |
788 | # on-CPU RTC drivers | 832 | # on-CPU RTC drivers |
789 | # | 833 | # |
834 | # CONFIG_RTC_DRV_PPC is not set | ||
790 | # CONFIG_DMADEVICES is not set | 835 | # CONFIG_DMADEVICES is not set |
791 | # CONFIG_UIO is not set | 836 | # CONFIG_UIO is not set |
837 | # CONFIG_STAGING is not set | ||
838 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
792 | 839 | ||
793 | # | 840 | # |
794 | # File systems | 841 | # File systems |
@@ -800,12 +847,13 @@ CONFIG_EXT3_FS=y | |||
800 | CONFIG_EXT3_FS_XATTR=y | 847 | CONFIG_EXT3_FS_XATTR=y |
801 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 848 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
802 | # CONFIG_EXT3_FS_SECURITY is not set | 849 | # CONFIG_EXT3_FS_SECURITY is not set |
803 | # CONFIG_EXT4DEV_FS is not set | 850 | # CONFIG_EXT4_FS is not set |
804 | CONFIG_JBD=y | 851 | CONFIG_JBD=y |
805 | CONFIG_FS_MBCACHE=y | 852 | CONFIG_FS_MBCACHE=y |
806 | # CONFIG_REISERFS_FS is not set | 853 | # CONFIG_REISERFS_FS is not set |
807 | # CONFIG_JFS_FS is not set | 854 | # CONFIG_JFS_FS is not set |
808 | # CONFIG_FS_POSIX_ACL is not set | 855 | # CONFIG_FS_POSIX_ACL is not set |
856 | CONFIG_FILE_LOCKING=y | ||
809 | # CONFIG_XFS_FS is not set | 857 | # CONFIG_XFS_FS is not set |
810 | # CONFIG_OCFS2_FS is not set | 858 | # CONFIG_OCFS2_FS is not set |
811 | CONFIG_DNOTIFY=y | 859 | CONFIG_DNOTIFY=y |
@@ -838,6 +886,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
838 | CONFIG_PROC_FS=y | 886 | CONFIG_PROC_FS=y |
839 | CONFIG_PROC_KCORE=y | 887 | CONFIG_PROC_KCORE=y |
840 | CONFIG_PROC_SYSCTL=y | 888 | CONFIG_PROC_SYSCTL=y |
889 | CONFIG_PROC_PAGE_MONITOR=y | ||
841 | CONFIG_SYSFS=y | 890 | CONFIG_SYSFS=y |
842 | CONFIG_TMPFS=y | 891 | CONFIG_TMPFS=y |
843 | # CONFIG_TMPFS_POSIX_ACL is not set | 892 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -868,6 +917,7 @@ CONFIG_JFFS2_RTIME=y | |||
868 | CONFIG_CRAMFS=y | 917 | CONFIG_CRAMFS=y |
869 | # CONFIG_VXFS_FS is not set | 918 | # CONFIG_VXFS_FS is not set |
870 | # CONFIG_MINIX_FS is not set | 919 | # CONFIG_MINIX_FS is not set |
920 | # CONFIG_OMFS_FS is not set | ||
871 | # CONFIG_HPFS_FS is not set | 921 | # CONFIG_HPFS_FS is not set |
872 | # CONFIG_QNX4FS_FS is not set | 922 | # CONFIG_QNX4FS_FS is not set |
873 | # CONFIG_ROMFS_FS is not set | 923 | # CONFIG_ROMFS_FS is not set |
@@ -878,14 +928,14 @@ CONFIG_NFS_FS=y | |||
878 | CONFIG_NFS_V3=y | 928 | CONFIG_NFS_V3=y |
879 | # CONFIG_NFS_V3_ACL is not set | 929 | # CONFIG_NFS_V3_ACL is not set |
880 | CONFIG_NFS_V4=y | 930 | CONFIG_NFS_V4=y |
881 | # CONFIG_NFSD is not set | ||
882 | CONFIG_ROOT_NFS=y | 931 | CONFIG_ROOT_NFS=y |
932 | # CONFIG_NFSD is not set | ||
883 | CONFIG_LOCKD=y | 933 | CONFIG_LOCKD=y |
884 | CONFIG_LOCKD_V4=y | 934 | CONFIG_LOCKD_V4=y |
885 | CONFIG_NFS_COMMON=y | 935 | CONFIG_NFS_COMMON=y |
886 | CONFIG_SUNRPC=y | 936 | CONFIG_SUNRPC=y |
887 | CONFIG_SUNRPC_GSS=y | 937 | CONFIG_SUNRPC_GSS=y |
888 | # CONFIG_SUNRPC_BIND34 is not set | 938 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
889 | CONFIG_RPCSEC_GSS_KRB5=y | 939 | CONFIG_RPCSEC_GSS_KRB5=y |
890 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 940 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
891 | # CONFIG_SMB_FS is not set | 941 | # CONFIG_SMB_FS is not set |
@@ -961,9 +1011,9 @@ CONFIG_NLS_ISO8859_1=y | |||
961 | # Library routines | 1011 | # Library routines |
962 | # | 1012 | # |
963 | CONFIG_BITREVERSE=y | 1013 | CONFIG_BITREVERSE=y |
964 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
965 | # CONFIG_CRC_CCITT is not set | 1014 | # CONFIG_CRC_CCITT is not set |
966 | # CONFIG_CRC16 is not set | 1015 | # CONFIG_CRC16 is not set |
1016 | # CONFIG_CRC_T10DIF is not set | ||
967 | # CONFIG_CRC_ITU_T is not set | 1017 | # CONFIG_CRC_ITU_T is not set |
968 | CONFIG_CRC32=y | 1018 | CONFIG_CRC32=y |
969 | # CONFIG_CRC7 is not set | 1019 | # CONFIG_CRC7 is not set |
@@ -990,9 +1040,12 @@ CONFIG_FRAME_WARN=1024 | |||
990 | CONFIG_DEBUG_KERNEL=y | 1040 | CONFIG_DEBUG_KERNEL=y |
991 | # CONFIG_DEBUG_SHIRQ is not set | 1041 | # CONFIG_DEBUG_SHIRQ is not set |
992 | CONFIG_DETECT_SOFTLOCKUP=y | 1042 | CONFIG_DETECT_SOFTLOCKUP=y |
1043 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1044 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
993 | CONFIG_SCHED_DEBUG=y | 1045 | CONFIG_SCHED_DEBUG=y |
994 | # CONFIG_SCHEDSTATS is not set | 1046 | # CONFIG_SCHEDSTATS is not set |
995 | # CONFIG_TIMER_STATS is not set | 1047 | # CONFIG_TIMER_STATS is not set |
1048 | # CONFIG_DEBUG_OBJECTS is not set | ||
996 | # CONFIG_SLUB_DEBUG_ON is not set | 1049 | # CONFIG_SLUB_DEBUG_ON is not set |
997 | # CONFIG_SLUB_STATS is not set | 1050 | # CONFIG_SLUB_STATS is not set |
998 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1051 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1006,16 +1059,37 @@ CONFIG_SCHED_DEBUG=y | |||
1006 | CONFIG_DEBUG_INFO=y | 1059 | CONFIG_DEBUG_INFO=y |
1007 | # CONFIG_DEBUG_VM is not set | 1060 | # CONFIG_DEBUG_VM is not set |
1008 | # CONFIG_DEBUG_WRITECOUNT is not set | 1061 | # CONFIG_DEBUG_WRITECOUNT is not set |
1062 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1009 | # CONFIG_DEBUG_LIST is not set | 1063 | # CONFIG_DEBUG_LIST is not set |
1010 | # CONFIG_DEBUG_SG is not set | 1064 | # CONFIG_DEBUG_SG is not set |
1011 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1065 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1066 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1067 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1012 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1068 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1069 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1013 | # CONFIG_FAULT_INJECTION is not set | 1070 | # CONFIG_FAULT_INJECTION is not set |
1071 | # CONFIG_LATENCYTOP is not set | ||
1072 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1073 | |||
1074 | # | ||
1075 | # Tracers | ||
1076 | # | ||
1077 | # CONFIG_FUNCTION_TRACER is not set | ||
1078 | # CONFIG_SCHED_TRACER is not set | ||
1079 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1080 | # CONFIG_BOOT_TRACER is not set | ||
1081 | # CONFIG_STACK_TRACER is not set | ||
1082 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1014 | # CONFIG_SAMPLES is not set | 1083 | # CONFIG_SAMPLES is not set |
1084 | CONFIG_HAVE_ARCH_KGDB=y | ||
1085 | # CONFIG_KGDB is not set | ||
1015 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1086 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1016 | # CONFIG_DEBUG_STACK_USAGE is not set | 1087 | # CONFIG_DEBUG_STACK_USAGE is not set |
1017 | # CONFIG_DEBUG_PAGEALLOC is not set | 1088 | # CONFIG_DEBUG_PAGEALLOC is not set |
1018 | # CONFIG_DEBUGGER is not set | 1089 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1090 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1091 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1092 | # CONFIG_XMON is not set | ||
1019 | # CONFIG_IRQSTACKS is not set | 1093 | # CONFIG_IRQSTACKS is not set |
1020 | # CONFIG_BDI_SWITCH is not set | 1094 | # CONFIG_BDI_SWITCH is not set |
1021 | # CONFIG_BOOTX_TEXT is not set | 1095 | # CONFIG_BOOTX_TEXT is not set |
@@ -1026,14 +1100,19 @@ CONFIG_DEBUG_INFO=y | |||
1026 | # | 1100 | # |
1027 | # CONFIG_KEYS is not set | 1101 | # CONFIG_KEYS is not set |
1028 | # CONFIG_SECURITY is not set | 1102 | # CONFIG_SECURITY is not set |
1103 | # CONFIG_SECURITYFS is not set | ||
1029 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1104 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1030 | CONFIG_CRYPTO=y | 1105 | CONFIG_CRYPTO=y |
1031 | 1106 | ||
1032 | # | 1107 | # |
1033 | # Crypto core or helper | 1108 | # Crypto core or helper |
1034 | # | 1109 | # |
1110 | # CONFIG_CRYPTO_FIPS is not set | ||
1035 | CONFIG_CRYPTO_ALGAPI=y | 1111 | CONFIG_CRYPTO_ALGAPI=y |
1112 | CONFIG_CRYPTO_AEAD=y | ||
1036 | CONFIG_CRYPTO_BLKCIPHER=y | 1113 | CONFIG_CRYPTO_BLKCIPHER=y |
1114 | CONFIG_CRYPTO_HASH=y | ||
1115 | CONFIG_CRYPTO_RNG=y | ||
1037 | CONFIG_CRYPTO_MANAGER=y | 1116 | CONFIG_CRYPTO_MANAGER=y |
1038 | # CONFIG_CRYPTO_GF128MUL is not set | 1117 | # CONFIG_CRYPTO_GF128MUL is not set |
1039 | # CONFIG_CRYPTO_NULL is not set | 1118 | # CONFIG_CRYPTO_NULL is not set |
@@ -1071,6 +1150,10 @@ CONFIG_CRYPTO_PCBC=y | |||
1071 | # CONFIG_CRYPTO_MD4 is not set | 1150 | # CONFIG_CRYPTO_MD4 is not set |
1072 | CONFIG_CRYPTO_MD5=y | 1151 | CONFIG_CRYPTO_MD5=y |
1073 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1152 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1153 | # CONFIG_CRYPTO_RMD128 is not set | ||
1154 | # CONFIG_CRYPTO_RMD160 is not set | ||
1155 | # CONFIG_CRYPTO_RMD256 is not set | ||
1156 | # CONFIG_CRYPTO_RMD320 is not set | ||
1074 | # CONFIG_CRYPTO_SHA1 is not set | 1157 | # CONFIG_CRYPTO_SHA1 is not set |
1075 | # CONFIG_CRYPTO_SHA256 is not set | 1158 | # CONFIG_CRYPTO_SHA256 is not set |
1076 | # CONFIG_CRYPTO_SHA512 is not set | 1159 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1101,6 +1184,11 @@ CONFIG_CRYPTO_DES=y | |||
1101 | # | 1184 | # |
1102 | # CONFIG_CRYPTO_DEFLATE is not set | 1185 | # CONFIG_CRYPTO_DEFLATE is not set |
1103 | # CONFIG_CRYPTO_LZO is not set | 1186 | # CONFIG_CRYPTO_LZO is not set |
1187 | |||
1188 | # | ||
1189 | # Random Number Generation | ||
1190 | # | ||
1191 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1104 | CONFIG_CRYPTO_HW=y | 1192 | CONFIG_CRYPTO_HW=y |
1105 | CONFIG_PPC_CLOCK=y | 1193 | CONFIG_PPC_CLOCK=y |
1106 | CONFIG_PPC_LIB_RHEAP=y | 1194 | CONFIG_PPC_LIB_RHEAP=y |
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig index 9c0caa488b2e..9d0207783d60 100644 --- a/arch/powerpc/configs/52xx/pcm030_defconfig +++ b/arch/powerpc/configs/52xx/pcm030_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Tue Apr 29 07:13:19 2008 | 4 | # Thu Nov 13 02:13:16 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -104,7 +105,9 @@ CONFIG_SIGNALFD=y | |||
104 | CONFIG_TIMERFD=y | 105 | CONFIG_TIMERFD=y |
105 | CONFIG_EVENTFD=y | 106 | CONFIG_EVENTFD=y |
106 | CONFIG_SHMEM=y | 107 | CONFIG_SHMEM=y |
108 | CONFIG_AIO=y | ||
107 | # CONFIG_VM_EVENT_COUNTERS is not set | 109 | # CONFIG_VM_EVENT_COUNTERS is not set |
110 | CONFIG_PCI_QUIRKS=y | ||
108 | CONFIG_SLAB=y | 111 | CONFIG_SLAB=y |
109 | # CONFIG_SLUB is not set | 112 | # CONFIG_SLUB is not set |
110 | # CONFIG_SLOB is not set | 113 | # CONFIG_SLOB is not set |
@@ -112,24 +115,30 @@ CONFIG_SLAB=y | |||
112 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
114 | # CONFIG_KPROBES is not set | 117 | # CONFIG_KPROBES is not set |
118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
117 | CONFIG_PROC_PAGE_MONITOR=y | 122 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
123 | CONFIG_HAVE_CLK=y | ||
124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
121 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
122 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
123 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
124 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 132 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
125 | # CONFIG_MODVERSIONS is not set | 133 | # CONFIG_MODVERSIONS is not set |
126 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 134 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
127 | # CONFIG_KMOD is not set | 135 | CONFIG_KMOD=y |
128 | CONFIG_BLOCK=y | 136 | CONFIG_BLOCK=y |
129 | # CONFIG_LBD is not set | 137 | # CONFIG_LBD is not set |
130 | # CONFIG_BLK_DEV_IO_TRACE is not set | 138 | # CONFIG_BLK_DEV_IO_TRACE is not set |
131 | # CONFIG_LSF is not set | 139 | # CONFIG_LSF is not set |
132 | # CONFIG_BLK_DEV_BSG is not set | 140 | # CONFIG_BLK_DEV_BSG is not set |
141 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
133 | 142 | ||
134 | # | 143 | # |
135 | # IO Schedulers | 144 | # IO Schedulers |
@@ -144,19 +153,16 @@ CONFIG_IOSCHED_NOOP=y | |||
144 | CONFIG_DEFAULT_NOOP=y | 153 | CONFIG_DEFAULT_NOOP=y |
145 | CONFIG_DEFAULT_IOSCHED="noop" | 154 | CONFIG_DEFAULT_IOSCHED="noop" |
146 | CONFIG_CLASSIC_RCU=y | 155 | CONFIG_CLASSIC_RCU=y |
156 | # CONFIG_FREEZER is not set | ||
147 | 157 | ||
148 | # | 158 | # |
149 | # Platform support | 159 | # Platform support |
150 | # | 160 | # |
151 | CONFIG_PPC_MULTIPLATFORM=y | 161 | CONFIG_PPC_MULTIPLATFORM=y |
152 | # CONFIG_PPC_82xx is not set | ||
153 | # CONFIG_PPC_83xx is not set | ||
154 | # CONFIG_PPC_86xx is not set | ||
155 | CONFIG_CLASSIC32=y | 162 | CONFIG_CLASSIC32=y |
156 | # CONFIG_PPC_CHRP is not set | 163 | # CONFIG_PPC_CHRP is not set |
157 | # CONFIG_PPC_MPC512x is not set | ||
158 | # CONFIG_PPC_MPC5121 is not set | ||
159 | # CONFIG_MPC5121_ADS is not set | 164 | # CONFIG_MPC5121_ADS is not set |
165 | # CONFIG_MPC5121_GENERIC is not set | ||
160 | CONFIG_PPC_MPC52xx=y | 166 | CONFIG_PPC_MPC52xx=y |
161 | CONFIG_PPC_MPC5200_SIMPLE=y | 167 | CONFIG_PPC_MPC5200_SIMPLE=y |
162 | # CONFIG_PPC_EFIKA is not set | 168 | # CONFIG_PPC_EFIKA is not set |
@@ -166,7 +172,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
166 | # CONFIG_PPC_PMAC is not set | 172 | # CONFIG_PPC_PMAC is not set |
167 | # CONFIG_PPC_CELL is not set | 173 | # CONFIG_PPC_CELL is not set |
168 | # CONFIG_PPC_CELL_NATIVE is not set | 174 | # CONFIG_PPC_CELL_NATIVE is not set |
175 | # CONFIG_PPC_82xx is not set | ||
169 | # CONFIG_PQ2ADS is not set | 176 | # CONFIG_PQ2ADS is not set |
177 | # CONFIG_PPC_83xx is not set | ||
178 | # CONFIG_PPC_86xx is not set | ||
170 | # CONFIG_EMBEDDED6xx is not set | 179 | # CONFIG_EMBEDDED6xx is not set |
171 | # CONFIG_IPIC is not set | 180 | # CONFIG_IPIC is not set |
172 | # CONFIG_MPIC is not set | 181 | # CONFIG_MPIC is not set |
@@ -199,12 +208,14 @@ CONFIG_HZ_100=y | |||
199 | # CONFIG_HZ_300 is not set | 208 | # CONFIG_HZ_300 is not set |
200 | # CONFIG_HZ_1000 is not set | 209 | # CONFIG_HZ_1000 is not set |
201 | CONFIG_HZ=100 | 210 | CONFIG_HZ=100 |
202 | # CONFIG_SCHED_HRTICK is not set | 211 | CONFIG_SCHED_HRTICK=y |
203 | # CONFIG_PREEMPT_NONE is not set | 212 | # CONFIG_PREEMPT_NONE is not set |
204 | # CONFIG_PREEMPT_VOLUNTARY is not set | 213 | # CONFIG_PREEMPT_VOLUNTARY is not set |
205 | CONFIG_PREEMPT=y | 214 | CONFIG_PREEMPT=y |
206 | # CONFIG_PREEMPT_RCU is not set | 215 | # CONFIG_PREEMPT_RCU is not set |
207 | CONFIG_BINFMT_ELF=y | 216 | CONFIG_BINFMT_ELF=y |
217 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
218 | # CONFIG_HAVE_AOUT is not set | ||
208 | # CONFIG_BINFMT_MISC is not set | 219 | # CONFIG_BINFMT_MISC is not set |
209 | # CONFIG_IOMMU_HELPER is not set | 220 | # CONFIG_IOMMU_HELPER is not set |
210 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 221 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -219,17 +230,19 @@ CONFIG_FLATMEM_MANUAL=y | |||
219 | # CONFIG_SPARSEMEM_MANUAL is not set | 230 | # CONFIG_SPARSEMEM_MANUAL is not set |
220 | CONFIG_FLATMEM=y | 231 | CONFIG_FLATMEM=y |
221 | CONFIG_FLAT_NODE_MEM_MAP=y | 232 | CONFIG_FLAT_NODE_MEM_MAP=y |
222 | # CONFIG_SPARSEMEM_STATIC is not set | ||
223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
224 | CONFIG_PAGEFLAGS_EXTENDED=y | 233 | CONFIG_PAGEFLAGS_EXTENDED=y |
225 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 234 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
235 | CONFIG_MIGRATION=y | ||
226 | # CONFIG_RESOURCES_64BIT is not set | 236 | # CONFIG_RESOURCES_64BIT is not set |
237 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
227 | CONFIG_ZONE_DMA_FLAG=1 | 238 | CONFIG_ZONE_DMA_FLAG=1 |
228 | CONFIG_BOUNCE=y | 239 | CONFIG_BOUNCE=y |
229 | CONFIG_VIRT_TO_BUS=y | 240 | CONFIG_VIRT_TO_BUS=y |
241 | CONFIG_UNEVICTABLE_LRU=y | ||
230 | CONFIG_FORCE_MAX_ZONEORDER=11 | 242 | CONFIG_FORCE_MAX_ZONEORDER=11 |
231 | CONFIG_PROC_DEVICETREE=y | 243 | CONFIG_PROC_DEVICETREE=y |
232 | # CONFIG_CMDLINE_BOOL is not set | 244 | # CONFIG_CMDLINE_BOOL is not set |
245 | CONFIG_EXTRA_TARGETS="" | ||
233 | # CONFIG_PM is not set | 246 | # CONFIG_PM is not set |
234 | # CONFIG_SECCOMP is not set | 247 | # CONFIG_SECCOMP is not set |
235 | CONFIG_ISA_DMA_API=y | 248 | CONFIG_ISA_DMA_API=y |
@@ -240,7 +253,7 @@ CONFIG_ISA_DMA_API=y | |||
240 | CONFIG_ZONE_DMA=y | 253 | CONFIG_ZONE_DMA=y |
241 | CONFIG_GENERIC_ISA_DMA=y | 254 | CONFIG_GENERIC_ISA_DMA=y |
242 | # CONFIG_PPC_INDIRECT_PCI is not set | 255 | # CONFIG_PPC_INDIRECT_PCI is not set |
243 | CONFIG_FSL_SOC=y | 256 | CONFIG_PPC_PCI_CHOICE=y |
244 | CONFIG_PCI=y | 257 | CONFIG_PCI=y |
245 | CONFIG_PCI_DOMAINS=y | 258 | CONFIG_PCI_DOMAINS=y |
246 | CONFIG_PCI_SYSCALL=y | 259 | CONFIG_PCI_SYSCALL=y |
@@ -265,10 +278,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
265 | CONFIG_KERNEL_START=0xc0000000 | 278 | CONFIG_KERNEL_START=0xc0000000 |
266 | CONFIG_PHYSICAL_START=0x00000000 | 279 | CONFIG_PHYSICAL_START=0x00000000 |
267 | CONFIG_TASK_SIZE=0xc0000000 | 280 | CONFIG_TASK_SIZE=0xc0000000 |
268 | |||
269 | # | ||
270 | # Networking | ||
271 | # | ||
272 | CONFIG_NET=y | 281 | CONFIG_NET=y |
273 | 282 | ||
274 | # | 283 | # |
@@ -313,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
313 | # CONFIG_TIPC is not set | 322 | # CONFIG_TIPC is not set |
314 | # CONFIG_ATM is not set | 323 | # CONFIG_ATM is not set |
315 | # CONFIG_BRIDGE is not set | 324 | # CONFIG_BRIDGE is not set |
325 | # CONFIG_NET_DSA is not set | ||
316 | # CONFIG_VLAN_8021Q is not set | 326 | # CONFIG_VLAN_8021Q is not set |
317 | # CONFIG_DECNET is not set | 327 | # CONFIG_DECNET is not set |
318 | # CONFIG_LLC2 is not set | 328 | # CONFIG_LLC2 is not set |
@@ -333,14 +343,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
333 | # CONFIG_IRDA is not set | 343 | # CONFIG_IRDA is not set |
334 | # CONFIG_BT is not set | 344 | # CONFIG_BT is not set |
335 | # CONFIG_AF_RXRPC is not set | 345 | # CONFIG_AF_RXRPC is not set |
336 | 346 | # CONFIG_PHONET is not set | |
337 | # | 347 | # CONFIG_WIRELESS is not set |
338 | # Wireless | ||
339 | # | ||
340 | # CONFIG_CFG80211 is not set | ||
341 | # CONFIG_WIRELESS_EXT is not set | ||
342 | # CONFIG_MAC80211 is not set | ||
343 | # CONFIG_IEEE80211 is not set | ||
344 | # CONFIG_RFKILL is not set | 348 | # CONFIG_RFKILL is not set |
345 | # CONFIG_NET_9P is not set | 349 | # CONFIG_NET_9P is not set |
346 | 350 | ||
@@ -484,12 +488,12 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
484 | # CONFIG_SCSI_SAS_LIBSAS is not set | 488 | # CONFIG_SCSI_SAS_LIBSAS is not set |
485 | # CONFIG_SCSI_SRP_ATTRS is not set | 489 | # CONFIG_SCSI_SRP_ATTRS is not set |
486 | # CONFIG_SCSI_LOWLEVEL is not set | 490 | # CONFIG_SCSI_LOWLEVEL is not set |
491 | # CONFIG_SCSI_DH is not set | ||
487 | CONFIG_ATA=m | 492 | CONFIG_ATA=m |
488 | # CONFIG_ATA_NONSTANDARD is not set | 493 | # CONFIG_ATA_NONSTANDARD is not set |
489 | CONFIG_SATA_PMP=y | 494 | CONFIG_SATA_PMP=y |
490 | # CONFIG_SATA_AHCI is not set | 495 | # CONFIG_SATA_AHCI is not set |
491 | # CONFIG_SATA_SIL24 is not set | 496 | # CONFIG_SATA_SIL24 is not set |
492 | # CONFIG_SATA_FSL is not set | ||
493 | CONFIG_ATA_SFF=y | 497 | CONFIG_ATA_SFF=y |
494 | # CONFIG_SATA_SVW is not set | 498 | # CONFIG_SATA_SVW is not set |
495 | # CONFIG_ATA_PIIX is not set | 499 | # CONFIG_ATA_PIIX is not set |
@@ -545,18 +549,22 @@ CONFIG_PATA_MPC52xx=m | |||
545 | # CONFIG_PATA_VIA is not set | 549 | # CONFIG_PATA_VIA is not set |
546 | # CONFIG_PATA_WINBOND is not set | 550 | # CONFIG_PATA_WINBOND is not set |
547 | # CONFIG_PATA_PLATFORM is not set | 551 | # CONFIG_PATA_PLATFORM is not set |
552 | # CONFIG_PATA_SCH is not set | ||
548 | # CONFIG_MD is not set | 553 | # CONFIG_MD is not set |
549 | # CONFIG_FUSION is not set | 554 | # CONFIG_FUSION is not set |
550 | 555 | ||
551 | # | 556 | # |
552 | # IEEE 1394 (FireWire) support | 557 | # IEEE 1394 (FireWire) support |
553 | # | 558 | # |
559 | |||
560 | # | ||
561 | # Enable only one of the two stacks, unless you know what you are doing | ||
562 | # | ||
554 | # CONFIG_FIREWIRE is not set | 563 | # CONFIG_FIREWIRE is not set |
555 | # CONFIG_IEEE1394 is not set | 564 | # CONFIG_IEEE1394 is not set |
556 | # CONFIG_I2O is not set | 565 | # CONFIG_I2O is not set |
557 | # CONFIG_MACINTOSH_DRIVERS is not set | 566 | # CONFIG_MACINTOSH_DRIVERS is not set |
558 | CONFIG_NETDEVICES=y | 567 | CONFIG_NETDEVICES=y |
559 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
560 | # CONFIG_DUMMY is not set | 568 | # CONFIG_DUMMY is not set |
561 | # CONFIG_BONDING is not set | 569 | # CONFIG_BONDING is not set |
562 | # CONFIG_MACVLAN is not set | 570 | # CONFIG_MACVLAN is not set |
@@ -593,10 +601,14 @@ CONFIG_MII=y | |||
593 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 601 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
594 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 602 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
595 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 603 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
604 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
605 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
606 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
596 | # CONFIG_NET_PCI is not set | 607 | # CONFIG_NET_PCI is not set |
597 | # CONFIG_B44 is not set | 608 | # CONFIG_B44 is not set |
598 | CONFIG_FEC_MPC52xx=y | 609 | CONFIG_FEC_MPC52xx=y |
599 | CONFIG_FEC_MPC52xx_MDIO=y | 610 | CONFIG_FEC_MPC52xx_MDIO=y |
611 | # CONFIG_ATL2 is not set | ||
600 | # CONFIG_NETDEV_1000 is not set | 612 | # CONFIG_NETDEV_1000 is not set |
601 | # CONFIG_NETDEV_10000 is not set | 613 | # CONFIG_NETDEV_10000 is not set |
602 | # CONFIG_TR is not set | 614 | # CONFIG_TR is not set |
@@ -606,7 +618,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
606 | # | 618 | # |
607 | # CONFIG_WLAN_PRE80211 is not set | 619 | # CONFIG_WLAN_PRE80211 is not set |
608 | # CONFIG_WLAN_80211 is not set | 620 | # CONFIG_WLAN_80211 is not set |
609 | # CONFIG_IWLWIFI is not set | ||
610 | # CONFIG_IWLWIFI_LEDS is not set | 621 | # CONFIG_IWLWIFI_LEDS is not set |
611 | 622 | ||
612 | # | 623 | # |
@@ -644,6 +655,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
644 | # Character devices | 655 | # Character devices |
645 | # | 656 | # |
646 | # CONFIG_VT is not set | 657 | # CONFIG_VT is not set |
658 | CONFIG_DEVKMEM=y | ||
647 | # CONFIG_SERIAL_NONSTANDARD is not set | 659 | # CONFIG_SERIAL_NONSTANDARD is not set |
648 | # CONFIG_NOZOMI is not set | 660 | # CONFIG_NOZOMI is not set |
649 | 661 | ||
@@ -675,43 +687,64 @@ CONFIG_DEVPORT=y | |||
675 | CONFIG_I2C=y | 687 | CONFIG_I2C=y |
676 | CONFIG_I2C_BOARDINFO=y | 688 | CONFIG_I2C_BOARDINFO=y |
677 | CONFIG_I2C_CHARDEV=y | 689 | CONFIG_I2C_CHARDEV=y |
690 | CONFIG_I2C_HELPER_AUTO=y | ||
678 | 691 | ||
679 | # | 692 | # |
680 | # I2C Hardware Bus support | 693 | # I2C Hardware Bus support |
681 | # | 694 | # |
695 | |||
696 | # | ||
697 | # PC SMBus host controller drivers | ||
698 | # | ||
682 | # CONFIG_I2C_ALI1535 is not set | 699 | # CONFIG_I2C_ALI1535 is not set |
683 | # CONFIG_I2C_ALI1563 is not set | 700 | # CONFIG_I2C_ALI1563 is not set |
684 | # CONFIG_I2C_ALI15X3 is not set | 701 | # CONFIG_I2C_ALI15X3 is not set |
685 | # CONFIG_I2C_AMD756 is not set | 702 | # CONFIG_I2C_AMD756 is not set |
686 | # CONFIG_I2C_AMD8111 is not set | 703 | # CONFIG_I2C_AMD8111 is not set |
687 | # CONFIG_I2C_I801 is not set | 704 | # CONFIG_I2C_I801 is not set |
688 | # CONFIG_I2C_I810 is not set | 705 | # CONFIG_I2C_ISCH is not set |
689 | # CONFIG_I2C_PIIX4 is not set | 706 | # CONFIG_I2C_PIIX4 is not set |
690 | CONFIG_I2C_MPC=y | ||
691 | # CONFIG_I2C_NFORCE2 is not set | 707 | # CONFIG_I2C_NFORCE2 is not set |
692 | # CONFIG_I2C_OCORES is not set | ||
693 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
694 | # CONFIG_I2C_PROSAVAGE is not set | ||
695 | # CONFIG_I2C_SAVAGE4 is not set | ||
696 | # CONFIG_I2C_SIMTEC is not set | ||
697 | # CONFIG_I2C_SIS5595 is not set | 708 | # CONFIG_I2C_SIS5595 is not set |
698 | # CONFIG_I2C_SIS630 is not set | 709 | # CONFIG_I2C_SIS630 is not set |
699 | # CONFIG_I2C_SIS96X is not set | 710 | # CONFIG_I2C_SIS96X is not set |
700 | # CONFIG_I2C_TAOS_EVM is not set | ||
701 | # CONFIG_I2C_STUB is not set | ||
702 | # CONFIG_I2C_TINY_USB is not set | ||
703 | # CONFIG_I2C_VIA is not set | 711 | # CONFIG_I2C_VIA is not set |
704 | # CONFIG_I2C_VIAPRO is not set | 712 | # CONFIG_I2C_VIAPRO is not set |
713 | |||
714 | # | ||
715 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
716 | # | ||
717 | CONFIG_I2C_MPC=y | ||
718 | # CONFIG_I2C_OCORES is not set | ||
719 | # CONFIG_I2C_SIMTEC is not set | ||
720 | |||
721 | # | ||
722 | # External I2C/SMBus adapter drivers | ||
723 | # | ||
724 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
725 | # CONFIG_I2C_TAOS_EVM is not set | ||
726 | # CONFIG_I2C_TINY_USB is not set | ||
727 | |||
728 | # | ||
729 | # Graphics adapter I2C/DDC channel drivers | ||
730 | # | ||
705 | # CONFIG_I2C_VOODOO3 is not set | 731 | # CONFIG_I2C_VOODOO3 is not set |
732 | |||
733 | # | ||
734 | # Other I2C/SMBus bus drivers | ||
735 | # | ||
706 | # CONFIG_I2C_PCA_PLATFORM is not set | 736 | # CONFIG_I2C_PCA_PLATFORM is not set |
737 | # CONFIG_I2C_STUB is not set | ||
707 | 738 | ||
708 | # | 739 | # |
709 | # Miscellaneous I2C Chip support | 740 | # Miscellaneous I2C Chip support |
710 | # | 741 | # |
711 | # CONFIG_DS1682 is not set | 742 | # CONFIG_DS1682 is not set |
743 | # CONFIG_AT24 is not set | ||
712 | CONFIG_SENSORS_EEPROM=m | 744 | CONFIG_SENSORS_EEPROM=m |
713 | # CONFIG_SENSORS_PCF8574 is not set | 745 | # CONFIG_SENSORS_PCF8574 is not set |
714 | # CONFIG_PCF8575 is not set | 746 | # CONFIG_PCF8575 is not set |
747 | # CONFIG_SENSORS_PCA9539 is not set | ||
715 | # CONFIG_SENSORS_PCF8591 is not set | 748 | # CONFIG_SENSORS_PCF8591 is not set |
716 | # CONFIG_SENSORS_MAX6875 is not set | 749 | # CONFIG_SENSORS_MAX6875 is not set |
717 | # CONFIG_SENSORS_TSL2550 is not set | 750 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -720,29 +753,47 @@ CONFIG_SENSORS_EEPROM=m | |||
720 | # CONFIG_I2C_DEBUG_BUS is not set | 753 | # CONFIG_I2C_DEBUG_BUS is not set |
721 | # CONFIG_I2C_DEBUG_CHIP is not set | 754 | # CONFIG_I2C_DEBUG_CHIP is not set |
722 | # CONFIG_SPI is not set | 755 | # CONFIG_SPI is not set |
756 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
757 | # CONFIG_GPIOLIB is not set | ||
723 | # CONFIG_W1 is not set | 758 | # CONFIG_W1 is not set |
724 | # CONFIG_POWER_SUPPLY is not set | 759 | # CONFIG_POWER_SUPPLY is not set |
725 | # CONFIG_HWMON is not set | 760 | # CONFIG_HWMON is not set |
726 | # CONFIG_THERMAL is not set | 761 | # CONFIG_THERMAL is not set |
762 | # CONFIG_THERMAL_HWMON is not set | ||
727 | # CONFIG_WATCHDOG is not set | 763 | # CONFIG_WATCHDOG is not set |
764 | CONFIG_SSB_POSSIBLE=y | ||
728 | 765 | ||
729 | # | 766 | # |
730 | # Sonics Silicon Backplane | 767 | # Sonics Silicon Backplane |
731 | # | 768 | # |
732 | CONFIG_SSB_POSSIBLE=y | ||
733 | # CONFIG_SSB is not set | 769 | # CONFIG_SSB is not set |
734 | 770 | ||
735 | # | 771 | # |
736 | # Multifunction device drivers | 772 | # Multifunction device drivers |
737 | # | 773 | # |
774 | # CONFIG_MFD_CORE is not set | ||
738 | # CONFIG_MFD_SM501 is not set | 775 | # CONFIG_MFD_SM501 is not set |
739 | # CONFIG_HTC_PASIC3 is not set | 776 | # CONFIG_HTC_PASIC3 is not set |
777 | # CONFIG_MFD_TMIO is not set | ||
778 | # CONFIG_PMIC_DA903X is not set | ||
779 | # CONFIG_MFD_WM8400 is not set | ||
780 | # CONFIG_MFD_WM8350_I2C is not set | ||
781 | # CONFIG_REGULATOR is not set | ||
740 | 782 | ||
741 | # | 783 | # |
742 | # Multimedia devices | 784 | # Multimedia devices |
743 | # | 785 | # |
786 | |||
787 | # | ||
788 | # Multimedia core support | ||
789 | # | ||
744 | # CONFIG_VIDEO_DEV is not set | 790 | # CONFIG_VIDEO_DEV is not set |
745 | # CONFIG_DVB_CORE is not set | 791 | # CONFIG_DVB_CORE is not set |
792 | # CONFIG_VIDEO_MEDIA is not set | ||
793 | |||
794 | # | ||
795 | # Multimedia drivers | ||
796 | # | ||
746 | # CONFIG_DAB is not set | 797 | # CONFIG_DAB is not set |
747 | 798 | ||
748 | # | 799 | # |
@@ -759,10 +810,6 @@ CONFIG_SSB_POSSIBLE=y | |||
759 | # Display device support | 810 | # Display device support |
760 | # | 811 | # |
761 | # CONFIG_DISPLAY_SUPPORT is not set | 812 | # CONFIG_DISPLAY_SUPPORT is not set |
762 | |||
763 | # | ||
764 | # Sound | ||
765 | # | ||
766 | # CONFIG_SOUND is not set | 813 | # CONFIG_SOUND is not set |
767 | CONFIG_USB_SUPPORT=y | 814 | CONFIG_USB_SUPPORT=y |
768 | CONFIG_USB_ARCH_HAS_HCD=y | 815 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -781,12 +828,17 @@ CONFIG_USB_DEVICEFS=y | |||
781 | # CONFIG_USB_OTG is not set | 828 | # CONFIG_USB_OTG is not set |
782 | # CONFIG_USB_OTG_WHITELIST is not set | 829 | # CONFIG_USB_OTG_WHITELIST is not set |
783 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 830 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
831 | # CONFIG_USB_MON is not set | ||
832 | # CONFIG_USB_WUSB is not set | ||
833 | # CONFIG_USB_WUSB_CBAF is not set | ||
784 | 834 | ||
785 | # | 835 | # |
786 | # USB Host Controller Drivers | 836 | # USB Host Controller Drivers |
787 | # | 837 | # |
838 | # CONFIG_USB_C67X00_HCD is not set | ||
788 | # CONFIG_USB_EHCI_HCD is not set | 839 | # CONFIG_USB_EHCI_HCD is not set |
789 | # CONFIG_USB_ISP116X_HCD is not set | 840 | # CONFIG_USB_ISP116X_HCD is not set |
841 | # CONFIG_USB_ISP1760_HCD is not set | ||
790 | CONFIG_USB_OHCI_HCD=m | 842 | CONFIG_USB_OHCI_HCD=m |
791 | # CONFIG_USB_OHCI_HCD_PPC_SOC is not set | 843 | # CONFIG_USB_OHCI_HCD_PPC_SOC is not set |
792 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 844 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
@@ -799,12 +851,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
799 | # CONFIG_USB_UHCI_HCD is not set | 851 | # CONFIG_USB_UHCI_HCD is not set |
800 | # CONFIG_USB_SL811_HCD is not set | 852 | # CONFIG_USB_SL811_HCD is not set |
801 | # CONFIG_USB_R8A66597_HCD is not set | 853 | # CONFIG_USB_R8A66597_HCD is not set |
854 | # CONFIG_USB_WHCI_HCD is not set | ||
855 | # CONFIG_USB_HWA_HCD is not set | ||
856 | # CONFIG_USB_MUSB_HDRC is not set | ||
802 | 857 | ||
803 | # | 858 | # |
804 | # USB Device Class drivers | 859 | # USB Device Class drivers |
805 | # | 860 | # |
806 | # CONFIG_USB_ACM is not set | 861 | # CONFIG_USB_ACM is not set |
807 | # CONFIG_USB_PRINTER is not set | 862 | # CONFIG_USB_PRINTER is not set |
863 | # CONFIG_USB_WDM is not set | ||
864 | # CONFIG_USB_TMC is not set | ||
808 | 865 | ||
809 | # | 866 | # |
810 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 867 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -833,7 +890,6 @@ CONFIG_USB_STORAGE=m | |||
833 | # | 890 | # |
834 | # CONFIG_USB_MDC800 is not set | 891 | # CONFIG_USB_MDC800 is not set |
835 | # CONFIG_USB_MICROTEK is not set | 892 | # CONFIG_USB_MICROTEK is not set |
836 | # CONFIG_USB_MON is not set | ||
837 | 893 | ||
838 | # | 894 | # |
839 | # USB port drivers | 895 | # USB port drivers |
@@ -846,7 +902,7 @@ CONFIG_USB_STORAGE=m | |||
846 | # CONFIG_USB_EMI62 is not set | 902 | # CONFIG_USB_EMI62 is not set |
847 | # CONFIG_USB_EMI26 is not set | 903 | # CONFIG_USB_EMI26 is not set |
848 | # CONFIG_USB_ADUTUX is not set | 904 | # CONFIG_USB_ADUTUX is not set |
849 | # CONFIG_USB_AUERSWALD is not set | 905 | # CONFIG_USB_SEVSEG is not set |
850 | # CONFIG_USB_RIO500 is not set | 906 | # CONFIG_USB_RIO500 is not set |
851 | # CONFIG_USB_LEGOTOWER is not set | 907 | # CONFIG_USB_LEGOTOWER is not set |
852 | # CONFIG_USB_LCD is not set | 908 | # CONFIG_USB_LCD is not set |
@@ -862,10 +918,14 @@ CONFIG_USB_STORAGE=m | |||
862 | # CONFIG_USB_TRANCEVIBRATOR is not set | 918 | # CONFIG_USB_TRANCEVIBRATOR is not set |
863 | # CONFIG_USB_IOWARRIOR is not set | 919 | # CONFIG_USB_IOWARRIOR is not set |
864 | # CONFIG_USB_TEST is not set | 920 | # CONFIG_USB_TEST is not set |
921 | # CONFIG_USB_ISIGHTFW is not set | ||
922 | # CONFIG_USB_VST is not set | ||
865 | # CONFIG_USB_GADGET is not set | 923 | # CONFIG_USB_GADGET is not set |
924 | # CONFIG_UWB is not set | ||
866 | # CONFIG_MMC is not set | 925 | # CONFIG_MMC is not set |
867 | # CONFIG_MEMSTICK is not set | 926 | # CONFIG_MEMSTICK is not set |
868 | # CONFIG_NEW_LEDS is not set | 927 | # CONFIG_NEW_LEDS is not set |
928 | # CONFIG_ACCESSIBILITY is not set | ||
869 | # CONFIG_INFINIBAND is not set | 929 | # CONFIG_INFINIBAND is not set |
870 | # CONFIG_EDAC is not set | 930 | # CONFIG_EDAC is not set |
871 | CONFIG_RTC_LIB=m | 931 | CONFIG_RTC_LIB=m |
@@ -894,6 +954,8 @@ CONFIG_RTC_DRV_PCF8563=m | |||
894 | # CONFIG_RTC_DRV_PCF8583 is not set | 954 | # CONFIG_RTC_DRV_PCF8583 is not set |
895 | # CONFIG_RTC_DRV_M41T80 is not set | 955 | # CONFIG_RTC_DRV_M41T80 is not set |
896 | # CONFIG_RTC_DRV_S35390A is not set | 956 | # CONFIG_RTC_DRV_S35390A is not set |
957 | # CONFIG_RTC_DRV_FM3130 is not set | ||
958 | # CONFIG_RTC_DRV_RX8581 is not set | ||
897 | 959 | ||
898 | # | 960 | # |
899 | # SPI RTC drivers | 961 | # SPI RTC drivers |
@@ -903,19 +965,25 @@ CONFIG_RTC_DRV_PCF8563=m | |||
903 | # Platform RTC drivers | 965 | # Platform RTC drivers |
904 | # | 966 | # |
905 | # CONFIG_RTC_DRV_CMOS is not set | 967 | # CONFIG_RTC_DRV_CMOS is not set |
968 | # CONFIG_RTC_DRV_DS1286 is not set | ||
906 | # CONFIG_RTC_DRV_DS1511 is not set | 969 | # CONFIG_RTC_DRV_DS1511 is not set |
907 | # CONFIG_RTC_DRV_DS1553 is not set | 970 | # CONFIG_RTC_DRV_DS1553 is not set |
908 | # CONFIG_RTC_DRV_DS1742 is not set | 971 | # CONFIG_RTC_DRV_DS1742 is not set |
909 | # CONFIG_RTC_DRV_STK17TA8 is not set | 972 | # CONFIG_RTC_DRV_STK17TA8 is not set |
910 | # CONFIG_RTC_DRV_M48T86 is not set | 973 | # CONFIG_RTC_DRV_M48T86 is not set |
974 | # CONFIG_RTC_DRV_M48T35 is not set | ||
911 | # CONFIG_RTC_DRV_M48T59 is not set | 975 | # CONFIG_RTC_DRV_M48T59 is not set |
976 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
912 | # CONFIG_RTC_DRV_V3020 is not set | 977 | # CONFIG_RTC_DRV_V3020 is not set |
913 | 978 | ||
914 | # | 979 | # |
915 | # on-CPU RTC drivers | 980 | # on-CPU RTC drivers |
916 | # | 981 | # |
982 | # CONFIG_RTC_DRV_PPC is not set | ||
917 | # CONFIG_DMADEVICES is not set | 983 | # CONFIG_DMADEVICES is not set |
918 | # CONFIG_UIO is not set | 984 | # CONFIG_UIO is not set |
985 | # CONFIG_STAGING is not set | ||
986 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
919 | 987 | ||
920 | # | 988 | # |
921 | # File systems | 989 | # File systems |
@@ -927,12 +995,13 @@ CONFIG_EXT3_FS=m | |||
927 | CONFIG_EXT3_FS_XATTR=y | 995 | CONFIG_EXT3_FS_XATTR=y |
928 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 996 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
929 | # CONFIG_EXT3_FS_SECURITY is not set | 997 | # CONFIG_EXT3_FS_SECURITY is not set |
930 | # CONFIG_EXT4DEV_FS is not set | 998 | # CONFIG_EXT4_FS is not set |
931 | CONFIG_JBD=m | 999 | CONFIG_JBD=m |
932 | CONFIG_FS_MBCACHE=m | 1000 | CONFIG_FS_MBCACHE=m |
933 | # CONFIG_REISERFS_FS is not set | 1001 | # CONFIG_REISERFS_FS is not set |
934 | # CONFIG_JFS_FS is not set | 1002 | # CONFIG_JFS_FS is not set |
935 | # CONFIG_FS_POSIX_ACL is not set | 1003 | # CONFIG_FS_POSIX_ACL is not set |
1004 | CONFIG_FILE_LOCKING=y | ||
936 | # CONFIG_XFS_FS is not set | 1005 | # CONFIG_XFS_FS is not set |
937 | # CONFIG_OCFS2_FS is not set | 1006 | # CONFIG_OCFS2_FS is not set |
938 | # CONFIG_DNOTIFY is not set | 1007 | # CONFIG_DNOTIFY is not set |
@@ -964,6 +1033,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
964 | CONFIG_PROC_FS=y | 1033 | CONFIG_PROC_FS=y |
965 | # CONFIG_PROC_KCORE is not set | 1034 | # CONFIG_PROC_KCORE is not set |
966 | CONFIG_PROC_SYSCTL=y | 1035 | CONFIG_PROC_SYSCTL=y |
1036 | CONFIG_PROC_PAGE_MONITOR=y | ||
967 | CONFIG_SYSFS=y | 1037 | CONFIG_SYSFS=y |
968 | CONFIG_TMPFS=y | 1038 | CONFIG_TMPFS=y |
969 | # CONFIG_TMPFS_POSIX_ACL is not set | 1039 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -994,6 +1064,7 @@ CONFIG_JFFS2_RTIME=y | |||
994 | # CONFIG_CRAMFS is not set | 1064 | # CONFIG_CRAMFS is not set |
995 | # CONFIG_VXFS_FS is not set | 1065 | # CONFIG_VXFS_FS is not set |
996 | # CONFIG_MINIX_FS is not set | 1066 | # CONFIG_MINIX_FS is not set |
1067 | # CONFIG_OMFS_FS is not set | ||
997 | # CONFIG_HPFS_FS is not set | 1068 | # CONFIG_HPFS_FS is not set |
998 | # CONFIG_QNX4FS_FS is not set | 1069 | # CONFIG_QNX4FS_FS is not set |
999 | # CONFIG_ROMFS_FS is not set | 1070 | # CONFIG_ROMFS_FS is not set |
@@ -1004,13 +1075,13 @@ CONFIG_NFS_FS=y | |||
1004 | CONFIG_NFS_V3=y | 1075 | CONFIG_NFS_V3=y |
1005 | # CONFIG_NFS_V3_ACL is not set | 1076 | # CONFIG_NFS_V3_ACL is not set |
1006 | # CONFIG_NFS_V4 is not set | 1077 | # CONFIG_NFS_V4 is not set |
1007 | # CONFIG_NFSD is not set | ||
1008 | CONFIG_ROOT_NFS=y | 1078 | CONFIG_ROOT_NFS=y |
1079 | # CONFIG_NFSD is not set | ||
1009 | CONFIG_LOCKD=y | 1080 | CONFIG_LOCKD=y |
1010 | CONFIG_LOCKD_V4=y | 1081 | CONFIG_LOCKD_V4=y |
1011 | CONFIG_NFS_COMMON=y | 1082 | CONFIG_NFS_COMMON=y |
1012 | CONFIG_SUNRPC=y | 1083 | CONFIG_SUNRPC=y |
1013 | # CONFIG_SUNRPC_BIND34 is not set | 1084 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
1014 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1085 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1015 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1086 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1016 | # CONFIG_SMB_FS is not set | 1087 | # CONFIG_SMB_FS is not set |
@@ -1070,9 +1141,9 @@ CONFIG_NLS_ISO8859_1=y | |||
1070 | # Library routines | 1141 | # Library routines |
1071 | # | 1142 | # |
1072 | CONFIG_BITREVERSE=y | 1143 | CONFIG_BITREVERSE=y |
1073 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1074 | # CONFIG_CRC_CCITT is not set | 1144 | # CONFIG_CRC_CCITT is not set |
1075 | # CONFIG_CRC16 is not set | 1145 | # CONFIG_CRC16 is not set |
1146 | # CONFIG_CRC_T10DIF is not set | ||
1076 | # CONFIG_CRC_ITU_T is not set | 1147 | # CONFIG_CRC_ITU_T is not set |
1077 | CONFIG_CRC32=y | 1148 | CONFIG_CRC32=y |
1078 | # CONFIG_CRC7 is not set | 1149 | # CONFIG_CRC7 is not set |
@@ -1098,7 +1169,17 @@ CONFIG_FRAME_WARN=1024 | |||
1098 | # CONFIG_HEADERS_CHECK is not set | 1169 | # CONFIG_HEADERS_CHECK is not set |
1099 | # CONFIG_DEBUG_KERNEL is not set | 1170 | # CONFIG_DEBUG_KERNEL is not set |
1100 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1171 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1172 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1173 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1174 | # CONFIG_LATENCYTOP is not set | ||
1175 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1176 | |||
1177 | # | ||
1178 | # Tracers | ||
1179 | # | ||
1180 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1101 | # CONFIG_SAMPLES is not set | 1181 | # CONFIG_SAMPLES is not set |
1182 | CONFIG_HAVE_ARCH_KGDB=y | ||
1102 | # CONFIG_IRQSTACKS is not set | 1183 | # CONFIG_IRQSTACKS is not set |
1103 | # CONFIG_BOOTX_TEXT is not set | 1184 | # CONFIG_BOOTX_TEXT is not set |
1104 | # CONFIG_PPC_EARLY_DEBUG is not set | 1185 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1108,6 +1189,7 @@ CONFIG_FRAME_WARN=1024 | |||
1108 | # | 1189 | # |
1109 | # CONFIG_KEYS is not set | 1190 | # CONFIG_KEYS is not set |
1110 | # CONFIG_SECURITY is not set | 1191 | # CONFIG_SECURITY is not set |
1192 | # CONFIG_SECURITYFS is not set | ||
1111 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1193 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1112 | # CONFIG_CRYPTO is not set | 1194 | # CONFIG_CRYPTO is not set |
1113 | CONFIG_PPC_CLOCK=y | 1195 | CONFIG_PPC_CLOCK=y |
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig index 7672bfba3566..bc190051e8d5 100644 --- a/arch/powerpc/configs/52xx/tqm5200_defconfig +++ b/arch/powerpc/configs/52xx/tqm5200_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Tue Apr 29 07:12:39 2008 | 4 | # Thu Nov 13 02:09:30 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y | |||
102 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
103 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
104 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
106 | CONFIG_AIO=y | ||
105 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
106 | CONFIG_SLUB_DEBUG=y | 108 | CONFIG_SLUB_DEBUG=y |
107 | # CONFIG_SLAB is not set | 109 | # CONFIG_SLAB is not set |
@@ -110,14 +112,19 @@ CONFIG_SLUB=y | |||
110 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
111 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
112 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
113 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
120 | CONFIG_HAVE_CLK=y | ||
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
119 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
120 | CONFIG_MODULES=y | 126 | CONFIG_MODULES=y |
127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
121 | CONFIG_MODULE_UNLOAD=y | 128 | CONFIG_MODULE_UNLOAD=y |
122 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 129 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
123 | CONFIG_MODVERSIONS=y | 130 | CONFIG_MODVERSIONS=y |
@@ -128,6 +135,7 @@ CONFIG_BLOCK=y | |||
128 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
129 | # CONFIG_LSF is not set | 136 | # CONFIG_LSF is not set |
130 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
138 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
131 | 139 | ||
132 | # | 140 | # |
133 | # IO Schedulers | 141 | # IO Schedulers |
@@ -142,19 +150,16 @@ CONFIG_DEFAULT_AS=y | |||
142 | # CONFIG_DEFAULT_NOOP is not set | 150 | # CONFIG_DEFAULT_NOOP is not set |
143 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
144 | CONFIG_CLASSIC_RCU=y | 152 | CONFIG_CLASSIC_RCU=y |
153 | # CONFIG_FREEZER is not set | ||
145 | 154 | ||
146 | # | 155 | # |
147 | # Platform support | 156 | # Platform support |
148 | # | 157 | # |
149 | CONFIG_PPC_MULTIPLATFORM=y | 158 | CONFIG_PPC_MULTIPLATFORM=y |
150 | # CONFIG_PPC_82xx is not set | ||
151 | # CONFIG_PPC_83xx is not set | ||
152 | # CONFIG_PPC_86xx is not set | ||
153 | CONFIG_CLASSIC32=y | 159 | CONFIG_CLASSIC32=y |
154 | # CONFIG_PPC_CHRP is not set | 160 | # CONFIG_PPC_CHRP is not set |
155 | # CONFIG_PPC_MPC512x is not set | ||
156 | # CONFIG_PPC_MPC5121 is not set | ||
157 | # CONFIG_MPC5121_ADS is not set | 161 | # CONFIG_MPC5121_ADS is not set |
162 | # CONFIG_MPC5121_GENERIC is not set | ||
158 | CONFIG_PPC_MPC52xx=y | 163 | CONFIG_PPC_MPC52xx=y |
159 | CONFIG_PPC_MPC5200_SIMPLE=y | 164 | CONFIG_PPC_MPC5200_SIMPLE=y |
160 | # CONFIG_PPC_EFIKA is not set | 165 | # CONFIG_PPC_EFIKA is not set |
@@ -164,7 +169,10 @@ CONFIG_PPC_MPC5200_BUGFIX=y | |||
164 | # CONFIG_PPC_PMAC is not set | 169 | # CONFIG_PPC_PMAC is not set |
165 | # CONFIG_PPC_CELL is not set | 170 | # CONFIG_PPC_CELL is not set |
166 | # CONFIG_PPC_CELL_NATIVE is not set | 171 | # CONFIG_PPC_CELL_NATIVE is not set |
172 | # CONFIG_PPC_82xx is not set | ||
167 | # CONFIG_PQ2ADS is not set | 173 | # CONFIG_PQ2ADS is not set |
174 | # CONFIG_PPC_83xx is not set | ||
175 | # CONFIG_PPC_86xx is not set | ||
168 | # CONFIG_EMBEDDED6xx is not set | 176 | # CONFIG_EMBEDDED6xx is not set |
169 | # CONFIG_IPIC is not set | 177 | # CONFIG_IPIC is not set |
170 | # CONFIG_MPIC is not set | 178 | # CONFIG_MPIC is not set |
@@ -188,7 +196,6 @@ CONFIG_PPC_BESTCOMM_FEC=y | |||
188 | # Kernel options | 196 | # Kernel options |
189 | # | 197 | # |
190 | # CONFIG_HIGHMEM is not set | 198 | # CONFIG_HIGHMEM is not set |
191 | # CONFIG_TICK_ONESHOT is not set | ||
192 | # CONFIG_NO_HZ is not set | 199 | # CONFIG_NO_HZ is not set |
193 | # CONFIG_HIGH_RES_TIMERS is not set | 200 | # CONFIG_HIGH_RES_TIMERS is not set |
194 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 201 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
@@ -202,6 +209,8 @@ CONFIG_PREEMPT_NONE=y | |||
202 | # CONFIG_PREEMPT_VOLUNTARY is not set | 209 | # CONFIG_PREEMPT_VOLUNTARY is not set |
203 | # CONFIG_PREEMPT is not set | 210 | # CONFIG_PREEMPT is not set |
204 | CONFIG_BINFMT_ELF=y | 211 | CONFIG_BINFMT_ELF=y |
212 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
213 | # CONFIG_HAVE_AOUT is not set | ||
205 | # CONFIG_BINFMT_MISC is not set | 214 | # CONFIG_BINFMT_MISC is not set |
206 | # CONFIG_IOMMU_HELPER is not set | 215 | # CONFIG_IOMMU_HELPER is not set |
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 216 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -216,19 +225,20 @@ CONFIG_FLATMEM_MANUAL=y | |||
216 | # CONFIG_SPARSEMEM_MANUAL is not set | 225 | # CONFIG_SPARSEMEM_MANUAL is not set |
217 | CONFIG_FLATMEM=y | 226 | CONFIG_FLATMEM=y |
218 | CONFIG_FLAT_NODE_MEM_MAP=y | 227 | CONFIG_FLAT_NODE_MEM_MAP=y |
219 | # CONFIG_SPARSEMEM_STATIC is not set | ||
220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
221 | CONFIG_PAGEFLAGS_EXTENDED=y | 228 | CONFIG_PAGEFLAGS_EXTENDED=y |
222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
230 | CONFIG_MIGRATION=y | ||
223 | # CONFIG_RESOURCES_64BIT is not set | 231 | # CONFIG_RESOURCES_64BIT is not set |
232 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
224 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
225 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
226 | CONFIG_VIRT_TO_BUS=y | 235 | CONFIG_VIRT_TO_BUS=y |
236 | CONFIG_UNEVICTABLE_LRU=y | ||
227 | CONFIG_FORCE_MAX_ZONEORDER=11 | 237 | CONFIG_FORCE_MAX_ZONEORDER=11 |
228 | CONFIG_PROC_DEVICETREE=y | 238 | CONFIG_PROC_DEVICETREE=y |
229 | # CONFIG_CMDLINE_BOOL is not set | 239 | # CONFIG_CMDLINE_BOOL is not set |
240 | CONFIG_EXTRA_TARGETS="" | ||
230 | CONFIG_PM=y | 241 | CONFIG_PM=y |
231 | # CONFIG_PM_LEGACY is not set | ||
232 | # CONFIG_PM_DEBUG is not set | 242 | # CONFIG_PM_DEBUG is not set |
233 | CONFIG_SECCOMP=y | 243 | CONFIG_SECCOMP=y |
234 | CONFIG_ISA_DMA_API=y | 244 | CONFIG_ISA_DMA_API=y |
@@ -238,7 +248,7 @@ CONFIG_ISA_DMA_API=y | |||
238 | # | 248 | # |
239 | CONFIG_ZONE_DMA=y | 249 | CONFIG_ZONE_DMA=y |
240 | CONFIG_GENERIC_ISA_DMA=y | 250 | CONFIG_GENERIC_ISA_DMA=y |
241 | CONFIG_FSL_SOC=y | 251 | CONFIG_PPC_PCI_CHOICE=y |
242 | # CONFIG_PCI is not set | 252 | # CONFIG_PCI is not set |
243 | # CONFIG_PCI_DOMAINS is not set | 253 | # CONFIG_PCI_DOMAINS is not set |
244 | # CONFIG_PCI_SYSCALL is not set | 254 | # CONFIG_PCI_SYSCALL is not set |
@@ -259,10 +269,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
259 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | 270 | CONFIG_PHYSICAL_START=0x00000000 |
261 | CONFIG_TASK_SIZE=0xc0000000 | 271 | CONFIG_TASK_SIZE=0xc0000000 |
262 | |||
263 | # | ||
264 | # Networking | ||
265 | # | ||
266 | CONFIG_NET=y | 272 | CONFIG_NET=y |
267 | 273 | ||
268 | # | 274 | # |
@@ -313,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
313 | # CONFIG_TIPC is not set | 319 | # CONFIG_TIPC is not set |
314 | # CONFIG_ATM is not set | 320 | # CONFIG_ATM is not set |
315 | # CONFIG_BRIDGE is not set | 321 | # CONFIG_BRIDGE is not set |
322 | # CONFIG_NET_DSA is not set | ||
316 | # CONFIG_VLAN_8021Q is not set | 323 | # CONFIG_VLAN_8021Q is not set |
317 | # CONFIG_DECNET is not set | 324 | # CONFIG_DECNET is not set |
318 | # CONFIG_LLC2 is not set | 325 | # CONFIG_LLC2 is not set |
@@ -333,14 +340,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
333 | # CONFIG_IRDA is not set | 340 | # CONFIG_IRDA is not set |
334 | # CONFIG_BT is not set | 341 | # CONFIG_BT is not set |
335 | # CONFIG_AF_RXRPC is not set | 342 | # CONFIG_AF_RXRPC is not set |
336 | 343 | # CONFIG_PHONET is not set | |
337 | # | 344 | # CONFIG_WIRELESS is not set |
338 | # Wireless | ||
339 | # | ||
340 | # CONFIG_CFG80211 is not set | ||
341 | # CONFIG_WIRELESS_EXT is not set | ||
342 | # CONFIG_MAC80211 is not set | ||
343 | # CONFIG_IEEE80211 is not set | ||
344 | # CONFIG_RFKILL is not set | 345 | # CONFIG_RFKILL is not set |
345 | # CONFIG_NET_9P is not set | 346 | # CONFIG_NET_9P is not set |
346 | 347 | ||
@@ -451,6 +452,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
451 | # CONFIG_BLK_DEV_XIP is not set | 452 | # CONFIG_BLK_DEV_XIP is not set |
452 | # CONFIG_CDROM_PKTCDVD is not set | 453 | # CONFIG_CDROM_PKTCDVD is not set |
453 | # CONFIG_ATA_OVER_ETH is not set | 454 | # CONFIG_ATA_OVER_ETH is not set |
455 | # CONFIG_BLK_DEV_HD is not set | ||
454 | # CONFIG_MISC_DEVICES is not set | 456 | # CONFIG_MISC_DEVICES is not set |
455 | CONFIG_HAVE_IDE=y | 457 | CONFIG_HAVE_IDE=y |
456 | # CONFIG_IDE is not set | 458 | # CONFIG_IDE is not set |
@@ -495,10 +497,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
495 | CONFIG_SCSI_LOWLEVEL=y | 497 | CONFIG_SCSI_LOWLEVEL=y |
496 | # CONFIG_ISCSI_TCP is not set | 498 | # CONFIG_ISCSI_TCP is not set |
497 | # CONFIG_SCSI_DEBUG is not set | 499 | # CONFIG_SCSI_DEBUG is not set |
500 | # CONFIG_SCSI_DH is not set | ||
498 | CONFIG_ATA=y | 501 | CONFIG_ATA=y |
499 | # CONFIG_ATA_NONSTANDARD is not set | 502 | # CONFIG_ATA_NONSTANDARD is not set |
500 | CONFIG_SATA_PMP=y | 503 | CONFIG_SATA_PMP=y |
501 | # CONFIG_SATA_FSL is not set | ||
502 | CONFIG_ATA_SFF=y | 504 | CONFIG_ATA_SFF=y |
503 | # CONFIG_SATA_MV is not set | 505 | # CONFIG_SATA_MV is not set |
504 | CONFIG_PATA_MPC52xx=y | 506 | CONFIG_PATA_MPC52xx=y |
@@ -507,7 +509,6 @@ CONFIG_PATA_PLATFORM=y | |||
507 | # CONFIG_MD is not set | 509 | # CONFIG_MD is not set |
508 | # CONFIG_MACINTOSH_DRIVERS is not set | 510 | # CONFIG_MACINTOSH_DRIVERS is not set |
509 | CONFIG_NETDEVICES=y | 511 | CONFIG_NETDEVICES=y |
510 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
511 | # CONFIG_DUMMY is not set | 512 | # CONFIG_DUMMY is not set |
512 | # CONFIG_BONDING is not set | 513 | # CONFIG_BONDING is not set |
513 | # CONFIG_MACVLAN is not set | 514 | # CONFIG_MACVLAN is not set |
@@ -537,6 +538,9 @@ CONFIG_NET_ETHERNET=y | |||
537 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 538 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
538 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 539 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
539 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 540 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
541 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
542 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
543 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
540 | # CONFIG_B44 is not set | 544 | # CONFIG_B44 is not set |
541 | CONFIG_FEC_MPC52xx=y | 545 | CONFIG_FEC_MPC52xx=y |
542 | CONFIG_FEC_MPC52xx_MDIO=y | 546 | CONFIG_FEC_MPC52xx_MDIO=y |
@@ -548,7 +552,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
548 | # | 552 | # |
549 | # CONFIG_WLAN_PRE80211 is not set | 553 | # CONFIG_WLAN_PRE80211 is not set |
550 | # CONFIG_WLAN_80211 is not set | 554 | # CONFIG_WLAN_80211 is not set |
551 | # CONFIG_IWLWIFI is not set | ||
552 | # CONFIG_IWLWIFI_LEDS is not set | 555 | # CONFIG_IWLWIFI_LEDS is not set |
553 | 556 | ||
554 | # | 557 | # |
@@ -583,6 +586,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
583 | # Character devices | 586 | # Character devices |
584 | # | 587 | # |
585 | # CONFIG_VT is not set | 588 | # CONFIG_VT is not set |
589 | CONFIG_DEVKMEM=y | ||
586 | # CONFIG_SERIAL_NONSTANDARD is not set | 590 | # CONFIG_SERIAL_NONSTANDARD is not set |
587 | 591 | ||
588 | # | 592 | # |
@@ -611,26 +615,41 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
611 | CONFIG_I2C=y | 615 | CONFIG_I2C=y |
612 | CONFIG_I2C_BOARDINFO=y | 616 | CONFIG_I2C_BOARDINFO=y |
613 | CONFIG_I2C_CHARDEV=y | 617 | CONFIG_I2C_CHARDEV=y |
618 | CONFIG_I2C_HELPER_AUTO=y | ||
614 | 619 | ||
615 | # | 620 | # |
616 | # I2C Hardware Bus support | 621 | # I2C Hardware Bus support |
617 | # | 622 | # |
623 | |||
624 | # | ||
625 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
626 | # | ||
618 | CONFIG_I2C_MPC=y | 627 | CONFIG_I2C_MPC=y |
619 | # CONFIG_I2C_OCORES is not set | 628 | # CONFIG_I2C_OCORES is not set |
620 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
621 | # CONFIG_I2C_SIMTEC is not set | 629 | # CONFIG_I2C_SIMTEC is not set |
630 | |||
631 | # | ||
632 | # External I2C/SMBus adapter drivers | ||
633 | # | ||
634 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
622 | # CONFIG_I2C_TAOS_EVM is not set | 635 | # CONFIG_I2C_TAOS_EVM is not set |
623 | # CONFIG_I2C_STUB is not set | ||
624 | # CONFIG_I2C_TINY_USB is not set | 636 | # CONFIG_I2C_TINY_USB is not set |
637 | |||
638 | # | ||
639 | # Other I2C/SMBus bus drivers | ||
640 | # | ||
625 | # CONFIG_I2C_PCA_PLATFORM is not set | 641 | # CONFIG_I2C_PCA_PLATFORM is not set |
642 | # CONFIG_I2C_STUB is not set | ||
626 | 643 | ||
627 | # | 644 | # |
628 | # Miscellaneous I2C Chip support | 645 | # Miscellaneous I2C Chip support |
629 | # | 646 | # |
630 | # CONFIG_DS1682 is not set | 647 | # CONFIG_DS1682 is not set |
648 | # CONFIG_AT24 is not set | ||
631 | # CONFIG_SENSORS_EEPROM is not set | 649 | # CONFIG_SENSORS_EEPROM is not set |
632 | # CONFIG_SENSORS_PCF8574 is not set | 650 | # CONFIG_SENSORS_PCF8574 is not set |
633 | # CONFIG_PCF8575 is not set | 651 | # CONFIG_PCF8575 is not set |
652 | # CONFIG_SENSORS_PCA9539 is not set | ||
634 | # CONFIG_SENSORS_PCF8591 is not set | 653 | # CONFIG_SENSORS_PCF8591 is not set |
635 | # CONFIG_SENSORS_MAX6875 is not set | 654 | # CONFIG_SENSORS_MAX6875 is not set |
636 | # CONFIG_SENSORS_TSL2550 is not set | 655 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -639,10 +658,13 @@ CONFIG_I2C_MPC=y | |||
639 | # CONFIG_I2C_DEBUG_BUS is not set | 658 | # CONFIG_I2C_DEBUG_BUS is not set |
640 | # CONFIG_I2C_DEBUG_CHIP is not set | 659 | # CONFIG_I2C_DEBUG_CHIP is not set |
641 | # CONFIG_SPI is not set | 660 | # CONFIG_SPI is not set |
661 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
662 | # CONFIG_GPIOLIB is not set | ||
642 | # CONFIG_W1 is not set | 663 | # CONFIG_W1 is not set |
643 | # CONFIG_POWER_SUPPLY is not set | 664 | # CONFIG_POWER_SUPPLY is not set |
644 | CONFIG_HWMON=y | 665 | CONFIG_HWMON=y |
645 | # CONFIG_HWMON_VID is not set | 666 | # CONFIG_HWMON_VID is not set |
667 | # CONFIG_SENSORS_AD7414 is not set | ||
646 | # CONFIG_SENSORS_AD7418 is not set | 668 | # CONFIG_SENSORS_AD7418 is not set |
647 | # CONFIG_SENSORS_ADM1021 is not set | 669 | # CONFIG_SENSORS_ADM1021 is not set |
648 | # CONFIG_SENSORS_ADM1025 is not set | 670 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -650,6 +672,7 @@ CONFIG_HWMON=y | |||
650 | # CONFIG_SENSORS_ADM1029 is not set | 672 | # CONFIG_SENSORS_ADM1029 is not set |
651 | # CONFIG_SENSORS_ADM1031 is not set | 673 | # CONFIG_SENSORS_ADM1031 is not set |
652 | # CONFIG_SENSORS_ADM9240 is not set | 674 | # CONFIG_SENSORS_ADM9240 is not set |
675 | # CONFIG_SENSORS_ADT7462 is not set | ||
653 | # CONFIG_SENSORS_ADT7470 is not set | 676 | # CONFIG_SENSORS_ADT7470 is not set |
654 | # CONFIG_SENSORS_ADT7473 is not set | 677 | # CONFIG_SENSORS_ADT7473 is not set |
655 | # CONFIG_SENSORS_ATXP1 is not set | 678 | # CONFIG_SENSORS_ATXP1 is not set |
@@ -692,6 +715,7 @@ CONFIG_HWMON=y | |||
692 | # CONFIG_SENSORS_W83627EHF is not set | 715 | # CONFIG_SENSORS_W83627EHF is not set |
693 | # CONFIG_HWMON_DEBUG_CHIP is not set | 716 | # CONFIG_HWMON_DEBUG_CHIP is not set |
694 | # CONFIG_THERMAL is not set | 717 | # CONFIG_THERMAL is not set |
718 | # CONFIG_THERMAL_HWMON is not set | ||
695 | CONFIG_WATCHDOG=y | 719 | CONFIG_WATCHDOG=y |
696 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 720 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
697 | 721 | ||
@@ -705,24 +729,39 @@ CONFIG_WATCHDOG=y | |||
705 | # USB-based Watchdog Cards | 729 | # USB-based Watchdog Cards |
706 | # | 730 | # |
707 | # CONFIG_USBPCWATCHDOG is not set | 731 | # CONFIG_USBPCWATCHDOG is not set |
732 | CONFIG_SSB_POSSIBLE=y | ||
708 | 733 | ||
709 | # | 734 | # |
710 | # Sonics Silicon Backplane | 735 | # Sonics Silicon Backplane |
711 | # | 736 | # |
712 | CONFIG_SSB_POSSIBLE=y | ||
713 | # CONFIG_SSB is not set | 737 | # CONFIG_SSB is not set |
714 | 738 | ||
715 | # | 739 | # |
716 | # Multifunction device drivers | 740 | # Multifunction device drivers |
717 | # | 741 | # |
742 | # CONFIG_MFD_CORE is not set | ||
718 | # CONFIG_MFD_SM501 is not set | 743 | # CONFIG_MFD_SM501 is not set |
719 | # CONFIG_HTC_PASIC3 is not set | 744 | # CONFIG_HTC_PASIC3 is not set |
745 | # CONFIG_MFD_TMIO is not set | ||
746 | # CONFIG_PMIC_DA903X is not set | ||
747 | # CONFIG_MFD_WM8400 is not set | ||
748 | # CONFIG_MFD_WM8350_I2C is not set | ||
749 | # CONFIG_REGULATOR is not set | ||
720 | 750 | ||
721 | # | 751 | # |
722 | # Multimedia devices | 752 | # Multimedia devices |
723 | # | 753 | # |
754 | |||
755 | # | ||
756 | # Multimedia core support | ||
757 | # | ||
724 | # CONFIG_VIDEO_DEV is not set | 758 | # CONFIG_VIDEO_DEV is not set |
725 | # CONFIG_DVB_CORE is not set | 759 | # CONFIG_DVB_CORE is not set |
760 | # CONFIG_VIDEO_MEDIA is not set | ||
761 | |||
762 | # | ||
763 | # Multimedia drivers | ||
764 | # | ||
726 | # CONFIG_DAB is not set | 765 | # CONFIG_DAB is not set |
727 | 766 | ||
728 | # | 767 | # |
@@ -737,10 +776,6 @@ CONFIG_SSB_POSSIBLE=y | |||
737 | # Display device support | 776 | # Display device support |
738 | # | 777 | # |
739 | # CONFIG_DISPLAY_SUPPORT is not set | 778 | # CONFIG_DISPLAY_SUPPORT is not set |
740 | |||
741 | # | ||
742 | # Sound | ||
743 | # | ||
744 | # CONFIG_SOUND is not set | 779 | # CONFIG_SOUND is not set |
745 | CONFIG_USB_SUPPORT=y | 780 | CONFIG_USB_SUPPORT=y |
746 | CONFIG_USB_ARCH_HAS_HCD=y | 781 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -760,11 +795,16 @@ CONFIG_USB_DEVICEFS=y | |||
760 | # CONFIG_USB_OTG is not set | 795 | # CONFIG_USB_OTG is not set |
761 | # CONFIG_USB_OTG_WHITELIST is not set | 796 | # CONFIG_USB_OTG_WHITELIST is not set |
762 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 797 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
798 | CONFIG_USB_MON=y | ||
799 | # CONFIG_USB_WUSB is not set | ||
800 | # CONFIG_USB_WUSB_CBAF is not set | ||
763 | 801 | ||
764 | # | 802 | # |
765 | # USB Host Controller Drivers | 803 | # USB Host Controller Drivers |
766 | # | 804 | # |
805 | # CONFIG_USB_C67X00_HCD is not set | ||
767 | # CONFIG_USB_ISP116X_HCD is not set | 806 | # CONFIG_USB_ISP116X_HCD is not set |
807 | # CONFIG_USB_ISP1760_HCD is not set | ||
768 | CONFIG_USB_OHCI_HCD=y | 808 | CONFIG_USB_OHCI_HCD=y |
769 | CONFIG_USB_OHCI_HCD_PPC_SOC=y | 809 | CONFIG_USB_OHCI_HCD_PPC_SOC=y |
770 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 810 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
@@ -775,12 +815,16 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
775 | # CONFIG_USB_OHCI_LITTLE_ENDIAN is not set | 815 | # CONFIG_USB_OHCI_LITTLE_ENDIAN is not set |
776 | # CONFIG_USB_SL811_HCD is not set | 816 | # CONFIG_USB_SL811_HCD is not set |
777 | # CONFIG_USB_R8A66597_HCD is not set | 817 | # CONFIG_USB_R8A66597_HCD is not set |
818 | # CONFIG_USB_HWA_HCD is not set | ||
819 | # CONFIG_USB_MUSB_HDRC is not set | ||
778 | 820 | ||
779 | # | 821 | # |
780 | # USB Device Class drivers | 822 | # USB Device Class drivers |
781 | # | 823 | # |
782 | # CONFIG_USB_ACM is not set | 824 | # CONFIG_USB_ACM is not set |
783 | # CONFIG_USB_PRINTER is not set | 825 | # CONFIG_USB_PRINTER is not set |
826 | # CONFIG_USB_WDM is not set | ||
827 | # CONFIG_USB_TMC is not set | ||
784 | 828 | ||
785 | # | 829 | # |
786 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 830 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -809,7 +853,6 @@ CONFIG_USB_STORAGE=y | |||
809 | # | 853 | # |
810 | # CONFIG_USB_MDC800 is not set | 854 | # CONFIG_USB_MDC800 is not set |
811 | # CONFIG_USB_MICROTEK is not set | 855 | # CONFIG_USB_MICROTEK is not set |
812 | CONFIG_USB_MON=y | ||
813 | 856 | ||
814 | # | 857 | # |
815 | # USB port drivers | 858 | # USB port drivers |
@@ -822,7 +865,7 @@ CONFIG_USB_MON=y | |||
822 | # CONFIG_USB_EMI62 is not set | 865 | # CONFIG_USB_EMI62 is not set |
823 | # CONFIG_USB_EMI26 is not set | 866 | # CONFIG_USB_EMI26 is not set |
824 | # CONFIG_USB_ADUTUX is not set | 867 | # CONFIG_USB_ADUTUX is not set |
825 | # CONFIG_USB_AUERSWALD is not set | 868 | # CONFIG_USB_SEVSEG is not set |
826 | # CONFIG_USB_RIO500 is not set | 869 | # CONFIG_USB_RIO500 is not set |
827 | # CONFIG_USB_LEGOTOWER is not set | 870 | # CONFIG_USB_LEGOTOWER is not set |
828 | # CONFIG_USB_LCD is not set | 871 | # CONFIG_USB_LCD is not set |
@@ -838,10 +881,13 @@ CONFIG_USB_MON=y | |||
838 | # CONFIG_USB_TRANCEVIBRATOR is not set | 881 | # CONFIG_USB_TRANCEVIBRATOR is not set |
839 | # CONFIG_USB_IOWARRIOR is not set | 882 | # CONFIG_USB_IOWARRIOR is not set |
840 | # CONFIG_USB_TEST is not set | 883 | # CONFIG_USB_TEST is not set |
884 | # CONFIG_USB_ISIGHTFW is not set | ||
885 | # CONFIG_USB_VST is not set | ||
841 | # CONFIG_USB_GADGET is not set | 886 | # CONFIG_USB_GADGET is not set |
842 | # CONFIG_MMC is not set | 887 | # CONFIG_MMC is not set |
843 | # CONFIG_MEMSTICK is not set | 888 | # CONFIG_MEMSTICK is not set |
844 | # CONFIG_NEW_LEDS is not set | 889 | # CONFIG_NEW_LEDS is not set |
890 | # CONFIG_ACCESSIBILITY is not set | ||
845 | # CONFIG_EDAC is not set | 891 | # CONFIG_EDAC is not set |
846 | CONFIG_RTC_LIB=y | 892 | CONFIG_RTC_LIB=y |
847 | CONFIG_RTC_CLASS=y | 893 | CONFIG_RTC_CLASS=y |
@@ -872,6 +918,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
872 | # CONFIG_RTC_DRV_PCF8583 is not set | 918 | # CONFIG_RTC_DRV_PCF8583 is not set |
873 | # CONFIG_RTC_DRV_M41T80 is not set | 919 | # CONFIG_RTC_DRV_M41T80 is not set |
874 | # CONFIG_RTC_DRV_S35390A is not set | 920 | # CONFIG_RTC_DRV_S35390A is not set |
921 | # CONFIG_RTC_DRV_FM3130 is not set | ||
922 | # CONFIG_RTC_DRV_RX8581 is not set | ||
875 | 923 | ||
876 | # | 924 | # |
877 | # SPI RTC drivers | 925 | # SPI RTC drivers |
@@ -881,19 +929,25 @@ CONFIG_RTC_DRV_DS1307=y | |||
881 | # Platform RTC drivers | 929 | # Platform RTC drivers |
882 | # | 930 | # |
883 | # CONFIG_RTC_DRV_CMOS is not set | 931 | # CONFIG_RTC_DRV_CMOS is not set |
932 | # CONFIG_RTC_DRV_DS1286 is not set | ||
884 | # CONFIG_RTC_DRV_DS1511 is not set | 933 | # CONFIG_RTC_DRV_DS1511 is not set |
885 | # CONFIG_RTC_DRV_DS1553 is not set | 934 | # CONFIG_RTC_DRV_DS1553 is not set |
886 | # CONFIG_RTC_DRV_DS1742 is not set | 935 | # CONFIG_RTC_DRV_DS1742 is not set |
887 | # CONFIG_RTC_DRV_STK17TA8 is not set | 936 | # CONFIG_RTC_DRV_STK17TA8 is not set |
888 | # CONFIG_RTC_DRV_M48T86 is not set | 937 | # CONFIG_RTC_DRV_M48T86 is not set |
938 | # CONFIG_RTC_DRV_M48T35 is not set | ||
889 | # CONFIG_RTC_DRV_M48T59 is not set | 939 | # CONFIG_RTC_DRV_M48T59 is not set |
940 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
890 | # CONFIG_RTC_DRV_V3020 is not set | 941 | # CONFIG_RTC_DRV_V3020 is not set |
891 | 942 | ||
892 | # | 943 | # |
893 | # on-CPU RTC drivers | 944 | # on-CPU RTC drivers |
894 | # | 945 | # |
946 | # CONFIG_RTC_DRV_PPC is not set | ||
895 | # CONFIG_DMADEVICES is not set | 947 | # CONFIG_DMADEVICES is not set |
896 | # CONFIG_UIO is not set | 948 | # CONFIG_UIO is not set |
949 | # CONFIG_STAGING is not set | ||
950 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
897 | 951 | ||
898 | # | 952 | # |
899 | # File systems | 953 | # File systems |
@@ -905,12 +959,13 @@ CONFIG_EXT3_FS=y | |||
905 | CONFIG_EXT3_FS_XATTR=y | 959 | CONFIG_EXT3_FS_XATTR=y |
906 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 960 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
907 | # CONFIG_EXT3_FS_SECURITY is not set | 961 | # CONFIG_EXT3_FS_SECURITY is not set |
908 | # CONFIG_EXT4DEV_FS is not set | 962 | # CONFIG_EXT4_FS is not set |
909 | CONFIG_JBD=y | 963 | CONFIG_JBD=y |
910 | CONFIG_FS_MBCACHE=y | 964 | CONFIG_FS_MBCACHE=y |
911 | # CONFIG_REISERFS_FS is not set | 965 | # CONFIG_REISERFS_FS is not set |
912 | # CONFIG_JFS_FS is not set | 966 | # CONFIG_JFS_FS is not set |
913 | # CONFIG_FS_POSIX_ACL is not set | 967 | # CONFIG_FS_POSIX_ACL is not set |
968 | CONFIG_FILE_LOCKING=y | ||
914 | # CONFIG_XFS_FS is not set | 969 | # CONFIG_XFS_FS is not set |
915 | # CONFIG_OCFS2_FS is not set | 970 | # CONFIG_OCFS2_FS is not set |
916 | CONFIG_DNOTIFY=y | 971 | CONFIG_DNOTIFY=y |
@@ -943,6 +998,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
943 | CONFIG_PROC_FS=y | 998 | CONFIG_PROC_FS=y |
944 | CONFIG_PROC_KCORE=y | 999 | CONFIG_PROC_KCORE=y |
945 | CONFIG_PROC_SYSCTL=y | 1000 | CONFIG_PROC_SYSCTL=y |
1001 | CONFIG_PROC_PAGE_MONITOR=y | ||
946 | CONFIG_SYSFS=y | 1002 | CONFIG_SYSFS=y |
947 | CONFIG_TMPFS=y | 1003 | CONFIG_TMPFS=y |
948 | # CONFIG_TMPFS_POSIX_ACL is not set | 1004 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -973,6 +1029,7 @@ CONFIG_JFFS2_RTIME=y | |||
973 | CONFIG_CRAMFS=y | 1029 | CONFIG_CRAMFS=y |
974 | # CONFIG_VXFS_FS is not set | 1030 | # CONFIG_VXFS_FS is not set |
975 | # CONFIG_MINIX_FS is not set | 1031 | # CONFIG_MINIX_FS is not set |
1032 | # CONFIG_OMFS_FS is not set | ||
976 | # CONFIG_HPFS_FS is not set | 1033 | # CONFIG_HPFS_FS is not set |
977 | # CONFIG_QNX4FS_FS is not set | 1034 | # CONFIG_QNX4FS_FS is not set |
978 | # CONFIG_ROMFS_FS is not set | 1035 | # CONFIG_ROMFS_FS is not set |
@@ -983,14 +1040,14 @@ CONFIG_NFS_FS=y | |||
983 | CONFIG_NFS_V3=y | 1040 | CONFIG_NFS_V3=y |
984 | # CONFIG_NFS_V3_ACL is not set | 1041 | # CONFIG_NFS_V3_ACL is not set |
985 | CONFIG_NFS_V4=y | 1042 | CONFIG_NFS_V4=y |
986 | # CONFIG_NFSD is not set | ||
987 | CONFIG_ROOT_NFS=y | 1043 | CONFIG_ROOT_NFS=y |
1044 | # CONFIG_NFSD is not set | ||
988 | CONFIG_LOCKD=y | 1045 | CONFIG_LOCKD=y |
989 | CONFIG_LOCKD_V4=y | 1046 | CONFIG_LOCKD_V4=y |
990 | CONFIG_NFS_COMMON=y | 1047 | CONFIG_NFS_COMMON=y |
991 | CONFIG_SUNRPC=y | 1048 | CONFIG_SUNRPC=y |
992 | CONFIG_SUNRPC_GSS=y | 1049 | CONFIG_SUNRPC_GSS=y |
993 | # CONFIG_SUNRPC_BIND34 is not set | 1050 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
994 | CONFIG_RPCSEC_GSS_KRB5=y | 1051 | CONFIG_RPCSEC_GSS_KRB5=y |
995 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1052 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
996 | # CONFIG_SMB_FS is not set | 1053 | # CONFIG_SMB_FS is not set |
@@ -1066,9 +1123,9 @@ CONFIG_NLS_ISO8859_1=y | |||
1066 | # Library routines | 1123 | # Library routines |
1067 | # | 1124 | # |
1068 | CONFIG_BITREVERSE=y | 1125 | CONFIG_BITREVERSE=y |
1069 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1070 | # CONFIG_CRC_CCITT is not set | 1126 | # CONFIG_CRC_CCITT is not set |
1071 | # CONFIG_CRC16 is not set | 1127 | # CONFIG_CRC16 is not set |
1128 | # CONFIG_CRC_T10DIF is not set | ||
1072 | # CONFIG_CRC_ITU_T is not set | 1129 | # CONFIG_CRC_ITU_T is not set |
1073 | CONFIG_CRC32=y | 1130 | CONFIG_CRC32=y |
1074 | # CONFIG_CRC7 is not set | 1131 | # CONFIG_CRC7 is not set |
@@ -1095,9 +1152,12 @@ CONFIG_FRAME_WARN=1024 | |||
1095 | CONFIG_DEBUG_KERNEL=y | 1152 | CONFIG_DEBUG_KERNEL=y |
1096 | # CONFIG_DEBUG_SHIRQ is not set | 1153 | # CONFIG_DEBUG_SHIRQ is not set |
1097 | CONFIG_DETECT_SOFTLOCKUP=y | 1154 | CONFIG_DETECT_SOFTLOCKUP=y |
1155 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1156 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1098 | CONFIG_SCHED_DEBUG=y | 1157 | CONFIG_SCHED_DEBUG=y |
1099 | # CONFIG_SCHEDSTATS is not set | 1158 | # CONFIG_SCHEDSTATS is not set |
1100 | # CONFIG_TIMER_STATS is not set | 1159 | # CONFIG_TIMER_STATS is not set |
1160 | # CONFIG_DEBUG_OBJECTS is not set | ||
1101 | # CONFIG_SLUB_DEBUG_ON is not set | 1161 | # CONFIG_SLUB_DEBUG_ON is not set |
1102 | # CONFIG_SLUB_STATS is not set | 1162 | # CONFIG_SLUB_STATS is not set |
1103 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1163 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1111,17 +1171,37 @@ CONFIG_SCHED_DEBUG=y | |||
1111 | CONFIG_DEBUG_INFO=y | 1171 | CONFIG_DEBUG_INFO=y |
1112 | # CONFIG_DEBUG_VM is not set | 1172 | # CONFIG_DEBUG_VM is not set |
1113 | # CONFIG_DEBUG_WRITECOUNT is not set | 1173 | # CONFIG_DEBUG_WRITECOUNT is not set |
1174 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1114 | # CONFIG_DEBUG_LIST is not set | 1175 | # CONFIG_DEBUG_LIST is not set |
1115 | # CONFIG_DEBUG_SG is not set | 1176 | # CONFIG_DEBUG_SG is not set |
1116 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1177 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1117 | # CONFIG_RCU_TORTURE_TEST is not set | 1178 | # CONFIG_RCU_TORTURE_TEST is not set |
1179 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1118 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1180 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1181 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1119 | # CONFIG_FAULT_INJECTION is not set | 1182 | # CONFIG_FAULT_INJECTION is not set |
1183 | # CONFIG_LATENCYTOP is not set | ||
1184 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1185 | |||
1186 | # | ||
1187 | # Tracers | ||
1188 | # | ||
1189 | # CONFIG_FUNCTION_TRACER is not set | ||
1190 | # CONFIG_SCHED_TRACER is not set | ||
1191 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1192 | # CONFIG_BOOT_TRACER is not set | ||
1193 | # CONFIG_STACK_TRACER is not set | ||
1194 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1120 | # CONFIG_SAMPLES is not set | 1195 | # CONFIG_SAMPLES is not set |
1196 | CONFIG_HAVE_ARCH_KGDB=y | ||
1197 | # CONFIG_KGDB is not set | ||
1121 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1198 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1122 | # CONFIG_DEBUG_STACK_USAGE is not set | 1199 | # CONFIG_DEBUG_STACK_USAGE is not set |
1123 | # CONFIG_DEBUG_PAGEALLOC is not set | 1200 | # CONFIG_DEBUG_PAGEALLOC is not set |
1124 | # CONFIG_DEBUGGER is not set | 1201 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1202 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1203 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1204 | # CONFIG_XMON is not set | ||
1125 | # CONFIG_IRQSTACKS is not set | 1205 | # CONFIG_IRQSTACKS is not set |
1126 | # CONFIG_BDI_SWITCH is not set | 1206 | # CONFIG_BDI_SWITCH is not set |
1127 | # CONFIG_BOOTX_TEXT is not set | 1207 | # CONFIG_BOOTX_TEXT is not set |
@@ -1132,14 +1212,19 @@ CONFIG_DEBUG_INFO=y | |||
1132 | # | 1212 | # |
1133 | # CONFIG_KEYS is not set | 1213 | # CONFIG_KEYS is not set |
1134 | # CONFIG_SECURITY is not set | 1214 | # CONFIG_SECURITY is not set |
1215 | # CONFIG_SECURITYFS is not set | ||
1135 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1216 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1136 | CONFIG_CRYPTO=y | 1217 | CONFIG_CRYPTO=y |
1137 | 1218 | ||
1138 | # | 1219 | # |
1139 | # Crypto core or helper | 1220 | # Crypto core or helper |
1140 | # | 1221 | # |
1222 | # CONFIG_CRYPTO_FIPS is not set | ||
1141 | CONFIG_CRYPTO_ALGAPI=y | 1223 | CONFIG_CRYPTO_ALGAPI=y |
1224 | CONFIG_CRYPTO_AEAD=y | ||
1142 | CONFIG_CRYPTO_BLKCIPHER=y | 1225 | CONFIG_CRYPTO_BLKCIPHER=y |
1226 | CONFIG_CRYPTO_HASH=y | ||
1227 | CONFIG_CRYPTO_RNG=y | ||
1143 | CONFIG_CRYPTO_MANAGER=y | 1228 | CONFIG_CRYPTO_MANAGER=y |
1144 | # CONFIG_CRYPTO_GF128MUL is not set | 1229 | # CONFIG_CRYPTO_GF128MUL is not set |
1145 | # CONFIG_CRYPTO_NULL is not set | 1230 | # CONFIG_CRYPTO_NULL is not set |
@@ -1178,6 +1263,10 @@ CONFIG_CRYPTO_PCBC=y | |||
1178 | # CONFIG_CRYPTO_MD4 is not set | 1263 | # CONFIG_CRYPTO_MD4 is not set |
1179 | CONFIG_CRYPTO_MD5=y | 1264 | CONFIG_CRYPTO_MD5=y |
1180 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1265 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1266 | # CONFIG_CRYPTO_RMD128 is not set | ||
1267 | # CONFIG_CRYPTO_RMD160 is not set | ||
1268 | # CONFIG_CRYPTO_RMD256 is not set | ||
1269 | # CONFIG_CRYPTO_RMD320 is not set | ||
1181 | # CONFIG_CRYPTO_SHA1 is not set | 1270 | # CONFIG_CRYPTO_SHA1 is not set |
1182 | # CONFIG_CRYPTO_SHA256 is not set | 1271 | # CONFIG_CRYPTO_SHA256 is not set |
1183 | # CONFIG_CRYPTO_SHA512 is not set | 1272 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1208,6 +1297,11 @@ CONFIG_CRYPTO_DES=y | |||
1208 | # | 1297 | # |
1209 | # CONFIG_CRYPTO_DEFLATE is not set | 1298 | # CONFIG_CRYPTO_DEFLATE is not set |
1210 | # CONFIG_CRYPTO_LZO is not set | 1299 | # CONFIG_CRYPTO_LZO is not set |
1300 | |||
1301 | # | ||
1302 | # Random Number Generation | ||
1303 | # | ||
1304 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1211 | CONFIG_CRYPTO_HW=y | 1305 | CONFIG_CRYPTO_HW=y |
1212 | CONFIG_PPC_CLOCK=y | 1306 | CONFIG_PPC_CLOCK=y |
1213 | CONFIG_PPC_LIB_RHEAP=y | 1307 | CONFIG_PPC_LIB_RHEAP=y |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index e55ff7c47a36..07a674f5344e 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
@@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y | |||
723 | # CONFIG_BROADCOM_PHY is not set | 723 | # CONFIG_BROADCOM_PHY is not set |
724 | # CONFIG_ICPLUS_PHY is not set | 724 | # CONFIG_ICPLUS_PHY is not set |
725 | # CONFIG_REALTEK_PHY is not set | 725 | # CONFIG_REALTEK_PHY is not set |
726 | # CONFIG_FIXED_PHY is not set | 726 | CONFIG_FIXED_PHY=y |
727 | # CONFIG_MDIO_BITBANG is not set | 727 | # CONFIG_MDIO_BITBANG is not set |
728 | # CONFIG_NET_ETHERNET is not set | 728 | # CONFIG_NET_ETHERNET is not set |
729 | CONFIG_NETDEV_1000=y | 729 | CONFIG_NETDEV_1000=y |
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig index 2da13e00a807..07ccaf89f379 100644 --- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig | |||
@@ -838,7 +838,7 @@ CONFIG_PHYLIB=y | |||
838 | # | 838 | # |
839 | # MII PHY device drivers | 839 | # MII PHY device drivers |
840 | # | 840 | # |
841 | CONFIG_MARVELL_PHY=y | 841 | # CONFIG_MARVELL_PHY is not set |
842 | # CONFIG_DAVICOM_PHY is not set | 842 | # CONFIG_DAVICOM_PHY is not set |
843 | # CONFIG_QSEMI_PHY is not set | 843 | # CONFIG_QSEMI_PHY is not set |
844 | # CONFIG_LXT_PHY is not set | 844 | # CONFIG_LXT_PHY is not set |
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index 740c9f2b7de6..15c5604d0b26 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.24-rc6 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Fri Jan 18 14:19:54 2008 | 4 | # Thu Nov 13 02:09:07 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -22,14 +22,18 @@ CONFIG_PPC_STD_MMU_32=y | |||
22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
29 | CONFIG_GENERIC_TIME_VSYSCALL=y | 29 | CONFIG_GENERIC_TIME_VSYSCALL=y |
30 | CONFIG_GENERIC_CLOCKEVENTS=y | 30 | CONFIG_GENERIC_CLOCKEVENTS=y |
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | ||
32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -47,7 +51,8 @@ CONFIG_OF=y | |||
47 | # CONFIG_GENERIC_TBSYNC is not set | 51 | # CONFIG_GENERIC_TBSYNC is not set |
48 | CONFIG_AUDIT_ARCH=y | 52 | CONFIG_AUDIT_ARCH=y |
49 | CONFIG_GENERIC_BUG=y | 53 | CONFIG_GENERIC_BUG=y |
50 | # CONFIG_DEFAULT_UIMAGE is not set | 54 | CONFIG_DEFAULT_UIMAGE=y |
55 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
51 | # CONFIG_PPC_DCR_NATIVE is not set | 56 | # CONFIG_PPC_DCR_NATIVE is not set |
52 | # CONFIG_PPC_DCR_MMIO is not set | 57 | # CONFIG_PPC_DCR_MMIO is not set |
53 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 58 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -66,17 +71,15 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
66 | # CONFIG_POSIX_MQUEUE is not set | 71 | # CONFIG_POSIX_MQUEUE is not set |
67 | # CONFIG_BSD_PROCESS_ACCT is not set | 72 | # CONFIG_BSD_PROCESS_ACCT is not set |
68 | # CONFIG_TASKSTATS is not set | 73 | # CONFIG_TASKSTATS is not set |
69 | # CONFIG_USER_NS is not set | ||
70 | # CONFIG_PID_NS is not set | ||
71 | # CONFIG_AUDIT is not set | 74 | # CONFIG_AUDIT is not set |
72 | # CONFIG_IKCONFIG is not set | 75 | # CONFIG_IKCONFIG is not set |
73 | CONFIG_LOG_BUF_SHIFT=14 | 76 | CONFIG_LOG_BUF_SHIFT=14 |
74 | # CONFIG_CGROUPS is not set | 77 | # CONFIG_CGROUPS is not set |
75 | CONFIG_FAIR_GROUP_SCHED=y | 78 | # CONFIG_GROUP_SCHED is not set |
76 | CONFIG_FAIR_USER_SCHED=y | ||
77 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
78 | CONFIG_SYSFS_DEPRECATED=y | 79 | CONFIG_SYSFS_DEPRECATED=y |
80 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
79 | # CONFIG_RELAY is not set | 81 | # CONFIG_RELAY is not set |
82 | # CONFIG_NAMESPACES is not set | ||
80 | CONFIG_BLK_DEV_INITRD=y | 83 | CONFIG_BLK_DEV_INITRD=y |
81 | CONFIG_INITRAMFS_SOURCE="" | 84 | CONFIG_INITRAMFS_SOURCE="" |
82 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 85 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -88,32 +91,49 @@ CONFIG_HOTPLUG=y | |||
88 | CONFIG_PRINTK=y | 91 | CONFIG_PRINTK=y |
89 | CONFIG_BUG=y | 92 | CONFIG_BUG=y |
90 | CONFIG_ELF_CORE=y | 93 | CONFIG_ELF_CORE=y |
94 | CONFIG_COMPAT_BRK=y | ||
91 | CONFIG_BASE_FULL=y | 95 | CONFIG_BASE_FULL=y |
92 | CONFIG_FUTEX=y | 96 | CONFIG_FUTEX=y |
93 | CONFIG_ANON_INODES=y | 97 | CONFIG_ANON_INODES=y |
94 | # CONFIG_EPOLL is not set | 98 | # CONFIG_EPOLL is not set |
95 | CONFIG_SIGNALFD=y | 99 | CONFIG_SIGNALFD=y |
100 | CONFIG_TIMERFD=y | ||
96 | CONFIG_EVENTFD=y | 101 | CONFIG_EVENTFD=y |
97 | CONFIG_SHMEM=y | 102 | CONFIG_SHMEM=y |
103 | CONFIG_AIO=y | ||
98 | CONFIG_VM_EVENT_COUNTERS=y | 104 | CONFIG_VM_EVENT_COUNTERS=y |
105 | CONFIG_PCI_QUIRKS=y | ||
99 | CONFIG_SLUB_DEBUG=y | 106 | CONFIG_SLUB_DEBUG=y |
100 | # CONFIG_SLAB is not set | 107 | # CONFIG_SLAB is not set |
101 | CONFIG_SLUB=y | 108 | CONFIG_SLUB=y |
102 | # CONFIG_SLOB is not set | 109 | # CONFIG_SLOB is not set |
110 | # CONFIG_PROFILING is not set | ||
111 | # CONFIG_MARKERS is not set | ||
112 | CONFIG_HAVE_OPROFILE=y | ||
113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
114 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | ||
116 | CONFIG_HAVE_KRETPROBES=y | ||
117 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
118 | CONFIG_HAVE_CLK=y | ||
119 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
120 | CONFIG_SLABINFO=y | ||
103 | CONFIG_RT_MUTEXES=y | 121 | CONFIG_RT_MUTEXES=y |
104 | # CONFIG_TINY_SHMEM is not set | 122 | # CONFIG_TINY_SHMEM is not set |
105 | CONFIG_BASE_SMALL=0 | 123 | CONFIG_BASE_SMALL=0 |
106 | CONFIG_MODULES=y | 124 | CONFIG_MODULES=y |
125 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
107 | CONFIG_MODULE_UNLOAD=y | 126 | CONFIG_MODULE_UNLOAD=y |
108 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 127 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
109 | # CONFIG_MODVERSIONS is not set | 128 | # CONFIG_MODVERSIONS is not set |
110 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 129 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
111 | # CONFIG_KMOD is not set | 130 | CONFIG_KMOD=y |
112 | CONFIG_BLOCK=y | 131 | CONFIG_BLOCK=y |
113 | # CONFIG_LBD is not set | 132 | # CONFIG_LBD is not set |
114 | # CONFIG_BLK_DEV_IO_TRACE is not set | 133 | # CONFIG_BLK_DEV_IO_TRACE is not set |
115 | # CONFIG_LSF is not set | 134 | # CONFIG_LSF is not set |
116 | # CONFIG_BLK_DEV_BSG is not set | 135 | # CONFIG_BLK_DEV_BSG is not set |
136 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
117 | 137 | ||
118 | # | 138 | # |
119 | # IO Schedulers | 139 | # IO Schedulers |
@@ -127,29 +147,34 @@ CONFIG_DEFAULT_AS=y | |||
127 | # CONFIG_DEFAULT_CFQ is not set | 147 | # CONFIG_DEFAULT_CFQ is not set |
128 | # CONFIG_DEFAULT_NOOP is not set | 148 | # CONFIG_DEFAULT_NOOP is not set |
129 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 149 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
150 | CONFIG_CLASSIC_RCU=y | ||
151 | CONFIG_FREEZER=y | ||
130 | 152 | ||
131 | # | 153 | # |
132 | # Platform support | 154 | # Platform support |
133 | # | 155 | # |
134 | CONFIG_PPC_MULTIPLATFORM=y | 156 | CONFIG_PPC_MULTIPLATFORM=y |
135 | # CONFIG_PPC_82xx is not set | ||
136 | # CONFIG_PPC_83xx is not set | ||
137 | # CONFIG_PPC_86xx is not set | ||
138 | CONFIG_CLASSIC32=y | 157 | CONFIG_CLASSIC32=y |
139 | # CONFIG_PPC_CHRP is not set | 158 | # CONFIG_PPC_CHRP is not set |
159 | # CONFIG_MPC5121_ADS is not set | ||
160 | # CONFIG_MPC5121_GENERIC is not set | ||
140 | CONFIG_PPC_MPC52xx=y | 161 | CONFIG_PPC_MPC52xx=y |
141 | CONFIG_PPC_MPC5200=y | ||
142 | CONFIG_PPC_MPC5200_BUGFIX=y | ||
143 | CONFIG_PPC_MPC5200_SIMPLE=y | 162 | CONFIG_PPC_MPC5200_SIMPLE=y |
144 | CONFIG_PPC_EFIKA=y | 163 | CONFIG_PPC_EFIKA=y |
145 | CONFIG_PPC_LITE5200=y | 164 | CONFIG_PPC_LITE5200=y |
165 | CONFIG_PPC_MPC5200_BUGFIX=y | ||
166 | # CONFIG_PPC_MPC5200_GPIO is not set | ||
146 | # CONFIG_PPC_PMAC is not set | 167 | # CONFIG_PPC_PMAC is not set |
147 | # CONFIG_PPC_CELL is not set | 168 | # CONFIG_PPC_CELL is not set |
148 | # CONFIG_PPC_CELL_NATIVE is not set | 169 | # CONFIG_PPC_CELL_NATIVE is not set |
170 | # CONFIG_PPC_82xx is not set | ||
149 | # CONFIG_PQ2ADS is not set | 171 | # CONFIG_PQ2ADS is not set |
172 | # CONFIG_PPC_83xx is not set | ||
173 | # CONFIG_PPC_86xx is not set | ||
150 | # CONFIG_EMBEDDED6xx is not set | 174 | # CONFIG_EMBEDDED6xx is not set |
151 | CONFIG_PPC_NATIVE=y | 175 | CONFIG_PPC_NATIVE=y |
152 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 176 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
177 | # CONFIG_IPIC is not set | ||
153 | # CONFIG_MPIC is not set | 178 | # CONFIG_MPIC is not set |
154 | # CONFIG_MPIC_WEIRD is not set | 179 | # CONFIG_MPIC_WEIRD is not set |
155 | # CONFIG_PPC_I8259 is not set | 180 | # CONFIG_PPC_I8259 is not set |
@@ -163,7 +188,6 @@ CONFIG_RTAS_PROC=y | |||
163 | # CONFIG_GENERIC_IOMAP is not set | 188 | # CONFIG_GENERIC_IOMAP is not set |
164 | # CONFIG_CPU_FREQ is not set | 189 | # CONFIG_CPU_FREQ is not set |
165 | # CONFIG_TAU is not set | 190 | # CONFIG_TAU is not set |
166 | # CONFIG_CPM2 is not set | ||
167 | # CONFIG_FSL_ULI1575 is not set | 191 | # CONFIG_FSL_ULI1575 is not set |
168 | CONFIG_PPC_BESTCOMM=y | 192 | CONFIG_PPC_BESTCOMM=y |
169 | CONFIG_PPC_BESTCOMM_ATA=y | 193 | CONFIG_PPC_BESTCOMM_ATA=y |
@@ -183,12 +207,18 @@ CONFIG_HZ_250=y | |||
183 | # CONFIG_HZ_300 is not set | 207 | # CONFIG_HZ_300 is not set |
184 | # CONFIG_HZ_1000 is not set | 208 | # CONFIG_HZ_1000 is not set |
185 | CONFIG_HZ=250 | 209 | CONFIG_HZ=250 |
210 | CONFIG_SCHED_HRTICK=y | ||
186 | CONFIG_PREEMPT_NONE=y | 211 | CONFIG_PREEMPT_NONE=y |
187 | # CONFIG_PREEMPT_VOLUNTARY is not set | 212 | # CONFIG_PREEMPT_VOLUNTARY is not set |
188 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
189 | CONFIG_BINFMT_ELF=y | 214 | CONFIG_BINFMT_ELF=y |
215 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
216 | # CONFIG_HAVE_AOUT is not set | ||
190 | # CONFIG_BINFMT_MISC is not set | 217 | # CONFIG_BINFMT_MISC is not set |
218 | # CONFIG_IOMMU_HELPER is not set | ||
191 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 219 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
220 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
221 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
192 | # CONFIG_KEXEC is not set | 222 | # CONFIG_KEXEC is not set |
193 | CONFIG_ARCH_FLATMEM_ENABLE=y | 223 | CONFIG_ARCH_FLATMEM_ENABLE=y |
194 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 224 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
@@ -198,26 +228,25 @@ CONFIG_FLATMEM_MANUAL=y | |||
198 | # CONFIG_SPARSEMEM_MANUAL is not set | 228 | # CONFIG_SPARSEMEM_MANUAL is not set |
199 | CONFIG_FLATMEM=y | 229 | CONFIG_FLATMEM=y |
200 | CONFIG_FLAT_NODE_MEM_MAP=y | 230 | CONFIG_FLAT_NODE_MEM_MAP=y |
201 | # CONFIG_SPARSEMEM_STATIC is not set | 231 | CONFIG_PAGEFLAGS_EXTENDED=y |
202 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
203 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
233 | CONFIG_MIGRATION=y | ||
204 | # CONFIG_RESOURCES_64BIT is not set | 234 | # CONFIG_RESOURCES_64BIT is not set |
235 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
205 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
206 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
207 | CONFIG_VIRT_TO_BUS=y | 238 | CONFIG_VIRT_TO_BUS=y |
239 | CONFIG_UNEVICTABLE_LRU=y | ||
240 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
208 | CONFIG_PROC_DEVICETREE=y | 241 | CONFIG_PROC_DEVICETREE=y |
209 | # CONFIG_CMDLINE_BOOL is not set | 242 | # CONFIG_CMDLINE_BOOL is not set |
243 | CONFIG_EXTRA_TARGETS="" | ||
210 | CONFIG_PM=y | 244 | CONFIG_PM=y |
211 | # CONFIG_PM_LEGACY is not set | ||
212 | # CONFIG_PM_DEBUG is not set | 245 | # CONFIG_PM_DEBUG is not set |
213 | CONFIG_PM_SLEEP=y | 246 | CONFIG_PM_SLEEP=y |
214 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
215 | CONFIG_SUSPEND=y | 247 | CONFIG_SUSPEND=y |
216 | CONFIG_HIBERNATION_UP_POSSIBLE=y | 248 | CONFIG_SUSPEND_FREEZER=y |
217 | # CONFIG_HIBERNATION is not set | ||
218 | CONFIG_SECCOMP=y | 249 | CONFIG_SECCOMP=y |
219 | CONFIG_WANT_DEVICE_TREE=y | ||
220 | CONFIG_DEVICE_TREE="" | ||
221 | CONFIG_ISA_DMA_API=y | 250 | CONFIG_ISA_DMA_API=y |
222 | 251 | ||
223 | # | 252 | # |
@@ -226,7 +255,7 @@ CONFIG_ISA_DMA_API=y | |||
226 | CONFIG_ZONE_DMA=y | 255 | CONFIG_ZONE_DMA=y |
227 | CONFIG_GENERIC_ISA_DMA=y | 256 | CONFIG_GENERIC_ISA_DMA=y |
228 | # CONFIG_PPC_INDIRECT_PCI is not set | 257 | # CONFIG_PPC_INDIRECT_PCI is not set |
229 | CONFIG_FSL_SOC=y | 258 | CONFIG_PPC_PCI_CHOICE=y |
230 | CONFIG_PCI=y | 259 | CONFIG_PCI=y |
231 | CONFIG_PCI_DOMAINS=y | 260 | CONFIG_PCI_DOMAINS=y |
232 | CONFIG_PCI_SYSCALL=y | 261 | CONFIG_PCI_SYSCALL=y |
@@ -237,6 +266,7 @@ CONFIG_PCI_LEGACY=y | |||
237 | # CONFIG_PCI_DEBUG is not set | 266 | # CONFIG_PCI_DEBUG is not set |
238 | # CONFIG_PCCARD is not set | 267 | # CONFIG_PCCARD is not set |
239 | # CONFIG_HOTPLUG_PCI is not set | 268 | # CONFIG_HOTPLUG_PCI is not set |
269 | # CONFIG_HAS_RAPIDIO is not set | ||
240 | 270 | ||
241 | # | 271 | # |
242 | # Advanced setup | 272 | # Advanced setup |
@@ -246,15 +276,11 @@ CONFIG_PCI_LEGACY=y | |||
246 | # | 276 | # |
247 | # Default settings for advanced configuration options are used | 277 | # Default settings for advanced configuration options are used |
248 | # | 278 | # |
249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
250 | CONFIG_LOWMEM_SIZE=0x30000000 | 279 | CONFIG_LOWMEM_SIZE=0x30000000 |
280 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
251 | CONFIG_KERNEL_START=0xc0000000 | 281 | CONFIG_KERNEL_START=0xc0000000 |
282 | CONFIG_PHYSICAL_START=0x00000000 | ||
252 | CONFIG_TASK_SIZE=0xc0000000 | 283 | CONFIG_TASK_SIZE=0xc0000000 |
253 | CONFIG_BOOT_LOAD=0x00800000 | ||
254 | |||
255 | # | ||
256 | # Networking | ||
257 | # | ||
258 | CONFIG_NET=y | 284 | CONFIG_NET=y |
259 | 285 | ||
260 | # | 286 | # |
@@ -267,6 +293,7 @@ CONFIG_XFRM=y | |||
267 | CONFIG_XFRM_USER=m | 293 | CONFIG_XFRM_USER=m |
268 | # CONFIG_XFRM_SUB_POLICY is not set | 294 | # CONFIG_XFRM_SUB_POLICY is not set |
269 | # CONFIG_XFRM_MIGRATE is not set | 295 | # CONFIG_XFRM_MIGRATE is not set |
296 | # CONFIG_XFRM_STATISTICS is not set | ||
270 | # CONFIG_NET_KEY is not set | 297 | # CONFIG_NET_KEY is not set |
271 | CONFIG_INET=y | 298 | CONFIG_INET=y |
272 | CONFIG_IP_MULTICAST=y | 299 | CONFIG_IP_MULTICAST=y |
@@ -297,8 +324,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
297 | CONFIG_DEFAULT_TCP_CONG="cubic" | 324 | CONFIG_DEFAULT_TCP_CONG="cubic" |
298 | # CONFIG_TCP_MD5SIG is not set | 325 | # CONFIG_TCP_MD5SIG is not set |
299 | # CONFIG_IPV6 is not set | 326 | # CONFIG_IPV6 is not set |
300 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
301 | # CONFIG_INET6_TUNNEL is not set | ||
302 | # CONFIG_NETWORK_SECMARK is not set | 327 | # CONFIG_NETWORK_SECMARK is not set |
303 | # CONFIG_NETFILTER is not set | 328 | # CONFIG_NETFILTER is not set |
304 | # CONFIG_IP_DCCP is not set | 329 | # CONFIG_IP_DCCP is not set |
@@ -306,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
306 | # CONFIG_TIPC is not set | 331 | # CONFIG_TIPC is not set |
307 | # CONFIG_ATM is not set | 332 | # CONFIG_ATM is not set |
308 | # CONFIG_BRIDGE is not set | 333 | # CONFIG_BRIDGE is not set |
334 | # CONFIG_NET_DSA is not set | ||
309 | # CONFIG_VLAN_8021Q is not set | 335 | # CONFIG_VLAN_8021Q is not set |
310 | # CONFIG_DECNET is not set | 336 | # CONFIG_DECNET is not set |
311 | # CONFIG_LLC2 is not set | 337 | # CONFIG_LLC2 is not set |
@@ -322,17 +348,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
322 | # | 348 | # |
323 | # CONFIG_NET_PKTGEN is not set | 349 | # CONFIG_NET_PKTGEN is not set |
324 | # CONFIG_HAMRADIO is not set | 350 | # CONFIG_HAMRADIO is not set |
351 | # CONFIG_CAN is not set | ||
325 | # CONFIG_IRDA is not set | 352 | # CONFIG_IRDA is not set |
326 | # CONFIG_BT is not set | 353 | # CONFIG_BT is not set |
327 | # CONFIG_AF_RXRPC is not set | 354 | # CONFIG_AF_RXRPC is not set |
328 | 355 | # CONFIG_PHONET is not set | |
329 | # | 356 | # CONFIG_WIRELESS is not set |
330 | # Wireless | ||
331 | # | ||
332 | # CONFIG_CFG80211 is not set | ||
333 | # CONFIG_WIRELESS_EXT is not set | ||
334 | # CONFIG_MAC80211 is not set | ||
335 | # CONFIG_IEEE80211 is not set | ||
336 | # CONFIG_RFKILL is not set | 357 | # CONFIG_RFKILL is not set |
337 | # CONFIG_NET_9P is not set | 358 | # CONFIG_NET_9P is not set |
338 | 359 | ||
@@ -357,6 +378,8 @@ CONFIG_MTD_CONCAT=y | |||
357 | CONFIG_MTD_PARTITIONS=y | 378 | CONFIG_MTD_PARTITIONS=y |
358 | # CONFIG_MTD_REDBOOT_PARTS is not set | 379 | # CONFIG_MTD_REDBOOT_PARTS is not set |
359 | CONFIG_MTD_CMDLINE_PARTS=y | 380 | CONFIG_MTD_CMDLINE_PARTS=y |
381 | # CONFIG_MTD_OF_PARTS is not set | ||
382 | # CONFIG_MTD_AR7_PARTS is not set | ||
360 | 383 | ||
361 | # | 384 | # |
362 | # User Modules And Translation Layers | 385 | # User Modules And Translation Layers |
@@ -428,6 +451,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
428 | # | 451 | # |
429 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
430 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
454 | CONFIG_OF_I2C=y | ||
431 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
432 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
433 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
@@ -444,14 +468,20 @@ CONFIG_BLK_DEV_LOOP=y | |||
444 | CONFIG_BLK_DEV_RAM=y | 468 | CONFIG_BLK_DEV_RAM=y |
445 | CONFIG_BLK_DEV_RAM_COUNT=16 | 469 | CONFIG_BLK_DEV_RAM_COUNT=16 |
446 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 470 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
447 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 471 | # CONFIG_BLK_DEV_XIP is not set |
448 | # CONFIG_CDROM_PKTCDVD is not set | 472 | # CONFIG_CDROM_PKTCDVD is not set |
449 | # CONFIG_ATA_OVER_ETH is not set | 473 | # CONFIG_ATA_OVER_ETH is not set |
474 | # CONFIG_BLK_DEV_HD is not set | ||
450 | CONFIG_MISC_DEVICES=y | 475 | CONFIG_MISC_DEVICES=y |
451 | # CONFIG_PHANTOM is not set | 476 | # CONFIG_PHANTOM is not set |
452 | # CONFIG_EEPROM_93CX6 is not set | 477 | # CONFIG_EEPROM_93CX6 is not set |
453 | # CONFIG_SGI_IOC4 is not set | 478 | # CONFIG_SGI_IOC4 is not set |
454 | # CONFIG_TIFM_CORE is not set | 479 | # CONFIG_TIFM_CORE is not set |
480 | # CONFIG_ICS932S401 is not set | ||
481 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
482 | # CONFIG_HP_ILO is not set | ||
483 | # CONFIG_C2PORT is not set | ||
484 | CONFIG_HAVE_IDE=y | ||
455 | # CONFIG_IDE is not set | 485 | # CONFIG_IDE is not set |
456 | 486 | ||
457 | # | 487 | # |
@@ -516,6 +546,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
516 | # CONFIG_SCSI_IPS is not set | 546 | # CONFIG_SCSI_IPS is not set |
517 | # CONFIG_SCSI_INITIO is not set | 547 | # CONFIG_SCSI_INITIO is not set |
518 | # CONFIG_SCSI_INIA100 is not set | 548 | # CONFIG_SCSI_INIA100 is not set |
549 | # CONFIG_SCSI_MVSAS is not set | ||
519 | # CONFIG_SCSI_STEX is not set | 550 | # CONFIG_SCSI_STEX is not set |
520 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 551 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
521 | # CONFIG_SCSI_IPR is not set | 552 | # CONFIG_SCSI_IPR is not set |
@@ -528,9 +559,13 @@ CONFIG_SCSI_LOWLEVEL=y | |||
528 | # CONFIG_SCSI_NSP32 is not set | 559 | # CONFIG_SCSI_NSP32 is not set |
529 | # CONFIG_SCSI_DEBUG is not set | 560 | # CONFIG_SCSI_DEBUG is not set |
530 | # CONFIG_SCSI_SRP is not set | 561 | # CONFIG_SCSI_SRP is not set |
562 | # CONFIG_SCSI_DH is not set | ||
531 | CONFIG_ATA=y | 563 | CONFIG_ATA=y |
532 | # CONFIG_ATA_NONSTANDARD is not set | 564 | # CONFIG_ATA_NONSTANDARD is not set |
565 | CONFIG_SATA_PMP=y | ||
533 | # CONFIG_SATA_AHCI is not set | 566 | # CONFIG_SATA_AHCI is not set |
567 | # CONFIG_SATA_SIL24 is not set | ||
568 | CONFIG_ATA_SFF=y | ||
534 | # CONFIG_SATA_SVW is not set | 569 | # CONFIG_SATA_SVW is not set |
535 | # CONFIG_ATA_PIIX is not set | 570 | # CONFIG_ATA_PIIX is not set |
536 | # CONFIG_SATA_MV is not set | 571 | # CONFIG_SATA_MV is not set |
@@ -540,7 +575,6 @@ CONFIG_ATA=y | |||
540 | # CONFIG_SATA_PROMISE is not set | 575 | # CONFIG_SATA_PROMISE is not set |
541 | # CONFIG_SATA_SX4 is not set | 576 | # CONFIG_SATA_SX4 is not set |
542 | # CONFIG_SATA_SIL is not set | 577 | # CONFIG_SATA_SIL is not set |
543 | # CONFIG_SATA_SIL24 is not set | ||
544 | # CONFIG_SATA_SIS is not set | 578 | # CONFIG_SATA_SIS is not set |
545 | # CONFIG_SATA_ULI is not set | 579 | # CONFIG_SATA_ULI is not set |
546 | # CONFIG_SATA_VIA is not set | 580 | # CONFIG_SATA_VIA is not set |
@@ -570,6 +604,7 @@ CONFIG_PATA_MPC52xx=y | |||
570 | # CONFIG_PATA_MPIIX is not set | 604 | # CONFIG_PATA_MPIIX is not set |
571 | # CONFIG_PATA_OLDPIIX is not set | 605 | # CONFIG_PATA_OLDPIIX is not set |
572 | # CONFIG_PATA_NETCELL is not set | 606 | # CONFIG_PATA_NETCELL is not set |
607 | # CONFIG_PATA_NINJA32 is not set | ||
573 | # CONFIG_PATA_NS87410 is not set | 608 | # CONFIG_PATA_NS87410 is not set |
574 | # CONFIG_PATA_NS87415 is not set | 609 | # CONFIG_PATA_NS87415 is not set |
575 | # CONFIG_PATA_OPTI is not set | 610 | # CONFIG_PATA_OPTI is not set |
@@ -586,25 +621,28 @@ CONFIG_PATA_MPC52xx=y | |||
586 | # CONFIG_PATA_WINBOND is not set | 621 | # CONFIG_PATA_WINBOND is not set |
587 | CONFIG_PATA_PLATFORM=y | 622 | CONFIG_PATA_PLATFORM=y |
588 | # CONFIG_PATA_OF_PLATFORM is not set | 623 | # CONFIG_PATA_OF_PLATFORM is not set |
624 | # CONFIG_PATA_SCH is not set | ||
589 | # CONFIG_MD is not set | 625 | # CONFIG_MD is not set |
590 | # CONFIG_FUSION is not set | 626 | # CONFIG_FUSION is not set |
591 | 627 | ||
592 | # | 628 | # |
593 | # IEEE 1394 (FireWire) support | 629 | # IEEE 1394 (FireWire) support |
594 | # | 630 | # |
631 | |||
632 | # | ||
633 | # Enable only one of the two stacks, unless you know what you are doing | ||
634 | # | ||
595 | # CONFIG_FIREWIRE is not set | 635 | # CONFIG_FIREWIRE is not set |
596 | # CONFIG_IEEE1394 is not set | 636 | # CONFIG_IEEE1394 is not set |
597 | # CONFIG_I2O is not set | 637 | # CONFIG_I2O is not set |
598 | # CONFIG_MACINTOSH_DRIVERS is not set | 638 | # CONFIG_MACINTOSH_DRIVERS is not set |
599 | CONFIG_NETDEVICES=y | 639 | CONFIG_NETDEVICES=y |
600 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
601 | # CONFIG_DUMMY is not set | 640 | # CONFIG_DUMMY is not set |
602 | # CONFIG_BONDING is not set | 641 | # CONFIG_BONDING is not set |
603 | # CONFIG_MACVLAN is not set | 642 | # CONFIG_MACVLAN is not set |
604 | # CONFIG_EQUALIZER is not set | 643 | # CONFIG_EQUALIZER is not set |
605 | # CONFIG_TUN is not set | 644 | # CONFIG_TUN is not set |
606 | # CONFIG_VETH is not set | 645 | # CONFIG_VETH is not set |
607 | # CONFIG_IP1000 is not set | ||
608 | # CONFIG_ARCNET is not set | 646 | # CONFIG_ARCNET is not set |
609 | CONFIG_PHYLIB=y | 647 | CONFIG_PHYLIB=y |
610 | 648 | ||
@@ -620,6 +658,7 @@ CONFIG_PHYLIB=y | |||
620 | # CONFIG_SMSC_PHY is not set | 658 | # CONFIG_SMSC_PHY is not set |
621 | # CONFIG_BROADCOM_PHY is not set | 659 | # CONFIG_BROADCOM_PHY is not set |
622 | # CONFIG_ICPLUS_PHY is not set | 660 | # CONFIG_ICPLUS_PHY is not set |
661 | # CONFIG_REALTEK_PHY is not set | ||
623 | # CONFIG_FIXED_PHY is not set | 662 | # CONFIG_FIXED_PHY is not set |
624 | # CONFIG_MDIO_BITBANG is not set | 663 | # CONFIG_MDIO_BITBANG is not set |
625 | CONFIG_NET_ETHERNET=y | 664 | CONFIG_NET_ETHERNET=y |
@@ -634,10 +673,14 @@ CONFIG_NET_ETHERNET=y | |||
634 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 673 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
635 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 674 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
636 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 675 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
676 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
677 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
678 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
637 | # CONFIG_NET_PCI is not set | 679 | # CONFIG_NET_PCI is not set |
638 | # CONFIG_B44 is not set | 680 | # CONFIG_B44 is not set |
639 | CONFIG_FEC_MPC52xx=y | 681 | CONFIG_FEC_MPC52xx=y |
640 | CONFIG_FEC_MPC52xx_MDIO=y | 682 | CONFIG_FEC_MPC52xx_MDIO=y |
683 | # CONFIG_ATL2 is not set | ||
641 | # CONFIG_NETDEV_1000 is not set | 684 | # CONFIG_NETDEV_1000 is not set |
642 | # CONFIG_NETDEV_10000 is not set | 685 | # CONFIG_NETDEV_10000 is not set |
643 | # CONFIG_TR is not set | 686 | # CONFIG_TR is not set |
@@ -647,6 +690,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
647 | # | 690 | # |
648 | # CONFIG_WLAN_PRE80211 is not set | 691 | # CONFIG_WLAN_PRE80211 is not set |
649 | # CONFIG_WLAN_80211 is not set | 692 | # CONFIG_WLAN_80211 is not set |
693 | # CONFIG_IWLWIFI_LEDS is not set | ||
650 | 694 | ||
651 | # | 695 | # |
652 | # USB Network Adapters | 696 | # USB Network Adapters |
@@ -662,7 +706,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
662 | # CONFIG_PPP is not set | 706 | # CONFIG_PPP is not set |
663 | # CONFIG_SLIP is not set | 707 | # CONFIG_SLIP is not set |
664 | # CONFIG_NET_FC is not set | 708 | # CONFIG_NET_FC is not set |
665 | # CONFIG_SHAPER is not set | ||
666 | # CONFIG_NETCONSOLE is not set | 709 | # CONFIG_NETCONSOLE is not set |
667 | # CONFIG_NETPOLL is not set | 710 | # CONFIG_NETPOLL is not set |
668 | # CONFIG_NET_POLL_CONTROLLER is not set | 711 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -672,7 +715,30 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
672 | # | 715 | # |
673 | # Input device support | 716 | # Input device support |
674 | # | 717 | # |
675 | # CONFIG_INPUT is not set | 718 | CONFIG_INPUT=y |
719 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
720 | # CONFIG_INPUT_POLLDEV is not set | ||
721 | |||
722 | # | ||
723 | # Userland interfaces | ||
724 | # | ||
725 | CONFIG_INPUT_MOUSEDEV=y | ||
726 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
727 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
728 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
729 | # CONFIG_INPUT_JOYDEV is not set | ||
730 | # CONFIG_INPUT_EVDEV is not set | ||
731 | # CONFIG_INPUT_EVBUG is not set | ||
732 | |||
733 | # | ||
734 | # Input Device Drivers | ||
735 | # | ||
736 | # CONFIG_INPUT_KEYBOARD is not set | ||
737 | # CONFIG_INPUT_MOUSE is not set | ||
738 | # CONFIG_INPUT_JOYSTICK is not set | ||
739 | # CONFIG_INPUT_TABLET is not set | ||
740 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
741 | # CONFIG_INPUT_MISC is not set | ||
676 | 742 | ||
677 | # | 743 | # |
678 | # Hardware I/O ports | 744 | # Hardware I/O ports |
@@ -683,8 +749,14 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
683 | # | 749 | # |
684 | # Character devices | 750 | # Character devices |
685 | # | 751 | # |
686 | # CONFIG_VT is not set | 752 | CONFIG_VT=y |
753 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
754 | CONFIG_VT_CONSOLE=y | ||
755 | CONFIG_HW_CONSOLE=y | ||
756 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
757 | CONFIG_DEVKMEM=y | ||
687 | # CONFIG_SERIAL_NONSTANDARD is not set | 758 | # CONFIG_SERIAL_NONSTANDARD is not set |
759 | # CONFIG_NOZOMI is not set | ||
688 | 760 | ||
689 | # | 761 | # |
690 | # Serial drivers | 762 | # Serial drivers |
@@ -718,16 +790,15 @@ CONFIG_DEVPORT=y | |||
718 | CONFIG_I2C=y | 790 | CONFIG_I2C=y |
719 | CONFIG_I2C_BOARDINFO=y | 791 | CONFIG_I2C_BOARDINFO=y |
720 | CONFIG_I2C_CHARDEV=y | 792 | CONFIG_I2C_CHARDEV=y |
793 | CONFIG_I2C_HELPER_AUTO=y | ||
794 | CONFIG_I2C_ALGOBIT=y | ||
721 | 795 | ||
722 | # | 796 | # |
723 | # I2C Algorithms | 797 | # I2C Hardware Bus support |
724 | # | 798 | # |
725 | # CONFIG_I2C_ALGOBIT is not set | ||
726 | # CONFIG_I2C_ALGOPCF is not set | ||
727 | # CONFIG_I2C_ALGOPCA is not set | ||
728 | 799 | ||
729 | # | 800 | # |
730 | # I2C Hardware Bus support | 801 | # PC SMBus host controller drivers |
731 | # | 802 | # |
732 | # CONFIG_I2C_ALI1535 is not set | 803 | # CONFIG_I2C_ALI1535 is not set |
733 | # CONFIG_I2C_ALI1563 is not set | 804 | # CONFIG_I2C_ALI1563 is not set |
@@ -735,52 +806,64 @@ CONFIG_I2C_CHARDEV=y | |||
735 | # CONFIG_I2C_AMD756 is not set | 806 | # CONFIG_I2C_AMD756 is not set |
736 | # CONFIG_I2C_AMD8111 is not set | 807 | # CONFIG_I2C_AMD8111 is not set |
737 | # CONFIG_I2C_I801 is not set | 808 | # CONFIG_I2C_I801 is not set |
738 | # CONFIG_I2C_I810 is not set | 809 | # CONFIG_I2C_ISCH is not set |
739 | # CONFIG_I2C_PIIX4 is not set | 810 | # CONFIG_I2C_PIIX4 is not set |
740 | CONFIG_I2C_MPC=y | ||
741 | # CONFIG_I2C_NFORCE2 is not set | 811 | # CONFIG_I2C_NFORCE2 is not set |
742 | # CONFIG_I2C_OCORES is not set | ||
743 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
744 | # CONFIG_I2C_PROSAVAGE is not set | ||
745 | # CONFIG_I2C_SAVAGE4 is not set | ||
746 | # CONFIG_I2C_SIMTEC is not set | ||
747 | # CONFIG_I2C_SIS5595 is not set | 812 | # CONFIG_I2C_SIS5595 is not set |
748 | # CONFIG_I2C_SIS630 is not set | 813 | # CONFIG_I2C_SIS630 is not set |
749 | # CONFIG_I2C_SIS96X is not set | 814 | # CONFIG_I2C_SIS96X is not set |
750 | # CONFIG_I2C_TAOS_EVM is not set | ||
751 | # CONFIG_I2C_STUB is not set | ||
752 | # CONFIG_I2C_TINY_USB is not set | ||
753 | # CONFIG_I2C_VIA is not set | 815 | # CONFIG_I2C_VIA is not set |
754 | # CONFIG_I2C_VIAPRO is not set | 816 | # CONFIG_I2C_VIAPRO is not set |
817 | |||
818 | # | ||
819 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
820 | # | ||
821 | CONFIG_I2C_MPC=y | ||
822 | # CONFIG_I2C_OCORES is not set | ||
823 | # CONFIG_I2C_SIMTEC is not set | ||
824 | |||
825 | # | ||
826 | # External I2C/SMBus adapter drivers | ||
827 | # | ||
828 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
829 | # CONFIG_I2C_TAOS_EVM is not set | ||
830 | # CONFIG_I2C_TINY_USB is not set | ||
831 | |||
832 | # | ||
833 | # Graphics adapter I2C/DDC channel drivers | ||
834 | # | ||
755 | # CONFIG_I2C_VOODOO3 is not set | 835 | # CONFIG_I2C_VOODOO3 is not set |
756 | 836 | ||
757 | # | 837 | # |
838 | # Other I2C/SMBus bus drivers | ||
839 | # | ||
840 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
841 | # CONFIG_I2C_STUB is not set | ||
842 | |||
843 | # | ||
758 | # Miscellaneous I2C Chip support | 844 | # Miscellaneous I2C Chip support |
759 | # | 845 | # |
760 | # CONFIG_SENSORS_DS1337 is not set | ||
761 | # CONFIG_SENSORS_DS1374 is not set | ||
762 | # CONFIG_DS1682 is not set | 846 | # CONFIG_DS1682 is not set |
847 | # CONFIG_AT24 is not set | ||
763 | # CONFIG_SENSORS_EEPROM is not set | 848 | # CONFIG_SENSORS_EEPROM is not set |
764 | # CONFIG_SENSORS_PCF8574 is not set | 849 | # CONFIG_SENSORS_PCF8574 is not set |
850 | # CONFIG_PCF8575 is not set | ||
765 | # CONFIG_SENSORS_PCA9539 is not set | 851 | # CONFIG_SENSORS_PCA9539 is not set |
766 | # CONFIG_SENSORS_PCF8591 is not set | 852 | # CONFIG_SENSORS_PCF8591 is not set |
767 | # CONFIG_SENSORS_M41T00 is not set | ||
768 | # CONFIG_SENSORS_MAX6875 is not set | 853 | # CONFIG_SENSORS_MAX6875 is not set |
769 | # CONFIG_SENSORS_TSL2550 is not set | 854 | # CONFIG_SENSORS_TSL2550 is not set |
770 | # CONFIG_I2C_DEBUG_CORE is not set | 855 | # CONFIG_I2C_DEBUG_CORE is not set |
771 | # CONFIG_I2C_DEBUG_ALGO is not set | 856 | # CONFIG_I2C_DEBUG_ALGO is not set |
772 | # CONFIG_I2C_DEBUG_BUS is not set | 857 | # CONFIG_I2C_DEBUG_BUS is not set |
773 | # CONFIG_I2C_DEBUG_CHIP is not set | 858 | # CONFIG_I2C_DEBUG_CHIP is not set |
774 | |||
775 | # | ||
776 | # SPI support | ||
777 | # | ||
778 | # CONFIG_SPI is not set | 859 | # CONFIG_SPI is not set |
779 | # CONFIG_SPI_MASTER is not set | 860 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
861 | # CONFIG_GPIOLIB is not set | ||
780 | # CONFIG_W1 is not set | 862 | # CONFIG_W1 is not set |
781 | # CONFIG_POWER_SUPPLY is not set | 863 | # CONFIG_POWER_SUPPLY is not set |
782 | CONFIG_HWMON=y | 864 | CONFIG_HWMON=y |
783 | # CONFIG_HWMON_VID is not set | 865 | # CONFIG_HWMON_VID is not set |
866 | # CONFIG_SENSORS_AD7414 is not set | ||
784 | # CONFIG_SENSORS_AD7418 is not set | 867 | # CONFIG_SENSORS_AD7418 is not set |
785 | # CONFIG_SENSORS_ADM1021 is not set | 868 | # CONFIG_SENSORS_ADM1021 is not set |
786 | # CONFIG_SENSORS_ADM1025 is not set | 869 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -788,7 +871,9 @@ CONFIG_HWMON=y | |||
788 | # CONFIG_SENSORS_ADM1029 is not set | 871 | # CONFIG_SENSORS_ADM1029 is not set |
789 | # CONFIG_SENSORS_ADM1031 is not set | 872 | # CONFIG_SENSORS_ADM1031 is not set |
790 | # CONFIG_SENSORS_ADM9240 is not set | 873 | # CONFIG_SENSORS_ADM9240 is not set |
874 | # CONFIG_SENSORS_ADT7462 is not set | ||
791 | # CONFIG_SENSORS_ADT7470 is not set | 875 | # CONFIG_SENSORS_ADT7470 is not set |
876 | # CONFIG_SENSORS_ADT7473 is not set | ||
792 | # CONFIG_SENSORS_ATXP1 is not set | 877 | # CONFIG_SENSORS_ATXP1 is not set |
793 | # CONFIG_SENSORS_DS1621 is not set | 878 | # CONFIG_SENSORS_DS1621 is not set |
794 | # CONFIG_SENSORS_I5K_AMB is not set | 879 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -818,6 +903,7 @@ CONFIG_HWMON=y | |||
818 | # CONFIG_SENSORS_SMSC47M1 is not set | 903 | # CONFIG_SENSORS_SMSC47M1 is not set |
819 | # CONFIG_SENSORS_SMSC47M192 is not set | 904 | # CONFIG_SENSORS_SMSC47M192 is not set |
820 | # CONFIG_SENSORS_SMSC47B397 is not set | 905 | # CONFIG_SENSORS_SMSC47B397 is not set |
906 | # CONFIG_SENSORS_ADS7828 is not set | ||
821 | # CONFIG_SENSORS_THMC50 is not set | 907 | # CONFIG_SENSORS_THMC50 is not set |
822 | # CONFIG_SENSORS_VIA686A is not set | 908 | # CONFIG_SENSORS_VIA686A is not set |
823 | # CONFIG_SENSORS_VT1211 is not set | 909 | # CONFIG_SENSORS_VT1211 is not set |
@@ -827,9 +913,12 @@ CONFIG_HWMON=y | |||
827 | # CONFIG_SENSORS_W83792D is not set | 913 | # CONFIG_SENSORS_W83792D is not set |
828 | # CONFIG_SENSORS_W83793 is not set | 914 | # CONFIG_SENSORS_W83793 is not set |
829 | # CONFIG_SENSORS_W83L785TS is not set | 915 | # CONFIG_SENSORS_W83L785TS is not set |
916 | # CONFIG_SENSORS_W83L786NG is not set | ||
830 | # CONFIG_SENSORS_W83627HF is not set | 917 | # CONFIG_SENSORS_W83627HF is not set |
831 | # CONFIG_SENSORS_W83627EHF is not set | 918 | # CONFIG_SENSORS_W83627EHF is not set |
832 | # CONFIG_HWMON_DEBUG_CHIP is not set | 919 | # CONFIG_HWMON_DEBUG_CHIP is not set |
920 | # CONFIG_THERMAL is not set | ||
921 | # CONFIG_THERMAL_HWMON is not set | ||
833 | CONFIG_WATCHDOG=y | 922 | CONFIG_WATCHDOG=y |
834 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 923 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
835 | 924 | ||
@@ -837,6 +926,7 @@ CONFIG_WATCHDOG=y | |||
837 | # Watchdog Device Drivers | 926 | # Watchdog Device Drivers |
838 | # | 927 | # |
839 | # CONFIG_SOFT_WATCHDOG is not set | 928 | # CONFIG_SOFT_WATCHDOG is not set |
929 | # CONFIG_ALIM7101_WDT is not set | ||
840 | # CONFIG_MPC5200_WDT is not set | 930 | # CONFIG_MPC5200_WDT is not set |
841 | # CONFIG_WATCHDOG_RTAS is not set | 931 | # CONFIG_WATCHDOG_RTAS is not set |
842 | 932 | ||
@@ -850,23 +940,39 @@ CONFIG_WATCHDOG=y | |||
850 | # USB-based Watchdog Cards | 940 | # USB-based Watchdog Cards |
851 | # | 941 | # |
852 | # CONFIG_USBPCWATCHDOG is not set | 942 | # CONFIG_USBPCWATCHDOG is not set |
943 | CONFIG_SSB_POSSIBLE=y | ||
853 | 944 | ||
854 | # | 945 | # |
855 | # Sonics Silicon Backplane | 946 | # Sonics Silicon Backplane |
856 | # | 947 | # |
857 | CONFIG_SSB_POSSIBLE=y | ||
858 | # CONFIG_SSB is not set | 948 | # CONFIG_SSB is not set |
859 | 949 | ||
860 | # | 950 | # |
861 | # Multifunction device drivers | 951 | # Multifunction device drivers |
862 | # | 952 | # |
953 | # CONFIG_MFD_CORE is not set | ||
863 | # CONFIG_MFD_SM501 is not set | 954 | # CONFIG_MFD_SM501 is not set |
955 | # CONFIG_HTC_PASIC3 is not set | ||
956 | # CONFIG_MFD_TMIO is not set | ||
957 | # CONFIG_PMIC_DA903X is not set | ||
958 | # CONFIG_MFD_WM8400 is not set | ||
959 | # CONFIG_MFD_WM8350_I2C is not set | ||
960 | # CONFIG_REGULATOR is not set | ||
864 | 961 | ||
865 | # | 962 | # |
866 | # Multimedia devices | 963 | # Multimedia devices |
867 | # | 964 | # |
965 | |||
966 | # | ||
967 | # Multimedia core support | ||
968 | # | ||
868 | # CONFIG_VIDEO_DEV is not set | 969 | # CONFIG_VIDEO_DEV is not set |
869 | # CONFIG_DVB_CORE is not set | 970 | # CONFIG_DVB_CORE is not set |
971 | # CONFIG_VIDEO_MEDIA is not set | ||
972 | |||
973 | # | ||
974 | # Multimedia drivers | ||
975 | # | ||
870 | CONFIG_DAB=y | 976 | CONFIG_DAB=y |
871 | # CONFIG_USB_DABUSB is not set | 977 | # CONFIG_USB_DABUSB is not set |
872 | 978 | ||
@@ -874,11 +980,78 @@ CONFIG_DAB=y | |||
874 | # Graphics support | 980 | # Graphics support |
875 | # | 981 | # |
876 | # CONFIG_AGP is not set | 982 | # CONFIG_AGP is not set |
877 | # CONFIG_DRM is not set | 983 | CONFIG_DRM=y |
984 | # CONFIG_DRM_TDFX is not set | ||
985 | # CONFIG_DRM_R128 is not set | ||
986 | # CONFIG_DRM_RADEON is not set | ||
987 | # CONFIG_DRM_MGA is not set | ||
988 | # CONFIG_DRM_VIA is not set | ||
989 | # CONFIG_DRM_SAVAGE is not set | ||
878 | # CONFIG_VGASTATE is not set | 990 | # CONFIG_VGASTATE is not set |
879 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 991 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
880 | # CONFIG_FB is not set | 992 | CONFIG_FB=y |
881 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 993 | # CONFIG_FIRMWARE_EDID is not set |
994 | CONFIG_FB_DDC=y | ||
995 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
996 | CONFIG_FB_CFB_FILLRECT=y | ||
997 | CONFIG_FB_CFB_COPYAREA=y | ||
998 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
999 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
1000 | # CONFIG_FB_SYS_FILLRECT is not set | ||
1001 | # CONFIG_FB_SYS_COPYAREA is not set | ||
1002 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
1003 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1004 | # CONFIG_FB_SYS_FOPS is not set | ||
1005 | # CONFIG_FB_SVGALIB is not set | ||
1006 | CONFIG_FB_MACMODES=y | ||
1007 | CONFIG_FB_BACKLIGHT=y | ||
1008 | CONFIG_FB_MODE_HELPERS=y | ||
1009 | # CONFIG_FB_TILEBLITTING is not set | ||
1010 | |||
1011 | # | ||
1012 | # Frame buffer hardware drivers | ||
1013 | # | ||
1014 | # CONFIG_FB_CIRRUS is not set | ||
1015 | # CONFIG_FB_PM2 is not set | ||
1016 | # CONFIG_FB_CYBER2000 is not set | ||
1017 | # CONFIG_FB_OF is not set | ||
1018 | # CONFIG_FB_CT65550 is not set | ||
1019 | # CONFIG_FB_ASILIANT is not set | ||
1020 | # CONFIG_FB_IMSTT is not set | ||
1021 | # CONFIG_FB_VGA16 is not set | ||
1022 | # CONFIG_FB_S1D13XXX is not set | ||
1023 | # CONFIG_FB_NVIDIA is not set | ||
1024 | # CONFIG_FB_RIVA is not set | ||
1025 | # CONFIG_FB_MATROX is not set | ||
1026 | CONFIG_FB_RADEON=y | ||
1027 | CONFIG_FB_RADEON_I2C=y | ||
1028 | CONFIG_FB_RADEON_BACKLIGHT=y | ||
1029 | # CONFIG_FB_RADEON_DEBUG is not set | ||
1030 | # CONFIG_FB_ATY128 is not set | ||
1031 | # CONFIG_FB_ATY is not set | ||
1032 | # CONFIG_FB_S3 is not set | ||
1033 | # CONFIG_FB_SAVAGE is not set | ||
1034 | # CONFIG_FB_SIS is not set | ||
1035 | # CONFIG_FB_VIA is not set | ||
1036 | # CONFIG_FB_NEOMAGIC is not set | ||
1037 | # CONFIG_FB_KYRO is not set | ||
1038 | # CONFIG_FB_3DFX is not set | ||
1039 | # CONFIG_FB_VOODOO1 is not set | ||
1040 | # CONFIG_FB_VT8623 is not set | ||
1041 | # CONFIG_FB_TRIDENT is not set | ||
1042 | # CONFIG_FB_ARK is not set | ||
1043 | # CONFIG_FB_PM3 is not set | ||
1044 | # CONFIG_FB_CARMINE is not set | ||
1045 | # CONFIG_FB_IBM_GXT4500 is not set | ||
1046 | # CONFIG_FB_VIRTUAL is not set | ||
1047 | # CONFIG_FB_METRONOME is not set | ||
1048 | # CONFIG_FB_MB862XX is not set | ||
1049 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
1050 | CONFIG_LCD_CLASS_DEVICE=m | ||
1051 | # CONFIG_LCD_ILI9320 is not set | ||
1052 | # CONFIG_LCD_PLATFORM is not set | ||
1053 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
1054 | # CONFIG_BACKLIGHT_CORGI is not set | ||
882 | 1055 | ||
883 | # | 1056 | # |
884 | # Display device support | 1057 | # Display device support |
@@ -886,15 +1059,64 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
886 | # CONFIG_DISPLAY_SUPPORT is not set | 1059 | # CONFIG_DISPLAY_SUPPORT is not set |
887 | 1060 | ||
888 | # | 1061 | # |
889 | # Sound | 1062 | # Console display driver support |
890 | # | 1063 | # |
1064 | # CONFIG_VGA_CONSOLE is not set | ||
1065 | CONFIG_DUMMY_CONSOLE=y | ||
1066 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
1067 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
1068 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
1069 | # CONFIG_FONTS is not set | ||
1070 | CONFIG_FONT_8x8=y | ||
1071 | CONFIG_FONT_8x16=y | ||
1072 | CONFIG_LOGO=y | ||
1073 | CONFIG_LOGO_LINUX_MONO=y | ||
1074 | CONFIG_LOGO_LINUX_VGA16=y | ||
1075 | CONFIG_LOGO_LINUX_CLUT224=y | ||
891 | # CONFIG_SOUND is not set | 1076 | # CONFIG_SOUND is not set |
1077 | CONFIG_HID_SUPPORT=y | ||
1078 | CONFIG_HID=y | ||
1079 | # CONFIG_HID_DEBUG is not set | ||
1080 | # CONFIG_HIDRAW is not set | ||
1081 | |||
1082 | # | ||
1083 | # USB Input Devices | ||
1084 | # | ||
1085 | CONFIG_USB_HID=y | ||
1086 | # CONFIG_HID_PID is not set | ||
1087 | # CONFIG_USB_HIDDEV is not set | ||
1088 | |||
1089 | # | ||
1090 | # Special HID drivers | ||
1091 | # | ||
1092 | CONFIG_HID_COMPAT=y | ||
1093 | CONFIG_HID_A4TECH=y | ||
1094 | # CONFIG_HID_APPLE is not set | ||
1095 | CONFIG_HID_BELKIN=y | ||
1096 | CONFIG_HID_BRIGHT=y | ||
1097 | CONFIG_HID_CHERRY=y | ||
1098 | # CONFIG_HID_CHICONY is not set | ||
1099 | CONFIG_HID_CYPRESS=y | ||
1100 | CONFIG_HID_DELL=y | ||
1101 | CONFIG_HID_EZKEY=y | ||
1102 | # CONFIG_HID_GYRATION is not set | ||
1103 | # CONFIG_HID_LOGITECH is not set | ||
1104 | # CONFIG_HID_MICROSOFT is not set | ||
1105 | # CONFIG_HID_MONTEREY is not set | ||
1106 | # CONFIG_HID_PANTHERLORD is not set | ||
1107 | # CONFIG_HID_PETALYNX is not set | ||
1108 | # CONFIG_HID_SAMSUNG is not set | ||
1109 | # CONFIG_HID_SONY is not set | ||
1110 | # CONFIG_HID_SUNPLUS is not set | ||
1111 | # CONFIG_THRUSTMASTER_FF is not set | ||
1112 | # CONFIG_ZEROPLUS_FF is not set | ||
892 | CONFIG_USB_SUPPORT=y | 1113 | CONFIG_USB_SUPPORT=y |
893 | CONFIG_USB_ARCH_HAS_HCD=y | 1114 | CONFIG_USB_ARCH_HAS_HCD=y |
894 | CONFIG_USB_ARCH_HAS_OHCI=y | 1115 | CONFIG_USB_ARCH_HAS_OHCI=y |
895 | CONFIG_USB_ARCH_HAS_EHCI=y | 1116 | CONFIG_USB_ARCH_HAS_EHCI=y |
896 | CONFIG_USB=y | 1117 | CONFIG_USB=y |
897 | # CONFIG_USB_DEBUG is not set | 1118 | # CONFIG_USB_DEBUG is not set |
1119 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
898 | 1120 | ||
899 | # | 1121 | # |
900 | # Miscellaneous USB options | 1122 | # Miscellaneous USB options |
@@ -903,14 +1125,20 @@ CONFIG_USB_DEVICEFS=y | |||
903 | # CONFIG_USB_DEVICE_CLASS is not set | 1125 | # CONFIG_USB_DEVICE_CLASS is not set |
904 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1126 | # CONFIG_USB_DYNAMIC_MINORS is not set |
905 | # CONFIG_USB_SUSPEND is not set | 1127 | # CONFIG_USB_SUSPEND is not set |
906 | # CONFIG_USB_PERSIST is not set | ||
907 | # CONFIG_USB_OTG is not set | 1128 | # CONFIG_USB_OTG is not set |
1129 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1130 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1131 | CONFIG_USB_MON=y | ||
1132 | # CONFIG_USB_WUSB is not set | ||
1133 | # CONFIG_USB_WUSB_CBAF is not set | ||
908 | 1134 | ||
909 | # | 1135 | # |
910 | # USB Host Controller Drivers | 1136 | # USB Host Controller Drivers |
911 | # | 1137 | # |
1138 | # CONFIG_USB_C67X00_HCD is not set | ||
912 | # CONFIG_USB_EHCI_HCD is not set | 1139 | # CONFIG_USB_EHCI_HCD is not set |
913 | # CONFIG_USB_ISP116X_HCD is not set | 1140 | # CONFIG_USB_ISP116X_HCD is not set |
1141 | # CONFIG_USB_ISP1760_HCD is not set | ||
914 | CONFIG_USB_OHCI_HCD=y | 1142 | CONFIG_USB_OHCI_HCD=y |
915 | CONFIG_USB_OHCI_HCD_PPC_SOC=y | 1143 | CONFIG_USB_OHCI_HCD_PPC_SOC=y |
916 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1144 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
@@ -923,12 +1151,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
923 | # CONFIG_USB_UHCI_HCD is not set | 1151 | # CONFIG_USB_UHCI_HCD is not set |
924 | # CONFIG_USB_SL811_HCD is not set | 1152 | # CONFIG_USB_SL811_HCD is not set |
925 | # CONFIG_USB_R8A66597_HCD is not set | 1153 | # CONFIG_USB_R8A66597_HCD is not set |
1154 | # CONFIG_USB_WHCI_HCD is not set | ||
1155 | # CONFIG_USB_HWA_HCD is not set | ||
1156 | # CONFIG_USB_MUSB_HDRC is not set | ||
926 | 1157 | ||
927 | # | 1158 | # |
928 | # USB Device Class drivers | 1159 | # USB Device Class drivers |
929 | # | 1160 | # |
930 | # CONFIG_USB_ACM is not set | 1161 | # CONFIG_USB_ACM is not set |
931 | # CONFIG_USB_PRINTER is not set | 1162 | # CONFIG_USB_PRINTER is not set |
1163 | # CONFIG_USB_WDM is not set | ||
1164 | # CONFIG_USB_TMC is not set | ||
932 | 1165 | ||
933 | # | 1166 | # |
934 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1167 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -948,7 +1181,9 @@ CONFIG_USB_STORAGE=y | |||
948 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1181 | # CONFIG_USB_STORAGE_SDDR55 is not set |
949 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1182 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
950 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1183 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1184 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
951 | # CONFIG_USB_STORAGE_KARMA is not set | 1185 | # CONFIG_USB_STORAGE_KARMA is not set |
1186 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
952 | # CONFIG_USB_LIBUSUAL is not set | 1187 | # CONFIG_USB_LIBUSUAL is not set |
953 | 1188 | ||
954 | # | 1189 | # |
@@ -956,15 +1191,10 @@ CONFIG_USB_STORAGE=y | |||
956 | # | 1191 | # |
957 | # CONFIG_USB_MDC800 is not set | 1192 | # CONFIG_USB_MDC800 is not set |
958 | # CONFIG_USB_MICROTEK is not set | 1193 | # CONFIG_USB_MICROTEK is not set |
959 | CONFIG_USB_MON=y | ||
960 | 1194 | ||
961 | # | 1195 | # |
962 | # USB port drivers | 1196 | # USB port drivers |
963 | # | 1197 | # |
964 | |||
965 | # | ||
966 | # USB Serial Converter support | ||
967 | # | ||
968 | # CONFIG_USB_SERIAL is not set | 1198 | # CONFIG_USB_SERIAL is not set |
969 | 1199 | ||
970 | # | 1200 | # |
@@ -973,7 +1203,7 @@ CONFIG_USB_MON=y | |||
973 | # CONFIG_USB_EMI62 is not set | 1203 | # CONFIG_USB_EMI62 is not set |
974 | # CONFIG_USB_EMI26 is not set | 1204 | # CONFIG_USB_EMI26 is not set |
975 | # CONFIG_USB_ADUTUX is not set | 1205 | # CONFIG_USB_ADUTUX is not set |
976 | # CONFIG_USB_AUERSWALD is not set | 1206 | # CONFIG_USB_SEVSEG is not set |
977 | # CONFIG_USB_RIO500 is not set | 1207 | # CONFIG_USB_RIO500 is not set |
978 | # CONFIG_USB_LEGOTOWER is not set | 1208 | # CONFIG_USB_LEGOTOWER is not set |
979 | # CONFIG_USB_LCD is not set | 1209 | # CONFIG_USB_LCD is not set |
@@ -989,18 +1219,14 @@ CONFIG_USB_MON=y | |||
989 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1219 | # CONFIG_USB_TRANCEVIBRATOR is not set |
990 | # CONFIG_USB_IOWARRIOR is not set | 1220 | # CONFIG_USB_IOWARRIOR is not set |
991 | # CONFIG_USB_TEST is not set | 1221 | # CONFIG_USB_TEST is not set |
992 | 1222 | # CONFIG_USB_ISIGHTFW is not set | |
993 | # | 1223 | # CONFIG_USB_VST is not set |
994 | # USB DSL modem support | ||
995 | # | ||
996 | |||
997 | # | ||
998 | # USB Gadget Support | ||
999 | # | ||
1000 | # CONFIG_USB_GADGET is not set | 1224 | # CONFIG_USB_GADGET is not set |
1225 | # CONFIG_UWB is not set | ||
1001 | # CONFIG_MMC is not set | 1226 | # CONFIG_MMC is not set |
1227 | # CONFIG_MEMSTICK is not set | ||
1002 | CONFIG_NEW_LEDS=y | 1228 | CONFIG_NEW_LEDS=y |
1003 | CONFIG_LEDS_CLASS=y | 1229 | # CONFIG_LEDS_CLASS is not set |
1004 | 1230 | ||
1005 | # | 1231 | # |
1006 | # LED drivers | 1232 | # LED drivers |
@@ -1009,17 +1235,15 @@ CONFIG_LEDS_CLASS=y | |||
1009 | # | 1235 | # |
1010 | # LED Triggers | 1236 | # LED Triggers |
1011 | # | 1237 | # |
1012 | CONFIG_LEDS_TRIGGERS=y | 1238 | # CONFIG_LEDS_TRIGGERS is not set |
1013 | CONFIG_LEDS_TRIGGER_TIMER=y | 1239 | # CONFIG_ACCESSIBILITY is not set |
1014 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
1015 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
1016 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
1017 | # CONFIG_RTC_CLASS is not set | 1242 | # CONFIG_RTC_CLASS is not set |
1018 | 1243 | # CONFIG_DMADEVICES is not set | |
1019 | # | ||
1020 | # Userspace I/O | ||
1021 | # | ||
1022 | # CONFIG_UIO is not set | 1244 | # CONFIG_UIO is not set |
1245 | # CONFIG_STAGING is not set | ||
1246 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
1023 | 1247 | ||
1024 | # | 1248 | # |
1025 | # File systems | 1249 | # File systems |
@@ -1031,21 +1255,19 @@ CONFIG_EXT3_FS=y | |||
1031 | CONFIG_EXT3_FS_XATTR=y | 1255 | CONFIG_EXT3_FS_XATTR=y |
1032 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1256 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
1033 | # CONFIG_EXT3_FS_SECURITY is not set | 1257 | # CONFIG_EXT3_FS_SECURITY is not set |
1034 | # CONFIG_EXT4DEV_FS is not set | 1258 | # CONFIG_EXT4_FS is not set |
1035 | CONFIG_JBD=y | 1259 | CONFIG_JBD=y |
1036 | CONFIG_FS_MBCACHE=y | 1260 | CONFIG_FS_MBCACHE=y |
1037 | # CONFIG_REISERFS_FS is not set | 1261 | # CONFIG_REISERFS_FS is not set |
1038 | # CONFIG_JFS_FS is not set | 1262 | # CONFIG_JFS_FS is not set |
1039 | # CONFIG_FS_POSIX_ACL is not set | 1263 | # CONFIG_FS_POSIX_ACL is not set |
1264 | CONFIG_FILE_LOCKING=y | ||
1040 | # CONFIG_XFS_FS is not set | 1265 | # CONFIG_XFS_FS is not set |
1041 | # CONFIG_GFS2_FS is not set | ||
1042 | # CONFIG_OCFS2_FS is not set | 1266 | # CONFIG_OCFS2_FS is not set |
1043 | # CONFIG_MINIX_FS is not set | 1267 | CONFIG_DNOTIFY=y |
1044 | # CONFIG_ROMFS_FS is not set | ||
1045 | CONFIG_INOTIFY=y | 1268 | CONFIG_INOTIFY=y |
1046 | CONFIG_INOTIFY_USER=y | 1269 | CONFIG_INOTIFY_USER=y |
1047 | # CONFIG_QUOTA is not set | 1270 | # CONFIG_QUOTA is not set |
1048 | CONFIG_DNOTIFY=y | ||
1049 | # CONFIG_AUTOFS_FS is not set | 1271 | # CONFIG_AUTOFS_FS is not set |
1050 | # CONFIG_AUTOFS4_FS is not set | 1272 | # CONFIG_AUTOFS4_FS is not set |
1051 | # CONFIG_FUSE_FS is not set | 1273 | # CONFIG_FUSE_FS is not set |
@@ -1072,6 +1294,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1072 | CONFIG_PROC_FS=y | 1294 | CONFIG_PROC_FS=y |
1073 | CONFIG_PROC_KCORE=y | 1295 | CONFIG_PROC_KCORE=y |
1074 | CONFIG_PROC_SYSCTL=y | 1296 | CONFIG_PROC_SYSCTL=y |
1297 | CONFIG_PROC_PAGE_MONITOR=y | ||
1075 | CONFIG_SYSFS=y | 1298 | CONFIG_SYSFS=y |
1076 | CONFIG_TMPFS=y | 1299 | CONFIG_TMPFS=y |
1077 | # CONFIG_TMPFS_POSIX_ACL is not set | 1300 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -1101,8 +1324,11 @@ CONFIG_JFFS2_RTIME=y | |||
1101 | # CONFIG_JFFS2_RUBIN is not set | 1324 | # CONFIG_JFFS2_RUBIN is not set |
1102 | CONFIG_CRAMFS=y | 1325 | CONFIG_CRAMFS=y |
1103 | # CONFIG_VXFS_FS is not set | 1326 | # CONFIG_VXFS_FS is not set |
1327 | # CONFIG_MINIX_FS is not set | ||
1328 | # CONFIG_OMFS_FS is not set | ||
1104 | # CONFIG_HPFS_FS is not set | 1329 | # CONFIG_HPFS_FS is not set |
1105 | # CONFIG_QNX4FS_FS is not set | 1330 | # CONFIG_QNX4FS_FS is not set |
1331 | # CONFIG_ROMFS_FS is not set | ||
1106 | # CONFIG_SYSV_FS is not set | 1332 | # CONFIG_SYSV_FS is not set |
1107 | # CONFIG_UFS_FS is not set | 1333 | # CONFIG_UFS_FS is not set |
1108 | CONFIG_NETWORK_FILESYSTEMS=y | 1334 | CONFIG_NETWORK_FILESYSTEMS=y |
@@ -1110,15 +1336,14 @@ CONFIG_NFS_FS=y | |||
1110 | CONFIG_NFS_V3=y | 1336 | CONFIG_NFS_V3=y |
1111 | # CONFIG_NFS_V3_ACL is not set | 1337 | # CONFIG_NFS_V3_ACL is not set |
1112 | CONFIG_NFS_V4=y | 1338 | CONFIG_NFS_V4=y |
1113 | # CONFIG_NFS_DIRECTIO is not set | ||
1114 | # CONFIG_NFSD is not set | ||
1115 | CONFIG_ROOT_NFS=y | 1339 | CONFIG_ROOT_NFS=y |
1340 | # CONFIG_NFSD is not set | ||
1116 | CONFIG_LOCKD=y | 1341 | CONFIG_LOCKD=y |
1117 | CONFIG_LOCKD_V4=y | 1342 | CONFIG_LOCKD_V4=y |
1118 | CONFIG_NFS_COMMON=y | 1343 | CONFIG_NFS_COMMON=y |
1119 | CONFIG_SUNRPC=y | 1344 | CONFIG_SUNRPC=y |
1120 | CONFIG_SUNRPC_GSS=y | 1345 | CONFIG_SUNRPC_GSS=y |
1121 | # CONFIG_SUNRPC_BIND34 is not set | 1346 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
1122 | CONFIG_RPCSEC_GSS_KRB5=y | 1347 | CONFIG_RPCSEC_GSS_KRB5=y |
1123 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1348 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1124 | # CONFIG_SMB_FS is not set | 1349 | # CONFIG_SMB_FS is not set |
@@ -1173,7 +1398,6 @@ CONFIG_NLS_ISO8859_1=y | |||
1173 | # CONFIG_NLS_KOI8_U is not set | 1398 | # CONFIG_NLS_KOI8_U is not set |
1174 | # CONFIG_NLS_UTF8 is not set | 1399 | # CONFIG_NLS_UTF8 is not set |
1175 | # CONFIG_DLM is not set | 1400 | # CONFIG_DLM is not set |
1176 | # CONFIG_UCC_SLOW is not set | ||
1177 | 1401 | ||
1178 | # | 1402 | # |
1179 | # Library routines | 1403 | # Library routines |
@@ -1181,6 +1405,7 @@ CONFIG_NLS_ISO8859_1=y | |||
1181 | CONFIG_BITREVERSE=y | 1405 | CONFIG_BITREVERSE=y |
1182 | # CONFIG_CRC_CCITT is not set | 1406 | # CONFIG_CRC_CCITT is not set |
1183 | # CONFIG_CRC16 is not set | 1407 | # CONFIG_CRC16 is not set |
1408 | # CONFIG_CRC_T10DIF is not set | ||
1184 | # CONFIG_CRC_ITU_T is not set | 1409 | # CONFIG_CRC_ITU_T is not set |
1185 | CONFIG_CRC32=y | 1410 | CONFIG_CRC32=y |
1186 | # CONFIG_CRC7 is not set | 1411 | # CONFIG_CRC7 is not set |
@@ -1191,7 +1416,7 @@ CONFIG_PLIST=y | |||
1191 | CONFIG_HAS_IOMEM=y | 1416 | CONFIG_HAS_IOMEM=y |
1192 | CONFIG_HAS_IOPORT=y | 1417 | CONFIG_HAS_IOPORT=y |
1193 | CONFIG_HAS_DMA=y | 1418 | CONFIG_HAS_DMA=y |
1194 | # CONFIG_INSTRUMENTATION is not set | 1419 | CONFIG_HAVE_LMB=y |
1195 | 1420 | ||
1196 | # | 1421 | # |
1197 | # Kernel hacking | 1422 | # Kernel hacking |
@@ -1199,6 +1424,7 @@ CONFIG_HAS_DMA=y | |||
1199 | CONFIG_PRINTK_TIME=y | 1424 | CONFIG_PRINTK_TIME=y |
1200 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1425 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1201 | CONFIG_ENABLE_MUST_CHECK=y | 1426 | CONFIG_ENABLE_MUST_CHECK=y |
1427 | CONFIG_FRAME_WARN=1024 | ||
1202 | # CONFIG_MAGIC_SYSRQ is not set | 1428 | # CONFIG_MAGIC_SYSRQ is not set |
1203 | # CONFIG_UNUSED_SYMBOLS is not set | 1429 | # CONFIG_UNUSED_SYMBOLS is not set |
1204 | # CONFIG_DEBUG_FS is not set | 1430 | # CONFIG_DEBUG_FS is not set |
@@ -1206,10 +1432,14 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1206 | CONFIG_DEBUG_KERNEL=y | 1432 | CONFIG_DEBUG_KERNEL=y |
1207 | # CONFIG_DEBUG_SHIRQ is not set | 1433 | # CONFIG_DEBUG_SHIRQ is not set |
1208 | CONFIG_DETECT_SOFTLOCKUP=y | 1434 | CONFIG_DETECT_SOFTLOCKUP=y |
1435 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1436 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1209 | CONFIG_SCHED_DEBUG=y | 1437 | CONFIG_SCHED_DEBUG=y |
1210 | # CONFIG_SCHEDSTATS is not set | 1438 | # CONFIG_SCHEDSTATS is not set |
1211 | # CONFIG_TIMER_STATS is not set | 1439 | # CONFIG_TIMER_STATS is not set |
1440 | # CONFIG_DEBUG_OBJECTS is not set | ||
1212 | # CONFIG_SLUB_DEBUG_ON is not set | 1441 | # CONFIG_SLUB_DEBUG_ON is not set |
1442 | # CONFIG_SLUB_STATS is not set | ||
1213 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1443 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1214 | # CONFIG_RT_MUTEX_TESTER is not set | 1444 | # CONFIG_RT_MUTEX_TESTER is not set |
1215 | # CONFIG_DEBUG_SPINLOCK is not set | 1445 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1220,17 +1450,39 @@ CONFIG_SCHED_DEBUG=y | |||
1220 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1450 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1221 | CONFIG_DEBUG_INFO=y | 1451 | CONFIG_DEBUG_INFO=y |
1222 | # CONFIG_DEBUG_VM is not set | 1452 | # CONFIG_DEBUG_VM is not set |
1453 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1454 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1223 | # CONFIG_DEBUG_LIST is not set | 1455 | # CONFIG_DEBUG_LIST is not set |
1224 | # CONFIG_DEBUG_SG is not set | 1456 | # CONFIG_DEBUG_SG is not set |
1225 | CONFIG_FORCED_INLINING=y | ||
1226 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1457 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1227 | # CONFIG_RCU_TORTURE_TEST is not set | 1458 | # CONFIG_RCU_TORTURE_TEST is not set |
1459 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1460 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1461 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1228 | # CONFIG_FAULT_INJECTION is not set | 1462 | # CONFIG_FAULT_INJECTION is not set |
1463 | # CONFIG_LATENCYTOP is not set | ||
1464 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1465 | |||
1466 | # | ||
1467 | # Tracers | ||
1468 | # | ||
1469 | # CONFIG_FUNCTION_TRACER is not set | ||
1470 | # CONFIG_SCHED_TRACER is not set | ||
1471 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1472 | # CONFIG_BOOT_TRACER is not set | ||
1473 | # CONFIG_STACK_TRACER is not set | ||
1474 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1229 | # CONFIG_SAMPLES is not set | 1475 | # CONFIG_SAMPLES is not set |
1476 | CONFIG_HAVE_ARCH_KGDB=y | ||
1477 | # CONFIG_KGDB is not set | ||
1230 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1478 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1231 | # CONFIG_DEBUG_STACK_USAGE is not set | 1479 | # CONFIG_DEBUG_STACK_USAGE is not set |
1232 | # CONFIG_DEBUG_PAGEALLOC is not set | 1480 | # CONFIG_DEBUG_PAGEALLOC is not set |
1233 | # CONFIG_DEBUGGER is not set | 1481 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1482 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1483 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1484 | # CONFIG_XMON is not set | ||
1485 | # CONFIG_IRQSTACKS is not set | ||
1234 | # CONFIG_BDI_SWITCH is not set | 1486 | # CONFIG_BDI_SWITCH is not set |
1235 | # CONFIG_BOOTX_TEXT is not set | 1487 | # CONFIG_BOOTX_TEXT is not set |
1236 | # CONFIG_PPC_EARLY_DEBUG is not set | 1488 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1240,47 +1492,98 @@ CONFIG_FORCED_INLINING=y | |||
1240 | # | 1492 | # |
1241 | # CONFIG_KEYS is not set | 1493 | # CONFIG_KEYS is not set |
1242 | # CONFIG_SECURITY is not set | 1494 | # CONFIG_SECURITY is not set |
1495 | # CONFIG_SECURITYFS is not set | ||
1243 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1496 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1244 | CONFIG_CRYPTO=y | 1497 | CONFIG_CRYPTO=y |
1498 | |||
1499 | # | ||
1500 | # Crypto core or helper | ||
1501 | # | ||
1502 | # CONFIG_CRYPTO_FIPS is not set | ||
1245 | CONFIG_CRYPTO_ALGAPI=y | 1503 | CONFIG_CRYPTO_ALGAPI=y |
1504 | CONFIG_CRYPTO_AEAD=y | ||
1246 | CONFIG_CRYPTO_BLKCIPHER=y | 1505 | CONFIG_CRYPTO_BLKCIPHER=y |
1506 | CONFIG_CRYPTO_HASH=y | ||
1507 | CONFIG_CRYPTO_RNG=y | ||
1247 | CONFIG_CRYPTO_MANAGER=y | 1508 | CONFIG_CRYPTO_MANAGER=y |
1509 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1510 | # CONFIG_CRYPTO_NULL is not set | ||
1511 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1512 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1513 | # CONFIG_CRYPTO_TEST is not set | ||
1514 | |||
1515 | # | ||
1516 | # Authenticated Encryption with Associated Data | ||
1517 | # | ||
1518 | # CONFIG_CRYPTO_CCM is not set | ||
1519 | # CONFIG_CRYPTO_GCM is not set | ||
1520 | # CONFIG_CRYPTO_SEQIV is not set | ||
1521 | |||
1522 | # | ||
1523 | # Block modes | ||
1524 | # | ||
1525 | CONFIG_CRYPTO_CBC=y | ||
1526 | # CONFIG_CRYPTO_CTR is not set | ||
1527 | # CONFIG_CRYPTO_CTS is not set | ||
1528 | # CONFIG_CRYPTO_ECB is not set | ||
1529 | # CONFIG_CRYPTO_LRW is not set | ||
1530 | # CONFIG_CRYPTO_PCBC is not set | ||
1531 | # CONFIG_CRYPTO_XTS is not set | ||
1532 | |||
1533 | # | ||
1534 | # Hash modes | ||
1535 | # | ||
1248 | # CONFIG_CRYPTO_HMAC is not set | 1536 | # CONFIG_CRYPTO_HMAC is not set |
1249 | # CONFIG_CRYPTO_XCBC is not set | 1537 | # CONFIG_CRYPTO_XCBC is not set |
1250 | # CONFIG_CRYPTO_NULL is not set | 1538 | |
1539 | # | ||
1540 | # Digest | ||
1541 | # | ||
1542 | # CONFIG_CRYPTO_CRC32C is not set | ||
1251 | # CONFIG_CRYPTO_MD4 is not set | 1543 | # CONFIG_CRYPTO_MD4 is not set |
1252 | CONFIG_CRYPTO_MD5=y | 1544 | CONFIG_CRYPTO_MD5=y |
1545 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1546 | # CONFIG_CRYPTO_RMD128 is not set | ||
1547 | # CONFIG_CRYPTO_RMD160 is not set | ||
1548 | # CONFIG_CRYPTO_RMD256 is not set | ||
1549 | # CONFIG_CRYPTO_RMD320 is not set | ||
1253 | # CONFIG_CRYPTO_SHA1 is not set | 1550 | # CONFIG_CRYPTO_SHA1 is not set |
1254 | # CONFIG_CRYPTO_SHA256 is not set | 1551 | # CONFIG_CRYPTO_SHA256 is not set |
1255 | # CONFIG_CRYPTO_SHA512 is not set | 1552 | # CONFIG_CRYPTO_SHA512 is not set |
1256 | # CONFIG_CRYPTO_WP512 is not set | ||
1257 | # CONFIG_CRYPTO_TGR192 is not set | 1553 | # CONFIG_CRYPTO_TGR192 is not set |
1258 | # CONFIG_CRYPTO_GF128MUL is not set | 1554 | # CONFIG_CRYPTO_WP512 is not set |
1259 | # CONFIG_CRYPTO_ECB is not set | 1555 | |
1260 | CONFIG_CRYPTO_CBC=y | 1556 | # |
1261 | # CONFIG_CRYPTO_PCBC is not set | 1557 | # Ciphers |
1262 | # CONFIG_CRYPTO_LRW is not set | 1558 | # |
1263 | # CONFIG_CRYPTO_XTS is not set | ||
1264 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1265 | CONFIG_CRYPTO_DES=y | ||
1266 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1267 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1268 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1269 | # CONFIG_CRYPTO_SERPENT is not set | ||
1270 | # CONFIG_CRYPTO_AES is not set | 1559 | # CONFIG_CRYPTO_AES is not set |
1560 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1561 | # CONFIG_CRYPTO_ARC4 is not set | ||
1562 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1563 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1271 | # CONFIG_CRYPTO_CAST5 is not set | 1564 | # CONFIG_CRYPTO_CAST5 is not set |
1272 | # CONFIG_CRYPTO_CAST6 is not set | 1565 | # CONFIG_CRYPTO_CAST6 is not set |
1273 | # CONFIG_CRYPTO_TEA is not set | 1566 | CONFIG_CRYPTO_DES=y |
1274 | # CONFIG_CRYPTO_ARC4 is not set | 1567 | # CONFIG_CRYPTO_FCRYPT is not set |
1275 | # CONFIG_CRYPTO_KHAZAD is not set | 1568 | # CONFIG_CRYPTO_KHAZAD is not set |
1276 | # CONFIG_CRYPTO_ANUBIS is not set | 1569 | # CONFIG_CRYPTO_SALSA20 is not set |
1277 | # CONFIG_CRYPTO_SEED is not set | 1570 | # CONFIG_CRYPTO_SEED is not set |
1571 | # CONFIG_CRYPTO_SERPENT is not set | ||
1572 | # CONFIG_CRYPTO_TEA is not set | ||
1573 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1574 | |||
1575 | # | ||
1576 | # Compression | ||
1577 | # | ||
1278 | # CONFIG_CRYPTO_DEFLATE is not set | 1578 | # CONFIG_CRYPTO_DEFLATE is not set |
1279 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1579 | # CONFIG_CRYPTO_LZO is not set |
1280 | # CONFIG_CRYPTO_CRC32C is not set | 1580 | |
1281 | # CONFIG_CRYPTO_CAMELLIA is not set | 1581 | # |
1282 | # CONFIG_CRYPTO_TEST is not set | 1582 | # Random Number Generation |
1283 | # CONFIG_CRYPTO_AUTHENC is not set | 1583 | # |
1584 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1284 | CONFIG_CRYPTO_HW=y | 1585 | CONFIG_CRYPTO_HW=y |
1586 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1285 | CONFIG_PPC_CLOCK=y | 1587 | CONFIG_PPC_CLOCK=y |
1286 | CONFIG_PPC_LIB_RHEAP=y | 1588 | CONFIG_PPC_LIB_RHEAP=y |
1589 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 15eb30c9b3f9..d582014b0a38 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
@@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y | |||
682 | # CONFIG_BROADCOM_PHY is not set | 682 | # CONFIG_BROADCOM_PHY is not set |
683 | CONFIG_ICPLUS_PHY=y | 683 | CONFIG_ICPLUS_PHY=y |
684 | # CONFIG_REALTEK_PHY is not set | 684 | # CONFIG_REALTEK_PHY is not set |
685 | # CONFIG_FIXED_PHY is not set | 685 | CONFIG_FIXED_PHY=y |
686 | # CONFIG_MDIO_BITBANG is not set | 686 | # CONFIG_MDIO_BITBANG is not set |
687 | CONFIG_NET_ETHERNET=y | 687 | CONFIG_NET_ETHERNET=y |
688 | CONFIG_MII=y | 688 | CONFIG_MII=y |
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig index c15c91deb2ab..4256e2c4534b 100644 --- a/arch/powerpc/configs/ppc40x_defconfig +++ b/arch/powerpc/configs/ppc40x_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc2 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Tue Oct 28 08:56:44 2008 | 4 | # Fri Nov 14 09:54:44 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -500,15 +500,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
500 | # CONFIG_BLK_DEV_XIP is not set | 500 | # CONFIG_BLK_DEV_XIP is not set |
501 | # CONFIG_CDROM_PKTCDVD is not set | 501 | # CONFIG_CDROM_PKTCDVD is not set |
502 | # CONFIG_ATA_OVER_ETH is not set | 502 | # CONFIG_ATA_OVER_ETH is not set |
503 | # CONFIG_XILINX_SYSACE is not set | 503 | CONFIG_XILINX_SYSACE=m |
504 | # CONFIG_BLK_DEV_HD is not set | 504 | # CONFIG_BLK_DEV_HD is not set |
505 | CONFIG_MISC_DEVICES=y | 505 | CONFIG_MISC_DEVICES=y |
506 | # CONFIG_PHANTOM is not set | 506 | # CONFIG_PHANTOM is not set |
507 | # CONFIG_EEPROM_93CX6 is not set | 507 | # CONFIG_EEPROM_93CX6 is not set |
508 | # CONFIG_SGI_IOC4 is not set | 508 | # CONFIG_SGI_IOC4 is not set |
509 | # CONFIG_TIFM_CORE is not set | 509 | # CONFIG_TIFM_CORE is not set |
510 | # CONFIG_ICS932S401 is not set | ||
510 | # CONFIG_ENCLOSURE_SERVICES is not set | 511 | # CONFIG_ENCLOSURE_SERVICES is not set |
511 | # CONFIG_HP_ILO is not set | 512 | # CONFIG_HP_ILO is not set |
513 | # CONFIG_C2PORT is not set | ||
512 | CONFIG_HAVE_IDE=y | 514 | CONFIG_HAVE_IDE=y |
513 | # CONFIG_IDE is not set | 515 | # CONFIG_IDE is not set |
514 | 516 | ||
@@ -632,7 +634,13 @@ CONFIG_NETDEV_10000=y | |||
632 | # | 634 | # |
633 | # Hardware I/O ports | 635 | # Hardware I/O ports |
634 | # | 636 | # |
635 | # CONFIG_SERIO is not set | 637 | CONFIG_SERIO=m |
638 | # CONFIG_SERIO_I8042 is not set | ||
639 | # CONFIG_SERIO_SERPORT is not set | ||
640 | # CONFIG_SERIO_PCIPS2 is not set | ||
641 | # CONFIG_SERIO_LIBPS2 is not set | ||
642 | # CONFIG_SERIO_RAW is not set | ||
643 | CONFIG_SERIO_XILINX_XPS_PS2=m | ||
636 | # CONFIG_GAMEPORT is not set | 644 | # CONFIG_GAMEPORT is not set |
637 | 645 | ||
638 | # | 646 | # |
@@ -660,7 +668,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
660 | # | 668 | # |
661 | # Non-8250 serial port support | 669 | # Non-8250 serial port support |
662 | # | 670 | # |
663 | # CONFIG_SERIAL_UARTLITE is not set | 671 | CONFIG_SERIAL_UARTLITE=y |
672 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | ||
664 | CONFIG_SERIAL_CORE=y | 673 | CONFIG_SERIAL_CORE=y |
665 | CONFIG_SERIAL_CORE_CONSOLE=y | 674 | CONFIG_SERIAL_CORE_CONSOLE=y |
666 | # CONFIG_SERIAL_JSM is not set | 675 | # CONFIG_SERIAL_JSM is not set |
@@ -757,6 +766,11 @@ CONFIG_GPIOLIB=y | |||
757 | # CONFIG_GPIO_SYSFS is not set | 766 | # CONFIG_GPIO_SYSFS is not set |
758 | 767 | ||
759 | # | 768 | # |
769 | # Memory mapped GPIO expanders: | ||
770 | # | ||
771 | CONFIG_GPIO_XILINX=y | ||
772 | |||
773 | # | ||
760 | # I2C GPIO expanders: | 774 | # I2C GPIO expanders: |
761 | # | 775 | # |
762 | # CONFIG_GPIO_MAX732X is not set | 776 | # CONFIG_GPIO_MAX732X is not set |
@@ -776,11 +790,11 @@ CONFIG_GPIOLIB=y | |||
776 | # CONFIG_HWMON is not set | 790 | # CONFIG_HWMON is not set |
777 | CONFIG_THERMAL=y | 791 | CONFIG_THERMAL=y |
778 | # CONFIG_WATCHDOG is not set | 792 | # CONFIG_WATCHDOG is not set |
793 | CONFIG_SSB_POSSIBLE=y | ||
779 | 794 | ||
780 | # | 795 | # |
781 | # Sonics Silicon Backplane | 796 | # Sonics Silicon Backplane |
782 | # | 797 | # |
783 | CONFIG_SSB_POSSIBLE=y | ||
784 | # CONFIG_SSB is not set | 798 | # CONFIG_SSB is not set |
785 | 799 | ||
786 | # | 800 | # |
@@ -792,6 +806,7 @@ CONFIG_SSB_POSSIBLE=y | |||
792 | # CONFIG_MFD_TMIO is not set | 806 | # CONFIG_MFD_TMIO is not set |
793 | # CONFIG_MFD_WM8400 is not set | 807 | # CONFIG_MFD_WM8400 is not set |
794 | # CONFIG_MFD_WM8350_I2C is not set | 808 | # CONFIG_MFD_WM8350_I2C is not set |
809 | # CONFIG_REGULATOR is not set | ||
795 | 810 | ||
796 | # | 811 | # |
797 | # Multimedia devices | 812 | # Multimedia devices |
@@ -816,13 +831,65 @@ CONFIG_SSB_POSSIBLE=y | |||
816 | # CONFIG_DRM is not set | 831 | # CONFIG_DRM is not set |
817 | # CONFIG_VGASTATE is not set | 832 | # CONFIG_VGASTATE is not set |
818 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 833 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
819 | # CONFIG_FB is not set | 834 | CONFIG_FB=m |
835 | # CONFIG_FIRMWARE_EDID is not set | ||
836 | # CONFIG_FB_DDC is not set | ||
837 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
838 | CONFIG_FB_CFB_FILLRECT=m | ||
839 | CONFIG_FB_CFB_COPYAREA=m | ||
840 | CONFIG_FB_CFB_IMAGEBLIT=m | ||
841 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
842 | # CONFIG_FB_SYS_FILLRECT is not set | ||
843 | # CONFIG_FB_SYS_COPYAREA is not set | ||
844 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
845 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
846 | # CONFIG_FB_SYS_FOPS is not set | ||
847 | # CONFIG_FB_SVGALIB is not set | ||
848 | # CONFIG_FB_MACMODES is not set | ||
849 | # CONFIG_FB_BACKLIGHT is not set | ||
850 | # CONFIG_FB_MODE_HELPERS is not set | ||
851 | # CONFIG_FB_TILEBLITTING is not set | ||
852 | |||
853 | # | ||
854 | # Frame buffer hardware drivers | ||
855 | # | ||
856 | # CONFIG_FB_CIRRUS is not set | ||
857 | # CONFIG_FB_PM2 is not set | ||
858 | # CONFIG_FB_CYBER2000 is not set | ||
859 | # CONFIG_FB_VGA16 is not set | ||
860 | # CONFIG_FB_UVESA is not set | ||
861 | # CONFIG_FB_S1D13XXX is not set | ||
862 | # CONFIG_FB_NVIDIA is not set | ||
863 | # CONFIG_FB_RIVA is not set | ||
864 | # CONFIG_FB_MATROX is not set | ||
865 | # CONFIG_FB_RADEON is not set | ||
866 | # CONFIG_FB_ATY128 is not set | ||
867 | # CONFIG_FB_ATY is not set | ||
868 | # CONFIG_FB_S3 is not set | ||
869 | # CONFIG_FB_SAVAGE is not set | ||
870 | # CONFIG_FB_SIS is not set | ||
871 | # CONFIG_FB_VIA is not set | ||
872 | # CONFIG_FB_NEOMAGIC is not set | ||
873 | # CONFIG_FB_KYRO is not set | ||
874 | # CONFIG_FB_3DFX is not set | ||
875 | # CONFIG_FB_VOODOO1 is not set | ||
876 | # CONFIG_FB_VT8623 is not set | ||
877 | # CONFIG_FB_TRIDENT is not set | ||
878 | # CONFIG_FB_ARK is not set | ||
879 | # CONFIG_FB_PM3 is not set | ||
880 | # CONFIG_FB_CARMINE is not set | ||
881 | # CONFIG_FB_IBM_GXT4500 is not set | ||
882 | CONFIG_FB_XILINX=m | ||
883 | # CONFIG_FB_VIRTUAL is not set | ||
884 | # CONFIG_FB_METRONOME is not set | ||
885 | # CONFIG_FB_MB862XX is not set | ||
820 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 886 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
821 | 887 | ||
822 | # | 888 | # |
823 | # Display device support | 889 | # Display device support |
824 | # | 890 | # |
825 | # CONFIG_DISPLAY_SUPPORT is not set | 891 | # CONFIG_DISPLAY_SUPPORT is not set |
892 | # CONFIG_LOGO is not set | ||
826 | # CONFIG_SOUND is not set | 893 | # CONFIG_SOUND is not set |
827 | CONFIG_USB_SUPPORT=y | 894 | CONFIG_USB_SUPPORT=y |
828 | CONFIG_USB_ARCH_HAS_HCD=y | 895 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -851,6 +918,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
851 | # CONFIG_DMADEVICES is not set | 918 | # CONFIG_DMADEVICES is not set |
852 | # CONFIG_UIO is not set | 919 | # CONFIG_UIO is not set |
853 | # CONFIG_STAGING is not set | 920 | # CONFIG_STAGING is not set |
921 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
854 | 922 | ||
855 | # | 923 | # |
856 | # File systems | 924 | # File systems |
@@ -1077,10 +1145,12 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1077 | # CONFIG_FAULT_INJECTION is not set | 1145 | # CONFIG_FAULT_INJECTION is not set |
1078 | # CONFIG_LATENCYTOP is not set | 1146 | # CONFIG_LATENCYTOP is not set |
1079 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1147 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1080 | CONFIG_NOP_TRACER=y | 1148 | CONFIG_HAVE_FUNCTION_TRACER=y |
1081 | CONFIG_HAVE_FTRACE=y | 1149 | |
1082 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1150 | # |
1083 | # CONFIG_FTRACE is not set | 1151 | # Tracers |
1152 | # | ||
1153 | # CONFIG_FUNCTION_TRACER is not set | ||
1084 | # CONFIG_SCHED_TRACER is not set | 1154 | # CONFIG_SCHED_TRACER is not set |
1085 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1155 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1086 | # CONFIG_BOOT_TRACER is not set | 1156 | # CONFIG_BOOT_TRACER is not set |
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig index 55edbd545b61..cfc94cfcf4cb 100644 --- a/arch/powerpc/configs/ppc44x_defconfig +++ b/arch/powerpc/configs/ppc44x_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc2 | 3 | # Linux kernel version: 2.6.28-rc4 |
4 | # Tue Oct 28 09:28:58 2008 | 4 | # Fri Nov 14 10:06:19 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -506,15 +506,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
506 | # CONFIG_BLK_DEV_XIP is not set | 506 | # CONFIG_BLK_DEV_XIP is not set |
507 | # CONFIG_CDROM_PKTCDVD is not set | 507 | # CONFIG_CDROM_PKTCDVD is not set |
508 | # CONFIG_ATA_OVER_ETH is not set | 508 | # CONFIG_ATA_OVER_ETH is not set |
509 | # CONFIG_XILINX_SYSACE is not set | 509 | CONFIG_XILINX_SYSACE=m |
510 | # CONFIG_BLK_DEV_HD is not set | 510 | # CONFIG_BLK_DEV_HD is not set |
511 | CONFIG_MISC_DEVICES=y | 511 | CONFIG_MISC_DEVICES=y |
512 | # CONFIG_PHANTOM is not set | 512 | # CONFIG_PHANTOM is not set |
513 | # CONFIG_EEPROM_93CX6 is not set | 513 | # CONFIG_EEPROM_93CX6 is not set |
514 | # CONFIG_SGI_IOC4 is not set | 514 | # CONFIG_SGI_IOC4 is not set |
515 | # CONFIG_TIFM_CORE is not set | 515 | # CONFIG_TIFM_CORE is not set |
516 | # CONFIG_ICS932S401 is not set | ||
516 | # CONFIG_ENCLOSURE_SERVICES is not set | 517 | # CONFIG_ENCLOSURE_SERVICES is not set |
517 | # CONFIG_HP_ILO is not set | 518 | # CONFIG_HP_ILO is not set |
519 | # CONFIG_C2PORT is not set | ||
518 | CONFIG_HAVE_IDE=y | 520 | CONFIG_HAVE_IDE=y |
519 | # CONFIG_IDE is not set | 521 | # CONFIG_IDE is not set |
520 | 522 | ||
@@ -680,7 +682,13 @@ CONFIG_NETDEV_10000=y | |||
680 | # | 682 | # |
681 | # Hardware I/O ports | 683 | # Hardware I/O ports |
682 | # | 684 | # |
683 | # CONFIG_SERIO is not set | 685 | CONFIG_SERIO=m |
686 | # CONFIG_SERIO_I8042 is not set | ||
687 | # CONFIG_SERIO_SERPORT is not set | ||
688 | # CONFIG_SERIO_PCIPS2 is not set | ||
689 | # CONFIG_SERIO_LIBPS2 is not set | ||
690 | # CONFIG_SERIO_RAW is not set | ||
691 | CONFIG_SERIO_XILINX_XPS_PS2=m | ||
684 | # CONFIG_GAMEPORT is not set | 692 | # CONFIG_GAMEPORT is not set |
685 | 693 | ||
686 | # | 694 | # |
@@ -708,7 +716,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
708 | # | 716 | # |
709 | # Non-8250 serial port support | 717 | # Non-8250 serial port support |
710 | # | 718 | # |
711 | # CONFIG_SERIAL_UARTLITE is not set | 719 | CONFIG_SERIAL_UARTLITE=y |
720 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | ||
712 | CONFIG_SERIAL_CORE=y | 721 | CONFIG_SERIAL_CORE=y |
713 | CONFIG_SERIAL_CORE_CONSOLE=y | 722 | CONFIG_SERIAL_CORE_CONSOLE=y |
714 | # CONFIG_SERIAL_JSM is not set | 723 | # CONFIG_SERIAL_JSM is not set |
@@ -806,6 +815,11 @@ CONFIG_GPIOLIB=y | |||
806 | # CONFIG_GPIO_SYSFS is not set | 815 | # CONFIG_GPIO_SYSFS is not set |
807 | 816 | ||
808 | # | 817 | # |
818 | # Memory mapped GPIO expanders: | ||
819 | # | ||
820 | CONFIG_GPIO_XILINX=y | ||
821 | |||
822 | # | ||
809 | # I2C GPIO expanders: | 823 | # I2C GPIO expanders: |
810 | # | 824 | # |
811 | # CONFIG_GPIO_MAX732X is not set | 825 | # CONFIG_GPIO_MAX732X is not set |
@@ -826,11 +840,11 @@ CONFIG_GPIOLIB=y | |||
826 | # CONFIG_THERMAL is not set | 840 | # CONFIG_THERMAL is not set |
827 | # CONFIG_THERMAL_HWMON is not set | 841 | # CONFIG_THERMAL_HWMON is not set |
828 | # CONFIG_WATCHDOG is not set | 842 | # CONFIG_WATCHDOG is not set |
843 | CONFIG_SSB_POSSIBLE=y | ||
829 | 844 | ||
830 | # | 845 | # |
831 | # Sonics Silicon Backplane | 846 | # Sonics Silicon Backplane |
832 | # | 847 | # |
833 | CONFIG_SSB_POSSIBLE=y | ||
834 | # CONFIG_SSB is not set | 848 | # CONFIG_SSB is not set |
835 | 849 | ||
836 | # | 850 | # |
@@ -842,6 +856,7 @@ CONFIG_SSB_POSSIBLE=y | |||
842 | # CONFIG_MFD_TMIO is not set | 856 | # CONFIG_MFD_TMIO is not set |
843 | # CONFIG_MFD_WM8400 is not set | 857 | # CONFIG_MFD_WM8400 is not set |
844 | # CONFIG_MFD_WM8350_I2C is not set | 858 | # CONFIG_MFD_WM8350_I2C is not set |
859 | # CONFIG_REGULATOR is not set | ||
845 | 860 | ||
846 | # | 861 | # |
847 | # Multimedia devices | 862 | # Multimedia devices |
@@ -866,13 +881,65 @@ CONFIG_SSB_POSSIBLE=y | |||
866 | # CONFIG_DRM is not set | 881 | # CONFIG_DRM is not set |
867 | # CONFIG_VGASTATE is not set | 882 | # CONFIG_VGASTATE is not set |
868 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 883 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
869 | # CONFIG_FB is not set | 884 | CONFIG_FB=m |
885 | # CONFIG_FIRMWARE_EDID is not set | ||
886 | # CONFIG_FB_DDC is not set | ||
887 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
888 | CONFIG_FB_CFB_FILLRECT=m | ||
889 | CONFIG_FB_CFB_COPYAREA=m | ||
890 | CONFIG_FB_CFB_IMAGEBLIT=m | ||
891 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
892 | # CONFIG_FB_SYS_FILLRECT is not set | ||
893 | # CONFIG_FB_SYS_COPYAREA is not set | ||
894 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
895 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
896 | # CONFIG_FB_SYS_FOPS is not set | ||
897 | # CONFIG_FB_SVGALIB is not set | ||
898 | # CONFIG_FB_MACMODES is not set | ||
899 | # CONFIG_FB_BACKLIGHT is not set | ||
900 | # CONFIG_FB_MODE_HELPERS is not set | ||
901 | # CONFIG_FB_TILEBLITTING is not set | ||
902 | |||
903 | # | ||
904 | # Frame buffer hardware drivers | ||
905 | # | ||
906 | # CONFIG_FB_CIRRUS is not set | ||
907 | # CONFIG_FB_PM2 is not set | ||
908 | # CONFIG_FB_CYBER2000 is not set | ||
909 | # CONFIG_FB_VGA16 is not set | ||
910 | # CONFIG_FB_UVESA is not set | ||
911 | # CONFIG_FB_S1D13XXX is not set | ||
912 | # CONFIG_FB_NVIDIA is not set | ||
913 | # CONFIG_FB_RIVA is not set | ||
914 | # CONFIG_FB_MATROX is not set | ||
915 | # CONFIG_FB_RADEON is not set | ||
916 | # CONFIG_FB_ATY128 is not set | ||
917 | # CONFIG_FB_ATY is not set | ||
918 | # CONFIG_FB_S3 is not set | ||
919 | # CONFIG_FB_SAVAGE is not set | ||
920 | # CONFIG_FB_SIS is not set | ||
921 | # CONFIG_FB_VIA is not set | ||
922 | # CONFIG_FB_NEOMAGIC is not set | ||
923 | # CONFIG_FB_KYRO is not set | ||
924 | # CONFIG_FB_3DFX is not set | ||
925 | # CONFIG_FB_VOODOO1 is not set | ||
926 | # CONFIG_FB_VT8623 is not set | ||
927 | # CONFIG_FB_TRIDENT is not set | ||
928 | # CONFIG_FB_ARK is not set | ||
929 | # CONFIG_FB_PM3 is not set | ||
930 | # CONFIG_FB_CARMINE is not set | ||
931 | # CONFIG_FB_IBM_GXT4500 is not set | ||
932 | CONFIG_FB_XILINX=m | ||
933 | # CONFIG_FB_VIRTUAL is not set | ||
934 | # CONFIG_FB_METRONOME is not set | ||
935 | # CONFIG_FB_MB862XX is not set | ||
870 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 936 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
871 | 937 | ||
872 | # | 938 | # |
873 | # Display device support | 939 | # Display device support |
874 | # | 940 | # |
875 | # CONFIG_DISPLAY_SUPPORT is not set | 941 | # CONFIG_DISPLAY_SUPPORT is not set |
942 | # CONFIG_LOGO is not set | ||
876 | # CONFIG_SOUND is not set | 943 | # CONFIG_SOUND is not set |
877 | CONFIG_USB_SUPPORT=y | 944 | CONFIG_USB_SUPPORT=y |
878 | CONFIG_USB_ARCH_HAS_HCD=y | 945 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -1002,6 +1069,7 @@ CONFIG_USB_STORAGE=m | |||
1002 | # CONFIG_DMADEVICES is not set | 1069 | # CONFIG_DMADEVICES is not set |
1003 | # CONFIG_UIO is not set | 1070 | # CONFIG_UIO is not set |
1004 | # CONFIG_STAGING is not set | 1071 | # CONFIG_STAGING is not set |
1072 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
1005 | 1073 | ||
1006 | # | 1074 | # |
1007 | # File systems | 1075 | # File systems |
@@ -1227,10 +1295,12 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1227 | # CONFIG_FAULT_INJECTION is not set | 1295 | # CONFIG_FAULT_INJECTION is not set |
1228 | # CONFIG_LATENCYTOP is not set | 1296 | # CONFIG_LATENCYTOP is not set |
1229 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1297 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1230 | CONFIG_NOP_TRACER=y | 1298 | CONFIG_HAVE_FUNCTION_TRACER=y |
1231 | CONFIG_HAVE_FTRACE=y | 1299 | |
1232 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1300 | # |
1233 | # CONFIG_FTRACE is not set | 1301 | # Tracers |
1302 | # | ||
1303 | # CONFIG_FUNCTION_TRACER is not set | ||
1234 | # CONFIG_SCHED_TRACER is not set | 1304 | # CONFIG_SCHED_TRACER is not set |
1235 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1305 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1236 | # CONFIG_BOOT_TRACER is not set | 1306 | # CONFIG_BOOT_TRACER is not set |
diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h index b298f7a631e6..e5f2ae8362f7 100644 --- a/arch/powerpc/include/asm/ftrace.h +++ b/arch/powerpc/include/asm/ftrace.h | |||
@@ -7,7 +7,19 @@ | |||
7 | 7 | ||
8 | #ifndef __ASSEMBLY__ | 8 | #ifndef __ASSEMBLY__ |
9 | extern void _mcount(void); | 9 | extern void _mcount(void); |
10 | #endif | 10 | |
11 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
12 | static inline unsigned long ftrace_call_adjust(unsigned long addr) | ||
13 | { | ||
14 | /* reloction of mcount call site is the same as the address */ | ||
15 | return addr; | ||
16 | } | ||
17 | |||
18 | struct dyn_arch_ftrace { | ||
19 | struct module *mod; | ||
20 | }; | ||
21 | #endif /* CONFIG_DYNAMIC_FTRACE */ | ||
22 | #endif /* __ASSEMBLY__ */ | ||
11 | 23 | ||
12 | #endif | 24 | #endif |
13 | 25 | ||
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index 8931ba729d2b..bb62ad876de3 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h | |||
@@ -104,4 +104,6 @@ static inline void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid) | |||
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu); | ||
108 | |||
107 | #endif /* __POWERPC_KVM_PPC_H__ */ | 109 | #endif /* __POWERPC_KVM_PPC_H__ */ |
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h index 5a441742ffba..68b752626808 100644 --- a/arch/powerpc/include/asm/mmu-hash64.h +++ b/arch/powerpc/include/asm/mmu-hash64.h | |||
@@ -280,7 +280,6 @@ extern int hash_huge_page(struct mm_struct *mm, unsigned long access, | |||
280 | extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, | 280 | extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, |
281 | unsigned long pstart, unsigned long prot, | 281 | unsigned long pstart, unsigned long prot, |
282 | int psize, int ssize); | 282 | int psize, int ssize); |
283 | extern void set_huge_psize(int psize); | ||
284 | extern void add_gpage(unsigned long addr, unsigned long page_size, | 283 | extern void add_gpage(unsigned long addr, unsigned long page_size, |
285 | unsigned long number_of_pages); | 284 | unsigned long number_of_pages); |
286 | extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr); | 285 | extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr); |
diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm/module.h index e5f14b13ccf0..08454880a2c0 100644 --- a/arch/powerpc/include/asm/module.h +++ b/arch/powerpc/include/asm/module.h | |||
@@ -34,11 +34,19 @@ struct mod_arch_specific { | |||
34 | #ifdef __powerpc64__ | 34 | #ifdef __powerpc64__ |
35 | unsigned int stubs_section; /* Index of stubs section in module */ | 35 | unsigned int stubs_section; /* Index of stubs section in module */ |
36 | unsigned int toc_section; /* What section is the TOC? */ | 36 | unsigned int toc_section; /* What section is the TOC? */ |
37 | #else | 37 | #ifdef CONFIG_DYNAMIC_FTRACE |
38 | unsigned long toc; | ||
39 | unsigned long tramp; | ||
40 | #endif | ||
41 | |||
42 | #else /* powerpc64 */ | ||
38 | /* Indices of PLT sections within module. */ | 43 | /* Indices of PLT sections within module. */ |
39 | unsigned int core_plt_section; | 44 | unsigned int core_plt_section; |
40 | unsigned int init_plt_section; | 45 | unsigned int init_plt_section; |
46 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
47 | unsigned long tramp; | ||
41 | #endif | 48 | #endif |
49 | #endif /* powerpc64 */ | ||
42 | 50 | ||
43 | /* List of BUG addresses, source line numbers and filenames */ | 51 | /* List of BUG addresses, source line numbers and filenames */ |
44 | struct list_head bug_list; | 52 | struct list_head bug_list; |
@@ -68,6 +76,12 @@ struct mod_arch_specific { | |||
68 | # endif /* MODULE */ | 76 | # endif /* MODULE */ |
69 | #endif | 77 | #endif |
70 | 78 | ||
79 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
80 | # ifdef MODULE | ||
81 | asm(".section .ftrace.tramp,\"ax\",@nobits; .align 3; .previous"); | ||
82 | # endif /* MODULE */ | ||
83 | #endif | ||
84 | |||
71 | 85 | ||
72 | struct exception_table_entry; | 86 | struct exception_table_entry; |
73 | void sort_ex_table(struct exception_table_entry *start, | 87 | void sort_ex_table(struct exception_table_entry *start, |
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h index 280a90cc9894..c9c678fb2538 100644 --- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h | |||
@@ -55,8 +55,6 @@ struct pt_regs { | |||
55 | 55 | ||
56 | #ifdef __powerpc64__ | 56 | #ifdef __powerpc64__ |
57 | 57 | ||
58 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
59 | |||
60 | #define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */ | 58 | #define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */ |
61 | #define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */ | 59 | #define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */ |
62 | #define STACK_FRAME_REGS_MARKER ASM_CONST(0x7265677368657265) | 60 | #define STACK_FRAME_REGS_MARKER ASM_CONST(0x7265677368657265) |
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index c32da6f97999..373fca394a54 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h | |||
@@ -48,7 +48,6 @@ static inline int pcibus_to_node(struct pci_bus *bus) | |||
48 | 48 | ||
49 | /* sched_domains SD_NODE_INIT for PPC64 machines */ | 49 | /* sched_domains SD_NODE_INIT for PPC64 machines */ |
50 | #define SD_NODE_INIT (struct sched_domain) { \ | 50 | #define SD_NODE_INIT (struct sched_domain) { \ |
51 | .span = CPU_MASK_NONE, \ | ||
52 | .parent = NULL, \ | 51 | .parent = NULL, \ |
53 | .child = NULL, \ | 52 | .child = NULL, \ |
54 | .groups = NULL, \ | 53 | .groups = NULL, \ |
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 92673b43858d..d17edb4a2f9d 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -17,6 +17,7 @@ ifdef CONFIG_FUNCTION_TRACER | |||
17 | CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog | 17 | CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog |
18 | CFLAGS_REMOVE_prom_init.o = -pg -mno-sched-epilog | 18 | CFLAGS_REMOVE_prom_init.o = -pg -mno-sched-epilog |
19 | CFLAGS_REMOVE_btext.o = -pg -mno-sched-epilog | 19 | CFLAGS_REMOVE_btext.o = -pg -mno-sched-epilog |
20 | CFLAGS_REMOVE_prom.o = -pg -mno-sched-epilog | ||
20 | 21 | ||
21 | ifdef CONFIG_DYNAMIC_FTRACE | 22 | ifdef CONFIG_DYNAMIC_FTRACE |
22 | # dynamic ftrace setup. | 23 | # dynamic ftrace setup. |
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S index 80cac984d85d..10b4ab1008af 100644 --- a/arch/powerpc/kernel/cpu_setup_44x.S +++ b/arch/powerpc/kernel/cpu_setup_44x.S | |||
@@ -34,7 +34,13 @@ _GLOBAL(__setup_cpu_440grx) | |||
34 | blr | 34 | blr |
35 | _GLOBAL(__setup_cpu_460ex) | 35 | _GLOBAL(__setup_cpu_460ex) |
36 | _GLOBAL(__setup_cpu_460gt) | 36 | _GLOBAL(__setup_cpu_460gt) |
37 | b __init_fpu_44x | 37 | mflr r4 |
38 | bl __init_fpu_44x | ||
39 | bl __fixup_440A_mcheck | ||
40 | mtlr r4 | ||
41 | blr | ||
42 | |||
43 | _GLOBAL(__setup_cpu_440x5) | ||
38 | _GLOBAL(__setup_cpu_440gx) | 44 | _GLOBAL(__setup_cpu_440gx) |
39 | _GLOBAL(__setup_cpu_440spe) | 45 | _GLOBAL(__setup_cpu_440spe) |
40 | b __fixup_440A_mcheck | 46 | b __fixup_440A_mcheck |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index b1eb834bc0fc..7e8719504f39 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -39,6 +39,7 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec); | |||
39 | extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); | 39 | extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); |
40 | extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); | 40 | extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); |
41 | extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); | 41 | extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); |
42 | extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec); | ||
42 | extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); | 43 | extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); |
43 | extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); | 44 | extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); |
44 | extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); | 45 | extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); |
@@ -1500,6 +1501,8 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
1500 | .cpu_user_features = COMMON_USER_BOOKE, | 1501 | .cpu_user_features = COMMON_USER_BOOKE, |
1501 | .icache_bsize = 32, | 1502 | .icache_bsize = 32, |
1502 | .dcache_bsize = 32, | 1503 | .dcache_bsize = 32, |
1504 | .cpu_setup = __setup_cpu_440x5, | ||
1505 | .machine_check = machine_check_440A, | ||
1503 | .platform = "ppc440", | 1506 | .platform = "ppc440", |
1504 | }, | 1507 | }, |
1505 | { /* 460EX */ | 1508 | { /* 460EX */ |
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 1562daf8839a..3a6eaa876ee1 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
@@ -75,6 +75,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, | |||
75 | for_each_sg(sgl, sg, nents, i) { | 75 | for_each_sg(sgl, sg, nents, i) { |
76 | sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); | 76 | sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); |
77 | sg->dma_length = sg->length; | 77 | sg->dma_length = sg->length; |
78 | __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction); | ||
78 | } | 79 | } |
79 | 80 | ||
80 | return nents; | 81 | return nents; |
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 7ecc0d1855c3..6f7eb7e00c79 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S | |||
@@ -1162,39 +1162,17 @@ machine_check_in_rtas: | |||
1162 | #ifdef CONFIG_DYNAMIC_FTRACE | 1162 | #ifdef CONFIG_DYNAMIC_FTRACE |
1163 | _GLOBAL(mcount) | 1163 | _GLOBAL(mcount) |
1164 | _GLOBAL(_mcount) | 1164 | _GLOBAL(_mcount) |
1165 | stwu r1,-48(r1) | 1165 | /* |
1166 | stw r3, 12(r1) | 1166 | * It is required that _mcount on PPC32 must preserve the |
1167 | stw r4, 16(r1) | 1167 | * link register. But we have r0 to play with. We use r0 |
1168 | stw r5, 20(r1) | 1168 | * to push the return address back to the caller of mcount |
1169 | stw r6, 24(r1) | 1169 | * into the ctr register, restore the link register and |
1170 | mflr r3 | 1170 | * then jump back using the ctr register. |
1171 | stw r7, 28(r1) | 1171 | */ |
1172 | mfcr r5 | 1172 | mflr r0 |
1173 | stw r8, 32(r1) | ||
1174 | stw r9, 36(r1) | ||
1175 | stw r10,40(r1) | ||
1176 | stw r3, 44(r1) | ||
1177 | stw r5, 8(r1) | ||
1178 | subi r3, r3, MCOUNT_INSN_SIZE | ||
1179 | .globl mcount_call | ||
1180 | mcount_call: | ||
1181 | bl ftrace_stub | ||
1182 | nop | ||
1183 | lwz r6, 8(r1) | ||
1184 | lwz r0, 44(r1) | ||
1185 | lwz r3, 12(r1) | ||
1186 | mtctr r0 | 1173 | mtctr r0 |
1187 | lwz r4, 16(r1) | 1174 | lwz r0, 4(r1) |
1188 | mtcr r6 | ||
1189 | lwz r5, 20(r1) | ||
1190 | lwz r6, 24(r1) | ||
1191 | lwz r0, 52(r1) | ||
1192 | lwz r7, 28(r1) | ||
1193 | lwz r8, 32(r1) | ||
1194 | mtlr r0 | 1175 | mtlr r0 |
1195 | lwz r9, 36(r1) | ||
1196 | lwz r10,40(r1) | ||
1197 | addi r1, r1, 48 | ||
1198 | bctr | 1176 | bctr |
1199 | 1177 | ||
1200 | _GLOBAL(ftrace_caller) | 1178 | _GLOBAL(ftrace_caller) |
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index e6d52845854f..383ed6eb0085 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
@@ -57,12 +57,18 @@ system_call_common: | |||
57 | beq- 1f | 57 | beq- 1f |
58 | ld r1,PACAKSAVE(r13) | 58 | ld r1,PACAKSAVE(r13) |
59 | 1: std r10,0(r1) | 59 | 1: std r10,0(r1) |
60 | crclr so | ||
61 | std r11,_NIP(r1) | 60 | std r11,_NIP(r1) |
62 | std r12,_MSR(r1) | 61 | std r12,_MSR(r1) |
63 | std r0,GPR0(r1) | 62 | std r0,GPR0(r1) |
64 | std r10,GPR1(r1) | 63 | std r10,GPR1(r1) |
65 | ACCOUNT_CPU_USER_ENTRY(r10, r11) | 64 | ACCOUNT_CPU_USER_ENTRY(r10, r11) |
65 | /* | ||
66 | * This "crclr so" clears CR0.SO, which is the error indication on | ||
67 | * return from this system call. There must be no cmp instruction | ||
68 | * between it and the "mfcr r9" below, otherwise if XER.SO is set, | ||
69 | * CR0.SO will get set, causing all system calls to appear to fail. | ||
70 | */ | ||
71 | crclr so | ||
66 | std r2,GPR2(r1) | 72 | std r2,GPR2(r1) |
67 | std r3,GPR3(r1) | 73 | std r3,GPR3(r1) |
68 | std r4,GPR4(r1) | 74 | std r4,GPR4(r1) |
@@ -888,18 +894,6 @@ _GLOBAL(enter_prom) | |||
888 | #ifdef CONFIG_DYNAMIC_FTRACE | 894 | #ifdef CONFIG_DYNAMIC_FTRACE |
889 | _GLOBAL(mcount) | 895 | _GLOBAL(mcount) |
890 | _GLOBAL(_mcount) | 896 | _GLOBAL(_mcount) |
891 | /* Taken from output of objdump from lib64/glibc */ | ||
892 | mflr r3 | ||
893 | stdu r1, -112(r1) | ||
894 | std r3, 128(r1) | ||
895 | subi r3, r3, MCOUNT_INSN_SIZE | ||
896 | .globl mcount_call | ||
897 | mcount_call: | ||
898 | bl ftrace_stub | ||
899 | nop | ||
900 | ld r0, 128(r1) | ||
901 | mtlr r0 | ||
902 | addi r1, r1, 112 | ||
903 | blr | 897 | blr |
904 | 898 | ||
905 | _GLOBAL(ftrace_caller) | 899 | _GLOBAL(ftrace_caller) |
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c index f4b006ed0ab1..5355244c99ff 100644 --- a/arch/powerpc/kernel/ftrace.c +++ b/arch/powerpc/kernel/ftrace.c | |||
@@ -9,22 +9,30 @@ | |||
9 | 9 | ||
10 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
11 | #include <linux/hardirq.h> | 11 | #include <linux/hardirq.h> |
12 | #include <linux/uaccess.h> | ||
13 | #include <linux/module.h> | ||
12 | #include <linux/ftrace.h> | 14 | #include <linux/ftrace.h> |
13 | #include <linux/percpu.h> | 15 | #include <linux/percpu.h> |
14 | #include <linux/init.h> | 16 | #include <linux/init.h> |
15 | #include <linux/list.h> | 17 | #include <linux/list.h> |
16 | 18 | ||
17 | #include <asm/cacheflush.h> | 19 | #include <asm/cacheflush.h> |
20 | #include <asm/code-patching.h> | ||
18 | #include <asm/ftrace.h> | 21 | #include <asm/ftrace.h> |
19 | 22 | ||
23 | #if 0 | ||
24 | #define DEBUGP printk | ||
25 | #else | ||
26 | #define DEBUGP(fmt , ...) do { } while (0) | ||
27 | #endif | ||
20 | 28 | ||
21 | static unsigned int ftrace_nop = 0x60000000; | 29 | static unsigned int ftrace_nop = PPC_NOP_INSTR; |
22 | 30 | ||
23 | #ifdef CONFIG_PPC32 | 31 | #ifdef CONFIG_PPC32 |
24 | # define GET_ADDR(addr) addr | 32 | # define GET_ADDR(addr) addr |
25 | #else | 33 | #else |
26 | /* PowerPC64's functions are data that points to the functions */ | 34 | /* PowerPC64's functions are data that points to the functions */ |
27 | # define GET_ADDR(addr) *(unsigned long *)addr | 35 | # define GET_ADDR(addr) (*(unsigned long *)addr) |
28 | #endif | 36 | #endif |
29 | 37 | ||
30 | 38 | ||
@@ -33,12 +41,12 @@ static unsigned int ftrace_calc_offset(long ip, long addr) | |||
33 | return (int)(addr - ip); | 41 | return (int)(addr - ip); |
34 | } | 42 | } |
35 | 43 | ||
36 | unsigned char *ftrace_nop_replace(void) | 44 | static unsigned char *ftrace_nop_replace(void) |
37 | { | 45 | { |
38 | return (char *)&ftrace_nop; | 46 | return (char *)&ftrace_nop; |
39 | } | 47 | } |
40 | 48 | ||
41 | unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) | 49 | static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) |
42 | { | 50 | { |
43 | static unsigned int op; | 51 | static unsigned int op; |
44 | 52 | ||
@@ -68,49 +76,422 @@ unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) | |||
68 | # define _ASM_PTR " .long " | 76 | # define _ASM_PTR " .long " |
69 | #endif | 77 | #endif |
70 | 78 | ||
71 | int | 79 | static int |
72 | ftrace_modify_code(unsigned long ip, unsigned char *old_code, | 80 | ftrace_modify_code(unsigned long ip, unsigned char *old_code, |
73 | unsigned char *new_code) | 81 | unsigned char *new_code) |
74 | { | 82 | { |
75 | unsigned replaced; | 83 | unsigned char replaced[MCOUNT_INSN_SIZE]; |
76 | unsigned old = *(unsigned *)old_code; | ||
77 | unsigned new = *(unsigned *)new_code; | ||
78 | int faulted = 0; | ||
79 | 84 | ||
80 | /* | 85 | /* |
81 | * Note: Due to modules and __init, code can | 86 | * Note: Due to modules and __init, code can |
82 | * disappear and change, we need to protect against faulting | 87 | * disappear and change, we need to protect against faulting |
83 | * as well as code changing. | 88 | * as well as code changing. We do this by using the |
89 | * probe_kernel_* functions. | ||
84 | * | 90 | * |
85 | * No real locking needed, this code is run through | 91 | * No real locking needed, this code is run through |
86 | * kstop_machine. | 92 | * kstop_machine, or before SMP starts. |
87 | */ | 93 | */ |
88 | asm volatile ( | 94 | |
89 | "1: lwz %1, 0(%2)\n" | 95 | /* read the text we want to modify */ |
90 | " cmpw %1, %5\n" | 96 | if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE)) |
91 | " bne 2f\n" | 97 | return -EFAULT; |
92 | " stwu %3, 0(%2)\n" | 98 | |
93 | "2:\n" | 99 | /* Make sure it is what we expect it to be */ |
94 | ".section .fixup, \"ax\"\n" | 100 | if (memcmp(replaced, old_code, MCOUNT_INSN_SIZE) != 0) |
95 | "3: li %0, 1\n" | 101 | return -EINVAL; |
96 | " b 2b\n" | 102 | |
97 | ".previous\n" | 103 | /* replace the text with the new text */ |
98 | ".section __ex_table,\"a\"\n" | 104 | if (probe_kernel_write((void *)ip, new_code, MCOUNT_INSN_SIZE)) |
99 | _ASM_ALIGN "\n" | 105 | return -EPERM; |
100 | _ASM_PTR "1b, 3b\n" | 106 | |
101 | ".previous" | 107 | flush_icache_range(ip, ip + 8); |
102 | : "=r"(faulted), "=r"(replaced) | 108 | |
103 | : "r"(ip), "r"(new), | 109 | return 0; |
104 | "0"(faulted), "r"(old) | 110 | } |
105 | : "memory"); | 111 | |
106 | 112 | /* | |
107 | if (replaced != old && replaced != new) | 113 | * Helper functions that are the same for both PPC64 and PPC32. |
108 | faulted = 2; | 114 | */ |
109 | 115 | static int test_24bit_addr(unsigned long ip, unsigned long addr) | |
110 | if (!faulted) | 116 | { |
111 | flush_icache_range(ip, ip + 8); | 117 | |
112 | 118 | /* use the create_branch to verify that this offset can be branched */ | |
113 | return faulted; | 119 | return create_branch((unsigned int *)ip, addr, 0); |
120 | } | ||
121 | |||
122 | static int is_bl_op(unsigned int op) | ||
123 | { | ||
124 | return (op & 0xfc000003) == 0x48000001; | ||
125 | } | ||
126 | |||
127 | static unsigned long find_bl_target(unsigned long ip, unsigned int op) | ||
128 | { | ||
129 | static int offset; | ||
130 | |||
131 | offset = (op & 0x03fffffc); | ||
132 | /* make it signed */ | ||
133 | if (offset & 0x02000000) | ||
134 | offset |= 0xfe000000; | ||
135 | |||
136 | return ip + (long)offset; | ||
137 | } | ||
138 | |||
139 | #ifdef CONFIG_PPC64 | ||
140 | static int | ||
141 | __ftrace_make_nop(struct module *mod, | ||
142 | struct dyn_ftrace *rec, unsigned long addr) | ||
143 | { | ||
144 | unsigned int op; | ||
145 | unsigned int jmp[5]; | ||
146 | unsigned long ptr; | ||
147 | unsigned long ip = rec->ip; | ||
148 | unsigned long tramp; | ||
149 | int offset; | ||
150 | |||
151 | /* read where this goes */ | ||
152 | if (probe_kernel_read(&op, (void *)ip, sizeof(int))) | ||
153 | return -EFAULT; | ||
154 | |||
155 | /* Make sure that that this is still a 24bit jump */ | ||
156 | if (!is_bl_op(op)) { | ||
157 | printk(KERN_ERR "Not expected bl: opcode is %x\n", op); | ||
158 | return -EINVAL; | ||
159 | } | ||
160 | |||
161 | /* lets find where the pointer goes */ | ||
162 | tramp = find_bl_target(ip, op); | ||
163 | |||
164 | /* | ||
165 | * On PPC64 the trampoline looks like: | ||
166 | * 0x3d, 0x82, 0x00, 0x00, addis r12,r2, <high> | ||
167 | * 0x39, 0x8c, 0x00, 0x00, addi r12,r12, <low> | ||
168 | * Where the bytes 2,3,6 and 7 make up the 32bit offset | ||
169 | * to the TOC that holds the pointer. | ||
170 | * to jump to. | ||
171 | * 0xf8, 0x41, 0x00, 0x28, std r2,40(r1) | ||
172 | * 0xe9, 0x6c, 0x00, 0x20, ld r11,32(r12) | ||
173 | * The actually address is 32 bytes from the offset | ||
174 | * into the TOC. | ||
175 | * 0xe8, 0x4c, 0x00, 0x28, ld r2,40(r12) | ||
176 | */ | ||
177 | |||
178 | DEBUGP("ip:%lx jumps to %lx r2: %lx", ip, tramp, mod->arch.toc); | ||
179 | |||
180 | /* Find where the trampoline jumps to */ | ||
181 | if (probe_kernel_read(jmp, (void *)tramp, sizeof(jmp))) { | ||
182 | printk(KERN_ERR "Failed to read %lx\n", tramp); | ||
183 | return -EFAULT; | ||
184 | } | ||
185 | |||
186 | DEBUGP(" %08x %08x", jmp[0], jmp[1]); | ||
187 | |||
188 | /* verify that this is what we expect it to be */ | ||
189 | if (((jmp[0] & 0xffff0000) != 0x3d820000) || | ||
190 | ((jmp[1] & 0xffff0000) != 0x398c0000) || | ||
191 | (jmp[2] != 0xf8410028) || | ||
192 | (jmp[3] != 0xe96c0020) || | ||
193 | (jmp[4] != 0xe84c0028)) { | ||
194 | printk(KERN_ERR "Not a trampoline\n"); | ||
195 | return -EINVAL; | ||
196 | } | ||
197 | |||
198 | offset = (unsigned)((unsigned short)jmp[0]) << 16 | | ||
199 | (unsigned)((unsigned short)jmp[1]); | ||
200 | |||
201 | DEBUGP(" %x ", offset); | ||
202 | |||
203 | /* get the address this jumps too */ | ||
204 | tramp = mod->arch.toc + offset + 32; | ||
205 | DEBUGP("toc: %lx", tramp); | ||
206 | |||
207 | if (probe_kernel_read(jmp, (void *)tramp, 8)) { | ||
208 | printk(KERN_ERR "Failed to read %lx\n", tramp); | ||
209 | return -EFAULT; | ||
210 | } | ||
211 | |||
212 | DEBUGP(" %08x %08x\n", jmp[0], jmp[1]); | ||
213 | |||
214 | ptr = ((unsigned long)jmp[0] << 32) + jmp[1]; | ||
215 | |||
216 | /* This should match what was called */ | ||
217 | if (ptr != GET_ADDR(addr)) { | ||
218 | printk(KERN_ERR "addr does not match %lx\n", ptr); | ||
219 | return -EINVAL; | ||
220 | } | ||
221 | |||
222 | /* | ||
223 | * We want to nop the line, but the next line is | ||
224 | * 0xe8, 0x41, 0x00, 0x28 ld r2,40(r1) | ||
225 | * This needs to be turned to a nop too. | ||
226 | */ | ||
227 | if (probe_kernel_read(&op, (void *)(ip+4), MCOUNT_INSN_SIZE)) | ||
228 | return -EFAULT; | ||
229 | |||
230 | if (op != 0xe8410028) { | ||
231 | printk(KERN_ERR "Next line is not ld! (%08x)\n", op); | ||
232 | return -EINVAL; | ||
233 | } | ||
234 | |||
235 | /* | ||
236 | * Milton Miller pointed out that we can not blindly do nops. | ||
237 | * If a task was preempted when calling a trace function, | ||
238 | * the nops will remove the way to restore the TOC in r2 | ||
239 | * and the r2 TOC will get corrupted. | ||
240 | */ | ||
241 | |||
242 | /* | ||
243 | * Replace: | ||
244 | * bl <tramp> <==== will be replaced with "b 1f" | ||
245 | * ld r2,40(r1) | ||
246 | * 1: | ||
247 | */ | ||
248 | op = 0x48000008; /* b +8 */ | ||
249 | |||
250 | if (probe_kernel_write((void *)ip, &op, MCOUNT_INSN_SIZE)) | ||
251 | return -EPERM; | ||
252 | |||
253 | |||
254 | flush_icache_range(ip, ip + 8); | ||
255 | |||
256 | return 0; | ||
257 | } | ||
258 | |||
259 | #else /* !PPC64 */ | ||
260 | static int | ||
261 | __ftrace_make_nop(struct module *mod, | ||
262 | struct dyn_ftrace *rec, unsigned long addr) | ||
263 | { | ||
264 | unsigned int op; | ||
265 | unsigned int jmp[4]; | ||
266 | unsigned long ip = rec->ip; | ||
267 | unsigned long tramp; | ||
268 | |||
269 | if (probe_kernel_read(&op, (void *)ip, MCOUNT_INSN_SIZE)) | ||
270 | return -EFAULT; | ||
271 | |||
272 | /* Make sure that that this is still a 24bit jump */ | ||
273 | if (!is_bl_op(op)) { | ||
274 | printk(KERN_ERR "Not expected bl: opcode is %x\n", op); | ||
275 | return -EINVAL; | ||
276 | } | ||
277 | |||
278 | /* lets find where the pointer goes */ | ||
279 | tramp = find_bl_target(ip, op); | ||
280 | |||
281 | /* | ||
282 | * On PPC32 the trampoline looks like: | ||
283 | * 0x3d, 0x60, 0x00, 0x00 lis r11,sym@ha | ||
284 | * 0x39, 0x6b, 0x00, 0x00 addi r11,r11,sym@l | ||
285 | * 0x7d, 0x69, 0x03, 0xa6 mtctr r11 | ||
286 | * 0x4e, 0x80, 0x04, 0x20 bctr | ||
287 | */ | ||
288 | |||
289 | DEBUGP("ip:%lx jumps to %lx", ip, tramp); | ||
290 | |||
291 | /* Find where the trampoline jumps to */ | ||
292 | if (probe_kernel_read(jmp, (void *)tramp, sizeof(jmp))) { | ||
293 | printk(KERN_ERR "Failed to read %lx\n", tramp); | ||
294 | return -EFAULT; | ||
295 | } | ||
296 | |||
297 | DEBUGP(" %08x %08x ", jmp[0], jmp[1]); | ||
298 | |||
299 | /* verify that this is what we expect it to be */ | ||
300 | if (((jmp[0] & 0xffff0000) != 0x3d600000) || | ||
301 | ((jmp[1] & 0xffff0000) != 0x396b0000) || | ||
302 | (jmp[2] != 0x7d6903a6) || | ||
303 | (jmp[3] != 0x4e800420)) { | ||
304 | printk(KERN_ERR "Not a trampoline\n"); | ||
305 | return -EINVAL; | ||
306 | } | ||
307 | |||
308 | tramp = (jmp[1] & 0xffff) | | ||
309 | ((jmp[0] & 0xffff) << 16); | ||
310 | if (tramp & 0x8000) | ||
311 | tramp -= 0x10000; | ||
312 | |||
313 | DEBUGP(" %x ", tramp); | ||
314 | |||
315 | if (tramp != addr) { | ||
316 | printk(KERN_ERR | ||
317 | "Trampoline location %08lx does not match addr\n", | ||
318 | tramp); | ||
319 | return -EINVAL; | ||
320 | } | ||
321 | |||
322 | op = PPC_NOP_INSTR; | ||
323 | |||
324 | if (probe_kernel_write((void *)ip, &op, MCOUNT_INSN_SIZE)) | ||
325 | return -EPERM; | ||
326 | |||
327 | flush_icache_range(ip, ip + 8); | ||
328 | |||
329 | return 0; | ||
330 | } | ||
331 | #endif /* PPC64 */ | ||
332 | |||
333 | int ftrace_make_nop(struct module *mod, | ||
334 | struct dyn_ftrace *rec, unsigned long addr) | ||
335 | { | ||
336 | unsigned char *old, *new; | ||
337 | unsigned long ip = rec->ip; | ||
338 | |||
339 | /* | ||
340 | * If the calling address is more that 24 bits away, | ||
341 | * then we had to use a trampoline to make the call. | ||
342 | * Otherwise just update the call site. | ||
343 | */ | ||
344 | if (test_24bit_addr(ip, addr)) { | ||
345 | /* within range */ | ||
346 | old = ftrace_call_replace(ip, addr); | ||
347 | new = ftrace_nop_replace(); | ||
348 | return ftrace_modify_code(ip, old, new); | ||
349 | } | ||
350 | |||
351 | /* | ||
352 | * Out of range jumps are called from modules. | ||
353 | * We should either already have a pointer to the module | ||
354 | * or it has been passed in. | ||
355 | */ | ||
356 | if (!rec->arch.mod) { | ||
357 | if (!mod) { | ||
358 | printk(KERN_ERR "No module loaded addr=%lx\n", | ||
359 | addr); | ||
360 | return -EFAULT; | ||
361 | } | ||
362 | rec->arch.mod = mod; | ||
363 | } else if (mod) { | ||
364 | if (mod != rec->arch.mod) { | ||
365 | printk(KERN_ERR | ||
366 | "Record mod %p not equal to passed in mod %p\n", | ||
367 | rec->arch.mod, mod); | ||
368 | return -EINVAL; | ||
369 | } | ||
370 | /* nothing to do if mod == rec->arch.mod */ | ||
371 | } else | ||
372 | mod = rec->arch.mod; | ||
373 | |||
374 | return __ftrace_make_nop(mod, rec, addr); | ||
375 | |||
376 | } | ||
377 | |||
378 | #ifdef CONFIG_PPC64 | ||
379 | static int | ||
380 | __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) | ||
381 | { | ||
382 | unsigned int op[2]; | ||
383 | unsigned long ip = rec->ip; | ||
384 | |||
385 | /* read where this goes */ | ||
386 | if (probe_kernel_read(op, (void *)ip, MCOUNT_INSN_SIZE * 2)) | ||
387 | return -EFAULT; | ||
388 | |||
389 | /* | ||
390 | * It should be pointing to two nops or | ||
391 | * b +8; ld r2,40(r1) | ||
392 | */ | ||
393 | if (((op[0] != 0x48000008) || (op[1] != 0xe8410028)) && | ||
394 | ((op[0] != PPC_NOP_INSTR) || (op[1] != PPC_NOP_INSTR))) { | ||
395 | printk(KERN_ERR "Expected NOPs but have %x %x\n", op[0], op[1]); | ||
396 | return -EINVAL; | ||
397 | } | ||
398 | |||
399 | /* If we never set up a trampoline to ftrace_caller, then bail */ | ||
400 | if (!rec->arch.mod->arch.tramp) { | ||
401 | printk(KERN_ERR "No ftrace trampoline\n"); | ||
402 | return -EINVAL; | ||
403 | } | ||
404 | |||
405 | /* create the branch to the trampoline */ | ||
406 | op[0] = create_branch((unsigned int *)ip, | ||
407 | rec->arch.mod->arch.tramp, BRANCH_SET_LINK); | ||
408 | if (!op[0]) { | ||
409 | printk(KERN_ERR "REL24 out of range!\n"); | ||
410 | return -EINVAL; | ||
411 | } | ||
412 | |||
413 | /* ld r2,40(r1) */ | ||
414 | op[1] = 0xe8410028; | ||
415 | |||
416 | DEBUGP("write to %lx\n", rec->ip); | ||
417 | |||
418 | if (probe_kernel_write((void *)ip, op, MCOUNT_INSN_SIZE * 2)) | ||
419 | return -EPERM; | ||
420 | |||
421 | flush_icache_range(ip, ip + 8); | ||
422 | |||
423 | return 0; | ||
424 | } | ||
425 | #else | ||
426 | static int | ||
427 | __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) | ||
428 | { | ||
429 | unsigned int op; | ||
430 | unsigned long ip = rec->ip; | ||
431 | |||
432 | /* read where this goes */ | ||
433 | if (probe_kernel_read(&op, (void *)ip, MCOUNT_INSN_SIZE)) | ||
434 | return -EFAULT; | ||
435 | |||
436 | /* It should be pointing to a nop */ | ||
437 | if (op != PPC_NOP_INSTR) { | ||
438 | printk(KERN_ERR "Expected NOP but have %x\n", op); | ||
439 | return -EINVAL; | ||
440 | } | ||
441 | |||
442 | /* If we never set up a trampoline to ftrace_caller, then bail */ | ||
443 | if (!rec->arch.mod->arch.tramp) { | ||
444 | printk(KERN_ERR "No ftrace trampoline\n"); | ||
445 | return -EINVAL; | ||
446 | } | ||
447 | |||
448 | /* create the branch to the trampoline */ | ||
449 | op = create_branch((unsigned int *)ip, | ||
450 | rec->arch.mod->arch.tramp, BRANCH_SET_LINK); | ||
451 | if (!op) { | ||
452 | printk(KERN_ERR "REL24 out of range!\n"); | ||
453 | return -EINVAL; | ||
454 | } | ||
455 | |||
456 | DEBUGP("write to %lx\n", rec->ip); | ||
457 | |||
458 | if (probe_kernel_write((void *)ip, &op, MCOUNT_INSN_SIZE)) | ||
459 | return -EPERM; | ||
460 | |||
461 | flush_icache_range(ip, ip + 8); | ||
462 | |||
463 | return 0; | ||
464 | } | ||
465 | #endif /* CONFIG_PPC64 */ | ||
466 | |||
467 | int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) | ||
468 | { | ||
469 | unsigned char *old, *new; | ||
470 | unsigned long ip = rec->ip; | ||
471 | |||
472 | /* | ||
473 | * If the calling address is more that 24 bits away, | ||
474 | * then we had to use a trampoline to make the call. | ||
475 | * Otherwise just update the call site. | ||
476 | */ | ||
477 | if (test_24bit_addr(ip, addr)) { | ||
478 | /* within range */ | ||
479 | old = ftrace_nop_replace(); | ||
480 | new = ftrace_call_replace(ip, addr); | ||
481 | return ftrace_modify_code(ip, old, new); | ||
482 | } | ||
483 | |||
484 | /* | ||
485 | * Out of range jumps are called from modules. | ||
486 | * Being that we are converting from nop, it had better | ||
487 | * already have a module defined. | ||
488 | */ | ||
489 | if (!rec->arch.mod) { | ||
490 | printk(KERN_ERR "No module loaded\n"); | ||
491 | return -EINVAL; | ||
492 | } | ||
493 | |||
494 | return __ftrace_make_call(rec, addr); | ||
114 | } | 495 | } |
115 | 496 | ||
116 | int ftrace_update_ftrace_func(ftrace_func_t func) | 497 | int ftrace_update_ftrace_func(ftrace_func_t func) |
@@ -128,10 +509,10 @@ int ftrace_update_ftrace_func(ftrace_func_t func) | |||
128 | 509 | ||
129 | int __init ftrace_dyn_arch_init(void *data) | 510 | int __init ftrace_dyn_arch_init(void *data) |
130 | { | 511 | { |
131 | /* This is running in kstop_machine */ | 512 | /* caller expects data to be zero */ |
513 | unsigned long *p = data; | ||
132 | 514 | ||
133 | ftrace_mcount_set(data); | 515 | *p = 0; |
134 | 516 | ||
135 | return 0; | 517 | return 0; |
136 | } | 518 | } |
137 | |||
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index 31982d05d81a..88d9c1d5e5fb 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c | |||
@@ -69,10 +69,15 @@ void cpu_idle(void) | |||
69 | smp_mb(); | 69 | smp_mb(); |
70 | local_irq_disable(); | 70 | local_irq_disable(); |
71 | 71 | ||
72 | /* Don't trace irqs off for idle */ | ||
73 | stop_critical_timings(); | ||
74 | |||
72 | /* check again after disabling irqs */ | 75 | /* check again after disabling irqs */ |
73 | if (!need_resched() && !cpu_should_die()) | 76 | if (!need_resched() && !cpu_should_die()) |
74 | ppc_md.power_save(); | 77 | ppc_md.power_save(); |
75 | 78 | ||
79 | start_critical_timings(); | ||
80 | |||
76 | local_irq_enable(); | 81 | local_irq_enable(); |
77 | set_thread_flag(TIF_POLLING_NRFLAG); | 82 | set_thread_flag(TIF_POLLING_NRFLAG); |
78 | 83 | ||
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index ac222d0ab12e..23b8b5e36f98 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -237,7 +237,7 @@ void fixup_irqs(cpumask_t map) | |||
237 | mask = map; | 237 | mask = map; |
238 | } | 238 | } |
239 | if (irq_desc[irq].chip->set_affinity) | 239 | if (irq_desc[irq].chip->set_affinity) |
240 | irq_desc[irq].chip->set_affinity(irq, mask); | 240 | irq_desc[irq].chip->set_affinity(irq, &mask); |
241 | else if (irq_desc[irq].action && !(warned++)) | 241 | else if (irq_desc[irq].action && !(warned++)) |
242 | printk("Cannot set affinity for irq %i\n", irq); | 242 | printk("Cannot set affinity for irq %i\n", irq); |
243 | } | 243 | } |
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index bdc8b0e860e5..d108715129e2 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
@@ -479,6 +479,8 @@ _GLOBAL(_tlbil_pid) | |||
479 | * (no broadcast) | 479 | * (no broadcast) |
480 | */ | 480 | */ |
481 | _GLOBAL(_tlbil_va) | 481 | _GLOBAL(_tlbil_va) |
482 | mfmsr r10 | ||
483 | wrteei 0 | ||
482 | slwi r4,r4,16 | 484 | slwi r4,r4,16 |
483 | mtspr SPRN_MAS6,r4 /* assume AS=0 for now */ | 485 | mtspr SPRN_MAS6,r4 /* assume AS=0 for now */ |
484 | tlbsx 0,r3 | 486 | tlbsx 0,r3 |
@@ -490,6 +492,7 @@ _GLOBAL(_tlbil_va) | |||
490 | tlbwe | 492 | tlbwe |
491 | msync | 493 | msync |
492 | isync | 494 | isync |
495 | wrtee r10 | ||
493 | blr | 496 | blr |
494 | #endif /* CONFIG_FSL_BOOKE */ | 497 | #endif /* CONFIG_FSL_BOOKE */ |
495 | 498 | ||
diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c index 2df91a03462a..f832773fc28e 100644 --- a/arch/powerpc/kernel/module_32.c +++ b/arch/powerpc/kernel/module_32.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/fs.h> | 22 | #include <linux/fs.h> |
23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/ftrace.h> | ||
25 | #include <linux/cache.h> | 26 | #include <linux/cache.h> |
26 | #include <linux/bug.h> | 27 | #include <linux/bug.h> |
27 | #include <linux/sort.h> | 28 | #include <linux/sort.h> |
@@ -53,6 +54,9 @@ static unsigned int count_relocs(const Elf32_Rela *rela, unsigned int num) | |||
53 | r_addend = rela[i].r_addend; | 54 | r_addend = rela[i].r_addend; |
54 | } | 55 | } |
55 | 56 | ||
57 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
58 | _count_relocs++; /* add one for ftrace_caller */ | ||
59 | #endif | ||
56 | return _count_relocs; | 60 | return _count_relocs; |
57 | } | 61 | } |
58 | 62 | ||
@@ -306,5 +310,11 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
306 | return -ENOEXEC; | 310 | return -ENOEXEC; |
307 | } | 311 | } |
308 | } | 312 | } |
313 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
314 | module->arch.tramp = | ||
315 | do_plt_call(module->module_core, | ||
316 | (unsigned long)ftrace_caller, | ||
317 | sechdrs, module); | ||
318 | #endif | ||
309 | return 0; | 319 | return 0; |
310 | } | 320 | } |
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index 1af2377e4992..8992b031a7b6 100644 --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/moduleloader.h> | 20 | #include <linux/moduleloader.h> |
21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
22 | #include <linux/vmalloc.h> | 22 | #include <linux/vmalloc.h> |
23 | #include <linux/ftrace.h> | ||
23 | #include <linux/bug.h> | 24 | #include <linux/bug.h> |
24 | #include <asm/module.h> | 25 | #include <asm/module.h> |
25 | #include <asm/firmware.h> | 26 | #include <asm/firmware.h> |
@@ -163,6 +164,11 @@ static unsigned long get_stubs_size(const Elf64_Ehdr *hdr, | |||
163 | } | 164 | } |
164 | } | 165 | } |
165 | 166 | ||
167 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
168 | /* make the trampoline to the ftrace_caller */ | ||
169 | relocs++; | ||
170 | #endif | ||
171 | |||
166 | DEBUGP("Looks like a total of %lu stubs, max\n", relocs); | 172 | DEBUGP("Looks like a total of %lu stubs, max\n", relocs); |
167 | return relocs * sizeof(struct ppc64_stub_entry); | 173 | return relocs * sizeof(struct ppc64_stub_entry); |
168 | } | 174 | } |
@@ -441,5 +447,12 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, | |||
441 | } | 447 | } |
442 | } | 448 | } |
443 | 449 | ||
450 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
451 | me->arch.toc = my_r2(sechdrs, me); | ||
452 | me->arch.tramp = stub_for_addr(sechdrs, | ||
453 | (unsigned long)ftrace_caller, | ||
454 | me); | ||
455 | #endif | ||
456 | |||
444 | return 0; | 457 | return 0; |
445 | } | 458 | } |
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index bc1fb27368af..a11d68976dc8 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c | |||
@@ -250,8 +250,11 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) | |||
250 | * parsing | 250 | * parsing |
251 | */ | 251 | */ |
252 | dn = pci_device_to_OF_node(pdev); | 252 | dn = pci_device_to_OF_node(pdev); |
253 | if (dn) | 253 | if (dn) { |
254 | return of_irq_map_one(dn, 0, out_irq); | 254 | rc = of_irq_map_one(dn, 0, out_irq); |
255 | if (!rc) | ||
256 | return rc; | ||
257 | } | ||
255 | 258 | ||
256 | /* Ok, we don't, time to have fun. Let's start by building up an | 259 | /* Ok, we don't, time to have fun. Let's start by building up an |
257 | * interrupt spec. we assume #interrupt-cells is 1, which is standard | 260 | * interrupt spec. we assume #interrupt-cells is 1, which is standard |
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index ff9f7010097d..d1165566f064 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
@@ -60,13 +60,9 @@ | |||
60 | int smp_hw_index[NR_CPUS]; | 60 | int smp_hw_index[NR_CPUS]; |
61 | struct thread_info *secondary_ti; | 61 | struct thread_info *secondary_ti; |
62 | 62 | ||
63 | cpumask_t cpu_possible_map = CPU_MASK_NONE; | ||
64 | cpumask_t cpu_online_map = CPU_MASK_NONE; | ||
65 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE; | 63 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE; |
66 | DEFINE_PER_CPU(cpumask_t, cpu_core_map) = CPU_MASK_NONE; | 64 | DEFINE_PER_CPU(cpumask_t, cpu_core_map) = CPU_MASK_NONE; |
67 | 65 | ||
68 | EXPORT_SYMBOL(cpu_online_map); | ||
69 | EXPORT_SYMBOL(cpu_possible_map); | ||
70 | EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); | 66 | EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); |
71 | EXPORT_PER_CPU_SYMBOL(cpu_core_map); | 67 | EXPORT_PER_CPU_SYMBOL(cpu_core_map); |
72 | 68 | ||
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 86a2ffccef25..20885a38237a 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c | |||
@@ -717,9 +717,11 @@ static void unregister_cpu_online(unsigned int cpu) | |||
717 | 717 | ||
718 | BUG_ON(!c->hotpluggable); | 718 | BUG_ON(!c->hotpluggable); |
719 | 719 | ||
720 | #ifdef CONFIG_PPC64 | ||
720 | if (!firmware_has_feature(FW_FEATURE_ISERIES) && | 721 | if (!firmware_has_feature(FW_FEATURE_ISERIES) && |
721 | cpu_has_feature(CPU_FTR_SMT)) | 722 | cpu_has_feature(CPU_FTR_SMT)) |
722 | sysdev_remove_file(s, &attr_smt_snooze_delay); | 723 | sysdev_remove_file(s, &attr_smt_snooze_delay); |
724 | #endif | ||
723 | 725 | ||
724 | /* PMC stuff */ | 726 | /* PMC stuff */ |
725 | switch (cur_cpu_spec->pmc_type) { | 727 | switch (cur_cpu_spec->pmc_type) { |
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index e2ee66b5831d..6f39d35d6f55 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
@@ -869,7 +869,7 @@ static void register_decrementer_clockevent(int cpu) | |||
869 | struct clock_event_device *dec = &per_cpu(decrementers, cpu).event; | 869 | struct clock_event_device *dec = &per_cpu(decrementers, cpu).event; |
870 | 870 | ||
871 | *dec = decrementer_clockevent; | 871 | *dec = decrementer_clockevent; |
872 | dec->cpumask = cpumask_of_cpu(cpu); | 872 | dec->cpumask = cpumask_of(cpu); |
873 | 873 | ||
874 | printk(KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n", | 874 | printk(KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n", |
875 | dec->name, dec->mult, dec->shift, cpu); | 875 | dec->name, dec->mult, dec->shift, cpu); |
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c index 2e227a412bc2..ad72c6f9811f 100644 --- a/arch/powerpc/kvm/44x_tlb.c +++ b/arch/powerpc/kvm/44x_tlb.c | |||
@@ -124,6 +124,14 @@ static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu, | |||
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu) | ||
128 | { | ||
129 | int i; | ||
130 | |||
131 | for (i = 0; i <= tlb_44x_hwater; i++) | ||
132 | kvmppc_44x_shadow_release(vcpu, i); | ||
133 | } | ||
134 | |||
127 | void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i) | 135 | void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i) |
128 | { | 136 | { |
129 | vcpu->arch.shadow_tlb_mod[i] = 1; | 137 | vcpu->arch.shadow_tlb_mod[i] = 1; |
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 90a6fc422b23..fda9baada132 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c | |||
@@ -238,6 +238,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) | |||
238 | 238 | ||
239 | void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) | 239 | void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) |
240 | { | 240 | { |
241 | kvmppc_core_destroy_mmu(vcpu); | ||
241 | } | 242 | } |
242 | 243 | ||
243 | /* Note: clearing MSR[DE] just means that the debug interrupt will not be | 244 | /* Note: clearing MSR[DE] just means that the debug interrupt will not be |
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index d69912c07ce7..8db35278a4b4 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
@@ -6,6 +6,9 @@ ifeq ($(CONFIG_PPC64),y) | |||
6 | EXTRA_CFLAGS += -mno-minimal-toc | 6 | EXTRA_CFLAGS += -mno-minimal-toc |
7 | endif | 7 | endif |
8 | 8 | ||
9 | CFLAGS_REMOVE_code-patching.o = -pg | ||
10 | CFLAGS_REMOVE_feature-fixups.o = -pg | ||
11 | |||
9 | obj-y := string.o alloc.o \ | 12 | obj-y := string.o alloc.o \ |
10 | checksum_$(CONFIG_WORD_SIZE).o | 13 | checksum_$(CONFIG_WORD_SIZE).o |
11 | obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o | 14 | obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o |
diff --git a/arch/powerpc/mm/40x_mmu.c b/arch/powerpc/mm/40x_mmu.c index cecbbc76f624..29954dc28942 100644 --- a/arch/powerpc/mm/40x_mmu.c +++ b/arch/powerpc/mm/40x_mmu.c | |||
@@ -93,7 +93,7 @@ void __init MMU_init_hw(void) | |||
93 | 93 | ||
94 | unsigned long __init mmu_mapin_ram(void) | 94 | unsigned long __init mmu_mapin_ram(void) |
95 | { | 95 | { |
96 | unsigned long v, s; | 96 | unsigned long v, s, mapped; |
97 | phys_addr_t p; | 97 | phys_addr_t p; |
98 | 98 | ||
99 | v = KERNELBASE; | 99 | v = KERNELBASE; |
@@ -130,5 +130,17 @@ unsigned long __init mmu_mapin_ram(void) | |||
130 | s -= LARGE_PAGE_SIZE_4M; | 130 | s -= LARGE_PAGE_SIZE_4M; |
131 | } | 131 | } |
132 | 132 | ||
133 | return total_lowmem - s; | 133 | mapped = total_lowmem - s; |
134 | |||
135 | /* If the size of RAM is not an exact power of two, we may not | ||
136 | * have covered RAM in its entirety with 16 and 4 MiB | ||
137 | * pages. Consequently, restrict the top end of RAM currently | ||
138 | * allocable so that calls to the LMB to allocate PTEs for "tail" | ||
139 | * coverage with normal-sized pages (or other reasons) do not | ||
140 | * attempt to allocate outside the allowed range. | ||
141 | */ | ||
142 | |||
143 | __initial_memory_limit_addr = memstart_addr + mapped; | ||
144 | |||
145 | return mapped; | ||
134 | } | 146 | } |
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index a117024ab8cd..f0c3b88d50fa 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
@@ -507,6 +507,9 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | |||
507 | { | 507 | { |
508 | struct hstate *hstate = hstate_file(file); | 508 | struct hstate *hstate = hstate_file(file); |
509 | int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate)); | 509 | int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate)); |
510 | |||
511 | if (!mmu_huge_psizes[mmu_psize]) | ||
512 | return -EINVAL; | ||
510 | return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0); | 513 | return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0); |
511 | } | 514 | } |
512 | 515 | ||
@@ -677,7 +680,7 @@ repeat: | |||
677 | return err; | 680 | return err; |
678 | } | 681 | } |
679 | 682 | ||
680 | void set_huge_psize(int psize) | 683 | static void __init set_huge_psize(int psize) |
681 | { | 684 | { |
682 | /* Check that it is a page size supported by the hardware and | 685 | /* Check that it is a page size supported by the hardware and |
683 | * that it fits within pagetable limits. */ | 686 | * that it fits within pagetable limits. */ |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index eb505ad34a85..cf81049e1e51 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -865,10 +865,77 @@ static struct notifier_block __cpuinitdata ppc64_numa_nb = { | |||
865 | .priority = 1 /* Must run before sched domains notifier. */ | 865 | .priority = 1 /* Must run before sched domains notifier. */ |
866 | }; | 866 | }; |
867 | 867 | ||
868 | static void mark_reserved_regions_for_nid(int nid) | ||
869 | { | ||
870 | struct pglist_data *node = NODE_DATA(nid); | ||
871 | int i; | ||
872 | |||
873 | for (i = 0; i < lmb.reserved.cnt; i++) { | ||
874 | unsigned long physbase = lmb.reserved.region[i].base; | ||
875 | unsigned long size = lmb.reserved.region[i].size; | ||
876 | unsigned long start_pfn = physbase >> PAGE_SHIFT; | ||
877 | unsigned long end_pfn = ((physbase + size) >> PAGE_SHIFT); | ||
878 | struct node_active_region node_ar; | ||
879 | unsigned long node_end_pfn = node->node_start_pfn + | ||
880 | node->node_spanned_pages; | ||
881 | |||
882 | /* | ||
883 | * Check to make sure that this lmb.reserved area is | ||
884 | * within the bounds of the node that we care about. | ||
885 | * Checking the nid of the start and end points is not | ||
886 | * sufficient because the reserved area could span the | ||
887 | * entire node. | ||
888 | */ | ||
889 | if (end_pfn <= node->node_start_pfn || | ||
890 | start_pfn >= node_end_pfn) | ||
891 | continue; | ||
892 | |||
893 | get_node_active_region(start_pfn, &node_ar); | ||
894 | while (start_pfn < end_pfn && | ||
895 | node_ar.start_pfn < node_ar.end_pfn) { | ||
896 | unsigned long reserve_size = size; | ||
897 | /* | ||
898 | * if reserved region extends past active region | ||
899 | * then trim size to active region | ||
900 | */ | ||
901 | if (end_pfn > node_ar.end_pfn) | ||
902 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) | ||
903 | - (start_pfn << PAGE_SHIFT); | ||
904 | /* | ||
905 | * Only worry about *this* node, others may not | ||
906 | * yet have valid NODE_DATA(). | ||
907 | */ | ||
908 | if (node_ar.nid == nid) { | ||
909 | dbg("reserve_bootmem %lx %lx nid=%d\n", | ||
910 | physbase, reserve_size, node_ar.nid); | ||
911 | reserve_bootmem_node(NODE_DATA(node_ar.nid), | ||
912 | physbase, reserve_size, | ||
913 | BOOTMEM_DEFAULT); | ||
914 | } | ||
915 | /* | ||
916 | * if reserved region is contained in the active region | ||
917 | * then done. | ||
918 | */ | ||
919 | if (end_pfn <= node_ar.end_pfn) | ||
920 | break; | ||
921 | |||
922 | /* | ||
923 | * reserved region extends past the active region | ||
924 | * get next active region that contains this | ||
925 | * reserved region | ||
926 | */ | ||
927 | start_pfn = node_ar.end_pfn; | ||
928 | physbase = start_pfn << PAGE_SHIFT; | ||
929 | size = size - reserve_size; | ||
930 | get_node_active_region(start_pfn, &node_ar); | ||
931 | } | ||
932 | } | ||
933 | } | ||
934 | |||
935 | |||
868 | void __init do_init_bootmem(void) | 936 | void __init do_init_bootmem(void) |
869 | { | 937 | { |
870 | int nid; | 938 | int nid; |
871 | unsigned int i; | ||
872 | 939 | ||
873 | min_low_pfn = 0; | 940 | min_low_pfn = 0; |
874 | max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT; | 941 | max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT; |
@@ -890,7 +957,13 @@ void __init do_init_bootmem(void) | |||
890 | 957 | ||
891 | get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); | 958 | get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); |
892 | 959 | ||
893 | /* Allocate the node structure node local if possible */ | 960 | /* |
961 | * Allocate the node structure node local if possible | ||
962 | * | ||
963 | * Be careful moving this around, as it relies on all | ||
964 | * previous nodes' bootmem to be initialized and have | ||
965 | * all reserved areas marked. | ||
966 | */ | ||
894 | NODE_DATA(nid) = careful_allocation(nid, | 967 | NODE_DATA(nid) = careful_allocation(nid, |
895 | sizeof(struct pglist_data), | 968 | sizeof(struct pglist_data), |
896 | SMP_CACHE_BYTES, end_pfn); | 969 | SMP_CACHE_BYTES, end_pfn); |
@@ -922,53 +995,14 @@ void __init do_init_bootmem(void) | |||
922 | start_pfn, end_pfn); | 995 | start_pfn, end_pfn); |
923 | 996 | ||
924 | free_bootmem_with_active_regions(nid, end_pfn); | 997 | free_bootmem_with_active_regions(nid, end_pfn); |
925 | } | 998 | /* |
926 | 999 | * Be very careful about moving this around. Future | |
927 | /* Mark reserved regions */ | 1000 | * calls to careful_allocation() depend on this getting |
928 | for (i = 0; i < lmb.reserved.cnt; i++) { | 1001 | * done correctly. |
929 | unsigned long physbase = lmb.reserved.region[i].base; | 1002 | */ |
930 | unsigned long size = lmb.reserved.region[i].size; | 1003 | mark_reserved_regions_for_nid(nid); |
931 | unsigned long start_pfn = physbase >> PAGE_SHIFT; | ||
932 | unsigned long end_pfn = ((physbase + size) >> PAGE_SHIFT); | ||
933 | struct node_active_region node_ar; | ||
934 | |||
935 | get_node_active_region(start_pfn, &node_ar); | ||
936 | while (start_pfn < end_pfn && | ||
937 | node_ar.start_pfn < node_ar.end_pfn) { | ||
938 | unsigned long reserve_size = size; | ||
939 | /* | ||
940 | * if reserved region extends past active region | ||
941 | * then trim size to active region | ||
942 | */ | ||
943 | if (end_pfn > node_ar.end_pfn) | ||
944 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) | ||
945 | - (start_pfn << PAGE_SHIFT); | ||
946 | dbg("reserve_bootmem %lx %lx nid=%d\n", physbase, | ||
947 | reserve_size, node_ar.nid); | ||
948 | reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase, | ||
949 | reserve_size, BOOTMEM_DEFAULT); | ||
950 | /* | ||
951 | * if reserved region is contained in the active region | ||
952 | * then done. | ||
953 | */ | ||
954 | if (end_pfn <= node_ar.end_pfn) | ||
955 | break; | ||
956 | |||
957 | /* | ||
958 | * reserved region extends past the active region | ||
959 | * get next active region that contains this | ||
960 | * reserved region | ||
961 | */ | ||
962 | start_pfn = node_ar.end_pfn; | ||
963 | physbase = start_pfn << PAGE_SHIFT; | ||
964 | size = size - reserve_size; | ||
965 | get_node_active_region(start_pfn, &node_ar); | ||
966 | } | ||
967 | |||
968 | } | ||
969 | |||
970 | for_each_online_node(nid) | ||
971 | sparse_memory_present_with_active_regions(nid); | 1004 | sparse_memory_present_with_active_regions(nid); |
1005 | } | ||
972 | } | 1006 | } |
973 | 1007 | ||
974 | void __init paging_init(void) | 1008 | void __init paging_init(void) |
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index 896548ba1ca1..0ce45c2b42f8 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c | |||
@@ -95,6 +95,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
95 | struct axon_msic *msic = get_irq_data(irq); | 95 | struct axon_msic *msic = get_irq_data(irq); |
96 | u32 write_offset, msi; | 96 | u32 write_offset, msi; |
97 | int idx; | 97 | int idx; |
98 | int retry = 0; | ||
98 | 99 | ||
99 | write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG); | 100 | write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG); |
100 | pr_debug("axon_msi: original write_offset 0x%x\n", write_offset); | 101 | pr_debug("axon_msi: original write_offset 0x%x\n", write_offset); |
@@ -102,7 +103,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
102 | /* write_offset doesn't wrap properly, so we have to mask it */ | 103 | /* write_offset doesn't wrap properly, so we have to mask it */ |
103 | write_offset &= MSIC_FIFO_SIZE_MASK; | 104 | write_offset &= MSIC_FIFO_SIZE_MASK; |
104 | 105 | ||
105 | while (msic->read_offset != write_offset) { | 106 | while (msic->read_offset != write_offset && retry < 100) { |
106 | idx = msic->read_offset / sizeof(__le32); | 107 | idx = msic->read_offset / sizeof(__le32); |
107 | msi = le32_to_cpu(msic->fifo_virt[idx]); | 108 | msi = le32_to_cpu(msic->fifo_virt[idx]); |
108 | msi &= 0xFFFF; | 109 | msi &= 0xFFFF; |
@@ -110,13 +111,37 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
110 | pr_debug("axon_msi: woff %x roff %x msi %x\n", | 111 | pr_debug("axon_msi: woff %x roff %x msi %x\n", |
111 | write_offset, msic->read_offset, msi); | 112 | write_offset, msic->read_offset, msi); |
112 | 113 | ||
114 | if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) { | ||
115 | generic_handle_irq(msi); | ||
116 | msic->fifo_virt[idx] = cpu_to_le32(0xffffffff); | ||
117 | } else { | ||
118 | /* | ||
119 | * Reading the MSIC_WRITE_OFFSET_REG does not | ||
120 | * reliably flush the outstanding DMA to the | ||
121 | * FIFO buffer. Here we were reading stale | ||
122 | * data, so we need to retry. | ||
123 | */ | ||
124 | udelay(1); | ||
125 | retry++; | ||
126 | pr_debug("axon_msi: invalid irq 0x%x!\n", msi); | ||
127 | continue; | ||
128 | } | ||
129 | |||
130 | if (retry) { | ||
131 | pr_debug("axon_msi: late irq 0x%x, retry %d\n", | ||
132 | msi, retry); | ||
133 | retry = 0; | ||
134 | } | ||
135 | |||
113 | msic->read_offset += MSIC_FIFO_ENTRY_SIZE; | 136 | msic->read_offset += MSIC_FIFO_ENTRY_SIZE; |
114 | msic->read_offset &= MSIC_FIFO_SIZE_MASK; | 137 | msic->read_offset &= MSIC_FIFO_SIZE_MASK; |
138 | } | ||
115 | 139 | ||
116 | if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) | 140 | if (retry) { |
117 | generic_handle_irq(msi); | 141 | printk(KERN_WARNING "axon_msi: irq timed out\n"); |
118 | else | 142 | |
119 | pr_debug("axon_msi: invalid irq 0x%x!\n", msi); | 143 | msic->read_offset += MSIC_FIFO_ENTRY_SIZE; |
144 | msic->read_offset &= MSIC_FIFO_SIZE_MASK; | ||
120 | } | 145 | } |
121 | 146 | ||
122 | desc->chip->eoi(irq); | 147 | desc->chip->eoi(irq); |
@@ -364,6 +389,7 @@ static int axon_msi_probe(struct of_device *device, | |||
364 | dn->full_name); | 389 | dn->full_name); |
365 | goto out_free_fifo; | 390 | goto out_free_fifo; |
366 | } | 391 | } |
392 | memset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES); | ||
367 | 393 | ||
368 | msic->irq_host = irq_alloc_host(dn, IRQ_HOST_MAP_NOMAP, | 394 | msic->irq_host = irq_alloc_host(dn, IRQ_HOST_MAP_NOMAP, |
369 | NR_IRQS, &msic_host_ops, 0); | 395 | NR_IRQS, &msic_host_ops, 0); |
@@ -387,6 +413,9 @@ static int axon_msi_probe(struct of_device *device, | |||
387 | MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE | | 413 | MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE | |
388 | MSIC_CTRL_FIFO_SIZE); | 414 | MSIC_CTRL_FIFO_SIZE); |
389 | 415 | ||
416 | msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG) | ||
417 | & MSIC_FIFO_SIZE_MASK; | ||
418 | |||
390 | device->dev.platform_data = msic; | 419 | device->dev.platform_data = msic; |
391 | 420 | ||
392 | ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; | 421 | ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; |
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c index c0d86e1f56ea..9046803c8276 100644 --- a/arch/powerpc/platforms/cell/smp.c +++ b/arch/powerpc/platforms/cell/smp.c | |||
@@ -129,10 +129,15 @@ static int __init smp_iic_probe(void) | |||
129 | return cpus_weight(cpu_possible_map); | 129 | return cpus_weight(cpu_possible_map); |
130 | } | 130 | } |
131 | 131 | ||
132 | static void __devinit smp_iic_setup_cpu(int cpu) | 132 | static void __devinit smp_cell_setup_cpu(int cpu) |
133 | { | 133 | { |
134 | if (cpu != boot_cpuid) | 134 | if (cpu != boot_cpuid) |
135 | iic_setup_cpu(); | 135 | iic_setup_cpu(); |
136 | |||
137 | /* | ||
138 | * change default DABRX to allow user watchpoints | ||
139 | */ | ||
140 | mtspr(SPRN_DABRX, DABRX_KERNEL | DABRX_USER); | ||
136 | } | 141 | } |
137 | 142 | ||
138 | static DEFINE_SPINLOCK(timebase_lock); | 143 | static DEFINE_SPINLOCK(timebase_lock); |
@@ -192,7 +197,7 @@ static struct smp_ops_t bpa_iic_smp_ops = { | |||
192 | .message_pass = smp_iic_message_pass, | 197 | .message_pass = smp_iic_message_pass, |
193 | .probe = smp_iic_probe, | 198 | .probe = smp_iic_probe, |
194 | .kick_cpu = smp_cell_kick_cpu, | 199 | .kick_cpu = smp_cell_kick_cpu, |
195 | .setup_cpu = smp_iic_setup_cpu, | 200 | .setup_cpu = smp_cell_setup_cpu, |
196 | .cpu_bootable = smp_cell_cpu_bootable, | 201 | .cpu_bootable = smp_cell_cpu_bootable, |
197 | }; | 202 | }; |
198 | 203 | ||
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index b73c369cc6f1..1b26071a86ca 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c | |||
@@ -390,6 +390,9 @@ static int spufs_ps_fault(struct vm_area_struct *vma, | |||
390 | if (offset >= ps_size) | 390 | if (offset >= ps_size) |
391 | return VM_FAULT_SIGBUS; | 391 | return VM_FAULT_SIGBUS; |
392 | 392 | ||
393 | if (fatal_signal_pending(current)) | ||
394 | return VM_FAULT_SIGBUS; | ||
395 | |||
393 | /* | 396 | /* |
394 | * Because we release the mmap_sem, the context may be destroyed while | 397 | * Because we release the mmap_sem, the context may be destroyed while |
395 | * we're in spu_wait. Grab an extra reference so it isn't destroyed | 398 | * we're in spu_wait. Grab an extra reference so it isn't destroyed |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index e1904774a70f..424b335a71c8 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -332,7 +332,7 @@ static void xics_eoi_lpar(unsigned int virq) | |||
332 | lpar_xirr_info_set((0xff << 24) | irq); | 332 | lpar_xirr_info_set((0xff << 24) | irq); |
333 | } | 333 | } |
334 | 334 | ||
335 | static void xics_set_affinity(unsigned int virq, cpumask_t cpumask) | 335 | static void xics_set_affinity(unsigned int virq, const struct cpumask *cpumask) |
336 | { | 336 | { |
337 | unsigned int irq; | 337 | unsigned int irq; |
338 | int status; | 338 | int status; |
@@ -845,7 +845,7 @@ void xics_migrate_irqs_away(void) | |||
845 | 845 | ||
846 | /* Reset affinity to all cpus */ | 846 | /* Reset affinity to all cpus */ |
847 | irq_desc[virq].affinity = CPU_MASK_ALL; | 847 | irq_desc[virq].affinity = CPU_MASK_ALL; |
848 | desc->chip->set_affinity(virq, CPU_MASK_ALL); | 848 | desc->chip->set_affinity(virq, cpu_all_mask); |
849 | unlock: | 849 | unlock: |
850 | spin_unlock_irqrestore(&desc->lock, flags); | 850 | spin_unlock_irqrestore(&desc->lock, flags); |
851 | } | 851 | } |
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig index 57cc56562567..0b192a1c429d 100644 --- a/arch/powerpc/sysdev/bestcomm/Kconfig +++ b/arch/powerpc/sysdev/bestcomm/Kconfig | |||
@@ -17,23 +17,20 @@ config PPC_BESTCOMM | |||
17 | answer Y or M. Otherwise say N. | 17 | answer Y or M. Otherwise say N. |
18 | 18 | ||
19 | config PPC_BESTCOMM_ATA | 19 | config PPC_BESTCOMM_ATA |
20 | tristate "Bestcomm ATA task support" | 20 | tristate |
21 | depends on PPC_BESTCOMM | 21 | depends on PPC_BESTCOMM |
22 | default n | ||
23 | help | 22 | help |
24 | This option enables the support for the ATA task. | 23 | This option enables the support for the ATA task. |
25 | 24 | ||
26 | config PPC_BESTCOMM_FEC | 25 | config PPC_BESTCOMM_FEC |
27 | tristate "Bestcomm FEC tasks support" | 26 | tristate |
28 | depends on PPC_BESTCOMM | 27 | depends on PPC_BESTCOMM |
29 | default n | ||
30 | help | 28 | help |
31 | This option enables the support for the FEC tasks. | 29 | This option enables the support for the FEC tasks. |
32 | 30 | ||
33 | config PPC_BESTCOMM_GEN_BD | 31 | config PPC_BESTCOMM_GEN_BD |
34 | tristate "Bestcomm GenBD tasks support" | 32 | tristate |
35 | depends on PPC_BESTCOMM | 33 | depends on PPC_BESTCOMM |
36 | default n | ||
37 | help | 34 | help |
38 | This option enables the support for the GenBD tasks. | 35 | This option enables the support for the GenBD tasks. |
39 | 36 | ||
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index f6299cca7814..5d7f9f0c93c3 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -600,7 +600,7 @@ static int irq_choose_cpu(unsigned int virt_irq) | |||
600 | cpuid = first_cpu(tmp); | 600 | cpuid = first_cpu(tmp); |
601 | } | 601 | } |
602 | 602 | ||
603 | return cpuid; | 603 | return get_hard_smp_processor_id(cpuid); |
604 | } | 604 | } |
605 | #else | 605 | #else |
606 | static int irq_choose_cpu(unsigned int virt_irq) | 606 | static int irq_choose_cpu(unsigned int virt_irq) |
@@ -817,7 +817,7 @@ static void mpic_end_ipi(unsigned int irq) | |||
817 | 817 | ||
818 | #endif /* CONFIG_SMP */ | 818 | #endif /* CONFIG_SMP */ |
819 | 819 | ||
820 | void mpic_set_affinity(unsigned int irq, cpumask_t cpumask) | 820 | void mpic_set_affinity(unsigned int irq, const struct cpumask *cpumask) |
821 | { | 821 | { |
822 | struct mpic *mpic = mpic_from_irq(irq); | 822 | struct mpic *mpic = mpic_from_irq(irq); |
823 | unsigned int src = mpic_irq_to_hw(irq); | 823 | unsigned int src = mpic_irq_to_hw(irq); |
@@ -829,7 +829,7 @@ void mpic_set_affinity(unsigned int irq, cpumask_t cpumask) | |||
829 | } else { | 829 | } else { |
830 | cpumask_t tmp; | 830 | cpumask_t tmp; |
831 | 831 | ||
832 | cpus_and(tmp, cpumask, cpu_online_map); | 832 | cpumask_and(&tmp, cpumask, cpu_online_mask); |
833 | 833 | ||
834 | mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), | 834 | mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), |
835 | mpic_physmask(cpus_addr(tmp)[0])); | 835 | mpic_physmask(cpus_addr(tmp)[0])); |
@@ -1271,6 +1271,7 @@ void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count) | |||
1271 | void __init mpic_init(struct mpic *mpic) | 1271 | void __init mpic_init(struct mpic *mpic) |
1272 | { | 1272 | { |
1273 | int i; | 1273 | int i; |
1274 | int cpu; | ||
1274 | 1275 | ||
1275 | BUG_ON(mpic->num_sources == 0); | 1276 | BUG_ON(mpic->num_sources == 0); |
1276 | 1277 | ||
@@ -1313,6 +1314,11 @@ void __init mpic_init(struct mpic *mpic) | |||
1313 | 1314 | ||
1314 | mpic_pasemi_msi_init(mpic); | 1315 | mpic_pasemi_msi_init(mpic); |
1315 | 1316 | ||
1317 | if (mpic->flags & MPIC_PRIMARY) | ||
1318 | cpu = hard_smp_processor_id(); | ||
1319 | else | ||
1320 | cpu = 0; | ||
1321 | |||
1316 | for (i = 0; i < mpic->num_sources; i++) { | 1322 | for (i = 0; i < mpic->num_sources; i++) { |
1317 | /* start with vector = source number, and masked */ | 1323 | /* start with vector = source number, and masked */ |
1318 | u32 vecpri = MPIC_VECPRI_MASK | i | | 1324 | u32 vecpri = MPIC_VECPRI_MASK | i | |
@@ -1323,8 +1329,7 @@ void __init mpic_init(struct mpic *mpic) | |||
1323 | continue; | 1329 | continue; |
1324 | /* init hw */ | 1330 | /* init hw */ |
1325 | mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri); | 1331 | mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri); |
1326 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), | 1332 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu); |
1327 | 1 << hard_smp_processor_id()); | ||
1328 | } | 1333 | } |
1329 | 1334 | ||
1330 | /* Init spurious vector */ | 1335 | /* Init spurious vector */ |
diff --git a/arch/powerpc/sysdev/mpic.h b/arch/powerpc/sysdev/mpic.h index 6209c62a426d..3cef2af10f42 100644 --- a/arch/powerpc/sysdev/mpic.h +++ b/arch/powerpc/sysdev/mpic.h | |||
@@ -36,6 +36,6 @@ static inline int mpic_pasemi_msi_init(struct mpic *mpic) | |||
36 | 36 | ||
37 | extern int mpic_set_irq_type(unsigned int virq, unsigned int flow_type); | 37 | extern int mpic_set_irq_type(unsigned int virq, unsigned int flow_type); |
38 | extern void mpic_set_vector(unsigned int virq, unsigned int vector); | 38 | extern void mpic_set_vector(unsigned int virq, unsigned int vector); |
39 | extern void mpic_set_affinity(unsigned int irq, cpumask_t cpumask); | 39 | extern void mpic_set_affinity(unsigned int irq, const struct cpumask *cpumask); |
40 | 40 | ||
41 | #endif /* _POWERPC_SYSDEV_MPIC_H */ | 41 | #endif /* _POWERPC_SYSDEV_MPIC_H */ |
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index b7aefd0d45cb..a22e1a2df1af 100644 --- a/arch/powerpc/sysdev/xilinx_intc.c +++ b/arch/powerpc/sysdev/xilinx_intc.c | |||
@@ -107,8 +107,8 @@ xilinx_intc_init(struct device_node *np) | |||
107 | } | 107 | } |
108 | regs = ioremap(res.start, 32); | 108 | regs = ioremap(res.start, 32); |
109 | 109 | ||
110 | printk(KERN_INFO "Xilinx intc at 0x%08LX mapped to 0x%p\n", | 110 | printk(KERN_INFO "Xilinx intc at 0x%08llx mapped to 0x%p\n", |
111 | res.start, regs); | 111 | (unsigned long long) res.start, regs); |
112 | 112 | ||
113 | /* Setup interrupt controller */ | 113 | /* Setup interrupt controller */ |
114 | out_be32(regs + XINTC_IER, 0); /* disable all irqs */ | 114 | out_be32(regs + XINTC_IER, 0); /* disable all irqs */ |
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 8116a3328a19..b4aa5869c7f9 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -75,6 +75,7 @@ config S390 | |||
75 | select HAVE_KRETPROBES | 75 | select HAVE_KRETPROBES |
76 | select HAVE_KVM if 64BIT | 76 | select HAVE_KVM if 64BIT |
77 | select HAVE_ARCH_TRACEHOOK | 77 | select HAVE_ARCH_TRACEHOOK |
78 | select INIT_ALL_POSSIBLE | ||
78 | 79 | ||
79 | source "init/Kconfig" | 80 | source "init/Kconfig" |
80 | 81 | ||
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 9b0bc2c9fba0..a0e748da9909 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc4 | 3 | # Linux kernel version: 2.6.28-rc6 |
4 | # Thu Aug 21 19:43:29 2008 | 4 | # Thu Nov 27 11:00:49 2008 |
5 | # | 5 | # |
6 | CONFIG_SCHED_MC=y | 6 | CONFIG_SCHED_MC=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -45,6 +45,7 @@ CONFIG_LOG_BUF_SHIFT=17 | |||
45 | CONFIG_CGROUPS=y | 45 | CONFIG_CGROUPS=y |
46 | # CONFIG_CGROUP_DEBUG is not set | 46 | # CONFIG_CGROUP_DEBUG is not set |
47 | CONFIG_CGROUP_NS=y | 47 | CONFIG_CGROUP_NS=y |
48 | # CONFIG_CGROUP_FREEZER is not set | ||
48 | # CONFIG_CGROUP_DEVICE is not set | 49 | # CONFIG_CGROUP_DEVICE is not set |
49 | # CONFIG_CPUSETS is not set | 50 | # CONFIG_CPUSETS is not set |
50 | CONFIG_GROUP_SCHED=y | 51 | CONFIG_GROUP_SCHED=y |
@@ -84,6 +85,7 @@ CONFIG_SIGNALFD=y | |||
84 | CONFIG_TIMERFD=y | 85 | CONFIG_TIMERFD=y |
85 | CONFIG_EVENTFD=y | 86 | CONFIG_EVENTFD=y |
86 | CONFIG_SHMEM=y | 87 | CONFIG_SHMEM=y |
88 | CONFIG_AIO=y | ||
87 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
88 | CONFIG_SLAB=y | 90 | CONFIG_SLAB=y |
89 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLUB is not set |
@@ -92,16 +94,10 @@ CONFIG_SLAB=y | |||
92 | # CONFIG_MARKERS is not set | 94 | # CONFIG_MARKERS is not set |
93 | CONFIG_HAVE_OPROFILE=y | 95 | CONFIG_HAVE_OPROFILE=y |
94 | CONFIG_KPROBES=y | 96 | CONFIG_KPROBES=y |
95 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
96 | CONFIG_KRETPROBES=y | 97 | CONFIG_KRETPROBES=y |
97 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
98 | CONFIG_HAVE_KPROBES=y | 98 | CONFIG_HAVE_KPROBES=y |
99 | CONFIG_HAVE_KRETPROBES=y | 99 | CONFIG_HAVE_KRETPROBES=y |
100 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | 100 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
101 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
102 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
103 | # CONFIG_HAVE_CLK is not set | ||
104 | CONFIG_PROC_PAGE_MONITOR=y | ||
105 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 101 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
106 | CONFIG_SLABINFO=y | 102 | CONFIG_SLABINFO=y |
107 | CONFIG_RT_MUTEXES=y | 103 | CONFIG_RT_MUTEXES=y |
@@ -135,6 +131,7 @@ CONFIG_DEFAULT_DEADLINE=y | |||
135 | CONFIG_DEFAULT_IOSCHED="deadline" | 131 | CONFIG_DEFAULT_IOSCHED="deadline" |
136 | CONFIG_PREEMPT_NOTIFIERS=y | 132 | CONFIG_PREEMPT_NOTIFIERS=y |
137 | CONFIG_CLASSIC_RCU=y | 133 | CONFIG_CLASSIC_RCU=y |
134 | # CONFIG_FREEZER is not set | ||
138 | 135 | ||
139 | # | 136 | # |
140 | # Base setup | 137 | # Base setup |
@@ -189,7 +186,6 @@ CONFIG_SELECT_MEMORY_MODEL=y | |||
189 | CONFIG_SPARSEMEM_MANUAL=y | 186 | CONFIG_SPARSEMEM_MANUAL=y |
190 | CONFIG_SPARSEMEM=y | 187 | CONFIG_SPARSEMEM=y |
191 | CONFIG_HAVE_MEMORY_PRESENT=y | 188 | CONFIG_HAVE_MEMORY_PRESENT=y |
192 | # CONFIG_SPARSEMEM_STATIC is not set | ||
193 | CONFIG_SPARSEMEM_EXTREME=y | 189 | CONFIG_SPARSEMEM_EXTREME=y |
194 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 190 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
195 | CONFIG_SPARSEMEM_VMEMMAP=y | 191 | CONFIG_SPARSEMEM_VMEMMAP=y |
@@ -200,9 +196,11 @@ CONFIG_PAGEFLAGS_EXTENDED=y | |||
200 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 196 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
201 | CONFIG_MIGRATION=y | 197 | CONFIG_MIGRATION=y |
202 | CONFIG_RESOURCES_64BIT=y | 198 | CONFIG_RESOURCES_64BIT=y |
199 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
203 | CONFIG_ZONE_DMA_FLAG=1 | 200 | CONFIG_ZONE_DMA_FLAG=1 |
204 | CONFIG_BOUNCE=y | 201 | CONFIG_BOUNCE=y |
205 | CONFIG_VIRT_TO_BUS=y | 202 | CONFIG_VIRT_TO_BUS=y |
203 | CONFIG_UNEVICTABLE_LRU=y | ||
206 | 204 | ||
207 | # | 205 | # |
208 | # I/O subsystem configuration | 206 | # I/O subsystem configuration |
@@ -220,6 +218,8 @@ CONFIG_IPL=y | |||
220 | CONFIG_IPL_VM=y | 218 | CONFIG_IPL_VM=y |
221 | CONFIG_BINFMT_ELF=y | 219 | CONFIG_BINFMT_ELF=y |
222 | CONFIG_COMPAT_BINFMT_ELF=y | 220 | CONFIG_COMPAT_BINFMT_ELF=y |
221 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
222 | # CONFIG_HAVE_AOUT is not set | ||
223 | CONFIG_BINFMT_MISC=m | 223 | CONFIG_BINFMT_MISC=m |
224 | CONFIG_FORCE_MAX_ZONEORDER=9 | 224 | CONFIG_FORCE_MAX_ZONEORDER=9 |
225 | # CONFIG_PROCESS_DEBUG is not set | 225 | # CONFIG_PROCESS_DEBUG is not set |
@@ -255,7 +255,7 @@ CONFIG_XFRM=y | |||
255 | # CONFIG_XFRM_STATISTICS is not set | 255 | # CONFIG_XFRM_STATISTICS is not set |
256 | CONFIG_NET_KEY=y | 256 | CONFIG_NET_KEY=y |
257 | # CONFIG_NET_KEY_MIGRATE is not set | 257 | # CONFIG_NET_KEY_MIGRATE is not set |
258 | CONFIG_IUCV=m | 258 | CONFIG_IUCV=y |
259 | CONFIG_AFIUCV=m | 259 | CONFIG_AFIUCV=m |
260 | CONFIG_INET=y | 260 | CONFIG_INET=y |
261 | CONFIG_IP_MULTICAST=y | 261 | CONFIG_IP_MULTICAST=y |
@@ -282,7 +282,6 @@ CONFIG_INET_TCP_DIAG=y | |||
282 | CONFIG_TCP_CONG_CUBIC=y | 282 | CONFIG_TCP_CONG_CUBIC=y |
283 | CONFIG_DEFAULT_TCP_CONG="cubic" | 283 | CONFIG_DEFAULT_TCP_CONG="cubic" |
284 | # CONFIG_TCP_MD5SIG is not set | 284 | # CONFIG_TCP_MD5SIG is not set |
285 | # CONFIG_IP_VS is not set | ||
286 | CONFIG_IPV6=y | 285 | CONFIG_IPV6=y |
287 | # CONFIG_IPV6_PRIVACY is not set | 286 | # CONFIG_IPV6_PRIVACY is not set |
288 | # CONFIG_IPV6_ROUTER_PREF is not set | 287 | # CONFIG_IPV6_ROUTER_PREF is not set |
@@ -331,10 +330,12 @@ CONFIG_NF_CONNTRACK=m | |||
331 | # CONFIG_NF_CONNTRACK_TFTP is not set | 330 | # CONFIG_NF_CONNTRACK_TFTP is not set |
332 | # CONFIG_NF_CT_NETLINK is not set | 331 | # CONFIG_NF_CT_NETLINK is not set |
333 | # CONFIG_NETFILTER_XTABLES is not set | 332 | # CONFIG_NETFILTER_XTABLES is not set |
333 | # CONFIG_IP_VS is not set | ||
334 | 334 | ||
335 | # | 335 | # |
336 | # IP: Netfilter Configuration | 336 | # IP: Netfilter Configuration |
337 | # | 337 | # |
338 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
338 | # CONFIG_NF_CONNTRACK_IPV4 is not set | 339 | # CONFIG_NF_CONNTRACK_IPV4 is not set |
339 | # CONFIG_IP_NF_QUEUE is not set | 340 | # CONFIG_IP_NF_QUEUE is not set |
340 | # CONFIG_IP_NF_IPTABLES is not set | 341 | # CONFIG_IP_NF_IPTABLES is not set |
@@ -374,6 +375,7 @@ CONFIG_NET_SCH_CBQ=m | |||
374 | # CONFIG_NET_SCH_HTB is not set | 375 | # CONFIG_NET_SCH_HTB is not set |
375 | # CONFIG_NET_SCH_HFSC is not set | 376 | # CONFIG_NET_SCH_HFSC is not set |
376 | CONFIG_NET_SCH_PRIO=m | 377 | CONFIG_NET_SCH_PRIO=m |
378 | CONFIG_NET_SCH_MULTIQ=y | ||
377 | CONFIG_NET_SCH_RED=m | 379 | CONFIG_NET_SCH_RED=m |
378 | CONFIG_NET_SCH_SFQ=m | 380 | CONFIG_NET_SCH_SFQ=m |
379 | CONFIG_NET_SCH_TEQL=m | 381 | CONFIG_NET_SCH_TEQL=m |
@@ -406,6 +408,7 @@ CONFIG_NET_ACT_POLICE=y | |||
406 | CONFIG_NET_ACT_NAT=m | 408 | CONFIG_NET_ACT_NAT=m |
407 | # CONFIG_NET_ACT_PEDIT is not set | 409 | # CONFIG_NET_ACT_PEDIT is not set |
408 | # CONFIG_NET_ACT_SIMP is not set | 410 | # CONFIG_NET_ACT_SIMP is not set |
411 | # CONFIG_NET_ACT_SKBEDIT is not set | ||
409 | # CONFIG_NET_CLS_IND is not set | 412 | # CONFIG_NET_CLS_IND is not set |
410 | CONFIG_NET_SCH_FIFO=y | 413 | CONFIG_NET_SCH_FIFO=y |
411 | 414 | ||
@@ -424,6 +427,7 @@ CONFIG_CAN_BCM=m | |||
424 | CONFIG_CAN_VCAN=m | 427 | CONFIG_CAN_VCAN=m |
425 | # CONFIG_CAN_DEBUG_DEVICES is not set | 428 | # CONFIG_CAN_DEBUG_DEVICES is not set |
426 | # CONFIG_AF_RXRPC is not set | 429 | # CONFIG_AF_RXRPC is not set |
430 | # CONFIG_PHONET is not set | ||
427 | # CONFIG_RFKILL is not set | 431 | # CONFIG_RFKILL is not set |
428 | # CONFIG_NET_9P is not set | 432 | # CONFIG_NET_9P is not set |
429 | # CONFIG_PCMCIA is not set | 433 | # CONFIG_PCMCIA is not set |
@@ -473,7 +477,7 @@ CONFIG_VIRTIO_BLK=m | |||
473 | CONFIG_MISC_DEVICES=y | 477 | CONFIG_MISC_DEVICES=y |
474 | # CONFIG_EEPROM_93CX6 is not set | 478 | # CONFIG_EEPROM_93CX6 is not set |
475 | # CONFIG_ENCLOSURE_SERVICES is not set | 479 | # CONFIG_ENCLOSURE_SERVICES is not set |
476 | # CONFIG_HAVE_IDE is not set | 480 | # CONFIG_C2PORT is not set |
477 | 481 | ||
478 | # | 482 | # |
479 | # SCSI device support | 483 | # SCSI device support |
@@ -525,6 +529,7 @@ CONFIG_SCSI_DH_EMC=m | |||
525 | CONFIG_SCSI_DH_ALUA=m | 529 | CONFIG_SCSI_DH_ALUA=m |
526 | CONFIG_MD=y | 530 | CONFIG_MD=y |
527 | CONFIG_BLK_DEV_MD=y | 531 | CONFIG_BLK_DEV_MD=y |
532 | CONFIG_MD_AUTODETECT=y | ||
528 | CONFIG_MD_LINEAR=m | 533 | CONFIG_MD_LINEAR=m |
529 | CONFIG_MD_RAID0=m | 534 | CONFIG_MD_RAID0=m |
530 | CONFIG_MD_RAID1=m | 535 | CONFIG_MD_RAID1=m |
@@ -555,6 +560,9 @@ CONFIG_NET_ETHERNET=y | |||
555 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 560 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
556 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 561 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
557 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 562 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
563 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
564 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
565 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
558 | CONFIG_NETDEV_1000=y | 566 | CONFIG_NETDEV_1000=y |
559 | CONFIG_NETDEV_10000=y | 567 | CONFIG_NETDEV_10000=y |
560 | # CONFIG_TR is not set | 568 | # CONFIG_TR is not set |
@@ -632,13 +640,12 @@ CONFIG_S390_VMUR=m | |||
632 | # CONFIG_THERMAL is not set | 640 | # CONFIG_THERMAL is not set |
633 | # CONFIG_THERMAL_HWMON is not set | 641 | # CONFIG_THERMAL_HWMON is not set |
634 | # CONFIG_WATCHDOG is not set | 642 | # CONFIG_WATCHDOG is not set |
635 | 643 | # CONFIG_REGULATOR is not set | |
636 | # | ||
637 | # Sonics Silicon Backplane | ||
638 | # | ||
639 | # CONFIG_MEMSTICK is not set | 644 | # CONFIG_MEMSTICK is not set |
640 | # CONFIG_NEW_LEDS is not set | 645 | # CONFIG_NEW_LEDS is not set |
641 | CONFIG_ACCESSIBILITY=y | 646 | CONFIG_ACCESSIBILITY=y |
647 | # CONFIG_STAGING is not set | ||
648 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
642 | 649 | ||
643 | # | 650 | # |
644 | # File systems | 651 | # File systems |
@@ -650,13 +657,14 @@ CONFIG_EXT3_FS=y | |||
650 | CONFIG_EXT3_FS_XATTR=y | 657 | CONFIG_EXT3_FS_XATTR=y |
651 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 658 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
652 | # CONFIG_EXT3_FS_SECURITY is not set | 659 | # CONFIG_EXT3_FS_SECURITY is not set |
653 | # CONFIG_EXT4DEV_FS is not set | 660 | # CONFIG_EXT4_FS is not set |
654 | CONFIG_JBD=y | 661 | CONFIG_JBD=y |
655 | # CONFIG_JBD_DEBUG is not set | 662 | # CONFIG_JBD_DEBUG is not set |
656 | CONFIG_FS_MBCACHE=y | 663 | CONFIG_FS_MBCACHE=y |
657 | # CONFIG_REISERFS_FS is not set | 664 | # CONFIG_REISERFS_FS is not set |
658 | # CONFIG_JFS_FS is not set | 665 | # CONFIG_JFS_FS is not set |
659 | CONFIG_FS_POSIX_ACL=y | 666 | CONFIG_FS_POSIX_ACL=y |
667 | CONFIG_FILE_LOCKING=y | ||
660 | # CONFIG_XFS_FS is not set | 668 | # CONFIG_XFS_FS is not set |
661 | # CONFIG_GFS2_FS is not set | 669 | # CONFIG_GFS2_FS is not set |
662 | # CONFIG_OCFS2_FS is not set | 670 | # CONFIG_OCFS2_FS is not set |
@@ -688,6 +696,7 @@ CONFIG_GENERIC_ACL=y | |||
688 | CONFIG_PROC_FS=y | 696 | CONFIG_PROC_FS=y |
689 | CONFIG_PROC_KCORE=y | 697 | CONFIG_PROC_KCORE=y |
690 | CONFIG_PROC_SYSCTL=y | 698 | CONFIG_PROC_SYSCTL=y |
699 | CONFIG_PROC_PAGE_MONITOR=y | ||
691 | CONFIG_SYSFS=y | 700 | CONFIG_SYSFS=y |
692 | CONFIG_TMPFS=y | 701 | CONFIG_TMPFS=y |
693 | CONFIG_TMPFS_POSIX_ACL=y | 702 | CONFIG_TMPFS_POSIX_ACL=y |
@@ -728,6 +737,7 @@ CONFIG_LOCKD_V4=y | |||
728 | CONFIG_EXPORTFS=y | 737 | CONFIG_EXPORTFS=y |
729 | CONFIG_NFS_COMMON=y | 738 | CONFIG_NFS_COMMON=y |
730 | CONFIG_SUNRPC=y | 739 | CONFIG_SUNRPC=y |
740 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
731 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 741 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
732 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 742 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
733 | # CONFIG_SMB_FS is not set | 743 | # CONFIG_SMB_FS is not set |
@@ -800,12 +810,24 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
800 | # CONFIG_DEBUG_SG is not set | 810 | # CONFIG_DEBUG_SG is not set |
801 | # CONFIG_FRAME_POINTER is not set | 811 | # CONFIG_FRAME_POINTER is not set |
802 | # CONFIG_RCU_TORTURE_TEST is not set | 812 | # CONFIG_RCU_TORTURE_TEST is not set |
813 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
803 | # CONFIG_KPROBES_SANITY_TEST is not set | 814 | # CONFIG_KPROBES_SANITY_TEST is not set |
804 | # CONFIG_BACKTRACE_SELF_TEST is not set | 815 | # CONFIG_BACKTRACE_SELF_TEST is not set |
816 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
805 | # CONFIG_LKDTM is not set | 817 | # CONFIG_LKDTM is not set |
806 | # CONFIG_FAULT_INJECTION is not set | 818 | # CONFIG_FAULT_INJECTION is not set |
807 | # CONFIG_LATENCYTOP is not set | 819 | # CONFIG_LATENCYTOP is not set |
808 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 820 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
821 | |||
822 | # | ||
823 | # Tracers | ||
824 | # | ||
825 | # CONFIG_IRQSOFF_TRACER is not set | ||
826 | # CONFIG_PREEMPT_TRACER is not set | ||
827 | # CONFIG_SCHED_TRACER is not set | ||
828 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
829 | # CONFIG_BOOT_TRACER is not set | ||
830 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
809 | CONFIG_SAMPLES=y | 831 | CONFIG_SAMPLES=y |
810 | # CONFIG_SAMPLE_KOBJECT is not set | 832 | # CONFIG_SAMPLE_KOBJECT is not set |
811 | # CONFIG_SAMPLE_KPROBES is not set | 833 | # CONFIG_SAMPLE_KPROBES is not set |
@@ -816,16 +838,19 @@ CONFIG_SAMPLES=y | |||
816 | # | 838 | # |
817 | # CONFIG_KEYS is not set | 839 | # CONFIG_KEYS is not set |
818 | # CONFIG_SECURITY is not set | 840 | # CONFIG_SECURITY is not set |
841 | # CONFIG_SECURITYFS is not set | ||
819 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 842 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
820 | CONFIG_CRYPTO=y | 843 | CONFIG_CRYPTO=y |
821 | 844 | ||
822 | # | 845 | # |
823 | # Crypto core or helper | 846 | # Crypto core or helper |
824 | # | 847 | # |
848 | CONFIG_CRYPTO_FIPS=y | ||
825 | CONFIG_CRYPTO_ALGAPI=y | 849 | CONFIG_CRYPTO_ALGAPI=y |
826 | CONFIG_CRYPTO_AEAD=m | 850 | CONFIG_CRYPTO_AEAD=y |
827 | CONFIG_CRYPTO_BLKCIPHER=y | 851 | CONFIG_CRYPTO_BLKCIPHER=y |
828 | CONFIG_CRYPTO_HASH=m | 852 | CONFIG_CRYPTO_HASH=y |
853 | CONFIG_CRYPTO_RNG=y | ||
829 | CONFIG_CRYPTO_MANAGER=y | 854 | CONFIG_CRYPTO_MANAGER=y |
830 | CONFIG_CRYPTO_GF128MUL=m | 855 | CONFIG_CRYPTO_GF128MUL=m |
831 | # CONFIG_CRYPTO_NULL is not set | 856 | # CONFIG_CRYPTO_NULL is not set |
@@ -877,7 +902,7 @@ CONFIG_CRYPTO_SHA1=m | |||
877 | # | 902 | # |
878 | # Ciphers | 903 | # Ciphers |
879 | # | 904 | # |
880 | # CONFIG_CRYPTO_AES is not set | 905 | CONFIG_CRYPTO_AES=m |
881 | # CONFIG_CRYPTO_ANUBIS is not set | 906 | # CONFIG_CRYPTO_ANUBIS is not set |
882 | # CONFIG_CRYPTO_ARC4 is not set | 907 | # CONFIG_CRYPTO_ARC4 is not set |
883 | # CONFIG_CRYPTO_BLOWFISH is not set | 908 | # CONFIG_CRYPTO_BLOWFISH is not set |
@@ -898,6 +923,11 @@ CONFIG_CRYPTO_SEED=m | |||
898 | # | 923 | # |
899 | # CONFIG_CRYPTO_DEFLATE is not set | 924 | # CONFIG_CRYPTO_DEFLATE is not set |
900 | CONFIG_CRYPTO_LZO=m | 925 | CONFIG_CRYPTO_LZO=m |
926 | |||
927 | # | ||
928 | # Random Number Generation | ||
929 | # | ||
930 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
901 | CONFIG_CRYPTO_HW=y | 931 | CONFIG_CRYPTO_HW=y |
902 | CONFIG_ZCRYPT=m | 932 | CONFIG_ZCRYPT=m |
903 | # CONFIG_ZCRYPT_MONOLITHIC is not set | 933 | # CONFIG_ZCRYPT_MONOLITHIC is not set |
@@ -912,8 +942,6 @@ CONFIG_S390_PRNG=m | |||
912 | # Library routines | 942 | # Library routines |
913 | # | 943 | # |
914 | CONFIG_BITREVERSE=m | 944 | CONFIG_BITREVERSE=m |
915 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
916 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
917 | # CONFIG_CRC_CCITT is not set | 945 | # CONFIG_CRC_CCITT is not set |
918 | # CONFIG_CRC16 is not set | 946 | # CONFIG_CRC16 is not set |
919 | CONFIG_CRC_T10DIF=y | 947 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 7fc76133b3e4..5caddd4f7bed 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h | |||
@@ -679,8 +679,6 @@ static inline void pmd_clear(pmd_t *pmd) | |||
679 | 679 | ||
680 | static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | 680 | static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) |
681 | { | 681 | { |
682 | if (mm->context.has_pgste) | ||
683 | ptep_rcp_copy(ptep); | ||
684 | pte_val(*ptep) = _PAGE_TYPE_EMPTY; | 682 | pte_val(*ptep) = _PAGE_TYPE_EMPTY; |
685 | if (mm->context.noexec) | 683 | if (mm->context.noexec) |
686 | pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY; | 684 | pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY; |
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h index a7226f8143fb..5396f9f12263 100644 --- a/arch/s390/include/asm/ptrace.h +++ b/arch/s390/include/asm/ptrace.h | |||
@@ -321,8 +321,8 @@ struct pt_regs | |||
321 | psw_t psw; | 321 | psw_t psw; |
322 | unsigned long gprs[NUM_GPRS]; | 322 | unsigned long gprs[NUM_GPRS]; |
323 | unsigned long orig_gpr2; | 323 | unsigned long orig_gpr2; |
324 | unsigned short svcnr; | ||
324 | unsigned short ilc; | 325 | unsigned short ilc; |
325 | unsigned short trap; | ||
326 | }; | 326 | }; |
327 | #endif | 327 | #endif |
328 | 328 | ||
@@ -486,8 +486,6 @@ struct task_struct; | |||
486 | extern void user_enable_single_step(struct task_struct *); | 486 | extern void user_enable_single_step(struct task_struct *); |
487 | extern void user_disable_single_step(struct task_struct *); | 487 | extern void user_disable_single_step(struct task_struct *); |
488 | 488 | ||
489 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
490 | |||
491 | #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) | 489 | #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) |
492 | #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN) | 490 | #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN) |
493 | #define user_stack_pointer(regs)((regs)->gprs[15]) | 491 | #define user_stack_pointer(regs)((regs)->gprs[15]) |
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h index 6e623971fbb9..2429b87eb28d 100644 --- a/arch/s390/include/asm/syscall.h +++ b/arch/s390/include/asm/syscall.h | |||
@@ -17,9 +17,7 @@ | |||
17 | static inline long syscall_get_nr(struct task_struct *task, | 17 | static inline long syscall_get_nr(struct task_struct *task, |
18 | struct pt_regs *regs) | 18 | struct pt_regs *regs) |
19 | { | 19 | { |
20 | if (regs->trap != __LC_SVC_OLD_PSW) | 20 | return regs->svcnr ? regs->svcnr : -1; |
21 | return -1; | ||
22 | return regs->gprs[2]; | ||
23 | } | 21 | } |
24 | 22 | ||
25 | static inline void syscall_rollback(struct task_struct *task, | 23 | static inline void syscall_rollback(struct task_struct *task, |
@@ -52,18 +50,20 @@ static inline void syscall_get_arguments(struct task_struct *task, | |||
52 | unsigned int i, unsigned int n, | 50 | unsigned int i, unsigned int n, |
53 | unsigned long *args) | 51 | unsigned long *args) |
54 | { | 52 | { |
53 | unsigned long mask = -1UL; | ||
54 | |||
55 | BUG_ON(i + n > 6); | 55 | BUG_ON(i + n > 6); |
56 | #ifdef CONFIG_COMPAT | 56 | #ifdef CONFIG_COMPAT |
57 | if (test_tsk_thread_flag(task, TIF_31BIT)) { | 57 | if (test_tsk_thread_flag(task, TIF_31BIT)) |
58 | if (i + n == 6) | 58 | mask = 0xffffffff; |
59 | args[--n] = (u32) regs->args[0]; | ||
60 | while (n-- > 0) | ||
61 | args[n] = (u32) regs->gprs[2 + i + n]; | ||
62 | } | ||
63 | #endif | 59 | #endif |
64 | if (i + n == 6) | 60 | if (i + n == 6) |
65 | args[--n] = regs->args[0]; | 61 | args[--n] = regs->args[0] & mask; |
66 | memcpy(args, ®s->gprs[2 + i], n * sizeof(args[0])); | 62 | while (n-- > 0) |
63 | if (i + n > 0) | ||
64 | args[n] = regs->gprs[2 + i + n] & mask; | ||
65 | if (i == 0) | ||
66 | args[0] = regs->orig_gpr2 & mask; | ||
67 | } | 67 | } |
68 | 68 | ||
69 | static inline void syscall_set_arguments(struct task_struct *task, | 69 | static inline void syscall_set_arguments(struct task_struct *task, |
@@ -74,7 +74,11 @@ static inline void syscall_set_arguments(struct task_struct *task, | |||
74 | BUG_ON(i + n > 6); | 74 | BUG_ON(i + n > 6); |
75 | if (i + n == 6) | 75 | if (i + n == 6) |
76 | regs->args[0] = args[--n]; | 76 | regs->args[0] = args[--n]; |
77 | memcpy(®s->gprs[2 + i], args, n * sizeof(args[0])); | 77 | while (n-- > 0) |
78 | if (i + n > 0) | ||
79 | regs->gprs[2 + i + n] = args[n]; | ||
80 | if (i == 0) | ||
81 | regs->orig_gpr2 = args[0]; | ||
78 | } | 82 | } |
79 | 83 | ||
80 | #endif /* _ASM_SYSCALL_H */ | 84 | #endif /* _ASM_SYSCALL_H */ |
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c index fa28ecae636b..3d144e6020c6 100644 --- a/arch/s390/kernel/asm-offsets.c +++ b/arch/s390/kernel/asm-offsets.c | |||
@@ -32,7 +32,7 @@ int main(void) | |||
32 | DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs)); | 32 | DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs)); |
33 | DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2)); | 33 | DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2)); |
34 | DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc)); | 34 | DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc)); |
35 | DEFINE(__PT_TRAP, offsetof(struct pt_regs, trap)); | 35 | DEFINE(__PT_SVCNR, offsetof(struct pt_regs, svcnr)); |
36 | DEFINE(__PT_SIZE, sizeof(struct pt_regs)); | 36 | DEFINE(__PT_SIZE, sizeof(struct pt_regs)); |
37 | BLANK(); | 37 | BLANK(); |
38 | DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain)); | 38 | DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain)); |
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index c7f02e777af2..b537cb0e9b55 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c | |||
@@ -340,7 +340,7 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs) | |||
340 | return err; | 340 | return err; |
341 | 341 | ||
342 | restore_fp_regs(¤t->thread.fp_regs); | 342 | restore_fp_regs(¤t->thread.fp_regs); |
343 | regs->trap = -1; /* disable syscall checks */ | 343 | regs->svcnr = 0; /* disable syscall checks */ |
344 | return 0; | 344 | return 0; |
345 | } | 345 | } |
346 | 346 | ||
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index ed500ef799b7..198ea18a534d 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
@@ -46,7 +46,7 @@ SP_R14 = STACK_FRAME_OVERHEAD + __PT_GPRS + 56 | |||
46 | SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 60 | 46 | SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 60 |
47 | SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 | 47 | SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 |
48 | SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC | 48 | SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC |
49 | SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP | 49 | SP_SVCNR = STACK_FRAME_OVERHEAD + __PT_SVCNR |
50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE | 50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE |
51 | 51 | ||
52 | _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ | 52 | _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ |
@@ -61,22 +61,25 @@ STACK_SIZE = 1 << STACK_SHIFT | |||
61 | 61 | ||
62 | #ifdef CONFIG_TRACE_IRQFLAGS | 62 | #ifdef CONFIG_TRACE_IRQFLAGS |
63 | .macro TRACE_IRQS_ON | 63 | .macro TRACE_IRQS_ON |
64 | l %r1,BASED(.Ltrace_irq_on) | 64 | basr %r2,%r0 |
65 | l %r1,BASED(.Ltrace_irq_on_caller) | ||
65 | basr %r14,%r1 | 66 | basr %r14,%r1 |
66 | .endm | 67 | .endm |
67 | 68 | ||
68 | .macro TRACE_IRQS_OFF | 69 | .macro TRACE_IRQS_OFF |
69 | l %r1,BASED(.Ltrace_irq_off) | 70 | basr %r2,%r0 |
71 | l %r1,BASED(.Ltrace_irq_off_caller) | ||
70 | basr %r14,%r1 | 72 | basr %r14,%r1 |
71 | .endm | 73 | .endm |
72 | 74 | ||
73 | .macro TRACE_IRQS_CHECK | 75 | .macro TRACE_IRQS_CHECK |
76 | basr %r2,%r0 | ||
74 | tm SP_PSW(%r15),0x03 # irqs enabled? | 77 | tm SP_PSW(%r15),0x03 # irqs enabled? |
75 | jz 0f | 78 | jz 0f |
76 | l %r1,BASED(.Ltrace_irq_on) | 79 | l %r1,BASED(.Ltrace_irq_on_caller) |
77 | basr %r14,%r1 | 80 | basr %r14,%r1 |
78 | j 1f | 81 | j 1f |
79 | 0: l %r1,BASED(.Ltrace_irq_off) | 82 | 0: l %r1,BASED(.Ltrace_irq_off_caller) |
80 | basr %r14,%r1 | 83 | basr %r14,%r1 |
81 | 1: | 84 | 1: |
82 | .endm | 85 | .endm |
@@ -180,11 +183,10 @@ STACK_SIZE = 1 << STACK_SHIFT | |||
180 | .macro CREATE_STACK_FRAME psworg,savearea | 183 | .macro CREATE_STACK_FRAME psworg,savearea |
181 | s %r15,BASED(.Lc_spsize) # make room for registers & psw | 184 | s %r15,BASED(.Lc_spsize) # make room for registers & psw |
182 | mvc SP_PSW(8,%r15),0(%r12) # move user PSW to stack | 185 | mvc SP_PSW(8,%r15),0(%r12) # move user PSW to stack |
183 | la %r12,\psworg | ||
184 | st %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 | 186 | st %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 |
185 | icm %r12,12,__LC_SVC_ILC | 187 | icm %r12,3,__LC_SVC_ILC |
186 | stm %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack | 188 | stm %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack |
187 | st %r12,SP_ILC(%r15) | 189 | st %r12,SP_SVCNR(%r15) |
188 | mvc SP_R12(16,%r15),\savearea # move %r12-%r15 to stack | 190 | mvc SP_R12(16,%r15),\savearea # move %r12-%r15 to stack |
189 | la %r12,0 | 191 | la %r12,0 |
190 | st %r12,__SF_BACKCHAIN(%r15) # clear back chain | 192 | st %r12,__SF_BACKCHAIN(%r15) # clear back chain |
@@ -261,16 +263,17 @@ sysc_update: | |||
261 | #endif | 263 | #endif |
262 | sysc_do_svc: | 264 | sysc_do_svc: |
263 | l %r9,__LC_THREAD_INFO # load pointer to thread_info struct | 265 | l %r9,__LC_THREAD_INFO # load pointer to thread_info struct |
264 | sla %r7,2 # *4 and test for svc 0 | 266 | ltr %r7,%r7 # test for svc 0 |
265 | bnz BASED(sysc_nr_ok) # svc number > 0 | 267 | bnz BASED(sysc_nr_ok) # svc number > 0 |
266 | # svc 0: system call number in %r1 | 268 | # svc 0: system call number in %r1 |
267 | cl %r1,BASED(.Lnr_syscalls) | 269 | cl %r1,BASED(.Lnr_syscalls) |
268 | bnl BASED(sysc_nr_ok) | 270 | bnl BASED(sysc_nr_ok) |
269 | lr %r7,%r1 # copy svc number to %r7 | 271 | lr %r7,%r1 # copy svc number to %r7 |
270 | sla %r7,2 # *4 | ||
271 | sysc_nr_ok: | 272 | sysc_nr_ok: |
272 | mvc SP_ARGS(4,%r15),SP_R7(%r15) | 273 | mvc SP_ARGS(4,%r15),SP_R7(%r15) |
273 | sysc_do_restart: | 274 | sysc_do_restart: |
275 | sth %r7,SP_SVCNR(%r15) | ||
276 | sll %r7,2 # svc number *4 | ||
274 | l %r8,BASED(.Lsysc_table) | 277 | l %r8,BASED(.Lsysc_table) |
275 | tm __TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT) | 278 | tm __TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT) |
276 | l %r8,0(%r7,%r8) # get system call addr. | 279 | l %r8,0(%r7,%r8) # get system call addr. |
@@ -373,7 +376,6 @@ sysc_notify_resume: | |||
373 | sysc_restart: | 376 | sysc_restart: |
374 | ni __TI_flags+3(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC | 377 | ni __TI_flags+3(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC |
375 | l %r7,SP_R2(%r15) # load new svc number | 378 | l %r7,SP_R2(%r15) # load new svc number |
376 | sla %r7,2 | ||
377 | mvc SP_R2(4,%r15),SP_ORIG_R2(%r15) # restore first argument | 379 | mvc SP_R2(4,%r15),SP_ORIG_R2(%r15) # restore first argument |
378 | lm %r2,%r6,SP_R2(%r15) # load svc arguments | 380 | lm %r2,%r6,SP_R2(%r15) # load svc arguments |
379 | b BASED(sysc_do_restart) # restart svc | 381 | b BASED(sysc_do_restart) # restart svc |
@@ -383,7 +385,8 @@ sysc_restart: | |||
383 | # | 385 | # |
384 | sysc_singlestep: | 386 | sysc_singlestep: |
385 | ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP | 387 | ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP |
386 | mvi SP_TRAP+1(%r15),0x28 # set trap indication to pgm check | 388 | mvi SP_SVCNR(%r15),0xff # set trap indication to pgm check |
389 | mvi SP_SVCNR+1(%r15),0xff | ||
387 | la %r2,SP_PTREGS(%r15) # address of register-save area | 390 | la %r2,SP_PTREGS(%r15) # address of register-save area |
388 | l %r1,BASED(.Lhandle_per) # load adr. of per handler | 391 | l %r1,BASED(.Lhandle_per) # load adr. of per handler |
389 | la %r14,BASED(sysc_return) # load adr. of system return | 392 | la %r14,BASED(sysc_return) # load adr. of system return |
@@ -404,7 +407,7 @@ sysc_tracesys: | |||
404 | bnl BASED(sysc_tracenogo) | 407 | bnl BASED(sysc_tracenogo) |
405 | l %r8,BASED(.Lsysc_table) | 408 | l %r8,BASED(.Lsysc_table) |
406 | lr %r7,%r2 | 409 | lr %r7,%r2 |
407 | sll %r7,2 # *4 | 410 | sll %r7,2 # svc number *4 |
408 | l %r8,0(%r7,%r8) | 411 | l %r8,0(%r7,%r8) |
409 | sysc_tracego: | 412 | sysc_tracego: |
410 | lm %r3,%r6,SP_R3(%r15) | 413 | lm %r3,%r6,SP_R3(%r15) |
@@ -583,7 +586,8 @@ pgm_svcper: | |||
583 | # per was called from kernel, must be kprobes | 586 | # per was called from kernel, must be kprobes |
584 | # | 587 | # |
585 | kernel_per: | 588 | kernel_per: |
586 | mvi SP_TRAP+1(%r15),0x28 # set trap indication to pgm check | 589 | mvi SP_SVCNR(%r15),0xff # set trap indication to pgm check |
590 | mvi SP_SVCNR+1(%r15),0xff | ||
587 | la %r2,SP_PTREGS(%r15) # address of register-save area | 591 | la %r2,SP_PTREGS(%r15) # address of register-save area |
588 | l %r1,BASED(.Lhandle_per) # load adr. of per handler | 592 | l %r1,BASED(.Lhandle_per) # load adr. of per handler |
589 | la %r14,BASED(sysc_restore)# load adr. of system return | 593 | la %r14,BASED(sysc_restore)# load adr. of system return |
@@ -1113,9 +1117,12 @@ cleanup_io_leave_insn: | |||
1113 | .Lschedtail: .long schedule_tail | 1117 | .Lschedtail: .long schedule_tail |
1114 | .Lsysc_table: .long sys_call_table | 1118 | .Lsysc_table: .long sys_call_table |
1115 | #ifdef CONFIG_TRACE_IRQFLAGS | 1119 | #ifdef CONFIG_TRACE_IRQFLAGS |
1116 | .Ltrace_irq_on: .long trace_hardirqs_on | 1120 | .Ltrace_irq_on_caller: |
1117 | .Ltrace_irq_off: | 1121 | .long trace_hardirqs_on_caller |
1118 | .long trace_hardirqs_off | 1122 | .Ltrace_irq_off_caller: |
1123 | .long trace_hardirqs_off_caller | ||
1124 | #endif | ||
1125 | #ifdef CONFIG_LOCKDEP | ||
1119 | .Llockdep_sys_exit: | 1126 | .Llockdep_sys_exit: |
1120 | .long lockdep_sys_exit | 1127 | .long lockdep_sys_exit |
1121 | #endif | 1128 | #endif |
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index d7ce150453f2..89c121ae6339 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
@@ -46,7 +46,7 @@ SP_R14 = STACK_FRAME_OVERHEAD + __PT_GPRS + 112 | |||
46 | SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 120 | 46 | SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 120 |
47 | SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 | 47 | SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 |
48 | SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC | 48 | SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC |
49 | SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP | 49 | SP_SVCNR = STACK_FRAME_OVERHEAD + __PT_SVCNR |
50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE | 50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE |
51 | 51 | ||
52 | STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER | 52 | STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER |
@@ -61,19 +61,22 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ | |||
61 | 61 | ||
62 | #ifdef CONFIG_TRACE_IRQFLAGS | 62 | #ifdef CONFIG_TRACE_IRQFLAGS |
63 | .macro TRACE_IRQS_ON | 63 | .macro TRACE_IRQS_ON |
64 | brasl %r14,trace_hardirqs_on | 64 | basr %r2,%r0 |
65 | brasl %r14,trace_hardirqs_on_caller | ||
65 | .endm | 66 | .endm |
66 | 67 | ||
67 | .macro TRACE_IRQS_OFF | 68 | .macro TRACE_IRQS_OFF |
68 | brasl %r14,trace_hardirqs_off | 69 | basr %r2,%r0 |
70 | brasl %r14,trace_hardirqs_off_caller | ||
69 | .endm | 71 | .endm |
70 | 72 | ||
71 | .macro TRACE_IRQS_CHECK | 73 | .macro TRACE_IRQS_CHECK |
74 | basr %r2,%r0 | ||
72 | tm SP_PSW(%r15),0x03 # irqs enabled? | 75 | tm SP_PSW(%r15),0x03 # irqs enabled? |
73 | jz 0f | 76 | jz 0f |
74 | brasl %r14,trace_hardirqs_on | 77 | brasl %r14,trace_hardirqs_on_caller |
75 | j 1f | 78 | j 1f |
76 | 0: brasl %r14,trace_hardirqs_off | 79 | 0: brasl %r14,trace_hardirqs_off_caller |
77 | 1: | 80 | 1: |
78 | .endm | 81 | .endm |
79 | #else | 82 | #else |
@@ -168,11 +171,10 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ | |||
168 | .macro CREATE_STACK_FRAME psworg,savearea | 171 | .macro CREATE_STACK_FRAME psworg,savearea |
169 | aghi %r15,-SP_SIZE # make room for registers & psw | 172 | aghi %r15,-SP_SIZE # make room for registers & psw |
170 | mvc SP_PSW(16,%r15),0(%r12) # move user PSW to stack | 173 | mvc SP_PSW(16,%r15),0(%r12) # move user PSW to stack |
171 | la %r12,\psworg | ||
172 | stg %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 | 174 | stg %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 |
173 | icm %r12,12,__LC_SVC_ILC | 175 | icm %r12,3,__LC_SVC_ILC |
174 | stmg %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack | 176 | stmg %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack |
175 | st %r12,SP_ILC(%r15) | 177 | st %r12,SP_SVCNR(%r15) |
176 | mvc SP_R12(32,%r15),\savearea # move %r12-%r15 to stack | 178 | mvc SP_R12(32,%r15),\savearea # move %r12-%r15 to stack |
177 | la %r12,0 | 179 | la %r12,0 |
178 | stg %r12,__SF_BACKCHAIN(%r15) | 180 | stg %r12,__SF_BACKCHAIN(%r15) |
@@ -247,16 +249,17 @@ sysc_update: | |||
247 | #endif | 249 | #endif |
248 | sysc_do_svc: | 250 | sysc_do_svc: |
249 | lg %r9,__LC_THREAD_INFO # load pointer to thread_info struct | 251 | lg %r9,__LC_THREAD_INFO # load pointer to thread_info struct |
250 | slag %r7,%r7,2 # *4 and test for svc 0 | 252 | ltgr %r7,%r7 # test for svc 0 |
251 | jnz sysc_nr_ok | 253 | jnz sysc_nr_ok |
252 | # svc 0: system call number in %r1 | 254 | # svc 0: system call number in %r1 |
253 | cl %r1,BASED(.Lnr_syscalls) | 255 | cl %r1,BASED(.Lnr_syscalls) |
254 | jnl sysc_nr_ok | 256 | jnl sysc_nr_ok |
255 | lgfr %r7,%r1 # clear high word in r1 | 257 | lgfr %r7,%r1 # clear high word in r1 |
256 | slag %r7,%r7,2 # svc 0: system call number in %r1 | ||
257 | sysc_nr_ok: | 258 | sysc_nr_ok: |
258 | mvc SP_ARGS(8,%r15),SP_R7(%r15) | 259 | mvc SP_ARGS(8,%r15),SP_R7(%r15) |
259 | sysc_do_restart: | 260 | sysc_do_restart: |
261 | sth %r7,SP_SVCNR(%r15) | ||
262 | sllg %r7,%r7,2 # svc number * 4 | ||
260 | larl %r10,sys_call_table | 263 | larl %r10,sys_call_table |
261 | #ifdef CONFIG_COMPAT | 264 | #ifdef CONFIG_COMPAT |
262 | tm __TI_flags+5(%r9),(_TIF_31BIT>>16) # running in 31 bit mode ? | 265 | tm __TI_flags+5(%r9),(_TIF_31BIT>>16) # running in 31 bit mode ? |
@@ -360,7 +363,6 @@ sysc_notify_resume: | |||
360 | sysc_restart: | 363 | sysc_restart: |
361 | ni __TI_flags+7(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC | 364 | ni __TI_flags+7(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC |
362 | lg %r7,SP_R2(%r15) # load new svc number | 365 | lg %r7,SP_R2(%r15) # load new svc number |
363 | slag %r7,%r7,2 # *4 | ||
364 | mvc SP_R2(8,%r15),SP_ORIG_R2(%r15) # restore first argument | 366 | mvc SP_R2(8,%r15),SP_ORIG_R2(%r15) # restore first argument |
365 | lmg %r2,%r6,SP_R2(%r15) # load svc arguments | 367 | lmg %r2,%r6,SP_R2(%r15) # load svc arguments |
366 | j sysc_do_restart # restart svc | 368 | j sysc_do_restart # restart svc |
@@ -369,9 +371,8 @@ sysc_restart: | |||
369 | # _TIF_SINGLE_STEP is set, call do_single_step | 371 | # _TIF_SINGLE_STEP is set, call do_single_step |
370 | # | 372 | # |
371 | sysc_singlestep: | 373 | sysc_singlestep: |
372 | ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP | 374 | ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP |
373 | lhi %r0,__LC_PGM_OLD_PSW | 375 | xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number |
374 | sth %r0,SP_TRAP(%r15) # set trap indication to pgm check | ||
375 | la %r2,SP_PTREGS(%r15) # address of register-save area | 376 | la %r2,SP_PTREGS(%r15) # address of register-save area |
376 | larl %r14,sysc_return # load adr. of system return | 377 | larl %r14,sysc_return # load adr. of system return |
377 | jg do_single_step # branch to do_sigtrap | 378 | jg do_single_step # branch to do_sigtrap |
@@ -389,7 +390,7 @@ sysc_tracesys: | |||
389 | lghi %r0,NR_syscalls | 390 | lghi %r0,NR_syscalls |
390 | clgr %r0,%r2 | 391 | clgr %r0,%r2 |
391 | jnh sysc_tracenogo | 392 | jnh sysc_tracenogo |
392 | slag %r7,%r2,2 # *4 | 393 | sllg %r7,%r2,2 # svc number *4 |
393 | lgf %r8,0(%r7,%r10) | 394 | lgf %r8,0(%r7,%r10) |
394 | sysc_tracego: | 395 | sysc_tracego: |
395 | lmg %r3,%r6,SP_R3(%r15) | 396 | lmg %r3,%r6,SP_R3(%r15) |
@@ -564,8 +565,7 @@ pgm_svcper: | |||
564 | # per was called from kernel, must be kprobes | 565 | # per was called from kernel, must be kprobes |
565 | # | 566 | # |
566 | kernel_per: | 567 | kernel_per: |
567 | lhi %r0,__LC_PGM_OLD_PSW | 568 | xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number |
568 | sth %r0,SP_TRAP(%r15) # set trap indication to pgm check | ||
569 | la %r2,SP_PTREGS(%r15) # address of register-save area | 569 | la %r2,SP_PTREGS(%r15) # address of register-save area |
570 | larl %r14,sysc_restore # load adr. of system ret, no work | 570 | larl %r14,sysc_restore # load adr. of system ret, no work |
571 | jg do_single_step # branch to do_single_step | 571 | jg do_single_step # branch to do_single_step |
diff --git a/arch/s390/kernel/init_task.c b/arch/s390/kernel/init_task.c index 7ad003969251..e80716843619 100644 --- a/arch/s390/kernel/init_task.c +++ b/arch/s390/kernel/init_task.c | |||
@@ -26,7 +26,7 @@ EXPORT_SYMBOL(init_mm); | |||
26 | /* | 26 | /* |
27 | * Initial thread structure. | 27 | * Initial thread structure. |
28 | * | 28 | * |
29 | * We need to make sure that this is 8192-byte aligned due to the | 29 | * We need to make sure that this is THREAD_SIZE aligned due to the |
30 | * way process stacks are handled. This is done by having a special | 30 | * way process stacks are handled. This is done by having a special |
31 | * "init_task" linker map entry.. | 31 | * "init_task" linker map entry.. |
32 | */ | 32 | */ |
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 3e2c05cb6a87..04f8c67a6101 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c | |||
@@ -136,9 +136,12 @@ static void default_idle(void) | |||
136 | return; | 136 | return; |
137 | } | 137 | } |
138 | trace_hardirqs_on(); | 138 | trace_hardirqs_on(); |
139 | /* Don't trace preempt off for idle. */ | ||
140 | stop_critical_timings(); | ||
139 | /* Wait for external, I/O or machine check interrupt. */ | 141 | /* Wait for external, I/O or machine check interrupt. */ |
140 | __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT | | 142 | __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT | |
141 | PSW_MASK_IO | PSW_MASK_EXT); | 143 | PSW_MASK_IO | PSW_MASK_EXT); |
144 | start_critical_timings(); | ||
142 | } | 145 | } |
143 | 146 | ||
144 | void cpu_idle(void) | 147 | void cpu_idle(void) |
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 1f31be1ecc4b..38ff2bce1203 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c | |||
@@ -657,7 +657,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) | |||
657 | * debugger stored an invalid system call number. Skip | 657 | * debugger stored an invalid system call number. Skip |
658 | * the system call and the system call restart handling. | 658 | * the system call and the system call restart handling. |
659 | */ | 659 | */ |
660 | regs->trap = -1; | 660 | regs->svcnr = 0; |
661 | ret = -1; | 661 | ret = -1; |
662 | } | 662 | } |
663 | 663 | ||
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 62122bad1e33..400b040df7fa 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -604,13 +604,13 @@ setup_memory(void) | |||
604 | if (memory_chunk[i].type != CHUNK_READ_WRITE) | 604 | if (memory_chunk[i].type != CHUNK_READ_WRITE) |
605 | continue; | 605 | continue; |
606 | start_chunk = PFN_DOWN(memory_chunk[i].addr); | 606 | start_chunk = PFN_DOWN(memory_chunk[i].addr); |
607 | end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size) - 1; | 607 | end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size); |
608 | end_chunk = min(end_chunk, end_pfn); | 608 | end_chunk = min(end_chunk, end_pfn); |
609 | if (start_chunk >= end_chunk) | 609 | if (start_chunk >= end_chunk) |
610 | continue; | 610 | continue; |
611 | add_active_range(0, start_chunk, end_chunk); | 611 | add_active_range(0, start_chunk, end_chunk); |
612 | pfn = max(start_chunk, start_pfn); | 612 | pfn = max(start_chunk, start_pfn); |
613 | for (; pfn <= end_chunk; pfn++) | 613 | for (; pfn < end_chunk; pfn++) |
614 | page_set_storage_key(PFN_PHYS(pfn), PAGE_DEFAULT_KEY); | 614 | page_set_storage_key(PFN_PHYS(pfn), PAGE_DEFAULT_KEY); |
615 | } | 615 | } |
616 | 616 | ||
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index 4f7fc3059a8e..8e6812a22670 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c | |||
@@ -160,7 +160,7 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs) | |||
160 | current->thread.fp_regs.fpc &= FPC_VALID_MASK; | 160 | current->thread.fp_regs.fpc &= FPC_VALID_MASK; |
161 | 161 | ||
162 | restore_fp_regs(¤t->thread.fp_regs); | 162 | restore_fp_regs(¤t->thread.fp_regs); |
163 | regs->trap = -1; /* disable syscall checks */ | 163 | regs->svcnr = 0; /* disable syscall checks */ |
164 | return 0; | 164 | return 0; |
165 | } | 165 | } |
166 | 166 | ||
@@ -445,7 +445,7 @@ void do_signal(struct pt_regs *regs) | |||
445 | oldset = ¤t->blocked; | 445 | oldset = ¤t->blocked; |
446 | 446 | ||
447 | /* Are we from a system call? */ | 447 | /* Are we from a system call? */ |
448 | if (regs->trap == __LC_SVC_OLD_PSW) { | 448 | if (regs->svcnr) { |
449 | continue_addr = regs->psw.addr; | 449 | continue_addr = regs->psw.addr; |
450 | restart_addr = continue_addr - regs->ilc; | 450 | restart_addr = continue_addr - regs->ilc; |
451 | retval = regs->gprs[2]; | 451 | retval = regs->gprs[2]; |
@@ -462,7 +462,7 @@ void do_signal(struct pt_regs *regs) | |||
462 | case -ERESTART_RESTARTBLOCK: | 462 | case -ERESTART_RESTARTBLOCK: |
463 | regs->gprs[2] = -EINTR; | 463 | regs->gprs[2] = -EINTR; |
464 | } | 464 | } |
465 | regs->trap = -1; /* Don't deal with this again. */ | 465 | regs->svcnr = 0; /* Don't deal with this again. */ |
466 | } | 466 | } |
467 | 467 | ||
468 | /* Get signal to deliver. When running under ptrace, at this point | 468 | /* Get signal to deliver. When running under ptrace, at this point |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index b5595688a477..f03914b8ed2f 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -52,12 +52,6 @@ | |||
52 | struct _lowcore *lowcore_ptr[NR_CPUS]; | 52 | struct _lowcore *lowcore_ptr[NR_CPUS]; |
53 | EXPORT_SYMBOL(lowcore_ptr); | 53 | EXPORT_SYMBOL(lowcore_ptr); |
54 | 54 | ||
55 | cpumask_t cpu_online_map = CPU_MASK_NONE; | ||
56 | EXPORT_SYMBOL(cpu_online_map); | ||
57 | |||
58 | cpumask_t cpu_possible_map = CPU_MASK_ALL; | ||
59 | EXPORT_SYMBOL(cpu_possible_map); | ||
60 | |||
61 | static struct task_struct *current_set[NR_CPUS]; | 55 | static struct task_struct *current_set[NR_CPUS]; |
62 | 56 | ||
63 | static u8 smp_cpu_type; | 57 | static u8 smp_cpu_type; |
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index 5fdb799062b7..4fe952e557ac 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c | |||
@@ -198,7 +198,7 @@ asmlinkage long s390x_newuname(struct new_utsname __user *name) | |||
198 | { | 198 | { |
199 | int ret = sys_newuname(name); | 199 | int ret = sys_newuname(name); |
200 | 200 | ||
201 | if (current->personality == PER_LINUX32 && !ret) { | 201 | if (personality(current->personality) == PER_LINUX32 && !ret) { |
202 | ret = copy_to_user(name->machine, "s390\0\0\0\0", 8); | 202 | ret = copy_to_user(name->machine, "s390\0\0\0\0", 8); |
203 | if (ret) ret = -EFAULT; | 203 | if (ret) ret = -EFAULT; |
204 | } | 204 | } |
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index b94e9e3b694a..f5bd141c8443 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -59,7 +59,7 @@ | |||
59 | 59 | ||
60 | static ext_int_info_t ext_int_info_cc; | 60 | static ext_int_info_t ext_int_info_cc; |
61 | static ext_int_info_t ext_int_etr_cc; | 61 | static ext_int_info_t ext_int_etr_cc; |
62 | static u64 jiffies_timer_cc; | 62 | static u64 sched_clock_base_cc; |
63 | 63 | ||
64 | static DEFINE_PER_CPU(struct clock_event_device, comparators); | 64 | static DEFINE_PER_CPU(struct clock_event_device, comparators); |
65 | 65 | ||
@@ -68,7 +68,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators); | |||
68 | */ | 68 | */ |
69 | unsigned long long sched_clock(void) | 69 | unsigned long long sched_clock(void) |
70 | { | 70 | { |
71 | return ((get_clock_xt() - jiffies_timer_cc) * 125) >> 9; | 71 | return ((get_clock_xt() - sched_clock_base_cc) * 125) >> 9; |
72 | } | 72 | } |
73 | 73 | ||
74 | /* | 74 | /* |
@@ -154,7 +154,7 @@ void init_cpu_timer(void) | |||
154 | cd->min_delta_ns = 1; | 154 | cd->min_delta_ns = 1; |
155 | cd->max_delta_ns = LONG_MAX; | 155 | cd->max_delta_ns = LONG_MAX; |
156 | cd->rating = 400; | 156 | cd->rating = 400; |
157 | cd->cpumask = cpumask_of_cpu(cpu); | 157 | cd->cpumask = cpumask_of(cpu); |
158 | cd->set_next_event = s390_next_event; | 158 | cd->set_next_event = s390_next_event; |
159 | cd->set_mode = s390_set_mode; | 159 | cd->set_mode = s390_set_mode; |
160 | 160 | ||
@@ -229,13 +229,10 @@ static struct clocksource clocksource_tod = { | |||
229 | */ | 229 | */ |
230 | void __init time_init(void) | 230 | void __init time_init(void) |
231 | { | 231 | { |
232 | u64 init_timer_cc; | 232 | sched_clock_base_cc = reset_tod_clock(); |
233 | |||
234 | init_timer_cc = reset_tod_clock(); | ||
235 | jiffies_timer_cc = init_timer_cc - jiffies_64 * CLK_TICKS_PER_JIFFY; | ||
236 | 233 | ||
237 | /* set xtime */ | 234 | /* set xtime */ |
238 | tod_to_timeval(init_timer_cc - TOD_UNIX_EPOCH, &xtime); | 235 | tod_to_timeval(sched_clock_base_cc - TOD_UNIX_EPOCH, &xtime); |
239 | set_normalized_timespec(&wall_to_monotonic, | 236 | set_normalized_timespec(&wall_to_monotonic, |
240 | -xtime.tv_sec, -xtime.tv_nsec); | 237 | -xtime.tv_sec, -xtime.tv_nsec); |
241 | 238 | ||
@@ -289,7 +286,7 @@ static unsigned long long adjust_time(unsigned long long old, | |||
289 | delta = -delta; | 286 | delta = -delta; |
290 | adjust.offset = -ticks * (1000000 / HZ); | 287 | adjust.offset = -ticks * (1000000 / HZ); |
291 | } | 288 | } |
292 | jiffies_timer_cc += delta; | 289 | sched_clock_base_cc += delta; |
293 | if (adjust.offset != 0) { | 290 | if (adjust.offset != 0) { |
294 | printk(KERN_NOTICE "etr: time adjusted by %li micro-seconds\n", | 291 | printk(KERN_NOTICE "etr: time adjusted by %li micro-seconds\n", |
295 | adjust.offset); | 292 | adjust.offset); |
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 632b13e10053..bf96f1b5c6ec 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c | |||
@@ -65,18 +65,21 @@ static int machine_has_topology_irq; | |||
65 | static struct timer_list topology_timer; | 65 | static struct timer_list topology_timer; |
66 | static void set_topology_timer(void); | 66 | static void set_topology_timer(void); |
67 | static DECLARE_WORK(topology_work, topology_work_fn); | 67 | static DECLARE_WORK(topology_work, topology_work_fn); |
68 | /* topology_lock protects the core linked list */ | ||
69 | static DEFINE_SPINLOCK(topology_lock); | ||
68 | 70 | ||
69 | cpumask_t cpu_core_map[NR_CPUS]; | 71 | cpumask_t cpu_core_map[NR_CPUS]; |
70 | 72 | ||
71 | cpumask_t cpu_coregroup_map(unsigned int cpu) | 73 | cpumask_t cpu_coregroup_map(unsigned int cpu) |
72 | { | 74 | { |
73 | struct core_info *core = &core_info; | 75 | struct core_info *core = &core_info; |
76 | unsigned long flags; | ||
74 | cpumask_t mask; | 77 | cpumask_t mask; |
75 | 78 | ||
76 | cpus_clear(mask); | 79 | cpus_clear(mask); |
77 | if (!machine_has_topology) | 80 | if (!machine_has_topology) |
78 | return cpu_present_map; | 81 | return cpu_present_map; |
79 | mutex_lock(&smp_cpu_state_mutex); | 82 | spin_lock_irqsave(&topology_lock, flags); |
80 | while (core) { | 83 | while (core) { |
81 | if (cpu_isset(cpu, core->mask)) { | 84 | if (cpu_isset(cpu, core->mask)) { |
82 | mask = core->mask; | 85 | mask = core->mask; |
@@ -84,7 +87,7 @@ cpumask_t cpu_coregroup_map(unsigned int cpu) | |||
84 | } | 87 | } |
85 | core = core->next; | 88 | core = core->next; |
86 | } | 89 | } |
87 | mutex_unlock(&smp_cpu_state_mutex); | 90 | spin_unlock_irqrestore(&topology_lock, flags); |
88 | if (cpus_empty(mask)) | 91 | if (cpus_empty(mask)) |
89 | mask = cpumask_of_cpu(cpu); | 92 | mask = cpumask_of_cpu(cpu); |
90 | return mask; | 93 | return mask; |
@@ -133,7 +136,7 @@ static void tl_to_cores(struct tl_info *info) | |||
133 | union tl_entry *tle, *end; | 136 | union tl_entry *tle, *end; |
134 | struct core_info *core = &core_info; | 137 | struct core_info *core = &core_info; |
135 | 138 | ||
136 | mutex_lock(&smp_cpu_state_mutex); | 139 | spin_lock_irq(&topology_lock); |
137 | clear_cores(); | 140 | clear_cores(); |
138 | tle = info->tle; | 141 | tle = info->tle; |
139 | end = (union tl_entry *)((unsigned long)info + info->length); | 142 | end = (union tl_entry *)((unsigned long)info + info->length); |
@@ -157,7 +160,7 @@ static void tl_to_cores(struct tl_info *info) | |||
157 | } | 160 | } |
158 | tle = next_tle(tle); | 161 | tle = next_tle(tle); |
159 | } | 162 | } |
160 | mutex_unlock(&smp_cpu_state_mutex); | 163 | spin_unlock_irq(&topology_lock); |
161 | } | 164 | } |
162 | 165 | ||
163 | static void topology_update_polarization_simple(void) | 166 | static void topology_update_polarization_simple(void) |
@@ -209,7 +212,7 @@ static void update_cpu_core_map(void) | |||
209 | cpu_core_map[cpu] = cpu_coregroup_map(cpu); | 212 | cpu_core_map[cpu] = cpu_coregroup_map(cpu); |
210 | } | 213 | } |
211 | 214 | ||
212 | void arch_update_cpu_topology(void) | 215 | int arch_update_cpu_topology(void) |
213 | { | 216 | { |
214 | struct tl_info *info = tl_info; | 217 | struct tl_info *info = tl_info; |
215 | struct sys_device *sysdev; | 218 | struct sys_device *sysdev; |
@@ -218,7 +221,7 @@ void arch_update_cpu_topology(void) | |||
218 | if (!machine_has_topology) { | 221 | if (!machine_has_topology) { |
219 | update_cpu_core_map(); | 222 | update_cpu_core_map(); |
220 | topology_update_polarization_simple(); | 223 | topology_update_polarization_simple(); |
221 | return; | 224 | return 0; |
222 | } | 225 | } |
223 | stsi(info, 15, 1, 2); | 226 | stsi(info, 15, 1, 2); |
224 | tl_to_cores(info); | 227 | tl_to_cores(info); |
@@ -227,6 +230,7 @@ void arch_update_cpu_topology(void) | |||
227 | sysdev = get_cpu_sysdev(cpu); | 230 | sysdev = get_cpu_sysdev(cpu); |
228 | kobject_uevent(&sysdev->kobj, KOBJ_CHANGE); | 231 | kobject_uevent(&sysdev->kobj, KOBJ_CHANGE); |
229 | } | 232 | } |
233 | return 1; | ||
230 | } | 234 | } |
231 | 235 | ||
232 | static void topology_work_fn(struct work_struct *work) | 236 | static void topology_work_fn(struct work_struct *work) |
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 607bd67a18ce..d796d05c9c01 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
@@ -2,6 +2,7 @@ | |||
2 | * Written by Martin Schwidefsky (schwidefsky@de.ibm.com) | 2 | * Written by Martin Schwidefsky (schwidefsky@de.ibm.com) |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include <asm/thread_info.h> | ||
5 | #include <asm/page.h> | 6 | #include <asm/page.h> |
6 | #include <asm-generic/vmlinux.lds.h> | 7 | #include <asm-generic/vmlinux.lds.h> |
7 | 8 | ||
@@ -86,7 +87,7 @@ SECTIONS | |||
86 | } | 87 | } |
87 | _edata = .; /* End of data section */ | 88 | _edata = .; /* End of data section */ |
88 | 89 | ||
89 | . = ALIGN(2 * PAGE_SIZE); /* init_task */ | 90 | . = ALIGN(THREAD_SIZE); /* init_task */ |
90 | .data.init_task : { | 91 | .data.init_task : { |
91 | *(.data.init_task) | 92 | *(.data.init_task) |
92 | } | 93 | } |
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c index 170392687ce0..2a01b9e02801 100644 --- a/arch/s390/kvm/sigp.c +++ b/arch/s390/kvm/sigp.c | |||
@@ -237,6 +237,11 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu) | |||
237 | u8 order_code; | 237 | u8 order_code; |
238 | int rc; | 238 | int rc; |
239 | 239 | ||
240 | /* sigp in userspace can exit */ | ||
241 | if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) | ||
242 | return kvm_s390_inject_program_int(vcpu, | ||
243 | PGM_PRIVILEGED_OPERATION); | ||
244 | |||
240 | order_code = disp2; | 245 | order_code = disp2; |
241 | if (base2) | 246 | if (base2) |
242 | order_code += vcpu->arch.guest_gprs[base2]; | 247 | order_code += vcpu->arch.guest_gprs[base2]; |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 80119b3398e7..5c9cbfc14c4d 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -55,6 +55,8 @@ config GENERIC_HARDIRQS | |||
55 | 55 | ||
56 | config GENERIC_HARDIRQS_NO__DO_IRQ | 56 | config GENERIC_HARDIRQS_NO__DO_IRQ |
57 | def_bool y | 57 | def_bool y |
58 | depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \ | ||
59 | !SH_7751_SYSTEMH && !HD64461) | ||
58 | 60 | ||
59 | config GENERIC_IRQ_PROBE | 61 | config GENERIC_IRQ_PROBE |
60 | def_bool y | 62 | def_bool y |
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 436c28539577..65eaae34e753 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h | |||
@@ -293,6 +293,10 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags) | |||
293 | */ | 293 | */ |
294 | #define xlate_dev_kmem_ptr(p) p | 294 | #define xlate_dev_kmem_ptr(p) p |
295 | 295 | ||
296 | #define ARCH_HAS_VALID_PHYS_ADDR_RANGE | ||
297 | int valid_phys_addr_range(unsigned long addr, size_t size); | ||
298 | int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); | ||
299 | |||
296 | #endif /* __KERNEL__ */ | 300 | #endif /* __KERNEL__ */ |
297 | 301 | ||
298 | #endif /* __ASM_SH_IO_H */ | 302 | #endif /* __ASM_SH_IO_H */ |
diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h index 52220d70a096..b517ae08b9c0 100644 --- a/arch/sh/include/asm/pgtable.h +++ b/arch/sh/include/asm/pgtable.h | |||
@@ -148,6 +148,12 @@ extern void paging_init(void); | |||
148 | extern void page_table_range_init(unsigned long start, unsigned long end, | 148 | extern void page_table_range_init(unsigned long start, unsigned long end, |
149 | pgd_t *pgd); | 149 | pgd_t *pgd); |
150 | 150 | ||
151 | #if !defined(CONFIG_CACHE_OFF) && defined(CONFIG_CPU_SH4) && defined(CONFIG_MMU) | ||
152 | extern void kmap_coherent_init(void); | ||
153 | #else | ||
154 | #define kmap_coherent_init() do { } while (0) | ||
155 | #endif | ||
156 | |||
151 | #include <asm-generic/pgtable.h> | 157 | #include <asm-generic/pgtable.h> |
152 | 158 | ||
153 | #endif /* __ASM_SH_PGTABLE_H */ | 159 | #endif /* __ASM_SH_PGTABLE_H */ |
diff --git a/arch/sh/include/asm/smp.h b/arch/sh/include/asm/smp.h index 85b660c17eb0..c24e9c6a1736 100644 --- a/arch/sh/include/asm/smp.h +++ b/arch/sh/include/asm/smp.h | |||
@@ -31,7 +31,7 @@ enum { | |||
31 | }; | 31 | }; |
32 | 32 | ||
33 | void smp_message_recv(unsigned int msg); | 33 | void smp_message_recv(unsigned int msg); |
34 | void smp_timer_broadcast(cpumask_t mask); | 34 | void smp_timer_broadcast(const struct cpumask *mask); |
35 | 35 | ||
36 | void local_timer_interrupt(void); | 36 | void local_timer_interrupt(void); |
37 | void local_timer_setup(unsigned int cpu); | 37 | void local_timer_setup(unsigned int cpu); |
diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h index 95f0085e098a..279d9cc4a007 100644 --- a/arch/sh/include/asm/topology.h +++ b/arch/sh/include/asm/topology.h | |||
@@ -5,7 +5,6 @@ | |||
5 | 5 | ||
6 | /* sched_domains SD_NODE_INIT for sh machines */ | 6 | /* sched_domains SD_NODE_INIT for sh machines */ |
7 | #define SD_NODE_INIT (struct sched_domain) { \ | 7 | #define SD_NODE_INIT (struct sched_domain) { \ |
8 | .span = CPU_MASK_NONE, \ | ||
9 | .parent = NULL, \ | 8 | .parent = NULL, \ |
10 | .child = NULL, \ | 9 | .child = NULL, \ |
11 | .groups = NULL, \ | 10 | .groups = NULL, \ |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index a7412cede534..6d9e6972cfc9 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
@@ -119,17 +119,17 @@ static struct plat_sci_port sci_platform_data[] = { | |||
119 | },{ | 119 | },{ |
120 | .mapbase = 0xa4e30000, | 120 | .mapbase = 0xa4e30000, |
121 | .flags = UPF_BOOT_AUTOCONF, | 121 | .flags = UPF_BOOT_AUTOCONF, |
122 | .type = PORT_SCI, | 122 | .type = PORT_SCIFA, |
123 | .irqs = { 56, 56, 56, 56 }, | 123 | .irqs = { 56, 56, 56, 56 }, |
124 | },{ | 124 | },{ |
125 | .mapbase = 0xa4e40000, | 125 | .mapbase = 0xa4e40000, |
126 | .flags = UPF_BOOT_AUTOCONF, | 126 | .flags = UPF_BOOT_AUTOCONF, |
127 | .type = PORT_SCI, | 127 | .type = PORT_SCIFA, |
128 | .irqs = { 88, 88, 88, 88 }, | 128 | .irqs = { 88, 88, 88, 88 }, |
129 | },{ | 129 | },{ |
130 | .mapbase = 0xa4e50000, | 130 | .mapbase = 0xa4e50000, |
131 | .flags = UPF_BOOT_AUTOCONF, | 131 | .flags = UPF_BOOT_AUTOCONF, |
132 | .type = PORT_SCI, | 132 | .type = PORT_SCIFA, |
133 | .irqs = { 109, 109, 109, 109 }, | 133 | .irqs = { 109, 109, 109, 109 }, |
134 | }, { | 134 | }, { |
135 | .flags = 0, | 135 | .flags = 0, |
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c index 6b7d166694e2..a952dcf9999d 100644 --- a/arch/sh/kernel/early_printk.c +++ b/arch/sh/kernel/early_printk.c | |||
@@ -75,6 +75,7 @@ static struct console bios_console = { | |||
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | static struct uart_port scif_port = { | 77 | static struct uart_port scif_port = { |
78 | .type = PORT_SCIF, | ||
78 | .mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT, | 79 | .mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT, |
79 | .membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT, | 80 | .membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT, |
80 | }; | 81 | }; |
@@ -84,9 +85,9 @@ static void scif_sercon_putc(int c) | |||
84 | while (((sci_in(&scif_port, SCFDR) & EPK_FIFO_BITS) >= EPK_FIFO_SIZE)) | 85 | while (((sci_in(&scif_port, SCFDR) & EPK_FIFO_BITS) >= EPK_FIFO_SIZE)) |
85 | ; | 86 | ; |
86 | 87 | ||
87 | sci_out(&scif_port, SCxTDR, c); | ||
88 | sci_in(&scif_port, SCxSR); | 88 | sci_in(&scif_port, SCxSR); |
89 | sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40)); | 89 | sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40)); |
90 | sci_out(&scif_port, SCxTDR, c); | ||
90 | 91 | ||
91 | while ((sci_in(&scif_port, SCxSR) & 0x40) == 0) | 92 | while ((sci_in(&scif_port, SCxSR) & 0x40) == 0) |
92 | ; | 93 | ; |
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index 3c5ad1660bbc..8f4027412614 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c | |||
@@ -31,12 +31,6 @@ | |||
31 | int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ | 31 | int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ |
32 | int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */ | 32 | int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */ |
33 | 33 | ||
34 | cpumask_t cpu_possible_map; | ||
35 | EXPORT_SYMBOL(cpu_possible_map); | ||
36 | |||
37 | cpumask_t cpu_online_map; | ||
38 | EXPORT_SYMBOL(cpu_online_map); | ||
39 | |||
40 | static inline void __init smp_store_cpu_info(unsigned int cpu) | 34 | static inline void __init smp_store_cpu_info(unsigned int cpu) |
41 | { | 35 | { |
42 | struct sh_cpuinfo *c = cpu_data + cpu; | 36 | struct sh_cpuinfo *c = cpu_data + cpu; |
@@ -190,11 +184,11 @@ void arch_send_call_function_single_ipi(int cpu) | |||
190 | plat_send_ipi(cpu, SMP_MSG_FUNCTION_SINGLE); | 184 | plat_send_ipi(cpu, SMP_MSG_FUNCTION_SINGLE); |
191 | } | 185 | } |
192 | 186 | ||
193 | void smp_timer_broadcast(cpumask_t mask) | 187 | void smp_timer_broadcast(const struct cpumask *mask) |
194 | { | 188 | { |
195 | int cpu; | 189 | int cpu; |
196 | 190 | ||
197 | for_each_cpu_mask(cpu, mask) | 191 | for_each_cpu(cpu, mask) |
198 | plat_send_ipi(cpu, SMP_MSG_TIMER); | 192 | plat_send_ipi(cpu, SMP_MSG_TIMER); |
199 | } | 193 | } |
200 | 194 | ||
diff --git a/arch/sh/kernel/timers/timer-broadcast.c b/arch/sh/kernel/timers/timer-broadcast.c index c2317635230f..96e8eaea1e62 100644 --- a/arch/sh/kernel/timers/timer-broadcast.c +++ b/arch/sh/kernel/timers/timer-broadcast.c | |||
@@ -51,7 +51,7 @@ void __cpuinit local_timer_setup(unsigned int cpu) | |||
51 | clk->mult = 1; | 51 | clk->mult = 1; |
52 | clk->set_mode = dummy_timer_set_mode; | 52 | clk->set_mode = dummy_timer_set_mode; |
53 | clk->broadcast = smp_timer_broadcast; | 53 | clk->broadcast = smp_timer_broadcast; |
54 | clk->cpumask = cpumask_of_cpu(cpu); | 54 | clk->cpumask = cpumask_of(cpu); |
55 | 55 | ||
56 | clockevents_register_device(clk); | 56 | clockevents_register_device(clk); |
57 | } | 57 | } |
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c index aaaf90d06b85..0db3f9510336 100644 --- a/arch/sh/kernel/timers/timer-tmu.c +++ b/arch/sh/kernel/timers/timer-tmu.c | |||
@@ -120,7 +120,7 @@ static void tmu_set_mode(enum clock_event_mode mode, | |||
120 | { | 120 | { |
121 | switch (mode) { | 121 | switch (mode) { |
122 | case CLOCK_EVT_MODE_PERIODIC: | 122 | case CLOCK_EVT_MODE_PERIODIC: |
123 | ctrl_outl(ctrl_inl(TMU0_TCNT), TMU0_TCOR); | 123 | ctrl_outl(tmu_latest_interval[TMU0], TMU0_TCOR); |
124 | break; | 124 | break; |
125 | case CLOCK_EVT_MODE_ONESHOT: | 125 | case CLOCK_EVT_MODE_ONESHOT: |
126 | ctrl_outl(0, TMU0_TCOR); | 126 | ctrl_outl(0, TMU0_TCOR); |
@@ -263,7 +263,7 @@ static int tmu_timer_init(void) | |||
263 | tmu0_clockevent.min_delta_ns = | 263 | tmu0_clockevent.min_delta_ns = |
264 | clockevent_delta2ns(1, &tmu0_clockevent); | 264 | clockevent_delta2ns(1, &tmu0_clockevent); |
265 | 265 | ||
266 | tmu0_clockevent.cpumask = cpumask_of_cpu(0); | 266 | tmu0_clockevent.cpumask = cpumask_of(0); |
267 | 267 | ||
268 | clockevents_register_device(&tmu0_clockevent); | 268 | clockevents_register_device(&tmu0_clockevent); |
269 | 269 | ||
diff --git a/arch/sh/lib/copy_page.S b/arch/sh/lib/copy_page.S index 5d12e657be34..43de7e8e4e17 100644 --- a/arch/sh/lib/copy_page.S +++ b/arch/sh/lib/copy_page.S | |||
@@ -80,6 +80,11 @@ ENTRY(copy_page) | |||
80 | .section __ex_table, "a"; \ | 80 | .section __ex_table, "a"; \ |
81 | .long 9999b, 6000f ; \ | 81 | .long 9999b, 6000f ; \ |
82 | .previous | 82 | .previous |
83 | #define EX_NO_POP(...) \ | ||
84 | 9999: __VA_ARGS__ ; \ | ||
85 | .section __ex_table, "a"; \ | ||
86 | .long 9999b, 6005f ; \ | ||
87 | .previous | ||
83 | ENTRY(__copy_user) | 88 | ENTRY(__copy_user) |
84 | ! Check if small number of bytes | 89 | ! Check if small number of bytes |
85 | mov #11,r0 | 90 | mov #11,r0 |
@@ -139,9 +144,9 @@ EX( mov.b r1,@r4 ) | |||
139 | bt 1f | 144 | bt 1f |
140 | 145 | ||
141 | 2: | 146 | 2: |
142 | EX( mov.b @r5+,r0 ) | 147 | EX_NO_POP( mov.b @r5+,r0 ) |
143 | dt r6 | 148 | dt r6 |
144 | EX( mov.b r0,@r4 ) | 149 | EX_NO_POP( mov.b r0,@r4 ) |
145 | bf/s 2b | 150 | bf/s 2b |
146 | add #1,r4 | 151 | add #1,r4 |
147 | 152 | ||
@@ -150,7 +155,7 @@ EX( mov.b r0,@r4 ) | |||
150 | 155 | ||
151 | # Exception handler: | 156 | # Exception handler: |
152 | .section .fixup, "ax" | 157 | .section .fixup, "ax" |
153 | 6000: | 158 | 6005: |
154 | mov.l 8000f,r1 | 159 | mov.l 8000f,r1 |
155 | mov r3,r0 | 160 | mov r3,r0 |
156 | jmp @r1 | 161 | jmp @r1 |
diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32 index 70e0906023cc..f066e76da204 100644 --- a/arch/sh/mm/Makefile_32 +++ b/arch/sh/mm/Makefile_32 | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for the Linux SuperH-specific parts of the memory manager. | 2 | # Makefile for the Linux SuperH-specific parts of the memory manager. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := init.o extable_32.o consistent.o | 5 | obj-y := init.o extable_32.o consistent.o mmap.o |
6 | 6 | ||
7 | ifndef CONFIG_CACHE_OFF | 7 | ifndef CONFIG_CACHE_OFF |
8 | cache-$(CONFIG_CPU_SH2) := cache-sh2.o | 8 | cache-$(CONFIG_CPU_SH2) := cache-sh2.o |
diff --git a/arch/sh/mm/Makefile_64 b/arch/sh/mm/Makefile_64 index 0d92a8a3ac9a..9481d0f54efd 100644 --- a/arch/sh/mm/Makefile_64 +++ b/arch/sh/mm/Makefile_64 | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for the Linux SuperH-specific parts of the memory manager. | 2 | # Makefile for the Linux SuperH-specific parts of the memory manager. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := init.o consistent.o | 5 | obj-y := init.o consistent.o mmap.o |
6 | 6 | ||
7 | mmu-y := tlb-nommu.o pg-nommu.o extable_32.o | 7 | mmu-y := tlb-nommu.o pg-nommu.o extable_32.o |
8 | mmu-$(CONFIG_MMU) := fault_64.o ioremap_64.o tlbflush_64.o tlb-sh5.o \ | 8 | mmu-$(CONFIG_MMU) := fault_64.o ioremap_64.o tlbflush_64.o tlb-sh5.o \ |
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 4abf00031dae..6cbef8caeb56 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c | |||
@@ -137,6 +137,7 @@ void __init page_table_range_init(unsigned long start, unsigned long end, | |||
137 | void __init paging_init(void) | 137 | void __init paging_init(void) |
138 | { | 138 | { |
139 | unsigned long max_zone_pfns[MAX_NR_ZONES]; | 139 | unsigned long max_zone_pfns[MAX_NR_ZONES]; |
140 | unsigned long vaddr; | ||
140 | int nid; | 141 | int nid; |
141 | 142 | ||
142 | /* We don't need to map the kernel through the TLB, as | 143 | /* We don't need to map the kernel through the TLB, as |
@@ -148,10 +149,15 @@ void __init paging_init(void) | |||
148 | * check for a null value. */ | 149 | * check for a null value. */ |
149 | set_TTB(swapper_pg_dir); | 150 | set_TTB(swapper_pg_dir); |
150 | 151 | ||
151 | /* Populate the relevant portions of swapper_pg_dir so that | 152 | /* |
153 | * Populate the relevant portions of swapper_pg_dir so that | ||
152 | * we can use the fixmap entries without calling kmalloc. | 154 | * we can use the fixmap entries without calling kmalloc. |
153 | * pte's will be filled in by __set_fixmap(). */ | 155 | * pte's will be filled in by __set_fixmap(). |
154 | page_table_range_init(FIXADDR_START, FIXADDR_TOP, swapper_pg_dir); | 156 | */ |
157 | vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; | ||
158 | page_table_range_init(vaddr, 0, swapper_pg_dir); | ||
159 | |||
160 | kmap_coherent_init(); | ||
155 | 161 | ||
156 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); | 162 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); |
157 | 163 | ||
diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c new file mode 100644 index 000000000000..8837d511710a --- /dev/null +++ b/arch/sh/mm/mmap.c | |||
@@ -0,0 +1,31 @@ | |||
1 | /* | ||
2 | * arch/sh/mm/mmap.c | ||
3 | * | ||
4 | * Copyright (C) 2008 Paul Mundt | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
9 | */ | ||
10 | #include <linux/io.h> | ||
11 | #include <linux/mm.h> | ||
12 | #include <asm/page.h> | ||
13 | |||
14 | /* | ||
15 | * You really shouldn't be using read() or write() on /dev/mem. This | ||
16 | * might go away in the future. | ||
17 | */ | ||
18 | int valid_phys_addr_range(unsigned long addr, size_t count) | ||
19 | { | ||
20 | if (addr < __MEMORY_START) | ||
21 | return 0; | ||
22 | if (addr + count > __pa(high_memory)) | ||
23 | return 0; | ||
24 | |||
25 | return 1; | ||
26 | } | ||
27 | |||
28 | int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) | ||
29 | { | ||
30 | return 1; | ||
31 | } | ||
diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c index 38870e0fc182..2fe14da1f839 100644 --- a/arch/sh/mm/pg-sh4.c +++ b/arch/sh/mm/pg-sh4.c | |||
@@ -7,6 +7,7 @@ | |||
7 | * Released under the terms of the GNU GPL v2.0. | 7 | * Released under the terms of the GNU GPL v2.0. |
8 | */ | 8 | */ |
9 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
10 | #include <linux/init.h> | ||
10 | #include <linux/mutex.h> | 11 | #include <linux/mutex.h> |
11 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
12 | #include <linux/highmem.h> | 13 | #include <linux/highmem.h> |
@@ -16,6 +17,20 @@ | |||
16 | 17 | ||
17 | #define CACHE_ALIAS (current_cpu_data.dcache.alias_mask) | 18 | #define CACHE_ALIAS (current_cpu_data.dcache.alias_mask) |
18 | 19 | ||
20 | #define kmap_get_fixmap_pte(vaddr) \ | ||
21 | pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), (vaddr)) | ||
22 | |||
23 | static pte_t *kmap_coherent_pte; | ||
24 | |||
25 | void __init kmap_coherent_init(void) | ||
26 | { | ||
27 | unsigned long vaddr; | ||
28 | |||
29 | /* cache the first coherent kmap pte */ | ||
30 | vaddr = __fix_to_virt(FIX_CMAP_BEGIN); | ||
31 | kmap_coherent_pte = kmap_get_fixmap_pte(vaddr); | ||
32 | } | ||
33 | |||
19 | static inline void *kmap_coherent(struct page *page, unsigned long addr) | 34 | static inline void *kmap_coherent(struct page *page, unsigned long addr) |
20 | { | 35 | { |
21 | enum fixed_addresses idx; | 36 | enum fixed_addresses idx; |
@@ -34,6 +49,8 @@ static inline void *kmap_coherent(struct page *page, unsigned long addr) | |||
34 | 49 | ||
35 | update_mmu_cache(NULL, vaddr, pte); | 50 | update_mmu_cache(NULL, vaddr, pte); |
36 | 51 | ||
52 | set_pte(kmap_coherent_pte - (FIX_CMAP_END - idx), pte); | ||
53 | |||
37 | return (void *)vaddr; | 54 | return (void *)vaddr; |
38 | } | 55 | } |
39 | 56 | ||
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h index 68b98a7e6454..9cf4ae0cd7ba 100644 --- a/arch/sparc/include/asm/bitops_32.h +++ b/arch/sparc/include/asm/bitops_32.h | |||
@@ -98,6 +98,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) | |||
98 | #include <asm-generic/bitops/sched.h> | 98 | #include <asm-generic/bitops/sched.h> |
99 | #include <asm-generic/bitops/ffs.h> | 99 | #include <asm-generic/bitops/ffs.h> |
100 | #include <asm-generic/bitops/fls.h> | 100 | #include <asm-generic/bitops/fls.h> |
101 | #include <asm-generic/bitops/__fls.h> | ||
101 | #include <asm-generic/bitops/fls64.h> | 102 | #include <asm-generic/bitops/fls64.h> |
102 | #include <asm-generic/bitops/hweight.h> | 103 | #include <asm-generic/bitops/hweight.h> |
103 | #include <asm-generic/bitops/lock.h> | 104 | #include <asm-generic/bitops/lock.h> |
diff --git a/arch/sparc/include/asm/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h index 3d3e9c161d8b..84e969f06afe 100644 --- a/arch/sparc/include/asm/ptrace_64.h +++ b/arch/sparc/include/asm/ptrace_64.h | |||
@@ -142,8 +142,6 @@ struct global_reg_snapshot { | |||
142 | }; | 142 | }; |
143 | extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; | 143 | extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; |
144 | 144 | ||
145 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
146 | |||
147 | #define force_successful_syscall_return() \ | 145 | #define force_successful_syscall_return() \ |
148 | do { current_thread_info()->syscall_noerror = 1; \ | 146 | do { current_thread_info()->syscall_noerror = 1; \ |
149 | } while (0) | 147 | } while (0) |
diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h index a8180e546a48..8408d9d2a662 100644 --- a/arch/sparc/include/asm/smp_32.h +++ b/arch/sparc/include/asm/smp_32.h | |||
@@ -29,8 +29,6 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | extern unsigned char boot_cpu_id; | 31 | extern unsigned char boot_cpu_id; |
32 | extern cpumask_t phys_cpu_present_map; | ||
33 | #define cpu_possible_map phys_cpu_present_map | ||
34 | 32 | ||
35 | typedef void (*smpfunc_t)(unsigned long, unsigned long, unsigned long, | 33 | typedef void (*smpfunc_t)(unsigned long, unsigned long, unsigned long, |
36 | unsigned long, unsigned long); | 34 | unsigned long, unsigned long); |
diff --git a/arch/sparc/include/asm/termbits.h b/arch/sparc/include/asm/termbits.h index d6ca3e2754f5..d72dfed1f9d7 100644 --- a/arch/sparc/include/asm/termbits.h +++ b/arch/sparc/include/asm/termbits.h | |||
@@ -29,10 +29,11 @@ struct termios { | |||
29 | tcflag_t c_cflag; /* control mode flags */ | 29 | tcflag_t c_cflag; /* control mode flags */ |
30 | tcflag_t c_lflag; /* local mode flags */ | 30 | tcflag_t c_lflag; /* local mode flags */ |
31 | cc_t c_line; /* line discipline */ | 31 | cc_t c_line; /* line discipline */ |
32 | #ifndef __KERNEL__ | ||
32 | cc_t c_cc[NCCS]; /* control characters */ | 33 | cc_t c_cc[NCCS]; /* control characters */ |
33 | #ifdef __KERNEL__ | 34 | #else |
35 | cc_t c_cc[NCCS+2]; /* kernel needs 2 more to hold vmin/vtime */ | ||
34 | #define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t)) | 36 | #define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t)) |
35 | cc_t _x_cc[2]; /* We need them to hold vmin/vtime */ | ||
36 | #endif | 37 | #endif |
37 | }; | 38 | }; |
38 | 39 | ||
@@ -42,8 +43,7 @@ struct termios2 { | |||
42 | tcflag_t c_cflag; /* control mode flags */ | 43 | tcflag_t c_cflag; /* control mode flags */ |
43 | tcflag_t c_lflag; /* local mode flags */ | 44 | tcflag_t c_lflag; /* local mode flags */ |
44 | cc_t c_line; /* line discipline */ | 45 | cc_t c_line; /* line discipline */ |
45 | cc_t c_cc[NCCS]; /* control characters */ | 46 | cc_t c_cc[NCCS+2]; /* control characters */ |
46 | cc_t _x_cc[2]; /* padding to match ktermios */ | ||
47 | speed_t c_ispeed; /* input speed */ | 47 | speed_t c_ispeed; /* input speed */ |
48 | speed_t c_ospeed; /* output speed */ | 48 | speed_t c_ospeed; /* output speed */ |
49 | }; | 49 | }; |
@@ -54,8 +54,7 @@ struct ktermios { | |||
54 | tcflag_t c_cflag; /* control mode flags */ | 54 | tcflag_t c_cflag; /* control mode flags */ |
55 | tcflag_t c_lflag; /* local mode flags */ | 55 | tcflag_t c_lflag; /* local mode flags */ |
56 | cc_t c_line; /* line discipline */ | 56 | cc_t c_line; /* line discipline */ |
57 | cc_t c_cc[NCCS]; /* control characters */ | 57 | cc_t c_cc[NCCS+2]; /* control characters */ |
58 | cc_t _x_cc[2]; /* We need them to hold vmin/vtime */ | ||
59 | speed_t c_ispeed; /* input speed */ | 58 | speed_t c_ispeed; /* input speed */ |
60 | speed_t c_ospeed; /* output speed */ | 59 | speed_t c_ospeed; /* output speed */ |
61 | }; | 60 | }; |
diff --git a/arch/sparc/include/asm/unistd_32.h b/arch/sparc/include/asm/unistd_32.h index 648643a9f139..0d13d2a4c76f 100644 --- a/arch/sparc/include/asm/unistd_32.h +++ b/arch/sparc/include/asm/unistd_32.h | |||
@@ -338,8 +338,9 @@ | |||
338 | #define __NR_dup3 320 | 338 | #define __NR_dup3 320 |
339 | #define __NR_pipe2 321 | 339 | #define __NR_pipe2 321 |
340 | #define __NR_inotify_init1 322 | 340 | #define __NR_inotify_init1 322 |
341 | #define __NR_accept4 323 | ||
341 | 342 | ||
342 | #define NR_SYSCALLS 323 | 343 | #define NR_SYSCALLS 324 |
343 | 344 | ||
344 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, | 345 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |
345 | * it never had the plain ones and there is no value to adding those | 346 | * it never had the plain ones and there is no value to adding those |
diff --git a/arch/sparc/include/asm/unistd_64.h b/arch/sparc/include/asm/unistd_64.h index c5cc0e052321..fa5d3c0343c7 100644 --- a/arch/sparc/include/asm/unistd_64.h +++ b/arch/sparc/include/asm/unistd_64.h | |||
@@ -340,8 +340,9 @@ | |||
340 | #define __NR_dup3 320 | 340 | #define __NR_dup3 320 |
341 | #define __NR_pipe2 321 | 341 | #define __NR_pipe2 321 |
342 | #define __NR_inotify_init1 322 | 342 | #define __NR_inotify_init1 322 |
343 | #define __NR_accept4 323 | ||
343 | 344 | ||
344 | #define NR_SYSCALLS 323 | 345 | #define NR_SYSCALLS 324 |
345 | 346 | ||
346 | #ifdef __KERNEL__ | 347 | #ifdef __KERNEL__ |
347 | #define __ARCH_WANT_IPC_PARSE_VERSION | 348 | #define __ARCH_WANT_IPC_PARSE_VERSION |
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index e7a0edfc1a32..1fc17f59c6bf 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c | |||
@@ -126,7 +126,7 @@ char *sparc_fpu_type; | |||
126 | 126 | ||
127 | unsigned int fsr_storage; | 127 | unsigned int fsr_storage; |
128 | 128 | ||
129 | void __init cpu_probe(void) | 129 | void __cpuinit cpu_probe(void) |
130 | { | 130 | { |
131 | int psr_impl, psr_vers, fpu_vers; | 131 | int psr_impl, psr_vers, fpu_vers; |
132 | int i, psr; | 132 | int i, psr; |
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S index 2d325fd84579..51b40426f9c6 100644 --- a/arch/sparc/kernel/head.S +++ b/arch/sparc/kernel/head.S | |||
@@ -72,7 +72,7 @@ sun4e_notsup: | |||
72 | .align 4 | 72 | .align 4 |
73 | 73 | ||
74 | /* The Sparc trap table, bootloader gives us control at _start. */ | 74 | /* The Sparc trap table, bootloader gives us control at _start. */ |
75 | .text | 75 | .section .text.head,"ax" |
76 | .globl start, _stext, _start, __stext | 76 | .globl start, _stext, _start, __stext |
77 | .globl trapbase | 77 | .globl trapbase |
78 | _start: /* danger danger */ | 78 | _start: /* danger danger */ |
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index 0837bd52e28f..0a83bd737654 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
@@ -563,9 +563,9 @@ build_resources: | |||
563 | op->dev.parent = parent; | 563 | op->dev.parent = parent; |
564 | op->dev.bus = &of_platform_bus_type; | 564 | op->dev.bus = &of_platform_bus_type; |
565 | if (!parent) | 565 | if (!parent) |
566 | strcpy(op->dev.bus_id, "root"); | 566 | dev_set_name(&op->dev, "root"); |
567 | else | 567 | else |
568 | sprintf(op->dev.bus_id, "%08x", dp->node); | 568 | dev_set_name(&op->dev, "%08x", dp->node); |
569 | 569 | ||
570 | if (of_device_register(op)) { | 570 | if (of_device_register(op)) { |
571 | printk("%s: Could not register of device.\n", | 571 | printk("%s: Could not register of device.\n", |
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c index 1619ec15c099..1e5ac4e282e1 100644 --- a/arch/sparc/kernel/smp.c +++ b/arch/sparc/kernel/smp.c | |||
@@ -35,12 +35,10 @@ | |||
35 | 35 | ||
36 | #include "irq.h" | 36 | #include "irq.h" |
37 | 37 | ||
38 | volatile unsigned long cpu_callin_map[NR_CPUS] __initdata = {0,}; | 38 | volatile unsigned long cpu_callin_map[NR_CPUS] __cpuinitdata = {0,}; |
39 | unsigned char boot_cpu_id = 0; | 39 | unsigned char boot_cpu_id = 0; |
40 | unsigned char boot_cpu_id4 = 0; /* boot_cpu_id << 2 */ | 40 | unsigned char boot_cpu_id4 = 0; /* boot_cpu_id << 2 */ |
41 | 41 | ||
42 | cpumask_t cpu_online_map = CPU_MASK_NONE; | ||
43 | cpumask_t phys_cpu_present_map = CPU_MASK_NONE; | ||
44 | cpumask_t smp_commenced_mask = CPU_MASK_NONE; | 42 | cpumask_t smp_commenced_mask = CPU_MASK_NONE; |
45 | 43 | ||
46 | /* The only guaranteed locking primitive available on all Sparc | 44 | /* The only guaranteed locking primitive available on all Sparc |
@@ -120,7 +118,7 @@ void cpu_panic(void) | |||
120 | panic("SMP bolixed\n"); | 118 | panic("SMP bolixed\n"); |
121 | } | 119 | } |
122 | 120 | ||
123 | struct linux_prom_registers smp_penguin_ctable __initdata = { 0 }; | 121 | struct linux_prom_registers smp_penguin_ctable __cpuinitdata = { 0 }; |
124 | 122 | ||
125 | void smp_send_reschedule(int cpu) | 123 | void smp_send_reschedule(int cpu) |
126 | { | 124 | { |
@@ -334,7 +332,7 @@ void __init smp_setup_cpu_possible_map(void) | |||
334 | instance = 0; | 332 | instance = 0; |
335 | while (!cpu_find_by_instance(instance, NULL, &mid)) { | 333 | while (!cpu_find_by_instance(instance, NULL, &mid)) { |
336 | if (mid < NR_CPUS) { | 334 | if (mid < NR_CPUS) { |
337 | cpu_set(mid, phys_cpu_present_map); | 335 | cpu_set(mid, cpu_possible_map); |
338 | cpu_set(mid, cpu_present_map); | 336 | cpu_set(mid, cpu_present_map); |
339 | } | 337 | } |
340 | instance++; | 338 | instance++; |
@@ -354,7 +352,7 @@ void __init smp_prepare_boot_cpu(void) | |||
354 | 352 | ||
355 | current_thread_info()->cpu = cpuid; | 353 | current_thread_info()->cpu = cpuid; |
356 | cpu_set(cpuid, cpu_online_map); | 354 | cpu_set(cpuid, cpu_online_map); |
357 | cpu_set(cpuid, phys_cpu_present_map); | 355 | cpu_set(cpuid, cpu_possible_map); |
358 | } | 356 | } |
359 | 357 | ||
360 | int __cpuinit __cpu_up(unsigned int cpu) | 358 | int __cpuinit __cpu_up(unsigned int cpu) |
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index b0dfff848653..32d11a5fe3a8 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c | |||
@@ -113,10 +113,6 @@ EXPORT_PER_CPU_SYMBOL(__cpu_data); | |||
113 | #ifdef CONFIG_SMP | 113 | #ifdef CONFIG_SMP |
114 | /* IRQ implementation. */ | 114 | /* IRQ implementation. */ |
115 | EXPORT_SYMBOL(synchronize_irq); | 115 | EXPORT_SYMBOL(synchronize_irq); |
116 | |||
117 | /* CPU online map and active count. */ | ||
118 | EXPORT_SYMBOL(cpu_online_map); | ||
119 | EXPORT_SYMBOL(phys_cpu_present_map); | ||
120 | #endif | 116 | #endif |
121 | 117 | ||
122 | EXPORT_SYMBOL(__udelay); | 118 | EXPORT_SYMBOL(__udelay); |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index 7a6a5e795928..16ab0cb731c5 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
@@ -83,7 +83,7 @@ static inline void show_leds(int cpuid) | |||
83 | "i" (ASI_M_CTL)); | 83 | "i" (ASI_M_CTL)); |
84 | } | 84 | } |
85 | 85 | ||
86 | void __init smp4d_callin(void) | 86 | void __cpuinit smp4d_callin(void) |
87 | { | 87 | { |
88 | int cpuid = hard_smp4d_processor_id(); | 88 | int cpuid = hard_smp4d_processor_id(); |
89 | extern spinlock_t sun4d_imsk_lock; | 89 | extern spinlock_t sun4d_imsk_lock; |
@@ -386,7 +386,7 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs) | |||
386 | 386 | ||
387 | extern unsigned int lvl14_resolution; | 387 | extern unsigned int lvl14_resolution; |
388 | 388 | ||
389 | static void __init smp_setup_percpu_timer(void) | 389 | static void __cpuinit smp_setup_percpu_timer(void) |
390 | { | 390 | { |
391 | int cpu = hard_smp4d_processor_id(); | 391 | int cpu = hard_smp4d_processor_id(); |
392 | 392 | ||
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 5fc386d08c47..4f8d60586b07 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -343,7 +343,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs) | |||
343 | 343 | ||
344 | extern unsigned int lvl14_resolution; | 344 | extern unsigned int lvl14_resolution; |
345 | 345 | ||
346 | static void __init smp_setup_percpu_timer(void) | 346 | static void __cpuinit smp_setup_percpu_timer(void) |
347 | { | 347 | { |
348 | int cpu = smp_processor_id(); | 348 | int cpu = smp_processor_id(); |
349 | 349 | ||
diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S index e1b9233b90ab..7d0807586442 100644 --- a/arch/sparc/kernel/systbls.S +++ b/arch/sparc/kernel/systbls.S | |||
@@ -81,4 +81,4 @@ sys_call_table: | |||
81 | /*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait | 81 | /*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait |
82 | /*310*/ .long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate | 82 | /*310*/ .long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate |
83 | /*315*/ .long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1 | 83 | /*315*/ .long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1 |
84 | /*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1 | 84 | /*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4 |
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S index 356c56aebc62..5e235c52d667 100644 --- a/arch/sparc/kernel/trampoline.S +++ b/arch/sparc/kernel/trampoline.S | |||
@@ -18,7 +18,7 @@ | |||
18 | .globl sun4m_cpu_startup, __smp4m_processor_id | 18 | .globl sun4m_cpu_startup, __smp4m_processor_id |
19 | .globl sun4d_cpu_startup, __smp4d_processor_id | 19 | .globl sun4d_cpu_startup, __smp4d_processor_id |
20 | 20 | ||
21 | __INIT | 21 | __CPUINIT |
22 | .align 4 | 22 | .align 4 |
23 | 23 | ||
24 | /* When we start up a cpu for the first time it enters this routine. | 24 | /* When we start up a cpu for the first time it enters this routine. |
@@ -109,7 +109,7 @@ __smp4d_processor_id: | |||
109 | /* CPUID in bootbus can be found at PA 0xff0140000 */ | 109 | /* CPUID in bootbus can be found at PA 0xff0140000 */ |
110 | #define SUN4D_BOOTBUS_CPUID 0xf0140000 | 110 | #define SUN4D_BOOTBUS_CPUID 0xf0140000 |
111 | 111 | ||
112 | __INIT | 112 | __CPUINIT |
113 | .align 4 | 113 | .align 4 |
114 | 114 | ||
115 | sun4d_cpu_startup: | 115 | sun4d_cpu_startup: |
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S index b1002c607196..5b7e69a8c32f 100644 --- a/arch/sparc/kernel/vmlinux.lds.S +++ b/arch/sparc/kernel/vmlinux.lds.S | |||
@@ -13,6 +13,7 @@ SECTIONS | |||
13 | .text 0xf0004000 : | 13 | .text 0xf0004000 : |
14 | { | 14 | { |
15 | _text = .; | 15 | _text = .; |
16 | *(.text.head) | ||
16 | TEXT_TEXT | 17 | TEXT_TEXT |
17 | SCHED_TEXT | 18 | SCHED_TEXT |
18 | LOCK_TEXT | 19 | LOCK_TEXT |
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 6a5d7cabc044..dd8aa36f366c 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
@@ -1251,7 +1251,7 @@ static inline void map_kernel(void) | |||
1251 | /* Paging initialization on the Sparc Reference MMU. */ | 1251 | /* Paging initialization on the Sparc Reference MMU. */ |
1252 | extern void sparc_context_init(int); | 1252 | extern void sparc_context_init(int); |
1253 | 1253 | ||
1254 | void (*poke_srmmu)(void) __initdata = NULL; | 1254 | void (*poke_srmmu)(void) __cpuinitdata = NULL; |
1255 | 1255 | ||
1256 | extern unsigned long bootmem_init(unsigned long *pages_avail); | 1256 | extern unsigned long bootmem_init(unsigned long *pages_avail); |
1257 | 1257 | ||
@@ -1446,7 +1446,7 @@ static void __init init_vac_layout(void) | |||
1446 | (int)vac_cache_size, (int)vac_line_size); | 1446 | (int)vac_cache_size, (int)vac_line_size); |
1447 | } | 1447 | } |
1448 | 1448 | ||
1449 | static void __init poke_hypersparc(void) | 1449 | static void __cpuinit poke_hypersparc(void) |
1450 | { | 1450 | { |
1451 | volatile unsigned long clear; | 1451 | volatile unsigned long clear; |
1452 | unsigned long mreg = srmmu_get_mmureg(); | 1452 | unsigned long mreg = srmmu_get_mmureg(); |
@@ -1501,7 +1501,7 @@ static void __init init_hypersparc(void) | |||
1501 | hypersparc_setup_blockops(); | 1501 | hypersparc_setup_blockops(); |
1502 | } | 1502 | } |
1503 | 1503 | ||
1504 | static void __init poke_cypress(void) | 1504 | static void __cpuinit poke_cypress(void) |
1505 | { | 1505 | { |
1506 | unsigned long mreg = srmmu_get_mmureg(); | 1506 | unsigned long mreg = srmmu_get_mmureg(); |
1507 | unsigned long faddr, tagval; | 1507 | unsigned long faddr, tagval; |
@@ -1589,7 +1589,7 @@ static void __init init_cypress_605(unsigned long mrev) | |||
1589 | init_cypress_common(); | 1589 | init_cypress_common(); |
1590 | } | 1590 | } |
1591 | 1591 | ||
1592 | static void __init poke_swift(void) | 1592 | static void __cpuinit poke_swift(void) |
1593 | { | 1593 | { |
1594 | unsigned long mreg; | 1594 | unsigned long mreg; |
1595 | 1595 | ||
@@ -1771,7 +1771,7 @@ static void turbosparc_flush_tlb_page(struct vm_area_struct *vma, unsigned long | |||
1771 | } | 1771 | } |
1772 | 1772 | ||
1773 | 1773 | ||
1774 | static void __init poke_turbosparc(void) | 1774 | static void __cpuinit poke_turbosparc(void) |
1775 | { | 1775 | { |
1776 | unsigned long mreg = srmmu_get_mmureg(); | 1776 | unsigned long mreg = srmmu_get_mmureg(); |
1777 | unsigned long ccreg; | 1777 | unsigned long ccreg; |
@@ -1834,7 +1834,7 @@ static void __init init_turbosparc(void) | |||
1834 | poke_srmmu = poke_turbosparc; | 1834 | poke_srmmu = poke_turbosparc; |
1835 | } | 1835 | } |
1836 | 1836 | ||
1837 | static void __init poke_tsunami(void) | 1837 | static void __cpuinit poke_tsunami(void) |
1838 | { | 1838 | { |
1839 | unsigned long mreg = srmmu_get_mmureg(); | 1839 | unsigned long mreg = srmmu_get_mmureg(); |
1840 | 1840 | ||
@@ -1876,7 +1876,7 @@ static void __init init_tsunami(void) | |||
1876 | tsunami_setup_blockops(); | 1876 | tsunami_setup_blockops(); |
1877 | } | 1877 | } |
1878 | 1878 | ||
1879 | static void __init poke_viking(void) | 1879 | static void __cpuinit poke_viking(void) |
1880 | { | 1880 | { |
1881 | unsigned long mreg = srmmu_get_mmureg(); | 1881 | unsigned long mreg = srmmu_get_mmureg(); |
1882 | static int smp_catch; | 1882 | static int smp_catch; |
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index 52fc836f464d..4aaf18e83c8c 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c | |||
@@ -312,7 +312,8 @@ static void sun4u_irq_enable(unsigned int virt_irq) | |||
312 | } | 312 | } |
313 | } | 313 | } |
314 | 314 | ||
315 | static void sun4u_set_affinity(unsigned int virt_irq, cpumask_t mask) | 315 | static void sun4u_set_affinity(unsigned int virt_irq, |
316 | const struct cpumask *mask) | ||
316 | { | 317 | { |
317 | sun4u_irq_enable(virt_irq); | 318 | sun4u_irq_enable(virt_irq); |
318 | } | 319 | } |
@@ -362,7 +363,8 @@ static void sun4v_irq_enable(unsigned int virt_irq) | |||
362 | ino, err); | 363 | ino, err); |
363 | } | 364 | } |
364 | 365 | ||
365 | static void sun4v_set_affinity(unsigned int virt_irq, cpumask_t mask) | 366 | static void sun4v_set_affinity(unsigned int virt_irq, |
367 | const struct cpumask *mask) | ||
366 | { | 368 | { |
367 | unsigned int ino = virt_irq_table[virt_irq].dev_ino; | 369 | unsigned int ino = virt_irq_table[virt_irq].dev_ino; |
368 | unsigned long cpuid = irq_choose_cpu(virt_irq); | 370 | unsigned long cpuid = irq_choose_cpu(virt_irq); |
@@ -429,7 +431,8 @@ static void sun4v_virq_enable(unsigned int virt_irq) | |||
429 | dev_handle, dev_ino, err); | 431 | dev_handle, dev_ino, err); |
430 | } | 432 | } |
431 | 433 | ||
432 | static void sun4v_virt_set_affinity(unsigned int virt_irq, cpumask_t mask) | 434 | static void sun4v_virt_set_affinity(unsigned int virt_irq, |
435 | const struct cpumask *mask) | ||
433 | { | 436 | { |
434 | unsigned long cpuid, dev_handle, dev_ino; | 437 | unsigned long cpuid, dev_handle, dev_ino; |
435 | int err; | 438 | int err; |
@@ -788,7 +791,7 @@ void fixup_irqs(void) | |||
788 | !(irq_desc[irq].status & IRQ_PER_CPU)) { | 791 | !(irq_desc[irq].status & IRQ_PER_CPU)) { |
789 | if (irq_desc[irq].chip->set_affinity) | 792 | if (irq_desc[irq].chip->set_affinity) |
790 | irq_desc[irq].chip->set_affinity(irq, | 793 | irq_desc[irq].chip->set_affinity(irq, |
791 | irq_desc[irq].affinity); | 794 | &irq_desc[irq].affinity); |
792 | } | 795 | } |
793 | spin_unlock_irqrestore(&irq_desc[irq].lock, flags); | 796 | spin_unlock_irqrestore(&irq_desc[irq].lock, flags); |
794 | } | 797 | } |
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index 0f616ae3246c..df2efb7fc14c 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/kernel/of_device.c | |||
@@ -780,7 +780,7 @@ out: | |||
780 | if (nid != -1) { | 780 | if (nid != -1) { |
781 | cpumask_t numa_mask = node_to_cpumask(nid); | 781 | cpumask_t numa_mask = node_to_cpumask(nid); |
782 | 782 | ||
783 | irq_set_affinity(irq, numa_mask); | 783 | irq_set_affinity(irq, &numa_mask); |
784 | } | 784 | } |
785 | 785 | ||
786 | return irq; | 786 | return irq; |
diff --git a/arch/sparc64/kernel/pci_msi.c b/arch/sparc64/kernel/pci_msi.c index 2e680f34f727..0d0cd815e83e 100644 --- a/arch/sparc64/kernel/pci_msi.c +++ b/arch/sparc64/kernel/pci_msi.c | |||
@@ -288,7 +288,7 @@ static int bringup_one_msi_queue(struct pci_pbm_info *pbm, | |||
288 | if (nid != -1) { | 288 | if (nid != -1) { |
289 | cpumask_t numa_mask = node_to_cpumask(nid); | 289 | cpumask_t numa_mask = node_to_cpumask(nid); |
290 | 290 | ||
291 | irq_set_affinity(irq, numa_mask); | 291 | irq_set_affinity(irq, &numa_mask); |
292 | } | 292 | } |
293 | err = request_irq(irq, sparc64_msiq_interrupt, 0, | 293 | err = request_irq(irq, sparc64_msiq_interrupt, 0, |
294 | "MSIQ", | 294 | "MSIQ", |
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index f43adbc773ca..a941c610e7ce 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c | |||
@@ -1014,7 +1014,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
1014 | break; | 1014 | break; |
1015 | 1015 | ||
1016 | case PTRACE_SETFPREGS64: | 1016 | case PTRACE_SETFPREGS64: |
1017 | ret = copy_regset_to_user(child, view, REGSET_FP, | 1017 | ret = copy_regset_from_user(child, view, REGSET_FP, |
1018 | 0 * sizeof(u64), | 1018 | 0 * sizeof(u64), |
1019 | 33 * sizeof(u64), | 1019 | 33 * sizeof(u64), |
1020 | fps); | 1020 | fps); |
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index e5627118e613..a97b8822c22c 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
@@ -49,14 +49,10 @@ | |||
49 | 49 | ||
50 | int sparc64_multi_core __read_mostly; | 50 | int sparc64_multi_core __read_mostly; |
51 | 51 | ||
52 | cpumask_t cpu_possible_map __read_mostly = CPU_MASK_NONE; | ||
53 | cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE; | ||
54 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE; | 52 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE; |
55 | cpumask_t cpu_core_map[NR_CPUS] __read_mostly = | 53 | cpumask_t cpu_core_map[NR_CPUS] __read_mostly = |
56 | { [0 ... NR_CPUS-1] = CPU_MASK_NONE }; | 54 | { [0 ... NR_CPUS-1] = CPU_MASK_NONE }; |
57 | 55 | ||
58 | EXPORT_SYMBOL(cpu_possible_map); | ||
59 | EXPORT_SYMBOL(cpu_online_map); | ||
60 | EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); | 56 | EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); |
61 | EXPORT_SYMBOL(cpu_core_map); | 57 | EXPORT_SYMBOL(cpu_core_map); |
62 | 58 | ||
@@ -282,7 +278,7 @@ static unsigned long kimage_addr_to_ra(void *p) | |||
282 | return kern_base + (val - KERNBASE); | 278 | return kern_base + (val - KERNBASE); |
283 | } | 279 | } |
284 | 280 | ||
285 | static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg) | 281 | static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg) |
286 | { | 282 | { |
287 | extern unsigned long sparc64_ttable_tl0; | 283 | extern unsigned long sparc64_ttable_tl0; |
288 | extern unsigned long kern_locked_tte_data; | 284 | extern unsigned long kern_locked_tte_data; |
@@ -343,7 +339,7 @@ extern unsigned long sparc64_cpu_startup; | |||
343 | */ | 339 | */ |
344 | static struct thread_info *cpu_new_thread = NULL; | 340 | static struct thread_info *cpu_new_thread = NULL; |
345 | 341 | ||
346 | static int __devinit smp_boot_one_cpu(unsigned int cpu) | 342 | static int __cpuinit smp_boot_one_cpu(unsigned int cpu) |
347 | { | 343 | { |
348 | struct trap_per_cpu *tb = &trap_block[cpu]; | 344 | struct trap_per_cpu *tb = &trap_block[cpu]; |
349 | unsigned long entry = | 345 | unsigned long entry = |
diff --git a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S index ade18ba0c686..f061c4dda9ef 100644 --- a/arch/sparc64/kernel/sys32.S +++ b/arch/sparc64/kernel/sys32.S | |||
@@ -150,7 +150,7 @@ sys32_mmap2: | |||
150 | sys32_socketcall: /* %o0=call, %o1=args */ | 150 | sys32_socketcall: /* %o0=call, %o1=args */ |
151 | cmp %o0, 1 | 151 | cmp %o0, 1 |
152 | bl,pn %xcc, do_einval | 152 | bl,pn %xcc, do_einval |
153 | cmp %o0, 17 | 153 | cmp %o0, 18 |
154 | bg,pn %xcc, do_einval | 154 | bg,pn %xcc, do_einval |
155 | sub %o0, 1, %o0 | 155 | sub %o0, 1, %o0 |
156 | sllx %o0, 5, %o0 | 156 | sllx %o0, 5, %o0 |
@@ -319,6 +319,15 @@ do_sys_recvmsg: /* compat_sys_recvmsg(int, struct compat_msghdr *, unsigned int) | |||
319 | nop | 319 | nop |
320 | nop | 320 | nop |
321 | nop | 321 | nop |
322 | do_sys_accept4: /* sys_accept4(int, struct sockaddr *, int *, int) */ | ||
323 | 63: ldswa [%o1 + 0x0] %asi, %o0 | ||
324 | sethi %hi(sys_accept4), %g1 | ||
325 | 64: lduwa [%o1 + 0x8] %asi, %o2 | ||
326 | 65: ldswa [%o1 + 0xc] %asi, %o3 | ||
327 | jmpl %g1 + %lo(sys_accept4), %g0 | ||
328 | 66: lduwa [%o1 + 0x4] %asi, %o1 | ||
329 | nop | ||
330 | nop | ||
322 | 331 | ||
323 | .section __ex_table,"a" | 332 | .section __ex_table,"a" |
324 | .align 4 | 333 | .align 4 |
@@ -353,4 +362,6 @@ do_sys_recvmsg: /* compat_sys_recvmsg(int, struct compat_msghdr *, unsigned int) | |||
353 | .word 57b, __retl_efault, 58b, __retl_efault | 362 | .word 57b, __retl_efault, 58b, __retl_efault |
354 | .word 59b, __retl_efault, 60b, __retl_efault | 363 | .word 59b, __retl_efault, 60b, __retl_efault |
355 | .word 61b, __retl_efault, 62b, __retl_efault | 364 | .word 61b, __retl_efault, 62b, __retl_efault |
365 | .word 63b, __retl_efault, 64b, __retl_efault | ||
366 | .word 65b, __retl_efault, 66b, __retl_efault | ||
356 | .previous | 367 | .previous |
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S index b2fa4c163638..9fc78cf354bd 100644 --- a/arch/sparc64/kernel/systbls.S +++ b/arch/sparc64/kernel/systbls.S | |||
@@ -82,7 +82,7 @@ sys_call_table32: | |||
82 | .word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait | 82 | .word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait |
83 | /*310*/ .word compat_sys_utimensat, compat_sys_signalfd, sys_timerfd_create, sys_eventfd, compat_sys_fallocate | 83 | /*310*/ .word compat_sys_utimensat, compat_sys_signalfd, sys_timerfd_create, sys_eventfd, compat_sys_fallocate |
84 | .word compat_sys_timerfd_settime, compat_sys_timerfd_gettime, compat_sys_signalfd4, sys_eventfd2, sys_epoll_create1 | 84 | .word compat_sys_timerfd_settime, compat_sys_timerfd_gettime, compat_sys_signalfd4, sys_eventfd2, sys_epoll_create1 |
85 | /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1 | 85 | /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4 |
86 | 86 | ||
87 | #endif /* CONFIG_COMPAT */ | 87 | #endif /* CONFIG_COMPAT */ |
88 | 88 | ||
@@ -156,4 +156,4 @@ sys_call_table: | |||
156 | .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait | 156 | .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait |
157 | /*310*/ .word sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate | 157 | /*310*/ .word sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate |
158 | .word sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1 | 158 | .word sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1 |
159 | /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1 | 159 | /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4 |
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index 141da3759091..9df8f095a8b1 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c | |||
@@ -763,7 +763,7 @@ void __devinit setup_sparc64_timer(void) | |||
763 | sevt = &__get_cpu_var(sparc64_events); | 763 | sevt = &__get_cpu_var(sparc64_events); |
764 | 764 | ||
765 | memcpy(sevt, &sparc64_clockevent, sizeof(*sevt)); | 765 | memcpy(sevt, &sparc64_clockevent, sizeof(*sevt)); |
766 | sevt->cpumask = cpumask_of_cpu(smp_processor_id()); | 766 | sevt->cpumask = cpumask_of(smp_processor_id()); |
767 | 767 | ||
768 | clockevents_register_device(sevt); | 768 | clockevents_register_device(sevt); |
769 | } | 769 | } |
diff --git a/arch/sparc64/kernel/visemul.c b/arch/sparc64/kernel/visemul.c index 9e05cb5cb855..b956fd71c131 100644 --- a/arch/sparc64/kernel/visemul.c +++ b/arch/sparc64/kernel/visemul.c | |||
@@ -131,7 +131,7 @@ | |||
131 | #define VIS_OPF_SHIFT 5 | 131 | #define VIS_OPF_SHIFT 5 |
132 | #define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT) | 132 | #define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT) |
133 | 133 | ||
134 | #define RS1(INSN) (((INSN) >> 24) & 0x1f) | 134 | #define RS1(INSN) (((INSN) >> 14) & 0x1f) |
135 | #define RS2(INSN) (((INSN) >> 0) & 0x1f) | 135 | #define RS2(INSN) (((INSN) >> 0) & 0x1f) |
136 | #define RD(INSN) (((INSN) >> 25) & 0x1f) | 136 | #define RD(INSN) (((INSN) >> 25) & 0x1f) |
137 | 137 | ||
@@ -445,7 +445,7 @@ static void pdist(struct pt_regs *regs, unsigned int insn) | |||
445 | unsigned long i; | 445 | unsigned long i; |
446 | 446 | ||
447 | rs1 = fpd_regval(f, RS1(insn)); | 447 | rs1 = fpd_regval(f, RS1(insn)); |
448 | rs2 = fpd_regval(f, RS1(insn)); | 448 | rs2 = fpd_regval(f, RS2(insn)); |
449 | rd = fpd_regaddr(f, RD(insn)); | 449 | rd = fpd_regaddr(f, RD(insn)); |
450 | 450 | ||
451 | rd_val = *rd; | 451 | rd_val = *rd; |
@@ -807,6 +807,8 @@ int vis_emul(struct pt_regs *regs, unsigned int insn) | |||
807 | if (get_user(insn, (u32 __user *) pc)) | 807 | if (get_user(insn, (u32 __user *) pc)) |
808 | return -EFAULT; | 808 | return -EFAULT; |
809 | 809 | ||
810 | save_and_clear_fpu(); | ||
811 | |||
810 | opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT; | 812 | opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT; |
811 | switch (opf) { | 813 | switch (opf) { |
812 | default: | 814 | default: |
diff --git a/arch/sparc64/lib/user_fixup.c b/arch/sparc64/lib/user_fixup.c index 19d1fdb17d0e..05a361b0a1a4 100644 --- a/arch/sparc64/lib/user_fixup.c +++ b/arch/sparc64/lib/user_fixup.c | |||
@@ -24,7 +24,7 @@ static unsigned long compute_size(unsigned long start, unsigned long size, unsig | |||
24 | if (fault_addr < start || fault_addr >= end) { | 24 | if (fault_addr < start || fault_addr >= end) { |
25 | *offset = 0; | 25 | *offset = 0; |
26 | } else { | 26 | } else { |
27 | *offset = start - fault_addr; | 27 | *offset = fault_addr - start; |
28 | size = end - fault_addr; | 28 | size = end - fault_addr; |
29 | } | 29 | } |
30 | return size; | 30 | return size; |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 3c10daf8fc01..185f34679110 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -956,7 +956,7 @@ int of_node_to_nid(struct device_node *dp) | |||
956 | return nid; | 956 | return nid; |
957 | } | 957 | } |
958 | 958 | ||
959 | static void add_node_ranges(void) | 959 | static void __init add_node_ranges(void) |
960 | { | 960 | { |
961 | int i; | 961 | int i; |
962 | 962 | ||
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 19d579d74d27..8f44ebb0dec8 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
@@ -16,6 +16,8 @@ | |||
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | #include <linux/syscalls.h> | 17 | #include <linux/syscalls.h> |
18 | #include <linux/utsname.h> | 18 | #include <linux/utsname.h> |
19 | #include <linux/socket.h> | ||
20 | #include <linux/un.h> | ||
19 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
20 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
21 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
@@ -785,7 +787,7 @@ static int __init mconsole_init(void) | |||
785 | /* long to avoid size mismatch warnings from gcc */ | 787 | /* long to avoid size mismatch warnings from gcc */ |
786 | long sock; | 788 | long sock; |
787 | int err; | 789 | int err; |
788 | char file[256]; | 790 | char file[UNIX_PATH_MAX]; |
789 | 791 | ||
790 | if (umid_file_name("mconsole", file, sizeof(file))) | 792 | if (umid_file_name("mconsole", file, sizeof(file))) |
791 | return -1; | 793 | return -1; |
diff --git a/arch/um/include/asm/system.h b/arch/um/include/asm/system.h index 753346e2cdfd..ae5f94d6317d 100644 --- a/arch/um/include/asm/system.h +++ b/arch/um/include/asm/system.h | |||
@@ -11,21 +11,21 @@ extern int get_signals(void); | |||
11 | extern void block_signals(void); | 11 | extern void block_signals(void); |
12 | extern void unblock_signals(void); | 12 | extern void unblock_signals(void); |
13 | 13 | ||
14 | #define local_save_flags(flags) do { typecheck(unsigned long, flags); \ | 14 | #define raw_local_save_flags(flags) do { typecheck(unsigned long, flags); \ |
15 | (flags) = get_signals(); } while(0) | 15 | (flags) = get_signals(); } while(0) |
16 | #define local_irq_restore(flags) do { typecheck(unsigned long, flags); \ | 16 | #define raw_local_irq_restore(flags) do { typecheck(unsigned long, flags); \ |
17 | set_signals(flags); } while(0) | 17 | set_signals(flags); } while(0) |
18 | 18 | ||
19 | #define local_irq_save(flags) do { local_save_flags(flags); \ | 19 | #define raw_local_irq_save(flags) do { raw_local_save_flags(flags); \ |
20 | local_irq_disable(); } while(0) | 20 | raw_local_irq_disable(); } while(0) |
21 | 21 | ||
22 | #define local_irq_enable() unblock_signals() | 22 | #define raw_local_irq_enable() unblock_signals() |
23 | #define local_irq_disable() block_signals() | 23 | #define raw_local_irq_disable() block_signals() |
24 | 24 | ||
25 | #define irqs_disabled() \ | 25 | #define irqs_disabled() \ |
26 | ({ \ | 26 | ({ \ |
27 | unsigned long flags; \ | 27 | unsigned long flags; \ |
28 | local_save_flags(flags); \ | 28 | raw_local_save_flags(flags); \ |
29 | (flags == 0); \ | 29 | (flags == 0); \ |
30 | }) | 30 | }) |
31 | 31 | ||
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index 045772142844..98351c78bc81 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c | |||
@@ -25,13 +25,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
25 | #include "irq_user.h" | 25 | #include "irq_user.h" |
26 | #include "os.h" | 26 | #include "os.h" |
27 | 27 | ||
28 | /* CPU online map, set by smp_boot_cpus */ | ||
29 | cpumask_t cpu_online_map = CPU_MASK_NONE; | ||
30 | cpumask_t cpu_possible_map = CPU_MASK_NONE; | ||
31 | |||
32 | EXPORT_SYMBOL(cpu_online_map); | ||
33 | EXPORT_SYMBOL(cpu_possible_map); | ||
34 | |||
35 | /* Per CPU bogomips and other parameters | 28 | /* Per CPU bogomips and other parameters |
36 | * The only piece used here is the ipi pipe, which is set before SMP is | 29 | * The only piece used here is the ipi pipe, which is set before SMP is |
37 | * started and never changed. | 30 | * started and never changed. |
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 47f04f4a3464..b13a87a3ec95 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
@@ -50,7 +50,7 @@ static int itimer_next_event(unsigned long delta, | |||
50 | static struct clock_event_device itimer_clockevent = { | 50 | static struct clock_event_device itimer_clockevent = { |
51 | .name = "itimer", | 51 | .name = "itimer", |
52 | .rating = 250, | 52 | .rating = 250, |
53 | .cpumask = CPU_MASK_ALL, | 53 | .cpumask = cpu_all_mask, |
54 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, | 54 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, |
55 | .set_mode = itimer_set_mode, | 55 | .set_mode = itimer_set_mode, |
56 | .set_next_event = itimer_next_event, | 56 | .set_next_event = itimer_next_event, |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 93224b569187..0ca2eb7573cd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -29,11 +29,14 @@ config X86 | |||
29 | select HAVE_FTRACE_MCOUNT_RECORD | 29 | select HAVE_FTRACE_MCOUNT_RECORD |
30 | select HAVE_DYNAMIC_FTRACE | 30 | select HAVE_DYNAMIC_FTRACE |
31 | select HAVE_FUNCTION_TRACER | 31 | select HAVE_FUNCTION_TRACER |
32 | select HAVE_FUNCTION_GRAPH_TRACER | ||
33 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST | ||
32 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 34 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
33 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 35 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
34 | select HAVE_ARCH_TRACEHOOK | 36 | select HAVE_ARCH_TRACEHOOK |
35 | select HAVE_GENERIC_DMA_COHERENT if X86_32 | 37 | select HAVE_GENERIC_DMA_COHERENT if X86_32 |
36 | select HAVE_EFFICIENT_UNALIGNED_ACCESS | 38 | select HAVE_EFFICIENT_UNALIGNED_ACCESS |
39 | select USER_STACKTRACE_SUPPORT | ||
37 | 40 | ||
38 | config ARCH_DEFCONFIG | 41 | config ARCH_DEFCONFIG |
39 | string | 42 | string |
@@ -167,9 +170,12 @@ config GENERIC_PENDING_IRQ | |||
167 | config X86_SMP | 170 | config X86_SMP |
168 | bool | 171 | bool |
169 | depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) | 172 | depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) |
170 | select USE_GENERIC_SMP_HELPERS | ||
171 | default y | 173 | default y |
172 | 174 | ||
175 | config USE_GENERIC_SMP_HELPERS | ||
176 | def_bool y | ||
177 | depends on SMP | ||
178 | |||
173 | config X86_32_SMP | 179 | config X86_32_SMP |
174 | def_bool y | 180 | def_bool y |
175 | depends on X86_32 && SMP | 181 | depends on X86_32 && SMP |
@@ -235,6 +241,25 @@ config X86_HAS_BOOT_CPU_ID | |||
235 | def_bool y | 241 | def_bool y |
236 | depends on X86_VOYAGER | 242 | depends on X86_VOYAGER |
237 | 243 | ||
244 | config SPARSE_IRQ | ||
245 | bool "Support sparse irq numbering" | ||
246 | depends on PCI_MSI || HT_IRQ | ||
247 | default y | ||
248 | help | ||
249 | This enables support for sparse irq, esp for msi/msi-x. You may need | ||
250 | if you have lots of cards supports msi-x installed. | ||
251 | |||
252 | If you don't know what to do here, say Y. | ||
253 | |||
254 | config NUMA_MIGRATE_IRQ_DESC | ||
255 | bool "Move irq desc when changing irq smp_affinity" | ||
256 | depends on SPARSE_IRQ && SMP | ||
257 | default n | ||
258 | help | ||
259 | This enables moving irq_desc to cpu/node that irq will use handled. | ||
260 | |||
261 | If you don't know what to do here, say N. | ||
262 | |||
238 | config X86_FIND_SMP_CONFIG | 263 | config X86_FIND_SMP_CONFIG |
239 | def_bool y | 264 | def_bool y |
240 | depends on X86_MPPARSE || X86_VOYAGER | 265 | depends on X86_MPPARSE || X86_VOYAGER |
@@ -364,10 +389,10 @@ config X86_RDC321X | |||
364 | as R-8610-(G). | 389 | as R-8610-(G). |
365 | If you don't have one of these chips, you should say N here. | 390 | If you don't have one of these chips, you should say N here. |
366 | 391 | ||
367 | config SCHED_NO_NO_OMIT_FRAME_POINTER | 392 | config SCHED_OMIT_FRAME_POINTER |
368 | def_bool y | 393 | def_bool y |
369 | prompt "Single-depth WCHAN output" | 394 | prompt "Single-depth WCHAN output" |
370 | depends on X86_32 | 395 | depends on X86 |
371 | help | 396 | help |
372 | Calculate simpler /proc/<PID>/wchan values. If this option | 397 | Calculate simpler /proc/<PID>/wchan values. If this option |
373 | is disabled then wchan values will recurse back to the | 398 | is disabled then wchan values will recurse back to the |
@@ -462,10 +487,6 @@ config X86_CYCLONE_TIMER | |||
462 | def_bool y | 487 | def_bool y |
463 | depends on X86_GENERICARCH | 488 | depends on X86_GENERICARCH |
464 | 489 | ||
465 | config ES7000_CLUSTERED_APIC | ||
466 | def_bool y | ||
467 | depends on SMP && X86_ES7000 && MPENTIUMIII | ||
468 | |||
469 | source "arch/x86/Kconfig.cpu" | 490 | source "arch/x86/Kconfig.cpu" |
470 | 491 | ||
471 | config HPET_TIMER | 492 | config HPET_TIMER |
@@ -579,19 +600,20 @@ config IOMMU_HELPER | |||
579 | 600 | ||
580 | config MAXSMP | 601 | config MAXSMP |
581 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" | 602 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" |
582 | depends on X86_64 && SMP && BROKEN | 603 | depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL |
604 | select CPUMASK_OFFSTACK | ||
583 | default n | 605 | default n |
584 | help | 606 | help |
585 | Configure maximum number of CPUS and NUMA Nodes for this architecture. | 607 | Configure maximum number of CPUS and NUMA Nodes for this architecture. |
586 | If unsure, say N. | 608 | If unsure, say N. |
587 | 609 | ||
588 | config NR_CPUS | 610 | config NR_CPUS |
589 | int "Maximum number of CPUs (2-512)" if !MAXSMP | 611 | int "Maximum number of CPUs" if SMP && !MAXSMP |
590 | range 2 512 | 612 | range 2 512 if SMP && !MAXSMP |
591 | depends on SMP | 613 | default "1" if !SMP |
592 | default "4096" if MAXSMP | 614 | default "4096" if MAXSMP |
593 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 615 | default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000) |
594 | default "8" | 616 | default "8" if SMP |
595 | help | 617 | help |
596 | This allows you to specify the maximum number of CPUs which this | 618 | This allows you to specify the maximum number of CPUs which this |
597 | kernel will support. The maximum supported value is 512 and the | 619 | kernel will support. The maximum supported value is 512 and the |
@@ -957,7 +979,7 @@ config ARCH_PHYS_ADDR_T_64BIT | |||
957 | config NUMA | 979 | config NUMA |
958 | bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" | 980 | bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" |
959 | depends on SMP | 981 | depends on SMP |
960 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && BROKEN) | 982 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) |
961 | default n if X86_PC | 983 | default n if X86_PC |
962 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) | 984 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) |
963 | help | 985 | help |
@@ -1629,13 +1651,6 @@ config APM_ALLOW_INTS | |||
1629 | many of the newer IBM Thinkpads. If you experience hangs when you | 1651 | many of the newer IBM Thinkpads. If you experience hangs when you |
1630 | suspend, try setting this to Y. Otherwise, say N. | 1652 | suspend, try setting this to Y. Otherwise, say N. |
1631 | 1653 | ||
1632 | config APM_REAL_MODE_POWER_OFF | ||
1633 | bool "Use real mode APM BIOS call to power off" | ||
1634 | help | ||
1635 | Use real mode APM BIOS calls to switch off the computer. This is | ||
1636 | a work-around for a number of buggy BIOSes. Switch this option on if | ||
1637 | your computer crashes instead of powering off properly. | ||
1638 | |||
1639 | endif # APM | 1654 | endif # APM |
1640 | 1655 | ||
1641 | source "arch/x86/kernel/cpu/cpufreq/Kconfig" | 1656 | source "arch/x86/kernel/cpu/cpufreq/Kconfig" |
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index b815664fe370..85a78575956c 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
@@ -515,6 +515,7 @@ config CPU_SUP_UMC_32 | |||
515 | config X86_DS | 515 | config X86_DS |
516 | def_bool X86_PTRACE_BTS | 516 | def_bool X86_PTRACE_BTS |
517 | depends on X86_DEBUGCTLMSR | 517 | depends on X86_DEBUGCTLMSR |
518 | select HAVE_HW_BRANCH_TRACER | ||
518 | 519 | ||
519 | config X86_PTRACE_BTS | 520 | config X86_PTRACE_BTS |
520 | bool "Branch Trace Store" | 521 | bool "Branch Trace Store" |
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 2a3dfbd5e677..fa013f529b74 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
@@ -186,14 +186,10 @@ config IOMMU_LEAK | |||
186 | Add a simple leak tracer to the IOMMU code. This is useful when you | 186 | Add a simple leak tracer to the IOMMU code. This is useful when you |
187 | are debugging a buggy device driver that leaks IOMMU mappings. | 187 | are debugging a buggy device driver that leaks IOMMU mappings. |
188 | 188 | ||
189 | config MMIOTRACE_HOOKS | ||
190 | bool | ||
191 | |||
192 | config MMIOTRACE | 189 | config MMIOTRACE |
193 | bool "Memory mapped IO tracing" | 190 | bool "Memory mapped IO tracing" |
194 | depends on DEBUG_KERNEL && PCI | 191 | depends on DEBUG_KERNEL && PCI |
195 | select TRACING | 192 | select TRACING |
196 | select MMIOTRACE_HOOKS | ||
197 | help | 193 | help |
198 | Mmiotrace traces Memory Mapped I/O access and is meant for | 194 | Mmiotrace traces Memory Mapped I/O access and is meant for |
199 | debugging and reverse engineering. It is called from the ioremap | 195 | debugging and reverse engineering. It is called from the ioremap |
diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c index 0be77b39328a..7e8e8b25f5f6 100644 --- a/arch/x86/boot/tty.c +++ b/arch/x86/boot/tty.c | |||
@@ -74,7 +74,7 @@ static int kbd_pending(void) | |||
74 | { | 74 | { |
75 | u8 pending; | 75 | u8 pending; |
76 | asm volatile("int $0x16; setnz %0" | 76 | asm volatile("int $0x16; setnz %0" |
77 | : "=rm" (pending) | 77 | : "=qm" (pending) |
78 | : "a" (0x0100)); | 78 | : "a" (0x0100)); |
79 | return pending; | 79 | return pending; |
80 | } | 80 | } |
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 8d676d8ecde9..9830681446ad 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h | |||
@@ -113,7 +113,6 @@ static inline void acpi_disable_pci(void) | |||
113 | acpi_pci_disabled = 1; | 113 | acpi_pci_disabled = 1; |
114 | acpi_noirq_set(); | 114 | acpi_noirq_set(); |
115 | } | 115 | } |
116 | extern int acpi_irq_balance_set(char *str); | ||
117 | 116 | ||
118 | /* routines for saving/restoring kernel state */ | 117 | /* routines for saving/restoring kernel state */ |
119 | extern int acpi_save_state_mem(void); | 118 | extern int acpi_save_state_mem(void); |
diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h index 1a30c0440c6b..ac302a2fa339 100644 --- a/arch/x86/include/asm/amd_iommu_types.h +++ b/arch/x86/include/asm/amd_iommu_types.h | |||
@@ -251,13 +251,6 @@ struct amd_iommu { | |||
251 | /* Pointer to PCI device of this IOMMU */ | 251 | /* Pointer to PCI device of this IOMMU */ |
252 | struct pci_dev *dev; | 252 | struct pci_dev *dev; |
253 | 253 | ||
254 | /* | ||
255 | * Capability pointer. There could be more than one IOMMU per PCI | ||
256 | * device function if there are more than one AMD IOMMU capability | ||
257 | * pointers. | ||
258 | */ | ||
259 | u16 cap_ptr; | ||
260 | |||
261 | /* physical address of MMIO space */ | 254 | /* physical address of MMIO space */ |
262 | u64 mmio_phys; | 255 | u64 mmio_phys; |
263 | /* virtual address of MMIO space */ | 256 | /* virtual address of MMIO space */ |
@@ -266,6 +259,13 @@ struct amd_iommu { | |||
266 | /* capabilities of that IOMMU read from ACPI */ | 259 | /* capabilities of that IOMMU read from ACPI */ |
267 | u32 cap; | 260 | u32 cap; |
268 | 261 | ||
262 | /* | ||
263 | * Capability pointer. There could be more than one IOMMU per PCI | ||
264 | * device function if there are more than one AMD IOMMU capability | ||
265 | * pointers. | ||
266 | */ | ||
267 | u16 cap_ptr; | ||
268 | |||
269 | /* pci domain of this IOMMU */ | 269 | /* pci domain of this IOMMU */ |
270 | u16 pci_seg; | 270 | u16 pci_seg; |
271 | 271 | ||
@@ -284,19 +284,19 @@ struct amd_iommu { | |||
284 | /* size of command buffer */ | 284 | /* size of command buffer */ |
285 | u32 cmd_buf_size; | 285 | u32 cmd_buf_size; |
286 | 286 | ||
287 | /* event buffer virtual address */ | ||
288 | u8 *evt_buf; | ||
289 | /* size of event buffer */ | 287 | /* size of event buffer */ |
290 | u32 evt_buf_size; | 288 | u32 evt_buf_size; |
289 | /* event buffer virtual address */ | ||
290 | u8 *evt_buf; | ||
291 | /* MSI number for event interrupt */ | 291 | /* MSI number for event interrupt */ |
292 | u16 evt_msi_num; | 292 | u16 evt_msi_num; |
293 | 293 | ||
294 | /* if one, we need to send a completion wait command */ | ||
295 | int need_sync; | ||
296 | |||
297 | /* true if interrupts for this IOMMU are already enabled */ | 294 | /* true if interrupts for this IOMMU are already enabled */ |
298 | bool int_enabled; | 295 | bool int_enabled; |
299 | 296 | ||
297 | /* if one, we need to send a completion wait command */ | ||
298 | int need_sync; | ||
299 | |||
300 | /* default dma_ops domain for that IOMMU */ | 300 | /* default dma_ops domain for that IOMMU */ |
301 | struct dma_ops_domain *default_dom; | 301 | struct dma_ops_domain *default_dom; |
302 | }; | 302 | }; |
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 3b1510b4fc57..25caa0738af5 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -193,6 +193,7 @@ extern u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask); | |||
193 | static inline void lapic_shutdown(void) { } | 193 | static inline void lapic_shutdown(void) { } |
194 | #define local_apic_timer_c2_ok 1 | 194 | #define local_apic_timer_c2_ok 1 |
195 | static inline void init_apic_mappings(void) { } | 195 | static inline void init_apic_mappings(void) { } |
196 | static inline void disable_local_APIC(void) { } | ||
196 | 197 | ||
197 | #endif /* !CONFIG_X86_LOCAL_APIC */ | 198 | #endif /* !CONFIG_X86_LOCAL_APIC */ |
198 | 199 | ||
diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h index 1d9543b9d358..976399debb3f 100644 --- a/arch/x86/include/asm/bigsmp/apic.h +++ b/arch/x86/include/asm/bigsmp/apic.h | |||
@@ -9,12 +9,12 @@ static inline int apic_id_registered(void) | |||
9 | return (1); | 9 | return (1); |
10 | } | 10 | } |
11 | 11 | ||
12 | static inline cpumask_t target_cpus(void) | 12 | static inline const cpumask_t *target_cpus(void) |
13 | { | 13 | { |
14 | #ifdef CONFIG_SMP | 14 | #ifdef CONFIG_SMP |
15 | return cpu_online_map; | 15 | return &cpu_online_map; |
16 | #else | 16 | #else |
17 | return cpumask_of_cpu(0); | 17 | return &cpumask_of_cpu(0); |
18 | #endif | 18 | #endif |
19 | } | 19 | } |
20 | 20 | ||
@@ -24,8 +24,6 @@ static inline cpumask_t target_cpus(void) | |||
24 | #define INT_DELIVERY_MODE (dest_Fixed) | 24 | #define INT_DELIVERY_MODE (dest_Fixed) |
25 | #define INT_DEST_MODE (0) /* phys delivery to target proc */ | 25 | #define INT_DEST_MODE (0) /* phys delivery to target proc */ |
26 | #define NO_BALANCE_IRQ (0) | 26 | #define NO_BALANCE_IRQ (0) |
27 | #define WAKE_SECONDARY_VIA_INIT | ||
28 | |||
29 | 27 | ||
30 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) | 28 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) |
31 | { | 29 | { |
@@ -81,7 +79,7 @@ static inline int apicid_to_node(int logical_apicid) | |||
81 | 79 | ||
82 | static inline int cpu_present_to_apicid(int mps_cpu) | 80 | static inline int cpu_present_to_apicid(int mps_cpu) |
83 | { | 81 | { |
84 | if (mps_cpu < NR_CPUS) | 82 | if (mps_cpu < nr_cpu_ids) |
85 | return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu); | 83 | return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu); |
86 | 84 | ||
87 | return BAD_APICID; | 85 | return BAD_APICID; |
@@ -96,7 +94,7 @@ extern u8 cpu_2_logical_apicid[]; | |||
96 | /* Mapping from cpu number to logical apicid */ | 94 | /* Mapping from cpu number to logical apicid */ |
97 | static inline int cpu_to_logical_apicid(int cpu) | 95 | static inline int cpu_to_logical_apicid(int cpu) |
98 | { | 96 | { |
99 | if (cpu >= NR_CPUS) | 97 | if (cpu >= nr_cpu_ids) |
100 | return BAD_APICID; | 98 | return BAD_APICID; |
101 | return cpu_physical_id(cpu); | 99 | return cpu_physical_id(cpu); |
102 | } | 100 | } |
@@ -121,16 +119,32 @@ static inline int check_phys_apicid_present(int boot_cpu_physical_apicid) | |||
121 | } | 119 | } |
122 | 120 | ||
123 | /* As we are using single CPU as destination, pick only one CPU here */ | 121 | /* As we are using single CPU as destination, pick only one CPU here */ |
124 | static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) | 122 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) |
125 | { | 123 | { |
126 | int cpu; | 124 | int cpu; |
127 | int apicid; | 125 | int apicid; |
128 | 126 | ||
129 | cpu = first_cpu(cpumask); | 127 | cpu = first_cpu(*cpumask); |
130 | apicid = cpu_to_logical_apicid(cpu); | 128 | apicid = cpu_to_logical_apicid(cpu); |
131 | return apicid; | 129 | return apicid; |
132 | } | 130 | } |
133 | 131 | ||
132 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
133 | const struct cpumask *andmask) | ||
134 | { | ||
135 | int cpu; | ||
136 | |||
137 | /* | ||
138 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | ||
139 | * May as well be the first. | ||
140 | */ | ||
141 | cpu = cpumask_any_and(cpumask, andmask); | ||
142 | if (cpu < nr_cpu_ids) | ||
143 | return cpu_to_logical_apicid(cpu); | ||
144 | |||
145 | return BAD_APICID; | ||
146 | } | ||
147 | |||
134 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) | 148 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) |
135 | { | 149 | { |
136 | return cpuid_apic >> index_msb; | 150 | return cpuid_apic >> index_msb; |
diff --git a/arch/x86/include/asm/bigsmp/ipi.h b/arch/x86/include/asm/bigsmp/ipi.h index 9404c535b7ec..27fcd01b3ae6 100644 --- a/arch/x86/include/asm/bigsmp/ipi.h +++ b/arch/x86/include/asm/bigsmp/ipi.h | |||
@@ -1,25 +1,22 @@ | |||
1 | #ifndef __ASM_MACH_IPI_H | 1 | #ifndef __ASM_MACH_IPI_H |
2 | #define __ASM_MACH_IPI_H | 2 | #define __ASM_MACH_IPI_H |
3 | 3 | ||
4 | void send_IPI_mask_sequence(cpumask_t mask, int vector); | 4 | void send_IPI_mask_sequence(const struct cpumask *mask, int vector); |
5 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
5 | 6 | ||
6 | static inline void send_IPI_mask(cpumask_t mask, int vector) | 7 | static inline void send_IPI_mask(const struct cpumask *mask, int vector) |
7 | { | 8 | { |
8 | send_IPI_mask_sequence(mask, vector); | 9 | send_IPI_mask_sequence(mask, vector); |
9 | } | 10 | } |
10 | 11 | ||
11 | static inline void send_IPI_allbutself(int vector) | 12 | static inline void send_IPI_allbutself(int vector) |
12 | { | 13 | { |
13 | cpumask_t mask = cpu_online_map; | 14 | send_IPI_mask_allbutself(cpu_online_mask, vector); |
14 | cpu_clear(smp_processor_id(), mask); | ||
15 | |||
16 | if (!cpus_empty(mask)) | ||
17 | send_IPI_mask(mask, vector); | ||
18 | } | 15 | } |
19 | 16 | ||
20 | static inline void send_IPI_all(int vector) | 17 | static inline void send_IPI_all(int vector) |
21 | { | 18 | { |
22 | send_IPI_mask(cpu_online_map, vector); | 19 | send_IPI_mask(cpu_online_mask, vector); |
23 | } | 20 | } |
24 | 21 | ||
25 | #endif /* __ASM_MACH_IPI_H */ | 22 | #endif /* __ASM_MACH_IPI_H */ |
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 7f225a4b2a26..097794ff6b79 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h | |||
@@ -71,15 +71,13 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev) | |||
71 | /* Make sure we keep the same behaviour */ | 71 | /* Make sure we keep the same behaviour */ |
72 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | 72 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) |
73 | { | 73 | { |
74 | #ifdef CONFIG_X86_32 | 74 | #ifdef CONFIG_X86_64 |
75 | return 0; | ||
76 | #else | ||
77 | struct dma_mapping_ops *ops = get_dma_ops(dev); | 75 | struct dma_mapping_ops *ops = get_dma_ops(dev); |
78 | if (ops->mapping_error) | 76 | if (ops->mapping_error) |
79 | return ops->mapping_error(dev, dma_addr); | 77 | return ops->mapping_error(dev, dma_addr); |
80 | 78 | ||
81 | return (dma_addr == bad_dma_address); | ||
82 | #endif | 79 | #endif |
80 | return (dma_addr == bad_dma_address); | ||
83 | } | 81 | } |
84 | 82 | ||
85 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | 83 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) |
diff --git a/arch/x86/include/asm/ds.h b/arch/x86/include/asm/ds.h index 72c5a190bf48..99b6c39774a4 100644 --- a/arch/x86/include/asm/ds.h +++ b/arch/x86/include/asm/ds.h | |||
@@ -7,13 +7,12 @@ | |||
7 | * | 7 | * |
8 | * It manages: | 8 | * It manages: |
9 | * - per-thread and per-cpu allocation of BTS and PEBS | 9 | * - per-thread and per-cpu allocation of BTS and PEBS |
10 | * - buffer memory allocation (optional) | 10 | * - buffer overflow handling (to be done) |
11 | * - buffer overflow handling | ||
12 | * - buffer access | 11 | * - buffer access |
13 | * | 12 | * |
14 | * It assumes: | 13 | * It assumes: |
15 | * - get_task_struct on all parameter tasks | 14 | * - get_task_struct on all traced tasks |
16 | * - current is allowed to trace parameter tasks | 15 | * - current is allowed to trace tasks |
17 | * | 16 | * |
18 | * | 17 | * |
19 | * Copyright (C) 2007-2008 Intel Corporation. | 18 | * Copyright (C) 2007-2008 Intel Corporation. |
@@ -23,13 +22,21 @@ | |||
23 | #ifndef _ASM_X86_DS_H | 22 | #ifndef _ASM_X86_DS_H |
24 | #define _ASM_X86_DS_H | 23 | #define _ASM_X86_DS_H |
25 | 24 | ||
26 | #ifdef CONFIG_X86_DS | ||
27 | 25 | ||
28 | #include <linux/types.h> | 26 | #include <linux/types.h> |
29 | #include <linux/init.h> | 27 | #include <linux/init.h> |
28 | #include <linux/err.h> | ||
29 | |||
30 | 30 | ||
31 | #ifdef CONFIG_X86_DS | ||
31 | 32 | ||
32 | struct task_struct; | 33 | struct task_struct; |
34 | struct ds_tracer; | ||
35 | struct bts_tracer; | ||
36 | struct pebs_tracer; | ||
37 | |||
38 | typedef void (*bts_ovfl_callback_t)(struct bts_tracer *); | ||
39 | typedef void (*pebs_ovfl_callback_t)(struct pebs_tracer *); | ||
33 | 40 | ||
34 | /* | 41 | /* |
35 | * Request BTS or PEBS | 42 | * Request BTS or PEBS |
@@ -37,60 +44,62 @@ struct task_struct; | |||
37 | * Due to alignement constraints, the actual buffer may be slightly | 44 | * Due to alignement constraints, the actual buffer may be slightly |
38 | * smaller than the requested or provided buffer. | 45 | * smaller than the requested or provided buffer. |
39 | * | 46 | * |
40 | * Returns 0 on success; -Eerrno otherwise | 47 | * Returns a pointer to a tracer structure on success, or |
48 | * ERR_PTR(errcode) on failure. | ||
49 | * | ||
50 | * The interrupt threshold is independent from the overflow callback | ||
51 | * to allow users to use their own overflow interrupt handling mechanism. | ||
41 | * | 52 | * |
42 | * task: the task to request recording for; | 53 | * task: the task to request recording for; |
43 | * NULL for per-cpu recording on the current cpu | 54 | * NULL for per-cpu recording on the current cpu |
44 | * base: the base pointer for the (non-pageable) buffer; | 55 | * base: the base pointer for the (non-pageable) buffer; |
45 | * NULL if buffer allocation requested | 56 | * size: the size of the provided buffer in bytes |
46 | * size: the size of the requested or provided buffer | ||
47 | * ovfl: pointer to a function to be called on buffer overflow; | 57 | * ovfl: pointer to a function to be called on buffer overflow; |
48 | * NULL if cyclic buffer requested | 58 | * NULL if cyclic buffer requested |
59 | * th: the interrupt threshold in records from the end of the buffer; | ||
60 | * -1 if no interrupt threshold is requested. | ||
49 | */ | 61 | */ |
50 | typedef void (*ds_ovfl_callback_t)(struct task_struct *); | 62 | extern struct bts_tracer *ds_request_bts(struct task_struct *task, |
51 | extern int ds_request_bts(struct task_struct *task, void *base, size_t size, | 63 | void *base, size_t size, |
52 | ds_ovfl_callback_t ovfl); | 64 | bts_ovfl_callback_t ovfl, size_t th); |
53 | extern int ds_request_pebs(struct task_struct *task, void *base, size_t size, | 65 | extern struct pebs_tracer *ds_request_pebs(struct task_struct *task, |
54 | ds_ovfl_callback_t ovfl); | 66 | void *base, size_t size, |
67 | pebs_ovfl_callback_t ovfl, | ||
68 | size_t th); | ||
55 | 69 | ||
56 | /* | 70 | /* |
57 | * Release BTS or PEBS resources | 71 | * Release BTS or PEBS resources |
58 | * | 72 | * |
59 | * Frees buffers allocated on ds_request. | ||
60 | * | ||
61 | * Returns 0 on success; -Eerrno otherwise | 73 | * Returns 0 on success; -Eerrno otherwise |
62 | * | 74 | * |
63 | * task: the task to release resources for; | 75 | * tracer: the tracer handle returned from ds_request_~() |
64 | * NULL to release resources for the current cpu | ||
65 | */ | 76 | */ |
66 | extern int ds_release_bts(struct task_struct *task); | 77 | extern int ds_release_bts(struct bts_tracer *tracer); |
67 | extern int ds_release_pebs(struct task_struct *task); | 78 | extern int ds_release_pebs(struct pebs_tracer *tracer); |
68 | 79 | ||
69 | /* | 80 | /* |
70 | * Return the (array) index of the write pointer. | 81 | * Get the (array) index of the write pointer. |
71 | * (assuming an array of BTS/PEBS records) | 82 | * (assuming an array of BTS/PEBS records) |
72 | * | 83 | * |
73 | * Returns -Eerrno on error | 84 | * Returns 0 on success; -Eerrno on error |
74 | * | 85 | * |
75 | * task: the task to access; | 86 | * tracer: the tracer handle returned from ds_request_~() |
76 | * NULL to access the current cpu | 87 | * pos (out): will hold the result |
77 | * pos (out): if not NULL, will hold the result | ||
78 | */ | 88 | */ |
79 | extern int ds_get_bts_index(struct task_struct *task, size_t *pos); | 89 | extern int ds_get_bts_index(struct bts_tracer *tracer, size_t *pos); |
80 | extern int ds_get_pebs_index(struct task_struct *task, size_t *pos); | 90 | extern int ds_get_pebs_index(struct pebs_tracer *tracer, size_t *pos); |
81 | 91 | ||
82 | /* | 92 | /* |
83 | * Return the (array) index one record beyond the end of the array. | 93 | * Get the (array) index one record beyond the end of the array. |
84 | * (assuming an array of BTS/PEBS records) | 94 | * (assuming an array of BTS/PEBS records) |
85 | * | 95 | * |
86 | * Returns -Eerrno on error | 96 | * Returns 0 on success; -Eerrno on error |
87 | * | 97 | * |
88 | * task: the task to access; | 98 | * tracer: the tracer handle returned from ds_request_~() |
89 | * NULL to access the current cpu | 99 | * pos (out): will hold the result |
90 | * pos (out): if not NULL, will hold the result | ||
91 | */ | 100 | */ |
92 | extern int ds_get_bts_end(struct task_struct *task, size_t *pos); | 101 | extern int ds_get_bts_end(struct bts_tracer *tracer, size_t *pos); |
93 | extern int ds_get_pebs_end(struct task_struct *task, size_t *pos); | 102 | extern int ds_get_pebs_end(struct pebs_tracer *tracer, size_t *pos); |
94 | 103 | ||
95 | /* | 104 | /* |
96 | * Provide a pointer to the BTS/PEBS record at parameter index. | 105 | * Provide a pointer to the BTS/PEBS record at parameter index. |
@@ -101,14 +110,13 @@ extern int ds_get_pebs_end(struct task_struct *task, size_t *pos); | |||
101 | * | 110 | * |
102 | * Returns the size of a single record on success; -Eerrno on error | 111 | * Returns the size of a single record on success; -Eerrno on error |
103 | * | 112 | * |
104 | * task: the task to access; | 113 | * tracer: the tracer handle returned from ds_request_~() |
105 | * NULL to access the current cpu | ||
106 | * index: the index of the requested record | 114 | * index: the index of the requested record |
107 | * record (out): pointer to the requested record | 115 | * record (out): pointer to the requested record |
108 | */ | 116 | */ |
109 | extern int ds_access_bts(struct task_struct *task, | 117 | extern int ds_access_bts(struct bts_tracer *tracer, |
110 | size_t index, const void **record); | 118 | size_t index, const void **record); |
111 | extern int ds_access_pebs(struct task_struct *task, | 119 | extern int ds_access_pebs(struct pebs_tracer *tracer, |
112 | size_t index, const void **record); | 120 | size_t index, const void **record); |
113 | 121 | ||
114 | /* | 122 | /* |
@@ -128,38 +136,24 @@ extern int ds_access_pebs(struct task_struct *task, | |||
128 | * | 136 | * |
129 | * Returns the number of bytes written or -Eerrno. | 137 | * Returns the number of bytes written or -Eerrno. |
130 | * | 138 | * |
131 | * task: the task to access; | 139 | * tracer: the tracer handle returned from ds_request_~() |
132 | * NULL to access the current cpu | ||
133 | * buffer: the buffer to write | 140 | * buffer: the buffer to write |
134 | * size: the size of the buffer | 141 | * size: the size of the buffer |
135 | */ | 142 | */ |
136 | extern int ds_write_bts(struct task_struct *task, | 143 | extern int ds_write_bts(struct bts_tracer *tracer, |
137 | const void *buffer, size_t size); | 144 | const void *buffer, size_t size); |
138 | extern int ds_write_pebs(struct task_struct *task, | 145 | extern int ds_write_pebs(struct pebs_tracer *tracer, |
139 | const void *buffer, size_t size); | 146 | const void *buffer, size_t size); |
140 | 147 | ||
141 | /* | 148 | /* |
142 | * Same as ds_write_bts/pebs, but omit ownership checks. | ||
143 | * | ||
144 | * This is needed to have some other task than the owner of the | ||
145 | * BTS/PEBS buffer or the parameter task itself write into the | ||
146 | * respective buffer. | ||
147 | */ | ||
148 | extern int ds_unchecked_write_bts(struct task_struct *task, | ||
149 | const void *buffer, size_t size); | ||
150 | extern int ds_unchecked_write_pebs(struct task_struct *task, | ||
151 | const void *buffer, size_t size); | ||
152 | |||
153 | /* | ||
154 | * Reset the write pointer of the BTS/PEBS buffer. | 149 | * Reset the write pointer of the BTS/PEBS buffer. |
155 | * | 150 | * |
156 | * Returns 0 on success; -Eerrno on error | 151 | * Returns 0 on success; -Eerrno on error |
157 | * | 152 | * |
158 | * task: the task to access; | 153 | * tracer: the tracer handle returned from ds_request_~() |
159 | * NULL to access the current cpu | ||
160 | */ | 154 | */ |
161 | extern int ds_reset_bts(struct task_struct *task); | 155 | extern int ds_reset_bts(struct bts_tracer *tracer); |
162 | extern int ds_reset_pebs(struct task_struct *task); | 156 | extern int ds_reset_pebs(struct pebs_tracer *tracer); |
163 | 157 | ||
164 | /* | 158 | /* |
165 | * Clear the BTS/PEBS buffer and reset the write pointer. | 159 | * Clear the BTS/PEBS buffer and reset the write pointer. |
@@ -167,33 +161,30 @@ extern int ds_reset_pebs(struct task_struct *task); | |||
167 | * | 161 | * |
168 | * Returns 0 on success; -Eerrno on error | 162 | * Returns 0 on success; -Eerrno on error |
169 | * | 163 | * |
170 | * task: the task to access; | 164 | * tracer: the tracer handle returned from ds_request_~() |
171 | * NULL to access the current cpu | ||
172 | */ | 165 | */ |
173 | extern int ds_clear_bts(struct task_struct *task); | 166 | extern int ds_clear_bts(struct bts_tracer *tracer); |
174 | extern int ds_clear_pebs(struct task_struct *task); | 167 | extern int ds_clear_pebs(struct pebs_tracer *tracer); |
175 | 168 | ||
176 | /* | 169 | /* |
177 | * Provide the PEBS counter reset value. | 170 | * Provide the PEBS counter reset value. |
178 | * | 171 | * |
179 | * Returns 0 on success; -Eerrno on error | 172 | * Returns 0 on success; -Eerrno on error |
180 | * | 173 | * |
181 | * task: the task to access; | 174 | * tracer: the tracer handle returned from ds_request_pebs() |
182 | * NULL to access the current cpu | ||
183 | * value (out): the counter reset value | 175 | * value (out): the counter reset value |
184 | */ | 176 | */ |
185 | extern int ds_get_pebs_reset(struct task_struct *task, u64 *value); | 177 | extern int ds_get_pebs_reset(struct pebs_tracer *tracer, u64 *value); |
186 | 178 | ||
187 | /* | 179 | /* |
188 | * Set the PEBS counter reset value. | 180 | * Set the PEBS counter reset value. |
189 | * | 181 | * |
190 | * Returns 0 on success; -Eerrno on error | 182 | * Returns 0 on success; -Eerrno on error |
191 | * | 183 | * |
192 | * task: the task to access; | 184 | * tracer: the tracer handle returned from ds_request_pebs() |
193 | * NULL to access the current cpu | ||
194 | * value: the new counter reset value | 185 | * value: the new counter reset value |
195 | */ | 186 | */ |
196 | extern int ds_set_pebs_reset(struct task_struct *task, u64 value); | 187 | extern int ds_set_pebs_reset(struct pebs_tracer *tracer, u64 value); |
197 | 188 | ||
198 | /* | 189 | /* |
199 | * Initialization | 190 | * Initialization |
@@ -206,17 +197,13 @@ extern void __cpuinit ds_init_intel(struct cpuinfo_x86 *); | |||
206 | /* | 197 | /* |
207 | * The DS context - part of struct thread_struct. | 198 | * The DS context - part of struct thread_struct. |
208 | */ | 199 | */ |
200 | #define MAX_SIZEOF_DS (12 * 8) | ||
201 | |||
209 | struct ds_context { | 202 | struct ds_context { |
210 | /* pointer to the DS configuration; goes into MSR_IA32_DS_AREA */ | 203 | /* pointer to the DS configuration; goes into MSR_IA32_DS_AREA */ |
211 | unsigned char *ds; | 204 | unsigned char ds[MAX_SIZEOF_DS]; |
212 | /* the owner of the BTS and PEBS configuration, respectively */ | 205 | /* the owner of the BTS and PEBS configuration, respectively */ |
213 | struct task_struct *owner[2]; | 206 | struct ds_tracer *owner[2]; |
214 | /* buffer overflow notification function for BTS and PEBS */ | ||
215 | ds_ovfl_callback_t callback[2]; | ||
216 | /* the original buffer address */ | ||
217 | void *buffer[2]; | ||
218 | /* the number of allocated pages for on-request allocated buffers */ | ||
219 | unsigned int pages[2]; | ||
220 | /* use count */ | 207 | /* use count */ |
221 | unsigned long count; | 208 | unsigned long count; |
222 | /* a pointer to the context location inside the thread_struct | 209 | /* a pointer to the context location inside the thread_struct |
@@ -232,7 +219,8 @@ extern void ds_free(struct ds_context *context); | |||
232 | 219 | ||
233 | #else /* CONFIG_X86_DS */ | 220 | #else /* CONFIG_X86_DS */ |
234 | 221 | ||
235 | #define ds_init_intel(config) do {} while (0) | 222 | struct cpuinfo_x86; |
223 | static inline void __cpuinit ds_init_intel(struct cpuinfo_x86 *ignored) {} | ||
236 | 224 | ||
237 | #endif /* CONFIG_X86_DS */ | 225 | #endif /* CONFIG_X86_DS */ |
238 | #endif /* _ASM_X86_DS_H */ | 226 | #endif /* _ASM_X86_DS_H */ |
diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h index 94826cf87455..cc70c1c78ca4 100644 --- a/arch/x86/include/asm/emergency-restart.h +++ b/arch/x86/include/asm/emergency-restart.h | |||
@@ -8,7 +8,9 @@ enum reboot_type { | |||
8 | BOOT_BIOS = 'b', | 8 | BOOT_BIOS = 'b', |
9 | #endif | 9 | #endif |
10 | BOOT_ACPI = 'a', | 10 | BOOT_ACPI = 'a', |
11 | BOOT_EFI = 'e' | 11 | BOOT_EFI = 'e', |
12 | BOOT_CF9 = 'p', | ||
13 | BOOT_CF9_COND = 'q', | ||
12 | }; | 14 | }; |
13 | 15 | ||
14 | extern enum reboot_type reboot_type; | 16 | extern enum reboot_type reboot_type; |
diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h index 380f0b4f17ed..ba8423c5363f 100644 --- a/arch/x86/include/asm/es7000/apic.h +++ b/arch/x86/include/asm/es7000/apic.h | |||
@@ -9,31 +9,27 @@ static inline int apic_id_registered(void) | |||
9 | return (1); | 9 | return (1); |
10 | } | 10 | } |
11 | 11 | ||
12 | static inline cpumask_t target_cpus(void) | 12 | static inline const cpumask_t *target_cpus_cluster(void) |
13 | { | 13 | { |
14 | #if defined CONFIG_ES7000_CLUSTERED_APIC | 14 | return &CPU_MASK_ALL; |
15 | return CPU_MASK_ALL; | ||
16 | #else | ||
17 | return cpumask_of_cpu(smp_processor_id()); | ||
18 | #endif | ||
19 | } | 15 | } |
20 | 16 | ||
21 | #if defined CONFIG_ES7000_CLUSTERED_APIC | 17 | static inline const cpumask_t *target_cpus(void) |
22 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) | 18 | { |
23 | #define INT_DELIVERY_MODE (dest_LowestPrio) | 19 | return &cpumask_of_cpu(smp_processor_id()); |
24 | #define INT_DEST_MODE (1) /* logical delivery broadcast to all procs */ | 20 | } |
25 | #define NO_BALANCE_IRQ (1) | 21 | |
26 | #undef WAKE_SECONDARY_VIA_INIT | 22 | #define APIC_DFR_VALUE_CLUSTER (APIC_DFR_CLUSTER) |
27 | #define WAKE_SECONDARY_VIA_MIP | 23 | #define INT_DELIVERY_MODE_CLUSTER (dest_LowestPrio) |
28 | #else | 24 | #define INT_DEST_MODE_CLUSTER (1) /* logical delivery broadcast to all procs */ |
25 | #define NO_BALANCE_IRQ_CLUSTER (1) | ||
26 | |||
29 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | 27 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) |
30 | #define INT_DELIVERY_MODE (dest_Fixed) | 28 | #define INT_DELIVERY_MODE (dest_Fixed) |
31 | #define INT_DEST_MODE (0) /* phys delivery to target procs */ | 29 | #define INT_DEST_MODE (0) /* phys delivery to target procs */ |
32 | #define NO_BALANCE_IRQ (0) | 30 | #define NO_BALANCE_IRQ (0) |
33 | #undef APIC_DEST_LOGICAL | 31 | #undef APIC_DEST_LOGICAL |
34 | #define APIC_DEST_LOGICAL 0x0 | 32 | #define APIC_DEST_LOGICAL 0x0 |
35 | #define WAKE_SECONDARY_VIA_INIT | ||
36 | #endif | ||
37 | 33 | ||
38 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) | 34 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) |
39 | { | 35 | { |
@@ -60,6 +56,16 @@ static inline unsigned long calculate_ldr(int cpu) | |||
60 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | 56 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel |
61 | * document number 292116). So here it goes... | 57 | * document number 292116). So here it goes... |
62 | */ | 58 | */ |
59 | static inline void init_apic_ldr_cluster(void) | ||
60 | { | ||
61 | unsigned long val; | ||
62 | int cpu = smp_processor_id(); | ||
63 | |||
64 | apic_write(APIC_DFR, APIC_DFR_VALUE_CLUSTER); | ||
65 | val = calculate_ldr(cpu); | ||
66 | apic_write(APIC_LDR, val); | ||
67 | } | ||
68 | |||
63 | static inline void init_apic_ldr(void) | 69 | static inline void init_apic_ldr(void) |
64 | { | 70 | { |
65 | unsigned long val; | 71 | unsigned long val; |
@@ -70,17 +76,14 @@ static inline void init_apic_ldr(void) | |||
70 | apic_write(APIC_LDR, val); | 76 | apic_write(APIC_LDR, val); |
71 | } | 77 | } |
72 | 78 | ||
73 | #ifndef CONFIG_X86_GENERICARCH | ||
74 | extern void enable_apic_mode(void); | ||
75 | #endif | ||
76 | |||
77 | extern int apic_version [MAX_APICS]; | 79 | extern int apic_version [MAX_APICS]; |
78 | static inline void setup_apic_routing(void) | 80 | static inline void setup_apic_routing(void) |
79 | { | 81 | { |
80 | int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id()); | 82 | int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id()); |
81 | printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", | 83 | printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", |
82 | (apic_version[apic] == 0x14) ? | 84 | (apic_version[apic] == 0x14) ? |
83 | "Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_addr(target_cpus())[0]); | 85 | "Physical Cluster" : "Logical Cluster", |
86 | nr_ioapics, cpus_addr(*target_cpus())[0]); | ||
84 | } | 87 | } |
85 | 88 | ||
86 | static inline int multi_timer_check(int apic, int irq) | 89 | static inline int multi_timer_check(int apic, int irq) |
@@ -98,7 +101,7 @@ static inline int cpu_present_to_apicid(int mps_cpu) | |||
98 | { | 101 | { |
99 | if (!mps_cpu) | 102 | if (!mps_cpu) |
100 | return boot_cpu_physical_apicid; | 103 | return boot_cpu_physical_apicid; |
101 | else if (mps_cpu < NR_CPUS) | 104 | else if (mps_cpu < nr_cpu_ids) |
102 | return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu); | 105 | return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu); |
103 | else | 106 | else |
104 | return BAD_APICID; | 107 | return BAD_APICID; |
@@ -118,9 +121,9 @@ extern u8 cpu_2_logical_apicid[]; | |||
118 | static inline int cpu_to_logical_apicid(int cpu) | 121 | static inline int cpu_to_logical_apicid(int cpu) |
119 | { | 122 | { |
120 | #ifdef CONFIG_SMP | 123 | #ifdef CONFIG_SMP |
121 | if (cpu >= NR_CPUS) | 124 | if (cpu >= nr_cpu_ids) |
122 | return BAD_APICID; | 125 | return BAD_APICID; |
123 | return (int)cpu_2_logical_apicid[cpu]; | 126 | return (int)cpu_2_logical_apicid[cpu]; |
124 | #else | 127 | #else |
125 | return logical_smp_processor_id(); | 128 | return logical_smp_processor_id(); |
126 | #endif | 129 | #endif |
@@ -144,16 +147,87 @@ static inline int check_phys_apicid_present(int cpu_physical_apicid) | |||
144 | return (1); | 147 | return (1); |
145 | } | 148 | } |
146 | 149 | ||
147 | static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) | 150 | static inline unsigned int |
151 | cpu_mask_to_apicid_cluster(const struct cpumask *cpumask) | ||
152 | { | ||
153 | int num_bits_set; | ||
154 | int cpus_found = 0; | ||
155 | int cpu; | ||
156 | int apicid; | ||
157 | |||
158 | num_bits_set = cpumask_weight(cpumask); | ||
159 | /* Return id to all */ | ||
160 | if (num_bits_set == NR_CPUS) | ||
161 | return 0xFF; | ||
162 | /* | ||
163 | * The cpus in the mask must all be on the apic cluster. If are not | ||
164 | * on the same apicid cluster return default value of TARGET_CPUS. | ||
165 | */ | ||
166 | cpu = cpumask_first(cpumask); | ||
167 | apicid = cpu_to_logical_apicid(cpu); | ||
168 | while (cpus_found < num_bits_set) { | ||
169 | if (cpumask_test_cpu(cpu, cpumask)) { | ||
170 | int new_apicid = cpu_to_logical_apicid(cpu); | ||
171 | if (apicid_cluster(apicid) != | ||
172 | apicid_cluster(new_apicid)){ | ||
173 | printk ("%s: Not a valid mask!\n", __func__); | ||
174 | return 0xFF; | ||
175 | } | ||
176 | apicid = new_apicid; | ||
177 | cpus_found++; | ||
178 | } | ||
179 | cpu++; | ||
180 | } | ||
181 | return apicid; | ||
182 | } | ||
183 | |||
184 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
148 | { | 185 | { |
149 | int num_bits_set; | 186 | int num_bits_set; |
150 | int cpus_found = 0; | 187 | int cpus_found = 0; |
151 | int cpu; | 188 | int cpu; |
152 | int apicid; | 189 | int apicid; |
153 | 190 | ||
154 | num_bits_set = cpus_weight(cpumask); | 191 | num_bits_set = cpus_weight(*cpumask); |
155 | /* Return id to all */ | 192 | /* Return id to all */ |
156 | if (num_bits_set == NR_CPUS) | 193 | if (num_bits_set == NR_CPUS) |
194 | return cpu_to_logical_apicid(0); | ||
195 | /* | ||
196 | * The cpus in the mask must all be on the apic cluster. If are not | ||
197 | * on the same apicid cluster return default value of TARGET_CPUS. | ||
198 | */ | ||
199 | cpu = first_cpu(*cpumask); | ||
200 | apicid = cpu_to_logical_apicid(cpu); | ||
201 | while (cpus_found < num_bits_set) { | ||
202 | if (cpu_isset(cpu, *cpumask)) { | ||
203 | int new_apicid = cpu_to_logical_apicid(cpu); | ||
204 | if (apicid_cluster(apicid) != | ||
205 | apicid_cluster(new_apicid)){ | ||
206 | printk ("%s: Not a valid mask!\n", __func__); | ||
207 | return cpu_to_logical_apicid(0); | ||
208 | } | ||
209 | apicid = new_apicid; | ||
210 | cpus_found++; | ||
211 | } | ||
212 | cpu++; | ||
213 | } | ||
214 | return apicid; | ||
215 | } | ||
216 | |||
217 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
218 | const struct cpumask *andmask) | ||
219 | { | ||
220 | int num_bits_set; | ||
221 | int num_bits_set2; | ||
222 | int cpus_found = 0; | ||
223 | int cpu; | ||
224 | int apicid = 0; | ||
225 | |||
226 | num_bits_set = cpumask_weight(cpumask); | ||
227 | num_bits_set2 = cpumask_weight(andmask); | ||
228 | num_bits_set = min(num_bits_set, num_bits_set2); | ||
229 | /* Return id to all */ | ||
230 | if (num_bits_set >= nr_cpu_ids) | ||
157 | #if defined CONFIG_ES7000_CLUSTERED_APIC | 231 | #if defined CONFIG_ES7000_CLUSTERED_APIC |
158 | return 0xFF; | 232 | return 0xFF; |
159 | #else | 233 | #else |
@@ -163,14 +237,17 @@ static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) | |||
163 | * The cpus in the mask must all be on the apic cluster. If are not | 237 | * The cpus in the mask must all be on the apic cluster. If are not |
164 | * on the same apicid cluster return default value of TARGET_CPUS. | 238 | * on the same apicid cluster return default value of TARGET_CPUS. |
165 | */ | 239 | */ |
166 | cpu = first_cpu(cpumask); | 240 | cpu = cpumask_first_and(cpumask, andmask); |
167 | apicid = cpu_to_logical_apicid(cpu); | 241 | apicid = cpu_to_logical_apicid(cpu); |
242 | |||
168 | while (cpus_found < num_bits_set) { | 243 | while (cpus_found < num_bits_set) { |
169 | if (cpu_isset(cpu, cpumask)) { | 244 | if (cpumask_test_cpu(cpu, cpumask) && |
245 | cpumask_test_cpu(cpu, andmask)) { | ||
170 | int new_apicid = cpu_to_logical_apicid(cpu); | 246 | int new_apicid = cpu_to_logical_apicid(cpu); |
171 | if (apicid_cluster(apicid) != | 247 | if (apicid_cluster(apicid) != |
172 | apicid_cluster(new_apicid)){ | 248 | apicid_cluster(new_apicid)) { |
173 | printk ("%s: Not a valid mask!\n", __func__); | 249 | printk(KERN_WARNING |
250 | "%s: Not a valid mask!\n", __func__); | ||
174 | #if defined CONFIG_ES7000_CLUSTERED_APIC | 251 | #if defined CONFIG_ES7000_CLUSTERED_APIC |
175 | return 0xFF; | 252 | return 0xFF; |
176 | #else | 253 | #else |
diff --git a/arch/x86/include/asm/es7000/ipi.h b/arch/x86/include/asm/es7000/ipi.h index 632a955fcc0a..7e8ed24d4b8a 100644 --- a/arch/x86/include/asm/es7000/ipi.h +++ b/arch/x86/include/asm/es7000/ipi.h | |||
@@ -1,24 +1,22 @@ | |||
1 | #ifndef __ASM_ES7000_IPI_H | 1 | #ifndef __ASM_ES7000_IPI_H |
2 | #define __ASM_ES7000_IPI_H | 2 | #define __ASM_ES7000_IPI_H |
3 | 3 | ||
4 | void send_IPI_mask_sequence(cpumask_t mask, int vector); | 4 | void send_IPI_mask_sequence(const struct cpumask *mask, int vector); |
5 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
5 | 6 | ||
6 | static inline void send_IPI_mask(cpumask_t mask, int vector) | 7 | static inline void send_IPI_mask(const struct cpumask *mask, int vector) |
7 | { | 8 | { |
8 | send_IPI_mask_sequence(mask, vector); | 9 | send_IPI_mask_sequence(mask, vector); |
9 | } | 10 | } |
10 | 11 | ||
11 | static inline void send_IPI_allbutself(int vector) | 12 | static inline void send_IPI_allbutself(int vector) |
12 | { | 13 | { |
13 | cpumask_t mask = cpu_online_map; | 14 | send_IPI_mask_allbutself(cpu_online_mask, vector); |
14 | cpu_clear(smp_processor_id(), mask); | ||
15 | if (!cpus_empty(mask)) | ||
16 | send_IPI_mask(mask, vector); | ||
17 | } | 15 | } |
18 | 16 | ||
19 | static inline void send_IPI_all(int vector) | 17 | static inline void send_IPI_all(int vector) |
20 | { | 18 | { |
21 | send_IPI_mask(cpu_online_map, vector); | 19 | send_IPI_mask(cpu_online_mask, vector); |
22 | } | 20 | } |
23 | 21 | ||
24 | #endif /* __ASM_ES7000_IPI_H */ | 22 | #endif /* __ASM_ES7000_IPI_H */ |
diff --git a/arch/x86/include/asm/es7000/wakecpu.h b/arch/x86/include/asm/es7000/wakecpu.h index 398493461913..78f0daaee436 100644 --- a/arch/x86/include/asm/es7000/wakecpu.h +++ b/arch/x86/include/asm/es7000/wakecpu.h | |||
@@ -1,36 +1,12 @@ | |||
1 | #ifndef __ASM_ES7000_WAKECPU_H | 1 | #ifndef __ASM_ES7000_WAKECPU_H |
2 | #define __ASM_ES7000_WAKECPU_H | 2 | #define __ASM_ES7000_WAKECPU_H |
3 | 3 | ||
4 | /* | 4 | #define TRAMPOLINE_PHYS_LOW 0x467 |
5 | * This file copes with machines that wakeup secondary CPUs by the | 5 | #define TRAMPOLINE_PHYS_HIGH 0x469 |
6 | * INIT, INIT, STARTUP sequence. | ||
7 | */ | ||
8 | |||
9 | #ifdef CONFIG_ES7000_CLUSTERED_APIC | ||
10 | #define WAKE_SECONDARY_VIA_MIP | ||
11 | #else | ||
12 | #define WAKE_SECONDARY_VIA_INIT | ||
13 | #endif | ||
14 | |||
15 | #ifdef WAKE_SECONDARY_VIA_MIP | ||
16 | extern int es7000_start_cpu(int cpu, unsigned long eip); | ||
17 | static inline int | ||
18 | wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) | ||
19 | { | ||
20 | int boot_error = 0; | ||
21 | boot_error = es7000_start_cpu(phys_apicid, start_eip); | ||
22 | return boot_error; | ||
23 | } | ||
24 | #endif | ||
25 | |||
26 | #define TRAMPOLINE_LOW phys_to_virt(0x467) | ||
27 | #define TRAMPOLINE_HIGH phys_to_virt(0x469) | ||
28 | |||
29 | #define boot_cpu_apicid boot_cpu_physical_apicid | ||
30 | 6 | ||
31 | static inline void wait_for_init_deassert(atomic_t *deassert) | 7 | static inline void wait_for_init_deassert(atomic_t *deassert) |
32 | { | 8 | { |
33 | #ifdef WAKE_SECONDARY_VIA_INIT | 9 | #ifndef CONFIG_ES7000_CLUSTERED_APIC |
34 | while (!atomic_read(deassert)) | 10 | while (!atomic_read(deassert)) |
35 | cpu_relax(); | 11 | cpu_relax(); |
36 | #endif | 12 | #endif |
@@ -50,9 +26,12 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) | |||
50 | { | 26 | { |
51 | } | 27 | } |
52 | 28 | ||
53 | #define inquire_remote_apic(apicid) do { \ | 29 | extern void __inquire_remote_apic(int apicid); |
54 | if (apic_verbosity >= APIC_DEBUG) \ | 30 | |
55 | __inquire_remote_apic(apicid); \ | 31 | static inline void inquire_remote_apic(int apicid) |
56 | } while (0) | 32 | { |
33 | if (apic_verbosity >= APIC_DEBUG) | ||
34 | __inquire_remote_apic(apicid); | ||
35 | } | ||
57 | 36 | ||
58 | #endif /* __ASM_MACH_WAKECPU_H */ | 37 | #endif /* __ASM_MACH_WAKECPU_H */ |
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h index 9e8bc29b8b17..7e61b4ceb9a4 100644 --- a/arch/x86/include/asm/ftrace.h +++ b/arch/x86/include/asm/ftrace.h | |||
@@ -17,8 +17,40 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) | |||
17 | */ | 17 | */ |
18 | return addr - 1; | 18 | return addr - 1; |
19 | } | 19 | } |
20 | #endif | ||
21 | 20 | ||
21 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
22 | |||
23 | struct dyn_arch_ftrace { | ||
24 | /* No extra data needed for x86 */ | ||
25 | }; | ||
26 | |||
27 | #endif /* CONFIG_DYNAMIC_FTRACE */ | ||
28 | #endif /* __ASSEMBLY__ */ | ||
22 | #endif /* CONFIG_FUNCTION_TRACER */ | 29 | #endif /* CONFIG_FUNCTION_TRACER */ |
23 | 30 | ||
31 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
32 | |||
33 | #ifndef __ASSEMBLY__ | ||
34 | |||
35 | /* | ||
36 | * Stack of return addresses for functions | ||
37 | * of a thread. | ||
38 | * Used in struct thread_info | ||
39 | */ | ||
40 | struct ftrace_ret_stack { | ||
41 | unsigned long ret; | ||
42 | unsigned long func; | ||
43 | unsigned long long calltime; | ||
44 | }; | ||
45 | |||
46 | /* | ||
47 | * Primary handler of a function return. | ||
48 | * It relays on ftrace_return_to_handler. | ||
49 | * Defined in entry32.S | ||
50 | */ | ||
51 | extern void return_to_handler(void); | ||
52 | |||
53 | #endif /* __ASSEMBLY__ */ | ||
54 | #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ | ||
55 | |||
24 | #endif /* _ASM_X86_FTRACE_H */ | 56 | #endif /* _ASM_X86_FTRACE_H */ |
diff --git a/arch/x86/include/asm/genapic_32.h b/arch/x86/include/asm/genapic_32.h index 5cbd4fcc06fd..746f37a7963a 100644 --- a/arch/x86/include/asm/genapic_32.h +++ b/arch/x86/include/asm/genapic_32.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _ASM_X86_GENAPIC_32_H | 2 | #define _ASM_X86_GENAPIC_32_H |
3 | 3 | ||
4 | #include <asm/mpspec.h> | 4 | #include <asm/mpspec.h> |
5 | #include <asm/atomic.h> | ||
5 | 6 | ||
6 | /* | 7 | /* |
7 | * Generic APIC driver interface. | 8 | * Generic APIC driver interface. |
@@ -23,7 +24,7 @@ struct genapic { | |||
23 | int (*probe)(void); | 24 | int (*probe)(void); |
24 | 25 | ||
25 | int (*apic_id_registered)(void); | 26 | int (*apic_id_registered)(void); |
26 | cpumask_t (*target_cpus)(void); | 27 | const struct cpumask *(*target_cpus)(void); |
27 | int int_delivery_mode; | 28 | int int_delivery_mode; |
28 | int int_dest_mode; | 29 | int int_dest_mode; |
29 | int ESR_DISABLE; | 30 | int ESR_DISABLE; |
@@ -56,15 +57,27 @@ struct genapic { | |||
56 | 57 | ||
57 | unsigned (*get_apic_id)(unsigned long x); | 58 | unsigned (*get_apic_id)(unsigned long x); |
58 | unsigned long apic_id_mask; | 59 | unsigned long apic_id_mask; |
59 | unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask); | 60 | unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask); |
60 | cpumask_t (*vector_allocation_domain)(int cpu); | 61 | unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask, |
62 | const struct cpumask *andmask); | ||
63 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); | ||
61 | 64 | ||
62 | #ifdef CONFIG_SMP | 65 | #ifdef CONFIG_SMP |
63 | /* ipi */ | 66 | /* ipi */ |
64 | void (*send_IPI_mask)(cpumask_t mask, int vector); | 67 | void (*send_IPI_mask)(const struct cpumask *mask, int vector); |
68 | void (*send_IPI_mask_allbutself)(const struct cpumask *mask, | ||
69 | int vector); | ||
65 | void (*send_IPI_allbutself)(int vector); | 70 | void (*send_IPI_allbutself)(int vector); |
66 | void (*send_IPI_all)(int vector); | 71 | void (*send_IPI_all)(int vector); |
67 | #endif | 72 | #endif |
73 | int (*wakeup_cpu)(int apicid, unsigned long start_eip); | ||
74 | int trampoline_phys_low; | ||
75 | int trampoline_phys_high; | ||
76 | void (*wait_for_init_deassert)(atomic_t *deassert); | ||
77 | void (*smp_callin_clear_local_apic)(void); | ||
78 | void (*store_NMI_vector)(unsigned short *high, unsigned short *low); | ||
79 | void (*restore_NMI_vector)(unsigned short *high, unsigned short *low); | ||
80 | void (*inquire_remote_apic)(int apicid); | ||
68 | }; | 81 | }; |
69 | 82 | ||
70 | #define APICFUNC(x) .x = x, | 83 | #define APICFUNC(x) .x = x, |
@@ -105,16 +118,25 @@ struct genapic { | |||
105 | APICFUNC(get_apic_id) \ | 118 | APICFUNC(get_apic_id) \ |
106 | .apic_id_mask = APIC_ID_MASK, \ | 119 | .apic_id_mask = APIC_ID_MASK, \ |
107 | APICFUNC(cpu_mask_to_apicid) \ | 120 | APICFUNC(cpu_mask_to_apicid) \ |
108 | APICFUNC(vector_allocation_domain) \ | 121 | APICFUNC(cpu_mask_to_apicid_and) \ |
122 | APICFUNC(vector_allocation_domain) \ | ||
109 | APICFUNC(acpi_madt_oem_check) \ | 123 | APICFUNC(acpi_madt_oem_check) \ |
110 | IPIFUNC(send_IPI_mask) \ | 124 | IPIFUNC(send_IPI_mask) \ |
111 | IPIFUNC(send_IPI_allbutself) \ | 125 | IPIFUNC(send_IPI_allbutself) \ |
112 | IPIFUNC(send_IPI_all) \ | 126 | IPIFUNC(send_IPI_all) \ |
113 | APICFUNC(enable_apic_mode) \ | 127 | APICFUNC(enable_apic_mode) \ |
114 | APICFUNC(phys_pkg_id) \ | 128 | APICFUNC(phys_pkg_id) \ |
129 | .trampoline_phys_low = TRAMPOLINE_PHYS_LOW, \ | ||
130 | .trampoline_phys_high = TRAMPOLINE_PHYS_HIGH, \ | ||
131 | APICFUNC(wait_for_init_deassert) \ | ||
132 | APICFUNC(smp_callin_clear_local_apic) \ | ||
133 | APICFUNC(store_NMI_vector) \ | ||
134 | APICFUNC(restore_NMI_vector) \ | ||
135 | APICFUNC(inquire_remote_apic) \ | ||
115 | } | 136 | } |
116 | 137 | ||
117 | extern struct genapic *genapic; | 138 | extern struct genapic *genapic; |
139 | extern void es7000_update_genapic_to_cluster(void); | ||
118 | 140 | ||
119 | enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; | 141 | enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; |
120 | #define get_uv_system_type() UV_NONE | 142 | #define get_uv_system_type() UV_NONE |
diff --git a/arch/x86/include/asm/genapic_64.h b/arch/x86/include/asm/genapic_64.h index 13c4e96199ea..adf32fb56aa6 100644 --- a/arch/x86/include/asm/genapic_64.h +++ b/arch/x86/include/asm/genapic_64.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _ASM_X86_GENAPIC_64_H | 1 | #ifndef _ASM_X86_GENAPIC_64_H |
2 | #define _ASM_X86_GENAPIC_64_H | 2 | #define _ASM_X86_GENAPIC_64_H |
3 | 3 | ||
4 | #include <linux/cpumask.h> | ||
5 | |||
4 | /* | 6 | /* |
5 | * Copyright 2004 James Cleverdon, IBM. | 7 | * Copyright 2004 James Cleverdon, IBM. |
6 | * Subject to the GNU Public License, v.2 | 8 | * Subject to the GNU Public License, v.2 |
@@ -18,20 +20,26 @@ struct genapic { | |||
18 | u32 int_delivery_mode; | 20 | u32 int_delivery_mode; |
19 | u32 int_dest_mode; | 21 | u32 int_dest_mode; |
20 | int (*apic_id_registered)(void); | 22 | int (*apic_id_registered)(void); |
21 | cpumask_t (*target_cpus)(void); | 23 | const struct cpumask *(*target_cpus)(void); |
22 | cpumask_t (*vector_allocation_domain)(int cpu); | 24 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); |
23 | void (*init_apic_ldr)(void); | 25 | void (*init_apic_ldr)(void); |
24 | /* ipi */ | 26 | /* ipi */ |
25 | void (*send_IPI_mask)(cpumask_t mask, int vector); | 27 | void (*send_IPI_mask)(const struct cpumask *mask, int vector); |
28 | void (*send_IPI_mask_allbutself)(const struct cpumask *mask, | ||
29 | int vector); | ||
26 | void (*send_IPI_allbutself)(int vector); | 30 | void (*send_IPI_allbutself)(int vector); |
27 | void (*send_IPI_all)(int vector); | 31 | void (*send_IPI_all)(int vector); |
28 | void (*send_IPI_self)(int vector); | 32 | void (*send_IPI_self)(int vector); |
29 | /* */ | 33 | /* */ |
30 | unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask); | 34 | unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask); |
35 | unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask, | ||
36 | const struct cpumask *andmask); | ||
31 | unsigned int (*phys_pkg_id)(int index_msb); | 37 | unsigned int (*phys_pkg_id)(int index_msb); |
32 | unsigned int (*get_apic_id)(unsigned long x); | 38 | unsigned int (*get_apic_id)(unsigned long x); |
33 | unsigned long (*set_apic_id)(unsigned int id); | 39 | unsigned long (*set_apic_id)(unsigned int id); |
34 | unsigned long apic_id_mask; | 40 | unsigned long apic_id_mask; |
41 | /* wakeup_secondary_cpu */ | ||
42 | int (*wakeup_cpu)(int apicid, unsigned long start_eip); | ||
35 | }; | 43 | }; |
36 | 44 | ||
37 | extern struct genapic *genapic; | 45 | extern struct genapic *genapic; |
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 6afd9933a7dd..25d527ca1362 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h | |||
@@ -188,17 +188,14 @@ extern void restore_IO_APIC_setup(void); | |||
188 | extern void reinit_intr_remapped_IO_APIC(int); | 188 | extern void reinit_intr_remapped_IO_APIC(int); |
189 | #endif | 189 | #endif |
190 | 190 | ||
191 | extern int probe_nr_irqs(void); | 191 | extern void probe_nr_irqs_gsi(void); |
192 | 192 | ||
193 | #else /* !CONFIG_X86_IO_APIC */ | 193 | #else /* !CONFIG_X86_IO_APIC */ |
194 | #define io_apic_assign_pci_irqs 0 | 194 | #define io_apic_assign_pci_irqs 0 |
195 | static const int timer_through_8259 = 0; | 195 | static const int timer_through_8259 = 0; |
196 | static inline void ioapic_init_mappings(void) { } | 196 | static inline void ioapic_init_mappings(void) { } |
197 | 197 | ||
198 | static inline int probe_nr_irqs(void) | 198 | static inline void probe_nr_irqs_gsi(void) { } |
199 | { | ||
200 | return NR_IRQS; | ||
201 | } | ||
202 | #endif | 199 | #endif |
203 | 200 | ||
204 | #endif /* _ASM_X86_IO_APIC_H */ | 201 | #endif /* _ASM_X86_IO_APIC_H */ |
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h new file mode 100644 index 000000000000..c1f06289b14b --- /dev/null +++ b/arch/x86/include/asm/iomap.h | |||
@@ -0,0 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright © 2008 Ingo Molnar | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, but | ||
10 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | * General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License along | ||
15 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
16 | * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | ||
17 | */ | ||
18 | |||
19 | #include <linux/fs.h> | ||
20 | #include <linux/mm.h> | ||
21 | #include <linux/uaccess.h> | ||
22 | #include <asm/cacheflush.h> | ||
23 | #include <asm/pgtable.h> | ||
24 | #include <asm/tlbflush.h> | ||
25 | |||
26 | void * | ||
27 | iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot); | ||
28 | |||
29 | void | ||
30 | iounmap_atomic(void *kvaddr, enum km_type type); | ||
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h index e4a552d44465..0b500c5b6446 100644 --- a/arch/x86/include/asm/iommu.h +++ b/arch/x86/include/asm/iommu.h | |||
@@ -6,7 +6,6 @@ extern void no_iommu_init(void); | |||
6 | extern struct dma_mapping_ops nommu_dma_ops; | 6 | extern struct dma_mapping_ops nommu_dma_ops; |
7 | extern int force_iommu, no_iommu; | 7 | extern int force_iommu, no_iommu; |
8 | extern int iommu_detected; | 8 | extern int iommu_detected; |
9 | extern int dmar_disabled; | ||
10 | 9 | ||
11 | extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len); | 10 | extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len); |
12 | 11 | ||
diff --git a/arch/x86/include/asm/ipi.h b/arch/x86/include/asm/ipi.h index f89dffb28aa9..c745a306f7d3 100644 --- a/arch/x86/include/asm/ipi.h +++ b/arch/x86/include/asm/ipi.h | |||
@@ -117,7 +117,8 @@ static inline void __send_IPI_dest_field(unsigned int mask, int vector, | |||
117 | native_apic_mem_write(APIC_ICR, cfg); | 117 | native_apic_mem_write(APIC_ICR, cfg); |
118 | } | 118 | } |
119 | 119 | ||
120 | static inline void send_IPI_mask_sequence(cpumask_t mask, int vector) | 120 | static inline void send_IPI_mask_sequence(const struct cpumask *mask, |
121 | int vector) | ||
121 | { | 122 | { |
122 | unsigned long flags; | 123 | unsigned long flags; |
123 | unsigned long query_cpu; | 124 | unsigned long query_cpu; |
@@ -128,11 +129,29 @@ static inline void send_IPI_mask_sequence(cpumask_t mask, int vector) | |||
128 | * - mbligh | 129 | * - mbligh |
129 | */ | 130 | */ |
130 | local_irq_save(flags); | 131 | local_irq_save(flags); |
131 | for_each_cpu_mask_nr(query_cpu, mask) { | 132 | for_each_cpu(query_cpu, mask) { |
132 | __send_IPI_dest_field(per_cpu(x86_cpu_to_apicid, query_cpu), | 133 | __send_IPI_dest_field(per_cpu(x86_cpu_to_apicid, query_cpu), |
133 | vector, APIC_DEST_PHYSICAL); | 134 | vector, APIC_DEST_PHYSICAL); |
134 | } | 135 | } |
135 | local_irq_restore(flags); | 136 | local_irq_restore(flags); |
136 | } | 137 | } |
137 | 138 | ||
139 | static inline void send_IPI_mask_allbutself(const struct cpumask *mask, | ||
140 | int vector) | ||
141 | { | ||
142 | unsigned long flags; | ||
143 | unsigned int query_cpu; | ||
144 | unsigned int this_cpu = smp_processor_id(); | ||
145 | |||
146 | /* See Hack comment above */ | ||
147 | |||
148 | local_irq_save(flags); | ||
149 | for_each_cpu(query_cpu, mask) | ||
150 | if (query_cpu != this_cpu) | ||
151 | __send_IPI_dest_field( | ||
152 | per_cpu(x86_cpu_to_apicid, query_cpu), | ||
153 | vector, APIC_DEST_PHYSICAL); | ||
154 | local_irq_restore(flags); | ||
155 | } | ||
156 | |||
138 | #endif /* _ASM_X86_IPI_H */ | 157 | #endif /* _ASM_X86_IPI_H */ |
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index bae0eda95486..8766d30fb746 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h | |||
@@ -37,7 +37,7 @@ extern int irqbalance_disable(char *str); | |||
37 | 37 | ||
38 | #ifdef CONFIG_HOTPLUG_CPU | 38 | #ifdef CONFIG_HOTPLUG_CPU |
39 | #include <linux/cpumask.h> | 39 | #include <linux/cpumask.h> |
40 | extern void fixup_irqs(cpumask_t map); | 40 | extern void fixup_irqs(void); |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | extern unsigned int do_IRQ(struct pt_regs *regs); | 43 | extern unsigned int do_IRQ(struct pt_regs *regs); |
diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h index 0005adb0f941..f7ff65032b9d 100644 --- a/arch/x86/include/asm/irq_vectors.h +++ b/arch/x86/include/asm/irq_vectors.h | |||
@@ -101,12 +101,23 @@ | |||
101 | #define LAST_VM86_IRQ 15 | 101 | #define LAST_VM86_IRQ 15 |
102 | #define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15) | 102 | #define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15) |
103 | 103 | ||
104 | #define NR_IRQS_LEGACY 16 | ||
105 | |||
104 | #if defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_VOYAGER) | 106 | #if defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_VOYAGER) |
107 | |||
108 | #ifndef CONFIG_SPARSE_IRQ | ||
105 | # if NR_CPUS < MAX_IO_APICS | 109 | # if NR_CPUS < MAX_IO_APICS |
106 | # define NR_IRQS (NR_VECTORS + (32 * NR_CPUS)) | 110 | # define NR_IRQS (NR_VECTORS + (32 * NR_CPUS)) |
107 | # else | 111 | # else |
108 | # define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS)) | 112 | # define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS)) |
109 | # endif | 113 | # endif |
114 | #else | ||
115 | # if (8 * NR_CPUS) > (32 * MAX_IO_APICS) | ||
116 | # define NR_IRQS (NR_VECTORS + (8 * NR_CPUS)) | ||
117 | # else | ||
118 | # define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS)) | ||
119 | # endif | ||
120 | #endif | ||
110 | 121 | ||
111 | #elif defined(CONFIG_X86_VOYAGER) | 122 | #elif defined(CONFIG_X86_VOYAGER) |
112 | 123 | ||
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h index ff3a6c236c00..8863d978cb96 100644 --- a/arch/x86/include/asm/mach-default/mach_apic.h +++ b/arch/x86/include/asm/mach-default/mach_apic.h | |||
@@ -8,12 +8,12 @@ | |||
8 | 8 | ||
9 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | 9 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) |
10 | 10 | ||
11 | static inline cpumask_t target_cpus(void) | 11 | static inline const struct cpumask *target_cpus(void) |
12 | { | 12 | { |
13 | #ifdef CONFIG_SMP | 13 | #ifdef CONFIG_SMP |
14 | return cpu_online_map; | 14 | return cpu_online_mask; |
15 | #else | 15 | #else |
16 | return cpumask_of_cpu(0); | 16 | return cpumask_of(0); |
17 | #endif | 17 | #endif |
18 | } | 18 | } |
19 | 19 | ||
@@ -28,15 +28,18 @@ static inline cpumask_t target_cpus(void) | |||
28 | #define apic_id_registered (genapic->apic_id_registered) | 28 | #define apic_id_registered (genapic->apic_id_registered) |
29 | #define init_apic_ldr (genapic->init_apic_ldr) | 29 | #define init_apic_ldr (genapic->init_apic_ldr) |
30 | #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid) | 30 | #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid) |
31 | #define cpu_mask_to_apicid_and (genapic->cpu_mask_to_apicid_and) | ||
31 | #define phys_pkg_id (genapic->phys_pkg_id) | 32 | #define phys_pkg_id (genapic->phys_pkg_id) |
32 | #define vector_allocation_domain (genapic->vector_allocation_domain) | 33 | #define vector_allocation_domain (genapic->vector_allocation_domain) |
33 | #define read_apic_id() (GET_APIC_ID(apic_read(APIC_ID))) | 34 | #define read_apic_id() (GET_APIC_ID(apic_read(APIC_ID))) |
34 | #define send_IPI_self (genapic->send_IPI_self) | 35 | #define send_IPI_self (genapic->send_IPI_self) |
36 | #define wakeup_secondary_cpu (genapic->wakeup_cpu) | ||
35 | extern void setup_apic_routing(void); | 37 | extern void setup_apic_routing(void); |
36 | #else | 38 | #else |
37 | #define INT_DELIVERY_MODE dest_LowestPrio | 39 | #define INT_DELIVERY_MODE dest_LowestPrio |
38 | #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */ | 40 | #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */ |
39 | #define TARGET_CPUS (target_cpus()) | 41 | #define TARGET_CPUS (target_cpus()) |
42 | #define wakeup_secondary_cpu wakeup_secondary_cpu_via_init | ||
40 | /* | 43 | /* |
41 | * Set up the logical destination ID. | 44 | * Set up the logical destination ID. |
42 | * | 45 | * |
@@ -59,9 +62,18 @@ static inline int apic_id_registered(void) | |||
59 | return physid_isset(read_apic_id(), phys_cpu_present_map); | 62 | return physid_isset(read_apic_id(), phys_cpu_present_map); |
60 | } | 63 | } |
61 | 64 | ||
62 | static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) | 65 | static inline unsigned int cpu_mask_to_apicid(const struct cpumask *cpumask) |
63 | { | 66 | { |
64 | return cpus_addr(cpumask)[0]; | 67 | return cpumask_bits(cpumask)[0]; |
68 | } | ||
69 | |||
70 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
71 | const struct cpumask *andmask) | ||
72 | { | ||
73 | unsigned long mask1 = cpumask_bits(cpumask)[0]; | ||
74 | unsigned long mask2 = cpumask_bits(andmask)[0]; | ||
75 | |||
76 | return (unsigned int)(mask1 & mask2); | ||
65 | } | 77 | } |
66 | 78 | ||
67 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) | 79 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) |
@@ -86,7 +98,7 @@ static inline int apicid_to_node(int logical_apicid) | |||
86 | #endif | 98 | #endif |
87 | } | 99 | } |
88 | 100 | ||
89 | static inline cpumask_t vector_allocation_domain(int cpu) | 101 | static inline void vector_allocation_domain(int cpu, struct cpumask *retmask) |
90 | { | 102 | { |
91 | /* Careful. Some cpus do not strictly honor the set of cpus | 103 | /* Careful. Some cpus do not strictly honor the set of cpus |
92 | * specified in the interrupt destination when using lowest | 104 | * specified in the interrupt destination when using lowest |
@@ -96,8 +108,7 @@ static inline cpumask_t vector_allocation_domain(int cpu) | |||
96 | * deliver interrupts to the wrong hyperthread when only one | 108 | * deliver interrupts to the wrong hyperthread when only one |
97 | * hyperthread was specified in the interrupt desitination. | 109 | * hyperthread was specified in the interrupt desitination. |
98 | */ | 110 | */ |
99 | cpumask_t domain = { { [0] = APIC_ALL_CPUS, } }; | 111 | *retmask = (cpumask_t) { { [0] = APIC_ALL_CPUS } }; |
100 | return domain; | ||
101 | } | 112 | } |
102 | #endif | 113 | #endif |
103 | 114 | ||
@@ -129,7 +140,7 @@ static inline int cpu_to_logical_apicid(int cpu) | |||
129 | 140 | ||
130 | static inline int cpu_present_to_apicid(int mps_cpu) | 141 | static inline int cpu_present_to_apicid(int mps_cpu) |
131 | { | 142 | { |
132 | if (mps_cpu < NR_CPUS && cpu_present(mps_cpu)) | 143 | if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu)) |
133 | return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu); | 144 | return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu); |
134 | else | 145 | else |
135 | return BAD_APICID; | 146 | return BAD_APICID; |
diff --git a/arch/x86/include/asm/mach-default/mach_ipi.h b/arch/x86/include/asm/mach-default/mach_ipi.h index fabca01ebacf..191312d155da 100644 --- a/arch/x86/include/asm/mach-default/mach_ipi.h +++ b/arch/x86/include/asm/mach-default/mach_ipi.h | |||
@@ -4,7 +4,8 @@ | |||
4 | /* Avoid include hell */ | 4 | /* Avoid include hell */ |
5 | #define NMI_VECTOR 0x02 | 5 | #define NMI_VECTOR 0x02 |
6 | 6 | ||
7 | void send_IPI_mask_bitmask(cpumask_t mask, int vector); | 7 | void send_IPI_mask_bitmask(const struct cpumask *mask, int vector); |
8 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
8 | void __send_IPI_shortcut(unsigned int shortcut, int vector); | 9 | void __send_IPI_shortcut(unsigned int shortcut, int vector); |
9 | 10 | ||
10 | extern int no_broadcast; | 11 | extern int no_broadcast; |
@@ -12,28 +13,27 @@ extern int no_broadcast; | |||
12 | #ifdef CONFIG_X86_64 | 13 | #ifdef CONFIG_X86_64 |
13 | #include <asm/genapic.h> | 14 | #include <asm/genapic.h> |
14 | #define send_IPI_mask (genapic->send_IPI_mask) | 15 | #define send_IPI_mask (genapic->send_IPI_mask) |
16 | #define send_IPI_mask_allbutself (genapic->send_IPI_mask_allbutself) | ||
15 | #else | 17 | #else |
16 | static inline void send_IPI_mask(cpumask_t mask, int vector) | 18 | static inline void send_IPI_mask(const struct cpumask *mask, int vector) |
17 | { | 19 | { |
18 | send_IPI_mask_bitmask(mask, vector); | 20 | send_IPI_mask_bitmask(mask, vector); |
19 | } | 21 | } |
22 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
20 | #endif | 23 | #endif |
21 | 24 | ||
22 | static inline void __local_send_IPI_allbutself(int vector) | 25 | static inline void __local_send_IPI_allbutself(int vector) |
23 | { | 26 | { |
24 | if (no_broadcast || vector == NMI_VECTOR) { | 27 | if (no_broadcast || vector == NMI_VECTOR) |
25 | cpumask_t mask = cpu_online_map; | 28 | send_IPI_mask_allbutself(cpu_online_mask, vector); |
26 | 29 | else | |
27 | cpu_clear(smp_processor_id(), mask); | ||
28 | send_IPI_mask(mask, vector); | ||
29 | } else | ||
30 | __send_IPI_shortcut(APIC_DEST_ALLBUT, vector); | 30 | __send_IPI_shortcut(APIC_DEST_ALLBUT, vector); |
31 | } | 31 | } |
32 | 32 | ||
33 | static inline void __local_send_IPI_all(int vector) | 33 | static inline void __local_send_IPI_all(int vector) |
34 | { | 34 | { |
35 | if (no_broadcast || vector == NMI_VECTOR) | 35 | if (no_broadcast || vector == NMI_VECTOR) |
36 | send_IPI_mask(cpu_online_map, vector); | 36 | send_IPI_mask(cpu_online_mask, vector); |
37 | else | 37 | else |
38 | __send_IPI_shortcut(APIC_DEST_ALLINC, vector); | 38 | __send_IPI_shortcut(APIC_DEST_ALLINC, vector); |
39 | } | 39 | } |
diff --git a/arch/x86/include/asm/mach-default/mach_wakecpu.h b/arch/x86/include/asm/mach-default/mach_wakecpu.h index 9d80db91e992..ceb013660146 100644 --- a/arch/x86/include/asm/mach-default/mach_wakecpu.h +++ b/arch/x86/include/asm/mach-default/mach_wakecpu.h | |||
@@ -1,17 +1,8 @@ | |||
1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H | 1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H |
2 | #define _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H | 2 | #define _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H |
3 | 3 | ||
4 | /* | 4 | #define TRAMPOLINE_PHYS_LOW (0x467) |
5 | * This file copes with machines that wakeup secondary CPUs by the | 5 | #define TRAMPOLINE_PHYS_HIGH (0x469) |
6 | * INIT, INIT, STARTUP sequence. | ||
7 | */ | ||
8 | |||
9 | #define WAKE_SECONDARY_VIA_INIT | ||
10 | |||
11 | #define TRAMPOLINE_LOW phys_to_virt(0x467) | ||
12 | #define TRAMPOLINE_HIGH phys_to_virt(0x469) | ||
13 | |||
14 | #define boot_cpu_apicid boot_cpu_physical_apicid | ||
15 | 6 | ||
16 | static inline void wait_for_init_deassert(atomic_t *deassert) | 7 | static inline void wait_for_init_deassert(atomic_t *deassert) |
17 | { | 8 | { |
@@ -33,9 +24,12 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) | |||
33 | { | 24 | { |
34 | } | 25 | } |
35 | 26 | ||
36 | #define inquire_remote_apic(apicid) do { \ | 27 | extern void __inquire_remote_apic(int apicid); |
37 | if (apic_verbosity >= APIC_DEBUG) \ | 28 | |
38 | __inquire_remote_apic(apicid); \ | 29 | static inline void inquire_remote_apic(int apicid) |
39 | } while (0) | 30 | { |
31 | if (apic_verbosity >= APIC_DEBUG) | ||
32 | __inquire_remote_apic(apicid); | ||
33 | } | ||
40 | 34 | ||
41 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */ | 35 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */ |
diff --git a/arch/x86/include/asm/mach-default/smpboot_hooks.h b/arch/x86/include/asm/mach-default/smpboot_hooks.h index dbab36d64d48..23bf52103b89 100644 --- a/arch/x86/include/asm/mach-default/smpboot_hooks.h +++ b/arch/x86/include/asm/mach-default/smpboot_hooks.h | |||
@@ -13,9 +13,11 @@ static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip) | |||
13 | CMOS_WRITE(0xa, 0xf); | 13 | CMOS_WRITE(0xa, 0xf); |
14 | local_flush_tlb(); | 14 | local_flush_tlb(); |
15 | pr_debug("1.\n"); | 15 | pr_debug("1.\n"); |
16 | *((volatile unsigned short *) TRAMPOLINE_HIGH) = start_eip >> 4; | 16 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) = |
17 | start_eip >> 4; | ||
17 | pr_debug("2.\n"); | 18 | pr_debug("2.\n"); |
18 | *((volatile unsigned short *) TRAMPOLINE_LOW) = start_eip & 0xf; | 19 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = |
20 | start_eip & 0xf; | ||
19 | pr_debug("3.\n"); | 21 | pr_debug("3.\n"); |
20 | } | 22 | } |
21 | 23 | ||
@@ -32,7 +34,7 @@ static inline void smpboot_restore_warm_reset_vector(void) | |||
32 | */ | 34 | */ |
33 | CMOS_WRITE(0, 0xf); | 35 | CMOS_WRITE(0, 0xf); |
34 | 36 | ||
35 | *((volatile long *) phys_to_virt(0x467)) = 0; | 37 | *((volatile long *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0; |
36 | } | 38 | } |
37 | 39 | ||
38 | static inline void __init smpboot_setup_io_apic(void) | 40 | static inline void __init smpboot_setup_io_apic(void) |
diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h index 5180bd7478fb..48553e958ad5 100644 --- a/arch/x86/include/asm/mach-generic/mach_apic.h +++ b/arch/x86/include/asm/mach-generic/mach_apic.h | |||
@@ -24,9 +24,11 @@ | |||
24 | #define check_phys_apicid_present (genapic->check_phys_apicid_present) | 24 | #define check_phys_apicid_present (genapic->check_phys_apicid_present) |
25 | #define check_apicid_used (genapic->check_apicid_used) | 25 | #define check_apicid_used (genapic->check_apicid_used) |
26 | #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid) | 26 | #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid) |
27 | #define cpu_mask_to_apicid_and (genapic->cpu_mask_to_apicid_and) | ||
27 | #define vector_allocation_domain (genapic->vector_allocation_domain) | 28 | #define vector_allocation_domain (genapic->vector_allocation_domain) |
28 | #define enable_apic_mode (genapic->enable_apic_mode) | 29 | #define enable_apic_mode (genapic->enable_apic_mode) |
29 | #define phys_pkg_id (genapic->phys_pkg_id) | 30 | #define phys_pkg_id (genapic->phys_pkg_id) |
31 | #define wakeup_secondary_cpu (genapic->wakeup_cpu) | ||
30 | 32 | ||
31 | extern void generic_bigsmp_probe(void); | 33 | extern void generic_bigsmp_probe(void); |
32 | 34 | ||
diff --git a/arch/x86/include/asm/mach-generic/mach_wakecpu.h b/arch/x86/include/asm/mach-generic/mach_wakecpu.h new file mode 100644 index 000000000000..1ab16b168c8a --- /dev/null +++ b/arch/x86/include/asm/mach-generic/mach_wakecpu.h | |||
@@ -0,0 +1,12 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H | ||
2 | #define _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H | ||
3 | |||
4 | #define TRAMPOLINE_PHYS_LOW (genapic->trampoline_phys_low) | ||
5 | #define TRAMPOLINE_PHYS_HIGH (genapic->trampoline_phys_high) | ||
6 | #define wait_for_init_deassert (genapic->wait_for_init_deassert) | ||
7 | #define smp_callin_clear_local_apic (genapic->smp_callin_clear_local_apic) | ||
8 | #define store_NMI_vector (genapic->store_NMI_vector) | ||
9 | #define restore_NMI_vector (genapic->restore_NMI_vector) | ||
10 | #define inquire_remote_apic (genapic->inquire_remote_apic) | ||
11 | |||
12 | #endif /* _ASM_X86_MACH_GENERIC_MACH_APIC_H */ | ||
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index 485bdf059ffb..07f1af494ca5 100644 --- a/arch/x86/include/asm/mmzone_32.h +++ b/arch/x86/include/asm/mmzone_32.h | |||
@@ -34,10 +34,14 @@ static inline void get_memcfg_numa(void) | |||
34 | 34 | ||
35 | extern int early_pfn_to_nid(unsigned long pfn); | 35 | extern int early_pfn_to_nid(unsigned long pfn); |
36 | 36 | ||
37 | extern void resume_map_numa_kva(pgd_t *pgd); | ||
38 | |||
37 | #else /* !CONFIG_NUMA */ | 39 | #else /* !CONFIG_NUMA */ |
38 | 40 | ||
39 | #define get_memcfg_numa get_memcfg_numa_flat | 41 | #define get_memcfg_numa get_memcfg_numa_flat |
40 | 42 | ||
43 | static inline void resume_map_numa_kva(pgd_t *pgd) {} | ||
44 | |||
41 | #endif /* CONFIG_NUMA */ | 45 | #endif /* CONFIG_NUMA */ |
42 | 46 | ||
43 | #ifdef CONFIG_DISCONTIGMEM | 47 | #ifdef CONFIG_DISCONTIGMEM |
diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h index 0bf2a06b7a4e..c80f00d29965 100644 --- a/arch/x86/include/asm/numaq/apic.h +++ b/arch/x86/include/asm/numaq/apic.h | |||
@@ -7,9 +7,9 @@ | |||
7 | 7 | ||
8 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) | 8 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) |
9 | 9 | ||
10 | static inline cpumask_t target_cpus(void) | 10 | static inline const cpumask_t *target_cpus(void) |
11 | { | 11 | { |
12 | return CPU_MASK_ALL; | 12 | return &CPU_MASK_ALL; |
13 | } | 13 | } |
14 | 14 | ||
15 | #define NO_BALANCE_IRQ (1) | 15 | #define NO_BALANCE_IRQ (1) |
@@ -122,7 +122,13 @@ static inline void enable_apic_mode(void) | |||
122 | * We use physical apicids here, not logical, so just return the default | 122 | * We use physical apicids here, not logical, so just return the default |
123 | * physical broadcast to stop people from breaking us | 123 | * physical broadcast to stop people from breaking us |
124 | */ | 124 | */ |
125 | static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) | 125 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) |
126 | { | ||
127 | return (int) 0xF; | ||
128 | } | ||
129 | |||
130 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
131 | const struct cpumask *andmask) | ||
126 | { | 132 | { |
127 | return (int) 0xF; | 133 | return (int) 0xF; |
128 | } | 134 | } |
diff --git a/arch/x86/include/asm/numaq/ipi.h b/arch/x86/include/asm/numaq/ipi.h index 935588d286cf..a8374c652778 100644 --- a/arch/x86/include/asm/numaq/ipi.h +++ b/arch/x86/include/asm/numaq/ipi.h | |||
@@ -1,25 +1,22 @@ | |||
1 | #ifndef __ASM_NUMAQ_IPI_H | 1 | #ifndef __ASM_NUMAQ_IPI_H |
2 | #define __ASM_NUMAQ_IPI_H | 2 | #define __ASM_NUMAQ_IPI_H |
3 | 3 | ||
4 | void send_IPI_mask_sequence(cpumask_t, int vector); | 4 | void send_IPI_mask_sequence(const struct cpumask *mask, int vector); |
5 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
5 | 6 | ||
6 | static inline void send_IPI_mask(cpumask_t mask, int vector) | 7 | static inline void send_IPI_mask(const struct cpumask *mask, int vector) |
7 | { | 8 | { |
8 | send_IPI_mask_sequence(mask, vector); | 9 | send_IPI_mask_sequence(mask, vector); |
9 | } | 10 | } |
10 | 11 | ||
11 | static inline void send_IPI_allbutself(int vector) | 12 | static inline void send_IPI_allbutself(int vector) |
12 | { | 13 | { |
13 | cpumask_t mask = cpu_online_map; | 14 | send_IPI_mask_allbutself(cpu_online_mask, vector); |
14 | cpu_clear(smp_processor_id(), mask); | ||
15 | |||
16 | if (!cpus_empty(mask)) | ||
17 | send_IPI_mask(mask, vector); | ||
18 | } | 15 | } |
19 | 16 | ||
20 | static inline void send_IPI_all(int vector) | 17 | static inline void send_IPI_all(int vector) |
21 | { | 18 | { |
22 | send_IPI_mask(cpu_online_map, vector); | 19 | send_IPI_mask(cpu_online_mask, vector); |
23 | } | 20 | } |
24 | 21 | ||
25 | #endif /* __ASM_NUMAQ_IPI_H */ | 22 | #endif /* __ASM_NUMAQ_IPI_H */ |
diff --git a/arch/x86/include/asm/numaq/wakecpu.h b/arch/x86/include/asm/numaq/wakecpu.h index c577bda5b1c5..6f499df8eddb 100644 --- a/arch/x86/include/asm/numaq/wakecpu.h +++ b/arch/x86/include/asm/numaq/wakecpu.h | |||
@@ -3,12 +3,8 @@ | |||
3 | 3 | ||
4 | /* This file copes with machines that wakeup secondary CPUs by NMIs */ | 4 | /* This file copes with machines that wakeup secondary CPUs by NMIs */ |
5 | 5 | ||
6 | #define WAKE_SECONDARY_VIA_NMI | 6 | #define TRAMPOLINE_PHYS_LOW (0x8) |
7 | 7 | #define TRAMPOLINE_PHYS_HIGH (0xa) | |
8 | #define TRAMPOLINE_LOW phys_to_virt(0x8) | ||
9 | #define TRAMPOLINE_HIGH phys_to_virt(0xa) | ||
10 | |||
11 | #define boot_cpu_apicid boot_cpu_logical_apicid | ||
12 | 8 | ||
13 | /* We don't do anything here because we use NMI's to boot instead */ | 9 | /* We don't do anything here because we use NMI's to boot instead */ |
14 | static inline void wait_for_init_deassert(atomic_t *deassert) | 10 | static inline void wait_for_init_deassert(atomic_t *deassert) |
@@ -27,17 +23,23 @@ static inline void smp_callin_clear_local_apic(void) | |||
27 | static inline void store_NMI_vector(unsigned short *high, unsigned short *low) | 23 | static inline void store_NMI_vector(unsigned short *high, unsigned short *low) |
28 | { | 24 | { |
29 | printk("Storing NMI vector\n"); | 25 | printk("Storing NMI vector\n"); |
30 | *high = *((volatile unsigned short *) TRAMPOLINE_HIGH); | 26 | *high = |
31 | *low = *((volatile unsigned short *) TRAMPOLINE_LOW); | 27 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)); |
28 | *low = | ||
29 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)); | ||
32 | } | 30 | } |
33 | 31 | ||
34 | static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) | 32 | static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) |
35 | { | 33 | { |
36 | printk("Restoring NMI vector\n"); | 34 | printk("Restoring NMI vector\n"); |
37 | *((volatile unsigned short *) TRAMPOLINE_HIGH) = *high; | 35 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) = |
38 | *((volatile unsigned short *) TRAMPOLINE_LOW) = *low; | 36 | *high; |
37 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = | ||
38 | *low; | ||
39 | } | 39 | } |
40 | 40 | ||
41 | #define inquire_remote_apic(apicid) {} | 41 | static inline void inquire_remote_apic(int apicid) |
42 | { | ||
43 | } | ||
42 | 44 | ||
43 | #endif /* __ASM_NUMAQ_WAKECPU_H */ | 45 | #endif /* __ASM_NUMAQ_WAKECPU_H */ |
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h index 5b28995d664e..d02d936840a3 100644 --- a/arch/x86/include/asm/pci_64.h +++ b/arch/x86/include/asm/pci_64.h | |||
@@ -34,8 +34,6 @@ extern void pci_iommu_alloc(void); | |||
34 | */ | 34 | */ |
35 | #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) | 35 | #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) |
36 | 36 | ||
37 | #if defined(CONFIG_GART_IOMMU) || defined(CONFIG_CALGARY_IOMMU) | ||
38 | |||
39 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ | 37 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ |
40 | dma_addr_t ADDR_NAME; | 38 | dma_addr_t ADDR_NAME; |
41 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ | 39 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ |
@@ -49,18 +47,6 @@ extern void pci_iommu_alloc(void); | |||
49 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ | 47 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ |
50 | (((PTR)->LEN_NAME) = (VAL)) | 48 | (((PTR)->LEN_NAME) = (VAL)) |
51 | 49 | ||
52 | #else | ||
53 | /* No IOMMU */ | ||
54 | |||
55 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) | ||
56 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) | ||
57 | #define pci_unmap_addr(PTR, ADDR_NAME) (0) | ||
58 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | ||
59 | #define pci_unmap_len(PTR, LEN_NAME) (0) | ||
60 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | ||
61 | |||
62 | #endif | ||
63 | |||
64 | #endif /* __KERNEL__ */ | 50 | #endif /* __KERNEL__ */ |
65 | 51 | ||
66 | #endif /* _ASM_X86_PCI_64_H */ | 52 | #endif /* _ASM_X86_PCI_64_H */ |
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index d1531c8480b7..eefb0594b058 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h | |||
@@ -271,8 +271,6 @@ extern int do_get_thread_area(struct task_struct *p, int idx, | |||
271 | extern int do_set_thread_area(struct task_struct *p, int idx, | 271 | extern int do_set_thread_area(struct task_struct *p, int idx, |
272 | struct user_desc __user *info, int can_allocate); | 272 | struct user_desc __user *info, int can_allocate); |
273 | 273 | ||
274 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
275 | |||
276 | #endif /* __KERNEL__ */ | 274 | #endif /* __KERNEL__ */ |
277 | 275 | ||
278 | #endif /* !__ASSEMBLY__ */ | 276 | #endif /* !__ASSEMBLY__ */ |
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index f12d37237465..294daeb3a006 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
@@ -16,6 +16,8 @@ static inline void visws_early_detect(void) { } | |||
16 | static inline int is_visws_box(void) { return 0; } | 16 | static inline int is_visws_box(void) { return 0; } |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip); | ||
20 | extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip); | ||
19 | /* | 21 | /* |
20 | * Any setup quirks to be performed? | 22 | * Any setup quirks to be performed? |
21 | */ | 23 | */ |
@@ -39,6 +41,7 @@ struct x86_quirks { | |||
39 | void (*smp_read_mpc_oem)(struct mp_config_oemtable *oemtable, | 41 | void (*smp_read_mpc_oem)(struct mp_config_oemtable *oemtable, |
40 | unsigned short oemsize); | 42 | unsigned short oemsize); |
41 | int (*setup_ioapic_ids)(void); | 43 | int (*setup_ioapic_ids)(void); |
44 | int (*update_genapic)(void); | ||
42 | }; | 45 | }; |
43 | 46 | ||
44 | extern struct x86_quirks *x86_quirks; | 47 | extern struct x86_quirks *x86_quirks; |
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index d12811ce51d9..830b9fcb6427 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h | |||
@@ -60,7 +60,7 @@ struct smp_ops { | |||
60 | void (*cpu_die)(unsigned int cpu); | 60 | void (*cpu_die)(unsigned int cpu); |
61 | void (*play_dead)(void); | 61 | void (*play_dead)(void); |
62 | 62 | ||
63 | void (*send_call_func_ipi)(cpumask_t mask); | 63 | void (*send_call_func_ipi)(const struct cpumask *mask); |
64 | void (*send_call_func_single_ipi)(int cpu); | 64 | void (*send_call_func_single_ipi)(int cpu); |
65 | }; | 65 | }; |
66 | 66 | ||
@@ -125,7 +125,7 @@ static inline void arch_send_call_function_single_ipi(int cpu) | |||
125 | 125 | ||
126 | static inline void arch_send_call_function_ipi(cpumask_t mask) | 126 | static inline void arch_send_call_function_ipi(cpumask_t mask) |
127 | { | 127 | { |
128 | smp_ops.send_call_func_ipi(mask); | 128 | smp_ops.send_call_func_ipi(&mask); |
129 | } | 129 | } |
130 | 130 | ||
131 | void cpu_disable_common(void); | 131 | void cpu_disable_common(void); |
@@ -138,7 +138,7 @@ void native_cpu_die(unsigned int cpu); | |||
138 | void native_play_dead(void); | 138 | void native_play_dead(void); |
139 | void play_dead_common(void); | 139 | void play_dead_common(void); |
140 | 140 | ||
141 | void native_send_call_func_ipi(cpumask_t mask); | 141 | void native_send_call_func_ipi(const struct cpumask *mask); |
142 | void native_send_call_func_single_ipi(int cpu); | 142 | void native_send_call_func_single_ipi(int cpu); |
143 | 143 | ||
144 | extern void prefill_possible_map(void); | 144 | extern void prefill_possible_map(void); |
diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h index 9b3070f1c2ac..651a93849341 100644 --- a/arch/x86/include/asm/summit/apic.h +++ b/arch/x86/include/asm/summit/apic.h | |||
@@ -14,13 +14,13 @@ | |||
14 | 14 | ||
15 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) | 15 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) |
16 | 16 | ||
17 | static inline cpumask_t target_cpus(void) | 17 | static inline const cpumask_t *target_cpus(void) |
18 | { | 18 | { |
19 | /* CPU_MASK_ALL (0xff) has undefined behaviour with | 19 | /* CPU_MASK_ALL (0xff) has undefined behaviour with |
20 | * dest_LowestPrio mode logical clustered apic interrupt routing | 20 | * dest_LowestPrio mode logical clustered apic interrupt routing |
21 | * Just start on cpu 0. IRQ balancing will spread load | 21 | * Just start on cpu 0. IRQ balancing will spread load |
22 | */ | 22 | */ |
23 | return cpumask_of_cpu(0); | 23 | return &cpumask_of_cpu(0); |
24 | } | 24 | } |
25 | 25 | ||
26 | #define INT_DELIVERY_MODE (dest_LowestPrio) | 26 | #define INT_DELIVERY_MODE (dest_LowestPrio) |
@@ -137,14 +137,14 @@ static inline void enable_apic_mode(void) | |||
137 | { | 137 | { |
138 | } | 138 | } |
139 | 139 | ||
140 | static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) | 140 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) |
141 | { | 141 | { |
142 | int num_bits_set; | 142 | int num_bits_set; |
143 | int cpus_found = 0; | 143 | int cpus_found = 0; |
144 | int cpu; | 144 | int cpu; |
145 | int apicid; | 145 | int apicid; |
146 | 146 | ||
147 | num_bits_set = cpus_weight(cpumask); | 147 | num_bits_set = cpus_weight(*cpumask); |
148 | /* Return id to all */ | 148 | /* Return id to all */ |
149 | if (num_bits_set == NR_CPUS) | 149 | if (num_bits_set == NR_CPUS) |
150 | return (int) 0xFF; | 150 | return (int) 0xFF; |
@@ -152,10 +152,10 @@ static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) | |||
152 | * The cpus in the mask must all be on the apic cluster. If are not | 152 | * The cpus in the mask must all be on the apic cluster. If are not |
153 | * on the same apicid cluster return default value of TARGET_CPUS. | 153 | * on the same apicid cluster return default value of TARGET_CPUS. |
154 | */ | 154 | */ |
155 | cpu = first_cpu(cpumask); | 155 | cpu = first_cpu(*cpumask); |
156 | apicid = cpu_to_logical_apicid(cpu); | 156 | apicid = cpu_to_logical_apicid(cpu); |
157 | while (cpus_found < num_bits_set) { | 157 | while (cpus_found < num_bits_set) { |
158 | if (cpu_isset(cpu, cpumask)) { | 158 | if (cpu_isset(cpu, *cpumask)) { |
159 | int new_apicid = cpu_to_logical_apicid(cpu); | 159 | int new_apicid = cpu_to_logical_apicid(cpu); |
160 | if (apicid_cluster(apicid) != | 160 | if (apicid_cluster(apicid) != |
161 | apicid_cluster(new_apicid)){ | 161 | apicid_cluster(new_apicid)){ |
@@ -170,6 +170,45 @@ static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) | |||
170 | return apicid; | 170 | return apicid; |
171 | } | 171 | } |
172 | 172 | ||
173 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
174 | const struct cpumask *andmask) | ||
175 | { | ||
176 | int num_bits_set; | ||
177 | int num_bits_set2; | ||
178 | int cpus_found = 0; | ||
179 | int cpu; | ||
180 | int apicid = 0; | ||
181 | |||
182 | num_bits_set = cpumask_weight(cpumask); | ||
183 | num_bits_set2 = cpumask_weight(andmask); | ||
184 | num_bits_set = min(num_bits_set, num_bits_set2); | ||
185 | /* Return id to all */ | ||
186 | if (num_bits_set >= nr_cpu_ids) | ||
187 | return 0xFF; | ||
188 | /* | ||
189 | * The cpus in the mask must all be on the apic cluster. If are not | ||
190 | * on the same apicid cluster return default value of TARGET_CPUS. | ||
191 | */ | ||
192 | cpu = cpumask_first_and(cpumask, andmask); | ||
193 | apicid = cpu_to_logical_apicid(cpu); | ||
194 | while (cpus_found < num_bits_set) { | ||
195 | if (cpumask_test_cpu(cpu, cpumask) | ||
196 | && cpumask_test_cpu(cpu, andmask)) { | ||
197 | int new_apicid = cpu_to_logical_apicid(cpu); | ||
198 | if (apicid_cluster(apicid) != | ||
199 | apicid_cluster(new_apicid)) { | ||
200 | printk(KERN_WARNING | ||
201 | "%s: Not a valid mask!\n", __func__); | ||
202 | return 0xFF; | ||
203 | } | ||
204 | apicid = apicid | new_apicid; | ||
205 | cpus_found++; | ||
206 | } | ||
207 | cpu++; | ||
208 | } | ||
209 | return apicid; | ||
210 | } | ||
211 | |||
173 | /* cpuid returns the value latched in the HW at reset, not the APIC ID | 212 | /* cpuid returns the value latched in the HW at reset, not the APIC ID |
174 | * register's value. For any box whose BIOS changes APIC IDs, like | 213 | * register's value. For any box whose BIOS changes APIC IDs, like |
175 | * clustered APIC systems, we must use hard_smp_processor_id. | 214 | * clustered APIC systems, we must use hard_smp_processor_id. |
diff --git a/arch/x86/include/asm/summit/ipi.h b/arch/x86/include/asm/summit/ipi.h index 53bd1e7bd7b4..a8a2c24f50cc 100644 --- a/arch/x86/include/asm/summit/ipi.h +++ b/arch/x86/include/asm/summit/ipi.h | |||
@@ -1,9 +1,10 @@ | |||
1 | #ifndef __ASM_SUMMIT_IPI_H | 1 | #ifndef __ASM_SUMMIT_IPI_H |
2 | #define __ASM_SUMMIT_IPI_H | 2 | #define __ASM_SUMMIT_IPI_H |
3 | 3 | ||
4 | void send_IPI_mask_sequence(cpumask_t mask, int vector); | 4 | void send_IPI_mask_sequence(const cpumask_t *mask, int vector); |
5 | void send_IPI_mask_allbutself(const cpumask_t *mask, int vector); | ||
5 | 6 | ||
6 | static inline void send_IPI_mask(cpumask_t mask, int vector) | 7 | static inline void send_IPI_mask(const cpumask_t *mask, int vector) |
7 | { | 8 | { |
8 | send_IPI_mask_sequence(mask, vector); | 9 | send_IPI_mask_sequence(mask, vector); |
9 | } | 10 | } |
@@ -14,12 +15,12 @@ static inline void send_IPI_allbutself(int vector) | |||
14 | cpu_clear(smp_processor_id(), mask); | 15 | cpu_clear(smp_processor_id(), mask); |
15 | 16 | ||
16 | if (!cpus_empty(mask)) | 17 | if (!cpus_empty(mask)) |
17 | send_IPI_mask(mask, vector); | 18 | send_IPI_mask(&mask, vector); |
18 | } | 19 | } |
19 | 20 | ||
20 | static inline void send_IPI_all(int vector) | 21 | static inline void send_IPI_all(int vector) |
21 | { | 22 | { |
22 | send_IPI_mask(cpu_online_map, vector); | 23 | send_IPI_mask(&cpu_online_map, vector); |
23 | } | 24 | } |
24 | 25 | ||
25 | #endif /* __ASM_SUMMIT_IPI_H */ | 26 | #endif /* __ASM_SUMMIT_IPI_H */ |
diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h index 2ed3f0f44ff7..07c3e4048991 100644 --- a/arch/x86/include/asm/system.h +++ b/arch/x86/include/asm/system.h | |||
@@ -314,6 +314,8 @@ extern void free_init_pages(char *what, unsigned long begin, unsigned long end); | |||
314 | 314 | ||
315 | void default_idle(void); | 315 | void default_idle(void); |
316 | 316 | ||
317 | void stop_this_cpu(void *dummy); | ||
318 | |||
317 | /* | 319 | /* |
318 | * Force strict CPU ordering. | 320 | * Force strict CPU ordering. |
319 | * And yes, this is required on UP too when we're talking | 321 | * And yes, this is required on UP too when we're talking |
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index e44d379faad2..0921b4018c11 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h | |||
@@ -20,6 +20,8 @@ | |||
20 | struct task_struct; | 20 | struct task_struct; |
21 | struct exec_domain; | 21 | struct exec_domain; |
22 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
23 | #include <asm/ftrace.h> | ||
24 | #include <asm/atomic.h> | ||
23 | 25 | ||
24 | struct thread_info { | 26 | struct thread_info { |
25 | struct task_struct *task; /* main task structure */ | 27 | struct task_struct *task; /* main task structure */ |
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 4850e4b02b61..79e31e9dcdda 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
@@ -226,6 +226,8 @@ extern cpumask_t cpu_coregroup_map(int cpu); | |||
226 | #define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id) | 226 | #define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id) |
227 | #define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu)) | 227 | #define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu)) |
228 | #define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) | 228 | #define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) |
229 | #define topology_core_cpumask(cpu) (&per_cpu(cpu_core_map, cpu)) | ||
230 | #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) | ||
229 | 231 | ||
230 | /* indicates that pointers to the topology cpumask_t maps are valid */ | 232 | /* indicates that pointers to the topology cpumask_t maps are valid */ |
231 | #define arch_provides_topology_pointers yes | 233 | #define arch_provides_topology_pointers yes |
@@ -239,7 +241,7 @@ struct pci_bus; | |||
239 | void set_pci_bus_resources_arch_default(struct pci_bus *b); | 241 | void set_pci_bus_resources_arch_default(struct pci_bus *b); |
240 | 242 | ||
241 | #ifdef CONFIG_SMP | 243 | #ifdef CONFIG_SMP |
242 | #define mc_capable() (boot_cpu_data.x86_max_cores > 1) | 244 | #define mc_capable() (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids) |
243 | #define smt_capable() (smp_num_siblings > 1) | 245 | #define smt_capable() (smp_num_siblings > 1) |
244 | #endif | 246 | #endif |
245 | 247 | ||
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 35c54921b2e4..99192bb55a53 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h | |||
@@ -157,6 +157,7 @@ extern int __get_user_bad(void); | |||
157 | int __ret_gu; \ | 157 | int __ret_gu; \ |
158 | unsigned long __val_gu; \ | 158 | unsigned long __val_gu; \ |
159 | __chk_user_ptr(ptr); \ | 159 | __chk_user_ptr(ptr); \ |
160 | might_fault(); \ | ||
160 | switch (sizeof(*(ptr))) { \ | 161 | switch (sizeof(*(ptr))) { \ |
161 | case 1: \ | 162 | case 1: \ |
162 | __get_user_x(1, __ret_gu, __val_gu, ptr); \ | 163 | __get_user_x(1, __ret_gu, __val_gu, ptr); \ |
@@ -241,6 +242,7 @@ extern void __put_user_8(void); | |||
241 | int __ret_pu; \ | 242 | int __ret_pu; \ |
242 | __typeof__(*(ptr)) __pu_val; \ | 243 | __typeof__(*(ptr)) __pu_val; \ |
243 | __chk_user_ptr(ptr); \ | 244 | __chk_user_ptr(ptr); \ |
245 | might_fault(); \ | ||
244 | __pu_val = x; \ | 246 | __pu_val = x; \ |
245 | switch (sizeof(*(ptr))) { \ | 247 | switch (sizeof(*(ptr))) { \ |
246 | case 1: \ | 248 | case 1: \ |
diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h index d095a3aeea1b..5e06259e90e5 100644 --- a/arch/x86/include/asm/uaccess_32.h +++ b/arch/x86/include/asm/uaccess_32.h | |||
@@ -82,8 +82,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) | |||
82 | static __always_inline unsigned long __must_check | 82 | static __always_inline unsigned long __must_check |
83 | __copy_to_user(void __user *to, const void *from, unsigned long n) | 83 | __copy_to_user(void __user *to, const void *from, unsigned long n) |
84 | { | 84 | { |
85 | might_sleep(); | 85 | might_fault(); |
86 | return __copy_to_user_inatomic(to, from, n); | 86 | return __copy_to_user_inatomic(to, from, n); |
87 | } | 87 | } |
88 | 88 | ||
89 | static __always_inline unsigned long | 89 | static __always_inline unsigned long |
@@ -137,7 +137,7 @@ __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) | |||
137 | static __always_inline unsigned long | 137 | static __always_inline unsigned long |
138 | __copy_from_user(void *to, const void __user *from, unsigned long n) | 138 | __copy_from_user(void *to, const void __user *from, unsigned long n) |
139 | { | 139 | { |
140 | might_sleep(); | 140 | might_fault(); |
141 | if (__builtin_constant_p(n)) { | 141 | if (__builtin_constant_p(n)) { |
142 | unsigned long ret; | 142 | unsigned long ret; |
143 | 143 | ||
@@ -159,7 +159,7 @@ __copy_from_user(void *to, const void __user *from, unsigned long n) | |||
159 | static __always_inline unsigned long __copy_from_user_nocache(void *to, | 159 | static __always_inline unsigned long __copy_from_user_nocache(void *to, |
160 | const void __user *from, unsigned long n) | 160 | const void __user *from, unsigned long n) |
161 | { | 161 | { |
162 | might_sleep(); | 162 | might_fault(); |
163 | if (__builtin_constant_p(n)) { | 163 | if (__builtin_constant_p(n)) { |
164 | unsigned long ret; | 164 | unsigned long ret; |
165 | 165 | ||
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index 664f15280f14..84210c479fca 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h | |||
@@ -29,6 +29,8 @@ static __always_inline __must_check | |||
29 | int __copy_from_user(void *dst, const void __user *src, unsigned size) | 29 | int __copy_from_user(void *dst, const void __user *src, unsigned size) |
30 | { | 30 | { |
31 | int ret = 0; | 31 | int ret = 0; |
32 | |||
33 | might_fault(); | ||
32 | if (!__builtin_constant_p(size)) | 34 | if (!__builtin_constant_p(size)) |
33 | return copy_user_generic(dst, (__force void *)src, size); | 35 | return copy_user_generic(dst, (__force void *)src, size); |
34 | switch (size) { | 36 | switch (size) { |
@@ -46,7 +48,7 @@ int __copy_from_user(void *dst, const void __user *src, unsigned size) | |||
46 | return ret; | 48 | return ret; |
47 | case 10: | 49 | case 10: |
48 | __get_user_asm(*(u64 *)dst, (u64 __user *)src, | 50 | __get_user_asm(*(u64 *)dst, (u64 __user *)src, |
49 | ret, "q", "", "=r", 16); | 51 | ret, "q", "", "=r", 10); |
50 | if (unlikely(ret)) | 52 | if (unlikely(ret)) |
51 | return ret; | 53 | return ret; |
52 | __get_user_asm(*(u16 *)(8 + (char *)dst), | 54 | __get_user_asm(*(u16 *)(8 + (char *)dst), |
@@ -71,6 +73,8 @@ static __always_inline __must_check | |||
71 | int __copy_to_user(void __user *dst, const void *src, unsigned size) | 73 | int __copy_to_user(void __user *dst, const void *src, unsigned size) |
72 | { | 74 | { |
73 | int ret = 0; | 75 | int ret = 0; |
76 | |||
77 | might_fault(); | ||
74 | if (!__builtin_constant_p(size)) | 78 | if (!__builtin_constant_p(size)) |
75 | return copy_user_generic((__force void *)dst, src, size); | 79 | return copy_user_generic((__force void *)dst, src, size); |
76 | switch (size) { | 80 | switch (size) { |
@@ -113,6 +117,8 @@ static __always_inline __must_check | |||
113 | int __copy_in_user(void __user *dst, const void __user *src, unsigned size) | 117 | int __copy_in_user(void __user *dst, const void __user *src, unsigned size) |
114 | { | 118 | { |
115 | int ret = 0; | 119 | int ret = 0; |
120 | |||
121 | might_fault(); | ||
116 | if (!__builtin_constant_p(size)) | 122 | if (!__builtin_constant_p(size)) |
117 | return copy_user_generic((__force void *)dst, | 123 | return copy_user_generic((__force void *)dst, |
118 | (__force void *)src, size); | 124 | (__force void *)src, size); |
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h index 834b2c1d89fb..d2e415e6666f 100644 --- a/arch/x86/include/asm/unistd_64.h +++ b/arch/x86/include/asm/unistd_64.h | |||
@@ -639,8 +639,8 @@ __SYSCALL(__NR_fallocate, sys_fallocate) | |||
639 | __SYSCALL(__NR_timerfd_settime, sys_timerfd_settime) | 639 | __SYSCALL(__NR_timerfd_settime, sys_timerfd_settime) |
640 | #define __NR_timerfd_gettime 287 | 640 | #define __NR_timerfd_gettime 287 |
641 | __SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime) | 641 | __SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime) |
642 | #define __NR_paccept 288 | 642 | #define __NR_accept4 288 |
643 | __SYSCALL(__NR_paccept, sys_paccept) | 643 | __SYSCALL(__NR_accept4, sys_accept4) |
644 | #define __NR_signalfd4 289 | 644 | #define __NR_signalfd4 289 |
645 | __SYSCALL(__NR_signalfd4, sys_signalfd4) | 645 | __SYSCALL(__NR_signalfd4, sys_signalfd4) |
646 | #define __NR_eventfd2 290 | 646 | #define __NR_eventfd2 290 |
diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h index b7c0dea119fe..61e08c0a2907 100644 --- a/arch/x86/include/asm/vmi.h +++ b/arch/x86/include/asm/vmi.h | |||
@@ -223,9 +223,15 @@ struct pci_header { | |||
223 | } __attribute__((packed)); | 223 | } __attribute__((packed)); |
224 | 224 | ||
225 | /* Function prototypes for bootstrapping */ | 225 | /* Function prototypes for bootstrapping */ |
226 | #ifdef CONFIG_VMI | ||
226 | extern void vmi_init(void); | 227 | extern void vmi_init(void); |
228 | extern void vmi_activate(void); | ||
227 | extern void vmi_bringup(void); | 229 | extern void vmi_bringup(void); |
228 | extern void vmi_apply_boot_page_allocations(void); | 230 | #else |
231 | static inline void vmi_init(void) {} | ||
232 | static inline void vmi_activate(void) {} | ||
233 | static inline void vmi_bringup(void) {} | ||
234 | #endif | ||
229 | 235 | ||
230 | /* State needed to start an application processor in an SMP system. */ | 236 | /* State needed to start an application processor in an SMP system. */ |
231 | struct vmi_ap_state { | 237 | struct vmi_ap_state { |
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index e489ff9cb3e2..1cad9318d217 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
@@ -25,7 +25,7 @@ CFLAGS_tsc.o := $(nostackp) | |||
25 | 25 | ||
26 | obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o | 26 | obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o |
27 | obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o | 27 | obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o |
28 | obj-y += time_$(BITS).o ioport.o ldt.o | 28 | obj-y += time_$(BITS).o ioport.o ldt.o dumpstack.o |
29 | obj-y += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o | 29 | obj-y += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o |
30 | obj-$(CONFIG_X86_VISWS) += visws_quirks.o | 30 | obj-$(CONFIG_X86_VISWS) += visws_quirks.o |
31 | obj-$(CONFIG_X86_32) += probe_roms_32.o | 31 | obj-$(CONFIG_X86_32) += probe_roms_32.o |
@@ -41,7 +41,7 @@ obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o | |||
41 | obj-y += process.o | 41 | obj-y += process.o |
42 | obj-y += i387.o xsave.o | 42 | obj-y += i387.o xsave.o |
43 | obj-y += ptrace.o | 43 | obj-y += ptrace.o |
44 | obj-y += ds.o | 44 | obj-$(CONFIG_X86_DS) += ds.o |
45 | obj-$(CONFIG_X86_32) += tls.o | 45 | obj-$(CONFIG_X86_32) += tls.o |
46 | obj-$(CONFIG_IA32_EMULATION) += tls.o | 46 | obj-$(CONFIG_IA32_EMULATION) += tls.o |
47 | obj-y += step.o | 47 | obj-y += step.o |
@@ -65,6 +65,7 @@ obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o | |||
65 | obj-$(CONFIG_X86_IO_APIC) += io_apic.o | 65 | obj-$(CONFIG_X86_IO_APIC) += io_apic.o |
66 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o | 66 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o |
67 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o | 67 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o |
68 | obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o | ||
68 | obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o | 69 | obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o |
69 | obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o | 70 | obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o |
70 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o | 71 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 8c1f76abae9e..65d0b72777ea 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -1343,7 +1343,6 @@ static void __init acpi_process_madt(void) | |||
1343 | error = acpi_parse_madt_ioapic_entries(); | 1343 | error = acpi_parse_madt_ioapic_entries(); |
1344 | if (!error) { | 1344 | if (!error) { |
1345 | acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC; | 1345 | acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC; |
1346 | acpi_irq_balance_set(NULL); | ||
1347 | acpi_ioapic = 1; | 1346 | acpi_ioapic = 1; |
1348 | 1347 | ||
1349 | smp_found_config = 1; | 1348 | smp_found_config = 1; |
@@ -1361,6 +1360,17 @@ static void __init acpi_process_madt(void) | |||
1361 | disable_acpi(); | 1360 | disable_acpi(); |
1362 | } | 1361 | } |
1363 | } | 1362 | } |
1363 | |||
1364 | /* | ||
1365 | * ACPI supports both logical (e.g. Hyper-Threading) and physical | ||
1366 | * processors, where MPS only supports physical. | ||
1367 | */ | ||
1368 | if (acpi_lapic && acpi_ioapic) | ||
1369 | printk(KERN_INFO "Using ACPI (MADT) for SMP configuration " | ||
1370 | "information\n"); | ||
1371 | else if (acpi_lapic) | ||
1372 | printk(KERN_INFO "Using ACPI for processor (LAPIC) " | ||
1373 | "configuration information\n"); | ||
1364 | #endif | 1374 | #endif |
1365 | return; | 1375 | return; |
1366 | } | 1376 | } |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 331b318304eb..a7b6dec6fc3f 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -187,6 +187,8 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd) | |||
187 | 187 | ||
188 | spin_lock_irqsave(&iommu->lock, flags); | 188 | spin_lock_irqsave(&iommu->lock, flags); |
189 | ret = __iommu_queue_command(iommu, cmd); | 189 | ret = __iommu_queue_command(iommu, cmd); |
190 | if (!ret) | ||
191 | iommu->need_sync = 1; | ||
190 | spin_unlock_irqrestore(&iommu->lock, flags); | 192 | spin_unlock_irqrestore(&iommu->lock, flags); |
191 | 193 | ||
192 | return ret; | 194 | return ret; |
@@ -210,10 +212,13 @@ static int iommu_completion_wait(struct amd_iommu *iommu) | |||
210 | cmd.data[0] = CMD_COMPL_WAIT_INT_MASK; | 212 | cmd.data[0] = CMD_COMPL_WAIT_INT_MASK; |
211 | CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); | 213 | CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); |
212 | 214 | ||
213 | iommu->need_sync = 0; | ||
214 | |||
215 | spin_lock_irqsave(&iommu->lock, flags); | 215 | spin_lock_irqsave(&iommu->lock, flags); |
216 | 216 | ||
217 | if (!iommu->need_sync) | ||
218 | goto out; | ||
219 | |||
220 | iommu->need_sync = 0; | ||
221 | |||
217 | ret = __iommu_queue_command(iommu, &cmd); | 222 | ret = __iommu_queue_command(iommu, &cmd); |
218 | 223 | ||
219 | if (ret) | 224 | if (ret) |
@@ -254,8 +259,6 @@ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid) | |||
254 | 259 | ||
255 | ret = iommu_queue_command(iommu, &cmd); | 260 | ret = iommu_queue_command(iommu, &cmd); |
256 | 261 | ||
257 | iommu->need_sync = 1; | ||
258 | |||
259 | return ret; | 262 | return ret; |
260 | } | 263 | } |
261 | 264 | ||
@@ -281,8 +284,6 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu, | |||
281 | 284 | ||
282 | ret = iommu_queue_command(iommu, &cmd); | 285 | ret = iommu_queue_command(iommu, &cmd); |
283 | 286 | ||
284 | iommu->need_sync = 1; | ||
285 | |||
286 | return ret; | 287 | return ret; |
287 | } | 288 | } |
288 | 289 | ||
@@ -343,7 +344,7 @@ static int iommu_map(struct protection_domain *dom, | |||
343 | u64 __pte, *pte, *page; | 344 | u64 __pte, *pte, *page; |
344 | 345 | ||
345 | bus_addr = PAGE_ALIGN(bus_addr); | 346 | bus_addr = PAGE_ALIGN(bus_addr); |
346 | phys_addr = PAGE_ALIGN(bus_addr); | 347 | phys_addr = PAGE_ALIGN(phys_addr); |
347 | 348 | ||
348 | /* only support 512GB address spaces for now */ | 349 | /* only support 512GB address spaces for now */ |
349 | if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK)) | 350 | if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK)) |
@@ -537,7 +538,7 @@ static void dma_ops_free_addresses(struct dma_ops_domain *dom, | |||
537 | address >>= PAGE_SHIFT; | 538 | address >>= PAGE_SHIFT; |
538 | iommu_area_free(dom->bitmap, address, pages); | 539 | iommu_area_free(dom->bitmap, address, pages); |
539 | 540 | ||
540 | if (address + pages >= dom->next_bit) | 541 | if (address >= dom->next_bit) |
541 | dom->need_flush = true; | 542 | dom->need_flush = true; |
542 | } | 543 | } |
543 | 544 | ||
@@ -599,7 +600,7 @@ static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom) | |||
599 | continue; | 600 | continue; |
600 | 601 | ||
601 | p2 = IOMMU_PTE_PAGE(p1[i]); | 602 | p2 = IOMMU_PTE_PAGE(p1[i]); |
602 | for (j = 0; j < 512; ++i) { | 603 | for (j = 0; j < 512; ++j) { |
603 | if (!IOMMU_PTE_PRESENT(p2[j])) | 604 | if (!IOMMU_PTE_PRESENT(p2[j])) |
604 | continue; | 605 | continue; |
605 | p3 = IOMMU_PTE_PAGE(p2[j]); | 606 | p3 = IOMMU_PTE_PAGE(p2[j]); |
@@ -762,8 +763,6 @@ static void set_device_domain(struct amd_iommu *iommu, | |||
762 | write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); | 763 | write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); |
763 | 764 | ||
764 | iommu_queue_inv_dev_entry(iommu, devid); | 765 | iommu_queue_inv_dev_entry(iommu, devid); |
765 | |||
766 | iommu->need_sync = 1; | ||
767 | } | 766 | } |
768 | 767 | ||
769 | /***************************************************************************** | 768 | /***************************************************************************** |
@@ -858,6 +857,9 @@ static int get_device_resources(struct device *dev, | |||
858 | print_devid(_bdf, 1); | 857 | print_devid(_bdf, 1); |
859 | } | 858 | } |
860 | 859 | ||
860 | if (domain_for_device(_bdf) == NULL) | ||
861 | set_device_domain(*iommu, *domain, _bdf); | ||
862 | |||
861 | return 1; | 863 | return 1; |
862 | } | 864 | } |
863 | 865 | ||
@@ -908,7 +910,7 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu, | |||
908 | if (address >= dom->aperture_size) | 910 | if (address >= dom->aperture_size) |
909 | return; | 911 | return; |
910 | 912 | ||
911 | WARN_ON(address & 0xfffULL || address > dom->aperture_size); | 913 | WARN_ON(address & ~PAGE_MASK || address >= dom->aperture_size); |
912 | 914 | ||
913 | pte = dom->pte_pages[IOMMU_PTE_L1_INDEX(address)]; | 915 | pte = dom->pte_pages[IOMMU_PTE_L1_INDEX(address)]; |
914 | pte += IOMMU_PTE_L0_INDEX(address); | 916 | pte += IOMMU_PTE_L0_INDEX(address); |
@@ -920,8 +922,8 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu, | |||
920 | 922 | ||
921 | /* | 923 | /* |
922 | * This function contains common code for mapping of a physically | 924 | * This function contains common code for mapping of a physically |
923 | * contiguous memory region into DMA address space. It is uses by all | 925 | * contiguous memory region into DMA address space. It is used by all |
924 | * mapping functions provided by this IOMMU driver. | 926 | * mapping functions provided with this IOMMU driver. |
925 | * Must be called with the domain lock held. | 927 | * Must be called with the domain lock held. |
926 | */ | 928 | */ |
927 | static dma_addr_t __map_single(struct device *dev, | 929 | static dma_addr_t __map_single(struct device *dev, |
@@ -981,7 +983,8 @@ static void __unmap_single(struct amd_iommu *iommu, | |||
981 | dma_addr_t i, start; | 983 | dma_addr_t i, start; |
982 | unsigned int pages; | 984 | unsigned int pages; |
983 | 985 | ||
984 | if ((dma_addr == 0) || (dma_addr + size > dma_dom->aperture_size)) | 986 | if ((dma_addr == bad_dma_address) || |
987 | (dma_addr + size > dma_dom->aperture_size)) | ||
985 | return; | 988 | return; |
986 | 989 | ||
987 | pages = iommu_num_pages(dma_addr, size, PAGE_SIZE); | 990 | pages = iommu_num_pages(dma_addr, size, PAGE_SIZE); |
@@ -1031,8 +1034,7 @@ static dma_addr_t map_single(struct device *dev, phys_addr_t paddr, | |||
1031 | if (addr == bad_dma_address) | 1034 | if (addr == bad_dma_address) |
1032 | goto out; | 1035 | goto out; |
1033 | 1036 | ||
1034 | if (unlikely(iommu->need_sync)) | 1037 | iommu_completion_wait(iommu); |
1035 | iommu_completion_wait(iommu); | ||
1036 | 1038 | ||
1037 | out: | 1039 | out: |
1038 | spin_unlock_irqrestore(&domain->lock, flags); | 1040 | spin_unlock_irqrestore(&domain->lock, flags); |
@@ -1060,8 +1062,7 @@ static void unmap_single(struct device *dev, dma_addr_t dma_addr, | |||
1060 | 1062 | ||
1061 | __unmap_single(iommu, domain->priv, dma_addr, size, dir); | 1063 | __unmap_single(iommu, domain->priv, dma_addr, size, dir); |
1062 | 1064 | ||
1063 | if (unlikely(iommu->need_sync)) | 1065 | iommu_completion_wait(iommu); |
1064 | iommu_completion_wait(iommu); | ||
1065 | 1066 | ||
1066 | spin_unlock_irqrestore(&domain->lock, flags); | 1067 | spin_unlock_irqrestore(&domain->lock, flags); |
1067 | } | 1068 | } |
@@ -1127,8 +1128,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, | |||
1127 | goto unmap; | 1128 | goto unmap; |
1128 | } | 1129 | } |
1129 | 1130 | ||
1130 | if (unlikely(iommu->need_sync)) | 1131 | iommu_completion_wait(iommu); |
1131 | iommu_completion_wait(iommu); | ||
1132 | 1132 | ||
1133 | out: | 1133 | out: |
1134 | spin_unlock_irqrestore(&domain->lock, flags); | 1134 | spin_unlock_irqrestore(&domain->lock, flags); |
@@ -1173,8 +1173,7 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist, | |||
1173 | s->dma_address = s->dma_length = 0; | 1173 | s->dma_address = s->dma_length = 0; |
1174 | } | 1174 | } |
1175 | 1175 | ||
1176 | if (unlikely(iommu->need_sync)) | 1176 | iommu_completion_wait(iommu); |
1177 | iommu_completion_wait(iommu); | ||
1178 | 1177 | ||
1179 | spin_unlock_irqrestore(&domain->lock, flags); | 1178 | spin_unlock_irqrestore(&domain->lock, flags); |
1180 | } | 1179 | } |
@@ -1225,8 +1224,7 @@ static void *alloc_coherent(struct device *dev, size_t size, | |||
1225 | goto out; | 1224 | goto out; |
1226 | } | 1225 | } |
1227 | 1226 | ||
1228 | if (unlikely(iommu->need_sync)) | 1227 | iommu_completion_wait(iommu); |
1229 | iommu_completion_wait(iommu); | ||
1230 | 1228 | ||
1231 | out: | 1229 | out: |
1232 | spin_unlock_irqrestore(&domain->lock, flags); | 1230 | spin_unlock_irqrestore(&domain->lock, flags); |
@@ -1257,8 +1255,7 @@ static void free_coherent(struct device *dev, size_t size, | |||
1257 | 1255 | ||
1258 | __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL); | 1256 | __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL); |
1259 | 1257 | ||
1260 | if (unlikely(iommu->need_sync)) | 1258 | iommu_completion_wait(iommu); |
1261 | iommu_completion_wait(iommu); | ||
1262 | 1259 | ||
1263 | spin_unlock_irqrestore(&domain->lock, flags); | 1260 | spin_unlock_irqrestore(&domain->lock, flags); |
1264 | 1261 | ||
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 0cdcda35a05f..30ae2701b3df 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
@@ -121,7 +121,7 @@ u16 amd_iommu_last_bdf; /* largest PCI device id we have | |||
121 | LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings | 121 | LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings |
122 | we find in ACPI */ | 122 | we find in ACPI */ |
123 | unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */ | 123 | unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */ |
124 | int amd_iommu_isolate; /* if 1, device isolation is enabled */ | 124 | int amd_iommu_isolate = 1; /* if 1, device isolation is enabled */ |
125 | bool amd_iommu_unmap_flush; /* if true, flush on every unmap */ | 125 | bool amd_iommu_unmap_flush; /* if true, flush on every unmap */ |
126 | 126 | ||
127 | LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the | 127 | LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the |
@@ -1213,7 +1213,9 @@ static int __init parse_amd_iommu_options(char *str) | |||
1213 | for (; *str; ++str) { | 1213 | for (; *str; ++str) { |
1214 | if (strncmp(str, "isolate", 7) == 0) | 1214 | if (strncmp(str, "isolate", 7) == 0) |
1215 | amd_iommu_isolate = 1; | 1215 | amd_iommu_isolate = 1; |
1216 | if (strncmp(str, "fullflush", 11) == 0) | 1216 | if (strncmp(str, "share", 5) == 0) |
1217 | amd_iommu_isolate = 0; | ||
1218 | if (strncmp(str, "fullflush", 9) == 0) | ||
1217 | amd_iommu_unmap_flush = true; | 1219 | amd_iommu_unmap_flush = true; |
1218 | } | 1220 | } |
1219 | 1221 | ||
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 04a7f960bbc0..edda4c00e3d2 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
@@ -141,7 +141,7 @@ static int lapic_next_event(unsigned long delta, | |||
141 | struct clock_event_device *evt); | 141 | struct clock_event_device *evt); |
142 | static void lapic_timer_setup(enum clock_event_mode mode, | 142 | static void lapic_timer_setup(enum clock_event_mode mode, |
143 | struct clock_event_device *evt); | 143 | struct clock_event_device *evt); |
144 | static void lapic_timer_broadcast(cpumask_t mask); | 144 | static void lapic_timer_broadcast(const cpumask_t *mask); |
145 | static void apic_pm_activate(void); | 145 | static void apic_pm_activate(void); |
146 | 146 | ||
147 | /* | 147 | /* |
@@ -453,7 +453,7 @@ static void lapic_timer_setup(enum clock_event_mode mode, | |||
453 | /* | 453 | /* |
454 | * Local APIC timer broadcast function | 454 | * Local APIC timer broadcast function |
455 | */ | 455 | */ |
456 | static void lapic_timer_broadcast(cpumask_t mask) | 456 | static void lapic_timer_broadcast(const cpumask_t *mask) |
457 | { | 457 | { |
458 | #ifdef CONFIG_SMP | 458 | #ifdef CONFIG_SMP |
459 | send_IPI_mask(mask, LOCAL_TIMER_VECTOR); | 459 | send_IPI_mask(mask, LOCAL_TIMER_VECTOR); |
@@ -469,7 +469,7 @@ static void __cpuinit setup_APIC_timer(void) | |||
469 | struct clock_event_device *levt = &__get_cpu_var(lapic_events); | 469 | struct clock_event_device *levt = &__get_cpu_var(lapic_events); |
470 | 470 | ||
471 | memcpy(levt, &lapic_clockevent, sizeof(*levt)); | 471 | memcpy(levt, &lapic_clockevent, sizeof(*levt)); |
472 | levt->cpumask = cpumask_of_cpu(smp_processor_id()); | 472 | levt->cpumask = cpumask_of(smp_processor_id()); |
473 | 473 | ||
474 | clockevents_register_device(levt); | 474 | clockevents_register_device(levt); |
475 | } | 475 | } |
@@ -1315,7 +1315,7 @@ void enable_x2apic(void) | |||
1315 | } | 1315 | } |
1316 | } | 1316 | } |
1317 | 1317 | ||
1318 | void enable_IR_x2apic(void) | 1318 | void __init enable_IR_x2apic(void) |
1319 | { | 1319 | { |
1320 | #ifdef CONFIG_INTR_REMAP | 1320 | #ifdef CONFIG_INTR_REMAP |
1321 | int ret; | 1321 | int ret; |
@@ -1903,8 +1903,8 @@ void __cpuinit generic_processor_info(int apicid, int version) | |||
1903 | } | 1903 | } |
1904 | #endif | 1904 | #endif |
1905 | 1905 | ||
1906 | cpu_set(cpu, cpu_possible_map); | 1906 | set_cpu_possible(cpu, true); |
1907 | cpu_set(cpu, cpu_present_map); | 1907 | set_cpu_present(cpu, true); |
1908 | } | 1908 | } |
1909 | 1909 | ||
1910 | #ifdef CONFIG_X86_64 | 1910 | #ifdef CONFIG_X86_64 |
@@ -2106,7 +2106,7 @@ __cpuinit int apic_is_clustered_box(void) | |||
2106 | bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid); | 2106 | bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid); |
2107 | bitmap_zero(clustermap, NUM_APIC_CLUSTERS); | 2107 | bitmap_zero(clustermap, NUM_APIC_CLUSTERS); |
2108 | 2108 | ||
2109 | for (i = 0; i < NR_CPUS; i++) { | 2109 | for (i = 0; i < nr_cpu_ids; i++) { |
2110 | /* are we being called early in kernel startup? */ | 2110 | /* are we being called early in kernel startup? */ |
2111 | if (bios_cpu_apicid) { | 2111 | if (bios_cpu_apicid) { |
2112 | id = bios_cpu_apicid[i]; | 2112 | id = bios_cpu_apicid[i]; |
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 5145a6e72bbb..3a26525a3f31 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -391,11 +391,7 @@ static int power_off; | |||
391 | #else | 391 | #else |
392 | static int power_off = 1; | 392 | static int power_off = 1; |
393 | #endif | 393 | #endif |
394 | #ifdef CONFIG_APM_REAL_MODE_POWER_OFF | ||
395 | static int realmode_power_off = 1; | ||
396 | #else | ||
397 | static int realmode_power_off; | 394 | static int realmode_power_off; |
398 | #endif | ||
399 | #ifdef CONFIG_APM_ALLOW_INTS | 395 | #ifdef CONFIG_APM_ALLOW_INTS |
400 | static int allow_ints = 1; | 396 | static int allow_ints = 1; |
401 | #else | 397 | #else |
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index 8e48c5d4467d..88ea02dcb622 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/cpufreq.h> | 33 | #include <linux/cpufreq.h> |
34 | #include <linux/compiler.h> | 34 | #include <linux/compiler.h> |
35 | #include <linux/dmi.h> | 35 | #include <linux/dmi.h> |
36 | #include <linux/ftrace.h> | ||
36 | 37 | ||
37 | #include <linux/acpi.h> | 38 | #include <linux/acpi.h> |
38 | #include <acpi/processor.h> | 39 | #include <acpi/processor.h> |
@@ -391,6 +392,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, | |||
391 | unsigned int next_perf_state = 0; /* Index into perf table */ | 392 | unsigned int next_perf_state = 0; /* Index into perf table */ |
392 | unsigned int i; | 393 | unsigned int i; |
393 | int result = 0; | 394 | int result = 0; |
395 | struct power_trace it; | ||
394 | 396 | ||
395 | dprintk("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu); | 397 | dprintk("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu); |
396 | 398 | ||
@@ -427,6 +429,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, | |||
427 | } | 429 | } |
428 | } | 430 | } |
429 | 431 | ||
432 | trace_power_mark(&it, POWER_PSTATE, next_perf_state); | ||
433 | |||
430 | switch (data->cpu_feature) { | 434 | switch (data->cpu_feature) { |
431 | case SYSTEM_INTEL_MSR_CAPABLE: | 435 | case SYSTEM_INTEL_MSR_CAPABLE: |
432 | cmd.type = SYSTEM_INTEL_MSR_CAPABLE; | 436 | cmd.type = SYSTEM_INTEL_MSR_CAPABLE; |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index d3dcd58b87cd..7f05f44b97e9 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | |||
@@ -115,9 +115,20 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data) | |||
115 | u32 i = 0; | 115 | u32 i = 0; |
116 | 116 | ||
117 | if (cpu_family == CPU_HW_PSTATE) { | 117 | if (cpu_family == CPU_HW_PSTATE) { |
118 | rdmsr(MSR_PSTATE_STATUS, lo, hi); | 118 | if (data->currpstate == HW_PSTATE_INVALID) { |
119 | i = lo & HW_PSTATE_MASK; | 119 | /* read (initial) hw pstate if not yet set */ |
120 | data->currpstate = i; | 120 | rdmsr(MSR_PSTATE_STATUS, lo, hi); |
121 | i = lo & HW_PSTATE_MASK; | ||
122 | |||
123 | /* | ||
124 | * a workaround for family 11h erratum 311 might cause | ||
125 | * an "out-of-range Pstate if the core is in Pstate-0 | ||
126 | */ | ||
127 | if (i >= data->numps) | ||
128 | data->currpstate = HW_PSTATE_0; | ||
129 | else | ||
130 | data->currpstate = i; | ||
131 | } | ||
121 | return 0; | 132 | return 0; |
122 | } | 133 | } |
123 | do { | 134 | do { |
@@ -1121,6 +1132,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
1121 | } | 1132 | } |
1122 | 1133 | ||
1123 | data->cpu = pol->cpu; | 1134 | data->cpu = pol->cpu; |
1135 | data->currpstate = HW_PSTATE_INVALID; | ||
1124 | 1136 | ||
1125 | if (powernow_k8_cpu_init_acpi(data)) { | 1137 | if (powernow_k8_cpu_init_acpi(data)) { |
1126 | /* | 1138 | /* |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h index ab48cfed4d96..65cfb5d7f77f 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h | |||
@@ -5,6 +5,19 @@ | |||
5 | * http://www.gnu.org/licenses/gpl.html | 5 | * http://www.gnu.org/licenses/gpl.html |
6 | */ | 6 | */ |
7 | 7 | ||
8 | |||
9 | enum pstate { | ||
10 | HW_PSTATE_INVALID = 0xff, | ||
11 | HW_PSTATE_0 = 0, | ||
12 | HW_PSTATE_1 = 1, | ||
13 | HW_PSTATE_2 = 2, | ||
14 | HW_PSTATE_3 = 3, | ||
15 | HW_PSTATE_4 = 4, | ||
16 | HW_PSTATE_5 = 5, | ||
17 | HW_PSTATE_6 = 6, | ||
18 | HW_PSTATE_7 = 7, | ||
19 | }; | ||
20 | |||
8 | struct powernow_k8_data { | 21 | struct powernow_k8_data { |
9 | unsigned int cpu; | 22 | unsigned int cpu; |
10 | 23 | ||
@@ -23,7 +36,9 @@ struct powernow_k8_data { | |||
23 | u32 exttype; /* extended interface = 1 */ | 36 | u32 exttype; /* extended interface = 1 */ |
24 | 37 | ||
25 | /* keep track of the current fid / vid or pstate */ | 38 | /* keep track of the current fid / vid or pstate */ |
26 | u32 currvid, currfid, currpstate; | 39 | u32 currvid; |
40 | u32 currfid; | ||
41 | enum pstate currpstate; | ||
27 | 42 | ||
28 | /* the powernow_table includes all frequency and vid/fid pairings: | 43 | /* the powernow_table includes all frequency and vid/fid pairings: |
29 | * fid are the lower 8 bits of the index, vid are the upper 8 bits. | 44 | * fid are the lower 8 bits of the index, vid are the upper 8 bits. |
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index cce0b6118d55..816f27f289b1 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
@@ -307,12 +307,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) | |||
307 | set_cpu_cap(c, X86_FEATURE_P4); | 307 | set_cpu_cap(c, X86_FEATURE_P4); |
308 | if (c->x86 == 6) | 308 | if (c->x86 == 6) |
309 | set_cpu_cap(c, X86_FEATURE_P3); | 309 | set_cpu_cap(c, X86_FEATURE_P3); |
310 | #endif | ||
310 | 311 | ||
311 | if (cpu_has_bts) | 312 | if (cpu_has_bts) |
312 | ptrace_bts_init_intel(c); | 313 | ptrace_bts_init_intel(c); |
313 | 314 | ||
314 | #endif | ||
315 | |||
316 | detect_extended_topology(c); | 315 | detect_extended_topology(c); |
317 | if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) { | 316 | if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) { |
318 | /* | 317 | /* |
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 3f46afbb1cf1..fb7f946cb65e 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
@@ -534,31 +534,16 @@ static void __cpuinit free_cache_attributes(unsigned int cpu) | |||
534 | per_cpu(cpuid4_info, cpu) = NULL; | 534 | per_cpu(cpuid4_info, cpu) = NULL; |
535 | } | 535 | } |
536 | 536 | ||
537 | static int __cpuinit detect_cache_attributes(unsigned int cpu) | 537 | static void get_cpu_leaves(void *_retval) |
538 | { | 538 | { |
539 | struct _cpuid4_info *this_leaf; | 539 | int j, *retval = _retval, cpu = smp_processor_id(); |
540 | unsigned long j; | ||
541 | int retval; | ||
542 | cpumask_t oldmask; | ||
543 | |||
544 | if (num_cache_leaves == 0) | ||
545 | return -ENOENT; | ||
546 | |||
547 | per_cpu(cpuid4_info, cpu) = kzalloc( | ||
548 | sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL); | ||
549 | if (per_cpu(cpuid4_info, cpu) == NULL) | ||
550 | return -ENOMEM; | ||
551 | |||
552 | oldmask = current->cpus_allowed; | ||
553 | retval = set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu)); | ||
554 | if (retval) | ||
555 | goto out; | ||
556 | 540 | ||
557 | /* Do cpuid and store the results */ | 541 | /* Do cpuid and store the results */ |
558 | for (j = 0; j < num_cache_leaves; j++) { | 542 | for (j = 0; j < num_cache_leaves; j++) { |
543 | struct _cpuid4_info *this_leaf; | ||
559 | this_leaf = CPUID4_INFO_IDX(cpu, j); | 544 | this_leaf = CPUID4_INFO_IDX(cpu, j); |
560 | retval = cpuid4_cache_lookup(j, this_leaf); | 545 | *retval = cpuid4_cache_lookup(j, this_leaf); |
561 | if (unlikely(retval < 0)) { | 546 | if (unlikely(*retval < 0)) { |
562 | int i; | 547 | int i; |
563 | 548 | ||
564 | for (i = 0; i < j; i++) | 549 | for (i = 0; i < j; i++) |
@@ -567,9 +552,21 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu) | |||
567 | } | 552 | } |
568 | cache_shared_cpu_map_setup(cpu, j); | 553 | cache_shared_cpu_map_setup(cpu, j); |
569 | } | 554 | } |
570 | set_cpus_allowed_ptr(current, &oldmask); | 555 | } |
556 | |||
557 | static int __cpuinit detect_cache_attributes(unsigned int cpu) | ||
558 | { | ||
559 | int retval; | ||
560 | |||
561 | if (num_cache_leaves == 0) | ||
562 | return -ENOENT; | ||
563 | |||
564 | per_cpu(cpuid4_info, cpu) = kzalloc( | ||
565 | sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL); | ||
566 | if (per_cpu(cpuid4_info, cpu) == NULL) | ||
567 | return -ENOMEM; | ||
571 | 568 | ||
572 | out: | 569 | smp_call_function_single(cpu, get_cpu_leaves, &retval, true); |
573 | if (retval) { | 570 | if (retval) { |
574 | kfree(per_cpu(cpuid4_info, cpu)); | 571 | kfree(per_cpu(cpuid4_info, cpu)); |
575 | per_cpu(cpuid4_info, cpu) = NULL; | 572 | per_cpu(cpuid4_info, cpu) = NULL; |
@@ -626,8 +623,8 @@ static ssize_t show_shared_cpu_map_func(struct _cpuid4_info *this_leaf, | |||
626 | cpumask_t *mask = &this_leaf->shared_cpu_map; | 623 | cpumask_t *mask = &this_leaf->shared_cpu_map; |
627 | 624 | ||
628 | n = type? | 625 | n = type? |
629 | cpulist_scnprintf(buf, len-2, *mask): | 626 | cpulist_scnprintf(buf, len-2, mask) : |
630 | cpumask_scnprintf(buf, len-2, *mask); | 627 | cpumask_scnprintf(buf, len-2, mask); |
631 | buf[n++] = '\n'; | 628 | buf[n++] = '\n'; |
632 | buf[n] = '\0'; | 629 | buf[n] = '\0'; |
633 | } | 630 | } |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c index 5eb390a4b2e9..a1de80f368f1 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c | |||
@@ -83,34 +83,41 @@ static DEFINE_PER_CPU(unsigned char, bank_map); /* see which banks are on */ | |||
83 | * CPU Initialization | 83 | * CPU Initialization |
84 | */ | 84 | */ |
85 | 85 | ||
86 | struct thresh_restart { | ||
87 | struct threshold_block *b; | ||
88 | int reset; | ||
89 | u16 old_limit; | ||
90 | }; | ||
91 | |||
86 | /* must be called with correct cpu affinity */ | 92 | /* must be called with correct cpu affinity */ |
87 | static void threshold_restart_bank(struct threshold_block *b, | 93 | static long threshold_restart_bank(void *_tr) |
88 | int reset, u16 old_limit) | ||
89 | { | 94 | { |
95 | struct thresh_restart *tr = _tr; | ||
90 | u32 mci_misc_hi, mci_misc_lo; | 96 | u32 mci_misc_hi, mci_misc_lo; |
91 | 97 | ||
92 | rdmsr(b->address, mci_misc_lo, mci_misc_hi); | 98 | rdmsr(tr->b->address, mci_misc_lo, mci_misc_hi); |
93 | 99 | ||
94 | if (b->threshold_limit < (mci_misc_hi & THRESHOLD_MAX)) | 100 | if (tr->b->threshold_limit < (mci_misc_hi & THRESHOLD_MAX)) |
95 | reset = 1; /* limit cannot be lower than err count */ | 101 | tr->reset = 1; /* limit cannot be lower than err count */ |
96 | 102 | ||
97 | if (reset) { /* reset err count and overflow bit */ | 103 | if (tr->reset) { /* reset err count and overflow bit */ |
98 | mci_misc_hi = | 104 | mci_misc_hi = |
99 | (mci_misc_hi & ~(MASK_ERR_COUNT_HI | MASK_OVERFLOW_HI)) | | 105 | (mci_misc_hi & ~(MASK_ERR_COUNT_HI | MASK_OVERFLOW_HI)) | |
100 | (THRESHOLD_MAX - b->threshold_limit); | 106 | (THRESHOLD_MAX - tr->b->threshold_limit); |
101 | } else if (old_limit) { /* change limit w/o reset */ | 107 | } else if (tr->old_limit) { /* change limit w/o reset */ |
102 | int new_count = (mci_misc_hi & THRESHOLD_MAX) + | 108 | int new_count = (mci_misc_hi & THRESHOLD_MAX) + |
103 | (old_limit - b->threshold_limit); | 109 | (tr->old_limit - tr->b->threshold_limit); |
104 | mci_misc_hi = (mci_misc_hi & ~MASK_ERR_COUNT_HI) | | 110 | mci_misc_hi = (mci_misc_hi & ~MASK_ERR_COUNT_HI) | |
105 | (new_count & THRESHOLD_MAX); | 111 | (new_count & THRESHOLD_MAX); |
106 | } | 112 | } |
107 | 113 | ||
108 | b->interrupt_enable ? | 114 | tr->b->interrupt_enable ? |
109 | (mci_misc_hi = (mci_misc_hi & ~MASK_INT_TYPE_HI) | INT_TYPE_APIC) : | 115 | (mci_misc_hi = (mci_misc_hi & ~MASK_INT_TYPE_HI) | INT_TYPE_APIC) : |
110 | (mci_misc_hi &= ~MASK_INT_TYPE_HI); | 116 | (mci_misc_hi &= ~MASK_INT_TYPE_HI); |
111 | 117 | ||
112 | mci_misc_hi |= MASK_COUNT_EN_HI; | 118 | mci_misc_hi |= MASK_COUNT_EN_HI; |
113 | wrmsr(b->address, mci_misc_lo, mci_misc_hi); | 119 | wrmsr(tr->b->address, mci_misc_lo, mci_misc_hi); |
120 | return 0; | ||
114 | } | 121 | } |
115 | 122 | ||
116 | /* cpu init entry point, called from mce.c with preempt off */ | 123 | /* cpu init entry point, called from mce.c with preempt off */ |
@@ -120,6 +127,7 @@ void __cpuinit mce_amd_feature_init(struct cpuinfo_x86 *c) | |||
120 | unsigned int cpu = smp_processor_id(); | 127 | unsigned int cpu = smp_processor_id(); |
121 | u8 lvt_off; | 128 | u8 lvt_off; |
122 | u32 low = 0, high = 0, address = 0; | 129 | u32 low = 0, high = 0, address = 0; |
130 | struct thresh_restart tr; | ||
123 | 131 | ||
124 | for (bank = 0; bank < NR_BANKS; ++bank) { | 132 | for (bank = 0; bank < NR_BANKS; ++bank) { |
125 | for (block = 0; block < NR_BLOCKS; ++block) { | 133 | for (block = 0; block < NR_BLOCKS; ++block) { |
@@ -162,7 +170,10 @@ void __cpuinit mce_amd_feature_init(struct cpuinfo_x86 *c) | |||
162 | wrmsr(address, low, high); | 170 | wrmsr(address, low, high); |
163 | 171 | ||
164 | threshold_defaults.address = address; | 172 | threshold_defaults.address = address; |
165 | threshold_restart_bank(&threshold_defaults, 0, 0); | 173 | tr.b = &threshold_defaults; |
174 | tr.reset = 0; | ||
175 | tr.old_limit = 0; | ||
176 | threshold_restart_bank(&tr); | ||
166 | } | 177 | } |
167 | } | 178 | } |
168 | } | 179 | } |
@@ -251,20 +262,6 @@ struct threshold_attr { | |||
251 | ssize_t(*store) (struct threshold_block *, const char *, size_t count); | 262 | ssize_t(*store) (struct threshold_block *, const char *, size_t count); |
252 | }; | 263 | }; |
253 | 264 | ||
254 | static void affinity_set(unsigned int cpu, cpumask_t *oldmask, | ||
255 | cpumask_t *newmask) | ||
256 | { | ||
257 | *oldmask = current->cpus_allowed; | ||
258 | cpus_clear(*newmask); | ||
259 | cpu_set(cpu, *newmask); | ||
260 | set_cpus_allowed_ptr(current, newmask); | ||
261 | } | ||
262 | |||
263 | static void affinity_restore(const cpumask_t *oldmask) | ||
264 | { | ||
265 | set_cpus_allowed_ptr(current, oldmask); | ||
266 | } | ||
267 | |||
268 | #define SHOW_FIELDS(name) \ | 265 | #define SHOW_FIELDS(name) \ |
269 | static ssize_t show_ ## name(struct threshold_block * b, char *buf) \ | 266 | static ssize_t show_ ## name(struct threshold_block * b, char *buf) \ |
270 | { \ | 267 | { \ |
@@ -277,15 +274,16 @@ static ssize_t store_interrupt_enable(struct threshold_block *b, | |||
277 | const char *buf, size_t count) | 274 | const char *buf, size_t count) |
278 | { | 275 | { |
279 | char *end; | 276 | char *end; |
280 | cpumask_t oldmask, newmask; | 277 | struct thresh_restart tr; |
281 | unsigned long new = simple_strtoul(buf, &end, 0); | 278 | unsigned long new = simple_strtoul(buf, &end, 0); |
282 | if (end == buf) | 279 | if (end == buf) |
283 | return -EINVAL; | 280 | return -EINVAL; |
284 | b->interrupt_enable = !!new; | 281 | b->interrupt_enable = !!new; |
285 | 282 | ||
286 | affinity_set(b->cpu, &oldmask, &newmask); | 283 | tr.b = b; |
287 | threshold_restart_bank(b, 0, 0); | 284 | tr.reset = 0; |
288 | affinity_restore(&oldmask); | 285 | tr.old_limit = 0; |
286 | work_on_cpu(b->cpu, threshold_restart_bank, &tr); | ||
289 | 287 | ||
290 | return end - buf; | 288 | return end - buf; |
291 | } | 289 | } |
@@ -294,8 +292,7 @@ static ssize_t store_threshold_limit(struct threshold_block *b, | |||
294 | const char *buf, size_t count) | 292 | const char *buf, size_t count) |
295 | { | 293 | { |
296 | char *end; | 294 | char *end; |
297 | cpumask_t oldmask, newmask; | 295 | struct thresh_restart tr; |
298 | u16 old; | ||
299 | unsigned long new = simple_strtoul(buf, &end, 0); | 296 | unsigned long new = simple_strtoul(buf, &end, 0); |
300 | if (end == buf) | 297 | if (end == buf) |
301 | return -EINVAL; | 298 | return -EINVAL; |
@@ -303,34 +300,36 @@ static ssize_t store_threshold_limit(struct threshold_block *b, | |||
303 | new = THRESHOLD_MAX; | 300 | new = THRESHOLD_MAX; |
304 | if (new < 1) | 301 | if (new < 1) |
305 | new = 1; | 302 | new = 1; |
306 | old = b->threshold_limit; | 303 | tr.old_limit = b->threshold_limit; |
307 | b->threshold_limit = new; | 304 | b->threshold_limit = new; |
305 | tr.b = b; | ||
306 | tr.reset = 0; | ||
308 | 307 | ||
309 | affinity_set(b->cpu, &oldmask, &newmask); | 308 | work_on_cpu(b->cpu, threshold_restart_bank, &tr); |
310 | threshold_restart_bank(b, 0, old); | ||
311 | affinity_restore(&oldmask); | ||
312 | 309 | ||
313 | return end - buf; | 310 | return end - buf; |
314 | } | 311 | } |
315 | 312 | ||
316 | static ssize_t show_error_count(struct threshold_block *b, char *buf) | 313 | static long local_error_count(void *_b) |
317 | { | 314 | { |
318 | u32 high, low; | 315 | struct threshold_block *b = _b; |
319 | cpumask_t oldmask, newmask; | 316 | u32 low, high; |
320 | affinity_set(b->cpu, &oldmask, &newmask); | 317 | |
321 | rdmsr(b->address, low, high); | 318 | rdmsr(b->address, low, high); |
322 | affinity_restore(&oldmask); | 319 | return (high & 0xFFF) - (THRESHOLD_MAX - b->threshold_limit); |
323 | return sprintf(buf, "%x\n", | 320 | } |
324 | (high & 0xFFF) - (THRESHOLD_MAX - b->threshold_limit)); | 321 | |
322 | static ssize_t show_error_count(struct threshold_block *b, char *buf) | ||
323 | { | ||
324 | return sprintf(buf, "%lx\n", work_on_cpu(b->cpu, local_error_count, b)); | ||
325 | } | 325 | } |
326 | 326 | ||
327 | static ssize_t store_error_count(struct threshold_block *b, | 327 | static ssize_t store_error_count(struct threshold_block *b, |
328 | const char *buf, size_t count) | 328 | const char *buf, size_t count) |
329 | { | 329 | { |
330 | cpumask_t oldmask, newmask; | 330 | struct thresh_restart tr = { .b = b, .reset = 1, .old_limit = 0 }; |
331 | affinity_set(b->cpu, &oldmask, &newmask); | 331 | |
332 | threshold_restart_bank(b, 1, 0); | 332 | work_on_cpu(b->cpu, threshold_restart_bank, &tr); |
333 | affinity_restore(&oldmask); | ||
334 | return 1; | 333 | return 1; |
335 | } | 334 | } |
336 | 335 | ||
@@ -463,12 +462,19 @@ out_free: | |||
463 | return err; | 462 | return err; |
464 | } | 463 | } |
465 | 464 | ||
465 | static long local_allocate_threshold_blocks(void *_bank) | ||
466 | { | ||
467 | unsigned int *bank = _bank; | ||
468 | |||
469 | return allocate_threshold_blocks(smp_processor_id(), *bank, 0, | ||
470 | MSR_IA32_MC0_MISC + *bank * 4); | ||
471 | } | ||
472 | |||
466 | /* symlinks sibling shared banks to first core. first core owns dir/files. */ | 473 | /* symlinks sibling shared banks to first core. first core owns dir/files. */ |
467 | static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) | 474 | static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) |
468 | { | 475 | { |
469 | int i, err = 0; | 476 | int i, err = 0; |
470 | struct threshold_bank *b = NULL; | 477 | struct threshold_bank *b = NULL; |
471 | cpumask_t oldmask, newmask; | ||
472 | char name[32]; | 478 | char name[32]; |
473 | 479 | ||
474 | sprintf(name, "threshold_bank%i", bank); | 480 | sprintf(name, "threshold_bank%i", bank); |
@@ -519,11 +525,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) | |||
519 | 525 | ||
520 | per_cpu(threshold_banks, cpu)[bank] = b; | 526 | per_cpu(threshold_banks, cpu)[bank] = b; |
521 | 527 | ||
522 | affinity_set(cpu, &oldmask, &newmask); | 528 | err = work_on_cpu(cpu, local_allocate_threshold_blocks, &bank); |
523 | err = allocate_threshold_blocks(cpu, bank, 0, | ||
524 | MSR_IA32_MC0_MISC + bank * 4); | ||
525 | affinity_restore(&oldmask); | ||
526 | |||
527 | if (err) | 529 | if (err) |
528 | goto out_free; | 530 | goto out_free; |
529 | 531 | ||
diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c index 2b69994fd3a8..19a8c2c0389f 100644 --- a/arch/x86/kernel/ds.c +++ b/arch/x86/kernel/ds.c | |||
@@ -7,13 +7,12 @@ | |||
7 | * | 7 | * |
8 | * It manages: | 8 | * It manages: |
9 | * - per-thread and per-cpu allocation of BTS and PEBS | 9 | * - per-thread and per-cpu allocation of BTS and PEBS |
10 | * - buffer memory allocation (optional) | 10 | * - buffer overflow handling (to be done) |
11 | * - buffer overflow handling | ||
12 | * - buffer access | 11 | * - buffer access |
13 | * | 12 | * |
14 | * It assumes: | 13 | * It assumes: |
15 | * - get_task_struct on all parameter tasks | 14 | * - get_task_struct on all traced tasks |
16 | * - current is allowed to trace parameter tasks | 15 | * - current is allowed to trace tasks |
17 | * | 16 | * |
18 | * | 17 | * |
19 | * Copyright (C) 2007-2008 Intel Corporation. | 18 | * Copyright (C) 2007-2008 Intel Corporation. |
@@ -21,8 +20,6 @@ | |||
21 | */ | 20 | */ |
22 | 21 | ||
23 | 22 | ||
24 | #ifdef CONFIG_X86_DS | ||
25 | |||
26 | #include <asm/ds.h> | 23 | #include <asm/ds.h> |
27 | 24 | ||
28 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
@@ -30,6 +27,7 @@ | |||
30 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
31 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
32 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
30 | #include <linux/kernel.h> | ||
33 | 31 | ||
34 | 32 | ||
35 | /* | 33 | /* |
@@ -46,6 +44,33 @@ struct ds_configuration { | |||
46 | }; | 44 | }; |
47 | static struct ds_configuration ds_cfg; | 45 | static struct ds_configuration ds_cfg; |
48 | 46 | ||
47 | /* | ||
48 | * A BTS or PEBS tracer. | ||
49 | * | ||
50 | * This holds the configuration of the tracer and serves as a handle | ||
51 | * to identify tracers. | ||
52 | */ | ||
53 | struct ds_tracer { | ||
54 | /* the DS context (partially) owned by this tracer */ | ||
55 | struct ds_context *context; | ||
56 | /* the buffer provided on ds_request() and its size in bytes */ | ||
57 | void *buffer; | ||
58 | size_t size; | ||
59 | }; | ||
60 | |||
61 | struct bts_tracer { | ||
62 | /* the common DS part */ | ||
63 | struct ds_tracer ds; | ||
64 | /* buffer overflow notification function */ | ||
65 | bts_ovfl_callback_t ovfl; | ||
66 | }; | ||
67 | |||
68 | struct pebs_tracer { | ||
69 | /* the common DS part */ | ||
70 | struct ds_tracer ds; | ||
71 | /* buffer overflow notification function */ | ||
72 | pebs_ovfl_callback_t ovfl; | ||
73 | }; | ||
49 | 74 | ||
50 | /* | 75 | /* |
51 | * Debug Store (DS) save area configuration (see Intel64 and IA32 | 76 | * Debug Store (DS) save area configuration (see Intel64 and IA32 |
@@ -109,34 +134,13 @@ static inline void ds_set(unsigned char *base, enum ds_qualifier qual, | |||
109 | (*(unsigned long *)base) = value; | 134 | (*(unsigned long *)base) = value; |
110 | } | 135 | } |
111 | 136 | ||
137 | #define DS_ALIGNMENT (1 << 3) /* BTS and PEBS buffer alignment */ | ||
112 | 138 | ||
113 | /* | ||
114 | * Locking is done only for allocating BTS or PEBS resources and for | ||
115 | * guarding context and buffer memory allocation. | ||
116 | * | ||
117 | * Most functions require the current task to own the ds context part | ||
118 | * they are going to access. All the locking is done when validating | ||
119 | * access to the context. | ||
120 | */ | ||
121 | static spinlock_t ds_lock = __SPIN_LOCK_UNLOCKED(ds_lock); | ||
122 | 139 | ||
123 | /* | 140 | /* |
124 | * Validate that the current task is allowed to access the BTS/PEBS | 141 | * Locking is done only for allocating BTS or PEBS resources. |
125 | * buffer of the parameter task. | ||
126 | * | ||
127 | * Returns 0, if access is granted; -Eerrno, otherwise. | ||
128 | */ | 142 | */ |
129 | static inline int ds_validate_access(struct ds_context *context, | 143 | static spinlock_t ds_lock = __SPIN_LOCK_UNLOCKED(ds_lock); |
130 | enum ds_qualifier qual) | ||
131 | { | ||
132 | if (!context) | ||
133 | return -EPERM; | ||
134 | |||
135 | if (context->owner[qual] == current) | ||
136 | return 0; | ||
137 | |||
138 | return -EPERM; | ||
139 | } | ||
140 | 144 | ||
141 | 145 | ||
142 | /* | 146 | /* |
@@ -185,80 +189,43 @@ static inline int check_tracer(struct task_struct *task) | |||
185 | * | 189 | * |
186 | * Contexts are use-counted. They are allocated on first access and | 190 | * Contexts are use-counted. They are allocated on first access and |
187 | * deallocated when the last user puts the context. | 191 | * deallocated when the last user puts the context. |
188 | * | ||
189 | * We distinguish between an allocating and a non-allocating get of a | ||
190 | * context: | ||
191 | * - the allocating get is used for requesting BTS/PEBS resources. It | ||
192 | * requires the caller to hold the global ds_lock. | ||
193 | * - the non-allocating get is used for all other cases. A | ||
194 | * non-existing context indicates an error. It acquires and releases | ||
195 | * the ds_lock itself for obtaining the context. | ||
196 | * | ||
197 | * A context and its DS configuration are allocated and deallocated | ||
198 | * together. A context always has a DS configuration of the | ||
199 | * appropriate size. | ||
200 | */ | 192 | */ |
201 | static DEFINE_PER_CPU(struct ds_context *, system_context); | 193 | static DEFINE_PER_CPU(struct ds_context *, system_context); |
202 | 194 | ||
203 | #define this_system_context per_cpu(system_context, smp_processor_id()) | 195 | #define this_system_context per_cpu(system_context, smp_processor_id()) |
204 | 196 | ||
205 | /* | ||
206 | * Returns the pointer to the parameter task's context or to the | ||
207 | * system-wide context, if task is NULL. | ||
208 | * | ||
209 | * Increases the use count of the returned context, if not NULL. | ||
210 | */ | ||
211 | static inline struct ds_context *ds_get_context(struct task_struct *task) | 197 | static inline struct ds_context *ds_get_context(struct task_struct *task) |
212 | { | 198 | { |
213 | struct ds_context *context; | ||
214 | |||
215 | spin_lock(&ds_lock); | ||
216 | |||
217 | context = (task ? task->thread.ds_ctx : this_system_context); | ||
218 | if (context) | ||
219 | context->count++; | ||
220 | |||
221 | spin_unlock(&ds_lock); | ||
222 | |||
223 | return context; | ||
224 | } | ||
225 | |||
226 | /* | ||
227 | * Same as ds_get_context, but allocates the context and it's DS | ||
228 | * structure, if necessary; returns NULL; if out of memory. | ||
229 | * | ||
230 | * pre: requires ds_lock to be held | ||
231 | */ | ||
232 | static inline struct ds_context *ds_alloc_context(struct task_struct *task) | ||
233 | { | ||
234 | struct ds_context **p_context = | 199 | struct ds_context **p_context = |
235 | (task ? &task->thread.ds_ctx : &this_system_context); | 200 | (task ? &task->thread.ds_ctx : &this_system_context); |
236 | struct ds_context *context = *p_context; | 201 | struct ds_context *context = *p_context; |
202 | unsigned long irq; | ||
237 | 203 | ||
238 | if (!context) { | 204 | if (!context) { |
239 | context = kzalloc(sizeof(*context), GFP_KERNEL); | 205 | context = kzalloc(sizeof(*context), GFP_KERNEL); |
240 | |||
241 | if (!context) | 206 | if (!context) |
242 | return NULL; | 207 | return NULL; |
243 | 208 | ||
244 | context->ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL); | 209 | spin_lock_irqsave(&ds_lock, irq); |
245 | if (!context->ds) { | ||
246 | kfree(context); | ||
247 | return NULL; | ||
248 | } | ||
249 | 210 | ||
250 | *p_context = context; | 211 | if (*p_context) { |
212 | kfree(context); | ||
251 | 213 | ||
252 | context->this = p_context; | 214 | context = *p_context; |
253 | context->task = task; | 215 | } else { |
216 | *p_context = context; | ||
254 | 217 | ||
255 | if (task) | 218 | context->this = p_context; |
256 | set_tsk_thread_flag(task, TIF_DS_AREA_MSR); | 219 | context->task = task; |
257 | 220 | ||
258 | if (!task || (task == current)) | 221 | if (task) |
259 | wrmsr(MSR_IA32_DS_AREA, (unsigned long)context->ds, 0); | 222 | set_tsk_thread_flag(task, TIF_DS_AREA_MSR); |
260 | 223 | ||
261 | get_tracer(task); | 224 | if (!task || (task == current)) |
225 | wrmsrl(MSR_IA32_DS_AREA, | ||
226 | (unsigned long)context->ds); | ||
227 | } | ||
228 | spin_unlock_irqrestore(&ds_lock, irq); | ||
262 | } | 229 | } |
263 | 230 | ||
264 | context->count++; | 231 | context->count++; |
@@ -266,16 +233,14 @@ static inline struct ds_context *ds_alloc_context(struct task_struct *task) | |||
266 | return context; | 233 | return context; |
267 | } | 234 | } |
268 | 235 | ||
269 | /* | ||
270 | * Decreases the use count of the parameter context, if not NULL. | ||
271 | * Deallocates the context, if the use count reaches zero. | ||
272 | */ | ||
273 | static inline void ds_put_context(struct ds_context *context) | 236 | static inline void ds_put_context(struct ds_context *context) |
274 | { | 237 | { |
238 | unsigned long irq; | ||
239 | |||
275 | if (!context) | 240 | if (!context) |
276 | return; | 241 | return; |
277 | 242 | ||
278 | spin_lock(&ds_lock); | 243 | spin_lock_irqsave(&ds_lock, irq); |
279 | 244 | ||
280 | if (--context->count) | 245 | if (--context->count) |
281 | goto out; | 246 | goto out; |
@@ -288,351 +253,351 @@ static inline void ds_put_context(struct ds_context *context) | |||
288 | if (!context->task || (context->task == current)) | 253 | if (!context->task || (context->task == current)) |
289 | wrmsrl(MSR_IA32_DS_AREA, 0); | 254 | wrmsrl(MSR_IA32_DS_AREA, 0); |
290 | 255 | ||
291 | put_tracer(context->task); | ||
292 | |||
293 | /* free any leftover buffers from tracers that did not | ||
294 | * deallocate them properly. */ | ||
295 | kfree(context->buffer[ds_bts]); | ||
296 | kfree(context->buffer[ds_pebs]); | ||
297 | kfree(context->ds); | ||
298 | kfree(context); | 256 | kfree(context); |
299 | out: | 257 | out: |
300 | spin_unlock(&ds_lock); | 258 | spin_unlock_irqrestore(&ds_lock, irq); |
301 | } | 259 | } |
302 | 260 | ||
303 | 261 | ||
304 | /* | 262 | /* |
305 | * Handle a buffer overflow | 263 | * Handle a buffer overflow |
306 | * | 264 | * |
307 | * task: the task whose buffers are overflowing; | ||
308 | * NULL for a buffer overflow on the current cpu | ||
309 | * context: the ds context | 265 | * context: the ds context |
310 | * qual: the buffer type | 266 | * qual: the buffer type |
311 | */ | 267 | */ |
312 | static void ds_overflow(struct task_struct *task, struct ds_context *context, | 268 | static void ds_overflow(struct ds_context *context, enum ds_qualifier qual) |
313 | enum ds_qualifier qual) | 269 | { |
314 | { | 270 | switch (qual) { |
315 | if (!context) | 271 | case ds_bts: { |
316 | return; | 272 | struct bts_tracer *tracer = |
317 | 273 | container_of(context->owner[qual], | |
318 | if (context->callback[qual]) | 274 | struct bts_tracer, ds); |
319 | (*context->callback[qual])(task); | 275 | if (tracer->ovfl) |
320 | 276 | tracer->ovfl(tracer); | |
321 | /* todo: do some more overflow handling */ | 277 | } |
278 | break; | ||
279 | case ds_pebs: { | ||
280 | struct pebs_tracer *tracer = | ||
281 | container_of(context->owner[qual], | ||
282 | struct pebs_tracer, ds); | ||
283 | if (tracer->ovfl) | ||
284 | tracer->ovfl(tracer); | ||
285 | } | ||
286 | break; | ||
287 | } | ||
322 | } | 288 | } |
323 | 289 | ||
324 | 290 | ||
325 | /* | 291 | static void ds_install_ds_config(struct ds_context *context, |
326 | * Allocate a non-pageable buffer of the parameter size. | 292 | enum ds_qualifier qual, |
327 | * Checks the memory and the locked memory rlimit. | 293 | void *base, size_t size, size_t ith) |
328 | * | ||
329 | * Returns the buffer, if successful; | ||
330 | * NULL, if out of memory or rlimit exceeded. | ||
331 | * | ||
332 | * size: the requested buffer size in bytes | ||
333 | * pages (out): if not NULL, contains the number of pages reserved | ||
334 | */ | ||
335 | static inline void *ds_allocate_buffer(size_t size, unsigned int *pages) | ||
336 | { | 294 | { |
337 | unsigned long rlim, vm, pgsz; | 295 | unsigned long buffer, adj; |
338 | void *buffer; | ||
339 | |||
340 | pgsz = PAGE_ALIGN(size) >> PAGE_SHIFT; | ||
341 | |||
342 | rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; | ||
343 | vm = current->mm->total_vm + pgsz; | ||
344 | if (rlim < vm) | ||
345 | return NULL; | ||
346 | 296 | ||
347 | rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT; | 297 | /* adjust the buffer address and size to meet alignment |
348 | vm = current->mm->locked_vm + pgsz; | 298 | * constraints: |
349 | if (rlim < vm) | 299 | * - buffer is double-word aligned |
350 | return NULL; | 300 | * - size is multiple of record size |
301 | * | ||
302 | * We checked the size at the very beginning; we have enough | ||
303 | * space to do the adjustment. | ||
304 | */ | ||
305 | buffer = (unsigned long)base; | ||
351 | 306 | ||
352 | buffer = kzalloc(size, GFP_KERNEL); | 307 | adj = ALIGN(buffer, DS_ALIGNMENT) - buffer; |
353 | if (!buffer) | 308 | buffer += adj; |
354 | return NULL; | 309 | size -= adj; |
355 | 310 | ||
356 | current->mm->total_vm += pgsz; | 311 | size /= ds_cfg.sizeof_rec[qual]; |
357 | current->mm->locked_vm += pgsz; | 312 | size *= ds_cfg.sizeof_rec[qual]; |
358 | 313 | ||
359 | if (pages) | 314 | ds_set(context->ds, qual, ds_buffer_base, buffer); |
360 | *pages = pgsz; | 315 | ds_set(context->ds, qual, ds_index, buffer); |
316 | ds_set(context->ds, qual, ds_absolute_maximum, buffer + size); | ||
361 | 317 | ||
362 | return buffer; | 318 | /* The value for 'no threshold' is -1, which will set the |
319 | * threshold outside of the buffer, just like we want it. | ||
320 | */ | ||
321 | ds_set(context->ds, qual, | ||
322 | ds_interrupt_threshold, buffer + size - ith); | ||
363 | } | 323 | } |
364 | 324 | ||
365 | static int ds_request(struct task_struct *task, void *base, size_t size, | 325 | static int ds_request(struct ds_tracer *tracer, enum ds_qualifier qual, |
366 | ds_ovfl_callback_t ovfl, enum ds_qualifier qual) | 326 | struct task_struct *task, |
327 | void *base, size_t size, size_t th) | ||
367 | { | 328 | { |
368 | struct ds_context *context; | 329 | struct ds_context *context; |
369 | unsigned long buffer, adj; | 330 | unsigned long irq; |
370 | const unsigned long alignment = (1 << 3); | 331 | int error; |
371 | int error = 0; | ||
372 | 332 | ||
333 | error = -EOPNOTSUPP; | ||
373 | if (!ds_cfg.sizeof_ds) | 334 | if (!ds_cfg.sizeof_ds) |
374 | return -EOPNOTSUPP; | 335 | goto out; |
375 | 336 | ||
376 | /* we require some space to do alignment adjustments below */ | 337 | error = -EINVAL; |
377 | if (size < (alignment + ds_cfg.sizeof_rec[qual])) | 338 | if (!base) |
378 | return -EINVAL; | 339 | goto out; |
379 | 340 | ||
380 | /* buffer overflow notification is not yet implemented */ | 341 | /* we require some space to do alignment adjustments below */ |
381 | if (ovfl) | 342 | error = -EINVAL; |
382 | return -EOPNOTSUPP; | 343 | if (size < (DS_ALIGNMENT + ds_cfg.sizeof_rec[qual])) |
344 | goto out; | ||
383 | 345 | ||
346 | if (th != (size_t)-1) { | ||
347 | th *= ds_cfg.sizeof_rec[qual]; | ||
384 | 348 | ||
385 | spin_lock(&ds_lock); | 349 | error = -EINVAL; |
350 | if (size <= th) | ||
351 | goto out; | ||
352 | } | ||
386 | 353 | ||
387 | if (!check_tracer(task)) | 354 | tracer->buffer = base; |
388 | return -EPERM; | 355 | tracer->size = size; |
389 | 356 | ||
390 | error = -ENOMEM; | 357 | error = -ENOMEM; |
391 | context = ds_alloc_context(task); | 358 | context = ds_get_context(task); |
392 | if (!context) | 359 | if (!context) |
393 | goto out_unlock; | 360 | goto out; |
394 | 361 | tracer->context = context; | |
395 | error = -EALREADY; | ||
396 | if (context->owner[qual] == current) | ||
397 | goto out_unlock; | ||
398 | error = -EPERM; | ||
399 | if (context->owner[qual] != NULL) | ||
400 | goto out_unlock; | ||
401 | context->owner[qual] = current; | ||
402 | |||
403 | spin_unlock(&ds_lock); | ||
404 | 362 | ||
405 | 363 | ||
406 | error = -ENOMEM; | 364 | spin_lock_irqsave(&ds_lock, irq); |
407 | if (!base) { | ||
408 | base = ds_allocate_buffer(size, &context->pages[qual]); | ||
409 | if (!base) | ||
410 | goto out_release; | ||
411 | |||
412 | context->buffer[qual] = base; | ||
413 | } | ||
414 | error = 0; | ||
415 | 365 | ||
416 | context->callback[qual] = ovfl; | 366 | error = -EPERM; |
417 | 367 | if (!check_tracer(task)) | |
418 | /* adjust the buffer address and size to meet alignment | 368 | goto out_unlock; |
419 | * constraints: | 369 | get_tracer(task); |
420 | * - buffer is double-word aligned | ||
421 | * - size is multiple of record size | ||
422 | * | ||
423 | * We checked the size at the very beginning; we have enough | ||
424 | * space to do the adjustment. | ||
425 | */ | ||
426 | buffer = (unsigned long)base; | ||
427 | 370 | ||
428 | adj = ALIGN(buffer, alignment) - buffer; | 371 | error = -EPERM; |
429 | buffer += adj; | 372 | if (context->owner[qual]) |
430 | size -= adj; | 373 | goto out_put_tracer; |
374 | context->owner[qual] = tracer; | ||
431 | 375 | ||
432 | size /= ds_cfg.sizeof_rec[qual]; | 376 | spin_unlock_irqrestore(&ds_lock, irq); |
433 | size *= ds_cfg.sizeof_rec[qual]; | ||
434 | 377 | ||
435 | ds_set(context->ds, qual, ds_buffer_base, buffer); | ||
436 | ds_set(context->ds, qual, ds_index, buffer); | ||
437 | ds_set(context->ds, qual, ds_absolute_maximum, buffer + size); | ||
438 | 378 | ||
439 | if (ovfl) { | 379 | ds_install_ds_config(context, qual, base, size, th); |
440 | /* todo: select a suitable interrupt threshold */ | ||
441 | } else | ||
442 | ds_set(context->ds, qual, | ||
443 | ds_interrupt_threshold, buffer + size + 1); | ||
444 | 380 | ||
445 | /* we keep the context until ds_release */ | 381 | return 0; |
446 | return error; | ||
447 | |||
448 | out_release: | ||
449 | context->owner[qual] = NULL; | ||
450 | ds_put_context(context); | ||
451 | return error; | ||
452 | 382 | ||
383 | out_put_tracer: | ||
384 | put_tracer(task); | ||
453 | out_unlock: | 385 | out_unlock: |
454 | spin_unlock(&ds_lock); | 386 | spin_unlock_irqrestore(&ds_lock, irq); |
455 | ds_put_context(context); | 387 | ds_put_context(context); |
388 | tracer->context = NULL; | ||
389 | out: | ||
456 | return error; | 390 | return error; |
457 | } | 391 | } |
458 | 392 | ||
459 | int ds_request_bts(struct task_struct *task, void *base, size_t size, | 393 | struct bts_tracer *ds_request_bts(struct task_struct *task, |
460 | ds_ovfl_callback_t ovfl) | 394 | void *base, size_t size, |
395 | bts_ovfl_callback_t ovfl, size_t th) | ||
461 | { | 396 | { |
462 | return ds_request(task, base, size, ovfl, ds_bts); | 397 | struct bts_tracer *tracer; |
463 | } | 398 | int error; |
464 | 399 | ||
465 | int ds_request_pebs(struct task_struct *task, void *base, size_t size, | 400 | /* buffer overflow notification is not yet implemented */ |
466 | ds_ovfl_callback_t ovfl) | 401 | error = -EOPNOTSUPP; |
467 | { | 402 | if (ovfl) |
468 | return ds_request(task, base, size, ovfl, ds_pebs); | 403 | goto out; |
404 | |||
405 | error = -ENOMEM; | ||
406 | tracer = kzalloc(sizeof(*tracer), GFP_KERNEL); | ||
407 | if (!tracer) | ||
408 | goto out; | ||
409 | tracer->ovfl = ovfl; | ||
410 | |||
411 | error = ds_request(&tracer->ds, ds_bts, task, base, size, th); | ||
412 | if (error < 0) | ||
413 | goto out_tracer; | ||
414 | |||
415 | return tracer; | ||
416 | |||
417 | out_tracer: | ||
418 | kfree(tracer); | ||
419 | out: | ||
420 | return ERR_PTR(error); | ||
469 | } | 421 | } |
470 | 422 | ||
471 | static int ds_release(struct task_struct *task, enum ds_qualifier qual) | 423 | struct pebs_tracer *ds_request_pebs(struct task_struct *task, |
424 | void *base, size_t size, | ||
425 | pebs_ovfl_callback_t ovfl, size_t th) | ||
472 | { | 426 | { |
473 | struct ds_context *context; | 427 | struct pebs_tracer *tracer; |
474 | int error; | 428 | int error; |
475 | 429 | ||
476 | context = ds_get_context(task); | 430 | /* buffer overflow notification is not yet implemented */ |
477 | error = ds_validate_access(context, qual); | 431 | error = -EOPNOTSUPP; |
478 | if (error < 0) | 432 | if (ovfl) |
433 | goto out; | ||
434 | |||
435 | error = -ENOMEM; | ||
436 | tracer = kzalloc(sizeof(*tracer), GFP_KERNEL); | ||
437 | if (!tracer) | ||
479 | goto out; | 438 | goto out; |
439 | tracer->ovfl = ovfl; | ||
480 | 440 | ||
481 | kfree(context->buffer[qual]); | 441 | error = ds_request(&tracer->ds, ds_pebs, task, base, size, th); |
482 | context->buffer[qual] = NULL; | 442 | if (error < 0) |
443 | goto out_tracer; | ||
483 | 444 | ||
484 | current->mm->total_vm -= context->pages[qual]; | 445 | return tracer; |
485 | current->mm->locked_vm -= context->pages[qual]; | ||
486 | context->pages[qual] = 0; | ||
487 | context->owner[qual] = NULL; | ||
488 | 446 | ||
489 | /* | 447 | out_tracer: |
490 | * we put the context twice: | 448 | kfree(tracer); |
491 | * once for the ds_get_context | ||
492 | * once for the corresponding ds_request | ||
493 | */ | ||
494 | ds_put_context(context); | ||
495 | out: | 449 | out: |
496 | ds_put_context(context); | 450 | return ERR_PTR(error); |
497 | return error; | ||
498 | } | 451 | } |
499 | 452 | ||
500 | int ds_release_bts(struct task_struct *task) | 453 | static void ds_release(struct ds_tracer *tracer, enum ds_qualifier qual) |
501 | { | 454 | { |
502 | return ds_release(task, ds_bts); | 455 | BUG_ON(tracer->context->owner[qual] != tracer); |
456 | tracer->context->owner[qual] = NULL; | ||
457 | |||
458 | put_tracer(tracer->context->task); | ||
459 | ds_put_context(tracer->context); | ||
503 | } | 460 | } |
504 | 461 | ||
505 | int ds_release_pebs(struct task_struct *task) | 462 | int ds_release_bts(struct bts_tracer *tracer) |
506 | { | 463 | { |
507 | return ds_release(task, ds_pebs); | 464 | if (!tracer) |
465 | return -EINVAL; | ||
466 | |||
467 | ds_release(&tracer->ds, ds_bts); | ||
468 | kfree(tracer); | ||
469 | |||
470 | return 0; | ||
508 | } | 471 | } |
509 | 472 | ||
510 | static int ds_get_index(struct task_struct *task, size_t *pos, | 473 | int ds_release_pebs(struct pebs_tracer *tracer) |
511 | enum ds_qualifier qual) | ||
512 | { | 474 | { |
513 | struct ds_context *context; | 475 | if (!tracer) |
514 | unsigned long base, index; | 476 | return -EINVAL; |
515 | int error; | ||
516 | 477 | ||
517 | context = ds_get_context(task); | 478 | ds_release(&tracer->ds, ds_pebs); |
518 | error = ds_validate_access(context, qual); | 479 | kfree(tracer); |
519 | if (error < 0) | 480 | |
520 | goto out; | 481 | return 0; |
482 | } | ||
483 | |||
484 | static size_t ds_get_index(struct ds_context *context, enum ds_qualifier qual) | ||
485 | { | ||
486 | unsigned long base, index; | ||
521 | 487 | ||
522 | base = ds_get(context->ds, qual, ds_buffer_base); | 488 | base = ds_get(context->ds, qual, ds_buffer_base); |
523 | index = ds_get(context->ds, qual, ds_index); | 489 | index = ds_get(context->ds, qual, ds_index); |
524 | 490 | ||
525 | error = ((index - base) / ds_cfg.sizeof_rec[qual]); | 491 | return (index - base) / ds_cfg.sizeof_rec[qual]; |
526 | if (pos) | ||
527 | *pos = error; | ||
528 | out: | ||
529 | ds_put_context(context); | ||
530 | return error; | ||
531 | } | 492 | } |
532 | 493 | ||
533 | int ds_get_bts_index(struct task_struct *task, size_t *pos) | 494 | int ds_get_bts_index(struct bts_tracer *tracer, size_t *pos) |
534 | { | 495 | { |
535 | return ds_get_index(task, pos, ds_bts); | 496 | if (!tracer) |
497 | return -EINVAL; | ||
498 | |||
499 | if (!pos) | ||
500 | return -EINVAL; | ||
501 | |||
502 | *pos = ds_get_index(tracer->ds.context, ds_bts); | ||
503 | |||
504 | return 0; | ||
536 | } | 505 | } |
537 | 506 | ||
538 | int ds_get_pebs_index(struct task_struct *task, size_t *pos) | 507 | int ds_get_pebs_index(struct pebs_tracer *tracer, size_t *pos) |
539 | { | 508 | { |
540 | return ds_get_index(task, pos, ds_pebs); | 509 | if (!tracer) |
510 | return -EINVAL; | ||
511 | |||
512 | if (!pos) | ||
513 | return -EINVAL; | ||
514 | |||
515 | *pos = ds_get_index(tracer->ds.context, ds_pebs); | ||
516 | |||
517 | return 0; | ||
541 | } | 518 | } |
542 | 519 | ||
543 | static int ds_get_end(struct task_struct *task, size_t *pos, | 520 | static size_t ds_get_end(struct ds_context *context, enum ds_qualifier qual) |
544 | enum ds_qualifier qual) | ||
545 | { | 521 | { |
546 | struct ds_context *context; | 522 | unsigned long base, max; |
547 | unsigned long base, end; | ||
548 | int error; | ||
549 | |||
550 | context = ds_get_context(task); | ||
551 | error = ds_validate_access(context, qual); | ||
552 | if (error < 0) | ||
553 | goto out; | ||
554 | 523 | ||
555 | base = ds_get(context->ds, qual, ds_buffer_base); | 524 | base = ds_get(context->ds, qual, ds_buffer_base); |
556 | end = ds_get(context->ds, qual, ds_absolute_maximum); | 525 | max = ds_get(context->ds, qual, ds_absolute_maximum); |
557 | 526 | ||
558 | error = ((end - base) / ds_cfg.sizeof_rec[qual]); | 527 | return (max - base) / ds_cfg.sizeof_rec[qual]; |
559 | if (pos) | ||
560 | *pos = error; | ||
561 | out: | ||
562 | ds_put_context(context); | ||
563 | return error; | ||
564 | } | 528 | } |
565 | 529 | ||
566 | int ds_get_bts_end(struct task_struct *task, size_t *pos) | 530 | int ds_get_bts_end(struct bts_tracer *tracer, size_t *pos) |
567 | { | 531 | { |
568 | return ds_get_end(task, pos, ds_bts); | 532 | if (!tracer) |
533 | return -EINVAL; | ||
534 | |||
535 | if (!pos) | ||
536 | return -EINVAL; | ||
537 | |||
538 | *pos = ds_get_end(tracer->ds.context, ds_bts); | ||
539 | |||
540 | return 0; | ||
569 | } | 541 | } |
570 | 542 | ||
571 | int ds_get_pebs_end(struct task_struct *task, size_t *pos) | 543 | int ds_get_pebs_end(struct pebs_tracer *tracer, size_t *pos) |
572 | { | 544 | { |
573 | return ds_get_end(task, pos, ds_pebs); | 545 | if (!tracer) |
546 | return -EINVAL; | ||
547 | |||
548 | if (!pos) | ||
549 | return -EINVAL; | ||
550 | |||
551 | *pos = ds_get_end(tracer->ds.context, ds_pebs); | ||
552 | |||
553 | return 0; | ||
574 | } | 554 | } |
575 | 555 | ||
576 | static int ds_access(struct task_struct *task, size_t index, | 556 | static int ds_access(struct ds_context *context, enum ds_qualifier qual, |
577 | const void **record, enum ds_qualifier qual) | 557 | size_t index, const void **record) |
578 | { | 558 | { |
579 | struct ds_context *context; | ||
580 | unsigned long base, idx; | 559 | unsigned long base, idx; |
581 | int error; | ||
582 | 560 | ||
583 | if (!record) | 561 | if (!record) |
584 | return -EINVAL; | 562 | return -EINVAL; |
585 | 563 | ||
586 | context = ds_get_context(task); | ||
587 | error = ds_validate_access(context, qual); | ||
588 | if (error < 0) | ||
589 | goto out; | ||
590 | |||
591 | base = ds_get(context->ds, qual, ds_buffer_base); | 564 | base = ds_get(context->ds, qual, ds_buffer_base); |
592 | idx = base + (index * ds_cfg.sizeof_rec[qual]); | 565 | idx = base + (index * ds_cfg.sizeof_rec[qual]); |
593 | 566 | ||
594 | error = -EINVAL; | ||
595 | if (idx > ds_get(context->ds, qual, ds_absolute_maximum)) | 567 | if (idx > ds_get(context->ds, qual, ds_absolute_maximum)) |
596 | goto out; | 568 | return -EINVAL; |
597 | 569 | ||
598 | *record = (const void *)idx; | 570 | *record = (const void *)idx; |
599 | error = ds_cfg.sizeof_rec[qual]; | 571 | |
600 | out: | 572 | return ds_cfg.sizeof_rec[qual]; |
601 | ds_put_context(context); | ||
602 | return error; | ||
603 | } | 573 | } |
604 | 574 | ||
605 | int ds_access_bts(struct task_struct *task, size_t index, const void **record) | 575 | int ds_access_bts(struct bts_tracer *tracer, size_t index, |
576 | const void **record) | ||
606 | { | 577 | { |
607 | return ds_access(task, index, record, ds_bts); | 578 | if (!tracer) |
579 | return -EINVAL; | ||
580 | |||
581 | return ds_access(tracer->ds.context, ds_bts, index, record); | ||
608 | } | 582 | } |
609 | 583 | ||
610 | int ds_access_pebs(struct task_struct *task, size_t index, const void **record) | 584 | int ds_access_pebs(struct pebs_tracer *tracer, size_t index, |
585 | const void **record) | ||
611 | { | 586 | { |
612 | return ds_access(task, index, record, ds_pebs); | 587 | if (!tracer) |
588 | return -EINVAL; | ||
589 | |||
590 | return ds_access(tracer->ds.context, ds_pebs, index, record); | ||
613 | } | 591 | } |
614 | 592 | ||
615 | static int ds_write(struct task_struct *task, const void *record, size_t size, | 593 | static int ds_write(struct ds_context *context, enum ds_qualifier qual, |
616 | enum ds_qualifier qual, int force) | 594 | const void *record, size_t size) |
617 | { | 595 | { |
618 | struct ds_context *context; | 596 | int bytes_written = 0; |
619 | int error; | ||
620 | 597 | ||
621 | if (!record) | 598 | if (!record) |
622 | return -EINVAL; | 599 | return -EINVAL; |
623 | 600 | ||
624 | error = -EPERM; | ||
625 | context = ds_get_context(task); | ||
626 | if (!context) | ||
627 | goto out; | ||
628 | |||
629 | if (!force) { | ||
630 | error = ds_validate_access(context, qual); | ||
631 | if (error < 0) | ||
632 | goto out; | ||
633 | } | ||
634 | |||
635 | error = 0; | ||
636 | while (size) { | 601 | while (size) { |
637 | unsigned long base, index, end, write_end, int_th; | 602 | unsigned long base, index, end, write_end, int_th; |
638 | unsigned long write_size, adj_write_size; | 603 | unsigned long write_size, adj_write_size; |
@@ -660,14 +625,14 @@ static int ds_write(struct task_struct *task, const void *record, size_t size, | |||
660 | write_end = end; | 625 | write_end = end; |
661 | 626 | ||
662 | if (write_end <= index) | 627 | if (write_end <= index) |
663 | goto out; | 628 | break; |
664 | 629 | ||
665 | write_size = min((unsigned long) size, write_end - index); | 630 | write_size = min((unsigned long) size, write_end - index); |
666 | memcpy((void *)index, record, write_size); | 631 | memcpy((void *)index, record, write_size); |
667 | 632 | ||
668 | record = (const char *)record + write_size; | 633 | record = (const char *)record + write_size; |
669 | size -= write_size; | 634 | size -= write_size; |
670 | error += write_size; | 635 | bytes_written += write_size; |
671 | 636 | ||
672 | adj_write_size = write_size / ds_cfg.sizeof_rec[qual]; | 637 | adj_write_size = write_size / ds_cfg.sizeof_rec[qual]; |
673 | adj_write_size *= ds_cfg.sizeof_rec[qual]; | 638 | adj_write_size *= ds_cfg.sizeof_rec[qual]; |
@@ -682,47 +647,32 @@ static int ds_write(struct task_struct *task, const void *record, size_t size, | |||
682 | ds_set(context->ds, qual, ds_index, index); | 647 | ds_set(context->ds, qual, ds_index, index); |
683 | 648 | ||
684 | if (index >= int_th) | 649 | if (index >= int_th) |
685 | ds_overflow(task, context, qual); | 650 | ds_overflow(context, qual); |
686 | } | 651 | } |
687 | 652 | ||
688 | out: | 653 | return bytes_written; |
689 | ds_put_context(context); | ||
690 | return error; | ||
691 | } | 654 | } |
692 | 655 | ||
693 | int ds_write_bts(struct task_struct *task, const void *record, size_t size) | 656 | int ds_write_bts(struct bts_tracer *tracer, const void *record, size_t size) |
694 | { | 657 | { |
695 | return ds_write(task, record, size, ds_bts, /* force = */ 0); | 658 | if (!tracer) |
696 | } | 659 | return -EINVAL; |
697 | 660 | ||
698 | int ds_write_pebs(struct task_struct *task, const void *record, size_t size) | 661 | return ds_write(tracer->ds.context, ds_bts, record, size); |
699 | { | ||
700 | return ds_write(task, record, size, ds_pebs, /* force = */ 0); | ||
701 | } | 662 | } |
702 | 663 | ||
703 | int ds_unchecked_write_bts(struct task_struct *task, | 664 | int ds_write_pebs(struct pebs_tracer *tracer, const void *record, size_t size) |
704 | const void *record, size_t size) | ||
705 | { | 665 | { |
706 | return ds_write(task, record, size, ds_bts, /* force = */ 1); | 666 | if (!tracer) |
707 | } | 667 | return -EINVAL; |
708 | 668 | ||
709 | int ds_unchecked_write_pebs(struct task_struct *task, | 669 | return ds_write(tracer->ds.context, ds_pebs, record, size); |
710 | const void *record, size_t size) | ||
711 | { | ||
712 | return ds_write(task, record, size, ds_pebs, /* force = */ 1); | ||
713 | } | 670 | } |
714 | 671 | ||
715 | static int ds_reset_or_clear(struct task_struct *task, | 672 | static void ds_reset_or_clear(struct ds_context *context, |
716 | enum ds_qualifier qual, int clear) | 673 | enum ds_qualifier qual, int clear) |
717 | { | 674 | { |
718 | struct ds_context *context; | ||
719 | unsigned long base, end; | 675 | unsigned long base, end; |
720 | int error; | ||
721 | |||
722 | context = ds_get_context(task); | ||
723 | error = ds_validate_access(context, qual); | ||
724 | if (error < 0) | ||
725 | goto out; | ||
726 | 676 | ||
727 | base = ds_get(context->ds, qual, ds_buffer_base); | 677 | base = ds_get(context->ds, qual, ds_buffer_base); |
728 | end = ds_get(context->ds, qual, ds_absolute_maximum); | 678 | end = ds_get(context->ds, qual, ds_absolute_maximum); |
@@ -731,89 +681,100 @@ static int ds_reset_or_clear(struct task_struct *task, | |||
731 | memset((void *)base, 0, end - base); | 681 | memset((void *)base, 0, end - base); |
732 | 682 | ||
733 | ds_set(context->ds, qual, ds_index, base); | 683 | ds_set(context->ds, qual, ds_index, base); |
734 | |||
735 | error = 0; | ||
736 | out: | ||
737 | ds_put_context(context); | ||
738 | return error; | ||
739 | } | 684 | } |
740 | 685 | ||
741 | int ds_reset_bts(struct task_struct *task) | 686 | int ds_reset_bts(struct bts_tracer *tracer) |
742 | { | 687 | { |
743 | return ds_reset_or_clear(task, ds_bts, /* clear = */ 0); | 688 | if (!tracer) |
689 | return -EINVAL; | ||
690 | |||
691 | ds_reset_or_clear(tracer->ds.context, ds_bts, /* clear = */ 0); | ||
692 | |||
693 | return 0; | ||
744 | } | 694 | } |
745 | 695 | ||
746 | int ds_reset_pebs(struct task_struct *task) | 696 | int ds_reset_pebs(struct pebs_tracer *tracer) |
747 | { | 697 | { |
748 | return ds_reset_or_clear(task, ds_pebs, /* clear = */ 0); | 698 | if (!tracer) |
699 | return -EINVAL; | ||
700 | |||
701 | ds_reset_or_clear(tracer->ds.context, ds_pebs, /* clear = */ 0); | ||
702 | |||
703 | return 0; | ||
749 | } | 704 | } |
750 | 705 | ||
751 | int ds_clear_bts(struct task_struct *task) | 706 | int ds_clear_bts(struct bts_tracer *tracer) |
752 | { | 707 | { |
753 | return ds_reset_or_clear(task, ds_bts, /* clear = */ 1); | 708 | if (!tracer) |
709 | return -EINVAL; | ||
710 | |||
711 | ds_reset_or_clear(tracer->ds.context, ds_bts, /* clear = */ 1); | ||
712 | |||
713 | return 0; | ||
754 | } | 714 | } |
755 | 715 | ||
756 | int ds_clear_pebs(struct task_struct *task) | 716 | int ds_clear_pebs(struct pebs_tracer *tracer) |
757 | { | 717 | { |
758 | return ds_reset_or_clear(task, ds_pebs, /* clear = */ 1); | 718 | if (!tracer) |
719 | return -EINVAL; | ||
720 | |||
721 | ds_reset_or_clear(tracer->ds.context, ds_pebs, /* clear = */ 1); | ||
722 | |||
723 | return 0; | ||
759 | } | 724 | } |
760 | 725 | ||
761 | int ds_get_pebs_reset(struct task_struct *task, u64 *value) | 726 | int ds_get_pebs_reset(struct pebs_tracer *tracer, u64 *value) |
762 | { | 727 | { |
763 | struct ds_context *context; | 728 | if (!tracer) |
764 | int error; | 729 | return -EINVAL; |
765 | 730 | ||
766 | if (!value) | 731 | if (!value) |
767 | return -EINVAL; | 732 | return -EINVAL; |
768 | 733 | ||
769 | context = ds_get_context(task); | 734 | *value = *(u64 *)(tracer->ds.context->ds + (ds_cfg.sizeof_field * 8)); |
770 | error = ds_validate_access(context, ds_pebs); | ||
771 | if (error < 0) | ||
772 | goto out; | ||
773 | 735 | ||
774 | *value = *(u64 *)(context->ds + (ds_cfg.sizeof_field * 8)); | 736 | return 0; |
775 | |||
776 | error = 0; | ||
777 | out: | ||
778 | ds_put_context(context); | ||
779 | return error; | ||
780 | } | 737 | } |
781 | 738 | ||
782 | int ds_set_pebs_reset(struct task_struct *task, u64 value) | 739 | int ds_set_pebs_reset(struct pebs_tracer *tracer, u64 value) |
783 | { | 740 | { |
784 | struct ds_context *context; | 741 | if (!tracer) |
785 | int error; | 742 | return -EINVAL; |
786 | |||
787 | context = ds_get_context(task); | ||
788 | error = ds_validate_access(context, ds_pebs); | ||
789 | if (error < 0) | ||
790 | goto out; | ||
791 | 743 | ||
792 | *(u64 *)(context->ds + (ds_cfg.sizeof_field * 8)) = value; | 744 | *(u64 *)(tracer->ds.context->ds + (ds_cfg.sizeof_field * 8)) = value; |
793 | 745 | ||
794 | error = 0; | 746 | return 0; |
795 | out: | ||
796 | ds_put_context(context); | ||
797 | return error; | ||
798 | } | 747 | } |
799 | 748 | ||
800 | static const struct ds_configuration ds_cfg_var = { | 749 | static const struct ds_configuration ds_cfg_var = { |
801 | .sizeof_ds = sizeof(long) * 12, | 750 | .sizeof_ds = sizeof(long) * 12, |
802 | .sizeof_field = sizeof(long), | 751 | .sizeof_field = sizeof(long), |
803 | .sizeof_rec[ds_bts] = sizeof(long) * 3, | 752 | .sizeof_rec[ds_bts] = sizeof(long) * 3, |
753 | #ifdef __i386__ | ||
804 | .sizeof_rec[ds_pebs] = sizeof(long) * 10 | 754 | .sizeof_rec[ds_pebs] = sizeof(long) * 10 |
755 | #else | ||
756 | .sizeof_rec[ds_pebs] = sizeof(long) * 18 | ||
757 | #endif | ||
805 | }; | 758 | }; |
806 | static const struct ds_configuration ds_cfg_64 = { | 759 | static const struct ds_configuration ds_cfg_64 = { |
807 | .sizeof_ds = 8 * 12, | 760 | .sizeof_ds = 8 * 12, |
808 | .sizeof_field = 8, | 761 | .sizeof_field = 8, |
809 | .sizeof_rec[ds_bts] = 8 * 3, | 762 | .sizeof_rec[ds_bts] = 8 * 3, |
763 | #ifdef __i386__ | ||
810 | .sizeof_rec[ds_pebs] = 8 * 10 | 764 | .sizeof_rec[ds_pebs] = 8 * 10 |
765 | #else | ||
766 | .sizeof_rec[ds_pebs] = 8 * 18 | ||
767 | #endif | ||
811 | }; | 768 | }; |
812 | 769 | ||
813 | static inline void | 770 | static inline void |
814 | ds_configure(const struct ds_configuration *cfg) | 771 | ds_configure(const struct ds_configuration *cfg) |
815 | { | 772 | { |
816 | ds_cfg = *cfg; | 773 | ds_cfg = *cfg; |
774 | |||
775 | printk(KERN_INFO "DS available\n"); | ||
776 | |||
777 | BUG_ON(MAX_SIZEOF_DS < ds_cfg.sizeof_ds); | ||
817 | } | 778 | } |
818 | 779 | ||
819 | void __cpuinit ds_init_intel(struct cpuinfo_x86 *c) | 780 | void __cpuinit ds_init_intel(struct cpuinfo_x86 *c) |
@@ -821,17 +782,16 @@ void __cpuinit ds_init_intel(struct cpuinfo_x86 *c) | |||
821 | switch (c->x86) { | 782 | switch (c->x86) { |
822 | case 0x6: | 783 | case 0x6: |
823 | switch (c->x86_model) { | 784 | switch (c->x86_model) { |
785 | case 0 ... 0xC: | ||
786 | /* sorry, don't know about them */ | ||
787 | break; | ||
824 | case 0xD: | 788 | case 0xD: |
825 | case 0xE: /* Pentium M */ | 789 | case 0xE: /* Pentium M */ |
826 | ds_configure(&ds_cfg_var); | 790 | ds_configure(&ds_cfg_var); |
827 | break; | 791 | break; |
828 | case 0xF: /* Core2 */ | 792 | default: /* Core2, Atom, ... */ |
829 | case 0x1C: /* Atom */ | ||
830 | ds_configure(&ds_cfg_64); | 793 | ds_configure(&ds_cfg_64); |
831 | break; | 794 | break; |
832 | default: | ||
833 | /* sorry, don't know about them */ | ||
834 | break; | ||
835 | } | 795 | } |
836 | break; | 796 | break; |
837 | case 0xF: | 797 | case 0xF: |
@@ -858,7 +818,8 @@ void ds_free(struct ds_context *context) | |||
858 | * is dying. There should not be any user of that context left | 818 | * is dying. There should not be any user of that context left |
859 | * to disturb us, anymore. */ | 819 | * to disturb us, anymore. */ |
860 | unsigned long leftovers = context->count; | 820 | unsigned long leftovers = context->count; |
861 | while (leftovers--) | 821 | while (leftovers--) { |
822 | put_tracer(context->task); | ||
862 | ds_put_context(context); | 823 | ds_put_context(context); |
824 | } | ||
863 | } | 825 | } |
864 | #endif /* CONFIG_X86_DS */ | ||
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c new file mode 100644 index 000000000000..6b1f6f6f8661 --- /dev/null +++ b/arch/x86/kernel/dumpstack.c | |||
@@ -0,0 +1,351 @@ | |||
1 | /* | ||
2 | * Copyright (C) 1991, 1992 Linus Torvalds | ||
3 | * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs | ||
4 | */ | ||
5 | #include <linux/kallsyms.h> | ||
6 | #include <linux/kprobes.h> | ||
7 | #include <linux/uaccess.h> | ||
8 | #include <linux/utsname.h> | ||
9 | #include <linux/hardirq.h> | ||
10 | #include <linux/kdebug.h> | ||
11 | #include <linux/module.h> | ||
12 | #include <linux/ptrace.h> | ||
13 | #include <linux/kexec.h> | ||
14 | #include <linux/bug.h> | ||
15 | #include <linux/nmi.h> | ||
16 | #include <linux/sysfs.h> | ||
17 | |||
18 | #include <asm/stacktrace.h> | ||
19 | |||
20 | #include "dumpstack.h" | ||
21 | |||
22 | int panic_on_unrecovered_nmi; | ||
23 | unsigned int code_bytes = 64; | ||
24 | int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE; | ||
25 | static int die_counter; | ||
26 | |||
27 | void printk_address(unsigned long address, int reliable) | ||
28 | { | ||
29 | printk(" [<%p>] %s%pS\n", (void *) address, | ||
30 | reliable ? "" : "? ", (void *) address); | ||
31 | } | ||
32 | |||
33 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
34 | static void | ||
35 | print_ftrace_graph_addr(unsigned long addr, void *data, | ||
36 | const struct stacktrace_ops *ops, | ||
37 | struct thread_info *tinfo, int *graph) | ||
38 | { | ||
39 | struct task_struct *task = tinfo->task; | ||
40 | unsigned long ret_addr; | ||
41 | int index = task->curr_ret_stack; | ||
42 | |||
43 | if (addr != (unsigned long)return_to_handler) | ||
44 | return; | ||
45 | |||
46 | if (!task->ret_stack || index < *graph) | ||
47 | return; | ||
48 | |||
49 | index -= *graph; | ||
50 | ret_addr = task->ret_stack[index].ret; | ||
51 | |||
52 | ops->address(data, ret_addr, 1); | ||
53 | |||
54 | (*graph)++; | ||
55 | } | ||
56 | #else | ||
57 | static inline void | ||
58 | print_ftrace_graph_addr(unsigned long addr, void *data, | ||
59 | const struct stacktrace_ops *ops, | ||
60 | struct thread_info *tinfo, int *graph) | ||
61 | { } | ||
62 | #endif | ||
63 | |||
64 | /* | ||
65 | * x86-64 can have up to three kernel stacks: | ||
66 | * process stack | ||
67 | * interrupt stack | ||
68 | * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack | ||
69 | */ | ||
70 | |||
71 | static inline int valid_stack_ptr(struct thread_info *tinfo, | ||
72 | void *p, unsigned int size, void *end) | ||
73 | { | ||
74 | void *t = tinfo; | ||
75 | if (end) { | ||
76 | if (p < end && p >= (end-THREAD_SIZE)) | ||
77 | return 1; | ||
78 | else | ||
79 | return 0; | ||
80 | } | ||
81 | return p > t && p < t + THREAD_SIZE - size; | ||
82 | } | ||
83 | |||
84 | unsigned long | ||
85 | print_context_stack(struct thread_info *tinfo, | ||
86 | unsigned long *stack, unsigned long bp, | ||
87 | const struct stacktrace_ops *ops, void *data, | ||
88 | unsigned long *end, int *graph) | ||
89 | { | ||
90 | struct stack_frame *frame = (struct stack_frame *)bp; | ||
91 | |||
92 | while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) { | ||
93 | unsigned long addr; | ||
94 | |||
95 | addr = *stack; | ||
96 | if (__kernel_text_address(addr)) { | ||
97 | if ((unsigned long) stack == bp + sizeof(long)) { | ||
98 | ops->address(data, addr, 1); | ||
99 | frame = frame->next_frame; | ||
100 | bp = (unsigned long) frame; | ||
101 | } else { | ||
102 | ops->address(data, addr, bp == 0); | ||
103 | } | ||
104 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); | ||
105 | } | ||
106 | stack++; | ||
107 | } | ||
108 | return bp; | ||
109 | } | ||
110 | |||
111 | |||
112 | static void | ||
113 | print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
114 | { | ||
115 | printk(data); | ||
116 | print_symbol(msg, symbol); | ||
117 | printk("\n"); | ||
118 | } | ||
119 | |||
120 | static void print_trace_warning(void *data, char *msg) | ||
121 | { | ||
122 | printk("%s%s\n", (char *)data, msg); | ||
123 | } | ||
124 | |||
125 | static int print_trace_stack(void *data, char *name) | ||
126 | { | ||
127 | printk("%s <%s> ", (char *)data, name); | ||
128 | return 0; | ||
129 | } | ||
130 | |||
131 | /* | ||
132 | * Print one address/symbol entries per line. | ||
133 | */ | ||
134 | static void print_trace_address(void *data, unsigned long addr, int reliable) | ||
135 | { | ||
136 | touch_nmi_watchdog(); | ||
137 | printk(data); | ||
138 | printk_address(addr, reliable); | ||
139 | } | ||
140 | |||
141 | static const struct stacktrace_ops print_trace_ops = { | ||
142 | .warning = print_trace_warning, | ||
143 | .warning_symbol = print_trace_warning_symbol, | ||
144 | .stack = print_trace_stack, | ||
145 | .address = print_trace_address, | ||
146 | }; | ||
147 | |||
148 | void | ||
149 | show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, | ||
150 | unsigned long *stack, unsigned long bp, char *log_lvl) | ||
151 | { | ||
152 | printk("%sCall Trace:\n", log_lvl); | ||
153 | dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl); | ||
154 | } | ||
155 | |||
156 | void show_trace(struct task_struct *task, struct pt_regs *regs, | ||
157 | unsigned long *stack, unsigned long bp) | ||
158 | { | ||
159 | show_trace_log_lvl(task, regs, stack, bp, ""); | ||
160 | } | ||
161 | |||
162 | void show_stack(struct task_struct *task, unsigned long *sp) | ||
163 | { | ||
164 | show_stack_log_lvl(task, NULL, sp, 0, ""); | ||
165 | } | ||
166 | |||
167 | /* | ||
168 | * The architecture-independent dump_stack generator | ||
169 | */ | ||
170 | void dump_stack(void) | ||
171 | { | ||
172 | unsigned long bp = 0; | ||
173 | unsigned long stack; | ||
174 | |||
175 | #ifdef CONFIG_FRAME_POINTER | ||
176 | if (!bp) | ||
177 | get_bp(bp); | ||
178 | #endif | ||
179 | |||
180 | printk("Pid: %d, comm: %.20s %s %s %.*s\n", | ||
181 | current->pid, current->comm, print_tainted(), | ||
182 | init_utsname()->release, | ||
183 | (int)strcspn(init_utsname()->version, " "), | ||
184 | init_utsname()->version); | ||
185 | show_trace(NULL, NULL, &stack, bp); | ||
186 | } | ||
187 | EXPORT_SYMBOL(dump_stack); | ||
188 | |||
189 | static raw_spinlock_t die_lock = __RAW_SPIN_LOCK_UNLOCKED; | ||
190 | static int die_owner = -1; | ||
191 | static unsigned int die_nest_count; | ||
192 | |||
193 | unsigned __kprobes long oops_begin(void) | ||
194 | { | ||
195 | int cpu; | ||
196 | unsigned long flags; | ||
197 | |||
198 | oops_enter(); | ||
199 | |||
200 | /* racy, but better than risking deadlock. */ | ||
201 | raw_local_irq_save(flags); | ||
202 | cpu = smp_processor_id(); | ||
203 | if (!__raw_spin_trylock(&die_lock)) { | ||
204 | if (cpu == die_owner) | ||
205 | /* nested oops. should stop eventually */; | ||
206 | else | ||
207 | __raw_spin_lock(&die_lock); | ||
208 | } | ||
209 | die_nest_count++; | ||
210 | die_owner = cpu; | ||
211 | console_verbose(); | ||
212 | bust_spinlocks(1); | ||
213 | return flags; | ||
214 | } | ||
215 | |||
216 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | ||
217 | { | ||
218 | if (regs && kexec_should_crash(current)) | ||
219 | crash_kexec(regs); | ||
220 | |||
221 | bust_spinlocks(0); | ||
222 | die_owner = -1; | ||
223 | add_taint(TAINT_DIE); | ||
224 | die_nest_count--; | ||
225 | if (!die_nest_count) | ||
226 | /* Nest count reaches zero, release the lock. */ | ||
227 | __raw_spin_unlock(&die_lock); | ||
228 | raw_local_irq_restore(flags); | ||
229 | oops_exit(); | ||
230 | |||
231 | if (!signr) | ||
232 | return; | ||
233 | if (in_interrupt()) | ||
234 | panic("Fatal exception in interrupt"); | ||
235 | if (panic_on_oops) | ||
236 | panic("Fatal exception"); | ||
237 | do_exit(signr); | ||
238 | } | ||
239 | |||
240 | int __kprobes __die(const char *str, struct pt_regs *regs, long err) | ||
241 | { | ||
242 | #ifdef CONFIG_X86_32 | ||
243 | unsigned short ss; | ||
244 | unsigned long sp; | ||
245 | #endif | ||
246 | printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); | ||
247 | #ifdef CONFIG_PREEMPT | ||
248 | printk("PREEMPT "); | ||
249 | #endif | ||
250 | #ifdef CONFIG_SMP | ||
251 | printk("SMP "); | ||
252 | #endif | ||
253 | #ifdef CONFIG_DEBUG_PAGEALLOC | ||
254 | printk("DEBUG_PAGEALLOC"); | ||
255 | #endif | ||
256 | printk("\n"); | ||
257 | sysfs_printk_last_file(); | ||
258 | if (notify_die(DIE_OOPS, str, regs, err, | ||
259 | current->thread.trap_no, SIGSEGV) == NOTIFY_STOP) | ||
260 | return 1; | ||
261 | |||
262 | show_registers(regs); | ||
263 | #ifdef CONFIG_X86_32 | ||
264 | sp = (unsigned long) (®s->sp); | ||
265 | savesegment(ss, ss); | ||
266 | if (user_mode(regs)) { | ||
267 | sp = regs->sp; | ||
268 | ss = regs->ss & 0xffff; | ||
269 | } | ||
270 | printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip); | ||
271 | print_symbol("%s", regs->ip); | ||
272 | printk(" SS:ESP %04x:%08lx\n", ss, sp); | ||
273 | #else | ||
274 | /* Executive summary in case the oops scrolled away */ | ||
275 | printk(KERN_ALERT "RIP "); | ||
276 | printk_address(regs->ip, 1); | ||
277 | printk(" RSP <%016lx>\n", regs->sp); | ||
278 | #endif | ||
279 | return 0; | ||
280 | } | ||
281 | |||
282 | /* | ||
283 | * This is gone through when something in the kernel has done something bad | ||
284 | * and is about to be terminated: | ||
285 | */ | ||
286 | void die(const char *str, struct pt_regs *regs, long err) | ||
287 | { | ||
288 | unsigned long flags = oops_begin(); | ||
289 | int sig = SIGSEGV; | ||
290 | |||
291 | if (!user_mode_vm(regs)) | ||
292 | report_bug(regs->ip, regs); | ||
293 | |||
294 | if (__die(str, regs, err)) | ||
295 | sig = 0; | ||
296 | oops_end(flags, regs, sig); | ||
297 | } | ||
298 | |||
299 | void notrace __kprobes | ||
300 | die_nmi(char *str, struct pt_regs *regs, int do_panic) | ||
301 | { | ||
302 | unsigned long flags; | ||
303 | |||
304 | if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP) | ||
305 | return; | ||
306 | |||
307 | /* | ||
308 | * We are in trouble anyway, lets at least try | ||
309 | * to get a message out. | ||
310 | */ | ||
311 | flags = oops_begin(); | ||
312 | printk(KERN_EMERG "%s", str); | ||
313 | printk(" on CPU%d, ip %08lx, registers:\n", | ||
314 | smp_processor_id(), regs->ip); | ||
315 | show_registers(regs); | ||
316 | oops_end(flags, regs, 0); | ||
317 | if (do_panic || panic_on_oops) | ||
318 | panic("Non maskable interrupt"); | ||
319 | nmi_exit(); | ||
320 | local_irq_enable(); | ||
321 | do_exit(SIGBUS); | ||
322 | } | ||
323 | |||
324 | static int __init oops_setup(char *s) | ||
325 | { | ||
326 | if (!s) | ||
327 | return -EINVAL; | ||
328 | if (!strcmp(s, "panic")) | ||
329 | panic_on_oops = 1; | ||
330 | return 0; | ||
331 | } | ||
332 | early_param("oops", oops_setup); | ||
333 | |||
334 | static int __init kstack_setup(char *s) | ||
335 | { | ||
336 | if (!s) | ||
337 | return -EINVAL; | ||
338 | kstack_depth_to_print = simple_strtoul(s, NULL, 0); | ||
339 | return 0; | ||
340 | } | ||
341 | early_param("kstack", kstack_setup); | ||
342 | |||
343 | static int __init code_bytes_setup(char *s) | ||
344 | { | ||
345 | code_bytes = simple_strtoul(s, NULL, 0); | ||
346 | if (code_bytes > 8192) | ||
347 | code_bytes = 8192; | ||
348 | |||
349 | return 1; | ||
350 | } | ||
351 | __setup("code_bytes=", code_bytes_setup); | ||
diff --git a/arch/x86/kernel/dumpstack.h b/arch/x86/kernel/dumpstack.h new file mode 100644 index 000000000000..da87590b8698 --- /dev/null +++ b/arch/x86/kernel/dumpstack.h | |||
@@ -0,0 +1,39 @@ | |||
1 | /* | ||
2 | * Copyright (C) 1991, 1992 Linus Torvalds | ||
3 | * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs | ||
4 | */ | ||
5 | |||
6 | #ifndef DUMPSTACK_H | ||
7 | #define DUMPSTACK_H | ||
8 | |||
9 | #ifdef CONFIG_X86_32 | ||
10 | #define STACKSLOTS_PER_LINE 8 | ||
11 | #define get_bp(bp) asm("movl %%ebp, %0" : "=r" (bp) :) | ||
12 | #else | ||
13 | #define STACKSLOTS_PER_LINE 4 | ||
14 | #define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :) | ||
15 | #endif | ||
16 | |||
17 | extern unsigned long | ||
18 | print_context_stack(struct thread_info *tinfo, | ||
19 | unsigned long *stack, unsigned long bp, | ||
20 | const struct stacktrace_ops *ops, void *data, | ||
21 | unsigned long *end, int *graph); | ||
22 | |||
23 | extern void | ||
24 | show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, | ||
25 | unsigned long *stack, unsigned long bp, char *log_lvl); | ||
26 | |||
27 | extern void | ||
28 | show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | ||
29 | unsigned long *sp, unsigned long bp, char *log_lvl); | ||
30 | |||
31 | extern unsigned int code_bytes; | ||
32 | extern int kstack_depth_to_print; | ||
33 | |||
34 | /* The form of the top of the frame on the stack */ | ||
35 | struct stack_frame { | ||
36 | struct stack_frame *next_frame; | ||
37 | unsigned long return_address; | ||
38 | }; | ||
39 | #endif | ||
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index b3614752197b..d593cd1f58dc 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c | |||
@@ -17,69 +17,14 @@ | |||
17 | 17 | ||
18 | #include <asm/stacktrace.h> | 18 | #include <asm/stacktrace.h> |
19 | 19 | ||
20 | #define STACKSLOTS_PER_LINE 8 | 20 | #include "dumpstack.h" |
21 | #define get_bp(bp) asm("movl %%ebp, %0" : "=r" (bp) :) | ||
22 | |||
23 | int panic_on_unrecovered_nmi; | ||
24 | int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE; | ||
25 | static unsigned int code_bytes = 64; | ||
26 | static int die_counter; | ||
27 | |||
28 | void printk_address(unsigned long address, int reliable) | ||
29 | { | ||
30 | printk(" [<%p>] %s%pS\n", (void *) address, | ||
31 | reliable ? "" : "? ", (void *) address); | ||
32 | } | ||
33 | |||
34 | static inline int valid_stack_ptr(struct thread_info *tinfo, | ||
35 | void *p, unsigned int size, void *end) | ||
36 | { | ||
37 | void *t = tinfo; | ||
38 | if (end) { | ||
39 | if (p < end && p >= (end-THREAD_SIZE)) | ||
40 | return 1; | ||
41 | else | ||
42 | return 0; | ||
43 | } | ||
44 | return p > t && p < t + THREAD_SIZE - size; | ||
45 | } | ||
46 | |||
47 | /* The form of the top of the frame on the stack */ | ||
48 | struct stack_frame { | ||
49 | struct stack_frame *next_frame; | ||
50 | unsigned long return_address; | ||
51 | }; | ||
52 | |||
53 | static inline unsigned long | ||
54 | print_context_stack(struct thread_info *tinfo, | ||
55 | unsigned long *stack, unsigned long bp, | ||
56 | const struct stacktrace_ops *ops, void *data, | ||
57 | unsigned long *end) | ||
58 | { | ||
59 | struct stack_frame *frame = (struct stack_frame *)bp; | ||
60 | |||
61 | while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) { | ||
62 | unsigned long addr; | ||
63 | |||
64 | addr = *stack; | ||
65 | if (__kernel_text_address(addr)) { | ||
66 | if ((unsigned long) stack == bp + sizeof(long)) { | ||
67 | ops->address(data, addr, 1); | ||
68 | frame = frame->next_frame; | ||
69 | bp = (unsigned long) frame; | ||
70 | } else { | ||
71 | ops->address(data, addr, bp == 0); | ||
72 | } | ||
73 | } | ||
74 | stack++; | ||
75 | } | ||
76 | return bp; | ||
77 | } | ||
78 | 21 | ||
79 | void dump_trace(struct task_struct *task, struct pt_regs *regs, | 22 | void dump_trace(struct task_struct *task, struct pt_regs *regs, |
80 | unsigned long *stack, unsigned long bp, | 23 | unsigned long *stack, unsigned long bp, |
81 | const struct stacktrace_ops *ops, void *data) | 24 | const struct stacktrace_ops *ops, void *data) |
82 | { | 25 | { |
26 | int graph = 0; | ||
27 | |||
83 | if (!task) | 28 | if (!task) |
84 | task = current; | 29 | task = current; |
85 | 30 | ||
@@ -107,7 +52,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
107 | 52 | ||
108 | context = (struct thread_info *) | 53 | context = (struct thread_info *) |
109 | ((unsigned long)stack & (~(THREAD_SIZE - 1))); | 54 | ((unsigned long)stack & (~(THREAD_SIZE - 1))); |
110 | bp = print_context_stack(context, stack, bp, ops, data, NULL); | 55 | bp = print_context_stack(context, stack, bp, ops, |
56 | data, NULL, &graph); | ||
111 | 57 | ||
112 | stack = (unsigned long *)context->previous_esp; | 58 | stack = (unsigned long *)context->previous_esp; |
113 | if (!stack) | 59 | if (!stack) |
@@ -119,57 +65,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
119 | } | 65 | } |
120 | EXPORT_SYMBOL(dump_trace); | 66 | EXPORT_SYMBOL(dump_trace); |
121 | 67 | ||
122 | static void | 68 | void |
123 | print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
124 | { | ||
125 | printk(data); | ||
126 | print_symbol(msg, symbol); | ||
127 | printk("\n"); | ||
128 | } | ||
129 | |||
130 | static void print_trace_warning(void *data, char *msg) | ||
131 | { | ||
132 | printk("%s%s\n", (char *)data, msg); | ||
133 | } | ||
134 | |||
135 | static int print_trace_stack(void *data, char *name) | ||
136 | { | ||
137 | printk("%s <%s> ", (char *)data, name); | ||
138 | return 0; | ||
139 | } | ||
140 | |||
141 | /* | ||
142 | * Print one address/symbol entries per line. | ||
143 | */ | ||
144 | static void print_trace_address(void *data, unsigned long addr, int reliable) | ||
145 | { | ||
146 | touch_nmi_watchdog(); | ||
147 | printk(data); | ||
148 | printk_address(addr, reliable); | ||
149 | } | ||
150 | |||
151 | static const struct stacktrace_ops print_trace_ops = { | ||
152 | .warning = print_trace_warning, | ||
153 | .warning_symbol = print_trace_warning_symbol, | ||
154 | .stack = print_trace_stack, | ||
155 | .address = print_trace_address, | ||
156 | }; | ||
157 | |||
158 | static void | ||
159 | show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, | ||
160 | unsigned long *stack, unsigned long bp, char *log_lvl) | ||
161 | { | ||
162 | printk("%sCall Trace:\n", log_lvl); | ||
163 | dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl); | ||
164 | } | ||
165 | |||
166 | void show_trace(struct task_struct *task, struct pt_regs *regs, | ||
167 | unsigned long *stack, unsigned long bp) | ||
168 | { | ||
169 | show_trace_log_lvl(task, regs, stack, bp, ""); | ||
170 | } | ||
171 | |||
172 | static void | ||
173 | show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | 69 | show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, |
174 | unsigned long *sp, unsigned long bp, char *log_lvl) | 70 | unsigned long *sp, unsigned long bp, char *log_lvl) |
175 | { | 71 | { |
@@ -196,33 +92,6 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | |||
196 | show_trace_log_lvl(task, regs, sp, bp, log_lvl); | 92 | show_trace_log_lvl(task, regs, sp, bp, log_lvl); |
197 | } | 93 | } |
198 | 94 | ||
199 | void show_stack(struct task_struct *task, unsigned long *sp) | ||
200 | { | ||
201 | show_stack_log_lvl(task, NULL, sp, 0, ""); | ||
202 | } | ||
203 | |||
204 | /* | ||
205 | * The architecture-independent dump_stack generator | ||
206 | */ | ||
207 | void dump_stack(void) | ||
208 | { | ||
209 | unsigned long bp = 0; | ||
210 | unsigned long stack; | ||
211 | |||
212 | #ifdef CONFIG_FRAME_POINTER | ||
213 | if (!bp) | ||
214 | get_bp(bp); | ||
215 | #endif | ||
216 | |||
217 | printk("Pid: %d, comm: %.20s %s %s %.*s\n", | ||
218 | current->pid, current->comm, print_tainted(), | ||
219 | init_utsname()->release, | ||
220 | (int)strcspn(init_utsname()->version, " "), | ||
221 | init_utsname()->version); | ||
222 | show_trace(NULL, NULL, &stack, bp); | ||
223 | } | ||
224 | |||
225 | EXPORT_SYMBOL(dump_stack); | ||
226 | 95 | ||
227 | void show_registers(struct pt_regs *regs) | 96 | void show_registers(struct pt_regs *regs) |
228 | { | 97 | { |
@@ -283,167 +152,3 @@ int is_valid_bugaddr(unsigned long ip) | |||
283 | return ud2 == 0x0b0f; | 152 | return ud2 == 0x0b0f; |
284 | } | 153 | } |
285 | 154 | ||
286 | static raw_spinlock_t die_lock = __RAW_SPIN_LOCK_UNLOCKED; | ||
287 | static int die_owner = -1; | ||
288 | static unsigned int die_nest_count; | ||
289 | |||
290 | unsigned __kprobes long oops_begin(void) | ||
291 | { | ||
292 | unsigned long flags; | ||
293 | |||
294 | oops_enter(); | ||
295 | |||
296 | if (die_owner != raw_smp_processor_id()) { | ||
297 | console_verbose(); | ||
298 | raw_local_irq_save(flags); | ||
299 | __raw_spin_lock(&die_lock); | ||
300 | die_owner = smp_processor_id(); | ||
301 | die_nest_count = 0; | ||
302 | bust_spinlocks(1); | ||
303 | } else { | ||
304 | raw_local_irq_save(flags); | ||
305 | } | ||
306 | die_nest_count++; | ||
307 | return flags; | ||
308 | } | ||
309 | |||
310 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | ||
311 | { | ||
312 | bust_spinlocks(0); | ||
313 | die_owner = -1; | ||
314 | add_taint(TAINT_DIE); | ||
315 | __raw_spin_unlock(&die_lock); | ||
316 | raw_local_irq_restore(flags); | ||
317 | |||
318 | if (!regs) | ||
319 | return; | ||
320 | |||
321 | if (kexec_should_crash(current)) | ||
322 | crash_kexec(regs); | ||
323 | if (in_interrupt()) | ||
324 | panic("Fatal exception in interrupt"); | ||
325 | if (panic_on_oops) | ||
326 | panic("Fatal exception"); | ||
327 | oops_exit(); | ||
328 | do_exit(signr); | ||
329 | } | ||
330 | |||
331 | int __kprobes __die(const char *str, struct pt_regs *regs, long err) | ||
332 | { | ||
333 | unsigned short ss; | ||
334 | unsigned long sp; | ||
335 | |||
336 | printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); | ||
337 | #ifdef CONFIG_PREEMPT | ||
338 | printk("PREEMPT "); | ||
339 | #endif | ||
340 | #ifdef CONFIG_SMP | ||
341 | printk("SMP "); | ||
342 | #endif | ||
343 | #ifdef CONFIG_DEBUG_PAGEALLOC | ||
344 | printk("DEBUG_PAGEALLOC"); | ||
345 | #endif | ||
346 | printk("\n"); | ||
347 | sysfs_printk_last_file(); | ||
348 | if (notify_die(DIE_OOPS, str, regs, err, | ||
349 | current->thread.trap_no, SIGSEGV) == NOTIFY_STOP) | ||
350 | return 1; | ||
351 | |||
352 | show_registers(regs); | ||
353 | /* Executive summary in case the oops scrolled away */ | ||
354 | sp = (unsigned long) (®s->sp); | ||
355 | savesegment(ss, ss); | ||
356 | if (user_mode(regs)) { | ||
357 | sp = regs->sp; | ||
358 | ss = regs->ss & 0xffff; | ||
359 | } | ||
360 | printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip); | ||
361 | print_symbol("%s", regs->ip); | ||
362 | printk(" SS:ESP %04x:%08lx\n", ss, sp); | ||
363 | return 0; | ||
364 | } | ||
365 | |||
366 | /* | ||
367 | * This is gone through when something in the kernel has done something bad | ||
368 | * and is about to be terminated: | ||
369 | */ | ||
370 | void die(const char *str, struct pt_regs *regs, long err) | ||
371 | { | ||
372 | unsigned long flags = oops_begin(); | ||
373 | |||
374 | if (die_nest_count < 3) { | ||
375 | report_bug(regs->ip, regs); | ||
376 | |||
377 | if (__die(str, regs, err)) | ||
378 | regs = NULL; | ||
379 | } else { | ||
380 | printk(KERN_EMERG "Recursive die() failure, output suppressed\n"); | ||
381 | } | ||
382 | |||
383 | oops_end(flags, regs, SIGSEGV); | ||
384 | } | ||
385 | |||
386 | static DEFINE_SPINLOCK(nmi_print_lock); | ||
387 | |||
388 | void notrace __kprobes | ||
389 | die_nmi(char *str, struct pt_regs *regs, int do_panic) | ||
390 | { | ||
391 | if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP) | ||
392 | return; | ||
393 | |||
394 | spin_lock(&nmi_print_lock); | ||
395 | /* | ||
396 | * We are in trouble anyway, lets at least try | ||
397 | * to get a message out: | ||
398 | */ | ||
399 | bust_spinlocks(1); | ||
400 | printk(KERN_EMERG "%s", str); | ||
401 | printk(" on CPU%d, ip %08lx, registers:\n", | ||
402 | smp_processor_id(), regs->ip); | ||
403 | show_registers(regs); | ||
404 | if (do_panic) | ||
405 | panic("Non maskable interrupt"); | ||
406 | console_silent(); | ||
407 | spin_unlock(&nmi_print_lock); | ||
408 | |||
409 | /* | ||
410 | * If we are in kernel we are probably nested up pretty bad | ||
411 | * and might aswell get out now while we still can: | ||
412 | */ | ||
413 | if (!user_mode_vm(regs)) { | ||
414 | current->thread.trap_no = 2; | ||
415 | crash_kexec(regs); | ||
416 | } | ||
417 | |||
418 | bust_spinlocks(0); | ||
419 | do_exit(SIGSEGV); | ||
420 | } | ||
421 | |||
422 | static int __init oops_setup(char *s) | ||
423 | { | ||
424 | if (!s) | ||
425 | return -EINVAL; | ||
426 | if (!strcmp(s, "panic")) | ||
427 | panic_on_oops = 1; | ||
428 | return 0; | ||
429 | } | ||
430 | early_param("oops", oops_setup); | ||
431 | |||
432 | static int __init kstack_setup(char *s) | ||
433 | { | ||
434 | if (!s) | ||
435 | return -EINVAL; | ||
436 | kstack_depth_to_print = simple_strtoul(s, NULL, 0); | ||
437 | return 0; | ||
438 | } | ||
439 | early_param("kstack", kstack_setup); | ||
440 | |||
441 | static int __init code_bytes_setup(char *s) | ||
442 | { | ||
443 | code_bytes = simple_strtoul(s, NULL, 0); | ||
444 | if (code_bytes > 8192) | ||
445 | code_bytes = 8192; | ||
446 | |||
447 | return 1; | ||
448 | } | ||
449 | __setup("code_bytes=", code_bytes_setup); | ||
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 96a5db7da8a7..c302d0707048 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c | |||
@@ -17,19 +17,7 @@ | |||
17 | 17 | ||
18 | #include <asm/stacktrace.h> | 18 | #include <asm/stacktrace.h> |
19 | 19 | ||
20 | #define STACKSLOTS_PER_LINE 4 | 20 | #include "dumpstack.h" |
21 | #define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :) | ||
22 | |||
23 | int panic_on_unrecovered_nmi; | ||
24 | int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE; | ||
25 | static unsigned int code_bytes = 64; | ||
26 | static int die_counter; | ||
27 | |||
28 | void printk_address(unsigned long address, int reliable) | ||
29 | { | ||
30 | printk(" [<%p>] %s%pS\n", (void *) address, | ||
31 | reliable ? "" : "? ", (void *) address); | ||
32 | } | ||
33 | 21 | ||
34 | static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack, | 22 | static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack, |
35 | unsigned *usedp, char **idp) | 23 | unsigned *usedp, char **idp) |
@@ -113,51 +101,6 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack, | |||
113 | * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack | 101 | * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack |
114 | */ | 102 | */ |
115 | 103 | ||
116 | static inline int valid_stack_ptr(struct thread_info *tinfo, | ||
117 | void *p, unsigned int size, void *end) | ||
118 | { | ||
119 | void *t = tinfo; | ||
120 | if (end) { | ||
121 | if (p < end && p >= (end-THREAD_SIZE)) | ||
122 | return 1; | ||
123 | else | ||
124 | return 0; | ||
125 | } | ||
126 | return p > t && p < t + THREAD_SIZE - size; | ||
127 | } | ||
128 | |||
129 | /* The form of the top of the frame on the stack */ | ||
130 | struct stack_frame { | ||
131 | struct stack_frame *next_frame; | ||
132 | unsigned long return_address; | ||
133 | }; | ||
134 | |||
135 | static inline unsigned long | ||
136 | print_context_stack(struct thread_info *tinfo, | ||
137 | unsigned long *stack, unsigned long bp, | ||
138 | const struct stacktrace_ops *ops, void *data, | ||
139 | unsigned long *end) | ||
140 | { | ||
141 | struct stack_frame *frame = (struct stack_frame *)bp; | ||
142 | |||
143 | while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) { | ||
144 | unsigned long addr; | ||
145 | |||
146 | addr = *stack; | ||
147 | if (__kernel_text_address(addr)) { | ||
148 | if ((unsigned long) stack == bp + sizeof(long)) { | ||
149 | ops->address(data, addr, 1); | ||
150 | frame = frame->next_frame; | ||
151 | bp = (unsigned long) frame; | ||
152 | } else { | ||
153 | ops->address(data, addr, bp == 0); | ||
154 | } | ||
155 | } | ||
156 | stack++; | ||
157 | } | ||
158 | return bp; | ||
159 | } | ||
160 | |||
161 | void dump_trace(struct task_struct *task, struct pt_regs *regs, | 104 | void dump_trace(struct task_struct *task, struct pt_regs *regs, |
162 | unsigned long *stack, unsigned long bp, | 105 | unsigned long *stack, unsigned long bp, |
163 | const struct stacktrace_ops *ops, void *data) | 106 | const struct stacktrace_ops *ops, void *data) |
@@ -166,6 +109,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
166 | unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)->irqstackptr; | 109 | unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)->irqstackptr; |
167 | unsigned used = 0; | 110 | unsigned used = 0; |
168 | struct thread_info *tinfo; | 111 | struct thread_info *tinfo; |
112 | int graph = 0; | ||
169 | 113 | ||
170 | if (!task) | 114 | if (!task) |
171 | task = current; | 115 | task = current; |
@@ -206,7 +150,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
206 | break; | 150 | break; |
207 | 151 | ||
208 | bp = print_context_stack(tinfo, stack, bp, ops, | 152 | bp = print_context_stack(tinfo, stack, bp, ops, |
209 | data, estack_end); | 153 | data, estack_end, &graph); |
210 | ops->stack(data, "<EOE>"); | 154 | ops->stack(data, "<EOE>"); |
211 | /* | 155 | /* |
212 | * We link to the next stack via the | 156 | * We link to the next stack via the |
@@ -225,7 +169,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
225 | if (ops->stack(data, "IRQ") < 0) | 169 | if (ops->stack(data, "IRQ") < 0) |
226 | break; | 170 | break; |
227 | bp = print_context_stack(tinfo, stack, bp, | 171 | bp = print_context_stack(tinfo, stack, bp, |
228 | ops, data, irqstack_end); | 172 | ops, data, irqstack_end, &graph); |
229 | /* | 173 | /* |
230 | * We link to the next stack (which would be | 174 | * We link to the next stack (which would be |
231 | * the process stack normally) the last | 175 | * the process stack normally) the last |
@@ -243,62 +187,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
243 | /* | 187 | /* |
244 | * This handles the process stack: | 188 | * This handles the process stack: |
245 | */ | 189 | */ |
246 | bp = print_context_stack(tinfo, stack, bp, ops, data, NULL); | 190 | bp = print_context_stack(tinfo, stack, bp, ops, data, NULL, &graph); |
247 | put_cpu(); | 191 | put_cpu(); |
248 | } | 192 | } |
249 | EXPORT_SYMBOL(dump_trace); | 193 | EXPORT_SYMBOL(dump_trace); |
250 | 194 | ||
251 | static void | 195 | void |
252 | print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) | ||
253 | { | ||
254 | printk(data); | ||
255 | print_symbol(msg, symbol); | ||
256 | printk("\n"); | ||
257 | } | ||
258 | |||
259 | static void print_trace_warning(void *data, char *msg) | ||
260 | { | ||
261 | printk("%s%s\n", (char *)data, msg); | ||
262 | } | ||
263 | |||
264 | static int print_trace_stack(void *data, char *name) | ||
265 | { | ||
266 | printk("%s <%s> ", (char *)data, name); | ||
267 | return 0; | ||
268 | } | ||
269 | |||
270 | /* | ||
271 | * Print one address/symbol entries per line. | ||
272 | */ | ||
273 | static void print_trace_address(void *data, unsigned long addr, int reliable) | ||
274 | { | ||
275 | touch_nmi_watchdog(); | ||
276 | printk(data); | ||
277 | printk_address(addr, reliable); | ||
278 | } | ||
279 | |||
280 | static const struct stacktrace_ops print_trace_ops = { | ||
281 | .warning = print_trace_warning, | ||
282 | .warning_symbol = print_trace_warning_symbol, | ||
283 | .stack = print_trace_stack, | ||
284 | .address = print_trace_address, | ||
285 | }; | ||
286 | |||
287 | static void | ||
288 | show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, | ||
289 | unsigned long *stack, unsigned long bp, char *log_lvl) | ||
290 | { | ||
291 | printk("%sCall Trace:\n", log_lvl); | ||
292 | dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl); | ||
293 | } | ||
294 | |||
295 | void show_trace(struct task_struct *task, struct pt_regs *regs, | ||
296 | unsigned long *stack, unsigned long bp) | ||
297 | { | ||
298 | show_trace_log_lvl(task, regs, stack, bp, ""); | ||
299 | } | ||
300 | |||
301 | static void | ||
302 | show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | 196 | show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, |
303 | unsigned long *sp, unsigned long bp, char *log_lvl) | 197 | unsigned long *sp, unsigned long bp, char *log_lvl) |
304 | { | 198 | { |
@@ -342,33 +236,6 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | |||
342 | show_trace_log_lvl(task, regs, sp, bp, log_lvl); | 236 | show_trace_log_lvl(task, regs, sp, bp, log_lvl); |
343 | } | 237 | } |
344 | 238 | ||
345 | void show_stack(struct task_struct *task, unsigned long *sp) | ||
346 | { | ||
347 | show_stack_log_lvl(task, NULL, sp, 0, ""); | ||
348 | } | ||
349 | |||
350 | /* | ||
351 | * The architecture-independent dump_stack generator | ||
352 | */ | ||
353 | void dump_stack(void) | ||
354 | { | ||
355 | unsigned long bp = 0; | ||
356 | unsigned long stack; | ||
357 | |||
358 | #ifdef CONFIG_FRAME_POINTER | ||
359 | if (!bp) | ||
360 | get_bp(bp); | ||
361 | #endif | ||
362 | |||
363 | printk("Pid: %d, comm: %.20s %s %s %.*s\n", | ||
364 | current->pid, current->comm, print_tainted(), | ||
365 | init_utsname()->release, | ||
366 | (int)strcspn(init_utsname()->version, " "), | ||
367 | init_utsname()->version); | ||
368 | show_trace(NULL, NULL, &stack, bp); | ||
369 | } | ||
370 | EXPORT_SYMBOL(dump_stack); | ||
371 | |||
372 | void show_registers(struct pt_regs *regs) | 239 | void show_registers(struct pt_regs *regs) |
373 | { | 240 | { |
374 | int i; | 241 | int i; |
@@ -429,147 +296,3 @@ int is_valid_bugaddr(unsigned long ip) | |||
429 | return ud2 == 0x0b0f; | 296 | return ud2 == 0x0b0f; |
430 | } | 297 | } |
431 | 298 | ||
432 | static raw_spinlock_t die_lock = __RAW_SPIN_LOCK_UNLOCKED; | ||
433 | static int die_owner = -1; | ||
434 | static unsigned int die_nest_count; | ||
435 | |||
436 | unsigned __kprobes long oops_begin(void) | ||
437 | { | ||
438 | int cpu; | ||
439 | unsigned long flags; | ||
440 | |||
441 | oops_enter(); | ||
442 | |||
443 | /* racy, but better than risking deadlock. */ | ||
444 | raw_local_irq_save(flags); | ||
445 | cpu = smp_processor_id(); | ||
446 | if (!__raw_spin_trylock(&die_lock)) { | ||
447 | if (cpu == die_owner) | ||
448 | /* nested oops. should stop eventually */; | ||
449 | else | ||
450 | __raw_spin_lock(&die_lock); | ||
451 | } | ||
452 | die_nest_count++; | ||
453 | die_owner = cpu; | ||
454 | console_verbose(); | ||
455 | bust_spinlocks(1); | ||
456 | return flags; | ||
457 | } | ||
458 | |||
459 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | ||
460 | { | ||
461 | die_owner = -1; | ||
462 | bust_spinlocks(0); | ||
463 | die_nest_count--; | ||
464 | if (!die_nest_count) | ||
465 | /* Nest count reaches zero, release the lock. */ | ||
466 | __raw_spin_unlock(&die_lock); | ||
467 | raw_local_irq_restore(flags); | ||
468 | if (!regs) { | ||
469 | oops_exit(); | ||
470 | return; | ||
471 | } | ||
472 | if (in_interrupt()) | ||
473 | panic("Fatal exception in interrupt"); | ||
474 | if (panic_on_oops) | ||
475 | panic("Fatal exception"); | ||
476 | oops_exit(); | ||
477 | do_exit(signr); | ||
478 | } | ||
479 | |||
480 | int __kprobes __die(const char *str, struct pt_regs *regs, long err) | ||
481 | { | ||
482 | printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); | ||
483 | #ifdef CONFIG_PREEMPT | ||
484 | printk("PREEMPT "); | ||
485 | #endif | ||
486 | #ifdef CONFIG_SMP | ||
487 | printk("SMP "); | ||
488 | #endif | ||
489 | #ifdef CONFIG_DEBUG_PAGEALLOC | ||
490 | printk("DEBUG_PAGEALLOC"); | ||
491 | #endif | ||
492 | printk("\n"); | ||
493 | sysfs_printk_last_file(); | ||
494 | if (notify_die(DIE_OOPS, str, regs, err, | ||
495 | current->thread.trap_no, SIGSEGV) == NOTIFY_STOP) | ||
496 | return 1; | ||
497 | |||
498 | show_registers(regs); | ||
499 | add_taint(TAINT_DIE); | ||
500 | /* Executive summary in case the oops scrolled away */ | ||
501 | printk(KERN_ALERT "RIP "); | ||
502 | printk_address(regs->ip, 1); | ||
503 | printk(" RSP <%016lx>\n", regs->sp); | ||
504 | if (kexec_should_crash(current)) | ||
505 | crash_kexec(regs); | ||
506 | return 0; | ||
507 | } | ||
508 | |||
509 | void die(const char *str, struct pt_regs *regs, long err) | ||
510 | { | ||
511 | unsigned long flags = oops_begin(); | ||
512 | |||
513 | if (!user_mode(regs)) | ||
514 | report_bug(regs->ip, regs); | ||
515 | |||
516 | if (__die(str, regs, err)) | ||
517 | regs = NULL; | ||
518 | oops_end(flags, regs, SIGSEGV); | ||
519 | } | ||
520 | |||
521 | notrace __kprobes void | ||
522 | die_nmi(char *str, struct pt_regs *regs, int do_panic) | ||
523 | { | ||
524 | unsigned long flags; | ||
525 | |||
526 | if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP) | ||
527 | return; | ||
528 | |||
529 | flags = oops_begin(); | ||
530 | /* | ||
531 | * We are in trouble anyway, lets at least try | ||
532 | * to get a message out. | ||
533 | */ | ||
534 | printk(KERN_EMERG "%s", str); | ||
535 | printk(" on CPU%d, ip %08lx, registers:\n", | ||
536 | smp_processor_id(), regs->ip); | ||
537 | show_registers(regs); | ||
538 | if (kexec_should_crash(current)) | ||
539 | crash_kexec(regs); | ||
540 | if (do_panic || panic_on_oops) | ||
541 | panic("Non maskable interrupt"); | ||
542 | oops_end(flags, NULL, SIGBUS); | ||
543 | nmi_exit(); | ||
544 | local_irq_enable(); | ||
545 | do_exit(SIGBUS); | ||
546 | } | ||
547 | |||
548 | static int __init oops_setup(char *s) | ||
549 | { | ||
550 | if (!s) | ||
551 | return -EINVAL; | ||
552 | if (!strcmp(s, "panic")) | ||
553 | panic_on_oops = 1; | ||
554 | return 0; | ||
555 | } | ||
556 | early_param("oops", oops_setup); | ||
557 | |||
558 | static int __init kstack_setup(char *s) | ||
559 | { | ||
560 | if (!s) | ||
561 | return -EINVAL; | ||
562 | kstack_depth_to_print = simple_strtoul(s, NULL, 0); | ||
563 | return 0; | ||
564 | } | ||
565 | early_param("kstack", kstack_setup); | ||
566 | |||
567 | static int __init code_bytes_setup(char *s) | ||
568 | { | ||
569 | code_bytes = simple_strtoul(s, NULL, 0); | ||
570 | if (code_bytes > 8192) | ||
571 | code_bytes = 8192; | ||
572 | |||
573 | return 1; | ||
574 | } | ||
575 | __setup("code_bytes=", code_bytes_setup); | ||
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 3ce029ffaa55..1b894b72c0f5 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c | |||
@@ -188,20 +188,6 @@ static void __init ati_bugs_contd(int num, int slot, int func) | |||
188 | } | 188 | } |
189 | #endif | 189 | #endif |
190 | 190 | ||
191 | #ifdef CONFIG_DMAR | ||
192 | static void __init intel_g33_dmar(int num, int slot, int func) | ||
193 | { | ||
194 | struct acpi_table_header *dmar_tbl; | ||
195 | acpi_status status; | ||
196 | |||
197 | status = acpi_get_table(ACPI_SIG_DMAR, 0, &dmar_tbl); | ||
198 | if (ACPI_SUCCESS(status)) { | ||
199 | printk(KERN_INFO "BIOS BUG: DMAR advertised on Intel G31/G33 chipset -- ignoring\n"); | ||
200 | dmar_disabled = 1; | ||
201 | } | ||
202 | } | ||
203 | #endif | ||
204 | |||
205 | #define QFLAG_APPLY_ONCE 0x1 | 191 | #define QFLAG_APPLY_ONCE 0x1 |
206 | #define QFLAG_APPLIED 0x2 | 192 | #define QFLAG_APPLIED 0x2 |
207 | #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) | 193 | #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) |
@@ -225,10 +211,6 @@ static struct chipset early_qrk[] __initdata = { | |||
225 | PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs }, | 211 | PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs }, |
226 | { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, | 212 | { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, |
227 | PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs_contd }, | 213 | PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs_contd }, |
228 | #ifdef CONFIG_DMAR | ||
229 | { PCI_VENDOR_ID_INTEL, 0x29c0, | ||
230 | PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, intel_g33_dmar }, | ||
231 | #endif | ||
232 | {} | 214 | {} |
233 | }; | 215 | }; |
234 | 216 | ||
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 28b597ef9ca1..43ceb3f454bf 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -1157,6 +1157,9 @@ ENTRY(mcount) | |||
1157 | END(mcount) | 1157 | END(mcount) |
1158 | 1158 | ||
1159 | ENTRY(ftrace_caller) | 1159 | ENTRY(ftrace_caller) |
1160 | cmpl $0, function_trace_stop | ||
1161 | jne ftrace_stub | ||
1162 | |||
1160 | pushl %eax | 1163 | pushl %eax |
1161 | pushl %ecx | 1164 | pushl %ecx |
1162 | pushl %edx | 1165 | pushl %edx |
@@ -1171,6 +1174,11 @@ ftrace_call: | |||
1171 | popl %edx | 1174 | popl %edx |
1172 | popl %ecx | 1175 | popl %ecx |
1173 | popl %eax | 1176 | popl %eax |
1177 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
1178 | .globl ftrace_graph_call | ||
1179 | ftrace_graph_call: | ||
1180 | jmp ftrace_stub | ||
1181 | #endif | ||
1174 | 1182 | ||
1175 | .globl ftrace_stub | 1183 | .globl ftrace_stub |
1176 | ftrace_stub: | 1184 | ftrace_stub: |
@@ -1180,8 +1188,18 @@ END(ftrace_caller) | |||
1180 | #else /* ! CONFIG_DYNAMIC_FTRACE */ | 1188 | #else /* ! CONFIG_DYNAMIC_FTRACE */ |
1181 | 1189 | ||
1182 | ENTRY(mcount) | 1190 | ENTRY(mcount) |
1191 | cmpl $0, function_trace_stop | ||
1192 | jne ftrace_stub | ||
1193 | |||
1183 | cmpl $ftrace_stub, ftrace_trace_function | 1194 | cmpl $ftrace_stub, ftrace_trace_function |
1184 | jnz trace | 1195 | jnz trace |
1196 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
1197 | cmpl $ftrace_stub, ftrace_graph_return | ||
1198 | jnz ftrace_graph_caller | ||
1199 | |||
1200 | cmpl $ftrace_graph_entry_stub, ftrace_graph_entry | ||
1201 | jnz ftrace_graph_caller | ||
1202 | #endif | ||
1185 | .globl ftrace_stub | 1203 | .globl ftrace_stub |
1186 | ftrace_stub: | 1204 | ftrace_stub: |
1187 | ret | 1205 | ret |
@@ -1200,12 +1218,43 @@ trace: | |||
1200 | popl %edx | 1218 | popl %edx |
1201 | popl %ecx | 1219 | popl %ecx |
1202 | popl %eax | 1220 | popl %eax |
1203 | |||
1204 | jmp ftrace_stub | 1221 | jmp ftrace_stub |
1205 | END(mcount) | 1222 | END(mcount) |
1206 | #endif /* CONFIG_DYNAMIC_FTRACE */ | 1223 | #endif /* CONFIG_DYNAMIC_FTRACE */ |
1207 | #endif /* CONFIG_FUNCTION_TRACER */ | 1224 | #endif /* CONFIG_FUNCTION_TRACER */ |
1208 | 1225 | ||
1226 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
1227 | ENTRY(ftrace_graph_caller) | ||
1228 | cmpl $0, function_trace_stop | ||
1229 | jne ftrace_stub | ||
1230 | |||
1231 | pushl %eax | ||
1232 | pushl %ecx | ||
1233 | pushl %edx | ||
1234 | movl 0xc(%esp), %edx | ||
1235 | lea 0x4(%ebp), %eax | ||
1236 | subl $MCOUNT_INSN_SIZE, %edx | ||
1237 | call prepare_ftrace_return | ||
1238 | popl %edx | ||
1239 | popl %ecx | ||
1240 | popl %eax | ||
1241 | ret | ||
1242 | END(ftrace_graph_caller) | ||
1243 | |||
1244 | .globl return_to_handler | ||
1245 | return_to_handler: | ||
1246 | pushl $0 | ||
1247 | pushl %eax | ||
1248 | pushl %ecx | ||
1249 | pushl %edx | ||
1250 | call ftrace_return_to_handler | ||
1251 | movl %eax, 0xc(%esp) | ||
1252 | popl %edx | ||
1253 | popl %ecx | ||
1254 | popl %eax | ||
1255 | ret | ||
1256 | #endif | ||
1257 | |||
1209 | .section .rodata,"a" | 1258 | .section .rodata,"a" |
1210 | #include "syscall_table_32.S" | 1259 | #include "syscall_table_32.S" |
1211 | 1260 | ||
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index b86f332c96a6..54e0bbdccb99 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -68,6 +68,8 @@ ENTRY(mcount) | |||
68 | END(mcount) | 68 | END(mcount) |
69 | 69 | ||
70 | ENTRY(ftrace_caller) | 70 | ENTRY(ftrace_caller) |
71 | cmpl $0, function_trace_stop | ||
72 | jne ftrace_stub | ||
71 | 73 | ||
72 | /* taken from glibc */ | 74 | /* taken from glibc */ |
73 | subq $0x38, %rsp | 75 | subq $0x38, %rsp |
@@ -96,6 +98,12 @@ ftrace_call: | |||
96 | movq (%rsp), %rax | 98 | movq (%rsp), %rax |
97 | addq $0x38, %rsp | 99 | addq $0x38, %rsp |
98 | 100 | ||
101 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
102 | .globl ftrace_graph_call | ||
103 | ftrace_graph_call: | ||
104 | jmp ftrace_stub | ||
105 | #endif | ||
106 | |||
99 | .globl ftrace_stub | 107 | .globl ftrace_stub |
100 | ftrace_stub: | 108 | ftrace_stub: |
101 | retq | 109 | retq |
@@ -103,8 +111,20 @@ END(ftrace_caller) | |||
103 | 111 | ||
104 | #else /* ! CONFIG_DYNAMIC_FTRACE */ | 112 | #else /* ! CONFIG_DYNAMIC_FTRACE */ |
105 | ENTRY(mcount) | 113 | ENTRY(mcount) |
114 | cmpl $0, function_trace_stop | ||
115 | jne ftrace_stub | ||
116 | |||
106 | cmpq $ftrace_stub, ftrace_trace_function | 117 | cmpq $ftrace_stub, ftrace_trace_function |
107 | jnz trace | 118 | jnz trace |
119 | |||
120 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
121 | cmpq $ftrace_stub, ftrace_graph_return | ||
122 | jnz ftrace_graph_caller | ||
123 | |||
124 | cmpq $ftrace_graph_entry_stub, ftrace_graph_entry | ||
125 | jnz ftrace_graph_caller | ||
126 | #endif | ||
127 | |||
108 | .globl ftrace_stub | 128 | .globl ftrace_stub |
109 | ftrace_stub: | 129 | ftrace_stub: |
110 | retq | 130 | retq |
@@ -140,6 +160,69 @@ END(mcount) | |||
140 | #endif /* CONFIG_DYNAMIC_FTRACE */ | 160 | #endif /* CONFIG_DYNAMIC_FTRACE */ |
141 | #endif /* CONFIG_FUNCTION_TRACER */ | 161 | #endif /* CONFIG_FUNCTION_TRACER */ |
142 | 162 | ||
163 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
164 | ENTRY(ftrace_graph_caller) | ||
165 | cmpl $0, function_trace_stop | ||
166 | jne ftrace_stub | ||
167 | |||
168 | subq $0x38, %rsp | ||
169 | movq %rax, (%rsp) | ||
170 | movq %rcx, 8(%rsp) | ||
171 | movq %rdx, 16(%rsp) | ||
172 | movq %rsi, 24(%rsp) | ||
173 | movq %rdi, 32(%rsp) | ||
174 | movq %r8, 40(%rsp) | ||
175 | movq %r9, 48(%rsp) | ||
176 | |||
177 | leaq 8(%rbp), %rdi | ||
178 | movq 0x38(%rsp), %rsi | ||
179 | subq $MCOUNT_INSN_SIZE, %rsi | ||
180 | |||
181 | call prepare_ftrace_return | ||
182 | |||
183 | movq 48(%rsp), %r9 | ||
184 | movq 40(%rsp), %r8 | ||
185 | movq 32(%rsp), %rdi | ||
186 | movq 24(%rsp), %rsi | ||
187 | movq 16(%rsp), %rdx | ||
188 | movq 8(%rsp), %rcx | ||
189 | movq (%rsp), %rax | ||
190 | addq $0x38, %rsp | ||
191 | retq | ||
192 | END(ftrace_graph_caller) | ||
193 | |||
194 | |||
195 | .globl return_to_handler | ||
196 | return_to_handler: | ||
197 | subq $80, %rsp | ||
198 | |||
199 | movq %rax, (%rsp) | ||
200 | movq %rcx, 8(%rsp) | ||
201 | movq %rdx, 16(%rsp) | ||
202 | movq %rsi, 24(%rsp) | ||
203 | movq %rdi, 32(%rsp) | ||
204 | movq %r8, 40(%rsp) | ||
205 | movq %r9, 48(%rsp) | ||
206 | movq %r10, 56(%rsp) | ||
207 | movq %r11, 64(%rsp) | ||
208 | |||
209 | call ftrace_return_to_handler | ||
210 | |||
211 | movq %rax, 72(%rsp) | ||
212 | movq 64(%rsp), %r11 | ||
213 | movq 56(%rsp), %r10 | ||
214 | movq 48(%rsp), %r9 | ||
215 | movq 40(%rsp), %r8 | ||
216 | movq 32(%rsp), %rdi | ||
217 | movq 24(%rsp), %rsi | ||
218 | movq 16(%rsp), %rdx | ||
219 | movq 8(%rsp), %rcx | ||
220 | movq (%rsp), %rax | ||
221 | addq $72, %rsp | ||
222 | retq | ||
223 | #endif | ||
224 | |||
225 | |||
143 | #ifndef CONFIG_PREEMPT | 226 | #ifndef CONFIG_PREEMPT |
144 | #define retint_kernel retint_restore_args | 227 | #define retint_kernel retint_restore_args |
145 | #endif | 228 | #endif |
diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c index f454c78fcef6..53699c931ad4 100644 --- a/arch/x86/kernel/es7000_32.c +++ b/arch/x86/kernel/es7000_32.c | |||
@@ -38,8 +38,11 @@ | |||
38 | #include <asm/io.h> | 38 | #include <asm/io.h> |
39 | #include <asm/nmi.h> | 39 | #include <asm/nmi.h> |
40 | #include <asm/smp.h> | 40 | #include <asm/smp.h> |
41 | #include <asm/atomic.h> | ||
41 | #include <asm/apicdef.h> | 42 | #include <asm/apicdef.h> |
42 | #include <mach_mpparse.h> | 43 | #include <mach_mpparse.h> |
44 | #include <asm/genapic.h> | ||
45 | #include <asm/setup.h> | ||
43 | 46 | ||
44 | /* | 47 | /* |
45 | * ES7000 chipsets | 48 | * ES7000 chipsets |
@@ -161,6 +164,43 @@ es7000_rename_gsi(int ioapic, int gsi) | |||
161 | return gsi; | 164 | return gsi; |
162 | } | 165 | } |
163 | 166 | ||
167 | static int wakeup_secondary_cpu_via_mip(int cpu, unsigned long eip) | ||
168 | { | ||
169 | unsigned long vect = 0, psaival = 0; | ||
170 | |||
171 | if (psai == NULL) | ||
172 | return -1; | ||
173 | |||
174 | vect = ((unsigned long)__pa(eip)/0x1000) << 16; | ||
175 | psaival = (0x1000000 | vect | cpu); | ||
176 | |||
177 | while (*psai & 0x1000000) | ||
178 | ; | ||
179 | |||
180 | *psai = psaival; | ||
181 | |||
182 | return 0; | ||
183 | } | ||
184 | |||
185 | static void noop_wait_for_deassert(atomic_t *deassert_not_used) | ||
186 | { | ||
187 | } | ||
188 | |||
189 | static int __init es7000_update_genapic(void) | ||
190 | { | ||
191 | genapic->wakeup_cpu = wakeup_secondary_cpu_via_mip; | ||
192 | |||
193 | /* MPENTIUMIII */ | ||
194 | if (boot_cpu_data.x86 == 6 && | ||
195 | (boot_cpu_data.x86_model >= 7 || boot_cpu_data.x86_model <= 11)) { | ||
196 | es7000_update_genapic_to_cluster(); | ||
197 | genapic->wait_for_init_deassert = noop_wait_for_deassert; | ||
198 | genapic->wakeup_cpu = wakeup_secondary_cpu_via_mip; | ||
199 | } | ||
200 | |||
201 | return 0; | ||
202 | } | ||
203 | |||
164 | void __init | 204 | void __init |
165 | setup_unisys(void) | 205 | setup_unisys(void) |
166 | { | 206 | { |
@@ -176,6 +216,8 @@ setup_unisys(void) | |||
176 | else | 216 | else |
177 | es7000_plat = ES7000_CLASSIC; | 217 | es7000_plat = ES7000_CLASSIC; |
178 | ioapic_renumber_irq = es7000_rename_gsi; | 218 | ioapic_renumber_irq = es7000_rename_gsi; |
219 | |||
220 | x86_quirks->update_genapic = es7000_update_genapic; | ||
179 | } | 221 | } |
180 | 222 | ||
181 | /* | 223 | /* |
@@ -250,31 +292,24 @@ int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) | |||
250 | { | 292 | { |
251 | struct acpi_table_header *header = NULL; | 293 | struct acpi_table_header *header = NULL; |
252 | int i = 0; | 294 | int i = 0; |
253 | acpi_size tbl_size; | ||
254 | 295 | ||
255 | while (ACPI_SUCCESS(acpi_get_table_with_size("OEM1", i++, &header, &tbl_size))) { | 296 | while (ACPI_SUCCESS(acpi_get_table("OEM1", i++, &header))) { |
256 | if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) { | 297 | if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) { |
257 | struct oem_table *t = (struct oem_table *)header; | 298 | struct oem_table *t = (struct oem_table *)header; |
258 | 299 | ||
259 | oem_addrX = t->OEMTableAddr; | 300 | oem_addrX = t->OEMTableAddr; |
260 | oem_size = t->OEMTableSize; | 301 | oem_size = t->OEMTableSize; |
261 | early_acpi_os_unmap_memory(header, tbl_size); | ||
262 | 302 | ||
263 | *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, | 303 | *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, |
264 | oem_size); | 304 | oem_size); |
265 | return 0; | 305 | return 0; |
266 | } | 306 | } |
267 | early_acpi_os_unmap_memory(header, tbl_size); | ||
268 | } | 307 | } |
269 | return -1; | 308 | return -1; |
270 | } | 309 | } |
271 | 310 | ||
272 | void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) | 311 | void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) |
273 | { | 312 | { |
274 | if (!oem_addr) | ||
275 | return; | ||
276 | |||
277 | __acpi_unmap_table((char *)oem_addr, oem_size); | ||
278 | } | 313 | } |
279 | #endif | 314 | #endif |
280 | 315 | ||
@@ -324,26 +359,6 @@ es7000_mip_write(struct mip_reg *mip_reg) | |||
324 | return status; | 359 | return status; |
325 | } | 360 | } |
326 | 361 | ||
327 | int | ||
328 | es7000_start_cpu(int cpu, unsigned long eip) | ||
329 | { | ||
330 | unsigned long vect = 0, psaival = 0; | ||
331 | |||
332 | if (psai == NULL) | ||
333 | return -1; | ||
334 | |||
335 | vect = ((unsigned long)__pa(eip)/0x1000) << 16; | ||
336 | psaival = (0x1000000 | vect | cpu); | ||
337 | |||
338 | while (*psai & 0x1000000) | ||
339 | ; | ||
340 | |||
341 | *psai = psaival; | ||
342 | |||
343 | return 0; | ||
344 | |||
345 | } | ||
346 | |||
347 | void __init | 362 | void __init |
348 | es7000_sw_apic(void) | 363 | es7000_sw_apic(void) |
349 | { | 364 | { |
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 50ea0ac8c9bf..1b43086b097a 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
@@ -14,14 +14,17 @@ | |||
14 | #include <linux/uaccess.h> | 14 | #include <linux/uaccess.h> |
15 | #include <linux/ftrace.h> | 15 | #include <linux/ftrace.h> |
16 | #include <linux/percpu.h> | 16 | #include <linux/percpu.h> |
17 | #include <linux/sched.h> | ||
17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
18 | #include <linux/list.h> | 19 | #include <linux/list.h> |
19 | 20 | ||
20 | #include <asm/ftrace.h> | 21 | #include <asm/ftrace.h> |
22 | #include <linux/ftrace.h> | ||
21 | #include <asm/nops.h> | 23 | #include <asm/nops.h> |
24 | #include <asm/nmi.h> | ||
22 | 25 | ||
23 | 26 | ||
24 | static unsigned char ftrace_nop[MCOUNT_INSN_SIZE]; | 27 | #ifdef CONFIG_DYNAMIC_FTRACE |
25 | 28 | ||
26 | union ftrace_code_union { | 29 | union ftrace_code_union { |
27 | char code[MCOUNT_INSN_SIZE]; | 30 | char code[MCOUNT_INSN_SIZE]; |
@@ -31,18 +34,12 @@ union ftrace_code_union { | |||
31 | } __attribute__((packed)); | 34 | } __attribute__((packed)); |
32 | }; | 35 | }; |
33 | 36 | ||
34 | |||
35 | static int ftrace_calc_offset(long ip, long addr) | 37 | static int ftrace_calc_offset(long ip, long addr) |
36 | { | 38 | { |
37 | return (int)(addr - ip); | 39 | return (int)(addr - ip); |
38 | } | 40 | } |
39 | 41 | ||
40 | unsigned char *ftrace_nop_replace(void) | 42 | static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) |
41 | { | ||
42 | return ftrace_nop; | ||
43 | } | ||
44 | |||
45 | unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) | ||
46 | { | 43 | { |
47 | static union ftrace_code_union calc; | 44 | static union ftrace_code_union calc; |
48 | 45 | ||
@@ -56,7 +53,142 @@ unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) | |||
56 | return calc.code; | 53 | return calc.code; |
57 | } | 54 | } |
58 | 55 | ||
59 | int | 56 | /* |
57 | * Modifying code must take extra care. On an SMP machine, if | ||
58 | * the code being modified is also being executed on another CPU | ||
59 | * that CPU will have undefined results and possibly take a GPF. | ||
60 | * We use kstop_machine to stop other CPUS from exectuing code. | ||
61 | * But this does not stop NMIs from happening. We still need | ||
62 | * to protect against that. We separate out the modification of | ||
63 | * the code to take care of this. | ||
64 | * | ||
65 | * Two buffers are added: An IP buffer and a "code" buffer. | ||
66 | * | ||
67 | * 1) Put the instruction pointer into the IP buffer | ||
68 | * and the new code into the "code" buffer. | ||
69 | * 2) Set a flag that says we are modifying code | ||
70 | * 3) Wait for any running NMIs to finish. | ||
71 | * 4) Write the code | ||
72 | * 5) clear the flag. | ||
73 | * 6) Wait for any running NMIs to finish. | ||
74 | * | ||
75 | * If an NMI is executed, the first thing it does is to call | ||
76 | * "ftrace_nmi_enter". This will check if the flag is set to write | ||
77 | * and if it is, it will write what is in the IP and "code" buffers. | ||
78 | * | ||
79 | * The trick is, it does not matter if everyone is writing the same | ||
80 | * content to the code location. Also, if a CPU is executing code | ||
81 | * it is OK to write to that code location if the contents being written | ||
82 | * are the same as what exists. | ||
83 | */ | ||
84 | |||
85 | static atomic_t in_nmi = ATOMIC_INIT(0); | ||
86 | static int mod_code_status; /* holds return value of text write */ | ||
87 | static int mod_code_write; /* set when NMI should do the write */ | ||
88 | static void *mod_code_ip; /* holds the IP to write to */ | ||
89 | static void *mod_code_newcode; /* holds the text to write to the IP */ | ||
90 | |||
91 | static unsigned nmi_wait_count; | ||
92 | static atomic_t nmi_update_count = ATOMIC_INIT(0); | ||
93 | |||
94 | int ftrace_arch_read_dyn_info(char *buf, int size) | ||
95 | { | ||
96 | int r; | ||
97 | |||
98 | r = snprintf(buf, size, "%u %u", | ||
99 | nmi_wait_count, | ||
100 | atomic_read(&nmi_update_count)); | ||
101 | return r; | ||
102 | } | ||
103 | |||
104 | static void ftrace_mod_code(void) | ||
105 | { | ||
106 | /* | ||
107 | * Yes, more than one CPU process can be writing to mod_code_status. | ||
108 | * (and the code itself) | ||
109 | * But if one were to fail, then they all should, and if one were | ||
110 | * to succeed, then they all should. | ||
111 | */ | ||
112 | mod_code_status = probe_kernel_write(mod_code_ip, mod_code_newcode, | ||
113 | MCOUNT_INSN_SIZE); | ||
114 | } | ||
115 | |||
116 | void ftrace_nmi_enter(void) | ||
117 | { | ||
118 | atomic_inc(&in_nmi); | ||
119 | /* Must have in_nmi seen before reading write flag */ | ||
120 | smp_mb(); | ||
121 | if (mod_code_write) { | ||
122 | ftrace_mod_code(); | ||
123 | atomic_inc(&nmi_update_count); | ||
124 | } | ||
125 | } | ||
126 | |||
127 | void ftrace_nmi_exit(void) | ||
128 | { | ||
129 | /* Finish all executions before clearing in_nmi */ | ||
130 | smp_wmb(); | ||
131 | atomic_dec(&in_nmi); | ||
132 | } | ||
133 | |||
134 | static void wait_for_nmi(void) | ||
135 | { | ||
136 | int waited = 0; | ||
137 | |||
138 | while (atomic_read(&in_nmi)) { | ||
139 | waited = 1; | ||
140 | cpu_relax(); | ||
141 | } | ||
142 | |||
143 | if (waited) | ||
144 | nmi_wait_count++; | ||
145 | } | ||
146 | |||
147 | static int | ||
148 | do_ftrace_mod_code(unsigned long ip, void *new_code) | ||
149 | { | ||
150 | mod_code_ip = (void *)ip; | ||
151 | mod_code_newcode = new_code; | ||
152 | |||
153 | /* The buffers need to be visible before we let NMIs write them */ | ||
154 | smp_wmb(); | ||
155 | |||
156 | mod_code_write = 1; | ||
157 | |||
158 | /* Make sure write bit is visible before we wait on NMIs */ | ||
159 | smp_mb(); | ||
160 | |||
161 | wait_for_nmi(); | ||
162 | |||
163 | /* Make sure all running NMIs have finished before we write the code */ | ||
164 | smp_mb(); | ||
165 | |||
166 | ftrace_mod_code(); | ||
167 | |||
168 | /* Make sure the write happens before clearing the bit */ | ||
169 | smp_wmb(); | ||
170 | |||
171 | mod_code_write = 0; | ||
172 | |||
173 | /* make sure NMIs see the cleared bit */ | ||
174 | smp_mb(); | ||
175 | |||
176 | wait_for_nmi(); | ||
177 | |||
178 | return mod_code_status; | ||
179 | } | ||
180 | |||
181 | |||
182 | |||
183 | |||
184 | static unsigned char ftrace_nop[MCOUNT_INSN_SIZE]; | ||
185 | |||
186 | static unsigned char *ftrace_nop_replace(void) | ||
187 | { | ||
188 | return ftrace_nop; | ||
189 | } | ||
190 | |||
191 | static int | ||
60 | ftrace_modify_code(unsigned long ip, unsigned char *old_code, | 192 | ftrace_modify_code(unsigned long ip, unsigned char *old_code, |
61 | unsigned char *new_code) | 193 | unsigned char *new_code) |
62 | { | 194 | { |
@@ -81,7 +213,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code, | |||
81 | return -EINVAL; | 213 | return -EINVAL; |
82 | 214 | ||
83 | /* replace the text with the new text */ | 215 | /* replace the text with the new text */ |
84 | if (probe_kernel_write((void *)ip, new_code, MCOUNT_INSN_SIZE)) | 216 | if (do_ftrace_mod_code(ip, new_code)) |
85 | return -EPERM; | 217 | return -EPERM; |
86 | 218 | ||
87 | sync_core(); | 219 | sync_core(); |
@@ -89,6 +221,29 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code, | |||
89 | return 0; | 221 | return 0; |
90 | } | 222 | } |
91 | 223 | ||
224 | int ftrace_make_nop(struct module *mod, | ||
225 | struct dyn_ftrace *rec, unsigned long addr) | ||
226 | { | ||
227 | unsigned char *new, *old; | ||
228 | unsigned long ip = rec->ip; | ||
229 | |||
230 | old = ftrace_call_replace(ip, addr); | ||
231 | new = ftrace_nop_replace(); | ||
232 | |||
233 | return ftrace_modify_code(rec->ip, old, new); | ||
234 | } | ||
235 | |||
236 | int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) | ||
237 | { | ||
238 | unsigned char *new, *old; | ||
239 | unsigned long ip = rec->ip; | ||
240 | |||
241 | old = ftrace_nop_replace(); | ||
242 | new = ftrace_call_replace(ip, addr); | ||
243 | |||
244 | return ftrace_modify_code(rec->ip, old, new); | ||
245 | } | ||
246 | |||
92 | int ftrace_update_ftrace_func(ftrace_func_t func) | 247 | int ftrace_update_ftrace_func(ftrace_func_t func) |
93 | { | 248 | { |
94 | unsigned long ip = (unsigned long)(&ftrace_call); | 249 | unsigned long ip = (unsigned long)(&ftrace_call); |
@@ -165,3 +320,218 @@ int __init ftrace_dyn_arch_init(void *data) | |||
165 | 320 | ||
166 | return 0; | 321 | return 0; |
167 | } | 322 | } |
323 | #endif | ||
324 | |||
325 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
326 | |||
327 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
328 | extern void ftrace_graph_call(void); | ||
329 | |||
330 | static int ftrace_mod_jmp(unsigned long ip, | ||
331 | int old_offset, int new_offset) | ||
332 | { | ||
333 | unsigned char code[MCOUNT_INSN_SIZE]; | ||
334 | |||
335 | if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) | ||
336 | return -EFAULT; | ||
337 | |||
338 | if (code[0] != 0xe9 || old_offset != *(int *)(&code[1])) | ||
339 | return -EINVAL; | ||
340 | |||
341 | *(int *)(&code[1]) = new_offset; | ||
342 | |||
343 | if (do_ftrace_mod_code(ip, &code)) | ||
344 | return -EPERM; | ||
345 | |||
346 | return 0; | ||
347 | } | ||
348 | |||
349 | int ftrace_enable_ftrace_graph_caller(void) | ||
350 | { | ||
351 | unsigned long ip = (unsigned long)(&ftrace_graph_call); | ||
352 | int old_offset, new_offset; | ||
353 | |||
354 | old_offset = (unsigned long)(&ftrace_stub) - (ip + MCOUNT_INSN_SIZE); | ||
355 | new_offset = (unsigned long)(&ftrace_graph_caller) - (ip + MCOUNT_INSN_SIZE); | ||
356 | |||
357 | return ftrace_mod_jmp(ip, old_offset, new_offset); | ||
358 | } | ||
359 | |||
360 | int ftrace_disable_ftrace_graph_caller(void) | ||
361 | { | ||
362 | unsigned long ip = (unsigned long)(&ftrace_graph_call); | ||
363 | int old_offset, new_offset; | ||
364 | |||
365 | old_offset = (unsigned long)(&ftrace_graph_caller) - (ip + MCOUNT_INSN_SIZE); | ||
366 | new_offset = (unsigned long)(&ftrace_stub) - (ip + MCOUNT_INSN_SIZE); | ||
367 | |||
368 | return ftrace_mod_jmp(ip, old_offset, new_offset); | ||
369 | } | ||
370 | |||
371 | #else /* CONFIG_DYNAMIC_FTRACE */ | ||
372 | |||
373 | /* | ||
374 | * These functions are picked from those used on | ||
375 | * this page for dynamic ftrace. They have been | ||
376 | * simplified to ignore all traces in NMI context. | ||
377 | */ | ||
378 | static atomic_t in_nmi; | ||
379 | |||
380 | void ftrace_nmi_enter(void) | ||
381 | { | ||
382 | atomic_inc(&in_nmi); | ||
383 | } | ||
384 | |||
385 | void ftrace_nmi_exit(void) | ||
386 | { | ||
387 | atomic_dec(&in_nmi); | ||
388 | } | ||
389 | |||
390 | #endif /* !CONFIG_DYNAMIC_FTRACE */ | ||
391 | |||
392 | /* Add a function return address to the trace stack on thread info.*/ | ||
393 | static int push_return_trace(unsigned long ret, unsigned long long time, | ||
394 | unsigned long func, int *depth) | ||
395 | { | ||
396 | int index; | ||
397 | |||
398 | if (!current->ret_stack) | ||
399 | return -EBUSY; | ||
400 | |||
401 | /* The return trace stack is full */ | ||
402 | if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) { | ||
403 | atomic_inc(¤t->trace_overrun); | ||
404 | return -EBUSY; | ||
405 | } | ||
406 | |||
407 | index = ++current->curr_ret_stack; | ||
408 | barrier(); | ||
409 | current->ret_stack[index].ret = ret; | ||
410 | current->ret_stack[index].func = func; | ||
411 | current->ret_stack[index].calltime = time; | ||
412 | *depth = index; | ||
413 | |||
414 | return 0; | ||
415 | } | ||
416 | |||
417 | /* Retrieve a function return address to the trace stack on thread info.*/ | ||
418 | static void pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret) | ||
419 | { | ||
420 | int index; | ||
421 | |||
422 | index = current->curr_ret_stack; | ||
423 | |||
424 | if (unlikely(index < 0)) { | ||
425 | ftrace_graph_stop(); | ||
426 | WARN_ON(1); | ||
427 | /* Might as well panic, otherwise we have no where to go */ | ||
428 | *ret = (unsigned long)panic; | ||
429 | return; | ||
430 | } | ||
431 | |||
432 | *ret = current->ret_stack[index].ret; | ||
433 | trace->func = current->ret_stack[index].func; | ||
434 | trace->calltime = current->ret_stack[index].calltime; | ||
435 | trace->overrun = atomic_read(¤t->trace_overrun); | ||
436 | trace->depth = index; | ||
437 | barrier(); | ||
438 | current->curr_ret_stack--; | ||
439 | |||
440 | } | ||
441 | |||
442 | /* | ||
443 | * Send the trace to the ring-buffer. | ||
444 | * @return the original return address. | ||
445 | */ | ||
446 | unsigned long ftrace_return_to_handler(void) | ||
447 | { | ||
448 | struct ftrace_graph_ret trace; | ||
449 | unsigned long ret; | ||
450 | |||
451 | pop_return_trace(&trace, &ret); | ||
452 | trace.rettime = cpu_clock(raw_smp_processor_id()); | ||
453 | ftrace_graph_return(&trace); | ||
454 | |||
455 | if (unlikely(!ret)) { | ||
456 | ftrace_graph_stop(); | ||
457 | WARN_ON(1); | ||
458 | /* Might as well panic. What else to do? */ | ||
459 | ret = (unsigned long)panic; | ||
460 | } | ||
461 | |||
462 | return ret; | ||
463 | } | ||
464 | |||
465 | /* | ||
466 | * Hook the return address and push it in the stack of return addrs | ||
467 | * in current thread info. | ||
468 | */ | ||
469 | void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | ||
470 | { | ||
471 | unsigned long old; | ||
472 | unsigned long long calltime; | ||
473 | int faulted; | ||
474 | struct ftrace_graph_ent trace; | ||
475 | unsigned long return_hooker = (unsigned long) | ||
476 | &return_to_handler; | ||
477 | |||
478 | /* Nmi's are currently unsupported */ | ||
479 | if (unlikely(atomic_read(&in_nmi))) | ||
480 | return; | ||
481 | |||
482 | if (unlikely(atomic_read(¤t->tracing_graph_pause))) | ||
483 | return; | ||
484 | |||
485 | /* | ||
486 | * Protect against fault, even if it shouldn't | ||
487 | * happen. This tool is too much intrusive to | ||
488 | * ignore such a protection. | ||
489 | */ | ||
490 | asm volatile( | ||
491 | "1: " _ASM_MOV " (%[parent_old]), %[old]\n" | ||
492 | "2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n" | ||
493 | " movl $0, %[faulted]\n" | ||
494 | |||
495 | ".section .fixup, \"ax\"\n" | ||
496 | "3: movl $1, %[faulted]\n" | ||
497 | ".previous\n" | ||
498 | |||
499 | _ASM_EXTABLE(1b, 3b) | ||
500 | _ASM_EXTABLE(2b, 3b) | ||
501 | |||
502 | : [parent_replaced] "=r" (parent), [old] "=r" (old), | ||
503 | [faulted] "=r" (faulted) | ||
504 | : [parent_old] "0" (parent), [return_hooker] "r" (return_hooker) | ||
505 | : "memory" | ||
506 | ); | ||
507 | |||
508 | if (unlikely(faulted)) { | ||
509 | ftrace_graph_stop(); | ||
510 | WARN_ON(1); | ||
511 | return; | ||
512 | } | ||
513 | |||
514 | if (unlikely(!__kernel_text_address(old))) { | ||
515 | ftrace_graph_stop(); | ||
516 | *parent = old; | ||
517 | WARN_ON(1); | ||
518 | return; | ||
519 | } | ||
520 | |||
521 | calltime = cpu_clock(raw_smp_processor_id()); | ||
522 | |||
523 | if (push_return_trace(old, calltime, | ||
524 | self_addr, &trace.depth) == -EBUSY) { | ||
525 | *parent = old; | ||
526 | return; | ||
527 | } | ||
528 | |||
529 | trace.func = self_addr; | ||
530 | |||
531 | /* Only trace if the calling function expects to */ | ||
532 | if (!ftrace_graph_entry(&trace)) { | ||
533 | current->curr_ret_stack--; | ||
534 | *parent = old; | ||
535 | } | ||
536 | } | ||
537 | #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ | ||
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c index 6c9bfc9e1e95..2bced78b0b8e 100644 --- a/arch/x86/kernel/genapic_64.c +++ b/arch/x86/kernel/genapic_64.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/smp.h> | 21 | #include <asm/smp.h> |
22 | #include <asm/ipi.h> | 22 | #include <asm/ipi.h> |
23 | #include <asm/genapic.h> | 23 | #include <asm/genapic.h> |
24 | #include <asm/setup.h> | ||
24 | 25 | ||
25 | extern struct genapic apic_flat; | 26 | extern struct genapic apic_flat; |
26 | extern struct genapic apic_physflat; | 27 | extern struct genapic apic_physflat; |
@@ -53,6 +54,9 @@ void __init setup_apic_routing(void) | |||
53 | genapic = &apic_physflat; | 54 | genapic = &apic_physflat; |
54 | printk(KERN_INFO "Setting APIC routing to %s\n", genapic->name); | 55 | printk(KERN_INFO "Setting APIC routing to %s\n", genapic->name); |
55 | } | 56 | } |
57 | |||
58 | if (x86_quirks->update_genapic) | ||
59 | x86_quirks->update_genapic(); | ||
56 | } | 60 | } |
57 | 61 | ||
58 | /* Same for both flat and physical. */ | 62 | /* Same for both flat and physical. */ |
diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c index c0262791bda4..7fa5f49c2dda 100644 --- a/arch/x86/kernel/genapic_flat_64.c +++ b/arch/x86/kernel/genapic_flat_64.c | |||
@@ -30,12 +30,12 @@ static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
30 | return 1; | 30 | return 1; |
31 | } | 31 | } |
32 | 32 | ||
33 | static cpumask_t flat_target_cpus(void) | 33 | static const struct cpumask *flat_target_cpus(void) |
34 | { | 34 | { |
35 | return cpu_online_map; | 35 | return cpu_online_mask; |
36 | } | 36 | } |
37 | 37 | ||
38 | static cpumask_t flat_vector_allocation_domain(int cpu) | 38 | static void flat_vector_allocation_domain(int cpu, struct cpumask *retmask) |
39 | { | 39 | { |
40 | /* Careful. Some cpus do not strictly honor the set of cpus | 40 | /* Careful. Some cpus do not strictly honor the set of cpus |
41 | * specified in the interrupt destination when using lowest | 41 | * specified in the interrupt destination when using lowest |
@@ -45,8 +45,8 @@ static cpumask_t flat_vector_allocation_domain(int cpu) | |||
45 | * deliver interrupts to the wrong hyperthread when only one | 45 | * deliver interrupts to the wrong hyperthread when only one |
46 | * hyperthread was specified in the interrupt desitination. | 46 | * hyperthread was specified in the interrupt desitination. |
47 | */ | 47 | */ |
48 | cpumask_t domain = { { [0] = APIC_ALL_CPUS, } }; | 48 | cpumask_clear(retmask); |
49 | return domain; | 49 | cpumask_bits(retmask)[0] = APIC_ALL_CPUS; |
50 | } | 50 | } |
51 | 51 | ||
52 | /* | 52 | /* |
@@ -69,9 +69,8 @@ static void flat_init_apic_ldr(void) | |||
69 | apic_write(APIC_LDR, val); | 69 | apic_write(APIC_LDR, val); |
70 | } | 70 | } |
71 | 71 | ||
72 | static void flat_send_IPI_mask(cpumask_t cpumask, int vector) | 72 | static inline void _flat_send_IPI_mask(unsigned long mask, int vector) |
73 | { | 73 | { |
74 | unsigned long mask = cpus_addr(cpumask)[0]; | ||
75 | unsigned long flags; | 74 | unsigned long flags; |
76 | 75 | ||
77 | local_irq_save(flags); | 76 | local_irq_save(flags); |
@@ -79,20 +78,41 @@ static void flat_send_IPI_mask(cpumask_t cpumask, int vector) | |||
79 | local_irq_restore(flags); | 78 | local_irq_restore(flags); |
80 | } | 79 | } |
81 | 80 | ||
81 | static void flat_send_IPI_mask(const struct cpumask *cpumask, int vector) | ||
82 | { | ||
83 | unsigned long mask = cpumask_bits(cpumask)[0]; | ||
84 | |||
85 | _flat_send_IPI_mask(mask, vector); | ||
86 | } | ||
87 | |||
88 | static void flat_send_IPI_mask_allbutself(const struct cpumask *cpumask, | ||
89 | int vector) | ||
90 | { | ||
91 | unsigned long mask = cpumask_bits(cpumask)[0]; | ||
92 | int cpu = smp_processor_id(); | ||
93 | |||
94 | if (cpu < BITS_PER_LONG) | ||
95 | clear_bit(cpu, &mask); | ||
96 | _flat_send_IPI_mask(mask, vector); | ||
97 | } | ||
98 | |||
82 | static void flat_send_IPI_allbutself(int vector) | 99 | static void flat_send_IPI_allbutself(int vector) |
83 | { | 100 | { |
101 | int cpu = smp_processor_id(); | ||
84 | #ifdef CONFIG_HOTPLUG_CPU | 102 | #ifdef CONFIG_HOTPLUG_CPU |
85 | int hotplug = 1; | 103 | int hotplug = 1; |
86 | #else | 104 | #else |
87 | int hotplug = 0; | 105 | int hotplug = 0; |
88 | #endif | 106 | #endif |
89 | if (hotplug || vector == NMI_VECTOR) { | 107 | if (hotplug || vector == NMI_VECTOR) { |
90 | cpumask_t allbutme = cpu_online_map; | 108 | if (!cpumask_equal(cpu_online_mask, cpumask_of(cpu))) { |
109 | unsigned long mask = cpumask_bits(cpu_online_mask)[0]; | ||
91 | 110 | ||
92 | cpu_clear(smp_processor_id(), allbutme); | 111 | if (cpu < BITS_PER_LONG) |
112 | clear_bit(cpu, &mask); | ||
93 | 113 | ||
94 | if (!cpus_empty(allbutme)) | 114 | _flat_send_IPI_mask(mask, vector); |
95 | flat_send_IPI_mask(allbutme, vector); | 115 | } |
96 | } else if (num_online_cpus() > 1) { | 116 | } else if (num_online_cpus() > 1) { |
97 | __send_IPI_shortcut(APIC_DEST_ALLBUT, vector,APIC_DEST_LOGICAL); | 117 | __send_IPI_shortcut(APIC_DEST_ALLBUT, vector,APIC_DEST_LOGICAL); |
98 | } | 118 | } |
@@ -101,7 +121,7 @@ static void flat_send_IPI_allbutself(int vector) | |||
101 | static void flat_send_IPI_all(int vector) | 121 | static void flat_send_IPI_all(int vector) |
102 | { | 122 | { |
103 | if (vector == NMI_VECTOR) | 123 | if (vector == NMI_VECTOR) |
104 | flat_send_IPI_mask(cpu_online_map, vector); | 124 | flat_send_IPI_mask(cpu_online_mask, vector); |
105 | else | 125 | else |
106 | __send_IPI_shortcut(APIC_DEST_ALLINC, vector, APIC_DEST_LOGICAL); | 126 | __send_IPI_shortcut(APIC_DEST_ALLINC, vector, APIC_DEST_LOGICAL); |
107 | } | 127 | } |
@@ -135,9 +155,18 @@ static int flat_apic_id_registered(void) | |||
135 | return physid_isset(read_xapic_id(), phys_cpu_present_map); | 155 | return physid_isset(read_xapic_id(), phys_cpu_present_map); |
136 | } | 156 | } |
137 | 157 | ||
138 | static unsigned int flat_cpu_mask_to_apicid(cpumask_t cpumask) | 158 | static unsigned int flat_cpu_mask_to_apicid(const struct cpumask *cpumask) |
159 | { | ||
160 | return cpumask_bits(cpumask)[0] & APIC_ALL_CPUS; | ||
161 | } | ||
162 | |||
163 | static unsigned int flat_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
164 | const struct cpumask *andmask) | ||
139 | { | 165 | { |
140 | return cpus_addr(cpumask)[0] & APIC_ALL_CPUS; | 166 | unsigned long mask1 = cpumask_bits(cpumask)[0] & APIC_ALL_CPUS; |
167 | unsigned long mask2 = cpumask_bits(andmask)[0] & APIC_ALL_CPUS; | ||
168 | |||
169 | return mask1 & mask2; | ||
141 | } | 170 | } |
142 | 171 | ||
143 | static unsigned int phys_pkg_id(int index_msb) | 172 | static unsigned int phys_pkg_id(int index_msb) |
@@ -157,8 +186,10 @@ struct genapic apic_flat = { | |||
157 | .send_IPI_all = flat_send_IPI_all, | 186 | .send_IPI_all = flat_send_IPI_all, |
158 | .send_IPI_allbutself = flat_send_IPI_allbutself, | 187 | .send_IPI_allbutself = flat_send_IPI_allbutself, |
159 | .send_IPI_mask = flat_send_IPI_mask, | 188 | .send_IPI_mask = flat_send_IPI_mask, |
189 | .send_IPI_mask_allbutself = flat_send_IPI_mask_allbutself, | ||
160 | .send_IPI_self = apic_send_IPI_self, | 190 | .send_IPI_self = apic_send_IPI_self, |
161 | .cpu_mask_to_apicid = flat_cpu_mask_to_apicid, | 191 | .cpu_mask_to_apicid = flat_cpu_mask_to_apicid, |
192 | .cpu_mask_to_apicid_and = flat_cpu_mask_to_apicid_and, | ||
162 | .phys_pkg_id = phys_pkg_id, | 193 | .phys_pkg_id = phys_pkg_id, |
163 | .get_apic_id = get_apic_id, | 194 | .get_apic_id = get_apic_id, |
164 | .set_apic_id = set_apic_id, | 195 | .set_apic_id = set_apic_id, |
@@ -188,35 +219,39 @@ static int physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
188 | return 0; | 219 | return 0; |
189 | } | 220 | } |
190 | 221 | ||
191 | static cpumask_t physflat_target_cpus(void) | 222 | static const struct cpumask *physflat_target_cpus(void) |
192 | { | 223 | { |
193 | return cpu_online_map; | 224 | return cpu_online_mask; |
194 | } | 225 | } |
195 | 226 | ||
196 | static cpumask_t physflat_vector_allocation_domain(int cpu) | 227 | static void physflat_vector_allocation_domain(int cpu, struct cpumask *retmask) |
197 | { | 228 | { |
198 | return cpumask_of_cpu(cpu); | 229 | cpumask_clear(retmask); |
230 | cpumask_set_cpu(cpu, retmask); | ||
199 | } | 231 | } |
200 | 232 | ||
201 | static void physflat_send_IPI_mask(cpumask_t cpumask, int vector) | 233 | static void physflat_send_IPI_mask(const struct cpumask *cpumask, int vector) |
202 | { | 234 | { |
203 | send_IPI_mask_sequence(cpumask, vector); | 235 | send_IPI_mask_sequence(cpumask, vector); |
204 | } | 236 | } |
205 | 237 | ||
206 | static void physflat_send_IPI_allbutself(int vector) | 238 | static void physflat_send_IPI_mask_allbutself(const struct cpumask *cpumask, |
239 | int vector) | ||
207 | { | 240 | { |
208 | cpumask_t allbutme = cpu_online_map; | 241 | send_IPI_mask_allbutself(cpumask, vector); |
242 | } | ||
209 | 243 | ||
210 | cpu_clear(smp_processor_id(), allbutme); | 244 | static void physflat_send_IPI_allbutself(int vector) |
211 | physflat_send_IPI_mask(allbutme, vector); | 245 | { |
246 | send_IPI_mask_allbutself(cpu_online_mask, vector); | ||
212 | } | 247 | } |
213 | 248 | ||
214 | static void physflat_send_IPI_all(int vector) | 249 | static void physflat_send_IPI_all(int vector) |
215 | { | 250 | { |
216 | physflat_send_IPI_mask(cpu_online_map, vector); | 251 | physflat_send_IPI_mask(cpu_online_mask, vector); |
217 | } | 252 | } |
218 | 253 | ||
219 | static unsigned int physflat_cpu_mask_to_apicid(cpumask_t cpumask) | 254 | static unsigned int physflat_cpu_mask_to_apicid(const struct cpumask *cpumask) |
220 | { | 255 | { |
221 | int cpu; | 256 | int cpu; |
222 | 257 | ||
@@ -224,13 +259,29 @@ static unsigned int physflat_cpu_mask_to_apicid(cpumask_t cpumask) | |||
224 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 259 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
225 | * May as well be the first. | 260 | * May as well be the first. |
226 | */ | 261 | */ |
227 | cpu = first_cpu(cpumask); | 262 | cpu = cpumask_first(cpumask); |
228 | if ((unsigned)cpu < nr_cpu_ids) | 263 | if ((unsigned)cpu < nr_cpu_ids) |
229 | return per_cpu(x86_cpu_to_apicid, cpu); | 264 | return per_cpu(x86_cpu_to_apicid, cpu); |
230 | else | 265 | else |
231 | return BAD_APICID; | 266 | return BAD_APICID; |
232 | } | 267 | } |
233 | 268 | ||
269 | static unsigned int | ||
270 | physflat_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
271 | const struct cpumask *andmask) | ||
272 | { | ||
273 | int cpu; | ||
274 | |||
275 | /* | ||
276 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | ||
277 | * May as well be the first. | ||
278 | */ | ||
279 | cpu = cpumask_any_and(cpumask, andmask); | ||
280 | if (cpu < nr_cpu_ids) | ||
281 | return per_cpu(x86_cpu_to_apicid, cpu); | ||
282 | return BAD_APICID; | ||
283 | } | ||
284 | |||
234 | struct genapic apic_physflat = { | 285 | struct genapic apic_physflat = { |
235 | .name = "physical flat", | 286 | .name = "physical flat", |
236 | .acpi_madt_oem_check = physflat_acpi_madt_oem_check, | 287 | .acpi_madt_oem_check = physflat_acpi_madt_oem_check, |
@@ -243,8 +294,10 @@ struct genapic apic_physflat = { | |||
243 | .send_IPI_all = physflat_send_IPI_all, | 294 | .send_IPI_all = physflat_send_IPI_all, |
244 | .send_IPI_allbutself = physflat_send_IPI_allbutself, | 295 | .send_IPI_allbutself = physflat_send_IPI_allbutself, |
245 | .send_IPI_mask = physflat_send_IPI_mask, | 296 | .send_IPI_mask = physflat_send_IPI_mask, |
297 | .send_IPI_mask_allbutself = physflat_send_IPI_mask_allbutself, | ||
246 | .send_IPI_self = apic_send_IPI_self, | 298 | .send_IPI_self = apic_send_IPI_self, |
247 | .cpu_mask_to_apicid = physflat_cpu_mask_to_apicid, | 299 | .cpu_mask_to_apicid = physflat_cpu_mask_to_apicid, |
300 | .cpu_mask_to_apicid_and = physflat_cpu_mask_to_apicid_and, | ||
248 | .phys_pkg_id = phys_pkg_id, | 301 | .phys_pkg_id = phys_pkg_id, |
249 | .get_apic_id = get_apic_id, | 302 | .get_apic_id = get_apic_id, |
250 | .set_apic_id = set_apic_id, | 303 | .set_apic_id = set_apic_id, |
diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c index f6a2c8eb48a6..4716a0c9f936 100644 --- a/arch/x86/kernel/genx2apic_cluster.c +++ b/arch/x86/kernel/genx2apic_cluster.c | |||
@@ -22,19 +22,18 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
22 | 22 | ||
23 | /* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */ | 23 | /* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */ |
24 | 24 | ||
25 | static cpumask_t x2apic_target_cpus(void) | 25 | static const struct cpumask *x2apic_target_cpus(void) |
26 | { | 26 | { |
27 | return cpumask_of_cpu(0); | 27 | return cpumask_of(0); |
28 | } | 28 | } |
29 | 29 | ||
30 | /* | 30 | /* |
31 | * for now each logical cpu is in its own vector allocation domain. | 31 | * for now each logical cpu is in its own vector allocation domain. |
32 | */ | 32 | */ |
33 | static cpumask_t x2apic_vector_allocation_domain(int cpu) | 33 | static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask) |
34 | { | 34 | { |
35 | cpumask_t domain = CPU_MASK_NONE; | 35 | cpumask_clear(retmask); |
36 | cpu_set(cpu, domain); | 36 | cpumask_set_cpu(cpu, retmask); |
37 | return domain; | ||
38 | } | 37 | } |
39 | 38 | ||
40 | static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, | 39 | static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, |
@@ -56,32 +55,53 @@ static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, | |||
56 | * at once. We have 16 cpu's in a cluster. This will minimize IPI register | 55 | * at once. We have 16 cpu's in a cluster. This will minimize IPI register |
57 | * writes. | 56 | * writes. |
58 | */ | 57 | */ |
59 | static void x2apic_send_IPI_mask(cpumask_t mask, int vector) | 58 | static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector) |
60 | { | 59 | { |
61 | unsigned long flags; | 60 | unsigned long flags; |
62 | unsigned long query_cpu; | 61 | unsigned long query_cpu; |
63 | 62 | ||
64 | local_irq_save(flags); | 63 | local_irq_save(flags); |
65 | for_each_cpu_mask(query_cpu, mask) { | 64 | for_each_cpu(query_cpu, mask) |
66 | __x2apic_send_IPI_dest(per_cpu(x86_cpu_to_logical_apicid, query_cpu), | 65 | __x2apic_send_IPI_dest( |
67 | vector, APIC_DEST_LOGICAL); | 66 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), |
68 | } | 67 | vector, APIC_DEST_LOGICAL); |
69 | local_irq_restore(flags); | 68 | local_irq_restore(flags); |
70 | } | 69 | } |
71 | 70 | ||
72 | static void x2apic_send_IPI_allbutself(int vector) | 71 | static void x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, |
72 | int vector) | ||
73 | { | 73 | { |
74 | cpumask_t mask = cpu_online_map; | 74 | unsigned long flags; |
75 | unsigned long query_cpu; | ||
76 | unsigned long this_cpu = smp_processor_id(); | ||
75 | 77 | ||
76 | cpu_clear(smp_processor_id(), mask); | 78 | local_irq_save(flags); |
79 | for_each_cpu(query_cpu, mask) | ||
80 | if (query_cpu != this_cpu) | ||
81 | __x2apic_send_IPI_dest( | ||
82 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), | ||
83 | vector, APIC_DEST_LOGICAL); | ||
84 | local_irq_restore(flags); | ||
85 | } | ||
86 | |||
87 | static void x2apic_send_IPI_allbutself(int vector) | ||
88 | { | ||
89 | unsigned long flags; | ||
90 | unsigned long query_cpu; | ||
91 | unsigned long this_cpu = smp_processor_id(); | ||
77 | 92 | ||
78 | if (!cpus_empty(mask)) | 93 | local_irq_save(flags); |
79 | x2apic_send_IPI_mask(mask, vector); | 94 | for_each_online_cpu(query_cpu) |
95 | if (query_cpu != this_cpu) | ||
96 | __x2apic_send_IPI_dest( | ||
97 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), | ||
98 | vector, APIC_DEST_LOGICAL); | ||
99 | local_irq_restore(flags); | ||
80 | } | 100 | } |
81 | 101 | ||
82 | static void x2apic_send_IPI_all(int vector) | 102 | static void x2apic_send_IPI_all(int vector) |
83 | { | 103 | { |
84 | x2apic_send_IPI_mask(cpu_online_map, vector); | 104 | x2apic_send_IPI_mask(cpu_online_mask, vector); |
85 | } | 105 | } |
86 | 106 | ||
87 | static int x2apic_apic_id_registered(void) | 107 | static int x2apic_apic_id_registered(void) |
@@ -89,7 +109,7 @@ static int x2apic_apic_id_registered(void) | |||
89 | return 1; | 109 | return 1; |
90 | } | 110 | } |
91 | 111 | ||
92 | static unsigned int x2apic_cpu_mask_to_apicid(cpumask_t cpumask) | 112 | static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask) |
93 | { | 113 | { |
94 | int cpu; | 114 | int cpu; |
95 | 115 | ||
@@ -97,13 +117,28 @@ static unsigned int x2apic_cpu_mask_to_apicid(cpumask_t cpumask) | |||
97 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 117 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
98 | * May as well be the first. | 118 | * May as well be the first. |
99 | */ | 119 | */ |
100 | cpu = first_cpu(cpumask); | 120 | cpu = cpumask_first(cpumask); |
101 | if ((unsigned)cpu < NR_CPUS) | 121 | if ((unsigned)cpu < nr_cpu_ids) |
102 | return per_cpu(x86_cpu_to_logical_apicid, cpu); | 122 | return per_cpu(x86_cpu_to_logical_apicid, cpu); |
103 | else | 123 | else |
104 | return BAD_APICID; | 124 | return BAD_APICID; |
105 | } | 125 | } |
106 | 126 | ||
127 | static unsigned int x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
128 | const struct cpumask *andmask) | ||
129 | { | ||
130 | int cpu; | ||
131 | |||
132 | /* | ||
133 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | ||
134 | * May as well be the first. | ||
135 | */ | ||
136 | cpu = cpumask_any_and(cpumask, andmask); | ||
137 | if (cpu < nr_cpu_ids) | ||
138 | return per_cpu(x86_cpu_to_apicid, cpu); | ||
139 | return BAD_APICID; | ||
140 | } | ||
141 | |||
107 | static unsigned int get_apic_id(unsigned long x) | 142 | static unsigned int get_apic_id(unsigned long x) |
108 | { | 143 | { |
109 | unsigned int id; | 144 | unsigned int id; |
@@ -150,8 +185,10 @@ struct genapic apic_x2apic_cluster = { | |||
150 | .send_IPI_all = x2apic_send_IPI_all, | 185 | .send_IPI_all = x2apic_send_IPI_all, |
151 | .send_IPI_allbutself = x2apic_send_IPI_allbutself, | 186 | .send_IPI_allbutself = x2apic_send_IPI_allbutself, |
152 | .send_IPI_mask = x2apic_send_IPI_mask, | 187 | .send_IPI_mask = x2apic_send_IPI_mask, |
188 | .send_IPI_mask_allbutself = x2apic_send_IPI_mask_allbutself, | ||
153 | .send_IPI_self = x2apic_send_IPI_self, | 189 | .send_IPI_self = x2apic_send_IPI_self, |
154 | .cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid, | 190 | .cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid, |
191 | .cpu_mask_to_apicid_and = x2apic_cpu_mask_to_apicid_and, | ||
155 | .phys_pkg_id = phys_pkg_id, | 192 | .phys_pkg_id = phys_pkg_id, |
156 | .get_apic_id = get_apic_id, | 193 | .get_apic_id = get_apic_id, |
157 | .set_apic_id = set_apic_id, | 194 | .set_apic_id = set_apic_id, |
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c index d042211768b7..b255507884f2 100644 --- a/arch/x86/kernel/genx2apic_phys.c +++ b/arch/x86/kernel/genx2apic_phys.c | |||
@@ -29,16 +29,15 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
29 | 29 | ||
30 | /* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */ | 30 | /* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */ |
31 | 31 | ||
32 | static cpumask_t x2apic_target_cpus(void) | 32 | static const struct cpumask *x2apic_target_cpus(void) |
33 | { | 33 | { |
34 | return cpumask_of_cpu(0); | 34 | return cpumask_of(0); |
35 | } | 35 | } |
36 | 36 | ||
37 | static cpumask_t x2apic_vector_allocation_domain(int cpu) | 37 | static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask) |
38 | { | 38 | { |
39 | cpumask_t domain = CPU_MASK_NONE; | 39 | cpumask_clear(retmask); |
40 | cpu_set(cpu, domain); | 40 | cpumask_set_cpu(cpu, retmask); |
41 | return domain; | ||
42 | } | 41 | } |
43 | 42 | ||
44 | static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, | 43 | static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, |
@@ -54,32 +53,54 @@ static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, | |||
54 | x2apic_icr_write(cfg, apicid); | 53 | x2apic_icr_write(cfg, apicid); |
55 | } | 54 | } |
56 | 55 | ||
57 | static void x2apic_send_IPI_mask(cpumask_t mask, int vector) | 56 | static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector) |
58 | { | 57 | { |
59 | unsigned long flags; | 58 | unsigned long flags; |
60 | unsigned long query_cpu; | 59 | unsigned long query_cpu; |
61 | 60 | ||
62 | local_irq_save(flags); | 61 | local_irq_save(flags); |
63 | for_each_cpu_mask(query_cpu, mask) { | 62 | for_each_cpu(query_cpu, mask) { |
64 | __x2apic_send_IPI_dest(per_cpu(x86_cpu_to_apicid, query_cpu), | 63 | __x2apic_send_IPI_dest(per_cpu(x86_cpu_to_apicid, query_cpu), |
65 | vector, APIC_DEST_PHYSICAL); | 64 | vector, APIC_DEST_PHYSICAL); |
66 | } | 65 | } |
67 | local_irq_restore(flags); | 66 | local_irq_restore(flags); |
68 | } | 67 | } |
69 | 68 | ||
70 | static void x2apic_send_IPI_allbutself(int vector) | 69 | static void x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, |
70 | int vector) | ||
71 | { | 71 | { |
72 | cpumask_t mask = cpu_online_map; | 72 | unsigned long flags; |
73 | unsigned long query_cpu; | ||
74 | unsigned long this_cpu = smp_processor_id(); | ||
75 | |||
76 | local_irq_save(flags); | ||
77 | for_each_cpu(query_cpu, mask) { | ||
78 | if (query_cpu != this_cpu) | ||
79 | __x2apic_send_IPI_dest( | ||
80 | per_cpu(x86_cpu_to_apicid, query_cpu), | ||
81 | vector, APIC_DEST_PHYSICAL); | ||
82 | } | ||
83 | local_irq_restore(flags); | ||
84 | } | ||
73 | 85 | ||
74 | cpu_clear(smp_processor_id(), mask); | 86 | static void x2apic_send_IPI_allbutself(int vector) |
87 | { | ||
88 | unsigned long flags; | ||
89 | unsigned long query_cpu; | ||
90 | unsigned long this_cpu = smp_processor_id(); | ||
75 | 91 | ||
76 | if (!cpus_empty(mask)) | 92 | local_irq_save(flags); |
77 | x2apic_send_IPI_mask(mask, vector); | 93 | for_each_online_cpu(query_cpu) |
94 | if (query_cpu != this_cpu) | ||
95 | __x2apic_send_IPI_dest( | ||
96 | per_cpu(x86_cpu_to_apicid, query_cpu), | ||
97 | vector, APIC_DEST_PHYSICAL); | ||
98 | local_irq_restore(flags); | ||
78 | } | 99 | } |
79 | 100 | ||
80 | static void x2apic_send_IPI_all(int vector) | 101 | static void x2apic_send_IPI_all(int vector) |
81 | { | 102 | { |
82 | x2apic_send_IPI_mask(cpu_online_map, vector); | 103 | x2apic_send_IPI_mask(cpu_online_mask, vector); |
83 | } | 104 | } |
84 | 105 | ||
85 | static int x2apic_apic_id_registered(void) | 106 | static int x2apic_apic_id_registered(void) |
@@ -87,7 +108,7 @@ static int x2apic_apic_id_registered(void) | |||
87 | return 1; | 108 | return 1; |
88 | } | 109 | } |
89 | 110 | ||
90 | static unsigned int x2apic_cpu_mask_to_apicid(cpumask_t cpumask) | 111 | static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask) |
91 | { | 112 | { |
92 | int cpu; | 113 | int cpu; |
93 | 114 | ||
@@ -95,13 +116,28 @@ static unsigned int x2apic_cpu_mask_to_apicid(cpumask_t cpumask) | |||
95 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 116 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
96 | * May as well be the first. | 117 | * May as well be the first. |
97 | */ | 118 | */ |
98 | cpu = first_cpu(cpumask); | 119 | cpu = cpumask_first(cpumask); |
99 | if ((unsigned)cpu < NR_CPUS) | 120 | if ((unsigned)cpu < nr_cpu_ids) |
100 | return per_cpu(x86_cpu_to_apicid, cpu); | 121 | return per_cpu(x86_cpu_to_apicid, cpu); |
101 | else | 122 | else |
102 | return BAD_APICID; | 123 | return BAD_APICID; |
103 | } | 124 | } |
104 | 125 | ||
126 | static unsigned int x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
127 | const struct cpumask *andmask) | ||
128 | { | ||
129 | int cpu; | ||
130 | |||
131 | /* | ||
132 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | ||
133 | * May as well be the first. | ||
134 | */ | ||
135 | cpu = cpumask_any_and(cpumask, andmask); | ||
136 | if (cpu < nr_cpu_ids) | ||
137 | return per_cpu(x86_cpu_to_apicid, cpu); | ||
138 | return BAD_APICID; | ||
139 | } | ||
140 | |||
105 | static unsigned int get_apic_id(unsigned long x) | 141 | static unsigned int get_apic_id(unsigned long x) |
106 | { | 142 | { |
107 | unsigned int id; | 143 | unsigned int id; |
@@ -145,8 +181,10 @@ struct genapic apic_x2apic_phys = { | |||
145 | .send_IPI_all = x2apic_send_IPI_all, | 181 | .send_IPI_all = x2apic_send_IPI_all, |
146 | .send_IPI_allbutself = x2apic_send_IPI_allbutself, | 182 | .send_IPI_allbutself = x2apic_send_IPI_allbutself, |
147 | .send_IPI_mask = x2apic_send_IPI_mask, | 183 | .send_IPI_mask = x2apic_send_IPI_mask, |
184 | .send_IPI_mask_allbutself = x2apic_send_IPI_mask_allbutself, | ||
148 | .send_IPI_self = x2apic_send_IPI_self, | 185 | .send_IPI_self = x2apic_send_IPI_self, |
149 | .cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid, | 186 | .cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid, |
187 | .cpu_mask_to_apicid_and = x2apic_cpu_mask_to_apicid_and, | ||
150 | .phys_pkg_id = phys_pkg_id, | 188 | .phys_pkg_id = phys_pkg_id, |
151 | .get_apic_id = get_apic_id, | 189 | .get_apic_id = get_apic_id, |
152 | .set_apic_id = set_apic_id, | 190 | .set_apic_id = set_apic_id, |
diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c index 2c7dbdb98278..3984682cd849 100644 --- a/arch/x86/kernel/genx2apic_uv_x.c +++ b/arch/x86/kernel/genx2apic_uv_x.c | |||
@@ -75,16 +75,15 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second); | |||
75 | 75 | ||
76 | /* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */ | 76 | /* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */ |
77 | 77 | ||
78 | static cpumask_t uv_target_cpus(void) | 78 | static const struct cpumask *uv_target_cpus(void) |
79 | { | 79 | { |
80 | return cpumask_of_cpu(0); | 80 | return cpumask_of(0); |
81 | } | 81 | } |
82 | 82 | ||
83 | static cpumask_t uv_vector_allocation_domain(int cpu) | 83 | static void uv_vector_allocation_domain(int cpu, struct cpumask *retmask) |
84 | { | 84 | { |
85 | cpumask_t domain = CPU_MASK_NONE; | 85 | cpumask_clear(retmask); |
86 | cpu_set(cpu, domain); | 86 | cpumask_set_cpu(cpu, retmask); |
87 | return domain; | ||
88 | } | 87 | } |
89 | 88 | ||
90 | int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip) | 89 | int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip) |
@@ -123,28 +122,37 @@ static void uv_send_IPI_one(int cpu, int vector) | |||
123 | uv_write_global_mmr64(pnode, UVH_IPI_INT, val); | 122 | uv_write_global_mmr64(pnode, UVH_IPI_INT, val); |
124 | } | 123 | } |
125 | 124 | ||
126 | static void uv_send_IPI_mask(cpumask_t mask, int vector) | 125 | static void uv_send_IPI_mask(const struct cpumask *mask, int vector) |
127 | { | 126 | { |
128 | unsigned int cpu; | 127 | unsigned int cpu; |
129 | 128 | ||
130 | for_each_possible_cpu(cpu) | 129 | for_each_cpu(cpu, mask) |
131 | if (cpu_isset(cpu, mask)) | 130 | uv_send_IPI_one(cpu, vector); |
131 | } | ||
132 | |||
133 | static void uv_send_IPI_mask_allbutself(const struct cpumask *mask, int vector) | ||
134 | { | ||
135 | unsigned int cpu; | ||
136 | unsigned int this_cpu = smp_processor_id(); | ||
137 | |||
138 | for_each_cpu(cpu, mask) | ||
139 | if (cpu != this_cpu) | ||
132 | uv_send_IPI_one(cpu, vector); | 140 | uv_send_IPI_one(cpu, vector); |
133 | } | 141 | } |
134 | 142 | ||
135 | static void uv_send_IPI_allbutself(int vector) | 143 | static void uv_send_IPI_allbutself(int vector) |
136 | { | 144 | { |
137 | cpumask_t mask = cpu_online_map; | 145 | unsigned int cpu; |
138 | 146 | unsigned int this_cpu = smp_processor_id(); | |
139 | cpu_clear(smp_processor_id(), mask); | ||
140 | 147 | ||
141 | if (!cpus_empty(mask)) | 148 | for_each_online_cpu(cpu) |
142 | uv_send_IPI_mask(mask, vector); | 149 | if (cpu != this_cpu) |
150 | uv_send_IPI_one(cpu, vector); | ||
143 | } | 151 | } |
144 | 152 | ||
145 | static void uv_send_IPI_all(int vector) | 153 | static void uv_send_IPI_all(int vector) |
146 | { | 154 | { |
147 | uv_send_IPI_mask(cpu_online_map, vector); | 155 | uv_send_IPI_mask(cpu_online_mask, vector); |
148 | } | 156 | } |
149 | 157 | ||
150 | static int uv_apic_id_registered(void) | 158 | static int uv_apic_id_registered(void) |
@@ -156,7 +164,7 @@ static void uv_init_apic_ldr(void) | |||
156 | { | 164 | { |
157 | } | 165 | } |
158 | 166 | ||
159 | static unsigned int uv_cpu_mask_to_apicid(cpumask_t cpumask) | 167 | static unsigned int uv_cpu_mask_to_apicid(const struct cpumask *cpumask) |
160 | { | 168 | { |
161 | int cpu; | 169 | int cpu; |
162 | 170 | ||
@@ -164,13 +172,28 @@ static unsigned int uv_cpu_mask_to_apicid(cpumask_t cpumask) | |||
164 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 172 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
165 | * May as well be the first. | 173 | * May as well be the first. |
166 | */ | 174 | */ |
167 | cpu = first_cpu(cpumask); | 175 | cpu = cpumask_first(cpumask); |
168 | if ((unsigned)cpu < nr_cpu_ids) | 176 | if ((unsigned)cpu < nr_cpu_ids) |
169 | return per_cpu(x86_cpu_to_apicid, cpu); | 177 | return per_cpu(x86_cpu_to_apicid, cpu); |
170 | else | 178 | else |
171 | return BAD_APICID; | 179 | return BAD_APICID; |
172 | } | 180 | } |
173 | 181 | ||
182 | static unsigned int uv_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
183 | const struct cpumask *andmask) | ||
184 | { | ||
185 | int cpu; | ||
186 | |||
187 | /* | ||
188 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | ||
189 | * May as well be the first. | ||
190 | */ | ||
191 | cpu = cpumask_any_and(cpumask, andmask); | ||
192 | if (cpu < nr_cpu_ids) | ||
193 | return per_cpu(x86_cpu_to_apicid, cpu); | ||
194 | return BAD_APICID; | ||
195 | } | ||
196 | |||
174 | static unsigned int get_apic_id(unsigned long x) | 197 | static unsigned int get_apic_id(unsigned long x) |
175 | { | 198 | { |
176 | unsigned int id; | 199 | unsigned int id; |
@@ -218,8 +241,10 @@ struct genapic apic_x2apic_uv_x = { | |||
218 | .send_IPI_all = uv_send_IPI_all, | 241 | .send_IPI_all = uv_send_IPI_all, |
219 | .send_IPI_allbutself = uv_send_IPI_allbutself, | 242 | .send_IPI_allbutself = uv_send_IPI_allbutself, |
220 | .send_IPI_mask = uv_send_IPI_mask, | 243 | .send_IPI_mask = uv_send_IPI_mask, |
244 | .send_IPI_mask_allbutself = uv_send_IPI_mask_allbutself, | ||
221 | .send_IPI_self = uv_send_IPI_self, | 245 | .send_IPI_self = uv_send_IPI_self, |
222 | .cpu_mask_to_apicid = uv_cpu_mask_to_apicid, | 246 | .cpu_mask_to_apicid = uv_cpu_mask_to_apicid, |
247 | .cpu_mask_to_apicid_and = uv_cpu_mask_to_apicid_and, | ||
223 | .phys_pkg_id = phys_pkg_id, | 248 | .phys_pkg_id = phys_pkg_id, |
224 | .get_apic_id = get_apic_id, | 249 | .get_apic_id = get_apic_id, |
225 | .set_apic_id = set_apic_id, | 250 | .set_apic_id = set_apic_id, |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 067d8de913f6..e76d7e272974 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -246,7 +246,7 @@ static void hpet_legacy_clockevent_register(void) | |||
246 | * Start hpet with the boot cpu mask and make it | 246 | * Start hpet with the boot cpu mask and make it |
247 | * global after the IO_APIC has been initialized. | 247 | * global after the IO_APIC has been initialized. |
248 | */ | 248 | */ |
249 | hpet_clockevent.cpumask = cpumask_of_cpu(smp_processor_id()); | 249 | hpet_clockevent.cpumask = cpumask_of(smp_processor_id()); |
250 | clockevents_register_device(&hpet_clockevent); | 250 | clockevents_register_device(&hpet_clockevent); |
251 | global_clock_event = &hpet_clockevent; | 251 | global_clock_event = &hpet_clockevent; |
252 | printk(KERN_DEBUG "hpet clockevent registered\n"); | 252 | printk(KERN_DEBUG "hpet clockevent registered\n"); |
@@ -301,7 +301,7 @@ static void hpet_set_mode(enum clock_event_mode mode, | |||
301 | struct hpet_dev *hdev = EVT_TO_HPET_DEV(evt); | 301 | struct hpet_dev *hdev = EVT_TO_HPET_DEV(evt); |
302 | hpet_setup_msi_irq(hdev->irq); | 302 | hpet_setup_msi_irq(hdev->irq); |
303 | disable_irq(hdev->irq); | 303 | disable_irq(hdev->irq); |
304 | irq_set_affinity(hdev->irq, cpumask_of_cpu(hdev->cpu)); | 304 | irq_set_affinity(hdev->irq, cpumask_of(hdev->cpu)); |
305 | enable_irq(hdev->irq); | 305 | enable_irq(hdev->irq); |
306 | } | 306 | } |
307 | break; | 307 | break; |
@@ -449,7 +449,7 @@ static int hpet_setup_irq(struct hpet_dev *dev) | |||
449 | return -1; | 449 | return -1; |
450 | 450 | ||
451 | disable_irq(dev->irq); | 451 | disable_irq(dev->irq); |
452 | irq_set_affinity(dev->irq, cpumask_of_cpu(dev->cpu)); | 452 | irq_set_affinity(dev->irq, cpumask_of(dev->cpu)); |
453 | enable_irq(dev->irq); | 453 | enable_irq(dev->irq); |
454 | 454 | ||
455 | printk(KERN_DEBUG "hpet: %s irq %d for MSI\n", | 455 | printk(KERN_DEBUG "hpet: %s irq %d for MSI\n", |
@@ -500,7 +500,7 @@ static void init_one_hpet_msi_clockevent(struct hpet_dev *hdev, int cpu) | |||
500 | /* 5 usec minimum reprogramming delta. */ | 500 | /* 5 usec minimum reprogramming delta. */ |
501 | evt->min_delta_ns = 5000; | 501 | evt->min_delta_ns = 5000; |
502 | 502 | ||
503 | evt->cpumask = cpumask_of_cpu(hdev->cpu); | 503 | evt->cpumask = cpumask_of(hdev->cpu); |
504 | clockevents_register_device(evt); | 504 | clockevents_register_device(evt); |
505 | } | 505 | } |
506 | 506 | ||
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index 1f20608d4ca8..b0f61f0dcd0a 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c | |||
@@ -58,7 +58,7 @@ void __cpuinit mxcsr_feature_mask_init(void) | |||
58 | stts(); | 58 | stts(); |
59 | } | 59 | } |
60 | 60 | ||
61 | void __init init_thread_xstate(void) | 61 | void __cpuinit init_thread_xstate(void) |
62 | { | 62 | { |
63 | if (!HAVE_HWFP) { | 63 | if (!HAVE_HWFP) { |
64 | xstate_size = sizeof(struct i387_soft_struct); | 64 | xstate_size = sizeof(struct i387_soft_struct); |
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index c1b5e3ece1f2..10f92fb532f3 100644 --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c | |||
@@ -114,7 +114,7 @@ void __init setup_pit_timer(void) | |||
114 | * Start pit with the boot cpu mask and make it global after the | 114 | * Start pit with the boot cpu mask and make it global after the |
115 | * IO_APIC has been initialized. | 115 | * IO_APIC has been initialized. |
116 | */ | 116 | */ |
117 | pit_clockevent.cpumask = cpumask_of_cpu(smp_processor_id()); | 117 | pit_clockevent.cpumask = cpumask_of(smp_processor_id()); |
118 | pit_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, | 118 | pit_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, |
119 | pit_clockevent.shift); | 119 | pit_clockevent.shift); |
120 | pit_clockevent.max_delta_ns = | 120 | pit_clockevent.max_delta_ns = |
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 7a3f2028e2eb..6bd51ce3ce32 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
@@ -108,93 +108,271 @@ static int __init parse_noapic(char *str) | |||
108 | early_param("noapic", parse_noapic); | 108 | early_param("noapic", parse_noapic); |
109 | 109 | ||
110 | struct irq_pin_list; | 110 | struct irq_pin_list; |
111 | |||
112 | /* | ||
113 | * This is performance-critical, we want to do it O(1) | ||
114 | * | ||
115 | * the indexing order of this array favors 1:1 mappings | ||
116 | * between pins and IRQs. | ||
117 | */ | ||
118 | |||
119 | struct irq_pin_list { | ||
120 | int apic, pin; | ||
121 | struct irq_pin_list *next; | ||
122 | }; | ||
123 | |||
124 | static struct irq_pin_list *get_one_free_irq_2_pin(int cpu) | ||
125 | { | ||
126 | struct irq_pin_list *pin; | ||
127 | int node; | ||
128 | |||
129 | node = cpu_to_node(cpu); | ||
130 | |||
131 | pin = kzalloc_node(sizeof(*pin), GFP_ATOMIC, node); | ||
132 | printk(KERN_DEBUG " alloc irq_2_pin on cpu %d node %d\n", cpu, node); | ||
133 | |||
134 | return pin; | ||
135 | } | ||
136 | |||
111 | struct irq_cfg { | 137 | struct irq_cfg { |
112 | unsigned int irq; | ||
113 | struct irq_pin_list *irq_2_pin; | 138 | struct irq_pin_list *irq_2_pin; |
114 | cpumask_t domain; | 139 | cpumask_var_t domain; |
115 | cpumask_t old_domain; | 140 | cpumask_var_t old_domain; |
116 | unsigned move_cleanup_count; | 141 | unsigned move_cleanup_count; |
117 | u8 vector; | 142 | u8 vector; |
118 | u8 move_in_progress : 1; | 143 | u8 move_in_progress : 1; |
144 | #ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC | ||
145 | u8 move_desc_pending : 1; | ||
146 | #endif | ||
119 | }; | 147 | }; |
120 | 148 | ||
121 | /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ | 149 | /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ |
150 | #ifdef CONFIG_SPARSE_IRQ | ||
151 | static struct irq_cfg irq_cfgx[] = { | ||
152 | #else | ||
122 | static struct irq_cfg irq_cfgx[NR_IRQS] = { | 153 | static struct irq_cfg irq_cfgx[NR_IRQS] = { |
123 | [0] = { .irq = 0, .domain = CPU_MASK_ALL, .vector = IRQ0_VECTOR, }, | 154 | #endif |
124 | [1] = { .irq = 1, .domain = CPU_MASK_ALL, .vector = IRQ1_VECTOR, }, | 155 | [0] = { .vector = IRQ0_VECTOR, }, |
125 | [2] = { .irq = 2, .domain = CPU_MASK_ALL, .vector = IRQ2_VECTOR, }, | 156 | [1] = { .vector = IRQ1_VECTOR, }, |
126 | [3] = { .irq = 3, .domain = CPU_MASK_ALL, .vector = IRQ3_VECTOR, }, | 157 | [2] = { .vector = IRQ2_VECTOR, }, |
127 | [4] = { .irq = 4, .domain = CPU_MASK_ALL, .vector = IRQ4_VECTOR, }, | 158 | [3] = { .vector = IRQ3_VECTOR, }, |
128 | [5] = { .irq = 5, .domain = CPU_MASK_ALL, .vector = IRQ5_VECTOR, }, | 159 | [4] = { .vector = IRQ4_VECTOR, }, |
129 | [6] = { .irq = 6, .domain = CPU_MASK_ALL, .vector = IRQ6_VECTOR, }, | 160 | [5] = { .vector = IRQ5_VECTOR, }, |
130 | [7] = { .irq = 7, .domain = CPU_MASK_ALL, .vector = IRQ7_VECTOR, }, | 161 | [6] = { .vector = IRQ6_VECTOR, }, |
131 | [8] = { .irq = 8, .domain = CPU_MASK_ALL, .vector = IRQ8_VECTOR, }, | 162 | [7] = { .vector = IRQ7_VECTOR, }, |
132 | [9] = { .irq = 9, .domain = CPU_MASK_ALL, .vector = IRQ9_VECTOR, }, | 163 | [8] = { .vector = IRQ8_VECTOR, }, |
133 | [10] = { .irq = 10, .domain = CPU_MASK_ALL, .vector = IRQ10_VECTOR, }, | 164 | [9] = { .vector = IRQ9_VECTOR, }, |
134 | [11] = { .irq = 11, .domain = CPU_MASK_ALL, .vector = IRQ11_VECTOR, }, | 165 | [10] = { .vector = IRQ10_VECTOR, }, |
135 | [12] = { .irq = 12, .domain = CPU_MASK_ALL, .vector = IRQ12_VECTOR, }, | 166 | [11] = { .vector = IRQ11_VECTOR, }, |
136 | [13] = { .irq = 13, .domain = CPU_MASK_ALL, .vector = IRQ13_VECTOR, }, | 167 | [12] = { .vector = IRQ12_VECTOR, }, |
137 | [14] = { .irq = 14, .domain = CPU_MASK_ALL, .vector = IRQ14_VECTOR, }, | 168 | [13] = { .vector = IRQ13_VECTOR, }, |
138 | [15] = { .irq = 15, .domain = CPU_MASK_ALL, .vector = IRQ15_VECTOR, }, | 169 | [14] = { .vector = IRQ14_VECTOR, }, |
170 | [15] = { .vector = IRQ15_VECTOR, }, | ||
139 | }; | 171 | }; |
140 | 172 | ||
141 | #define for_each_irq_cfg(irq, cfg) \ | 173 | void __init arch_early_irq_init(void) |
142 | for (irq = 0, cfg = irq_cfgx; irq < nr_irqs; irq++, cfg++) | 174 | { |
175 | struct irq_cfg *cfg; | ||
176 | struct irq_desc *desc; | ||
177 | int count; | ||
178 | int i; | ||
143 | 179 | ||
180 | cfg = irq_cfgx; | ||
181 | count = ARRAY_SIZE(irq_cfgx); | ||
182 | |||
183 | for (i = 0; i < count; i++) { | ||
184 | desc = irq_to_desc(i); | ||
185 | desc->chip_data = &cfg[i]; | ||
186 | alloc_bootmem_cpumask_var(&cfg[i].domain); | ||
187 | alloc_bootmem_cpumask_var(&cfg[i].old_domain); | ||
188 | if (i < NR_IRQS_LEGACY) | ||
189 | cpumask_setall(cfg[i].domain); | ||
190 | } | ||
191 | } | ||
192 | |||
193 | #ifdef CONFIG_SPARSE_IRQ | ||
144 | static struct irq_cfg *irq_cfg(unsigned int irq) | 194 | static struct irq_cfg *irq_cfg(unsigned int irq) |
145 | { | 195 | { |
146 | return irq < nr_irqs ? irq_cfgx + irq : NULL; | 196 | struct irq_cfg *cfg = NULL; |
197 | struct irq_desc *desc; | ||
198 | |||
199 | desc = irq_to_desc(irq); | ||
200 | if (desc) | ||
201 | cfg = desc->chip_data; | ||
202 | |||
203 | return cfg; | ||
147 | } | 204 | } |
148 | 205 | ||
149 | static struct irq_cfg *irq_cfg_alloc(unsigned int irq) | 206 | static struct irq_cfg *get_one_free_irq_cfg(int cpu) |
150 | { | 207 | { |
151 | return irq_cfg(irq); | 208 | struct irq_cfg *cfg; |
209 | int node; | ||
210 | |||
211 | node = cpu_to_node(cpu); | ||
212 | |||
213 | cfg = kzalloc_node(sizeof(*cfg), GFP_ATOMIC, node); | ||
214 | if (cfg) { | ||
215 | /* FIXME: needs alloc_cpumask_var_node() */ | ||
216 | if (!alloc_cpumask_var(&cfg->domain, GFP_ATOMIC)) { | ||
217 | kfree(cfg); | ||
218 | cfg = NULL; | ||
219 | } else if (!alloc_cpumask_var(&cfg->old_domain, GFP_ATOMIC)) { | ||
220 | free_cpumask_var(cfg->domain); | ||
221 | kfree(cfg); | ||
222 | cfg = NULL; | ||
223 | } else { | ||
224 | cpumask_clear(cfg->domain); | ||
225 | cpumask_clear(cfg->old_domain); | ||
226 | } | ||
227 | } | ||
228 | printk(KERN_DEBUG " alloc irq_cfg on cpu %d node %d\n", cpu, node); | ||
229 | |||
230 | return cfg; | ||
152 | } | 231 | } |
153 | 232 | ||
154 | /* | 233 | void arch_init_chip_data(struct irq_desc *desc, int cpu) |
155 | * Rough estimation of how many shared IRQs there are, can be changed | 234 | { |
156 | * anytime. | 235 | struct irq_cfg *cfg; |
157 | */ | ||
158 | #define MAX_PLUS_SHARED_IRQS NR_IRQS | ||
159 | #define PIN_MAP_SIZE (MAX_PLUS_SHARED_IRQS + NR_IRQS) | ||
160 | 236 | ||
161 | /* | 237 | cfg = desc->chip_data; |
162 | * This is performance-critical, we want to do it O(1) | 238 | if (!cfg) { |
163 | * | 239 | desc->chip_data = get_one_free_irq_cfg(cpu); |
164 | * the indexing order of this array favors 1:1 mappings | 240 | if (!desc->chip_data) { |
165 | * between pins and IRQs. | 241 | printk(KERN_ERR "can not alloc irq_cfg\n"); |
166 | */ | 242 | BUG_ON(1); |
243 | } | ||
244 | } | ||
245 | } | ||
167 | 246 | ||
168 | struct irq_pin_list { | 247 | #ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC |
169 | int apic, pin; | ||
170 | struct irq_pin_list *next; | ||
171 | }; | ||
172 | 248 | ||
173 | static struct irq_pin_list irq_2_pin_head[PIN_MAP_SIZE]; | 249 | static void |
174 | static struct irq_pin_list *irq_2_pin_ptr; | 250 | init_copy_irq_2_pin(struct irq_cfg *old_cfg, struct irq_cfg *cfg, int cpu) |
251 | { | ||
252 | struct irq_pin_list *old_entry, *head, *tail, *entry; | ||
253 | |||
254 | cfg->irq_2_pin = NULL; | ||
255 | old_entry = old_cfg->irq_2_pin; | ||
256 | if (!old_entry) | ||
257 | return; | ||
258 | |||
259 | entry = get_one_free_irq_2_pin(cpu); | ||
260 | if (!entry) | ||
261 | return; | ||
175 | 262 | ||
176 | static void __init irq_2_pin_init(void) | 263 | entry->apic = old_entry->apic; |
264 | entry->pin = old_entry->pin; | ||
265 | head = entry; | ||
266 | tail = entry; | ||
267 | old_entry = old_entry->next; | ||
268 | while (old_entry) { | ||
269 | entry = get_one_free_irq_2_pin(cpu); | ||
270 | if (!entry) { | ||
271 | entry = head; | ||
272 | while (entry) { | ||
273 | head = entry->next; | ||
274 | kfree(entry); | ||
275 | entry = head; | ||
276 | } | ||
277 | /* still use the old one */ | ||
278 | return; | ||
279 | } | ||
280 | entry->apic = old_entry->apic; | ||
281 | entry->pin = old_entry->pin; | ||
282 | tail->next = entry; | ||
283 | tail = entry; | ||
284 | old_entry = old_entry->next; | ||
285 | } | ||
286 | |||
287 | tail->next = NULL; | ||
288 | cfg->irq_2_pin = head; | ||
289 | } | ||
290 | |||
291 | static void free_irq_2_pin(struct irq_cfg *old_cfg, struct irq_cfg *cfg) | ||
177 | { | 292 | { |
178 | struct irq_pin_list *pin = irq_2_pin_head; | 293 | struct irq_pin_list *entry, *next; |
179 | int i; | ||
180 | 294 | ||
181 | for (i = 1; i < PIN_MAP_SIZE; i++) | 295 | if (old_cfg->irq_2_pin == cfg->irq_2_pin) |
182 | pin[i-1].next = &pin[i]; | 296 | return; |
183 | 297 | ||
184 | irq_2_pin_ptr = &pin[0]; | 298 | entry = old_cfg->irq_2_pin; |
299 | |||
300 | while (entry) { | ||
301 | next = entry->next; | ||
302 | kfree(entry); | ||
303 | entry = next; | ||
304 | } | ||
305 | old_cfg->irq_2_pin = NULL; | ||
185 | } | 306 | } |
186 | 307 | ||
187 | static struct irq_pin_list *get_one_free_irq_2_pin(void) | 308 | void arch_init_copy_chip_data(struct irq_desc *old_desc, |
309 | struct irq_desc *desc, int cpu) | ||
188 | { | 310 | { |
189 | struct irq_pin_list *pin = irq_2_pin_ptr; | 311 | struct irq_cfg *cfg; |
312 | struct irq_cfg *old_cfg; | ||
190 | 313 | ||
191 | if (!pin) | 314 | cfg = get_one_free_irq_cfg(cpu); |
192 | panic("can not get more irq_2_pin\n"); | ||
193 | 315 | ||
194 | irq_2_pin_ptr = pin->next; | 316 | if (!cfg) |
195 | pin->next = NULL; | 317 | return; |
196 | return pin; | 318 | |
319 | desc->chip_data = cfg; | ||
320 | |||
321 | old_cfg = old_desc->chip_data; | ||
322 | |||
323 | memcpy(cfg, old_cfg, sizeof(struct irq_cfg)); | ||
324 | |||
325 | init_copy_irq_2_pin(old_cfg, cfg, cpu); | ||
326 | } | ||
327 | |||
328 | static void free_irq_cfg(struct irq_cfg *old_cfg) | ||
329 | { | ||
330 | kfree(old_cfg); | ||
331 | } | ||
332 | |||
333 | void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc) | ||
334 | { | ||
335 | struct irq_cfg *old_cfg, *cfg; | ||
336 | |||
337 | old_cfg = old_desc->chip_data; | ||
338 | cfg = desc->chip_data; | ||
339 | |||
340 | if (old_cfg == cfg) | ||
341 | return; | ||
342 | |||
343 | if (old_cfg) { | ||
344 | free_irq_2_pin(old_cfg, cfg); | ||
345 | free_irq_cfg(old_cfg); | ||
346 | old_desc->chip_data = NULL; | ||
347 | } | ||
348 | } | ||
349 | |||
350 | static void set_extra_move_desc(struct irq_desc *desc, cpumask_t mask) | ||
351 | { | ||
352 | struct irq_cfg *cfg = desc->chip_data; | ||
353 | |||
354 | if (!cfg->move_in_progress) { | ||
355 | /* it means that domain is not changed */ | ||
356 | if (!cpus_intersects(desc->affinity, mask)) | ||
357 | cfg->move_desc_pending = 1; | ||
358 | } | ||
197 | } | 359 | } |
360 | #endif | ||
361 | |||
362 | #else | ||
363 | static struct irq_cfg *irq_cfg(unsigned int irq) | ||
364 | { | ||
365 | return irq < nr_irqs ? irq_cfgx + irq : NULL; | ||
366 | } | ||
367 | |||
368 | #endif | ||
369 | |||
370 | #ifndef CONFIG_NUMA_MIGRATE_IRQ_DESC | ||
371 | static inline void | ||
372 | set_extra_move_desc(struct irq_desc *desc, const struct cpumask *mask) | ||
373 | { | ||
374 | } | ||
375 | #endif | ||
198 | 376 | ||
199 | struct io_apic { | 377 | struct io_apic { |
200 | unsigned int index; | 378 | unsigned int index; |
@@ -237,11 +415,10 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned | |||
237 | writel(value, &io_apic->data); | 415 | writel(value, &io_apic->data); |
238 | } | 416 | } |
239 | 417 | ||
240 | static bool io_apic_level_ack_pending(unsigned int irq) | 418 | static bool io_apic_level_ack_pending(struct irq_cfg *cfg) |
241 | { | 419 | { |
242 | struct irq_pin_list *entry; | 420 | struct irq_pin_list *entry; |
243 | unsigned long flags; | 421 | unsigned long flags; |
244 | struct irq_cfg *cfg = irq_cfg(irq); | ||
245 | 422 | ||
246 | spin_lock_irqsave(&ioapic_lock, flags); | 423 | spin_lock_irqsave(&ioapic_lock, flags); |
247 | entry = cfg->irq_2_pin; | 424 | entry = cfg->irq_2_pin; |
@@ -323,13 +500,32 @@ static void ioapic_mask_entry(int apic, int pin) | |||
323 | } | 500 | } |
324 | 501 | ||
325 | #ifdef CONFIG_SMP | 502 | #ifdef CONFIG_SMP |
326 | static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector) | 503 | static void send_cleanup_vector(struct irq_cfg *cfg) |
504 | { | ||
505 | cpumask_var_t cleanup_mask; | ||
506 | |||
507 | if (unlikely(!alloc_cpumask_var(&cleanup_mask, GFP_ATOMIC))) { | ||
508 | unsigned int i; | ||
509 | cfg->move_cleanup_count = 0; | ||
510 | for_each_cpu_and(i, cfg->old_domain, cpu_online_mask) | ||
511 | cfg->move_cleanup_count++; | ||
512 | for_each_cpu_and(i, cfg->old_domain, cpu_online_mask) | ||
513 | send_IPI_mask(cpumask_of(i), IRQ_MOVE_CLEANUP_VECTOR); | ||
514 | } else { | ||
515 | cpumask_and(cleanup_mask, cfg->old_domain, cpu_online_mask); | ||
516 | cfg->move_cleanup_count = cpumask_weight(cleanup_mask); | ||
517 | send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); | ||
518 | free_cpumask_var(cleanup_mask); | ||
519 | } | ||
520 | cfg->move_in_progress = 0; | ||
521 | } | ||
522 | |||
523 | static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, struct irq_cfg *cfg) | ||
327 | { | 524 | { |
328 | int apic, pin; | 525 | int apic, pin; |
329 | struct irq_cfg *cfg; | ||
330 | struct irq_pin_list *entry; | 526 | struct irq_pin_list *entry; |
527 | u8 vector = cfg->vector; | ||
331 | 528 | ||
332 | cfg = irq_cfg(irq); | ||
333 | entry = cfg->irq_2_pin; | 529 | entry = cfg->irq_2_pin; |
334 | for (;;) { | 530 | for (;;) { |
335 | unsigned int reg; | 531 | unsigned int reg; |
@@ -359,36 +555,61 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector) | |||
359 | } | 555 | } |
360 | } | 556 | } |
361 | 557 | ||
362 | static int assign_irq_vector(int irq, cpumask_t mask); | 558 | static int |
559 | assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask); | ||
560 | |||
561 | /* | ||
562 | * Either sets desc->affinity to a valid value, and returns cpu_mask_to_apicid | ||
563 | * of that, or returns BAD_APICID and leaves desc->affinity untouched. | ||
564 | */ | ||
565 | static unsigned int | ||
566 | set_desc_affinity(struct irq_desc *desc, const struct cpumask *mask) | ||
567 | { | ||
568 | struct irq_cfg *cfg; | ||
569 | unsigned int irq; | ||
570 | |||
571 | if (!cpumask_intersects(mask, cpu_online_mask)) | ||
572 | return BAD_APICID; | ||
363 | 573 | ||
364 | static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask) | 574 | irq = desc->irq; |
575 | cfg = desc->chip_data; | ||
576 | if (assign_irq_vector(irq, cfg, mask)) | ||
577 | return BAD_APICID; | ||
578 | |||
579 | cpumask_and(&desc->affinity, cfg->domain, mask); | ||
580 | set_extra_move_desc(desc, mask); | ||
581 | return cpu_mask_to_apicid_and(&desc->affinity, cpu_online_mask); | ||
582 | } | ||
583 | |||
584 | static void | ||
585 | set_ioapic_affinity_irq_desc(struct irq_desc *desc, const struct cpumask *mask) | ||
365 | { | 586 | { |
366 | struct irq_cfg *cfg; | 587 | struct irq_cfg *cfg; |
367 | unsigned long flags; | 588 | unsigned long flags; |
368 | unsigned int dest; | 589 | unsigned int dest; |
369 | cpumask_t tmp; | 590 | unsigned int irq; |
370 | struct irq_desc *desc; | ||
371 | 591 | ||
372 | cpus_and(tmp, mask, cpu_online_map); | 592 | irq = desc->irq; |
373 | if (cpus_empty(tmp)) | 593 | cfg = desc->chip_data; |
374 | return; | ||
375 | 594 | ||
376 | cfg = irq_cfg(irq); | 595 | spin_lock_irqsave(&ioapic_lock, flags); |
377 | if (assign_irq_vector(irq, mask)) | 596 | dest = set_desc_affinity(desc, mask); |
378 | return; | 597 | if (dest != BAD_APICID) { |
598 | /* Only the high 8 bits are valid. */ | ||
599 | dest = SET_APIC_LOGICAL_ID(dest); | ||
600 | __target_IO_APIC_irq(irq, dest, cfg); | ||
601 | } | ||
602 | spin_unlock_irqrestore(&ioapic_lock, flags); | ||
603 | } | ||
379 | 604 | ||
380 | cpus_and(tmp, cfg->domain, mask); | 605 | static void |
381 | dest = cpu_mask_to_apicid(tmp); | 606 | set_ioapic_affinity_irq(unsigned int irq, const struct cpumask *mask) |
382 | /* | 607 | { |
383 | * Only the high 8 bits are valid. | 608 | struct irq_desc *desc; |
384 | */ | ||
385 | dest = SET_APIC_LOGICAL_ID(dest); | ||
386 | 609 | ||
387 | desc = irq_to_desc(irq); | 610 | desc = irq_to_desc(irq); |
388 | spin_lock_irqsave(&ioapic_lock, flags); | 611 | |
389 | __target_IO_APIC_irq(irq, dest, cfg->vector); | 612 | set_ioapic_affinity_irq_desc(desc, mask); |
390 | desc->affinity = mask; | ||
391 | spin_unlock_irqrestore(&ioapic_lock, flags); | ||
392 | } | 613 | } |
393 | #endif /* CONFIG_SMP */ | 614 | #endif /* CONFIG_SMP */ |
394 | 615 | ||
@@ -397,16 +618,18 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask) | |||
397 | * shared ISA-space IRQs, so we have to support them. We are super | 618 | * shared ISA-space IRQs, so we have to support them. We are super |
398 | * fast in the common case, and fast for shared ISA-space IRQs. | 619 | * fast in the common case, and fast for shared ISA-space IRQs. |
399 | */ | 620 | */ |
400 | static void add_pin_to_irq(unsigned int irq, int apic, int pin) | 621 | static void add_pin_to_irq_cpu(struct irq_cfg *cfg, int cpu, int apic, int pin) |
401 | { | 622 | { |
402 | struct irq_cfg *cfg; | ||
403 | struct irq_pin_list *entry; | 623 | struct irq_pin_list *entry; |
404 | 624 | ||
405 | /* first time to refer irq_cfg, so with new */ | ||
406 | cfg = irq_cfg_alloc(irq); | ||
407 | entry = cfg->irq_2_pin; | 625 | entry = cfg->irq_2_pin; |
408 | if (!entry) { | 626 | if (!entry) { |
409 | entry = get_one_free_irq_2_pin(); | 627 | entry = get_one_free_irq_2_pin(cpu); |
628 | if (!entry) { | ||
629 | printk(KERN_ERR "can not alloc irq_2_pin to add %d - %d\n", | ||
630 | apic, pin); | ||
631 | return; | ||
632 | } | ||
410 | cfg->irq_2_pin = entry; | 633 | cfg->irq_2_pin = entry; |
411 | entry->apic = apic; | 634 | entry->apic = apic; |
412 | entry->pin = pin; | 635 | entry->pin = pin; |
@@ -421,7 +644,7 @@ static void add_pin_to_irq(unsigned int irq, int apic, int pin) | |||
421 | entry = entry->next; | 644 | entry = entry->next; |
422 | } | 645 | } |
423 | 646 | ||
424 | entry->next = get_one_free_irq_2_pin(); | 647 | entry->next = get_one_free_irq_2_pin(cpu); |
425 | entry = entry->next; | 648 | entry = entry->next; |
426 | entry->apic = apic; | 649 | entry->apic = apic; |
427 | entry->pin = pin; | 650 | entry->pin = pin; |
@@ -430,11 +653,10 @@ static void add_pin_to_irq(unsigned int irq, int apic, int pin) | |||
430 | /* | 653 | /* |
431 | * Reroute an IRQ to a different pin. | 654 | * Reroute an IRQ to a different pin. |
432 | */ | 655 | */ |
433 | static void __init replace_pin_at_irq(unsigned int irq, | 656 | static void __init replace_pin_at_irq_cpu(struct irq_cfg *cfg, int cpu, |
434 | int oldapic, int oldpin, | 657 | int oldapic, int oldpin, |
435 | int newapic, int newpin) | 658 | int newapic, int newpin) |
436 | { | 659 | { |
437 | struct irq_cfg *cfg = irq_cfg(irq); | ||
438 | struct irq_pin_list *entry = cfg->irq_2_pin; | 660 | struct irq_pin_list *entry = cfg->irq_2_pin; |
439 | int replaced = 0; | 661 | int replaced = 0; |
440 | 662 | ||
@@ -451,18 +673,16 @@ static void __init replace_pin_at_irq(unsigned int irq, | |||
451 | 673 | ||
452 | /* why? call replace before add? */ | 674 | /* why? call replace before add? */ |
453 | if (!replaced) | 675 | if (!replaced) |
454 | add_pin_to_irq(irq, newapic, newpin); | 676 | add_pin_to_irq_cpu(cfg, cpu, newapic, newpin); |
455 | } | 677 | } |
456 | 678 | ||
457 | static inline void io_apic_modify_irq(unsigned int irq, | 679 | static inline void io_apic_modify_irq(struct irq_cfg *cfg, |
458 | int mask_and, int mask_or, | 680 | int mask_and, int mask_or, |
459 | void (*final)(struct irq_pin_list *entry)) | 681 | void (*final)(struct irq_pin_list *entry)) |
460 | { | 682 | { |
461 | int pin; | 683 | int pin; |
462 | struct irq_cfg *cfg; | ||
463 | struct irq_pin_list *entry; | 684 | struct irq_pin_list *entry; |
464 | 685 | ||
465 | cfg = irq_cfg(irq); | ||
466 | for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) { | 686 | for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) { |
467 | unsigned int reg; | 687 | unsigned int reg; |
468 | pin = entry->pin; | 688 | pin = entry->pin; |
@@ -475,9 +695,9 @@ static inline void io_apic_modify_irq(unsigned int irq, | |||
475 | } | 695 | } |
476 | } | 696 | } |
477 | 697 | ||
478 | static void __unmask_IO_APIC_irq(unsigned int irq) | 698 | static void __unmask_IO_APIC_irq(struct irq_cfg *cfg) |
479 | { | 699 | { |
480 | io_apic_modify_irq(irq, ~IO_APIC_REDIR_MASKED, 0, NULL); | 700 | io_apic_modify_irq(cfg, ~IO_APIC_REDIR_MASKED, 0, NULL); |
481 | } | 701 | } |
482 | 702 | ||
483 | #ifdef CONFIG_X86_64 | 703 | #ifdef CONFIG_X86_64 |
@@ -492,47 +712,64 @@ void io_apic_sync(struct irq_pin_list *entry) | |||
492 | readl(&io_apic->data); | 712 | readl(&io_apic->data); |
493 | } | 713 | } |
494 | 714 | ||
495 | static void __mask_IO_APIC_irq(unsigned int irq) | 715 | static void __mask_IO_APIC_irq(struct irq_cfg *cfg) |
496 | { | 716 | { |
497 | io_apic_modify_irq(irq, ~0, IO_APIC_REDIR_MASKED, &io_apic_sync); | 717 | io_apic_modify_irq(cfg, ~0, IO_APIC_REDIR_MASKED, &io_apic_sync); |
498 | } | 718 | } |
499 | #else /* CONFIG_X86_32 */ | 719 | #else /* CONFIG_X86_32 */ |
500 | static void __mask_IO_APIC_irq(unsigned int irq) | 720 | static void __mask_IO_APIC_irq(struct irq_cfg *cfg) |
501 | { | 721 | { |
502 | io_apic_modify_irq(irq, ~0, IO_APIC_REDIR_MASKED, NULL); | 722 | io_apic_modify_irq(cfg, ~0, IO_APIC_REDIR_MASKED, NULL); |
503 | } | 723 | } |
504 | 724 | ||
505 | static void __mask_and_edge_IO_APIC_irq(unsigned int irq) | 725 | static void __mask_and_edge_IO_APIC_irq(struct irq_cfg *cfg) |
506 | { | 726 | { |
507 | io_apic_modify_irq(irq, ~IO_APIC_REDIR_LEVEL_TRIGGER, | 727 | io_apic_modify_irq(cfg, ~IO_APIC_REDIR_LEVEL_TRIGGER, |
508 | IO_APIC_REDIR_MASKED, NULL); | 728 | IO_APIC_REDIR_MASKED, NULL); |
509 | } | 729 | } |
510 | 730 | ||
511 | static void __unmask_and_level_IO_APIC_irq(unsigned int irq) | 731 | static void __unmask_and_level_IO_APIC_irq(struct irq_cfg *cfg) |
512 | { | 732 | { |
513 | io_apic_modify_irq(irq, ~IO_APIC_REDIR_MASKED, | 733 | io_apic_modify_irq(cfg, ~IO_APIC_REDIR_MASKED, |
514 | IO_APIC_REDIR_LEVEL_TRIGGER, NULL); | 734 | IO_APIC_REDIR_LEVEL_TRIGGER, NULL); |
515 | } | 735 | } |
516 | #endif /* CONFIG_X86_32 */ | 736 | #endif /* CONFIG_X86_32 */ |
517 | 737 | ||
518 | static void mask_IO_APIC_irq (unsigned int irq) | 738 | static void mask_IO_APIC_irq_desc(struct irq_desc *desc) |
519 | { | 739 | { |
740 | struct irq_cfg *cfg = desc->chip_data; | ||
520 | unsigned long flags; | 741 | unsigned long flags; |
521 | 742 | ||
743 | BUG_ON(!cfg); | ||
744 | |||
522 | spin_lock_irqsave(&ioapic_lock, flags); | 745 | spin_lock_irqsave(&ioapic_lock, flags); |
523 | __mask_IO_APIC_irq(irq); | 746 | __mask_IO_APIC_irq(cfg); |
524 | spin_unlock_irqrestore(&ioapic_lock, flags); | 747 | spin_unlock_irqrestore(&ioapic_lock, flags); |
525 | } | 748 | } |
526 | 749 | ||
527 | static void unmask_IO_APIC_irq (unsigned int irq) | 750 | static void unmask_IO_APIC_irq_desc(struct irq_desc *desc) |
528 | { | 751 | { |
752 | struct irq_cfg *cfg = desc->chip_data; | ||
529 | unsigned long flags; | 753 | unsigned long flags; |
530 | 754 | ||
531 | spin_lock_irqsave(&ioapic_lock, flags); | 755 | spin_lock_irqsave(&ioapic_lock, flags); |
532 | __unmask_IO_APIC_irq(irq); | 756 | __unmask_IO_APIC_irq(cfg); |
533 | spin_unlock_irqrestore(&ioapic_lock, flags); | 757 | spin_unlock_irqrestore(&ioapic_lock, flags); |
534 | } | 758 | } |
535 | 759 | ||
760 | static void mask_IO_APIC_irq(unsigned int irq) | ||
761 | { | ||
762 | struct irq_desc *desc = irq_to_desc(irq); | ||
763 | |||
764 | mask_IO_APIC_irq_desc(desc); | ||
765 | } | ||
766 | static void unmask_IO_APIC_irq(unsigned int irq) | ||
767 | { | ||
768 | struct irq_desc *desc = irq_to_desc(irq); | ||
769 | |||
770 | unmask_IO_APIC_irq_desc(desc); | ||
771 | } | ||
772 | |||
536 | static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) | 773 | static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) |
537 | { | 774 | { |
538 | struct IO_APIC_route_entry entry; | 775 | struct IO_APIC_route_entry entry; |
@@ -809,7 +1046,7 @@ EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); | |||
809 | */ | 1046 | */ |
810 | static int EISA_ELCR(unsigned int irq) | 1047 | static int EISA_ELCR(unsigned int irq) |
811 | { | 1048 | { |
812 | if (irq < 16) { | 1049 | if (irq < NR_IRQS_LEGACY) { |
813 | unsigned int port = 0x4d0 + (irq >> 3); | 1050 | unsigned int port = 0x4d0 + (irq >> 3); |
814 | return (inb(port) >> (irq & 7)) & 1; | 1051 | return (inb(port) >> (irq & 7)) & 1; |
815 | } | 1052 | } |
@@ -1034,7 +1271,8 @@ void unlock_vector_lock(void) | |||
1034 | spin_unlock(&vector_lock); | 1271 | spin_unlock(&vector_lock); |
1035 | } | 1272 | } |
1036 | 1273 | ||
1037 | static int __assign_irq_vector(int irq, cpumask_t mask) | 1274 | static int |
1275 | __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) | ||
1038 | { | 1276 | { |
1039 | /* | 1277 | /* |
1040 | * NOTE! The local APIC isn't very good at handling | 1278 | * NOTE! The local APIC isn't very good at handling |
@@ -1049,39 +1287,39 @@ static int __assign_irq_vector(int irq, cpumask_t mask) | |||
1049 | */ | 1287 | */ |
1050 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset = 0; | 1288 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset = 0; |
1051 | unsigned int old_vector; | 1289 | unsigned int old_vector; |
1052 | int cpu; | 1290 | int cpu, err; |
1053 | struct irq_cfg *cfg; | 1291 | cpumask_var_t tmp_mask; |
1054 | |||
1055 | cfg = irq_cfg(irq); | ||
1056 | |||
1057 | /* Only try and allocate irqs on cpus that are present */ | ||
1058 | cpus_and(mask, mask, cpu_online_map); | ||
1059 | 1292 | ||
1060 | if ((cfg->move_in_progress) || cfg->move_cleanup_count) | 1293 | if ((cfg->move_in_progress) || cfg->move_cleanup_count) |
1061 | return -EBUSY; | 1294 | return -EBUSY; |
1062 | 1295 | ||
1296 | if (!alloc_cpumask_var(&tmp_mask, GFP_ATOMIC)) | ||
1297 | return -ENOMEM; | ||
1298 | |||
1063 | old_vector = cfg->vector; | 1299 | old_vector = cfg->vector; |
1064 | if (old_vector) { | 1300 | if (old_vector) { |
1065 | cpumask_t tmp; | 1301 | cpumask_and(tmp_mask, mask, cpu_online_mask); |
1066 | cpus_and(tmp, cfg->domain, mask); | 1302 | cpumask_and(tmp_mask, cfg->domain, tmp_mask); |
1067 | if (!cpus_empty(tmp)) | 1303 | if (!cpumask_empty(tmp_mask)) { |
1304 | free_cpumask_var(tmp_mask); | ||
1068 | return 0; | 1305 | return 0; |
1306 | } | ||
1069 | } | 1307 | } |
1070 | 1308 | ||
1071 | for_each_cpu_mask_nr(cpu, mask) { | 1309 | /* Only try and allocate irqs on cpus that are present */ |
1072 | cpumask_t domain, new_mask; | 1310 | err = -ENOSPC; |
1311 | for_each_cpu_and(cpu, mask, cpu_online_mask) { | ||
1073 | int new_cpu; | 1312 | int new_cpu; |
1074 | int vector, offset; | 1313 | int vector, offset; |
1075 | 1314 | ||
1076 | domain = vector_allocation_domain(cpu); | 1315 | vector_allocation_domain(cpu, tmp_mask); |
1077 | cpus_and(new_mask, domain, cpu_online_map); | ||
1078 | 1316 | ||
1079 | vector = current_vector; | 1317 | vector = current_vector; |
1080 | offset = current_offset; | 1318 | offset = current_offset; |
1081 | next: | 1319 | next: |
1082 | vector += 8; | 1320 | vector += 8; |
1083 | if (vector >= first_system_vector) { | 1321 | if (vector >= first_system_vector) { |
1084 | /* If we run out of vectors on large boxen, must share them. */ | 1322 | /* If out of vectors on large boxen, must share them. */ |
1085 | offset = (offset + 1) % 8; | 1323 | offset = (offset + 1) % 8; |
1086 | vector = FIRST_DEVICE_VECTOR + offset; | 1324 | vector = FIRST_DEVICE_VECTOR + offset; |
1087 | } | 1325 | } |
@@ -1094,7 +1332,7 @@ next: | |||
1094 | if (vector == SYSCALL_VECTOR) | 1332 | if (vector == SYSCALL_VECTOR) |
1095 | goto next; | 1333 | goto next; |
1096 | #endif | 1334 | #endif |
1097 | for_each_cpu_mask_nr(new_cpu, new_mask) | 1335 | for_each_cpu_and(new_cpu, tmp_mask, cpu_online_mask) |
1098 | if (per_cpu(vector_irq, new_cpu)[vector] != -1) | 1336 | if (per_cpu(vector_irq, new_cpu)[vector] != -1) |
1099 | goto next; | 1337 | goto next; |
1100 | /* Found one! */ | 1338 | /* Found one! */ |
@@ -1102,44 +1340,56 @@ next: | |||
1102 | current_offset = offset; | 1340 | current_offset = offset; |
1103 | if (old_vector) { | 1341 | if (old_vector) { |
1104 | cfg->move_in_progress = 1; | 1342 | cfg->move_in_progress = 1; |
1105 | cfg->old_domain = cfg->domain; | 1343 | cpumask_copy(cfg->old_domain, cfg->domain); |
1106 | } | 1344 | } |
1107 | for_each_cpu_mask_nr(new_cpu, new_mask) | 1345 | for_each_cpu_and(new_cpu, tmp_mask, cpu_online_mask) |
1108 | per_cpu(vector_irq, new_cpu)[vector] = irq; | 1346 | per_cpu(vector_irq, new_cpu)[vector] = irq; |
1109 | cfg->vector = vector; | 1347 | cfg->vector = vector; |
1110 | cfg->domain = domain; | 1348 | cpumask_copy(cfg->domain, tmp_mask); |
1111 | return 0; | 1349 | err = 0; |
1350 | break; | ||
1112 | } | 1351 | } |
1113 | return -ENOSPC; | 1352 | free_cpumask_var(tmp_mask); |
1353 | return err; | ||
1114 | } | 1354 | } |
1115 | 1355 | ||
1116 | static int assign_irq_vector(int irq, cpumask_t mask) | 1356 | static int |
1357 | assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) | ||
1117 | { | 1358 | { |
1118 | int err; | 1359 | int err; |
1119 | unsigned long flags; | 1360 | unsigned long flags; |
1120 | 1361 | ||
1121 | spin_lock_irqsave(&vector_lock, flags); | 1362 | spin_lock_irqsave(&vector_lock, flags); |
1122 | err = __assign_irq_vector(irq, mask); | 1363 | err = __assign_irq_vector(irq, cfg, mask); |
1123 | spin_unlock_irqrestore(&vector_lock, flags); | 1364 | spin_unlock_irqrestore(&vector_lock, flags); |
1124 | return err; | 1365 | return err; |
1125 | } | 1366 | } |
1126 | 1367 | ||
1127 | static void __clear_irq_vector(int irq) | 1368 | static void __clear_irq_vector(int irq, struct irq_cfg *cfg) |
1128 | { | 1369 | { |
1129 | struct irq_cfg *cfg; | ||
1130 | cpumask_t mask; | ||
1131 | int cpu, vector; | 1370 | int cpu, vector; |
1132 | 1371 | ||
1133 | cfg = irq_cfg(irq); | ||
1134 | BUG_ON(!cfg->vector); | 1372 | BUG_ON(!cfg->vector); |
1135 | 1373 | ||
1136 | vector = cfg->vector; | 1374 | vector = cfg->vector; |
1137 | cpus_and(mask, cfg->domain, cpu_online_map); | 1375 | for_each_cpu_and(cpu, cfg->domain, cpu_online_mask) |
1138 | for_each_cpu_mask_nr(cpu, mask) | ||
1139 | per_cpu(vector_irq, cpu)[vector] = -1; | 1376 | per_cpu(vector_irq, cpu)[vector] = -1; |
1140 | 1377 | ||
1141 | cfg->vector = 0; | 1378 | cfg->vector = 0; |
1142 | cpus_clear(cfg->domain); | 1379 | cpumask_clear(cfg->domain); |
1380 | |||
1381 | if (likely(!cfg->move_in_progress)) | ||
1382 | return; | ||
1383 | for_each_cpu_and(cpu, cfg->old_domain, cpu_online_mask) { | ||
1384 | for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; | ||
1385 | vector++) { | ||
1386 | if (per_cpu(vector_irq, cpu)[vector] != irq) | ||
1387 | continue; | ||
1388 | per_cpu(vector_irq, cpu)[vector] = -1; | ||
1389 | break; | ||
1390 | } | ||
1391 | } | ||
1392 | cfg->move_in_progress = 0; | ||
1143 | } | 1393 | } |
1144 | 1394 | ||
1145 | void __setup_vector_irq(int cpu) | 1395 | void __setup_vector_irq(int cpu) |
@@ -1148,10 +1398,14 @@ void __setup_vector_irq(int cpu) | |||
1148 | /* This function must be called with vector_lock held */ | 1398 | /* This function must be called with vector_lock held */ |
1149 | int irq, vector; | 1399 | int irq, vector; |
1150 | struct irq_cfg *cfg; | 1400 | struct irq_cfg *cfg; |
1401 | struct irq_desc *desc; | ||
1151 | 1402 | ||
1152 | /* Mark the inuse vectors */ | 1403 | /* Mark the inuse vectors */ |
1153 | for_each_irq_cfg(irq, cfg) { | 1404 | for_each_irq_desc(irq, desc) { |
1154 | if (!cpu_isset(cpu, cfg->domain)) | 1405 | if (!desc) |
1406 | continue; | ||
1407 | cfg = desc->chip_data; | ||
1408 | if (!cpumask_test_cpu(cpu, cfg->domain)) | ||
1155 | continue; | 1409 | continue; |
1156 | vector = cfg->vector; | 1410 | vector = cfg->vector; |
1157 | per_cpu(vector_irq, cpu)[vector] = irq; | 1411 | per_cpu(vector_irq, cpu)[vector] = irq; |
@@ -1163,7 +1417,7 @@ void __setup_vector_irq(int cpu) | |||
1163 | continue; | 1417 | continue; |
1164 | 1418 | ||
1165 | cfg = irq_cfg(irq); | 1419 | cfg = irq_cfg(irq); |
1166 | if (!cpu_isset(cpu, cfg->domain)) | 1420 | if (!cpumask_test_cpu(cpu, cfg->domain)) |
1167 | per_cpu(vector_irq, cpu)[vector] = -1; | 1421 | per_cpu(vector_irq, cpu)[vector] = -1; |
1168 | } | 1422 | } |
1169 | } | 1423 | } |
@@ -1201,11 +1455,8 @@ static inline int IO_APIC_irq_trigger(int irq) | |||
1201 | } | 1455 | } |
1202 | #endif | 1456 | #endif |
1203 | 1457 | ||
1204 | static void ioapic_register_intr(int irq, unsigned long trigger) | 1458 | static void ioapic_register_intr(int irq, struct irq_desc *desc, unsigned long trigger) |
1205 | { | 1459 | { |
1206 | struct irq_desc *desc; | ||
1207 | |||
1208 | desc = irq_to_desc(irq); | ||
1209 | 1460 | ||
1210 | if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) || | 1461 | if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) || |
1211 | trigger == IOAPIC_LEVEL) | 1462 | trigger == IOAPIC_LEVEL) |
@@ -1297,23 +1548,22 @@ static int setup_ioapic_entry(int apic, int irq, | |||
1297 | return 0; | 1548 | return 0; |
1298 | } | 1549 | } |
1299 | 1550 | ||
1300 | static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq, | 1551 | static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq, struct irq_desc *desc, |
1301 | int trigger, int polarity) | 1552 | int trigger, int polarity) |
1302 | { | 1553 | { |
1303 | struct irq_cfg *cfg; | 1554 | struct irq_cfg *cfg; |
1304 | struct IO_APIC_route_entry entry; | 1555 | struct IO_APIC_route_entry entry; |
1305 | cpumask_t mask; | 1556 | unsigned int dest; |
1306 | 1557 | ||
1307 | if (!IO_APIC_IRQ(irq)) | 1558 | if (!IO_APIC_IRQ(irq)) |
1308 | return; | 1559 | return; |
1309 | 1560 | ||
1310 | cfg = irq_cfg(irq); | 1561 | cfg = desc->chip_data; |
1311 | 1562 | ||
1312 | mask = TARGET_CPUS; | 1563 | if (assign_irq_vector(irq, cfg, TARGET_CPUS)) |
1313 | if (assign_irq_vector(irq, mask)) | ||
1314 | return; | 1564 | return; |
1315 | 1565 | ||
1316 | cpus_and(mask, cfg->domain, mask); | 1566 | dest = cpu_mask_to_apicid_and(cfg->domain, TARGET_CPUS); |
1317 | 1567 | ||
1318 | apic_printk(APIC_VERBOSE,KERN_DEBUG | 1568 | apic_printk(APIC_VERBOSE,KERN_DEBUG |
1319 | "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> " | 1569 | "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> " |
@@ -1323,16 +1573,15 @@ static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq, | |||
1323 | 1573 | ||
1324 | 1574 | ||
1325 | if (setup_ioapic_entry(mp_ioapics[apic].mp_apicid, irq, &entry, | 1575 | if (setup_ioapic_entry(mp_ioapics[apic].mp_apicid, irq, &entry, |
1326 | cpu_mask_to_apicid(mask), trigger, polarity, | 1576 | dest, trigger, polarity, cfg->vector)) { |
1327 | cfg->vector)) { | ||
1328 | printk("Failed to setup ioapic entry for ioapic %d, pin %d\n", | 1577 | printk("Failed to setup ioapic entry for ioapic %d, pin %d\n", |
1329 | mp_ioapics[apic].mp_apicid, pin); | 1578 | mp_ioapics[apic].mp_apicid, pin); |
1330 | __clear_irq_vector(irq); | 1579 | __clear_irq_vector(irq, cfg); |
1331 | return; | 1580 | return; |
1332 | } | 1581 | } |
1333 | 1582 | ||
1334 | ioapic_register_intr(irq, trigger); | 1583 | ioapic_register_intr(irq, desc, trigger); |
1335 | if (irq < 16) | 1584 | if (irq < NR_IRQS_LEGACY) |
1336 | disable_8259A_irq(irq); | 1585 | disable_8259A_irq(irq); |
1337 | 1586 | ||
1338 | ioapic_write_entry(apic, pin, entry); | 1587 | ioapic_write_entry(apic, pin, entry); |
@@ -1342,6 +1591,9 @@ static void __init setup_IO_APIC_irqs(void) | |||
1342 | { | 1591 | { |
1343 | int apic, pin, idx, irq; | 1592 | int apic, pin, idx, irq; |
1344 | int notcon = 0; | 1593 | int notcon = 0; |
1594 | struct irq_desc *desc; | ||
1595 | struct irq_cfg *cfg; | ||
1596 | int cpu = boot_cpu_id; | ||
1345 | 1597 | ||
1346 | apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n"); | 1598 | apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n"); |
1347 | 1599 | ||
@@ -1373,9 +1625,15 @@ static void __init setup_IO_APIC_irqs(void) | |||
1373 | if (multi_timer_check(apic, irq)) | 1625 | if (multi_timer_check(apic, irq)) |
1374 | continue; | 1626 | continue; |
1375 | #endif | 1627 | #endif |
1376 | add_pin_to_irq(irq, apic, pin); | 1628 | desc = irq_to_desc_alloc_cpu(irq, cpu); |
1629 | if (!desc) { | ||
1630 | printk(KERN_INFO "can not get irq_desc for %d\n", irq); | ||
1631 | continue; | ||
1632 | } | ||
1633 | cfg = desc->chip_data; | ||
1634 | add_pin_to_irq_cpu(cfg, cpu, apic, pin); | ||
1377 | 1635 | ||
1378 | setup_IO_APIC_irq(apic, pin, irq, | 1636 | setup_IO_APIC_irq(apic, pin, irq, desc, |
1379 | irq_trigger(idx), irq_polarity(idx)); | 1637 | irq_trigger(idx), irq_polarity(idx)); |
1380 | } | 1638 | } |
1381 | } | 1639 | } |
@@ -1434,6 +1692,7 @@ __apicdebuginit(void) print_IO_APIC(void) | |||
1434 | union IO_APIC_reg_03 reg_03; | 1692 | union IO_APIC_reg_03 reg_03; |
1435 | unsigned long flags; | 1693 | unsigned long flags; |
1436 | struct irq_cfg *cfg; | 1694 | struct irq_cfg *cfg; |
1695 | struct irq_desc *desc; | ||
1437 | unsigned int irq; | 1696 | unsigned int irq; |
1438 | 1697 | ||
1439 | if (apic_verbosity == APIC_QUIET) | 1698 | if (apic_verbosity == APIC_QUIET) |
@@ -1523,8 +1782,13 @@ __apicdebuginit(void) print_IO_APIC(void) | |||
1523 | } | 1782 | } |
1524 | } | 1783 | } |
1525 | printk(KERN_DEBUG "IRQ to pin mappings:\n"); | 1784 | printk(KERN_DEBUG "IRQ to pin mappings:\n"); |
1526 | for_each_irq_cfg(irq, cfg) { | 1785 | for_each_irq_desc(irq, desc) { |
1527 | struct irq_pin_list *entry = cfg->irq_2_pin; | 1786 | struct irq_pin_list *entry; |
1787 | |||
1788 | if (!desc) | ||
1789 | continue; | ||
1790 | cfg = desc->chip_data; | ||
1791 | entry = cfg->irq_2_pin; | ||
1528 | if (!entry) | 1792 | if (!entry) |
1529 | continue; | 1793 | continue; |
1530 | printk(KERN_DEBUG "IRQ%d ", irq); | 1794 | printk(KERN_DEBUG "IRQ%d ", irq); |
@@ -2008,14 +2272,16 @@ static unsigned int startup_ioapic_irq(unsigned int irq) | |||
2008 | { | 2272 | { |
2009 | int was_pending = 0; | 2273 | int was_pending = 0; |
2010 | unsigned long flags; | 2274 | unsigned long flags; |
2275 | struct irq_cfg *cfg; | ||
2011 | 2276 | ||
2012 | spin_lock_irqsave(&ioapic_lock, flags); | 2277 | spin_lock_irqsave(&ioapic_lock, flags); |
2013 | if (irq < 16) { | 2278 | if (irq < NR_IRQS_LEGACY) { |
2014 | disable_8259A_irq(irq); | 2279 | disable_8259A_irq(irq); |
2015 | if (i8259A_irq_pending(irq)) | 2280 | if (i8259A_irq_pending(irq)) |
2016 | was_pending = 1; | 2281 | was_pending = 1; |
2017 | } | 2282 | } |
2018 | __unmask_IO_APIC_irq(irq); | 2283 | cfg = irq_cfg(irq); |
2284 | __unmask_IO_APIC_irq(cfg); | ||
2019 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2285 | spin_unlock_irqrestore(&ioapic_lock, flags); |
2020 | 2286 | ||
2021 | return was_pending; | 2287 | return was_pending; |
@@ -2029,7 +2295,7 @@ static int ioapic_retrigger_irq(unsigned int irq) | |||
2029 | unsigned long flags; | 2295 | unsigned long flags; |
2030 | 2296 | ||
2031 | spin_lock_irqsave(&vector_lock, flags); | 2297 | spin_lock_irqsave(&vector_lock, flags); |
2032 | send_IPI_mask(cpumask_of_cpu(first_cpu(cfg->domain)), cfg->vector); | 2298 | send_IPI_mask(cpumask_of(cpumask_first(cfg->domain)), cfg->vector); |
2033 | spin_unlock_irqrestore(&vector_lock, flags); | 2299 | spin_unlock_irqrestore(&vector_lock, flags); |
2034 | 2300 | ||
2035 | return 1; | 2301 | return 1; |
@@ -2078,35 +2344,35 @@ static DECLARE_DELAYED_WORK(ir_migration_work, ir_irq_migration); | |||
2078 | * as simple as edge triggered migration and we can do the irq migration | 2344 | * as simple as edge triggered migration and we can do the irq migration |
2079 | * with a simple atomic update to IO-APIC RTE. | 2345 | * with a simple atomic update to IO-APIC RTE. |
2080 | */ | 2346 | */ |
2081 | static void migrate_ioapic_irq(int irq, cpumask_t mask) | 2347 | static void |
2348 | migrate_ioapic_irq_desc(struct irq_desc *desc, const struct cpumask *mask) | ||
2082 | { | 2349 | { |
2083 | struct irq_cfg *cfg; | 2350 | struct irq_cfg *cfg; |
2084 | struct irq_desc *desc; | ||
2085 | cpumask_t tmp, cleanup_mask; | ||
2086 | struct irte irte; | 2351 | struct irte irte; |
2087 | int modify_ioapic_rte; | 2352 | int modify_ioapic_rte; |
2088 | unsigned int dest; | 2353 | unsigned int dest; |
2089 | unsigned long flags; | 2354 | unsigned long flags; |
2355 | unsigned int irq; | ||
2090 | 2356 | ||
2091 | cpus_and(tmp, mask, cpu_online_map); | 2357 | if (!cpumask_intersects(mask, cpu_online_mask)) |
2092 | if (cpus_empty(tmp)) | ||
2093 | return; | 2358 | return; |
2094 | 2359 | ||
2360 | irq = desc->irq; | ||
2095 | if (get_irte(irq, &irte)) | 2361 | if (get_irte(irq, &irte)) |
2096 | return; | 2362 | return; |
2097 | 2363 | ||
2098 | if (assign_irq_vector(irq, mask)) | 2364 | cfg = desc->chip_data; |
2365 | if (assign_irq_vector(irq, cfg, mask)) | ||
2099 | return; | 2366 | return; |
2100 | 2367 | ||
2101 | cfg = irq_cfg(irq); | 2368 | set_extra_move_desc(desc, mask); |
2102 | cpus_and(tmp, cfg->domain, mask); | 2369 | |
2103 | dest = cpu_mask_to_apicid(tmp); | 2370 | dest = cpu_mask_to_apicid_and(cfg->domain, mask); |
2104 | 2371 | ||
2105 | desc = irq_to_desc(irq); | ||
2106 | modify_ioapic_rte = desc->status & IRQ_LEVEL; | 2372 | modify_ioapic_rte = desc->status & IRQ_LEVEL; |
2107 | if (modify_ioapic_rte) { | 2373 | if (modify_ioapic_rte) { |
2108 | spin_lock_irqsave(&ioapic_lock, flags); | 2374 | spin_lock_irqsave(&ioapic_lock, flags); |
2109 | __target_IO_APIC_irq(irq, dest, cfg->vector); | 2375 | __target_IO_APIC_irq(irq, dest, cfg); |
2110 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2376 | spin_unlock_irqrestore(&ioapic_lock, flags); |
2111 | } | 2377 | } |
2112 | 2378 | ||
@@ -2118,24 +2384,20 @@ static void migrate_ioapic_irq(int irq, cpumask_t mask) | |||
2118 | */ | 2384 | */ |
2119 | modify_irte(irq, &irte); | 2385 | modify_irte(irq, &irte); |
2120 | 2386 | ||
2121 | if (cfg->move_in_progress) { | 2387 | if (cfg->move_in_progress) |
2122 | cpus_and(cleanup_mask, cfg->old_domain, cpu_online_map); | 2388 | send_cleanup_vector(cfg); |
2123 | cfg->move_cleanup_count = cpus_weight(cleanup_mask); | ||
2124 | send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); | ||
2125 | cfg->move_in_progress = 0; | ||
2126 | } | ||
2127 | 2389 | ||
2128 | desc->affinity = mask; | 2390 | cpumask_copy(&desc->affinity, mask); |
2129 | } | 2391 | } |
2130 | 2392 | ||
2131 | static int migrate_irq_remapped_level(int irq) | 2393 | static int migrate_irq_remapped_level_desc(struct irq_desc *desc) |
2132 | { | 2394 | { |
2133 | int ret = -1; | 2395 | int ret = -1; |
2134 | struct irq_desc *desc = irq_to_desc(irq); | 2396 | struct irq_cfg *cfg = desc->chip_data; |
2135 | 2397 | ||
2136 | mask_IO_APIC_irq(irq); | 2398 | mask_IO_APIC_irq_desc(desc); |
2137 | 2399 | ||
2138 | if (io_apic_level_ack_pending(irq)) { | 2400 | if (io_apic_level_ack_pending(cfg)) { |
2139 | /* | 2401 | /* |
2140 | * Interrupt in progress. Migrating irq now will change the | 2402 | * Interrupt in progress. Migrating irq now will change the |
2141 | * vector information in the IO-APIC RTE and that will confuse | 2403 | * vector information in the IO-APIC RTE and that will confuse |
@@ -2147,14 +2409,15 @@ static int migrate_irq_remapped_level(int irq) | |||
2147 | } | 2409 | } |
2148 | 2410 | ||
2149 | /* everthing is clear. we have right of way */ | 2411 | /* everthing is clear. we have right of way */ |
2150 | migrate_ioapic_irq(irq, desc->pending_mask); | 2412 | migrate_ioapic_irq_desc(desc, &desc->pending_mask); |
2151 | 2413 | ||
2152 | ret = 0; | 2414 | ret = 0; |
2153 | desc->status &= ~IRQ_MOVE_PENDING; | 2415 | desc->status &= ~IRQ_MOVE_PENDING; |
2154 | cpus_clear(desc->pending_mask); | 2416 | cpumask_clear(&desc->pending_mask); |
2155 | 2417 | ||
2156 | unmask: | 2418 | unmask: |
2157 | unmask_IO_APIC_irq(irq); | 2419 | unmask_IO_APIC_irq_desc(desc); |
2420 | |||
2158 | return ret; | 2421 | return ret; |
2159 | } | 2422 | } |
2160 | 2423 | ||
@@ -2164,6 +2427,9 @@ static void ir_irq_migration(struct work_struct *work) | |||
2164 | struct irq_desc *desc; | 2427 | struct irq_desc *desc; |
2165 | 2428 | ||
2166 | for_each_irq_desc(irq, desc) { | 2429 | for_each_irq_desc(irq, desc) { |
2430 | if (!desc) | ||
2431 | continue; | ||
2432 | |||
2167 | if (desc->status & IRQ_MOVE_PENDING) { | 2433 | if (desc->status & IRQ_MOVE_PENDING) { |
2168 | unsigned long flags; | 2434 | unsigned long flags; |
2169 | 2435 | ||
@@ -2175,7 +2441,7 @@ static void ir_irq_migration(struct work_struct *work) | |||
2175 | continue; | 2441 | continue; |
2176 | } | 2442 | } |
2177 | 2443 | ||
2178 | desc->chip->set_affinity(irq, desc->pending_mask); | 2444 | desc->chip->set_affinity(irq, &desc->pending_mask); |
2179 | spin_unlock_irqrestore(&desc->lock, flags); | 2445 | spin_unlock_irqrestore(&desc->lock, flags); |
2180 | } | 2446 | } |
2181 | } | 2447 | } |
@@ -2184,18 +2450,24 @@ static void ir_irq_migration(struct work_struct *work) | |||
2184 | /* | 2450 | /* |
2185 | * Migrates the IRQ destination in the process context. | 2451 | * Migrates the IRQ destination in the process context. |
2186 | */ | 2452 | */ |
2187 | static void set_ir_ioapic_affinity_irq(unsigned int irq, cpumask_t mask) | 2453 | static void set_ir_ioapic_affinity_irq_desc(struct irq_desc *desc, |
2454 | const struct cpumask *mask) | ||
2188 | { | 2455 | { |
2189 | struct irq_desc *desc = irq_to_desc(irq); | ||
2190 | |||
2191 | if (desc->status & IRQ_LEVEL) { | 2456 | if (desc->status & IRQ_LEVEL) { |
2192 | desc->status |= IRQ_MOVE_PENDING; | 2457 | desc->status |= IRQ_MOVE_PENDING; |
2193 | desc->pending_mask = mask; | 2458 | cpumask_copy(&desc->pending_mask, mask); |
2194 | migrate_irq_remapped_level(irq); | 2459 | migrate_irq_remapped_level_desc(desc); |
2195 | return; | 2460 | return; |
2196 | } | 2461 | } |
2197 | 2462 | ||
2198 | migrate_ioapic_irq(irq, mask); | 2463 | migrate_ioapic_irq_desc(desc, mask); |
2464 | } | ||
2465 | static void set_ir_ioapic_affinity_irq(unsigned int irq, | ||
2466 | const struct cpumask *mask) | ||
2467 | { | ||
2468 | struct irq_desc *desc = irq_to_desc(irq); | ||
2469 | |||
2470 | set_ir_ioapic_affinity_irq_desc(desc, mask); | ||
2199 | } | 2471 | } |
2200 | #endif | 2472 | #endif |
2201 | 2473 | ||
@@ -2215,6 +2487,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) | |||
2215 | struct irq_cfg *cfg; | 2487 | struct irq_cfg *cfg; |
2216 | irq = __get_cpu_var(vector_irq)[vector]; | 2488 | irq = __get_cpu_var(vector_irq)[vector]; |
2217 | 2489 | ||
2490 | if (irq == -1) | ||
2491 | continue; | ||
2492 | |||
2218 | desc = irq_to_desc(irq); | 2493 | desc = irq_to_desc(irq); |
2219 | if (!desc) | 2494 | if (!desc) |
2220 | continue; | 2495 | continue; |
@@ -2224,7 +2499,7 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) | |||
2224 | if (!cfg->move_cleanup_count) | 2499 | if (!cfg->move_cleanup_count) |
2225 | goto unlock; | 2500 | goto unlock; |
2226 | 2501 | ||
2227 | if ((vector == cfg->vector) && cpu_isset(me, cfg->domain)) | 2502 | if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain)) |
2228 | goto unlock; | 2503 | goto unlock; |
2229 | 2504 | ||
2230 | __get_cpu_var(vector_irq)[vector] = -1; | 2505 | __get_cpu_var(vector_irq)[vector] = -1; |
@@ -2236,28 +2511,44 @@ unlock: | |||
2236 | irq_exit(); | 2511 | irq_exit(); |
2237 | } | 2512 | } |
2238 | 2513 | ||
2239 | static void irq_complete_move(unsigned int irq) | 2514 | static void irq_complete_move(struct irq_desc **descp) |
2240 | { | 2515 | { |
2241 | struct irq_cfg *cfg = irq_cfg(irq); | 2516 | struct irq_desc *desc = *descp; |
2517 | struct irq_cfg *cfg = desc->chip_data; | ||
2242 | unsigned vector, me; | 2518 | unsigned vector, me; |
2243 | 2519 | ||
2244 | if (likely(!cfg->move_in_progress)) | 2520 | if (likely(!cfg->move_in_progress)) { |
2521 | #ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC | ||
2522 | if (likely(!cfg->move_desc_pending)) | ||
2523 | return; | ||
2524 | |||
2525 | /* domain is not change, but affinity is changed */ | ||
2526 | me = smp_processor_id(); | ||
2527 | if (cpu_isset(me, desc->affinity)) { | ||
2528 | *descp = desc = move_irq_desc(desc, me); | ||
2529 | /* get the new one */ | ||
2530 | cfg = desc->chip_data; | ||
2531 | cfg->move_desc_pending = 0; | ||
2532 | } | ||
2533 | #endif | ||
2245 | return; | 2534 | return; |
2535 | } | ||
2246 | 2536 | ||
2247 | vector = ~get_irq_regs()->orig_ax; | 2537 | vector = ~get_irq_regs()->orig_ax; |
2248 | me = smp_processor_id(); | 2538 | me = smp_processor_id(); |
2249 | if ((vector == cfg->vector) && cpu_isset(me, cfg->domain)) { | 2539 | #ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC |
2250 | cpumask_t cleanup_mask; | 2540 | *descp = desc = move_irq_desc(desc, me); |
2541 | /* get the new one */ | ||
2542 | cfg = desc->chip_data; | ||
2543 | #endif | ||
2251 | 2544 | ||
2252 | cpus_and(cleanup_mask, cfg->old_domain, cpu_online_map); | 2545 | if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain)) |
2253 | cfg->move_cleanup_count = cpus_weight(cleanup_mask); | 2546 | send_cleanup_vector(cfg); |
2254 | send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); | ||
2255 | cfg->move_in_progress = 0; | ||
2256 | } | ||
2257 | } | 2547 | } |
2258 | #else | 2548 | #else |
2259 | static inline void irq_complete_move(unsigned int irq) {} | 2549 | static inline void irq_complete_move(struct irq_desc **descp) {} |
2260 | #endif | 2550 | #endif |
2551 | |||
2261 | #ifdef CONFIG_INTR_REMAP | 2552 | #ifdef CONFIG_INTR_REMAP |
2262 | static void ack_x2apic_level(unsigned int irq) | 2553 | static void ack_x2apic_level(unsigned int irq) |
2263 | { | 2554 | { |
@@ -2268,11 +2559,14 @@ static void ack_x2apic_edge(unsigned int irq) | |||
2268 | { | 2559 | { |
2269 | ack_x2APIC_irq(); | 2560 | ack_x2APIC_irq(); |
2270 | } | 2561 | } |
2562 | |||
2271 | #endif | 2563 | #endif |
2272 | 2564 | ||
2273 | static void ack_apic_edge(unsigned int irq) | 2565 | static void ack_apic_edge(unsigned int irq) |
2274 | { | 2566 | { |
2275 | irq_complete_move(irq); | 2567 | struct irq_desc *desc = irq_to_desc(irq); |
2568 | |||
2569 | irq_complete_move(&desc); | ||
2276 | move_native_irq(irq); | 2570 | move_native_irq(irq); |
2277 | ack_APIC_irq(); | 2571 | ack_APIC_irq(); |
2278 | } | 2572 | } |
@@ -2281,18 +2575,21 @@ atomic_t irq_mis_count; | |||
2281 | 2575 | ||
2282 | static void ack_apic_level(unsigned int irq) | 2576 | static void ack_apic_level(unsigned int irq) |
2283 | { | 2577 | { |
2578 | struct irq_desc *desc = irq_to_desc(irq); | ||
2579 | |||
2284 | #ifdef CONFIG_X86_32 | 2580 | #ifdef CONFIG_X86_32 |
2285 | unsigned long v; | 2581 | unsigned long v; |
2286 | int i; | 2582 | int i; |
2287 | #endif | 2583 | #endif |
2584 | struct irq_cfg *cfg; | ||
2288 | int do_unmask_irq = 0; | 2585 | int do_unmask_irq = 0; |
2289 | 2586 | ||
2290 | irq_complete_move(irq); | 2587 | irq_complete_move(&desc); |
2291 | #ifdef CONFIG_GENERIC_PENDING_IRQ | 2588 | #ifdef CONFIG_GENERIC_PENDING_IRQ |
2292 | /* If we are moving the irq we need to mask it */ | 2589 | /* If we are moving the irq we need to mask it */ |
2293 | if (unlikely(irq_to_desc(irq)->status & IRQ_MOVE_PENDING)) { | 2590 | if (unlikely(desc->status & IRQ_MOVE_PENDING)) { |
2294 | do_unmask_irq = 1; | 2591 | do_unmask_irq = 1; |
2295 | mask_IO_APIC_irq(irq); | 2592 | mask_IO_APIC_irq_desc(desc); |
2296 | } | 2593 | } |
2297 | #endif | 2594 | #endif |
2298 | 2595 | ||
@@ -2316,7 +2613,8 @@ static void ack_apic_level(unsigned int irq) | |||
2316 | * operation to prevent an edge-triggered interrupt escaping meanwhile. | 2613 | * operation to prevent an edge-triggered interrupt escaping meanwhile. |
2317 | * The idea is from Manfred Spraul. --macro | 2614 | * The idea is from Manfred Spraul. --macro |
2318 | */ | 2615 | */ |
2319 | i = irq_cfg(irq)->vector; | 2616 | cfg = desc->chip_data; |
2617 | i = cfg->vector; | ||
2320 | 2618 | ||
2321 | v = apic_read(APIC_TMR + ((i & ~0x1f) >> 1)); | 2619 | v = apic_read(APIC_TMR + ((i & ~0x1f) >> 1)); |
2322 | #endif | 2620 | #endif |
@@ -2355,17 +2653,18 @@ static void ack_apic_level(unsigned int irq) | |||
2355 | * accurate and is causing problems then it is a hardware bug | 2653 | * accurate and is causing problems then it is a hardware bug |
2356 | * and you can go talk to the chipset vendor about it. | 2654 | * and you can go talk to the chipset vendor about it. |
2357 | */ | 2655 | */ |
2358 | if (!io_apic_level_ack_pending(irq)) | 2656 | cfg = desc->chip_data; |
2657 | if (!io_apic_level_ack_pending(cfg)) | ||
2359 | move_masked_irq(irq); | 2658 | move_masked_irq(irq); |
2360 | unmask_IO_APIC_irq(irq); | 2659 | unmask_IO_APIC_irq_desc(desc); |
2361 | } | 2660 | } |
2362 | 2661 | ||
2363 | #ifdef CONFIG_X86_32 | 2662 | #ifdef CONFIG_X86_32 |
2364 | if (!(v & (1 << (i & 0x1f)))) { | 2663 | if (!(v & (1 << (i & 0x1f)))) { |
2365 | atomic_inc(&irq_mis_count); | 2664 | atomic_inc(&irq_mis_count); |
2366 | spin_lock(&ioapic_lock); | 2665 | spin_lock(&ioapic_lock); |
2367 | __mask_and_edge_IO_APIC_irq(irq); | 2666 | __mask_and_edge_IO_APIC_irq(cfg); |
2368 | __unmask_and_level_IO_APIC_irq(irq); | 2667 | __unmask_and_level_IO_APIC_irq(cfg); |
2369 | spin_unlock(&ioapic_lock); | 2668 | spin_unlock(&ioapic_lock); |
2370 | } | 2669 | } |
2371 | #endif | 2670 | #endif |
@@ -2416,20 +2715,22 @@ static inline void init_IO_APIC_traps(void) | |||
2416 | * Also, we've got to be careful not to trash gate | 2715 | * Also, we've got to be careful not to trash gate |
2417 | * 0x80, because int 0x80 is hm, kind of importantish. ;) | 2716 | * 0x80, because int 0x80 is hm, kind of importantish. ;) |
2418 | */ | 2717 | */ |
2419 | for_each_irq_cfg(irq, cfg) { | 2718 | for_each_irq_desc(irq, desc) { |
2420 | if (IO_APIC_IRQ(irq) && !cfg->vector) { | 2719 | if (!desc) |
2720 | continue; | ||
2721 | |||
2722 | cfg = desc->chip_data; | ||
2723 | if (IO_APIC_IRQ(irq) && cfg && !cfg->vector) { | ||
2421 | /* | 2724 | /* |
2422 | * Hmm.. We don't have an entry for this, | 2725 | * Hmm.. We don't have an entry for this, |
2423 | * so default to an old-fashioned 8259 | 2726 | * so default to an old-fashioned 8259 |
2424 | * interrupt if we can.. | 2727 | * interrupt if we can.. |
2425 | */ | 2728 | */ |
2426 | if (irq < 16) | 2729 | if (irq < NR_IRQS_LEGACY) |
2427 | make_8259A_irq(irq); | 2730 | make_8259A_irq(irq); |
2428 | else { | 2731 | else |
2429 | desc = irq_to_desc(irq); | ||
2430 | /* Strange. Oh, well.. */ | 2732 | /* Strange. Oh, well.. */ |
2431 | desc->chip = &no_irq_chip; | 2733 | desc->chip = &no_irq_chip; |
2432 | } | ||
2433 | } | 2734 | } |
2434 | } | 2735 | } |
2435 | } | 2736 | } |
@@ -2454,7 +2755,7 @@ static void unmask_lapic_irq(unsigned int irq) | |||
2454 | apic_write(APIC_LVT0, v & ~APIC_LVT_MASKED); | 2755 | apic_write(APIC_LVT0, v & ~APIC_LVT_MASKED); |
2455 | } | 2756 | } |
2456 | 2757 | ||
2457 | static void ack_lapic_irq (unsigned int irq) | 2758 | static void ack_lapic_irq(unsigned int irq) |
2458 | { | 2759 | { |
2459 | ack_APIC_irq(); | 2760 | ack_APIC_irq(); |
2460 | } | 2761 | } |
@@ -2466,11 +2767,8 @@ static struct irq_chip lapic_chip __read_mostly = { | |||
2466 | .ack = ack_lapic_irq, | 2767 | .ack = ack_lapic_irq, |
2467 | }; | 2768 | }; |
2468 | 2769 | ||
2469 | static void lapic_register_intr(int irq) | 2770 | static void lapic_register_intr(int irq, struct irq_desc *desc) |
2470 | { | 2771 | { |
2471 | struct irq_desc *desc; | ||
2472 | |||
2473 | desc = irq_to_desc(irq); | ||
2474 | desc->status &= ~IRQ_LEVEL; | 2772 | desc->status &= ~IRQ_LEVEL; |
2475 | set_irq_chip_and_handler_name(irq, &lapic_chip, handle_edge_irq, | 2773 | set_irq_chip_and_handler_name(irq, &lapic_chip, handle_edge_irq, |
2476 | "edge"); | 2774 | "edge"); |
@@ -2574,7 +2872,9 @@ int timer_through_8259 __initdata; | |||
2574 | */ | 2872 | */ |
2575 | static inline void __init check_timer(void) | 2873 | static inline void __init check_timer(void) |
2576 | { | 2874 | { |
2577 | struct irq_cfg *cfg = irq_cfg(0); | 2875 | struct irq_desc *desc = irq_to_desc(0); |
2876 | struct irq_cfg *cfg = desc->chip_data; | ||
2877 | int cpu = boot_cpu_id; | ||
2578 | int apic1, pin1, apic2, pin2; | 2878 | int apic1, pin1, apic2, pin2; |
2579 | unsigned long flags; | 2879 | unsigned long flags; |
2580 | unsigned int ver; | 2880 | unsigned int ver; |
@@ -2589,7 +2889,7 @@ static inline void __init check_timer(void) | |||
2589 | * get/set the timer IRQ vector: | 2889 | * get/set the timer IRQ vector: |
2590 | */ | 2890 | */ |
2591 | disable_8259A_irq(0); | 2891 | disable_8259A_irq(0); |
2592 | assign_irq_vector(0, TARGET_CPUS); | 2892 | assign_irq_vector(0, cfg, TARGET_CPUS); |
2593 | 2893 | ||
2594 | /* | 2894 | /* |
2595 | * As IRQ0 is to be enabled in the 8259A, the virtual | 2895 | * As IRQ0 is to be enabled in the 8259A, the virtual |
@@ -2640,10 +2940,10 @@ static inline void __init check_timer(void) | |||
2640 | * Ok, does IRQ0 through the IOAPIC work? | 2940 | * Ok, does IRQ0 through the IOAPIC work? |
2641 | */ | 2941 | */ |
2642 | if (no_pin1) { | 2942 | if (no_pin1) { |
2643 | add_pin_to_irq(0, apic1, pin1); | 2943 | add_pin_to_irq_cpu(cfg, cpu, apic1, pin1); |
2644 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); | 2944 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); |
2645 | } | 2945 | } |
2646 | unmask_IO_APIC_irq(0); | 2946 | unmask_IO_APIC_irq_desc(desc); |
2647 | if (timer_irq_works()) { | 2947 | if (timer_irq_works()) { |
2648 | if (nmi_watchdog == NMI_IO_APIC) { | 2948 | if (nmi_watchdog == NMI_IO_APIC) { |
2649 | setup_nmi(); | 2949 | setup_nmi(); |
@@ -2669,9 +2969,9 @@ static inline void __init check_timer(void) | |||
2669 | /* | 2969 | /* |
2670 | * legacy devices should be connected to IO APIC #0 | 2970 | * legacy devices should be connected to IO APIC #0 |
2671 | */ | 2971 | */ |
2672 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); | 2972 | replace_pin_at_irq_cpu(cfg, cpu, apic1, pin1, apic2, pin2); |
2673 | setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); | 2973 | setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); |
2674 | unmask_IO_APIC_irq(0); | 2974 | unmask_IO_APIC_irq_desc(desc); |
2675 | enable_8259A_irq(0); | 2975 | enable_8259A_irq(0); |
2676 | if (timer_irq_works()) { | 2976 | if (timer_irq_works()) { |
2677 | apic_printk(APIC_QUIET, KERN_INFO "....... works.\n"); | 2977 | apic_printk(APIC_QUIET, KERN_INFO "....... works.\n"); |
@@ -2703,7 +3003,7 @@ static inline void __init check_timer(void) | |||
2703 | apic_printk(APIC_QUIET, KERN_INFO | 3003 | apic_printk(APIC_QUIET, KERN_INFO |
2704 | "...trying to set up timer as Virtual Wire IRQ...\n"); | 3004 | "...trying to set up timer as Virtual Wire IRQ...\n"); |
2705 | 3005 | ||
2706 | lapic_register_intr(0); | 3006 | lapic_register_intr(0, desc); |
2707 | apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */ | 3007 | apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */ |
2708 | enable_8259A_irq(0); | 3008 | enable_8259A_irq(0); |
2709 | 3009 | ||
@@ -2888,22 +3188,26 @@ unsigned int create_irq_nr(unsigned int irq_want) | |||
2888 | unsigned int irq; | 3188 | unsigned int irq; |
2889 | unsigned int new; | 3189 | unsigned int new; |
2890 | unsigned long flags; | 3190 | unsigned long flags; |
2891 | struct irq_cfg *cfg_new; | 3191 | struct irq_cfg *cfg_new = NULL; |
2892 | 3192 | int cpu = boot_cpu_id; | |
2893 | irq_want = nr_irqs - 1; | 3193 | struct irq_desc *desc_new = NULL; |
2894 | 3194 | ||
2895 | irq = 0; | 3195 | irq = 0; |
2896 | spin_lock_irqsave(&vector_lock, flags); | 3196 | spin_lock_irqsave(&vector_lock, flags); |
2897 | for (new = irq_want; new > 0; new--) { | 3197 | for (new = irq_want; new < NR_IRQS; new++) { |
2898 | if (platform_legacy_irq(new)) | 3198 | if (platform_legacy_irq(new)) |
2899 | continue; | 3199 | continue; |
2900 | cfg_new = irq_cfg(new); | 3200 | |
2901 | if (cfg_new && cfg_new->vector != 0) | 3201 | desc_new = irq_to_desc_alloc_cpu(new, cpu); |
3202 | if (!desc_new) { | ||
3203 | printk(KERN_INFO "can not get irq_desc for %d\n", new); | ||
3204 | continue; | ||
3205 | } | ||
3206 | cfg_new = desc_new->chip_data; | ||
3207 | |||
3208 | if (cfg_new->vector != 0) | ||
2902 | continue; | 3209 | continue; |
2903 | /* check if need to create one */ | 3210 | if (__assign_irq_vector(new, cfg_new, TARGET_CPUS) == 0) |
2904 | if (!cfg_new) | ||
2905 | cfg_new = irq_cfg_alloc(new); | ||
2906 | if (__assign_irq_vector(new, TARGET_CPUS) == 0) | ||
2907 | irq = new; | 3211 | irq = new; |
2908 | break; | 3212 | break; |
2909 | } | 3213 | } |
@@ -2911,15 +3215,21 @@ unsigned int create_irq_nr(unsigned int irq_want) | |||
2911 | 3215 | ||
2912 | if (irq > 0) { | 3216 | if (irq > 0) { |
2913 | dynamic_irq_init(irq); | 3217 | dynamic_irq_init(irq); |
3218 | /* restore it, in case dynamic_irq_init clear it */ | ||
3219 | if (desc_new) | ||
3220 | desc_new->chip_data = cfg_new; | ||
2914 | } | 3221 | } |
2915 | return irq; | 3222 | return irq; |
2916 | } | 3223 | } |
2917 | 3224 | ||
3225 | static int nr_irqs_gsi = NR_IRQS_LEGACY; | ||
2918 | int create_irq(void) | 3226 | int create_irq(void) |
2919 | { | 3227 | { |
3228 | unsigned int irq_want; | ||
2920 | int irq; | 3229 | int irq; |
2921 | 3230 | ||
2922 | irq = create_irq_nr(nr_irqs - 1); | 3231 | irq_want = nr_irqs_gsi; |
3232 | irq = create_irq_nr(irq_want); | ||
2923 | 3233 | ||
2924 | if (irq == 0) | 3234 | if (irq == 0) |
2925 | irq = -1; | 3235 | irq = -1; |
@@ -2930,14 +3240,22 @@ int create_irq(void) | |||
2930 | void destroy_irq(unsigned int irq) | 3240 | void destroy_irq(unsigned int irq) |
2931 | { | 3241 | { |
2932 | unsigned long flags; | 3242 | unsigned long flags; |
3243 | struct irq_cfg *cfg; | ||
3244 | struct irq_desc *desc; | ||
2933 | 3245 | ||
3246 | /* store it, in case dynamic_irq_cleanup clear it */ | ||
3247 | desc = irq_to_desc(irq); | ||
3248 | cfg = desc->chip_data; | ||
2934 | dynamic_irq_cleanup(irq); | 3249 | dynamic_irq_cleanup(irq); |
3250 | /* connect back irq_cfg */ | ||
3251 | if (desc) | ||
3252 | desc->chip_data = cfg; | ||
2935 | 3253 | ||
2936 | #ifdef CONFIG_INTR_REMAP | 3254 | #ifdef CONFIG_INTR_REMAP |
2937 | free_irte(irq); | 3255 | free_irte(irq); |
2938 | #endif | 3256 | #endif |
2939 | spin_lock_irqsave(&vector_lock, flags); | 3257 | spin_lock_irqsave(&vector_lock, flags); |
2940 | __clear_irq_vector(irq); | 3258 | __clear_irq_vector(irq, cfg); |
2941 | spin_unlock_irqrestore(&vector_lock, flags); | 3259 | spin_unlock_irqrestore(&vector_lock, flags); |
2942 | } | 3260 | } |
2943 | 3261 | ||
@@ -2950,16 +3268,13 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
2950 | struct irq_cfg *cfg; | 3268 | struct irq_cfg *cfg; |
2951 | int err; | 3269 | int err; |
2952 | unsigned dest; | 3270 | unsigned dest; |
2953 | cpumask_t tmp; | ||
2954 | 3271 | ||
2955 | tmp = TARGET_CPUS; | 3272 | cfg = irq_cfg(irq); |
2956 | err = assign_irq_vector(irq, tmp); | 3273 | err = assign_irq_vector(irq, cfg, TARGET_CPUS); |
2957 | if (err) | 3274 | if (err) |
2958 | return err; | 3275 | return err; |
2959 | 3276 | ||
2960 | cfg = irq_cfg(irq); | 3277 | dest = cpu_mask_to_apicid_and(cfg->domain, TARGET_CPUS); |
2961 | cpus_and(tmp, cfg->domain, tmp); | ||
2962 | dest = cpu_mask_to_apicid(tmp); | ||
2963 | 3278 | ||
2964 | #ifdef CONFIG_INTR_REMAP | 3279 | #ifdef CONFIG_INTR_REMAP |
2965 | if (irq_remapped(irq)) { | 3280 | if (irq_remapped(irq)) { |
@@ -3013,64 +3328,48 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
3013 | } | 3328 | } |
3014 | 3329 | ||
3015 | #ifdef CONFIG_SMP | 3330 | #ifdef CONFIG_SMP |
3016 | static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask) | 3331 | static void set_msi_irq_affinity(unsigned int irq, const struct cpumask *mask) |
3017 | { | 3332 | { |
3333 | struct irq_desc *desc = irq_to_desc(irq); | ||
3018 | struct irq_cfg *cfg; | 3334 | struct irq_cfg *cfg; |
3019 | struct msi_msg msg; | 3335 | struct msi_msg msg; |
3020 | unsigned int dest; | 3336 | unsigned int dest; |
3021 | cpumask_t tmp; | ||
3022 | struct irq_desc *desc; | ||
3023 | 3337 | ||
3024 | cpus_and(tmp, mask, cpu_online_map); | 3338 | dest = set_desc_affinity(desc, mask); |
3025 | if (cpus_empty(tmp)) | 3339 | if (dest == BAD_APICID) |
3026 | return; | 3340 | return; |
3027 | 3341 | ||
3028 | if (assign_irq_vector(irq, mask)) | 3342 | cfg = desc->chip_data; |
3029 | return; | ||
3030 | |||
3031 | cfg = irq_cfg(irq); | ||
3032 | cpus_and(tmp, cfg->domain, mask); | ||
3033 | dest = cpu_mask_to_apicid(tmp); | ||
3034 | 3343 | ||
3035 | read_msi_msg(irq, &msg); | 3344 | read_msi_msg_desc(desc, &msg); |
3036 | 3345 | ||
3037 | msg.data &= ~MSI_DATA_VECTOR_MASK; | 3346 | msg.data &= ~MSI_DATA_VECTOR_MASK; |
3038 | msg.data |= MSI_DATA_VECTOR(cfg->vector); | 3347 | msg.data |= MSI_DATA_VECTOR(cfg->vector); |
3039 | msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK; | 3348 | msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK; |
3040 | msg.address_lo |= MSI_ADDR_DEST_ID(dest); | 3349 | msg.address_lo |= MSI_ADDR_DEST_ID(dest); |
3041 | 3350 | ||
3042 | write_msi_msg(irq, &msg); | 3351 | write_msi_msg_desc(desc, &msg); |
3043 | desc = irq_to_desc(irq); | ||
3044 | desc->affinity = mask; | ||
3045 | } | 3352 | } |
3046 | |||
3047 | #ifdef CONFIG_INTR_REMAP | 3353 | #ifdef CONFIG_INTR_REMAP |
3048 | /* | 3354 | /* |
3049 | * Migrate the MSI irq to another cpumask. This migration is | 3355 | * Migrate the MSI irq to another cpumask. This migration is |
3050 | * done in the process context using interrupt-remapping hardware. | 3356 | * done in the process context using interrupt-remapping hardware. |
3051 | */ | 3357 | */ |
3052 | static void ir_set_msi_irq_affinity(unsigned int irq, cpumask_t mask) | 3358 | static void |
3359 | ir_set_msi_irq_affinity(unsigned int irq, const struct cpumask *mask) | ||
3053 | { | 3360 | { |
3361 | struct irq_desc *desc = irq_to_desc(irq); | ||
3054 | struct irq_cfg *cfg; | 3362 | struct irq_cfg *cfg; |
3055 | unsigned int dest; | 3363 | unsigned int dest; |
3056 | cpumask_t tmp, cleanup_mask; | ||
3057 | struct irte irte; | 3364 | struct irte irte; |
3058 | struct irq_desc *desc; | ||
3059 | |||
3060 | cpus_and(tmp, mask, cpu_online_map); | ||
3061 | if (cpus_empty(tmp)) | ||
3062 | return; | ||
3063 | 3365 | ||
3064 | if (get_irte(irq, &irte)) | 3366 | if (get_irte(irq, &irte)) |
3065 | return; | 3367 | return; |
3066 | 3368 | ||
3067 | if (assign_irq_vector(irq, mask)) | 3369 | dest = set_desc_affinity(desc, mask); |
3370 | if (dest == BAD_APICID) | ||
3068 | return; | 3371 | return; |
3069 | 3372 | ||
3070 | cfg = irq_cfg(irq); | ||
3071 | cpus_and(tmp, cfg->domain, mask); | ||
3072 | dest = cpu_mask_to_apicid(tmp); | ||
3073 | |||
3074 | irte.vector = cfg->vector; | 3373 | irte.vector = cfg->vector; |
3075 | irte.dest_id = IRTE_DEST(dest); | 3374 | irte.dest_id = IRTE_DEST(dest); |
3076 | 3375 | ||
@@ -3084,16 +3383,10 @@ static void ir_set_msi_irq_affinity(unsigned int irq, cpumask_t mask) | |||
3084 | * at the new destination. So, time to cleanup the previous | 3383 | * at the new destination. So, time to cleanup the previous |
3085 | * vector allocation. | 3384 | * vector allocation. |
3086 | */ | 3385 | */ |
3087 | if (cfg->move_in_progress) { | 3386 | if (cfg->move_in_progress) |
3088 | cpus_and(cleanup_mask, cfg->old_domain, cpu_online_map); | 3387 | send_cleanup_vector(cfg); |
3089 | cfg->move_cleanup_count = cpus_weight(cleanup_mask); | ||
3090 | send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); | ||
3091 | cfg->move_in_progress = 0; | ||
3092 | } | ||
3093 | |||
3094 | desc = irq_to_desc(irq); | ||
3095 | desc->affinity = mask; | ||
3096 | } | 3388 | } |
3389 | |||
3097 | #endif | 3390 | #endif |
3098 | #endif /* CONFIG_SMP */ | 3391 | #endif /* CONFIG_SMP */ |
3099 | 3392 | ||
@@ -3152,7 +3445,7 @@ static int msi_alloc_irte(struct pci_dev *dev, int irq, int nvec) | |||
3152 | } | 3445 | } |
3153 | #endif | 3446 | #endif |
3154 | 3447 | ||
3155 | static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc, int irq) | 3448 | static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int irq) |
3156 | { | 3449 | { |
3157 | int ret; | 3450 | int ret; |
3158 | struct msi_msg msg; | 3451 | struct msi_msg msg; |
@@ -3161,7 +3454,7 @@ static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc, int irq) | |||
3161 | if (ret < 0) | 3454 | if (ret < 0) |
3162 | return ret; | 3455 | return ret; |
3163 | 3456 | ||
3164 | set_irq_msi(irq, desc); | 3457 | set_irq_msi(irq, msidesc); |
3165 | write_msi_msg(irq, &msg); | 3458 | write_msi_msg(irq, &msg); |
3166 | 3459 | ||
3167 | #ifdef CONFIG_INTR_REMAP | 3460 | #ifdef CONFIG_INTR_REMAP |
@@ -3181,26 +3474,13 @@ static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc, int irq) | |||
3181 | return 0; | 3474 | return 0; |
3182 | } | 3475 | } |
3183 | 3476 | ||
3184 | static unsigned int build_irq_for_pci_dev(struct pci_dev *dev) | 3477 | int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc) |
3185 | { | ||
3186 | unsigned int irq; | ||
3187 | |||
3188 | irq = dev->bus->number; | ||
3189 | irq <<= 8; | ||
3190 | irq |= dev->devfn; | ||
3191 | irq <<= 12; | ||
3192 | |||
3193 | return irq; | ||
3194 | } | ||
3195 | |||
3196 | int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) | ||
3197 | { | 3478 | { |
3198 | unsigned int irq; | 3479 | unsigned int irq; |
3199 | int ret; | 3480 | int ret; |
3200 | unsigned int irq_want; | 3481 | unsigned int irq_want; |
3201 | 3482 | ||
3202 | irq_want = build_irq_for_pci_dev(dev) + 0x100; | 3483 | irq_want = nr_irqs_gsi; |
3203 | |||
3204 | irq = create_irq_nr(irq_want); | 3484 | irq = create_irq_nr(irq_want); |
3205 | if (irq == 0) | 3485 | if (irq == 0) |
3206 | return -1; | 3486 | return -1; |
@@ -3214,7 +3494,7 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) | |||
3214 | goto error; | 3494 | goto error; |
3215 | no_ir: | 3495 | no_ir: |
3216 | #endif | 3496 | #endif |
3217 | ret = setup_msi_irq(dev, desc, irq); | 3497 | ret = setup_msi_irq(dev, msidesc, irq); |
3218 | if (ret < 0) { | 3498 | if (ret < 0) { |
3219 | destroy_irq(irq); | 3499 | destroy_irq(irq); |
3220 | return ret; | 3500 | return ret; |
@@ -3232,7 +3512,7 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | |||
3232 | { | 3512 | { |
3233 | unsigned int irq; | 3513 | unsigned int irq; |
3234 | int ret, sub_handle; | 3514 | int ret, sub_handle; |
3235 | struct msi_desc *desc; | 3515 | struct msi_desc *msidesc; |
3236 | unsigned int irq_want; | 3516 | unsigned int irq_want; |
3237 | 3517 | ||
3238 | #ifdef CONFIG_INTR_REMAP | 3518 | #ifdef CONFIG_INTR_REMAP |
@@ -3240,10 +3520,11 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | |||
3240 | int index = 0; | 3520 | int index = 0; |
3241 | #endif | 3521 | #endif |
3242 | 3522 | ||
3243 | irq_want = build_irq_for_pci_dev(dev) + 0x100; | 3523 | irq_want = nr_irqs_gsi; |
3244 | sub_handle = 0; | 3524 | sub_handle = 0; |
3245 | list_for_each_entry(desc, &dev->msi_list, list) { | 3525 | list_for_each_entry(msidesc, &dev->msi_list, list) { |
3246 | irq = create_irq_nr(irq_want--); | 3526 | irq = create_irq_nr(irq_want); |
3527 | irq_want++; | ||
3247 | if (irq == 0) | 3528 | if (irq == 0) |
3248 | return -1; | 3529 | return -1; |
3249 | #ifdef CONFIG_INTR_REMAP | 3530 | #ifdef CONFIG_INTR_REMAP |
@@ -3275,7 +3556,7 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | |||
3275 | } | 3556 | } |
3276 | no_ir: | 3557 | no_ir: |
3277 | #endif | 3558 | #endif |
3278 | ret = setup_msi_irq(dev, desc, irq); | 3559 | ret = setup_msi_irq(dev, msidesc, irq); |
3279 | if (ret < 0) | 3560 | if (ret < 0) |
3280 | goto error; | 3561 | goto error; |
3281 | sub_handle++; | 3562 | sub_handle++; |
@@ -3294,24 +3575,18 @@ void arch_teardown_msi_irq(unsigned int irq) | |||
3294 | 3575 | ||
3295 | #ifdef CONFIG_DMAR | 3576 | #ifdef CONFIG_DMAR |
3296 | #ifdef CONFIG_SMP | 3577 | #ifdef CONFIG_SMP |
3297 | static void dmar_msi_set_affinity(unsigned int irq, cpumask_t mask) | 3578 | static void dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask) |
3298 | { | 3579 | { |
3580 | struct irq_desc *desc = irq_to_desc(irq); | ||
3299 | struct irq_cfg *cfg; | 3581 | struct irq_cfg *cfg; |
3300 | struct msi_msg msg; | 3582 | struct msi_msg msg; |
3301 | unsigned int dest; | 3583 | unsigned int dest; |
3302 | cpumask_t tmp; | ||
3303 | struct irq_desc *desc; | ||
3304 | 3584 | ||
3305 | cpus_and(tmp, mask, cpu_online_map); | 3585 | dest = set_desc_affinity(desc, mask); |
3306 | if (cpus_empty(tmp)) | 3586 | if (dest == BAD_APICID) |
3307 | return; | 3587 | return; |
3308 | 3588 | ||
3309 | if (assign_irq_vector(irq, mask)) | 3589 | cfg = desc->chip_data; |
3310 | return; | ||
3311 | |||
3312 | cfg = irq_cfg(irq); | ||
3313 | cpus_and(tmp, cfg->domain, mask); | ||
3314 | dest = cpu_mask_to_apicid(tmp); | ||
3315 | 3590 | ||
3316 | dmar_msi_read(irq, &msg); | 3591 | dmar_msi_read(irq, &msg); |
3317 | 3592 | ||
@@ -3321,9 +3596,8 @@ static void dmar_msi_set_affinity(unsigned int irq, cpumask_t mask) | |||
3321 | msg.address_lo |= MSI_ADDR_DEST_ID(dest); | 3596 | msg.address_lo |= MSI_ADDR_DEST_ID(dest); |
3322 | 3597 | ||
3323 | dmar_msi_write(irq, &msg); | 3598 | dmar_msi_write(irq, &msg); |
3324 | desc = irq_to_desc(irq); | ||
3325 | desc->affinity = mask; | ||
3326 | } | 3599 | } |
3600 | |||
3327 | #endif /* CONFIG_SMP */ | 3601 | #endif /* CONFIG_SMP */ |
3328 | 3602 | ||
3329 | struct irq_chip dmar_msi_type = { | 3603 | struct irq_chip dmar_msi_type = { |
@@ -3355,24 +3629,18 @@ int arch_setup_dmar_msi(unsigned int irq) | |||
3355 | #ifdef CONFIG_HPET_TIMER | 3629 | #ifdef CONFIG_HPET_TIMER |
3356 | 3630 | ||
3357 | #ifdef CONFIG_SMP | 3631 | #ifdef CONFIG_SMP |
3358 | static void hpet_msi_set_affinity(unsigned int irq, cpumask_t mask) | 3632 | static void hpet_msi_set_affinity(unsigned int irq, const struct cpumask *mask) |
3359 | { | 3633 | { |
3634 | struct irq_desc *desc = irq_to_desc(irq); | ||
3360 | struct irq_cfg *cfg; | 3635 | struct irq_cfg *cfg; |
3361 | struct irq_desc *desc; | ||
3362 | struct msi_msg msg; | 3636 | struct msi_msg msg; |
3363 | unsigned int dest; | 3637 | unsigned int dest; |
3364 | cpumask_t tmp; | ||
3365 | 3638 | ||
3366 | cpus_and(tmp, mask, cpu_online_map); | 3639 | dest = set_desc_affinity(desc, mask); |
3367 | if (cpus_empty(tmp)) | 3640 | if (dest == BAD_APICID) |
3368 | return; | 3641 | return; |
3369 | 3642 | ||
3370 | if (assign_irq_vector(irq, mask)) | 3643 | cfg = desc->chip_data; |
3371 | return; | ||
3372 | |||
3373 | cfg = irq_cfg(irq); | ||
3374 | cpus_and(tmp, cfg->domain, mask); | ||
3375 | dest = cpu_mask_to_apicid(tmp); | ||
3376 | 3644 | ||
3377 | hpet_msi_read(irq, &msg); | 3645 | hpet_msi_read(irq, &msg); |
3378 | 3646 | ||
@@ -3382,9 +3650,8 @@ static void hpet_msi_set_affinity(unsigned int irq, cpumask_t mask) | |||
3382 | msg.address_lo |= MSI_ADDR_DEST_ID(dest); | 3650 | msg.address_lo |= MSI_ADDR_DEST_ID(dest); |
3383 | 3651 | ||
3384 | hpet_msi_write(irq, &msg); | 3652 | hpet_msi_write(irq, &msg); |
3385 | desc = irq_to_desc(irq); | ||
3386 | desc->affinity = mask; | ||
3387 | } | 3653 | } |
3654 | |||
3388 | #endif /* CONFIG_SMP */ | 3655 | #endif /* CONFIG_SMP */ |
3389 | 3656 | ||
3390 | struct irq_chip hpet_msi_type = { | 3657 | struct irq_chip hpet_msi_type = { |
@@ -3437,28 +3704,21 @@ static void target_ht_irq(unsigned int irq, unsigned int dest, u8 vector) | |||
3437 | write_ht_irq_msg(irq, &msg); | 3704 | write_ht_irq_msg(irq, &msg); |
3438 | } | 3705 | } |
3439 | 3706 | ||
3440 | static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask) | 3707 | static void set_ht_irq_affinity(unsigned int irq, const struct cpumask *mask) |
3441 | { | 3708 | { |
3709 | struct irq_desc *desc = irq_to_desc(irq); | ||
3442 | struct irq_cfg *cfg; | 3710 | struct irq_cfg *cfg; |
3443 | unsigned int dest; | 3711 | unsigned int dest; |
3444 | cpumask_t tmp; | ||
3445 | struct irq_desc *desc; | ||
3446 | |||
3447 | cpus_and(tmp, mask, cpu_online_map); | ||
3448 | if (cpus_empty(tmp)) | ||
3449 | return; | ||
3450 | 3712 | ||
3451 | if (assign_irq_vector(irq, mask)) | 3713 | dest = set_desc_affinity(desc, mask); |
3714 | if (dest == BAD_APICID) | ||
3452 | return; | 3715 | return; |
3453 | 3716 | ||
3454 | cfg = irq_cfg(irq); | 3717 | cfg = desc->chip_data; |
3455 | cpus_and(tmp, cfg->domain, mask); | ||
3456 | dest = cpu_mask_to_apicid(tmp); | ||
3457 | 3718 | ||
3458 | target_ht_irq(irq, dest, cfg->vector); | 3719 | target_ht_irq(irq, dest, cfg->vector); |
3459 | desc = irq_to_desc(irq); | ||
3460 | desc->affinity = mask; | ||
3461 | } | 3720 | } |
3721 | |||
3462 | #endif | 3722 | #endif |
3463 | 3723 | ||
3464 | static struct irq_chip ht_irq_chip = { | 3724 | static struct irq_chip ht_irq_chip = { |
@@ -3476,17 +3736,14 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) | |||
3476 | { | 3736 | { |
3477 | struct irq_cfg *cfg; | 3737 | struct irq_cfg *cfg; |
3478 | int err; | 3738 | int err; |
3479 | cpumask_t tmp; | ||
3480 | 3739 | ||
3481 | tmp = TARGET_CPUS; | 3740 | cfg = irq_cfg(irq); |
3482 | err = assign_irq_vector(irq, tmp); | 3741 | err = assign_irq_vector(irq, cfg, TARGET_CPUS); |
3483 | if (!err) { | 3742 | if (!err) { |
3484 | struct ht_irq_msg msg; | 3743 | struct ht_irq_msg msg; |
3485 | unsigned dest; | 3744 | unsigned dest; |
3486 | 3745 | ||
3487 | cfg = irq_cfg(irq); | 3746 | dest = cpu_mask_to_apicid_and(cfg->domain, TARGET_CPUS); |
3488 | cpus_and(tmp, cfg->domain, tmp); | ||
3489 | dest = cpu_mask_to_apicid(tmp); | ||
3490 | 3747 | ||
3491 | msg.address_hi = HT_IRQ_HIGH_DEST_ID(dest); | 3748 | msg.address_hi = HT_IRQ_HIGH_DEST_ID(dest); |
3492 | 3749 | ||
@@ -3522,7 +3779,7 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) | |||
3522 | int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, | 3779 | int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, |
3523 | unsigned long mmr_offset) | 3780 | unsigned long mmr_offset) |
3524 | { | 3781 | { |
3525 | const cpumask_t *eligible_cpu = get_cpu_mask(cpu); | 3782 | const struct cpumask *eligible_cpu = cpumask_of(cpu); |
3526 | struct irq_cfg *cfg; | 3783 | struct irq_cfg *cfg; |
3527 | int mmr_pnode; | 3784 | int mmr_pnode; |
3528 | unsigned long mmr_value; | 3785 | unsigned long mmr_value; |
@@ -3530,7 +3787,9 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, | |||
3530 | unsigned long flags; | 3787 | unsigned long flags; |
3531 | int err; | 3788 | int err; |
3532 | 3789 | ||
3533 | err = assign_irq_vector(irq, *eligible_cpu); | 3790 | cfg = irq_cfg(irq); |
3791 | |||
3792 | err = assign_irq_vector(irq, cfg, eligible_cpu); | ||
3534 | if (err != 0) | 3793 | if (err != 0) |
3535 | return err; | 3794 | return err; |
3536 | 3795 | ||
@@ -3539,8 +3798,6 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, | |||
3539 | irq_name); | 3798 | irq_name); |
3540 | spin_unlock_irqrestore(&vector_lock, flags); | 3799 | spin_unlock_irqrestore(&vector_lock, flags); |
3541 | 3800 | ||
3542 | cfg = irq_cfg(irq); | ||
3543 | |||
3544 | mmr_value = 0; | 3801 | mmr_value = 0; |
3545 | entry = (struct uv_IO_APIC_route_entry *)&mmr_value; | 3802 | entry = (struct uv_IO_APIC_route_entry *)&mmr_value; |
3546 | BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long)); | 3803 | BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long)); |
@@ -3551,7 +3808,7 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, | |||
3551 | entry->polarity = 0; | 3808 | entry->polarity = 0; |
3552 | entry->trigger = 0; | 3809 | entry->trigger = 0; |
3553 | entry->mask = 0; | 3810 | entry->mask = 0; |
3554 | entry->dest = cpu_mask_to_apicid(*eligible_cpu); | 3811 | entry->dest = cpu_mask_to_apicid(eligible_cpu); |
3555 | 3812 | ||
3556 | mmr_pnode = uv_blade_to_pnode(mmr_blade); | 3813 | mmr_pnode = uv_blade_to_pnode(mmr_blade); |
3557 | uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); | 3814 | uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); |
@@ -3592,29 +3849,16 @@ int __init io_apic_get_redir_entries (int ioapic) | |||
3592 | return reg_01.bits.entries; | 3849 | return reg_01.bits.entries; |
3593 | } | 3850 | } |
3594 | 3851 | ||
3595 | int __init probe_nr_irqs(void) | 3852 | void __init probe_nr_irqs_gsi(void) |
3596 | { | 3853 | { |
3597 | int idx; | 3854 | int idx; |
3598 | int nr = 0; | 3855 | int nr = 0; |
3599 | #ifndef CONFIG_XEN | ||
3600 | int nr_min = 32; | ||
3601 | #else | ||
3602 | int nr_min = NR_IRQS; | ||
3603 | #endif | ||
3604 | 3856 | ||
3605 | for (idx = 0; idx < nr_ioapics; idx++) | 3857 | for (idx = 0; idx < nr_ioapics; idx++) |
3606 | nr += io_apic_get_redir_entries(idx) + 1; | 3858 | nr += io_apic_get_redir_entries(idx) + 1; |
3607 | 3859 | ||
3608 | /* double it for hotplug and msi and nmi */ | 3860 | if (nr > nr_irqs_gsi) |
3609 | nr <<= 1; | 3861 | nr_irqs_gsi = nr; |
3610 | |||
3611 | /* something wrong ? */ | ||
3612 | if (nr < nr_min) | ||
3613 | nr = nr_min; | ||
3614 | if (WARN_ON(nr > NR_IRQS)) | ||
3615 | nr = NR_IRQS; | ||
3616 | |||
3617 | return nr; | ||
3618 | } | 3862 | } |
3619 | 3863 | ||
3620 | /* -------------------------------------------------------------------------- | 3864 | /* -------------------------------------------------------------------------- |
@@ -3713,19 +3957,31 @@ int __init io_apic_get_version(int ioapic) | |||
3713 | 3957 | ||
3714 | int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int polarity) | 3958 | int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int polarity) |
3715 | { | 3959 | { |
3960 | struct irq_desc *desc; | ||
3961 | struct irq_cfg *cfg; | ||
3962 | int cpu = boot_cpu_id; | ||
3963 | |||
3716 | if (!IO_APIC_IRQ(irq)) { | 3964 | if (!IO_APIC_IRQ(irq)) { |
3717 | apic_printk(APIC_QUIET,KERN_ERR "IOAPIC[%d]: Invalid reference to IRQ 0\n", | 3965 | apic_printk(APIC_QUIET,KERN_ERR "IOAPIC[%d]: Invalid reference to IRQ 0\n", |
3718 | ioapic); | 3966 | ioapic); |
3719 | return -EINVAL; | 3967 | return -EINVAL; |
3720 | } | 3968 | } |
3721 | 3969 | ||
3970 | desc = irq_to_desc_alloc_cpu(irq, cpu); | ||
3971 | if (!desc) { | ||
3972 | printk(KERN_INFO "can not get irq_desc %d\n", irq); | ||
3973 | return 0; | ||
3974 | } | ||
3975 | |||
3722 | /* | 3976 | /* |
3723 | * IRQs < 16 are already in the irq_2_pin[] map | 3977 | * IRQs < 16 are already in the irq_2_pin[] map |
3724 | */ | 3978 | */ |
3725 | if (irq >= 16) | 3979 | if (irq >= NR_IRQS_LEGACY) { |
3726 | add_pin_to_irq(irq, ioapic, pin); | 3980 | cfg = desc->chip_data; |
3981 | add_pin_to_irq_cpu(cfg, cpu, ioapic, pin); | ||
3982 | } | ||
3727 | 3983 | ||
3728 | setup_IO_APIC_irq(ioapic, pin, irq, triggering, polarity); | 3984 | setup_IO_APIC_irq(ioapic, pin, irq, desc, triggering, polarity); |
3729 | 3985 | ||
3730 | return 0; | 3986 | return 0; |
3731 | } | 3987 | } |
@@ -3761,7 +4017,9 @@ int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity) | |||
3761 | void __init setup_ioapic_dest(void) | 4017 | void __init setup_ioapic_dest(void) |
3762 | { | 4018 | { |
3763 | int pin, ioapic, irq, irq_entry; | 4019 | int pin, ioapic, irq, irq_entry; |
4020 | struct irq_desc *desc; | ||
3764 | struct irq_cfg *cfg; | 4021 | struct irq_cfg *cfg; |
4022 | const struct cpumask *mask; | ||
3765 | 4023 | ||
3766 | if (skip_ioapic_setup == 1) | 4024 | if (skip_ioapic_setup == 1) |
3767 | return; | 4025 | return; |
@@ -3777,17 +4035,31 @@ void __init setup_ioapic_dest(void) | |||
3777 | * when you have too many devices, because at that time only boot | 4035 | * when you have too many devices, because at that time only boot |
3778 | * cpu is online. | 4036 | * cpu is online. |
3779 | */ | 4037 | */ |
3780 | cfg = irq_cfg(irq); | 4038 | desc = irq_to_desc(irq); |
3781 | if (!cfg->vector) | 4039 | cfg = desc->chip_data; |
3782 | setup_IO_APIC_irq(ioapic, pin, irq, | 4040 | if (!cfg->vector) { |
4041 | setup_IO_APIC_irq(ioapic, pin, irq, desc, | ||
3783 | irq_trigger(irq_entry), | 4042 | irq_trigger(irq_entry), |
3784 | irq_polarity(irq_entry)); | 4043 | irq_polarity(irq_entry)); |
4044 | continue; | ||
4045 | |||
4046 | } | ||
4047 | |||
4048 | /* | ||
4049 | * Honour affinities which have been set in early boot | ||
4050 | */ | ||
4051 | if (desc->status & | ||
4052 | (IRQ_NO_BALANCING | IRQ_AFFINITY_SET)) | ||
4053 | mask = &desc->affinity; | ||
4054 | else | ||
4055 | mask = TARGET_CPUS; | ||
4056 | |||
3785 | #ifdef CONFIG_INTR_REMAP | 4057 | #ifdef CONFIG_INTR_REMAP |
3786 | else if (intr_remapping_enabled) | 4058 | if (intr_remapping_enabled) |
3787 | set_ir_ioapic_affinity_irq(irq, TARGET_CPUS); | 4059 | set_ir_ioapic_affinity_irq_desc(desc, mask); |
3788 | #endif | ||
3789 | else | 4060 | else |
3790 | set_ioapic_affinity_irq(irq, TARGET_CPUS); | 4061 | #endif |
4062 | set_ioapic_affinity_irq_desc(desc, mask); | ||
3791 | } | 4063 | } |
3792 | 4064 | ||
3793 | } | 4065 | } |
@@ -3836,7 +4108,6 @@ void __init ioapic_init_mappings(void) | |||
3836 | struct resource *ioapic_res; | 4108 | struct resource *ioapic_res; |
3837 | int i; | 4109 | int i; |
3838 | 4110 | ||
3839 | irq_2_pin_init(); | ||
3840 | ioapic_res = ioapic_setup_resources(); | 4111 | ioapic_res = ioapic_setup_resources(); |
3841 | for (i = 0; i < nr_ioapics; i++) { | 4112 | for (i = 0; i < nr_ioapics; i++) { |
3842 | if (smp_found_config) { | 4113 | if (smp_found_config) { |
diff --git a/arch/x86/kernel/ipi.c b/arch/x86/kernel/ipi.c index f1c688e46f35..285bbf8831fa 100644 --- a/arch/x86/kernel/ipi.c +++ b/arch/x86/kernel/ipi.c | |||
@@ -116,18 +116,18 @@ static inline void __send_IPI_dest_field(unsigned long mask, int vector) | |||
116 | /* | 116 | /* |
117 | * This is only used on smaller machines. | 117 | * This is only used on smaller machines. |
118 | */ | 118 | */ |
119 | void send_IPI_mask_bitmask(cpumask_t cpumask, int vector) | 119 | void send_IPI_mask_bitmask(const struct cpumask *cpumask, int vector) |
120 | { | 120 | { |
121 | unsigned long mask = cpus_addr(cpumask)[0]; | 121 | unsigned long mask = cpumask_bits(cpumask)[0]; |
122 | unsigned long flags; | 122 | unsigned long flags; |
123 | 123 | ||
124 | local_irq_save(flags); | 124 | local_irq_save(flags); |
125 | WARN_ON(mask & ~cpus_addr(cpu_online_map)[0]); | 125 | WARN_ON(mask & ~cpumask_bits(cpu_online_mask)[0]); |
126 | __send_IPI_dest_field(mask, vector); | 126 | __send_IPI_dest_field(mask, vector); |
127 | local_irq_restore(flags); | 127 | local_irq_restore(flags); |
128 | } | 128 | } |
129 | 129 | ||
130 | void send_IPI_mask_sequence(cpumask_t mask, int vector) | 130 | void send_IPI_mask_sequence(const struct cpumask *mask, int vector) |
131 | { | 131 | { |
132 | unsigned long flags; | 132 | unsigned long flags; |
133 | unsigned int query_cpu; | 133 | unsigned int query_cpu; |
@@ -139,12 +139,24 @@ void send_IPI_mask_sequence(cpumask_t mask, int vector) | |||
139 | */ | 139 | */ |
140 | 140 | ||
141 | local_irq_save(flags); | 141 | local_irq_save(flags); |
142 | for_each_possible_cpu(query_cpu) { | 142 | for_each_cpu(query_cpu, mask) |
143 | if (cpu_isset(query_cpu, mask)) { | 143 | __send_IPI_dest_field(cpu_to_logical_apicid(query_cpu), vector); |
144 | local_irq_restore(flags); | ||
145 | } | ||
146 | |||
147 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector) | ||
148 | { | ||
149 | unsigned long flags; | ||
150 | unsigned int query_cpu; | ||
151 | unsigned int this_cpu = smp_processor_id(); | ||
152 | |||
153 | /* See Hack comment above */ | ||
154 | |||
155 | local_irq_save(flags); | ||
156 | for_each_cpu(query_cpu, mask) | ||
157 | if (query_cpu != this_cpu) | ||
144 | __send_IPI_dest_field(cpu_to_logical_apicid(query_cpu), | 158 | __send_IPI_dest_field(cpu_to_logical_apicid(query_cpu), |
145 | vector); | 159 | vector); |
146 | } | ||
147 | } | ||
148 | local_irq_restore(flags); | 160 | local_irq_restore(flags); |
149 | } | 161 | } |
150 | 162 | ||
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index d1d4dc52f649..3f1d9d18df67 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c | |||
@@ -118,6 +118,9 @@ int show_interrupts(struct seq_file *p, void *v) | |||
118 | } | 118 | } |
119 | 119 | ||
120 | desc = irq_to_desc(i); | 120 | desc = irq_to_desc(i); |
121 | if (!desc) | ||
122 | return 0; | ||
123 | |||
121 | spin_lock_irqsave(&desc->lock, flags); | 124 | spin_lock_irqsave(&desc->lock, flags); |
122 | #ifndef CONFIG_SMP | 125 | #ifndef CONFIG_SMP |
123 | any_count = kstat_irqs(i); | 126 | any_count = kstat_irqs(i); |
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index a51382672de0..9dc5588f336a 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c | |||
@@ -233,25 +233,28 @@ unsigned int do_IRQ(struct pt_regs *regs) | |||
233 | #ifdef CONFIG_HOTPLUG_CPU | 233 | #ifdef CONFIG_HOTPLUG_CPU |
234 | #include <mach_apic.h> | 234 | #include <mach_apic.h> |
235 | 235 | ||
236 | void fixup_irqs(cpumask_t map) | 236 | /* A cpu has been removed from cpu_online_mask. Reset irq affinities. */ |
237 | void fixup_irqs(void) | ||
237 | { | 238 | { |
238 | unsigned int irq; | 239 | unsigned int irq; |
239 | static int warned; | 240 | static int warned; |
240 | struct irq_desc *desc; | 241 | struct irq_desc *desc; |
241 | 242 | ||
242 | for_each_irq_desc(irq, desc) { | 243 | for_each_irq_desc(irq, desc) { |
243 | cpumask_t mask; | 244 | const struct cpumask *affinity; |
244 | 245 | ||
246 | if (!desc) | ||
247 | continue; | ||
245 | if (irq == 2) | 248 | if (irq == 2) |
246 | continue; | 249 | continue; |
247 | 250 | ||
248 | cpus_and(mask, desc->affinity, map); | 251 | affinity = &desc->affinity; |
249 | if (any_online_cpu(mask) == NR_CPUS) { | 252 | if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) { |
250 | printk("Breaking affinity for irq %i\n", irq); | 253 | printk("Breaking affinity for irq %i\n", irq); |
251 | mask = map; | 254 | affinity = cpu_all_mask; |
252 | } | 255 | } |
253 | if (desc->chip->set_affinity) | 256 | if (desc->chip->set_affinity) |
254 | desc->chip->set_affinity(irq, mask); | 257 | desc->chip->set_affinity(irq, affinity); |
255 | else if (desc->action && !(warned++)) | 258 | else if (desc->action && !(warned++)) |
256 | printk("Cannot set affinity for irq %i\n", irq); | 259 | printk("Cannot set affinity for irq %i\n", irq); |
257 | } | 260 | } |
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index 60eb84eb77a0..fca2991443f5 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c | |||
@@ -83,40 +83,43 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs) | |||
83 | } | 83 | } |
84 | 84 | ||
85 | #ifdef CONFIG_HOTPLUG_CPU | 85 | #ifdef CONFIG_HOTPLUG_CPU |
86 | void fixup_irqs(cpumask_t map) | 86 | /* A cpu has been removed from cpu_online_mask. Reset irq affinities. */ |
87 | void fixup_irqs(void) | ||
87 | { | 88 | { |
88 | unsigned int irq; | 89 | unsigned int irq; |
89 | static int warned; | 90 | static int warned; |
90 | struct irq_desc *desc; | 91 | struct irq_desc *desc; |
91 | 92 | ||
92 | for_each_irq_desc(irq, desc) { | 93 | for_each_irq_desc(irq, desc) { |
93 | cpumask_t mask; | ||
94 | int break_affinity = 0; | 94 | int break_affinity = 0; |
95 | int set_affinity = 1; | 95 | int set_affinity = 1; |
96 | const struct cpumask *affinity; | ||
96 | 97 | ||
98 | if (!desc) | ||
99 | continue; | ||
97 | if (irq == 2) | 100 | if (irq == 2) |
98 | continue; | 101 | continue; |
99 | 102 | ||
100 | /* interrupt's are disabled at this point */ | 103 | /* interrupt's are disabled at this point */ |
101 | spin_lock(&desc->lock); | 104 | spin_lock(&desc->lock); |
102 | 105 | ||
106 | affinity = &desc->affinity; | ||
103 | if (!irq_has_action(irq) || | 107 | if (!irq_has_action(irq) || |
104 | cpus_equal(desc->affinity, map)) { | 108 | cpumask_equal(affinity, cpu_online_mask)) { |
105 | spin_unlock(&desc->lock); | 109 | spin_unlock(&desc->lock); |
106 | continue; | 110 | continue; |
107 | } | 111 | } |
108 | 112 | ||
109 | cpus_and(mask, desc->affinity, map); | 113 | if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) { |
110 | if (cpus_empty(mask)) { | ||
111 | break_affinity = 1; | 114 | break_affinity = 1; |
112 | mask = map; | 115 | affinity = cpu_all_mask; |
113 | } | 116 | } |
114 | 117 | ||
115 | if (desc->chip->mask) | 118 | if (desc->chip->mask) |
116 | desc->chip->mask(irq); | 119 | desc->chip->mask(irq); |
117 | 120 | ||
118 | if (desc->chip->set_affinity) | 121 | if (desc->chip->set_affinity) |
119 | desc->chip->set_affinity(irq, mask); | 122 | desc->chip->set_affinity(irq, affinity); |
120 | else if (!(warned++)) | 123 | else if (!(warned++)) |
121 | set_affinity = 0; | 124 | set_affinity = 0; |
122 | 125 | ||
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c index 845aa9803e80..6a92f47c52e7 100644 --- a/arch/x86/kernel/irqinit_32.c +++ b/arch/x86/kernel/irqinit_32.c | |||
@@ -68,8 +68,7 @@ void __init init_ISA_irqs (void) | |||
68 | /* | 68 | /* |
69 | * 16 old-style INTA-cycle interrupts: | 69 | * 16 old-style INTA-cycle interrupts: |
70 | */ | 70 | */ |
71 | for (i = 0; i < 16; i++) { | 71 | for (i = 0; i < NR_IRQS_LEGACY; i++) { |
72 | /* first time call this irq_desc */ | ||
73 | struct irq_desc *desc = irq_to_desc(i); | 72 | struct irq_desc *desc = irq_to_desc(i); |
74 | 73 | ||
75 | desc->status = IRQ_DISABLED; | 74 | desc->status = IRQ_DISABLED; |
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c index ff0235391285..40c1e62ec785 100644 --- a/arch/x86/kernel/irqinit_64.c +++ b/arch/x86/kernel/irqinit_64.c | |||
@@ -142,8 +142,7 @@ void __init init_ISA_irqs(void) | |||
142 | init_bsp_APIC(); | 142 | init_bsp_APIC(); |
143 | init_8259A(0); | 143 | init_8259A(0); |
144 | 144 | ||
145 | for (i = 0; i < 16; i++) { | 145 | for (i = 0; i < NR_IRQS_LEGACY; i++) { |
146 | /* first time call this irq_desc */ | ||
147 | struct irq_desc *desc = irq_to_desc(i); | 146 | struct irq_desc *desc = irq_to_desc(i); |
148 | 147 | ||
149 | desc->status = IRQ_DISABLED; | 148 | desc->status = IRQ_DISABLED; |
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 774ac4991568..e169ae9b6a62 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c | |||
@@ -128,7 +128,7 @@ static int kvm_register_clock(char *txt) | |||
128 | } | 128 | } |
129 | 129 | ||
130 | #ifdef CONFIG_X86_LOCAL_APIC | 130 | #ifdef CONFIG_X86_LOCAL_APIC |
131 | static void kvm_setup_secondary_clock(void) | 131 | static void __cpuinit kvm_setup_secondary_clock(void) |
132 | { | 132 | { |
133 | /* | 133 | /* |
134 | * Now that the first cpu already had this clocksource initialized, | 134 | * Now that the first cpu already had this clocksource initialized, |
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 3b599518c322..c12314c9e86f 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
@@ -287,7 +287,7 @@ static struct clock_event_device mfgpt_clockevent = { | |||
287 | .set_mode = mfgpt_set_mode, | 287 | .set_mode = mfgpt_set_mode, |
288 | .set_next_event = mfgpt_next_event, | 288 | .set_next_event = mfgpt_next_event, |
289 | .rating = 250, | 289 | .rating = 250, |
290 | .cpumask = CPU_MASK_ALL, | 290 | .cpumask = cpu_all_mask, |
291 | .shift = 32 | 291 | .shift = 32 |
292 | }; | 292 | }; |
293 | 293 | ||
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index f98f4e1dba09..45e3b69808ba 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -586,23 +586,23 @@ static void __init __get_smp_config(unsigned int early) | |||
586 | { | 586 | { |
587 | struct intel_mp_floating *mpf = mpf_found; | 587 | struct intel_mp_floating *mpf = mpf_found; |
588 | 588 | ||
589 | if (x86_quirks->mach_get_smp_config) { | 589 | if (!mpf) |
590 | if (x86_quirks->mach_get_smp_config(early)) | 590 | return; |
591 | return; | 591 | |
592 | } | ||
593 | if (acpi_lapic && early) | 592 | if (acpi_lapic && early) |
594 | return; | 593 | return; |
594 | |||
595 | /* | 595 | /* |
596 | * ACPI supports both logical (e.g. Hyper-Threading) and physical | 596 | * MPS doesn't support hyperthreading, aka only have |
597 | * processors, where MPS only supports physical. | 597 | * thread 0 apic id in MPS table |
598 | */ | 598 | */ |
599 | if (acpi_lapic && acpi_ioapic) { | 599 | if (acpi_lapic && acpi_ioapic) |
600 | printk(KERN_INFO "Using ACPI (MADT) for SMP configuration " | ||
601 | "information\n"); | ||
602 | return; | 600 | return; |
603 | } else if (acpi_lapic) | 601 | |
604 | printk(KERN_INFO "Using ACPI for processor (LAPIC) " | 602 | if (x86_quirks->mach_get_smp_config) { |
605 | "configuration information\n"); | 603 | if (x86_quirks->mach_get_smp_config(early)) |
604 | return; | ||
605 | } | ||
606 | 606 | ||
607 | printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", | 607 | printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", |
608 | mpf->mpf_specification); | 608 | mpf->mpf_specification); |
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c index 4caff39078e0..0deea37a53cf 100644 --- a/arch/x86/kernel/numaq_32.c +++ b/arch/x86/kernel/numaq_32.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/numaq.h> | 31 | #include <asm/numaq.h> |
32 | #include <asm/topology.h> | 32 | #include <asm/topology.h> |
33 | #include <asm/processor.h> | 33 | #include <asm/processor.h> |
34 | #include <asm/mpspec.h> | 34 | #include <asm/genapic.h> |
35 | #include <asm/e820.h> | 35 | #include <asm/e820.h> |
36 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |
37 | 37 | ||
@@ -235,6 +235,13 @@ static int __init numaq_setup_ioapic_ids(void) | |||
235 | return 1; | 235 | return 1; |
236 | } | 236 | } |
237 | 237 | ||
238 | static int __init numaq_update_genapic(void) | ||
239 | { | ||
240 | genapic->wakeup_cpu = wakeup_secondary_cpu_via_nmi; | ||
241 | |||
242 | return 0; | ||
243 | } | ||
244 | |||
238 | static struct x86_quirks numaq_x86_quirks __initdata = { | 245 | static struct x86_quirks numaq_x86_quirks __initdata = { |
239 | .arch_pre_time_init = numaq_pre_time_init, | 246 | .arch_pre_time_init = numaq_pre_time_init, |
240 | .arch_time_init = NULL, | 247 | .arch_time_init = NULL, |
@@ -250,6 +257,7 @@ static struct x86_quirks numaq_x86_quirks __initdata = { | |||
250 | .mpc_oem_pci_bus = mpc_oem_pci_bus, | 257 | .mpc_oem_pci_bus = mpc_oem_pci_bus, |
251 | .smp_read_mpc_oem = smp_read_mpc_oem, | 258 | .smp_read_mpc_oem = smp_read_mpc_oem, |
252 | .setup_ioapic_ids = numaq_setup_ioapic_ids, | 259 | .setup_ioapic_ids = numaq_setup_ioapic_ids, |
260 | .update_genapic = numaq_update_genapic, | ||
253 | }; | 261 | }; |
254 | 262 | ||
255 | void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, | 263 | void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, |
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c index 0e9f1982b1dd..95777b0faa73 100644 --- a/arch/x86/kernel/paravirt-spinlocks.c +++ b/arch/x86/kernel/paravirt-spinlocks.c | |||
@@ -7,7 +7,8 @@ | |||
7 | 7 | ||
8 | #include <asm/paravirt.h> | 8 | #include <asm/paravirt.h> |
9 | 9 | ||
10 | static void default_spin_lock_flags(struct raw_spinlock *lock, unsigned long flags) | 10 | static inline void |
11 | default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags) | ||
11 | { | 12 | { |
12 | __raw_spin_lock(lock); | 13 | __raw_spin_lock(lock); |
13 | } | 14 | } |
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index e1e731d78f38..d28bbdc35e4e 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
@@ -1567,7 +1567,7 @@ static int __init calgary_parse_options(char *p) | |||
1567 | ++p; | 1567 | ++p; |
1568 | if (*p == '\0') | 1568 | if (*p == '\0') |
1569 | break; | 1569 | break; |
1570 | bridge = simple_strtol(p, &endp, 0); | 1570 | bridge = simple_strtoul(p, &endp, 0); |
1571 | if (p == endp) | 1571 | if (p == endp) |
1572 | break; | 1572 | break; |
1573 | 1573 | ||
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index a42b02b4df68..ba7ad83e20a8 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
@@ -123,6 +123,8 @@ static void free_iommu(unsigned long offset, int size) | |||
123 | 123 | ||
124 | spin_lock_irqsave(&iommu_bitmap_lock, flags); | 124 | spin_lock_irqsave(&iommu_bitmap_lock, flags); |
125 | iommu_area_free(iommu_gart_bitmap, offset, size); | 125 | iommu_area_free(iommu_gart_bitmap, offset, size); |
126 | if (offset >= next_bit) | ||
127 | next_bit = offset + size; | ||
126 | spin_unlock_irqrestore(&iommu_bitmap_lock, flags); | 128 | spin_unlock_irqrestore(&iommu_bitmap_lock, flags); |
127 | } | 129 | } |
128 | 130 | ||
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index c622772744d8..95d811a9594f 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -7,7 +7,9 @@ | |||
7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
8 | #include <linux/pm.h> | 8 | #include <linux/pm.h> |
9 | #include <linux/clockchips.h> | 9 | #include <linux/clockchips.h> |
10 | #include <linux/ftrace.h> | ||
10 | #include <asm/system.h> | 11 | #include <asm/system.h> |
12 | #include <asm/apic.h> | ||
11 | 13 | ||
12 | unsigned long idle_halt; | 14 | unsigned long idle_halt; |
13 | EXPORT_SYMBOL(idle_halt); | 15 | EXPORT_SYMBOL(idle_halt); |
@@ -100,6 +102,9 @@ static inline int hlt_use_halt(void) | |||
100 | void default_idle(void) | 102 | void default_idle(void) |
101 | { | 103 | { |
102 | if (hlt_use_halt()) { | 104 | if (hlt_use_halt()) { |
105 | struct power_trace it; | ||
106 | |||
107 | trace_power_start(&it, POWER_CSTATE, 1); | ||
103 | current_thread_info()->status &= ~TS_POLLING; | 108 | current_thread_info()->status &= ~TS_POLLING; |
104 | /* | 109 | /* |
105 | * TS_POLLING-cleared state must be visible before we | 110 | * TS_POLLING-cleared state must be visible before we |
@@ -112,6 +117,7 @@ void default_idle(void) | |||
112 | else | 117 | else |
113 | local_irq_enable(); | 118 | local_irq_enable(); |
114 | current_thread_info()->status |= TS_POLLING; | 119 | current_thread_info()->status |= TS_POLLING; |
120 | trace_power_end(&it); | ||
115 | } else { | 121 | } else { |
116 | local_irq_enable(); | 122 | local_irq_enable(); |
117 | /* loop is done by the caller */ | 123 | /* loop is done by the caller */ |
@@ -122,6 +128,21 @@ void default_idle(void) | |||
122 | EXPORT_SYMBOL(default_idle); | 128 | EXPORT_SYMBOL(default_idle); |
123 | #endif | 129 | #endif |
124 | 130 | ||
131 | void stop_this_cpu(void *dummy) | ||
132 | { | ||
133 | local_irq_disable(); | ||
134 | /* | ||
135 | * Remove this CPU: | ||
136 | */ | ||
137 | cpu_clear(smp_processor_id(), cpu_online_map); | ||
138 | disable_local_APIC(); | ||
139 | |||
140 | for (;;) { | ||
141 | if (hlt_works(smp_processor_id())) | ||
142 | halt(); | ||
143 | } | ||
144 | } | ||
145 | |||
125 | static void do_nothing(void *unused) | 146 | static void do_nothing(void *unused) |
126 | { | 147 | { |
127 | } | 148 | } |
@@ -154,24 +175,31 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait); | |||
154 | */ | 175 | */ |
155 | void mwait_idle_with_hints(unsigned long ax, unsigned long cx) | 176 | void mwait_idle_with_hints(unsigned long ax, unsigned long cx) |
156 | { | 177 | { |
178 | struct power_trace it; | ||
179 | |||
180 | trace_power_start(&it, POWER_CSTATE, (ax>>4)+1); | ||
157 | if (!need_resched()) { | 181 | if (!need_resched()) { |
158 | __monitor((void *)¤t_thread_info()->flags, 0, 0); | 182 | __monitor((void *)¤t_thread_info()->flags, 0, 0); |
159 | smp_mb(); | 183 | smp_mb(); |
160 | if (!need_resched()) | 184 | if (!need_resched()) |
161 | __mwait(ax, cx); | 185 | __mwait(ax, cx); |
162 | } | 186 | } |
187 | trace_power_end(&it); | ||
163 | } | 188 | } |
164 | 189 | ||
165 | /* Default MONITOR/MWAIT with no hints, used for default C1 state */ | 190 | /* Default MONITOR/MWAIT with no hints, used for default C1 state */ |
166 | static void mwait_idle(void) | 191 | static void mwait_idle(void) |
167 | { | 192 | { |
193 | struct power_trace it; | ||
168 | if (!need_resched()) { | 194 | if (!need_resched()) { |
195 | trace_power_start(&it, POWER_CSTATE, 1); | ||
169 | __monitor((void *)¤t_thread_info()->flags, 0, 0); | 196 | __monitor((void *)¤t_thread_info()->flags, 0, 0); |
170 | smp_mb(); | 197 | smp_mb(); |
171 | if (!need_resched()) | 198 | if (!need_resched()) |
172 | __sti_mwait(0, 0); | 199 | __sti_mwait(0, 0); |
173 | else | 200 | else |
174 | local_irq_enable(); | 201 | local_irq_enable(); |
202 | trace_power_end(&it); | ||
175 | } else | 203 | } else |
176 | local_irq_enable(); | 204 | local_irq_enable(); |
177 | } | 205 | } |
@@ -183,9 +211,13 @@ static void mwait_idle(void) | |||
183 | */ | 211 | */ |
184 | static void poll_idle(void) | 212 | static void poll_idle(void) |
185 | { | 213 | { |
214 | struct power_trace it; | ||
215 | |||
216 | trace_power_start(&it, POWER_CSTATE, 0); | ||
186 | local_irq_enable(); | 217 | local_irq_enable(); |
187 | while (!need_resched()) | 218 | while (!need_resched()) |
188 | cpu_relax(); | 219 | cpu_relax(); |
220 | trace_power_end(&it); | ||
189 | } | 221 | } |
190 | 222 | ||
191 | /* | 223 | /* |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 0a1302fe6d45..24c2276aa453 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/percpu.h> | 38 | #include <linux/percpu.h> |
39 | #include <linux/prctl.h> | 39 | #include <linux/prctl.h> |
40 | #include <linux/dmi.h> | 40 | #include <linux/dmi.h> |
41 | #include <linux/ftrace.h> | ||
41 | 42 | ||
42 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
43 | #include <asm/pgtable.h> | 44 | #include <asm/pgtable.h> |
@@ -548,7 +549,8 @@ __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p, | |||
548 | * the task-switch, and shows up in ret_from_fork in entry.S, | 549 | * the task-switch, and shows up in ret_from_fork in entry.S, |
549 | * for example. | 550 | * for example. |
550 | */ | 551 | */ |
551 | struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | 552 | __notrace_funcgraph struct task_struct * |
553 | __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | ||
552 | { | 554 | { |
553 | struct thread_struct *prev = &prev_p->thread, | 555 | struct thread_struct *prev = &prev_p->thread, |
554 | *next = &next_p->thread; | 556 | *next = &next_p->thread; |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index c958120fb1b6..fbb321d53d34 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/prctl.h> | 39 | #include <linux/prctl.h> |
40 | #include <linux/uaccess.h> | 40 | #include <linux/uaccess.h> |
41 | #include <linux/io.h> | 41 | #include <linux/io.h> |
42 | #include <linux/ftrace.h> | ||
42 | 43 | ||
43 | #include <asm/pgtable.h> | 44 | #include <asm/pgtable.h> |
44 | #include <asm/system.h> | 45 | #include <asm/system.h> |
@@ -551,8 +552,9 @@ static inline void __switch_to_xtra(struct task_struct *prev_p, | |||
551 | * - could test fs/gs bitsliced | 552 | * - could test fs/gs bitsliced |
552 | * | 553 | * |
553 | * Kprobes not supported here. Set the probe on schedule instead. | 554 | * Kprobes not supported here. Set the probe on schedule instead. |
555 | * Function graph tracer not supported too. | ||
554 | */ | 556 | */ |
555 | struct task_struct * | 557 | __notrace_funcgraph struct task_struct * |
556 | __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | 558 | __switch_to(struct task_struct *prev_p, struct task_struct *next_p) |
557 | { | 559 | { |
558 | struct thread_struct *prev = &prev_p->thread; | 560 | struct thread_struct *prev = &prev_p->thread; |
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 0a6d8c12e10d..2c8ec1ba75e6 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c | |||
@@ -668,14 +668,14 @@ static int ptrace_bts_read_record(struct task_struct *child, size_t index, | |||
668 | size_t bts_index, bts_end; | 668 | size_t bts_index, bts_end; |
669 | int error; | 669 | int error; |
670 | 670 | ||
671 | error = ds_get_bts_end(child, &bts_end); | 671 | error = ds_get_bts_end(child->bts, &bts_end); |
672 | if (error < 0) | 672 | if (error < 0) |
673 | return error; | 673 | return error; |
674 | 674 | ||
675 | if (bts_end <= index) | 675 | if (bts_end <= index) |
676 | return -EINVAL; | 676 | return -EINVAL; |
677 | 677 | ||
678 | error = ds_get_bts_index(child, &bts_index); | 678 | error = ds_get_bts_index(child->bts, &bts_index); |
679 | if (error < 0) | 679 | if (error < 0) |
680 | return error; | 680 | return error; |
681 | 681 | ||
@@ -684,7 +684,7 @@ static int ptrace_bts_read_record(struct task_struct *child, size_t index, | |||
684 | if (bts_end <= bts_index) | 684 | if (bts_end <= bts_index) |
685 | bts_index -= bts_end; | 685 | bts_index -= bts_end; |
686 | 686 | ||
687 | error = ds_access_bts(child, bts_index, &bts_record); | 687 | error = ds_access_bts(child->bts, bts_index, &bts_record); |
688 | if (error < 0) | 688 | if (error < 0) |
689 | return error; | 689 | return error; |
690 | 690 | ||
@@ -705,14 +705,14 @@ static int ptrace_bts_drain(struct task_struct *child, | |||
705 | size_t end, i; | 705 | size_t end, i; |
706 | int error; | 706 | int error; |
707 | 707 | ||
708 | error = ds_get_bts_index(child, &end); | 708 | error = ds_get_bts_index(child->bts, &end); |
709 | if (error < 0) | 709 | if (error < 0) |
710 | return error; | 710 | return error; |
711 | 711 | ||
712 | if (size < (end * sizeof(struct bts_struct))) | 712 | if (size < (end * sizeof(struct bts_struct))) |
713 | return -EIO; | 713 | return -EIO; |
714 | 714 | ||
715 | error = ds_access_bts(child, 0, (const void **)&raw); | 715 | error = ds_access_bts(child->bts, 0, (const void **)&raw); |
716 | if (error < 0) | 716 | if (error < 0) |
717 | return error; | 717 | return error; |
718 | 718 | ||
@@ -723,18 +723,13 @@ static int ptrace_bts_drain(struct task_struct *child, | |||
723 | return -EFAULT; | 723 | return -EFAULT; |
724 | } | 724 | } |
725 | 725 | ||
726 | error = ds_clear_bts(child); | 726 | error = ds_clear_bts(child->bts); |
727 | if (error < 0) | 727 | if (error < 0) |
728 | return error; | 728 | return error; |
729 | 729 | ||
730 | return end; | 730 | return end; |
731 | } | 731 | } |
732 | 732 | ||
733 | static void ptrace_bts_ovfl(struct task_struct *child) | ||
734 | { | ||
735 | send_sig(child->thread.bts_ovfl_signal, child, 0); | ||
736 | } | ||
737 | |||
738 | static int ptrace_bts_config(struct task_struct *child, | 733 | static int ptrace_bts_config(struct task_struct *child, |
739 | long cfg_size, | 734 | long cfg_size, |
740 | const struct ptrace_bts_config __user *ucfg) | 735 | const struct ptrace_bts_config __user *ucfg) |
@@ -760,23 +755,45 @@ static int ptrace_bts_config(struct task_struct *child, | |||
760 | goto errout; | 755 | goto errout; |
761 | 756 | ||
762 | if (cfg.flags & PTRACE_BTS_O_ALLOC) { | 757 | if (cfg.flags & PTRACE_BTS_O_ALLOC) { |
763 | ds_ovfl_callback_t ovfl = NULL; | 758 | bts_ovfl_callback_t ovfl = NULL; |
764 | unsigned int sig = 0; | 759 | unsigned int sig = 0; |
765 | 760 | ||
766 | /* we ignore the error in case we were not tracing child */ | 761 | error = -EINVAL; |
767 | (void)ds_release_bts(child); | 762 | if (cfg.size < (10 * bts_cfg.sizeof_bts)) |
763 | goto errout; | ||
768 | 764 | ||
769 | if (cfg.flags & PTRACE_BTS_O_SIGNAL) { | 765 | if (cfg.flags & PTRACE_BTS_O_SIGNAL) { |
770 | if (!cfg.signal) | 766 | if (!cfg.signal) |
771 | goto errout; | 767 | goto errout; |
772 | 768 | ||
769 | error = -EOPNOTSUPP; | ||
770 | goto errout; | ||
771 | |||
773 | sig = cfg.signal; | 772 | sig = cfg.signal; |
774 | ovfl = ptrace_bts_ovfl; | ||
775 | } | 773 | } |
776 | 774 | ||
777 | error = ds_request_bts(child, /* base = */ NULL, cfg.size, ovfl); | 775 | if (child->bts) { |
778 | if (error < 0) | 776 | (void)ds_release_bts(child->bts); |
777 | kfree(child->bts_buffer); | ||
778 | |||
779 | child->bts = NULL; | ||
780 | child->bts_buffer = NULL; | ||
781 | } | ||
782 | |||
783 | error = -ENOMEM; | ||
784 | child->bts_buffer = kzalloc(cfg.size, GFP_KERNEL); | ||
785 | if (!child->bts_buffer) | ||
786 | goto errout; | ||
787 | |||
788 | child->bts = ds_request_bts(child, child->bts_buffer, cfg.size, | ||
789 | ovfl, /* th = */ (size_t)-1); | ||
790 | if (IS_ERR(child->bts)) { | ||
791 | error = PTR_ERR(child->bts); | ||
792 | kfree(child->bts_buffer); | ||
793 | child->bts = NULL; | ||
794 | child->bts_buffer = NULL; | ||
779 | goto errout; | 795 | goto errout; |
796 | } | ||
780 | 797 | ||
781 | child->thread.bts_ovfl_signal = sig; | 798 | child->thread.bts_ovfl_signal = sig; |
782 | } | 799 | } |
@@ -823,15 +840,15 @@ static int ptrace_bts_status(struct task_struct *child, | |||
823 | if (cfg_size < sizeof(cfg)) | 840 | if (cfg_size < sizeof(cfg)) |
824 | return -EIO; | 841 | return -EIO; |
825 | 842 | ||
826 | error = ds_get_bts_end(child, &end); | 843 | error = ds_get_bts_end(child->bts, &end); |
827 | if (error < 0) | 844 | if (error < 0) |
828 | return error; | 845 | return error; |
829 | 846 | ||
830 | error = ds_access_bts(child, /* index = */ 0, &base); | 847 | error = ds_access_bts(child->bts, /* index = */ 0, &base); |
831 | if (error < 0) | 848 | if (error < 0) |
832 | return error; | 849 | return error; |
833 | 850 | ||
834 | error = ds_access_bts(child, /* index = */ end, &max); | 851 | error = ds_access_bts(child->bts, /* index = */ end, &max); |
835 | if (error < 0) | 852 | if (error < 0) |
836 | return error; | 853 | return error; |
837 | 854 | ||
@@ -884,10 +901,7 @@ static int ptrace_bts_write_record(struct task_struct *child, | |||
884 | return -EINVAL; | 901 | return -EINVAL; |
885 | } | 902 | } |
886 | 903 | ||
887 | /* The writing task will be the switched-to task on a context | 904 | return ds_write_bts(child->bts, bts_record, bts_cfg.sizeof_bts); |
888 | * switch. It needs to write into the switched-from task's BTS | ||
889 | * buffer. */ | ||
890 | return ds_unchecked_write_bts(child, bts_record, bts_cfg.sizeof_bts); | ||
891 | } | 905 | } |
892 | 906 | ||
893 | void ptrace_bts_take_timestamp(struct task_struct *tsk, | 907 | void ptrace_bts_take_timestamp(struct task_struct *tsk, |
@@ -929,17 +943,16 @@ void __cpuinit ptrace_bts_init_intel(struct cpuinfo_x86 *c) | |||
929 | switch (c->x86) { | 943 | switch (c->x86) { |
930 | case 0x6: | 944 | case 0x6: |
931 | switch (c->x86_model) { | 945 | switch (c->x86_model) { |
946 | case 0 ... 0xC: | ||
947 | /* sorry, don't know about them */ | ||
948 | break; | ||
932 | case 0xD: | 949 | case 0xD: |
933 | case 0xE: /* Pentium M */ | 950 | case 0xE: /* Pentium M */ |
934 | bts_configure(&bts_cfg_pentium_m); | 951 | bts_configure(&bts_cfg_pentium_m); |
935 | break; | 952 | break; |
936 | case 0xF: /* Core2 */ | 953 | default: /* Core2, Atom, ... */ |
937 | case 0x1C: /* Atom */ | ||
938 | bts_configure(&bts_cfg_core2); | 954 | bts_configure(&bts_cfg_core2); |
939 | break; | 955 | break; |
940 | default: | ||
941 | /* sorry, don't know about them */ | ||
942 | break; | ||
943 | } | 956 | } |
944 | break; | 957 | break; |
945 | case 0xF: | 958 | case 0xF: |
@@ -973,13 +986,17 @@ void ptrace_disable(struct task_struct *child) | |||
973 | clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); | 986 | clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); |
974 | #endif | 987 | #endif |
975 | #ifdef CONFIG_X86_PTRACE_BTS | 988 | #ifdef CONFIG_X86_PTRACE_BTS |
976 | (void)ds_release_bts(child); | 989 | if (child->bts) { |
990 | (void)ds_release_bts(child->bts); | ||
991 | kfree(child->bts_buffer); | ||
992 | child->bts_buffer = NULL; | ||
977 | 993 | ||
978 | child->thread.debugctlmsr &= ~bts_cfg.debugctl_mask; | 994 | child->thread.debugctlmsr &= ~bts_cfg.debugctl_mask; |
979 | if (!child->thread.debugctlmsr) | 995 | if (!child->thread.debugctlmsr) |
980 | clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR); | 996 | clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR); |
981 | 997 | ||
982 | clear_tsk_thread_flag(child, TIF_BTS_TRACE_TS); | 998 | clear_tsk_thread_flag(child, TIF_BTS_TRACE_TS); |
999 | } | ||
983 | #endif /* CONFIG_X86_PTRACE_BTS */ | 1000 | #endif /* CONFIG_X86_PTRACE_BTS */ |
984 | } | 1001 | } |
985 | 1002 | ||
@@ -1111,9 +1128,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
1111 | (child, data, (struct ptrace_bts_config __user *)addr); | 1128 | (child, data, (struct ptrace_bts_config __user *)addr); |
1112 | break; | 1129 | break; |
1113 | 1130 | ||
1114 | case PTRACE_BTS_SIZE: | 1131 | case PTRACE_BTS_SIZE: { |
1115 | ret = ds_get_bts_index(child, /* pos = */ NULL); | 1132 | size_t size; |
1133 | |||
1134 | ret = ds_get_bts_index(child->bts, &size); | ||
1135 | if (ret == 0) { | ||
1136 | BUG_ON(size != (int) size); | ||
1137 | ret = (int) size; | ||
1138 | } | ||
1116 | break; | 1139 | break; |
1140 | } | ||
1117 | 1141 | ||
1118 | case PTRACE_BTS_GET: | 1142 | case PTRACE_BTS_GET: |
1119 | ret = ptrace_bts_read_record | 1143 | ret = ptrace_bts_read_record |
@@ -1121,7 +1145,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
1121 | break; | 1145 | break; |
1122 | 1146 | ||
1123 | case PTRACE_BTS_CLEAR: | 1147 | case PTRACE_BTS_CLEAR: |
1124 | ret = ds_clear_bts(child); | 1148 | ret = ds_clear_bts(child->bts); |
1125 | break; | 1149 | break; |
1126 | 1150 | ||
1127 | case PTRACE_BTS_DRAIN: | 1151 | case PTRACE_BTS_DRAIN: |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index c3cd512484e5..ba7b9a0e6063 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -39,7 +39,10 @@ int reboot_force; | |||
39 | static int reboot_cpu = -1; | 39 | static int reboot_cpu = -1; |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | /* reboot=b[ios] | s[mp] | t[riple] | k[bd] | e[fi] [, [w]arm | [c]old] | 42 | /* This is set by the PCI code if either type 1 or type 2 PCI is detected */ |
43 | bool port_cf9_safe = false; | ||
44 | |||
45 | /* reboot=b[ios] | s[mp] | t[riple] | k[bd] | e[fi] [, [w]arm | [c]old] | p[ci] | ||
43 | warm Don't set the cold reboot flag | 46 | warm Don't set the cold reboot flag |
44 | cold Set the cold reboot flag | 47 | cold Set the cold reboot flag |
45 | bios Reboot by jumping through the BIOS (only for X86_32) | 48 | bios Reboot by jumping through the BIOS (only for X86_32) |
@@ -48,6 +51,7 @@ static int reboot_cpu = -1; | |||
48 | kbd Use the keyboard controller. cold reset (default) | 51 | kbd Use the keyboard controller. cold reset (default) |
49 | acpi Use the RESET_REG in the FADT | 52 | acpi Use the RESET_REG in the FADT |
50 | efi Use efi reset_system runtime service | 53 | efi Use efi reset_system runtime service |
54 | pci Use the so-called "PCI reset register", CF9 | ||
51 | force Avoid anything that could hang. | 55 | force Avoid anything that could hang. |
52 | */ | 56 | */ |
53 | static int __init reboot_setup(char *str) | 57 | static int __init reboot_setup(char *str) |
@@ -82,6 +86,7 @@ static int __init reboot_setup(char *str) | |||
82 | case 'k': | 86 | case 'k': |
83 | case 't': | 87 | case 't': |
84 | case 'e': | 88 | case 'e': |
89 | case 'p': | ||
85 | reboot_type = *str; | 90 | reboot_type = *str; |
86 | break; | 91 | break; |
87 | 92 | ||
@@ -172,6 +177,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
172 | DMI_MATCH(DMI_BOARD_NAME, "0KW626"), | 177 | DMI_MATCH(DMI_BOARD_NAME, "0KW626"), |
173 | }, | 178 | }, |
174 | }, | 179 | }, |
180 | { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */ | ||
181 | .callback = set_bios_reboot, | ||
182 | .ident = "Dell OptiPlex 330", | ||
183 | .matches = { | ||
184 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
185 | DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 330"), | ||
186 | DMI_MATCH(DMI_BOARD_NAME, "0KP561"), | ||
187 | }, | ||
188 | }, | ||
175 | { /* Handle problems with rebooting on Dell 2400's */ | 189 | { /* Handle problems with rebooting on Dell 2400's */ |
176 | .callback = set_bios_reboot, | 190 | .callback = set_bios_reboot, |
177 | .ident = "Dell PowerEdge 2400", | 191 | .ident = "Dell PowerEdge 2400", |
@@ -398,12 +412,27 @@ static void native_machine_emergency_restart(void) | |||
398 | reboot_type = BOOT_KBD; | 412 | reboot_type = BOOT_KBD; |
399 | break; | 413 | break; |
400 | 414 | ||
401 | |||
402 | case BOOT_EFI: | 415 | case BOOT_EFI: |
403 | if (efi_enabled) | 416 | if (efi_enabled) |
404 | efi.reset_system(reboot_mode ? EFI_RESET_WARM : EFI_RESET_COLD, | 417 | efi.reset_system(reboot_mode ? |
418 | EFI_RESET_WARM : | ||
419 | EFI_RESET_COLD, | ||
405 | EFI_SUCCESS, 0, NULL); | 420 | EFI_SUCCESS, 0, NULL); |
421 | reboot_type = BOOT_KBD; | ||
422 | break; | ||
406 | 423 | ||
424 | case BOOT_CF9: | ||
425 | port_cf9_safe = true; | ||
426 | /* fall through */ | ||
427 | |||
428 | case BOOT_CF9_COND: | ||
429 | if (port_cf9_safe) { | ||
430 | u8 cf9 = inb(0xcf9) & ~6; | ||
431 | outb(cf9|2, 0xcf9); /* Request hard reset */ | ||
432 | udelay(50); | ||
433 | outb(cf9|6, 0xcf9); /* Actually do the reset */ | ||
434 | udelay(50); | ||
435 | } | ||
407 | reboot_type = BOOT_KBD; | 436 | reboot_type = BOOT_KBD; |
408 | break; | 437 | break; |
409 | } | 438 | } |
@@ -464,6 +493,11 @@ static void native_machine_restart(char *__unused) | |||
464 | 493 | ||
465 | static void native_machine_halt(void) | 494 | static void native_machine_halt(void) |
466 | { | 495 | { |
496 | /* stop other cpus and apics */ | ||
497 | machine_shutdown(); | ||
498 | |||
499 | /* stop this cpu */ | ||
500 | stop_this_cpu(NULL); | ||
467 | } | 501 | } |
468 | 502 | ||
469 | static void native_machine_power_off(void) | 503 | static void native_machine_power_off(void) |
@@ -558,10 +592,7 @@ static int crash_nmi_callback(struct notifier_block *self, | |||
558 | 592 | ||
559 | static void smp_send_nmi_allbutself(void) | 593 | static void smp_send_nmi_allbutself(void) |
560 | { | 594 | { |
561 | cpumask_t mask = cpu_online_map; | 595 | send_IPI_allbutself(NMI_VECTOR); |
562 | cpu_clear(safe_smp_processor_id(), mask); | ||
563 | if (!cpus_empty(mask)) | ||
564 | send_IPI_mask(mask, NMI_VECTOR); | ||
565 | } | 596 | } |
566 | 597 | ||
567 | static struct notifier_block crash_nmi_nb = { | 598 | static struct notifier_block crash_nmi_nb = { |
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0fa6790c1dd3..32fe42f26e79 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -583,7 +583,20 @@ static int __init setup_elfcorehdr(char *arg) | |||
583 | early_param("elfcorehdr", setup_elfcorehdr); | 583 | early_param("elfcorehdr", setup_elfcorehdr); |
584 | #endif | 584 | #endif |
585 | 585 | ||
586 | static struct x86_quirks default_x86_quirks __initdata; | 586 | static int __init default_update_genapic(void) |
587 | { | ||
588 | #ifdef CONFIG_X86_SMP | ||
589 | # if defined(CONFIG_X86_GENERICARCH) || defined(CONFIG_X86_64) | ||
590 | genapic->wakeup_cpu = wakeup_secondary_cpu_via_init; | ||
591 | # endif | ||
592 | #endif | ||
593 | |||
594 | return 0; | ||
595 | } | ||
596 | |||
597 | static struct x86_quirks default_x86_quirks __initdata = { | ||
598 | .update_genapic = default_update_genapic, | ||
599 | }; | ||
587 | 600 | ||
588 | struct x86_quirks *x86_quirks __initdata = &default_x86_quirks; | 601 | struct x86_quirks *x86_quirks __initdata = &default_x86_quirks; |
589 | 602 | ||
@@ -764,7 +777,7 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { | |||
764 | .callback = dmi_low_memory_corruption, | 777 | .callback = dmi_low_memory_corruption, |
765 | .ident = "Phoenix BIOS", | 778 | .ident = "Phoenix BIOS", |
766 | .matches = { | 779 | .matches = { |
767 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), | 780 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies"), |
768 | }, | 781 | }, |
769 | }, | 782 | }, |
770 | #endif | 783 | #endif |
@@ -794,6 +807,9 @@ void __init setup_arch(char **cmdline_p) | |||
794 | printk(KERN_INFO "Command line: %s\n", boot_command_line); | 807 | printk(KERN_INFO "Command line: %s\n", boot_command_line); |
795 | #endif | 808 | #endif |
796 | 809 | ||
810 | /* VMI may relocate the fixmap; do this before touching ioremap area */ | ||
811 | vmi_init(); | ||
812 | |||
797 | early_cpu_init(); | 813 | early_cpu_init(); |
798 | early_ioremap_init(); | 814 | early_ioremap_init(); |
799 | 815 | ||
@@ -880,13 +896,8 @@ void __init setup_arch(char **cmdline_p) | |||
880 | check_efer(); | 896 | check_efer(); |
881 | #endif | 897 | #endif |
882 | 898 | ||
883 | #if defined(CONFIG_VMI) && defined(CONFIG_X86_32) | 899 | /* Must be before kernel pagetables are setup */ |
884 | /* | 900 | vmi_activate(); |
885 | * Must be before kernel pagetables are setup | ||
886 | * or fixmap area is touched. | ||
887 | */ | ||
888 | vmi_init(); | ||
889 | #endif | ||
890 | 901 | ||
891 | /* after early param, so could get panic from serial */ | 902 | /* after early param, so could get panic from serial */ |
892 | reserve_early_setup_data(); | 903 | reserve_early_setup_data(); |
@@ -1082,7 +1093,7 @@ void __init setup_arch(char **cmdline_p) | |||
1082 | ioapic_init_mappings(); | 1093 | ioapic_init_mappings(); |
1083 | 1094 | ||
1084 | /* need to wait for io_apic is mapped */ | 1095 | /* need to wait for io_apic is mapped */ |
1085 | nr_irqs = probe_nr_irqs(); | 1096 | probe_nr_irqs_gsi(); |
1086 | 1097 | ||
1087 | kvm_guest_init(); | 1098 | kvm_guest_init(); |
1088 | 1099 | ||
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index ae0c0d3bb770..0b63b08e7530 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
@@ -152,6 +152,11 @@ void __init setup_per_cpu_areas(void) | |||
152 | old_size = PERCPU_ENOUGH_ROOM; | 152 | old_size = PERCPU_ENOUGH_ROOM; |
153 | align = max_t(unsigned long, PAGE_SIZE, align); | 153 | align = max_t(unsigned long, PAGE_SIZE, align); |
154 | size = roundup(old_size, align); | 154 | size = roundup(old_size, align); |
155 | |||
156 | printk(KERN_INFO | ||
157 | "NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n", | ||
158 | NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids); | ||
159 | |||
155 | printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n", | 160 | printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n", |
156 | size); | 161 | size); |
157 | 162 | ||
@@ -168,24 +173,24 @@ void __init setup_per_cpu_areas(void) | |||
168 | "cpu %d has no node %d or node-local memory\n", | 173 | "cpu %d has no node %d or node-local memory\n", |
169 | cpu, node); | 174 | cpu, node); |
170 | if (ptr) | 175 | if (ptr) |
171 | printk(KERN_DEBUG "per cpu data for cpu%d at %016lx\n", | 176 | printk(KERN_DEBUG |
177 | "per cpu data for cpu%d at %016lx\n", | ||
172 | cpu, __pa(ptr)); | 178 | cpu, __pa(ptr)); |
173 | } | 179 | } |
174 | else { | 180 | else { |
175 | ptr = __alloc_bootmem_node(NODE_DATA(node), size, align, | 181 | ptr = __alloc_bootmem_node(NODE_DATA(node), size, align, |
176 | __pa(MAX_DMA_ADDRESS)); | 182 | __pa(MAX_DMA_ADDRESS)); |
177 | if (ptr) | 183 | if (ptr) |
178 | printk(KERN_DEBUG "per cpu data for cpu%d on node%d at %016lx\n", | 184 | printk(KERN_DEBUG |
179 | cpu, node, __pa(ptr)); | 185 | "per cpu data for cpu%d on node%d " |
186 | "at %016lx\n", | ||
187 | cpu, node, __pa(ptr)); | ||
180 | } | 188 | } |
181 | #endif | 189 | #endif |
182 | per_cpu_offset(cpu) = ptr - __per_cpu_start; | 190 | per_cpu_offset(cpu) = ptr - __per_cpu_start; |
183 | memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start); | 191 | memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start); |
184 | } | 192 | } |
185 | 193 | ||
186 | printk(KERN_DEBUG "NR_CPUS: %d, nr_cpu_ids: %d, nr_node_ids %d\n", | ||
187 | NR_CPUS, nr_cpu_ids, nr_node_ids); | ||
188 | |||
189 | /* Setup percpu data maps */ | 194 | /* Setup percpu data maps */ |
190 | setup_per_cpu_maps(); | 195 | setup_per_cpu_maps(); |
191 | 196 | ||
@@ -282,7 +287,7 @@ static void __cpuinit numa_set_cpumask(int cpu, int enable) | |||
282 | else | 287 | else |
283 | cpu_clear(cpu, *mask); | 288 | cpu_clear(cpu, *mask); |
284 | 289 | ||
285 | cpulist_scnprintf(buf, sizeof(buf), *mask); | 290 | cpulist_scnprintf(buf, sizeof(buf), mask); |
286 | printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", | 291 | printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", |
287 | enable? "numa_add_cpu":"numa_remove_cpu", cpu, node, buf); | 292 | enable? "numa_add_cpu":"numa_remove_cpu", cpu, node, buf); |
288 | } | 293 | } |
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index 18f9b19f5f8f..49ed667b06f3 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c | |||
@@ -118,41 +118,28 @@ static void native_smp_send_reschedule(int cpu) | |||
118 | WARN_ON(1); | 118 | WARN_ON(1); |
119 | return; | 119 | return; |
120 | } | 120 | } |
121 | send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR); | 121 | send_IPI_mask(cpumask_of(cpu), RESCHEDULE_VECTOR); |
122 | } | 122 | } |
123 | 123 | ||
124 | void native_send_call_func_single_ipi(int cpu) | 124 | void native_send_call_func_single_ipi(int cpu) |
125 | { | 125 | { |
126 | send_IPI_mask(cpumask_of_cpu(cpu), CALL_FUNCTION_SINGLE_VECTOR); | 126 | send_IPI_mask(cpumask_of(cpu), CALL_FUNCTION_SINGLE_VECTOR); |
127 | } | 127 | } |
128 | 128 | ||
129 | void native_send_call_func_ipi(cpumask_t mask) | 129 | void native_send_call_func_ipi(const struct cpumask *mask) |
130 | { | 130 | { |
131 | cpumask_t allbutself; | 131 | cpumask_t allbutself; |
132 | 132 | ||
133 | allbutself = cpu_online_map; | 133 | allbutself = cpu_online_map; |
134 | cpu_clear(smp_processor_id(), allbutself); | 134 | cpu_clear(smp_processor_id(), allbutself); |
135 | 135 | ||
136 | if (cpus_equal(mask, allbutself) && | 136 | if (cpus_equal(*mask, allbutself) && |
137 | cpus_equal(cpu_online_map, cpu_callout_map)) | 137 | cpus_equal(cpu_online_map, cpu_callout_map)) |
138 | send_IPI_allbutself(CALL_FUNCTION_VECTOR); | 138 | send_IPI_allbutself(CALL_FUNCTION_VECTOR); |
139 | else | 139 | else |
140 | send_IPI_mask(mask, CALL_FUNCTION_VECTOR); | 140 | send_IPI_mask(mask, CALL_FUNCTION_VECTOR); |
141 | } | 141 | } |
142 | 142 | ||
143 | static void stop_this_cpu(void *dummy) | ||
144 | { | ||
145 | local_irq_disable(); | ||
146 | /* | ||
147 | * Remove this CPU: | ||
148 | */ | ||
149 | cpu_clear(smp_processor_id(), cpu_online_map); | ||
150 | disable_local_APIC(); | ||
151 | if (hlt_works(smp_processor_id())) | ||
152 | for (;;) halt(); | ||
153 | for (;;); | ||
154 | } | ||
155 | |||
156 | /* | 143 | /* |
157 | * this function calls the 'stop' function on all other CPUs in the system. | 144 | * this function calls the 'stop' function on all other CPUs in the system. |
158 | */ | 145 | */ |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 7b1093397319..be9466788043 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -62,6 +62,7 @@ | |||
62 | #include <asm/mtrr.h> | 62 | #include <asm/mtrr.h> |
63 | #include <asm/vmi.h> | 63 | #include <asm/vmi.h> |
64 | #include <asm/genapic.h> | 64 | #include <asm/genapic.h> |
65 | #include <asm/setup.h> | ||
65 | #include <linux/mc146818rtc.h> | 66 | #include <linux/mc146818rtc.h> |
66 | 67 | ||
67 | #include <mach_apic.h> | 68 | #include <mach_apic.h> |
@@ -101,14 +102,8 @@ EXPORT_SYMBOL(smp_num_siblings); | |||
101 | /* Last level cache ID of each logical CPU */ | 102 | /* Last level cache ID of each logical CPU */ |
102 | DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID; | 103 | DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID; |
103 | 104 | ||
104 | /* bitmap of online cpus */ | ||
105 | cpumask_t cpu_online_map __read_mostly; | ||
106 | EXPORT_SYMBOL(cpu_online_map); | ||
107 | |||
108 | cpumask_t cpu_callin_map; | 105 | cpumask_t cpu_callin_map; |
109 | cpumask_t cpu_callout_map; | 106 | cpumask_t cpu_callout_map; |
110 | cpumask_t cpu_possible_map; | ||
111 | EXPORT_SYMBOL(cpu_possible_map); | ||
112 | 107 | ||
113 | /* representing HT siblings of each logical CPU */ | 108 | /* representing HT siblings of each logical CPU */ |
114 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map); | 109 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map); |
@@ -294,9 +289,7 @@ static void __cpuinit start_secondary(void *unused) | |||
294 | * fragile that we want to limit the things done here to the | 289 | * fragile that we want to limit the things done here to the |
295 | * most necessary things. | 290 | * most necessary things. |
296 | */ | 291 | */ |
297 | #ifdef CONFIG_VMI | ||
298 | vmi_bringup(); | 292 | vmi_bringup(); |
299 | #endif | ||
300 | cpu_init(); | 293 | cpu_init(); |
301 | preempt_disable(); | 294 | preempt_disable(); |
302 | smp_callin(); | 295 | smp_callin(); |
@@ -536,7 +529,7 @@ static void impress_friends(void) | |||
536 | pr_debug("Before bogocount - setting activated=1.\n"); | 529 | pr_debug("Before bogocount - setting activated=1.\n"); |
537 | } | 530 | } |
538 | 531 | ||
539 | static inline void __inquire_remote_apic(int apicid) | 532 | void __inquire_remote_apic(int apicid) |
540 | { | 533 | { |
541 | unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 }; | 534 | unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 }; |
542 | char *names[] = { "ID", "VERSION", "SPIV" }; | 535 | char *names[] = { "ID", "VERSION", "SPIV" }; |
@@ -575,14 +568,13 @@ static inline void __inquire_remote_apic(int apicid) | |||
575 | } | 568 | } |
576 | } | 569 | } |
577 | 570 | ||
578 | #ifdef WAKE_SECONDARY_VIA_NMI | ||
579 | /* | 571 | /* |
580 | * Poke the other CPU in the eye via NMI to wake it up. Remember that the normal | 572 | * Poke the other CPU in the eye via NMI to wake it up. Remember that the normal |
581 | * INIT, INIT, STARTUP sequence will reset the chip hard for us, and this | 573 | * INIT, INIT, STARTUP sequence will reset the chip hard for us, and this |
582 | * won't ... remember to clear down the APIC, etc later. | 574 | * won't ... remember to clear down the APIC, etc later. |
583 | */ | 575 | */ |
584 | static int __devinit | 576 | int __devinit |
585 | wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) | 577 | wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip) |
586 | { | 578 | { |
587 | unsigned long send_status, accept_status = 0; | 579 | unsigned long send_status, accept_status = 0; |
588 | int maxlvt; | 580 | int maxlvt; |
@@ -599,7 +591,7 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) | |||
599 | * Give the other CPU some time to accept the IPI. | 591 | * Give the other CPU some time to accept the IPI. |
600 | */ | 592 | */ |
601 | udelay(200); | 593 | udelay(200); |
602 | if (APIC_INTEGRATED(apic_version[phys_apicid])) { | 594 | if (APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) { |
603 | maxlvt = lapic_get_maxlvt(); | 595 | maxlvt = lapic_get_maxlvt(); |
604 | if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ | 596 | if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ |
605 | apic_write(APIC_ESR, 0); | 597 | apic_write(APIC_ESR, 0); |
@@ -614,11 +606,9 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) | |||
614 | 606 | ||
615 | return (send_status | accept_status); | 607 | return (send_status | accept_status); |
616 | } | 608 | } |
617 | #endif /* WAKE_SECONDARY_VIA_NMI */ | ||
618 | 609 | ||
619 | #ifdef WAKE_SECONDARY_VIA_INIT | 610 | int __devinit |
620 | static int __devinit | 611 | wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip) |
621 | wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) | ||
622 | { | 612 | { |
623 | unsigned long send_status, accept_status = 0; | 613 | unsigned long send_status, accept_status = 0; |
624 | int maxlvt, num_starts, j; | 614 | int maxlvt, num_starts, j; |
@@ -737,7 +727,6 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) | |||
737 | 727 | ||
738 | return (send_status | accept_status); | 728 | return (send_status | accept_status); |
739 | } | 729 | } |
740 | #endif /* WAKE_SECONDARY_VIA_INIT */ | ||
741 | 730 | ||
742 | struct create_idle { | 731 | struct create_idle { |
743 | struct work_struct work; | 732 | struct work_struct work; |
@@ -1355,7 +1344,7 @@ void cpu_disable_common(void) | |||
1355 | lock_vector_lock(); | 1344 | lock_vector_lock(); |
1356 | remove_cpu_from_maps(cpu); | 1345 | remove_cpu_from_maps(cpu); |
1357 | unlock_vector_lock(); | 1346 | unlock_vector_lock(); |
1358 | fixup_irqs(cpu_online_map); | 1347 | fixup_irqs(); |
1359 | } | 1348 | } |
1360 | 1349 | ||
1361 | int native_cpu_disable(void) | 1350 | int native_cpu_disable(void) |
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c index a03e7f6d90c3..10786af95545 100644 --- a/arch/x86/kernel/stacktrace.c +++ b/arch/x86/kernel/stacktrace.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
7 | #include <linux/stacktrace.h> | 7 | #include <linux/stacktrace.h> |
8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
9 | #include <linux/uaccess.h> | ||
9 | #include <asm/stacktrace.h> | 10 | #include <asm/stacktrace.h> |
10 | 11 | ||
11 | static void save_stack_warning(void *data, char *msg) | 12 | static void save_stack_warning(void *data, char *msg) |
@@ -83,3 +84,66 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) | |||
83 | trace->entries[trace->nr_entries++] = ULONG_MAX; | 84 | trace->entries[trace->nr_entries++] = ULONG_MAX; |
84 | } | 85 | } |
85 | EXPORT_SYMBOL_GPL(save_stack_trace_tsk); | 86 | EXPORT_SYMBOL_GPL(save_stack_trace_tsk); |
87 | |||
88 | /* Userspace stacktrace - based on kernel/trace/trace_sysprof.c */ | ||
89 | |||
90 | struct stack_frame { | ||
91 | const void __user *next_fp; | ||
92 | unsigned long ret_addr; | ||
93 | }; | ||
94 | |||
95 | static int copy_stack_frame(const void __user *fp, struct stack_frame *frame) | ||
96 | { | ||
97 | int ret; | ||
98 | |||
99 | if (!access_ok(VERIFY_READ, fp, sizeof(*frame))) | ||
100 | return 0; | ||
101 | |||
102 | ret = 1; | ||
103 | pagefault_disable(); | ||
104 | if (__copy_from_user_inatomic(frame, fp, sizeof(*frame))) | ||
105 | ret = 0; | ||
106 | pagefault_enable(); | ||
107 | |||
108 | return ret; | ||
109 | } | ||
110 | |||
111 | static inline void __save_stack_trace_user(struct stack_trace *trace) | ||
112 | { | ||
113 | const struct pt_regs *regs = task_pt_regs(current); | ||
114 | const void __user *fp = (const void __user *)regs->bp; | ||
115 | |||
116 | if (trace->nr_entries < trace->max_entries) | ||
117 | trace->entries[trace->nr_entries++] = regs->ip; | ||
118 | |||
119 | while (trace->nr_entries < trace->max_entries) { | ||
120 | struct stack_frame frame; | ||
121 | |||
122 | frame.next_fp = NULL; | ||
123 | frame.ret_addr = 0; | ||
124 | if (!copy_stack_frame(fp, &frame)) | ||
125 | break; | ||
126 | if ((unsigned long)fp < regs->sp) | ||
127 | break; | ||
128 | if (frame.ret_addr) { | ||
129 | trace->entries[trace->nr_entries++] = | ||
130 | frame.ret_addr; | ||
131 | } | ||
132 | if (fp == frame.next_fp) | ||
133 | break; | ||
134 | fp = frame.next_fp; | ||
135 | } | ||
136 | } | ||
137 | |||
138 | void save_stack_trace_user(struct stack_trace *trace) | ||
139 | { | ||
140 | /* | ||
141 | * Trace user stack if we are not a kernel thread | ||
142 | */ | ||
143 | if (current->mm) { | ||
144 | __save_stack_trace_user(trace); | ||
145 | } | ||
146 | if (trace->nr_entries < trace->max_entries) | ||
147 | trace->entries[trace->nr_entries++] = ULONG_MAX; | ||
148 | } | ||
149 | |||
diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c index f4049f3513b6..174ea90d1cbd 100644 --- a/arch/x86/kernel/tlb_32.c +++ b/arch/x86/kernel/tlb_32.c | |||
@@ -164,7 +164,7 @@ void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm, | |||
164 | * We have to send the IPI only to | 164 | * We have to send the IPI only to |
165 | * CPUs affected. | 165 | * CPUs affected. |
166 | */ | 166 | */ |
167 | send_IPI_mask(cpumask, INVALIDATE_TLB_VECTOR); | 167 | send_IPI_mask(&cpumask, INVALIDATE_TLB_VECTOR); |
168 | 168 | ||
169 | while (!cpus_empty(flush_cpumask)) | 169 | while (!cpus_empty(flush_cpumask)) |
170 | /* nothing. lockup detection does not belong here */ | 170 | /* nothing. lockup detection does not belong here */ |
diff --git a/arch/x86/kernel/tlb_64.c b/arch/x86/kernel/tlb_64.c index 8f919ca69494..de6f1bda0c50 100644 --- a/arch/x86/kernel/tlb_64.c +++ b/arch/x86/kernel/tlb_64.c | |||
@@ -191,7 +191,7 @@ void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm, | |||
191 | * We have to send the IPI only to | 191 | * We have to send the IPI only to |
192 | * CPUs affected. | 192 | * CPUs affected. |
193 | */ | 193 | */ |
194 | send_IPI_mask(cpumask, INVALIDATE_TLB_VECTOR_START + sender); | 194 | send_IPI_mask(&cpumask, INVALIDATE_TLB_VECTOR_START + sender); |
195 | 195 | ||
196 | while (!cpus_empty(f->flush_cpumask)) | 196 | while (!cpus_empty(f->flush_cpumask)) |
197 | cpu_relax(); | 197 | cpu_relax(); |
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index 9ffb01c31c40..1c0dfbca87c1 100644 --- a/arch/x86/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c | |||
@@ -46,7 +46,9 @@ static __cpuinit void check_tsc_warp(void) | |||
46 | cycles_t start, now, prev, end; | 46 | cycles_t start, now, prev, end; |
47 | int i; | 47 | int i; |
48 | 48 | ||
49 | rdtsc_barrier(); | ||
49 | start = get_cycles(); | 50 | start = get_cycles(); |
51 | rdtsc_barrier(); | ||
50 | /* | 52 | /* |
51 | * The measurement runs for 20 msecs: | 53 | * The measurement runs for 20 msecs: |
52 | */ | 54 | */ |
@@ -61,7 +63,9 @@ static __cpuinit void check_tsc_warp(void) | |||
61 | */ | 63 | */ |
62 | __raw_spin_lock(&sync_lock); | 64 | __raw_spin_lock(&sync_lock); |
63 | prev = last_tsc; | 65 | prev = last_tsc; |
66 | rdtsc_barrier(); | ||
64 | now = get_cycles(); | 67 | now = get_cycles(); |
68 | rdtsc_barrier(); | ||
65 | last_tsc = now; | 69 | last_tsc = now; |
66 | __raw_spin_unlock(&sync_lock); | 70 | __raw_spin_unlock(&sync_lock); |
67 | 71 | ||
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index 8b6c393ab9fd..22fd6577156a 100644 --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c | |||
@@ -960,8 +960,6 @@ static inline int __init activate_vmi(void) | |||
960 | 960 | ||
961 | void __init vmi_init(void) | 961 | void __init vmi_init(void) |
962 | { | 962 | { |
963 | unsigned long flags; | ||
964 | |||
965 | if (!vmi_rom) | 963 | if (!vmi_rom) |
966 | probe_vmi_rom(); | 964 | probe_vmi_rom(); |
967 | else | 965 | else |
@@ -973,13 +971,21 @@ void __init vmi_init(void) | |||
973 | 971 | ||
974 | reserve_top_address(-vmi_rom->virtual_top); | 972 | reserve_top_address(-vmi_rom->virtual_top); |
975 | 973 | ||
976 | local_irq_save(flags); | ||
977 | activate_vmi(); | ||
978 | |||
979 | #ifdef CONFIG_X86_IO_APIC | 974 | #ifdef CONFIG_X86_IO_APIC |
980 | /* This is virtual hardware; timer routing is wired correctly */ | 975 | /* This is virtual hardware; timer routing is wired correctly */ |
981 | no_timer_check = 1; | 976 | no_timer_check = 1; |
982 | #endif | 977 | #endif |
978 | } | ||
979 | |||
980 | void vmi_activate(void) | ||
981 | { | ||
982 | unsigned long flags; | ||
983 | |||
984 | if (!vmi_rom) | ||
985 | return; | ||
986 | |||
987 | local_irq_save(flags); | ||
988 | activate_vmi(); | ||
983 | local_irq_restore(flags & X86_EFLAGS_IF); | 989 | local_irq_restore(flags & X86_EFLAGS_IF); |
984 | } | 990 | } |
985 | 991 | ||
diff --git a/arch/x86/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c index 254ee07f8635..c4c1f9e09402 100644 --- a/arch/x86/kernel/vmiclock_32.c +++ b/arch/x86/kernel/vmiclock_32.c | |||
@@ -226,7 +226,7 @@ static void __devinit vmi_time_init_clockevent(void) | |||
226 | /* Upper bound is clockevent's use of ulong for cycle deltas. */ | 226 | /* Upper bound is clockevent's use of ulong for cycle deltas. */ |
227 | evt->max_delta_ns = clockevent_delta2ns(ULONG_MAX, evt); | 227 | evt->max_delta_ns = clockevent_delta2ns(ULONG_MAX, evt); |
228 | evt->min_delta_ns = clockevent_delta2ns(1, evt); | 228 | evt->min_delta_ns = clockevent_delta2ns(1, evt); |
229 | evt->cpumask = cpumask_of_cpu(cpu); | 229 | evt->cpumask = cpumask_of(cpu); |
230 | 230 | ||
231 | printk(KERN_WARNING "vmi: registering clock event %s. mult=%lu shift=%u\n", | 231 | printk(KERN_WARNING "vmi: registering clock event %s. mult=%lu shift=%u\n", |
232 | evt->name, evt->mult, evt->shift); | 232 | evt->name, evt->mult, evt->shift); |
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 0b8b6690a86d..6f3d3d4cd973 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
@@ -17,6 +17,9 @@ | |||
17 | * want per guest time just set the kernel.vsyscall64 sysctl to 0. | 17 | * want per guest time just set the kernel.vsyscall64 sysctl to 0. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | /* Disable profiling for userspace code: */ | ||
21 | #define DISABLE_BRANCH_PROFILING | ||
22 | |||
20 | #include <linux/time.h> | 23 | #include <linux/time.h> |
21 | #include <linux/init.h> | 24 | #include <linux/init.h> |
22 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c index b13acb75e822..15c3e6999182 100644 --- a/arch/x86/kernel/xsave.c +++ b/arch/x86/kernel/xsave.c | |||
@@ -310,7 +310,7 @@ static void __init setup_xstate_init(void) | |||
310 | /* | 310 | /* |
311 | * Enable and initialize the xsave feature. | 311 | * Enable and initialize the xsave feature. |
312 | */ | 312 | */ |
313 | void __init xsave_cntxt_init(void) | 313 | void __ref xsave_cntxt_init(void) |
314 | { | 314 | { |
315 | unsigned int eax, ebx, ecx, edx; | 315 | unsigned int eax, ebx, ecx, edx; |
316 | 316 | ||
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index ce3251ce5504..b81125f0bdee 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig | |||
@@ -20,6 +20,8 @@ if VIRTUALIZATION | |||
20 | config KVM | 20 | config KVM |
21 | tristate "Kernel-based Virtual Machine (KVM) support" | 21 | tristate "Kernel-based Virtual Machine (KVM) support" |
22 | depends on HAVE_KVM | 22 | depends on HAVE_KVM |
23 | # for device assignment: | ||
24 | depends on PCI | ||
23 | select PREEMPT_NOTIFIERS | 25 | select PREEMPT_NOTIFIERS |
24 | select MMU_NOTIFIER | 26 | select MMU_NOTIFIER |
25 | select ANON_INODES | 27 | select ANON_INODES |
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 8772dc946823..59ebd37ad79e 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
@@ -548,8 +548,10 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm) | |||
548 | mutex_lock(&kvm->lock); | 548 | mutex_lock(&kvm->lock); |
549 | pit->irq_source_id = kvm_request_irq_source_id(kvm); | 549 | pit->irq_source_id = kvm_request_irq_source_id(kvm); |
550 | mutex_unlock(&kvm->lock); | 550 | mutex_unlock(&kvm->lock); |
551 | if (pit->irq_source_id < 0) | 551 | if (pit->irq_source_id < 0) { |
552 | kfree(pit); | ||
552 | return NULL; | 553 | return NULL; |
554 | } | ||
553 | 555 | ||
554 | mutex_init(&pit->pit_state.lock); | 556 | mutex_init(&pit->pit_state.lock); |
555 | mutex_lock(&pit->pit_state.lock); | 557 | mutex_lock(&pit->pit_state.lock); |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 2a5e64881d9b..410ddbc1aa2e 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -314,7 +314,7 @@ static int mmu_topup_memory_caches(struct kvm_vcpu *vcpu) | |||
314 | if (r) | 314 | if (r) |
315 | goto out; | 315 | goto out; |
316 | r = mmu_topup_memory_cache(&vcpu->arch.mmu_rmap_desc_cache, | 316 | r = mmu_topup_memory_cache(&vcpu->arch.mmu_rmap_desc_cache, |
317 | rmap_desc_cache, 1); | 317 | rmap_desc_cache, 4); |
318 | if (r) | 318 | if (r) |
319 | goto out; | 319 | goto out; |
320 | r = mmu_topup_memory_cache_page(&vcpu->arch.mmu_page_cache, 8); | 320 | r = mmu_topup_memory_cache_page(&vcpu->arch.mmu_page_cache, 8); |
@@ -1038,13 +1038,13 @@ static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) | |||
1038 | } | 1038 | } |
1039 | 1039 | ||
1040 | rmap_write_protect(vcpu->kvm, sp->gfn); | 1040 | rmap_write_protect(vcpu->kvm, sp->gfn); |
1041 | kvm_unlink_unsync_page(vcpu->kvm, sp); | ||
1041 | if (vcpu->arch.mmu.sync_page(vcpu, sp)) { | 1042 | if (vcpu->arch.mmu.sync_page(vcpu, sp)) { |
1042 | kvm_mmu_zap_page(vcpu->kvm, sp); | 1043 | kvm_mmu_zap_page(vcpu->kvm, sp); |
1043 | return 1; | 1044 | return 1; |
1044 | } | 1045 | } |
1045 | 1046 | ||
1046 | kvm_mmu_flush_tlb(vcpu); | 1047 | kvm_mmu_flush_tlb(vcpu); |
1047 | kvm_unlink_unsync_page(vcpu->kvm, sp); | ||
1048 | return 0; | 1048 | return 0; |
1049 | } | 1049 | } |
1050 | 1050 | ||
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 613ec9aa674a..84eee43bbe74 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
@@ -331,6 +331,7 @@ static int FNAME(shadow_walk_entry)(struct kvm_shadow_walk *_sw, | |||
331 | r = kvm_read_guest_atomic(vcpu->kvm, gw->pte_gpa[level - 2], | 331 | r = kvm_read_guest_atomic(vcpu->kvm, gw->pte_gpa[level - 2], |
332 | &curr_pte, sizeof(curr_pte)); | 332 | &curr_pte, sizeof(curr_pte)); |
333 | if (r || curr_pte != gw->ptes[level - 2]) { | 333 | if (r || curr_pte != gw->ptes[level - 2]) { |
334 | kvm_mmu_put_page(shadow_page, sptep); | ||
334 | kvm_release_pfn_clean(sw->pfn); | 335 | kvm_release_pfn_clean(sw->pfn); |
335 | sw->sptep = NULL; | 336 | sw->sptep = NULL; |
336 | return 1; | 337 | return 1; |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 2643b430d83a..a4018b01e1f9 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -3149,7 +3149,9 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu) | |||
3149 | 3149 | ||
3150 | if (cpu_has_virtual_nmis()) { | 3150 | if (cpu_has_virtual_nmis()) { |
3151 | if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) { | 3151 | if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) { |
3152 | if (vmx_nmi_enabled(vcpu)) { | 3152 | if (vcpu->arch.interrupt.pending) { |
3153 | enable_nmi_window(vcpu); | ||
3154 | } else if (vmx_nmi_enabled(vcpu)) { | ||
3153 | vcpu->arch.nmi_pending = false; | 3155 | vcpu->arch.nmi_pending = false; |
3154 | vcpu->arch.nmi_injected = true; | 3156 | vcpu->arch.nmi_injected = true; |
3155 | } else { | 3157 | } else { |
@@ -3564,7 +3566,8 @@ static int __init vmx_init(void) | |||
3564 | bypass_guest_pf = 0; | 3566 | bypass_guest_pf = 0; |
3565 | kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK | | 3567 | kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK | |
3566 | VMX_EPT_WRITABLE_MASK | | 3568 | VMX_EPT_WRITABLE_MASK | |
3567 | VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT); | 3569 | VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT | |
3570 | VMX_EPT_IGMT_BIT); | ||
3568 | kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull, | 3571 | kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull, |
3569 | VMX_EPT_EXECUTABLE_MASK); | 3572 | VMX_EPT_EXECUTABLE_MASK); |
3570 | kvm_enable_tdp(); | 3573 | kvm_enable_tdp(); |
diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h index 3e010d21fdd7..ec5edc339da6 100644 --- a/arch/x86/kvm/vmx.h +++ b/arch/x86/kvm/vmx.h | |||
@@ -352,6 +352,7 @@ enum vmcs_field { | |||
352 | #define VMX_EPT_READABLE_MASK 0x1ull | 352 | #define VMX_EPT_READABLE_MASK 0x1ull |
353 | #define VMX_EPT_WRITABLE_MASK 0x2ull | 353 | #define VMX_EPT_WRITABLE_MASK 0x2ull |
354 | #define VMX_EPT_EXECUTABLE_MASK 0x4ull | 354 | #define VMX_EPT_EXECUTABLE_MASK 0x4ull |
355 | #define VMX_EPT_IGMT_BIT (1ull << 6) | ||
355 | 356 | ||
356 | #define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul | 357 | #define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul |
357 | 358 | ||
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index a5d8e1ace1cf..104c8220a383 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -737,7 +737,7 @@ static void lguest_time_init(void) | |||
737 | 737 | ||
738 | /* We can't set cpumask in the initializer: damn C limitations! Set it | 738 | /* We can't set cpumask in the initializer: damn C limitations! Set it |
739 | * here and register our timer device. */ | 739 | * here and register our timer device. */ |
740 | lguest_clockevent.cpumask = cpumask_of_cpu(0); | 740 | lguest_clockevent.cpumask = cpumask_of(0); |
741 | clockevents_register_device(&lguest_clockevent); | 741 | clockevents_register_device(&lguest_clockevent); |
742 | 742 | ||
743 | /* Finally, we unblock the timer interrupt. */ | 743 | /* Finally, we unblock the timer interrupt. */ |
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c index 9e68075544f6..4a20b2f9a381 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c | |||
@@ -39,7 +39,7 @@ static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned lon | |||
39 | #define __do_strncpy_from_user(dst, src, count, res) \ | 39 | #define __do_strncpy_from_user(dst, src, count, res) \ |
40 | do { \ | 40 | do { \ |
41 | int __d0, __d1, __d2; \ | 41 | int __d0, __d1, __d2; \ |
42 | might_sleep(); \ | 42 | might_fault(); \ |
43 | __asm__ __volatile__( \ | 43 | __asm__ __volatile__( \ |
44 | " testl %1,%1\n" \ | 44 | " testl %1,%1\n" \ |
45 | " jz 2f\n" \ | 45 | " jz 2f\n" \ |
@@ -126,7 +126,7 @@ EXPORT_SYMBOL(strncpy_from_user); | |||
126 | #define __do_clear_user(addr,size) \ | 126 | #define __do_clear_user(addr,size) \ |
127 | do { \ | 127 | do { \ |
128 | int __d0; \ | 128 | int __d0; \ |
129 | might_sleep(); \ | 129 | might_fault(); \ |
130 | __asm__ __volatile__( \ | 130 | __asm__ __volatile__( \ |
131 | "0: rep; stosl\n" \ | 131 | "0: rep; stosl\n" \ |
132 | " movl %2,%0\n" \ | 132 | " movl %2,%0\n" \ |
@@ -155,7 +155,7 @@ do { \ | |||
155 | unsigned long | 155 | unsigned long |
156 | clear_user(void __user *to, unsigned long n) | 156 | clear_user(void __user *to, unsigned long n) |
157 | { | 157 | { |
158 | might_sleep(); | 158 | might_fault(); |
159 | if (access_ok(VERIFY_WRITE, to, n)) | 159 | if (access_ok(VERIFY_WRITE, to, n)) |
160 | __do_clear_user(to, n); | 160 | __do_clear_user(to, n); |
161 | return n; | 161 | return n; |
@@ -197,7 +197,7 @@ long strnlen_user(const char __user *s, long n) | |||
197 | unsigned long mask = -__addr_ok(s); | 197 | unsigned long mask = -__addr_ok(s); |
198 | unsigned long res, tmp; | 198 | unsigned long res, tmp; |
199 | 199 | ||
200 | might_sleep(); | 200 | might_fault(); |
201 | 201 | ||
202 | __asm__ __volatile__( | 202 | __asm__ __volatile__( |
203 | " testl %0, %0\n" | 203 | " testl %0, %0\n" |
diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c index f4df6e7c718b..64d6c84e6353 100644 --- a/arch/x86/lib/usercopy_64.c +++ b/arch/x86/lib/usercopy_64.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #define __do_strncpy_from_user(dst,src,count,res) \ | 15 | #define __do_strncpy_from_user(dst,src,count,res) \ |
16 | do { \ | 16 | do { \ |
17 | long __d0, __d1, __d2; \ | 17 | long __d0, __d1, __d2; \ |
18 | might_sleep(); \ | 18 | might_fault(); \ |
19 | __asm__ __volatile__( \ | 19 | __asm__ __volatile__( \ |
20 | " testq %1,%1\n" \ | 20 | " testq %1,%1\n" \ |
21 | " jz 2f\n" \ | 21 | " jz 2f\n" \ |
@@ -64,7 +64,7 @@ EXPORT_SYMBOL(strncpy_from_user); | |||
64 | unsigned long __clear_user(void __user *addr, unsigned long size) | 64 | unsigned long __clear_user(void __user *addr, unsigned long size) |
65 | { | 65 | { |
66 | long __d0; | 66 | long __d0; |
67 | might_sleep(); | 67 | might_fault(); |
68 | /* no memory constraint because it doesn't change any memory gcc knows | 68 | /* no memory constraint because it doesn't change any memory gcc knows |
69 | about */ | 69 | about */ |
70 | asm volatile( | 70 | asm volatile( |
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c index 3c3b471ea496..bc4c7840b2a8 100644 --- a/arch/x86/mach-generic/bigsmp.c +++ b/arch/x86/mach-generic/bigsmp.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <asm/bigsmp/apic.h> | 17 | #include <asm/bigsmp/apic.h> |
18 | #include <asm/bigsmp/ipi.h> | 18 | #include <asm/bigsmp/ipi.h> |
19 | #include <asm/mach-default/mach_mpparse.h> | 19 | #include <asm/mach-default/mach_mpparse.h> |
20 | #include <asm/mach-default/mach_wakecpu.h> | ||
20 | 21 | ||
21 | static int dmi_bigsmp; /* can be set by dmi scanners */ | 22 | static int dmi_bigsmp; /* can be set by dmi scanners */ |
22 | 23 | ||
@@ -41,9 +42,10 @@ static const struct dmi_system_id bigsmp_dmi_table[] = { | |||
41 | { } | 42 | { } |
42 | }; | 43 | }; |
43 | 44 | ||
44 | static cpumask_t vector_allocation_domain(int cpu) | 45 | static void vector_allocation_domain(int cpu, cpumask_t *retmask) |
45 | { | 46 | { |
46 | return cpumask_of_cpu(cpu); | 47 | cpus_clear(*retmask); |
48 | cpu_set(cpu, *retmask); | ||
47 | } | 49 | } |
48 | 50 | ||
49 | static int probe_bigsmp(void) | 51 | static int probe_bigsmp(void) |
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c index 9e835a11a13a..e63a4a76d8cd 100644 --- a/arch/x86/mach-generic/default.c +++ b/arch/x86/mach-generic/default.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <asm/mach-default/mach_apic.h> | 16 | #include <asm/mach-default/mach_apic.h> |
17 | #include <asm/mach-default/mach_ipi.h> | 17 | #include <asm/mach-default/mach_ipi.h> |
18 | #include <asm/mach-default/mach_mpparse.h> | 18 | #include <asm/mach-default/mach_mpparse.h> |
19 | #include <asm/mach-default/mach_wakecpu.h> | ||
19 | 20 | ||
20 | /* should be called last. */ | 21 | /* should be called last. */ |
21 | static int probe_default(void) | 22 | static int probe_default(void) |
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c index 28459cab3ddb..4ba5ccaa1584 100644 --- a/arch/x86/mach-generic/es7000.c +++ b/arch/x86/mach-generic/es7000.c | |||
@@ -16,7 +16,19 @@ | |||
16 | #include <asm/es7000/apic.h> | 16 | #include <asm/es7000/apic.h> |
17 | #include <asm/es7000/ipi.h> | 17 | #include <asm/es7000/ipi.h> |
18 | #include <asm/es7000/mpparse.h> | 18 | #include <asm/es7000/mpparse.h> |
19 | #include <asm/es7000/wakecpu.h> | 19 | #include <asm/mach-default/mach_wakecpu.h> |
20 | |||
21 | void __init es7000_update_genapic_to_cluster(void) | ||
22 | { | ||
23 | genapic->target_cpus = target_cpus_cluster; | ||
24 | genapic->int_delivery_mode = INT_DELIVERY_MODE_CLUSTER; | ||
25 | genapic->int_dest_mode = INT_DEST_MODE_CLUSTER; | ||
26 | genapic->no_balance_irq = NO_BALANCE_IRQ_CLUSTER; | ||
27 | |||
28 | genapic->init_apic_ldr = init_apic_ldr_cluster; | ||
29 | |||
30 | genapic->cpu_mask_to_apicid = cpu_mask_to_apicid_cluster; | ||
31 | } | ||
20 | 32 | ||
21 | static int probe_es7000(void) | 33 | static int probe_es7000(void) |
22 | { | 34 | { |
@@ -75,7 +87,7 @@ static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
75 | } | 87 | } |
76 | #endif | 88 | #endif |
77 | 89 | ||
78 | static cpumask_t vector_allocation_domain(int cpu) | 90 | static void vector_allocation_domain(int cpu, cpumask_t *retmask) |
79 | { | 91 | { |
80 | /* Careful. Some cpus do not strictly honor the set of cpus | 92 | /* Careful. Some cpus do not strictly honor the set of cpus |
81 | * specified in the interrupt destination when using lowest | 93 | * specified in the interrupt destination when using lowest |
@@ -85,8 +97,7 @@ static cpumask_t vector_allocation_domain(int cpu) | |||
85 | * deliver interrupts to the wrong hyperthread when only one | 97 | * deliver interrupts to the wrong hyperthread when only one |
86 | * hyperthread was specified in the interrupt desitination. | 98 | * hyperthread was specified in the interrupt desitination. |
87 | */ | 99 | */ |
88 | cpumask_t domain = { { [0] = APIC_ALL_CPUS, } }; | 100 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; |
89 | return domain; | ||
90 | } | 101 | } |
91 | 102 | ||
92 | struct genapic __initdata_refok apic_es7000 = APIC_INIT("es7000", probe_es7000); | 103 | struct genapic __initdata_refok apic_es7000 = APIC_INIT("es7000", probe_es7000); |
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c index 71a309b122e6..511d7941364f 100644 --- a/arch/x86/mach-generic/numaq.c +++ b/arch/x86/mach-generic/numaq.c | |||
@@ -38,7 +38,7 @@ static int acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
38 | return 0; | 38 | return 0; |
39 | } | 39 | } |
40 | 40 | ||
41 | static cpumask_t vector_allocation_domain(int cpu) | 41 | static void vector_allocation_domain(int cpu, cpumask_t *retmask) |
42 | { | 42 | { |
43 | /* Careful. Some cpus do not strictly honor the set of cpus | 43 | /* Careful. Some cpus do not strictly honor the set of cpus |
44 | * specified in the interrupt destination when using lowest | 44 | * specified in the interrupt destination when using lowest |
@@ -48,8 +48,7 @@ static cpumask_t vector_allocation_domain(int cpu) | |||
48 | * deliver interrupts to the wrong hyperthread when only one | 48 | * deliver interrupts to the wrong hyperthread when only one |
49 | * hyperthread was specified in the interrupt desitination. | 49 | * hyperthread was specified in the interrupt desitination. |
50 | */ | 50 | */ |
51 | cpumask_t domain = { { [0] = APIC_ALL_CPUS, } }; | 51 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; |
52 | return domain; | ||
53 | } | 52 | } |
54 | 53 | ||
55 | struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq); | 54 | struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq); |
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c index 5a7e4619e1c4..c346d9d0226f 100644 --- a/arch/x86/mach-generic/probe.c +++ b/arch/x86/mach-generic/probe.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <asm/mpspec.h> | 15 | #include <asm/mpspec.h> |
16 | #include <asm/apicdef.h> | 16 | #include <asm/apicdef.h> |
17 | #include <asm/genapic.h> | 17 | #include <asm/genapic.h> |
18 | #include <asm/setup.h> | ||
18 | 19 | ||
19 | extern struct genapic apic_numaq; | 20 | extern struct genapic apic_numaq; |
20 | extern struct genapic apic_summit; | 21 | extern struct genapic apic_summit; |
@@ -57,6 +58,9 @@ static int __init parse_apic(char *arg) | |||
57 | } | 58 | } |
58 | } | 59 | } |
59 | 60 | ||
61 | if (x86_quirks->update_genapic) | ||
62 | x86_quirks->update_genapic(); | ||
63 | |||
60 | /* Parsed again by __setup for debug/verbose */ | 64 | /* Parsed again by __setup for debug/verbose */ |
61 | return 0; | 65 | return 0; |
62 | } | 66 | } |
@@ -72,12 +76,15 @@ void __init generic_bigsmp_probe(void) | |||
72 | * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support | 76 | * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support |
73 | */ | 77 | */ |
74 | 78 | ||
75 | if (!cmdline_apic && genapic == &apic_default) | 79 | if (!cmdline_apic && genapic == &apic_default) { |
76 | if (apic_bigsmp.probe()) { | 80 | if (apic_bigsmp.probe()) { |
77 | genapic = &apic_bigsmp; | 81 | genapic = &apic_bigsmp; |
82 | if (x86_quirks->update_genapic) | ||
83 | x86_quirks->update_genapic(); | ||
78 | printk(KERN_INFO "Overriding APIC driver with %s\n", | 84 | printk(KERN_INFO "Overriding APIC driver with %s\n", |
79 | genapic->name); | 85 | genapic->name); |
80 | } | 86 | } |
87 | } | ||
81 | #endif | 88 | #endif |
82 | } | 89 | } |
83 | 90 | ||
@@ -94,6 +101,9 @@ void __init generic_apic_probe(void) | |||
94 | /* Not visible without early console */ | 101 | /* Not visible without early console */ |
95 | if (!apic_probe[i]) | 102 | if (!apic_probe[i]) |
96 | panic("Didn't find an APIC driver"); | 103 | panic("Didn't find an APIC driver"); |
104 | |||
105 | if (x86_quirks->update_genapic) | ||
106 | x86_quirks->update_genapic(); | ||
97 | } | 107 | } |
98 | printk(KERN_INFO "Using APIC driver %s\n", genapic->name); | 108 | printk(KERN_INFO "Using APIC driver %s\n", genapic->name); |
99 | } | 109 | } |
@@ -108,6 +118,8 @@ int __init mps_oem_check(struct mp_config_table *mpc, char *oem, | |||
108 | if (apic_probe[i]->mps_oem_check(mpc, oem, productid)) { | 118 | if (apic_probe[i]->mps_oem_check(mpc, oem, productid)) { |
109 | if (!cmdline_apic) { | 119 | if (!cmdline_apic) { |
110 | genapic = apic_probe[i]; | 120 | genapic = apic_probe[i]; |
121 | if (x86_quirks->update_genapic) | ||
122 | x86_quirks->update_genapic(); | ||
111 | printk(KERN_INFO "Switched to APIC driver `%s'.\n", | 123 | printk(KERN_INFO "Switched to APIC driver `%s'.\n", |
112 | genapic->name); | 124 | genapic->name); |
113 | } | 125 | } |
@@ -124,6 +136,8 @@ int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
124 | if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { | 136 | if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { |
125 | if (!cmdline_apic) { | 137 | if (!cmdline_apic) { |
126 | genapic = apic_probe[i]; | 138 | genapic = apic_probe[i]; |
139 | if (x86_quirks->update_genapic) | ||
140 | x86_quirks->update_genapic(); | ||
127 | printk(KERN_INFO "Switched to APIC driver `%s'.\n", | 141 | printk(KERN_INFO "Switched to APIC driver `%s'.\n", |
128 | genapic->name); | 142 | genapic->name); |
129 | } | 143 | } |
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c index 6272b5e69da6..2821ffc188b5 100644 --- a/arch/x86/mach-generic/summit.c +++ b/arch/x86/mach-generic/summit.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <asm/summit/apic.h> | 16 | #include <asm/summit/apic.h> |
17 | #include <asm/summit/ipi.h> | 17 | #include <asm/summit/ipi.h> |
18 | #include <asm/summit/mpparse.h> | 18 | #include <asm/summit/mpparse.h> |
19 | #include <asm/mach-default/mach_wakecpu.h> | ||
19 | 20 | ||
20 | static int probe_summit(void) | 21 | static int probe_summit(void) |
21 | { | 22 | { |
@@ -23,7 +24,7 @@ static int probe_summit(void) | |||
23 | return 0; | 24 | return 0; |
24 | } | 25 | } |
25 | 26 | ||
26 | static cpumask_t vector_allocation_domain(int cpu) | 27 | static void vector_allocation_domain(int cpu, cpumask_t *retmask) |
27 | { | 28 | { |
28 | /* Careful. Some cpus do not strictly honor the set of cpus | 29 | /* Careful. Some cpus do not strictly honor the set of cpus |
29 | * specified in the interrupt destination when using lowest | 30 | * specified in the interrupt destination when using lowest |
@@ -33,8 +34,7 @@ static cpumask_t vector_allocation_domain(int cpu) | |||
33 | * deliver interrupts to the wrong hyperthread when only one | 34 | * deliver interrupts to the wrong hyperthread when only one |
34 | * hyperthread was specified in the interrupt desitination. | 35 | * hyperthread was specified in the interrupt desitination. |
35 | */ | 36 | */ |
36 | cpumask_t domain = { { [0] = APIC_ALL_CPUS, } }; | 37 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; |
37 | return domain; | ||
38 | } | 38 | } |
39 | 39 | ||
40 | struct genapic apic_summit = APIC_INIT("summit", probe_summit); | 40 | struct genapic apic_summit = APIC_INIT("summit", probe_summit); |
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index 0e331652681e..a5bc05492b1e 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c | |||
@@ -7,6 +7,7 @@ | |||
7 | * This file provides all the same external entries as smp.c but uses | 7 | * This file provides all the same external entries as smp.c but uses |
8 | * the voyager hal to provide the functionality | 8 | * the voyager hal to provide the functionality |
9 | */ | 9 | */ |
10 | #include <linux/cpu.h> | ||
10 | #include <linux/module.h> | 11 | #include <linux/module.h> |
11 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
12 | #include <linux/kernel_stat.h> | 13 | #include <linux/kernel_stat.h> |
@@ -62,11 +63,6 @@ static int voyager_extended_cpus = 1; | |||
62 | /* Used for the invalidate map that's also checked in the spinlock */ | 63 | /* Used for the invalidate map that's also checked in the spinlock */ |
63 | static volatile unsigned long smp_invalidate_needed; | 64 | static volatile unsigned long smp_invalidate_needed; |
64 | 65 | ||
65 | /* Bitmask of currently online CPUs - used by setup.c for | ||
66 | /proc/cpuinfo, visible externally but still physical */ | ||
67 | cpumask_t cpu_online_map = CPU_MASK_NONE; | ||
68 | EXPORT_SYMBOL(cpu_online_map); | ||
69 | |||
70 | /* Bitmask of CPUs present in the system - exported by i386_syms.c, used | 66 | /* Bitmask of CPUs present in the system - exported by i386_syms.c, used |
71 | * by scheduler but indexed physically */ | 67 | * by scheduler but indexed physically */ |
72 | cpumask_t phys_cpu_present_map = CPU_MASK_NONE; | 68 | cpumask_t phys_cpu_present_map = CPU_MASK_NONE; |
@@ -217,8 +213,6 @@ static cpumask_t smp_commenced_mask = CPU_MASK_NONE; | |||
217 | /* This is for the new dynamic CPU boot code */ | 213 | /* This is for the new dynamic CPU boot code */ |
218 | cpumask_t cpu_callin_map = CPU_MASK_NONE; | 214 | cpumask_t cpu_callin_map = CPU_MASK_NONE; |
219 | cpumask_t cpu_callout_map = CPU_MASK_NONE; | 215 | cpumask_t cpu_callout_map = CPU_MASK_NONE; |
220 | cpumask_t cpu_possible_map = CPU_MASK_NONE; | ||
221 | EXPORT_SYMBOL(cpu_possible_map); | ||
222 | 216 | ||
223 | /* The per processor IRQ masks (these are usually kept in sync) */ | 217 | /* The per processor IRQ masks (these are usually kept in sync) */ |
224 | static __u16 vic_irq_mask[NR_CPUS] __cacheline_aligned; | 218 | static __u16 vic_irq_mask[NR_CPUS] __cacheline_aligned; |
@@ -678,7 +672,7 @@ void __init smp_boot_cpus(void) | |||
678 | 672 | ||
679 | /* loop over all the extended VIC CPUs and boot them. The | 673 | /* loop over all the extended VIC CPUs and boot them. The |
680 | * Quad CPUs must be bootstrapped by their extended VIC cpu */ | 674 | * Quad CPUs must be bootstrapped by their extended VIC cpu */ |
681 | for (i = 0; i < NR_CPUS; i++) { | 675 | for (i = 0; i < nr_cpu_ids; i++) { |
682 | if (i == boot_cpu_id || !cpu_isset(i, phys_cpu_present_map)) | 676 | if (i == boot_cpu_id || !cpu_isset(i, phys_cpu_present_map)) |
683 | continue; | 677 | continue; |
684 | do_boot_cpu(i); | 678 | do_boot_cpu(i); |
@@ -1790,6 +1784,17 @@ void __init smp_setup_processor_id(void) | |||
1790 | x86_write_percpu(cpu_number, hard_smp_processor_id()); | 1784 | x86_write_percpu(cpu_number, hard_smp_processor_id()); |
1791 | } | 1785 | } |
1792 | 1786 | ||
1787 | static void voyager_send_call_func(cpumask_t callmask) | ||
1788 | { | ||
1789 | __u32 mask = cpus_addr(callmask)[0] & ~(1 << smp_processor_id()); | ||
1790 | send_CPI(mask, VIC_CALL_FUNCTION_CPI); | ||
1791 | } | ||
1792 | |||
1793 | static void voyager_send_call_func_single(int cpu) | ||
1794 | { | ||
1795 | send_CPI(1 << cpu, VIC_CALL_FUNCTION_SINGLE_CPI); | ||
1796 | } | ||
1797 | |||
1793 | struct smp_ops smp_ops = { | 1798 | struct smp_ops smp_ops = { |
1794 | .smp_prepare_boot_cpu = voyager_smp_prepare_boot_cpu, | 1799 | .smp_prepare_boot_cpu = voyager_smp_prepare_boot_cpu, |
1795 | .smp_prepare_cpus = voyager_smp_prepare_cpus, | 1800 | .smp_prepare_cpus = voyager_smp_prepare_cpus, |
@@ -1799,6 +1804,6 @@ struct smp_ops smp_ops = { | |||
1799 | .smp_send_stop = voyager_smp_send_stop, | 1804 | .smp_send_stop = voyager_smp_send_stop, |
1800 | .smp_send_reschedule = voyager_smp_send_reschedule, | 1805 | .smp_send_reschedule = voyager_smp_send_reschedule, |
1801 | 1806 | ||
1802 | .send_call_func_ipi = native_send_call_func_ipi, | 1807 | .send_call_func_ipi = voyager_send_call_func, |
1803 | .send_call_func_single_ipi = native_send_call_func_single_ipi, | 1808 | .send_call_func_single_ipi = voyager_send_call_func_single, |
1804 | }; | 1809 | }; |
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index fea4565ff576..d8cc96a2738f 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile | |||
@@ -8,9 +8,8 @@ obj-$(CONFIG_X86_PTDUMP) += dump_pagetables.o | |||
8 | 8 | ||
9 | obj-$(CONFIG_HIGHMEM) += highmem_32.o | 9 | obj-$(CONFIG_HIGHMEM) += highmem_32.o |
10 | 10 | ||
11 | obj-$(CONFIG_MMIOTRACE_HOOKS) += kmmio.o | ||
12 | obj-$(CONFIG_MMIOTRACE) += mmiotrace.o | 11 | obj-$(CONFIG_MMIOTRACE) += mmiotrace.o |
13 | mmiotrace-y := pf_in.o mmio-mod.o | 12 | mmiotrace-y := kmmio.o pf_in.o mmio-mod.o |
14 | obj-$(CONFIG_MMIOTRACE_TEST) += testmmiotrace.o | 13 | obj-$(CONFIG_MMIOTRACE_TEST) += testmmiotrace.o |
15 | 14 | ||
16 | obj-$(CONFIG_NUMA) += numa_$(BITS).o | 15 | obj-$(CONFIG_NUMA) += numa_$(BITS).o |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 31e8730fa246..21e996a70d68 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -53,7 +53,7 @@ | |||
53 | 53 | ||
54 | static inline int kmmio_fault(struct pt_regs *regs, unsigned long addr) | 54 | static inline int kmmio_fault(struct pt_regs *regs, unsigned long addr) |
55 | { | 55 | { |
56 | #ifdef CONFIG_MMIOTRACE_HOOKS | 56 | #ifdef CONFIG_MMIOTRACE |
57 | if (unlikely(is_kmmio_active())) | 57 | if (unlikely(is_kmmio_active())) |
58 | if (kmmio_handler(regs, addr) == 1) | 58 | if (kmmio_handler(regs, addr) == 1) |
59 | return -1; | 59 | return -1; |
@@ -413,6 +413,7 @@ static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs, | |||
413 | unsigned long error_code) | 413 | unsigned long error_code) |
414 | { | 414 | { |
415 | unsigned long flags = oops_begin(); | 415 | unsigned long flags = oops_begin(); |
416 | int sig = SIGKILL; | ||
416 | struct task_struct *tsk; | 417 | struct task_struct *tsk; |
417 | 418 | ||
418 | printk(KERN_ALERT "%s: Corrupted page table at address %lx\n", | 419 | printk(KERN_ALERT "%s: Corrupted page table at address %lx\n", |
@@ -423,8 +424,8 @@ static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs, | |||
423 | tsk->thread.trap_no = 14; | 424 | tsk->thread.trap_no = 14; |
424 | tsk->thread.error_code = error_code; | 425 | tsk->thread.error_code = error_code; |
425 | if (__die("Bad pagetable", regs, error_code)) | 426 | if (__die("Bad pagetable", regs, error_code)) |
426 | regs = NULL; | 427 | sig = 0; |
427 | oops_end(flags, regs, SIGKILL); | 428 | oops_end(flags, regs, sig); |
428 | } | 429 | } |
429 | #endif | 430 | #endif |
430 | 431 | ||
@@ -590,6 +591,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) | |||
590 | int fault; | 591 | int fault; |
591 | #ifdef CONFIG_X86_64 | 592 | #ifdef CONFIG_X86_64 |
592 | unsigned long flags; | 593 | unsigned long flags; |
594 | int sig; | ||
593 | #endif | 595 | #endif |
594 | 596 | ||
595 | tsk = current; | 597 | tsk = current; |
@@ -849,11 +851,12 @@ no_context: | |||
849 | bust_spinlocks(0); | 851 | bust_spinlocks(0); |
850 | do_exit(SIGKILL); | 852 | do_exit(SIGKILL); |
851 | #else | 853 | #else |
854 | sig = SIGKILL; | ||
852 | if (__die("Oops", regs, error_code)) | 855 | if (__die("Oops", regs, error_code)) |
853 | regs = NULL; | 856 | sig = 0; |
854 | /* Executive summary in case the body of the oops scrolled away */ | 857 | /* Executive summary in case the body of the oops scrolled away */ |
855 | printk(KERN_EMERG "CR2: %016lx\n", address); | 858 | printk(KERN_EMERG "CR2: %016lx\n", address); |
856 | oops_end(flags, regs, SIGKILL); | 859 | oops_end(flags, regs, sig); |
857 | #endif | 860 | #endif |
858 | 861 | ||
859 | /* | 862 | /* |
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c index 847c164725f4..8518c678d83f 100644 --- a/arch/x86/mm/numa_32.c +++ b/arch/x86/mm/numa_32.c | |||
@@ -222,6 +222,41 @@ static void __init remap_numa_kva(void) | |||
222 | } | 222 | } |
223 | } | 223 | } |
224 | 224 | ||
225 | #ifdef CONFIG_HIBERNATION | ||
226 | /** | ||
227 | * resume_map_numa_kva - add KVA mapping to the temporary page tables created | ||
228 | * during resume from hibernation | ||
229 | * @pgd_base - temporary resume page directory | ||
230 | */ | ||
231 | void resume_map_numa_kva(pgd_t *pgd_base) | ||
232 | { | ||
233 | int node; | ||
234 | |||
235 | for_each_online_node(node) { | ||
236 | unsigned long start_va, start_pfn, size, pfn; | ||
237 | |||
238 | start_va = (unsigned long)node_remap_start_vaddr[node]; | ||
239 | start_pfn = node_remap_start_pfn[node]; | ||
240 | size = node_remap_size[node]; | ||
241 | |||
242 | printk(KERN_DEBUG "%s: node %d\n", __FUNCTION__, node); | ||
243 | |||
244 | for (pfn = 0; pfn < size; pfn += PTRS_PER_PTE) { | ||
245 | unsigned long vaddr = start_va + (pfn << PAGE_SHIFT); | ||
246 | pgd_t *pgd = pgd_base + pgd_index(vaddr); | ||
247 | pud_t *pud = pud_offset(pgd, vaddr); | ||
248 | pmd_t *pmd = pmd_offset(pud, vaddr); | ||
249 | |||
250 | set_pmd(pmd, pfn_pmd(start_pfn + pfn, | ||
251 | PAGE_KERNEL_LARGE_EXEC)); | ||
252 | |||
253 | printk(KERN_DEBUG "%s: %08lx -> pfn %08lx\n", | ||
254 | __FUNCTION__, vaddr, start_pfn + pfn); | ||
255 | } | ||
256 | } | ||
257 | } | ||
258 | #endif | ||
259 | |||
225 | static unsigned long calculate_numa_remap_pages(void) | 260 | static unsigned long calculate_numa_remap_pages(void) |
226 | { | 261 | { |
227 | int nid; | 262 | int nid; |
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index cebcbf152d46..71a14f89f89e 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -278,7 +278,7 @@ void __init numa_init_array(void) | |||
278 | int rr, i; | 278 | int rr, i; |
279 | 279 | ||
280 | rr = first_node(node_online_map); | 280 | rr = first_node(node_online_map); |
281 | for (i = 0; i < NR_CPUS; i++) { | 281 | for (i = 0; i < nr_cpu_ids; i++) { |
282 | if (early_cpu_to_node(i) != NUMA_NO_NODE) | 282 | if (early_cpu_to_node(i) != NUMA_NO_NODE) |
283 | continue; | 283 | continue; |
284 | numa_set_node(i, rr); | 284 | numa_set_node(i, rr); |
@@ -549,7 +549,7 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn) | |||
549 | memnodemap[0] = 0; | 549 | memnodemap[0] = 0; |
550 | node_set_online(0); | 550 | node_set_online(0); |
551 | node_set(0, node_possible_map); | 551 | node_set(0, node_possible_map); |
552 | for (i = 0; i < NR_CPUS; i++) | 552 | for (i = 0; i < nr_cpu_ids; i++) |
553 | numa_set_node(i, 0); | 553 | numa_set_node(i, 0); |
554 | e820_register_active_regions(0, start_pfn, last_pfn); | 554 | e820_register_active_regions(0, start_pfn, last_pfn); |
555 | setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT); | 555 | setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT); |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 51c0a2fc14fe..09737c8af074 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
@@ -382,7 +382,7 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) | |||
382 | if (!node_online(i)) | 382 | if (!node_online(i)) |
383 | setup_node_bootmem(i, nodes[i].start, nodes[i].end); | 383 | setup_node_bootmem(i, nodes[i].start, nodes[i].end); |
384 | 384 | ||
385 | for (i = 0; i < NR_CPUS; i++) { | 385 | for (i = 0; i < nr_cpu_ids; i++) { |
386 | int node = early_cpu_to_node(i); | 386 | int node = early_cpu_to_node(i); |
387 | 387 | ||
388 | if (node == NUMA_NO_NODE) | 388 | if (node == NUMA_NO_NODE) |
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 022cd41ea9b4..202864ad49a7 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
@@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type) | |||
401 | *cpu_type = "i386/pii"; | 401 | *cpu_type = "i386/pii"; |
402 | break; | 402 | break; |
403 | case 6 ... 8: | 403 | case 6 ... 8: |
404 | case 10 ... 11: | ||
404 | *cpu_type = "i386/piii"; | 405 | *cpu_type = "i386/piii"; |
405 | break; | 406 | break; |
406 | case 9: | 407 | case 9: |
408 | case 13: | ||
407 | *cpu_type = "i386/p6_mobile"; | 409 | *cpu_type = "i386/p6_mobile"; |
408 | break; | 410 | break; |
409 | case 10 ... 13: | ||
410 | *cpu_type = "i386/p6"; | ||
411 | break; | ||
412 | case 14: | 411 | case 14: |
413 | *cpu_type = "i386/core"; | 412 | *cpu_type = "i386/core"; |
414 | break; | 413 | break; |
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 3f1b81a83e2e..e9f80c744cf3 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c | |||
@@ -69,7 +69,7 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs) | |||
69 | int i; | 69 | int i; |
70 | 70 | ||
71 | if (!reset_value) { | 71 | if (!reset_value) { |
72 | reset_value = kmalloc(sizeof(unsigned) * num_counters, | 72 | reset_value = kmalloc(sizeof(reset_value[0]) * num_counters, |
73 | GFP_ATOMIC); | 73 | GFP_ATOMIC); |
74 | if (!reset_value) | 74 | if (!reset_value) |
75 | return; | 75 | return; |
@@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs) | |||
156 | unsigned int low, high; | 156 | unsigned int low, high; |
157 | int i; | 157 | int i; |
158 | 158 | ||
159 | if (!reset_value) | ||
160 | return; | ||
159 | for (i = 0; i < num_counters; ++i) { | 161 | for (i = 0; i < num_counters; ++i) { |
160 | if (reset_value[i]) { | 162 | if (reset_value[i]) { |
161 | CTRL_READ(low, high, msrs, i); | 163 | CTRL_READ(low, high, msrs, i); |
@@ -171,6 +173,8 @@ static void ppro_stop(struct op_msrs const * const msrs) | |||
171 | unsigned int low, high; | 173 | unsigned int low, high; |
172 | int i; | 174 | int i; |
173 | 175 | ||
176 | if (!reset_value) | ||
177 | return; | ||
174 | for (i = 0; i < num_counters; ++i) { | 178 | for (i = 0; i < num_counters; ++i) { |
175 | if (!reset_value[i]) | 179 | if (!reset_value[i]) |
176 | continue; | 180 | continue; |
diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c index 9915293500fb..9a5af6c8fbe9 100644 --- a/arch/x86/pci/direct.c +++ b/arch/x86/pci/direct.c | |||
@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus, | |||
173 | 173 | ||
174 | #undef PCI_CONF2_ADDRESS | 174 | #undef PCI_CONF2_ADDRESS |
175 | 175 | ||
176 | static struct pci_raw_ops pci_direct_conf2 = { | 176 | struct pci_raw_ops pci_direct_conf2 = { |
177 | .read = pci_conf2_read, | 177 | .read = pci_conf2_read, |
178 | .write = pci_conf2_write, | 178 | .write = pci_conf2_write, |
179 | }; | 179 | }; |
@@ -289,6 +289,7 @@ int __init pci_direct_probe(void) | |||
289 | 289 | ||
290 | if (pci_check_type1()) { | 290 | if (pci_check_type1()) { |
291 | raw_pci_ops = &pci_direct_conf1; | 291 | raw_pci_ops = &pci_direct_conf1; |
292 | port_cf9_safe = true; | ||
292 | return 1; | 293 | return 1; |
293 | } | 294 | } |
294 | release_resource(region); | 295 | release_resource(region); |
@@ -305,6 +306,7 @@ int __init pci_direct_probe(void) | |||
305 | 306 | ||
306 | if (pci_check_type2()) { | 307 | if (pci_check_type2()) { |
307 | raw_pci_ops = &pci_direct_conf2; | 308 | raw_pci_ops = &pci_direct_conf2; |
309 | port_cf9_safe = true; | ||
308 | return 2; | 310 | return 2; |
309 | } | 311 | } |
310 | 312 | ||
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index 3c27a809393b..2051dc96b8e9 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c | |||
@@ -496,21 +496,24 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SIEMENS, 0x0015, | |||
496 | pci_siemens_interrupt_controller); | 496 | pci_siemens_interrupt_controller); |
497 | 497 | ||
498 | /* | 498 | /* |
499 | * Regular PCI devices have 256 bytes, but AMD Family 10h Opteron ext config | 499 | * Regular PCI devices have 256 bytes, but AMD Family 10h/11h CPUs have |
500 | * have 4096 bytes. Even if the device is capable, that doesn't mean we can | 500 | * 4096 bytes configuration space for each function of their processor |
501 | * access it. Maybe we don't have a way to generate extended config space | 501 | * configuration space. |
502 | * accesses. So check it | ||
503 | */ | 502 | */ |
504 | static void fam10h_pci_cfg_space_size(struct pci_dev *dev) | 503 | static void amd_cpu_pci_cfg_space_size(struct pci_dev *dev) |
505 | { | 504 | { |
506 | dev->cfg_size = pci_cfg_space_size_ext(dev); | 505 | dev->cfg_size = pci_cfg_space_size_ext(dev); |
507 | } | 506 | } |
508 | 507 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, amd_cpu_pci_cfg_space_size); | |
509 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, fam10h_pci_cfg_space_size); | 508 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, amd_cpu_pci_cfg_space_size); |
510 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, fam10h_pci_cfg_space_size); | 509 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, amd_cpu_pci_cfg_space_size); |
511 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, fam10h_pci_cfg_space_size); | 510 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, amd_cpu_pci_cfg_space_size); |
512 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, fam10h_pci_cfg_space_size); | 511 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, amd_cpu_pci_cfg_space_size); |
513 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, fam10h_pci_cfg_space_size); | 512 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1300, amd_cpu_pci_cfg_space_size); |
513 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1301, amd_cpu_pci_cfg_space_size); | ||
514 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1302, amd_cpu_pci_cfg_space_size); | ||
515 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1303, amd_cpu_pci_cfg_space_size); | ||
516 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1304, amd_cpu_pci_cfg_space_size); | ||
514 | 517 | ||
515 | /* | 518 | /* |
516 | * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from | 519 | * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from |
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index 15b9cf6be729..1959018aac02 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h | |||
@@ -96,6 +96,7 @@ extern struct pci_raw_ops *raw_pci_ops; | |||
96 | extern struct pci_raw_ops *raw_pci_ext_ops; | 96 | extern struct pci_raw_ops *raw_pci_ext_ops; |
97 | 97 | ||
98 | extern struct pci_raw_ops pci_direct_conf1; | 98 | extern struct pci_raw_ops pci_direct_conf1; |
99 | extern bool port_cf9_safe; | ||
99 | 100 | ||
100 | /* arch_initcall level */ | 101 | /* arch_initcall level */ |
101 | extern int pci_direct_probe(void); | 102 | extern int pci_direct_probe(void); |
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c index f2b6e3f11bfc..81197c62d5b3 100644 --- a/arch/x86/power/hibernate_32.c +++ b/arch/x86/power/hibernate_32.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <asm/system.h> | 12 | #include <asm/system.h> |
13 | #include <asm/page.h> | 13 | #include <asm/page.h> |
14 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
15 | #include <asm/mmzone.h> | ||
15 | 16 | ||
16 | /* Defined in hibernate_asm_32.S */ | 17 | /* Defined in hibernate_asm_32.S */ |
17 | extern int restore_image(void); | 18 | extern int restore_image(void); |
@@ -127,6 +128,9 @@ static int resume_physical_mapping_init(pgd_t *pgd_base) | |||
127 | } | 128 | } |
128 | } | 129 | } |
129 | } | 130 | } |
131 | |||
132 | resume_map_numa_kva(pgd_base); | ||
133 | |||
130 | return 0; | 134 | return 0; |
131 | } | 135 | } |
132 | 136 | ||
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c index 1ef0f90813d6..d9d35824c56f 100644 --- a/arch/x86/vdso/vclock_gettime.c +++ b/arch/x86/vdso/vclock_gettime.c | |||
@@ -9,6 +9,9 @@ | |||
9 | * Also alternative() doesn't work. | 9 | * Also alternative() doesn't work. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | /* Disable profiling for userspace code: */ | ||
13 | #define DISABLE_BRANCH_PROFILING | ||
14 | |||
12 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
13 | #include <linux/posix-timers.h> | 16 | #include <linux/posix-timers.h> |
14 | #include <linux/time.h> | 17 | #include <linux/time.h> |
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 688936044dc9..e59e53b11e2b 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -661,12 +661,11 @@ void xen_set_pgd(pgd_t *ptr, pgd_t val) | |||
661 | * For 64-bit, we must skip the Xen hole in the middle of the address | 661 | * For 64-bit, we must skip the Xen hole in the middle of the address |
662 | * space, just after the big x86-64 virtual hole. | 662 | * space, just after the big x86-64 virtual hole. |
663 | */ | 663 | */ |
664 | static int xen_pgd_walk(struct mm_struct *mm, | 664 | static int __xen_pgd_walk(struct mm_struct *mm, pgd_t *pgd, |
665 | int (*func)(struct mm_struct *mm, struct page *, | 665 | int (*func)(struct mm_struct *mm, struct page *, |
666 | enum pt_level), | 666 | enum pt_level), |
667 | unsigned long limit) | 667 | unsigned long limit) |
668 | { | 668 | { |
669 | pgd_t *pgd = mm->pgd; | ||
670 | int flush = 0; | 669 | int flush = 0; |
671 | unsigned hole_low, hole_high; | 670 | unsigned hole_low, hole_high; |
672 | unsigned pgdidx_limit, pudidx_limit, pmdidx_limit; | 671 | unsigned pgdidx_limit, pudidx_limit, pmdidx_limit; |
@@ -753,6 +752,14 @@ out: | |||
753 | return flush; | 752 | return flush; |
754 | } | 753 | } |
755 | 754 | ||
755 | static int xen_pgd_walk(struct mm_struct *mm, | ||
756 | int (*func)(struct mm_struct *mm, struct page *, | ||
757 | enum pt_level), | ||
758 | unsigned long limit) | ||
759 | { | ||
760 | return __xen_pgd_walk(mm, mm->pgd, func, limit); | ||
761 | } | ||
762 | |||
756 | /* If we're using split pte locks, then take the page's lock and | 763 | /* If we're using split pte locks, then take the page's lock and |
757 | return a pointer to it. Otherwise return NULL. */ | 764 | return a pointer to it. Otherwise return NULL. */ |
758 | static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm) | 765 | static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm) |
@@ -854,7 +861,7 @@ static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd) | |||
854 | 861 | ||
855 | xen_mc_batch(); | 862 | xen_mc_batch(); |
856 | 863 | ||
857 | if (xen_pgd_walk(mm, xen_pin_page, USER_LIMIT)) { | 864 | if (__xen_pgd_walk(mm, pgd, xen_pin_page, USER_LIMIT)) { |
858 | /* re-enable interrupts for flushing */ | 865 | /* re-enable interrupts for flushing */ |
859 | xen_mc_issue(0); | 866 | xen_mc_issue(0); |
860 | 867 | ||
@@ -998,7 +1005,7 @@ static void __xen_pgd_unpin(struct mm_struct *mm, pgd_t *pgd) | |||
998 | PT_PMD); | 1005 | PT_PMD); |
999 | #endif | 1006 | #endif |
1000 | 1007 | ||
1001 | xen_pgd_walk(mm, xen_unpin_page, USER_LIMIT); | 1008 | __xen_pgd_walk(mm, pgd, xen_unpin_page, USER_LIMIT); |
1002 | 1009 | ||
1003 | xen_mc_issue(0); | 1010 | xen_mc_issue(0); |
1004 | } | 1011 | } |
@@ -1072,7 +1079,7 @@ static void drop_other_mm_ref(void *info) | |||
1072 | 1079 | ||
1073 | static void xen_drop_mm_ref(struct mm_struct *mm) | 1080 | static void xen_drop_mm_ref(struct mm_struct *mm) |
1074 | { | 1081 | { |
1075 | cpumask_t mask; | 1082 | cpumask_var_t mask; |
1076 | unsigned cpu; | 1083 | unsigned cpu; |
1077 | 1084 | ||
1078 | if (current->active_mm == mm) { | 1085 | if (current->active_mm == mm) { |
@@ -1084,7 +1091,16 @@ static void xen_drop_mm_ref(struct mm_struct *mm) | |||
1084 | } | 1091 | } |
1085 | 1092 | ||
1086 | /* Get the "official" set of cpus referring to our pagetable. */ | 1093 | /* Get the "official" set of cpus referring to our pagetable. */ |
1087 | mask = mm->cpu_vm_mask; | 1094 | if (!alloc_cpumask_var(&mask, GFP_ATOMIC)) { |
1095 | for_each_online_cpu(cpu) { | ||
1096 | if (!cpumask_test_cpu(cpu, &mm->cpu_vm_mask) | ||
1097 | && per_cpu(xen_current_cr3, cpu) != __pa(mm->pgd)) | ||
1098 | continue; | ||
1099 | smp_call_function_single(cpu, drop_other_mm_ref, mm, 1); | ||
1100 | } | ||
1101 | return; | ||
1102 | } | ||
1103 | cpumask_copy(mask, &mm->cpu_vm_mask); | ||
1088 | 1104 | ||
1089 | /* It's possible that a vcpu may have a stale reference to our | 1105 | /* It's possible that a vcpu may have a stale reference to our |
1090 | cr3, because its in lazy mode, and it hasn't yet flushed | 1106 | cr3, because its in lazy mode, and it hasn't yet flushed |
@@ -1093,11 +1109,12 @@ static void xen_drop_mm_ref(struct mm_struct *mm) | |||
1093 | if needed. */ | 1109 | if needed. */ |
1094 | for_each_online_cpu(cpu) { | 1110 | for_each_online_cpu(cpu) { |
1095 | if (per_cpu(xen_current_cr3, cpu) == __pa(mm->pgd)) | 1111 | if (per_cpu(xen_current_cr3, cpu) == __pa(mm->pgd)) |
1096 | cpu_set(cpu, mask); | 1112 | cpumask_set_cpu(cpu, mask); |
1097 | } | 1113 | } |
1098 | 1114 | ||
1099 | if (!cpus_empty(mask)) | 1115 | if (!cpumask_empty(mask)) |
1100 | smp_call_function_mask(mask, drop_other_mm_ref, mm, 1); | 1116 | smp_call_function_many(mask, drop_other_mm_ref, mm, 1); |
1117 | free_cpumask_var(mask); | ||
1101 | } | 1118 | } |
1102 | #else | 1119 | #else |
1103 | static void xen_drop_mm_ref(struct mm_struct *mm) | 1120 | static void xen_drop_mm_ref(struct mm_struct *mm) |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index d77da613b1d2..c44e2069c7c7 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "xen-ops.h" | 33 | #include "xen-ops.h" |
34 | #include "mmu.h" | 34 | #include "mmu.h" |
35 | 35 | ||
36 | cpumask_t xen_cpu_initialized_map; | 36 | cpumask_var_t xen_cpu_initialized_map; |
37 | 37 | ||
38 | static DEFINE_PER_CPU(int, resched_irq); | 38 | static DEFINE_PER_CPU(int, resched_irq); |
39 | static DEFINE_PER_CPU(int, callfunc_irq); | 39 | static DEFINE_PER_CPU(int, callfunc_irq); |
@@ -158,7 +158,7 @@ static void __init xen_fill_possible_map(void) | |||
158 | { | 158 | { |
159 | int i, rc; | 159 | int i, rc; |
160 | 160 | ||
161 | for (i = 0; i < NR_CPUS; i++) { | 161 | for (i = 0; i < nr_cpu_ids; i++) { |
162 | rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL); | 162 | rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL); |
163 | if (rc >= 0) { | 163 | if (rc >= 0) { |
164 | num_processors++; | 164 | num_processors++; |
@@ -192,11 +192,14 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus) | |||
192 | if (xen_smp_intr_init(0)) | 192 | if (xen_smp_intr_init(0)) |
193 | BUG(); | 193 | BUG(); |
194 | 194 | ||
195 | xen_cpu_initialized_map = cpumask_of_cpu(0); | 195 | if (!alloc_cpumask_var(&xen_cpu_initialized_map, GFP_KERNEL)) |
196 | panic("could not allocate xen_cpu_initialized_map\n"); | ||
197 | |||
198 | cpumask_copy(xen_cpu_initialized_map, cpumask_of(0)); | ||
196 | 199 | ||
197 | /* Restrict the possible_map according to max_cpus. */ | 200 | /* Restrict the possible_map according to max_cpus. */ |
198 | while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) { | 201 | while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) { |
199 | for (cpu = NR_CPUS - 1; !cpu_possible(cpu); cpu--) | 202 | for (cpu = nr_cpu_ids - 1; !cpu_possible(cpu); cpu--) |
200 | continue; | 203 | continue; |
201 | cpu_clear(cpu, cpu_possible_map); | 204 | cpu_clear(cpu, cpu_possible_map); |
202 | } | 205 | } |
@@ -221,7 +224,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) | |||
221 | struct vcpu_guest_context *ctxt; | 224 | struct vcpu_guest_context *ctxt; |
222 | struct desc_struct *gdt; | 225 | struct desc_struct *gdt; |
223 | 226 | ||
224 | if (cpu_test_and_set(cpu, xen_cpu_initialized_map)) | 227 | if (cpumask_test_and_set_cpu(cpu, xen_cpu_initialized_map)) |
225 | return 0; | 228 | return 0; |
226 | 229 | ||
227 | ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); | 230 | ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); |
@@ -362,7 +365,7 @@ static void xen_cpu_die(unsigned int cpu) | |||
362 | alternatives_smp_switch(0); | 365 | alternatives_smp_switch(0); |
363 | } | 366 | } |
364 | 367 | ||
365 | static void xen_play_dead(void) | 368 | static void __cpuinit xen_play_dead(void) /* used only with CPU_HOTPLUG */ |
366 | { | 369 | { |
367 | play_dead_common(); | 370 | play_dead_common(); |
368 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); | 371 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); |
@@ -408,24 +411,23 @@ static void xen_smp_send_reschedule(int cpu) | |||
408 | xen_send_IPI_one(cpu, XEN_RESCHEDULE_VECTOR); | 411 | xen_send_IPI_one(cpu, XEN_RESCHEDULE_VECTOR); |
409 | } | 412 | } |
410 | 413 | ||
411 | static void xen_send_IPI_mask(cpumask_t mask, enum ipi_vector vector) | 414 | static void xen_send_IPI_mask(const struct cpumask *mask, |
415 | enum ipi_vector vector) | ||
412 | { | 416 | { |
413 | unsigned cpu; | 417 | unsigned cpu; |
414 | 418 | ||
415 | cpus_and(mask, mask, cpu_online_map); | 419 | for_each_cpu_and(cpu, mask, cpu_online_mask) |
416 | |||
417 | for_each_cpu_mask_nr(cpu, mask) | ||
418 | xen_send_IPI_one(cpu, vector); | 420 | xen_send_IPI_one(cpu, vector); |
419 | } | 421 | } |
420 | 422 | ||
421 | static void xen_smp_send_call_function_ipi(cpumask_t mask) | 423 | static void xen_smp_send_call_function_ipi(const struct cpumask *mask) |
422 | { | 424 | { |
423 | int cpu; | 425 | int cpu; |
424 | 426 | ||
425 | xen_send_IPI_mask(mask, XEN_CALL_FUNCTION_VECTOR); | 427 | xen_send_IPI_mask(mask, XEN_CALL_FUNCTION_VECTOR); |
426 | 428 | ||
427 | /* Make sure other vcpus get a chance to run if they need to. */ | 429 | /* Make sure other vcpus get a chance to run if they need to. */ |
428 | for_each_cpu_mask_nr(cpu, mask) { | 430 | for_each_cpu(cpu, mask) { |
429 | if (xen_vcpu_stolen(cpu)) { | 431 | if (xen_vcpu_stolen(cpu)) { |
430 | HYPERVISOR_sched_op(SCHEDOP_yield, 0); | 432 | HYPERVISOR_sched_op(SCHEDOP_yield, 0); |
431 | break; | 433 | break; |
@@ -435,7 +437,8 @@ static void xen_smp_send_call_function_ipi(cpumask_t mask) | |||
435 | 437 | ||
436 | static void xen_smp_send_call_function_single_ipi(int cpu) | 438 | static void xen_smp_send_call_function_single_ipi(int cpu) |
437 | { | 439 | { |
438 | xen_send_IPI_mask(cpumask_of_cpu(cpu), XEN_CALL_FUNCTION_SINGLE_VECTOR); | 440 | xen_send_IPI_mask(cpumask_of(cpu), |
441 | XEN_CALL_FUNCTION_SINGLE_VECTOR); | ||
439 | } | 442 | } |
440 | 443 | ||
441 | static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id) | 444 | static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id) |
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 2a234db5949b..212ffe012b76 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c | |||
@@ -35,7 +35,8 @@ void xen_post_suspend(int suspend_cancelled) | |||
35 | pfn_to_mfn(xen_start_info->console.domU.mfn); | 35 | pfn_to_mfn(xen_start_info->console.domU.mfn); |
36 | } else { | 36 | } else { |
37 | #ifdef CONFIG_SMP | 37 | #ifdef CONFIG_SMP |
38 | xen_cpu_initialized_map = cpu_online_map; | 38 | BUG_ON(xen_cpu_initialized_map == NULL); |
39 | cpumask_copy(xen_cpu_initialized_map, cpu_online_mask); | ||
39 | #endif | 40 | #endif |
40 | xen_vcpu_restore(); | 41 | xen_vcpu_restore(); |
41 | } | 42 | } |
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index c9f7cda48ed7..65d75a6be0ba 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c | |||
@@ -437,7 +437,7 @@ void xen_setup_timer(int cpu) | |||
437 | evt = &per_cpu(xen_clock_events, cpu); | 437 | evt = &per_cpu(xen_clock_events, cpu); |
438 | memcpy(evt, xen_clockevent, sizeof(*evt)); | 438 | memcpy(evt, xen_clockevent, sizeof(*evt)); |
439 | 439 | ||
440 | evt->cpumask = cpumask_of_cpu(cpu); | 440 | evt->cpumask = cpumask_of(cpu); |
441 | evt->irq = irq; | 441 | evt->irq = irq; |
442 | 442 | ||
443 | setup_runstate_info(cpu); | 443 | setup_runstate_info(cpu); |
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index d7422dc2a55c..c1f8faf0a2c5 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
@@ -49,7 +49,7 @@ bool xen_vcpu_stolen(int vcpu); | |||
49 | 49 | ||
50 | void xen_mark_init_mm_pinned(void); | 50 | void xen_mark_init_mm_pinned(void); |
51 | 51 | ||
52 | void __init xen_setup_vcpu_info_placement(void); | 52 | void xen_setup_vcpu_info_placement(void); |
53 | 53 | ||
54 | #ifdef CONFIG_SMP | 54 | #ifdef CONFIG_SMP |
55 | void xen_smp_init(void); | 55 | void xen_smp_init(void); |
@@ -58,7 +58,7 @@ void __init xen_init_spinlocks(void); | |||
58 | __cpuinit void xen_init_lock_cpu(int cpu); | 58 | __cpuinit void xen_init_lock_cpu(int cpu); |
59 | void xen_uninit_lock_cpu(int cpu); | 59 | void xen_uninit_lock_cpu(int cpu); |
60 | 60 | ||
61 | extern cpumask_t xen_cpu_initialized_map; | 61 | extern cpumask_var_t xen_cpu_initialized_map; |
62 | #else | 62 | #else |
63 | static inline void xen_smp_init(void) {} | 63 | static inline void xen_smp_init(void) {} |
64 | #endif | 64 | #endif |