diff options
Diffstat (limited to 'arch')
52 files changed, 498 insertions, 245 deletions
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c index 582a3519fb28..9903e3a79102 100644 --- a/arch/alpha/kernel/pci-noop.c +++ b/arch/alpha/kernel/pci-noop.c | |||
@@ -154,7 +154,7 @@ pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask) | |||
154 | 154 | ||
155 | void * | 155 | void * |
156 | dma_alloc_coherent(struct device *dev, size_t size, | 156 | dma_alloc_coherent(struct device *dev, size_t size, |
157 | dma_addr_t *dma_handle, int gfp) | 157 | dma_addr_t *dma_handle, gfp_t gfp) |
158 | { | 158 | { |
159 | void *ret; | 159 | void *ret; |
160 | 160 | ||
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 7cb23f12ecbd..c468e312e5f8 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c | |||
@@ -397,7 +397,7 @@ pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp) | |||
397 | { | 397 | { |
398 | void *cpu_addr; | 398 | void *cpu_addr; |
399 | long order = get_order(size); | 399 | long order = get_order(size); |
400 | int gfp = GFP_ATOMIC; | 400 | gfp_t gfp = GFP_ATOMIC; |
401 | 401 | ||
402 | try_again: | 402 | try_again: |
403 | cpu_addr = (void *)__get_free_pages(gfp, order); | 403 | cpu_addr = (void *)__get_free_pages(gfp, order); |
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index c3c2f17d030e..a1b153d1626c 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
@@ -67,7 +67,7 @@ static void impd1_setvco(struct clk *clk, struct icst525_vco vco) | |||
67 | } | 67 | } |
68 | writel(0, impd1->base + IMPD1_LOCK); | 68 | writel(0, impd1->base + IMPD1_LOCK); |
69 | 69 | ||
70 | #if DEBUG | 70 | #ifdef DEBUG |
71 | vco.v = val & 0x1ff; | 71 | vco.v = val & 0x1ff; |
72 | vco.r = (val >> 9) & 0x7f; | 72 | vco.r = (val >> 9) & 0x7f; |
73 | vco.s = (val >> 16) & 7; | 73 | vco.s = (val >> 16) & 7; |
@@ -427,17 +427,18 @@ static int impd1_probe(struct lm_device *dev) | |||
427 | return ret; | 427 | return ret; |
428 | } | 428 | } |
429 | 429 | ||
430 | static int impd1_remove_one(struct device *dev, void *data) | ||
431 | { | ||
432 | device_unregister(dev); | ||
433 | return 0; | ||
434 | } | ||
435 | |||
430 | static void impd1_remove(struct lm_device *dev) | 436 | static void impd1_remove(struct lm_device *dev) |
431 | { | 437 | { |
432 | struct impd1_module *impd1 = lm_get_drvdata(dev); | 438 | struct impd1_module *impd1 = lm_get_drvdata(dev); |
433 | struct list_head *l, *n; | ||
434 | int i; | 439 | int i; |
435 | 440 | ||
436 | list_for_each_safe(l, n, &dev->dev.children) { | 441 | device_for_each_child(&dev->dev, NULL, impd1_remove_one); |
437 | struct device *d = list_to_dev(l); | ||
438 | |||
439 | device_unregister(d); | ||
440 | } | ||
441 | 442 | ||
442 | for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) | 443 | for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) |
443 | clk_unregister(&impd1->vcos[i]); | 444 | clk_unregister(&impd1->vcos[i]); |
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c index 850538fadece..370df113dc06 100644 --- a/arch/arm/mach-pxa/corgi_lcd.c +++ b/arch/arm/mach-pxa/corgi_lcd.c | |||
@@ -488,6 +488,7 @@ static int is_pxafb_device(struct device * dev, void * data) | |||
488 | 488 | ||
489 | unsigned long spitz_get_hsync_len(void) | 489 | unsigned long spitz_get_hsync_len(void) |
490 | { | 490 | { |
491 | #ifdef CONFIG_FB_PXA | ||
491 | if (!spitz_pxafb_dev) { | 492 | if (!spitz_pxafb_dev) { |
492 | spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device); | 493 | spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device); |
493 | if (!spitz_pxafb_dev) | 494 | if (!spitz_pxafb_dev) |
@@ -496,6 +497,7 @@ unsigned long spitz_get_hsync_len(void) | |||
496 | if (!get_hsync_time) | 497 | if (!get_hsync_time) |
497 | get_hsync_time = symbol_get(pxafb_get_hsync_time); | 498 | get_hsync_time = symbol_get(pxafb_get_hsync_time); |
498 | if (!get_hsync_time) | 499 | if (!get_hsync_time) |
500 | #endif | ||
499 | return 0; | 501 | return 0; |
500 | 502 | ||
501 | return pxafb_get_hsync_time(spitz_pxafb_dev); | 503 | return pxafb_get_hsync_time(spitz_pxafb_dev); |
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index d327c127eddb..1d7677669a76 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -250,6 +250,25 @@ void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) | |||
250 | i2c_device.dev.platform_data = info; | 250 | i2c_device.dev.platform_data = info; |
251 | } | 251 | } |
252 | 252 | ||
253 | static struct resource i2s_resources[] = { | ||
254 | { | ||
255 | .start = 0x40400000, | ||
256 | .end = 0x40400083, | ||
257 | .flags = IORESOURCE_MEM, | ||
258 | }, { | ||
259 | .start = IRQ_I2S, | ||
260 | .end = IRQ_I2S, | ||
261 | .flags = IORESOURCE_IRQ, | ||
262 | }, | ||
263 | }; | ||
264 | |||
265 | static struct platform_device i2s_device = { | ||
266 | .name = "pxa2xx-i2s", | ||
267 | .id = -1, | ||
268 | .resource = i2c_resources, | ||
269 | .num_resources = ARRAY_SIZE(i2s_resources), | ||
270 | }; | ||
271 | |||
253 | static struct platform_device *devices[] __initdata = { | 272 | static struct platform_device *devices[] __initdata = { |
254 | &pxamci_device, | 273 | &pxamci_device, |
255 | &udc_device, | 274 | &udc_device, |
@@ -258,6 +277,7 @@ static struct platform_device *devices[] __initdata = { | |||
258 | &btuart_device, | 277 | &btuart_device, |
259 | &stuart_device, | 278 | &stuart_device, |
260 | &i2c_device, | 279 | &i2c_device, |
280 | &i2s_device, | ||
261 | }; | 281 | }; |
262 | 282 | ||
263 | static int __init pxa_init(void) | 283 | static int __init pxa_init(void) |
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index f59608268751..8b3d5dc35de5 100644 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c | |||
@@ -98,7 +98,10 @@ struct clk *clk_get(struct device *dev, const char *id) | |||
98 | struct clk *clk = ERR_PTR(-ENOENT); | 98 | struct clk *clk = ERR_PTR(-ENOENT); |
99 | int idno; | 99 | int idno; |
100 | 100 | ||
101 | idno = (dev == NULL) ? -1 : to_platform_device(dev)->id; | 101 | if (dev == NULL || dev->bus != &platform_bus_type) |
102 | idno = -1; | ||
103 | else | ||
104 | idno = to_platform_device(dev)->id; | ||
102 | 105 | ||
103 | down(&clocks_sem); | 106 | down(&clocks_sem); |
104 | 107 | ||
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 8ca955984645..7b51bfd0ba6d 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -307,9 +307,9 @@ static void bast_nand_select(struct s3c2410_nand_set *set, int slot) | |||
307 | } | 307 | } |
308 | 308 | ||
309 | static struct s3c2410_platform_nand bast_nand_info = { | 309 | static struct s3c2410_platform_nand bast_nand_info = { |
310 | .tacls = 40, | 310 | .tacls = 30, |
311 | .twrph0 = 80, | 311 | .twrph0 = 60, |
312 | .twrph1 = 80, | 312 | .twrph1 = 60, |
313 | .nr_sets = ARRAY_SIZE(bast_nand_sets), | 313 | .nr_sets = ARRAY_SIZE(bast_nand_sets), |
314 | .sets = bast_nand_sets, | 314 | .sets = bast_nand_sets, |
315 | .select_chip = bast_nand_select, | 315 | .select_chip = bast_nand_select, |
diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c index 26356ce4da54..82f4d5e27c54 100644 --- a/arch/arm/mm/consistent.c +++ b/arch/arm/mm/consistent.c | |||
@@ -75,7 +75,7 @@ static struct vm_region consistent_head = { | |||
75 | }; | 75 | }; |
76 | 76 | ||
77 | static struct vm_region * | 77 | static struct vm_region * |
78 | vm_region_alloc(struct vm_region *head, size_t size, int gfp) | 78 | vm_region_alloc(struct vm_region *head, size_t size, gfp_t gfp) |
79 | { | 79 | { |
80 | unsigned long addr = head->vm_start, end = head->vm_end - size; | 80 | unsigned long addr = head->vm_start, end = head->vm_end - size; |
81 | unsigned long flags; | 81 | unsigned long flags; |
@@ -133,7 +133,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad | |||
133 | #endif | 133 | #endif |
134 | 134 | ||
135 | static void * | 135 | static void * |
136 | __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, int gfp, | 136 | __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp, |
137 | pgprot_t prot) | 137 | pgprot_t prot) |
138 | { | 138 | { |
139 | struct page *page; | 139 | struct page *page; |
@@ -251,7 +251,7 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, int gfp, | |||
251 | * virtual and bus address for that space. | 251 | * virtual and bus address for that space. |
252 | */ | 252 | */ |
253 | void * | 253 | void * |
254 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp) | 254 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp) |
255 | { | 255 | { |
256 | return __dma_alloc(dev, size, handle, gfp, | 256 | return __dma_alloc(dev, size, handle, gfp, |
257 | pgprot_noncached(pgprot_kernel)); | 257 | pgprot_noncached(pgprot_kernel)); |
@@ -263,7 +263,7 @@ EXPORT_SYMBOL(dma_alloc_coherent); | |||
263 | * dma_alloc_coherent above. | 263 | * dma_alloc_coherent above. |
264 | */ | 264 | */ |
265 | void * | 265 | void * |
266 | dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, int gfp) | 266 | dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp) |
267 | { | 267 | { |
268 | return __dma_alloc(dev, size, handle, gfp, | 268 | return __dma_alloc(dev, size, handle, gfp, |
269 | pgprot_writecombine(pgprot_kernel)); | 269 | pgprot_writecombine(pgprot_kernel)); |
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index caf3b19b167f..9bb5fff406fb 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
@@ -55,7 +55,14 @@ ENTRY(cpu_v6_proc_init) | |||
55 | mov pc, lr | 55 | mov pc, lr |
56 | 56 | ||
57 | ENTRY(cpu_v6_proc_fin) | 57 | ENTRY(cpu_v6_proc_fin) |
58 | mov pc, lr | 58 | stmfd sp!, {lr} |
59 | cpsid if @ disable interrupts | ||
60 | bl v6_flush_kern_cache_all | ||
61 | mrc p15, 0, r0, c1, c0, 0 @ ctrl register | ||
62 | bic r0, r0, #0x1000 @ ...i............ | ||
63 | bic r0, r0, #0x0006 @ .............ca. | ||
64 | mcr p15, 0, r0, c1, c0, 0 @ disable caches | ||
65 | ldmfd sp!, {pc} | ||
59 | 66 | ||
60 | /* | 67 | /* |
61 | * cpu_v6_reset(loc) | 68 | * cpu_v6_reset(loc) |
diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c index 819895cf0b9e..2082a9647f4f 100644 --- a/arch/frv/mb93090-mb00/pci-dma-nommu.c +++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c | |||
@@ -33,7 +33,7 @@ struct dma_alloc_record { | |||
33 | static DEFINE_SPINLOCK(dma_alloc_lock); | 33 | static DEFINE_SPINLOCK(dma_alloc_lock); |
34 | static LIST_HEAD(dma_alloc_list); | 34 | static LIST_HEAD(dma_alloc_list); |
35 | 35 | ||
36 | void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, int gfp) | 36 | void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) |
37 | { | 37 | { |
38 | struct dma_alloc_record *new; | 38 | struct dma_alloc_record *new; |
39 | struct list_head *this = &dma_alloc_list; | 39 | struct list_head *this = &dma_alloc_list; |
diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c index 27eb12066507..86fbdadc51b6 100644 --- a/arch/frv/mb93090-mb00/pci-dma.c +++ b/arch/frv/mb93090-mb00/pci-dma.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | 19 | ||
20 | void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, int gfp) | 20 | void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) |
21 | { | 21 | { |
22 | void *ret; | 22 | void *ret; |
23 | 23 | ||
diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c index 4b38d45435f6..cfc4f97490c6 100644 --- a/arch/frv/mm/dma-alloc.c +++ b/arch/frv/mm/dma-alloc.c | |||
@@ -81,7 +81,7 @@ static int map_page(unsigned long va, unsigned long pa, pgprot_t prot) | |||
81 | * portions of the kernel with single large page TLB entries, and | 81 | * portions of the kernel with single large page TLB entries, and |
82 | * still get unique uncached pages for consistent DMA. | 82 | * still get unique uncached pages for consistent DMA. |
83 | */ | 83 | */ |
84 | void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) | 84 | void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle) |
85 | { | 85 | { |
86 | struct vm_struct *area; | 86 | struct vm_struct *area; |
87 | unsigned long page, va, pa; | 87 | unsigned long page, va, pa; |
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c index ab6e0611303d..58ca98fdc2ca 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c | |||
@@ -44,7 +44,7 @@ | |||
44 | 44 | ||
45 | #define PFX "powernow-k8: " | 45 | #define PFX "powernow-k8: " |
46 | #define BFX PFX "BIOS error: " | 46 | #define BFX PFX "BIOS error: " |
47 | #define VERSION "version 1.50.3" | 47 | #define VERSION "version 1.50.4" |
48 | #include "powernow-k8.h" | 48 | #include "powernow-k8.h" |
49 | 49 | ||
50 | /* serialize freq changes */ | 50 | /* serialize freq changes */ |
@@ -111,8 +111,8 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data) | |||
111 | u32 i = 0; | 111 | u32 i = 0; |
112 | 112 | ||
113 | do { | 113 | do { |
114 | if (i++ > 0x1000000) { | 114 | if (i++ > 10000) { |
115 | printk(KERN_ERR PFX "detected change pending stuck\n"); | 115 | dprintk("detected change pending stuck\n"); |
116 | return 1; | 116 | return 1; |
117 | } | 117 | } |
118 | rdmsr(MSR_FIDVID_STATUS, lo, hi); | 118 | rdmsr(MSR_FIDVID_STATUS, lo, hi); |
@@ -159,6 +159,7 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid) | |||
159 | { | 159 | { |
160 | u32 lo; | 160 | u32 lo; |
161 | u32 savevid = data->currvid; | 161 | u32 savevid = data->currvid; |
162 | u32 i = 0; | ||
162 | 163 | ||
163 | if ((fid & INVALID_FID_MASK) || (data->currvid & INVALID_VID_MASK)) { | 164 | if ((fid & INVALID_FID_MASK) || (data->currvid & INVALID_VID_MASK)) { |
164 | printk(KERN_ERR PFX "internal error - overflow on fid write\n"); | 165 | printk(KERN_ERR PFX "internal error - overflow on fid write\n"); |
@@ -170,10 +171,13 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid) | |||
170 | dprintk("writing fid 0x%x, lo 0x%x, hi 0x%x\n", | 171 | dprintk("writing fid 0x%x, lo 0x%x, hi 0x%x\n", |
171 | fid, lo, data->plllock * PLL_LOCK_CONVERSION); | 172 | fid, lo, data->plllock * PLL_LOCK_CONVERSION); |
172 | 173 | ||
173 | wrmsr(MSR_FIDVID_CTL, lo, data->plllock * PLL_LOCK_CONVERSION); | 174 | do { |
174 | 175 | wrmsr(MSR_FIDVID_CTL, lo, data->plllock * PLL_LOCK_CONVERSION); | |
175 | if (query_current_values_with_pending_wait(data)) | 176 | if (i++ > 100) { |
176 | return 1; | 177 | printk(KERN_ERR PFX "internal error - pending bit very stuck - no further pstate changes possible\n"); |
178 | return 1; | ||
179 | } | ||
180 | } while (query_current_values_with_pending_wait(data)); | ||
177 | 181 | ||
178 | count_off_irt(data); | 182 | count_off_irt(data); |
179 | 183 | ||
@@ -197,6 +201,7 @@ static int write_new_vid(struct powernow_k8_data *data, u32 vid) | |||
197 | { | 201 | { |
198 | u32 lo; | 202 | u32 lo; |
199 | u32 savefid = data->currfid; | 203 | u32 savefid = data->currfid; |
204 | int i = 0; | ||
200 | 205 | ||
201 | if ((data->currfid & INVALID_FID_MASK) || (vid & INVALID_VID_MASK)) { | 206 | if ((data->currfid & INVALID_FID_MASK) || (vid & INVALID_VID_MASK)) { |
202 | printk(KERN_ERR PFX "internal error - overflow on vid write\n"); | 207 | printk(KERN_ERR PFX "internal error - overflow on vid write\n"); |
@@ -208,10 +213,13 @@ static int write_new_vid(struct powernow_k8_data *data, u32 vid) | |||
208 | dprintk("writing vid 0x%x, lo 0x%x, hi 0x%x\n", | 213 | dprintk("writing vid 0x%x, lo 0x%x, hi 0x%x\n", |
209 | vid, lo, STOP_GRANT_5NS); | 214 | vid, lo, STOP_GRANT_5NS); |
210 | 215 | ||
211 | wrmsr(MSR_FIDVID_CTL, lo, STOP_GRANT_5NS); | 216 | do { |
212 | 217 | wrmsr(MSR_FIDVID_CTL, lo, STOP_GRANT_5NS); | |
213 | if (query_current_values_with_pending_wait(data)) | 218 | if (i++ > 100) { |
214 | return 1; | 219 | printk(KERN_ERR PFX "internal error - pending bit very stuck - no further pstate changes possible\n"); |
220 | return 1; | ||
221 | } | ||
222 | } while (query_current_values_with_pending_wait(data)); | ||
215 | 223 | ||
216 | if (savefid != data->currfid) { | 224 | if (savefid != data->currfid) { |
217 | printk(KERN_ERR PFX "fid changed on vid trans, old 0x%x new 0x%x\n", | 225 | printk(KERN_ERR PFX "fid changed on vid trans, old 0x%x new 0x%x\n", |
diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c index 80f8ef013939..1ba02baf2f94 100644 --- a/arch/ia64/hp/common/hwsw_iommu.c +++ b/arch/ia64/hp/common/hwsw_iommu.c | |||
@@ -71,7 +71,7 @@ hwsw_init (void) | |||
71 | } | 71 | } |
72 | 72 | ||
73 | void * | 73 | void * |
74 | hwsw_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flags) | 74 | hwsw_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) |
75 | { | 75 | { |
76 | if (use_swiotlb(dev)) | 76 | if (use_swiotlb(dev)) |
77 | return swiotlb_alloc_coherent(dev, size, dma_handle, flags); | 77 | return swiotlb_alloc_coherent(dev, size, dma_handle, flags); |
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 11957598a8b9..21bffba78b6d 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -1076,7 +1076,7 @@ void sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, int dir) | |||
1076 | * See Documentation/DMA-mapping.txt | 1076 | * See Documentation/DMA-mapping.txt |
1077 | */ | 1077 | */ |
1078 | void * | 1078 | void * |
1079 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flags) | 1079 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) |
1080 | { | 1080 | { |
1081 | struct ioc *ioc; | 1081 | struct ioc *ioc; |
1082 | void *addr; | 1082 | void *addr; |
diff --git a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c index dbc0b3e449c5..3ebbb3c8ba36 100644 --- a/arch/ia64/lib/swiotlb.c +++ b/arch/ia64/lib/swiotlb.c | |||
@@ -123,8 +123,8 @@ swiotlb_init_with_default_size (size_t default_size) | |||
123 | /* | 123 | /* |
124 | * Get IO TLB memory from the low pages | 124 | * Get IO TLB memory from the low pages |
125 | */ | 125 | */ |
126 | io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs * | 126 | io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs * |
127 | (1 << IO_TLB_SHIFT)); | 127 | (1 << IO_TLB_SHIFT), 0x100000000); |
128 | if (!io_tlb_start) | 128 | if (!io_tlb_start) |
129 | panic("Cannot allocate SWIOTLB buffer"); | 129 | panic("Cannot allocate SWIOTLB buffer"); |
130 | io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT); | 130 | io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT); |
@@ -314,7 +314,7 @@ sync_single(struct device *hwdev, char *dma_addr, size_t size, int dir) | |||
314 | 314 | ||
315 | void * | 315 | void * |
316 | swiotlb_alloc_coherent(struct device *hwdev, size_t size, | 316 | swiotlb_alloc_coherent(struct device *hwdev, size_t size, |
317 | dma_addr_t *dma_handle, int flags) | 317 | dma_addr_t *dma_handle, gfp_t flags) |
318 | { | 318 | { |
319 | unsigned long dev_addr; | 319 | unsigned long dev_addr; |
320 | void *ret; | 320 | void *ret; |
diff --git a/arch/ia64/sn/kernel/xpc.h b/arch/ia64/sn/kernel/xpc.h index d0ee635daf2e..e5f5a4e51f70 100644 --- a/arch/ia64/sn/kernel/xpc.h +++ b/arch/ia64/sn/kernel/xpc.h | |||
@@ -939,7 +939,7 @@ xpc_map_bte_errors(bte_result_t error) | |||
939 | 939 | ||
940 | 940 | ||
941 | static inline void * | 941 | static inline void * |
942 | xpc_kmalloc_cacheline_aligned(size_t size, int flags, void **base) | 942 | xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base) |
943 | { | 943 | { |
944 | /* see if kmalloc will give us cachline aligned memory by default */ | 944 | /* see if kmalloc will give us cachline aligned memory by default */ |
945 | *base = kmalloc(size, flags); | 945 | *base = kmalloc(size, flags); |
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c index 0e4b9ad9ef02..75e6e874bebf 100644 --- a/arch/ia64/sn/pci/pci_dma.c +++ b/arch/ia64/sn/pci/pci_dma.c | |||
@@ -75,7 +75,7 @@ EXPORT_SYMBOL(sn_dma_set_mask); | |||
75 | * more information. | 75 | * more information. |
76 | */ | 76 | */ |
77 | void *sn_dma_alloc_coherent(struct device *dev, size_t size, | 77 | void *sn_dma_alloc_coherent(struct device *dev, size_t size, |
78 | dma_addr_t * dma_handle, int flags) | 78 | dma_addr_t * dma_handle, gfp_t flags) |
79 | { | 79 | { |
80 | void *cpuaddr; | 80 | void *cpuaddr; |
81 | unsigned long phys_addr; | 81 | unsigned long phys_addr; |
diff --git a/arch/mips/mm/dma-coherent.c b/arch/mips/mm/dma-coherent.c index 97a50d38c98f..a617f8c327e8 100644 --- a/arch/mips/mm/dma-coherent.c +++ b/arch/mips/mm/dma-coherent.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | 19 | ||
20 | void *dma_alloc_noncoherent(struct device *dev, size_t size, | 20 | void *dma_alloc_noncoherent(struct device *dev, size_t size, |
21 | dma_addr_t * dma_handle, int gfp) | 21 | dma_addr_t * dma_handle, gfp_t gfp) |
22 | { | 22 | { |
23 | void *ret; | 23 | void *ret; |
24 | /* ignore region specifiers */ | 24 | /* ignore region specifiers */ |
@@ -39,7 +39,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, | |||
39 | EXPORT_SYMBOL(dma_alloc_noncoherent); | 39 | EXPORT_SYMBOL(dma_alloc_noncoherent); |
40 | 40 | ||
41 | void *dma_alloc_coherent(struct device *dev, size_t size, | 41 | void *dma_alloc_coherent(struct device *dev, size_t size, |
42 | dma_addr_t * dma_handle, int gfp) | 42 | dma_addr_t * dma_handle, gfp_t gfp) |
43 | __attribute__((alias("dma_alloc_noncoherent"))); | 43 | __attribute__((alias("dma_alloc_noncoherent"))); |
44 | 44 | ||
45 | EXPORT_SYMBOL(dma_alloc_coherent); | 45 | EXPORT_SYMBOL(dma_alloc_coherent); |
diff --git a/arch/mips/mm/dma-ip27.c b/arch/mips/mm/dma-ip27.c index aa7c94b5d781..8da19fd22ac6 100644 --- a/arch/mips/mm/dma-ip27.c +++ b/arch/mips/mm/dma-ip27.c | |||
@@ -22,7 +22,7 @@ | |||
22 | pdev_to_baddr(to_pci_dev(dev), (addr)) | 22 | pdev_to_baddr(to_pci_dev(dev), (addr)) |
23 | 23 | ||
24 | void *dma_alloc_noncoherent(struct device *dev, size_t size, | 24 | void *dma_alloc_noncoherent(struct device *dev, size_t size, |
25 | dma_addr_t * dma_handle, int gfp) | 25 | dma_addr_t * dma_handle, gfp_t gfp) |
26 | { | 26 | { |
27 | void *ret; | 27 | void *ret; |
28 | 28 | ||
@@ -44,7 +44,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, | |||
44 | EXPORT_SYMBOL(dma_alloc_noncoherent); | 44 | EXPORT_SYMBOL(dma_alloc_noncoherent); |
45 | 45 | ||
46 | void *dma_alloc_coherent(struct device *dev, size_t size, | 46 | void *dma_alloc_coherent(struct device *dev, size_t size, |
47 | dma_addr_t * dma_handle, int gfp) | 47 | dma_addr_t * dma_handle, gfp_t gfp) |
48 | __attribute__((alias("dma_alloc_noncoherent"))); | 48 | __attribute__((alias("dma_alloc_noncoherent"))); |
49 | 49 | ||
50 | EXPORT_SYMBOL(dma_alloc_coherent); | 50 | EXPORT_SYMBOL(dma_alloc_coherent); |
diff --git a/arch/mips/mm/dma-ip32.c b/arch/mips/mm/dma-ip32.c index 2cbe196c35fb..a7e3072ff78d 100644 --- a/arch/mips/mm/dma-ip32.c +++ b/arch/mips/mm/dma-ip32.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #define RAM_OFFSET_MASK 0x3fffffff | 37 | #define RAM_OFFSET_MASK 0x3fffffff |
38 | 38 | ||
39 | void *dma_alloc_noncoherent(struct device *dev, size_t size, | 39 | void *dma_alloc_noncoherent(struct device *dev, size_t size, |
40 | dma_addr_t * dma_handle, int gfp) | 40 | dma_addr_t * dma_handle, gfp_t gfp) |
41 | { | 41 | { |
42 | void *ret; | 42 | void *ret; |
43 | /* ignore region specifiers */ | 43 | /* ignore region specifiers */ |
@@ -61,7 +61,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, | |||
61 | EXPORT_SYMBOL(dma_alloc_noncoherent); | 61 | EXPORT_SYMBOL(dma_alloc_noncoherent); |
62 | 62 | ||
63 | void *dma_alloc_coherent(struct device *dev, size_t size, | 63 | void *dma_alloc_coherent(struct device *dev, size_t size, |
64 | dma_addr_t * dma_handle, int gfp) | 64 | dma_addr_t * dma_handle, gfp_t gfp) |
65 | { | 65 | { |
66 | void *ret; | 66 | void *ret; |
67 | 67 | ||
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c index 59e54f12212e..4ce02028a292 100644 --- a/arch/mips/mm/dma-noncoherent.c +++ b/arch/mips/mm/dma-noncoherent.c | |||
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | void *dma_alloc_noncoherent(struct device *dev, size_t size, | 26 | void *dma_alloc_noncoherent(struct device *dev, size_t size, |
27 | dma_addr_t * dma_handle, int gfp) | 27 | dma_addr_t * dma_handle, gfp_t gfp) |
28 | { | 28 | { |
29 | void *ret; | 29 | void *ret; |
30 | /* ignore region specifiers */ | 30 | /* ignore region specifiers */ |
@@ -45,7 +45,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, | |||
45 | EXPORT_SYMBOL(dma_alloc_noncoherent); | 45 | EXPORT_SYMBOL(dma_alloc_noncoherent); |
46 | 46 | ||
47 | void *dma_alloc_coherent(struct device *dev, size_t size, | 47 | void *dma_alloc_coherent(struct device *dev, size_t size, |
48 | dma_addr_t * dma_handle, int gfp) | 48 | dma_addr_t * dma_handle, gfp_t gfp) |
49 | { | 49 | { |
50 | void *ret; | 50 | void *ret; |
51 | 51 | ||
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index 368cc095c99f..844c2877a2e3 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c | |||
@@ -349,7 +349,7 @@ pcxl_dma_init(void) | |||
349 | 349 | ||
350 | __initcall(pcxl_dma_init); | 350 | __initcall(pcxl_dma_init); |
351 | 351 | ||
352 | static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flag) | 352 | static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) |
353 | { | 353 | { |
354 | unsigned long vaddr; | 354 | unsigned long vaddr; |
355 | unsigned long paddr; | 355 | unsigned long paddr; |
@@ -502,13 +502,13 @@ struct hppa_dma_ops pcxl_dma_ops = { | |||
502 | }; | 502 | }; |
503 | 503 | ||
504 | static void *fail_alloc_consistent(struct device *dev, size_t size, | 504 | static void *fail_alloc_consistent(struct device *dev, size_t size, |
505 | dma_addr_t *dma_handle, int flag) | 505 | dma_addr_t *dma_handle, gfp_t flag) |
506 | { | 506 | { |
507 | return NULL; | 507 | return NULL; |
508 | } | 508 | } |
509 | 509 | ||
510 | static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size, | 510 | static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size, |
511 | dma_addr_t *dma_handle, int flag) | 511 | dma_addr_t *dma_handle, gfp_t flag) |
512 | { | 512 | { |
513 | void *addr = NULL; | 513 | void *addr = NULL; |
514 | 514 | ||
diff --git a/arch/ppc/8xx_io/cs4218.h b/arch/ppc/8xx_io/cs4218.h index a3c38c5a5db2..f1c7392255f8 100644 --- a/arch/ppc/8xx_io/cs4218.h +++ b/arch/ppc/8xx_io/cs4218.h | |||
@@ -78,7 +78,7 @@ typedef struct { | |||
78 | const char *name2; | 78 | const char *name2; |
79 | void (*open)(void); | 79 | void (*open)(void); |
80 | void (*release)(void); | 80 | void (*release)(void); |
81 | void *(*dma_alloc)(unsigned int, int); | 81 | void *(*dma_alloc)(unsigned int, gfp_t); |
82 | void (*dma_free)(void *, unsigned int); | 82 | void (*dma_free)(void *, unsigned int); |
83 | int (*irqinit)(void); | 83 | int (*irqinit)(void); |
84 | #ifdef MODULE | 84 | #ifdef MODULE |
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c index 2ca9ec7ec3a7..532caa388dc2 100644 --- a/arch/ppc/8xx_io/cs4218_tdm.c +++ b/arch/ppc/8xx_io/cs4218_tdm.c | |||
@@ -318,7 +318,7 @@ struct cs_sound_settings { | |||
318 | 318 | ||
319 | static struct cs_sound_settings sound; | 319 | static struct cs_sound_settings sound; |
320 | 320 | ||
321 | static void *CS_Alloc(unsigned int size, int flags); | 321 | static void *CS_Alloc(unsigned int size, gfp_t flags); |
322 | static void CS_Free(void *ptr, unsigned int size); | 322 | static void CS_Free(void *ptr, unsigned int size); |
323 | static int CS_IrqInit(void); | 323 | static int CS_IrqInit(void); |
324 | #ifdef MODULE | 324 | #ifdef MODULE |
@@ -959,7 +959,7 @@ static TRANS transCSNormalRead = { | |||
959 | 959 | ||
960 | /*** Low level stuff *********************************************************/ | 960 | /*** Low level stuff *********************************************************/ |
961 | 961 | ||
962 | static void *CS_Alloc(unsigned int size, int flags) | 962 | static void *CS_Alloc(unsigned int size, gfp_t flags) |
963 | { | 963 | { |
964 | int order; | 964 | int order; |
965 | 965 | ||
diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c index 8edee806dae7..0f710d2baec6 100644 --- a/arch/ppc/kernel/dma-mapping.c +++ b/arch/ppc/kernel/dma-mapping.c | |||
@@ -115,7 +115,7 @@ static struct vm_region consistent_head = { | |||
115 | }; | 115 | }; |
116 | 116 | ||
117 | static struct vm_region * | 117 | static struct vm_region * |
118 | vm_region_alloc(struct vm_region *head, size_t size, int gfp) | 118 | vm_region_alloc(struct vm_region *head, size_t size, gfp_t gfp) |
119 | { | 119 | { |
120 | unsigned long addr = head->vm_start, end = head->vm_end - size; | 120 | unsigned long addr = head->vm_start, end = head->vm_end - size; |
121 | unsigned long flags; | 121 | unsigned long flags; |
@@ -173,7 +173,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad | |||
173 | * virtual and bus address for that space. | 173 | * virtual and bus address for that space. |
174 | */ | 174 | */ |
175 | void * | 175 | void * |
176 | __dma_alloc_coherent(size_t size, dma_addr_t *handle, int gfp) | 176 | __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp) |
177 | { | 177 | { |
178 | struct page *page; | 178 | struct page *page; |
179 | struct vm_region *c; | 179 | struct vm_region *c; |
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c index 81a3d7446d37..43505b1fc5d8 100644 --- a/arch/ppc/mm/pgtable.c +++ b/arch/ppc/mm/pgtable.c | |||
@@ -114,9 +114,9 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) | |||
114 | struct page *ptepage; | 114 | struct page *ptepage; |
115 | 115 | ||
116 | #ifdef CONFIG_HIGHPTE | 116 | #ifdef CONFIG_HIGHPTE |
117 | int flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT; | 117 | gfp_t flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT; |
118 | #else | 118 | #else |
119 | int flags = GFP_KERNEL | __GFP_REPEAT; | 119 | gfp_t flags = GFP_KERNEL | __GFP_REPEAT; |
120 | #endif | 120 | #endif |
121 | 121 | ||
122 | ptepage = alloc_pages(flags, 0); | 122 | ptepage = alloc_pages(flags, 0); |
diff --git a/arch/ppc64/configs/bpa_defconfig b/arch/ppc64/configs/bpa_defconfig index 46c5da41c3ae..67ffecbc05cb 100644 --- a/arch/ppc64/configs/bpa_defconfig +++ b/arch/ppc64/configs/bpa_defconfig | |||
@@ -1,17 +1,17 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6 | 3 | # Linux kernel version: 2.6.14-rc4 |
4 | # Mon Aug 8 14:12:19 2005 | 4 | # Thu Oct 20 08:29:10 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 9 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
10 | CONFIG_GENERIC_ISA_DMA=y | 10 | CONFIG_GENERIC_ISA_DMA=y |
11 | CONFIG_HAVE_DEC_LOCK=y | ||
12 | CONFIG_EARLY_PRINTK=y | 11 | CONFIG_EARLY_PRINTK=y |
13 | CONFIG_COMPAT=y | 12 | CONFIG_COMPAT=y |
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 13 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
14 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
15 | CONFIG_FORCE_MAX_ZONEORDER=13 | 15 | CONFIG_FORCE_MAX_ZONEORDER=13 |
16 | 16 | ||
17 | # | 17 | # |
@@ -26,6 +26,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
26 | # General setup | 26 | # General setup |
27 | # | 27 | # |
28 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
29 | CONFIG_LOCALVERSION_AUTO=y | ||
29 | CONFIG_SWAP=y | 30 | CONFIG_SWAP=y |
30 | CONFIG_SYSVIPC=y | 31 | CONFIG_SYSVIPC=y |
31 | # CONFIG_POSIX_MQUEUE is not set | 32 | # CONFIG_POSIX_MQUEUE is not set |
@@ -36,6 +37,7 @@ CONFIG_HOTPLUG=y | |||
36 | CONFIG_KOBJECT_UEVENT=y | 37 | CONFIG_KOBJECT_UEVENT=y |
37 | # CONFIG_IKCONFIG is not set | 38 | # CONFIG_IKCONFIG is not set |
38 | # CONFIG_CPUSETS is not set | 39 | # CONFIG_CPUSETS is not set |
40 | CONFIG_INITRAMFS_SOURCE="" | ||
39 | # CONFIG_EMBEDDED is not set | 41 | # CONFIG_EMBEDDED is not set |
40 | CONFIG_KALLSYMS=y | 42 | CONFIG_KALLSYMS=y |
41 | # CONFIG_KALLSYMS_ALL is not set | 43 | # CONFIG_KALLSYMS_ALL is not set |
@@ -95,6 +97,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
95 | # CONFIG_SPARSEMEM_MANUAL is not set | 97 | # CONFIG_SPARSEMEM_MANUAL is not set |
96 | CONFIG_FLATMEM=y | 98 | CONFIG_FLATMEM=y |
97 | CONFIG_FLAT_NODE_MEM_MAP=y | 99 | CONFIG_FLAT_NODE_MEM_MAP=y |
100 | # CONFIG_SPARSEMEM_STATIC is not set | ||
98 | # CONFIG_NUMA is not set | 101 | # CONFIG_NUMA is not set |
99 | CONFIG_SCHED_SMT=y | 102 | CONFIG_SCHED_SMT=y |
100 | CONFIG_PREEMPT_NONE=y | 103 | CONFIG_PREEMPT_NONE=y |
@@ -110,17 +113,18 @@ CONFIG_PPC_RTAS=y | |||
110 | CONFIG_RTAS_PROC=y | 113 | CONFIG_RTAS_PROC=y |
111 | CONFIG_RTAS_FLASH=y | 114 | CONFIG_RTAS_FLASH=y |
112 | CONFIG_SECCOMP=y | 115 | CONFIG_SECCOMP=y |
116 | CONFIG_BINFMT_ELF=y | ||
117 | # CONFIG_BINFMT_MISC is not set | ||
118 | CONFIG_PROC_DEVICETREE=y | ||
119 | # CONFIG_CMDLINE_BOOL is not set | ||
113 | CONFIG_ISA_DMA_API=y | 120 | CONFIG_ISA_DMA_API=y |
114 | 121 | ||
115 | # | 122 | # |
116 | # General setup | 123 | # Bus Options |
117 | # | 124 | # |
118 | CONFIG_PCI=y | 125 | CONFIG_PCI=y |
119 | CONFIG_PCI_DOMAINS=y | 126 | CONFIG_PCI_DOMAINS=y |
120 | CONFIG_BINFMT_ELF=y | ||
121 | # CONFIG_BINFMT_MISC is not set | ||
122 | CONFIG_PCI_LEGACY_PROC=y | 127 | CONFIG_PCI_LEGACY_PROC=y |
123 | CONFIG_PCI_NAMES=y | ||
124 | # CONFIG_PCI_DEBUG is not set | 128 | # CONFIG_PCI_DEBUG is not set |
125 | 129 | ||
126 | # | 130 | # |
@@ -132,8 +136,6 @@ CONFIG_PCI_NAMES=y | |||
132 | # PCI Hotplug Support | 136 | # PCI Hotplug Support |
133 | # | 137 | # |
134 | # CONFIG_HOTPLUG_PCI is not set | 138 | # CONFIG_HOTPLUG_PCI is not set |
135 | CONFIG_PROC_DEVICETREE=y | ||
136 | # CONFIG_CMDLINE_BOOL is not set | ||
137 | 139 | ||
138 | # | 140 | # |
139 | # Networking | 141 | # Networking |
@@ -163,8 +165,8 @@ CONFIG_SYN_COOKIES=y | |||
163 | # CONFIG_INET_ESP is not set | 165 | # CONFIG_INET_ESP is not set |
164 | # CONFIG_INET_IPCOMP is not set | 166 | # CONFIG_INET_IPCOMP is not set |
165 | CONFIG_INET_TUNNEL=y | 167 | CONFIG_INET_TUNNEL=y |
166 | CONFIG_IP_TCPDIAG=y | 168 | CONFIG_INET_DIAG=y |
167 | CONFIG_IP_TCPDIAG_IPV6=y | 169 | CONFIG_INET_TCP_DIAG=y |
168 | # CONFIG_TCP_CONG_ADVANCED is not set | 170 | # CONFIG_TCP_CONG_ADVANCED is not set |
169 | CONFIG_TCP_CONG_BIC=y | 171 | CONFIG_TCP_CONG_BIC=y |
170 | 172 | ||
@@ -181,6 +183,7 @@ CONFIG_INET6_TUNNEL=m | |||
181 | CONFIG_IPV6_TUNNEL=m | 183 | CONFIG_IPV6_TUNNEL=m |
182 | CONFIG_NETFILTER=y | 184 | CONFIG_NETFILTER=y |
183 | # CONFIG_NETFILTER_DEBUG is not set | 185 | # CONFIG_NETFILTER_DEBUG is not set |
186 | # CONFIG_NETFILTER_NETLINK is not set | ||
184 | 187 | ||
185 | # | 188 | # |
186 | # IP: Netfilter Configuration | 189 | # IP: Netfilter Configuration |
@@ -188,11 +191,14 @@ CONFIG_NETFILTER=y | |||
188 | CONFIG_IP_NF_CONNTRACK=y | 191 | CONFIG_IP_NF_CONNTRACK=y |
189 | # CONFIG_IP_NF_CT_ACCT is not set | 192 | # CONFIG_IP_NF_CT_ACCT is not set |
190 | # CONFIG_IP_NF_CONNTRACK_MARK is not set | 193 | # CONFIG_IP_NF_CONNTRACK_MARK is not set |
194 | # CONFIG_IP_NF_CONNTRACK_EVENTS is not set | ||
191 | CONFIG_IP_NF_CT_PROTO_SCTP=y | 195 | CONFIG_IP_NF_CT_PROTO_SCTP=y |
192 | CONFIG_IP_NF_FTP=m | 196 | CONFIG_IP_NF_FTP=m |
193 | CONFIG_IP_NF_IRC=m | 197 | CONFIG_IP_NF_IRC=m |
198 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
194 | CONFIG_IP_NF_TFTP=m | 199 | CONFIG_IP_NF_TFTP=m |
195 | CONFIG_IP_NF_AMANDA=m | 200 | CONFIG_IP_NF_AMANDA=m |
201 | # CONFIG_IP_NF_PPTP is not set | ||
196 | CONFIG_IP_NF_QUEUE=m | 202 | CONFIG_IP_NF_QUEUE=m |
197 | CONFIG_IP_NF_IPTABLES=m | 203 | CONFIG_IP_NF_IPTABLES=m |
198 | CONFIG_IP_NF_MATCH_LIMIT=m | 204 | CONFIG_IP_NF_MATCH_LIMIT=m |
@@ -216,13 +222,16 @@ CONFIG_IP_NF_MATCH_OWNER=m | |||
216 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 222 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
217 | CONFIG_IP_NF_MATCH_REALM=m | 223 | CONFIG_IP_NF_MATCH_REALM=m |
218 | CONFIG_IP_NF_MATCH_SCTP=m | 224 | CONFIG_IP_NF_MATCH_SCTP=m |
225 | # CONFIG_IP_NF_MATCH_DCCP is not set | ||
219 | CONFIG_IP_NF_MATCH_COMMENT=m | 226 | CONFIG_IP_NF_MATCH_COMMENT=m |
220 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 227 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
228 | CONFIG_IP_NF_MATCH_STRING=m | ||
221 | CONFIG_IP_NF_FILTER=m | 229 | CONFIG_IP_NF_FILTER=m |
222 | CONFIG_IP_NF_TARGET_REJECT=m | 230 | CONFIG_IP_NF_TARGET_REJECT=m |
223 | CONFIG_IP_NF_TARGET_LOG=m | 231 | CONFIG_IP_NF_TARGET_LOG=m |
224 | CONFIG_IP_NF_TARGET_ULOG=m | 232 | CONFIG_IP_NF_TARGET_ULOG=m |
225 | CONFIG_IP_NF_TARGET_TCPMSS=m | 233 | CONFIG_IP_NF_TARGET_TCPMSS=m |
234 | CONFIG_IP_NF_TARGET_NFQUEUE=m | ||
226 | CONFIG_IP_NF_NAT=m | 235 | CONFIG_IP_NF_NAT=m |
227 | CONFIG_IP_NF_NAT_NEEDED=y | 236 | CONFIG_IP_NF_NAT_NEEDED=y |
228 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 237 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
@@ -240,6 +249,7 @@ CONFIG_IP_NF_TARGET_ECN=m | |||
240 | CONFIG_IP_NF_TARGET_DSCP=m | 249 | CONFIG_IP_NF_TARGET_DSCP=m |
241 | CONFIG_IP_NF_TARGET_MARK=m | 250 | CONFIG_IP_NF_TARGET_MARK=m |
242 | CONFIG_IP_NF_TARGET_CLASSIFY=m | 251 | CONFIG_IP_NF_TARGET_CLASSIFY=m |
252 | CONFIG_IP_NF_TARGET_TTL=m | ||
243 | CONFIG_IP_NF_RAW=m | 253 | CONFIG_IP_NF_RAW=m |
244 | CONFIG_IP_NF_TARGET_NOTRACK=m | 254 | CONFIG_IP_NF_TARGET_NOTRACK=m |
245 | CONFIG_IP_NF_ARPTABLES=m | 255 | CONFIG_IP_NF_ARPTABLES=m |
@@ -251,6 +261,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
251 | # | 261 | # |
252 | # CONFIG_IP6_NF_QUEUE is not set | 262 | # CONFIG_IP6_NF_QUEUE is not set |
253 | # CONFIG_IP6_NF_IPTABLES is not set | 263 | # CONFIG_IP6_NF_IPTABLES is not set |
264 | # CONFIG_IP6_NF_TARGET_NFQUEUE is not set | ||
265 | |||
266 | # | ||
267 | # DCCP Configuration (EXPERIMENTAL) | ||
268 | # | ||
269 | # CONFIG_IP_DCCP is not set | ||
254 | 270 | ||
255 | # | 271 | # |
256 | # SCTP Configuration (EXPERIMENTAL) | 272 | # SCTP Configuration (EXPERIMENTAL) |
@@ -278,6 +294,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
278 | # CONFIG_HAMRADIO is not set | 294 | # CONFIG_HAMRADIO is not set |
279 | # CONFIG_IRDA is not set | 295 | # CONFIG_IRDA is not set |
280 | # CONFIG_BT is not set | 296 | # CONFIG_BT is not set |
297 | # CONFIG_IEEE80211 is not set | ||
281 | 298 | ||
282 | # | 299 | # |
283 | # Device Drivers | 300 | # Device Drivers |
@@ -292,6 +309,11 @@ CONFIG_FW_LOADER=y | |||
292 | # CONFIG_DEBUG_DRIVER is not set | 309 | # CONFIG_DEBUG_DRIVER is not set |
293 | 310 | ||
294 | # | 311 | # |
312 | # Connector - unified userspace <-> kernelspace linker | ||
313 | # | ||
314 | # CONFIG_CONNECTOR is not set | ||
315 | |||
316 | # | ||
295 | # Memory Technology Devices (MTD) | 317 | # Memory Technology Devices (MTD) |
296 | # | 318 | # |
297 | # CONFIG_MTD is not set | 319 | # CONFIG_MTD is not set |
@@ -322,7 +344,6 @@ CONFIG_BLK_DEV_RAM=y | |||
322 | CONFIG_BLK_DEV_RAM_COUNT=16 | 344 | CONFIG_BLK_DEV_RAM_COUNT=16 |
323 | CONFIG_BLK_DEV_RAM_SIZE=131072 | 345 | CONFIG_BLK_DEV_RAM_SIZE=131072 |
324 | CONFIG_BLK_DEV_INITRD=y | 346 | CONFIG_BLK_DEV_INITRD=y |
325 | CONFIG_INITRAMFS_SOURCE="" | ||
326 | # CONFIG_CDROM_PKTCDVD is not set | 347 | # CONFIG_CDROM_PKTCDVD is not set |
327 | 348 | ||
328 | # | 349 | # |
@@ -395,6 +416,7 @@ CONFIG_IDEDMA_AUTO=y | |||
395 | # | 416 | # |
396 | # SCSI device support | 417 | # SCSI device support |
397 | # | 418 | # |
419 | # CONFIG_RAID_ATTRS is not set | ||
398 | # CONFIG_SCSI is not set | 420 | # CONFIG_SCSI is not set |
399 | 421 | ||
400 | # | 422 | # |
@@ -436,12 +458,18 @@ CONFIG_NETDEVICES=y | |||
436 | # CONFIG_ARCNET is not set | 458 | # CONFIG_ARCNET is not set |
437 | 459 | ||
438 | # | 460 | # |
461 | # PHY device support | ||
462 | # | ||
463 | # CONFIG_PHYLIB is not set | ||
464 | |||
465 | # | ||
439 | # Ethernet (10 or 100Mbit) | 466 | # Ethernet (10 or 100Mbit) |
440 | # | 467 | # |
441 | CONFIG_NET_ETHERNET=y | 468 | CONFIG_NET_ETHERNET=y |
442 | CONFIG_MII=y | 469 | CONFIG_MII=y |
443 | # CONFIG_HAPPYMEAL is not set | 470 | # CONFIG_HAPPYMEAL is not set |
444 | # CONFIG_SUNGEM is not set | 471 | # CONFIG_SUNGEM is not set |
472 | # CONFIG_CASSINI is not set | ||
445 | # CONFIG_NET_VENDOR_3COM is not set | 473 | # CONFIG_NET_VENDOR_3COM is not set |
446 | 474 | ||
447 | # | 475 | # |
@@ -462,15 +490,18 @@ CONFIG_E1000=m | |||
462 | # CONFIG_HAMACHI is not set | 490 | # CONFIG_HAMACHI is not set |
463 | # CONFIG_YELLOWFIN is not set | 491 | # CONFIG_YELLOWFIN is not set |
464 | # CONFIG_R8169 is not set | 492 | # CONFIG_R8169 is not set |
493 | # CONFIG_SIS190 is not set | ||
465 | CONFIG_SKGE=m | 494 | CONFIG_SKGE=m |
466 | # CONFIG_SK98LIN is not set | 495 | # CONFIG_SK98LIN is not set |
467 | # CONFIG_TIGON3 is not set | 496 | # CONFIG_TIGON3 is not set |
468 | # CONFIG_BNX2 is not set | 497 | # CONFIG_BNX2 is not set |
498 | # CONFIG_SPIDER_NET is not set | ||
469 | # CONFIG_MV643XX_ETH is not set | 499 | # CONFIG_MV643XX_ETH is not set |
470 | 500 | ||
471 | # | 501 | # |
472 | # Ethernet (10000 Mbit) | 502 | # Ethernet (10000 Mbit) |
473 | # | 503 | # |
504 | # CONFIG_CHELSIO_T1 is not set | ||
474 | # CONFIG_IXGB is not set | 505 | # CONFIG_IXGB is not set |
475 | # CONFIG_S2IO is not set | 506 | # CONFIG_S2IO is not set |
476 | 507 | ||
@@ -552,6 +583,7 @@ CONFIG_HW_CONSOLE=y | |||
552 | CONFIG_SERIAL_NONSTANDARD=y | 583 | CONFIG_SERIAL_NONSTANDARD=y |
553 | # CONFIG_ROCKETPORT is not set | 584 | # CONFIG_ROCKETPORT is not set |
554 | # CONFIG_CYCLADES is not set | 585 | # CONFIG_CYCLADES is not set |
586 | # CONFIG_DIGIEPCA is not set | ||
555 | # CONFIG_MOXA_SMARTIO is not set | 587 | # CONFIG_MOXA_SMARTIO is not set |
556 | # CONFIG_ISI is not set | 588 | # CONFIG_ISI is not set |
557 | # CONFIG_SYNCLINK is not set | 589 | # CONFIG_SYNCLINK is not set |
@@ -642,7 +674,6 @@ CONFIG_I2C_ALGOBIT=y | |||
642 | # CONFIG_I2C_I801 is not set | 674 | # CONFIG_I2C_I801 is not set |
643 | # CONFIG_I2C_I810 is not set | 675 | # CONFIG_I2C_I810 is not set |
644 | # CONFIG_I2C_PIIX4 is not set | 676 | # CONFIG_I2C_PIIX4 is not set |
645 | # CONFIG_I2C_ISA is not set | ||
646 | # CONFIG_I2C_NFORCE2 is not set | 677 | # CONFIG_I2C_NFORCE2 is not set |
647 | # CONFIG_I2C_PARPORT_LIGHT is not set | 678 | # CONFIG_I2C_PARPORT_LIGHT is not set |
648 | # CONFIG_I2C_PROSAVAGE is not set | 679 | # CONFIG_I2C_PROSAVAGE is not set |
@@ -656,7 +687,6 @@ CONFIG_I2C_ALGOBIT=y | |||
656 | # CONFIG_I2C_VIAPRO is not set | 687 | # CONFIG_I2C_VIAPRO is not set |
657 | # CONFIG_I2C_VOODOO3 is not set | 688 | # CONFIG_I2C_VOODOO3 is not set |
658 | # CONFIG_I2C_PCA_ISA is not set | 689 | # CONFIG_I2C_PCA_ISA is not set |
659 | # CONFIG_I2C_SENSOR is not set | ||
660 | 690 | ||
661 | # | 691 | # |
662 | # Miscellaneous I2C Chip support | 692 | # Miscellaneous I2C Chip support |
@@ -683,12 +713,17 @@ CONFIG_I2C_ALGOBIT=y | |||
683 | # Hardware Monitoring support | 713 | # Hardware Monitoring support |
684 | # | 714 | # |
685 | # CONFIG_HWMON is not set | 715 | # CONFIG_HWMON is not set |
716 | # CONFIG_HWMON_VID is not set | ||
686 | 717 | ||
687 | # | 718 | # |
688 | # Misc devices | 719 | # Misc devices |
689 | # | 720 | # |
690 | 721 | ||
691 | # | 722 | # |
723 | # Multimedia Capabilities Port drivers | ||
724 | # | ||
725 | |||
726 | # | ||
692 | # Multimedia devices | 727 | # Multimedia devices |
693 | # | 728 | # |
694 | # CONFIG_VIDEO_DEV is not set | 729 | # CONFIG_VIDEO_DEV is not set |
@@ -756,10 +791,6 @@ CONFIG_FS_MBCACHE=y | |||
756 | # CONFIG_REISERFS_FS is not set | 791 | # CONFIG_REISERFS_FS is not set |
757 | # CONFIG_JFS_FS is not set | 792 | # CONFIG_JFS_FS is not set |
758 | CONFIG_FS_POSIX_ACL=y | 793 | CONFIG_FS_POSIX_ACL=y |
759 | |||
760 | # | ||
761 | # XFS support | ||
762 | # | ||
763 | # CONFIG_XFS_FS is not set | 794 | # CONFIG_XFS_FS is not set |
764 | # CONFIG_MINIX_FS is not set | 795 | # CONFIG_MINIX_FS is not set |
765 | # CONFIG_ROMFS_FS is not set | 796 | # CONFIG_ROMFS_FS is not set |
@@ -768,6 +799,7 @@ CONFIG_INOTIFY=y | |||
768 | CONFIG_DNOTIFY=y | 799 | CONFIG_DNOTIFY=y |
769 | # CONFIG_AUTOFS_FS is not set | 800 | # CONFIG_AUTOFS_FS is not set |
770 | # CONFIG_AUTOFS4_FS is not set | 801 | # CONFIG_AUTOFS4_FS is not set |
802 | # CONFIG_FUSE_FS is not set | ||
771 | 803 | ||
772 | # | 804 | # |
773 | # CD-ROM/DVD Filesystems | 805 | # CD-ROM/DVD Filesystems |
@@ -794,13 +826,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
794 | CONFIG_PROC_FS=y | 826 | CONFIG_PROC_FS=y |
795 | CONFIG_PROC_KCORE=y | 827 | CONFIG_PROC_KCORE=y |
796 | CONFIG_SYSFS=y | 828 | CONFIG_SYSFS=y |
797 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
798 | CONFIG_TMPFS=y | 829 | CONFIG_TMPFS=y |
799 | CONFIG_TMPFS_XATTR=y | ||
800 | # CONFIG_TMPFS_SECURITY is not set | ||
801 | CONFIG_HUGETLBFS=y | 830 | CONFIG_HUGETLBFS=y |
802 | CONFIG_HUGETLB_PAGE=y | 831 | CONFIG_HUGETLB_PAGE=y |
803 | CONFIG_RAMFS=y | 832 | CONFIG_RAMFS=y |
833 | # CONFIG_RELAYFS_FS is not set | ||
804 | 834 | ||
805 | # | 835 | # |
806 | # Miscellaneous filesystems | 836 | # Miscellaneous filesystems |
@@ -846,6 +876,7 @@ CONFIG_SUNRPC=m | |||
846 | # CONFIG_NCP_FS is not set | 876 | # CONFIG_NCP_FS is not set |
847 | # CONFIG_CODA_FS is not set | 877 | # CONFIG_CODA_FS is not set |
848 | # CONFIG_AFS_FS is not set | 878 | # CONFIG_AFS_FS is not set |
879 | # CONFIG_9P_FS is not set | ||
849 | 880 | ||
850 | # | 881 | # |
851 | # Partition Types | 882 | # Partition Types |
@@ -923,6 +954,7 @@ CONFIG_NLS_ISO8859_15=m | |||
923 | CONFIG_DEBUG_KERNEL=y | 954 | CONFIG_DEBUG_KERNEL=y |
924 | CONFIG_MAGIC_SYSRQ=y | 955 | CONFIG_MAGIC_SYSRQ=y |
925 | CONFIG_LOG_BUF_SHIFT=15 | 956 | CONFIG_LOG_BUF_SHIFT=15 |
957 | CONFIG_DETECT_SOFTLOCKUP=y | ||
926 | # CONFIG_SCHEDSTATS is not set | 958 | # CONFIG_SCHEDSTATS is not set |
927 | # CONFIG_DEBUG_SLAB is not set | 959 | # CONFIG_DEBUG_SLAB is not set |
928 | # CONFIG_DEBUG_SPINLOCK is not set | 960 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -981,7 +1013,12 @@ CONFIG_CRYPTO_DEFLATE=m | |||
981 | # Library routines | 1013 | # Library routines |
982 | # | 1014 | # |
983 | # CONFIG_CRC_CCITT is not set | 1015 | # CONFIG_CRC_CCITT is not set |
1016 | # CONFIG_CRC16 is not set | ||
984 | CONFIG_CRC32=y | 1017 | CONFIG_CRC32=y |
985 | # CONFIG_LIBCRC32C is not set | 1018 | # CONFIG_LIBCRC32C is not set |
986 | CONFIG_ZLIB_INFLATE=m | 1019 | CONFIG_ZLIB_INFLATE=m |
987 | CONFIG_ZLIB_DEFLATE=m | 1020 | CONFIG_ZLIB_DEFLATE=m |
1021 | CONFIG_TEXTSEARCH=y | ||
1022 | CONFIG_TEXTSEARCH_KMP=m | ||
1023 | CONFIG_TEXTSEARCH_BM=m | ||
1024 | CONFIG_TEXTSEARCH_FSM=m | ||
diff --git a/arch/ppc64/configs/g5_defconfig b/arch/ppc64/configs/g5_defconfig index fc83d9330282..6323065fbf2c 100644 --- a/arch/ppc64/configs/g5_defconfig +++ b/arch/ppc64/configs/g5_defconfig | |||
@@ -1,17 +1,17 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6 | 3 | # Linux kernel version: 2.6.14-rc4 |
4 | # Mon Aug 8 14:16:59 2005 | 4 | # Thu Oct 20 08:30:23 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 9 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
10 | CONFIG_GENERIC_ISA_DMA=y | 10 | CONFIG_GENERIC_ISA_DMA=y |
11 | CONFIG_HAVE_DEC_LOCK=y | ||
12 | CONFIG_EARLY_PRINTK=y | 11 | CONFIG_EARLY_PRINTK=y |
13 | CONFIG_COMPAT=y | 12 | CONFIG_COMPAT=y |
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 13 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
14 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
15 | CONFIG_FORCE_MAX_ZONEORDER=13 | 15 | CONFIG_FORCE_MAX_ZONEORDER=13 |
16 | 16 | ||
17 | # | 17 | # |
@@ -26,6 +26,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
26 | # General setup | 26 | # General setup |
27 | # | 27 | # |
28 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
29 | CONFIG_LOCALVERSION_AUTO=y | ||
29 | CONFIG_SWAP=y | 30 | CONFIG_SWAP=y |
30 | CONFIG_SYSVIPC=y | 31 | CONFIG_SYSVIPC=y |
31 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
@@ -37,6 +38,7 @@ CONFIG_KOBJECT_UEVENT=y | |||
37 | CONFIG_IKCONFIG=y | 38 | CONFIG_IKCONFIG=y |
38 | CONFIG_IKCONFIG_PROC=y | 39 | CONFIG_IKCONFIG_PROC=y |
39 | # CONFIG_CPUSETS is not set | 40 | # CONFIG_CPUSETS is not set |
41 | CONFIG_INITRAMFS_SOURCE="" | ||
40 | # CONFIG_EMBEDDED is not set | 42 | # CONFIG_EMBEDDED is not set |
41 | CONFIG_KALLSYMS=y | 43 | CONFIG_KALLSYMS=y |
42 | # CONFIG_KALLSYMS_ALL is not set | 44 | # CONFIG_KALLSYMS_ALL is not set |
@@ -97,6 +99,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
97 | # CONFIG_SPARSEMEM_MANUAL is not set | 99 | # CONFIG_SPARSEMEM_MANUAL is not set |
98 | CONFIG_FLATMEM=y | 100 | CONFIG_FLATMEM=y |
99 | CONFIG_FLAT_NODE_MEM_MAP=y | 101 | CONFIG_FLAT_NODE_MEM_MAP=y |
102 | # CONFIG_SPARSEMEM_STATIC is not set | ||
100 | # CONFIG_NUMA is not set | 103 | # CONFIG_NUMA is not set |
101 | # CONFIG_SCHED_SMT is not set | 104 | # CONFIG_SCHED_SMT is not set |
102 | CONFIG_PREEMPT_NONE=y | 105 | CONFIG_PREEMPT_NONE=y |
@@ -109,19 +112,20 @@ CONFIG_HZ_250=y | |||
109 | CONFIG_HZ=250 | 112 | CONFIG_HZ=250 |
110 | CONFIG_GENERIC_HARDIRQS=y | 113 | CONFIG_GENERIC_HARDIRQS=y |
111 | CONFIG_SECCOMP=y | 114 | CONFIG_SECCOMP=y |
115 | CONFIG_BINFMT_ELF=y | ||
116 | # CONFIG_BINFMT_MISC is not set | ||
117 | # CONFIG_HOTPLUG_CPU is not set | ||
118 | CONFIG_PROC_DEVICETREE=y | ||
119 | # CONFIG_CMDLINE_BOOL is not set | ||
112 | CONFIG_ISA_DMA_API=y | 120 | CONFIG_ISA_DMA_API=y |
113 | 121 | ||
114 | # | 122 | # |
115 | # General setup | 123 | # Bus Options |
116 | # | 124 | # |
117 | CONFIG_PCI=y | 125 | CONFIG_PCI=y |
118 | CONFIG_PCI_DOMAINS=y | 126 | CONFIG_PCI_DOMAINS=y |
119 | CONFIG_BINFMT_ELF=y | ||
120 | # CONFIG_BINFMT_MISC is not set | ||
121 | CONFIG_PCI_LEGACY_PROC=y | 127 | CONFIG_PCI_LEGACY_PROC=y |
122 | CONFIG_PCI_NAMES=y | ||
123 | # CONFIG_PCI_DEBUG is not set | 128 | # CONFIG_PCI_DEBUG is not set |
124 | # CONFIG_HOTPLUG_CPU is not set | ||
125 | 129 | ||
126 | # | 130 | # |
127 | # PCCARD (PCMCIA/CardBus) support | 131 | # PCCARD (PCMCIA/CardBus) support |
@@ -132,8 +136,6 @@ CONFIG_PCI_NAMES=y | |||
132 | # PCI Hotplug Support | 136 | # PCI Hotplug Support |
133 | # | 137 | # |
134 | # CONFIG_HOTPLUG_PCI is not set | 138 | # CONFIG_HOTPLUG_PCI is not set |
135 | CONFIG_PROC_DEVICETREE=y | ||
136 | # CONFIG_CMDLINE_BOOL is not set | ||
137 | 139 | ||
138 | # | 140 | # |
139 | # Networking | 141 | # Networking |
@@ -163,8 +165,8 @@ CONFIG_INET_AH=m | |||
163 | CONFIG_INET_ESP=m | 165 | CONFIG_INET_ESP=m |
164 | CONFIG_INET_IPCOMP=m | 166 | CONFIG_INET_IPCOMP=m |
165 | CONFIG_INET_TUNNEL=y | 167 | CONFIG_INET_TUNNEL=y |
166 | CONFIG_IP_TCPDIAG=m | 168 | CONFIG_INET_DIAG=y |
167 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 169 | CONFIG_INET_TCP_DIAG=y |
168 | # CONFIG_TCP_CONG_ADVANCED is not set | 170 | # CONFIG_TCP_CONG_ADVANCED is not set |
169 | CONFIG_TCP_CONG_BIC=y | 171 | CONFIG_TCP_CONG_BIC=y |
170 | 172 | ||
@@ -175,6 +177,7 @@ CONFIG_TCP_CONG_BIC=y | |||
175 | # CONFIG_IPV6 is not set | 177 | # CONFIG_IPV6 is not set |
176 | CONFIG_NETFILTER=y | 178 | CONFIG_NETFILTER=y |
177 | # CONFIG_NETFILTER_DEBUG is not set | 179 | # CONFIG_NETFILTER_DEBUG is not set |
180 | # CONFIG_NETFILTER_NETLINK is not set | ||
178 | 181 | ||
179 | # | 182 | # |
180 | # IP: Netfilter Configuration | 183 | # IP: Netfilter Configuration |
@@ -182,11 +185,14 @@ CONFIG_NETFILTER=y | |||
182 | CONFIG_IP_NF_CONNTRACK=m | 185 | CONFIG_IP_NF_CONNTRACK=m |
183 | CONFIG_IP_NF_CT_ACCT=y | 186 | CONFIG_IP_NF_CT_ACCT=y |
184 | CONFIG_IP_NF_CONNTRACK_MARK=y | 187 | CONFIG_IP_NF_CONNTRACK_MARK=y |
188 | CONFIG_IP_NF_CONNTRACK_EVENTS=y | ||
185 | CONFIG_IP_NF_CT_PROTO_SCTP=m | 189 | CONFIG_IP_NF_CT_PROTO_SCTP=m |
186 | CONFIG_IP_NF_FTP=m | 190 | CONFIG_IP_NF_FTP=m |
187 | CONFIG_IP_NF_IRC=m | 191 | CONFIG_IP_NF_IRC=m |
192 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
188 | CONFIG_IP_NF_TFTP=m | 193 | CONFIG_IP_NF_TFTP=m |
189 | CONFIG_IP_NF_AMANDA=m | 194 | CONFIG_IP_NF_AMANDA=m |
195 | # CONFIG_IP_NF_PPTP is not set | ||
190 | CONFIG_IP_NF_QUEUE=m | 196 | CONFIG_IP_NF_QUEUE=m |
191 | CONFIG_IP_NF_IPTABLES=m | 197 | CONFIG_IP_NF_IPTABLES=m |
192 | CONFIG_IP_NF_MATCH_LIMIT=m | 198 | CONFIG_IP_NF_MATCH_LIMIT=m |
@@ -210,14 +216,18 @@ CONFIG_IP_NF_MATCH_OWNER=m | |||
210 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 216 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
211 | CONFIG_IP_NF_MATCH_REALM=m | 217 | CONFIG_IP_NF_MATCH_REALM=m |
212 | CONFIG_IP_NF_MATCH_SCTP=m | 218 | CONFIG_IP_NF_MATCH_SCTP=m |
219 | # CONFIG_IP_NF_MATCH_DCCP is not set | ||
213 | CONFIG_IP_NF_MATCH_COMMENT=m | 220 | CONFIG_IP_NF_MATCH_COMMENT=m |
214 | CONFIG_IP_NF_MATCH_CONNMARK=m | 221 | CONFIG_IP_NF_MATCH_CONNMARK=m |
222 | CONFIG_IP_NF_MATCH_CONNBYTES=m | ||
215 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 223 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
224 | CONFIG_IP_NF_MATCH_STRING=m | ||
216 | CONFIG_IP_NF_FILTER=m | 225 | CONFIG_IP_NF_FILTER=m |
217 | CONFIG_IP_NF_TARGET_REJECT=m | 226 | CONFIG_IP_NF_TARGET_REJECT=m |
218 | CONFIG_IP_NF_TARGET_LOG=m | 227 | CONFIG_IP_NF_TARGET_LOG=m |
219 | CONFIG_IP_NF_TARGET_ULOG=m | 228 | CONFIG_IP_NF_TARGET_ULOG=m |
220 | CONFIG_IP_NF_TARGET_TCPMSS=m | 229 | CONFIG_IP_NF_TARGET_TCPMSS=m |
230 | CONFIG_IP_NF_TARGET_NFQUEUE=m | ||
221 | CONFIG_IP_NF_NAT=m | 231 | CONFIG_IP_NF_NAT=m |
222 | CONFIG_IP_NF_NAT_NEEDED=y | 232 | CONFIG_IP_NF_NAT_NEEDED=y |
223 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 233 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
@@ -235,6 +245,7 @@ CONFIG_IP_NF_TARGET_ECN=m | |||
235 | CONFIG_IP_NF_TARGET_DSCP=m | 245 | CONFIG_IP_NF_TARGET_DSCP=m |
236 | CONFIG_IP_NF_TARGET_MARK=m | 246 | CONFIG_IP_NF_TARGET_MARK=m |
237 | CONFIG_IP_NF_TARGET_CLASSIFY=m | 247 | CONFIG_IP_NF_TARGET_CLASSIFY=m |
248 | CONFIG_IP_NF_TARGET_TTL=m | ||
238 | CONFIG_IP_NF_TARGET_CONNMARK=m | 249 | CONFIG_IP_NF_TARGET_CONNMARK=m |
239 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 250 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
240 | CONFIG_IP_NF_RAW=m | 251 | CONFIG_IP_NF_RAW=m |
@@ -244,6 +255,11 @@ CONFIG_IP_NF_ARPFILTER=m | |||
244 | CONFIG_IP_NF_ARP_MANGLE=m | 255 | CONFIG_IP_NF_ARP_MANGLE=m |
245 | 256 | ||
246 | # | 257 | # |
258 | # DCCP Configuration (EXPERIMENTAL) | ||
259 | # | ||
260 | # CONFIG_IP_DCCP is not set | ||
261 | |||
262 | # | ||
247 | # SCTP Configuration (EXPERIMENTAL) | 263 | # SCTP Configuration (EXPERIMENTAL) |
248 | # | 264 | # |
249 | # CONFIG_IP_SCTP is not set | 265 | # CONFIG_IP_SCTP is not set |
@@ -270,6 +286,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
270 | # CONFIG_HAMRADIO is not set | 286 | # CONFIG_HAMRADIO is not set |
271 | # CONFIG_IRDA is not set | 287 | # CONFIG_IRDA is not set |
272 | # CONFIG_BT is not set | 288 | # CONFIG_BT is not set |
289 | # CONFIG_IEEE80211 is not set | ||
273 | 290 | ||
274 | # | 291 | # |
275 | # Device Drivers | 292 | # Device Drivers |
@@ -284,6 +301,11 @@ CONFIG_FW_LOADER=y | |||
284 | # CONFIG_DEBUG_DRIVER is not set | 301 | # CONFIG_DEBUG_DRIVER is not set |
285 | 302 | ||
286 | # | 303 | # |
304 | # Connector - unified userspace <-> kernelspace linker | ||
305 | # | ||
306 | # CONFIG_CONNECTOR is not set | ||
307 | |||
308 | # | ||
287 | # Memory Technology Devices (MTD) | 309 | # Memory Technology Devices (MTD) |
288 | # | 310 | # |
289 | # CONFIG_MTD is not set | 311 | # CONFIG_MTD is not set |
@@ -315,7 +337,6 @@ CONFIG_BLK_DEV_RAM=y | |||
315 | CONFIG_BLK_DEV_RAM_COUNT=16 | 337 | CONFIG_BLK_DEV_RAM_COUNT=16 |
316 | CONFIG_BLK_DEV_RAM_SIZE=65536 | 338 | CONFIG_BLK_DEV_RAM_SIZE=65536 |
317 | CONFIG_BLK_DEV_INITRD=y | 339 | CONFIG_BLK_DEV_INITRD=y |
318 | CONFIG_INITRAMFS_SOURCE="" | ||
319 | CONFIG_CDROM_PKTCDVD=m | 340 | CONFIG_CDROM_PKTCDVD=m |
320 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 341 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
321 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 342 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
@@ -395,6 +416,7 @@ CONFIG_IDEDMA_AUTO=y | |||
395 | # | 416 | # |
396 | # SCSI device support | 417 | # SCSI device support |
397 | # | 418 | # |
419 | # CONFIG_RAID_ATTRS is not set | ||
398 | CONFIG_SCSI=y | 420 | CONFIG_SCSI=y |
399 | CONFIG_SCSI_PROC_FS=y | 421 | CONFIG_SCSI_PROC_FS=y |
400 | 422 | ||
@@ -422,6 +444,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
422 | CONFIG_SCSI_SPI_ATTRS=y | 444 | CONFIG_SCSI_SPI_ATTRS=y |
423 | # CONFIG_SCSI_FC_ATTRS is not set | 445 | # CONFIG_SCSI_FC_ATTRS is not set |
424 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 446 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
447 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
425 | 448 | ||
426 | # | 449 | # |
427 | # SCSI low-level drivers | 450 | # SCSI low-level drivers |
@@ -435,10 +458,12 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
435 | # CONFIG_SCSI_AIC79XX is not set | 458 | # CONFIG_SCSI_AIC79XX is not set |
436 | # CONFIG_MEGARAID_NEWGEN is not set | 459 | # CONFIG_MEGARAID_NEWGEN is not set |
437 | # CONFIG_MEGARAID_LEGACY is not set | 460 | # CONFIG_MEGARAID_LEGACY is not set |
461 | # CONFIG_MEGARAID_SAS is not set | ||
438 | CONFIG_SCSI_SATA=y | 462 | CONFIG_SCSI_SATA=y |
439 | # CONFIG_SCSI_SATA_AHCI is not set | 463 | # CONFIG_SCSI_SATA_AHCI is not set |
440 | CONFIG_SCSI_SATA_SVW=y | 464 | CONFIG_SCSI_SATA_SVW=y |
441 | # CONFIG_SCSI_ATA_PIIX is not set | 465 | # CONFIG_SCSI_ATA_PIIX is not set |
466 | # CONFIG_SCSI_SATA_MV is not set | ||
442 | # CONFIG_SCSI_SATA_NV is not set | 467 | # CONFIG_SCSI_SATA_NV is not set |
443 | # CONFIG_SCSI_SATA_PROMISE is not set | 468 | # CONFIG_SCSI_SATA_PROMISE is not set |
444 | # CONFIG_SCSI_SATA_QSTOR is not set | 469 | # CONFIG_SCSI_SATA_QSTOR is not set |
@@ -498,6 +523,7 @@ CONFIG_DM_ZERO=m | |||
498 | # CONFIG_FUSION is not set | 523 | # CONFIG_FUSION is not set |
499 | # CONFIG_FUSION_SPI is not set | 524 | # CONFIG_FUSION_SPI is not set |
500 | # CONFIG_FUSION_FC is not set | 525 | # CONFIG_FUSION_FC is not set |
526 | # CONFIG_FUSION_SAS is not set | ||
501 | 527 | ||
502 | # | 528 | # |
503 | # IEEE 1394 (FireWire) support | 529 | # IEEE 1394 (FireWire) support |
@@ -540,7 +566,6 @@ CONFIG_IEEE1394_RAWIO=y | |||
540 | # | 566 | # |
541 | CONFIG_ADB_PMU=y | 567 | CONFIG_ADB_PMU=y |
542 | CONFIG_PMAC_SMU=y | 568 | CONFIG_PMAC_SMU=y |
543 | # CONFIG_PMAC_BACKLIGHT is not set | ||
544 | CONFIG_THERM_PM72=y | 569 | CONFIG_THERM_PM72=y |
545 | 570 | ||
546 | # | 571 | # |
@@ -558,12 +583,18 @@ CONFIG_TUN=m | |||
558 | # CONFIG_ARCNET is not set | 583 | # CONFIG_ARCNET is not set |
559 | 584 | ||
560 | # | 585 | # |
586 | # PHY device support | ||
587 | # | ||
588 | # CONFIG_PHYLIB is not set | ||
589 | |||
590 | # | ||
561 | # Ethernet (10 or 100Mbit) | 591 | # Ethernet (10 or 100Mbit) |
562 | # | 592 | # |
563 | CONFIG_NET_ETHERNET=y | 593 | CONFIG_NET_ETHERNET=y |
564 | CONFIG_MII=y | 594 | CONFIG_MII=y |
565 | # CONFIG_HAPPYMEAL is not set | 595 | # CONFIG_HAPPYMEAL is not set |
566 | CONFIG_SUNGEM=y | 596 | CONFIG_SUNGEM=y |
597 | # CONFIG_CASSINI is not set | ||
567 | # CONFIG_NET_VENDOR_3COM is not set | 598 | # CONFIG_NET_VENDOR_3COM is not set |
568 | 599 | ||
569 | # | 600 | # |
@@ -585,6 +616,7 @@ CONFIG_E1000=y | |||
585 | # CONFIG_HAMACHI is not set | 616 | # CONFIG_HAMACHI is not set |
586 | # CONFIG_YELLOWFIN is not set | 617 | # CONFIG_YELLOWFIN is not set |
587 | # CONFIG_R8169 is not set | 618 | # CONFIG_R8169 is not set |
619 | # CONFIG_SIS190 is not set | ||
588 | # CONFIG_SKGE is not set | 620 | # CONFIG_SKGE is not set |
589 | # CONFIG_SK98LIN is not set | 621 | # CONFIG_SK98LIN is not set |
590 | CONFIG_TIGON3=m | 622 | CONFIG_TIGON3=m |
@@ -594,6 +626,7 @@ CONFIG_TIGON3=m | |||
594 | # | 626 | # |
595 | # Ethernet (10000 Mbit) | 627 | # Ethernet (10000 Mbit) |
596 | # | 628 | # |
629 | # CONFIG_CHELSIO_T1 is not set | ||
597 | # CONFIG_IXGB is not set | 630 | # CONFIG_IXGB is not set |
598 | # CONFIG_S2IO is not set | 631 | # CONFIG_S2IO is not set |
599 | 632 | ||
@@ -760,8 +793,8 @@ CONFIG_I2C_ALGOBIT=y | |||
760 | # CONFIG_I2C_I801 is not set | 793 | # CONFIG_I2C_I801 is not set |
761 | # CONFIG_I2C_I810 is not set | 794 | # CONFIG_I2C_I810 is not set |
762 | # CONFIG_I2C_PIIX4 is not set | 795 | # CONFIG_I2C_PIIX4 is not set |
763 | # CONFIG_I2C_ISA is not set | ||
764 | CONFIG_I2C_KEYWEST=y | 796 | CONFIG_I2C_KEYWEST=y |
797 | CONFIG_I2C_PMAC_SMU=y | ||
765 | # CONFIG_I2C_NFORCE2 is not set | 798 | # CONFIG_I2C_NFORCE2 is not set |
766 | # CONFIG_I2C_PARPORT_LIGHT is not set | 799 | # CONFIG_I2C_PARPORT_LIGHT is not set |
767 | # CONFIG_I2C_PROSAVAGE is not set | 800 | # CONFIG_I2C_PROSAVAGE is not set |
@@ -775,7 +808,6 @@ CONFIG_I2C_KEYWEST=y | |||
775 | # CONFIG_I2C_VIAPRO is not set | 808 | # CONFIG_I2C_VIAPRO is not set |
776 | # CONFIG_I2C_VOODOO3 is not set | 809 | # CONFIG_I2C_VOODOO3 is not set |
777 | # CONFIG_I2C_PCA_ISA is not set | 810 | # CONFIG_I2C_PCA_ISA is not set |
778 | # CONFIG_I2C_SENSOR is not set | ||
779 | 811 | ||
780 | # | 812 | # |
781 | # Miscellaneous I2C Chip support | 813 | # Miscellaneous I2C Chip support |
@@ -802,12 +834,17 @@ CONFIG_I2C_KEYWEST=y | |||
802 | # Hardware Monitoring support | 834 | # Hardware Monitoring support |
803 | # | 835 | # |
804 | # CONFIG_HWMON is not set | 836 | # CONFIG_HWMON is not set |
837 | # CONFIG_HWMON_VID is not set | ||
805 | 838 | ||
806 | # | 839 | # |
807 | # Misc devices | 840 | # Misc devices |
808 | # | 841 | # |
809 | 842 | ||
810 | # | 843 | # |
844 | # Multimedia Capabilities Port drivers | ||
845 | # | ||
846 | |||
847 | # | ||
811 | # Multimedia devices | 848 | # Multimedia devices |
812 | # | 849 | # |
813 | # CONFIG_VIDEO_DEV is not set | 850 | # CONFIG_VIDEO_DEV is not set |
@@ -856,6 +893,7 @@ CONFIG_FB_RADEON_I2C=y | |||
856 | # CONFIG_FB_KYRO is not set | 893 | # CONFIG_FB_KYRO is not set |
857 | # CONFIG_FB_3DFX is not set | 894 | # CONFIG_FB_3DFX is not set |
858 | # CONFIG_FB_VOODOO1 is not set | 895 | # CONFIG_FB_VOODOO1 is not set |
896 | # CONFIG_FB_CYBLA is not set | ||
859 | # CONFIG_FB_TRIDENT is not set | 897 | # CONFIG_FB_TRIDENT is not set |
860 | # CONFIG_FB_S1D13XXX is not set | 898 | # CONFIG_FB_S1D13XXX is not set |
861 | # CONFIG_FB_VIRTUAL is not set | 899 | # CONFIG_FB_VIRTUAL is not set |
@@ -937,6 +975,7 @@ CONFIG_USB_STORAGE_DPCM=y | |||
937 | CONFIG_USB_STORAGE_SDDR09=y | 975 | CONFIG_USB_STORAGE_SDDR09=y |
938 | CONFIG_USB_STORAGE_SDDR55=y | 976 | CONFIG_USB_STORAGE_SDDR55=y |
939 | CONFIG_USB_STORAGE_JUMPSHOT=y | 977 | CONFIG_USB_STORAGE_JUMPSHOT=y |
978 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
940 | 979 | ||
941 | # | 980 | # |
942 | # USB Input Devices | 981 | # USB Input Devices |
@@ -956,9 +995,11 @@ CONFIG_USB_HIDDEV=y | |||
956 | # CONFIG_USB_MTOUCH is not set | 995 | # CONFIG_USB_MTOUCH is not set |
957 | # CONFIG_USB_ITMTOUCH is not set | 996 | # CONFIG_USB_ITMTOUCH is not set |
958 | # CONFIG_USB_EGALAX is not set | 997 | # CONFIG_USB_EGALAX is not set |
998 | # CONFIG_USB_YEALINK is not set | ||
959 | # CONFIG_USB_XPAD is not set | 999 | # CONFIG_USB_XPAD is not set |
960 | # CONFIG_USB_ATI_REMOTE is not set | 1000 | # CONFIG_USB_ATI_REMOTE is not set |
961 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1001 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
1002 | # CONFIG_USB_APPLETOUCH is not set | ||
962 | 1003 | ||
963 | # | 1004 | # |
964 | # USB Imaging devices | 1005 | # USB Imaging devices |
@@ -983,30 +1024,14 @@ CONFIG_USB_KAWETH=m | |||
983 | CONFIG_USB_PEGASUS=m | 1024 | CONFIG_USB_PEGASUS=m |
984 | CONFIG_USB_RTL8150=m | 1025 | CONFIG_USB_RTL8150=m |
985 | CONFIG_USB_USBNET=m | 1026 | CONFIG_USB_USBNET=m |
986 | 1027 | # CONFIG_USB_NET_AX8817X is not set | |
987 | # | 1028 | CONFIG_USB_NET_CDCETHER=m |
988 | # USB Host-to-Host Cables | 1029 | # CONFIG_USB_NET_GL620A is not set |
989 | # | 1030 | # CONFIG_USB_NET_NET1080 is not set |
990 | CONFIG_USB_ALI_M5632=y | 1031 | # CONFIG_USB_NET_PLUSB is not set |
991 | CONFIG_USB_AN2720=y | 1032 | # CONFIG_USB_NET_RNDIS_HOST is not set |
992 | CONFIG_USB_BELKIN=y | 1033 | # CONFIG_USB_NET_CDC_SUBSET is not set |
993 | CONFIG_USB_GENESYS=y | 1034 | # CONFIG_USB_NET_ZAURUS is not set |
994 | CONFIG_USB_NET1080=y | ||
995 | CONFIG_USB_PL2301=y | ||
996 | CONFIG_USB_KC2190=y | ||
997 | |||
998 | # | ||
999 | # Intelligent USB Devices/Gadgets | ||
1000 | # | ||
1001 | CONFIG_USB_ARMLINUX=y | ||
1002 | CONFIG_USB_EPSON2888=y | ||
1003 | CONFIG_USB_ZAURUS=y | ||
1004 | CONFIG_USB_CDCETHER=y | ||
1005 | |||
1006 | # | ||
1007 | # USB Network Adapters | ||
1008 | # | ||
1009 | CONFIG_USB_AX8817X=y | ||
1010 | CONFIG_USB_MON=y | 1035 | CONFIG_USB_MON=y |
1011 | 1036 | ||
1012 | # | 1037 | # |
@@ -1124,16 +1149,12 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
1124 | CONFIG_REISERFS_FS_SECURITY=y | 1149 | CONFIG_REISERFS_FS_SECURITY=y |
1125 | # CONFIG_JFS_FS is not set | 1150 | # CONFIG_JFS_FS is not set |
1126 | CONFIG_FS_POSIX_ACL=y | 1151 | CONFIG_FS_POSIX_ACL=y |
1127 | |||
1128 | # | ||
1129 | # XFS support | ||
1130 | # | ||
1131 | CONFIG_XFS_FS=m | 1152 | CONFIG_XFS_FS=m |
1132 | CONFIG_XFS_EXPORT=y | 1153 | CONFIG_XFS_EXPORT=y |
1133 | # CONFIG_XFS_RT is not set | ||
1134 | # CONFIG_XFS_QUOTA is not set | 1154 | # CONFIG_XFS_QUOTA is not set |
1135 | CONFIG_XFS_SECURITY=y | 1155 | CONFIG_XFS_SECURITY=y |
1136 | CONFIG_XFS_POSIX_ACL=y | 1156 | CONFIG_XFS_POSIX_ACL=y |
1157 | # CONFIG_XFS_RT is not set | ||
1137 | # CONFIG_MINIX_FS is not set | 1158 | # CONFIG_MINIX_FS is not set |
1138 | # CONFIG_ROMFS_FS is not set | 1159 | # CONFIG_ROMFS_FS is not set |
1139 | CONFIG_INOTIFY=y | 1160 | CONFIG_INOTIFY=y |
@@ -1141,6 +1162,7 @@ CONFIG_INOTIFY=y | |||
1141 | CONFIG_DNOTIFY=y | 1162 | CONFIG_DNOTIFY=y |
1142 | CONFIG_AUTOFS_FS=m | 1163 | CONFIG_AUTOFS_FS=m |
1143 | # CONFIG_AUTOFS4_FS is not set | 1164 | # CONFIG_AUTOFS4_FS is not set |
1165 | # CONFIG_FUSE_FS is not set | ||
1144 | 1166 | ||
1145 | # | 1167 | # |
1146 | # CD-ROM/DVD Filesystems | 1168 | # CD-ROM/DVD Filesystems |
@@ -1168,14 +1190,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1168 | CONFIG_PROC_FS=y | 1190 | CONFIG_PROC_FS=y |
1169 | CONFIG_PROC_KCORE=y | 1191 | CONFIG_PROC_KCORE=y |
1170 | CONFIG_SYSFS=y | 1192 | CONFIG_SYSFS=y |
1171 | CONFIG_DEVPTS_FS_XATTR=y | ||
1172 | # CONFIG_DEVPTS_FS_SECURITY is not set | ||
1173 | CONFIG_TMPFS=y | 1193 | CONFIG_TMPFS=y |
1174 | CONFIG_TMPFS_XATTR=y | ||
1175 | CONFIG_TMPFS_SECURITY=y | ||
1176 | CONFIG_HUGETLBFS=y | 1194 | CONFIG_HUGETLBFS=y |
1177 | CONFIG_HUGETLB_PAGE=y | 1195 | CONFIG_HUGETLB_PAGE=y |
1178 | CONFIG_RAMFS=y | 1196 | CONFIG_RAMFS=y |
1197 | # CONFIG_RELAYFS_FS is not set | ||
1179 | 1198 | ||
1180 | # | 1199 | # |
1181 | # Miscellaneous filesystems | 1200 | # Miscellaneous filesystems |
@@ -1225,6 +1244,7 @@ CONFIG_CIFS=m | |||
1225 | # CONFIG_NCP_FS is not set | 1244 | # CONFIG_NCP_FS is not set |
1226 | # CONFIG_CODA_FS is not set | 1245 | # CONFIG_CODA_FS is not set |
1227 | # CONFIG_AFS_FS is not set | 1246 | # CONFIG_AFS_FS is not set |
1247 | # CONFIG_9P_FS is not set | ||
1228 | 1248 | ||
1229 | # | 1249 | # |
1230 | # Partition Types | 1250 | # Partition Types |
@@ -1303,6 +1323,7 @@ CONFIG_OPROFILE=y | |||
1303 | CONFIG_DEBUG_KERNEL=y | 1323 | CONFIG_DEBUG_KERNEL=y |
1304 | CONFIG_MAGIC_SYSRQ=y | 1324 | CONFIG_MAGIC_SYSRQ=y |
1305 | CONFIG_LOG_BUF_SHIFT=17 | 1325 | CONFIG_LOG_BUF_SHIFT=17 |
1326 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1306 | # CONFIG_SCHEDSTATS is not set | 1327 | # CONFIG_SCHEDSTATS is not set |
1307 | # CONFIG_DEBUG_SLAB is not set | 1328 | # CONFIG_DEBUG_SLAB is not set |
1308 | # CONFIG_DEBUG_SPINLOCK is not set | 1329 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1360,7 +1381,12 @@ CONFIG_CRYPTO_TEST=m | |||
1360 | # Library routines | 1381 | # Library routines |
1361 | # | 1382 | # |
1362 | CONFIG_CRC_CCITT=m | 1383 | CONFIG_CRC_CCITT=m |
1384 | # CONFIG_CRC16 is not set | ||
1363 | CONFIG_CRC32=y | 1385 | CONFIG_CRC32=y |
1364 | CONFIG_LIBCRC32C=m | 1386 | CONFIG_LIBCRC32C=m |
1365 | CONFIG_ZLIB_INFLATE=y | 1387 | CONFIG_ZLIB_INFLATE=y |
1366 | CONFIG_ZLIB_DEFLATE=m | 1388 | CONFIG_ZLIB_DEFLATE=m |
1389 | CONFIG_TEXTSEARCH=y | ||
1390 | CONFIG_TEXTSEARCH_KMP=m | ||
1391 | CONFIG_TEXTSEARCH_BM=m | ||
1392 | CONFIG_TEXTSEARCH_FSM=m | ||
diff --git a/arch/ppc64/configs/iSeries_defconfig b/arch/ppc64/configs/iSeries_defconfig index 013d4e0e4003..62e92c7e9e27 100644 --- a/arch/ppc64/configs/iSeries_defconfig +++ b/arch/ppc64/configs/iSeries_defconfig | |||
@@ -1,17 +1,17 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6 | 3 | # Linux kernel version: 2.6.14-rc4 |
4 | # Mon Aug 8 14:17:02 2005 | 4 | # Thu Oct 20 08:30:56 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 9 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
10 | CONFIG_GENERIC_ISA_DMA=y | 10 | CONFIG_GENERIC_ISA_DMA=y |
11 | CONFIG_HAVE_DEC_LOCK=y | ||
12 | CONFIG_EARLY_PRINTK=y | 11 | CONFIG_EARLY_PRINTK=y |
13 | CONFIG_COMPAT=y | 12 | CONFIG_COMPAT=y |
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 13 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
14 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
15 | CONFIG_FORCE_MAX_ZONEORDER=13 | 15 | CONFIG_FORCE_MAX_ZONEORDER=13 |
16 | 16 | ||
17 | # | 17 | # |
@@ -26,6 +26,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
26 | # General setup | 26 | # General setup |
27 | # | 27 | # |
28 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
29 | CONFIG_LOCALVERSION_AUTO=y | ||
29 | CONFIG_SWAP=y | 30 | CONFIG_SWAP=y |
30 | CONFIG_SYSVIPC=y | 31 | CONFIG_SYSVIPC=y |
31 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
@@ -38,6 +39,7 @@ CONFIG_KOBJECT_UEVENT=y | |||
38 | CONFIG_IKCONFIG=y | 39 | CONFIG_IKCONFIG=y |
39 | CONFIG_IKCONFIG_PROC=y | 40 | CONFIG_IKCONFIG_PROC=y |
40 | # CONFIG_CPUSETS is not set | 41 | # CONFIG_CPUSETS is not set |
42 | CONFIG_INITRAMFS_SOURCE="" | ||
41 | # CONFIG_EMBEDDED is not set | 43 | # CONFIG_EMBEDDED is not set |
42 | CONFIG_KALLSYMS=y | 44 | CONFIG_KALLSYMS=y |
43 | # CONFIG_KALLSYMS_ALL is not set | 45 | # CONFIG_KALLSYMS_ALL is not set |
@@ -88,6 +90,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
88 | # CONFIG_SPARSEMEM_MANUAL is not set | 90 | # CONFIG_SPARSEMEM_MANUAL is not set |
89 | CONFIG_FLATMEM=y | 91 | CONFIG_FLATMEM=y |
90 | CONFIG_FLAT_NODE_MEM_MAP=y | 92 | CONFIG_FLAT_NODE_MEM_MAP=y |
93 | # CONFIG_SPARSEMEM_STATIC is not set | ||
91 | # CONFIG_NUMA is not set | 94 | # CONFIG_NUMA is not set |
92 | # CONFIG_SCHED_SMT is not set | 95 | # CONFIG_SCHED_SMT is not set |
93 | CONFIG_PREEMPT_NONE=y | 96 | CONFIG_PREEMPT_NONE=y |
@@ -101,17 +104,16 @@ CONFIG_HZ=250 | |||
101 | CONFIG_GENERIC_HARDIRQS=y | 104 | CONFIG_GENERIC_HARDIRQS=y |
102 | CONFIG_LPARCFG=y | 105 | CONFIG_LPARCFG=y |
103 | CONFIG_SECCOMP=y | 106 | CONFIG_SECCOMP=y |
107 | CONFIG_BINFMT_ELF=y | ||
108 | # CONFIG_BINFMT_MISC is not set | ||
104 | CONFIG_ISA_DMA_API=y | 109 | CONFIG_ISA_DMA_API=y |
105 | 110 | ||
106 | # | 111 | # |
107 | # General setup | 112 | # Bus Options |
108 | # | 113 | # |
109 | CONFIG_PCI=y | 114 | CONFIG_PCI=y |
110 | CONFIG_PCI_DOMAINS=y | 115 | CONFIG_PCI_DOMAINS=y |
111 | CONFIG_BINFMT_ELF=y | ||
112 | # CONFIG_BINFMT_MISC is not set | ||
113 | CONFIG_PCI_LEGACY_PROC=y | 116 | CONFIG_PCI_LEGACY_PROC=y |
114 | CONFIG_PCI_NAMES=y | ||
115 | # CONFIG_PCI_DEBUG is not set | 117 | # CONFIG_PCI_DEBUG is not set |
116 | 118 | ||
117 | # | 119 | # |
@@ -152,8 +154,8 @@ CONFIG_INET_AH=m | |||
152 | CONFIG_INET_ESP=m | 154 | CONFIG_INET_ESP=m |
153 | CONFIG_INET_IPCOMP=m | 155 | CONFIG_INET_IPCOMP=m |
154 | CONFIG_INET_TUNNEL=y | 156 | CONFIG_INET_TUNNEL=y |
155 | CONFIG_IP_TCPDIAG=m | 157 | CONFIG_INET_DIAG=y |
156 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 158 | CONFIG_INET_TCP_DIAG=y |
157 | # CONFIG_TCP_CONG_ADVANCED is not set | 159 | # CONFIG_TCP_CONG_ADVANCED is not set |
158 | CONFIG_TCP_CONG_BIC=y | 160 | CONFIG_TCP_CONG_BIC=y |
159 | 161 | ||
@@ -164,6 +166,7 @@ CONFIG_TCP_CONG_BIC=y | |||
164 | # CONFIG_IPV6 is not set | 166 | # CONFIG_IPV6 is not set |
165 | CONFIG_NETFILTER=y | 167 | CONFIG_NETFILTER=y |
166 | # CONFIG_NETFILTER_DEBUG is not set | 168 | # CONFIG_NETFILTER_DEBUG is not set |
169 | # CONFIG_NETFILTER_NETLINK is not set | ||
167 | 170 | ||
168 | # | 171 | # |
169 | # IP: Netfilter Configuration | 172 | # IP: Netfilter Configuration |
@@ -171,11 +174,14 @@ CONFIG_NETFILTER=y | |||
171 | CONFIG_IP_NF_CONNTRACK=m | 174 | CONFIG_IP_NF_CONNTRACK=m |
172 | CONFIG_IP_NF_CT_ACCT=y | 175 | CONFIG_IP_NF_CT_ACCT=y |
173 | CONFIG_IP_NF_CONNTRACK_MARK=y | 176 | CONFIG_IP_NF_CONNTRACK_MARK=y |
177 | CONFIG_IP_NF_CONNTRACK_EVENTS=y | ||
174 | CONFIG_IP_NF_CT_PROTO_SCTP=m | 178 | CONFIG_IP_NF_CT_PROTO_SCTP=m |
175 | CONFIG_IP_NF_FTP=m | 179 | CONFIG_IP_NF_FTP=m |
176 | CONFIG_IP_NF_IRC=m | 180 | CONFIG_IP_NF_IRC=m |
181 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
177 | CONFIG_IP_NF_TFTP=m | 182 | CONFIG_IP_NF_TFTP=m |
178 | CONFIG_IP_NF_AMANDA=m | 183 | CONFIG_IP_NF_AMANDA=m |
184 | # CONFIG_IP_NF_PPTP is not set | ||
179 | CONFIG_IP_NF_QUEUE=m | 185 | CONFIG_IP_NF_QUEUE=m |
180 | CONFIG_IP_NF_IPTABLES=m | 186 | CONFIG_IP_NF_IPTABLES=m |
181 | CONFIG_IP_NF_MATCH_LIMIT=m | 187 | CONFIG_IP_NF_MATCH_LIMIT=m |
@@ -199,14 +205,18 @@ CONFIG_IP_NF_MATCH_OWNER=m | |||
199 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 205 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
200 | CONFIG_IP_NF_MATCH_REALM=m | 206 | CONFIG_IP_NF_MATCH_REALM=m |
201 | CONFIG_IP_NF_MATCH_SCTP=m | 207 | CONFIG_IP_NF_MATCH_SCTP=m |
208 | # CONFIG_IP_NF_MATCH_DCCP is not set | ||
202 | CONFIG_IP_NF_MATCH_COMMENT=m | 209 | CONFIG_IP_NF_MATCH_COMMENT=m |
203 | CONFIG_IP_NF_MATCH_CONNMARK=m | 210 | CONFIG_IP_NF_MATCH_CONNMARK=m |
211 | CONFIG_IP_NF_MATCH_CONNBYTES=m | ||
204 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 212 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
213 | CONFIG_IP_NF_MATCH_STRING=m | ||
205 | CONFIG_IP_NF_FILTER=m | 214 | CONFIG_IP_NF_FILTER=m |
206 | CONFIG_IP_NF_TARGET_REJECT=m | 215 | CONFIG_IP_NF_TARGET_REJECT=m |
207 | CONFIG_IP_NF_TARGET_LOG=m | 216 | CONFIG_IP_NF_TARGET_LOG=m |
208 | CONFIG_IP_NF_TARGET_ULOG=m | 217 | CONFIG_IP_NF_TARGET_ULOG=m |
209 | CONFIG_IP_NF_TARGET_TCPMSS=m | 218 | CONFIG_IP_NF_TARGET_TCPMSS=m |
219 | CONFIG_IP_NF_TARGET_NFQUEUE=m | ||
210 | CONFIG_IP_NF_NAT=m | 220 | CONFIG_IP_NF_NAT=m |
211 | CONFIG_IP_NF_NAT_NEEDED=y | 221 | CONFIG_IP_NF_NAT_NEEDED=y |
212 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 222 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
@@ -224,6 +234,7 @@ CONFIG_IP_NF_TARGET_ECN=m | |||
224 | CONFIG_IP_NF_TARGET_DSCP=m | 234 | CONFIG_IP_NF_TARGET_DSCP=m |
225 | CONFIG_IP_NF_TARGET_MARK=m | 235 | CONFIG_IP_NF_TARGET_MARK=m |
226 | CONFIG_IP_NF_TARGET_CLASSIFY=m | 236 | CONFIG_IP_NF_TARGET_CLASSIFY=m |
237 | CONFIG_IP_NF_TARGET_TTL=m | ||
227 | CONFIG_IP_NF_TARGET_CONNMARK=m | 238 | CONFIG_IP_NF_TARGET_CONNMARK=m |
228 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 239 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
229 | CONFIG_IP_NF_RAW=m | 240 | CONFIG_IP_NF_RAW=m |
@@ -233,6 +244,11 @@ CONFIG_IP_NF_ARPFILTER=m | |||
233 | CONFIG_IP_NF_ARP_MANGLE=m | 244 | CONFIG_IP_NF_ARP_MANGLE=m |
234 | 245 | ||
235 | # | 246 | # |
247 | # DCCP Configuration (EXPERIMENTAL) | ||
248 | # | ||
249 | # CONFIG_IP_DCCP is not set | ||
250 | |||
251 | # | ||
236 | # SCTP Configuration (EXPERIMENTAL) | 252 | # SCTP Configuration (EXPERIMENTAL) |
237 | # | 253 | # |
238 | # CONFIG_IP_SCTP is not set | 254 | # CONFIG_IP_SCTP is not set |
@@ -259,6 +275,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
259 | # CONFIG_HAMRADIO is not set | 275 | # CONFIG_HAMRADIO is not set |
260 | # CONFIG_IRDA is not set | 276 | # CONFIG_IRDA is not set |
261 | # CONFIG_BT is not set | 277 | # CONFIG_BT is not set |
278 | # CONFIG_IEEE80211 is not set | ||
262 | 279 | ||
263 | # | 280 | # |
264 | # Device Drivers | 281 | # Device Drivers |
@@ -273,6 +290,11 @@ CONFIG_FW_LOADER=m | |||
273 | # CONFIG_DEBUG_DRIVER is not set | 290 | # CONFIG_DEBUG_DRIVER is not set |
274 | 291 | ||
275 | # | 292 | # |
293 | # Connector - unified userspace <-> kernelspace linker | ||
294 | # | ||
295 | # CONFIG_CONNECTOR is not set | ||
296 | |||
297 | # | ||
276 | # Memory Technology Devices (MTD) | 298 | # Memory Technology Devices (MTD) |
277 | # | 299 | # |
278 | # CONFIG_MTD is not set | 300 | # CONFIG_MTD is not set |
@@ -303,7 +325,6 @@ CONFIG_BLK_DEV_RAM=y | |||
303 | CONFIG_BLK_DEV_RAM_COUNT=16 | 325 | CONFIG_BLK_DEV_RAM_COUNT=16 |
304 | CONFIG_BLK_DEV_RAM_SIZE=65536 | 326 | CONFIG_BLK_DEV_RAM_SIZE=65536 |
305 | CONFIG_BLK_DEV_INITRD=y | 327 | CONFIG_BLK_DEV_INITRD=y |
306 | CONFIG_INITRAMFS_SOURCE="" | ||
307 | # CONFIG_CDROM_PKTCDVD is not set | 328 | # CONFIG_CDROM_PKTCDVD is not set |
308 | 329 | ||
309 | # | 330 | # |
@@ -323,6 +344,7 @@ CONFIG_IOSCHED_CFQ=y | |||
323 | # | 344 | # |
324 | # SCSI device support | 345 | # SCSI device support |
325 | # | 346 | # |
347 | # CONFIG_RAID_ATTRS is not set | ||
326 | CONFIG_SCSI=y | 348 | CONFIG_SCSI=y |
327 | CONFIG_SCSI_PROC_FS=y | 349 | CONFIG_SCSI_PROC_FS=y |
328 | 350 | ||
@@ -350,6 +372,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
350 | CONFIG_SCSI_SPI_ATTRS=y | 372 | CONFIG_SCSI_SPI_ATTRS=y |
351 | CONFIG_SCSI_FC_ATTRS=y | 373 | CONFIG_SCSI_FC_ATTRS=y |
352 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 374 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
375 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
353 | 376 | ||
354 | # | 377 | # |
355 | # SCSI low-level drivers | 378 | # SCSI low-level drivers |
@@ -363,6 +386,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
363 | # CONFIG_SCSI_AIC79XX is not set | 386 | # CONFIG_SCSI_AIC79XX is not set |
364 | # CONFIG_MEGARAID_NEWGEN is not set | 387 | # CONFIG_MEGARAID_NEWGEN is not set |
365 | # CONFIG_MEGARAID_LEGACY is not set | 388 | # CONFIG_MEGARAID_LEGACY is not set |
389 | # CONFIG_MEGARAID_SAS is not set | ||
366 | # CONFIG_SCSI_SATA is not set | 390 | # CONFIG_SCSI_SATA is not set |
367 | # CONFIG_SCSI_BUSLOGIC is not set | 391 | # CONFIG_SCSI_BUSLOGIC is not set |
368 | # CONFIG_SCSI_DMX3191D is not set | 392 | # CONFIG_SCSI_DMX3191D is not set |
@@ -415,6 +439,7 @@ CONFIG_DM_ZERO=m | |||
415 | # CONFIG_FUSION is not set | 439 | # CONFIG_FUSION is not set |
416 | # CONFIG_FUSION_SPI is not set | 440 | # CONFIG_FUSION_SPI is not set |
417 | # CONFIG_FUSION_FC is not set | 441 | # CONFIG_FUSION_FC is not set |
442 | # CONFIG_FUSION_SAS is not set | ||
418 | 443 | ||
419 | # | 444 | # |
420 | # IEEE 1394 (FireWire) support | 445 | # IEEE 1394 (FireWire) support |
@@ -445,12 +470,18 @@ CONFIG_TUN=m | |||
445 | # CONFIG_ARCNET is not set | 470 | # CONFIG_ARCNET is not set |
446 | 471 | ||
447 | # | 472 | # |
473 | # PHY device support | ||
474 | # | ||
475 | # CONFIG_PHYLIB is not set | ||
476 | |||
477 | # | ||
448 | # Ethernet (10 or 100Mbit) | 478 | # Ethernet (10 or 100Mbit) |
449 | # | 479 | # |
450 | CONFIG_NET_ETHERNET=y | 480 | CONFIG_NET_ETHERNET=y |
451 | CONFIG_MII=y | 481 | CONFIG_MII=y |
452 | # CONFIG_HAPPYMEAL is not set | 482 | # CONFIG_HAPPYMEAL is not set |
453 | # CONFIG_SUNGEM is not set | 483 | # CONFIG_SUNGEM is not set |
484 | # CONFIG_CASSINI is not set | ||
454 | # CONFIG_NET_VENDOR_3COM is not set | 485 | # CONFIG_NET_VENDOR_3COM is not set |
455 | 486 | ||
456 | # | 487 | # |
@@ -489,6 +520,7 @@ CONFIG_E1000=m | |||
489 | # CONFIG_HAMACHI is not set | 520 | # CONFIG_HAMACHI is not set |
490 | # CONFIG_YELLOWFIN is not set | 521 | # CONFIG_YELLOWFIN is not set |
491 | # CONFIG_R8169 is not set | 522 | # CONFIG_R8169 is not set |
523 | # CONFIG_SIS190 is not set | ||
492 | # CONFIG_SKGE is not set | 524 | # CONFIG_SKGE is not set |
493 | # CONFIG_SK98LIN is not set | 525 | # CONFIG_SK98LIN is not set |
494 | # CONFIG_VIA_VELOCITY is not set | 526 | # CONFIG_VIA_VELOCITY is not set |
@@ -498,6 +530,7 @@ CONFIG_E1000=m | |||
498 | # | 530 | # |
499 | # Ethernet (10000 Mbit) | 531 | # Ethernet (10000 Mbit) |
500 | # | 532 | # |
533 | # CONFIG_CHELSIO_T1 is not set | ||
501 | # CONFIG_IXGB is not set | 534 | # CONFIG_IXGB is not set |
502 | # CONFIG_S2IO is not set | 535 | # CONFIG_S2IO is not set |
503 | 536 | ||
@@ -632,7 +665,6 @@ CONFIG_MAX_RAW_DEVS=256 | |||
632 | # I2C support | 665 | # I2C support |
633 | # | 666 | # |
634 | # CONFIG_I2C is not set | 667 | # CONFIG_I2C is not set |
635 | # CONFIG_I2C_SENSOR is not set | ||
636 | 668 | ||
637 | # | 669 | # |
638 | # Dallas's 1-wire bus | 670 | # Dallas's 1-wire bus |
@@ -643,12 +675,17 @@ CONFIG_MAX_RAW_DEVS=256 | |||
643 | # Hardware Monitoring support | 675 | # Hardware Monitoring support |
644 | # | 676 | # |
645 | # CONFIG_HWMON is not set | 677 | # CONFIG_HWMON is not set |
678 | # CONFIG_HWMON_VID is not set | ||
646 | 679 | ||
647 | # | 680 | # |
648 | # Misc devices | 681 | # Misc devices |
649 | # | 682 | # |
650 | 683 | ||
651 | # | 684 | # |
685 | # Multimedia Capabilities Port drivers | ||
686 | # | ||
687 | |||
688 | # | ||
652 | # Multimedia devices | 689 | # Multimedia devices |
653 | # | 690 | # |
654 | # CONFIG_VIDEO_DEV is not set | 691 | # CONFIG_VIDEO_DEV is not set |
@@ -722,16 +759,12 @@ CONFIG_JFS_SECURITY=y | |||
722 | # CONFIG_JFS_DEBUG is not set | 759 | # CONFIG_JFS_DEBUG is not set |
723 | # CONFIG_JFS_STATISTICS is not set | 760 | # CONFIG_JFS_STATISTICS is not set |
724 | CONFIG_FS_POSIX_ACL=y | 761 | CONFIG_FS_POSIX_ACL=y |
725 | |||
726 | # | ||
727 | # XFS support | ||
728 | # | ||
729 | CONFIG_XFS_FS=m | 762 | CONFIG_XFS_FS=m |
730 | CONFIG_XFS_EXPORT=y | 763 | CONFIG_XFS_EXPORT=y |
731 | # CONFIG_XFS_RT is not set | ||
732 | # CONFIG_XFS_QUOTA is not set | 764 | # CONFIG_XFS_QUOTA is not set |
733 | CONFIG_XFS_SECURITY=y | 765 | CONFIG_XFS_SECURITY=y |
734 | CONFIG_XFS_POSIX_ACL=y | 766 | CONFIG_XFS_POSIX_ACL=y |
767 | # CONFIG_XFS_RT is not set | ||
735 | # CONFIG_MINIX_FS is not set | 768 | # CONFIG_MINIX_FS is not set |
736 | # CONFIG_ROMFS_FS is not set | 769 | # CONFIG_ROMFS_FS is not set |
737 | CONFIG_INOTIFY=y | 770 | CONFIG_INOTIFY=y |
@@ -739,6 +772,7 @@ CONFIG_INOTIFY=y | |||
739 | CONFIG_DNOTIFY=y | 772 | CONFIG_DNOTIFY=y |
740 | CONFIG_AUTOFS_FS=m | 773 | CONFIG_AUTOFS_FS=m |
741 | # CONFIG_AUTOFS4_FS is not set | 774 | # CONFIG_AUTOFS4_FS is not set |
775 | # CONFIG_FUSE_FS is not set | ||
742 | 776 | ||
743 | # | 777 | # |
744 | # CD-ROM/DVD Filesystems | 778 | # CD-ROM/DVD Filesystems |
@@ -766,14 +800,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
766 | CONFIG_PROC_FS=y | 800 | CONFIG_PROC_FS=y |
767 | CONFIG_PROC_KCORE=y | 801 | CONFIG_PROC_KCORE=y |
768 | CONFIG_SYSFS=y | 802 | CONFIG_SYSFS=y |
769 | CONFIG_DEVPTS_FS_XATTR=y | ||
770 | CONFIG_DEVPTS_FS_SECURITY=y | ||
771 | CONFIG_TMPFS=y | 803 | CONFIG_TMPFS=y |
772 | CONFIG_TMPFS_XATTR=y | ||
773 | CONFIG_TMPFS_SECURITY=y | ||
774 | # CONFIG_HUGETLBFS is not set | 804 | # CONFIG_HUGETLBFS is not set |
775 | # CONFIG_HUGETLB_PAGE is not set | 805 | # CONFIG_HUGETLB_PAGE is not set |
776 | CONFIG_RAMFS=y | 806 | CONFIG_RAMFS=y |
807 | # CONFIG_RELAYFS_FS is not set | ||
777 | 808 | ||
778 | # | 809 | # |
779 | # Miscellaneous filesystems | 810 | # Miscellaneous filesystems |
@@ -824,6 +855,7 @@ CONFIG_CIFS_POSIX=y | |||
824 | # CONFIG_NCP_FS is not set | 855 | # CONFIG_NCP_FS is not set |
825 | # CONFIG_CODA_FS is not set | 856 | # CONFIG_CODA_FS is not set |
826 | # CONFIG_AFS_FS is not set | 857 | # CONFIG_AFS_FS is not set |
858 | # CONFIG_9P_FS is not set | ||
827 | 859 | ||
828 | # | 860 | # |
829 | # Partition Types | 861 | # Partition Types |
@@ -897,6 +929,7 @@ CONFIG_OPROFILE=y | |||
897 | CONFIG_DEBUG_KERNEL=y | 929 | CONFIG_DEBUG_KERNEL=y |
898 | CONFIG_MAGIC_SYSRQ=y | 930 | CONFIG_MAGIC_SYSRQ=y |
899 | CONFIG_LOG_BUF_SHIFT=17 | 931 | CONFIG_LOG_BUF_SHIFT=17 |
932 | CONFIG_DETECT_SOFTLOCKUP=y | ||
900 | # CONFIG_SCHEDSTATS is not set | 933 | # CONFIG_SCHEDSTATS is not set |
901 | # CONFIG_DEBUG_SLAB is not set | 934 | # CONFIG_DEBUG_SLAB is not set |
902 | # CONFIG_DEBUG_SPINLOCK is not set | 935 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -954,7 +987,12 @@ CONFIG_CRYPTO_TEST=m | |||
954 | # Library routines | 987 | # Library routines |
955 | # | 988 | # |
956 | CONFIG_CRC_CCITT=m | 989 | CONFIG_CRC_CCITT=m |
990 | # CONFIG_CRC16 is not set | ||
957 | CONFIG_CRC32=y | 991 | CONFIG_CRC32=y |
958 | CONFIG_LIBCRC32C=m | 992 | CONFIG_LIBCRC32C=m |
959 | CONFIG_ZLIB_INFLATE=y | 993 | CONFIG_ZLIB_INFLATE=y |
960 | CONFIG_ZLIB_DEFLATE=m | 994 | CONFIG_ZLIB_DEFLATE=m |
995 | CONFIG_TEXTSEARCH=y | ||
996 | CONFIG_TEXTSEARCH_KMP=m | ||
997 | CONFIG_TEXTSEARCH_BM=m | ||
998 | CONFIG_TEXTSEARCH_FSM=m | ||
diff --git a/arch/ppc64/configs/maple_defconfig b/arch/ppc64/configs/maple_defconfig index dd42892cd873..7b480f3d1406 100644 --- a/arch/ppc64/configs/maple_defconfig +++ b/arch/ppc64/configs/maple_defconfig | |||
@@ -1,17 +1,17 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6 | 3 | # Linux kernel version: 2.6.14-rc4 |
4 | # Mon Aug 8 14:17:04 2005 | 4 | # Thu Oct 20 08:31:24 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 9 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
10 | CONFIG_GENERIC_ISA_DMA=y | 10 | CONFIG_GENERIC_ISA_DMA=y |
11 | CONFIG_HAVE_DEC_LOCK=y | ||
12 | CONFIG_EARLY_PRINTK=y | 11 | CONFIG_EARLY_PRINTK=y |
13 | CONFIG_COMPAT=y | 12 | CONFIG_COMPAT=y |
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 13 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
14 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
15 | CONFIG_FORCE_MAX_ZONEORDER=13 | 15 | CONFIG_FORCE_MAX_ZONEORDER=13 |
16 | 16 | ||
17 | # | 17 | # |
@@ -26,6 +26,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
26 | # General setup | 26 | # General setup |
27 | # | 27 | # |
28 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
29 | CONFIG_LOCALVERSION_AUTO=y | ||
29 | CONFIG_SWAP=y | 30 | CONFIG_SWAP=y |
30 | CONFIG_SYSVIPC=y | 31 | CONFIG_SYSVIPC=y |
31 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
@@ -37,6 +38,7 @@ CONFIG_KOBJECT_UEVENT=y | |||
37 | CONFIG_IKCONFIG=y | 38 | CONFIG_IKCONFIG=y |
38 | CONFIG_IKCONFIG_PROC=y | 39 | CONFIG_IKCONFIG_PROC=y |
39 | # CONFIG_CPUSETS is not set | 40 | # CONFIG_CPUSETS is not set |
41 | CONFIG_INITRAMFS_SOURCE="" | ||
40 | # CONFIG_EMBEDDED is not set | 42 | # CONFIG_EMBEDDED is not set |
41 | CONFIG_KALLSYMS=y | 43 | CONFIG_KALLSYMS=y |
42 | CONFIG_KALLSYMS_ALL=y | 44 | CONFIG_KALLSYMS_ALL=y |
@@ -97,6 +99,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
97 | # CONFIG_SPARSEMEM_MANUAL is not set | 99 | # CONFIG_SPARSEMEM_MANUAL is not set |
98 | CONFIG_FLATMEM=y | 100 | CONFIG_FLATMEM=y |
99 | CONFIG_FLAT_NODE_MEM_MAP=y | 101 | CONFIG_FLAT_NODE_MEM_MAP=y |
102 | # CONFIG_SPARSEMEM_STATIC is not set | ||
100 | # CONFIG_NUMA is not set | 103 | # CONFIG_NUMA is not set |
101 | # CONFIG_SCHED_SMT is not set | 104 | # CONFIG_SCHED_SMT is not set |
102 | CONFIG_PREEMPT_NONE=y | 105 | CONFIG_PREEMPT_NONE=y |
@@ -109,17 +112,18 @@ CONFIG_HZ_250=y | |||
109 | CONFIG_HZ=250 | 112 | CONFIG_HZ=250 |
110 | CONFIG_GENERIC_HARDIRQS=y | 113 | CONFIG_GENERIC_HARDIRQS=y |
111 | CONFIG_SECCOMP=y | 114 | CONFIG_SECCOMP=y |
115 | CONFIG_BINFMT_ELF=y | ||
116 | # CONFIG_BINFMT_MISC is not set | ||
117 | CONFIG_PROC_DEVICETREE=y | ||
118 | # CONFIG_CMDLINE_BOOL is not set | ||
112 | CONFIG_ISA_DMA_API=y | 119 | CONFIG_ISA_DMA_API=y |
113 | 120 | ||
114 | # | 121 | # |
115 | # General setup | 122 | # Bus Options |
116 | # | 123 | # |
117 | CONFIG_PCI=y | 124 | CONFIG_PCI=y |
118 | CONFIG_PCI_DOMAINS=y | 125 | CONFIG_PCI_DOMAINS=y |
119 | CONFIG_BINFMT_ELF=y | ||
120 | # CONFIG_BINFMT_MISC is not set | ||
121 | CONFIG_PCI_LEGACY_PROC=y | 126 | CONFIG_PCI_LEGACY_PROC=y |
122 | CONFIG_PCI_NAMES=y | ||
123 | # CONFIG_PCI_DEBUG is not set | 127 | # CONFIG_PCI_DEBUG is not set |
124 | 128 | ||
125 | # | 129 | # |
@@ -131,8 +135,6 @@ CONFIG_PCI_NAMES=y | |||
131 | # PCI Hotplug Support | 135 | # PCI Hotplug Support |
132 | # | 136 | # |
133 | # CONFIG_HOTPLUG_PCI is not set | 137 | # CONFIG_HOTPLUG_PCI is not set |
134 | CONFIG_PROC_DEVICETREE=y | ||
135 | # CONFIG_CMDLINE_BOOL is not set | ||
136 | 138 | ||
137 | # | 139 | # |
138 | # Networking | 140 | # Networking |
@@ -163,14 +165,19 @@ CONFIG_IP_PNP_DHCP=y | |||
163 | # CONFIG_INET_ESP is not set | 165 | # CONFIG_INET_ESP is not set |
164 | # CONFIG_INET_IPCOMP is not set | 166 | # CONFIG_INET_IPCOMP is not set |
165 | # CONFIG_INET_TUNNEL is not set | 167 | # CONFIG_INET_TUNNEL is not set |
166 | CONFIG_IP_TCPDIAG=y | 168 | CONFIG_INET_DIAG=y |
167 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 169 | CONFIG_INET_TCP_DIAG=y |
168 | # CONFIG_TCP_CONG_ADVANCED is not set | 170 | # CONFIG_TCP_CONG_ADVANCED is not set |
169 | CONFIG_TCP_CONG_BIC=y | 171 | CONFIG_TCP_CONG_BIC=y |
170 | # CONFIG_IPV6 is not set | 172 | # CONFIG_IPV6 is not set |
171 | # CONFIG_NETFILTER is not set | 173 | # CONFIG_NETFILTER is not set |
172 | 174 | ||
173 | # | 175 | # |
176 | # DCCP Configuration (EXPERIMENTAL) | ||
177 | # | ||
178 | # CONFIG_IP_DCCP is not set | ||
179 | |||
180 | # | ||
174 | # SCTP Configuration (EXPERIMENTAL) | 181 | # SCTP Configuration (EXPERIMENTAL) |
175 | # | 182 | # |
176 | # CONFIG_IP_SCTP is not set | 183 | # CONFIG_IP_SCTP is not set |
@@ -196,6 +203,7 @@ CONFIG_TCP_CONG_BIC=y | |||
196 | # CONFIG_HAMRADIO is not set | 203 | # CONFIG_HAMRADIO is not set |
197 | # CONFIG_IRDA is not set | 204 | # CONFIG_IRDA is not set |
198 | # CONFIG_BT is not set | 205 | # CONFIG_BT is not set |
206 | # CONFIG_IEEE80211 is not set | ||
199 | 207 | ||
200 | # | 208 | # |
201 | # Device Drivers | 209 | # Device Drivers |
@@ -210,6 +218,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
210 | # CONFIG_DEBUG_DRIVER is not set | 218 | # CONFIG_DEBUG_DRIVER is not set |
211 | 219 | ||
212 | # | 220 | # |
221 | # Connector - unified userspace <-> kernelspace linker | ||
222 | # | ||
223 | # CONFIG_CONNECTOR is not set | ||
224 | |||
225 | # | ||
213 | # Memory Technology Devices (MTD) | 226 | # Memory Technology Devices (MTD) |
214 | # | 227 | # |
215 | # CONFIG_MTD is not set | 228 | # CONFIG_MTD is not set |
@@ -240,7 +253,6 @@ CONFIG_BLK_DEV_RAM=y | |||
240 | CONFIG_BLK_DEV_RAM_COUNT=16 | 253 | CONFIG_BLK_DEV_RAM_COUNT=16 |
241 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 254 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
242 | # CONFIG_BLK_DEV_INITRD is not set | 255 | # CONFIG_BLK_DEV_INITRD is not set |
243 | CONFIG_INITRAMFS_SOURCE="" | ||
244 | # CONFIG_CDROM_PKTCDVD is not set | 256 | # CONFIG_CDROM_PKTCDVD is not set |
245 | 257 | ||
246 | # | 258 | # |
@@ -313,6 +325,7 @@ CONFIG_IDEDMA_AUTO=y | |||
313 | # | 325 | # |
314 | # SCSI device support | 326 | # SCSI device support |
315 | # | 327 | # |
328 | # CONFIG_RAID_ATTRS is not set | ||
316 | # CONFIG_SCSI is not set | 329 | # CONFIG_SCSI is not set |
317 | 330 | ||
318 | # | 331 | # |
@@ -354,12 +367,18 @@ CONFIG_NETDEVICES=y | |||
354 | # CONFIG_ARCNET is not set | 367 | # CONFIG_ARCNET is not set |
355 | 368 | ||
356 | # | 369 | # |
370 | # PHY device support | ||
371 | # | ||
372 | # CONFIG_PHYLIB is not set | ||
373 | |||
374 | # | ||
357 | # Ethernet (10 or 100Mbit) | 375 | # Ethernet (10 or 100Mbit) |
358 | # | 376 | # |
359 | CONFIG_NET_ETHERNET=y | 377 | CONFIG_NET_ETHERNET=y |
360 | CONFIG_MII=y | 378 | CONFIG_MII=y |
361 | # CONFIG_HAPPYMEAL is not set | 379 | # CONFIG_HAPPYMEAL is not set |
362 | # CONFIG_SUNGEM is not set | 380 | # CONFIG_SUNGEM is not set |
381 | # CONFIG_CASSINI is not set | ||
363 | # CONFIG_NET_VENDOR_3COM is not set | 382 | # CONFIG_NET_VENDOR_3COM is not set |
364 | 383 | ||
365 | # | 384 | # |
@@ -398,6 +417,7 @@ CONFIG_E1000=y | |||
398 | # CONFIG_HAMACHI is not set | 417 | # CONFIG_HAMACHI is not set |
399 | # CONFIG_YELLOWFIN is not set | 418 | # CONFIG_YELLOWFIN is not set |
400 | # CONFIG_R8169 is not set | 419 | # CONFIG_R8169 is not set |
420 | # CONFIG_SIS190 is not set | ||
401 | # CONFIG_SKGE is not set | 421 | # CONFIG_SKGE is not set |
402 | # CONFIG_SK98LIN is not set | 422 | # CONFIG_SK98LIN is not set |
403 | # CONFIG_VIA_VELOCITY is not set | 423 | # CONFIG_VIA_VELOCITY is not set |
@@ -408,6 +428,7 @@ CONFIG_E1000=y | |||
408 | # | 428 | # |
409 | # Ethernet (10000 Mbit) | 429 | # Ethernet (10000 Mbit) |
410 | # | 430 | # |
431 | # CONFIG_CHELSIO_T1 is not set | ||
411 | # CONFIG_IXGB is not set | 432 | # CONFIG_IXGB is not set |
412 | # CONFIG_S2IO is not set | 433 | # CONFIG_S2IO is not set |
413 | 434 | ||
@@ -553,7 +574,6 @@ CONFIG_I2C_AMD8111=y | |||
553 | # CONFIG_I2C_I801 is not set | 574 | # CONFIG_I2C_I801 is not set |
554 | # CONFIG_I2C_I810 is not set | 575 | # CONFIG_I2C_I810 is not set |
555 | # CONFIG_I2C_PIIX4 is not set | 576 | # CONFIG_I2C_PIIX4 is not set |
556 | # CONFIG_I2C_ISA is not set | ||
557 | # CONFIG_I2C_NFORCE2 is not set | 577 | # CONFIG_I2C_NFORCE2 is not set |
558 | # CONFIG_I2C_PARPORT_LIGHT is not set | 578 | # CONFIG_I2C_PARPORT_LIGHT is not set |
559 | # CONFIG_I2C_PROSAVAGE is not set | 579 | # CONFIG_I2C_PROSAVAGE is not set |
@@ -567,7 +587,6 @@ CONFIG_I2C_AMD8111=y | |||
567 | # CONFIG_I2C_VIAPRO is not set | 587 | # CONFIG_I2C_VIAPRO is not set |
568 | # CONFIG_I2C_VOODOO3 is not set | 588 | # CONFIG_I2C_VOODOO3 is not set |
569 | # CONFIG_I2C_PCA_ISA is not set | 589 | # CONFIG_I2C_PCA_ISA is not set |
570 | # CONFIG_I2C_SENSOR is not set | ||
571 | 590 | ||
572 | # | 591 | # |
573 | # Miscellaneous I2C Chip support | 592 | # Miscellaneous I2C Chip support |
@@ -594,12 +613,17 @@ CONFIG_I2C_AMD8111=y | |||
594 | # Hardware Monitoring support | 613 | # Hardware Monitoring support |
595 | # | 614 | # |
596 | # CONFIG_HWMON is not set | 615 | # CONFIG_HWMON is not set |
616 | # CONFIG_HWMON_VID is not set | ||
597 | 617 | ||
598 | # | 618 | # |
599 | # Misc devices | 619 | # Misc devices |
600 | # | 620 | # |
601 | 621 | ||
602 | # | 622 | # |
623 | # Multimedia Capabilities Port drivers | ||
624 | # | ||
625 | |||
626 | # | ||
603 | # Multimedia devices | 627 | # Multimedia devices |
604 | # | 628 | # |
605 | # CONFIG_VIDEO_DEV is not set | 629 | # CONFIG_VIDEO_DEV is not set |
@@ -681,9 +705,11 @@ CONFIG_USB_HIDINPUT=y | |||
681 | # CONFIG_USB_MTOUCH is not set | 705 | # CONFIG_USB_MTOUCH is not set |
682 | # CONFIG_USB_ITMTOUCH is not set | 706 | # CONFIG_USB_ITMTOUCH is not set |
683 | # CONFIG_USB_EGALAX is not set | 707 | # CONFIG_USB_EGALAX is not set |
708 | # CONFIG_USB_YEALINK is not set | ||
684 | # CONFIG_USB_XPAD is not set | 709 | # CONFIG_USB_XPAD is not set |
685 | # CONFIG_USB_ATI_REMOTE is not set | 710 | # CONFIG_USB_ATI_REMOTE is not set |
686 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 711 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
712 | # CONFIG_USB_APPLETOUCH is not set | ||
687 | 713 | ||
688 | # | 714 | # |
689 | # USB Imaging devices | 715 | # USB Imaging devices |
@@ -814,10 +840,6 @@ CONFIG_JBD=y | |||
814 | # CONFIG_REISERFS_FS is not set | 840 | # CONFIG_REISERFS_FS is not set |
815 | # CONFIG_JFS_FS is not set | 841 | # CONFIG_JFS_FS is not set |
816 | CONFIG_FS_POSIX_ACL=y | 842 | CONFIG_FS_POSIX_ACL=y |
817 | |||
818 | # | ||
819 | # XFS support | ||
820 | # | ||
821 | # CONFIG_XFS_FS is not set | 843 | # CONFIG_XFS_FS is not set |
822 | # CONFIG_MINIX_FS is not set | 844 | # CONFIG_MINIX_FS is not set |
823 | # CONFIG_ROMFS_FS is not set | 845 | # CONFIG_ROMFS_FS is not set |
@@ -826,6 +848,7 @@ CONFIG_INOTIFY=y | |||
826 | CONFIG_DNOTIFY=y | 848 | CONFIG_DNOTIFY=y |
827 | # CONFIG_AUTOFS_FS is not set | 849 | # CONFIG_AUTOFS_FS is not set |
828 | # CONFIG_AUTOFS4_FS is not set | 850 | # CONFIG_AUTOFS4_FS is not set |
851 | # CONFIG_FUSE_FS is not set | ||
829 | 852 | ||
830 | # | 853 | # |
831 | # CD-ROM/DVD Filesystems | 854 | # CD-ROM/DVD Filesystems |
@@ -849,14 +872,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
849 | CONFIG_PROC_FS=y | 872 | CONFIG_PROC_FS=y |
850 | CONFIG_PROC_KCORE=y | 873 | CONFIG_PROC_KCORE=y |
851 | CONFIG_SYSFS=y | 874 | CONFIG_SYSFS=y |
852 | CONFIG_DEVPTS_FS_XATTR=y | ||
853 | # CONFIG_DEVPTS_FS_SECURITY is not set | ||
854 | CONFIG_TMPFS=y | 875 | CONFIG_TMPFS=y |
855 | CONFIG_TMPFS_XATTR=y | ||
856 | CONFIG_TMPFS_SECURITY=y | ||
857 | CONFIG_HUGETLBFS=y | 876 | CONFIG_HUGETLBFS=y |
858 | CONFIG_HUGETLB_PAGE=y | 877 | CONFIG_HUGETLB_PAGE=y |
859 | CONFIG_RAMFS=y | 878 | CONFIG_RAMFS=y |
879 | # CONFIG_RELAYFS_FS is not set | ||
860 | 880 | ||
861 | # | 881 | # |
862 | # Miscellaneous filesystems | 882 | # Miscellaneous filesystems |
@@ -898,6 +918,7 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
898 | # CONFIG_NCP_FS is not set | 918 | # CONFIG_NCP_FS is not set |
899 | # CONFIG_CODA_FS is not set | 919 | # CONFIG_CODA_FS is not set |
900 | # CONFIG_AFS_FS is not set | 920 | # CONFIG_AFS_FS is not set |
921 | # CONFIG_9P_FS is not set | ||
901 | 922 | ||
902 | # | 923 | # |
903 | # Partition Types | 924 | # Partition Types |
@@ -975,6 +996,7 @@ CONFIG_NLS_UTF8=y | |||
975 | CONFIG_DEBUG_KERNEL=y | 996 | CONFIG_DEBUG_KERNEL=y |
976 | CONFIG_MAGIC_SYSRQ=y | 997 | CONFIG_MAGIC_SYSRQ=y |
977 | CONFIG_LOG_BUF_SHIFT=17 | 998 | CONFIG_LOG_BUF_SHIFT=17 |
999 | CONFIG_DETECT_SOFTLOCKUP=y | ||
978 | # CONFIG_SCHEDSTATS is not set | 1000 | # CONFIG_SCHEDSTATS is not set |
979 | CONFIG_DEBUG_SLAB=y | 1001 | CONFIG_DEBUG_SLAB=y |
980 | # CONFIG_DEBUG_SPINLOCK is not set | 1002 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1034,6 +1056,7 @@ CONFIG_CRYPTO_DES=y | |||
1034 | # Library routines | 1056 | # Library routines |
1035 | # | 1057 | # |
1036 | CONFIG_CRC_CCITT=y | 1058 | CONFIG_CRC_CCITT=y |
1059 | # CONFIG_CRC16 is not set | ||
1037 | CONFIG_CRC32=y | 1060 | CONFIG_CRC32=y |
1038 | # CONFIG_LIBCRC32C is not set | 1061 | # CONFIG_LIBCRC32C is not set |
1039 | CONFIG_ZLIB_INFLATE=y | 1062 | CONFIG_ZLIB_INFLATE=y |
diff --git a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig index 29f7b80b0efc..9f09dff9e11a 100644 --- a/arch/ppc64/configs/pSeries_defconfig +++ b/arch/ppc64/configs/pSeries_defconfig | |||
@@ -1,17 +1,17 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6 | 3 | # Linux kernel version: 2.6.14-rc4 |
4 | # Mon Aug 8 14:17:07 2005 | 4 | # Thu Oct 20 08:32:17 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 9 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
10 | CONFIG_GENERIC_ISA_DMA=y | 10 | CONFIG_GENERIC_ISA_DMA=y |
11 | CONFIG_HAVE_DEC_LOCK=y | ||
12 | CONFIG_EARLY_PRINTK=y | 11 | CONFIG_EARLY_PRINTK=y |
13 | CONFIG_COMPAT=y | 12 | CONFIG_COMPAT=y |
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 13 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
14 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
15 | CONFIG_FORCE_MAX_ZONEORDER=13 | 15 | CONFIG_FORCE_MAX_ZONEORDER=13 |
16 | 16 | ||
17 | # | 17 | # |
@@ -26,6 +26,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
26 | # General setup | 26 | # General setup |
27 | # | 27 | # |
28 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
29 | CONFIG_LOCALVERSION_AUTO=y | ||
29 | CONFIG_SWAP=y | 30 | CONFIG_SWAP=y |
30 | CONFIG_SYSVIPC=y | 31 | CONFIG_SYSVIPC=y |
31 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
@@ -38,6 +39,7 @@ CONFIG_KOBJECT_UEVENT=y | |||
38 | CONFIG_IKCONFIG=y | 39 | CONFIG_IKCONFIG=y |
39 | CONFIG_IKCONFIG_PROC=y | 40 | CONFIG_IKCONFIG_PROC=y |
40 | CONFIG_CPUSETS=y | 41 | CONFIG_CPUSETS=y |
42 | CONFIG_INITRAMFS_SOURCE="" | ||
41 | # CONFIG_EMBEDDED is not set | 43 | # CONFIG_EMBEDDED is not set |
42 | CONFIG_KALLSYMS=y | 44 | CONFIG_KALLSYMS=y |
43 | CONFIG_KALLSYMS_ALL=y | 45 | CONFIG_KALLSYMS_ALL=y |
@@ -104,6 +106,7 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
104 | CONFIG_DISCONTIGMEM=y | 106 | CONFIG_DISCONTIGMEM=y |
105 | CONFIG_FLAT_NODE_MEM_MAP=y | 107 | CONFIG_FLAT_NODE_MEM_MAP=y |
106 | CONFIG_NEED_MULTIPLE_NODES=y | 108 | CONFIG_NEED_MULTIPLE_NODES=y |
109 | # CONFIG_SPARSEMEM_STATIC is not set | ||
107 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 110 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
108 | CONFIG_NODES_SPAN_OTHER_NODES=y | 111 | CONFIG_NODES_SPAN_OTHER_NODES=y |
109 | CONFIG_NUMA=y | 112 | CONFIG_NUMA=y |
@@ -124,19 +127,20 @@ CONFIG_RTAS_FLASH=m | |||
124 | CONFIG_SCANLOG=m | 127 | CONFIG_SCANLOG=m |
125 | CONFIG_LPARCFG=y | 128 | CONFIG_LPARCFG=y |
126 | CONFIG_SECCOMP=y | 129 | CONFIG_SECCOMP=y |
130 | CONFIG_BINFMT_ELF=y | ||
131 | # CONFIG_BINFMT_MISC is not set | ||
132 | CONFIG_HOTPLUG_CPU=y | ||
133 | CONFIG_PROC_DEVICETREE=y | ||
134 | # CONFIG_CMDLINE_BOOL is not set | ||
127 | CONFIG_ISA_DMA_API=y | 135 | CONFIG_ISA_DMA_API=y |
128 | 136 | ||
129 | # | 137 | # |
130 | # General setup | 138 | # Bus Options |
131 | # | 139 | # |
132 | CONFIG_PCI=y | 140 | CONFIG_PCI=y |
133 | CONFIG_PCI_DOMAINS=y | 141 | CONFIG_PCI_DOMAINS=y |
134 | CONFIG_BINFMT_ELF=y | ||
135 | # CONFIG_BINFMT_MISC is not set | ||
136 | CONFIG_PCI_LEGACY_PROC=y | 142 | CONFIG_PCI_LEGACY_PROC=y |
137 | CONFIG_PCI_NAMES=y | ||
138 | # CONFIG_PCI_DEBUG is not set | 143 | # CONFIG_PCI_DEBUG is not set |
139 | CONFIG_HOTPLUG_CPU=y | ||
140 | 144 | ||
141 | # | 145 | # |
142 | # PCCARD (PCMCIA/CardBus) support | 146 | # PCCARD (PCMCIA/CardBus) support |
@@ -152,8 +156,6 @@ CONFIG_HOTPLUG_PCI=m | |||
152 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 156 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
153 | CONFIG_HOTPLUG_PCI_RPA=m | 157 | CONFIG_HOTPLUG_PCI_RPA=m |
154 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | 158 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m |
155 | CONFIG_PROC_DEVICETREE=y | ||
156 | # CONFIG_CMDLINE_BOOL is not set | ||
157 | 159 | ||
158 | # | 160 | # |
159 | # Networking | 161 | # Networking |
@@ -183,8 +185,8 @@ CONFIG_INET_AH=m | |||
183 | CONFIG_INET_ESP=m | 185 | CONFIG_INET_ESP=m |
184 | CONFIG_INET_IPCOMP=m | 186 | CONFIG_INET_IPCOMP=m |
185 | CONFIG_INET_TUNNEL=y | 187 | CONFIG_INET_TUNNEL=y |
186 | CONFIG_IP_TCPDIAG=m | 188 | CONFIG_INET_DIAG=y |
187 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 189 | CONFIG_INET_TCP_DIAG=y |
188 | # CONFIG_TCP_CONG_ADVANCED is not set | 190 | # CONFIG_TCP_CONG_ADVANCED is not set |
189 | CONFIG_TCP_CONG_BIC=y | 191 | CONFIG_TCP_CONG_BIC=y |
190 | 192 | ||
@@ -195,6 +197,9 @@ CONFIG_TCP_CONG_BIC=y | |||
195 | # CONFIG_IPV6 is not set | 197 | # CONFIG_IPV6 is not set |
196 | CONFIG_NETFILTER=y | 198 | CONFIG_NETFILTER=y |
197 | # CONFIG_NETFILTER_DEBUG is not set | 199 | # CONFIG_NETFILTER_DEBUG is not set |
200 | CONFIG_NETFILTER_NETLINK=y | ||
201 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
202 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
198 | 203 | ||
199 | # | 204 | # |
200 | # IP: Netfilter Configuration | 205 | # IP: Netfilter Configuration |
@@ -202,11 +207,15 @@ CONFIG_NETFILTER=y | |||
202 | CONFIG_IP_NF_CONNTRACK=m | 207 | CONFIG_IP_NF_CONNTRACK=m |
203 | CONFIG_IP_NF_CT_ACCT=y | 208 | CONFIG_IP_NF_CT_ACCT=y |
204 | CONFIG_IP_NF_CONNTRACK_MARK=y | 209 | CONFIG_IP_NF_CONNTRACK_MARK=y |
210 | CONFIG_IP_NF_CONNTRACK_EVENTS=y | ||
211 | CONFIG_IP_NF_CONNTRACK_NETLINK=m | ||
205 | CONFIG_IP_NF_CT_PROTO_SCTP=m | 212 | CONFIG_IP_NF_CT_PROTO_SCTP=m |
206 | CONFIG_IP_NF_FTP=m | 213 | CONFIG_IP_NF_FTP=m |
207 | CONFIG_IP_NF_IRC=m | 214 | CONFIG_IP_NF_IRC=m |
215 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
208 | CONFIG_IP_NF_TFTP=m | 216 | CONFIG_IP_NF_TFTP=m |
209 | CONFIG_IP_NF_AMANDA=m | 217 | CONFIG_IP_NF_AMANDA=m |
218 | # CONFIG_IP_NF_PPTP is not set | ||
210 | CONFIG_IP_NF_QUEUE=m | 219 | CONFIG_IP_NF_QUEUE=m |
211 | CONFIG_IP_NF_IPTABLES=m | 220 | CONFIG_IP_NF_IPTABLES=m |
212 | CONFIG_IP_NF_MATCH_LIMIT=m | 221 | CONFIG_IP_NF_MATCH_LIMIT=m |
@@ -230,14 +239,18 @@ CONFIG_IP_NF_MATCH_OWNER=m | |||
230 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 239 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
231 | CONFIG_IP_NF_MATCH_REALM=m | 240 | CONFIG_IP_NF_MATCH_REALM=m |
232 | CONFIG_IP_NF_MATCH_SCTP=m | 241 | CONFIG_IP_NF_MATCH_SCTP=m |
242 | # CONFIG_IP_NF_MATCH_DCCP is not set | ||
233 | CONFIG_IP_NF_MATCH_COMMENT=m | 243 | CONFIG_IP_NF_MATCH_COMMENT=m |
234 | CONFIG_IP_NF_MATCH_CONNMARK=m | 244 | CONFIG_IP_NF_MATCH_CONNMARK=m |
245 | CONFIG_IP_NF_MATCH_CONNBYTES=m | ||
235 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 246 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
247 | CONFIG_IP_NF_MATCH_STRING=m | ||
236 | CONFIG_IP_NF_FILTER=m | 248 | CONFIG_IP_NF_FILTER=m |
237 | CONFIG_IP_NF_TARGET_REJECT=m | 249 | CONFIG_IP_NF_TARGET_REJECT=m |
238 | CONFIG_IP_NF_TARGET_LOG=m | 250 | CONFIG_IP_NF_TARGET_LOG=m |
239 | CONFIG_IP_NF_TARGET_ULOG=m | 251 | CONFIG_IP_NF_TARGET_ULOG=m |
240 | CONFIG_IP_NF_TARGET_TCPMSS=m | 252 | CONFIG_IP_NF_TARGET_TCPMSS=m |
253 | CONFIG_IP_NF_TARGET_NFQUEUE=m | ||
241 | CONFIG_IP_NF_NAT=m | 254 | CONFIG_IP_NF_NAT=m |
242 | CONFIG_IP_NF_NAT_NEEDED=y | 255 | CONFIG_IP_NF_NAT_NEEDED=y |
243 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 256 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
@@ -255,6 +268,7 @@ CONFIG_IP_NF_TARGET_ECN=m | |||
255 | CONFIG_IP_NF_TARGET_DSCP=m | 268 | CONFIG_IP_NF_TARGET_DSCP=m |
256 | CONFIG_IP_NF_TARGET_MARK=m | 269 | CONFIG_IP_NF_TARGET_MARK=m |
257 | CONFIG_IP_NF_TARGET_CLASSIFY=m | 270 | CONFIG_IP_NF_TARGET_CLASSIFY=m |
271 | CONFIG_IP_NF_TARGET_TTL=m | ||
258 | CONFIG_IP_NF_TARGET_CONNMARK=m | 272 | CONFIG_IP_NF_TARGET_CONNMARK=m |
259 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 273 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
260 | CONFIG_IP_NF_RAW=m | 274 | CONFIG_IP_NF_RAW=m |
@@ -264,6 +278,11 @@ CONFIG_IP_NF_ARPFILTER=m | |||
264 | CONFIG_IP_NF_ARP_MANGLE=m | 278 | CONFIG_IP_NF_ARP_MANGLE=m |
265 | 279 | ||
266 | # | 280 | # |
281 | # DCCP Configuration (EXPERIMENTAL) | ||
282 | # | ||
283 | # CONFIG_IP_DCCP is not set | ||
284 | |||
285 | # | ||
267 | # SCTP Configuration (EXPERIMENTAL) | 286 | # SCTP Configuration (EXPERIMENTAL) |
268 | # | 287 | # |
269 | # CONFIG_IP_SCTP is not set | 288 | # CONFIG_IP_SCTP is not set |
@@ -290,6 +309,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
290 | # CONFIG_HAMRADIO is not set | 309 | # CONFIG_HAMRADIO is not set |
291 | # CONFIG_IRDA is not set | 310 | # CONFIG_IRDA is not set |
292 | # CONFIG_BT is not set | 311 | # CONFIG_BT is not set |
312 | # CONFIG_IEEE80211 is not set | ||
293 | 313 | ||
294 | # | 314 | # |
295 | # Device Drivers | 315 | # Device Drivers |
@@ -304,6 +324,11 @@ CONFIG_FW_LOADER=y | |||
304 | # CONFIG_DEBUG_DRIVER is not set | 324 | # CONFIG_DEBUG_DRIVER is not set |
305 | 325 | ||
306 | # | 326 | # |
327 | # Connector - unified userspace <-> kernelspace linker | ||
328 | # | ||
329 | # CONFIG_CONNECTOR is not set | ||
330 | |||
331 | # | ||
307 | # Memory Technology Devices (MTD) | 332 | # Memory Technology Devices (MTD) |
308 | # | 333 | # |
309 | # CONFIG_MTD is not set | 334 | # CONFIG_MTD is not set |
@@ -342,7 +367,6 @@ CONFIG_BLK_DEV_RAM=y | |||
342 | CONFIG_BLK_DEV_RAM_COUNT=16 | 367 | CONFIG_BLK_DEV_RAM_COUNT=16 |
343 | CONFIG_BLK_DEV_RAM_SIZE=65536 | 368 | CONFIG_BLK_DEV_RAM_SIZE=65536 |
344 | CONFIG_BLK_DEV_INITRD=y | 369 | CONFIG_BLK_DEV_INITRD=y |
345 | CONFIG_INITRAMFS_SOURCE="" | ||
346 | # CONFIG_CDROM_PKTCDVD is not set | 370 | # CONFIG_CDROM_PKTCDVD is not set |
347 | 371 | ||
348 | # | 372 | # |
@@ -416,6 +440,7 @@ CONFIG_IDEDMA_AUTO=y | |||
416 | # | 440 | # |
417 | # SCSI device support | 441 | # SCSI device support |
418 | # | 442 | # |
443 | # CONFIG_RAID_ATTRS is not set | ||
419 | CONFIG_SCSI=y | 444 | CONFIG_SCSI=y |
420 | CONFIG_SCSI_PROC_FS=y | 445 | CONFIG_SCSI_PROC_FS=y |
421 | 446 | ||
@@ -443,6 +468,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
443 | CONFIG_SCSI_SPI_ATTRS=y | 468 | CONFIG_SCSI_SPI_ATTRS=y |
444 | CONFIG_SCSI_FC_ATTRS=y | 469 | CONFIG_SCSI_FC_ATTRS=y |
445 | CONFIG_SCSI_ISCSI_ATTRS=m | 470 | CONFIG_SCSI_ISCSI_ATTRS=m |
471 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
446 | 472 | ||
447 | # | 473 | # |
448 | # SCSI low-level drivers | 474 | # SCSI low-level drivers |
@@ -456,6 +482,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m | |||
456 | # CONFIG_SCSI_AIC79XX is not set | 482 | # CONFIG_SCSI_AIC79XX is not set |
457 | # CONFIG_MEGARAID_NEWGEN is not set | 483 | # CONFIG_MEGARAID_NEWGEN is not set |
458 | # CONFIG_MEGARAID_LEGACY is not set | 484 | # CONFIG_MEGARAID_LEGACY is not set |
485 | # CONFIG_MEGARAID_SAS is not set | ||
459 | # CONFIG_SCSI_SATA is not set | 486 | # CONFIG_SCSI_SATA is not set |
460 | # CONFIG_SCSI_BUSLOGIC is not set | 487 | # CONFIG_SCSI_BUSLOGIC is not set |
461 | # CONFIG_SCSI_DMX3191D is not set | 488 | # CONFIG_SCSI_DMX3191D is not set |
@@ -517,6 +544,7 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
517 | # CONFIG_FUSION is not set | 544 | # CONFIG_FUSION is not set |
518 | # CONFIG_FUSION_SPI is not set | 545 | # CONFIG_FUSION_SPI is not set |
519 | # CONFIG_FUSION_FC is not set | 546 | # CONFIG_FUSION_FC is not set |
547 | # CONFIG_FUSION_SAS is not set | ||
520 | 548 | ||
521 | # | 549 | # |
522 | # IEEE 1394 (FireWire) support | 550 | # IEEE 1394 (FireWire) support |
@@ -547,12 +575,18 @@ CONFIG_TUN=m | |||
547 | # CONFIG_ARCNET is not set | 575 | # CONFIG_ARCNET is not set |
548 | 576 | ||
549 | # | 577 | # |
578 | # PHY device support | ||
579 | # | ||
580 | # CONFIG_PHYLIB is not set | ||
581 | |||
582 | # | ||
550 | # Ethernet (10 or 100Mbit) | 583 | # Ethernet (10 or 100Mbit) |
551 | # | 584 | # |
552 | CONFIG_NET_ETHERNET=y | 585 | CONFIG_NET_ETHERNET=y |
553 | CONFIG_MII=y | 586 | CONFIG_MII=y |
554 | # CONFIG_HAPPYMEAL is not set | 587 | # CONFIG_HAPPYMEAL is not set |
555 | # CONFIG_SUNGEM is not set | 588 | # CONFIG_SUNGEM is not set |
589 | # CONFIG_CASSINI is not set | ||
556 | CONFIG_NET_VENDOR_3COM=y | 590 | CONFIG_NET_VENDOR_3COM=y |
557 | CONFIG_VORTEX=y | 591 | CONFIG_VORTEX=y |
558 | # CONFIG_TYPHOON is not set | 592 | # CONFIG_TYPHOON is not set |
@@ -581,6 +615,7 @@ CONFIG_E100=y | |||
581 | # CONFIG_EPIC100 is not set | 615 | # CONFIG_EPIC100 is not set |
582 | # CONFIG_SUNDANCE is not set | 616 | # CONFIG_SUNDANCE is not set |
583 | # CONFIG_VIA_RHINE is not set | 617 | # CONFIG_VIA_RHINE is not set |
618 | # CONFIG_NET_POCKET is not set | ||
584 | 619 | ||
585 | # | 620 | # |
586 | # Ethernet (1000 Mbit) | 621 | # Ethernet (1000 Mbit) |
@@ -594,6 +629,7 @@ CONFIG_E1000=y | |||
594 | # CONFIG_HAMACHI is not set | 629 | # CONFIG_HAMACHI is not set |
595 | # CONFIG_YELLOWFIN is not set | 630 | # CONFIG_YELLOWFIN is not set |
596 | # CONFIG_R8169 is not set | 631 | # CONFIG_R8169 is not set |
632 | # CONFIG_SIS190 is not set | ||
597 | # CONFIG_SKGE is not set | 633 | # CONFIG_SKGE is not set |
598 | # CONFIG_SK98LIN is not set | 634 | # CONFIG_SK98LIN is not set |
599 | # CONFIG_VIA_VELOCITY is not set | 635 | # CONFIG_VIA_VELOCITY is not set |
@@ -604,6 +640,7 @@ CONFIG_TIGON3=y | |||
604 | # | 640 | # |
605 | # Ethernet (10000 Mbit) | 641 | # Ethernet (10000 Mbit) |
606 | # | 642 | # |
643 | # CONFIG_CHELSIO_T1 is not set | ||
607 | CONFIG_IXGB=m | 644 | CONFIG_IXGB=m |
608 | # CONFIG_IXGB_NAPI is not set | 645 | # CONFIG_IXGB_NAPI is not set |
609 | CONFIG_S2IO=m | 646 | CONFIG_S2IO=m |
@@ -789,7 +826,6 @@ CONFIG_I2C_ALGOBIT=y | |||
789 | # CONFIG_I2C_I801 is not set | 826 | # CONFIG_I2C_I801 is not set |
790 | # CONFIG_I2C_I810 is not set | 827 | # CONFIG_I2C_I810 is not set |
791 | # CONFIG_I2C_PIIX4 is not set | 828 | # CONFIG_I2C_PIIX4 is not set |
792 | # CONFIG_I2C_ISA is not set | ||
793 | # CONFIG_I2C_NFORCE2 is not set | 829 | # CONFIG_I2C_NFORCE2 is not set |
794 | # CONFIG_I2C_PARPORT is not set | 830 | # CONFIG_I2C_PARPORT is not set |
795 | # CONFIG_I2C_PARPORT_LIGHT is not set | 831 | # CONFIG_I2C_PARPORT_LIGHT is not set |
@@ -804,7 +840,6 @@ CONFIG_I2C_ALGOBIT=y | |||
804 | # CONFIG_I2C_VIAPRO is not set | 840 | # CONFIG_I2C_VIAPRO is not set |
805 | # CONFIG_I2C_VOODOO3 is not set | 841 | # CONFIG_I2C_VOODOO3 is not set |
806 | # CONFIG_I2C_PCA_ISA is not set | 842 | # CONFIG_I2C_PCA_ISA is not set |
807 | # CONFIG_I2C_SENSOR is not set | ||
808 | 843 | ||
809 | # | 844 | # |
810 | # Miscellaneous I2C Chip support | 845 | # Miscellaneous I2C Chip support |
@@ -831,12 +866,17 @@ CONFIG_I2C_ALGOBIT=y | |||
831 | # Hardware Monitoring support | 866 | # Hardware Monitoring support |
832 | # | 867 | # |
833 | # CONFIG_HWMON is not set | 868 | # CONFIG_HWMON is not set |
869 | # CONFIG_HWMON_VID is not set | ||
834 | 870 | ||
835 | # | 871 | # |
836 | # Misc devices | 872 | # Misc devices |
837 | # | 873 | # |
838 | 874 | ||
839 | # | 875 | # |
876 | # Multimedia Capabilities Port drivers | ||
877 | # | ||
878 | |||
879 | # | ||
840 | # Multimedia devices | 880 | # Multimedia devices |
841 | # | 881 | # |
842 | # CONFIG_VIDEO_DEV is not set | 882 | # CONFIG_VIDEO_DEV is not set |
@@ -885,6 +925,7 @@ CONFIG_FB_RADEON_I2C=y | |||
885 | # CONFIG_FB_KYRO is not set | 925 | # CONFIG_FB_KYRO is not set |
886 | # CONFIG_FB_3DFX is not set | 926 | # CONFIG_FB_3DFX is not set |
887 | # CONFIG_FB_VOODOO1 is not set | 927 | # CONFIG_FB_VOODOO1 is not set |
928 | # CONFIG_FB_CYBLA is not set | ||
888 | # CONFIG_FB_TRIDENT is not set | 929 | # CONFIG_FB_TRIDENT is not set |
889 | # CONFIG_FB_S1D13XXX is not set | 930 | # CONFIG_FB_S1D13XXX is not set |
890 | # CONFIG_FB_VIRTUAL is not set | 931 | # CONFIG_FB_VIRTUAL is not set |
@@ -982,9 +1023,11 @@ CONFIG_USB_HIDDEV=y | |||
982 | # CONFIG_USB_MTOUCH is not set | 1023 | # CONFIG_USB_MTOUCH is not set |
983 | # CONFIG_USB_ITMTOUCH is not set | 1024 | # CONFIG_USB_ITMTOUCH is not set |
984 | # CONFIG_USB_EGALAX is not set | 1025 | # CONFIG_USB_EGALAX is not set |
1026 | # CONFIG_USB_YEALINK is not set | ||
985 | # CONFIG_USB_XPAD is not set | 1027 | # CONFIG_USB_XPAD is not set |
986 | # CONFIG_USB_ATI_REMOTE is not set | 1028 | # CONFIG_USB_ATI_REMOTE is not set |
987 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1029 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
1030 | # CONFIG_USB_APPLETOUCH is not set | ||
988 | 1031 | ||
989 | # | 1032 | # |
990 | # USB Imaging devices | 1033 | # USB Imaging devices |
@@ -1057,7 +1100,8 @@ CONFIG_USB_MON=y | |||
1057 | # InfiniBand support | 1100 | # InfiniBand support |
1058 | # | 1101 | # |
1059 | CONFIG_INFINIBAND=m | 1102 | CONFIG_INFINIBAND=m |
1060 | CONFIG_INFINIBAND_USER_VERBS=m | 1103 | # CONFIG_INFINIBAND_USER_MAD is not set |
1104 | # CONFIG_INFINIBAND_USER_ACCESS is not set | ||
1061 | CONFIG_INFINIBAND_MTHCA=m | 1105 | CONFIG_INFINIBAND_MTHCA=m |
1062 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | 1106 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set |
1063 | CONFIG_INFINIBAND_IPOIB=m | 1107 | CONFIG_INFINIBAND_IPOIB=m |
@@ -1095,16 +1139,12 @@ CONFIG_JFS_SECURITY=y | |||
1095 | # CONFIG_JFS_DEBUG is not set | 1139 | # CONFIG_JFS_DEBUG is not set |
1096 | # CONFIG_JFS_STATISTICS is not set | 1140 | # CONFIG_JFS_STATISTICS is not set |
1097 | CONFIG_FS_POSIX_ACL=y | 1141 | CONFIG_FS_POSIX_ACL=y |
1098 | |||
1099 | # | ||
1100 | # XFS support | ||
1101 | # | ||
1102 | CONFIG_XFS_FS=m | 1142 | CONFIG_XFS_FS=m |
1103 | CONFIG_XFS_EXPORT=y | 1143 | CONFIG_XFS_EXPORT=y |
1104 | # CONFIG_XFS_RT is not set | ||
1105 | # CONFIG_XFS_QUOTA is not set | 1144 | # CONFIG_XFS_QUOTA is not set |
1106 | CONFIG_XFS_SECURITY=y | 1145 | CONFIG_XFS_SECURITY=y |
1107 | CONFIG_XFS_POSIX_ACL=y | 1146 | CONFIG_XFS_POSIX_ACL=y |
1147 | # CONFIG_XFS_RT is not set | ||
1108 | # CONFIG_MINIX_FS is not set | 1148 | # CONFIG_MINIX_FS is not set |
1109 | # CONFIG_ROMFS_FS is not set | 1149 | # CONFIG_ROMFS_FS is not set |
1110 | CONFIG_INOTIFY=y | 1150 | CONFIG_INOTIFY=y |
@@ -1112,6 +1152,7 @@ CONFIG_INOTIFY=y | |||
1112 | CONFIG_DNOTIFY=y | 1152 | CONFIG_DNOTIFY=y |
1113 | CONFIG_AUTOFS_FS=m | 1153 | CONFIG_AUTOFS_FS=m |
1114 | # CONFIG_AUTOFS4_FS is not set | 1154 | # CONFIG_AUTOFS4_FS is not set |
1155 | # CONFIG_FUSE_FS is not set | ||
1115 | 1156 | ||
1116 | # | 1157 | # |
1117 | # CD-ROM/DVD Filesystems | 1158 | # CD-ROM/DVD Filesystems |
@@ -1139,14 +1180,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1139 | CONFIG_PROC_FS=y | 1180 | CONFIG_PROC_FS=y |
1140 | CONFIG_PROC_KCORE=y | 1181 | CONFIG_PROC_KCORE=y |
1141 | CONFIG_SYSFS=y | 1182 | CONFIG_SYSFS=y |
1142 | CONFIG_DEVPTS_FS_XATTR=y | ||
1143 | CONFIG_DEVPTS_FS_SECURITY=y | ||
1144 | CONFIG_TMPFS=y | 1183 | CONFIG_TMPFS=y |
1145 | CONFIG_TMPFS_XATTR=y | ||
1146 | CONFIG_TMPFS_SECURITY=y | ||
1147 | CONFIG_HUGETLBFS=y | 1184 | CONFIG_HUGETLBFS=y |
1148 | CONFIG_HUGETLB_PAGE=y | 1185 | CONFIG_HUGETLB_PAGE=y |
1149 | CONFIG_RAMFS=y | 1186 | CONFIG_RAMFS=y |
1187 | # CONFIG_RELAYFS_FS is not set | ||
1150 | 1188 | ||
1151 | # | 1189 | # |
1152 | # Miscellaneous filesystems | 1190 | # Miscellaneous filesystems |
@@ -1197,6 +1235,7 @@ CONFIG_CIFS_POSIX=y | |||
1197 | # CONFIG_NCP_FS is not set | 1235 | # CONFIG_NCP_FS is not set |
1198 | # CONFIG_CODA_FS is not set | 1236 | # CONFIG_CODA_FS is not set |
1199 | # CONFIG_AFS_FS is not set | 1237 | # CONFIG_AFS_FS is not set |
1238 | # CONFIG_9P_FS is not set | ||
1200 | 1239 | ||
1201 | # | 1240 | # |
1202 | # Partition Types | 1241 | # Partition Types |
@@ -1261,6 +1300,7 @@ CONFIG_OPROFILE=y | |||
1261 | CONFIG_DEBUG_KERNEL=y | 1300 | CONFIG_DEBUG_KERNEL=y |
1262 | CONFIG_MAGIC_SYSRQ=y | 1301 | CONFIG_MAGIC_SYSRQ=y |
1263 | CONFIG_LOG_BUF_SHIFT=17 | 1302 | CONFIG_LOG_BUF_SHIFT=17 |
1303 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1264 | # CONFIG_SCHEDSTATS is not set | 1304 | # CONFIG_SCHEDSTATS is not set |
1265 | # CONFIG_DEBUG_SLAB is not set | 1305 | # CONFIG_DEBUG_SLAB is not set |
1266 | # CONFIG_DEBUG_SPINLOCK is not set | 1306 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1320,7 +1360,12 @@ CONFIG_CRYPTO_TEST=m | |||
1320 | # Library routines | 1360 | # Library routines |
1321 | # | 1361 | # |
1322 | CONFIG_CRC_CCITT=m | 1362 | CONFIG_CRC_CCITT=m |
1363 | # CONFIG_CRC16 is not set | ||
1323 | CONFIG_CRC32=y | 1364 | CONFIG_CRC32=y |
1324 | CONFIG_LIBCRC32C=m | 1365 | CONFIG_LIBCRC32C=m |
1325 | CONFIG_ZLIB_INFLATE=y | 1366 | CONFIG_ZLIB_INFLATE=y |
1326 | CONFIG_ZLIB_DEFLATE=m | 1367 | CONFIG_ZLIB_DEFLATE=m |
1368 | CONFIG_TEXTSEARCH=y | ||
1369 | CONFIG_TEXTSEARCH_KMP=m | ||
1370 | CONFIG_TEXTSEARCH_BM=m | ||
1371 | CONFIG_TEXTSEARCH_FSM=m | ||
diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig index 7cb4750bb7a9..37c157c93cef 100644 --- a/arch/ppc64/defconfig +++ b/arch/ppc64/defconfig | |||
@@ -1,17 +1,17 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6 | 3 | # Linux kernel version: 2.6.14-rc4 |
4 | # Mon Aug 8 14:16:54 2005 | 4 | # Thu Oct 20 08:28:33 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 9 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
10 | CONFIG_GENERIC_ISA_DMA=y | 10 | CONFIG_GENERIC_ISA_DMA=y |
11 | CONFIG_HAVE_DEC_LOCK=y | ||
12 | CONFIG_EARLY_PRINTK=y | 11 | CONFIG_EARLY_PRINTK=y |
13 | CONFIG_COMPAT=y | 12 | CONFIG_COMPAT=y |
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 13 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
14 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
15 | CONFIG_FORCE_MAX_ZONEORDER=13 | 15 | CONFIG_FORCE_MAX_ZONEORDER=13 |
16 | 16 | ||
17 | # | 17 | # |
@@ -26,6 +26,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
26 | # General setup | 26 | # General setup |
27 | # | 27 | # |
28 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
29 | CONFIG_LOCALVERSION_AUTO=y | ||
29 | CONFIG_SWAP=y | 30 | CONFIG_SWAP=y |
30 | CONFIG_SYSVIPC=y | 31 | CONFIG_SYSVIPC=y |
31 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
@@ -37,6 +38,7 @@ CONFIG_KOBJECT_UEVENT=y | |||
37 | CONFIG_IKCONFIG=y | 38 | CONFIG_IKCONFIG=y |
38 | CONFIG_IKCONFIG_PROC=y | 39 | CONFIG_IKCONFIG_PROC=y |
39 | CONFIG_CPUSETS=y | 40 | CONFIG_CPUSETS=y |
41 | CONFIG_INITRAMFS_SOURCE="" | ||
40 | # CONFIG_EMBEDDED is not set | 42 | # CONFIG_EMBEDDED is not set |
41 | CONFIG_KALLSYMS=y | 43 | CONFIG_KALLSYMS=y |
42 | # CONFIG_KALLSYMS_ALL is not set | 44 | # CONFIG_KALLSYMS_ALL is not set |
@@ -106,6 +108,7 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
106 | CONFIG_DISCONTIGMEM=y | 108 | CONFIG_DISCONTIGMEM=y |
107 | CONFIG_FLAT_NODE_MEM_MAP=y | 109 | CONFIG_FLAT_NODE_MEM_MAP=y |
108 | CONFIG_NEED_MULTIPLE_NODES=y | 110 | CONFIG_NEED_MULTIPLE_NODES=y |
111 | # CONFIG_SPARSEMEM_STATIC is not set | ||
109 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 112 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
110 | CONFIG_NODES_SPAN_OTHER_NODES=y | 113 | CONFIG_NODES_SPAN_OTHER_NODES=y |
111 | # CONFIG_NUMA is not set | 114 | # CONFIG_NUMA is not set |
@@ -126,19 +129,20 @@ CONFIG_RTAS_FLASH=m | |||
126 | CONFIG_SCANLOG=m | 129 | CONFIG_SCANLOG=m |
127 | CONFIG_LPARCFG=y | 130 | CONFIG_LPARCFG=y |
128 | CONFIG_SECCOMP=y | 131 | CONFIG_SECCOMP=y |
132 | CONFIG_BINFMT_ELF=y | ||
133 | CONFIG_BINFMT_MISC=m | ||
134 | CONFIG_HOTPLUG_CPU=y | ||
135 | CONFIG_PROC_DEVICETREE=y | ||
136 | # CONFIG_CMDLINE_BOOL is not set | ||
129 | CONFIG_ISA_DMA_API=y | 137 | CONFIG_ISA_DMA_API=y |
130 | 138 | ||
131 | # | 139 | # |
132 | # General setup | 140 | # Bus Options |
133 | # | 141 | # |
134 | CONFIG_PCI=y | 142 | CONFIG_PCI=y |
135 | CONFIG_PCI_DOMAINS=y | 143 | CONFIG_PCI_DOMAINS=y |
136 | CONFIG_BINFMT_ELF=y | ||
137 | CONFIG_BINFMT_MISC=m | ||
138 | # CONFIG_PCI_LEGACY_PROC is not set | 144 | # CONFIG_PCI_LEGACY_PROC is not set |
139 | # CONFIG_PCI_NAMES is not set | ||
140 | # CONFIG_PCI_DEBUG is not set | 145 | # CONFIG_PCI_DEBUG is not set |
141 | CONFIG_HOTPLUG_CPU=y | ||
142 | 146 | ||
143 | # | 147 | # |
144 | # PCCARD (PCMCIA/CardBus) support | 148 | # PCCARD (PCMCIA/CardBus) support |
@@ -154,8 +158,6 @@ CONFIG_HOTPLUG_PCI=m | |||
154 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 158 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
155 | CONFIG_HOTPLUG_PCI_RPA=m | 159 | CONFIG_HOTPLUG_PCI_RPA=m |
156 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | 160 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m |
157 | CONFIG_PROC_DEVICETREE=y | ||
158 | # CONFIG_CMDLINE_BOOL is not set | ||
159 | 161 | ||
160 | # | 162 | # |
161 | # Networking | 163 | # Networking |
@@ -185,8 +187,8 @@ CONFIG_INET_AH=m | |||
185 | CONFIG_INET_ESP=m | 187 | CONFIG_INET_ESP=m |
186 | CONFIG_INET_IPCOMP=m | 188 | CONFIG_INET_IPCOMP=m |
187 | CONFIG_INET_TUNNEL=y | 189 | CONFIG_INET_TUNNEL=y |
188 | # CONFIG_IP_TCPDIAG is not set | 190 | CONFIG_INET_DIAG=y |
189 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 191 | CONFIG_INET_TCP_DIAG=y |
190 | # CONFIG_TCP_CONG_ADVANCED is not set | 192 | # CONFIG_TCP_CONG_ADVANCED is not set |
191 | CONFIG_TCP_CONG_BIC=y | 193 | CONFIG_TCP_CONG_BIC=y |
192 | 194 | ||
@@ -197,6 +199,9 @@ CONFIG_TCP_CONG_BIC=y | |||
197 | # CONFIG_IPV6 is not set | 199 | # CONFIG_IPV6 is not set |
198 | CONFIG_NETFILTER=y | 200 | CONFIG_NETFILTER=y |
199 | # CONFIG_NETFILTER_DEBUG is not set | 201 | # CONFIG_NETFILTER_DEBUG is not set |
202 | CONFIG_NETFILTER_NETLINK=y | ||
203 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
204 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
200 | 205 | ||
201 | # | 206 | # |
202 | # IP: Netfilter Configuration | 207 | # IP: Netfilter Configuration |
@@ -204,11 +209,15 @@ CONFIG_NETFILTER=y | |||
204 | CONFIG_IP_NF_CONNTRACK=m | 209 | CONFIG_IP_NF_CONNTRACK=m |
205 | CONFIG_IP_NF_CT_ACCT=y | 210 | CONFIG_IP_NF_CT_ACCT=y |
206 | CONFIG_IP_NF_CONNTRACK_MARK=y | 211 | CONFIG_IP_NF_CONNTRACK_MARK=y |
212 | CONFIG_IP_NF_CONNTRACK_EVENTS=y | ||
213 | CONFIG_IP_NF_CONNTRACK_NETLINK=m | ||
207 | CONFIG_IP_NF_CT_PROTO_SCTP=m | 214 | CONFIG_IP_NF_CT_PROTO_SCTP=m |
208 | CONFIG_IP_NF_FTP=m | 215 | CONFIG_IP_NF_FTP=m |
209 | CONFIG_IP_NF_IRC=m | 216 | CONFIG_IP_NF_IRC=m |
217 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
210 | CONFIG_IP_NF_TFTP=m | 218 | CONFIG_IP_NF_TFTP=m |
211 | CONFIG_IP_NF_AMANDA=m | 219 | CONFIG_IP_NF_AMANDA=m |
220 | # CONFIG_IP_NF_PPTP is not set | ||
212 | CONFIG_IP_NF_QUEUE=m | 221 | CONFIG_IP_NF_QUEUE=m |
213 | CONFIG_IP_NF_IPTABLES=m | 222 | CONFIG_IP_NF_IPTABLES=m |
214 | CONFIG_IP_NF_MATCH_LIMIT=m | 223 | CONFIG_IP_NF_MATCH_LIMIT=m |
@@ -232,14 +241,18 @@ CONFIG_IP_NF_MATCH_OWNER=m | |||
232 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 241 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
233 | CONFIG_IP_NF_MATCH_REALM=m | 242 | CONFIG_IP_NF_MATCH_REALM=m |
234 | CONFIG_IP_NF_MATCH_SCTP=m | 243 | CONFIG_IP_NF_MATCH_SCTP=m |
244 | CONFIG_IP_NF_MATCH_DCCP=m | ||
235 | CONFIG_IP_NF_MATCH_COMMENT=m | 245 | CONFIG_IP_NF_MATCH_COMMENT=m |
236 | CONFIG_IP_NF_MATCH_CONNMARK=m | 246 | CONFIG_IP_NF_MATCH_CONNMARK=m |
247 | CONFIG_IP_NF_MATCH_CONNBYTES=m | ||
237 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 248 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
249 | CONFIG_IP_NF_MATCH_STRING=m | ||
238 | CONFIG_IP_NF_FILTER=m | 250 | CONFIG_IP_NF_FILTER=m |
239 | CONFIG_IP_NF_TARGET_REJECT=m | 251 | CONFIG_IP_NF_TARGET_REJECT=m |
240 | CONFIG_IP_NF_TARGET_LOG=m | 252 | CONFIG_IP_NF_TARGET_LOG=m |
241 | CONFIG_IP_NF_TARGET_ULOG=m | 253 | CONFIG_IP_NF_TARGET_ULOG=m |
242 | CONFIG_IP_NF_TARGET_TCPMSS=m | 254 | CONFIG_IP_NF_TARGET_TCPMSS=m |
255 | CONFIG_IP_NF_TARGET_NFQUEUE=m | ||
243 | CONFIG_IP_NF_NAT=m | 256 | CONFIG_IP_NF_NAT=m |
244 | CONFIG_IP_NF_NAT_NEEDED=y | 257 | CONFIG_IP_NF_NAT_NEEDED=y |
245 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 258 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
@@ -257,6 +270,7 @@ CONFIG_IP_NF_TARGET_ECN=m | |||
257 | CONFIG_IP_NF_TARGET_DSCP=m | 270 | CONFIG_IP_NF_TARGET_DSCP=m |
258 | CONFIG_IP_NF_TARGET_MARK=m | 271 | CONFIG_IP_NF_TARGET_MARK=m |
259 | CONFIG_IP_NF_TARGET_CLASSIFY=m | 272 | CONFIG_IP_NF_TARGET_CLASSIFY=m |
273 | CONFIG_IP_NF_TARGET_TTL=m | ||
260 | CONFIG_IP_NF_TARGET_CONNMARK=m | 274 | CONFIG_IP_NF_TARGET_CONNMARK=m |
261 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 275 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
262 | CONFIG_IP_NF_RAW=m | 276 | CONFIG_IP_NF_RAW=m |
@@ -266,6 +280,11 @@ CONFIG_IP_NF_ARPFILTER=m | |||
266 | CONFIG_IP_NF_ARP_MANGLE=m | 280 | CONFIG_IP_NF_ARP_MANGLE=m |
267 | 281 | ||
268 | # | 282 | # |
283 | # DCCP Configuration (EXPERIMENTAL) | ||
284 | # | ||
285 | # CONFIG_IP_DCCP is not set | ||
286 | |||
287 | # | ||
269 | # SCTP Configuration (EXPERIMENTAL) | 288 | # SCTP Configuration (EXPERIMENTAL) |
270 | # | 289 | # |
271 | # CONFIG_IP_SCTP is not set | 290 | # CONFIG_IP_SCTP is not set |
@@ -292,6 +311,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
292 | # CONFIG_HAMRADIO is not set | 311 | # CONFIG_HAMRADIO is not set |
293 | # CONFIG_IRDA is not set | 312 | # CONFIG_IRDA is not set |
294 | # CONFIG_BT is not set | 313 | # CONFIG_BT is not set |
314 | # CONFIG_IEEE80211 is not set | ||
295 | 315 | ||
296 | # | 316 | # |
297 | # Device Drivers | 317 | # Device Drivers |
@@ -306,6 +326,11 @@ CONFIG_FW_LOADER=y | |||
306 | # CONFIG_DEBUG_DRIVER is not set | 326 | # CONFIG_DEBUG_DRIVER is not set |
307 | 327 | ||
308 | # | 328 | # |
329 | # Connector - unified userspace <-> kernelspace linker | ||
330 | # | ||
331 | # CONFIG_CONNECTOR is not set | ||
332 | |||
333 | # | ||
309 | # Memory Technology Devices (MTD) | 334 | # Memory Technology Devices (MTD) |
310 | # | 335 | # |
311 | # CONFIG_MTD is not set | 336 | # CONFIG_MTD is not set |
@@ -344,7 +369,6 @@ CONFIG_BLK_DEV_RAM=y | |||
344 | CONFIG_BLK_DEV_RAM_COUNT=16 | 369 | CONFIG_BLK_DEV_RAM_COUNT=16 |
345 | CONFIG_BLK_DEV_RAM_SIZE=65536 | 370 | CONFIG_BLK_DEV_RAM_SIZE=65536 |
346 | CONFIG_BLK_DEV_INITRD=y | 371 | CONFIG_BLK_DEV_INITRD=y |
347 | CONFIG_INITRAMFS_SOURCE="" | ||
348 | # CONFIG_CDROM_PKTCDVD is not set | 372 | # CONFIG_CDROM_PKTCDVD is not set |
349 | 373 | ||
350 | # | 374 | # |
@@ -422,6 +446,7 @@ CONFIG_IDEDMA_AUTO=y | |||
422 | # | 446 | # |
423 | # SCSI device support | 447 | # SCSI device support |
424 | # | 448 | # |
449 | # CONFIG_RAID_ATTRS is not set | ||
425 | CONFIG_SCSI=y | 450 | CONFIG_SCSI=y |
426 | CONFIG_SCSI_PROC_FS=y | 451 | CONFIG_SCSI_PROC_FS=y |
427 | 452 | ||
@@ -449,6 +474,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
449 | CONFIG_SCSI_SPI_ATTRS=y | 474 | CONFIG_SCSI_SPI_ATTRS=y |
450 | CONFIG_SCSI_FC_ATTRS=y | 475 | CONFIG_SCSI_FC_ATTRS=y |
451 | CONFIG_SCSI_ISCSI_ATTRS=m | 476 | CONFIG_SCSI_ISCSI_ATTRS=m |
477 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
452 | 478 | ||
453 | # | 479 | # |
454 | # SCSI low-level drivers | 480 | # SCSI low-level drivers |
@@ -462,10 +488,12 @@ CONFIG_SCSI_ISCSI_ATTRS=m | |||
462 | # CONFIG_SCSI_AIC79XX is not set | 488 | # CONFIG_SCSI_AIC79XX is not set |
463 | # CONFIG_MEGARAID_NEWGEN is not set | 489 | # CONFIG_MEGARAID_NEWGEN is not set |
464 | # CONFIG_MEGARAID_LEGACY is not set | 490 | # CONFIG_MEGARAID_LEGACY is not set |
491 | # CONFIG_MEGARAID_SAS is not set | ||
465 | CONFIG_SCSI_SATA=y | 492 | CONFIG_SCSI_SATA=y |
466 | # CONFIG_SCSI_SATA_AHCI is not set | 493 | # CONFIG_SCSI_SATA_AHCI is not set |
467 | CONFIG_SCSI_SATA_SVW=y | 494 | CONFIG_SCSI_SATA_SVW=y |
468 | # CONFIG_SCSI_ATA_PIIX is not set | 495 | # CONFIG_SCSI_ATA_PIIX is not set |
496 | # CONFIG_SCSI_SATA_MV is not set | ||
469 | # CONFIG_SCSI_SATA_NV is not set | 497 | # CONFIG_SCSI_SATA_NV is not set |
470 | # CONFIG_SCSI_SATA_PROMISE is not set | 498 | # CONFIG_SCSI_SATA_PROMISE is not set |
471 | # CONFIG_SCSI_SATA_QSTOR is not set | 499 | # CONFIG_SCSI_SATA_QSTOR is not set |
@@ -535,6 +563,7 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
535 | # CONFIG_FUSION is not set | 563 | # CONFIG_FUSION is not set |
536 | # CONFIG_FUSION_SPI is not set | 564 | # CONFIG_FUSION_SPI is not set |
537 | # CONFIG_FUSION_FC is not set | 565 | # CONFIG_FUSION_FC is not set |
566 | # CONFIG_FUSION_SAS is not set | ||
538 | 567 | ||
539 | # | 568 | # |
540 | # IEEE 1394 (FireWire) support | 569 | # IEEE 1394 (FireWire) support |
@@ -578,7 +607,6 @@ CONFIG_IEEE1394_AMDTP=m | |||
578 | # | 607 | # |
579 | CONFIG_ADB_PMU=y | 608 | CONFIG_ADB_PMU=y |
580 | CONFIG_PMAC_SMU=y | 609 | CONFIG_PMAC_SMU=y |
581 | # CONFIG_PMAC_BACKLIGHT is not set | ||
582 | CONFIG_THERM_PM72=y | 610 | CONFIG_THERM_PM72=y |
583 | 611 | ||
584 | # | 612 | # |
@@ -596,12 +624,18 @@ CONFIG_TUN=m | |||
596 | # CONFIG_ARCNET is not set | 624 | # CONFIG_ARCNET is not set |
597 | 625 | ||
598 | # | 626 | # |
627 | # PHY device support | ||
628 | # | ||
629 | # CONFIG_PHYLIB is not set | ||
630 | |||
631 | # | ||
599 | # Ethernet (10 or 100Mbit) | 632 | # Ethernet (10 or 100Mbit) |
600 | # | 633 | # |
601 | CONFIG_NET_ETHERNET=y | 634 | CONFIG_NET_ETHERNET=y |
602 | CONFIG_MII=y | 635 | CONFIG_MII=y |
603 | # CONFIG_HAPPYMEAL is not set | 636 | # CONFIG_HAPPYMEAL is not set |
604 | CONFIG_SUNGEM=y | 637 | CONFIG_SUNGEM=y |
638 | # CONFIG_CASSINI is not set | ||
605 | CONFIG_NET_VENDOR_3COM=y | 639 | CONFIG_NET_VENDOR_3COM=y |
606 | CONFIG_VORTEX=y | 640 | CONFIG_VORTEX=y |
607 | # CONFIG_TYPHOON is not set | 641 | # CONFIG_TYPHOON is not set |
@@ -630,6 +664,7 @@ CONFIG_E100=y | |||
630 | # CONFIG_EPIC100 is not set | 664 | # CONFIG_EPIC100 is not set |
631 | # CONFIG_SUNDANCE is not set | 665 | # CONFIG_SUNDANCE is not set |
632 | # CONFIG_VIA_RHINE is not set | 666 | # CONFIG_VIA_RHINE is not set |
667 | # CONFIG_NET_POCKET is not set | ||
633 | 668 | ||
634 | # | 669 | # |
635 | # Ethernet (1000 Mbit) | 670 | # Ethernet (1000 Mbit) |
@@ -643,16 +678,19 @@ CONFIG_E1000=y | |||
643 | # CONFIG_HAMACHI is not set | 678 | # CONFIG_HAMACHI is not set |
644 | # CONFIG_YELLOWFIN is not set | 679 | # CONFIG_YELLOWFIN is not set |
645 | # CONFIG_R8169 is not set | 680 | # CONFIG_R8169 is not set |
681 | # CONFIG_SIS190 is not set | ||
646 | # CONFIG_SKGE is not set | 682 | # CONFIG_SKGE is not set |
647 | # CONFIG_SK98LIN is not set | 683 | # CONFIG_SK98LIN is not set |
648 | # CONFIG_VIA_VELOCITY is not set | 684 | # CONFIG_VIA_VELOCITY is not set |
649 | CONFIG_TIGON3=y | 685 | CONFIG_TIGON3=y |
650 | # CONFIG_BNX2 is not set | 686 | # CONFIG_BNX2 is not set |
687 | # CONFIG_SPIDER_NET is not set | ||
651 | # CONFIG_MV643XX_ETH is not set | 688 | # CONFIG_MV643XX_ETH is not set |
652 | 689 | ||
653 | # | 690 | # |
654 | # Ethernet (10000 Mbit) | 691 | # Ethernet (10000 Mbit) |
655 | # | 692 | # |
693 | # CONFIG_CHELSIO_T1 is not set | ||
656 | CONFIG_IXGB=m | 694 | CONFIG_IXGB=m |
657 | # CONFIG_IXGB_NAPI is not set | 695 | # CONFIG_IXGB_NAPI is not set |
658 | # CONFIG_S2IO is not set | 696 | # CONFIG_S2IO is not set |
@@ -838,8 +876,8 @@ CONFIG_I2C_AMD8111=y | |||
838 | # CONFIG_I2C_I801 is not set | 876 | # CONFIG_I2C_I801 is not set |
839 | # CONFIG_I2C_I810 is not set | 877 | # CONFIG_I2C_I810 is not set |
840 | # CONFIG_I2C_PIIX4 is not set | 878 | # CONFIG_I2C_PIIX4 is not set |
841 | # CONFIG_I2C_ISA is not set | ||
842 | CONFIG_I2C_KEYWEST=y | 879 | CONFIG_I2C_KEYWEST=y |
880 | CONFIG_I2C_PMAC_SMU=y | ||
843 | # CONFIG_I2C_NFORCE2 is not set | 881 | # CONFIG_I2C_NFORCE2 is not set |
844 | # CONFIG_I2C_PARPORT is not set | 882 | # CONFIG_I2C_PARPORT is not set |
845 | # CONFIG_I2C_PARPORT_LIGHT is not set | 883 | # CONFIG_I2C_PARPORT_LIGHT is not set |
@@ -854,7 +892,6 @@ CONFIG_I2C_KEYWEST=y | |||
854 | # CONFIG_I2C_VIAPRO is not set | 892 | # CONFIG_I2C_VIAPRO is not set |
855 | # CONFIG_I2C_VOODOO3 is not set | 893 | # CONFIG_I2C_VOODOO3 is not set |
856 | # CONFIG_I2C_PCA_ISA is not set | 894 | # CONFIG_I2C_PCA_ISA is not set |
857 | # CONFIG_I2C_SENSOR is not set | ||
858 | 895 | ||
859 | # | 896 | # |
860 | # Miscellaneous I2C Chip support | 897 | # Miscellaneous I2C Chip support |
@@ -881,12 +918,17 @@ CONFIG_I2C_KEYWEST=y | |||
881 | # Hardware Monitoring support | 918 | # Hardware Monitoring support |
882 | # | 919 | # |
883 | # CONFIG_HWMON is not set | 920 | # CONFIG_HWMON is not set |
921 | # CONFIG_HWMON_VID is not set | ||
884 | 922 | ||
885 | # | 923 | # |
886 | # Misc devices | 924 | # Misc devices |
887 | # | 925 | # |
888 | 926 | ||
889 | # | 927 | # |
928 | # Multimedia Capabilities Port drivers | ||
929 | # | ||
930 | |||
931 | # | ||
890 | # Multimedia devices | 932 | # Multimedia devices |
891 | # | 933 | # |
892 | # CONFIG_VIDEO_DEV is not set | 934 | # CONFIG_VIDEO_DEV is not set |
@@ -939,6 +981,7 @@ CONFIG_FB_RADEON_I2C=y | |||
939 | # CONFIG_FB_KYRO is not set | 981 | # CONFIG_FB_KYRO is not set |
940 | # CONFIG_FB_3DFX is not set | 982 | # CONFIG_FB_3DFX is not set |
941 | # CONFIG_FB_VOODOO1 is not set | 983 | # CONFIG_FB_VOODOO1 is not set |
984 | # CONFIG_FB_CYBLA is not set | ||
942 | # CONFIG_FB_TRIDENT is not set | 985 | # CONFIG_FB_TRIDENT is not set |
943 | # CONFIG_FB_S1D13XXX is not set | 986 | # CONFIG_FB_S1D13XXX is not set |
944 | # CONFIG_FB_VIRTUAL is not set | 987 | # CONFIG_FB_VIRTUAL is not set |
@@ -1020,6 +1063,7 @@ CONFIG_USB_STORAGE=m | |||
1020 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1063 | # CONFIG_USB_STORAGE_SDDR09 is not set |
1021 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1064 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1022 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1065 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1066 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1023 | 1067 | ||
1024 | # | 1068 | # |
1025 | # USB Input Devices | 1069 | # USB Input Devices |
@@ -1036,9 +1080,11 @@ CONFIG_USB_HIDDEV=y | |||
1036 | # CONFIG_USB_MTOUCH is not set | 1080 | # CONFIG_USB_MTOUCH is not set |
1037 | # CONFIG_USB_ITMTOUCH is not set | 1081 | # CONFIG_USB_ITMTOUCH is not set |
1038 | # CONFIG_USB_EGALAX is not set | 1082 | # CONFIG_USB_EGALAX is not set |
1083 | # CONFIG_USB_YEALINK is not set | ||
1039 | # CONFIG_USB_XPAD is not set | 1084 | # CONFIG_USB_XPAD is not set |
1040 | # CONFIG_USB_ATI_REMOTE is not set | 1085 | # CONFIG_USB_ATI_REMOTE is not set |
1041 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1086 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
1087 | # CONFIG_USB_APPLETOUCH is not set | ||
1042 | 1088 | ||
1043 | # | 1089 | # |
1044 | # USB Imaging devices | 1090 | # USB Imaging devices |
@@ -1111,7 +1157,8 @@ CONFIG_USB_PEGASUS=y | |||
1111 | # InfiniBand support | 1157 | # InfiniBand support |
1112 | # | 1158 | # |
1113 | CONFIG_INFINIBAND=m | 1159 | CONFIG_INFINIBAND=m |
1114 | CONFIG_INFINIBAND_USER_VERBS=m | 1160 | # CONFIG_INFINIBAND_USER_MAD is not set |
1161 | # CONFIG_INFINIBAND_USER_ACCESS is not set | ||
1115 | CONFIG_INFINIBAND_MTHCA=m | 1162 | CONFIG_INFINIBAND_MTHCA=m |
1116 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | 1163 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set |
1117 | CONFIG_INFINIBAND_IPOIB=m | 1164 | CONFIG_INFINIBAND_IPOIB=m |
@@ -1149,16 +1196,12 @@ CONFIG_JFS_SECURITY=y | |||
1149 | # CONFIG_JFS_DEBUG is not set | 1196 | # CONFIG_JFS_DEBUG is not set |
1150 | # CONFIG_JFS_STATISTICS is not set | 1197 | # CONFIG_JFS_STATISTICS is not set |
1151 | CONFIG_FS_POSIX_ACL=y | 1198 | CONFIG_FS_POSIX_ACL=y |
1152 | |||
1153 | # | ||
1154 | # XFS support | ||
1155 | # | ||
1156 | CONFIG_XFS_FS=m | 1199 | CONFIG_XFS_FS=m |
1157 | CONFIG_XFS_EXPORT=y | 1200 | CONFIG_XFS_EXPORT=y |
1158 | # CONFIG_XFS_RT is not set | ||
1159 | # CONFIG_XFS_QUOTA is not set | 1201 | # CONFIG_XFS_QUOTA is not set |
1160 | CONFIG_XFS_SECURITY=y | 1202 | CONFIG_XFS_SECURITY=y |
1161 | CONFIG_XFS_POSIX_ACL=y | 1203 | CONFIG_XFS_POSIX_ACL=y |
1204 | # CONFIG_XFS_RT is not set | ||
1162 | # CONFIG_MINIX_FS is not set | 1205 | # CONFIG_MINIX_FS is not set |
1163 | # CONFIG_ROMFS_FS is not set | 1206 | # CONFIG_ROMFS_FS is not set |
1164 | CONFIG_INOTIFY=y | 1207 | CONFIG_INOTIFY=y |
@@ -1166,6 +1209,7 @@ CONFIG_INOTIFY=y | |||
1166 | CONFIG_DNOTIFY=y | 1209 | CONFIG_DNOTIFY=y |
1167 | CONFIG_AUTOFS_FS=y | 1210 | CONFIG_AUTOFS_FS=y |
1168 | # CONFIG_AUTOFS4_FS is not set | 1211 | # CONFIG_AUTOFS4_FS is not set |
1212 | # CONFIG_FUSE_FS is not set | ||
1169 | 1213 | ||
1170 | # | 1214 | # |
1171 | # CD-ROM/DVD Filesystems | 1215 | # CD-ROM/DVD Filesystems |
@@ -1192,14 +1236,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1192 | CONFIG_PROC_FS=y | 1236 | CONFIG_PROC_FS=y |
1193 | CONFIG_PROC_KCORE=y | 1237 | CONFIG_PROC_KCORE=y |
1194 | CONFIG_SYSFS=y | 1238 | CONFIG_SYSFS=y |
1195 | CONFIG_DEVPTS_FS_XATTR=y | ||
1196 | CONFIG_DEVPTS_FS_SECURITY=y | ||
1197 | CONFIG_TMPFS=y | 1239 | CONFIG_TMPFS=y |
1198 | CONFIG_TMPFS_XATTR=y | ||
1199 | CONFIG_TMPFS_SECURITY=y | ||
1200 | CONFIG_HUGETLBFS=y | 1240 | CONFIG_HUGETLBFS=y |
1201 | CONFIG_HUGETLB_PAGE=y | 1241 | CONFIG_HUGETLB_PAGE=y |
1202 | CONFIG_RAMFS=y | 1242 | CONFIG_RAMFS=y |
1243 | # CONFIG_RELAYFS_FS is not set | ||
1203 | 1244 | ||
1204 | # | 1245 | # |
1205 | # Miscellaneous filesystems | 1246 | # Miscellaneous filesystems |
@@ -1250,6 +1291,7 @@ CONFIG_CIFS_POSIX=y | |||
1250 | # CONFIG_NCP_FS is not set | 1291 | # CONFIG_NCP_FS is not set |
1251 | # CONFIG_CODA_FS is not set | 1292 | # CONFIG_CODA_FS is not set |
1252 | # CONFIG_AFS_FS is not set | 1293 | # CONFIG_AFS_FS is not set |
1294 | # CONFIG_9P_FS is not set | ||
1253 | 1295 | ||
1254 | # | 1296 | # |
1255 | # Partition Types | 1297 | # Partition Types |
@@ -1328,6 +1370,7 @@ CONFIG_OPROFILE=y | |||
1328 | CONFIG_DEBUG_KERNEL=y | 1370 | CONFIG_DEBUG_KERNEL=y |
1329 | CONFIG_MAGIC_SYSRQ=y | 1371 | CONFIG_MAGIC_SYSRQ=y |
1330 | CONFIG_LOG_BUF_SHIFT=17 | 1372 | CONFIG_LOG_BUF_SHIFT=17 |
1373 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1331 | # CONFIG_SCHEDSTATS is not set | 1374 | # CONFIG_SCHEDSTATS is not set |
1332 | # CONFIG_DEBUG_SLAB is not set | 1375 | # CONFIG_DEBUG_SLAB is not set |
1333 | # CONFIG_DEBUG_SPINLOCK is not set | 1376 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1387,7 +1430,12 @@ CONFIG_CRYPTO_TEST=m | |||
1387 | # Library routines | 1430 | # Library routines |
1388 | # | 1431 | # |
1389 | CONFIG_CRC_CCITT=m | 1432 | CONFIG_CRC_CCITT=m |
1433 | # CONFIG_CRC16 is not set | ||
1390 | CONFIG_CRC32=y | 1434 | CONFIG_CRC32=y |
1391 | CONFIG_LIBCRC32C=m | 1435 | CONFIG_LIBCRC32C=m |
1392 | CONFIG_ZLIB_INFLATE=y | 1436 | CONFIG_ZLIB_INFLATE=y |
1393 | CONFIG_ZLIB_DEFLATE=m | 1437 | CONFIG_ZLIB_DEFLATE=m |
1438 | CONFIG_TEXTSEARCH=y | ||
1439 | CONFIG_TEXTSEARCH_KMP=m | ||
1440 | CONFIG_TEXTSEARCH_BM=m | ||
1441 | CONFIG_TEXTSEARCH_FSM=m | ||
diff --git a/arch/ppc64/kernel/iSeries_htab.c b/arch/ppc64/kernel/iSeries_htab.c index 2192055a90a0..073b76661747 100644 --- a/arch/ppc64/kernel/iSeries_htab.c +++ b/arch/ppc64/kernel/iSeries_htab.c | |||
@@ -66,7 +66,7 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va, | |||
66 | } | 66 | } |
67 | 67 | ||
68 | if (slot < 0) { /* MSB set means secondary group */ | 68 | if (slot < 0) { /* MSB set means secondary group */ |
69 | vflags |= HPTE_V_VALID; | 69 | vflags |= HPTE_V_SECONDARY; |
70 | secondary = 1; | 70 | secondary = 1; |
71 | slot &= 0x7fffffffffffffff; | 71 | slot &= 0x7fffffffffffffff; |
72 | } | 72 | } |
diff --git a/arch/ppc64/kernel/mpic.c b/arch/ppc64/kernel/mpic.c index cc262a05ddb4..5f5bc73754d9 100644 --- a/arch/ppc64/kernel/mpic.c +++ b/arch/ppc64/kernel/mpic.c | |||
@@ -506,8 +506,8 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr, | |||
506 | mpic->senses_count = senses_count; | 506 | mpic->senses_count = senses_count; |
507 | 507 | ||
508 | /* Map the global registers */ | 508 | /* Map the global registers */ |
509 | mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x1000); | 509 | mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x2000); |
510 | mpic->tmregs = mpic->gregs + (MPIC_TIMER_BASE >> 2); | 510 | mpic->tmregs = mpic->gregs + ((MPIC_TIMER_BASE - MPIC_GREG_BASE) >> 2); |
511 | BUG_ON(mpic->gregs == NULL); | 511 | BUG_ON(mpic->gregs == NULL); |
512 | 512 | ||
513 | /* Reset */ | 513 | /* Reset */ |
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 9939c206afa4..b56c6a324e17 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c | |||
@@ -870,7 +870,7 @@ void div128_by_32( unsigned long dividend_high, unsigned long dividend_low, | |||
870 | rb = ((ra + b) - (x * divisor)) << 32; | 870 | rb = ((ra + b) - (x * divisor)) << 32; |
871 | 871 | ||
872 | y = (rb + c)/divisor; | 872 | y = (rb + c)/divisor; |
873 | rc = ((rb + b) - (y * divisor)) << 32; | 873 | rc = ((rb + c) - (y * divisor)) << 32; |
874 | 874 | ||
875 | z = (rc + d)/divisor; | 875 | z = (rc + d)/divisor; |
876 | 876 | ||
diff --git a/arch/ppc64/kernel/vdso32/gettimeofday.S b/arch/ppc64/kernel/vdso32/gettimeofday.S index 07f1c1c650c8..e243c1d24af7 100644 --- a/arch/ppc64/kernel/vdso32/gettimeofday.S +++ b/arch/ppc64/kernel/vdso32/gettimeofday.S | |||
@@ -109,7 +109,7 @@ __do_get_xsec: | |||
109 | lwz r6,(CFG_TB_TO_XS+4)(r9) | 109 | lwz r6,(CFG_TB_TO_XS+4)(r9) |
110 | mulhwu r4,r7,r5 | 110 | mulhwu r4,r7,r5 |
111 | mulhwu r6,r7,r6 | 111 | mulhwu r6,r7,r6 |
112 | mullw r6,r7,r5 | 112 | mullw r0,r7,r5 |
113 | addc r6,r6,r0 | 113 | addc r6,r6,r0 |
114 | 114 | ||
115 | /* At this point, we have the scaled xsec value in r4 + XER:CA | 115 | /* At this point, we have the scaled xsec value in r4 + XER:CA |
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c index c2157c9c3acb..be64b157afce 100644 --- a/arch/ppc64/mm/init.c +++ b/arch/ppc64/mm/init.c | |||
@@ -799,8 +799,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long ea, | |||
799 | if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp)) | 799 | if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp)) |
800 | local = 1; | 800 | local = 1; |
801 | 801 | ||
802 | __hash_page(ea, pte_val(pte) & (_PAGE_USER|_PAGE_RW), vsid, ptep, | 802 | __hash_page(ea, 0, vsid, ptep, 0x300, local); |
803 | 0x300, local); | ||
804 | local_irq_restore(flags); | 803 | local_irq_restore(flags); |
805 | } | 804 | } |
806 | 805 | ||
diff --git a/arch/sh/boards/renesas/rts7751r2d/mach.c b/arch/sh/boards/renesas/rts7751r2d/mach.c index 1efc18e786d5..610740512d56 100644 --- a/arch/sh/boards/renesas/rts7751r2d/mach.c +++ b/arch/sh/boards/renesas/rts7751r2d/mach.c | |||
@@ -23,7 +23,7 @@ extern void init_rts7751r2d_IRQ(void); | |||
23 | extern void *rts7751r2d_ioremap(unsigned long, unsigned long); | 23 | extern void *rts7751r2d_ioremap(unsigned long, unsigned long); |
24 | extern int rts7751r2d_irq_demux(int irq); | 24 | extern int rts7751r2d_irq_demux(int irq); |
25 | 25 | ||
26 | extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, int); | 26 | extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t); |
27 | extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t); | 27 | extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t); |
28 | 28 | ||
29 | /* | 29 | /* |
diff --git a/arch/sh/cchips/voyagergx/consistent.c b/arch/sh/cchips/voyagergx/consistent.c index 5b92585a38d2..3d9a02c093a3 100644 --- a/arch/sh/cchips/voyagergx/consistent.c +++ b/arch/sh/cchips/voyagergx/consistent.c | |||
@@ -31,7 +31,7 @@ static LIST_HEAD(voya_alloc_list); | |||
31 | #define OHCI_SRAM_SIZE 0x10000 | 31 | #define OHCI_SRAM_SIZE 0x10000 |
32 | 32 | ||
33 | void *voyagergx_consistent_alloc(struct device *dev, size_t size, | 33 | void *voyagergx_consistent_alloc(struct device *dev, size_t size, |
34 | dma_addr_t *handle, int flag) | 34 | dma_addr_t *handle, gfp_t flag) |
35 | { | 35 | { |
36 | struct list_head *list = &voya_alloc_list; | 36 | struct list_head *list = &voya_alloc_list; |
37 | struct voya_alloc_entry *entry; | 37 | struct voya_alloc_entry *entry; |
diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c index 83de7ef4e7df..e12418bb1fa5 100644 --- a/arch/sh/drivers/pci/dma-dreamcast.c +++ b/arch/sh/drivers/pci/dma-dreamcast.c | |||
@@ -33,7 +33,7 @@ | |||
33 | static int gapspci_dma_used = 0; | 33 | static int gapspci_dma_used = 0; |
34 | 34 | ||
35 | void *dreamcast_consistent_alloc(struct device *dev, size_t size, | 35 | void *dreamcast_consistent_alloc(struct device *dev, size_t size, |
36 | dma_addr_t *dma_handle, int flag) | 36 | dma_addr_t *dma_handle, gfp_t flag) |
37 | { | 37 | { |
38 | unsigned long buf; | 38 | unsigned long buf; |
39 | 39 | ||
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index 1f7af0c73cf4..df3a9e452cc5 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/dma-mapping.h> | 11 | #include <linux/dma-mapping.h> |
12 | #include <asm/io.h> | 12 | #include <asm/io.h> |
13 | 13 | ||
14 | void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle) | 14 | void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle) |
15 | { | 15 | { |
16 | struct page *page, *end, *free; | 16 | struct page *page, *end, *free; |
17 | void *ret; | 17 | void *ret; |
diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c index d7c1c76582cc..fc6669e8dde1 100644 --- a/arch/sparc64/solaris/socksys.c +++ b/arch/sparc64/solaris/socksys.c | |||
@@ -49,7 +49,7 @@ IPPROTO_EGP, IPPROTO_PUP, IPPROTO_UDP, IPPROTO_IDP, IPPROTO_RAW, | |||
49 | 49 | ||
50 | #else | 50 | #else |
51 | 51 | ||
52 | extern void * mykmalloc(size_t s, int gfp); | 52 | extern void * mykmalloc(size_t s, gfp_t gfp); |
53 | extern void mykfree(void *); | 53 | extern void mykfree(void *); |
54 | 54 | ||
55 | #endif | 55 | #endif |
diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c index aaad29c35c83..b84e5456b025 100644 --- a/arch/sparc64/solaris/timod.c +++ b/arch/sparc64/solaris/timod.c | |||
@@ -39,7 +39,7 @@ static char * page = NULL ; | |||
39 | 39 | ||
40 | #else | 40 | #else |
41 | 41 | ||
42 | void * mykmalloc(size_t s, int gfp) | 42 | void * mykmalloc(size_t s, gfp_t gfp) |
43 | { | 43 | { |
44 | static char * page; | 44 | static char * page; |
45 | static size_t free; | 45 | static size_t free; |
diff --git a/arch/um/include/sysdep-i386/thread.h b/arch/um/include/sysdep-i386/thread.h index e2bd6bae8b8a..243fed44d780 100644 --- a/arch/um/include/sysdep-i386/thread.h +++ b/arch/um/include/sysdep-i386/thread.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <kern_constants.h> | 4 | #include <kern_constants.h> |
5 | 5 | ||
6 | #define TASK_DEBUGREGS(task) ((unsigned long *) &(((char *) (task))[HOST_TASK_DEBUGREGS])) | 6 | #define TASK_DEBUGREGS(task) ((unsigned long *) &(((char *) (task))[HOST_TASK_DEBUGREGS])) |
7 | #ifdef CONFIG_MODE_TT | 7 | #ifdef UML_CONFIG_MODE_TT |
8 | #define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID])) | 8 | #define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID])) |
9 | #endif | 9 | #endif |
10 | 10 | ||
diff --git a/arch/um/include/sysdep-x86_64/ptrace.h b/arch/um/include/sysdep-x86_64/ptrace.h index 8f0656766c21..8d353f0feec1 100644 --- a/arch/um/include/sysdep-x86_64/ptrace.h +++ b/arch/um/include/sysdep-x86_64/ptrace.h | |||
@@ -183,10 +183,6 @@ struct syscall_args { | |||
183 | case RBP: val = UPT_RBP(regs); break; \ | 183 | case RBP: val = UPT_RBP(regs); break; \ |
184 | case ORIG_RAX: val = UPT_ORIG_RAX(regs); break; \ | 184 | case ORIG_RAX: val = UPT_ORIG_RAX(regs); break; \ |
185 | case CS: val = UPT_CS(regs); break; \ | 185 | case CS: val = UPT_CS(regs); break; \ |
186 | case DS: val = UPT_DS(regs); break; \ | ||
187 | case ES: val = UPT_ES(regs); break; \ | ||
188 | case FS: val = UPT_FS(regs); break; \ | ||
189 | case GS: val = UPT_GS(regs); break; \ | ||
190 | case EFLAGS: val = UPT_EFLAGS(regs); break; \ | 186 | case EFLAGS: val = UPT_EFLAGS(regs); break; \ |
191 | default : \ | 187 | default : \ |
192 | panic("Bad register in UPT_REG : %d\n", reg); \ | 188 | panic("Bad register in UPT_REG : %d\n", reg); \ |
diff --git a/arch/um/include/sysdep-x86_64/thread.h b/arch/um/include/sysdep-x86_64/thread.h index 6a76a7f3683f..cbef3e1697f4 100644 --- a/arch/um/include/sysdep-x86_64/thread.h +++ b/arch/um/include/sysdep-x86_64/thread.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <kern_constants.h> | 4 | #include <kern_constants.h> |
5 | 5 | ||
6 | #ifdef CONFIG_MODE_TT | 6 | #ifdef UML_CONFIG_MODE_TT |
7 | #define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID])) | 7 | #define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID])) |
8 | #endif | 8 | #endif |
9 | 9 | ||
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index ea008b031a8f..462cc9d65386 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -252,7 +252,7 @@ void paging_init(void) | |||
252 | #endif | 252 | #endif |
253 | } | 253 | } |
254 | 254 | ||
255 | struct page *arch_validate(struct page *page, int mask, int order) | 255 | struct page *arch_validate(struct page *page, gfp_t mask, int order) |
256 | { | 256 | { |
257 | unsigned long addr, zero = 0; | 257 | unsigned long addr, zero = 0; |
258 | int i; | 258 | int i; |
diff --git a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c index ea65db679e9c..0d73ceeece72 100644 --- a/arch/um/kernel/process_kern.c +++ b/arch/um/kernel/process_kern.c | |||
@@ -80,7 +80,7 @@ void free_stack(unsigned long stack, int order) | |||
80 | unsigned long alloc_stack(int order, int atomic) | 80 | unsigned long alloc_stack(int order, int atomic) |
81 | { | 81 | { |
82 | unsigned long page; | 82 | unsigned long page; |
83 | int flags = GFP_KERNEL; | 83 | gfp_t flags = GFP_KERNEL; |
84 | 84 | ||
85 | if (atomic) | 85 | if (atomic) |
86 | flags = GFP_ATOMIC; | 86 | flags = GFP_ATOMIC; |
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index cf0a0315d586..88be97c96987 100644 --- a/arch/x86_64/kernel/pci-gart.c +++ b/arch/x86_64/kernel/pci-gart.c | |||
@@ -187,7 +187,7 @@ static void flush_gart(struct device *dev) | |||
187 | 187 | ||
188 | /* Allocate DMA memory on node near device */ | 188 | /* Allocate DMA memory on node near device */ |
189 | noinline | 189 | noinline |
190 | static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order) | 190 | static void *dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order) |
191 | { | 191 | { |
192 | struct page *page; | 192 | struct page *page; |
193 | int node; | 193 | int node; |
@@ -204,7 +204,7 @@ static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order) | |||
204 | */ | 204 | */ |
205 | void * | 205 | void * |
206 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | 206 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, |
207 | unsigned gfp) | 207 | gfp_t gfp) |
208 | { | 208 | { |
209 | void *memory; | 209 | void *memory; |
210 | unsigned long dma_mask = 0; | 210 | unsigned long dma_mask = 0; |
diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c index 67d90b89af0b..5a981dca87ff 100644 --- a/arch/x86_64/kernel/pci-nommu.c +++ b/arch/x86_64/kernel/pci-nommu.c | |||
@@ -24,7 +24,7 @@ EXPORT_SYMBOL(iommu_sac_force); | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | void *dma_alloc_coherent(struct device *hwdev, size_t size, | 26 | void *dma_alloc_coherent(struct device *hwdev, size_t size, |
27 | dma_addr_t *dma_handle, unsigned gfp) | 27 | dma_addr_t *dma_handle, gfp_t gfp) |
28 | { | 28 | { |
29 | void *ret; | 29 | void *ret; |
30 | u64 mask; | 30 | u64 mask; |
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c index 84fde258cf85..1ff82268e8ea 100644 --- a/arch/xtensa/kernel/pci-dma.c +++ b/arch/xtensa/kernel/pci-dma.c | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | void * | 31 | void * |
32 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp) | 32 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp) |
33 | { | 33 | { |
34 | void *ret; | 34 | void *ret; |
35 | 35 | ||