aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-31 11:14:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-31 11:14:15 -0400
commitf891caf28febf9d4129716e848227148654b5993 (patch)
treeadf5afe6eecb0ad6c0c10d5c69b3937da675eb5e /arch/powerpc
parent1fe01cb57c6272577ebb107a03253484f6dabe7c (diff)
parent5663a1232bd557b4b2141ad345dd56785fa51c2a (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (23 commits) Revert "powerpc: Sync RPA note in zImage with kernel's RPA note" powerpc: Fix compile errors with CONFIG_BUG=n powerpc: Fix format string warning in arch/powerpc/boot/main.c powerpc: Fix bug in kernel copy of libfdt's fdt_subnode_offset_namelen() powerpc: Remove duplicate DMA entry from mpc8313erdb device tree powerpc/cell/OProfile: Fix on-stack array size in activate spu profiling function powerpc/mpic: Fix regression caused by change of default IRQ affinity powerpc: Update remaining dma_mapping_ops to use map/unmap_page powerpc/pci: Fix unmapping of IO space on 64-bit powerpc/pci: Properly allocate bus resources for hotplug PHBs OF-device: Don't overwrite numa_node in device registration powerpc: Fix swapcontext system for VSX + old ucontext size powerpc: Fix compiler warning for the relocatable kernel powerpc: Work around ld bug in older binutils powerpc/ppc64/kdump: Better flag for running relocatable powerpc: Use is_kdump_kernel() powerpc: Kexec exit should not use magic numbers powerpc/44x: Update 44x defconfigs powerpc/40x: Update 40x defconfigs powerpc: enable heap randomization for linkstations ...
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/boot/addnote.c175
-rw-r--r--arch/powerpc/boot/dts/mpc8313erdb.dts39
-rw-r--r--arch/powerpc/boot/libfdt/fdt_ro.c9
-rw-r--r--arch/powerpc/boot/main.c2
-rwxr-xr-xarch/powerpc/boot/wrapper9
-rw-r--r--arch/powerpc/configs/40x/acadia_defconfig59
-rw-r--r--arch/powerpc/configs/40x/ep405_defconfig83
-rw-r--r--arch/powerpc/configs/40x/hcu4_defconfig125
-rw-r--r--arch/powerpc/configs/40x/kilauea_defconfig69
-rw-r--r--arch/powerpc/configs/40x/makalu_defconfig69
-rw-r--r--arch/powerpc/configs/40x/walnut_defconfig77
-rw-r--r--arch/powerpc/configs/44x/arches_defconfig51
-rw-r--r--arch/powerpc/configs/44x/bamboo_defconfig77
-rw-r--r--arch/powerpc/configs/44x/canyonlands_defconfig61
-rw-r--r--arch/powerpc/configs/44x/ebony_defconfig77
-rw-r--r--arch/powerpc/configs/44x/katmai_defconfig77
-rw-r--r--arch/powerpc/configs/44x/rainier_defconfig73
-rw-r--r--arch/powerpc/configs/44x/sam440ep_defconfig110
-rw-r--r--arch/powerpc/configs/44x/sequoia_defconfig78
-rw-r--r--arch/powerpc/configs/44x/taishan_defconfig77
-rw-r--r--arch/powerpc/configs/44x/warp_defconfig82
-rw-r--r--arch/powerpc/configs/linkstation_defconfig11
-rw-r--r--arch/powerpc/configs/ppc40x_defconfig106
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig125
-rw-r--r--arch/powerpc/include/asm/iommu.h15
-rw-r--r--arch/powerpc/include/asm/kdump.h8
-rw-r--r--arch/powerpc/include/asm/mpic.h2
-rw-r--r--arch/powerpc/include/asm/pci.h2
-rw-r--r--arch/powerpc/kernel/dma-iommu.c34
-rw-r--r--arch/powerpc/kernel/head_64.S30
-rw-r--r--arch/powerpc/kernel/ibmebus.c27
-rw-r--r--arch/powerpc/kernel/iommu.c25
-rw-r--r--arch/powerpc/kernel/machine_kexec_64.c9
-rw-r--r--arch/powerpc/kernel/misc_64.S9
-rw-r--r--arch/powerpc/kernel/of_device.c1
-rw-r--r--arch/powerpc/kernel/pci-common.c110
-rw-r--r--arch/powerpc/kernel/pci_64.c2
-rw-r--r--arch/powerpc/kernel/prom_init.c10
-rw-r--r--arch/powerpc/kernel/setup_64.c6
-rw-r--r--arch/powerpc/kernel/signal_32.c36
-rw-r--r--arch/powerpc/kernel/signal_64.c33
-rw-r--r--arch/powerpc/kernel/vio.c25
-rw-r--r--arch/powerpc/kernel/vmlinux.lds.S5
-rw-r--r--arch/powerpc/oprofile/op_model_cell.c13
-rw-r--r--arch/powerpc/platforms/40x/Kconfig2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_ds.c3
-rw-r--r--arch/powerpc/platforms/86xx/pic.c3
-rw-r--r--arch/powerpc/platforms/cell/iommu.c37
-rw-r--r--arch/powerpc/platforms/cell/ras.c6
-rw-r--r--arch/powerpc/platforms/embedded6xx/linkstation.c14
-rw-r--r--arch/powerpc/platforms/iseries/iommu.c7
-rw-r--r--arch/powerpc/platforms/ps3/system-bus.c36
-rw-r--r--arch/powerpc/platforms/pseries/iommu.c4
-rw-r--r--arch/powerpc/platforms/pseries/pci_dlpar.c2
-rw-r--r--arch/powerpc/sysdev/mpic.c59
-rw-r--r--arch/powerpc/xmon/xmon.c2
56 files changed, 1434 insertions, 864 deletions
diff --git a/arch/powerpc/boot/addnote.c b/arch/powerpc/boot/addnote.c
index 3091d1d21aef..b1e5611b2ab1 100644
--- a/arch/powerpc/boot/addnote.c
+++ b/arch/powerpc/boot/addnote.c
@@ -11,12 +11,7 @@
11 * as published by the Free Software Foundation; either version 11 * as published by the Free Software Foundation; either version
12 * 2 of the License, or (at your option) any later version. 12 * 2 of the License, or (at your option) any later version.
13 * 13 *
14 * Usage: addnote [-r realbase] zImage [note.elf] 14 * Usage: addnote zImage
15 *
16 * If note.elf is supplied, it is the name of an ELF file that contains
17 * an RPA note to use instead of the built-in one. Alternatively, the
18 * note.elf file may be empty, in which case the built-in RPA note is
19 * used (this is to simplify how this is invoked from the wrapper script).
20 */ 15 */
21#include <stdio.h> 16#include <stdio.h>
22#include <stdlib.h> 17#include <stdlib.h>
@@ -48,29 +43,27 @@ char rpaname[] = "IBM,RPA-Client-Config";
48 */ 43 */
49#define N_RPA_DESCR 8 44#define N_RPA_DESCR 8
50unsigned int rpanote[N_RPA_DESCR] = { 45unsigned int rpanote[N_RPA_DESCR] = {
51 1, /* lparaffinity */ 46 0, /* lparaffinity */
52 128, /* min_rmo_size */ 47 64, /* min_rmo_size */
53 0, /* min_rmo_percent */ 48 0, /* min_rmo_percent */
54 46, /* max_pft_size */ 49 40, /* max_pft_size */
55 1, /* splpar */ 50 1, /* splpar */
56 -1, /* min_load */ 51 -1, /* min_load */
57 1, /* new_mem_def */ 52 0, /* new_mem_def */
58 0, /* ignore_my_client_config */ 53 1, /* ignore_my_client_config */
59}; 54};
60 55
61#define ROUNDUP(len) (((len) + 3) & ~3) 56#define ROUNDUP(len) (((len) + 3) & ~3)
62 57
63unsigned char buf[512]; 58unsigned char buf[512];
64unsigned char notebuf[512];
65 59
66#define GET_16BE(b, off) (((b)[off] << 8) + ((b)[(off)+1])) 60#define GET_16BE(off) ((buf[off] << 8) + (buf[(off)+1]))
67#define GET_32BE(b, off) ((GET_16BE((b), (off)) << 16) + \ 61#define GET_32BE(off) ((GET_16BE(off) << 16) + GET_16BE((off)+2))
68 GET_16BE((b), (off)+2))
69 62
70#define PUT_16BE(b, off, v) ((b)[off] = ((v) >> 8) & 0xff, \ 63#define PUT_16BE(off, v) (buf[off] = ((v) >> 8) & 0xff, \
71 (b)[(off) + 1] = (v) & 0xff) 64 buf[(off) + 1] = (v) & 0xff)
72#define PUT_32BE(b, off, v) (PUT_16BE((b), (off), (v) >> 16), \ 65#define PUT_32BE(off, v) (PUT_16BE((off), (v) >> 16), \
73 PUT_16BE((b), (off) + 2, (v))) 66 PUT_16BE((off) + 2, (v)))
74 67
75/* Structure of an ELF file */ 68/* Structure of an ELF file */
76#define E_IDENT 0 /* ELF header */ 69#define E_IDENT 0 /* ELF header */
@@ -95,95 +88,25 @@ unsigned char notebuf[512];
95 88
96unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' }; 89unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' };
97 90
98unsigned char *read_rpanote(const char *fname, int *nnp)
99{
100 int notefd, nr, i;
101 int ph, ps, np;
102 int note, notesize;
103
104 notefd = open(fname, O_RDONLY);
105 if (notefd < 0) {
106 perror(fname);
107 exit(1);
108 }
109 nr = read(notefd, notebuf, sizeof(notebuf));
110 if (nr < 0) {
111 perror("read note");
112 exit(1);
113 }
114 if (nr == 0) /* empty file */
115 return NULL;
116 if (nr < E_HSIZE ||
117 memcmp(&notebuf[E_IDENT+EI_MAGIC], elf_magic, 4) != 0 ||
118 notebuf[E_IDENT+EI_CLASS] != ELFCLASS32 ||
119 notebuf[E_IDENT+EI_DATA] != ELFDATA2MSB)
120 goto notelf;
121 close(notefd);
122
123 /* now look for the RPA-note */
124 ph = GET_32BE(notebuf, E_PHOFF);
125 ps = GET_16BE(notebuf, E_PHENTSIZE);
126 np = GET_16BE(notebuf, E_PHNUM);
127 if (ph < E_HSIZE || ps < PH_HSIZE || np < 1)
128 goto notelf;
129
130 for (i = 0; i < np; ++i, ph += ps) {
131 if (GET_32BE(notebuf, ph + PH_TYPE) != PT_NOTE)
132 continue;
133 note = GET_32BE(notebuf, ph + PH_OFFSET);
134 notesize = GET_32BE(notebuf, ph + PH_FILESZ);
135 if (notesize < 34 || note + notesize > nr)
136 continue;
137 if (GET_32BE(notebuf, note) != strlen(rpaname) + 1 ||
138 GET_32BE(notebuf, note + 8) != 0x12759999 ||
139 strcmp((char *)&notebuf[note + 12], rpaname) != 0)
140 continue;
141 /* looks like an RPA note, return it */
142 *nnp = notesize;
143 return &notebuf[note];
144 }
145 /* no RPA note found */
146 return NULL;
147
148 notelf:
149 fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n", fname);
150 exit(1);
151}
152
153int 91int
154main(int ac, char **av) 92main(int ac, char **av)
155{ 93{
156 int fd, n, i, ai; 94 int fd, n, i;
157 int ph, ps, np; 95 int ph, ps, np;
158 int nnote, nnote2, ns; 96 int nnote, nnote2, ns;
159 unsigned char *rpap; 97
160 char *p, *endp; 98 if (ac != 2) {
161 99 fprintf(stderr, "Usage: %s elf-file\n", av[0]);
162 ai = 1;
163 if (ac >= ai + 2 && strcmp(av[ai], "-r") == 0) {
164 /* process -r realbase */
165 p = av[ai + 1];
166 descr[1] = strtol(p, &endp, 16);
167 if (endp == p || *endp != 0) {
168 fprintf(stderr, "Can't parse -r argument '%s' as hex\n",
169 p);
170 exit(1);
171 }
172 ai += 2;
173 }
174 if (ac != ai + 1 && ac != ai + 2) {
175 fprintf(stderr, "Usage: %s [-r realbase] elf-file [rpanote.elf]\n", av[0]);
176 exit(1); 100 exit(1);
177 } 101 }
178 fd = open(av[ai], O_RDWR); 102 fd = open(av[1], O_RDWR);
179 if (fd < 0) { 103 if (fd < 0) {
180 perror(av[ai]); 104 perror(av[1]);
181 exit(1); 105 exit(1);
182 } 106 }
183 107
184 nnote = 12 + ROUNDUP(strlen(arch) + 1) + sizeof(descr); 108 nnote = 12 + ROUNDUP(strlen(arch) + 1) + sizeof(descr);
185 nnote2 = 12 + ROUNDUP(strlen(rpaname) + 1) + sizeof(rpanote); 109 nnote2 = 12 + ROUNDUP(strlen(rpaname) + 1) + sizeof(rpanote);
186 rpap = NULL;
187 110
188 n = read(fd, buf, sizeof(buf)); 111 n = read(fd, buf, sizeof(buf));
189 if (n < 0) { 112 if (n < 0) {
@@ -197,25 +120,22 @@ main(int ac, char **av)
197 if (buf[E_IDENT+EI_CLASS] != ELFCLASS32 120 if (buf[E_IDENT+EI_CLASS] != ELFCLASS32
198 || buf[E_IDENT+EI_DATA] != ELFDATA2MSB) { 121 || buf[E_IDENT+EI_DATA] != ELFDATA2MSB) {
199 fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n", 122 fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n",
200 av[ai]); 123 av[1]);
201 exit(1); 124 exit(1);
202 } 125 }
203 126
204 if (ac == ai + 2) 127 ph = GET_32BE(E_PHOFF);
205 rpap = read_rpanote(av[ai + 1], &nnote2); 128 ps = GET_16BE(E_PHENTSIZE);
206 129 np = GET_16BE(E_PHNUM);
207 ph = GET_32BE(buf, E_PHOFF);
208 ps = GET_16BE(buf, E_PHENTSIZE);
209 np = GET_16BE(buf, E_PHNUM);
210 if (ph < E_HSIZE || ps < PH_HSIZE || np < 1) 130 if (ph < E_HSIZE || ps < PH_HSIZE || np < 1)
211 goto notelf; 131 goto notelf;
212 if (ph + (np + 2) * ps + nnote + nnote2 > n) 132 if (ph + (np + 2) * ps + nnote + nnote2 > n)
213 goto nospace; 133 goto nospace;
214 134
215 for (i = 0; i < np; ++i) { 135 for (i = 0; i < np; ++i) {
216 if (GET_32BE(buf, ph + PH_TYPE) == PT_NOTE) { 136 if (GET_32BE(ph + PH_TYPE) == PT_NOTE) {
217 fprintf(stderr, "%s already has a note entry\n", 137 fprintf(stderr, "%s already has a note entry\n",
218 av[ai]); 138 av[1]);
219 exit(0); 139 exit(0);
220 } 140 }
221 ph += ps; 141 ph += ps;
@@ -228,42 +148,37 @@ main(int ac, char **av)
228 148
229 /* fill in the program header entry */ 149 /* fill in the program header entry */
230 ns = ph + 2 * ps; 150 ns = ph + 2 * ps;
231 PUT_32BE(buf, ph + PH_TYPE, PT_NOTE); 151 PUT_32BE(ph + PH_TYPE, PT_NOTE);
232 PUT_32BE(buf, ph + PH_OFFSET, ns); 152 PUT_32BE(ph + PH_OFFSET, ns);
233 PUT_32BE(buf, ph + PH_FILESZ, nnote); 153 PUT_32BE(ph + PH_FILESZ, nnote);
234 154
235 /* fill in the note area we point to */ 155 /* fill in the note area we point to */
236 /* XXX we should probably make this a proper section */ 156 /* XXX we should probably make this a proper section */
237 PUT_32BE(buf, ns, strlen(arch) + 1); 157 PUT_32BE(ns, strlen(arch) + 1);
238 PUT_32BE(buf, ns + 4, N_DESCR * 4); 158 PUT_32BE(ns + 4, N_DESCR * 4);
239 PUT_32BE(buf, ns + 8, 0x1275); 159 PUT_32BE(ns + 8, 0x1275);
240 strcpy((char *) &buf[ns + 12], arch); 160 strcpy((char *) &buf[ns + 12], arch);
241 ns += 12 + strlen(arch) + 1; 161 ns += 12 + strlen(arch) + 1;
242 for (i = 0; i < N_DESCR; ++i, ns += 4) 162 for (i = 0; i < N_DESCR; ++i, ns += 4)
243 PUT_32BE(buf, ns, descr[i]); 163 PUT_32BE(ns, descr[i]);
244 164
245 /* fill in the second program header entry and the RPA note area */ 165 /* fill in the second program header entry and the RPA note area */
246 ph += ps; 166 ph += ps;
247 PUT_32BE(buf, ph + PH_TYPE, PT_NOTE); 167 PUT_32BE(ph + PH_TYPE, PT_NOTE);
248 PUT_32BE(buf, ph + PH_OFFSET, ns); 168 PUT_32BE(ph + PH_OFFSET, ns);
249 PUT_32BE(buf, ph + PH_FILESZ, nnote2); 169 PUT_32BE(ph + PH_FILESZ, nnote2);
250 170
251 /* fill in the note area we point to */ 171 /* fill in the note area we point to */
252 if (rpap) { 172 PUT_32BE(ns, strlen(rpaname) + 1);
253 /* RPA note supplied in file, just copy the whole thing over */ 173 PUT_32BE(ns + 4, sizeof(rpanote));
254 memcpy(buf + ns, rpap, nnote2); 174 PUT_32BE(ns + 8, 0x12759999);
255 } else { 175 strcpy((char *) &buf[ns + 12], rpaname);
256 PUT_32BE(buf, ns, strlen(rpaname) + 1); 176 ns += 12 + ROUNDUP(strlen(rpaname) + 1);
257 PUT_32BE(buf, ns + 4, sizeof(rpanote)); 177 for (i = 0; i < N_RPA_DESCR; ++i, ns += 4)
258 PUT_32BE(buf, ns + 8, 0x12759999); 178 PUT_32BE(ns, rpanote[i]);
259 strcpy((char *) &buf[ns + 12], rpaname);
260 ns += 12 + ROUNDUP(strlen(rpaname) + 1);
261 for (i = 0; i < N_RPA_DESCR; ++i, ns += 4)
262 PUT_32BE(buf, ns, rpanote[i]);
263 }
264 179
265 /* Update the number of program headers */ 180 /* Update the number of program headers */
266 PUT_16BE(buf, E_PHNUM, np + 2); 181 PUT_16BE(E_PHNUM, np + 2);
267 182
268 /* write back */ 183 /* write back */
269 lseek(fd, (long) 0, SEEK_SET); 184 lseek(fd, (long) 0, SEEK_SET);
@@ -273,18 +188,18 @@ main(int ac, char **av)
273 exit(1); 188 exit(1);
274 } 189 }
275 if (i < n) { 190 if (i < n) {
276 fprintf(stderr, "%s: write truncated\n", av[ai]); 191 fprintf(stderr, "%s: write truncated\n", av[1]);
277 exit(1); 192 exit(1);
278 } 193 }
279 194
280 exit(0); 195 exit(0);
281 196
282 notelf: 197 notelf:
283 fprintf(stderr, "%s does not appear to be an ELF file\n", av[ai]); 198 fprintf(stderr, "%s does not appear to be an ELF file\n", av[1]);
284 exit(1); 199 exit(1);
285 200
286 nospace: 201 nospace:
287 fprintf(stderr, "sorry, I can't find space in %s to put the note\n", 202 fprintf(stderr, "sorry, I can't find space in %s to put the note\n",
288 av[ai]); 203 av[1]);
289 exit(1); 204 exit(1);
290} 205}
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 747f27676332..503031766825 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -164,45 +164,6 @@
164 mode = "cpu"; 164 mode = "cpu";
165 }; 165 };
166 166
167 dma@82a8 {
168 #address-cells = <1>;
169 #size-cells = <1>;
170 compatible = "fsl,mpc8313-dma", "fsl,elo-dma";
171 reg = <0x82a8 4>;
172 ranges = <0 0x8100 0x1a8>;
173 interrupt-parent = <&ipic>;
174 interrupts = <71 8>;
175 cell-index = <0>;
176 dma-channel@0 {
177 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
178 reg = <0 0x80>;
179 cell-index = <0>;
180 interrupt-parent = <&ipic>;
181 interrupts = <71 8>;
182 };
183 dma-channel@80 {
184 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
185 reg = <0x80 0x80>;
186 cell-index = <1>;
187 interrupt-parent = <&ipic>;
188 interrupts = <71 8>;
189 };
190 dma-channel@100 {
191 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
192 reg = <0x100 0x80>;
193 cell-index = <2>;
194 interrupt-parent = <&ipic>;
195 interrupts = <71 8>;
196 };
197 dma-channel@180 {
198 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
199 reg = <0x180 0x28>;
200 cell-index = <3>;
201 interrupt-parent = <&ipic>;
202 interrupts = <71 8>;
203 };
204 };
205
206 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ 167 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
207 usb@23000 { 168 usb@23000 {
208 compatible = "fsl-usb2-dr"; 169 compatible = "fsl-usb2-dr";
diff --git a/arch/powerpc/boot/libfdt/fdt_ro.c b/arch/powerpc/boot/libfdt/fdt_ro.c
index 129b532bcc1a..fbbba44fcd0d 100644
--- a/arch/powerpc/boot/libfdt/fdt_ro.c
+++ b/arch/powerpc/boot/libfdt/fdt_ro.c
@@ -104,8 +104,8 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset,
104 104
105 FDT_CHECK_HEADER(fdt); 105 FDT_CHECK_HEADER(fdt);
106 106
107 for (depth = 0; 107 for (depth = 0, offset = fdt_next_node(fdt, offset, &depth);
108 offset >= 0; 108 (offset >= 0) && (depth > 0);
109 offset = fdt_next_node(fdt, offset, &depth)) { 109 offset = fdt_next_node(fdt, offset, &depth)) {
110 if (depth < 0) 110 if (depth < 0)
111 return -FDT_ERR_NOTFOUND; 111 return -FDT_ERR_NOTFOUND;
@@ -114,7 +114,10 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset,
114 return offset; 114 return offset;
115 } 115 }
116 116
117 return offset; /* error */ 117 if (offset < 0)
118 return offset; /* error */
119 else
120 return -FDT_ERR_NOTFOUND;
118} 121}
119 122
120int fdt_subnode_offset(const void *fdt, int parentoffset, 123int fdt_subnode_offset(const void *fdt, int parentoffset,
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index ae32801ebd69..a28f02165e97 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -63,7 +63,7 @@ static struct addr_range prep_kernel(void)
63 */ 63 */
64 if ((unsigned long)_start < ei.loadsize) 64 if ((unsigned long)_start < ei.loadsize)
65 fatal("Insufficient memory for kernel at address 0!" 65 fatal("Insufficient memory for kernel at address 0!"
66 " (_start=%p, uncomressed size=%08x)\n\r", 66 " (_start=%p, uncompressed size=%08lx)\n\r",
67 _start, ei.loadsize); 67 _start, ei.loadsize);
68 68
69 if ((unsigned long)_end < ei.memsize) 69 if ((unsigned long)_end < ei.memsize)
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index f39073511a49..965c237c122d 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -306,13 +306,8 @@ fi
306 306
307# post-processing needed for some platforms 307# post-processing needed for some platforms
308case "$platform" in 308case "$platform" in
309pseries) 309pseries|chrp)
310 ${CROSS}objcopy -O binary -j .fakeelf "$kernel" "$ofile".rpanote 310 $objbin/addnote "$ofile"
311 $objbin/addnote "$ofile" "$ofile".rpanote
312 rm -r "$ofile".rpanote
313 ;;
314chrp)
315 $objbin/addnote -r c00000 "$ofile"
316 ;; 311 ;;
317coff) 312coff)
318 ${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile" 313 ${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile"
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig
index 39bd9eb453f0..25572cc837ca 100644
--- a/arch/powerpc/configs/40x/acadia_defconfig
+++ b/arch/powerpc/configs/40x/acadia_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc5 3# Linux kernel version: 2.6.28-rc2
4# Mon Oct 13 13:47:16 2008 4# Tue Oct 28 08:49:18 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,7 +19,7 @@ CONFIG_4xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
@@ -103,7 +103,9 @@ CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
104CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
105CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
106CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
107CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
108# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
109CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -117,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
117CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
118CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
119CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
120# CONFIG_HAVE_DMA_ATTRS is not set
121# CONFIG_USE_GENERIC_SMP_HELPERS is not set
122# CONFIG_HAVE_CLK is not set
123CONFIG_PROC_PAGE_MONITOR=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -153,6 +151,7 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
156# CONFIG_PPC4xx_PCI_EXPRESS is not set 155# CONFIG_PPC4xx_PCI_EXPRESS is not set
157 156
158# 157#
@@ -161,8 +160,10 @@ CONFIG_CLASSIC_RCU=y
161# CONFIG_PPC_CELL is not set 160# CONFIG_PPC_CELL is not set
162# CONFIG_PPC_CELL_NATIVE is not set 161# CONFIG_PPC_CELL_NATIVE is not set
163# CONFIG_PQ2ADS is not set 162# CONFIG_PQ2ADS is not set
163# CONFIG_PPC4xx_GPIO is not set
164CONFIG_ACADIA=y 164CONFIG_ACADIA=y
165# CONFIG_EP405 is not set 165# CONFIG_EP405 is not set
166# CONFIG_HCU4 is not set
166# CONFIG_KILAUEA is not set 167# CONFIG_KILAUEA is not set
167# CONFIG_MAKALU is not set 168# CONFIG_MAKALU is not set
168# CONFIG_WALNUT is not set 169# CONFIG_WALNUT is not set
@@ -186,7 +187,6 @@ CONFIG_405EZ=y
186# Kernel options 187# Kernel options
187# 188#
188# CONFIG_HIGHMEM is not set 189# CONFIG_HIGHMEM is not set
189# CONFIG_TICK_ONESHOT is not set
190# CONFIG_NO_HZ is not set 190# CONFIG_NO_HZ is not set
191# CONFIG_HIGH_RES_TIMERS is not set 191# CONFIG_HIGH_RES_TIMERS is not set
192CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 192CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -200,6 +200,8 @@ CONFIG_PREEMPT_NONE=y
200# CONFIG_PREEMPT_VOLUNTARY is not set 200# CONFIG_PREEMPT_VOLUNTARY is not set
201# CONFIG_PREEMPT is not set 201# CONFIG_PREEMPT is not set
202CONFIG_BINFMT_ELF=y 202CONFIG_BINFMT_ELF=y
203# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
204# CONFIG_HAVE_AOUT is not set
203# CONFIG_BINFMT_MISC is not set 205# CONFIG_BINFMT_MISC is not set
204# CONFIG_MATH_EMULATION is not set 206# CONFIG_MATH_EMULATION is not set
205# CONFIG_IOMMU_HELPER is not set 207# CONFIG_IOMMU_HELPER is not set
@@ -214,15 +216,15 @@ CONFIG_FLATMEM_MANUAL=y
214# CONFIG_SPARSEMEM_MANUAL is not set 216# CONFIG_SPARSEMEM_MANUAL is not set
215CONFIG_FLATMEM=y 217CONFIG_FLATMEM=y
216CONFIG_FLAT_NODE_MEM_MAP=y 218CONFIG_FLAT_NODE_MEM_MAP=y
217# CONFIG_SPARSEMEM_STATIC is not set
218# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
219CONFIG_PAGEFLAGS_EXTENDED=y 219CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 220CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 221CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set 222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set
223CONFIG_ZONE_DMA_FLAG=1 224CONFIG_ZONE_DMA_FLAG=1
224CONFIG_BOUNCE=y 225CONFIG_BOUNCE=y
225CONFIG_VIRT_TO_BUS=y 226CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y
226CONFIG_FORCE_MAX_ZONEORDER=11 228CONFIG_FORCE_MAX_ZONEORDER=11
227CONFIG_PROC_DEVICETREE=y 229CONFIG_PROC_DEVICETREE=y
228# CONFIG_CMDLINE_BOOL is not set 230# CONFIG_CMDLINE_BOOL is not set
@@ -309,6 +311,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
309# CONFIG_TIPC is not set 311# CONFIG_TIPC is not set
310# CONFIG_ATM is not set 312# CONFIG_ATM is not set
311# CONFIG_BRIDGE is not set 313# CONFIG_BRIDGE is not set
314# CONFIG_NET_DSA is not set
312# CONFIG_VLAN_8021Q is not set 315# CONFIG_VLAN_8021Q is not set
313# CONFIG_DECNET is not set 316# CONFIG_DECNET is not set
314# CONFIG_LLC2 is not set 317# CONFIG_LLC2 is not set
@@ -329,14 +332,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_IRDA is not set 332# CONFIG_IRDA is not set
330# CONFIG_BT is not set 333# CONFIG_BT is not set
331# CONFIG_AF_RXRPC is not set 334# CONFIG_AF_RXRPC is not set
332 335# CONFIG_PHONET is not set
333# 336# CONFIG_WIRELESS is not set
334# Wireless
335#
336# CONFIG_CFG80211 is not set
337# CONFIG_WIRELESS_EXT is not set
338# CONFIG_MAC80211 is not set
339# CONFIG_IEEE80211 is not set
340# CONFIG_RFKILL is not set 337# CONFIG_RFKILL is not set
341# CONFIG_NET_9P is not set 338# CONFIG_NET_9P is not set
342 339
@@ -516,6 +513,7 @@ CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT=y
516CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y 513CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y
517# CONFIG_NET_PCI is not set 514# CONFIG_NET_PCI is not set
518# CONFIG_B44 is not set 515# CONFIG_B44 is not set
516# CONFIG_ATL2 is not set
519# CONFIG_NETDEV_1000 is not set 517# CONFIG_NETDEV_1000 is not set
520# CONFIG_NETDEV_10000 is not set 518# CONFIG_NETDEV_10000 is not set
521# CONFIG_TR is not set 519# CONFIG_TR is not set
@@ -613,6 +611,7 @@ CONFIG_SSB_POSSIBLE=y
613# CONFIG_MFD_SM501 is not set 611# CONFIG_MFD_SM501 is not set
614# CONFIG_HTC_PASIC3 is not set 612# CONFIG_HTC_PASIC3 is not set
615# CONFIG_MFD_TMIO is not set 613# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set
616 615
617# 616#
618# Multimedia devices 617# Multimedia devices
@@ -646,6 +645,7 @@ CONFIG_SSB_POSSIBLE=y
646# CONFIG_DISPLAY_SUPPORT is not set 645# CONFIG_DISPLAY_SUPPORT is not set
647# CONFIG_SOUND is not set 646# CONFIG_SOUND is not set
648# CONFIG_USB_SUPPORT is not set 647# CONFIG_USB_SUPPORT is not set
648# CONFIG_UWB is not set
649# CONFIG_MMC is not set 649# CONFIG_MMC is not set
650# CONFIG_MEMSTICK is not set 650# CONFIG_MEMSTICK is not set
651# CONFIG_NEW_LEDS is not set 651# CONFIG_NEW_LEDS is not set
@@ -655,6 +655,7 @@ CONFIG_SSB_POSSIBLE=y
655# CONFIG_RTC_CLASS is not set 655# CONFIG_RTC_CLASS is not set
656# CONFIG_DMADEVICES is not set 656# CONFIG_DMADEVICES is not set
657# CONFIG_UIO is not set 657# CONFIG_UIO is not set
658# CONFIG_STAGING is not set
658 659
659# 660#
660# File systems 661# File systems
@@ -663,10 +664,11 @@ CONFIG_EXT2_FS=y
663# CONFIG_EXT2_FS_XATTR is not set 664# CONFIG_EXT2_FS_XATTR is not set
664# CONFIG_EXT2_FS_XIP is not set 665# CONFIG_EXT2_FS_XIP is not set
665# CONFIG_EXT3_FS is not set 666# CONFIG_EXT3_FS is not set
666# CONFIG_EXT4DEV_FS is not set 667# CONFIG_EXT4_FS is not set
667# CONFIG_REISERFS_FS is not set 668# CONFIG_REISERFS_FS is not set
668# CONFIG_JFS_FS is not set 669# CONFIG_JFS_FS is not set
669# CONFIG_FS_POSIX_ACL is not set 670# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y
670# CONFIG_XFS_FS is not set 672# CONFIG_XFS_FS is not set
671# CONFIG_OCFS2_FS is not set 673# CONFIG_OCFS2_FS is not set
672CONFIG_DNOTIFY=y 674CONFIG_DNOTIFY=y
@@ -696,6 +698,7 @@ CONFIG_INOTIFY_USER=y
696CONFIG_PROC_FS=y 698CONFIG_PROC_FS=y
697CONFIG_PROC_KCORE=y 699CONFIG_PROC_KCORE=y
698CONFIG_PROC_SYSCTL=y 700CONFIG_PROC_SYSCTL=y
701CONFIG_PROC_PAGE_MONITOR=y
699CONFIG_SYSFS=y 702CONFIG_SYSFS=y
700CONFIG_TMPFS=y 703CONFIG_TMPFS=y
701# CONFIG_TMPFS_POSIX_ACL is not set 704# CONFIG_TMPFS_POSIX_ACL is not set
@@ -733,6 +736,7 @@ CONFIG_LOCKD=y
733CONFIG_LOCKD_V4=y 736CONFIG_LOCKD_V4=y
734CONFIG_NFS_COMMON=y 737CONFIG_NFS_COMMON=y
735CONFIG_SUNRPC=y 738CONFIG_SUNRPC=y
739# CONFIG_SUNRPC_REGISTER_V4 is not set
736# CONFIG_RPCSEC_GSS_KRB5 is not set 740# CONFIG_RPCSEC_GSS_KRB5 is not set
737# CONFIG_RPCSEC_GSS_SPKM3 is not set 741# CONFIG_RPCSEC_GSS_SPKM3 is not set
738# CONFIG_SMB_FS is not set 742# CONFIG_SMB_FS is not set
@@ -753,7 +757,6 @@ CONFIG_MSDOS_PARTITION=y
753# Library routines 757# Library routines
754# 758#
755CONFIG_BITREVERSE=y 759CONFIG_BITREVERSE=y
756# CONFIG_GENERIC_FIND_FIRST_BIT is not set
757# CONFIG_CRC_CCITT is not set 760# CONFIG_CRC_CCITT is not set
758# CONFIG_CRC16 is not set 761# CONFIG_CRC16 is not set
759# CONFIG_CRC_T10DIF is not set 762# CONFIG_CRC_T10DIF is not set
@@ -806,15 +809,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
806# CONFIG_DEBUG_SG is not set 809# CONFIG_DEBUG_SG is not set
807# CONFIG_BOOT_PRINTK_DELAY is not set 810# CONFIG_BOOT_PRINTK_DELAY is not set
808# CONFIG_RCU_TORTURE_TEST is not set 811# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set
809# CONFIG_BACKTRACE_SELF_TEST is not set 813# CONFIG_BACKTRACE_SELF_TEST is not set
814# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
810# CONFIG_FAULT_INJECTION is not set 815# CONFIG_FAULT_INJECTION is not set
811# CONFIG_LATENCYTOP is not set 816# CONFIG_LATENCYTOP is not set
812CONFIG_SYSCTL_SYSCALL_CHECK=y 817CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y
813CONFIG_HAVE_FTRACE=y 819CONFIG_HAVE_FTRACE=y
814CONFIG_HAVE_DYNAMIC_FTRACE=y 820CONFIG_HAVE_DYNAMIC_FTRACE=y
815# CONFIG_FTRACE is not set 821# CONFIG_FTRACE is not set
816# CONFIG_SCHED_TRACER is not set 822# CONFIG_SCHED_TRACER is not set
817# CONFIG_CONTEXT_SWITCH_TRACER is not set 823# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set
825# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
818# CONFIG_SAMPLES is not set 827# CONFIG_SAMPLES is not set
819CONFIG_HAVE_ARCH_KGDB=y 828CONFIG_HAVE_ARCH_KGDB=y
820# CONFIG_KGDB is not set 829# CONFIG_KGDB is not set
@@ -835,14 +844,19 @@ CONFIG_HAVE_ARCH_KGDB=y
835# 844#
836# CONFIG_KEYS is not set 845# CONFIG_KEYS is not set
837# CONFIG_SECURITY is not set 846# CONFIG_SECURITY is not set
847# CONFIG_SECURITYFS is not set
838# CONFIG_SECURITY_FILE_CAPABILITIES is not set 848# CONFIG_SECURITY_FILE_CAPABILITIES is not set
839CONFIG_CRYPTO=y 849CONFIG_CRYPTO=y
840 850
841# 851#
842# Crypto core or helper 852# Crypto core or helper
843# 853#
854# CONFIG_CRYPTO_FIPS is not set
844CONFIG_CRYPTO_ALGAPI=y 855CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y
845CONFIG_CRYPTO_BLKCIPHER=y 857CONFIG_CRYPTO_BLKCIPHER=y
858CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y
846CONFIG_CRYPTO_MANAGER=y 860CONFIG_CRYPTO_MANAGER=y
847# CONFIG_CRYPTO_GF128MUL is not set 861# CONFIG_CRYPTO_GF128MUL is not set
848# CONFIG_CRYPTO_NULL is not set 862# CONFIG_CRYPTO_NULL is not set
@@ -915,6 +929,11 @@ CONFIG_CRYPTO_DES=y
915# 929#
916# CONFIG_CRYPTO_DEFLATE is not set 930# CONFIG_CRYPTO_DEFLATE is not set
917# CONFIG_CRYPTO_LZO is not set 931# CONFIG_CRYPTO_LZO is not set
932
933#
934# Random Number Generation
935#
936# CONFIG_CRYPTO_ANSI_CPRNG is not set
918CONFIG_CRYPTO_HW=y 937CONFIG_CRYPTO_HW=y
919# CONFIG_CRYPTO_DEV_HIFN_795X is not set 938# CONFIG_CRYPTO_DEV_HIFN_795X is not set
920# CONFIG_PPC_CLOCK is not set 939# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig
index 2113ae2ab401..b80ba7aa3129 100644
--- a/arch/powerpc/configs/40x/ep405_defconfig
+++ b/arch/powerpc/configs/40x/ep405_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 19:34:03 2008 4# Tue Oct 28 08:49:20 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,14 +19,13 @@ CONFIG_4xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
30# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
32CONFIG_STACKTRACE_SUPPORT=y 31CONFIG_STACKTRACE_SUPPORT=y
@@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE=""
88CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
89CONFIG_EMBEDDED=y 88CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
93CONFIG_KALLSYMS_ALL=y 91CONFIG_KALLSYMS_ALL=y
94CONFIG_KALLSYMS_EXTRA_PASS=y 92CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
111CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124# CONFIG_HAVE_CLK is not set
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -155,6 +151,7 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
158# CONFIG_PPC4xx_PCI_EXPRESS is not set 155# CONFIG_PPC4xx_PCI_EXPRESS is not set
159 156
160# 157#
@@ -163,11 +160,15 @@ CONFIG_CLASSIC_RCU=y
163# CONFIG_PPC_CELL is not set 160# CONFIG_PPC_CELL is not set
164# CONFIG_PPC_CELL_NATIVE is not set 161# CONFIG_PPC_CELL_NATIVE is not set
165# CONFIG_PQ2ADS is not set 162# CONFIG_PQ2ADS is not set
163# CONFIG_PPC4xx_GPIO is not set
164# CONFIG_ACADIA is not set
166CONFIG_EP405=y 165CONFIG_EP405=y
166# CONFIG_HCU4 is not set
167# CONFIG_KILAUEA is not set 167# CONFIG_KILAUEA is not set
168# CONFIG_MAKALU is not set 168# CONFIG_MAKALU is not set
169# CONFIG_WALNUT is not set 169# CONFIG_WALNUT is not set
170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
171# CONFIG_PPC40x_SIMPLE is not set
171CONFIG_405GP=y 172CONFIG_405GP=y
172CONFIG_IBM405_ERR77=y 173CONFIG_IBM405_ERR77=y
173CONFIG_IBM405_ERR51=y 174CONFIG_IBM405_ERR51=y
@@ -188,7 +189,6 @@ CONFIG_IBM405_ERR51=y
188# Kernel options 189# Kernel options
189# 190#
190# CONFIG_HIGHMEM is not set 191# CONFIG_HIGHMEM is not set
191# CONFIG_TICK_ONESHOT is not set
192# CONFIG_NO_HZ is not set 192# CONFIG_NO_HZ is not set
193# CONFIG_HIGH_RES_TIMERS is not set 193# CONFIG_HIGH_RES_TIMERS is not set
194CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 194CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -202,6 +202,8 @@ CONFIG_PREEMPT_NONE=y
202# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
203# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
204CONFIG_BINFMT_ELF=y 204CONFIG_BINFMT_ELF=y
205# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
206# CONFIG_HAVE_AOUT is not set
205# CONFIG_BINFMT_MISC is not set 207# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 208# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 209# CONFIG_IOMMU_HELPER is not set
@@ -216,15 +218,15 @@ CONFIG_FLATMEM_MANUAL=y
216# CONFIG_SPARSEMEM_MANUAL is not set 218# CONFIG_SPARSEMEM_MANUAL is not set
217CONFIG_FLATMEM=y 219CONFIG_FLATMEM=y
218CONFIG_FLAT_NODE_MEM_MAP=y 220CONFIG_FLAT_NODE_MEM_MAP=y
219# CONFIG_SPARSEMEM_STATIC is not set
220# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
221CONFIG_PAGEFLAGS_EXTENDED=y 221CONFIG_PAGEFLAGS_EXTENDED=y
222CONFIG_SPLIT_PTLOCK_CPUS=4 222CONFIG_SPLIT_PTLOCK_CPUS=4
223CONFIG_MIGRATION=y 223CONFIG_MIGRATION=y
224# CONFIG_RESOURCES_64BIT is not set 224# CONFIG_RESOURCES_64BIT is not set
225# CONFIG_PHYS_ADDR_T_64BIT is not set
225CONFIG_ZONE_DMA_FLAG=1 226CONFIG_ZONE_DMA_FLAG=1
226CONFIG_BOUNCE=y 227CONFIG_BOUNCE=y
227CONFIG_VIRT_TO_BUS=y 228CONFIG_VIRT_TO_BUS=y
229CONFIG_UNEVICTABLE_LRU=y
228CONFIG_FORCE_MAX_ZONEORDER=11 230CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 231CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 232# CONFIG_CMDLINE_BOOL is not set
@@ -311,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
311# CONFIG_TIPC is not set 313# CONFIG_TIPC is not set
312# CONFIG_ATM is not set 314# CONFIG_ATM is not set
313# CONFIG_BRIDGE is not set 315# CONFIG_BRIDGE is not set
316# CONFIG_NET_DSA is not set
314# CONFIG_VLAN_8021Q is not set 317# CONFIG_VLAN_8021Q is not set
315# CONFIG_DECNET is not set 318# CONFIG_DECNET is not set
316# CONFIG_LLC2 is not set 319# CONFIG_LLC2 is not set
@@ -331,14 +334,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_IRDA is not set 334# CONFIG_IRDA is not set
332# CONFIG_BT is not set 335# CONFIG_BT is not set
333# CONFIG_AF_RXRPC is not set 336# CONFIG_AF_RXRPC is not set
334 337# CONFIG_PHONET is not set
335# 338# CONFIG_WIRELESS is not set
336# Wireless
337#
338# CONFIG_CFG80211 is not set
339# CONFIG_WIRELESS_EXT is not set
340# CONFIG_MAC80211 is not set
341# CONFIG_IEEE80211 is not set
342# CONFIG_RFKILL is not set 339# CONFIG_RFKILL is not set
343# CONFIG_NET_9P is not set 340# CONFIG_NET_9P is not set
344 341
@@ -520,8 +517,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
520# CONFIG_IBM_NEW_EMAC_RGMII is not set 517# CONFIG_IBM_NEW_EMAC_RGMII is not set
521# CONFIG_IBM_NEW_EMAC_TAH is not set 518# CONFIG_IBM_NEW_EMAC_TAH is not set
522# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 519# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
520# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
521# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
522# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
523# CONFIG_NET_PCI is not set 523# CONFIG_NET_PCI is not set
524# CONFIG_B44 is not set 524# CONFIG_B44 is not set
525# CONFIG_ATL2 is not set
525CONFIG_NETDEV_1000=y 526CONFIG_NETDEV_1000=y
526# CONFIG_ACENIC is not set 527# CONFIG_ACENIC is not set
527# CONFIG_DL2K is not set 528# CONFIG_DL2K is not set
@@ -542,18 +543,22 @@ CONFIG_NETDEV_1000=y
542# CONFIG_QLA3XXX is not set 543# CONFIG_QLA3XXX is not set
543# CONFIG_ATL1 is not set 544# CONFIG_ATL1 is not set
544# CONFIG_ATL1E is not set 545# CONFIG_ATL1E is not set
546# CONFIG_JME is not set
545CONFIG_NETDEV_10000=y 547CONFIG_NETDEV_10000=y
546# CONFIG_CHELSIO_T1 is not set 548# CONFIG_CHELSIO_T1 is not set
547# CONFIG_CHELSIO_T3 is not set 549# CONFIG_CHELSIO_T3 is not set
550# CONFIG_ENIC is not set
548# CONFIG_IXGBE is not set 551# CONFIG_IXGBE is not set
549# CONFIG_IXGB is not set 552# CONFIG_IXGB is not set
550# CONFIG_S2IO is not set 553# CONFIG_S2IO is not set
551# CONFIG_MYRI10GE is not set 554# CONFIG_MYRI10GE is not set
552# CONFIG_NETXEN_NIC is not set 555# CONFIG_NETXEN_NIC is not set
553# CONFIG_NIU is not set 556# CONFIG_NIU is not set
557# CONFIG_MLX4_EN is not set
554# CONFIG_MLX4_CORE is not set 558# CONFIG_MLX4_CORE is not set
555# CONFIG_TEHUTI is not set 559# CONFIG_TEHUTI is not set
556# CONFIG_BNX2X is not set 560# CONFIG_BNX2X is not set
561# CONFIG_QLGE is not set
557# CONFIG_SFC is not set 562# CONFIG_SFC is not set
558# CONFIG_TR is not set 563# CONFIG_TR is not set
559 564
@@ -658,6 +663,8 @@ CONFIG_SSB_POSSIBLE=y
658# CONFIG_MFD_CORE is not set 663# CONFIG_MFD_CORE is not set
659# CONFIG_MFD_SM501 is not set 664# CONFIG_MFD_SM501 is not set
660# CONFIG_HTC_PASIC3 is not set 665# CONFIG_HTC_PASIC3 is not set
666# CONFIG_MFD_TMIO is not set
667# CONFIG_MFD_WM8400 is not set
661 668
662# 669#
663# Multimedia devices 670# Multimedia devices
@@ -707,6 +714,9 @@ CONFIG_USB_DEVICE_CLASS=y
707# CONFIG_USB_OTG is not set 714# CONFIG_USB_OTG is not set
708# CONFIG_USB_OTG_WHITELIST is not set 715# CONFIG_USB_OTG_WHITELIST is not set
709# CONFIG_USB_OTG_BLACKLIST_HUB is not set 716# CONFIG_USB_OTG_BLACKLIST_HUB is not set
717CONFIG_USB_MON=y
718# CONFIG_USB_WUSB is not set
719# CONFIG_USB_WUSB_CBAF is not set
710 720
711# 721#
712# USB Host Controller Drivers 722# USB Host Controller Drivers
@@ -726,6 +736,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
726# CONFIG_USB_UHCI_HCD is not set 736# CONFIG_USB_UHCI_HCD is not set
727# CONFIG_USB_SL811_HCD is not set 737# CONFIG_USB_SL811_HCD is not set
728# CONFIG_USB_R8A66597_HCD is not set 738# CONFIG_USB_R8A66597_HCD is not set
739# CONFIG_USB_WHCI_HCD is not set
740# CONFIG_USB_HWA_HCD is not set
729 741
730# 742#
731# USB Device Class drivers 743# USB Device Class drivers
@@ -733,6 +745,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
733# CONFIG_USB_ACM is not set 745# CONFIG_USB_ACM is not set
734# CONFIG_USB_PRINTER is not set 746# CONFIG_USB_PRINTER is not set
735# CONFIG_USB_WDM is not set 747# CONFIG_USB_WDM is not set
748# CONFIG_USB_TMC is not set
736 749
737# 750#
738# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 751# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -747,7 +760,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
747# USB Imaging devices 760# USB Imaging devices
748# 761#
749# CONFIG_USB_MDC800 is not set 762# CONFIG_USB_MDC800 is not set
750CONFIG_USB_MON=y
751 763
752# 764#
753# USB port drivers 765# USB port drivers
@@ -760,7 +772,7 @@ CONFIG_USB_MON=y
760# CONFIG_USB_EMI62 is not set 772# CONFIG_USB_EMI62 is not set
761# CONFIG_USB_EMI26 is not set 773# CONFIG_USB_EMI26 is not set
762# CONFIG_USB_ADUTUX is not set 774# CONFIG_USB_ADUTUX is not set
763# CONFIG_USB_AUERSWALD is not set 775# CONFIG_USB_SEVSEG is not set
764# CONFIG_USB_RIO500 is not set 776# CONFIG_USB_RIO500 is not set
765# CONFIG_USB_LEGOTOWER is not set 777# CONFIG_USB_LEGOTOWER is not set
766# CONFIG_USB_LCD is not set 778# CONFIG_USB_LCD is not set
@@ -777,7 +789,9 @@ CONFIG_USB_MON=y
777# CONFIG_USB_IOWARRIOR is not set 789# CONFIG_USB_IOWARRIOR is not set
778# CONFIG_USB_TEST is not set 790# CONFIG_USB_TEST is not set
779# CONFIG_USB_ISIGHTFW is not set 791# CONFIG_USB_ISIGHTFW is not set
792# CONFIG_USB_VST is not set
780# CONFIG_USB_GADGET is not set 793# CONFIG_USB_GADGET is not set
794# CONFIG_UWB is not set
781# CONFIG_MMC is not set 795# CONFIG_MMC is not set
782# CONFIG_MEMSTICK is not set 796# CONFIG_MEMSTICK is not set
783# CONFIG_NEW_LEDS is not set 797# CONFIG_NEW_LEDS is not set
@@ -787,6 +801,7 @@ CONFIG_USB_MON=y
787# CONFIG_RTC_CLASS is not set 801# CONFIG_RTC_CLASS is not set
788# CONFIG_DMADEVICES is not set 802# CONFIG_DMADEVICES is not set
789# CONFIG_UIO is not set 803# CONFIG_UIO is not set
804# CONFIG_STAGING is not set
790 805
791# 806#
792# File systems 807# File systems
@@ -795,10 +810,11 @@ CONFIG_EXT2_FS=y
795# CONFIG_EXT2_FS_XATTR is not set 810# CONFIG_EXT2_FS_XATTR is not set
796# CONFIG_EXT2_FS_XIP is not set 811# CONFIG_EXT2_FS_XIP is not set
797# CONFIG_EXT3_FS is not set 812# CONFIG_EXT3_FS is not set
798# CONFIG_EXT4DEV_FS is not set 813# CONFIG_EXT4_FS is not set
799# CONFIG_REISERFS_FS is not set 814# CONFIG_REISERFS_FS is not set
800# CONFIG_JFS_FS is not set 815# CONFIG_JFS_FS is not set
801# CONFIG_FS_POSIX_ACL is not set 816# CONFIG_FS_POSIX_ACL is not set
817CONFIG_FILE_LOCKING=y
802# CONFIG_XFS_FS is not set 818# CONFIG_XFS_FS is not set
803# CONFIG_OCFS2_FS is not set 819# CONFIG_OCFS2_FS is not set
804CONFIG_DNOTIFY=y 820CONFIG_DNOTIFY=y
@@ -828,6 +844,7 @@ CONFIG_INOTIFY_USER=y
828CONFIG_PROC_FS=y 844CONFIG_PROC_FS=y
829CONFIG_PROC_KCORE=y 845CONFIG_PROC_KCORE=y
830CONFIG_PROC_SYSCTL=y 846CONFIG_PROC_SYSCTL=y
847CONFIG_PROC_PAGE_MONITOR=y
831CONFIG_SYSFS=y 848CONFIG_SYSFS=y
832CONFIG_TMPFS=y 849CONFIG_TMPFS=y
833# CONFIG_TMPFS_POSIX_ACL is not set 850# CONFIG_TMPFS_POSIX_ACL is not set
@@ -865,6 +882,7 @@ CONFIG_LOCKD=y
865CONFIG_LOCKD_V4=y 882CONFIG_LOCKD_V4=y
866CONFIG_NFS_COMMON=y 883CONFIG_NFS_COMMON=y
867CONFIG_SUNRPC=y 884CONFIG_SUNRPC=y
885# CONFIG_SUNRPC_REGISTER_V4 is not set
868# CONFIG_RPCSEC_GSS_KRB5 is not set 886# CONFIG_RPCSEC_GSS_KRB5 is not set
869# CONFIG_RPCSEC_GSS_SPKM3 is not set 887# CONFIG_RPCSEC_GSS_SPKM3 is not set
870# CONFIG_SMB_FS is not set 888# CONFIG_SMB_FS is not set
@@ -885,7 +903,6 @@ CONFIG_MSDOS_PARTITION=y
885# Library routines 903# Library routines
886# 904#
887CONFIG_BITREVERSE=y 905CONFIG_BITREVERSE=y
888# CONFIG_GENERIC_FIND_FIRST_BIT is not set
889# CONFIG_CRC_CCITT is not set 906# CONFIG_CRC_CCITT is not set
890# CONFIG_CRC16 is not set 907# CONFIG_CRC16 is not set
891# CONFIG_CRC_T10DIF is not set 908# CONFIG_CRC_T10DIF is not set
@@ -938,14 +955,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
938# CONFIG_DEBUG_SG is not set 955# CONFIG_DEBUG_SG is not set
939# CONFIG_BOOT_PRINTK_DELAY is not set 956# CONFIG_BOOT_PRINTK_DELAY is not set
940# CONFIG_RCU_TORTURE_TEST is not set 957# CONFIG_RCU_TORTURE_TEST is not set
958# CONFIG_RCU_CPU_STALL_DETECTOR is not set
941# CONFIG_BACKTRACE_SELF_TEST is not set 959# CONFIG_BACKTRACE_SELF_TEST is not set
960# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
942# CONFIG_FAULT_INJECTION is not set 961# CONFIG_FAULT_INJECTION is not set
943# CONFIG_LATENCYTOP is not set 962# CONFIG_LATENCYTOP is not set
963CONFIG_SYSCTL_SYSCALL_CHECK=y
964CONFIG_NOP_TRACER=y
944CONFIG_HAVE_FTRACE=y 965CONFIG_HAVE_FTRACE=y
945CONFIG_HAVE_DYNAMIC_FTRACE=y 966CONFIG_HAVE_DYNAMIC_FTRACE=y
946# CONFIG_FTRACE is not set 967# CONFIG_FTRACE is not set
947# CONFIG_SCHED_TRACER is not set 968# CONFIG_SCHED_TRACER is not set
948# CONFIG_CONTEXT_SWITCH_TRACER is not set 969# CONFIG_CONTEXT_SWITCH_TRACER is not set
970# CONFIG_BOOT_TRACER is not set
971# CONFIG_STACK_TRACER is not set
972# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
949# CONFIG_SAMPLES is not set 973# CONFIG_SAMPLES is not set
950CONFIG_HAVE_ARCH_KGDB=y 974CONFIG_HAVE_ARCH_KGDB=y
951# CONFIG_KGDB is not set 975# CONFIG_KGDB is not set
@@ -954,6 +978,7 @@ CONFIG_HAVE_ARCH_KGDB=y
954# CONFIG_DEBUG_PAGEALLOC is not set 978# CONFIG_DEBUG_PAGEALLOC is not set
955# CONFIG_CODE_PATCHING_SELFTEST is not set 979# CONFIG_CODE_PATCHING_SELFTEST is not set
956# CONFIG_FTR_FIXUP_SELFTEST is not set 980# CONFIG_FTR_FIXUP_SELFTEST is not set
981# CONFIG_MSI_BITMAP_SELFTEST is not set
957# CONFIG_XMON is not set 982# CONFIG_XMON is not set
958# CONFIG_IRQSTACKS is not set 983# CONFIG_IRQSTACKS is not set
959# CONFIG_VIRQ_DEBUG is not set 984# CONFIG_VIRQ_DEBUG is not set
@@ -965,14 +990,19 @@ CONFIG_HAVE_ARCH_KGDB=y
965# 990#
966# CONFIG_KEYS is not set 991# CONFIG_KEYS is not set
967# CONFIG_SECURITY is not set 992# CONFIG_SECURITY is not set
993# CONFIG_SECURITYFS is not set
968# CONFIG_SECURITY_FILE_CAPABILITIES is not set 994# CONFIG_SECURITY_FILE_CAPABILITIES is not set
969CONFIG_CRYPTO=y 995CONFIG_CRYPTO=y
970 996
971# 997#
972# Crypto core or helper 998# Crypto core or helper
973# 999#
1000# CONFIG_CRYPTO_FIPS is not set
974CONFIG_CRYPTO_ALGAPI=y 1001CONFIG_CRYPTO_ALGAPI=y
1002CONFIG_CRYPTO_AEAD=y
975CONFIG_CRYPTO_BLKCIPHER=y 1003CONFIG_CRYPTO_BLKCIPHER=y
1004CONFIG_CRYPTO_HASH=y
1005CONFIG_CRYPTO_RNG=y
976CONFIG_CRYPTO_MANAGER=y 1006CONFIG_CRYPTO_MANAGER=y
977# CONFIG_CRYPTO_GF128MUL is not set 1007# CONFIG_CRYPTO_GF128MUL is not set
978# CONFIG_CRYPTO_NULL is not set 1008# CONFIG_CRYPTO_NULL is not set
@@ -1045,6 +1075,11 @@ CONFIG_CRYPTO_DES=y
1045# 1075#
1046# CONFIG_CRYPTO_DEFLATE is not set 1076# CONFIG_CRYPTO_DEFLATE is not set
1047# CONFIG_CRYPTO_LZO is not set 1077# CONFIG_CRYPTO_LZO is not set
1078
1079#
1080# Random Number Generation
1081#
1082# CONFIG_CRYPTO_ANSI_CPRNG is not set
1048CONFIG_CRYPTO_HW=y 1083CONFIG_CRYPTO_HW=y
1049# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1084# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1050# CONFIG_PPC_CLOCK is not set 1085# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/40x/hcu4_defconfig b/arch/powerpc/configs/40x/hcu4_defconfig
index 682fce02c73a..45dcb824503f 100644
--- a/arch/powerpc/configs/40x/hcu4_defconfig
+++ b/arch/powerpc/configs/40x/hcu4_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.26.5 3# Linux kernel version: 2.6.28-rc2
4# Tue Sep 16 00:44:33 2008 4# Tue Oct 28 08:49:22 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,7 +19,7 @@ CONFIG_4xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
30CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
31CONFIG_STACKTRACE_SUPPORT=y 31CONFIG_STACKTRACE_SUPPORT=y
32CONFIG_HAVE_LATENCYTOP_SUPPORT=y
32CONFIG_LOCKDEP_SUPPORT=y 33CONFIG_LOCKDEP_SUPPORT=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y 35CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -86,13 +87,11 @@ CONFIG_INITRAMFS_SOURCE=""
86CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
87CONFIG_EMBEDDED=y 88CONFIG_EMBEDDED=y
88CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
89CONFIG_SYSCTL_SYSCALL_CHECK=y
90CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 91CONFIG_KALLSYMS_ALL=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 92CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 93CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 94CONFIG_PRINTK=y
95# CONFIG_LOGBUFFER is not set
96CONFIG_BUG=y 95CONFIG_BUG=y
97CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
98CONFIG_COMPAT_BRK=y 97CONFIG_COMPAT_BRK=y
@@ -104,7 +103,9 @@ CONFIG_SIGNALFD=y
104CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
105CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
106CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
107CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
108CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
109# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
110CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -113,10 +114,12 @@ CONFIG_SLUB=y
113# CONFIG_MARKERS is not set 114# CONFIG_MARKERS is not set
114CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
115# CONFIG_KPROBES is not set 116# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
118CONFIG_HAVE_IOREMAP_PROT=y
116CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
117CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
118# CONFIG_HAVE_DMA_ATTRS is not set 121CONFIG_HAVE_ARCH_TRACEHOOK=y
119CONFIG_PROC_PAGE_MONITOR=y 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
120CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
121CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
122# CONFIG_TINY_SHMEM is not set 125# CONFIG_TINY_SHMEM is not set
@@ -133,6 +136,7 @@ CONFIG_LBD=y
133# CONFIG_BLK_DEV_IO_TRACE is not set 136# CONFIG_BLK_DEV_IO_TRACE is not set
134# CONFIG_LSF is not set 137# CONFIG_LSF is not set
135# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set
136 140
137# 141#
138# IO Schedulers 142# IO Schedulers
@@ -147,22 +151,25 @@ CONFIG_DEFAULT_AS=y
147# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
148CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
149CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
150# CONFIG_PPC4xx_PCI_EXPRESS is not set 155# CONFIG_PPC4xx_PCI_EXPRESS is not set
151 156
152# 157#
153# Platform support 158# Platform support
154# 159#
155# CONFIG_PPC_MPC512x is not set
156# CONFIG_PPC_MPC5121 is not set
157# CONFIG_PPC_CELL is not set 160# CONFIG_PPC_CELL is not set
158# CONFIG_PPC_CELL_NATIVE is not set 161# CONFIG_PPC_CELL_NATIVE is not set
159# CONFIG_PQ2ADS is not set 162# CONFIG_PQ2ADS is not set
163# CONFIG_PPC4xx_GPIO is not set
164# CONFIG_ACADIA is not set
160# CONFIG_EP405 is not set 165# CONFIG_EP405 is not set
161CONFIG_HCU4=y 166CONFIG_HCU4=y
162# CONFIG_KILAUEA is not set 167# CONFIG_KILAUEA is not set
163# CONFIG_MAKALU is not set 168# CONFIG_MAKALU is not set
164# CONFIG_WALNUT is not set 169# CONFIG_WALNUT is not set
165# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
171# CONFIG_PPC40x_SIMPLE is not set
172CONFIG_405GPR=y
166# CONFIG_IPIC is not set 173# CONFIG_IPIC is not set
167# CONFIG_MPIC is not set 174# CONFIG_MPIC is not set
168# CONFIG_MPIC_WEIRD is not set 175# CONFIG_MPIC_WEIRD is not set
@@ -180,7 +187,6 @@ CONFIG_HCU4=y
180# Kernel options 187# Kernel options
181# 188#
182# CONFIG_HIGHMEM is not set 189# CONFIG_HIGHMEM is not set
183# CONFIG_TICK_ONESHOT is not set
184# CONFIG_NO_HZ is not set 190# CONFIG_NO_HZ is not set
185# CONFIG_HIGH_RES_TIMERS is not set 191# CONFIG_HIGH_RES_TIMERS is not set
186CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 192CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -194,6 +200,8 @@ CONFIG_PREEMPT_NONE=y
194# CONFIG_PREEMPT_VOLUNTARY is not set 200# CONFIG_PREEMPT_VOLUNTARY is not set
195# CONFIG_PREEMPT is not set 201# CONFIG_PREEMPT is not set
196CONFIG_BINFMT_ELF=y 202CONFIG_BINFMT_ELF=y
203# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
204# CONFIG_HAVE_AOUT is not set
197# CONFIG_BINFMT_MISC is not set 205# CONFIG_BINFMT_MISC is not set
198# CONFIG_MATH_EMULATION is not set 206# CONFIG_MATH_EMULATION is not set
199# CONFIG_IOMMU_HELPER is not set 207# CONFIG_IOMMU_HELPER is not set
@@ -208,17 +216,19 @@ CONFIG_FLATMEM_MANUAL=y
208# CONFIG_SPARSEMEM_MANUAL is not set 216# CONFIG_SPARSEMEM_MANUAL is not set
209CONFIG_FLATMEM=y 217CONFIG_FLATMEM=y
210CONFIG_FLAT_NODE_MEM_MAP=y 218CONFIG_FLAT_NODE_MEM_MAP=y
211# CONFIG_SPARSEMEM_STATIC is not set
212# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
213CONFIG_PAGEFLAGS_EXTENDED=y 219CONFIG_PAGEFLAGS_EXTENDED=y
214CONFIG_SPLIT_PTLOCK_CPUS=4 220CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y
215CONFIG_RESOURCES_64BIT=y 222CONFIG_RESOURCES_64BIT=y
223# CONFIG_PHYS_ADDR_T_64BIT is not set
216CONFIG_ZONE_DMA_FLAG=1 224CONFIG_ZONE_DMA_FLAG=1
217CONFIG_BOUNCE=y 225CONFIG_BOUNCE=y
218CONFIG_VIRT_TO_BUS=y 226CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y
219CONFIG_FORCE_MAX_ZONEORDER=11 228CONFIG_FORCE_MAX_ZONEORDER=11
220CONFIG_PROC_DEVICETREE=y 229CONFIG_PROC_DEVICETREE=y
221# CONFIG_CMDLINE_BOOL is not set 230# CONFIG_CMDLINE_BOOL is not set
231CONFIG_EXTRA_TARGETS=""
222# CONFIG_PM is not set 232# CONFIG_PM is not set
223CONFIG_SECCOMP=y 233CONFIG_SECCOMP=y
224CONFIG_ISA_DMA_API=y 234CONFIG_ISA_DMA_API=y
@@ -229,6 +239,7 @@ CONFIG_ISA_DMA_API=y
229CONFIG_ZONE_DMA=y 239CONFIG_ZONE_DMA=y
230CONFIG_PPC_INDIRECT_PCI=y 240CONFIG_PPC_INDIRECT_PCI=y
231CONFIG_4xx_SOC=y 241CONFIG_4xx_SOC=y
242CONFIG_PPC_PCI_CHOICE=y
232CONFIG_PCI=y 243CONFIG_PCI=y
233CONFIG_PCI_DOMAINS=y 244CONFIG_PCI_DOMAINS=y
234CONFIG_PCI_SYSCALL=y 245CONFIG_PCI_SYSCALL=y
@@ -256,10 +267,6 @@ CONFIG_PHYSICAL_START=0x00000000
256CONFIG_TASK_SIZE=0xc0000000 267CONFIG_TASK_SIZE=0xc0000000
257CONFIG_CONSISTENT_START=0xff100000 268CONFIG_CONSISTENT_START=0xff100000
258CONFIG_CONSISTENT_SIZE=0x00200000 269CONFIG_CONSISTENT_SIZE=0x00200000
259
260#
261# Networking
262#
263CONFIG_NET=y 270CONFIG_NET=y
264 271
265# 272#
@@ -304,6 +311,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
304# CONFIG_TIPC is not set 311# CONFIG_TIPC is not set
305# CONFIG_ATM is not set 312# CONFIG_ATM is not set
306# CONFIG_BRIDGE is not set 313# CONFIG_BRIDGE is not set
314# CONFIG_NET_DSA is not set
307# CONFIG_VLAN_8021Q is not set 315# CONFIG_VLAN_8021Q is not set
308# CONFIG_DECNET is not set 316# CONFIG_DECNET is not set
309# CONFIG_LLC2 is not set 317# CONFIG_LLC2 is not set
@@ -324,14 +332,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
324# CONFIG_IRDA is not set 332# CONFIG_IRDA is not set
325# CONFIG_BT is not set 333# CONFIG_BT is not set
326# CONFIG_AF_RXRPC is not set 334# CONFIG_AF_RXRPC is not set
327 335# CONFIG_PHONET is not set
328# 336# CONFIG_WIRELESS is not set
329# Wireless
330#
331# CONFIG_CFG80211 is not set
332# CONFIG_WIRELESS_EXT is not set
333# CONFIG_MAC80211 is not set
334# CONFIG_IEEE80211 is not set
335# CONFIG_RFKILL is not set 337# CONFIG_RFKILL is not set
336# CONFIG_NET_9P is not set 338# CONFIG_NET_9P is not set
337 339
@@ -346,6 +348,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
346CONFIG_STANDALONE=y 348CONFIG_STANDALONE=y
347CONFIG_PREVENT_FIRMWARE_BUILD=y 349CONFIG_PREVENT_FIRMWARE_BUILD=y
348CONFIG_FW_LOADER=y 350CONFIG_FW_LOADER=y
351CONFIG_FIRMWARE_IN_KERNEL=y
352CONFIG_EXTRA_FIRMWARE=""
349# CONFIG_DEBUG_DRIVER is not set 353# CONFIG_DEBUG_DRIVER is not set
350# CONFIG_DEBUG_DEVRES is not set 354# CONFIG_DEBUG_DEVRES is not set
351# CONFIG_SYS_HYPERVISOR is not set 355# CONFIG_SYS_HYPERVISOR is not set
@@ -449,12 +453,14 @@ CONFIG_BLK_DEV_RAM_SIZE=35000
449# CONFIG_CDROM_PKTCDVD is not set 453# CONFIG_CDROM_PKTCDVD is not set
450# CONFIG_ATA_OVER_ETH is not set 454# CONFIG_ATA_OVER_ETH is not set
451# CONFIG_XILINX_SYSACE is not set 455# CONFIG_XILINX_SYSACE is not set
456# CONFIG_BLK_DEV_HD is not set
452CONFIG_MISC_DEVICES=y 457CONFIG_MISC_DEVICES=y
453# CONFIG_PHANTOM is not set 458# CONFIG_PHANTOM is not set
454# CONFIG_EEPROM_93CX6 is not set 459# CONFIG_EEPROM_93CX6 is not set
455# CONFIG_SGI_IOC4 is not set 460# CONFIG_SGI_IOC4 is not set
456# CONFIG_TIFM_CORE is not set 461# CONFIG_TIFM_CORE is not set
457# CONFIG_ENCLOSURE_SERVICES is not set 462# CONFIG_ENCLOSURE_SERVICES is not set
463# CONFIG_HP_ILO is not set
458CONFIG_HAVE_IDE=y 464CONFIG_HAVE_IDE=y
459# CONFIG_IDE is not set 465# CONFIG_IDE is not set
460 466
@@ -481,7 +487,6 @@ CONFIG_HAVE_IDE=y
481# CONFIG_I2O is not set 487# CONFIG_I2O is not set
482# CONFIG_MACINTOSH_DRIVERS is not set 488# CONFIG_MACINTOSH_DRIVERS is not set
483CONFIG_NETDEVICES=y 489CONFIG_NETDEVICES=y
484# CONFIG_NETDEVICES_MULTIQUEUE is not set
485# CONFIG_DUMMY is not set 490# CONFIG_DUMMY is not set
486# CONFIG_BONDING is not set 491# CONFIG_BONDING is not set
487# CONFIG_MACVLAN is not set 492# CONFIG_MACVLAN is not set
@@ -509,14 +514,17 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
509# CONFIG_IBM_NEW_EMAC_RGMII is not set 514# CONFIG_IBM_NEW_EMAC_RGMII is not set
510# CONFIG_IBM_NEW_EMAC_TAH is not set 515# CONFIG_IBM_NEW_EMAC_TAH is not set
511# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 516# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
517# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
518# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
519# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
512# CONFIG_NET_PCI is not set 520# CONFIG_NET_PCI is not set
513# CONFIG_B44 is not set 521# CONFIG_B44 is not set
522# CONFIG_ATL2 is not set
514CONFIG_NETDEV_1000=y 523CONFIG_NETDEV_1000=y
515# CONFIG_ACENIC is not set 524# CONFIG_ACENIC is not set
516# CONFIG_DL2K is not set 525# CONFIG_DL2K is not set
517# CONFIG_E1000 is not set 526# CONFIG_E1000 is not set
518# CONFIG_E1000E is not set 527# CONFIG_E1000E is not set
519# CONFIG_E1000E_ENABLED is not set
520# CONFIG_IP1000 is not set 528# CONFIG_IP1000 is not set
521# CONFIG_IGB is not set 529# CONFIG_IGB is not set
522# CONFIG_NS83820 is not set 530# CONFIG_NS83820 is not set
@@ -531,18 +539,23 @@ CONFIG_NETDEV_1000=y
531# CONFIG_BNX2 is not set 539# CONFIG_BNX2 is not set
532# CONFIG_QLA3XXX is not set 540# CONFIG_QLA3XXX is not set
533# CONFIG_ATL1 is not set 541# CONFIG_ATL1 is not set
542# CONFIG_ATL1E is not set
543# CONFIG_JME is not set
534CONFIG_NETDEV_10000=y 544CONFIG_NETDEV_10000=y
535# CONFIG_CHELSIO_T1 is not set 545# CONFIG_CHELSIO_T1 is not set
536# CONFIG_CHELSIO_T3 is not set 546# CONFIG_CHELSIO_T3 is not set
547# CONFIG_ENIC is not set
537# CONFIG_IXGBE is not set 548# CONFIG_IXGBE is not set
538# CONFIG_IXGB is not set 549# CONFIG_IXGB is not set
539# CONFIG_S2IO is not set 550# CONFIG_S2IO is not set
540# CONFIG_MYRI10GE is not set 551# CONFIG_MYRI10GE is not set
541# CONFIG_NETXEN_NIC is not set 552# CONFIG_NETXEN_NIC is not set
542# CONFIG_NIU is not set 553# CONFIG_NIU is not set
554# CONFIG_MLX4_EN is not set
543# CONFIG_MLX4_CORE is not set 555# CONFIG_MLX4_CORE is not set
544# CONFIG_TEHUTI is not set 556# CONFIG_TEHUTI is not set
545# CONFIG_BNX2X is not set 557# CONFIG_BNX2X is not set
558# CONFIG_QLGE is not set
546# CONFIG_SFC is not set 559# CONFIG_SFC is not set
547# CONFIG_TR is not set 560# CONFIG_TR is not set
548 561
@@ -618,6 +631,8 @@ CONFIG_LEGACY_PTY_COUNT=256
618CONFIG_DEVPORT=y 631CONFIG_DEVPORT=y
619# CONFIG_I2C is not set 632# CONFIG_I2C is not set
620# CONFIG_SPI is not set 633# CONFIG_SPI is not set
634CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
635# CONFIG_GPIOLIB is not set
621# CONFIG_W1 is not set 636# CONFIG_W1 is not set
622# CONFIG_POWER_SUPPLY is not set 637# CONFIG_POWER_SUPPLY is not set
623# CONFIG_HWMON is not set 638# CONFIG_HWMON is not set
@@ -634,8 +649,11 @@ CONFIG_SSB_POSSIBLE=y
634# 649#
635# Multifunction device drivers 650# Multifunction device drivers
636# 651#
652# CONFIG_MFD_CORE is not set
637# CONFIG_MFD_SM501 is not set 653# CONFIG_MFD_SM501 is not set
638# CONFIG_HTC_PASIC3 is not set 654# CONFIG_HTC_PASIC3 is not set
655# CONFIG_MFD_TMIO is not set
656# CONFIG_MFD_WM8400 is not set
639 657
640# 658#
641# Multimedia devices 659# Multimedia devices
@@ -667,12 +685,9 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
667# Display device support 685# Display device support
668# 686#
669# CONFIG_DISPLAY_SUPPORT is not set 687# CONFIG_DISPLAY_SUPPORT is not set
670
671#
672# Sound
673#
674# CONFIG_SOUND is not set 688# CONFIG_SOUND is not set
675# CONFIG_USB_SUPPORT is not set 689# CONFIG_USB_SUPPORT is not set
690# CONFIG_UWB is not set
676# CONFIG_MMC is not set 691# CONFIG_MMC is not set
677# CONFIG_MEMSTICK is not set 692# CONFIG_MEMSTICK is not set
678# CONFIG_NEW_LEDS is not set 693# CONFIG_NEW_LEDS is not set
@@ -682,6 +697,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
682# CONFIG_RTC_CLASS is not set 697# CONFIG_RTC_CLASS is not set
683# CONFIG_DMADEVICES is not set 698# CONFIG_DMADEVICES is not set
684# CONFIG_UIO is not set 699# CONFIG_UIO is not set
700# CONFIG_STAGING is not set
685 701
686# 702#
687# File systems 703# File systems
@@ -690,10 +706,11 @@ CONFIG_EXT2_FS=y
690# CONFIG_EXT2_FS_XATTR is not set 706# CONFIG_EXT2_FS_XATTR is not set
691# CONFIG_EXT2_FS_XIP is not set 707# CONFIG_EXT2_FS_XIP is not set
692# CONFIG_EXT3_FS is not set 708# CONFIG_EXT3_FS is not set
693# CONFIG_EXT4DEV_FS is not set 709# CONFIG_EXT4_FS is not set
694# CONFIG_REISERFS_FS is not set 710# CONFIG_REISERFS_FS is not set
695# CONFIG_JFS_FS is not set 711# CONFIG_JFS_FS is not set
696# CONFIG_FS_POSIX_ACL is not set 712# CONFIG_FS_POSIX_ACL is not set
713CONFIG_FILE_LOCKING=y
697# CONFIG_XFS_FS is not set 714# CONFIG_XFS_FS is not set
698# CONFIG_OCFS2_FS is not set 715# CONFIG_OCFS2_FS is not set
699CONFIG_DNOTIFY=y 716CONFIG_DNOTIFY=y
@@ -723,6 +740,7 @@ CONFIG_INOTIFY_USER=y
723CONFIG_PROC_FS=y 740CONFIG_PROC_FS=y
724CONFIG_PROC_KCORE=y 741CONFIG_PROC_KCORE=y
725CONFIG_PROC_SYSCTL=y 742CONFIG_PROC_SYSCTL=y
743CONFIG_PROC_PAGE_MONITOR=y
726CONFIG_SYSFS=y 744CONFIG_SYSFS=y
727CONFIG_TMPFS=y 745CONFIG_TMPFS=y
728# CONFIG_TMPFS_POSIX_ACL is not set 746# CONFIG_TMPFS_POSIX_ACL is not set
@@ -739,11 +757,11 @@ CONFIG_TMPFS=y
739# CONFIG_BEFS_FS is not set 757# CONFIG_BEFS_FS is not set
740# CONFIG_BFS_FS is not set 758# CONFIG_BFS_FS is not set
741# CONFIG_EFS_FS is not set 759# CONFIG_EFS_FS is not set
742# CONFIG_YAFFS_FS is not set
743# CONFIG_JFFS2_FS is not set 760# CONFIG_JFFS2_FS is not set
744CONFIG_CRAMFS=y 761CONFIG_CRAMFS=y
745# CONFIG_VXFS_FS is not set 762# CONFIG_VXFS_FS is not set
746# CONFIG_MINIX_FS is not set 763# CONFIG_MINIX_FS is not set
764# CONFIG_OMFS_FS is not set
747# CONFIG_HPFS_FS is not set 765# CONFIG_HPFS_FS is not set
748# CONFIG_QNX4FS_FS is not set 766# CONFIG_QNX4FS_FS is not set
749# CONFIG_ROMFS_FS is not set 767# CONFIG_ROMFS_FS is not set
@@ -754,13 +772,13 @@ CONFIG_NFS_FS=y
754CONFIG_NFS_V3=y 772CONFIG_NFS_V3=y
755# CONFIG_NFS_V3_ACL is not set 773# CONFIG_NFS_V3_ACL is not set
756# CONFIG_NFS_V4 is not set 774# CONFIG_NFS_V4 is not set
757# CONFIG_NFSD is not set
758CONFIG_ROOT_NFS=y 775CONFIG_ROOT_NFS=y
776# CONFIG_NFSD is not set
759CONFIG_LOCKD=y 777CONFIG_LOCKD=y
760CONFIG_LOCKD_V4=y 778CONFIG_LOCKD_V4=y
761CONFIG_NFS_COMMON=y 779CONFIG_NFS_COMMON=y
762CONFIG_SUNRPC=y 780CONFIG_SUNRPC=y
763# CONFIG_SUNRPC_BIND34 is not set 781# CONFIG_SUNRPC_REGISTER_V4 is not set
764# CONFIG_RPCSEC_GSS_KRB5 is not set 782# CONFIG_RPCSEC_GSS_KRB5 is not set
765# CONFIG_RPCSEC_GSS_SPKM3 is not set 783# CONFIG_RPCSEC_GSS_SPKM3 is not set
766# CONFIG_SMB_FS is not set 784# CONFIG_SMB_FS is not set
@@ -781,9 +799,9 @@ CONFIG_MSDOS_PARTITION=y
781# Library routines 799# Library routines
782# 800#
783CONFIG_BITREVERSE=y 801CONFIG_BITREVERSE=y
784# CONFIG_GENERIC_FIND_FIRST_BIT is not set
785# CONFIG_CRC_CCITT is not set 802# CONFIG_CRC_CCITT is not set
786# CONFIG_CRC16 is not set 803# CONFIG_CRC16 is not set
804# CONFIG_CRC_T10DIF is not set
787# CONFIG_CRC_ITU_T is not set 805# CONFIG_CRC_ITU_T is not set
788CONFIG_CRC32=y 806CONFIG_CRC32=y
789# CONFIG_CRC7 is not set 807# CONFIG_CRC7 is not set
@@ -809,6 +827,8 @@ CONFIG_DEBUG_FS=y
809CONFIG_DEBUG_KERNEL=y 827CONFIG_DEBUG_KERNEL=y
810# CONFIG_DEBUG_SHIRQ is not set 828# CONFIG_DEBUG_SHIRQ is not set
811CONFIG_DETECT_SOFTLOCKUP=y 829CONFIG_DETECT_SOFTLOCKUP=y
830# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
831CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
812CONFIG_SCHED_DEBUG=y 832CONFIG_SCHED_DEBUG=y
813# CONFIG_SCHEDSTATS is not set 833# CONFIG_SCHEDSTATS is not set
814# CONFIG_TIMER_STATS is not set 834# CONFIG_TIMER_STATS is not set
@@ -826,17 +846,36 @@ CONFIG_DEBUG_BUGVERBOSE=y
826# CONFIG_DEBUG_INFO is not set 846# CONFIG_DEBUG_INFO is not set
827# CONFIG_DEBUG_VM is not set 847# CONFIG_DEBUG_VM is not set
828# CONFIG_DEBUG_WRITECOUNT is not set 848# CONFIG_DEBUG_WRITECOUNT is not set
849# CONFIG_DEBUG_MEMORY_INIT is not set
829# CONFIG_DEBUG_LIST is not set 850# CONFIG_DEBUG_LIST is not set
830# CONFIG_DEBUG_SG is not set 851# CONFIG_DEBUG_SG is not set
831# CONFIG_BOOT_PRINTK_DELAY is not set 852# CONFIG_BOOT_PRINTK_DELAY is not set
832# CONFIG_RCU_TORTURE_TEST is not set 853# CONFIG_RCU_TORTURE_TEST is not set
854# CONFIG_RCU_CPU_STALL_DETECTOR is not set
833# CONFIG_BACKTRACE_SELF_TEST is not set 855# CONFIG_BACKTRACE_SELF_TEST is not set
856# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
834# CONFIG_FAULT_INJECTION is not set 857# CONFIG_FAULT_INJECTION is not set
858# CONFIG_LATENCYTOP is not set
859CONFIG_SYSCTL_SYSCALL_CHECK=y
860CONFIG_NOP_TRACER=y
861CONFIG_HAVE_FTRACE=y
862CONFIG_HAVE_DYNAMIC_FTRACE=y
863# CONFIG_FTRACE is not set
864# CONFIG_SCHED_TRACER is not set
865# CONFIG_CONTEXT_SWITCH_TRACER is not set
866# CONFIG_BOOT_TRACER is not set
867# CONFIG_STACK_TRACER is not set
868# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
835# CONFIG_SAMPLES is not set 869# CONFIG_SAMPLES is not set
870CONFIG_HAVE_ARCH_KGDB=y
871# CONFIG_KGDB is not set
836# CONFIG_DEBUG_STACKOVERFLOW is not set 872# CONFIG_DEBUG_STACKOVERFLOW is not set
837# CONFIG_DEBUG_STACK_USAGE is not set 873# CONFIG_DEBUG_STACK_USAGE is not set
838# CONFIG_DEBUG_PAGEALLOC is not set 874# CONFIG_DEBUG_PAGEALLOC is not set
839# CONFIG_DEBUGGER is not set 875# CONFIG_CODE_PATCHING_SELFTEST is not set
876# CONFIG_FTR_FIXUP_SELFTEST is not set
877# CONFIG_MSI_BITMAP_SELFTEST is not set
878# CONFIG_XMON is not set
840# CONFIG_IRQSTACKS is not set 879# CONFIG_IRQSTACKS is not set
841# CONFIG_VIRQ_DEBUG is not set 880# CONFIG_VIRQ_DEBUG is not set
842# CONFIG_BDI_SWITCH is not set 881# CONFIG_BDI_SWITCH is not set
@@ -847,14 +886,19 @@ CONFIG_DEBUG_BUGVERBOSE=y
847# 886#
848# CONFIG_KEYS is not set 887# CONFIG_KEYS is not set
849# CONFIG_SECURITY is not set 888# CONFIG_SECURITY is not set
889# CONFIG_SECURITYFS is not set
850# CONFIG_SECURITY_FILE_CAPABILITIES is not set 890# CONFIG_SECURITY_FILE_CAPABILITIES is not set
851CONFIG_CRYPTO=y 891CONFIG_CRYPTO=y
852 892
853# 893#
854# Crypto core or helper 894# Crypto core or helper
855# 895#
896# CONFIG_CRYPTO_FIPS is not set
856CONFIG_CRYPTO_ALGAPI=y 897CONFIG_CRYPTO_ALGAPI=y
898CONFIG_CRYPTO_AEAD=y
857CONFIG_CRYPTO_BLKCIPHER=y 899CONFIG_CRYPTO_BLKCIPHER=y
900CONFIG_CRYPTO_HASH=y
901CONFIG_CRYPTO_RNG=y
858CONFIG_CRYPTO_MANAGER=y 902CONFIG_CRYPTO_MANAGER=y
859# CONFIG_CRYPTO_GF128MUL is not set 903# CONFIG_CRYPTO_GF128MUL is not set
860# CONFIG_CRYPTO_NULL is not set 904# CONFIG_CRYPTO_NULL is not set
@@ -893,6 +937,10 @@ CONFIG_CRYPTO_PCBC=y
893# CONFIG_CRYPTO_MD4 is not set 937# CONFIG_CRYPTO_MD4 is not set
894CONFIG_CRYPTO_MD5=y 938CONFIG_CRYPTO_MD5=y
895# CONFIG_CRYPTO_MICHAEL_MIC is not set 939# CONFIG_CRYPTO_MICHAEL_MIC is not set
940# CONFIG_CRYPTO_RMD128 is not set
941# CONFIG_CRYPTO_RMD160 is not set
942# CONFIG_CRYPTO_RMD256 is not set
943# CONFIG_CRYPTO_RMD320 is not set
896# CONFIG_CRYPTO_SHA1 is not set 944# CONFIG_CRYPTO_SHA1 is not set
897# CONFIG_CRYPTO_SHA256 is not set 945# CONFIG_CRYPTO_SHA256 is not set
898# CONFIG_CRYPTO_SHA512 is not set 946# CONFIG_CRYPTO_SHA512 is not set
@@ -923,6 +971,11 @@ CONFIG_CRYPTO_DES=y
923# 971#
924# CONFIG_CRYPTO_DEFLATE is not set 972# CONFIG_CRYPTO_DEFLATE is not set
925# CONFIG_CRYPTO_LZO is not set 973# CONFIG_CRYPTO_LZO is not set
974
975#
976# Random Number Generation
977#
978# CONFIG_CRYPTO_ANSI_CPRNG is not set
926CONFIG_CRYPTO_HW=y 979CONFIG_CRYPTO_HW=y
927# CONFIG_CRYPTO_DEV_HIFN_795X is not set 980# CONFIG_CRYPTO_DEV_HIFN_795X is not set
928# CONFIG_PPC_CLOCK is not set 981# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig
index 565ed9666c54..e2f3695d9d0b 100644
--- a/arch/powerpc/configs/40x/kilauea_defconfig
+++ b/arch/powerpc/configs/40x/kilauea_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 19:36:14 2008 4# Tue Oct 28 08:49:23 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,14 +19,13 @@ CONFIG_4xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
30# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
32CONFIG_STACKTRACE_SUPPORT=y 31CONFIG_STACKTRACE_SUPPORT=y
@@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE=""
88CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
89CONFIG_EMBEDDED=y 88CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
93CONFIG_KALLSYMS_ALL=y 91CONFIG_KALLSYMS_ALL=y
94CONFIG_KALLSYMS_EXTRA_PASS=y 92CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
111CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124# CONFIG_HAVE_CLK is not set
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -155,6 +151,7 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
158CONFIG_PPC4xx_PCI_EXPRESS=y 155CONFIG_PPC4xx_PCI_EXPRESS=y
159 156
160# 157#
@@ -163,11 +160,15 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
163# CONFIG_PPC_CELL is not set 160# CONFIG_PPC_CELL is not set
164# CONFIG_PPC_CELL_NATIVE is not set 161# CONFIG_PPC_CELL_NATIVE is not set
165# CONFIG_PQ2ADS is not set 162# CONFIG_PQ2ADS is not set
163# CONFIG_PPC4xx_GPIO is not set
164# CONFIG_ACADIA is not set
166# CONFIG_EP405 is not set 165# CONFIG_EP405 is not set
166# CONFIG_HCU4 is not set
167CONFIG_KILAUEA=y 167CONFIG_KILAUEA=y
168# CONFIG_MAKALU is not set 168# CONFIG_MAKALU is not set
169# CONFIG_WALNUT is not set 169# CONFIG_WALNUT is not set
170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
171# CONFIG_PPC40x_SIMPLE is not set
171CONFIG_405EX=y 172CONFIG_405EX=y
172# CONFIG_IPIC is not set 173# CONFIG_IPIC is not set
173# CONFIG_MPIC is not set 174# CONFIG_MPIC is not set
@@ -186,7 +187,6 @@ CONFIG_405EX=y
186# Kernel options 187# Kernel options
187# 188#
188# CONFIG_HIGHMEM is not set 189# CONFIG_HIGHMEM is not set
189# CONFIG_TICK_ONESHOT is not set
190# CONFIG_NO_HZ is not set 190# CONFIG_NO_HZ is not set
191# CONFIG_HIGH_RES_TIMERS is not set 191# CONFIG_HIGH_RES_TIMERS is not set
192CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 192CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -200,6 +200,8 @@ CONFIG_PREEMPT_NONE=y
200# CONFIG_PREEMPT_VOLUNTARY is not set 200# CONFIG_PREEMPT_VOLUNTARY is not set
201# CONFIG_PREEMPT is not set 201# CONFIG_PREEMPT is not set
202CONFIG_BINFMT_ELF=y 202CONFIG_BINFMT_ELF=y
203# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
204# CONFIG_HAVE_AOUT is not set
203# CONFIG_BINFMT_MISC is not set 205# CONFIG_BINFMT_MISC is not set
204# CONFIG_MATH_EMULATION is not set 206# CONFIG_MATH_EMULATION is not set
205# CONFIG_IOMMU_HELPER is not set 207# CONFIG_IOMMU_HELPER is not set
@@ -214,15 +216,15 @@ CONFIG_FLATMEM_MANUAL=y
214# CONFIG_SPARSEMEM_MANUAL is not set 216# CONFIG_SPARSEMEM_MANUAL is not set
215CONFIG_FLATMEM=y 217CONFIG_FLATMEM=y
216CONFIG_FLAT_NODE_MEM_MAP=y 218CONFIG_FLAT_NODE_MEM_MAP=y
217# CONFIG_SPARSEMEM_STATIC is not set
218# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
219CONFIG_PAGEFLAGS_EXTENDED=y 219CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 220CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 221CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set 222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set
223CONFIG_ZONE_DMA_FLAG=1 224CONFIG_ZONE_DMA_FLAG=1
224CONFIG_BOUNCE=y 225CONFIG_BOUNCE=y
225CONFIG_VIRT_TO_BUS=y 226CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y
226CONFIG_FORCE_MAX_ZONEORDER=11 228CONFIG_FORCE_MAX_ZONEORDER=11
227CONFIG_PROC_DEVICETREE=y 229CONFIG_PROC_DEVICETREE=y
228# CONFIG_CMDLINE_BOOL is not set 230# CONFIG_CMDLINE_BOOL is not set
@@ -309,6 +311,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
309# CONFIG_TIPC is not set 311# CONFIG_TIPC is not set
310# CONFIG_ATM is not set 312# CONFIG_ATM is not set
311# CONFIG_BRIDGE is not set 313# CONFIG_BRIDGE is not set
314# CONFIG_NET_DSA is not set
312# CONFIG_VLAN_8021Q is not set 315# CONFIG_VLAN_8021Q is not set
313# CONFIG_DECNET is not set 316# CONFIG_DECNET is not set
314# CONFIG_LLC2 is not set 317# CONFIG_LLC2 is not set
@@ -329,14 +332,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_IRDA is not set 332# CONFIG_IRDA is not set
330# CONFIG_BT is not set 333# CONFIG_BT is not set
331# CONFIG_AF_RXRPC is not set 334# CONFIG_AF_RXRPC is not set
332 335# CONFIG_PHONET is not set
333# 336# CONFIG_WIRELESS is not set
334# Wireless
335#
336# CONFIG_CFG80211 is not set
337# CONFIG_WIRELESS_EXT is not set
338# CONFIG_MAC80211 is not set
339# CONFIG_IEEE80211 is not set
340# CONFIG_RFKILL is not set 337# CONFIG_RFKILL is not set
341# CONFIG_NET_9P is not set 338# CONFIG_NET_9P is not set
342 339
@@ -511,8 +508,12 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
511CONFIG_IBM_NEW_EMAC_RGMII=y 508CONFIG_IBM_NEW_EMAC_RGMII=y
512# CONFIG_IBM_NEW_EMAC_TAH is not set 509# CONFIG_IBM_NEW_EMAC_TAH is not set
513CONFIG_IBM_NEW_EMAC_EMAC4=y 510CONFIG_IBM_NEW_EMAC_EMAC4=y
511# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
512# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
513# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
514# CONFIG_NET_PCI is not set 514# CONFIG_NET_PCI is not set
515# CONFIG_B44 is not set 515# CONFIG_B44 is not set
516# CONFIG_ATL2 is not set
516# CONFIG_NETDEV_1000 is not set 517# CONFIG_NETDEV_1000 is not set
517# CONFIG_NETDEV_10000 is not set 518# CONFIG_NETDEV_10000 is not set
518# CONFIG_TR is not set 519# CONFIG_TR is not set
@@ -609,6 +610,8 @@ CONFIG_SSB_POSSIBLE=y
609# CONFIG_MFD_CORE is not set 610# CONFIG_MFD_CORE is not set
610# CONFIG_MFD_SM501 is not set 611# CONFIG_MFD_SM501 is not set
611# CONFIG_HTC_PASIC3 is not set 612# CONFIG_HTC_PASIC3 is not set
613# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set
612 615
613# 616#
614# Multimedia devices 617# Multimedia devices
@@ -642,6 +645,7 @@ CONFIG_SSB_POSSIBLE=y
642# CONFIG_DISPLAY_SUPPORT is not set 645# CONFIG_DISPLAY_SUPPORT is not set
643# CONFIG_SOUND is not set 646# CONFIG_SOUND is not set
644# CONFIG_USB_SUPPORT is not set 647# CONFIG_USB_SUPPORT is not set
648# CONFIG_UWB is not set
645# CONFIG_MMC is not set 649# CONFIG_MMC is not set
646# CONFIG_MEMSTICK is not set 650# CONFIG_MEMSTICK is not set
647# CONFIG_NEW_LEDS is not set 651# CONFIG_NEW_LEDS is not set
@@ -651,6 +655,7 @@ CONFIG_SSB_POSSIBLE=y
651# CONFIG_RTC_CLASS is not set 655# CONFIG_RTC_CLASS is not set
652# CONFIG_DMADEVICES is not set 656# CONFIG_DMADEVICES is not set
653# CONFIG_UIO is not set 657# CONFIG_UIO is not set
658# CONFIG_STAGING is not set
654 659
655# 660#
656# File systems 661# File systems
@@ -659,10 +664,11 @@ CONFIG_EXT2_FS=y
659# CONFIG_EXT2_FS_XATTR is not set 664# CONFIG_EXT2_FS_XATTR is not set
660# CONFIG_EXT2_FS_XIP is not set 665# CONFIG_EXT2_FS_XIP is not set
661# CONFIG_EXT3_FS is not set 666# CONFIG_EXT3_FS is not set
662# CONFIG_EXT4DEV_FS is not set 667# CONFIG_EXT4_FS is not set
663# CONFIG_REISERFS_FS is not set 668# CONFIG_REISERFS_FS is not set
664# CONFIG_JFS_FS is not set 669# CONFIG_JFS_FS is not set
665# CONFIG_FS_POSIX_ACL is not set 670# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y
666# CONFIG_XFS_FS is not set 672# CONFIG_XFS_FS is not set
667# CONFIG_OCFS2_FS is not set 673# CONFIG_OCFS2_FS is not set
668CONFIG_DNOTIFY=y 674CONFIG_DNOTIFY=y
@@ -692,6 +698,7 @@ CONFIG_INOTIFY_USER=y
692CONFIG_PROC_FS=y 698CONFIG_PROC_FS=y
693CONFIG_PROC_KCORE=y 699CONFIG_PROC_KCORE=y
694CONFIG_PROC_SYSCTL=y 700CONFIG_PROC_SYSCTL=y
701CONFIG_PROC_PAGE_MONITOR=y
695CONFIG_SYSFS=y 702CONFIG_SYSFS=y
696CONFIG_TMPFS=y 703CONFIG_TMPFS=y
697# CONFIG_TMPFS_POSIX_ACL is not set 704# CONFIG_TMPFS_POSIX_ACL is not set
@@ -729,6 +736,7 @@ CONFIG_LOCKD=y
729CONFIG_LOCKD_V4=y 736CONFIG_LOCKD_V4=y
730CONFIG_NFS_COMMON=y 737CONFIG_NFS_COMMON=y
731CONFIG_SUNRPC=y 738CONFIG_SUNRPC=y
739# CONFIG_SUNRPC_REGISTER_V4 is not set
732# CONFIG_RPCSEC_GSS_KRB5 is not set 740# CONFIG_RPCSEC_GSS_KRB5 is not set
733# CONFIG_RPCSEC_GSS_SPKM3 is not set 741# CONFIG_RPCSEC_GSS_SPKM3 is not set
734# CONFIG_SMB_FS is not set 742# CONFIG_SMB_FS is not set
@@ -749,7 +757,6 @@ CONFIG_MSDOS_PARTITION=y
749# Library routines 757# Library routines
750# 758#
751CONFIG_BITREVERSE=y 759CONFIG_BITREVERSE=y
752# CONFIG_GENERIC_FIND_FIRST_BIT is not set
753# CONFIG_CRC_CCITT is not set 760# CONFIG_CRC_CCITT is not set
754# CONFIG_CRC16 is not set 761# CONFIG_CRC16 is not set
755# CONFIG_CRC_T10DIF is not set 762# CONFIG_CRC_T10DIF is not set
@@ -802,14 +809,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
802# CONFIG_DEBUG_SG is not set 809# CONFIG_DEBUG_SG is not set
803# CONFIG_BOOT_PRINTK_DELAY is not set 810# CONFIG_BOOT_PRINTK_DELAY is not set
804# CONFIG_RCU_TORTURE_TEST is not set 811# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set
805# CONFIG_BACKTRACE_SELF_TEST is not set 813# CONFIG_BACKTRACE_SELF_TEST is not set
814# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
806# CONFIG_FAULT_INJECTION is not set 815# CONFIG_FAULT_INJECTION is not set
807# CONFIG_LATENCYTOP is not set 816# CONFIG_LATENCYTOP is not set
817CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y
808CONFIG_HAVE_FTRACE=y 819CONFIG_HAVE_FTRACE=y
809CONFIG_HAVE_DYNAMIC_FTRACE=y 820CONFIG_HAVE_DYNAMIC_FTRACE=y
810# CONFIG_FTRACE is not set 821# CONFIG_FTRACE is not set
811# CONFIG_SCHED_TRACER is not set 822# CONFIG_SCHED_TRACER is not set
812# CONFIG_CONTEXT_SWITCH_TRACER is not set 823# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set
825# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
813# CONFIG_SAMPLES is not set 827# CONFIG_SAMPLES is not set
814CONFIG_HAVE_ARCH_KGDB=y 828CONFIG_HAVE_ARCH_KGDB=y
815# CONFIG_KGDB is not set 829# CONFIG_KGDB is not set
@@ -818,6 +832,7 @@ CONFIG_HAVE_ARCH_KGDB=y
818# CONFIG_DEBUG_PAGEALLOC is not set 832# CONFIG_DEBUG_PAGEALLOC is not set
819# CONFIG_CODE_PATCHING_SELFTEST is not set 833# CONFIG_CODE_PATCHING_SELFTEST is not set
820# CONFIG_FTR_FIXUP_SELFTEST is not set 834# CONFIG_FTR_FIXUP_SELFTEST is not set
835# CONFIG_MSI_BITMAP_SELFTEST is not set
821# CONFIG_XMON is not set 836# CONFIG_XMON is not set
822# CONFIG_IRQSTACKS is not set 837# CONFIG_IRQSTACKS is not set
823# CONFIG_VIRQ_DEBUG is not set 838# CONFIG_VIRQ_DEBUG is not set
@@ -829,14 +844,19 @@ CONFIG_HAVE_ARCH_KGDB=y
829# 844#
830# CONFIG_KEYS is not set 845# CONFIG_KEYS is not set
831# CONFIG_SECURITY is not set 846# CONFIG_SECURITY is not set
847# CONFIG_SECURITYFS is not set
832# CONFIG_SECURITY_FILE_CAPABILITIES is not set 848# CONFIG_SECURITY_FILE_CAPABILITIES is not set
833CONFIG_CRYPTO=y 849CONFIG_CRYPTO=y
834 850
835# 851#
836# Crypto core or helper 852# Crypto core or helper
837# 853#
854# CONFIG_CRYPTO_FIPS is not set
838CONFIG_CRYPTO_ALGAPI=y 855CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y
839CONFIG_CRYPTO_BLKCIPHER=y 857CONFIG_CRYPTO_BLKCIPHER=y
858CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y
840CONFIG_CRYPTO_MANAGER=y 860CONFIG_CRYPTO_MANAGER=y
841# CONFIG_CRYPTO_GF128MUL is not set 861# CONFIG_CRYPTO_GF128MUL is not set
842# CONFIG_CRYPTO_NULL is not set 862# CONFIG_CRYPTO_NULL is not set
@@ -909,6 +929,11 @@ CONFIG_CRYPTO_DES=y
909# 929#
910# CONFIG_CRYPTO_DEFLATE is not set 930# CONFIG_CRYPTO_DEFLATE is not set
911# CONFIG_CRYPTO_LZO is not set 931# CONFIG_CRYPTO_LZO is not set
932
933#
934# Random Number Generation
935#
936# CONFIG_CRYPTO_ANSI_CPRNG is not set
912CONFIG_CRYPTO_HW=y 937CONFIG_CRYPTO_HW=y
913# CONFIG_CRYPTO_DEV_HIFN_795X is not set 938# CONFIG_CRYPTO_DEV_HIFN_795X is not set
914# CONFIG_PPC_CLOCK is not set 939# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig
index 987a4481800f..413c778ecd7c 100644
--- a/arch/powerpc/configs/40x/makalu_defconfig
+++ b/arch/powerpc/configs/40x/makalu_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 19:38:39 2008 4# Tue Oct 28 08:49:25 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,14 +19,13 @@ CONFIG_4xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
30# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
32CONFIG_STACKTRACE_SUPPORT=y 31CONFIG_STACKTRACE_SUPPORT=y
@@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE=""
88CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
89CONFIG_EMBEDDED=y 88CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
93CONFIG_KALLSYMS_ALL=y 91CONFIG_KALLSYMS_ALL=y
94CONFIG_KALLSYMS_EXTRA_PASS=y 92CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
111CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124# CONFIG_HAVE_CLK is not set
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -155,6 +151,7 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
158CONFIG_PPC4xx_PCI_EXPRESS=y 155CONFIG_PPC4xx_PCI_EXPRESS=y
159 156
160# 157#
@@ -163,11 +160,15 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
163# CONFIG_PPC_CELL is not set 160# CONFIG_PPC_CELL is not set
164# CONFIG_PPC_CELL_NATIVE is not set 161# CONFIG_PPC_CELL_NATIVE is not set
165# CONFIG_PQ2ADS is not set 162# CONFIG_PQ2ADS is not set
163# CONFIG_PPC4xx_GPIO is not set
164# CONFIG_ACADIA is not set
166# CONFIG_EP405 is not set 165# CONFIG_EP405 is not set
166# CONFIG_HCU4 is not set
167# CONFIG_KILAUEA is not set 167# CONFIG_KILAUEA is not set
168CONFIG_MAKALU=y 168CONFIG_MAKALU=y
169# CONFIG_WALNUT is not set 169# CONFIG_WALNUT is not set
170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
171# CONFIG_PPC40x_SIMPLE is not set
171CONFIG_405EX=y 172CONFIG_405EX=y
172# CONFIG_IPIC is not set 173# CONFIG_IPIC is not set
173# CONFIG_MPIC is not set 174# CONFIG_MPIC is not set
@@ -186,7 +187,6 @@ CONFIG_405EX=y
186# Kernel options 187# Kernel options
187# 188#
188# CONFIG_HIGHMEM is not set 189# CONFIG_HIGHMEM is not set
189# CONFIG_TICK_ONESHOT is not set
190# CONFIG_NO_HZ is not set 190# CONFIG_NO_HZ is not set
191# CONFIG_HIGH_RES_TIMERS is not set 191# CONFIG_HIGH_RES_TIMERS is not set
192CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 192CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -200,6 +200,8 @@ CONFIG_PREEMPT_NONE=y
200# CONFIG_PREEMPT_VOLUNTARY is not set 200# CONFIG_PREEMPT_VOLUNTARY is not set
201# CONFIG_PREEMPT is not set 201# CONFIG_PREEMPT is not set
202CONFIG_BINFMT_ELF=y 202CONFIG_BINFMT_ELF=y
203# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
204# CONFIG_HAVE_AOUT is not set
203# CONFIG_BINFMT_MISC is not set 205# CONFIG_BINFMT_MISC is not set
204# CONFIG_MATH_EMULATION is not set 206# CONFIG_MATH_EMULATION is not set
205# CONFIG_IOMMU_HELPER is not set 207# CONFIG_IOMMU_HELPER is not set
@@ -214,15 +216,15 @@ CONFIG_FLATMEM_MANUAL=y
214# CONFIG_SPARSEMEM_MANUAL is not set 216# CONFIG_SPARSEMEM_MANUAL is not set
215CONFIG_FLATMEM=y 217CONFIG_FLATMEM=y
216CONFIG_FLAT_NODE_MEM_MAP=y 218CONFIG_FLAT_NODE_MEM_MAP=y
217# CONFIG_SPARSEMEM_STATIC is not set
218# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
219CONFIG_PAGEFLAGS_EXTENDED=y 219CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 220CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 221CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set 222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set
223CONFIG_ZONE_DMA_FLAG=1 224CONFIG_ZONE_DMA_FLAG=1
224CONFIG_BOUNCE=y 225CONFIG_BOUNCE=y
225CONFIG_VIRT_TO_BUS=y 226CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y
226CONFIG_FORCE_MAX_ZONEORDER=11 228CONFIG_FORCE_MAX_ZONEORDER=11
227CONFIG_PROC_DEVICETREE=y 229CONFIG_PROC_DEVICETREE=y
228# CONFIG_CMDLINE_BOOL is not set 230# CONFIG_CMDLINE_BOOL is not set
@@ -309,6 +311,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
309# CONFIG_TIPC is not set 311# CONFIG_TIPC is not set
310# CONFIG_ATM is not set 312# CONFIG_ATM is not set
311# CONFIG_BRIDGE is not set 313# CONFIG_BRIDGE is not set
314# CONFIG_NET_DSA is not set
312# CONFIG_VLAN_8021Q is not set 315# CONFIG_VLAN_8021Q is not set
313# CONFIG_DECNET is not set 316# CONFIG_DECNET is not set
314# CONFIG_LLC2 is not set 317# CONFIG_LLC2 is not set
@@ -329,14 +332,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_IRDA is not set 332# CONFIG_IRDA is not set
330# CONFIG_BT is not set 333# CONFIG_BT is not set
331# CONFIG_AF_RXRPC is not set 334# CONFIG_AF_RXRPC is not set
332 335# CONFIG_PHONET is not set
333# 336# CONFIG_WIRELESS is not set
334# Wireless
335#
336# CONFIG_CFG80211 is not set
337# CONFIG_WIRELESS_EXT is not set
338# CONFIG_MAC80211 is not set
339# CONFIG_IEEE80211 is not set
340# CONFIG_RFKILL is not set 337# CONFIG_RFKILL is not set
341# CONFIG_NET_9P is not set 338# CONFIG_NET_9P is not set
342 339
@@ -511,8 +508,12 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
511CONFIG_IBM_NEW_EMAC_RGMII=y 508CONFIG_IBM_NEW_EMAC_RGMII=y
512# CONFIG_IBM_NEW_EMAC_TAH is not set 509# CONFIG_IBM_NEW_EMAC_TAH is not set
513CONFIG_IBM_NEW_EMAC_EMAC4=y 510CONFIG_IBM_NEW_EMAC_EMAC4=y
511# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
512# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
513# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
514# CONFIG_NET_PCI is not set 514# CONFIG_NET_PCI is not set
515# CONFIG_B44 is not set 515# CONFIG_B44 is not set
516# CONFIG_ATL2 is not set
516# CONFIG_NETDEV_1000 is not set 517# CONFIG_NETDEV_1000 is not set
517# CONFIG_NETDEV_10000 is not set 518# CONFIG_NETDEV_10000 is not set
518# CONFIG_TR is not set 519# CONFIG_TR is not set
@@ -609,6 +610,8 @@ CONFIG_SSB_POSSIBLE=y
609# CONFIG_MFD_CORE is not set 610# CONFIG_MFD_CORE is not set
610# CONFIG_MFD_SM501 is not set 611# CONFIG_MFD_SM501 is not set
611# CONFIG_HTC_PASIC3 is not set 612# CONFIG_HTC_PASIC3 is not set
613# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set
612 615
613# 616#
614# Multimedia devices 617# Multimedia devices
@@ -642,6 +645,7 @@ CONFIG_SSB_POSSIBLE=y
642# CONFIG_DISPLAY_SUPPORT is not set 645# CONFIG_DISPLAY_SUPPORT is not set
643# CONFIG_SOUND is not set 646# CONFIG_SOUND is not set
644# CONFIG_USB_SUPPORT is not set 647# CONFIG_USB_SUPPORT is not set
648# CONFIG_UWB is not set
645# CONFIG_MMC is not set 649# CONFIG_MMC is not set
646# CONFIG_MEMSTICK is not set 650# CONFIG_MEMSTICK is not set
647# CONFIG_NEW_LEDS is not set 651# CONFIG_NEW_LEDS is not set
@@ -651,6 +655,7 @@ CONFIG_SSB_POSSIBLE=y
651# CONFIG_RTC_CLASS is not set 655# CONFIG_RTC_CLASS is not set
652# CONFIG_DMADEVICES is not set 656# CONFIG_DMADEVICES is not set
653# CONFIG_UIO is not set 657# CONFIG_UIO is not set
658# CONFIG_STAGING is not set
654 659
655# 660#
656# File systems 661# File systems
@@ -659,10 +664,11 @@ CONFIG_EXT2_FS=y
659# CONFIG_EXT2_FS_XATTR is not set 664# CONFIG_EXT2_FS_XATTR is not set
660# CONFIG_EXT2_FS_XIP is not set 665# CONFIG_EXT2_FS_XIP is not set
661# CONFIG_EXT3_FS is not set 666# CONFIG_EXT3_FS is not set
662# CONFIG_EXT4DEV_FS is not set 667# CONFIG_EXT4_FS is not set
663# CONFIG_REISERFS_FS is not set 668# CONFIG_REISERFS_FS is not set
664# CONFIG_JFS_FS is not set 669# CONFIG_JFS_FS is not set
665# CONFIG_FS_POSIX_ACL is not set 670# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y
666# CONFIG_XFS_FS is not set 672# CONFIG_XFS_FS is not set
667# CONFIG_OCFS2_FS is not set 673# CONFIG_OCFS2_FS is not set
668CONFIG_DNOTIFY=y 674CONFIG_DNOTIFY=y
@@ -692,6 +698,7 @@ CONFIG_INOTIFY_USER=y
692CONFIG_PROC_FS=y 698CONFIG_PROC_FS=y
693CONFIG_PROC_KCORE=y 699CONFIG_PROC_KCORE=y
694CONFIG_PROC_SYSCTL=y 700CONFIG_PROC_SYSCTL=y
701CONFIG_PROC_PAGE_MONITOR=y
695CONFIG_SYSFS=y 702CONFIG_SYSFS=y
696CONFIG_TMPFS=y 703CONFIG_TMPFS=y
697# CONFIG_TMPFS_POSIX_ACL is not set 704# CONFIG_TMPFS_POSIX_ACL is not set
@@ -729,6 +736,7 @@ CONFIG_LOCKD=y
729CONFIG_LOCKD_V4=y 736CONFIG_LOCKD_V4=y
730CONFIG_NFS_COMMON=y 737CONFIG_NFS_COMMON=y
731CONFIG_SUNRPC=y 738CONFIG_SUNRPC=y
739# CONFIG_SUNRPC_REGISTER_V4 is not set
732# CONFIG_RPCSEC_GSS_KRB5 is not set 740# CONFIG_RPCSEC_GSS_KRB5 is not set
733# CONFIG_RPCSEC_GSS_SPKM3 is not set 741# CONFIG_RPCSEC_GSS_SPKM3 is not set
734# CONFIG_SMB_FS is not set 742# CONFIG_SMB_FS is not set
@@ -749,7 +757,6 @@ CONFIG_MSDOS_PARTITION=y
749# Library routines 757# Library routines
750# 758#
751CONFIG_BITREVERSE=y 759CONFIG_BITREVERSE=y
752# CONFIG_GENERIC_FIND_FIRST_BIT is not set
753# CONFIG_CRC_CCITT is not set 760# CONFIG_CRC_CCITT is not set
754# CONFIG_CRC16 is not set 761# CONFIG_CRC16 is not set
755# CONFIG_CRC_T10DIF is not set 762# CONFIG_CRC_T10DIF is not set
@@ -802,14 +809,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
802# CONFIG_DEBUG_SG is not set 809# CONFIG_DEBUG_SG is not set
803# CONFIG_BOOT_PRINTK_DELAY is not set 810# CONFIG_BOOT_PRINTK_DELAY is not set
804# CONFIG_RCU_TORTURE_TEST is not set 811# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set
805# CONFIG_BACKTRACE_SELF_TEST is not set 813# CONFIG_BACKTRACE_SELF_TEST is not set
814# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
806# CONFIG_FAULT_INJECTION is not set 815# CONFIG_FAULT_INJECTION is not set
807# CONFIG_LATENCYTOP is not set 816# CONFIG_LATENCYTOP is not set
817CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y
808CONFIG_HAVE_FTRACE=y 819CONFIG_HAVE_FTRACE=y
809CONFIG_HAVE_DYNAMIC_FTRACE=y 820CONFIG_HAVE_DYNAMIC_FTRACE=y
810# CONFIG_FTRACE is not set 821# CONFIG_FTRACE is not set
811# CONFIG_SCHED_TRACER is not set 822# CONFIG_SCHED_TRACER is not set
812# CONFIG_CONTEXT_SWITCH_TRACER is not set 823# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set
825# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
813# CONFIG_SAMPLES is not set 827# CONFIG_SAMPLES is not set
814CONFIG_HAVE_ARCH_KGDB=y 828CONFIG_HAVE_ARCH_KGDB=y
815# CONFIG_KGDB is not set 829# CONFIG_KGDB is not set
@@ -818,6 +832,7 @@ CONFIG_HAVE_ARCH_KGDB=y
818# CONFIG_DEBUG_PAGEALLOC is not set 832# CONFIG_DEBUG_PAGEALLOC is not set
819# CONFIG_CODE_PATCHING_SELFTEST is not set 833# CONFIG_CODE_PATCHING_SELFTEST is not set
820# CONFIG_FTR_FIXUP_SELFTEST is not set 834# CONFIG_FTR_FIXUP_SELFTEST is not set
835# CONFIG_MSI_BITMAP_SELFTEST is not set
821# CONFIG_XMON is not set 836# CONFIG_XMON is not set
822# CONFIG_IRQSTACKS is not set 837# CONFIG_IRQSTACKS is not set
823# CONFIG_VIRQ_DEBUG is not set 838# CONFIG_VIRQ_DEBUG is not set
@@ -829,14 +844,19 @@ CONFIG_HAVE_ARCH_KGDB=y
829# 844#
830# CONFIG_KEYS is not set 845# CONFIG_KEYS is not set
831# CONFIG_SECURITY is not set 846# CONFIG_SECURITY is not set
847# CONFIG_SECURITYFS is not set
832# CONFIG_SECURITY_FILE_CAPABILITIES is not set 848# CONFIG_SECURITY_FILE_CAPABILITIES is not set
833CONFIG_CRYPTO=y 849CONFIG_CRYPTO=y
834 850
835# 851#
836# Crypto core or helper 852# Crypto core or helper
837# 853#
854# CONFIG_CRYPTO_FIPS is not set
838CONFIG_CRYPTO_ALGAPI=y 855CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y
839CONFIG_CRYPTO_BLKCIPHER=y 857CONFIG_CRYPTO_BLKCIPHER=y
858CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y
840CONFIG_CRYPTO_MANAGER=y 860CONFIG_CRYPTO_MANAGER=y
841# CONFIG_CRYPTO_GF128MUL is not set 861# CONFIG_CRYPTO_GF128MUL is not set
842# CONFIG_CRYPTO_NULL is not set 862# CONFIG_CRYPTO_NULL is not set
@@ -909,6 +929,11 @@ CONFIG_CRYPTO_DES=y
909# 929#
910# CONFIG_CRYPTO_DEFLATE is not set 930# CONFIG_CRYPTO_DEFLATE is not set
911# CONFIG_CRYPTO_LZO is not set 931# CONFIG_CRYPTO_LZO is not set
932
933#
934# Random Number Generation
935#
936# CONFIG_CRYPTO_ANSI_CPRNG is not set
912CONFIG_CRYPTO_HW=y 937CONFIG_CRYPTO_HW=y
913# CONFIG_CRYPTO_DEV_HIFN_795X is not set 938# CONFIG_CRYPTO_DEV_HIFN_795X is not set
914# CONFIG_PPC_CLOCK is not set 939# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig
index aee79338f41f..5820e0a4fc55 100644
--- a/arch/powerpc/configs/40x/walnut_defconfig
+++ b/arch/powerpc/configs/40x/walnut_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 19:40:56 2008 4# Tue Oct 28 08:49:27 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,14 +19,13 @@ CONFIG_4xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
30# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
32CONFIG_STACKTRACE_SUPPORT=y 31CONFIG_STACKTRACE_SUPPORT=y
@@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE=""
88CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
89CONFIG_EMBEDDED=y 88CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
93CONFIG_KALLSYMS_ALL=y 91CONFIG_KALLSYMS_ALL=y
94CONFIG_KALLSYMS_EXTRA_PASS=y 92CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
111CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124# CONFIG_HAVE_CLK is not set
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -155,6 +151,7 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
158# CONFIG_PPC4xx_PCI_EXPRESS is not set 155# CONFIG_PPC4xx_PCI_EXPRESS is not set
159 156
160# 157#
@@ -163,11 +160,15 @@ CONFIG_CLASSIC_RCU=y
163# CONFIG_PPC_CELL is not set 160# CONFIG_PPC_CELL is not set
164# CONFIG_PPC_CELL_NATIVE is not set 161# CONFIG_PPC_CELL_NATIVE is not set
165# CONFIG_PQ2ADS is not set 162# CONFIG_PQ2ADS is not set
163# CONFIG_PPC4xx_GPIO is not set
164# CONFIG_ACADIA is not set
166# CONFIG_EP405 is not set 165# CONFIG_EP405 is not set
166# CONFIG_HCU4 is not set
167# CONFIG_KILAUEA is not set 167# CONFIG_KILAUEA is not set
168# CONFIG_MAKALU is not set 168# CONFIG_MAKALU is not set
169CONFIG_WALNUT=y 169CONFIG_WALNUT=y
170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 170# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
171# CONFIG_PPC40x_SIMPLE is not set
171CONFIG_405GP=y 172CONFIG_405GP=y
172CONFIG_IBM405_ERR77=y 173CONFIG_IBM405_ERR77=y
173CONFIG_IBM405_ERR51=y 174CONFIG_IBM405_ERR51=y
@@ -189,7 +190,6 @@ CONFIG_OF_RTC=y
189# Kernel options 190# Kernel options
190# 191#
191# CONFIG_HIGHMEM is not set 192# CONFIG_HIGHMEM is not set
192# CONFIG_TICK_ONESHOT is not set
193# CONFIG_NO_HZ is not set 193# CONFIG_NO_HZ is not set
194# CONFIG_HIGH_RES_TIMERS is not set 194# CONFIG_HIGH_RES_TIMERS is not set
195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -203,6 +203,8 @@ CONFIG_PREEMPT_NONE=y
203# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
204# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
205CONFIG_BINFMT_ELF=y 205CONFIG_BINFMT_ELF=y
206# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
207# CONFIG_HAVE_AOUT is not set
206# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
207# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
208# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
@@ -217,15 +219,15 @@ CONFIG_FLATMEM_MANUAL=y
217# CONFIG_SPARSEMEM_MANUAL is not set 219# CONFIG_SPARSEMEM_MANUAL is not set
218CONFIG_FLATMEM=y 220CONFIG_FLATMEM=y
219CONFIG_FLAT_NODE_MEM_MAP=y 221CONFIG_FLAT_NODE_MEM_MAP=y
220# CONFIG_SPARSEMEM_STATIC is not set
221# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
222CONFIG_PAGEFLAGS_EXTENDED=y 222CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 223CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 224CONFIG_MIGRATION=y
225CONFIG_RESOURCES_64BIT=y 225CONFIG_RESOURCES_64BIT=y
226# CONFIG_PHYS_ADDR_T_64BIT is not set
226CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
227CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
228CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y
229CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
230CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
231# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
@@ -312,6 +314,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
312# CONFIG_TIPC is not set 314# CONFIG_TIPC is not set
313# CONFIG_ATM is not set 315# CONFIG_ATM is not set
314# CONFIG_BRIDGE is not set 316# CONFIG_BRIDGE is not set
317# CONFIG_NET_DSA is not set
315# CONFIG_VLAN_8021Q is not set 318# CONFIG_VLAN_8021Q is not set
316# CONFIG_DECNET is not set 319# CONFIG_DECNET is not set
317# CONFIG_LLC2 is not set 320# CONFIG_LLC2 is not set
@@ -332,14 +335,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_IRDA is not set 335# CONFIG_IRDA is not set
333# CONFIG_BT is not set 336# CONFIG_BT is not set
334# CONFIG_AF_RXRPC is not set 337# CONFIG_AF_RXRPC is not set
335 338# CONFIG_PHONET is not set
336# 339# CONFIG_WIRELESS is not set
337# Wireless
338#
339# CONFIG_CFG80211 is not set
340# CONFIG_WIRELESS_EXT is not set
341# CONFIG_MAC80211 is not set
342# CONFIG_IEEE80211 is not set
343# CONFIG_RFKILL is not set 340# CONFIG_RFKILL is not set
344# CONFIG_NET_9P is not set 341# CONFIG_NET_9P is not set
345 342
@@ -520,8 +517,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
520# CONFIG_IBM_NEW_EMAC_RGMII is not set 517# CONFIG_IBM_NEW_EMAC_RGMII is not set
521# CONFIG_IBM_NEW_EMAC_TAH is not set 518# CONFIG_IBM_NEW_EMAC_TAH is not set
522# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 519# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
520# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
521# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
522# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
523# CONFIG_NET_PCI is not set 523# CONFIG_NET_PCI is not set
524# CONFIG_B44 is not set 524# CONFIG_B44 is not set
525# CONFIG_ATL2 is not set
525CONFIG_NETDEV_1000=y 526CONFIG_NETDEV_1000=y
526# CONFIG_ACENIC is not set 527# CONFIG_ACENIC is not set
527# CONFIG_DL2K is not set 528# CONFIG_DL2K is not set
@@ -542,18 +543,22 @@ CONFIG_NETDEV_1000=y
542# CONFIG_QLA3XXX is not set 543# CONFIG_QLA3XXX is not set
543# CONFIG_ATL1 is not set 544# CONFIG_ATL1 is not set
544# CONFIG_ATL1E is not set 545# CONFIG_ATL1E is not set
546# CONFIG_JME is not set
545CONFIG_NETDEV_10000=y 547CONFIG_NETDEV_10000=y
546# CONFIG_CHELSIO_T1 is not set 548# CONFIG_CHELSIO_T1 is not set
547# CONFIG_CHELSIO_T3 is not set 549# CONFIG_CHELSIO_T3 is not set
550# CONFIG_ENIC is not set
548# CONFIG_IXGBE is not set 551# CONFIG_IXGBE is not set
549# CONFIG_IXGB is not set 552# CONFIG_IXGB is not set
550# CONFIG_S2IO is not set 553# CONFIG_S2IO is not set
551# CONFIG_MYRI10GE is not set 554# CONFIG_MYRI10GE is not set
552# CONFIG_NETXEN_NIC is not set 555# CONFIG_NETXEN_NIC is not set
553# CONFIG_NIU is not set 556# CONFIG_NIU is not set
557# CONFIG_MLX4_EN is not set
554# CONFIG_MLX4_CORE is not set 558# CONFIG_MLX4_CORE is not set
555# CONFIG_TEHUTI is not set 559# CONFIG_TEHUTI is not set
556# CONFIG_BNX2X is not set 560# CONFIG_BNX2X is not set
561# CONFIG_QLGE is not set
557# CONFIG_SFC is not set 562# CONFIG_SFC is not set
558# CONFIG_TR is not set 563# CONFIG_TR is not set
559 564
@@ -649,6 +654,8 @@ CONFIG_SSB_POSSIBLE=y
649# CONFIG_MFD_CORE is not set 654# CONFIG_MFD_CORE is not set
650# CONFIG_MFD_SM501 is not set 655# CONFIG_MFD_SM501 is not set
651# CONFIG_HTC_PASIC3 is not set 656# CONFIG_HTC_PASIC3 is not set
657# CONFIG_MFD_TMIO is not set
658# CONFIG_MFD_WM8400 is not set
652 659
653# 660#
654# Multimedia devices 661# Multimedia devices
@@ -690,9 +697,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
690# CONFIG_USB_OTG_BLACKLIST_HUB is not set 697# CONFIG_USB_OTG_BLACKLIST_HUB is not set
691 698
692# 699#
700# Enable Host or Gadget support to see Inventra options
701#
702
703#
693# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 704# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
694# 705#
695# CONFIG_USB_GADGET is not set 706# CONFIG_USB_GADGET is not set
707# CONFIG_UWB is not set
696# CONFIG_MMC is not set 708# CONFIG_MMC is not set
697# CONFIG_MEMSTICK is not set 709# CONFIG_MEMSTICK is not set
698# CONFIG_NEW_LEDS is not set 710# CONFIG_NEW_LEDS is not set
@@ -702,6 +714,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
702# CONFIG_RTC_CLASS is not set 714# CONFIG_RTC_CLASS is not set
703# CONFIG_DMADEVICES is not set 715# CONFIG_DMADEVICES is not set
704# CONFIG_UIO is not set 716# CONFIG_UIO is not set
717# CONFIG_STAGING is not set
705 718
706# 719#
707# File systems 720# File systems
@@ -710,10 +723,11 @@ CONFIG_EXT2_FS=y
710# CONFIG_EXT2_FS_XATTR is not set 723# CONFIG_EXT2_FS_XATTR is not set
711# CONFIG_EXT2_FS_XIP is not set 724# CONFIG_EXT2_FS_XIP is not set
712# CONFIG_EXT3_FS is not set 725# CONFIG_EXT3_FS is not set
713# CONFIG_EXT4DEV_FS is not set 726# CONFIG_EXT4_FS is not set
714# CONFIG_REISERFS_FS is not set 727# CONFIG_REISERFS_FS is not set
715# CONFIG_JFS_FS is not set 728# CONFIG_JFS_FS is not set
716# CONFIG_FS_POSIX_ACL is not set 729# CONFIG_FS_POSIX_ACL is not set
730CONFIG_FILE_LOCKING=y
717# CONFIG_XFS_FS is not set 731# CONFIG_XFS_FS is not set
718# CONFIG_OCFS2_FS is not set 732# CONFIG_OCFS2_FS is not set
719CONFIG_DNOTIFY=y 733CONFIG_DNOTIFY=y
@@ -743,6 +757,7 @@ CONFIG_INOTIFY_USER=y
743CONFIG_PROC_FS=y 757CONFIG_PROC_FS=y
744CONFIG_PROC_KCORE=y 758CONFIG_PROC_KCORE=y
745CONFIG_PROC_SYSCTL=y 759CONFIG_PROC_SYSCTL=y
760CONFIG_PROC_PAGE_MONITOR=y
746CONFIG_SYSFS=y 761CONFIG_SYSFS=y
747CONFIG_TMPFS=y 762CONFIG_TMPFS=y
748# CONFIG_TMPFS_POSIX_ACL is not set 763# CONFIG_TMPFS_POSIX_ACL is not set
@@ -780,6 +795,7 @@ CONFIG_LOCKD=y
780CONFIG_LOCKD_V4=y 795CONFIG_LOCKD_V4=y
781CONFIG_NFS_COMMON=y 796CONFIG_NFS_COMMON=y
782CONFIG_SUNRPC=y 797CONFIG_SUNRPC=y
798# CONFIG_SUNRPC_REGISTER_V4 is not set
783# CONFIG_RPCSEC_GSS_KRB5 is not set 799# CONFIG_RPCSEC_GSS_KRB5 is not set
784# CONFIG_RPCSEC_GSS_SPKM3 is not set 800# CONFIG_RPCSEC_GSS_SPKM3 is not set
785# CONFIG_SMB_FS is not set 801# CONFIG_SMB_FS is not set
@@ -800,7 +816,6 @@ CONFIG_MSDOS_PARTITION=y
800# Library routines 816# Library routines
801# 817#
802CONFIG_BITREVERSE=y 818CONFIG_BITREVERSE=y
803# CONFIG_GENERIC_FIND_FIRST_BIT is not set
804# CONFIG_CRC_CCITT is not set 819# CONFIG_CRC_CCITT is not set
805# CONFIG_CRC16 is not set 820# CONFIG_CRC16 is not set
806# CONFIG_CRC_T10DIF is not set 821# CONFIG_CRC_T10DIF is not set
@@ -853,14 +868,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
853# CONFIG_DEBUG_SG is not set 868# CONFIG_DEBUG_SG is not set
854# CONFIG_BOOT_PRINTK_DELAY is not set 869# CONFIG_BOOT_PRINTK_DELAY is not set
855# CONFIG_RCU_TORTURE_TEST is not set 870# CONFIG_RCU_TORTURE_TEST is not set
871# CONFIG_RCU_CPU_STALL_DETECTOR is not set
856# CONFIG_BACKTRACE_SELF_TEST is not set 872# CONFIG_BACKTRACE_SELF_TEST is not set
873# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
857# CONFIG_FAULT_INJECTION is not set 874# CONFIG_FAULT_INJECTION is not set
858# CONFIG_LATENCYTOP is not set 875# CONFIG_LATENCYTOP is not set
876CONFIG_SYSCTL_SYSCALL_CHECK=y
877CONFIG_NOP_TRACER=y
859CONFIG_HAVE_FTRACE=y 878CONFIG_HAVE_FTRACE=y
860CONFIG_HAVE_DYNAMIC_FTRACE=y 879CONFIG_HAVE_DYNAMIC_FTRACE=y
861# CONFIG_FTRACE is not set 880# CONFIG_FTRACE is not set
862# CONFIG_SCHED_TRACER is not set 881# CONFIG_SCHED_TRACER is not set
863# CONFIG_CONTEXT_SWITCH_TRACER is not set 882# CONFIG_CONTEXT_SWITCH_TRACER is not set
883# CONFIG_BOOT_TRACER is not set
884# CONFIG_STACK_TRACER is not set
885# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
864# CONFIG_SAMPLES is not set 886# CONFIG_SAMPLES is not set
865CONFIG_HAVE_ARCH_KGDB=y 887CONFIG_HAVE_ARCH_KGDB=y
866# CONFIG_KGDB is not set 888# CONFIG_KGDB is not set
@@ -869,6 +891,7 @@ CONFIG_HAVE_ARCH_KGDB=y
869# CONFIG_DEBUG_PAGEALLOC is not set 891# CONFIG_DEBUG_PAGEALLOC is not set
870# CONFIG_CODE_PATCHING_SELFTEST is not set 892# CONFIG_CODE_PATCHING_SELFTEST is not set
871# CONFIG_FTR_FIXUP_SELFTEST is not set 893# CONFIG_FTR_FIXUP_SELFTEST is not set
894# CONFIG_MSI_BITMAP_SELFTEST is not set
872# CONFIG_XMON is not set 895# CONFIG_XMON is not set
873# CONFIG_IRQSTACKS is not set 896# CONFIG_IRQSTACKS is not set
874# CONFIG_VIRQ_DEBUG is not set 897# CONFIG_VIRQ_DEBUG is not set
@@ -880,14 +903,19 @@ CONFIG_HAVE_ARCH_KGDB=y
880# 903#
881# CONFIG_KEYS is not set 904# CONFIG_KEYS is not set
882# CONFIG_SECURITY is not set 905# CONFIG_SECURITY is not set
906# CONFIG_SECURITYFS is not set
883# CONFIG_SECURITY_FILE_CAPABILITIES is not set 907# CONFIG_SECURITY_FILE_CAPABILITIES is not set
884CONFIG_CRYPTO=y 908CONFIG_CRYPTO=y
885 909
886# 910#
887# Crypto core or helper 911# Crypto core or helper
888# 912#
913# CONFIG_CRYPTO_FIPS is not set
889CONFIG_CRYPTO_ALGAPI=y 914CONFIG_CRYPTO_ALGAPI=y
915CONFIG_CRYPTO_AEAD=y
890CONFIG_CRYPTO_BLKCIPHER=y 916CONFIG_CRYPTO_BLKCIPHER=y
917CONFIG_CRYPTO_HASH=y
918CONFIG_CRYPTO_RNG=y
891CONFIG_CRYPTO_MANAGER=y 919CONFIG_CRYPTO_MANAGER=y
892# CONFIG_CRYPTO_GF128MUL is not set 920# CONFIG_CRYPTO_GF128MUL is not set
893# CONFIG_CRYPTO_NULL is not set 921# CONFIG_CRYPTO_NULL is not set
@@ -960,6 +988,11 @@ CONFIG_CRYPTO_DES=y
960# 988#
961# CONFIG_CRYPTO_DEFLATE is not set 989# CONFIG_CRYPTO_DEFLATE is not set
962# CONFIG_CRYPTO_LZO is not set 990# CONFIG_CRYPTO_LZO is not set
991
992#
993# Random Number Generation
994#
995# CONFIG_CRYPTO_ANSI_CPRNG is not set
963CONFIG_CRYPTO_HW=y 996CONFIG_CRYPTO_HW=y
964# CONFIG_CRYPTO_DEV_HIFN_795X is not set 997# CONFIG_CRYPTO_DEV_HIFN_795X is not set
965# CONFIG_PPC_CLOCK is not set 998# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig
index 70f46078eb6a..082158d591c5 100644
--- a/arch/powerpc/configs/44x/arches_defconfig
+++ b/arch/powerpc/configs/44x/arches_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc5 3# Linux kernel version: 2.6.28-rc2
4# Wed Oct 1 15:54:57 2008 4# Tue Oct 28 09:16:04 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -103,7 +103,9 @@ CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
104CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
105CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
106CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
107CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
108# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
109CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -117,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
117CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
118CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
119CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
120# CONFIG_HAVE_DMA_ATTRS is not set
121# CONFIG_USE_GENERIC_SMP_HELPERS is not set
122# CONFIG_HAVE_CLK is not set
123CONFIG_PROC_PAGE_MONITOR=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -153,6 +151,7 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
156CONFIG_PPC4xx_PCI_EXPRESS=y 155CONFIG_PPC4xx_PCI_EXPRESS=y
157 156
158# 157#
@@ -175,6 +174,7 @@ CONFIG_ARCHES=y
175# CONFIG_YOSEMITE is not set 174# CONFIG_YOSEMITE is not set
176# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 175# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
177CONFIG_PPC44x_SIMPLE=y 176CONFIG_PPC44x_SIMPLE=y
177# CONFIG_PPC4xx_GPIO is not set
178CONFIG_460EX=y 178CONFIG_460EX=y
179# CONFIG_IPIC is not set 179# CONFIG_IPIC is not set
180# CONFIG_MPIC is not set 180# CONFIG_MPIC is not set
@@ -207,6 +207,8 @@ CONFIG_PREEMPT_NONE=y
207# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
208# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
209CONFIG_BINFMT_ELF=y 209CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set
210# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
211# CONFIG_MATH_EMULATION is not set 213# CONFIG_MATH_EMULATION is not set
212# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
@@ -221,15 +223,15 @@ CONFIG_FLATMEM_MANUAL=y
221# CONFIG_SPARSEMEM_MANUAL is not set 223# CONFIG_SPARSEMEM_MANUAL is not set
222CONFIG_FLATMEM=y 224CONFIG_FLATMEM=y
223CONFIG_FLAT_NODE_MEM_MAP=y 225CONFIG_FLAT_NODE_MEM_MAP=y
224# CONFIG_SPARSEMEM_STATIC is not set
225# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
226CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y 229CONFIG_RESOURCES_64BIT=y
230CONFIG_PHYS_ADDR_T_64BIT=y
230CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
231CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
232CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y
233CONFIG_FORCE_MAX_ZONEORDER=11 235CONFIG_FORCE_MAX_ZONEORDER=11
234CONFIG_PROC_DEVICETREE=y 236CONFIG_PROC_DEVICETREE=y
235CONFIG_CMDLINE_BOOL=y 237CONFIG_CMDLINE_BOOL=y
@@ -316,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# CONFIG_TIPC is not set 318# CONFIG_TIPC is not set
317# CONFIG_ATM is not set 319# CONFIG_ATM is not set
318# CONFIG_BRIDGE is not set 320# CONFIG_BRIDGE is not set
321# CONFIG_NET_DSA is not set
319# CONFIG_VLAN_8021Q is not set 322# CONFIG_VLAN_8021Q is not set
320# CONFIG_DECNET is not set 323# CONFIG_DECNET is not set
321# CONFIG_LLC2 is not set 324# CONFIG_LLC2 is not set
@@ -336,14 +339,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
336# CONFIG_IRDA is not set 339# CONFIG_IRDA is not set
337# CONFIG_BT is not set 340# CONFIG_BT is not set
338# CONFIG_AF_RXRPC is not set 341# CONFIG_AF_RXRPC is not set
339 342# CONFIG_PHONET is not set
340# 343# CONFIG_WIRELESS is not set
341# Wireless
342#
343# CONFIG_CFG80211 is not set
344# CONFIG_WIRELESS_EXT is not set
345# CONFIG_MAC80211 is not set
346# CONFIG_IEEE80211 is not set
347# CONFIG_RFKILL is not set 344# CONFIG_RFKILL is not set
348# CONFIG_NET_9P is not set 345# CONFIG_NET_9P is not set
349 346
@@ -440,8 +437,12 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
440# CONFIG_IBM_NEW_EMAC_RGMII is not set 437# CONFIG_IBM_NEW_EMAC_RGMII is not set
441CONFIG_IBM_NEW_EMAC_TAH=y 438CONFIG_IBM_NEW_EMAC_TAH=y
442CONFIG_IBM_NEW_EMAC_EMAC4=y 439CONFIG_IBM_NEW_EMAC_EMAC4=y
440# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
441# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
442# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
443# CONFIG_NET_PCI is not set 443# CONFIG_NET_PCI is not set
444# CONFIG_B44 is not set 444# CONFIG_B44 is not set
445# CONFIG_ATL2 is not set
445# CONFIG_NETDEV_1000 is not set 446# CONFIG_NETDEV_1000 is not set
446# CONFIG_NETDEV_10000 is not set 447# CONFIG_NETDEV_10000 is not set
447# CONFIG_TR is not set 448# CONFIG_TR is not set
@@ -540,6 +541,7 @@ CONFIG_SSB_POSSIBLE=y
540# CONFIG_MFD_SM501 is not set 541# CONFIG_MFD_SM501 is not set
541# CONFIG_HTC_PASIC3 is not set 542# CONFIG_HTC_PASIC3 is not set
542# CONFIG_MFD_TMIO is not set 543# CONFIG_MFD_TMIO is not set
544# CONFIG_MFD_WM8400 is not set
543 545
544# 546#
545# Multimedia devices 547# Multimedia devices
@@ -573,6 +575,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
573# CONFIG_DISPLAY_SUPPORT is not set 575# CONFIG_DISPLAY_SUPPORT is not set
574# CONFIG_SOUND is not set 576# CONFIG_SOUND is not set
575# CONFIG_USB_SUPPORT is not set 577# CONFIG_USB_SUPPORT is not set
578# CONFIG_UWB is not set
576# CONFIG_MMC is not set 579# CONFIG_MMC is not set
577# CONFIG_MEMSTICK is not set 580# CONFIG_MEMSTICK is not set
578# CONFIG_NEW_LEDS is not set 581# CONFIG_NEW_LEDS is not set
@@ -582,6 +585,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
582# CONFIG_RTC_CLASS is not set 585# CONFIG_RTC_CLASS is not set
583# CONFIG_DMADEVICES is not set 586# CONFIG_DMADEVICES is not set
584# CONFIG_UIO is not set 587# CONFIG_UIO is not set
588# CONFIG_STAGING is not set
585 589
586# 590#
587# File systems 591# File systems
@@ -590,10 +594,11 @@ CONFIG_EXT2_FS=y
590# CONFIG_EXT2_FS_XATTR is not set 594# CONFIG_EXT2_FS_XATTR is not set
591# CONFIG_EXT2_FS_XIP is not set 595# CONFIG_EXT2_FS_XIP is not set
592# CONFIG_EXT3_FS is not set 596# CONFIG_EXT3_FS is not set
593# CONFIG_EXT4DEV_FS is not set 597# CONFIG_EXT4_FS is not set
594# CONFIG_REISERFS_FS is not set 598# CONFIG_REISERFS_FS is not set
595# CONFIG_JFS_FS is not set 599# CONFIG_JFS_FS is not set
596# CONFIG_FS_POSIX_ACL is not set 600# CONFIG_FS_POSIX_ACL is not set
601CONFIG_FILE_LOCKING=y
597# CONFIG_XFS_FS is not set 602# CONFIG_XFS_FS is not set
598# CONFIG_OCFS2_FS is not set 603# CONFIG_OCFS2_FS is not set
599CONFIG_DNOTIFY=y 604CONFIG_DNOTIFY=y
@@ -623,6 +628,7 @@ CONFIG_INOTIFY_USER=y
623CONFIG_PROC_FS=y 628CONFIG_PROC_FS=y
624CONFIG_PROC_KCORE=y 629CONFIG_PROC_KCORE=y
625CONFIG_PROC_SYSCTL=y 630CONFIG_PROC_SYSCTL=y
631CONFIG_PROC_PAGE_MONITOR=y
626CONFIG_SYSFS=y 632CONFIG_SYSFS=y
627CONFIG_TMPFS=y 633CONFIG_TMPFS=y
628# CONFIG_TMPFS_POSIX_ACL is not set 634# CONFIG_TMPFS_POSIX_ACL is not set
@@ -659,6 +665,7 @@ CONFIG_LOCKD=y
659CONFIG_LOCKD_V4=y 665CONFIG_LOCKD_V4=y
660CONFIG_NFS_COMMON=y 666CONFIG_NFS_COMMON=y
661CONFIG_SUNRPC=y 667CONFIG_SUNRPC=y
668# CONFIG_SUNRPC_REGISTER_V4 is not set
662# CONFIG_RPCSEC_GSS_KRB5 is not set 669# CONFIG_RPCSEC_GSS_KRB5 is not set
663# CONFIG_RPCSEC_GSS_SPKM3 is not set 670# CONFIG_RPCSEC_GSS_SPKM3 is not set
664# CONFIG_SMB_FS is not set 671# CONFIG_SMB_FS is not set
@@ -679,7 +686,6 @@ CONFIG_MSDOS_PARTITION=y
679# Library routines 686# Library routines
680# 687#
681CONFIG_BITREVERSE=y 688CONFIG_BITREVERSE=y
682# CONFIG_GENERIC_FIND_FIRST_BIT is not set
683# CONFIG_CRC_CCITT is not set 689# CONFIG_CRC_CCITT is not set
684# CONFIG_CRC16 is not set 690# CONFIG_CRC16 is not set
685# CONFIG_CRC_T10DIF is not set 691# CONFIG_CRC_T10DIF is not set
@@ -732,15 +738,21 @@ CONFIG_SCHED_DEBUG=y
732# CONFIG_DEBUG_SG is not set 738# CONFIG_DEBUG_SG is not set
733# CONFIG_BOOT_PRINTK_DELAY is not set 739# CONFIG_BOOT_PRINTK_DELAY is not set
734# CONFIG_RCU_TORTURE_TEST is not set 740# CONFIG_RCU_TORTURE_TEST is not set
741# CONFIG_RCU_CPU_STALL_DETECTOR is not set
735# CONFIG_BACKTRACE_SELF_TEST is not set 742# CONFIG_BACKTRACE_SELF_TEST is not set
743# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
736# CONFIG_FAULT_INJECTION is not set 744# CONFIG_FAULT_INJECTION is not set
737# CONFIG_LATENCYTOP is not set 745# CONFIG_LATENCYTOP is not set
738CONFIG_SYSCTL_SYSCALL_CHECK=y 746CONFIG_SYSCTL_SYSCALL_CHECK=y
747CONFIG_NOP_TRACER=y
739CONFIG_HAVE_FTRACE=y 748CONFIG_HAVE_FTRACE=y
740CONFIG_HAVE_DYNAMIC_FTRACE=y 749CONFIG_HAVE_DYNAMIC_FTRACE=y
741# CONFIG_FTRACE is not set 750# CONFIG_FTRACE is not set
742# CONFIG_SCHED_TRACER is not set 751# CONFIG_SCHED_TRACER is not set
743# CONFIG_CONTEXT_SWITCH_TRACER is not set 752# CONFIG_CONTEXT_SWITCH_TRACER is not set
753# CONFIG_BOOT_TRACER is not set
754# CONFIG_STACK_TRACER is not set
755# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
744# CONFIG_SAMPLES is not set 756# CONFIG_SAMPLES is not set
745CONFIG_HAVE_ARCH_KGDB=y 757CONFIG_HAVE_ARCH_KGDB=y
746# CONFIG_KGDB is not set 758# CONFIG_KGDB is not set
@@ -761,6 +773,7 @@ CONFIG_HAVE_ARCH_KGDB=y
761# 773#
762# CONFIG_KEYS is not set 774# CONFIG_KEYS is not set
763# CONFIG_SECURITY is not set 775# CONFIG_SECURITY is not set
776# CONFIG_SECURITYFS is not set
764# CONFIG_SECURITY_FILE_CAPABILITIES is not set 777# CONFIG_SECURITY_FILE_CAPABILITIES is not set
765# CONFIG_CRYPTO is not set 778# CONFIG_CRYPTO is not set
766# CONFIG_PPC_CLOCK is not set 779# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig
index e920693535af..f47c2f3420f6 100644
--- a/arch/powerpc/configs/44x/bamboo_defconfig
+++ b/arch/powerpc/configs/44x/bamboo_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 08:43:44 2008 4# Tue Oct 28 09:16:06 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""
92CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
93CONFIG_EMBEDDED=y 92CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 93CONFIG_SYSCTL_SYSCALL=y
95CONFIG_SYSCTL_SYSCALL_CHECK=y
96CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
97# CONFIG_KALLSYMS_ALL is not set 95# CONFIG_KALLSYMS_ALL is not set
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -109,7 +107,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
115CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -159,6 +155,7 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
162# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
163 160
164# 161#
@@ -175,9 +172,13 @@ CONFIG_BAMBOO=y
175# CONFIG_KATMAI is not set 172# CONFIG_KATMAI is not set
176# CONFIG_RAINIER is not set 173# CONFIG_RAINIER is not set
177# CONFIG_WARP is not set 174# CONFIG_WARP is not set
175# CONFIG_ARCHES is not set
178# CONFIG_CANYONLANDS is not set 176# CONFIG_CANYONLANDS is not set
177# CONFIG_GLACIER is not set
179# CONFIG_YOSEMITE is not set 178# CONFIG_YOSEMITE is not set
180# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
180CONFIG_PPC44x_SIMPLE=y
181# CONFIG_PPC4xx_GPIO is not set
181CONFIG_440EP=y 182CONFIG_440EP=y
182CONFIG_IBM440EP_ERR42=y 183CONFIG_IBM440EP_ERR42=y
183# CONFIG_IPIC is not set 184# CONFIG_IPIC is not set
@@ -197,7 +198,6 @@ CONFIG_IBM440EP_ERR42=y
197# Kernel options 198# Kernel options
198# 199#
199# CONFIG_HIGHMEM is not set 200# CONFIG_HIGHMEM is not set
200# CONFIG_TICK_ONESHOT is not set
201# CONFIG_NO_HZ is not set 201# CONFIG_NO_HZ is not set
202# CONFIG_HIGH_RES_TIMERS is not set 202# CONFIG_HIGH_RES_TIMERS is not set
203CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 203CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -211,6 +211,8 @@ CONFIG_PREEMPT_NONE=y
211# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
212# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
213CONFIG_BINFMT_ELF=y 213CONFIG_BINFMT_ELF=y
214# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
215# CONFIG_HAVE_AOUT is not set
214# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
215# CONFIG_MATH_EMULATION is not set 217# CONFIG_MATH_EMULATION is not set
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
@@ -225,15 +227,15 @@ CONFIG_FLATMEM_MANUAL=y
225# CONFIG_SPARSEMEM_MANUAL is not set 227# CONFIG_SPARSEMEM_MANUAL is not set
226CONFIG_FLATMEM=y 228CONFIG_FLATMEM=y
227CONFIG_FLAT_NODE_MEM_MAP=y 229CONFIG_FLAT_NODE_MEM_MAP=y
228# CONFIG_SPARSEMEM_STATIC is not set
229# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
230CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y 233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y
234CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y
237CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 241CONFIG_CMDLINE_BOOL=y
@@ -320,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
320# CONFIG_TIPC is not set 322# CONFIG_TIPC is not set
321# CONFIG_ATM is not set 323# CONFIG_ATM is not set
322# CONFIG_BRIDGE is not set 324# CONFIG_BRIDGE is not set
325# CONFIG_NET_DSA is not set
323# CONFIG_VLAN_8021Q is not set 326# CONFIG_VLAN_8021Q is not set
324# CONFIG_DECNET is not set 327# CONFIG_DECNET is not set
325# CONFIG_LLC2 is not set 328# CONFIG_LLC2 is not set
@@ -340,14 +343,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_IRDA is not set 343# CONFIG_IRDA is not set
341# CONFIG_BT is not set 344# CONFIG_BT is not set
342# CONFIG_AF_RXRPC is not set 345# CONFIG_AF_RXRPC is not set
343 346# CONFIG_PHONET is not set
344# 347# CONFIG_WIRELESS is not set
345# Wireless
346#
347# CONFIG_CFG80211 is not set
348# CONFIG_WIRELESS_EXT is not set
349# CONFIG_MAC80211 is not set
350# CONFIG_IEEE80211 is not set
351# CONFIG_RFKILL is not set 348# CONFIG_RFKILL is not set
352# CONFIG_NET_9P is not set 349# CONFIG_NET_9P is not set
353 350
@@ -450,8 +447,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
450# CONFIG_IBM_NEW_EMAC_RGMII is not set 447# CONFIG_IBM_NEW_EMAC_RGMII is not set
451# CONFIG_IBM_NEW_EMAC_TAH is not set 448# CONFIG_IBM_NEW_EMAC_TAH is not set
452# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 449# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
450# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
451# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
452# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
453# CONFIG_NET_PCI is not set 453# CONFIG_NET_PCI is not set
454# CONFIG_B44 is not set 454# CONFIG_B44 is not set
455# CONFIG_ATL2 is not set
455CONFIG_NETDEV_1000=y 456CONFIG_NETDEV_1000=y
456# CONFIG_ACENIC is not set 457# CONFIG_ACENIC is not set
457# CONFIG_DL2K is not set 458# CONFIG_DL2K is not set
@@ -472,18 +473,22 @@ CONFIG_NETDEV_1000=y
472# CONFIG_QLA3XXX is not set 473# CONFIG_QLA3XXX is not set
473# CONFIG_ATL1 is not set 474# CONFIG_ATL1 is not set
474# CONFIG_ATL1E is not set 475# CONFIG_ATL1E is not set
476# CONFIG_JME is not set
475CONFIG_NETDEV_10000=y 477CONFIG_NETDEV_10000=y
476# CONFIG_CHELSIO_T1 is not set 478# CONFIG_CHELSIO_T1 is not set
477# CONFIG_CHELSIO_T3 is not set 479# CONFIG_CHELSIO_T3 is not set
480# CONFIG_ENIC is not set
478# CONFIG_IXGBE is not set 481# CONFIG_IXGBE is not set
479# CONFIG_IXGB is not set 482# CONFIG_IXGB is not set
480# CONFIG_S2IO is not set 483# CONFIG_S2IO is not set
481# CONFIG_MYRI10GE is not set 484# CONFIG_MYRI10GE is not set
482# CONFIG_NETXEN_NIC is not set 485# CONFIG_NETXEN_NIC is not set
483# CONFIG_NIU is not set 486# CONFIG_NIU is not set
487# CONFIG_MLX4_EN is not set
484# CONFIG_MLX4_CORE is not set 488# CONFIG_MLX4_CORE is not set
485# CONFIG_TEHUTI is not set 489# CONFIG_TEHUTI is not set
486# CONFIG_BNX2X is not set 490# CONFIG_BNX2X is not set
491# CONFIG_QLGE is not set
487# CONFIG_SFC is not set 492# CONFIG_SFC is not set
488# CONFIG_TR is not set 493# CONFIG_TR is not set
489 494
@@ -579,6 +584,8 @@ CONFIG_SSB_POSSIBLE=y
579# CONFIG_MFD_CORE is not set 584# CONFIG_MFD_CORE is not set
580# CONFIG_MFD_SM501 is not set 585# CONFIG_MFD_SM501 is not set
581# CONFIG_HTC_PASIC3 is not set 586# CONFIG_HTC_PASIC3 is not set
587# CONFIG_MFD_TMIO is not set
588# CONFIG_MFD_WM8400 is not set
582 589
583# 590#
584# Multimedia devices 591# Multimedia devices
@@ -620,9 +627,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
620# CONFIG_USB_OTG_BLACKLIST_HUB is not set 627# CONFIG_USB_OTG_BLACKLIST_HUB is not set
621 628
622# 629#
630# Enable Host or Gadget support to see Inventra options
631#
632
633#
623# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 634# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
624# 635#
625# CONFIG_USB_GADGET is not set 636# CONFIG_USB_GADGET is not set
637# CONFIG_UWB is not set
626# CONFIG_MMC is not set 638# CONFIG_MMC is not set
627# CONFIG_MEMSTICK is not set 639# CONFIG_MEMSTICK is not set
628# CONFIG_NEW_LEDS is not set 640# CONFIG_NEW_LEDS is not set
@@ -632,6 +644,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
632# CONFIG_RTC_CLASS is not set 644# CONFIG_RTC_CLASS is not set
633# CONFIG_DMADEVICES is not set 645# CONFIG_DMADEVICES is not set
634# CONFIG_UIO is not set 646# CONFIG_UIO is not set
647# CONFIG_STAGING is not set
635 648
636# 649#
637# File systems 650# File systems
@@ -640,10 +653,11 @@ CONFIG_EXT2_FS=y
640# CONFIG_EXT2_FS_XATTR is not set 653# CONFIG_EXT2_FS_XATTR is not set
641# CONFIG_EXT2_FS_XIP is not set 654# CONFIG_EXT2_FS_XIP is not set
642# CONFIG_EXT3_FS is not set 655# CONFIG_EXT3_FS is not set
643# CONFIG_EXT4DEV_FS is not set 656# CONFIG_EXT4_FS is not set
644# CONFIG_REISERFS_FS is not set 657# CONFIG_REISERFS_FS is not set
645# CONFIG_JFS_FS is not set 658# CONFIG_JFS_FS is not set
646# CONFIG_FS_POSIX_ACL is not set 659# CONFIG_FS_POSIX_ACL is not set
660CONFIG_FILE_LOCKING=y
647# CONFIG_XFS_FS is not set 661# CONFIG_XFS_FS is not set
648# CONFIG_OCFS2_FS is not set 662# CONFIG_OCFS2_FS is not set
649CONFIG_DNOTIFY=y 663CONFIG_DNOTIFY=y
@@ -673,6 +687,7 @@ CONFIG_INOTIFY_USER=y
673CONFIG_PROC_FS=y 687CONFIG_PROC_FS=y
674CONFIG_PROC_KCORE=y 688CONFIG_PROC_KCORE=y
675CONFIG_PROC_SYSCTL=y 689CONFIG_PROC_SYSCTL=y
690CONFIG_PROC_PAGE_MONITOR=y
676CONFIG_SYSFS=y 691CONFIG_SYSFS=y
677CONFIG_TMPFS=y 692CONFIG_TMPFS=y
678# CONFIG_TMPFS_POSIX_ACL is not set 693# CONFIG_TMPFS_POSIX_ACL is not set
@@ -709,6 +724,7 @@ CONFIG_LOCKD=y
709CONFIG_LOCKD_V4=y 724CONFIG_LOCKD_V4=y
710CONFIG_NFS_COMMON=y 725CONFIG_NFS_COMMON=y
711CONFIG_SUNRPC=y 726CONFIG_SUNRPC=y
727# CONFIG_SUNRPC_REGISTER_V4 is not set
712# CONFIG_RPCSEC_GSS_KRB5 is not set 728# CONFIG_RPCSEC_GSS_KRB5 is not set
713# CONFIG_RPCSEC_GSS_SPKM3 is not set 729# CONFIG_RPCSEC_GSS_SPKM3 is not set
714# CONFIG_SMB_FS is not set 730# CONFIG_SMB_FS is not set
@@ -729,7 +745,6 @@ CONFIG_MSDOS_PARTITION=y
729# Library routines 745# Library routines
730# 746#
731CONFIG_BITREVERSE=y 747CONFIG_BITREVERSE=y
732# CONFIG_GENERIC_FIND_FIRST_BIT is not set
733# CONFIG_CRC_CCITT is not set 748# CONFIG_CRC_CCITT is not set
734# CONFIG_CRC16 is not set 749# CONFIG_CRC16 is not set
735# CONFIG_CRC_T10DIF is not set 750# CONFIG_CRC_T10DIF is not set
@@ -782,14 +797,21 @@ CONFIG_SCHED_DEBUG=y
782# CONFIG_DEBUG_SG is not set 797# CONFIG_DEBUG_SG is not set
783# CONFIG_BOOT_PRINTK_DELAY is not set 798# CONFIG_BOOT_PRINTK_DELAY is not set
784# CONFIG_RCU_TORTURE_TEST is not set 799# CONFIG_RCU_TORTURE_TEST is not set
800# CONFIG_RCU_CPU_STALL_DETECTOR is not set
785# CONFIG_BACKTRACE_SELF_TEST is not set 801# CONFIG_BACKTRACE_SELF_TEST is not set
802# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
786# CONFIG_FAULT_INJECTION is not set 803# CONFIG_FAULT_INJECTION is not set
787# CONFIG_LATENCYTOP is not set 804# CONFIG_LATENCYTOP is not set
805CONFIG_SYSCTL_SYSCALL_CHECK=y
806CONFIG_NOP_TRACER=y
788CONFIG_HAVE_FTRACE=y 807CONFIG_HAVE_FTRACE=y
789CONFIG_HAVE_DYNAMIC_FTRACE=y 808CONFIG_HAVE_DYNAMIC_FTRACE=y
790# CONFIG_FTRACE is not set 809# CONFIG_FTRACE is not set
791# CONFIG_SCHED_TRACER is not set 810# CONFIG_SCHED_TRACER is not set
792# CONFIG_CONTEXT_SWITCH_TRACER is not set 811# CONFIG_CONTEXT_SWITCH_TRACER is not set
812# CONFIG_BOOT_TRACER is not set
813# CONFIG_STACK_TRACER is not set
814# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
793# CONFIG_SAMPLES is not set 815# CONFIG_SAMPLES is not set
794CONFIG_HAVE_ARCH_KGDB=y 816CONFIG_HAVE_ARCH_KGDB=y
795# CONFIG_KGDB is not set 817# CONFIG_KGDB is not set
@@ -798,6 +820,7 @@ CONFIG_HAVE_ARCH_KGDB=y
798# CONFIG_DEBUG_PAGEALLOC is not set 820# CONFIG_DEBUG_PAGEALLOC is not set
799# CONFIG_CODE_PATCHING_SELFTEST is not set 821# CONFIG_CODE_PATCHING_SELFTEST is not set
800# CONFIG_FTR_FIXUP_SELFTEST is not set 822# CONFIG_FTR_FIXUP_SELFTEST is not set
823# CONFIG_MSI_BITMAP_SELFTEST is not set
801# CONFIG_XMON is not set 824# CONFIG_XMON is not set
802# CONFIG_IRQSTACKS is not set 825# CONFIG_IRQSTACKS is not set
803# CONFIG_VIRQ_DEBUG is not set 826# CONFIG_VIRQ_DEBUG is not set
@@ -809,14 +832,19 @@ CONFIG_HAVE_ARCH_KGDB=y
809# 832#
810# CONFIG_KEYS is not set 833# CONFIG_KEYS is not set
811# CONFIG_SECURITY is not set 834# CONFIG_SECURITY is not set
835# CONFIG_SECURITYFS is not set
812# CONFIG_SECURITY_FILE_CAPABILITIES is not set 836# CONFIG_SECURITY_FILE_CAPABILITIES is not set
813CONFIG_CRYPTO=y 837CONFIG_CRYPTO=y
814 838
815# 839#
816# Crypto core or helper 840# Crypto core or helper
817# 841#
842# CONFIG_CRYPTO_FIPS is not set
818CONFIG_CRYPTO_ALGAPI=y 843CONFIG_CRYPTO_ALGAPI=y
844CONFIG_CRYPTO_AEAD=y
819CONFIG_CRYPTO_BLKCIPHER=y 845CONFIG_CRYPTO_BLKCIPHER=y
846CONFIG_CRYPTO_HASH=y
847CONFIG_CRYPTO_RNG=y
820CONFIG_CRYPTO_MANAGER=y 848CONFIG_CRYPTO_MANAGER=y
821# CONFIG_CRYPTO_GF128MUL is not set 849# CONFIG_CRYPTO_GF128MUL is not set
822# CONFIG_CRYPTO_NULL is not set 850# CONFIG_CRYPTO_NULL is not set
@@ -889,6 +917,11 @@ CONFIG_CRYPTO_DES=y
889# 917#
890# CONFIG_CRYPTO_DEFLATE is not set 918# CONFIG_CRYPTO_DEFLATE is not set
891# CONFIG_CRYPTO_LZO is not set 919# CONFIG_CRYPTO_LZO is not set
920
921#
922# Random Number Generation
923#
924# CONFIG_CRYPTO_ANSI_CPRNG is not set
892CONFIG_CRYPTO_HW=y 925CONFIG_CRYPTO_HW=y
893# CONFIG_CRYPTO_DEV_HIFN_795X is not set 926# CONFIG_CRYPTO_DEV_HIFN_795X is not set
894# CONFIG_PPC_CLOCK is not set 927# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig
index 74da5c7754a4..0694756ac759 100644
--- a/arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/arch/powerpc/configs/44x/canyonlands_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 08:46:14 2008 4# Tue Oct 28 09:16:08 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE=""
88CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
89CONFIG_EMBEDDED=y 88CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
93# CONFIG_KALLSYMS_ALL is not set 91# CONFIG_KALLSYMS_ALL is not set
94# CONFIG_KALLSYMS_EXTRA_PASS is not set 92# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
111CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124# CONFIG_HAVE_CLK is not set
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -155,6 +151,7 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
158CONFIG_PPC4xx_PCI_EXPRESS=y 155CONFIG_PPC4xx_PCI_EXPRESS=y
159 156
160# 157#
@@ -171,9 +168,13 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
171# CONFIG_KATMAI is not set 168# CONFIG_KATMAI is not set
172# CONFIG_RAINIER is not set 169# CONFIG_RAINIER is not set
173# CONFIG_WARP is not set 170# CONFIG_WARP is not set
171# CONFIG_ARCHES is not set
174CONFIG_CANYONLANDS=y 172CONFIG_CANYONLANDS=y
173# CONFIG_GLACIER is not set
175# CONFIG_YOSEMITE is not set 174# CONFIG_YOSEMITE is not set
176# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 175# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
176CONFIG_PPC44x_SIMPLE=y
177# CONFIG_PPC4xx_GPIO is not set
177CONFIG_460EX=y 178CONFIG_460EX=y
178# CONFIG_IPIC is not set 179# CONFIG_IPIC is not set
179# CONFIG_MPIC is not set 180# CONFIG_MPIC is not set
@@ -201,11 +202,13 @@ CONFIG_HZ_250=y
201# CONFIG_HZ_300 is not set 202# CONFIG_HZ_300 is not set
202# CONFIG_HZ_1000 is not set 203# CONFIG_HZ_1000 is not set
203CONFIG_HZ=250 204CONFIG_HZ=250
204# CONFIG_SCHED_HRTICK is not set 205CONFIG_SCHED_HRTICK=y
205CONFIG_PREEMPT_NONE=y 206CONFIG_PREEMPT_NONE=y
206# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
207# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
208CONFIG_BINFMT_ELF=y 209CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set
209# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
210# CONFIG_MATH_EMULATION is not set 213# CONFIG_MATH_EMULATION is not set
211# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
@@ -220,15 +223,15 @@ CONFIG_FLATMEM_MANUAL=y
220# CONFIG_SPARSEMEM_MANUAL is not set 223# CONFIG_SPARSEMEM_MANUAL is not set
221CONFIG_FLATMEM=y 224CONFIG_FLATMEM=y
222CONFIG_FLAT_NODE_MEM_MAP=y 225CONFIG_FLAT_NODE_MEM_MAP=y
223# CONFIG_SPARSEMEM_STATIC is not set
224# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
225CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
228CONFIG_RESOURCES_64BIT=y 229CONFIG_RESOURCES_64BIT=y
230CONFIG_PHYS_ADDR_T_64BIT=y
229CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
230CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
231CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y
232CONFIG_FORCE_MAX_ZONEORDER=11 235CONFIG_FORCE_MAX_ZONEORDER=11
233CONFIG_PROC_DEVICETREE=y 236CONFIG_PROC_DEVICETREE=y
234CONFIG_CMDLINE_BOOL=y 237CONFIG_CMDLINE_BOOL=y
@@ -315,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
315# CONFIG_TIPC is not set 318# CONFIG_TIPC is not set
316# CONFIG_ATM is not set 319# CONFIG_ATM is not set
317# CONFIG_BRIDGE is not set 320# CONFIG_BRIDGE is not set
321# CONFIG_NET_DSA is not set
318# CONFIG_VLAN_8021Q is not set 322# CONFIG_VLAN_8021Q is not set
319# CONFIG_DECNET is not set 323# CONFIG_DECNET is not set
320# CONFIG_LLC2 is not set 324# CONFIG_LLC2 is not set
@@ -335,14 +339,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
335# CONFIG_IRDA is not set 339# CONFIG_IRDA is not set
336# CONFIG_BT is not set 340# CONFIG_BT is not set
337# CONFIG_AF_RXRPC is not set 341# CONFIG_AF_RXRPC is not set
338 342# CONFIG_PHONET is not set
339# 343# CONFIG_WIRELESS is not set
340# Wireless
341#
342# CONFIG_CFG80211 is not set
343# CONFIG_WIRELESS_EXT is not set
344# CONFIG_MAC80211 is not set
345# CONFIG_IEEE80211 is not set
346# CONFIG_RFKILL is not set 344# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 345# CONFIG_NET_9P is not set
348 346
@@ -439,8 +437,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
439CONFIG_IBM_NEW_EMAC_RGMII=y 437CONFIG_IBM_NEW_EMAC_RGMII=y
440CONFIG_IBM_NEW_EMAC_TAH=y 438CONFIG_IBM_NEW_EMAC_TAH=y
441CONFIG_IBM_NEW_EMAC_EMAC4=y 439CONFIG_IBM_NEW_EMAC_EMAC4=y
440# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
441# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
442# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
442# CONFIG_NET_PCI is not set 443# CONFIG_NET_PCI is not set
443# CONFIG_B44 is not set 444# CONFIG_B44 is not set
445# CONFIG_ATL2 is not set
444# CONFIG_NETDEV_1000 is not set 446# CONFIG_NETDEV_1000 is not set
445# CONFIG_NETDEV_10000 is not set 447# CONFIG_NETDEV_10000 is not set
446# CONFIG_TR is not set 448# CONFIG_TR is not set
@@ -538,6 +540,8 @@ CONFIG_SSB_POSSIBLE=y
538# CONFIG_MFD_CORE is not set 540# CONFIG_MFD_CORE is not set
539# CONFIG_MFD_SM501 is not set 541# CONFIG_MFD_SM501 is not set
540# CONFIG_HTC_PASIC3 is not set 542# CONFIG_HTC_PASIC3 is not set
543# CONFIG_MFD_TMIO is not set
544# CONFIG_MFD_WM8400 is not set
541 545
542# 546#
543# Multimedia devices 547# Multimedia devices
@@ -571,6 +575,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
571# CONFIG_DISPLAY_SUPPORT is not set 575# CONFIG_DISPLAY_SUPPORT is not set
572# CONFIG_SOUND is not set 576# CONFIG_SOUND is not set
573# CONFIG_USB_SUPPORT is not set 577# CONFIG_USB_SUPPORT is not set
578# CONFIG_UWB is not set
574# CONFIG_MMC is not set 579# CONFIG_MMC is not set
575# CONFIG_MEMSTICK is not set 580# CONFIG_MEMSTICK is not set
576# CONFIG_NEW_LEDS is not set 581# CONFIG_NEW_LEDS is not set
@@ -580,6 +585,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
580# CONFIG_RTC_CLASS is not set 585# CONFIG_RTC_CLASS is not set
581# CONFIG_DMADEVICES is not set 586# CONFIG_DMADEVICES is not set
582# CONFIG_UIO is not set 587# CONFIG_UIO is not set
588# CONFIG_STAGING is not set
583 589
584# 590#
585# File systems 591# File systems
@@ -588,10 +594,11 @@ CONFIG_EXT2_FS=y
588# CONFIG_EXT2_FS_XATTR is not set 594# CONFIG_EXT2_FS_XATTR is not set
589# CONFIG_EXT2_FS_XIP is not set 595# CONFIG_EXT2_FS_XIP is not set
590# CONFIG_EXT3_FS is not set 596# CONFIG_EXT3_FS is not set
591# CONFIG_EXT4DEV_FS is not set 597# CONFIG_EXT4_FS is not set
592# CONFIG_REISERFS_FS is not set 598# CONFIG_REISERFS_FS is not set
593# CONFIG_JFS_FS is not set 599# CONFIG_JFS_FS is not set
594# CONFIG_FS_POSIX_ACL is not set 600# CONFIG_FS_POSIX_ACL is not set
601CONFIG_FILE_LOCKING=y
595# CONFIG_XFS_FS is not set 602# CONFIG_XFS_FS is not set
596# CONFIG_OCFS2_FS is not set 603# CONFIG_OCFS2_FS is not set
597CONFIG_DNOTIFY=y 604CONFIG_DNOTIFY=y
@@ -621,6 +628,7 @@ CONFIG_INOTIFY_USER=y
621CONFIG_PROC_FS=y 628CONFIG_PROC_FS=y
622CONFIG_PROC_KCORE=y 629CONFIG_PROC_KCORE=y
623CONFIG_PROC_SYSCTL=y 630CONFIG_PROC_SYSCTL=y
631CONFIG_PROC_PAGE_MONITOR=y
624CONFIG_SYSFS=y 632CONFIG_SYSFS=y
625CONFIG_TMPFS=y 633CONFIG_TMPFS=y
626# CONFIG_TMPFS_POSIX_ACL is not set 634# CONFIG_TMPFS_POSIX_ACL is not set
@@ -657,6 +665,7 @@ CONFIG_LOCKD=y
657CONFIG_LOCKD_V4=y 665CONFIG_LOCKD_V4=y
658CONFIG_NFS_COMMON=y 666CONFIG_NFS_COMMON=y
659CONFIG_SUNRPC=y 667CONFIG_SUNRPC=y
668# CONFIG_SUNRPC_REGISTER_V4 is not set
660# CONFIG_RPCSEC_GSS_KRB5 is not set 669# CONFIG_RPCSEC_GSS_KRB5 is not set
661# CONFIG_RPCSEC_GSS_SPKM3 is not set 670# CONFIG_RPCSEC_GSS_SPKM3 is not set
662# CONFIG_SMB_FS is not set 671# CONFIG_SMB_FS is not set
@@ -677,7 +686,6 @@ CONFIG_MSDOS_PARTITION=y
677# Library routines 686# Library routines
678# 687#
679CONFIG_BITREVERSE=y 688CONFIG_BITREVERSE=y
680# CONFIG_GENERIC_FIND_FIRST_BIT is not set
681# CONFIG_CRC_CCITT is not set 689# CONFIG_CRC_CCITT is not set
682# CONFIG_CRC16 is not set 690# CONFIG_CRC16 is not set
683# CONFIG_CRC_T10DIF is not set 691# CONFIG_CRC_T10DIF is not set
@@ -730,14 +738,21 @@ CONFIG_SCHED_DEBUG=y
730# CONFIG_DEBUG_SG is not set 738# CONFIG_DEBUG_SG is not set
731# CONFIG_BOOT_PRINTK_DELAY is not set 739# CONFIG_BOOT_PRINTK_DELAY is not set
732# CONFIG_RCU_TORTURE_TEST is not set 740# CONFIG_RCU_TORTURE_TEST is not set
741# CONFIG_RCU_CPU_STALL_DETECTOR is not set
733# CONFIG_BACKTRACE_SELF_TEST is not set 742# CONFIG_BACKTRACE_SELF_TEST is not set
743# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
734# CONFIG_FAULT_INJECTION is not set 744# CONFIG_FAULT_INJECTION is not set
735# CONFIG_LATENCYTOP is not set 745# CONFIG_LATENCYTOP is not set
746CONFIG_SYSCTL_SYSCALL_CHECK=y
747CONFIG_NOP_TRACER=y
736CONFIG_HAVE_FTRACE=y 748CONFIG_HAVE_FTRACE=y
737CONFIG_HAVE_DYNAMIC_FTRACE=y 749CONFIG_HAVE_DYNAMIC_FTRACE=y
738# CONFIG_FTRACE is not set 750# CONFIG_FTRACE is not set
739# CONFIG_SCHED_TRACER is not set 751# CONFIG_SCHED_TRACER is not set
740# CONFIG_CONTEXT_SWITCH_TRACER is not set 752# CONFIG_CONTEXT_SWITCH_TRACER is not set
753# CONFIG_BOOT_TRACER is not set
754# CONFIG_STACK_TRACER is not set
755# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
741# CONFIG_SAMPLES is not set 756# CONFIG_SAMPLES is not set
742CONFIG_HAVE_ARCH_KGDB=y 757CONFIG_HAVE_ARCH_KGDB=y
743# CONFIG_KGDB is not set 758# CONFIG_KGDB is not set
@@ -746,6 +761,7 @@ CONFIG_HAVE_ARCH_KGDB=y
746# CONFIG_DEBUG_PAGEALLOC is not set 761# CONFIG_DEBUG_PAGEALLOC is not set
747# CONFIG_CODE_PATCHING_SELFTEST is not set 762# CONFIG_CODE_PATCHING_SELFTEST is not set
748# CONFIG_FTR_FIXUP_SELFTEST is not set 763# CONFIG_FTR_FIXUP_SELFTEST is not set
764# CONFIG_MSI_BITMAP_SELFTEST is not set
749# CONFIG_XMON is not set 765# CONFIG_XMON is not set
750# CONFIG_IRQSTACKS is not set 766# CONFIG_IRQSTACKS is not set
751# CONFIG_VIRQ_DEBUG is not set 767# CONFIG_VIRQ_DEBUG is not set
@@ -757,6 +773,7 @@ CONFIG_HAVE_ARCH_KGDB=y
757# 773#
758# CONFIG_KEYS is not set 774# CONFIG_KEYS is not set
759# CONFIG_SECURITY is not set 775# CONFIG_SECURITY is not set
776# CONFIG_SECURITYFS is not set
760# CONFIG_SECURITY_FILE_CAPABILITIES is not set 777# CONFIG_SECURITY_FILE_CAPABILITIES is not set
761# CONFIG_CRYPTO is not set 778# CONFIG_CRYPTO is not set
762# CONFIG_PPC_CLOCK is not set 779# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig
index 17615750b494..c9937578ef7f 100644
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:04:12 2008 4# Tue Oct 28 09:16:09 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE=""
91CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
92CONFIG_EMBEDDED=y 91CONFIG_EMBEDDED=y
93CONFIG_SYSCTL_SYSCALL=y 92CONFIG_SYSCTL_SYSCALL=y
94CONFIG_SYSCTL_SYSCALL_CHECK=y
95CONFIG_KALLSYMS=y 93CONFIG_KALLSYMS=y
96CONFIG_KALLSYMS_ALL=y 94CONFIG_KALLSYMS_ALL=y
97CONFIG_KALLSYMS_EXTRA_PASS=y 95CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -108,7 +106,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
114CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -158,6 +154,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 154# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 156CONFIG_CLASSIC_RCU=y
157# CONFIG_FREEZER is not set
161# CONFIG_PPC4xx_PCI_EXPRESS is not set 158# CONFIG_PPC4xx_PCI_EXPRESS is not set
162 159
163# 160#
@@ -174,9 +171,13 @@ CONFIG_EBONY=y
174# CONFIG_KATMAI is not set 171# CONFIG_KATMAI is not set
175# CONFIG_RAINIER is not set 172# CONFIG_RAINIER is not set
176# CONFIG_WARP is not set 173# CONFIG_WARP is not set
174# CONFIG_ARCHES is not set
177# CONFIG_CANYONLANDS is not set 175# CONFIG_CANYONLANDS is not set
176# CONFIG_GLACIER is not set
178# CONFIG_YOSEMITE is not set 177# CONFIG_YOSEMITE is not set
179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 178# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
179# CONFIG_PPC44x_SIMPLE is not set
180# CONFIG_PPC4xx_GPIO is not set
180CONFIG_440GP=y 181CONFIG_440GP=y
181# CONFIG_IPIC is not set 182# CONFIG_IPIC is not set
182# CONFIG_MPIC is not set 183# CONFIG_MPIC is not set
@@ -196,7 +197,6 @@ CONFIG_OF_RTC=y
196# Kernel options 197# Kernel options
197# 198#
198# CONFIG_HIGHMEM is not set 199# CONFIG_HIGHMEM is not set
199# CONFIG_TICK_ONESHOT is not set
200# CONFIG_NO_HZ is not set 200# CONFIG_NO_HZ is not set
201# CONFIG_HIGH_RES_TIMERS is not set 201# CONFIG_HIGH_RES_TIMERS is not set
202CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 202CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -210,6 +210,8 @@ CONFIG_PREEMPT_NONE=y
210# CONFIG_PREEMPT_VOLUNTARY is not set 210# CONFIG_PREEMPT_VOLUNTARY is not set
211# CONFIG_PREEMPT is not set 211# CONFIG_PREEMPT is not set
212CONFIG_BINFMT_ELF=y 212CONFIG_BINFMT_ELF=y
213# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
214# CONFIG_HAVE_AOUT is not set
213# CONFIG_BINFMT_MISC is not set 215# CONFIG_BINFMT_MISC is not set
214CONFIG_MATH_EMULATION=y 216CONFIG_MATH_EMULATION=y
215# CONFIG_IOMMU_HELPER is not set 217# CONFIG_IOMMU_HELPER is not set
@@ -224,15 +226,15 @@ CONFIG_FLATMEM_MANUAL=y
224# CONFIG_SPARSEMEM_MANUAL is not set 226# CONFIG_SPARSEMEM_MANUAL is not set
225CONFIG_FLATMEM=y 227CONFIG_FLATMEM=y
226CONFIG_FLAT_NODE_MEM_MAP=y 228CONFIG_FLAT_NODE_MEM_MAP=y
227# CONFIG_SPARSEMEM_STATIC is not set
228# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
229CONFIG_PAGEFLAGS_EXTENDED=y 229CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 231CONFIG_MIGRATION=y
232CONFIG_RESOURCES_64BIT=y 232CONFIG_RESOURCES_64BIT=y
233CONFIG_PHYS_ADDR_T_64BIT=y
233CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
237CONFIG_UNEVICTABLE_LRU=y
236CONFIG_FORCE_MAX_ZONEORDER=11 238CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 239CONFIG_PROC_DEVICETREE=y
238# CONFIG_CMDLINE_BOOL is not set 240# CONFIG_CMDLINE_BOOL is not set
@@ -318,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 320# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 321# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 322# CONFIG_BRIDGE is not set
323# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 324# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 325# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 326# CONFIG_LLC2 is not set
@@ -338,14 +341,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 341# CONFIG_IRDA is not set
339# CONFIG_BT is not set 342# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
341 344# CONFIG_PHONET is not set
342# 345# CONFIG_WIRELESS is not set
343# Wireless
344#
345# CONFIG_CFG80211 is not set
346# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set
349# CONFIG_RFKILL is not set 346# CONFIG_RFKILL is not set
350# CONFIG_NET_9P is not set 347# CONFIG_NET_9P is not set
351 348
@@ -525,8 +522,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
525# CONFIG_IBM_NEW_EMAC_RGMII is not set 522# CONFIG_IBM_NEW_EMAC_RGMII is not set
526# CONFIG_IBM_NEW_EMAC_TAH is not set 523# CONFIG_IBM_NEW_EMAC_TAH is not set
527# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 524# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
525# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
526# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
527# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
528# CONFIG_NET_PCI is not set 528# CONFIG_NET_PCI is not set
529# CONFIG_B44 is not set 529# CONFIG_B44 is not set
530# CONFIG_ATL2 is not set
530CONFIG_NETDEV_1000=y 531CONFIG_NETDEV_1000=y
531# CONFIG_ACENIC is not set 532# CONFIG_ACENIC is not set
532# CONFIG_DL2K is not set 533# CONFIG_DL2K is not set
@@ -547,18 +548,22 @@ CONFIG_NETDEV_1000=y
547# CONFIG_QLA3XXX is not set 548# CONFIG_QLA3XXX is not set
548# CONFIG_ATL1 is not set 549# CONFIG_ATL1 is not set
549# CONFIG_ATL1E is not set 550# CONFIG_ATL1E is not set
551# CONFIG_JME is not set
550CONFIG_NETDEV_10000=y 552CONFIG_NETDEV_10000=y
551# CONFIG_CHELSIO_T1 is not set 553# CONFIG_CHELSIO_T1 is not set
552# CONFIG_CHELSIO_T3 is not set 554# CONFIG_CHELSIO_T3 is not set
555# CONFIG_ENIC is not set
553# CONFIG_IXGBE is not set 556# CONFIG_IXGBE is not set
554# CONFIG_IXGB is not set 557# CONFIG_IXGB is not set
555# CONFIG_S2IO is not set 558# CONFIG_S2IO is not set
556# CONFIG_MYRI10GE is not set 559# CONFIG_MYRI10GE is not set
557# CONFIG_NETXEN_NIC is not set 560# CONFIG_NETXEN_NIC is not set
558# CONFIG_NIU is not set 561# CONFIG_NIU is not set
562# CONFIG_MLX4_EN is not set
559# CONFIG_MLX4_CORE is not set 563# CONFIG_MLX4_CORE is not set
560# CONFIG_TEHUTI is not set 564# CONFIG_TEHUTI is not set
561# CONFIG_BNX2X is not set 565# CONFIG_BNX2X is not set
566# CONFIG_QLGE is not set
562# CONFIG_SFC is not set 567# CONFIG_SFC is not set
563# CONFIG_TR is not set 568# CONFIG_TR is not set
564 569
@@ -654,6 +659,8 @@ CONFIG_SSB_POSSIBLE=y
654# CONFIG_MFD_CORE is not set 659# CONFIG_MFD_CORE is not set
655# CONFIG_MFD_SM501 is not set 660# CONFIG_MFD_SM501 is not set
656# CONFIG_HTC_PASIC3 is not set 661# CONFIG_HTC_PASIC3 is not set
662# CONFIG_MFD_TMIO is not set
663# CONFIG_MFD_WM8400 is not set
657 664
658# 665#
659# Multimedia devices 666# Multimedia devices
@@ -695,9 +702,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
695# CONFIG_USB_OTG_BLACKLIST_HUB is not set 702# CONFIG_USB_OTG_BLACKLIST_HUB is not set
696 703
697# 704#
705# Enable Host or Gadget support to see Inventra options
706#
707
708#
698# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 709# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
699# 710#
700# CONFIG_USB_GADGET is not set 711# CONFIG_USB_GADGET is not set
712# CONFIG_UWB is not set
701# CONFIG_MMC is not set 713# CONFIG_MMC is not set
702# CONFIG_MEMSTICK is not set 714# CONFIG_MEMSTICK is not set
703# CONFIG_NEW_LEDS is not set 715# CONFIG_NEW_LEDS is not set
@@ -707,6 +719,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
707# CONFIG_RTC_CLASS is not set 719# CONFIG_RTC_CLASS is not set
708# CONFIG_DMADEVICES is not set 720# CONFIG_DMADEVICES is not set
709# CONFIG_UIO is not set 721# CONFIG_UIO is not set
722# CONFIG_STAGING is not set
710 723
711# 724#
712# File systems 725# File systems
@@ -715,10 +728,11 @@ CONFIG_EXT2_FS=y
715# CONFIG_EXT2_FS_XATTR is not set 728# CONFIG_EXT2_FS_XATTR is not set
716# CONFIG_EXT2_FS_XIP is not set 729# CONFIG_EXT2_FS_XIP is not set
717# CONFIG_EXT3_FS is not set 730# CONFIG_EXT3_FS is not set
718# CONFIG_EXT4DEV_FS is not set 731# CONFIG_EXT4_FS is not set
719# CONFIG_REISERFS_FS is not set 732# CONFIG_REISERFS_FS is not set
720# CONFIG_JFS_FS is not set 733# CONFIG_JFS_FS is not set
721# CONFIG_FS_POSIX_ACL is not set 734# CONFIG_FS_POSIX_ACL is not set
735CONFIG_FILE_LOCKING=y
722# CONFIG_XFS_FS is not set 736# CONFIG_XFS_FS is not set
723# CONFIG_OCFS2_FS is not set 737# CONFIG_OCFS2_FS is not set
724CONFIG_DNOTIFY=y 738CONFIG_DNOTIFY=y
@@ -748,6 +762,7 @@ CONFIG_INOTIFY_USER=y
748CONFIG_PROC_FS=y 762CONFIG_PROC_FS=y
749CONFIG_PROC_KCORE=y 763CONFIG_PROC_KCORE=y
750CONFIG_PROC_SYSCTL=y 764CONFIG_PROC_SYSCTL=y
765CONFIG_PROC_PAGE_MONITOR=y
751CONFIG_SYSFS=y 766CONFIG_SYSFS=y
752CONFIG_TMPFS=y 767CONFIG_TMPFS=y
753# CONFIG_TMPFS_POSIX_ACL is not set 768# CONFIG_TMPFS_POSIX_ACL is not set
@@ -795,6 +810,7 @@ CONFIG_LOCKD=y
795CONFIG_LOCKD_V4=y 810CONFIG_LOCKD_V4=y
796CONFIG_NFS_COMMON=y 811CONFIG_NFS_COMMON=y
797CONFIG_SUNRPC=y 812CONFIG_SUNRPC=y
813# CONFIG_SUNRPC_REGISTER_V4 is not set
798# CONFIG_RPCSEC_GSS_KRB5 is not set 814# CONFIG_RPCSEC_GSS_KRB5 is not set
799# CONFIG_RPCSEC_GSS_SPKM3 is not set 815# CONFIG_RPCSEC_GSS_SPKM3 is not set
800# CONFIG_SMB_FS is not set 816# CONFIG_SMB_FS is not set
@@ -815,7 +831,6 @@ CONFIG_MSDOS_PARTITION=y
815# Library routines 831# Library routines
816# 832#
817CONFIG_BITREVERSE=y 833CONFIG_BITREVERSE=y
818# CONFIG_GENERIC_FIND_FIRST_BIT is not set
819# CONFIG_CRC_CCITT is not set 834# CONFIG_CRC_CCITT is not set
820# CONFIG_CRC16 is not set 835# CONFIG_CRC16 is not set
821# CONFIG_CRC_T10DIF is not set 836# CONFIG_CRC_T10DIF is not set
@@ -869,14 +884,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
869# CONFIG_DEBUG_SG is not set 884# CONFIG_DEBUG_SG is not set
870# CONFIG_BOOT_PRINTK_DELAY is not set 885# CONFIG_BOOT_PRINTK_DELAY is not set
871# CONFIG_RCU_TORTURE_TEST is not set 886# CONFIG_RCU_TORTURE_TEST is not set
887# CONFIG_RCU_CPU_STALL_DETECTOR is not set
872# CONFIG_BACKTRACE_SELF_TEST is not set 888# CONFIG_BACKTRACE_SELF_TEST is not set
889# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
873# CONFIG_FAULT_INJECTION is not set 890# CONFIG_FAULT_INJECTION is not set
874# CONFIG_LATENCYTOP is not set 891# CONFIG_LATENCYTOP is not set
892CONFIG_SYSCTL_SYSCALL_CHECK=y
893CONFIG_NOP_TRACER=y
875CONFIG_HAVE_FTRACE=y 894CONFIG_HAVE_FTRACE=y
876CONFIG_HAVE_DYNAMIC_FTRACE=y 895CONFIG_HAVE_DYNAMIC_FTRACE=y
877# CONFIG_FTRACE is not set 896# CONFIG_FTRACE is not set
878# CONFIG_SCHED_TRACER is not set 897# CONFIG_SCHED_TRACER is not set
879# CONFIG_CONTEXT_SWITCH_TRACER is not set 898# CONFIG_CONTEXT_SWITCH_TRACER is not set
899# CONFIG_BOOT_TRACER is not set
900# CONFIG_STACK_TRACER is not set
901# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
880# CONFIG_SAMPLES is not set 902# CONFIG_SAMPLES is not set
881CONFIG_HAVE_ARCH_KGDB=y 903CONFIG_HAVE_ARCH_KGDB=y
882# CONFIG_KGDB is not set 904# CONFIG_KGDB is not set
@@ -885,6 +907,7 @@ CONFIG_HAVE_ARCH_KGDB=y
885# CONFIG_DEBUG_PAGEALLOC is not set 907# CONFIG_DEBUG_PAGEALLOC is not set
886# CONFIG_CODE_PATCHING_SELFTEST is not set 908# CONFIG_CODE_PATCHING_SELFTEST is not set
887# CONFIG_FTR_FIXUP_SELFTEST is not set 909# CONFIG_FTR_FIXUP_SELFTEST is not set
910# CONFIG_MSI_BITMAP_SELFTEST is not set
888# CONFIG_XMON is not set 911# CONFIG_XMON is not set
889# CONFIG_IRQSTACKS is not set 912# CONFIG_IRQSTACKS is not set
890# CONFIG_VIRQ_DEBUG is not set 913# CONFIG_VIRQ_DEBUG is not set
@@ -896,14 +919,19 @@ CONFIG_HAVE_ARCH_KGDB=y
896# 919#
897# CONFIG_KEYS is not set 920# CONFIG_KEYS is not set
898# CONFIG_SECURITY is not set 921# CONFIG_SECURITY is not set
922# CONFIG_SECURITYFS is not set
899# CONFIG_SECURITY_FILE_CAPABILITIES is not set 923# CONFIG_SECURITY_FILE_CAPABILITIES is not set
900CONFIG_CRYPTO=y 924CONFIG_CRYPTO=y
901 925
902# 926#
903# Crypto core or helper 927# Crypto core or helper
904# 928#
929# CONFIG_CRYPTO_FIPS is not set
905CONFIG_CRYPTO_ALGAPI=y 930CONFIG_CRYPTO_ALGAPI=y
931CONFIG_CRYPTO_AEAD=y
906CONFIG_CRYPTO_BLKCIPHER=y 932CONFIG_CRYPTO_BLKCIPHER=y
933CONFIG_CRYPTO_HASH=y
934CONFIG_CRYPTO_RNG=y
907CONFIG_CRYPTO_MANAGER=y 935CONFIG_CRYPTO_MANAGER=y
908# CONFIG_CRYPTO_GF128MUL is not set 936# CONFIG_CRYPTO_GF128MUL is not set
909# CONFIG_CRYPTO_NULL is not set 937# CONFIG_CRYPTO_NULL is not set
@@ -976,6 +1004,11 @@ CONFIG_CRYPTO_DES=y
976# 1004#
977# CONFIG_CRYPTO_DEFLATE is not set 1005# CONFIG_CRYPTO_DEFLATE is not set
978# CONFIG_CRYPTO_LZO is not set 1006# CONFIG_CRYPTO_LZO is not set
1007
1008#
1009# Random Number Generation
1010#
1011# CONFIG_CRYPTO_ANSI_CPRNG is not set
979# CONFIG_CRYPTO_HW is not set 1012# CONFIG_CRYPTO_HW is not set
980# CONFIG_PPC_CLOCK is not set 1013# CONFIG_PPC_CLOCK is not set
981# CONFIG_VIRTUALIZATION is not set 1014# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig
index 7bc4082a1c93..e326ee8bd195 100644
--- a/arch/powerpc/configs/44x/katmai_defconfig
+++ b/arch/powerpc/configs/44x/katmai_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:06:51 2008 4# Tue Oct 28 09:16:11 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -87,7 +86,6 @@ CONFIG_INITRAMFS_SOURCE=""
87CONFIG_SYSCTL=y 86CONFIG_SYSCTL=y
88CONFIG_EMBEDDED=y 87CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 88CONFIG_SYSCTL_SYSCALL=y
90CONFIG_SYSCTL_SYSCALL_CHECK=y
91CONFIG_KALLSYMS=y 89CONFIG_KALLSYMS=y
92# CONFIG_KALLSYMS_ALL is not set 90# CONFIG_KALLSYMS_ALL is not set
93# CONFIG_KALLSYMS_EXTRA_PASS is not set 91# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -104,7 +102,9 @@ CONFIG_SIGNALFD=y
104CONFIG_TIMERFD=y 102CONFIG_TIMERFD=y
105CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
106CONFIG_SHMEM=y 104CONFIG_SHMEM=y
105CONFIG_AIO=y
107CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
107CONFIG_PCI_QUIRKS=y
108CONFIG_SLUB_DEBUG=y 108CONFIG_SLUB_DEBUG=y
109# CONFIG_SLAB is not set 109# CONFIG_SLAB is not set
110CONFIG_SLUB=y 110CONFIG_SLUB=y
@@ -118,10 +118,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
118CONFIG_HAVE_KPROBES=y 118CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y 119CONFIG_HAVE_KRETPROBES=y
120CONFIG_HAVE_ARCH_TRACEHOOK=y 120CONFIG_HAVE_ARCH_TRACEHOOK=y
121# CONFIG_HAVE_DMA_ATTRS is not set
122# CONFIG_USE_GENERIC_SMP_HELPERS is not set
123# CONFIG_HAVE_CLK is not set
124CONFIG_PROC_PAGE_MONITOR=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
@@ -154,6 +150,7 @@ CONFIG_DEFAULT_AS=y
154# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
155CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
156CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_FREEZER is not set
157CONFIG_PPC4xx_PCI_EXPRESS=y 154CONFIG_PPC4xx_PCI_EXPRESS=y
158 155
159# 156#
@@ -170,9 +167,13 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
170CONFIG_KATMAI=y 167CONFIG_KATMAI=y
171# CONFIG_RAINIER is not set 168# CONFIG_RAINIER is not set
172# CONFIG_WARP is not set 169# CONFIG_WARP is not set
170# CONFIG_ARCHES is not set
173# CONFIG_CANYONLANDS is not set 171# CONFIG_CANYONLANDS is not set
172# CONFIG_GLACIER is not set
174# CONFIG_YOSEMITE is not set 173# CONFIG_YOSEMITE is not set
175# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 174# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
175CONFIG_PPC44x_SIMPLE=y
176# CONFIG_PPC4xx_GPIO is not set
176CONFIG_440SPe=y 177CONFIG_440SPe=y
177# CONFIG_IPIC is not set 178# CONFIG_IPIC is not set
178# CONFIG_MPIC is not set 179# CONFIG_MPIC is not set
@@ -191,7 +192,6 @@ CONFIG_440SPe=y
191# Kernel options 192# Kernel options
192# 193#
193# CONFIG_HIGHMEM is not set 194# CONFIG_HIGHMEM is not set
194# CONFIG_TICK_ONESHOT is not set
195# CONFIG_NO_HZ is not set 195# CONFIG_NO_HZ is not set
196# CONFIG_HIGH_RES_TIMERS is not set 196# CONFIG_HIGH_RES_TIMERS is not set
197CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 197CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -205,6 +205,8 @@ CONFIG_PREEMPT_NONE=y
205# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
206# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
207CONFIG_BINFMT_ELF=y 207CONFIG_BINFMT_ELF=y
208# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
209# CONFIG_HAVE_AOUT is not set
208# CONFIG_BINFMT_MISC is not set 210# CONFIG_BINFMT_MISC is not set
209# CONFIG_MATH_EMULATION is not set 211# CONFIG_MATH_EMULATION is not set
210# CONFIG_IOMMU_HELPER is not set 212# CONFIG_IOMMU_HELPER is not set
@@ -219,15 +221,15 @@ CONFIG_FLATMEM_MANUAL=y
219# CONFIG_SPARSEMEM_MANUAL is not set 221# CONFIG_SPARSEMEM_MANUAL is not set
220CONFIG_FLATMEM=y 222CONFIG_FLATMEM=y
221CONFIG_FLAT_NODE_MEM_MAP=y 223CONFIG_FLAT_NODE_MEM_MAP=y
222# CONFIG_SPARSEMEM_STATIC is not set
223# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
224CONFIG_PAGEFLAGS_EXTENDED=y 224CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 225CONFIG_SPLIT_PTLOCK_CPUS=4
226CONFIG_MIGRATION=y 226CONFIG_MIGRATION=y
227CONFIG_RESOURCES_64BIT=y 227CONFIG_RESOURCES_64BIT=y
228CONFIG_PHYS_ADDR_T_64BIT=y
228CONFIG_ZONE_DMA_FLAG=1 229CONFIG_ZONE_DMA_FLAG=1
229CONFIG_BOUNCE=y 230CONFIG_BOUNCE=y
230CONFIG_VIRT_TO_BUS=y 231CONFIG_VIRT_TO_BUS=y
232CONFIG_UNEVICTABLE_LRU=y
231CONFIG_FORCE_MAX_ZONEORDER=11 233CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 234CONFIG_PROC_DEVICETREE=y
233CONFIG_CMDLINE_BOOL=y 235CONFIG_CMDLINE_BOOL=y
@@ -314,6 +316,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
314# CONFIG_TIPC is not set 316# CONFIG_TIPC is not set
315# CONFIG_ATM is not set 317# CONFIG_ATM is not set
316# CONFIG_BRIDGE is not set 318# CONFIG_BRIDGE is not set
319# CONFIG_NET_DSA is not set
317# CONFIG_VLAN_8021Q is not set 320# CONFIG_VLAN_8021Q is not set
318# CONFIG_DECNET is not set 321# CONFIG_DECNET is not set
319# CONFIG_LLC2 is not set 322# CONFIG_LLC2 is not set
@@ -334,14 +337,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_IRDA is not set 337# CONFIG_IRDA is not set
335# CONFIG_BT is not set 338# CONFIG_BT is not set
336# CONFIG_AF_RXRPC is not set 339# CONFIG_AF_RXRPC is not set
337 340# CONFIG_PHONET is not set
338# 341# CONFIG_WIRELESS is not set
339# Wireless
340#
341# CONFIG_CFG80211 is not set
342# CONFIG_WIRELESS_EXT is not set
343# CONFIG_MAC80211 is not set
344# CONFIG_IEEE80211 is not set
345# CONFIG_RFKILL is not set 342# CONFIG_RFKILL is not set
346# CONFIG_NET_9P is not set 343# CONFIG_NET_9P is not set
347 344
@@ -446,8 +443,12 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
446# CONFIG_IBM_NEW_EMAC_RGMII is not set 443# CONFIG_IBM_NEW_EMAC_RGMII is not set
447# CONFIG_IBM_NEW_EMAC_TAH is not set 444# CONFIG_IBM_NEW_EMAC_TAH is not set
448CONFIG_IBM_NEW_EMAC_EMAC4=y 445CONFIG_IBM_NEW_EMAC_EMAC4=y
446# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
447# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
448# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
449# CONFIG_NET_PCI is not set 449# CONFIG_NET_PCI is not set
450# CONFIG_B44 is not set 450# CONFIG_B44 is not set
451# CONFIG_ATL2 is not set
451CONFIG_NETDEV_1000=y 452CONFIG_NETDEV_1000=y
452# CONFIG_ACENIC is not set 453# CONFIG_ACENIC is not set
453# CONFIG_DL2K is not set 454# CONFIG_DL2K is not set
@@ -468,18 +469,22 @@ CONFIG_NETDEV_1000=y
468# CONFIG_QLA3XXX is not set 469# CONFIG_QLA3XXX is not set
469# CONFIG_ATL1 is not set 470# CONFIG_ATL1 is not set
470# CONFIG_ATL1E is not set 471# CONFIG_ATL1E is not set
472# CONFIG_JME is not set
471CONFIG_NETDEV_10000=y 473CONFIG_NETDEV_10000=y
472# CONFIG_CHELSIO_T1 is not set 474# CONFIG_CHELSIO_T1 is not set
473# CONFIG_CHELSIO_T3 is not set 475# CONFIG_CHELSIO_T3 is not set
476# CONFIG_ENIC is not set
474# CONFIG_IXGBE is not set 477# CONFIG_IXGBE is not set
475# CONFIG_IXGB is not set 478# CONFIG_IXGB is not set
476# CONFIG_S2IO is not set 479# CONFIG_S2IO is not set
477# CONFIG_MYRI10GE is not set 480# CONFIG_MYRI10GE is not set
478# CONFIG_NETXEN_NIC is not set 481# CONFIG_NETXEN_NIC is not set
479# CONFIG_NIU is not set 482# CONFIG_NIU is not set
483# CONFIG_MLX4_EN is not set
480# CONFIG_MLX4_CORE is not set 484# CONFIG_MLX4_CORE is not set
481# CONFIG_TEHUTI is not set 485# CONFIG_TEHUTI is not set
482# CONFIG_BNX2X is not set 486# CONFIG_BNX2X is not set
487# CONFIG_QLGE is not set
483# CONFIG_SFC is not set 488# CONFIG_SFC is not set
484# CONFIG_TR is not set 489# CONFIG_TR is not set
485 490
@@ -576,6 +581,8 @@ CONFIG_SSB_POSSIBLE=y
576# CONFIG_MFD_CORE is not set 581# CONFIG_MFD_CORE is not set
577# CONFIG_MFD_SM501 is not set 582# CONFIG_MFD_SM501 is not set
578# CONFIG_HTC_PASIC3 is not set 583# CONFIG_HTC_PASIC3 is not set
584# CONFIG_MFD_TMIO is not set
585# CONFIG_MFD_WM8400 is not set
579 586
580# 587#
581# Multimedia devices 588# Multimedia devices
@@ -617,9 +624,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
617# CONFIG_USB_OTG_BLACKLIST_HUB is not set 624# CONFIG_USB_OTG_BLACKLIST_HUB is not set
618 625
619# 626#
627# Enable Host or Gadget support to see Inventra options
628#
629
630#
620# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 631# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
621# 632#
622# CONFIG_USB_GADGET is not set 633# CONFIG_USB_GADGET is not set
634# CONFIG_UWB is not set
623# CONFIG_MMC is not set 635# CONFIG_MMC is not set
624# CONFIG_MEMSTICK is not set 636# CONFIG_MEMSTICK is not set
625# CONFIG_NEW_LEDS is not set 637# CONFIG_NEW_LEDS is not set
@@ -629,6 +641,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
629# CONFIG_RTC_CLASS is not set 641# CONFIG_RTC_CLASS is not set
630# CONFIG_DMADEVICES is not set 642# CONFIG_DMADEVICES is not set
631# CONFIG_UIO is not set 643# CONFIG_UIO is not set
644# CONFIG_STAGING is not set
632 645
633# 646#
634# File systems 647# File systems
@@ -637,10 +650,11 @@ CONFIG_EXT2_FS=y
637# CONFIG_EXT2_FS_XATTR is not set 650# CONFIG_EXT2_FS_XATTR is not set
638# CONFIG_EXT2_FS_XIP is not set 651# CONFIG_EXT2_FS_XIP is not set
639# CONFIG_EXT3_FS is not set 652# CONFIG_EXT3_FS is not set
640# CONFIG_EXT4DEV_FS is not set 653# CONFIG_EXT4_FS is not set
641# CONFIG_REISERFS_FS is not set 654# CONFIG_REISERFS_FS is not set
642# CONFIG_JFS_FS is not set 655# CONFIG_JFS_FS is not set
643# CONFIG_FS_POSIX_ACL is not set 656# CONFIG_FS_POSIX_ACL is not set
657CONFIG_FILE_LOCKING=y
644# CONFIG_XFS_FS is not set 658# CONFIG_XFS_FS is not set
645# CONFIG_OCFS2_FS is not set 659# CONFIG_OCFS2_FS is not set
646CONFIG_DNOTIFY=y 660CONFIG_DNOTIFY=y
@@ -670,6 +684,7 @@ CONFIG_INOTIFY_USER=y
670CONFIG_PROC_FS=y 684CONFIG_PROC_FS=y
671CONFIG_PROC_KCORE=y 685CONFIG_PROC_KCORE=y
672CONFIG_PROC_SYSCTL=y 686CONFIG_PROC_SYSCTL=y
687CONFIG_PROC_PAGE_MONITOR=y
673CONFIG_SYSFS=y 688CONFIG_SYSFS=y
674CONFIG_TMPFS=y 689CONFIG_TMPFS=y
675# CONFIG_TMPFS_POSIX_ACL is not set 690# CONFIG_TMPFS_POSIX_ACL is not set
@@ -706,6 +721,7 @@ CONFIG_LOCKD=y
706CONFIG_LOCKD_V4=y 721CONFIG_LOCKD_V4=y
707CONFIG_NFS_COMMON=y 722CONFIG_NFS_COMMON=y
708CONFIG_SUNRPC=y 723CONFIG_SUNRPC=y
724# CONFIG_SUNRPC_REGISTER_V4 is not set
709# CONFIG_RPCSEC_GSS_KRB5 is not set 725# CONFIG_RPCSEC_GSS_KRB5 is not set
710# CONFIG_RPCSEC_GSS_SPKM3 is not set 726# CONFIG_RPCSEC_GSS_SPKM3 is not set
711# CONFIG_SMB_FS is not set 727# CONFIG_SMB_FS is not set
@@ -726,7 +742,6 @@ CONFIG_MSDOS_PARTITION=y
726# Library routines 742# Library routines
727# 743#
728CONFIG_BITREVERSE=y 744CONFIG_BITREVERSE=y
729# CONFIG_GENERIC_FIND_FIRST_BIT is not set
730# CONFIG_CRC_CCITT is not set 745# CONFIG_CRC_CCITT is not set
731# CONFIG_CRC16 is not set 746# CONFIG_CRC16 is not set
732# CONFIG_CRC_T10DIF is not set 747# CONFIG_CRC_T10DIF is not set
@@ -779,14 +794,21 @@ CONFIG_SCHED_DEBUG=y
779# CONFIG_DEBUG_SG is not set 794# CONFIG_DEBUG_SG is not set
780# CONFIG_BOOT_PRINTK_DELAY is not set 795# CONFIG_BOOT_PRINTK_DELAY is not set
781# CONFIG_RCU_TORTURE_TEST is not set 796# CONFIG_RCU_TORTURE_TEST is not set
797# CONFIG_RCU_CPU_STALL_DETECTOR is not set
782# CONFIG_BACKTRACE_SELF_TEST is not set 798# CONFIG_BACKTRACE_SELF_TEST is not set
799# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
783# CONFIG_FAULT_INJECTION is not set 800# CONFIG_FAULT_INJECTION is not set
784# CONFIG_LATENCYTOP is not set 801# CONFIG_LATENCYTOP is not set
802CONFIG_SYSCTL_SYSCALL_CHECK=y
803CONFIG_NOP_TRACER=y
785CONFIG_HAVE_FTRACE=y 804CONFIG_HAVE_FTRACE=y
786CONFIG_HAVE_DYNAMIC_FTRACE=y 805CONFIG_HAVE_DYNAMIC_FTRACE=y
787# CONFIG_FTRACE is not set 806# CONFIG_FTRACE is not set
788# CONFIG_SCHED_TRACER is not set 807# CONFIG_SCHED_TRACER is not set
789# CONFIG_CONTEXT_SWITCH_TRACER is not set 808# CONFIG_CONTEXT_SWITCH_TRACER is not set
809# CONFIG_BOOT_TRACER is not set
810# CONFIG_STACK_TRACER is not set
811# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
790# CONFIG_SAMPLES is not set 812# CONFIG_SAMPLES is not set
791CONFIG_HAVE_ARCH_KGDB=y 813CONFIG_HAVE_ARCH_KGDB=y
792# CONFIG_KGDB is not set 814# CONFIG_KGDB is not set
@@ -795,6 +817,7 @@ CONFIG_HAVE_ARCH_KGDB=y
795# CONFIG_DEBUG_PAGEALLOC is not set 817# CONFIG_DEBUG_PAGEALLOC is not set
796# CONFIG_CODE_PATCHING_SELFTEST is not set 818# CONFIG_CODE_PATCHING_SELFTEST is not set
797# CONFIG_FTR_FIXUP_SELFTEST is not set 819# CONFIG_FTR_FIXUP_SELFTEST is not set
820# CONFIG_MSI_BITMAP_SELFTEST is not set
798# CONFIG_XMON is not set 821# CONFIG_XMON is not set
799# CONFIG_IRQSTACKS is not set 822# CONFIG_IRQSTACKS is not set
800# CONFIG_BDI_SWITCH is not set 823# CONFIG_BDI_SWITCH is not set
@@ -805,14 +828,19 @@ CONFIG_HAVE_ARCH_KGDB=y
805# 828#
806# CONFIG_KEYS is not set 829# CONFIG_KEYS is not set
807# CONFIG_SECURITY is not set 830# CONFIG_SECURITY is not set
831# CONFIG_SECURITYFS is not set
808# CONFIG_SECURITY_FILE_CAPABILITIES is not set 832# CONFIG_SECURITY_FILE_CAPABILITIES is not set
809CONFIG_CRYPTO=y 833CONFIG_CRYPTO=y
810 834
811# 835#
812# Crypto core or helper 836# Crypto core or helper
813# 837#
838# CONFIG_CRYPTO_FIPS is not set
814CONFIG_CRYPTO_ALGAPI=y 839CONFIG_CRYPTO_ALGAPI=y
840CONFIG_CRYPTO_AEAD=y
815CONFIG_CRYPTO_BLKCIPHER=y 841CONFIG_CRYPTO_BLKCIPHER=y
842CONFIG_CRYPTO_HASH=y
843CONFIG_CRYPTO_RNG=y
816CONFIG_CRYPTO_MANAGER=y 844CONFIG_CRYPTO_MANAGER=y
817# CONFIG_CRYPTO_GF128MUL is not set 845# CONFIG_CRYPTO_GF128MUL is not set
818# CONFIG_CRYPTO_NULL is not set 846# CONFIG_CRYPTO_NULL is not set
@@ -885,6 +913,11 @@ CONFIG_CRYPTO_DES=y
885# 913#
886# CONFIG_CRYPTO_DEFLATE is not set 914# CONFIG_CRYPTO_DEFLATE is not set
887# CONFIG_CRYPTO_LZO is not set 915# CONFIG_CRYPTO_LZO is not set
916
917#
918# Random Number Generation
919#
920# CONFIG_CRYPTO_ANSI_CPRNG is not set
888CONFIG_CRYPTO_HW=y 921CONFIG_CRYPTO_HW=y
889# CONFIG_CRYPTO_DEV_HIFN_795X is not set 922# CONFIG_CRYPTO_DEV_HIFN_795X is not set
890# CONFIG_PPC_CLOCK is not set 923# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig
index 0479648a9141..927f829e2087 100644
--- a/arch/powerpc/configs/44x/rainier_defconfig
+++ b/arch/powerpc/configs/44x/rainier_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:09:35 2008 4# Tue Oct 28 09:16:13 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE=""
91CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
92CONFIG_EMBEDDED=y 91CONFIG_EMBEDDED=y
93CONFIG_SYSCTL_SYSCALL=y 92CONFIG_SYSCTL_SYSCALL=y
94CONFIG_SYSCTL_SYSCALL_CHECK=y
95CONFIG_KALLSYMS=y 93CONFIG_KALLSYMS=y
96# CONFIG_KALLSYMS_ALL is not set 94# CONFIG_KALLSYMS_ALL is not set
97# CONFIG_KALLSYMS_EXTRA_PASS is not set 95# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -108,7 +106,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
114CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -158,6 +154,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 154# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 156CONFIG_CLASSIC_RCU=y
157# CONFIG_FREEZER is not set
161# CONFIG_PPC4xx_PCI_EXPRESS is not set 158# CONFIG_PPC4xx_PCI_EXPRESS is not set
162 159
163# 160#
@@ -174,9 +171,13 @@ CONFIG_CLASSIC_RCU=y
174# CONFIG_KATMAI is not set 171# CONFIG_KATMAI is not set
175CONFIG_RAINIER=y 172CONFIG_RAINIER=y
176# CONFIG_WARP is not set 173# CONFIG_WARP is not set
174# CONFIG_ARCHES is not set
177# CONFIG_CANYONLANDS is not set 175# CONFIG_CANYONLANDS is not set
176# CONFIG_GLACIER is not set
178# CONFIG_YOSEMITE is not set 177# CONFIG_YOSEMITE is not set
179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 178# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
179CONFIG_PPC44x_SIMPLE=y
180# CONFIG_PPC4xx_GPIO is not set
180CONFIG_440GRX=y 181CONFIG_440GRX=y
181# CONFIG_IPIC is not set 182# CONFIG_IPIC is not set
182# CONFIG_MPIC is not set 183# CONFIG_MPIC is not set
@@ -195,7 +196,6 @@ CONFIG_440GRX=y
195# Kernel options 196# Kernel options
196# 197#
197# CONFIG_HIGHMEM is not set 198# CONFIG_HIGHMEM is not set
198# CONFIG_TICK_ONESHOT is not set
199# CONFIG_NO_HZ is not set 199# CONFIG_NO_HZ is not set
200# CONFIG_HIGH_RES_TIMERS is not set 200# CONFIG_HIGH_RES_TIMERS is not set
201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -209,6 +209,8 @@ CONFIG_PREEMPT_NONE=y
209# CONFIG_PREEMPT_VOLUNTARY is not set 209# CONFIG_PREEMPT_VOLUNTARY is not set
210# CONFIG_PREEMPT is not set 210# CONFIG_PREEMPT is not set
211CONFIG_BINFMT_ELF=y 211CONFIG_BINFMT_ELF=y
212# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
213# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
213CONFIG_MATH_EMULATION=y 215CONFIG_MATH_EMULATION=y
214# CONFIG_IOMMU_HELPER is not set 216# CONFIG_IOMMU_HELPER is not set
@@ -223,15 +225,15 @@ CONFIG_FLATMEM_MANUAL=y
223# CONFIG_SPARSEMEM_MANUAL is not set 225# CONFIG_SPARSEMEM_MANUAL is not set
224CONFIG_FLATMEM=y 226CONFIG_FLATMEM=y
225CONFIG_FLAT_NODE_MEM_MAP=y 227CONFIG_FLAT_NODE_MEM_MAP=y
226# CONFIG_SPARSEMEM_STATIC is not set
227# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
228CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y 231CONFIG_RESOURCES_64BIT=y
232CONFIG_PHYS_ADDR_T_64BIT=y
232CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y
235CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 239CONFIG_CMDLINE_BOOL=y
@@ -318,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 320# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 321# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 322# CONFIG_BRIDGE is not set
323# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 324# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 325# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 326# CONFIG_LLC2 is not set
@@ -338,14 +341,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 341# CONFIG_IRDA is not set
339# CONFIG_BT is not set 342# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
341 344# CONFIG_PHONET is not set
342# 345# CONFIG_WIRELESS is not set
343# Wireless
344#
345# CONFIG_CFG80211 is not set
346# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set
349# CONFIG_RFKILL is not set 346# CONFIG_RFKILL is not set
350# CONFIG_NET_9P is not set 347# CONFIG_NET_9P is not set
351 348
@@ -532,18 +529,22 @@ CONFIG_NETDEV_1000=y
532# CONFIG_QLA3XXX is not set 529# CONFIG_QLA3XXX is not set
533# CONFIG_ATL1 is not set 530# CONFIG_ATL1 is not set
534# CONFIG_ATL1E is not set 531# CONFIG_ATL1E is not set
532# CONFIG_JME is not set
535CONFIG_NETDEV_10000=y 533CONFIG_NETDEV_10000=y
536# CONFIG_CHELSIO_T1 is not set 534# CONFIG_CHELSIO_T1 is not set
537# CONFIG_CHELSIO_T3 is not set 535# CONFIG_CHELSIO_T3 is not set
536# CONFIG_ENIC is not set
538# CONFIG_IXGBE is not set 537# CONFIG_IXGBE is not set
539# CONFIG_IXGB is not set 538# CONFIG_IXGB is not set
540# CONFIG_S2IO is not set 539# CONFIG_S2IO is not set
541# CONFIG_MYRI10GE is not set 540# CONFIG_MYRI10GE is not set
542# CONFIG_NETXEN_NIC is not set 541# CONFIG_NETXEN_NIC is not set
543# CONFIG_NIU is not set 542# CONFIG_NIU is not set
543# CONFIG_MLX4_EN is not set
544# CONFIG_MLX4_CORE is not set 544# CONFIG_MLX4_CORE is not set
545# CONFIG_TEHUTI is not set 545# CONFIG_TEHUTI is not set
546# CONFIG_BNX2X is not set 546# CONFIG_BNX2X is not set
547# CONFIG_QLGE is not set
547# CONFIG_SFC is not set 548# CONFIG_SFC is not set
548# CONFIG_TR is not set 549# CONFIG_TR is not set
549 550
@@ -639,6 +640,8 @@ CONFIG_SSB_POSSIBLE=y
639# CONFIG_MFD_CORE is not set 640# CONFIG_MFD_CORE is not set
640# CONFIG_MFD_SM501 is not set 641# CONFIG_MFD_SM501 is not set
641# CONFIG_HTC_PASIC3 is not set 642# CONFIG_HTC_PASIC3 is not set
643# CONFIG_MFD_TMIO is not set
644# CONFIG_MFD_WM8400 is not set
642 645
643# 646#
644# Multimedia devices 647# Multimedia devices
@@ -680,9 +683,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
680# CONFIG_USB_OTG_BLACKLIST_HUB is not set 683# CONFIG_USB_OTG_BLACKLIST_HUB is not set
681 684
682# 685#
686# Enable Host or Gadget support to see Inventra options
687#
688
689#
683# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 690# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
684# 691#
685# CONFIG_USB_GADGET is not set 692# CONFIG_USB_GADGET is not set
693# CONFIG_UWB is not set
686# CONFIG_MMC is not set 694# CONFIG_MMC is not set
687# CONFIG_MEMSTICK is not set 695# CONFIG_MEMSTICK is not set
688# CONFIG_NEW_LEDS is not set 696# CONFIG_NEW_LEDS is not set
@@ -692,6 +700,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
692# CONFIG_RTC_CLASS is not set 700# CONFIG_RTC_CLASS is not set
693# CONFIG_DMADEVICES is not set 701# CONFIG_DMADEVICES is not set
694# CONFIG_UIO is not set 702# CONFIG_UIO is not set
703# CONFIG_STAGING is not set
695 704
696# 705#
697# File systems 706# File systems
@@ -700,10 +709,11 @@ CONFIG_EXT2_FS=y
700# CONFIG_EXT2_FS_XATTR is not set 709# CONFIG_EXT2_FS_XATTR is not set
701# CONFIG_EXT2_FS_XIP is not set 710# CONFIG_EXT2_FS_XIP is not set
702# CONFIG_EXT3_FS is not set 711# CONFIG_EXT3_FS is not set
703# CONFIG_EXT4DEV_FS is not set 712# CONFIG_EXT4_FS is not set
704# CONFIG_REISERFS_FS is not set 713# CONFIG_REISERFS_FS is not set
705# CONFIG_JFS_FS is not set 714# CONFIG_JFS_FS is not set
706# CONFIG_FS_POSIX_ACL is not set 715# CONFIG_FS_POSIX_ACL is not set
716CONFIG_FILE_LOCKING=y
707# CONFIG_XFS_FS is not set 717# CONFIG_XFS_FS is not set
708# CONFIG_OCFS2_FS is not set 718# CONFIG_OCFS2_FS is not set
709CONFIG_DNOTIFY=y 719CONFIG_DNOTIFY=y
@@ -733,6 +743,7 @@ CONFIG_INOTIFY_USER=y
733CONFIG_PROC_FS=y 743CONFIG_PROC_FS=y
734CONFIG_PROC_KCORE=y 744CONFIG_PROC_KCORE=y
735CONFIG_PROC_SYSCTL=y 745CONFIG_PROC_SYSCTL=y
746CONFIG_PROC_PAGE_MONITOR=y
736CONFIG_SYSFS=y 747CONFIG_SYSFS=y
737CONFIG_TMPFS=y 748CONFIG_TMPFS=y
738# CONFIG_TMPFS_POSIX_ACL is not set 749# CONFIG_TMPFS_POSIX_ACL is not set
@@ -780,6 +791,7 @@ CONFIG_LOCKD=y
780CONFIG_LOCKD_V4=y 791CONFIG_LOCKD_V4=y
781CONFIG_NFS_COMMON=y 792CONFIG_NFS_COMMON=y
782CONFIG_SUNRPC=y 793CONFIG_SUNRPC=y
794# CONFIG_SUNRPC_REGISTER_V4 is not set
783# CONFIG_RPCSEC_GSS_KRB5 is not set 795# CONFIG_RPCSEC_GSS_KRB5 is not set
784# CONFIG_RPCSEC_GSS_SPKM3 is not set 796# CONFIG_RPCSEC_GSS_SPKM3 is not set
785# CONFIG_SMB_FS is not set 797# CONFIG_SMB_FS is not set
@@ -800,7 +812,6 @@ CONFIG_MSDOS_PARTITION=y
800# Library routines 812# Library routines
801# 813#
802CONFIG_BITREVERSE=y 814CONFIG_BITREVERSE=y
803# CONFIG_GENERIC_FIND_FIRST_BIT is not set
804# CONFIG_CRC_CCITT is not set 815# CONFIG_CRC_CCITT is not set
805# CONFIG_CRC16 is not set 816# CONFIG_CRC16 is not set
806# CONFIG_CRC_T10DIF is not set 817# CONFIG_CRC_T10DIF is not set
@@ -854,14 +865,21 @@ CONFIG_SCHED_DEBUG=y
854# CONFIG_DEBUG_SG is not set 865# CONFIG_DEBUG_SG is not set
855# CONFIG_BOOT_PRINTK_DELAY is not set 866# CONFIG_BOOT_PRINTK_DELAY is not set
856# CONFIG_RCU_TORTURE_TEST is not set 867# CONFIG_RCU_TORTURE_TEST is not set
868# CONFIG_RCU_CPU_STALL_DETECTOR is not set
857# CONFIG_BACKTRACE_SELF_TEST is not set 869# CONFIG_BACKTRACE_SELF_TEST is not set
870# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
858# CONFIG_FAULT_INJECTION is not set 871# CONFIG_FAULT_INJECTION is not set
859# CONFIG_LATENCYTOP is not set 872# CONFIG_LATENCYTOP is not set
873CONFIG_SYSCTL_SYSCALL_CHECK=y
874CONFIG_NOP_TRACER=y
860CONFIG_HAVE_FTRACE=y 875CONFIG_HAVE_FTRACE=y
861CONFIG_HAVE_DYNAMIC_FTRACE=y 876CONFIG_HAVE_DYNAMIC_FTRACE=y
862# CONFIG_FTRACE is not set 877# CONFIG_FTRACE is not set
863# CONFIG_SCHED_TRACER is not set 878# CONFIG_SCHED_TRACER is not set
864# CONFIG_CONTEXT_SWITCH_TRACER is not set 879# CONFIG_CONTEXT_SWITCH_TRACER is not set
880# CONFIG_BOOT_TRACER is not set
881# CONFIG_STACK_TRACER is not set
882# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
865# CONFIG_SAMPLES is not set 883# CONFIG_SAMPLES is not set
866CONFIG_HAVE_ARCH_KGDB=y 884CONFIG_HAVE_ARCH_KGDB=y
867# CONFIG_KGDB is not set 885# CONFIG_KGDB is not set
@@ -870,6 +888,7 @@ CONFIG_HAVE_ARCH_KGDB=y
870# CONFIG_DEBUG_PAGEALLOC is not set 888# CONFIG_DEBUG_PAGEALLOC is not set
871# CONFIG_CODE_PATCHING_SELFTEST is not set 889# CONFIG_CODE_PATCHING_SELFTEST is not set
872# CONFIG_FTR_FIXUP_SELFTEST is not set 890# CONFIG_FTR_FIXUP_SELFTEST is not set
891# CONFIG_MSI_BITMAP_SELFTEST is not set
873# CONFIG_XMON is not set 892# CONFIG_XMON is not set
874# CONFIG_IRQSTACKS is not set 893# CONFIG_IRQSTACKS is not set
875# CONFIG_VIRQ_DEBUG is not set 894# CONFIG_VIRQ_DEBUG is not set
@@ -894,14 +913,19 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
894# 913#
895# CONFIG_KEYS is not set 914# CONFIG_KEYS is not set
896# CONFIG_SECURITY is not set 915# CONFIG_SECURITY is not set
916# CONFIG_SECURITYFS is not set
897# CONFIG_SECURITY_FILE_CAPABILITIES is not set 917# CONFIG_SECURITY_FILE_CAPABILITIES is not set
898CONFIG_CRYPTO=y 918CONFIG_CRYPTO=y
899 919
900# 920#
901# Crypto core or helper 921# Crypto core or helper
902# 922#
923# CONFIG_CRYPTO_FIPS is not set
903CONFIG_CRYPTO_ALGAPI=y 924CONFIG_CRYPTO_ALGAPI=y
925CONFIG_CRYPTO_AEAD=y
904CONFIG_CRYPTO_BLKCIPHER=y 926CONFIG_CRYPTO_BLKCIPHER=y
927CONFIG_CRYPTO_HASH=y
928CONFIG_CRYPTO_RNG=y
905CONFIG_CRYPTO_MANAGER=y 929CONFIG_CRYPTO_MANAGER=y
906# CONFIG_CRYPTO_GF128MUL is not set 930# CONFIG_CRYPTO_GF128MUL is not set
907# CONFIG_CRYPTO_NULL is not set 931# CONFIG_CRYPTO_NULL is not set
@@ -974,6 +998,11 @@ CONFIG_CRYPTO_DES=y
974# 998#
975# CONFIG_CRYPTO_DEFLATE is not set 999# CONFIG_CRYPTO_DEFLATE is not set
976# CONFIG_CRYPTO_LZO is not set 1000# CONFIG_CRYPTO_LZO is not set
1001
1002#
1003# Random Number Generation
1004#
1005# CONFIG_CRYPTO_ANSI_CPRNG is not set
977CONFIG_CRYPTO_HW=y 1006CONFIG_CRYPTO_HW=y
978# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1007# CONFIG_CRYPTO_DEV_HIFN_795X is not set
979# CONFIG_PPC_CLOCK is not set 1008# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index 0ed2de05f4e8..15f48e03ec2e 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:12:48 2008 4# Tue Oct 28 09:16:15 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -93,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""
93CONFIG_SYSCTL=y 92CONFIG_SYSCTL=y
94CONFIG_EMBEDDED=y 93CONFIG_EMBEDDED=y
95CONFIG_SYSCTL_SYSCALL=y 94CONFIG_SYSCTL_SYSCALL=y
96CONFIG_SYSCTL_SYSCALL_CHECK=y
97CONFIG_KALLSYMS=y 95CONFIG_KALLSYMS=y
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
99CONFIG_HOTPLUG=y 97CONFIG_HOTPLUG=y
@@ -109,7 +107,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
115CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -159,6 +155,7 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
162# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
163 160
164# 161#
@@ -175,9 +172,13 @@ CONFIG_SAM440EP=y
175# CONFIG_KATMAI is not set 172# CONFIG_KATMAI is not set
176# CONFIG_RAINIER is not set 173# CONFIG_RAINIER is not set
177# CONFIG_WARP is not set 174# CONFIG_WARP is not set
175# CONFIG_ARCHES is not set
178# CONFIG_CANYONLANDS is not set 176# CONFIG_CANYONLANDS is not set
177# CONFIG_GLACIER is not set
179# CONFIG_YOSEMITE is not set 178# CONFIG_YOSEMITE is not set
180# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
180# CONFIG_PPC44x_SIMPLE is not set
181# CONFIG_PPC4xx_GPIO is not set
181CONFIG_440EP=y 182CONFIG_440EP=y
182CONFIG_IBM440EP_ERR42=y 183CONFIG_IBM440EP_ERR42=y
183# CONFIG_IPIC is not set 184# CONFIG_IPIC is not set
@@ -197,7 +198,6 @@ CONFIG_IBM440EP_ERR42=y
197# Kernel options 198# Kernel options
198# 199#
199# CONFIG_HIGHMEM is not set 200# CONFIG_HIGHMEM is not set
200# CONFIG_TICK_ONESHOT is not set
201# CONFIG_NO_HZ is not set 201# CONFIG_NO_HZ is not set
202# CONFIG_HIGH_RES_TIMERS is not set 202# CONFIG_HIGH_RES_TIMERS is not set
203CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 203CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -211,6 +211,8 @@ CONFIG_PREEMPT_NONE=y
211# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
212# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
213CONFIG_BINFMT_ELF=y 213CONFIG_BINFMT_ELF=y
214# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
215# CONFIG_HAVE_AOUT is not set
214# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
215# CONFIG_MATH_EMULATION is not set 217# CONFIG_MATH_EMULATION is not set
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
@@ -225,15 +227,15 @@ CONFIG_FLATMEM_MANUAL=y
225# CONFIG_SPARSEMEM_MANUAL is not set 227# CONFIG_SPARSEMEM_MANUAL is not set
226CONFIG_FLATMEM=y 228CONFIG_FLATMEM=y
227CONFIG_FLAT_NODE_MEM_MAP=y 229CONFIG_FLAT_NODE_MEM_MAP=y
228# CONFIG_SPARSEMEM_STATIC is not set
229# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
230CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y 233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y
234CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y
237CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 241CONFIG_CMDLINE_BOOL=y
@@ -319,6 +321,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
319# CONFIG_TIPC is not set 321# CONFIG_TIPC is not set
320# CONFIG_ATM is not set 322# CONFIG_ATM is not set
321# CONFIG_BRIDGE is not set 323# CONFIG_BRIDGE is not set
324# CONFIG_NET_DSA is not set
322# CONFIG_VLAN_8021Q is not set 325# CONFIG_VLAN_8021Q is not set
323# CONFIG_DECNET is not set 326# CONFIG_DECNET is not set
324# CONFIG_LLC2 is not set 327# CONFIG_LLC2 is not set
@@ -339,14 +342,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_IRDA is not set 342# CONFIG_IRDA is not set
340# CONFIG_BT is not set 343# CONFIG_BT is not set
341# CONFIG_AF_RXRPC is not set 344# CONFIG_AF_RXRPC is not set
342 345# CONFIG_PHONET is not set
343# 346# CONFIG_WIRELESS is not set
344# Wireless
345#
346# CONFIG_CFG80211 is not set
347# CONFIG_WIRELESS_EXT is not set
348# CONFIG_MAC80211 is not set
349# CONFIG_IEEE80211 is not set
350# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
351# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
352 349
@@ -536,8 +533,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
536# CONFIG_IBM_NEW_EMAC_RGMII is not set 533# CONFIG_IBM_NEW_EMAC_RGMII is not set
537# CONFIG_IBM_NEW_EMAC_TAH is not set 534# CONFIG_IBM_NEW_EMAC_TAH is not set
538# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 535# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
536# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
537# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
538# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
539# CONFIG_NET_PCI is not set 539# CONFIG_NET_PCI is not set
540# CONFIG_B44 is not set 540# CONFIG_B44 is not set
541# CONFIG_ATL2 is not set
541# CONFIG_NETDEV_1000 is not set 542# CONFIG_NETDEV_1000 is not set
542# CONFIG_NETDEV_10000 is not set 543# CONFIG_NETDEV_10000 is not set
543# CONFIG_TR is not set 544# CONFIG_TR is not set
@@ -573,7 +574,7 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
573# Input device support 574# Input device support
574# 575#
575CONFIG_INPUT=y 576CONFIG_INPUT=y
576# CONFIG_INPUT_FF_MEMLESS is not set 577CONFIG_INPUT_FF_MEMLESS=m
577# CONFIG_INPUT_POLLDEV is not set 578# CONFIG_INPUT_POLLDEV is not set
578 579
579# 580#
@@ -607,6 +608,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
607# CONFIG_MOUSE_PS2_TOUCHKIT is not set 608# CONFIG_MOUSE_PS2_TOUCHKIT is not set
608# CONFIG_MOUSE_SERIAL is not set 609# CONFIG_MOUSE_SERIAL is not set
609# CONFIG_MOUSE_APPLETOUCH is not set 610# CONFIG_MOUSE_APPLETOUCH is not set
611# CONFIG_MOUSE_BCM5974 is not set
610# CONFIG_MOUSE_VSXXXAA is not set 612# CONFIG_MOUSE_VSXXXAA is not set
611# CONFIG_INPUT_JOYSTICK is not set 613# CONFIG_INPUT_JOYSTICK is not set
612# CONFIG_INPUT_TABLET is not set 614# CONFIG_INPUT_TABLET is not set
@@ -673,6 +675,7 @@ CONFIG_DEVPORT=y
673CONFIG_I2C=y 675CONFIG_I2C=y
674CONFIG_I2C_BOARDINFO=y 676CONFIG_I2C_BOARDINFO=y
675# CONFIG_I2C_CHARDEV is not set 677# CONFIG_I2C_CHARDEV is not set
678CONFIG_I2C_HELPER_AUTO=y
676CONFIG_I2C_ALGOBIT=y 679CONFIG_I2C_ALGOBIT=y
677 680
678# 681#
@@ -761,6 +764,9 @@ CONFIG_SSB_POSSIBLE=y
761# CONFIG_MFD_CORE is not set 764# CONFIG_MFD_CORE is not set
762# CONFIG_MFD_SM501 is not set 765# CONFIG_MFD_SM501 is not set
763# CONFIG_HTC_PASIC3 is not set 766# CONFIG_HTC_PASIC3 is not set
767# CONFIG_MFD_TMIO is not set
768# CONFIG_MFD_WM8400 is not set
769# CONFIG_MFD_WM8350_I2C is not set
764 770
765# 771#
766# Multimedia devices 772# Multimedia devices
@@ -788,6 +794,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
788CONFIG_FB=y 794CONFIG_FB=y
789# CONFIG_FIRMWARE_EDID is not set 795# CONFIG_FIRMWARE_EDID is not set
790CONFIG_FB_DDC=y 796CONFIG_FB_DDC=y
797# CONFIG_FB_BOOT_VESA_SUPPORT is not set
791CONFIG_FB_CFB_FILLRECT=y 798CONFIG_FB_CFB_FILLRECT=y
792CONFIG_FB_CFB_COPYAREA=y 799CONFIG_FB_CFB_COPYAREA=y
793CONFIG_FB_CFB_IMAGEBLIT=y 800CONFIG_FB_CFB_IMAGEBLIT=y
@@ -828,6 +835,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
828# CONFIG_FB_S3 is not set 835# CONFIG_FB_S3 is not set
829# CONFIG_FB_SAVAGE is not set 836# CONFIG_FB_SAVAGE is not set
830# CONFIG_FB_SIS is not set 837# CONFIG_FB_SIS is not set
838# CONFIG_FB_VIA is not set
831# CONFIG_FB_NEOMAGIC is not set 839# CONFIG_FB_NEOMAGIC is not set
832# CONFIG_FB_KYRO is not set 840# CONFIG_FB_KYRO is not set
833# CONFIG_FB_3DFX is not set 841# CONFIG_FB_3DFX is not set
@@ -839,6 +847,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
839# CONFIG_FB_CARMINE is not set 847# CONFIG_FB_CARMINE is not set
840# CONFIG_FB_IBM_GXT4500 is not set 848# CONFIG_FB_IBM_GXT4500 is not set
841# CONFIG_FB_VIRTUAL is not set 849# CONFIG_FB_VIRTUAL is not set
850# CONFIG_FB_METRONOME is not set
842CONFIG_BACKLIGHT_LCD_SUPPORT=y 851CONFIG_BACKLIGHT_LCD_SUPPORT=y
843CONFIG_LCD_CLASS_DEVICE=y 852CONFIG_LCD_CLASS_DEVICE=y
844# CONFIG_LCD_ILI9320 is not set 853# CONFIG_LCD_ILI9320 is not set
@@ -875,9 +884,36 @@ CONFIG_HID=y
875# USB Input Devices 884# USB Input Devices
876# 885#
877CONFIG_USB_HID=y 886CONFIG_USB_HID=y
878# CONFIG_USB_HIDINPUT_POWERBOOK is not set 887# CONFIG_HID_PID is not set
879# CONFIG_HID_FF is not set
880# CONFIG_USB_HIDDEV is not set 888# CONFIG_USB_HIDDEV is not set
889
890#
891# Special HID drivers
892#
893CONFIG_HID_COMPAT=y
894CONFIG_HID_A4TECH=y
895CONFIG_HID_APPLE=y
896CONFIG_HID_BELKIN=y
897CONFIG_HID_BRIGHT=y
898CONFIG_HID_CHERRY=y
899CONFIG_HID_CHICONY=y
900CONFIG_HID_CYPRESS=y
901CONFIG_HID_DELL=y
902CONFIG_HID_EZKEY=y
903CONFIG_HID_GYRATION=y
904CONFIG_HID_LOGITECH=y
905# CONFIG_LOGITECH_FF is not set
906# CONFIG_LOGIRUMBLEPAD2_FF is not set
907CONFIG_HID_MICROSOFT=y
908CONFIG_HID_MONTEREY=y
909CONFIG_HID_PANTHERLORD=y
910# CONFIG_PANTHERLORD_FF is not set
911CONFIG_HID_PETALYNX=y
912CONFIG_HID_SAMSUNG=y
913CONFIG_HID_SONY=y
914CONFIG_HID_SUNPLUS=y
915CONFIG_THRUSTMASTER_FF=m
916CONFIG_ZEROPLUS_FF=m
881CONFIG_USB_SUPPORT=y 917CONFIG_USB_SUPPORT=y
882CONFIG_USB_ARCH_HAS_HCD=y 918CONFIG_USB_ARCH_HAS_HCD=y
883CONFIG_USB_ARCH_HAS_OHCI=y 919CONFIG_USB_ARCH_HAS_OHCI=y
@@ -895,6 +931,9 @@ CONFIG_USB_DEVICEFS=y
895# CONFIG_USB_OTG is not set 931# CONFIG_USB_OTG is not set
896# CONFIG_USB_OTG_WHITELIST is not set 932# CONFIG_USB_OTG_WHITELIST is not set
897# CONFIG_USB_OTG_BLACKLIST_HUB is not set 933# CONFIG_USB_OTG_BLACKLIST_HUB is not set
934# CONFIG_USB_MON is not set
935# CONFIG_USB_WUSB is not set
936# CONFIG_USB_WUSB_CBAF is not set
898 937
899# 938#
900# USB Host Controller Drivers 939# USB Host Controller Drivers
@@ -917,6 +956,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
917# CONFIG_USB_UHCI_HCD is not set 956# CONFIG_USB_UHCI_HCD is not set
918# CONFIG_USB_SL811_HCD is not set 957# CONFIG_USB_SL811_HCD is not set
919# CONFIG_USB_R8A66597_HCD is not set 958# CONFIG_USB_R8A66597_HCD is not set
959# CONFIG_USB_WHCI_HCD is not set
960# CONFIG_USB_HWA_HCD is not set
920 961
921# 962#
922# USB Device Class drivers 963# USB Device Class drivers
@@ -924,6 +965,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
924# CONFIG_USB_ACM is not set 965# CONFIG_USB_ACM is not set
925# CONFIG_USB_PRINTER is not set 966# CONFIG_USB_PRINTER is not set
926# CONFIG_USB_WDM is not set 967# CONFIG_USB_WDM is not set
968# CONFIG_USB_TMC is not set
927 969
928# 970#
929# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 971# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -953,7 +995,6 @@ CONFIG_USB_STORAGE=m
953# 995#
954# CONFIG_USB_MDC800 is not set 996# CONFIG_USB_MDC800 is not set
955# CONFIG_USB_MICROTEK is not set 997# CONFIG_USB_MICROTEK is not set
956# CONFIG_USB_MON is not set
957 998
958# 999#
959# USB port drivers 1000# USB port drivers
@@ -966,7 +1007,7 @@ CONFIG_USB_STORAGE=m
966# CONFIG_USB_EMI62 is not set 1007# CONFIG_USB_EMI62 is not set
967# CONFIG_USB_EMI26 is not set 1008# CONFIG_USB_EMI26 is not set
968# CONFIG_USB_ADUTUX is not set 1009# CONFIG_USB_ADUTUX is not set
969# CONFIG_USB_AUERSWALD is not set 1010# CONFIG_USB_SEVSEG is not set
970# CONFIG_USB_RIO500 is not set 1011# CONFIG_USB_RIO500 is not set
971# CONFIG_USB_LEGOTOWER is not set 1012# CONFIG_USB_LEGOTOWER is not set
972# CONFIG_USB_LCD is not set 1013# CONFIG_USB_LCD is not set
@@ -984,7 +1025,9 @@ CONFIG_USB_STORAGE=m
984# CONFIG_USB_IOWARRIOR is not set 1025# CONFIG_USB_IOWARRIOR is not set
985# CONFIG_USB_TEST is not set 1026# CONFIG_USB_TEST is not set
986# CONFIG_USB_ISIGHTFW is not set 1027# CONFIG_USB_ISIGHTFW is not set
1028# CONFIG_USB_VST is not set
987# CONFIG_USB_GADGET is not set 1029# CONFIG_USB_GADGET is not set
1030# CONFIG_UWB is not set
988# CONFIG_MMC is not set 1031# CONFIG_MMC is not set
989# CONFIG_MEMSTICK is not set 1032# CONFIG_MEMSTICK is not set
990# CONFIG_NEW_LEDS is not set 1033# CONFIG_NEW_LEDS is not set
@@ -1031,12 +1074,15 @@ CONFIG_RTC_DRV_M41T80_WDT=y
1031# Platform RTC drivers 1074# Platform RTC drivers
1032# 1075#
1033# CONFIG_RTC_DRV_CMOS is not set 1076# CONFIG_RTC_DRV_CMOS is not set
1077# CONFIG_RTC_DRV_DS1286 is not set
1034# CONFIG_RTC_DRV_DS1511 is not set 1078# CONFIG_RTC_DRV_DS1511 is not set
1035# CONFIG_RTC_DRV_DS1553 is not set 1079# CONFIG_RTC_DRV_DS1553 is not set
1036# CONFIG_RTC_DRV_DS1742 is not set 1080# CONFIG_RTC_DRV_DS1742 is not set
1037# CONFIG_RTC_DRV_STK17TA8 is not set 1081# CONFIG_RTC_DRV_STK17TA8 is not set
1038# CONFIG_RTC_DRV_M48T86 is not set 1082# CONFIG_RTC_DRV_M48T86 is not set
1083# CONFIG_RTC_DRV_M48T35 is not set
1039# CONFIG_RTC_DRV_M48T59 is not set 1084# CONFIG_RTC_DRV_M48T59 is not set
1085# CONFIG_RTC_DRV_BQ4802 is not set
1040# CONFIG_RTC_DRV_V3020 is not set 1086# CONFIG_RTC_DRV_V3020 is not set
1041 1087
1042# 1088#
@@ -1045,6 +1091,7 @@ CONFIG_RTC_DRV_M41T80_WDT=y
1045# CONFIG_RTC_DRV_PPC is not set 1091# CONFIG_RTC_DRV_PPC is not set
1046# CONFIG_DMADEVICES is not set 1092# CONFIG_DMADEVICES is not set
1047# CONFIG_UIO is not set 1093# CONFIG_UIO is not set
1094# CONFIG_STAGING is not set
1048 1095
1049# 1096#
1050# File systems 1097# File systems
@@ -1058,7 +1105,7 @@ CONFIG_EXT3_FS=y
1058CONFIG_EXT3_FS_XATTR=y 1105CONFIG_EXT3_FS_XATTR=y
1059CONFIG_EXT3_FS_POSIX_ACL=y 1106CONFIG_EXT3_FS_POSIX_ACL=y
1060# CONFIG_EXT3_FS_SECURITY is not set 1107# CONFIG_EXT3_FS_SECURITY is not set
1061# CONFIG_EXT4DEV_FS is not set 1108# CONFIG_EXT4_FS is not set
1062CONFIG_JBD=y 1109CONFIG_JBD=y
1063CONFIG_FS_MBCACHE=y 1110CONFIG_FS_MBCACHE=y
1064CONFIG_REISERFS_FS=y 1111CONFIG_REISERFS_FS=y
@@ -1067,6 +1114,7 @@ CONFIG_REISERFS_FS=y
1067# CONFIG_REISERFS_FS_XATTR is not set 1114# CONFIG_REISERFS_FS_XATTR is not set
1068# CONFIG_JFS_FS is not set 1115# CONFIG_JFS_FS is not set
1069CONFIG_FS_POSIX_ACL=y 1116CONFIG_FS_POSIX_ACL=y
1117CONFIG_FILE_LOCKING=y
1070# CONFIG_XFS_FS is not set 1118# CONFIG_XFS_FS is not set
1071# CONFIG_OCFS2_FS is not set 1119# CONFIG_OCFS2_FS is not set
1072CONFIG_DNOTIFY=y 1120CONFIG_DNOTIFY=y
@@ -1102,6 +1150,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1102CONFIG_PROC_FS=y 1150CONFIG_PROC_FS=y
1103CONFIG_PROC_KCORE=y 1151CONFIG_PROC_KCORE=y
1104CONFIG_PROC_SYSCTL=y 1152CONFIG_PROC_SYSCTL=y
1153CONFIG_PROC_PAGE_MONITOR=y
1105CONFIG_SYSFS=y 1154CONFIG_SYSFS=y
1106CONFIG_TMPFS=y 1155CONFIG_TMPFS=y
1107# CONFIG_TMPFS_POSIX_ACL is not set 1156# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1196,7 +1245,6 @@ CONFIG_NLS_ISO8859_1=y
1196# Library routines 1245# Library routines
1197# 1246#
1198CONFIG_BITREVERSE=y 1247CONFIG_BITREVERSE=y
1199# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1200# CONFIG_CRC_CCITT is not set 1248# CONFIG_CRC_CCITT is not set
1201# CONFIG_CRC16 is not set 1249# CONFIG_CRC16 is not set
1202CONFIG_CRC_T10DIF=y 1250CONFIG_CRC_T10DIF=y
@@ -1227,12 +1275,13 @@ CONFIG_MAGIC_SYSRQ=y
1227# CONFIG_SLUB_STATS is not set 1275# CONFIG_SLUB_STATS is not set
1228# CONFIG_DEBUG_BUGVERBOSE is not set 1276# CONFIG_DEBUG_BUGVERBOSE is not set
1229# CONFIG_DEBUG_MEMORY_INIT is not set 1277# CONFIG_DEBUG_MEMORY_INIT is not set
1278# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1230# CONFIG_LATENCYTOP is not set 1279# CONFIG_LATENCYTOP is not set
1280CONFIG_SYSCTL_SYSCALL_CHECK=y
1281CONFIG_NOP_TRACER=y
1231CONFIG_HAVE_FTRACE=y 1282CONFIG_HAVE_FTRACE=y
1232CONFIG_HAVE_DYNAMIC_FTRACE=y 1283CONFIG_HAVE_DYNAMIC_FTRACE=y
1233# CONFIG_FTRACE is not set 1284# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1234# CONFIG_SCHED_TRACER is not set
1235# CONFIG_CONTEXT_SWITCH_TRACER is not set
1236# CONFIG_SAMPLES is not set 1285# CONFIG_SAMPLES is not set
1237CONFIG_HAVE_ARCH_KGDB=y 1286CONFIG_HAVE_ARCH_KGDB=y
1238# CONFIG_IRQSTACKS is not set 1287# CONFIG_IRQSTACKS is not set
@@ -1243,6 +1292,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1243# 1292#
1244# CONFIG_KEYS is not set 1293# CONFIG_KEYS is not set
1245# CONFIG_SECURITY is not set 1294# CONFIG_SECURITY is not set
1295# CONFIG_SECURITYFS is not set
1246# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1296# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1247# CONFIG_CRYPTO is not set 1297# CONFIG_CRYPTO is not set
1248# CONFIG_PPC_CLOCK is not set 1298# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig
index e40b1023265c..562beeaab53d 100644
--- a/arch/powerpc/configs/44x/sequoia_defconfig
+++ b/arch/powerpc/configs/44x/sequoia_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:15:13 2008 4# Tue Oct 28 09:16:16 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""
92CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
93CONFIG_EMBEDDED=y 92CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 93CONFIG_SYSCTL_SYSCALL=y
95CONFIG_SYSCTL_SYSCALL_CHECK=y
96CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
97# CONFIG_KALLSYMS_ALL is not set 95# CONFIG_KALLSYMS_ALL is not set
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -109,7 +107,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
115CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -159,6 +155,7 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
162# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
163 160
164# 161#
@@ -175,9 +172,13 @@ CONFIG_SEQUOIA=y
175# CONFIG_KATMAI is not set 172# CONFIG_KATMAI is not set
176# CONFIG_RAINIER is not set 173# CONFIG_RAINIER is not set
177# CONFIG_WARP is not set 174# CONFIG_WARP is not set
175# CONFIG_ARCHES is not set
178# CONFIG_CANYONLANDS is not set 176# CONFIG_CANYONLANDS is not set
177# CONFIG_GLACIER is not set
179# CONFIG_YOSEMITE is not set 178# CONFIG_YOSEMITE is not set
180# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
180CONFIG_PPC44x_SIMPLE=y
181# CONFIG_PPC4xx_GPIO is not set
181CONFIG_440EPX=y 182CONFIG_440EPX=y
182# CONFIG_IPIC is not set 183# CONFIG_IPIC is not set
183# CONFIG_MPIC is not set 184# CONFIG_MPIC is not set
@@ -205,11 +206,13 @@ CONFIG_HZ_250=y
205# CONFIG_HZ_300 is not set 206# CONFIG_HZ_300 is not set
206# CONFIG_HZ_1000 is not set 207# CONFIG_HZ_1000 is not set
207CONFIG_HZ=250 208CONFIG_HZ=250
208# CONFIG_SCHED_HRTICK is not set 209CONFIG_SCHED_HRTICK=y
209CONFIG_PREEMPT_NONE=y 210CONFIG_PREEMPT_NONE=y
210# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
211# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
212CONFIG_BINFMT_ELF=y 213CONFIG_BINFMT_ELF=y
214# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
215# CONFIG_HAVE_AOUT is not set
213# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
214# CONFIG_MATH_EMULATION is not set 217# CONFIG_MATH_EMULATION is not set
215# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
@@ -224,15 +227,15 @@ CONFIG_FLATMEM_MANUAL=y
224# CONFIG_SPARSEMEM_MANUAL is not set 227# CONFIG_SPARSEMEM_MANUAL is not set
225CONFIG_FLATMEM=y 228CONFIG_FLATMEM=y
226CONFIG_FLAT_NODE_MEM_MAP=y 229CONFIG_FLAT_NODE_MEM_MAP=y
227# CONFIG_SPARSEMEM_STATIC is not set
228# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
229CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
232CONFIG_RESOURCES_64BIT=y 233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y
233CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y
236CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
238CONFIG_CMDLINE_BOOL=y 241CONFIG_CMDLINE_BOOL=y
@@ -319,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
319# CONFIG_TIPC is not set 322# CONFIG_TIPC is not set
320# CONFIG_ATM is not set 323# CONFIG_ATM is not set
321# CONFIG_BRIDGE is not set 324# CONFIG_BRIDGE is not set
325# CONFIG_NET_DSA is not set
322# CONFIG_VLAN_8021Q is not set 326# CONFIG_VLAN_8021Q is not set
323# CONFIG_DECNET is not set 327# CONFIG_DECNET is not set
324# CONFIG_LLC2 is not set 328# CONFIG_LLC2 is not set
@@ -339,14 +343,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_IRDA is not set 343# CONFIG_IRDA is not set
340# CONFIG_BT is not set 344# CONFIG_BT is not set
341# CONFIG_AF_RXRPC is not set 345# CONFIG_AF_RXRPC is not set
342 346# CONFIG_PHONET is not set
343# 347# CONFIG_WIRELESS is not set
344# Wireless
345#
346# CONFIG_CFG80211 is not set
347# CONFIG_WIRELESS_EXT is not set
348# CONFIG_MAC80211 is not set
349# CONFIG_IEEE80211 is not set
350# CONFIG_RFKILL is not set 348# CONFIG_RFKILL is not set
351# CONFIG_NET_9P is not set 349# CONFIG_NET_9P is not set
352 350
@@ -527,8 +525,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
527CONFIG_IBM_NEW_EMAC_RGMII=y 525CONFIG_IBM_NEW_EMAC_RGMII=y
528# CONFIG_IBM_NEW_EMAC_TAH is not set 526# CONFIG_IBM_NEW_EMAC_TAH is not set
529CONFIG_IBM_NEW_EMAC_EMAC4=y 527CONFIG_IBM_NEW_EMAC_EMAC4=y
528# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
529# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
530# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
530# CONFIG_NET_PCI is not set 531# CONFIG_NET_PCI is not set
531# CONFIG_B44 is not set 532# CONFIG_B44 is not set
533# CONFIG_ATL2 is not set
532CONFIG_NETDEV_1000=y 534CONFIG_NETDEV_1000=y
533# CONFIG_ACENIC is not set 535# CONFIG_ACENIC is not set
534# CONFIG_DL2K is not set 536# CONFIG_DL2K is not set
@@ -549,18 +551,22 @@ CONFIG_NETDEV_1000=y
549# CONFIG_QLA3XXX is not set 551# CONFIG_QLA3XXX is not set
550# CONFIG_ATL1 is not set 552# CONFIG_ATL1 is not set
551# CONFIG_ATL1E is not set 553# CONFIG_ATL1E is not set
554# CONFIG_JME is not set
552CONFIG_NETDEV_10000=y 555CONFIG_NETDEV_10000=y
553# CONFIG_CHELSIO_T1 is not set 556# CONFIG_CHELSIO_T1 is not set
554# CONFIG_CHELSIO_T3 is not set 557# CONFIG_CHELSIO_T3 is not set
558# CONFIG_ENIC is not set
555# CONFIG_IXGBE is not set 559# CONFIG_IXGBE is not set
556# CONFIG_IXGB is not set 560# CONFIG_IXGB is not set
557# CONFIG_S2IO is not set 561# CONFIG_S2IO is not set
558# CONFIG_MYRI10GE is not set 562# CONFIG_MYRI10GE is not set
559# CONFIG_NETXEN_NIC is not set 563# CONFIG_NETXEN_NIC is not set
560# CONFIG_NIU is not set 564# CONFIG_NIU is not set
565# CONFIG_MLX4_EN is not set
561# CONFIG_MLX4_CORE is not set 566# CONFIG_MLX4_CORE is not set
562# CONFIG_TEHUTI is not set 567# CONFIG_TEHUTI is not set
563# CONFIG_BNX2X is not set 568# CONFIG_BNX2X is not set
569# CONFIG_QLGE is not set
564# CONFIG_SFC is not set 570# CONFIG_SFC is not set
565# CONFIG_TR is not set 571# CONFIG_TR is not set
566 572
@@ -656,6 +662,8 @@ CONFIG_SSB_POSSIBLE=y
656# CONFIG_MFD_CORE is not set 662# CONFIG_MFD_CORE is not set
657# CONFIG_MFD_SM501 is not set 663# CONFIG_MFD_SM501 is not set
658# CONFIG_HTC_PASIC3 is not set 664# CONFIG_HTC_PASIC3 is not set
665# CONFIG_MFD_TMIO is not set
666# CONFIG_MFD_WM8400 is not set
659 667
660# 668#
661# Multimedia devices 669# Multimedia devices
@@ -697,9 +705,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
697# CONFIG_USB_OTG_BLACKLIST_HUB is not set 705# CONFIG_USB_OTG_BLACKLIST_HUB is not set
698 706
699# 707#
708# Enable Host or Gadget support to see Inventra options
709#
710
711#
700# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
701# 713#
702# CONFIG_USB_GADGET is not set 714# CONFIG_USB_GADGET is not set
715# CONFIG_UWB is not set
703# CONFIG_MMC is not set 716# CONFIG_MMC is not set
704# CONFIG_MEMSTICK is not set 717# CONFIG_MEMSTICK is not set
705# CONFIG_NEW_LEDS is not set 718# CONFIG_NEW_LEDS is not set
@@ -709,6 +722,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
709# CONFIG_RTC_CLASS is not set 722# CONFIG_RTC_CLASS is not set
710# CONFIG_DMADEVICES is not set 723# CONFIG_DMADEVICES is not set
711# CONFIG_UIO is not set 724# CONFIG_UIO is not set
725# CONFIG_STAGING is not set
712 726
713# 727#
714# File systems 728# File systems
@@ -717,10 +731,11 @@ CONFIG_EXT2_FS=y
717# CONFIG_EXT2_FS_XATTR is not set 731# CONFIG_EXT2_FS_XATTR is not set
718# CONFIG_EXT2_FS_XIP is not set 732# CONFIG_EXT2_FS_XIP is not set
719# CONFIG_EXT3_FS is not set 733# CONFIG_EXT3_FS is not set
720# CONFIG_EXT4DEV_FS is not set 734# CONFIG_EXT4_FS is not set
721# CONFIG_REISERFS_FS is not set 735# CONFIG_REISERFS_FS is not set
722# CONFIG_JFS_FS is not set 736# CONFIG_JFS_FS is not set
723# CONFIG_FS_POSIX_ACL is not set 737# CONFIG_FS_POSIX_ACL is not set
738CONFIG_FILE_LOCKING=y
724# CONFIG_XFS_FS is not set 739# CONFIG_XFS_FS is not set
725# CONFIG_OCFS2_FS is not set 740# CONFIG_OCFS2_FS is not set
726CONFIG_DNOTIFY=y 741CONFIG_DNOTIFY=y
@@ -750,6 +765,7 @@ CONFIG_INOTIFY_USER=y
750CONFIG_PROC_FS=y 765CONFIG_PROC_FS=y
751CONFIG_PROC_KCORE=y 766CONFIG_PROC_KCORE=y
752CONFIG_PROC_SYSCTL=y 767CONFIG_PROC_SYSCTL=y
768CONFIG_PROC_PAGE_MONITOR=y
753CONFIG_SYSFS=y 769CONFIG_SYSFS=y
754CONFIG_TMPFS=y 770CONFIG_TMPFS=y
755# CONFIG_TMPFS_POSIX_ACL is not set 771# CONFIG_TMPFS_POSIX_ACL is not set
@@ -797,6 +813,7 @@ CONFIG_LOCKD=y
797CONFIG_LOCKD_V4=y 813CONFIG_LOCKD_V4=y
798CONFIG_NFS_COMMON=y 814CONFIG_NFS_COMMON=y
799CONFIG_SUNRPC=y 815CONFIG_SUNRPC=y
816# CONFIG_SUNRPC_REGISTER_V4 is not set
800# CONFIG_RPCSEC_GSS_KRB5 is not set 817# CONFIG_RPCSEC_GSS_KRB5 is not set
801# CONFIG_RPCSEC_GSS_SPKM3 is not set 818# CONFIG_RPCSEC_GSS_SPKM3 is not set
802# CONFIG_SMB_FS is not set 819# CONFIG_SMB_FS is not set
@@ -817,7 +834,6 @@ CONFIG_MSDOS_PARTITION=y
817# Library routines 834# Library routines
818# 835#
819CONFIG_BITREVERSE=y 836CONFIG_BITREVERSE=y
820# CONFIG_GENERIC_FIND_FIRST_BIT is not set
821# CONFIG_CRC_CCITT is not set 837# CONFIG_CRC_CCITT is not set
822# CONFIG_CRC16 is not set 838# CONFIG_CRC16 is not set
823# CONFIG_CRC_T10DIF is not set 839# CONFIG_CRC_T10DIF is not set
@@ -871,14 +887,21 @@ CONFIG_SCHED_DEBUG=y
871# CONFIG_DEBUG_SG is not set 887# CONFIG_DEBUG_SG is not set
872# CONFIG_BOOT_PRINTK_DELAY is not set 888# CONFIG_BOOT_PRINTK_DELAY is not set
873# CONFIG_RCU_TORTURE_TEST is not set 889# CONFIG_RCU_TORTURE_TEST is not set
890# CONFIG_RCU_CPU_STALL_DETECTOR is not set
874# CONFIG_BACKTRACE_SELF_TEST is not set 891# CONFIG_BACKTRACE_SELF_TEST is not set
892# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
875# CONFIG_FAULT_INJECTION is not set 893# CONFIG_FAULT_INJECTION is not set
876# CONFIG_LATENCYTOP is not set 894# CONFIG_LATENCYTOP is not set
895CONFIG_SYSCTL_SYSCALL_CHECK=y
896CONFIG_NOP_TRACER=y
877CONFIG_HAVE_FTRACE=y 897CONFIG_HAVE_FTRACE=y
878CONFIG_HAVE_DYNAMIC_FTRACE=y 898CONFIG_HAVE_DYNAMIC_FTRACE=y
879# CONFIG_FTRACE is not set 899# CONFIG_FTRACE is not set
880# CONFIG_SCHED_TRACER is not set 900# CONFIG_SCHED_TRACER is not set
881# CONFIG_CONTEXT_SWITCH_TRACER is not set 901# CONFIG_CONTEXT_SWITCH_TRACER is not set
902# CONFIG_BOOT_TRACER is not set
903# CONFIG_STACK_TRACER is not set
904# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
882# CONFIG_SAMPLES is not set 905# CONFIG_SAMPLES is not set
883CONFIG_HAVE_ARCH_KGDB=y 906CONFIG_HAVE_ARCH_KGDB=y
884# CONFIG_KGDB is not set 907# CONFIG_KGDB is not set
@@ -887,6 +910,7 @@ CONFIG_HAVE_ARCH_KGDB=y
887# CONFIG_DEBUG_PAGEALLOC is not set 910# CONFIG_DEBUG_PAGEALLOC is not set
888# CONFIG_CODE_PATCHING_SELFTEST is not set 911# CONFIG_CODE_PATCHING_SELFTEST is not set
889# CONFIG_FTR_FIXUP_SELFTEST is not set 912# CONFIG_FTR_FIXUP_SELFTEST is not set
913# CONFIG_MSI_BITMAP_SELFTEST is not set
890# CONFIG_XMON is not set 914# CONFIG_XMON is not set
891# CONFIG_IRQSTACKS is not set 915# CONFIG_IRQSTACKS is not set
892# CONFIG_VIRQ_DEBUG is not set 916# CONFIG_VIRQ_DEBUG is not set
@@ -911,14 +935,19 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
911# 935#
912# CONFIG_KEYS is not set 936# CONFIG_KEYS is not set
913# CONFIG_SECURITY is not set 937# CONFIG_SECURITY is not set
938# CONFIG_SECURITYFS is not set
914# CONFIG_SECURITY_FILE_CAPABILITIES is not set 939# CONFIG_SECURITY_FILE_CAPABILITIES is not set
915CONFIG_CRYPTO=y 940CONFIG_CRYPTO=y
916 941
917# 942#
918# Crypto core or helper 943# Crypto core or helper
919# 944#
945# CONFIG_CRYPTO_FIPS is not set
920CONFIG_CRYPTO_ALGAPI=y 946CONFIG_CRYPTO_ALGAPI=y
947CONFIG_CRYPTO_AEAD=y
921CONFIG_CRYPTO_BLKCIPHER=y 948CONFIG_CRYPTO_BLKCIPHER=y
949CONFIG_CRYPTO_HASH=y
950CONFIG_CRYPTO_RNG=y
922CONFIG_CRYPTO_MANAGER=y 951CONFIG_CRYPTO_MANAGER=y
923# CONFIG_CRYPTO_GF128MUL is not set 952# CONFIG_CRYPTO_GF128MUL is not set
924# CONFIG_CRYPTO_NULL is not set 953# CONFIG_CRYPTO_NULL is not set
@@ -991,6 +1020,11 @@ CONFIG_CRYPTO_DES=y
991# 1020#
992# CONFIG_CRYPTO_DEFLATE is not set 1021# CONFIG_CRYPTO_DEFLATE is not set
993# CONFIG_CRYPTO_LZO is not set 1022# CONFIG_CRYPTO_LZO is not set
1023
1024#
1025# Random Number Generation
1026#
1027# CONFIG_CRYPTO_ANSI_CPRNG is not set
994CONFIG_CRYPTO_HW=y 1028CONFIG_CRYPTO_HW=y
995# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1029# CONFIG_CRYPTO_DEV_HIFN_795X is not set
996# CONFIG_PPC_CLOCK is not set 1030# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 5075873bdb1b..427bb6a11be5 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:17:48 2008 4# Tue Oct 28 09:16:18 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE=""
91CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
92CONFIG_EMBEDDED=y 91CONFIG_EMBEDDED=y
93CONFIG_SYSCTL_SYSCALL=y 92CONFIG_SYSCTL_SYSCALL=y
94CONFIG_SYSCTL_SYSCALL_CHECK=y
95CONFIG_KALLSYMS=y 93CONFIG_KALLSYMS=y
96# CONFIG_KALLSYMS_ALL is not set 94# CONFIG_KALLSYMS_ALL is not set
97# CONFIG_KALLSYMS_EXTRA_PASS is not set 95# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -108,7 +106,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
114CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -158,6 +154,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 154# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 156CONFIG_CLASSIC_RCU=y
157# CONFIG_FREEZER is not set
161# CONFIG_PPC4xx_PCI_EXPRESS is not set 158# CONFIG_PPC4xx_PCI_EXPRESS is not set
162 159
163# 160#
@@ -174,9 +171,13 @@ CONFIG_TAISHAN=y
174# CONFIG_KATMAI is not set 171# CONFIG_KATMAI is not set
175# CONFIG_RAINIER is not set 172# CONFIG_RAINIER is not set
176# CONFIG_WARP is not set 173# CONFIG_WARP is not set
174# CONFIG_ARCHES is not set
177# CONFIG_CANYONLANDS is not set 175# CONFIG_CANYONLANDS is not set
176# CONFIG_GLACIER is not set
178# CONFIG_YOSEMITE is not set 177# CONFIG_YOSEMITE is not set
179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 178# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
179CONFIG_PPC44x_SIMPLE=y
180# CONFIG_PPC4xx_GPIO is not set
180CONFIG_440GX=y 181CONFIG_440GX=y
181# CONFIG_IPIC is not set 182# CONFIG_IPIC is not set
182# CONFIG_MPIC is not set 183# CONFIG_MPIC is not set
@@ -195,7 +196,6 @@ CONFIG_440GX=y
195# Kernel options 196# Kernel options
196# 197#
197# CONFIG_HIGHMEM is not set 198# CONFIG_HIGHMEM is not set
198# CONFIG_TICK_ONESHOT is not set
199# CONFIG_NO_HZ is not set 199# CONFIG_NO_HZ is not set
200# CONFIG_HIGH_RES_TIMERS is not set 200# CONFIG_HIGH_RES_TIMERS is not set
201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -209,6 +209,8 @@ CONFIG_PREEMPT_NONE=y
209# CONFIG_PREEMPT_VOLUNTARY is not set 209# CONFIG_PREEMPT_VOLUNTARY is not set
210# CONFIG_PREEMPT is not set 210# CONFIG_PREEMPT is not set
211CONFIG_BINFMT_ELF=y 211CONFIG_BINFMT_ELF=y
212# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
213# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
213# CONFIG_MATH_EMULATION is not set 215# CONFIG_MATH_EMULATION is not set
214# CONFIG_IOMMU_HELPER is not set 216# CONFIG_IOMMU_HELPER is not set
@@ -223,15 +225,15 @@ CONFIG_FLATMEM_MANUAL=y
223# CONFIG_SPARSEMEM_MANUAL is not set 225# CONFIG_SPARSEMEM_MANUAL is not set
224CONFIG_FLATMEM=y 226CONFIG_FLATMEM=y
225CONFIG_FLAT_NODE_MEM_MAP=y 227CONFIG_FLAT_NODE_MEM_MAP=y
226# CONFIG_SPARSEMEM_STATIC is not set
227# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
228CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y 231CONFIG_RESOURCES_64BIT=y
232CONFIG_PHYS_ADDR_T_64BIT=y
232CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y
235CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 239CONFIG_CMDLINE_BOOL=y
@@ -318,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 320# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 321# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 322# CONFIG_BRIDGE is not set
323# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 324# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 325# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 326# CONFIG_LLC2 is not set
@@ -338,14 +341,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 341# CONFIG_IRDA is not set
339# CONFIG_BT is not set 342# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
341 344# CONFIG_PHONET is not set
342# 345# CONFIG_WIRELESS is not set
343# Wireless
344#
345# CONFIG_CFG80211 is not set
346# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set
349# CONFIG_RFKILL is not set 346# CONFIG_RFKILL is not set
350# CONFIG_NET_9P is not set 347# CONFIG_NET_9P is not set
351 348
@@ -528,8 +525,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
528CONFIG_IBM_NEW_EMAC_RGMII=y 525CONFIG_IBM_NEW_EMAC_RGMII=y
529CONFIG_IBM_NEW_EMAC_TAH=y 526CONFIG_IBM_NEW_EMAC_TAH=y
530CONFIG_IBM_NEW_EMAC_EMAC4=y 527CONFIG_IBM_NEW_EMAC_EMAC4=y
528# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
529# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
530# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
531# CONFIG_NET_PCI is not set 531# CONFIG_NET_PCI is not set
532# CONFIG_B44 is not set 532# CONFIG_B44 is not set
533# CONFIG_ATL2 is not set
533CONFIG_NETDEV_1000=y 534CONFIG_NETDEV_1000=y
534# CONFIG_ACENIC is not set 535# CONFIG_ACENIC is not set
535# CONFIG_DL2K is not set 536# CONFIG_DL2K is not set
@@ -550,18 +551,22 @@ CONFIG_NETDEV_1000=y
550# CONFIG_QLA3XXX is not set 551# CONFIG_QLA3XXX is not set
551# CONFIG_ATL1 is not set 552# CONFIG_ATL1 is not set
552# CONFIG_ATL1E is not set 553# CONFIG_ATL1E is not set
554# CONFIG_JME is not set
553CONFIG_NETDEV_10000=y 555CONFIG_NETDEV_10000=y
554# CONFIG_CHELSIO_T1 is not set 556# CONFIG_CHELSIO_T1 is not set
555# CONFIG_CHELSIO_T3 is not set 557# CONFIG_CHELSIO_T3 is not set
558# CONFIG_ENIC is not set
556# CONFIG_IXGBE is not set 559# CONFIG_IXGBE is not set
557# CONFIG_IXGB is not set 560# CONFIG_IXGB is not set
558# CONFIG_S2IO is not set 561# CONFIG_S2IO is not set
559# CONFIG_MYRI10GE is not set 562# CONFIG_MYRI10GE is not set
560# CONFIG_NETXEN_NIC is not set 563# CONFIG_NETXEN_NIC is not set
561# CONFIG_NIU is not set 564# CONFIG_NIU is not set
565# CONFIG_MLX4_EN is not set
562# CONFIG_MLX4_CORE is not set 566# CONFIG_MLX4_CORE is not set
563# CONFIG_TEHUTI is not set 567# CONFIG_TEHUTI is not set
564# CONFIG_BNX2X is not set 568# CONFIG_BNX2X is not set
569# CONFIG_QLGE is not set
565# CONFIG_SFC is not set 570# CONFIG_SFC is not set
566# CONFIG_TR is not set 571# CONFIG_TR is not set
567 572
@@ -657,6 +662,8 @@ CONFIG_SSB_POSSIBLE=y
657# CONFIG_MFD_CORE is not set 662# CONFIG_MFD_CORE is not set
658# CONFIG_MFD_SM501 is not set 663# CONFIG_MFD_SM501 is not set
659# CONFIG_HTC_PASIC3 is not set 664# CONFIG_HTC_PASIC3 is not set
665# CONFIG_MFD_TMIO is not set
666# CONFIG_MFD_WM8400 is not set
660 667
661# 668#
662# Multimedia devices 669# Multimedia devices
@@ -698,9 +705,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
698# CONFIG_USB_OTG_BLACKLIST_HUB is not set 705# CONFIG_USB_OTG_BLACKLIST_HUB is not set
699 706
700# 707#
708# Enable Host or Gadget support to see Inventra options
709#
710
711#
701# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
702# 713#
703# CONFIG_USB_GADGET is not set 714# CONFIG_USB_GADGET is not set
715# CONFIG_UWB is not set
704# CONFIG_MMC is not set 716# CONFIG_MMC is not set
705# CONFIG_MEMSTICK is not set 717# CONFIG_MEMSTICK is not set
706# CONFIG_NEW_LEDS is not set 718# CONFIG_NEW_LEDS is not set
@@ -710,6 +722,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
710# CONFIG_RTC_CLASS is not set 722# CONFIG_RTC_CLASS is not set
711# CONFIG_DMADEVICES is not set 723# CONFIG_DMADEVICES is not set
712# CONFIG_UIO is not set 724# CONFIG_UIO is not set
725# CONFIG_STAGING is not set
713 726
714# 727#
715# File systems 728# File systems
@@ -718,10 +731,11 @@ CONFIG_EXT2_FS=y
718# CONFIG_EXT2_FS_XATTR is not set 731# CONFIG_EXT2_FS_XATTR is not set
719# CONFIG_EXT2_FS_XIP is not set 732# CONFIG_EXT2_FS_XIP is not set
720# CONFIG_EXT3_FS is not set 733# CONFIG_EXT3_FS is not set
721# CONFIG_EXT4DEV_FS is not set 734# CONFIG_EXT4_FS is not set
722# CONFIG_REISERFS_FS is not set 735# CONFIG_REISERFS_FS is not set
723# CONFIG_JFS_FS is not set 736# CONFIG_JFS_FS is not set
724# CONFIG_FS_POSIX_ACL is not set 737# CONFIG_FS_POSIX_ACL is not set
738CONFIG_FILE_LOCKING=y
725# CONFIG_XFS_FS is not set 739# CONFIG_XFS_FS is not set
726# CONFIG_OCFS2_FS is not set 740# CONFIG_OCFS2_FS is not set
727CONFIG_DNOTIFY=y 741CONFIG_DNOTIFY=y
@@ -751,6 +765,7 @@ CONFIG_INOTIFY_USER=y
751CONFIG_PROC_FS=y 765CONFIG_PROC_FS=y
752CONFIG_PROC_KCORE=y 766CONFIG_PROC_KCORE=y
753CONFIG_PROC_SYSCTL=y 767CONFIG_PROC_SYSCTL=y
768CONFIG_PROC_PAGE_MONITOR=y
754CONFIG_SYSFS=y 769CONFIG_SYSFS=y
755CONFIG_TMPFS=y 770CONFIG_TMPFS=y
756# CONFIG_TMPFS_POSIX_ACL is not set 771# CONFIG_TMPFS_POSIX_ACL is not set
@@ -788,6 +803,7 @@ CONFIG_LOCKD=y
788CONFIG_LOCKD_V4=y 803CONFIG_LOCKD_V4=y
789CONFIG_NFS_COMMON=y 804CONFIG_NFS_COMMON=y
790CONFIG_SUNRPC=y 805CONFIG_SUNRPC=y
806# CONFIG_SUNRPC_REGISTER_V4 is not set
791# CONFIG_RPCSEC_GSS_KRB5 is not set 807# CONFIG_RPCSEC_GSS_KRB5 is not set
792# CONFIG_RPCSEC_GSS_SPKM3 is not set 808# CONFIG_RPCSEC_GSS_SPKM3 is not set
793# CONFIG_SMB_FS is not set 809# CONFIG_SMB_FS is not set
@@ -808,7 +824,6 @@ CONFIG_MSDOS_PARTITION=y
808# Library routines 824# Library routines
809# 825#
810CONFIG_BITREVERSE=y 826CONFIG_BITREVERSE=y
811# CONFIG_GENERIC_FIND_FIRST_BIT is not set
812# CONFIG_CRC_CCITT is not set 827# CONFIG_CRC_CCITT is not set
813# CONFIG_CRC16 is not set 828# CONFIG_CRC16 is not set
814# CONFIG_CRC_T10DIF is not set 829# CONFIG_CRC_T10DIF is not set
@@ -861,14 +876,21 @@ CONFIG_SCHED_DEBUG=y
861# CONFIG_DEBUG_SG is not set 876# CONFIG_DEBUG_SG is not set
862# CONFIG_BOOT_PRINTK_DELAY is not set 877# CONFIG_BOOT_PRINTK_DELAY is not set
863# CONFIG_RCU_TORTURE_TEST is not set 878# CONFIG_RCU_TORTURE_TEST is not set
879# CONFIG_RCU_CPU_STALL_DETECTOR is not set
864# CONFIG_BACKTRACE_SELF_TEST is not set 880# CONFIG_BACKTRACE_SELF_TEST is not set
881# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
865# CONFIG_FAULT_INJECTION is not set 882# CONFIG_FAULT_INJECTION is not set
866# CONFIG_LATENCYTOP is not set 883# CONFIG_LATENCYTOP is not set
884CONFIG_SYSCTL_SYSCALL_CHECK=y
885CONFIG_NOP_TRACER=y
867CONFIG_HAVE_FTRACE=y 886CONFIG_HAVE_FTRACE=y
868CONFIG_HAVE_DYNAMIC_FTRACE=y 887CONFIG_HAVE_DYNAMIC_FTRACE=y
869# CONFIG_FTRACE is not set 888# CONFIG_FTRACE is not set
870# CONFIG_SCHED_TRACER is not set 889# CONFIG_SCHED_TRACER is not set
871# CONFIG_CONTEXT_SWITCH_TRACER is not set 890# CONFIG_CONTEXT_SWITCH_TRACER is not set
891# CONFIG_BOOT_TRACER is not set
892# CONFIG_STACK_TRACER is not set
893# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
872# CONFIG_SAMPLES is not set 894# CONFIG_SAMPLES is not set
873CONFIG_HAVE_ARCH_KGDB=y 895CONFIG_HAVE_ARCH_KGDB=y
874# CONFIG_KGDB is not set 896# CONFIG_KGDB is not set
@@ -877,6 +899,7 @@ CONFIG_HAVE_ARCH_KGDB=y
877# CONFIG_DEBUG_PAGEALLOC is not set 899# CONFIG_DEBUG_PAGEALLOC is not set
878# CONFIG_CODE_PATCHING_SELFTEST is not set 900# CONFIG_CODE_PATCHING_SELFTEST is not set
879# CONFIG_FTR_FIXUP_SELFTEST is not set 901# CONFIG_FTR_FIXUP_SELFTEST is not set
902# CONFIG_MSI_BITMAP_SELFTEST is not set
880# CONFIG_XMON is not set 903# CONFIG_XMON is not set
881# CONFIG_IRQSTACKS is not set 904# CONFIG_IRQSTACKS is not set
882# CONFIG_VIRQ_DEBUG is not set 905# CONFIG_VIRQ_DEBUG is not set
@@ -888,14 +911,19 @@ CONFIG_HAVE_ARCH_KGDB=y
888# 911#
889# CONFIG_KEYS is not set 912# CONFIG_KEYS is not set
890# CONFIG_SECURITY is not set 913# CONFIG_SECURITY is not set
914# CONFIG_SECURITYFS is not set
891# CONFIG_SECURITY_FILE_CAPABILITIES is not set 915# CONFIG_SECURITY_FILE_CAPABILITIES is not set
892CONFIG_CRYPTO=y 916CONFIG_CRYPTO=y
893 917
894# 918#
895# Crypto core or helper 919# Crypto core or helper
896# 920#
921# CONFIG_CRYPTO_FIPS is not set
897CONFIG_CRYPTO_ALGAPI=y 922CONFIG_CRYPTO_ALGAPI=y
923CONFIG_CRYPTO_AEAD=y
898CONFIG_CRYPTO_BLKCIPHER=y 924CONFIG_CRYPTO_BLKCIPHER=y
925CONFIG_CRYPTO_HASH=y
926CONFIG_CRYPTO_RNG=y
899CONFIG_CRYPTO_MANAGER=y 927CONFIG_CRYPTO_MANAGER=y
900# CONFIG_CRYPTO_GF128MUL is not set 928# CONFIG_CRYPTO_GF128MUL is not set
901# CONFIG_CRYPTO_NULL is not set 929# CONFIG_CRYPTO_NULL is not set
@@ -968,6 +996,11 @@ CONFIG_CRYPTO_DES=y
968# 996#
969# CONFIG_CRYPTO_DEFLATE is not set 997# CONFIG_CRYPTO_DEFLATE is not set
970# CONFIG_CRYPTO_LZO is not set 998# CONFIG_CRYPTO_LZO is not set
999
1000#
1001# Random Number Generation
1002#
1003# CONFIG_CRYPTO_ANSI_CPRNG is not set
971CONFIG_CRYPTO_HW=y 1004CONFIG_CRYPTO_HW=y
972# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1005# CONFIG_CRYPTO_DEV_HIFN_795X is not set
973# CONFIG_PPC_CLOCK is not set 1006# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index d9375a969c67..59cbd2761ed7 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:23:39 2008 4# Tue Oct 28 09:16:22 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""
92CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
93CONFIG_EMBEDDED=y 92CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 93CONFIG_SYSCTL_SYSCALL=y
95CONFIG_SYSCTL_SYSCALL_CHECK=y
96CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
97# CONFIG_KALLSYMS_ALL is not set 95# CONFIG_KALLSYMS_ALL is not set
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -109,6 +107,7 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_SLAB=y 112CONFIG_SLAB=y
114# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
@@ -122,10 +121,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
@@ -158,6 +153,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 154CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_FREEZER is not set
161 157
162# 158#
163# Platform support 159# Platform support
@@ -173,9 +169,13 @@ CONFIG_CLASSIC_RCU=y
173# CONFIG_KATMAI is not set 169# CONFIG_KATMAI is not set
174# CONFIG_RAINIER is not set 170# CONFIG_RAINIER is not set
175CONFIG_WARP=y 171CONFIG_WARP=y
172# CONFIG_ARCHES is not set
176# CONFIG_CANYONLANDS is not set 173# CONFIG_CANYONLANDS is not set
174# CONFIG_GLACIER is not set
177# CONFIG_YOSEMITE is not set 175# CONFIG_YOSEMITE is not set
178# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 176# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
177# CONFIG_PPC44x_SIMPLE is not set
178# CONFIG_PPC4xx_GPIO is not set
179CONFIG_440EP=y 179CONFIG_440EP=y
180CONFIG_IBM440EP_ERR42=y 180CONFIG_IBM440EP_ERR42=y
181# CONFIG_IPIC is not set 181# CONFIG_IPIC is not set
@@ -195,7 +195,6 @@ CONFIG_IBM440EP_ERR42=y
195# Kernel options 195# Kernel options
196# 196#
197# CONFIG_HIGHMEM is not set 197# CONFIG_HIGHMEM is not set
198# CONFIG_TICK_ONESHOT is not set
199# CONFIG_NO_HZ is not set 198# CONFIG_NO_HZ is not set
200# CONFIG_HIGH_RES_TIMERS is not set 199# CONFIG_HIGH_RES_TIMERS is not set
201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 200CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -209,6 +208,8 @@ CONFIG_PREEMPT_NONE=y
209# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
210# CONFIG_PREEMPT is not set 209# CONFIG_PREEMPT is not set
211CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
211# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
212# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set 213# CONFIG_BINFMT_MISC is not set
213# CONFIG_MATH_EMULATION is not set 214# CONFIG_MATH_EMULATION is not set
214# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
@@ -223,15 +224,15 @@ CONFIG_FLATMEM_MANUAL=y
223# CONFIG_SPARSEMEM_MANUAL is not set 224# CONFIG_SPARSEMEM_MANUAL is not set
224CONFIG_FLATMEM=y 225CONFIG_FLATMEM=y
225CONFIG_FLAT_NODE_MEM_MAP=y 226CONFIG_FLAT_NODE_MEM_MAP=y
226# CONFIG_SPARSEMEM_STATIC is not set
227# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
228CONFIG_PAGEFLAGS_EXTENDED=y 227CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y 230CONFIG_RESOURCES_64BIT=y
231CONFIG_PHYS_ADDR_T_64BIT=y
232CONFIG_ZONE_DMA_FLAG=1 232CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 233CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 234CONFIG_VIRT_TO_BUS=y
235CONFIG_UNEVICTABLE_LRU=y
235CONFIG_FORCE_MAX_ZONEORDER=11 236CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 237CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 238CONFIG_CMDLINE_BOOL=y
@@ -308,7 +309,6 @@ CONFIG_INET_TCP_DIAG=y
308CONFIG_TCP_CONG_CUBIC=y 309CONFIG_TCP_CONG_CUBIC=y
309CONFIG_DEFAULT_TCP_CONG="cubic" 310CONFIG_DEFAULT_TCP_CONG="cubic"
310# CONFIG_TCP_MD5SIG is not set 311# CONFIG_TCP_MD5SIG is not set
311# CONFIG_IP_VS is not set
312# CONFIG_IPV6 is not set 312# CONFIG_IPV6 is not set
313# CONFIG_NETWORK_SECMARK is not set 313# CONFIG_NETWORK_SECMARK is not set
314CONFIG_NETFILTER=y 314CONFIG_NETFILTER=y
@@ -322,10 +322,12 @@ CONFIG_NETFILTER_ADVANCED=y
322# CONFIG_NETFILTER_NETLINK_LOG is not set 322# CONFIG_NETFILTER_NETLINK_LOG is not set
323# CONFIG_NF_CONNTRACK is not set 323# CONFIG_NF_CONNTRACK is not set
324# CONFIG_NETFILTER_XTABLES is not set 324# CONFIG_NETFILTER_XTABLES is not set
325# CONFIG_IP_VS is not set
325 326
326# 327#
327# IP: Netfilter Configuration 328# IP: Netfilter Configuration
328# 329#
330# CONFIG_NF_DEFRAG_IPV4 is not set
329# CONFIG_IP_NF_QUEUE is not set 331# CONFIG_IP_NF_QUEUE is not set
330# CONFIG_IP_NF_IPTABLES is not set 332# CONFIG_IP_NF_IPTABLES is not set
331# CONFIG_IP_NF_ARPTABLES is not set 333# CONFIG_IP_NF_ARPTABLES is not set
@@ -334,6 +336,7 @@ CONFIG_NETFILTER_ADVANCED=y
334# CONFIG_TIPC is not set 336# CONFIG_TIPC is not set
335# CONFIG_ATM is not set 337# CONFIG_ATM is not set
336# CONFIG_BRIDGE is not set 338# CONFIG_BRIDGE is not set
339# CONFIG_NET_DSA is not set
337CONFIG_VLAN_8021Q=y 340CONFIG_VLAN_8021Q=y
338# CONFIG_VLAN_8021Q_GVRP is not set 341# CONFIG_VLAN_8021Q_GVRP is not set
339# CONFIG_DECNET is not set 342# CONFIG_DECNET is not set
@@ -355,14 +358,8 @@ CONFIG_VLAN_8021Q=y
355# CONFIG_IRDA is not set 358# CONFIG_IRDA is not set
356# CONFIG_BT is not set 359# CONFIG_BT is not set
357# CONFIG_AF_RXRPC is not set 360# CONFIG_AF_RXRPC is not set
358 361# CONFIG_PHONET is not set
359# 362# CONFIG_WIRELESS is not set
360# Wireless
361#
362# CONFIG_CFG80211 is not set
363# CONFIG_WIRELESS_EXT is not set
364# CONFIG_MAC80211 is not set
365# CONFIG_IEEE80211 is not set
366# CONFIG_RFKILL is not set 363# CONFIG_RFKILL is not set
367# CONFIG_NET_9P is not set 364# CONFIG_NET_9P is not set
368 365
@@ -550,6 +547,9 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
550# CONFIG_IBM_NEW_EMAC_RGMII is not set 547# CONFIG_IBM_NEW_EMAC_RGMII is not set
551# CONFIG_IBM_NEW_EMAC_TAH is not set 548# CONFIG_IBM_NEW_EMAC_TAH is not set
552# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 549# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
550# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
551# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
552# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
553# CONFIG_B44 is not set 553# CONFIG_B44 is not set
554# CONFIG_NETDEV_1000 is not set 554# CONFIG_NETDEV_1000 is not set
555# CONFIG_NETDEV_10000 is not set 555# CONFIG_NETDEV_10000 is not set
@@ -629,6 +629,7 @@ CONFIG_HW_RANDOM=y
629CONFIG_I2C=y 629CONFIG_I2C=y
630CONFIG_I2C_BOARDINFO=y 630CONFIG_I2C_BOARDINFO=y
631# CONFIG_I2C_CHARDEV is not set 631# CONFIG_I2C_CHARDEV is not set
632CONFIG_I2C_HELPER_AUTO=y
632 633
633# 634#
634# I2C Hardware Bus support 635# I2C Hardware Bus support
@@ -678,6 +679,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
678# CONFIG_POWER_SUPPLY is not set 679# CONFIG_POWER_SUPPLY is not set
679CONFIG_HWMON=y 680CONFIG_HWMON=y
680# CONFIG_HWMON_VID is not set 681# CONFIG_HWMON_VID is not set
682# CONFIG_SENSORS_AD7414 is not set
681# CONFIG_SENSORS_AD7418 is not set 683# CONFIG_SENSORS_AD7418 is not set
682# CONFIG_SENSORS_ADM1021 is not set 684# CONFIG_SENSORS_ADM1021 is not set
683# CONFIG_SENSORS_ADM1025 is not set 685# CONFIG_SENSORS_ADM1025 is not set
@@ -742,6 +744,9 @@ CONFIG_SSB_POSSIBLE=y
742# CONFIG_MFD_CORE is not set 744# CONFIG_MFD_CORE is not set
743# CONFIG_MFD_SM501 is not set 745# CONFIG_MFD_SM501 is not set
744# CONFIG_HTC_PASIC3 is not set 746# CONFIG_HTC_PASIC3 is not set
747# CONFIG_MFD_TMIO is not set
748# CONFIG_MFD_WM8400 is not set
749# CONFIG_MFD_WM8350_I2C is not set
745 750
746# 751#
747# Multimedia devices 752# Multimedia devices
@@ -789,6 +794,9 @@ CONFIG_USB_DEVICE_CLASS=y
789# CONFIG_USB_OTG is not set 794# CONFIG_USB_OTG is not set
790# CONFIG_USB_OTG_WHITELIST is not set 795# CONFIG_USB_OTG_WHITELIST is not set
791# CONFIG_USB_OTG_BLACKLIST_HUB is not set 796# CONFIG_USB_OTG_BLACKLIST_HUB is not set
797CONFIG_USB_MON=y
798# CONFIG_USB_WUSB is not set
799# CONFIG_USB_WUSB_CBAF is not set
792 800
793# 801#
794# USB Host Controller Drivers 802# USB Host Controller Drivers
@@ -805,6 +813,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
805CONFIG_USB_OHCI_LITTLE_ENDIAN=y 813CONFIG_USB_OHCI_LITTLE_ENDIAN=y
806# CONFIG_USB_SL811_HCD is not set 814# CONFIG_USB_SL811_HCD is not set
807# CONFIG_USB_R8A66597_HCD is not set 815# CONFIG_USB_R8A66597_HCD is not set
816# CONFIG_USB_HWA_HCD is not set
808 817
809# 818#
810# USB Device Class drivers 819# USB Device Class drivers
@@ -812,6 +821,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
812# CONFIG_USB_ACM is not set 821# CONFIG_USB_ACM is not set
813# CONFIG_USB_PRINTER is not set 822# CONFIG_USB_PRINTER is not set
814# CONFIG_USB_WDM is not set 823# CONFIG_USB_WDM is not set
824# CONFIG_USB_TMC is not set
815 825
816# 826#
817# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 827# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -840,7 +850,6 @@ CONFIG_USB_STORAGE=y
840# 850#
841# CONFIG_USB_MDC800 is not set 851# CONFIG_USB_MDC800 is not set
842# CONFIG_USB_MICROTEK is not set 852# CONFIG_USB_MICROTEK is not set
843CONFIG_USB_MON=y
844 853
845# 854#
846# USB port drivers 855# USB port drivers
@@ -853,7 +862,7 @@ CONFIG_USB_MON=y
853# CONFIG_USB_EMI62 is not set 862# CONFIG_USB_EMI62 is not set
854# CONFIG_USB_EMI26 is not set 863# CONFIG_USB_EMI26 is not set
855# CONFIG_USB_ADUTUX is not set 864# CONFIG_USB_ADUTUX is not set
856# CONFIG_USB_AUERSWALD is not set 865# CONFIG_USB_SEVSEG is not set
857# CONFIG_USB_RIO500 is not set 866# CONFIG_USB_RIO500 is not set
858# CONFIG_USB_LEGOTOWER is not set 867# CONFIG_USB_LEGOTOWER is not set
859# CONFIG_USB_LCD is not set 868# CONFIG_USB_LCD is not set
@@ -869,13 +878,14 @@ CONFIG_USB_MON=y
869# CONFIG_USB_TRANCEVIBRATOR is not set 878# CONFIG_USB_TRANCEVIBRATOR is not set
870# CONFIG_USB_IOWARRIOR is not set 879# CONFIG_USB_IOWARRIOR is not set
871# CONFIG_USB_ISIGHTFW is not set 880# CONFIG_USB_ISIGHTFW is not set
881# CONFIG_USB_VST is not set
872# CONFIG_USB_GADGET is not set 882# CONFIG_USB_GADGET is not set
873CONFIG_MMC=m 883CONFIG_MMC=m
874# CONFIG_MMC_DEBUG is not set 884# CONFIG_MMC_DEBUG is not set
875# CONFIG_MMC_UNSAFE_RESUME is not set 885# CONFIG_MMC_UNSAFE_RESUME is not set
876 886
877# 887#
878# MMC/SD Card Drivers 888# MMC/SD/SDIO Card Drivers
879# 889#
880CONFIG_MMC_BLOCK=m 890CONFIG_MMC_BLOCK=m
881CONFIG_MMC_BLOCK_BOUNCE=y 891CONFIG_MMC_BLOCK_BOUNCE=y
@@ -883,7 +893,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
883# CONFIG_MMC_TEST is not set 893# CONFIG_MMC_TEST is not set
884 894
885# 895#
886# MMC/SD Host Controller Drivers 896# MMC/SD/SDIO Host Controller Drivers
887# 897#
888# CONFIG_MMC_SDHCI is not set 898# CONFIG_MMC_SDHCI is not set
889# CONFIG_MMC_WBSD is not set 899# CONFIG_MMC_WBSD is not set
@@ -894,6 +904,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
894# CONFIG_RTC_CLASS is not set 904# CONFIG_RTC_CLASS is not set
895# CONFIG_DMADEVICES is not set 905# CONFIG_DMADEVICES is not set
896# CONFIG_UIO is not set 906# CONFIG_UIO is not set
907# CONFIG_STAGING is not set
897 908
898# 909#
899# File systems 910# File systems
@@ -902,10 +913,11 @@ CONFIG_EXT2_FS=y
902# CONFIG_EXT2_FS_XATTR is not set 913# CONFIG_EXT2_FS_XATTR is not set
903# CONFIG_EXT2_FS_XIP is not set 914# CONFIG_EXT2_FS_XIP is not set
904# CONFIG_EXT3_FS is not set 915# CONFIG_EXT3_FS is not set
905# CONFIG_EXT4DEV_FS is not set 916# CONFIG_EXT4_FS is not set
906# CONFIG_REISERFS_FS is not set 917# CONFIG_REISERFS_FS is not set
907# CONFIG_JFS_FS is not set 918# CONFIG_JFS_FS is not set
908# CONFIG_FS_POSIX_ACL is not set 919# CONFIG_FS_POSIX_ACL is not set
920CONFIG_FILE_LOCKING=y
909# CONFIG_XFS_FS is not set 921# CONFIG_XFS_FS is not set
910# CONFIG_OCFS2_FS is not set 922# CONFIG_OCFS2_FS is not set
911CONFIG_DNOTIFY=y 923CONFIG_DNOTIFY=y
@@ -938,6 +950,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
938CONFIG_PROC_FS=y 950CONFIG_PROC_FS=y
939CONFIG_PROC_KCORE=y 951CONFIG_PROC_KCORE=y
940CONFIG_PROC_SYSCTL=y 952CONFIG_PROC_SYSCTL=y
953CONFIG_PROC_PAGE_MONITOR=y
941CONFIG_SYSFS=y 954CONFIG_SYSFS=y
942# CONFIG_TMPFS is not set 955# CONFIG_TMPFS is not set
943# CONFIG_HUGETLB_PAGE is not set 956# CONFIG_HUGETLB_PAGE is not set
@@ -984,6 +997,7 @@ CONFIG_LOCKD=y
984CONFIG_LOCKD_V4=y 997CONFIG_LOCKD_V4=y
985CONFIG_NFS_COMMON=y 998CONFIG_NFS_COMMON=y
986CONFIG_SUNRPC=y 999CONFIG_SUNRPC=y
1000# CONFIG_SUNRPC_REGISTER_V4 is not set
987# CONFIG_RPCSEC_GSS_KRB5 is not set 1001# CONFIG_RPCSEC_GSS_KRB5 is not set
988# CONFIG_RPCSEC_GSS_SPKM3 is not set 1002# CONFIG_RPCSEC_GSS_SPKM3 is not set
989# CONFIG_SMB_FS is not set 1003# CONFIG_SMB_FS is not set
@@ -1043,7 +1057,6 @@ CONFIG_NLS_UTF8=y
1043# Library routines 1057# Library routines
1044# 1058#
1045CONFIG_BITREVERSE=y 1059CONFIG_BITREVERSE=y
1046# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1047CONFIG_CRC_CCITT=y 1060CONFIG_CRC_CCITT=y
1048# CONFIG_CRC16 is not set 1061# CONFIG_CRC16 is not set
1049CONFIG_CRC_T10DIF=y 1062CONFIG_CRC_T10DIF=y
@@ -1096,14 +1109,21 @@ CONFIG_DEBUG_INFO=y
1096# CONFIG_DEBUG_SG is not set 1109# CONFIG_DEBUG_SG is not set
1097# CONFIG_BOOT_PRINTK_DELAY is not set 1110# CONFIG_BOOT_PRINTK_DELAY is not set
1098# CONFIG_RCU_TORTURE_TEST is not set 1111# CONFIG_RCU_TORTURE_TEST is not set
1112# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1099# CONFIG_BACKTRACE_SELF_TEST is not set 1113# CONFIG_BACKTRACE_SELF_TEST is not set
1114# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1100# CONFIG_FAULT_INJECTION is not set 1115# CONFIG_FAULT_INJECTION is not set
1101# CONFIG_LATENCYTOP is not set 1116# CONFIG_LATENCYTOP is not set
1117CONFIG_SYSCTL_SYSCALL_CHECK=y
1118CONFIG_NOP_TRACER=y
1102CONFIG_HAVE_FTRACE=y 1119CONFIG_HAVE_FTRACE=y
1103CONFIG_HAVE_DYNAMIC_FTRACE=y 1120CONFIG_HAVE_DYNAMIC_FTRACE=y
1104# CONFIG_FTRACE is not set 1121# CONFIG_FTRACE is not set
1105# CONFIG_SCHED_TRACER is not set 1122# CONFIG_SCHED_TRACER is not set
1106# CONFIG_CONTEXT_SWITCH_TRACER is not set 1123# CONFIG_CONTEXT_SWITCH_TRACER is not set
1124# CONFIG_BOOT_TRACER is not set
1125# CONFIG_STACK_TRACER is not set
1126# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1107# CONFIG_SAMPLES is not set 1127# CONFIG_SAMPLES is not set
1108CONFIG_HAVE_ARCH_KGDB=y 1128CONFIG_HAVE_ARCH_KGDB=y
1109# CONFIG_KGDB is not set 1129# CONFIG_KGDB is not set
@@ -1112,6 +1132,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1112# CONFIG_DEBUG_PAGEALLOC is not set 1132# CONFIG_DEBUG_PAGEALLOC is not set
1113# CONFIG_CODE_PATCHING_SELFTEST is not set 1133# CONFIG_CODE_PATCHING_SELFTEST is not set
1114# CONFIG_FTR_FIXUP_SELFTEST is not set 1134# CONFIG_FTR_FIXUP_SELFTEST is not set
1135# CONFIG_MSI_BITMAP_SELFTEST is not set
1115# CONFIG_XMON is not set 1136# CONFIG_XMON is not set
1116# CONFIG_IRQSTACKS is not set 1137# CONFIG_IRQSTACKS is not set
1117# CONFIG_VIRQ_DEBUG is not set 1138# CONFIG_VIRQ_DEBUG is not set
@@ -1123,12 +1144,14 @@ CONFIG_BDI_SWITCH=y
1123# 1144#
1124# CONFIG_KEYS is not set 1145# CONFIG_KEYS is not set
1125# CONFIG_SECURITY is not set 1146# CONFIG_SECURITY is not set
1147# CONFIG_SECURITYFS is not set
1126# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1148# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1127CONFIG_CRYPTO=y 1149CONFIG_CRYPTO=y
1128 1150
1129# 1151#
1130# Crypto core or helper 1152# Crypto core or helper
1131# 1153#
1154# CONFIG_CRYPTO_FIPS is not set
1132# CONFIG_CRYPTO_MANAGER is not set 1155# CONFIG_CRYPTO_MANAGER is not set
1133# CONFIG_CRYPTO_GF128MUL is not set 1156# CONFIG_CRYPTO_GF128MUL is not set
1134# CONFIG_CRYPTO_NULL is not set 1157# CONFIG_CRYPTO_NULL is not set
@@ -1201,6 +1224,11 @@ CONFIG_CRYPTO=y
1201# 1224#
1202# CONFIG_CRYPTO_DEFLATE is not set 1225# CONFIG_CRYPTO_DEFLATE is not set
1203# CONFIG_CRYPTO_LZO is not set 1226# CONFIG_CRYPTO_LZO is not set
1227
1228#
1229# Random Number Generation
1230#
1231# CONFIG_CRYPTO_ANSI_CPRNG is not set
1204CONFIG_CRYPTO_HW=y 1232CONFIG_CRYPTO_HW=y
1205# CONFIG_PPC_CLOCK is not set 1233# CONFIG_PPC_CLOCK is not set
1206# CONFIG_VIRTUALIZATION is not set 1234# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 6fc4c2127757..851b27e45cfc 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc4 3# Linux kernel version: 2.6.27
4# Thu Aug 21 00:52:05 2008 4# Fri Oct 24 00:42:39 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -90,7 +90,7 @@ CONFIG_NAMESPACES=y
90# CONFIG_PID_NS is not set 90# CONFIG_PID_NS is not set
91CONFIG_BLK_DEV_INITRD=y 91CONFIG_BLK_DEV_INITRD=y
92CONFIG_INITRAMFS_SOURCE="" 92CONFIG_INITRAMFS_SOURCE=""
93# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 93CONFIG_CC_OPTIMIZE_FOR_SIZE=y
94CONFIG_SYSCTL=y 94CONFIG_SYSCTL=y
95# CONFIG_EMBEDDED is not set 95# CONFIG_EMBEDDED is not set
96CONFIG_SYSCTL_SYSCALL=y 96CONFIG_SYSCTL_SYSCALL=y
@@ -101,7 +101,7 @@ CONFIG_HOTPLUG=y
101CONFIG_PRINTK=y 101CONFIG_PRINTK=y
102CONFIG_BUG=y 102CONFIG_BUG=y
103CONFIG_ELF_CORE=y 103CONFIG_ELF_CORE=y
104CONFIG_COMPAT_BRK=y 104# CONFIG_COMPAT_BRK is not set
105CONFIG_BASE_FULL=y 105CONFIG_BASE_FULL=y
106CONFIG_FUTEX=y 106CONFIG_FUTEX=y
107CONFIG_ANON_INODES=y 107CONFIG_ANON_INODES=y
@@ -934,7 +934,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
934CONFIG_SERIAL_CORE=y 934CONFIG_SERIAL_CORE=y
935CONFIG_SERIAL_CORE_CONSOLE=y 935CONFIG_SERIAL_CORE_CONSOLE=y
936# CONFIG_SERIAL_JSM is not set 936# CONFIG_SERIAL_JSM is not set
937CONFIG_SERIAL_OF_PLATFORM=y 937# CONFIG_SERIAL_OF_PLATFORM is not set
938CONFIG_UNIX98_PTYS=y 938CONFIG_UNIX98_PTYS=y
939CONFIG_LEGACY_PTYS=y 939CONFIG_LEGACY_PTYS=y
940CONFIG_LEGACY_PTY_COUNT=256 940CONFIG_LEGACY_PTY_COUNT=256
@@ -1211,7 +1211,6 @@ CONFIG_USB_STORAGE=m
1211# CONFIG_USB_STORAGE_ALAUDA is not set 1211# CONFIG_USB_STORAGE_ALAUDA is not set
1212# CONFIG_USB_STORAGE_ONETOUCH is not set 1212# CONFIG_USB_STORAGE_ONETOUCH is not set
1213# CONFIG_USB_STORAGE_KARMA is not set 1213# CONFIG_USB_STORAGE_KARMA is not set
1214# CONFIG_USB_STORAGE_SIERRA is not set
1215# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1214# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1216# CONFIG_USB_LIBUSUAL is not set 1215# CONFIG_USB_LIBUSUAL is not set
1217 1216
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig
index 6a5b713a07e0..c15c91deb2ab 100644
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 12:34:33 2008 4# Tue Oct 28 08:56:44 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,14 +19,13 @@ CONFIG_4xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
30# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
32CONFIG_STACKTRACE_SUPPORT=y 31CONFIG_STACKTRACE_SUPPORT=y
@@ -37,6 +36,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
37CONFIG_GENERIC_HWEIGHT=y 36CONFIG_GENERIC_HWEIGHT=y
38CONFIG_GENERIC_CALIBRATE_DELAY=y 37CONFIG_GENERIC_CALIBRATE_DELAY=y
39CONFIG_GENERIC_FIND_NEXT_BIT=y 38CONFIG_GENERIC_FIND_NEXT_BIT=y
39CONFIG_GENERIC_GPIO=y
40# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 40# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
41CONFIG_PPC=y 41CONFIG_PPC=y
42CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
@@ -88,7 +88,6 @@ CONFIG_INITRAMFS_SOURCE=""
88CONFIG_SYSCTL=y 88CONFIG_SYSCTL=y
89CONFIG_EMBEDDED=y 89CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
93CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
94CONFIG_KALLSYMS_EXTRA_PASS=y 93CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -105,7 +104,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 104CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 105CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 106CONFIG_SHMEM=y
107CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
109CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 110CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
111CONFIG_SLUB=y 112CONFIG_SLUB=y
@@ -119,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124# CONFIG_HAVE_CLK is not set
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -155,6 +152,7 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
158CONFIG_PPC4xx_PCI_EXPRESS=y 156CONFIG_PPC4xx_PCI_EXPRESS=y
159 157
160# 158#
@@ -163,14 +161,20 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
163# CONFIG_PPC_CELL is not set 161# CONFIG_PPC_CELL is not set
164# CONFIG_PPC_CELL_NATIVE is not set 162# CONFIG_PPC_CELL_NATIVE is not set
165# CONFIG_PQ2ADS is not set 163# CONFIG_PQ2ADS is not set
164CONFIG_PPC4xx_GPIO=y
166CONFIG_XILINX_VIRTEX=y 165CONFIG_XILINX_VIRTEX=y
166CONFIG_ACADIA=y
167CONFIG_EP405=y 167CONFIG_EP405=y
168CONFIG_HCU4=y
168CONFIG_KILAUEA=y 169CONFIG_KILAUEA=y
169CONFIG_MAKALU=y 170CONFIG_MAKALU=y
170CONFIG_WALNUT=y 171CONFIG_WALNUT=y
171CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y 172CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y
173CONFIG_PPC40x_SIMPLE=y
172CONFIG_405GP=y 174CONFIG_405GP=y
173CONFIG_405EX=y 175CONFIG_405EX=y
176CONFIG_405EZ=y
177CONFIG_405GPR=y
174CONFIG_XILINX_VIRTEX_II_PRO=y 178CONFIG_XILINX_VIRTEX_II_PRO=y
175CONFIG_XILINX_VIRTEX_4_FX=y 179CONFIG_XILINX_VIRTEX_4_FX=y
176CONFIG_IBM405_ERR77=y 180CONFIG_IBM405_ERR77=y
@@ -193,7 +197,6 @@ CONFIG_OF_RTC=y
193# Kernel options 197# Kernel options
194# 198#
195# CONFIG_HIGHMEM is not set 199# CONFIG_HIGHMEM is not set
196# CONFIG_TICK_ONESHOT is not set
197# CONFIG_NO_HZ is not set 200# CONFIG_NO_HZ is not set
198# CONFIG_HIGH_RES_TIMERS is not set 201# CONFIG_HIGH_RES_TIMERS is not set
199CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 202CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -207,6 +210,8 @@ CONFIG_PREEMPT_NONE=y
207# CONFIG_PREEMPT_VOLUNTARY is not set 210# CONFIG_PREEMPT_VOLUNTARY is not set
208# CONFIG_PREEMPT is not set 211# CONFIG_PREEMPT is not set
209CONFIG_BINFMT_ELF=y 212CONFIG_BINFMT_ELF=y
213# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
214# CONFIG_HAVE_AOUT is not set
210# CONFIG_BINFMT_MISC is not set 215# CONFIG_BINFMT_MISC is not set
211# CONFIG_MATH_EMULATION is not set 216# CONFIG_MATH_EMULATION is not set
212# CONFIG_IOMMU_HELPER is not set 217# CONFIG_IOMMU_HELPER is not set
@@ -221,15 +226,15 @@ CONFIG_FLATMEM_MANUAL=y
221# CONFIG_SPARSEMEM_MANUAL is not set 226# CONFIG_SPARSEMEM_MANUAL is not set
222CONFIG_FLATMEM=y 227CONFIG_FLATMEM=y
223CONFIG_FLAT_NODE_MEM_MAP=y 228CONFIG_FLAT_NODE_MEM_MAP=y
224# CONFIG_SPARSEMEM_STATIC is not set
225# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
226CONFIG_PAGEFLAGS_EXTENDED=y 229CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 231CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y 232CONFIG_RESOURCES_64BIT=y
233# CONFIG_PHYS_ADDR_T_64BIT is not set
230CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
231CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
232CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
237CONFIG_UNEVICTABLE_LRU=y
233CONFIG_FORCE_MAX_ZONEORDER=11 238CONFIG_FORCE_MAX_ZONEORDER=11
234CONFIG_PROC_DEVICETREE=y 239CONFIG_PROC_DEVICETREE=y
235# CONFIG_CMDLINE_BOOL is not set 240# CONFIG_CMDLINE_BOOL is not set
@@ -339,6 +344,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
339# CONFIG_TIPC is not set 344# CONFIG_TIPC is not set
340# CONFIG_ATM is not set 345# CONFIG_ATM is not set
341# CONFIG_BRIDGE is not set 346# CONFIG_BRIDGE is not set
347# CONFIG_NET_DSA is not set
342# CONFIG_VLAN_8021Q is not set 348# CONFIG_VLAN_8021Q is not set
343# CONFIG_DECNET is not set 349# CONFIG_DECNET is not set
344# CONFIG_LLC2 is not set 350# CONFIG_LLC2 is not set
@@ -359,11 +365,10 @@ CONFIG_IPV6_NDISC_NODETYPE=y
359# CONFIG_IRDA is not set 365# CONFIG_IRDA is not set
360# CONFIG_BT is not set 366# CONFIG_BT is not set
361# CONFIG_AF_RXRPC is not set 367# CONFIG_AF_RXRPC is not set
362 368# CONFIG_PHONET is not set
363# 369CONFIG_WIRELESS=y
364# Wireless
365#
366# CONFIG_CFG80211 is not set 370# CONFIG_CFG80211 is not set
371CONFIG_WIRELESS_OLD_REGULATORY=y
367# CONFIG_WIRELESS_EXT is not set 372# CONFIG_WIRELESS_EXT is not set
368# CONFIG_MAC80211 is not set 373# CONFIG_MAC80211 is not set
369# CONFIG_IEEE80211 is not set 374# CONFIG_IEEE80211 is not set
@@ -476,6 +481,7 @@ CONFIG_MTD_UBI_GLUEBI=y
476# 481#
477# CONFIG_MTD_UBI_DEBUG is not set 482# CONFIG_MTD_UBI_DEBUG is not set
478CONFIG_OF_DEVICE=y 483CONFIG_OF_DEVICE=y
484CONFIG_OF_GPIO=y
479CONFIG_OF_I2C=m 485CONFIG_OF_I2C=m
480# CONFIG_PARPORT is not set 486# CONFIG_PARPORT is not set
481CONFIG_BLK_DEV=y 487CONFIG_BLK_DEV=y
@@ -556,8 +562,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
556CONFIG_IBM_NEW_EMAC_RGMII=y 562CONFIG_IBM_NEW_EMAC_RGMII=y
557# CONFIG_IBM_NEW_EMAC_TAH is not set 563# CONFIG_IBM_NEW_EMAC_TAH is not set
558CONFIG_IBM_NEW_EMAC_EMAC4=y 564CONFIG_IBM_NEW_EMAC_EMAC4=y
565CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL=y
566CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT=y
567CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y
559# CONFIG_NET_PCI is not set 568# CONFIG_NET_PCI is not set
560# CONFIG_B44 is not set 569# CONFIG_B44 is not set
570# CONFIG_ATL2 is not set
561CONFIG_NETDEV_1000=y 571CONFIG_NETDEV_1000=y
562# CONFIG_ACENIC is not set 572# CONFIG_ACENIC is not set
563# CONFIG_DL2K is not set 573# CONFIG_DL2K is not set
@@ -578,18 +588,22 @@ CONFIG_NETDEV_1000=y
578# CONFIG_QLA3XXX is not set 588# CONFIG_QLA3XXX is not set
579# CONFIG_ATL1 is not set 589# CONFIG_ATL1 is not set
580# CONFIG_ATL1E is not set 590# CONFIG_ATL1E is not set
591# CONFIG_JME is not set
581CONFIG_NETDEV_10000=y 592CONFIG_NETDEV_10000=y
582# CONFIG_CHELSIO_T1 is not set 593# CONFIG_CHELSIO_T1 is not set
583# CONFIG_CHELSIO_T3 is not set 594# CONFIG_CHELSIO_T3 is not set
595# CONFIG_ENIC is not set
584# CONFIG_IXGBE is not set 596# CONFIG_IXGBE is not set
585# CONFIG_IXGB is not set 597# CONFIG_IXGB is not set
586# CONFIG_S2IO is not set 598# CONFIG_S2IO is not set
587# CONFIG_MYRI10GE is not set 599# CONFIG_MYRI10GE is not set
588# CONFIG_NETXEN_NIC is not set 600# CONFIG_NETXEN_NIC is not set
589# CONFIG_NIU is not set 601# CONFIG_NIU is not set
602# CONFIG_MLX4_EN is not set
590# CONFIG_MLX4_CORE is not set 603# CONFIG_MLX4_CORE is not set
591# CONFIG_TEHUTI is not set 604# CONFIG_TEHUTI is not set
592# CONFIG_BNX2X is not set 605# CONFIG_BNX2X is not set
606# CONFIG_QLGE is not set
593# CONFIG_SFC is not set 607# CONFIG_SFC is not set
594# CONFIG_TR is not set 608# CONFIG_TR is not set
595 609
@@ -667,6 +681,8 @@ CONFIG_DEVPORT=y
667CONFIG_I2C=m 681CONFIG_I2C=m
668CONFIG_I2C_BOARDINFO=y 682CONFIG_I2C_BOARDINFO=y
669CONFIG_I2C_CHARDEV=m 683CONFIG_I2C_CHARDEV=m
684CONFIG_I2C_HELPER_AUTO=y
685CONFIG_I2C_ALGOBIT=m
670 686
671# 687#
672# I2C Hardware Bus support 688# I2C Hardware Bus support
@@ -693,6 +709,7 @@ CONFIG_I2C_CHARDEV=m
693# 709#
694# I2C system bus drivers (mostly embedded / system-on-chip) 710# I2C system bus drivers (mostly embedded / system-on-chip)
695# 711#
712CONFIG_I2C_GPIO=m
696CONFIG_I2C_IBM_IIC=m 713CONFIG_I2C_IBM_IIC=m
697# CONFIG_I2C_MPC is not set 714# CONFIG_I2C_MPC is not set
698# CONFIG_I2C_OCORES is not set 715# CONFIG_I2C_OCORES is not set
@@ -725,6 +742,7 @@ CONFIG_I2C_IBM_IIC=m
725# CONFIG_PCF8575 is not set 742# CONFIG_PCF8575 is not set
726# CONFIG_SENSORS_PCA9539 is not set 743# CONFIG_SENSORS_PCA9539 is not set
727# CONFIG_SENSORS_PCF8591 is not set 744# CONFIG_SENSORS_PCF8591 is not set
745# CONFIG_TPS65010 is not set
728# CONFIG_SENSORS_MAX6875 is not set 746# CONFIG_SENSORS_MAX6875 is not set
729# CONFIG_SENSORS_TSL2550 is not set 747# CONFIG_SENSORS_TSL2550 is not set
730# CONFIG_I2C_DEBUG_CORE is not set 748# CONFIG_I2C_DEBUG_CORE is not set
@@ -733,7 +751,26 @@ CONFIG_I2C_IBM_IIC=m
733# CONFIG_I2C_DEBUG_CHIP is not set 751# CONFIG_I2C_DEBUG_CHIP is not set
734# CONFIG_SPI is not set 752# CONFIG_SPI is not set
735CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 753CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
736# CONFIG_GPIOLIB is not set 754CONFIG_ARCH_REQUIRE_GPIOLIB=y
755CONFIG_GPIOLIB=y
756# CONFIG_DEBUG_GPIO is not set
757# CONFIG_GPIO_SYSFS is not set
758
759#
760# I2C GPIO expanders:
761#
762# CONFIG_GPIO_MAX732X is not set
763# CONFIG_GPIO_PCA953X is not set
764# CONFIG_GPIO_PCF857X is not set
765
766#
767# PCI GPIO expanders:
768#
769# CONFIG_GPIO_BT8XX is not set
770
771#
772# SPI GPIO expanders:
773#
737# CONFIG_W1 is not set 774# CONFIG_W1 is not set
738# CONFIG_POWER_SUPPLY is not set 775# CONFIG_POWER_SUPPLY is not set
739# CONFIG_HWMON is not set 776# CONFIG_HWMON is not set
@@ -752,6 +789,9 @@ CONFIG_SSB_POSSIBLE=y
752# CONFIG_MFD_CORE is not set 789# CONFIG_MFD_CORE is not set
753# CONFIG_MFD_SM501 is not set 790# CONFIG_MFD_SM501 is not set
754# CONFIG_HTC_PASIC3 is not set 791# CONFIG_HTC_PASIC3 is not set
792# CONFIG_MFD_TMIO is not set
793# CONFIG_MFD_WM8400 is not set
794# CONFIG_MFD_WM8350_I2C is not set
755 795
756# 796#
757# Multimedia devices 797# Multimedia devices
@@ -793,9 +833,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
793# CONFIG_USB_OTG_BLACKLIST_HUB is not set 833# CONFIG_USB_OTG_BLACKLIST_HUB is not set
794 834
795# 835#
836# Enable Host or Gadget support to see Inventra options
837#
838
839#
796# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 840# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
797# 841#
798# CONFIG_USB_GADGET is not set 842# CONFIG_USB_GADGET is not set
843# CONFIG_UWB is not set
799# CONFIG_MMC is not set 844# CONFIG_MMC is not set
800# CONFIG_MEMSTICK is not set 845# CONFIG_MEMSTICK is not set
801# CONFIG_NEW_LEDS is not set 846# CONFIG_NEW_LEDS is not set
@@ -805,6 +850,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
805# CONFIG_RTC_CLASS is not set 850# CONFIG_RTC_CLASS is not set
806# CONFIG_DMADEVICES is not set 851# CONFIG_DMADEVICES is not set
807# CONFIG_UIO is not set 852# CONFIG_UIO is not set
853# CONFIG_STAGING is not set
808 854
809# 855#
810# File systems 856# File systems
@@ -816,13 +862,14 @@ CONFIG_EXT3_FS=m
816CONFIG_EXT3_FS_XATTR=y 862CONFIG_EXT3_FS_XATTR=y
817# CONFIG_EXT3_FS_POSIX_ACL is not set 863# CONFIG_EXT3_FS_POSIX_ACL is not set
818# CONFIG_EXT3_FS_SECURITY is not set 864# CONFIG_EXT3_FS_SECURITY is not set
819# CONFIG_EXT4DEV_FS is not set 865# CONFIG_EXT4_FS is not set
820CONFIG_JBD=m 866CONFIG_JBD=m
821# CONFIG_JBD_DEBUG is not set 867# CONFIG_JBD_DEBUG is not set
822CONFIG_FS_MBCACHE=y 868CONFIG_FS_MBCACHE=m
823# CONFIG_REISERFS_FS is not set 869# CONFIG_REISERFS_FS is not set
824# CONFIG_JFS_FS is not set 870# CONFIG_JFS_FS is not set
825# CONFIG_FS_POSIX_ACL is not set 871# CONFIG_FS_POSIX_ACL is not set
872CONFIG_FILE_LOCKING=y
826# CONFIG_XFS_FS is not set 873# CONFIG_XFS_FS is not set
827# CONFIG_OCFS2_FS is not set 874# CONFIG_OCFS2_FS is not set
828CONFIG_DNOTIFY=y 875CONFIG_DNOTIFY=y
@@ -855,6 +902,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
855CONFIG_PROC_FS=y 902CONFIG_PROC_FS=y
856CONFIG_PROC_KCORE=y 903CONFIG_PROC_KCORE=y
857CONFIG_PROC_SYSCTL=y 904CONFIG_PROC_SYSCTL=y
905CONFIG_PROC_PAGE_MONITOR=y
858CONFIG_SYSFS=y 906CONFIG_SYSFS=y
859CONFIG_TMPFS=y 907CONFIG_TMPFS=y
860# CONFIG_TMPFS_POSIX_ACL is not set 908# CONFIG_TMPFS_POSIX_ACL is not set
@@ -908,6 +956,7 @@ CONFIG_LOCKD=y
908CONFIG_LOCKD_V4=y 956CONFIG_LOCKD_V4=y
909CONFIG_NFS_COMMON=y 957CONFIG_NFS_COMMON=y
910CONFIG_SUNRPC=y 958CONFIG_SUNRPC=y
959# CONFIG_SUNRPC_REGISTER_V4 is not set
911# CONFIG_RPCSEC_GSS_KRB5 is not set 960# CONFIG_RPCSEC_GSS_KRB5 is not set
912# CONFIG_RPCSEC_GSS_SPKM3 is not set 961# CONFIG_RPCSEC_GSS_SPKM3 is not set
913# CONFIG_SMB_FS is not set 962# CONFIG_SMB_FS is not set
@@ -967,7 +1016,6 @@ CONFIG_NLS_ISO8859_1=m
967# Library routines 1016# Library routines
968# 1017#
969CONFIG_BITREVERSE=y 1018CONFIG_BITREVERSE=y
970# CONFIG_GENERIC_FIND_FIRST_BIT is not set
971# CONFIG_CRC_CCITT is not set 1019# CONFIG_CRC_CCITT is not set
972CONFIG_CRC16=m 1020CONFIG_CRC16=m
973# CONFIG_CRC_T10DIF is not set 1021# CONFIG_CRC_T10DIF is not set
@@ -1023,14 +1071,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
1023# CONFIG_DEBUG_SG is not set 1071# CONFIG_DEBUG_SG is not set
1024# CONFIG_BOOT_PRINTK_DELAY is not set 1072# CONFIG_BOOT_PRINTK_DELAY is not set
1025# CONFIG_RCU_TORTURE_TEST is not set 1073# CONFIG_RCU_TORTURE_TEST is not set
1074# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1026# CONFIG_BACKTRACE_SELF_TEST is not set 1075# CONFIG_BACKTRACE_SELF_TEST is not set
1076# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1027# CONFIG_FAULT_INJECTION is not set 1077# CONFIG_FAULT_INJECTION is not set
1028# CONFIG_LATENCYTOP is not set 1078# CONFIG_LATENCYTOP is not set
1079CONFIG_SYSCTL_SYSCALL_CHECK=y
1080CONFIG_NOP_TRACER=y
1029CONFIG_HAVE_FTRACE=y 1081CONFIG_HAVE_FTRACE=y
1030CONFIG_HAVE_DYNAMIC_FTRACE=y 1082CONFIG_HAVE_DYNAMIC_FTRACE=y
1031# CONFIG_FTRACE is not set 1083# CONFIG_FTRACE is not set
1032# CONFIG_SCHED_TRACER is not set 1084# CONFIG_SCHED_TRACER is not set
1033# CONFIG_CONTEXT_SWITCH_TRACER is not set 1085# CONFIG_CONTEXT_SWITCH_TRACER is not set
1086# CONFIG_BOOT_TRACER is not set
1087# CONFIG_STACK_TRACER is not set
1088# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1034# CONFIG_SAMPLES is not set 1089# CONFIG_SAMPLES is not set
1035CONFIG_HAVE_ARCH_KGDB=y 1090CONFIG_HAVE_ARCH_KGDB=y
1036# CONFIG_KGDB is not set 1091# CONFIG_KGDB is not set
@@ -1039,6 +1094,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1039# CONFIG_DEBUG_PAGEALLOC is not set 1094# CONFIG_DEBUG_PAGEALLOC is not set
1040# CONFIG_CODE_PATCHING_SELFTEST is not set 1095# CONFIG_CODE_PATCHING_SELFTEST is not set
1041# CONFIG_FTR_FIXUP_SELFTEST is not set 1096# CONFIG_FTR_FIXUP_SELFTEST is not set
1097# CONFIG_MSI_BITMAP_SELFTEST is not set
1042# CONFIG_XMON is not set 1098# CONFIG_XMON is not set
1043# CONFIG_IRQSTACKS is not set 1099# CONFIG_IRQSTACKS is not set
1044# CONFIG_VIRQ_DEBUG is not set 1100# CONFIG_VIRQ_DEBUG is not set
@@ -1050,14 +1106,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1050# 1106#
1051# CONFIG_KEYS is not set 1107# CONFIG_KEYS is not set
1052# CONFIG_SECURITY is not set 1108# CONFIG_SECURITY is not set
1109# CONFIG_SECURITYFS is not set
1053# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1110# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1054CONFIG_CRYPTO=y 1111CONFIG_CRYPTO=y
1055 1112
1056# 1113#
1057# Crypto core or helper 1114# Crypto core or helper
1058# 1115#
1116# CONFIG_CRYPTO_FIPS is not set
1059CONFIG_CRYPTO_ALGAPI=y 1117CONFIG_CRYPTO_ALGAPI=y
1118CONFIG_CRYPTO_AEAD=y
1060CONFIG_CRYPTO_BLKCIPHER=y 1119CONFIG_CRYPTO_BLKCIPHER=y
1120CONFIG_CRYPTO_HASH=y
1121CONFIG_CRYPTO_RNG=y
1061CONFIG_CRYPTO_MANAGER=y 1122CONFIG_CRYPTO_MANAGER=y
1062# CONFIG_CRYPTO_GF128MUL is not set 1123# CONFIG_CRYPTO_GF128MUL is not set
1063# CONFIG_CRYPTO_NULL is not set 1124# CONFIG_CRYPTO_NULL is not set
@@ -1130,6 +1191,11 @@ CONFIG_CRYPTO_DES=y
1130# 1191#
1131CONFIG_CRYPTO_DEFLATE=m 1192CONFIG_CRYPTO_DEFLATE=m
1132CONFIG_CRYPTO_LZO=m 1193CONFIG_CRYPTO_LZO=m
1194
1195#
1196# Random Number Generation
1197#
1198# CONFIG_CRYPTO_ANSI_CPRNG is not set
1133CONFIG_CRYPTO_HW=y 1199CONFIG_CRYPTO_HW=y
1134# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1200# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1135# CONFIG_PPC_CLOCK is not set 1201# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index c7825dcbf415..55edbd545b61 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 10:01:31 2008 4# Tue Oct 28 09:28:58 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -41,6 +40,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
41CONFIG_GENERIC_HWEIGHT=y 40CONFIG_GENERIC_HWEIGHT=y
42CONFIG_GENERIC_CALIBRATE_DELAY=y 41CONFIG_GENERIC_CALIBRATE_DELAY=y
43CONFIG_GENERIC_FIND_NEXT_BIT=y 42CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_GENERIC_GPIO=y
44# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 44# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
45CONFIG_PPC=y 45CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
@@ -92,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""
92CONFIG_SYSCTL=y 92CONFIG_SYSCTL=y
93CONFIG_EMBEDDED=y 93CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 94CONFIG_SYSCTL_SYSCALL=y
95CONFIG_SYSCTL_SYSCALL_CHECK=y
96CONFIG_KALLSYMS=y 95CONFIG_KALLSYMS=y
97CONFIG_KALLSYMS_ALL=y 96CONFIG_KALLSYMS_ALL=y
98CONFIG_KALLSYMS_EXTRA_PASS=y 97CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -109,7 +108,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 108CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 109CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 110CONFIG_SHMEM=y
111CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 114CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 115# CONFIG_SLAB is not set
115CONFIG_SLUB=y 116CONFIG_SLUB=y
@@ -123,10 +124,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 124CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 125CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 129CONFIG_RT_MUTEXES=y
@@ -158,7 +155,9 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_CFQ is not set 155# CONFIG_DEFAULT_CFQ is not set
159# CONFIG_DEFAULT_NOOP is not set 156# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 157CONFIG_DEFAULT_IOSCHED="anticipatory"
158CONFIG_PREEMPT_NOTIFIERS=y
161CONFIG_CLASSIC_RCU=y 159CONFIG_CLASSIC_RCU=y
160# CONFIG_FREEZER is not set
162CONFIG_PPC4xx_PCI_EXPRESS=y 161CONFIG_PPC4xx_PCI_EXPRESS=y
163 162
164# 163#
@@ -175,9 +174,13 @@ CONFIG_TAISHAN=y
175CONFIG_KATMAI=y 174CONFIG_KATMAI=y
176CONFIG_RAINIER=y 175CONFIG_RAINIER=y
177CONFIG_WARP=y 176CONFIG_WARP=y
177CONFIG_ARCHES=y
178CONFIG_CANYONLANDS=y 178CONFIG_CANYONLANDS=y
179CONFIG_GLACIER=y
179CONFIG_YOSEMITE=y 180CONFIG_YOSEMITE=y
180CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y 181CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y
182CONFIG_PPC44x_SIMPLE=y
183CONFIG_PPC4xx_GPIO=y
181CONFIG_440EP=y 184CONFIG_440EP=y
182CONFIG_440EPX=y 185CONFIG_440EPX=y
183CONFIG_440GRX=y 186CONFIG_440GRX=y
@@ -206,7 +209,6 @@ CONFIG_OF_RTC=y
206# Kernel options 209# Kernel options
207# 210#
208# CONFIG_HIGHMEM is not set 211# CONFIG_HIGHMEM is not set
209# CONFIG_TICK_ONESHOT is not set
210# CONFIG_NO_HZ is not set 212# CONFIG_NO_HZ is not set
211# CONFIG_HIGH_RES_TIMERS is not set 213# CONFIG_HIGH_RES_TIMERS is not set
212CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 214CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -220,6 +222,8 @@ CONFIG_PREEMPT_NONE=y
220# CONFIG_PREEMPT_VOLUNTARY is not set 222# CONFIG_PREEMPT_VOLUNTARY is not set
221# CONFIG_PREEMPT is not set 223# CONFIG_PREEMPT is not set
222CONFIG_BINFMT_ELF=y 224CONFIG_BINFMT_ELF=y
225# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
226# CONFIG_HAVE_AOUT is not set
223# CONFIG_BINFMT_MISC is not set 227# CONFIG_BINFMT_MISC is not set
224CONFIG_MATH_EMULATION=y 228CONFIG_MATH_EMULATION=y
225# CONFIG_IOMMU_HELPER is not set 229# CONFIG_IOMMU_HELPER is not set
@@ -234,15 +238,15 @@ CONFIG_FLATMEM_MANUAL=y
234# CONFIG_SPARSEMEM_MANUAL is not set 238# CONFIG_SPARSEMEM_MANUAL is not set
235CONFIG_FLATMEM=y 239CONFIG_FLATMEM=y
236CONFIG_FLAT_NODE_MEM_MAP=y 240CONFIG_FLAT_NODE_MEM_MAP=y
237# CONFIG_SPARSEMEM_STATIC is not set
238# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
239CONFIG_PAGEFLAGS_EXTENDED=y 241CONFIG_PAGEFLAGS_EXTENDED=y
240CONFIG_SPLIT_PTLOCK_CPUS=4 242CONFIG_SPLIT_PTLOCK_CPUS=4
241CONFIG_MIGRATION=y 243CONFIG_MIGRATION=y
242CONFIG_RESOURCES_64BIT=y 244CONFIG_RESOURCES_64BIT=y
245CONFIG_PHYS_ADDR_T_64BIT=y
243CONFIG_ZONE_DMA_FLAG=1 246CONFIG_ZONE_DMA_FLAG=1
244CONFIG_BOUNCE=y 247CONFIG_BOUNCE=y
245CONFIG_VIRT_TO_BUS=y 248CONFIG_VIRT_TO_BUS=y
249CONFIG_UNEVICTABLE_LRU=y
246CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
248# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -351,6 +355,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
351# CONFIG_TIPC is not set 355# CONFIG_TIPC is not set
352# CONFIG_ATM is not set 356# CONFIG_ATM is not set
353# CONFIG_BRIDGE is not set 357# CONFIG_BRIDGE is not set
358# CONFIG_NET_DSA is not set
354# CONFIG_VLAN_8021Q is not set 359# CONFIG_VLAN_8021Q is not set
355# CONFIG_DECNET is not set 360# CONFIG_DECNET is not set
356# CONFIG_LLC2 is not set 361# CONFIG_LLC2 is not set
@@ -371,14 +376,8 @@ CONFIG_IPV6_NDISC_NODETYPE=y
371# CONFIG_IRDA is not set 376# CONFIG_IRDA is not set
372# CONFIG_BT is not set 377# CONFIG_BT is not set
373# CONFIG_AF_RXRPC is not set 378# CONFIG_AF_RXRPC is not set
374 379# CONFIG_PHONET is not set
375# 380# CONFIG_WIRELESS is not set
376# Wireless
377#
378# CONFIG_CFG80211 is not set
379# CONFIG_WIRELESS_EXT is not set
380# CONFIG_MAC80211 is not set
381# CONFIG_IEEE80211 is not set
382# CONFIG_RFKILL is not set 381# CONFIG_RFKILL is not set
383# CONFIG_NET_9P is not set 382# CONFIG_NET_9P is not set
384 383
@@ -487,6 +486,7 @@ CONFIG_MTD_UBI_GLUEBI=y
487# 486#
488# CONFIG_MTD_UBI_DEBUG is not set 487# CONFIG_MTD_UBI_DEBUG is not set
489CONFIG_OF_DEVICE=y 488CONFIG_OF_DEVICE=y
489CONFIG_OF_GPIO=y
490CONFIG_OF_I2C=m 490CONFIG_OF_I2C=m
491# CONFIG_PARPORT is not set 491# CONFIG_PARPORT is not set
492CONFIG_BLK_DEV=y 492CONFIG_BLK_DEV=y
@@ -600,8 +600,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
600CONFIG_IBM_NEW_EMAC_RGMII=y 600CONFIG_IBM_NEW_EMAC_RGMII=y
601CONFIG_IBM_NEW_EMAC_TAH=y 601CONFIG_IBM_NEW_EMAC_TAH=y
602CONFIG_IBM_NEW_EMAC_EMAC4=y 602CONFIG_IBM_NEW_EMAC_EMAC4=y
603# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
604# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
605# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
603# CONFIG_NET_PCI is not set 606# CONFIG_NET_PCI is not set
604# CONFIG_B44 is not set 607# CONFIG_B44 is not set
608# CONFIG_ATL2 is not set
605CONFIG_NETDEV_1000=y 609CONFIG_NETDEV_1000=y
606# CONFIG_ACENIC is not set 610# CONFIG_ACENIC is not set
607# CONFIG_DL2K is not set 611# CONFIG_DL2K is not set
@@ -622,18 +626,22 @@ CONFIG_NETDEV_1000=y
622# CONFIG_QLA3XXX is not set 626# CONFIG_QLA3XXX is not set
623# CONFIG_ATL1 is not set 627# CONFIG_ATL1 is not set
624# CONFIG_ATL1E is not set 628# CONFIG_ATL1E is not set
629# CONFIG_JME is not set
625CONFIG_NETDEV_10000=y 630CONFIG_NETDEV_10000=y
626# CONFIG_CHELSIO_T1 is not set 631# CONFIG_CHELSIO_T1 is not set
627# CONFIG_CHELSIO_T3 is not set 632# CONFIG_CHELSIO_T3 is not set
633# CONFIG_ENIC is not set
628# CONFIG_IXGBE is not set 634# CONFIG_IXGBE is not set
629# CONFIG_IXGB is not set 635# CONFIG_IXGB is not set
630# CONFIG_S2IO is not set 636# CONFIG_S2IO is not set
631# CONFIG_MYRI10GE is not set 637# CONFIG_MYRI10GE is not set
632# CONFIG_NETXEN_NIC is not set 638# CONFIG_NETXEN_NIC is not set
633# CONFIG_NIU is not set 639# CONFIG_NIU is not set
640# CONFIG_MLX4_EN is not set
634# CONFIG_MLX4_CORE is not set 641# CONFIG_MLX4_CORE is not set
635# CONFIG_TEHUTI is not set 642# CONFIG_TEHUTI is not set
636# CONFIG_BNX2X is not set 643# CONFIG_BNX2X is not set
644# CONFIG_QLGE is not set
637# CONFIG_SFC is not set 645# CONFIG_SFC is not set
638# CONFIG_TR is not set 646# CONFIG_TR is not set
639 647
@@ -721,6 +729,8 @@ CONFIG_DEVPORT=y
721CONFIG_I2C=m 729CONFIG_I2C=m
722CONFIG_I2C_BOARDINFO=y 730CONFIG_I2C_BOARDINFO=y
723CONFIG_I2C_CHARDEV=m 731CONFIG_I2C_CHARDEV=m
732CONFIG_I2C_HELPER_AUTO=y
733CONFIG_I2C_ALGOBIT=m
724 734
725# 735#
726# I2C Hardware Bus support 736# I2C Hardware Bus support
@@ -747,6 +757,7 @@ CONFIG_I2C_CHARDEV=m
747# 757#
748# I2C system bus drivers (mostly embedded / system-on-chip) 758# I2C system bus drivers (mostly embedded / system-on-chip)
749# 759#
760CONFIG_I2C_GPIO=m
750CONFIG_I2C_IBM_IIC=m 761CONFIG_I2C_IBM_IIC=m
751# CONFIG_I2C_MPC is not set 762# CONFIG_I2C_MPC is not set
752# CONFIG_I2C_OCORES is not set 763# CONFIG_I2C_OCORES is not set
@@ -780,6 +791,7 @@ CONFIG_I2C_IBM_IIC=m
780# CONFIG_PCF8575 is not set 791# CONFIG_PCF8575 is not set
781# CONFIG_SENSORS_PCA9539 is not set 792# CONFIG_SENSORS_PCA9539 is not set
782# CONFIG_SENSORS_PCF8591 is not set 793# CONFIG_SENSORS_PCF8591 is not set
794# CONFIG_TPS65010 is not set
783# CONFIG_SENSORS_MAX6875 is not set 795# CONFIG_SENSORS_MAX6875 is not set
784# CONFIG_SENSORS_TSL2550 is not set 796# CONFIG_SENSORS_TSL2550 is not set
785# CONFIG_I2C_DEBUG_CORE is not set 797# CONFIG_I2C_DEBUG_CORE is not set
@@ -788,7 +800,26 @@ CONFIG_I2C_IBM_IIC=m
788# CONFIG_I2C_DEBUG_CHIP is not set 800# CONFIG_I2C_DEBUG_CHIP is not set
789# CONFIG_SPI is not set 801# CONFIG_SPI is not set
790CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 802CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
791# CONFIG_GPIOLIB is not set 803CONFIG_ARCH_REQUIRE_GPIOLIB=y
804CONFIG_GPIOLIB=y
805# CONFIG_DEBUG_GPIO is not set
806# CONFIG_GPIO_SYSFS is not set
807
808#
809# I2C GPIO expanders:
810#
811# CONFIG_GPIO_MAX732X is not set
812# CONFIG_GPIO_PCA953X is not set
813# CONFIG_GPIO_PCF857X is not set
814
815#
816# PCI GPIO expanders:
817#
818# CONFIG_GPIO_BT8XX is not set
819
820#
821# SPI GPIO expanders:
822#
792# CONFIG_W1 is not set 823# CONFIG_W1 is not set
793# CONFIG_POWER_SUPPLY is not set 824# CONFIG_POWER_SUPPLY is not set
794# CONFIG_HWMON is not set 825# CONFIG_HWMON is not set
@@ -808,6 +839,9 @@ CONFIG_SSB_POSSIBLE=y
808# CONFIG_MFD_CORE is not set 839# CONFIG_MFD_CORE is not set
809# CONFIG_MFD_SM501 is not set 840# CONFIG_MFD_SM501 is not set
810# CONFIG_HTC_PASIC3 is not set 841# CONFIG_HTC_PASIC3 is not set
842# CONFIG_MFD_TMIO is not set
843# CONFIG_MFD_WM8400 is not set
844# CONFIG_MFD_WM8350_I2C is not set
811 845
812# 846#
813# Multimedia devices 847# Multimedia devices
@@ -857,6 +891,9 @@ CONFIG_USB_DEVICE_CLASS=y
857# CONFIG_USB_OTG is not set 891# CONFIG_USB_OTG is not set
858# CONFIG_USB_OTG_WHITELIST is not set 892# CONFIG_USB_OTG_WHITELIST is not set
859# CONFIG_USB_OTG_BLACKLIST_HUB is not set 893# CONFIG_USB_OTG_BLACKLIST_HUB is not set
894# CONFIG_USB_MON is not set
895# CONFIG_USB_WUSB is not set
896# CONFIG_USB_WUSB_CBAF is not set
860 897
861# 898#
862# USB Host Controller Drivers 899# USB Host Controller Drivers
@@ -881,6 +918,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
881# CONFIG_USB_UHCI_HCD is not set 918# CONFIG_USB_UHCI_HCD is not set
882# CONFIG_USB_SL811_HCD is not set 919# CONFIG_USB_SL811_HCD is not set
883# CONFIG_USB_R8A66597_HCD is not set 920# CONFIG_USB_R8A66597_HCD is not set
921# CONFIG_USB_WHCI_HCD is not set
922# CONFIG_USB_HWA_HCD is not set
923
924#
925# Enable Host or Gadget support to see Inventra options
926#
884 927
885# 928#
886# USB Device Class drivers 929# USB Device Class drivers
@@ -888,6 +931,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
888# CONFIG_USB_ACM is not set 931# CONFIG_USB_ACM is not set
889# CONFIG_USB_PRINTER is not set 932# CONFIG_USB_PRINTER is not set
890# CONFIG_USB_WDM is not set 933# CONFIG_USB_WDM is not set
934# CONFIG_USB_TMC is not set
891 935
892# 936#
893# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 937# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -916,7 +960,6 @@ CONFIG_USB_STORAGE=m
916# 960#
917# CONFIG_USB_MDC800 is not set 961# CONFIG_USB_MDC800 is not set
918# CONFIG_USB_MICROTEK is not set 962# CONFIG_USB_MICROTEK is not set
919# CONFIG_USB_MON is not set
920 963
921# 964#
922# USB port drivers 965# USB port drivers
@@ -929,7 +972,7 @@ CONFIG_USB_STORAGE=m
929# CONFIG_USB_EMI62 is not set 972# CONFIG_USB_EMI62 is not set
930# CONFIG_USB_EMI26 is not set 973# CONFIG_USB_EMI26 is not set
931# CONFIG_USB_ADUTUX is not set 974# CONFIG_USB_ADUTUX is not set
932# CONFIG_USB_AUERSWALD is not set 975# CONFIG_USB_SEVSEG is not set
933# CONFIG_USB_RIO500 is not set 976# CONFIG_USB_RIO500 is not set
934# CONFIG_USB_LEGOTOWER is not set 977# CONFIG_USB_LEGOTOWER is not set
935# CONFIG_USB_LCD is not set 978# CONFIG_USB_LCD is not set
@@ -946,7 +989,9 @@ CONFIG_USB_STORAGE=m
946# CONFIG_USB_TRANCEVIBRATOR is not set 989# CONFIG_USB_TRANCEVIBRATOR is not set
947# CONFIG_USB_IOWARRIOR is not set 990# CONFIG_USB_IOWARRIOR is not set
948# CONFIG_USB_ISIGHTFW is not set 991# CONFIG_USB_ISIGHTFW is not set
992# CONFIG_USB_VST is not set
949# CONFIG_USB_GADGET is not set 993# CONFIG_USB_GADGET is not set
994# CONFIG_UWB is not set
950# CONFIG_MMC is not set 995# CONFIG_MMC is not set
951# CONFIG_MEMSTICK is not set 996# CONFIG_MEMSTICK is not set
952# CONFIG_NEW_LEDS is not set 997# CONFIG_NEW_LEDS is not set
@@ -956,6 +1001,7 @@ CONFIG_USB_STORAGE=m
956# CONFIG_RTC_CLASS is not set 1001# CONFIG_RTC_CLASS is not set
957# CONFIG_DMADEVICES is not set 1002# CONFIG_DMADEVICES is not set
958# CONFIG_UIO is not set 1003# CONFIG_UIO is not set
1004# CONFIG_STAGING is not set
959 1005
960# 1006#
961# File systems 1007# File systems
@@ -967,12 +1013,13 @@ CONFIG_EXT3_FS=m
967CONFIG_EXT3_FS_XATTR=y 1013CONFIG_EXT3_FS_XATTR=y
968# CONFIG_EXT3_FS_POSIX_ACL is not set 1014# CONFIG_EXT3_FS_POSIX_ACL is not set
969# CONFIG_EXT3_FS_SECURITY is not set 1015# CONFIG_EXT3_FS_SECURITY is not set
970# CONFIG_EXT4DEV_FS is not set 1016# CONFIG_EXT4_FS is not set
971CONFIG_JBD=m 1017CONFIG_JBD=m
972CONFIG_FS_MBCACHE=y 1018CONFIG_FS_MBCACHE=m
973# CONFIG_REISERFS_FS is not set 1019# CONFIG_REISERFS_FS is not set
974# CONFIG_JFS_FS is not set 1020# CONFIG_JFS_FS is not set
975# CONFIG_FS_POSIX_ACL is not set 1021# CONFIG_FS_POSIX_ACL is not set
1022CONFIG_FILE_LOCKING=y
976# CONFIG_XFS_FS is not set 1023# CONFIG_XFS_FS is not set
977# CONFIG_OCFS2_FS is not set 1024# CONFIG_OCFS2_FS is not set
978CONFIG_DNOTIFY=y 1025CONFIG_DNOTIFY=y
@@ -1005,6 +1052,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1005CONFIG_PROC_FS=y 1052CONFIG_PROC_FS=y
1006CONFIG_PROC_KCORE=y 1053CONFIG_PROC_KCORE=y
1007CONFIG_PROC_SYSCTL=y 1054CONFIG_PROC_SYSCTL=y
1055CONFIG_PROC_PAGE_MONITOR=y
1008CONFIG_SYSFS=y 1056CONFIG_SYSFS=y
1009CONFIG_TMPFS=y 1057CONFIG_TMPFS=y
1010# CONFIG_TMPFS_POSIX_ACL is not set 1058# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1058,6 +1106,7 @@ CONFIG_LOCKD=y
1058CONFIG_LOCKD_V4=y 1106CONFIG_LOCKD_V4=y
1059CONFIG_NFS_COMMON=y 1107CONFIG_NFS_COMMON=y
1060CONFIG_SUNRPC=y 1108CONFIG_SUNRPC=y
1109# CONFIG_SUNRPC_REGISTER_V4 is not set
1061# CONFIG_RPCSEC_GSS_KRB5 is not set 1110# CONFIG_RPCSEC_GSS_KRB5 is not set
1062# CONFIG_RPCSEC_GSS_SPKM3 is not set 1111# CONFIG_RPCSEC_GSS_SPKM3 is not set
1063# CONFIG_SMB_FS is not set 1112# CONFIG_SMB_FS is not set
@@ -1117,7 +1166,6 @@ CONFIG_NLS_ISO8859_1=m
1117# Library routines 1166# Library routines
1118# 1167#
1119CONFIG_BITREVERSE=y 1168CONFIG_BITREVERSE=y
1120# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1121# CONFIG_CRC_CCITT is not set 1169# CONFIG_CRC_CCITT is not set
1122CONFIG_CRC16=m 1170CONFIG_CRC16=m
1123CONFIG_CRC_T10DIF=m 1171CONFIG_CRC_T10DIF=m
@@ -1173,14 +1221,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
1173# CONFIG_DEBUG_SG is not set 1221# CONFIG_DEBUG_SG is not set
1174# CONFIG_BOOT_PRINTK_DELAY is not set 1222# CONFIG_BOOT_PRINTK_DELAY is not set
1175# CONFIG_RCU_TORTURE_TEST is not set 1223# CONFIG_RCU_TORTURE_TEST is not set
1224# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1176# CONFIG_BACKTRACE_SELF_TEST is not set 1225# CONFIG_BACKTRACE_SELF_TEST is not set
1226# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1177# CONFIG_FAULT_INJECTION is not set 1227# CONFIG_FAULT_INJECTION is not set
1178# CONFIG_LATENCYTOP is not set 1228# CONFIG_LATENCYTOP is not set
1229CONFIG_SYSCTL_SYSCALL_CHECK=y
1230CONFIG_NOP_TRACER=y
1179CONFIG_HAVE_FTRACE=y 1231CONFIG_HAVE_FTRACE=y
1180CONFIG_HAVE_DYNAMIC_FTRACE=y 1232CONFIG_HAVE_DYNAMIC_FTRACE=y
1181# CONFIG_FTRACE is not set 1233# CONFIG_FTRACE is not set
1182# CONFIG_SCHED_TRACER is not set 1234# CONFIG_SCHED_TRACER is not set
1183# CONFIG_CONTEXT_SWITCH_TRACER is not set 1235# CONFIG_CONTEXT_SWITCH_TRACER is not set
1236# CONFIG_BOOT_TRACER is not set
1237# CONFIG_STACK_TRACER is not set
1238# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1184# CONFIG_SAMPLES is not set 1239# CONFIG_SAMPLES is not set
1185CONFIG_HAVE_ARCH_KGDB=y 1240CONFIG_HAVE_ARCH_KGDB=y
1186# CONFIG_KGDB is not set 1241# CONFIG_KGDB is not set
@@ -1189,24 +1244,29 @@ CONFIG_HAVE_ARCH_KGDB=y
1189# CONFIG_DEBUG_PAGEALLOC is not set 1244# CONFIG_DEBUG_PAGEALLOC is not set
1190# CONFIG_CODE_PATCHING_SELFTEST is not set 1245# CONFIG_CODE_PATCHING_SELFTEST is not set
1191# CONFIG_FTR_FIXUP_SELFTEST is not set 1246# CONFIG_FTR_FIXUP_SELFTEST is not set
1247# CONFIG_MSI_BITMAP_SELFTEST is not set
1192# CONFIG_XMON is not set 1248# CONFIG_XMON is not set
1193# CONFIG_IRQSTACKS is not set 1249# CONFIG_IRQSTACKS is not set
1194# CONFIG_BDI_SWITCH is not set 1250# CONFIG_BDI_SWITCH is not set
1195# CONFIG_PPC_EARLY_DEBUG is not set
1196 1251
1197# 1252#
1198# Security options 1253# Security options
1199# 1254#
1200# CONFIG_KEYS is not set 1255# CONFIG_KEYS is not set
1201# CONFIG_SECURITY is not set 1256# CONFIG_SECURITY is not set
1257# CONFIG_SECURITYFS is not set
1202# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1258# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1203CONFIG_CRYPTO=y 1259CONFIG_CRYPTO=y
1204 1260
1205# 1261#
1206# Crypto core or helper 1262# Crypto core or helper
1207# 1263#
1264# CONFIG_CRYPTO_FIPS is not set
1208CONFIG_CRYPTO_ALGAPI=y 1265CONFIG_CRYPTO_ALGAPI=y
1266CONFIG_CRYPTO_AEAD=y
1209CONFIG_CRYPTO_BLKCIPHER=y 1267CONFIG_CRYPTO_BLKCIPHER=y
1268CONFIG_CRYPTO_HASH=y
1269CONFIG_CRYPTO_RNG=y
1210CONFIG_CRYPTO_MANAGER=y 1270CONFIG_CRYPTO_MANAGER=y
1211# CONFIG_CRYPTO_GF128MUL is not set 1271# CONFIG_CRYPTO_GF128MUL is not set
1212# CONFIG_CRYPTO_NULL is not set 1272# CONFIG_CRYPTO_NULL is not set
@@ -1279,6 +1339,15 @@ CONFIG_CRYPTO_DES=y
1279# 1339#
1280CONFIG_CRYPTO_DEFLATE=m 1340CONFIG_CRYPTO_DEFLATE=m
1281CONFIG_CRYPTO_LZO=m 1341CONFIG_CRYPTO_LZO=m
1342
1343#
1344# Random Number Generation
1345#
1346# CONFIG_CRYPTO_ANSI_CPRNG is not set
1282# CONFIG_CRYPTO_HW is not set 1347# CONFIG_CRYPTO_HW is not set
1283# CONFIG_PPC_CLOCK is not set 1348# CONFIG_PPC_CLOCK is not set
1284# CONFIG_VIRTUALIZATION is not set 1349CONFIG_VIRTUALIZATION=y
1350CONFIG_KVM=y
1351CONFIG_KVM_BOOKE_HOST=y
1352# CONFIG_VIRTIO_PCI is not set
1353# CONFIG_VIRTIO_BALLOON is not set
diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
index 51ecfef8d843..7464c0daddd1 100644
--- a/arch/powerpc/include/asm/iommu.h
+++ b/arch/powerpc/include/asm/iommu.h
@@ -92,13 +92,14 @@ extern void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl,
92 unsigned long mask, gfp_t flag, int node); 92 unsigned long mask, gfp_t flag, int node);
93extern void iommu_free_coherent(struct iommu_table *tbl, size_t size, 93extern void iommu_free_coherent(struct iommu_table *tbl, size_t size,
94 void *vaddr, dma_addr_t dma_handle); 94 void *vaddr, dma_addr_t dma_handle);
95extern dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl, 95extern dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl,
96 void *vaddr, size_t size, unsigned long mask, 96 struct page *page, unsigned long offset,
97 enum dma_data_direction direction, 97 size_t size, unsigned long mask,
98 struct dma_attrs *attrs); 98 enum dma_data_direction direction,
99extern void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle, 99 struct dma_attrs *attrs);
100 size_t size, enum dma_data_direction direction, 100extern void iommu_unmap_page(struct iommu_table *tbl, dma_addr_t dma_handle,
101 struct dma_attrs *attrs); 101 size_t size, enum dma_data_direction direction,
102 struct dma_attrs *attrs);
102 103
103extern void iommu_init_early_pSeries(void); 104extern void iommu_init_early_pSeries(void);
104extern void iommu_init_early_iSeries(void); 105extern void iommu_init_early_iSeries(void);
diff --git a/arch/powerpc/include/asm/kdump.h b/arch/powerpc/include/asm/kdump.h
index a503da9d56f3..b07ebb9784d3 100644
--- a/arch/powerpc/include/asm/kdump.h
+++ b/arch/powerpc/include/asm/kdump.h
@@ -9,12 +9,6 @@
9 * Reserve to the end of the FWNMI area, see head_64.S */ 9 * Reserve to the end of the FWNMI area, see head_64.S */
10#define KDUMP_RESERVE_LIMIT 0x10000 /* 64K */ 10#define KDUMP_RESERVE_LIMIT 0x10000 /* 64K */
11 11
12/*
13 * Used to differentiate between relocatable kdump kernel and other
14 * kernels
15 */
16#define KDUMP_SIGNATURE 0xfeed1234
17
18#ifdef CONFIG_CRASH_DUMP 12#ifdef CONFIG_CRASH_DUMP
19 13
20#define KDUMP_TRAMPOLINE_START 0x0100 14#define KDUMP_TRAMPOLINE_START 0x0100
@@ -26,8 +20,6 @@
26 20
27#ifndef __ASSEMBLY__ 21#ifndef __ASSEMBLY__
28 22
29extern unsigned long __kdump_flag;
30
31#if defined(CONFIG_CRASH_DUMP) && !defined(CONFIG_RELOCATABLE) 23#if defined(CONFIG_CRASH_DUMP) && !defined(CONFIG_RELOCATABLE)
32extern void reserve_kdump_trampoline(void); 24extern void reserve_kdump_trampoline(void);
33extern void setup_kdump_trampoline(void); 25extern void setup_kdump_trampoline(void);
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index 34d9ac433ace..c2ccca53b991 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -355,6 +355,8 @@ struct mpic
355#define MPIC_NO_BIAS 0x00000400 355#define MPIC_NO_BIAS 0x00000400
356/* Ignore NIRQS as reported by FRR */ 356/* Ignore NIRQS as reported by FRR */
357#define MPIC_BROKEN_FRR_NIRQS 0x00000800 357#define MPIC_BROKEN_FRR_NIRQS 0x00000800
358/* Destination only supports a single CPU at a time */
359#define MPIC_SINGLE_DEST_CPU 0x00001000
358 360
359/* MPIC HW modification ID */ 361/* MPIC HW modification ID */
360#define MPIC_REGSET_MASK 0xf0000000 362#define MPIC_REGSET_MASK 0xf0000000
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index 39d547fde956..57a2a494886b 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -208,6 +208,8 @@ extern void pcibios_setup_new_device(struct pci_dev *dev);
208 208
209extern void pcibios_claim_one_bus(struct pci_bus *b); 209extern void pcibios_claim_one_bus(struct pci_bus *b);
210 210
211extern void pcibios_allocate_bus_resources(struct pci_bus *bus);
212
211extern void pcibios_resource_survey(void); 213extern void pcibios_resource_survey(void);
212 214
213extern struct pci_controller *init_phb_dynamic(struct device_node *dn); 215extern struct pci_controller *init_phb_dynamic(struct device_node *dn);
diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
index 49248f89ce23..14183af1b3fb 100644
--- a/arch/powerpc/kernel/dma-iommu.c
+++ b/arch/powerpc/kernel/dma-iommu.c
@@ -30,28 +30,26 @@ static void dma_iommu_free_coherent(struct device *dev, size_t size,
30} 30}
31 31
32/* Creates TCEs for a user provided buffer. The user buffer must be 32/* Creates TCEs for a user provided buffer. The user buffer must be
33 * contiguous real kernel storage (not vmalloc). The address of the buffer 33 * contiguous real kernel storage (not vmalloc). The address passed here
34 * passed here is the kernel (virtual) address of the buffer. The buffer 34 * comprises a page address and offset into that page. The dma_addr_t
35 * need not be page aligned, the dma_addr_t returned will point to the same 35 * returned will point to the same byte within the page as was passed in.
36 * byte within the page as vaddr.
37 */ 36 */
38static dma_addr_t dma_iommu_map_single(struct device *dev, void *vaddr, 37static dma_addr_t dma_iommu_map_page(struct device *dev, struct page *page,
39 size_t size, 38 unsigned long offset, size_t size,
40 enum dma_data_direction direction, 39 enum dma_data_direction direction,
41 struct dma_attrs *attrs) 40 struct dma_attrs *attrs)
42{ 41{
43 return iommu_map_single(dev, dev->archdata.dma_data, vaddr, size, 42 return iommu_map_page(dev, dev->archdata.dma_data, page, offset, size,
44 device_to_mask(dev), direction, attrs); 43 device_to_mask(dev), direction, attrs);
45} 44}
46 45
47 46
48static void dma_iommu_unmap_single(struct device *dev, dma_addr_t dma_handle, 47static void dma_iommu_unmap_page(struct device *dev, dma_addr_t dma_handle,
49 size_t size, 48 size_t size, enum dma_data_direction direction,
50 enum dma_data_direction direction, 49 struct dma_attrs *attrs)
51 struct dma_attrs *attrs)
52{ 50{
53 iommu_unmap_single(dev->archdata.dma_data, dma_handle, size, direction, 51 iommu_unmap_page(dev->archdata.dma_data, dma_handle, size, direction,
54 attrs); 52 attrs);
55} 53}
56 54
57 55
@@ -94,10 +92,10 @@ static int dma_iommu_dma_supported(struct device *dev, u64 mask)
94struct dma_mapping_ops dma_iommu_ops = { 92struct dma_mapping_ops dma_iommu_ops = {
95 .alloc_coherent = dma_iommu_alloc_coherent, 93 .alloc_coherent = dma_iommu_alloc_coherent,
96 .free_coherent = dma_iommu_free_coherent, 94 .free_coherent = dma_iommu_free_coherent,
97 .map_single = dma_iommu_map_single,
98 .unmap_single = dma_iommu_unmap_single,
99 .map_sg = dma_iommu_map_sg, 95 .map_sg = dma_iommu_map_sg,
100 .unmap_sg = dma_iommu_unmap_sg, 96 .unmap_sg = dma_iommu_unmap_sg,
101 .dma_supported = dma_iommu_dma_supported, 97 .dma_supported = dma_iommu_dma_supported,
98 .map_page = dma_iommu_map_page,
99 .unmap_page = dma_iommu_unmap_page,
102}; 100};
103EXPORT_SYMBOL(dma_iommu_ops); 101EXPORT_SYMBOL(dma_iommu_ops);
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 69489bd3210c..b4bcf5a930fa 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -97,12 +97,6 @@ __secondary_hold_spinloop:
97__secondary_hold_acknowledge: 97__secondary_hold_acknowledge:
98 .llong 0x0 98 .llong 0x0
99 99
100 /* This flag is set by purgatory if we should be a kdump kernel. */
101 /* Do not move this variable as purgatory knows about it. */
102 .globl __kdump_flag
103__kdump_flag:
104 .llong 0x0
105
106#ifdef CONFIG_PPC_ISERIES 100#ifdef CONFIG_PPC_ISERIES
107 /* 101 /*
108 * At offset 0x20, there is a pointer to iSeries LPAR data. 102 * At offset 0x20, there is a pointer to iSeries LPAR data.
@@ -112,6 +106,20 @@ __kdump_flag:
112 .llong hvReleaseData-KERNELBASE 106 .llong hvReleaseData-KERNELBASE
113#endif /* CONFIG_PPC_ISERIES */ 107#endif /* CONFIG_PPC_ISERIES */
114 108
109#ifdef CONFIG_CRASH_DUMP
110 /* This flag is set to 1 by a loader if the kernel should run
111 * at the loaded address instead of the linked address. This
112 * is used by kexec-tools to keep the the kdump kernel in the
113 * crash_kernel region. The loader is responsible for
114 * observing the alignment requirement.
115 */
116 /* Do not move this variable as kexec-tools knows about it. */
117 . = 0x5c
118 .globl __run_at_load
119__run_at_load:
120 .long 0x72756e30 /* "run0" -- relocate to 0 by default */
121#endif
122
115 . = 0x60 123 . = 0x60
116/* 124/*
117 * The following code is used to hold secondary processors 125 * The following code is used to hold secondary processors
@@ -1391,8 +1399,8 @@ _STATIC(__after_prom_start)
1391 lis r25,PAGE_OFFSET@highest /* compute virtual base of kernel */ 1399 lis r25,PAGE_OFFSET@highest /* compute virtual base of kernel */
1392 sldi r25,r25,32 1400 sldi r25,r25,32
1393#ifdef CONFIG_CRASH_DUMP 1401#ifdef CONFIG_CRASH_DUMP
1394 ld r7,__kdump_flag-_stext(r26) 1402 lwz r7,__run_at_load-_stext(r26)
1395 cmpldi cr0,r7,1 /* kdump kernel ? - stay where we are */ 1403 cmplwi cr0,r7,1 /* kdump kernel ? - stay where we are */
1396 bne 1f 1404 bne 1f
1397 add r25,r25,r26 1405 add r25,r25,r26
1398#endif 1406#endif
@@ -1416,11 +1424,11 @@ _STATIC(__after_prom_start)
1416#ifdef CONFIG_CRASH_DUMP 1424#ifdef CONFIG_CRASH_DUMP
1417/* 1425/*
1418 * Check if the kernel has to be running as relocatable kernel based on the 1426 * Check if the kernel has to be running as relocatable kernel based on the
1419 * variable __kdump_flag, if it is set the kernel is treated as relocatable 1427 * variable __run_at_load, if it is set the kernel is treated as relocatable
1420 * kernel, otherwise it will be moved to PHYSICAL_START 1428 * kernel, otherwise it will be moved to PHYSICAL_START
1421 */ 1429 */
1422 ld r7,__kdump_flag-_stext(r26) 1430 lwz r7,__run_at_load-_stext(r26)
1423 cmpldi cr0,r7,1 1431 cmplwi cr0,r7,1
1424 bne 3f 1432 bne 3f
1425 1433
1426 li r5,__end_interrupts - _stext /* just copy interrupts */ 1434 li r5,__end_interrupts - _stext /* just copy interrupts */
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index a06362223f8d..64299d28f364 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -79,20 +79,21 @@ static void ibmebus_free_coherent(struct device *dev,
79 kfree(vaddr); 79 kfree(vaddr);
80} 80}
81 81
82static dma_addr_t ibmebus_map_single(struct device *dev, 82static dma_addr_t ibmebus_map_page(struct device *dev,
83 void *ptr, 83 struct page *page,
84 size_t size, 84 unsigned long offset,
85 enum dma_data_direction direction, 85 size_t size,
86 struct dma_attrs *attrs) 86 enum dma_data_direction direction,
87 struct dma_attrs *attrs)
87{ 88{
88 return (dma_addr_t)(ptr); 89 return (dma_addr_t)(page_address(page) + offset);
89} 90}
90 91
91static void ibmebus_unmap_single(struct device *dev, 92static void ibmebus_unmap_page(struct device *dev,
92 dma_addr_t dma_addr, 93 dma_addr_t dma_addr,
93 size_t size, 94 size_t size,
94 enum dma_data_direction direction, 95 enum dma_data_direction direction,
95 struct dma_attrs *attrs) 96 struct dma_attrs *attrs)
96{ 97{
97 return; 98 return;
98} 99}
@@ -129,11 +130,11 @@ static int ibmebus_dma_supported(struct device *dev, u64 mask)
129static struct dma_mapping_ops ibmebus_dma_ops = { 130static struct dma_mapping_ops ibmebus_dma_ops = {
130 .alloc_coherent = ibmebus_alloc_coherent, 131 .alloc_coherent = ibmebus_alloc_coherent,
131 .free_coherent = ibmebus_free_coherent, 132 .free_coherent = ibmebus_free_coherent,
132 .map_single = ibmebus_map_single,
133 .unmap_single = ibmebus_unmap_single,
134 .map_sg = ibmebus_map_sg, 133 .map_sg = ibmebus_map_sg,
135 .unmap_sg = ibmebus_unmap_sg, 134 .unmap_sg = ibmebus_unmap_sg,
136 .dma_supported = ibmebus_dma_supported, 135 .dma_supported = ibmebus_dma_supported,
136 .map_page = ibmebus_map_page,
137 .unmap_page = ibmebus_unmap_page,
137}; 138};
138 139
139static int ibmebus_match_path(struct device *dev, void *data) 140static int ibmebus_match_path(struct device *dev, void *data)
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 3857d7e2af0c..1bfa706b96e7 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -32,6 +32,7 @@
32#include <linux/dma-mapping.h> 32#include <linux/dma-mapping.h>
33#include <linux/bitops.h> 33#include <linux/bitops.h>
34#include <linux/iommu-helper.h> 34#include <linux/iommu-helper.h>
35#include <linux/crash_dump.h>
35#include <asm/io.h> 36#include <asm/io.h>
36#include <asm/prom.h> 37#include <asm/prom.h>
37#include <asm/iommu.h> 38#include <asm/iommu.h>
@@ -460,7 +461,7 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,
460 461
461static void iommu_table_clear(struct iommu_table *tbl) 462static void iommu_table_clear(struct iommu_table *tbl)
462{ 463{
463 if (!__kdump_flag) { 464 if (!is_kdump_kernel()) {
464 /* Clear the table in case firmware left allocations in it */ 465 /* Clear the table in case firmware left allocations in it */
465 ppc_md.tce_free(tbl, tbl->it_offset, tbl->it_size); 466 ppc_md.tce_free(tbl, tbl->it_offset, tbl->it_size);
466 return; 467 return;
@@ -564,21 +565,23 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name)
564} 565}
565 566
566/* Creates TCEs for a user provided buffer. The user buffer must be 567/* Creates TCEs for a user provided buffer. The user buffer must be
567 * contiguous real kernel storage (not vmalloc). The address of the buffer 568 * contiguous real kernel storage (not vmalloc). The address passed here
568 * passed here is the kernel (virtual) address of the buffer. The buffer 569 * comprises a page address and offset into that page. The dma_addr_t
569 * need not be page aligned, the dma_addr_t returned will point to the same 570 * returned will point to the same byte within the page as was passed in.
570 * byte within the page as vaddr.
571 */ 571 */
572dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl, 572dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl,
573 void *vaddr, size_t size, unsigned long mask, 573 struct page *page, unsigned long offset, size_t size,
574 enum dma_data_direction direction, struct dma_attrs *attrs) 574 unsigned long mask, enum dma_data_direction direction,
575 struct dma_attrs *attrs)
575{ 576{
576 dma_addr_t dma_handle = DMA_ERROR_CODE; 577 dma_addr_t dma_handle = DMA_ERROR_CODE;
578 void *vaddr;
577 unsigned long uaddr; 579 unsigned long uaddr;
578 unsigned int npages, align; 580 unsigned int npages, align;
579 581
580 BUG_ON(direction == DMA_NONE); 582 BUG_ON(direction == DMA_NONE);
581 583
584 vaddr = page_address(page) + offset;
582 uaddr = (unsigned long)vaddr; 585 uaddr = (unsigned long)vaddr;
583 npages = iommu_num_pages(uaddr, size, IOMMU_PAGE_SIZE); 586 npages = iommu_num_pages(uaddr, size, IOMMU_PAGE_SIZE);
584 587
@@ -604,9 +607,9 @@ dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl,
604 return dma_handle; 607 return dma_handle;
605} 608}
606 609
607void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle, 610void iommu_unmap_page(struct iommu_table *tbl, dma_addr_t dma_handle,
608 size_t size, enum dma_data_direction direction, 611 size_t size, enum dma_data_direction direction,
609 struct dma_attrs *attrs) 612 struct dma_attrs *attrs)
610{ 613{
611 unsigned int npages; 614 unsigned int npages;
612 615
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index e6efec788c4d..3c4ca046e854 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -255,14 +255,11 @@ static union thread_union kexec_stack
255/* Our assembly helper, in kexec_stub.S */ 255/* Our assembly helper, in kexec_stub.S */
256extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start, 256extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start,
257 void *image, void *control, 257 void *image, void *control,
258 void (*clear_all)(void), 258 void (*clear_all)(void)) ATTRIB_NORET;
259 unsigned long kdump_flag) ATTRIB_NORET;
260 259
261/* too late to fail here */ 260/* too late to fail here */
262void default_machine_kexec(struct kimage *image) 261void default_machine_kexec(struct kimage *image)
263{ 262{
264 unsigned long kdump_flag = 0;
265
266 /* prepare control code if any */ 263 /* prepare control code if any */
267 264
268 /* 265 /*
@@ -275,8 +272,6 @@ void default_machine_kexec(struct kimage *image)
275 272
276 if (crashing_cpu == -1) 273 if (crashing_cpu == -1)
277 kexec_prepare_cpus(); 274 kexec_prepare_cpus();
278 else
279 kdump_flag = KDUMP_SIGNATURE;
280 275
281 /* switch to a staticly allocated stack. Based on irq stack code. 276 /* switch to a staticly allocated stack. Based on irq stack code.
282 * XXX: the task struct will likely be invalid once we do the copy! 277 * XXX: the task struct will likely be invalid once we do the copy!
@@ -289,7 +284,7 @@ void default_machine_kexec(struct kimage *image)
289 */ 284 */
290 kexec_sequence(&kexec_stack, image->start, image, 285 kexec_sequence(&kexec_stack, image->start, image,
291 page_address(image->control_code_page), 286 page_address(image->control_code_page),
292 ppc_md.hpte_clear_all, kdump_flag); 287 ppc_md.hpte_clear_all);
293 /* NOTREACHED */ 288 /* NOTREACHED */
294} 289}
295 290
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index a243fd072a77..3053fe5c62f2 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -611,12 +611,10 @@ real_mode: /* assume normal blr return */
611 611
612 612
613/* 613/*
614 * kexec_sequence(newstack, start, image, control, clear_all(), kdump_flag) 614 * kexec_sequence(newstack, start, image, control, clear_all())
615 * 615 *
616 * does the grungy work with stack switching and real mode switches 616 * does the grungy work with stack switching and real mode switches
617 * also does simple calls to other code 617 * also does simple calls to other code
618 *
619 * kdump_flag says whether the next kernel should be a kdump kernel.
620 */ 618 */
621 619
622_GLOBAL(kexec_sequence) 620_GLOBAL(kexec_sequence)
@@ -649,7 +647,7 @@ _GLOBAL(kexec_sequence)
649 mr r29,r5 /* image (virt) */ 647 mr r29,r5 /* image (virt) */
650 mr r28,r6 /* control, unused */ 648 mr r28,r6 /* control, unused */
651 mr r27,r7 /* clear_all() fn desc */ 649 mr r27,r7 /* clear_all() fn desc */
652 mr r26,r8 /* kdump flag */ 650 mr r26,r8 /* spare */
653 lhz r25,PACAHWCPUID(r13) /* get our phys cpu from paca */ 651 lhz r25,PACAHWCPUID(r13) /* get our phys cpu from paca */
654 652
655 /* disable interrupts, we are overwriting kernel data next */ 653 /* disable interrupts, we are overwriting kernel data next */
@@ -711,6 +709,5 @@ _GLOBAL(kexec_sequence)
711 mr r4,r30 # start, aka phys mem offset 709 mr r4,r30 # start, aka phys mem offset
712 mtlr 4 710 mtlr 4
713 li r5,0 711 li r5,0
714 mr r6,r26 /* kdump_flag */ 712 blr /* image->start(physid, image->start, 0); */
715 blr /* image->start(physid, image->start, 0, kdump_flag); */
716#endif /* CONFIG_KEXEC */ 713#endif /* CONFIG_KEXEC */
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 93ae5b169f41..f3c9cae01dd5 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -78,7 +78,6 @@ struct of_device *of_device_alloc(struct device_node *np,
78 dev->dev.parent = parent; 78 dev->dev.parent = parent;
79 dev->dev.release = of_release_dev; 79 dev->dev.release = of_release_dev;
80 dev->dev.archdata.of_node = np; 80 dev->dev.archdata.of_node = np;
81 set_dev_node(&dev->dev, of_node_to_nid(np));
82 81
83 if (bus_id) 82 if (bus_id)
84 strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); 83 strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 1ec73938a00f..f36936d9fda3 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1239,69 +1239,66 @@ static int __init reparent_resources(struct resource *parent,
1239 * as well. 1239 * as well.
1240 */ 1240 */
1241 1241
1242static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 1242void pcibios_allocate_bus_resources(struct pci_bus *bus)
1243{ 1243{
1244 struct pci_bus *bus; 1244 struct pci_bus *b;
1245 int i; 1245 int i;
1246 struct resource *res, *pr; 1246 struct resource *res, *pr;
1247 1247
1248 /* Depth-First Search on bus tree */ 1248 for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {
1249 list_for_each_entry(bus, bus_list, node) { 1249 if ((res = bus->resource[i]) == NULL || !res->flags
1250 for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) { 1250 || res->start > res->end)
1251 if ((res = bus->resource[i]) == NULL || !res->flags 1251 continue;
1252 || res->start > res->end) 1252 if (bus->parent == NULL)
1253 continue; 1253 pr = (res->flags & IORESOURCE_IO) ?
1254 if (bus->parent == NULL) 1254 &ioport_resource : &iomem_resource;
1255 pr = (res->flags & IORESOURCE_IO) ? 1255 else {
1256 &ioport_resource : &iomem_resource; 1256 /* Don't bother with non-root busses when
1257 else { 1257 * re-assigning all resources. We clear the
1258 /* Don't bother with non-root busses when 1258 * resource flags as if they were colliding
1259 * re-assigning all resources. We clear the 1259 * and as such ensure proper re-allocation
1260 * resource flags as if they were colliding 1260 * later.
1261 * and as such ensure proper re-allocation 1261 */
1262 * later. 1262 if (ppc_pci_flags & PPC_PCI_REASSIGN_ALL_RSRC)
1263 goto clear_resource;
1264 pr = pci_find_parent_resource(bus->self, res);
1265 if (pr == res) {
1266 /* this happens when the generic PCI
1267 * code (wrongly) decides that this
1268 * bridge is transparent -- paulus
1263 */ 1269 */
1264 if (ppc_pci_flags & PPC_PCI_REASSIGN_ALL_RSRC) 1270 continue;
1265 goto clear_resource;
1266 pr = pci_find_parent_resource(bus->self, res);
1267 if (pr == res) {
1268 /* this happens when the generic PCI
1269 * code (wrongly) decides that this
1270 * bridge is transparent -- paulus
1271 */
1272 continue;
1273 }
1274 } 1271 }
1272 }
1275 1273
1276 DBG("PCI: %s (bus %d) bridge rsrc %d: %016llx-%016llx " 1274 DBG("PCI: %s (bus %d) bridge rsrc %d: %016llx-%016llx "
1277 "[0x%x], parent %p (%s)\n", 1275 "[0x%x], parent %p (%s)\n",
1278 bus->self ? pci_name(bus->self) : "PHB", 1276 bus->self ? pci_name(bus->self) : "PHB",
1279 bus->number, i, 1277 bus->number, i,
1280 (unsigned long long)res->start, 1278 (unsigned long long)res->start,
1281 (unsigned long long)res->end, 1279 (unsigned long long)res->end,
1282 (unsigned int)res->flags, 1280 (unsigned int)res->flags,
1283 pr, (pr && pr->name) ? pr->name : "nil"); 1281 pr, (pr && pr->name) ? pr->name : "nil");
1284 1282
1285 if (pr && !(pr->flags & IORESOURCE_UNSET)) { 1283 if (pr && !(pr->flags & IORESOURCE_UNSET)) {
1286 if (request_resource(pr, res) == 0) 1284 if (request_resource(pr, res) == 0)
1287 continue; 1285 continue;
1288 /* 1286 /*
1289 * Must be a conflict with an existing entry. 1287 * Must be a conflict with an existing entry.
1290 * Move that entry (or entries) under the 1288 * Move that entry (or entries) under the
1291 * bridge resource and try again. 1289 * bridge resource and try again.
1292 */ 1290 */
1293 if (reparent_resources(pr, res) == 0) 1291 if (reparent_resources(pr, res) == 0)
1294 continue; 1292 continue;
1295 }
1296 printk(KERN_WARNING
1297 "PCI: Cannot allocate resource region "
1298 "%d of PCI bridge %d, will remap\n",
1299 i, bus->number);
1300clear_resource:
1301 res->flags = 0;
1302 } 1293 }
1303 pcibios_allocate_bus_resources(&bus->children); 1294 printk(KERN_WARNING "PCI: Cannot allocate resource region "
1295 "%d of PCI bridge %d, will remap\n", i, bus->number);
1296clear_resource:
1297 res->flags = 0;
1304 } 1298 }
1299
1300 list_for_each_entry(b, &bus->children, node)
1301 pcibios_allocate_bus_resources(b);
1305} 1302}
1306 1303
1307static inline void __devinit alloc_resource(struct pci_dev *dev, int idx) 1304static inline void __devinit alloc_resource(struct pci_dev *dev, int idx)
@@ -1372,10 +1369,13 @@ static void __init pcibios_allocate_resources(int pass)
1372 1369
1373void __init pcibios_resource_survey(void) 1370void __init pcibios_resource_survey(void)
1374{ 1371{
1372 struct pci_bus *b;
1373
1375 /* Allocate and assign resources. If we re-assign everything, then 1374 /* Allocate and assign resources. If we re-assign everything, then
1376 * we skip the allocate phase 1375 * we skip the allocate phase
1377 */ 1376 */
1378 pcibios_allocate_bus_resources(&pci_root_buses); 1377 list_for_each_entry(b, &pci_root_buses, node)
1378 pcibios_allocate_bus_resources(b);
1379 1379
1380 if (!(ppc_pci_flags & PPC_PCI_REASSIGN_ALL_RSRC)) { 1380 if (!(ppc_pci_flags & PPC_PCI_REASSIGN_ALL_RSRC)) {
1381 pcibios_allocate_resources(0); 1381 pcibios_allocate_resources(0);
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 8247cff1cb3e..3502b9101e6b 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -426,7 +426,7 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
426 pci_name(bus->self)); 426 pci_name(bus->self));
427 427
428 __flush_hash_table_range(&init_mm, res->start + _IO_BASE, 428 __flush_hash_table_range(&init_mm, res->start + _IO_BASE,
429 res->end - res->start + 1); 429 res->end + _IO_BASE + 1);
430 return 0; 430 return 0;
431 } 431 }
432 432
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 23e0db203329..2445945d3761 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -671,7 +671,7 @@ static struct fake_elf {
671 u32 ignore_me; 671 u32 ignore_me;
672 } rpadesc; 672 } rpadesc;
673 } rpanote; 673 } rpanote;
674} fake_elf __section(.fakeelf) = { 674} fake_elf = {
675 .elfhdr = { 675 .elfhdr = {
676 .e_ident = { 0x7f, 'E', 'L', 'F', 676 .e_ident = { 0x7f, 'E', 'L', 'F',
677 ELFCLASS32, ELFDATA2MSB, EV_CURRENT }, 677 ELFCLASS32, ELFDATA2MSB, EV_CURRENT },
@@ -713,13 +713,13 @@ static struct fake_elf {
713 .type = 0x12759999, 713 .type = 0x12759999,
714 .name = "IBM,RPA-Client-Config", 714 .name = "IBM,RPA-Client-Config",
715 .rpadesc = { 715 .rpadesc = {
716 .lpar_affinity = 1, 716 .lpar_affinity = 0,
717 .min_rmo_size = 128, /* in megabytes */ 717 .min_rmo_size = 64, /* in megabytes */
718 .min_rmo_percent = 0, 718 .min_rmo_percent = 0,
719 .max_pft_size = 46, /* 2^46 bytes max PFT size */ 719 .max_pft_size = 48, /* 2^48 bytes max PFT size */
720 .splpar = 1, 720 .splpar = 1,
721 .min_load = ~0U, 721 .min_load = ~0U,
722 .new_mem_def = 1 722 .new_mem_def = 0
723 } 723 }
724 } 724 }
725}; 725};
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 843c0af210d0..169d74cef157 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -444,9 +444,9 @@ void __init setup_system(void)
444 if (htab_address) 444 if (htab_address)
445 printk("htab_address = 0x%p\n", htab_address); 445 printk("htab_address = 0x%p\n", htab_address);
446 printk("htab_hash_mask = 0x%lx\n", htab_hash_mask); 446 printk("htab_hash_mask = 0x%lx\n", htab_hash_mask);
447#if PHYSICAL_START > 0 447 if (PHYSICAL_START > 0)
448 printk("physical_start = 0x%lx\n", PHYSICAL_START); 448 printk("physical_start = 0x%lx\n",
449#endif 449 PHYSICAL_START);
450 printk("-----------------------------------------------------\n"); 450 printk("-----------------------------------------------------\n");
451 451
452 DBG(" <- setup_system()\n"); 452 DBG(" <- setup_system()\n");
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 3e80aa32b8b0..a6a43103655e 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -410,7 +410,7 @@ inline unsigned long copy_fpr_from_user(struct task_struct *task,
410 * altivec/spe instructions at some point. 410 * altivec/spe instructions at some point.
411 */ 411 */
412static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame, 412static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
413 int sigret) 413 int sigret, int ctx_has_vsx_region)
414{ 414{
415 unsigned long msr = regs->msr; 415 unsigned long msr = regs->msr;
416 416
@@ -451,7 +451,7 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
451 * the saved MSR value to indicate that frame->mc_vregs 451 * the saved MSR value to indicate that frame->mc_vregs
452 * contains valid data 452 * contains valid data
453 */ 453 */
454 if (current->thread.used_vsr) { 454 if (current->thread.used_vsr && ctx_has_vsx_region) {
455 __giveup_vsx(current); 455 __giveup_vsx(current);
456 if (copy_vsx_to_user(&frame->mc_vsregs, current)) 456 if (copy_vsx_to_user(&frame->mc_vsregs, current))
457 return 1; 457 return 1;
@@ -858,11 +858,11 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
858 frame = &rt_sf->uc.uc_mcontext; 858 frame = &rt_sf->uc.uc_mcontext;
859 addr = frame; 859 addr = frame;
860 if (vdso32_rt_sigtramp && current->mm->context.vdso_base) { 860 if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
861 if (save_user_regs(regs, frame, 0)) 861 if (save_user_regs(regs, frame, 0, 1))
862 goto badframe; 862 goto badframe;
863 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; 863 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
864 } else { 864 } else {
865 if (save_user_regs(regs, frame, __NR_rt_sigreturn)) 865 if (save_user_regs(regs, frame, __NR_rt_sigreturn, 1))
866 goto badframe; 866 goto badframe;
867 regs->link = (unsigned long) frame->tramp; 867 regs->link = (unsigned long) frame->tramp;
868 } 868 }
@@ -936,12 +936,13 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
936 int ctx_size, int r6, int r7, int r8, struct pt_regs *regs) 936 int ctx_size, int r6, int r7, int r8, struct pt_regs *regs)
937{ 937{
938 unsigned char tmp; 938 unsigned char tmp;
939 int ctx_has_vsx_region = 0;
939 940
940#ifdef CONFIG_PPC64 941#ifdef CONFIG_PPC64
941 unsigned long new_msr = 0; 942 unsigned long new_msr = 0;
942 943
943 if (new_ctx && 944 if (new_ctx &&
944 __get_user(new_msr, &new_ctx->uc_mcontext.mc_gregs[PT_MSR])) 945 get_user(new_msr, &new_ctx->uc_mcontext.mc_gregs[PT_MSR]))
945 return -EFAULT; 946 return -EFAULT;
946 /* 947 /*
947 * Check that the context is not smaller than the original 948 * Check that the context is not smaller than the original
@@ -956,16 +957,9 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
956 if ((ctx_size < sizeof(struct ucontext)) && 957 if ((ctx_size < sizeof(struct ucontext)) &&
957 (new_msr & MSR_VSX)) 958 (new_msr & MSR_VSX))
958 return -EINVAL; 959 return -EINVAL;
959#ifdef CONFIG_VSX 960 /* Does the context have enough room to store VSX data? */
960 /* 961 if (ctx_size >= sizeof(struct ucontext))
961 * If userspace doesn't provide enough room for VSX data, 962 ctx_has_vsx_region = 1;
962 * but current thread has used VSX, we don't have anywhere
963 * to store the full context back into.
964 */
965 if ((ctx_size < sizeof(struct ucontext)) &&
966 (current->thread.used_vsr && old_ctx))
967 return -EINVAL;
968#endif
969#else 963#else
970 /* Context size is for future use. Right now, we only make sure 964 /* Context size is for future use. Right now, we only make sure
971 * we are passed something we understand 965 * we are passed something we understand
@@ -985,17 +979,17 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
985 */ 979 */
986 mctx = (struct mcontext __user *) 980 mctx = (struct mcontext __user *)
987 ((unsigned long) &old_ctx->uc_mcontext & ~0xfUL); 981 ((unsigned long) &old_ctx->uc_mcontext & ~0xfUL);
988 if (!access_ok(VERIFY_WRITE, old_ctx, sizeof(*old_ctx)) 982 if (!access_ok(VERIFY_WRITE, old_ctx, ctx_size)
989 || save_user_regs(regs, mctx, 0) 983 || save_user_regs(regs, mctx, 0, ctx_has_vsx_region)
990 || put_sigset_t(&old_ctx->uc_sigmask, &current->blocked) 984 || put_sigset_t(&old_ctx->uc_sigmask, &current->blocked)
991 || __put_user(to_user_ptr(mctx), &old_ctx->uc_regs)) 985 || __put_user(to_user_ptr(mctx), &old_ctx->uc_regs))
992 return -EFAULT; 986 return -EFAULT;
993 } 987 }
994 if (new_ctx == NULL) 988 if (new_ctx == NULL)
995 return 0; 989 return 0;
996 if (!access_ok(VERIFY_READ, new_ctx, sizeof(*new_ctx)) 990 if (!access_ok(VERIFY_READ, new_ctx, ctx_size)
997 || __get_user(tmp, (u8 __user *) new_ctx) 991 || __get_user(tmp, (u8 __user *) new_ctx)
998 || __get_user(tmp, (u8 __user *) (new_ctx + 1) - 1)) 992 || __get_user(tmp, (u8 __user *) new_ctx + ctx_size - 1))
999 return -EFAULT; 993 return -EFAULT;
1000 994
1001 /* 995 /*
@@ -1196,11 +1190,11 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
1196 goto badframe; 1190 goto badframe;
1197 1191
1198 if (vdso32_sigtramp && current->mm->context.vdso_base) { 1192 if (vdso32_sigtramp && current->mm->context.vdso_base) {
1199 if (save_user_regs(regs, &frame->mctx, 0)) 1193 if (save_user_regs(regs, &frame->mctx, 0, 1))
1200 goto badframe; 1194 goto badframe;
1201 regs->link = current->mm->context.vdso_base + vdso32_sigtramp; 1195 regs->link = current->mm->context.vdso_base + vdso32_sigtramp;
1202 } else { 1196 } else {
1203 if (save_user_regs(regs, &frame->mctx, __NR_sigreturn)) 1197 if (save_user_regs(regs, &frame->mctx, __NR_sigreturn, 1))
1204 goto badframe; 1198 goto badframe;
1205 regs->link = (unsigned long) frame->mctx.tramp; 1199 regs->link = (unsigned long) frame->mctx.tramp;
1206 } 1200 }
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index c6a8f2326b6f..e132891d3cea 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -74,7 +74,8 @@ static const char fmt64[] = KERN_INFO \
74 */ 74 */
75 75
76static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, 76static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
77 int signr, sigset_t *set, unsigned long handler) 77 int signr, sigset_t *set, unsigned long handler,
78 int ctx_has_vsx_region)
78{ 79{
79 /* When CONFIG_ALTIVEC is set, we _always_ setup v_regs even if the 80 /* When CONFIG_ALTIVEC is set, we _always_ setup v_regs even if the
80 * process never used altivec yet (MSR_VEC is zero in pt_regs of 81 * process never used altivec yet (MSR_VEC is zero in pt_regs of
@@ -121,7 +122,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
121 * then out to userspace. Update v_regs to point after the 122 * then out to userspace. Update v_regs to point after the
122 * VMX data. 123 * VMX data.
123 */ 124 */
124 if (current->thread.used_vsr) { 125 if (current->thread.used_vsr && ctx_has_vsx_region) {
125 __giveup_vsx(current); 126 __giveup_vsx(current);
126 v_regs += ELF_NVRREG; 127 v_regs += ELF_NVRREG;
127 err |= copy_vsx_to_user(v_regs, current); 128 err |= copy_vsx_to_user(v_regs, current);
@@ -282,9 +283,10 @@ int sys_swapcontext(struct ucontext __user *old_ctx,
282 unsigned char tmp; 283 unsigned char tmp;
283 sigset_t set; 284 sigset_t set;
284 unsigned long new_msr = 0; 285 unsigned long new_msr = 0;
286 int ctx_has_vsx_region = 0;
285 287
286 if (new_ctx && 288 if (new_ctx &&
287 __get_user(new_msr, &new_ctx->uc_mcontext.gp_regs[PT_MSR])) 289 get_user(new_msr, &new_ctx->uc_mcontext.gp_regs[PT_MSR]))
288 return -EFAULT; 290 return -EFAULT;
289 /* 291 /*
290 * Check that the context is not smaller than the original 292 * Check that the context is not smaller than the original
@@ -299,28 +301,23 @@ int sys_swapcontext(struct ucontext __user *old_ctx,
299 if ((ctx_size < sizeof(struct ucontext)) && 301 if ((ctx_size < sizeof(struct ucontext)) &&
300 (new_msr & MSR_VSX)) 302 (new_msr & MSR_VSX))
301 return -EINVAL; 303 return -EINVAL;
302#ifdef CONFIG_VSX 304 /* Does the context have enough room to store VSX data? */
303 /* 305 if (ctx_size >= sizeof(struct ucontext))
304 * If userspace doesn't provide enough room for VSX data, 306 ctx_has_vsx_region = 1;
305 * but current thread has used VSX, we don't have anywhere 307
306 * to store the full context back into.
307 */
308 if ((ctx_size < sizeof(struct ucontext)) &&
309 (current->thread.used_vsr && old_ctx))
310 return -EINVAL;
311#endif
312 if (old_ctx != NULL) { 308 if (old_ctx != NULL) {
313 if (!access_ok(VERIFY_WRITE, old_ctx, sizeof(*old_ctx)) 309 if (!access_ok(VERIFY_WRITE, old_ctx, ctx_size)
314 || setup_sigcontext(&old_ctx->uc_mcontext, regs, 0, NULL, 0) 310 || setup_sigcontext(&old_ctx->uc_mcontext, regs, 0, NULL, 0,
311 ctx_has_vsx_region)
315 || __copy_to_user(&old_ctx->uc_sigmask, 312 || __copy_to_user(&old_ctx->uc_sigmask,
316 &current->blocked, sizeof(sigset_t))) 313 &current->blocked, sizeof(sigset_t)))
317 return -EFAULT; 314 return -EFAULT;
318 } 315 }
319 if (new_ctx == NULL) 316 if (new_ctx == NULL)
320 return 0; 317 return 0;
321 if (!access_ok(VERIFY_READ, new_ctx, sizeof(*new_ctx)) 318 if (!access_ok(VERIFY_READ, new_ctx, ctx_size)
322 || __get_user(tmp, (u8 __user *) new_ctx) 319 || __get_user(tmp, (u8 __user *) new_ctx)
323 || __get_user(tmp, (u8 __user *) (new_ctx + 1) - 1)) 320 || __get_user(tmp, (u8 __user *) new_ctx + ctx_size - 1))
324 return -EFAULT; 321 return -EFAULT;
325 322
326 /* 323 /*
@@ -423,7 +420,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
423 &frame->uc.uc_stack.ss_flags); 420 &frame->uc.uc_stack.ss_flags);
424 err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size); 421 err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
425 err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, signr, NULL, 422 err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, signr, NULL,
426 (unsigned long)ka->sa.sa_handler); 423 (unsigned long)ka->sa.sa_handler, 1);
427 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); 424 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
428 if (err) 425 if (err)
429 goto badframe; 426 goto badframe;
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 434c92a85c03..a11e6bc59b30 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -516,10 +516,10 @@ static void vio_dma_iommu_free_coherent(struct device *dev, size_t size,
516 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); 516 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE));
517} 517}
518 518
519static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr, 519static dma_addr_t vio_dma_iommu_map_page(struct device *dev, struct page *page,
520 size_t size, 520 unsigned long offset, size_t size,
521 enum dma_data_direction direction, 521 enum dma_data_direction direction,
522 struct dma_attrs *attrs) 522 struct dma_attrs *attrs)
523{ 523{
524 struct vio_dev *viodev = to_vio_dev(dev); 524 struct vio_dev *viodev = to_vio_dev(dev);
525 dma_addr_t ret = DMA_ERROR_CODE; 525 dma_addr_t ret = DMA_ERROR_CODE;
@@ -529,7 +529,7 @@ static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr,
529 return ret; 529 return ret;
530 } 530 }
531 531
532 ret = dma_iommu_ops.map_single(dev, vaddr, size, direction, attrs); 532 ret = dma_iommu_ops.map_page(dev, page, offset, size, direction, attrs);
533 if (unlikely(dma_mapping_error(dev, ret))) { 533 if (unlikely(dma_mapping_error(dev, ret))) {
534 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); 534 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE));
535 atomic_inc(&viodev->cmo.allocs_failed); 535 atomic_inc(&viodev->cmo.allocs_failed);
@@ -538,14 +538,14 @@ static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr,
538 return ret; 538 return ret;
539} 539}
540 540
541static void vio_dma_iommu_unmap_single(struct device *dev, 541static void vio_dma_iommu_unmap_page(struct device *dev, dma_addr_t dma_handle,
542 dma_addr_t dma_handle, size_t size, 542 size_t size,
543 enum dma_data_direction direction, 543 enum dma_data_direction direction,
544 struct dma_attrs *attrs) 544 struct dma_attrs *attrs)
545{ 545{
546 struct vio_dev *viodev = to_vio_dev(dev); 546 struct vio_dev *viodev = to_vio_dev(dev);
547 547
548 dma_iommu_ops.unmap_single(dev, dma_handle, size, direction, attrs); 548 dma_iommu_ops.unmap_page(dev, dma_handle, size, direction, attrs);
549 549
550 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); 550 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE));
551} 551}
@@ -603,10 +603,11 @@ static void vio_dma_iommu_unmap_sg(struct device *dev,
603struct dma_mapping_ops vio_dma_mapping_ops = { 603struct dma_mapping_ops vio_dma_mapping_ops = {
604 .alloc_coherent = vio_dma_iommu_alloc_coherent, 604 .alloc_coherent = vio_dma_iommu_alloc_coherent,
605 .free_coherent = vio_dma_iommu_free_coherent, 605 .free_coherent = vio_dma_iommu_free_coherent,
606 .map_single = vio_dma_iommu_map_single,
607 .unmap_single = vio_dma_iommu_unmap_single,
608 .map_sg = vio_dma_iommu_map_sg, 606 .map_sg = vio_dma_iommu_map_sg,
609 .unmap_sg = vio_dma_iommu_unmap_sg, 607 .unmap_sg = vio_dma_iommu_unmap_sg,
608 .map_page = vio_dma_iommu_map_page,
609 .unmap_page = vio_dma_iommu_unmap_page,
610
610}; 611};
611 612
612/** 613/**
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index b39c27ed7919..2412c056baa4 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -187,6 +187,7 @@ SECTIONS
187 *(.machine.desc) 187 *(.machine.desc)
188 __machine_desc_end = . ; 188 __machine_desc_end = . ;
189 } 189 }
190#ifdef CONFIG_RELOCATABLE
190 . = ALIGN(8); 191 . = ALIGN(8);
191 .dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) { *(.dynsym) } 192 .dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) { *(.dynsym) }
192 .dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) } 193 .dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) }
@@ -202,9 +203,7 @@ SECTIONS
202 __rela_dyn_start = .; 203 __rela_dyn_start = .;
203 *(.rela*) 204 *(.rela*)
204 } 205 }
205 206#endif
206 /* Fake ELF header containing RPA note; for addnote */
207 .fakeelf : AT(ADDR(.fakeelf) - LOAD_OFFSET) { *(.fakeelf) }
208 207
209 /* freed after init ends here */ 208 /* freed after init ends here */
210 . = ALIGN(PAGE_SIZE); 209 . = ALIGN(PAGE_SIZE);
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
index 35141a8bc3d9..25a4ec2514a3 100644
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -582,6 +582,13 @@ static int cell_reg_setup(struct op_counter_config *ctr,
582 582
583 num_counters = num_ctrs; 583 num_counters = num_ctrs;
584 584
585 if (unlikely(num_ctrs > NR_PHYS_CTRS)) {
586 printk(KERN_ERR
587 "%s: Oprofile, number of specified events " \
588 "exceeds number of physical counters\n",
589 __func__);
590 return -EIO;
591 }
585 pm_regs.group_control = 0; 592 pm_regs.group_control = 0;
586 pm_regs.debug_bus_control = 0; 593 pm_regs.debug_bus_control = 0;
587 594
@@ -830,13 +837,13 @@ static int calculate_lfsr(int n)
830static int pm_rtas_activate_spu_profiling(u32 node) 837static int pm_rtas_activate_spu_profiling(u32 node)
831{ 838{
832 int ret, i; 839 int ret, i;
833 struct pm_signal pm_signal_local[NR_PHYS_CTRS]; 840 struct pm_signal pm_signal_local[NUM_SPUS_PER_NODE];
834 841
835 /* 842 /*
836 * Set up the rtas call to configure the debug bus to 843 * Set up the rtas call to configure the debug bus to
837 * route the SPU PCs. Setup the pm_signal for each SPU 844 * route the SPU PCs. Setup the pm_signal for each SPU
838 */ 845 */
839 for (i = 0; i < NUM_SPUS_PER_NODE; i++) { 846 for (i = 0; i < ARRAY_SIZE(pm_signal_local); i++) {
840 pm_signal_local[i].cpu = node; 847 pm_signal_local[i].cpu = node;
841 pm_signal_local[i].signal_group = 41; 848 pm_signal_local[i].signal_group = 41;
842 /* spu i on word (i/2) */ 849 /* spu i on word (i/2) */
@@ -848,7 +855,7 @@ static int pm_rtas_activate_spu_profiling(u32 node)
848 855
849 ret = rtas_ibm_cbe_perftools(SUBFUNC_ACTIVATE, 856 ret = rtas_ibm_cbe_perftools(SUBFUNC_ACTIVATE,
850 PASSTHRU_ENABLE, pm_signal_local, 857 PASSTHRU_ENABLE, pm_signal_local,
851 (NUM_SPUS_PER_NODE 858 (ARRAY_SIZE(pm_signal_local)
852 * sizeof(struct pm_signal))); 859 * sizeof(struct pm_signal)));
853 860
854 if (unlikely(ret)) { 861 if (unlikely(ret)) {
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index 65730275e012..14e027f5be66 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -35,7 +35,7 @@ config EP405
35config HCU4 35config HCU4
36 bool "Hcu4" 36 bool "Hcu4"
37 depends on 40x 37 depends on 40x
38 default y 38 default n
39 select 405GPR 39 select 405GPR
40 help 40 help
41 This option enables support for the Nestal Maschinen HCU4 board. 41 This option enables support for the Nestal Maschinen HCU4 board.
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 483b65cbabae..613bf8c2e30d 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -78,7 +78,8 @@ void __init mpc85xx_ds_pic_init(void)
78 78
79 mpic = mpic_alloc(np, r.start, 79 mpic = mpic_alloc(np, r.start,
80 MPIC_PRIMARY | MPIC_WANTS_RESET | 80 MPIC_PRIMARY | MPIC_WANTS_RESET |
81 MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS, 81 MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
82 MPIC_SINGLE_DEST_CPU,
82 0, 256, " OpenPIC "); 83 0, 256, " OpenPIC ");
83 BUG_ON(mpic == NULL); 84 BUG_ON(mpic == NULL);
84 of_node_put(np); 85 of_node_put(np);
diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c
index 8881c5de500d..668275d9e668 100644
--- a/arch/powerpc/platforms/86xx/pic.c
+++ b/arch/powerpc/platforms/86xx/pic.c
@@ -44,7 +44,8 @@ void __init mpc86xx_init_irq(void)
44 44
45 mpic = mpic_alloc(np, res.start, 45 mpic = mpic_alloc(np, res.start,
46 MPIC_PRIMARY | MPIC_WANTS_RESET | 46 MPIC_PRIMARY | MPIC_WANTS_RESET |
47 MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS, 47 MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
48 MPIC_SINGLE_DEST_CPU,
48 0, 256, " MPIC "); 49 0, 256, " MPIC ");
49 of_node_put(np); 50 of_node_put(np);
50 BUG_ON(mpic == NULL); 51 BUG_ON(mpic == NULL);
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index ef92e7146215..3168272ab0d7 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -593,31 +593,30 @@ static void dma_fixed_free_coherent(struct device *dev, size_t size,
593 dma_direct_ops.free_coherent(dev, size, vaddr, dma_handle); 593 dma_direct_ops.free_coherent(dev, size, vaddr, dma_handle);
594} 594}
595 595
596static dma_addr_t dma_fixed_map_single(struct device *dev, void *ptr, 596static dma_addr_t dma_fixed_map_page(struct device *dev, struct page *page,
597 size_t size, 597 unsigned long offset, size_t size,
598 enum dma_data_direction direction, 598 enum dma_data_direction direction,
599 struct dma_attrs *attrs) 599 struct dma_attrs *attrs)
600{ 600{
601 if (iommu_fixed_is_weak == dma_get_attr(DMA_ATTR_WEAK_ORDERING, attrs)) 601 if (iommu_fixed_is_weak == dma_get_attr(DMA_ATTR_WEAK_ORDERING, attrs))
602 return dma_direct_ops.map_single(dev, ptr, size, direction, 602 return dma_direct_ops.map_page(dev, page, offset, size,
603 attrs); 603 direction, attrs);
604 else 604 else
605 return iommu_map_single(dev, cell_get_iommu_table(dev), ptr, 605 return iommu_map_page(dev, cell_get_iommu_table(dev), page,
606 size, device_to_mask(dev), direction, 606 offset, size, device_to_mask(dev),
607 attrs); 607 direction, attrs);
608} 608}
609 609
610static void dma_fixed_unmap_single(struct device *dev, dma_addr_t dma_addr, 610static void dma_fixed_unmap_page(struct device *dev, dma_addr_t dma_addr,
611 size_t size, 611 size_t size, enum dma_data_direction direction,
612 enum dma_data_direction direction, 612 struct dma_attrs *attrs)
613 struct dma_attrs *attrs)
614{ 613{
615 if (iommu_fixed_is_weak == dma_get_attr(DMA_ATTR_WEAK_ORDERING, attrs)) 614 if (iommu_fixed_is_weak == dma_get_attr(DMA_ATTR_WEAK_ORDERING, attrs))
616 dma_direct_ops.unmap_single(dev, dma_addr, size, direction, 615 dma_direct_ops.unmap_page(dev, dma_addr, size, direction,
617 attrs); 616 attrs);
618 else 617 else
619 iommu_unmap_single(cell_get_iommu_table(dev), dma_addr, size, 618 iommu_unmap_page(cell_get_iommu_table(dev), dma_addr, size,
620 direction, attrs); 619 direction, attrs);
621} 620}
622 621
623static int dma_fixed_map_sg(struct device *dev, struct scatterlist *sg, 622static int dma_fixed_map_sg(struct device *dev, struct scatterlist *sg,
@@ -652,12 +651,12 @@ static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
652struct dma_mapping_ops dma_iommu_fixed_ops = { 651struct dma_mapping_ops dma_iommu_fixed_ops = {
653 .alloc_coherent = dma_fixed_alloc_coherent, 652 .alloc_coherent = dma_fixed_alloc_coherent,
654 .free_coherent = dma_fixed_free_coherent, 653 .free_coherent = dma_fixed_free_coherent,
655 .map_single = dma_fixed_map_single,
656 .unmap_single = dma_fixed_unmap_single,
657 .map_sg = dma_fixed_map_sg, 654 .map_sg = dma_fixed_map_sg,
658 .unmap_sg = dma_fixed_unmap_sg, 655 .unmap_sg = dma_fixed_unmap_sg,
659 .dma_supported = dma_fixed_dma_supported, 656 .dma_supported = dma_fixed_dma_supported,
660 .set_dma_mask = dma_set_mask_and_switch, 657 .set_dma_mask = dma_set_mask_and_switch,
658 .map_page = dma_fixed_map_page,
659 .unmap_page = dma_fixed_unmap_page,
661}; 660};
662 661
663static void cell_dma_dev_setup_fixed(struct device *dev); 662static void cell_dma_dev_setup_fixed(struct device *dev);
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 665af1c4195b..fdf088f2430e 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -13,15 +13,15 @@
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/smp.h> 14#include <linux/smp.h>
15#include <linux/reboot.h> 15#include <linux/reboot.h>
16#include <linux/kexec.h>
17#include <linux/crash_dump.h>
16 18
17#include <asm/reg.h> 19#include <asm/reg.h>
18#include <asm/io.h> 20#include <asm/io.h>
19#include <asm/prom.h> 21#include <asm/prom.h>
20#include <asm/kexec.h>
21#include <asm/machdep.h> 22#include <asm/machdep.h>
22#include <asm/rtas.h> 23#include <asm/rtas.h>
23#include <asm/cell-regs.h> 24#include <asm/cell-regs.h>
24#include <asm/kdump.h>
25 25
26#include "ras.h" 26#include "ras.h"
27 27
@@ -112,7 +112,7 @@ static int __init cbe_ptcal_enable_on_node(int nid, int order)
112 int ret = -ENOMEM; 112 int ret = -ENOMEM;
113 unsigned long addr; 113 unsigned long addr;
114 114
115 if (__kdump_flag) 115 if (is_kdump_kernel())
116 rtas_call(ptcal_stop_tok, 1, 1, NULL, nid); 116 rtas_call(ptcal_stop_tok, 1, 1, NULL, nid);
117 117
118 area = kmalloc(sizeof(*area), GFP_KERNEL); 118 area = kmalloc(sizeof(*area), GFP_KERNEL);
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index eb5d74e26fe9..2ca7be65c2d2 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -13,6 +13,7 @@
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/initrd.h> 14#include <linux/initrd.h>
15#include <linux/mtd/physmap.h> 15#include <linux/mtd/physmap.h>
16#include <linux/of_platform.h>
16 17
17#include <asm/time.h> 18#include <asm/time.h>
18#include <asm/prom.h> 19#include <asm/prom.h>
@@ -54,6 +55,19 @@ static struct mtd_partition linkstation_physmap_partitions[] = {
54 }, 55 },
55}; 56};
56 57
58static __initdata struct of_device_id of_bus_ids[] = {
59 { .type = "soc", },
60 { .compatible = "simple-bus", },
61 {},
62};
63
64static int __init declare_of_platform_devices(void)
65{
66 of_platform_bus_probe(NULL, of_bus_ids, NULL);
67 return 0;
68}
69machine_device_initcall(linkstation, declare_of_platform_devices);
70
57static int __init linkstation_add_bridge(struct device_node *dev) 71static int __init linkstation_add_bridge(struct device_node *dev)
58{ 72{
59#ifdef CONFIG_PCI 73#ifdef CONFIG_PCI
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index bb464d1211b2..bbe828f1b885 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -215,14 +215,15 @@ EXPORT_SYMBOL_GPL(iseries_hv_free);
215dma_addr_t iseries_hv_map(void *vaddr, size_t size, 215dma_addr_t iseries_hv_map(void *vaddr, size_t size,
216 enum dma_data_direction direction) 216 enum dma_data_direction direction)
217{ 217{
218 return iommu_map_single(NULL, &vio_iommu_table, vaddr, size, 218 return iommu_map_page(NULL, &vio_iommu_table, virt_to_page(vaddr),
219 DMA_32BIT_MASK, direction, NULL); 219 (unsigned long)vaddr % PAGE_SIZE, size,
220 DMA_32BIT_MASK, direction, NULL);
220} 221}
221 222
222void iseries_hv_unmap(dma_addr_t dma_handle, size_t size, 223void iseries_hv_unmap(dma_addr_t dma_handle, size_t size,
223 enum dma_data_direction direction) 224 enum dma_data_direction direction)
224{ 225{
225 iommu_unmap_single(&vio_iommu_table, dma_handle, size, direction, NULL); 226 iommu_unmap_page(&vio_iommu_table, dma_handle, size, direction, NULL);
226} 227}
227 228
228void __init iommu_vio_init(void) 229void __init iommu_vio_init(void)
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index a789bf58ca8b..661e9f77ebf6 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -555,18 +555,19 @@ static void ps3_free_coherent(struct device *_dev, size_t size, void *vaddr,
555} 555}
556 556
557/* Creates TCEs for a user provided buffer. The user buffer must be 557/* Creates TCEs for a user provided buffer. The user buffer must be
558 * contiguous real kernel storage (not vmalloc). The address of the buffer 558 * contiguous real kernel storage (not vmalloc). The address passed here
559 * passed here is the kernel (virtual) address of the buffer. The buffer 559 * comprises a page address and offset into that page. The dma_addr_t
560 * need not be page aligned, the dma_addr_t returned will point to the same 560 * returned will point to the same byte within the page as was passed in.
561 * byte within the page as vaddr.
562 */ 561 */
563 562
564static dma_addr_t ps3_sb_map_single(struct device *_dev, void *ptr, size_t size, 563static dma_addr_t ps3_sb_map_page(struct device *_dev, struct page *page,
565 enum dma_data_direction direction, struct dma_attrs *attrs) 564 unsigned long offset, size_t size, enum dma_data_direction direction,
565 struct dma_attrs *attrs)
566{ 566{
567 struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev); 567 struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
568 int result; 568 int result;
569 unsigned long bus_addr; 569 unsigned long bus_addr;
570 void *ptr = page_address(page) + offset;
570 571
571 result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size, 572 result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,
572 &bus_addr, 573 &bus_addr,
@@ -580,15 +581,16 @@ static dma_addr_t ps3_sb_map_single(struct device *_dev, void *ptr, size_t size,
580 return bus_addr; 581 return bus_addr;
581} 582}
582 583
583static dma_addr_t ps3_ioc0_map_single(struct device *_dev, void *ptr, 584static dma_addr_t ps3_ioc0_map_page(struct device *_dev, struct page *page,
584 size_t size, 585 unsigned long offset, size_t size,
585 enum dma_data_direction direction, 586 enum dma_data_direction direction,
586 struct dma_attrs *attrs) 587 struct dma_attrs *attrs)
587{ 588{
588 struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev); 589 struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
589 int result; 590 int result;
590 unsigned long bus_addr; 591 unsigned long bus_addr;
591 u64 iopte_flag; 592 u64 iopte_flag;
593 void *ptr = page_address(page) + offset;
592 594
593 iopte_flag = IOPTE_M; 595 iopte_flag = IOPTE_M;
594 switch (direction) { 596 switch (direction) {
@@ -615,7 +617,7 @@ static dma_addr_t ps3_ioc0_map_single(struct device *_dev, void *ptr,
615 return bus_addr; 617 return bus_addr;
616} 618}
617 619
618static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr, 620static void ps3_unmap_page(struct device *_dev, dma_addr_t dma_addr,
619 size_t size, enum dma_data_direction direction, struct dma_attrs *attrs) 621 size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
620{ 622{
621 struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev); 623 struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
@@ -689,21 +691,21 @@ static int ps3_dma_supported(struct device *_dev, u64 mask)
689static struct dma_mapping_ops ps3_sb_dma_ops = { 691static struct dma_mapping_ops ps3_sb_dma_ops = {
690 .alloc_coherent = ps3_alloc_coherent, 692 .alloc_coherent = ps3_alloc_coherent,
691 .free_coherent = ps3_free_coherent, 693 .free_coherent = ps3_free_coherent,
692 .map_single = ps3_sb_map_single,
693 .unmap_single = ps3_unmap_single,
694 .map_sg = ps3_sb_map_sg, 694 .map_sg = ps3_sb_map_sg,
695 .unmap_sg = ps3_sb_unmap_sg, 695 .unmap_sg = ps3_sb_unmap_sg,
696 .dma_supported = ps3_dma_supported 696 .dma_supported = ps3_dma_supported,
697 .map_page = ps3_sb_map_page,
698 .unmap_page = ps3_unmap_page,
697}; 699};
698 700
699static struct dma_mapping_ops ps3_ioc0_dma_ops = { 701static struct dma_mapping_ops ps3_ioc0_dma_ops = {
700 .alloc_coherent = ps3_alloc_coherent, 702 .alloc_coherent = ps3_alloc_coherent,
701 .free_coherent = ps3_free_coherent, 703 .free_coherent = ps3_free_coherent,
702 .map_single = ps3_ioc0_map_single,
703 .unmap_single = ps3_unmap_single,
704 .map_sg = ps3_ioc0_map_sg, 704 .map_sg = ps3_ioc0_map_sg,
705 .unmap_sg = ps3_ioc0_unmap_sg, 705 .unmap_sg = ps3_ioc0_unmap_sg,
706 .dma_supported = ps3_dma_supported 706 .dma_supported = ps3_dma_supported,
707 .map_page = ps3_ioc0_map_page,
708 .unmap_page = ps3_unmap_page,
707}; 709};
708 710
709/** 711/**
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index d56491d182d3..c90817acb472 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -32,6 +32,7 @@
32#include <linux/string.h> 32#include <linux/string.h>
33#include <linux/pci.h> 33#include <linux/pci.h>
34#include <linux/dma-mapping.h> 34#include <linux/dma-mapping.h>
35#include <linux/crash_dump.h>
35#include <asm/io.h> 36#include <asm/io.h>
36#include <asm/prom.h> 37#include <asm/prom.h>
37#include <asm/rtas.h> 38#include <asm/rtas.h>
@@ -44,7 +45,6 @@
44#include <asm/tce.h> 45#include <asm/tce.h>
45#include <asm/ppc-pci.h> 46#include <asm/ppc-pci.h>
46#include <asm/udbg.h> 47#include <asm/udbg.h>
47#include <asm/kdump.h>
48 48
49#include "plpar_wrappers.h" 49#include "plpar_wrappers.h"
50 50
@@ -292,7 +292,7 @@ static void iommu_table_setparms(struct pci_controller *phb,
292 292
293 tbl->it_base = (unsigned long)__va(*basep); 293 tbl->it_base = (unsigned long)__va(*basep);
294 294
295 if (!__kdump_flag) 295 if (!is_kdump_kernel())
296 memset((void *)tbl->it_base, 0, *sizep); 296 memset((void *)tbl->it_base, 0, *sizep);
297 297
298 tbl->it_busno = phb->bus->number; 298 tbl->it_busno = phb->bus->number;
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 21a6d55418f1..31481dc485de 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -189,6 +189,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
189{ 189{
190 struct pci_controller *phb; 190 struct pci_controller *phb;
191 int primary; 191 int primary;
192 struct pci_bus *b;
192 193
193 primary = list_empty(&hose_list); 194 primary = list_empty(&hose_list);
194 phb = pcibios_alloc_controller(dn); 195 phb = pcibios_alloc_controller(dn);
@@ -203,6 +204,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
203 eeh_add_device_tree_early(dn); 204 eeh_add_device_tree_early(dn);
204 205
205 scan_phb(phb); 206 scan_phb(phb);
207 pcibios_allocate_bus_resources(phb->bus);
206 pcibios_fixup_new_pci_devices(phb->bus); 208 pcibios_fixup_new_pci_devices(phb->bus);
207 pci_bus_add_devices(phb->bus); 209 pci_bus_add_devices(phb->bus);
208 eeh_add_device_tree_late(phb->bus); 210 eeh_add_device_tree_late(phb->bus);
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 8e3478c995ef..f6299cca7814 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -563,6 +563,51 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic)
563 563
564#endif /* CONFIG_MPIC_U3_HT_IRQS */ 564#endif /* CONFIG_MPIC_U3_HT_IRQS */
565 565
566#ifdef CONFIG_SMP
567static int irq_choose_cpu(unsigned int virt_irq)
568{
569 cpumask_t mask = irq_desc[virt_irq].affinity;
570 int cpuid;
571
572 if (cpus_equal(mask, CPU_MASK_ALL)) {
573 static int irq_rover;
574 static DEFINE_SPINLOCK(irq_rover_lock);
575 unsigned long flags;
576
577 /* Round-robin distribution... */
578 do_round_robin:
579 spin_lock_irqsave(&irq_rover_lock, flags);
580
581 while (!cpu_online(irq_rover)) {
582 if (++irq_rover >= NR_CPUS)
583 irq_rover = 0;
584 }
585 cpuid = irq_rover;
586 do {
587 if (++irq_rover >= NR_CPUS)
588 irq_rover = 0;
589 } while (!cpu_online(irq_rover));
590
591 spin_unlock_irqrestore(&irq_rover_lock, flags);
592 } else {
593 cpumask_t tmp;
594
595 cpus_and(tmp, cpu_online_map, mask);
596
597 if (cpus_empty(tmp))
598 goto do_round_robin;
599
600 cpuid = first_cpu(tmp);
601 }
602
603 return cpuid;
604}
605#else
606static int irq_choose_cpu(unsigned int virt_irq)
607{
608 return hard_smp_processor_id();
609}
610#endif
566 611
567#define mpic_irq_to_hw(virq) ((unsigned int)irq_map[virq].hwirq) 612#define mpic_irq_to_hw(virq) ((unsigned int)irq_map[virq].hwirq)
568 613
@@ -777,12 +822,18 @@ void mpic_set_affinity(unsigned int irq, cpumask_t cpumask)
777 struct mpic *mpic = mpic_from_irq(irq); 822 struct mpic *mpic = mpic_from_irq(irq);
778 unsigned int src = mpic_irq_to_hw(irq); 823 unsigned int src = mpic_irq_to_hw(irq);
779 824
780 cpumask_t tmp; 825 if (mpic->flags & MPIC_SINGLE_DEST_CPU) {
826 int cpuid = irq_choose_cpu(irq);
781 827
782 cpus_and(tmp, cpumask, cpu_online_map); 828 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), 1 << cpuid);
829 } else {
830 cpumask_t tmp;
783 831
784 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), 832 cpus_and(tmp, cpumask, cpu_online_map);
785 mpic_physmask(cpus_addr(tmp)[0])); 833
834 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION),
835 mpic_physmask(cpus_addr(tmp)[0]));
836 }
786} 837}
787 838
788static unsigned int mpic_type_to_vecpri(struct mpic *mpic, unsigned int type) 839static unsigned int mpic_type_to_vecpri(struct mpic *mpic, unsigned int type)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 34c3d0688fe0..076368c8b8a9 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1353,6 +1353,7 @@ static void backtrace(struct pt_regs *excp)
1353 1353
1354static void print_bug_trap(struct pt_regs *regs) 1354static void print_bug_trap(struct pt_regs *regs)
1355{ 1355{
1356#ifdef CONFIG_BUG
1356 const struct bug_entry *bug; 1357 const struct bug_entry *bug;
1357 unsigned long addr; 1358 unsigned long addr;
1358 1359
@@ -1373,6 +1374,7 @@ static void print_bug_trap(struct pt_regs *regs)
1373#else 1374#else
1374 printf("kernel BUG at %p!\n", (void *)bug->bug_addr); 1375 printf("kernel BUG at %p!\n", (void *)bug->bug_addr);
1375#endif 1376#endif
1377#endif /* CONFIG_BUG */
1376} 1378}
1377 1379
1378static void excprint(struct pt_regs *fp) 1380static void excprint(struct pt_regs *fp)
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-03 18:45:43 -0400