diff options
145 files changed, 3115 insertions, 3313 deletions
diff --git a/Documentation/sh/new-machine.txt b/Documentation/sh/new-machine.txt index 5482bf5d005b..f0354164cb0e 100644 --- a/Documentation/sh/new-machine.txt +++ b/Documentation/sh/new-machine.txt | |||
| @@ -47,9 +47,7 @@ Next, for companion chips: | |||
| 47 | `-- sh | 47 | `-- sh |
| 48 | `-- cchips | 48 | `-- cchips |
| 49 | `-- hd6446x | 49 | `-- hd6446x |
| 50 | |-- hd64461 | 50 | `-- hd64461 |
| 51 | | `-- cchip-specific files | ||
| 52 | `-- hd64465 | ||
| 53 | `-- cchip-specific files | 51 | `-- cchip-specific files |
| 54 | 52 | ||
| 55 | ... and so on. Headers for the companion chips are treated the same way as | 53 | ... and so on. Headers for the companion chips are treated the same way as |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index ada4605d1223..6543a5547c84 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -1995,11 +1995,6 @@ pfm_close(struct inode *inode, struct file *filp) | |||
| 1995 | return -EBADF; | 1995 | return -EBADF; |
| 1996 | } | 1996 | } |
| 1997 | 1997 | ||
| 1998 | if (filp->f_flags & FASYNC) { | ||
| 1999 | DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue)); | ||
| 2000 | pfm_do_fasync(-1, filp, ctx, 0); | ||
| 2001 | } | ||
| 2002 | |||
| 2003 | PROTECT_CTX(ctx, flags); | 1998 | PROTECT_CTX(ctx, flags); |
| 2004 | 1999 | ||
| 2005 | state = ctx->ctx_state; | 2000 | state = ctx->ctx_state; |
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 |
| 50 | unsigned int rpanote[N_RPA_DESCR] = { | 45 | unsigned 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 | ||
| 63 | unsigned char buf[512]; | 58 | unsigned char buf[512]; |
| 64 | unsigned 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 | ||
| 96 | unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' }; | 89 | unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' }; |
| 97 | 90 | ||
| 98 | unsigned 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(¬ebuf[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 *)¬ebuf[note + 12], rpaname) != 0) | ||
| 140 | continue; | ||
| 141 | /* looks like an RPA note, return it */ | ||
| 142 | *nnp = notesize; | ||
| 143 | return ¬ebuf[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 | |||
| 153 | int | 91 | int |
| 154 | main(int ac, char **av) | 92 | main(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 | ||
| 120 | int fdt_subnode_offset(const void *fdt, int parentoffset, | 123 | int 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 |
| 308 | case "$platform" in | 308 | case "$platform" in |
| 309 | pseries) | 309 | pseries|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 | ;; | ||
| 314 | chrp) | ||
| 315 | $objbin/addnote -r c00000 "$ofile" | ||
| 316 | ;; | 311 | ;; |
| 317 | coff) | 312 | coff) |
| 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 | |||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | 19 | CONFIG_NOT_COHERENT_CACHE=y |
| 20 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 21 | CONFIG_WORD_SIZE=32 | 21 | CONFIG_WORD_SIZE=32 |
| 22 | CONFIG_PPC_MERGE=y | 22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 23 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| 24 | CONFIG_GENERIC_CMOS_UPDATE=y | 24 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 25 | CONFIG_GENERIC_TIME=y | 25 | CONFIG_GENERIC_TIME=y |
| @@ -103,7 +103,9 @@ CONFIG_SIGNALFD=y | |||
| 103 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 104 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 105 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 106 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 108 | CONFIG_PCI_QUIRKS=y | ||
| 107 | CONFIG_SLUB_DEBUG=y | 109 | CONFIG_SLUB_DEBUG=y |
| 108 | # CONFIG_SLAB is not set | 110 | # CONFIG_SLAB is not set |
| 109 | CONFIG_SLUB=y | 111 | CONFIG_SLUB=y |
| @@ -117,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 117 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 118 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_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 | ||
| 123 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 125 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_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 |
| 154 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 152 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 155 | CONFIG_CLASSIC_RCU=y | 153 | CONFIG_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 | ||
| 164 | CONFIG_ACADIA=y | 164 | CONFIG_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 |
| 192 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 192 | CONFIG_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 |
| 202 | CONFIG_BINFMT_ELF=y | 202 | CONFIG_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 |
| 215 | CONFIG_FLATMEM=y | 217 | CONFIG_FLATMEM=y |
| 216 | CONFIG_FLAT_NODE_MEM_MAP=y | 218 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 217 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | 219 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | CONFIG_MIGRATION=y | 221 | CONFIG_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 | ||
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
| 224 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
| 225 | CONFIG_VIRT_TO_BUS=y | 226 | CONFIG_VIRT_TO_BUS=y |
| 227 | CONFIG_UNEVICTABLE_LRU=y | ||
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 228 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 227 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_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 | |||
| 516 | CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y | 513 | CONFIG_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 |
| 671 | CONFIG_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 |
| 672 | CONFIG_DNOTIFY=y | 674 | CONFIG_DNOTIFY=y |
| @@ -696,6 +698,7 @@ CONFIG_INOTIFY_USER=y | |||
| 696 | CONFIG_PROC_FS=y | 698 | CONFIG_PROC_FS=y |
| 697 | CONFIG_PROC_KCORE=y | 699 | CONFIG_PROC_KCORE=y |
| 698 | CONFIG_PROC_SYSCTL=y | 700 | CONFIG_PROC_SYSCTL=y |
| 701 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 699 | CONFIG_SYSFS=y | 702 | CONFIG_SYSFS=y |
| 700 | CONFIG_TMPFS=y | 703 | CONFIG_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 | |||
| 733 | CONFIG_LOCKD_V4=y | 736 | CONFIG_LOCKD_V4=y |
| 734 | CONFIG_NFS_COMMON=y | 737 | CONFIG_NFS_COMMON=y |
| 735 | CONFIG_SUNRPC=y | 738 | CONFIG_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 | # |
| 755 | CONFIG_BITREVERSE=y | 759 | CONFIG_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 |
| 812 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 817 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 818 | CONFIG_NOP_TRACER=y | ||
| 813 | CONFIG_HAVE_FTRACE=y | 819 | CONFIG_HAVE_FTRACE=y |
| 814 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 820 | CONFIG_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 |
| 819 | CONFIG_HAVE_ARCH_KGDB=y | 828 | CONFIG_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 |
| 839 | CONFIG_CRYPTO=y | 849 | CONFIG_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 | ||
| 844 | CONFIG_CRYPTO_ALGAPI=y | 855 | CONFIG_CRYPTO_ALGAPI=y |
| 856 | CONFIG_CRYPTO_AEAD=y | ||
| 845 | CONFIG_CRYPTO_BLKCIPHER=y | 857 | CONFIG_CRYPTO_BLKCIPHER=y |
| 858 | CONFIG_CRYPTO_HASH=y | ||
| 859 | CONFIG_CRYPTO_RNG=y | ||
| 846 | CONFIG_CRYPTO_MANAGER=y | 860 | CONFIG_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 | ||
| 918 | CONFIG_CRYPTO_HW=y | 937 | CONFIG_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 | |||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | 19 | CONFIG_NOT_COHERENT_CACHE=y |
| 20 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 21 | CONFIG_WORD_SIZE=32 | 21 | CONFIG_WORD_SIZE=32 |
| 22 | CONFIG_PPC_MERGE=y | 22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 23 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| 24 | CONFIG_GENERIC_CMOS_UPDATE=y | 24 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 25 | CONFIG_GENERIC_TIME=y | 25 | CONFIG_GENERIC_TIME=y |
| 26 | CONFIG_GENERIC_TIME_VSYSCALL=y | 26 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 27 | CONFIG_GENERIC_CLOCKEVENTS=y | 27 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_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 |
| 31 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 90 | CONFIG_KALLSYMS=y |
| 93 | CONFIG_KALLSYMS_ALL=y | 91 | CONFIG_KALLSYMS_ALL=y |
| 94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 92 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y | |||
| 105 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 106 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 107 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 108 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 108 | CONFIG_PCI_QUIRKS=y | ||
| 109 | CONFIG_SLUB_DEBUG=y | 109 | CONFIG_SLUB_DEBUG=y |
| 110 | # CONFIG_SLAB is not set | 110 | # CONFIG_SLAB is not set |
| 111 | CONFIG_SLUB=y | 111 | CONFIG_SLUB=y |
| @@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 119 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_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 | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 127 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 128 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_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 |
| 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 152 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 157 | CONFIG_CLASSIC_RCU=y | 153 | CONFIG_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=y | 165 | CONFIG_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 | ||
| 171 | CONFIG_405GP=y | 172 | CONFIG_405GP=y |
| 172 | CONFIG_IBM405_ERR77=y | 173 | CONFIG_IBM405_ERR77=y |
| 173 | CONFIG_IBM405_ERR51=y | 174 | CONFIG_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 |
| 194 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 194 | CONFIG_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 |
| 204 | CONFIG_BINFMT_ELF=y | 204 | CONFIG_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 |
| 217 | CONFIG_FLATMEM=y | 219 | CONFIG_FLATMEM=y |
| 218 | CONFIG_FLAT_NODE_MEM_MAP=y | 220 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 219 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 221 | CONFIG_PAGEFLAGS_EXTENDED=y | 221 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 223 | CONFIG_MIGRATION=y | 223 | CONFIG_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 | ||
| 225 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
| 226 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
| 227 | CONFIG_VIRT_TO_BUS=y | 228 | CONFIG_VIRT_TO_BUS=y |
| 229 | CONFIG_UNEVICTABLE_LRU=y | ||
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | 230 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 229 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_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 | ||
| 525 | CONFIG_NETDEV_1000=y | 526 | CONFIG_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 | ||
| 545 | CONFIG_NETDEV_10000=y | 547 | CONFIG_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 |
| 717 | CONFIG_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 |
| 750 | CONFIG_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 |
| 817 | CONFIG_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 |
| 804 | CONFIG_DNOTIFY=y | 820 | CONFIG_DNOTIFY=y |
| @@ -828,6 +844,7 @@ CONFIG_INOTIFY_USER=y | |||
| 828 | CONFIG_PROC_FS=y | 844 | CONFIG_PROC_FS=y |
| 829 | CONFIG_PROC_KCORE=y | 845 | CONFIG_PROC_KCORE=y |
| 830 | CONFIG_PROC_SYSCTL=y | 846 | CONFIG_PROC_SYSCTL=y |
| 847 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 831 | CONFIG_SYSFS=y | 848 | CONFIG_SYSFS=y |
| 832 | CONFIG_TMPFS=y | 849 | CONFIG_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 | |||
| 865 | CONFIG_LOCKD_V4=y | 882 | CONFIG_LOCKD_V4=y |
| 866 | CONFIG_NFS_COMMON=y | 883 | CONFIG_NFS_COMMON=y |
| 867 | CONFIG_SUNRPC=y | 884 | CONFIG_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 | # |
| 887 | CONFIG_BITREVERSE=y | 905 | CONFIG_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 |
| 963 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 964 | CONFIG_NOP_TRACER=y | ||
| 944 | CONFIG_HAVE_FTRACE=y | 965 | CONFIG_HAVE_FTRACE=y |
| 945 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 966 | CONFIG_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 |
| 950 | CONFIG_HAVE_ARCH_KGDB=y | 974 | CONFIG_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 |
| 969 | CONFIG_CRYPTO=y | 995 | CONFIG_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 | ||
| 974 | CONFIG_CRYPTO_ALGAPI=y | 1001 | CONFIG_CRYPTO_ALGAPI=y |
| 1002 | CONFIG_CRYPTO_AEAD=y | ||
| 975 | CONFIG_CRYPTO_BLKCIPHER=y | 1003 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1004 | CONFIG_CRYPTO_HASH=y | ||
| 1005 | CONFIG_CRYPTO_RNG=y | ||
| 976 | CONFIG_CRYPTO_MANAGER=y | 1006 | CONFIG_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 | ||
| 1048 | CONFIG_CRYPTO_HW=y | 1083 | CONFIG_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 | |||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | 19 | CONFIG_NOT_COHERENT_CACHE=y |
| 20 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 21 | CONFIG_WORD_SIZE=32 | 21 | CONFIG_WORD_SIZE=32 |
| 22 | CONFIG_PPC_MERGE=y | 22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 23 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| 24 | CONFIG_GENERIC_CMOS_UPDATE=y | 24 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 25 | CONFIG_GENERIC_TIME=y | 25 | CONFIG_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 |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| 32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -86,13 +87,11 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 89 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 90 | CONFIG_KALLSYMS=y |
| 91 | CONFIG_KALLSYMS_ALL=y | 91 | CONFIG_KALLSYMS_ALL=y |
| 92 | CONFIG_KALLSYMS_EXTRA_PASS=y | 92 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 93 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 94 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| 95 | # CONFIG_LOGBUFFER is not set | ||
| 96 | CONFIG_BUG=y | 95 | CONFIG_BUG=y |
| 97 | CONFIG_ELF_CORE=y | 96 | CONFIG_ELF_CORE=y |
| 98 | CONFIG_COMPAT_BRK=y | 97 | CONFIG_COMPAT_BRK=y |
| @@ -104,7 +103,9 @@ CONFIG_SIGNALFD=y | |||
| 104 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 105 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 106 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 107 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 108 | CONFIG_PCI_QUIRKS=y | ||
| 108 | CONFIG_SLUB_DEBUG=y | 109 | CONFIG_SLUB_DEBUG=y |
| 109 | # CONFIG_SLAB is not set | 110 | # CONFIG_SLAB is not set |
| 110 | CONFIG_SLUB=y | 111 | CONFIG_SLUB=y |
| @@ -113,10 +114,12 @@ CONFIG_SLUB=y | |||
| 113 | # CONFIG_MARKERS is not set | 114 | # CONFIG_MARKERS is not set |
| 114 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
| 115 | # CONFIG_KPROBES is not set | 116 | # CONFIG_KPROBES is not set |
| 117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 116 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 117 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 118 | # CONFIG_HAVE_DMA_ATTRS is not set | 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 119 | CONFIG_PROC_PAGE_MONITOR=y | 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 120 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 121 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_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 |
| 148 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 152 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 149 | CONFIG_CLASSIC_RCU=y | 153 | CONFIG_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 |
| 161 | CONFIG_HCU4=y | 166 | CONFIG_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 | ||
| 172 | CONFIG_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 |
| 186 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 192 | CONFIG_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 |
| 196 | CONFIG_BINFMT_ELF=y | 202 | CONFIG_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 |
| 209 | CONFIG_FLATMEM=y | 217 | CONFIG_FLATMEM=y |
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 218 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 213 | CONFIG_PAGEFLAGS_EXTENDED=y | 219 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | CONFIG_MIGRATION=y | ||
| 215 | CONFIG_RESOURCES_64BIT=y | 222 | CONFIG_RESOURCES_64BIT=y |
| 223 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 226 | CONFIG_VIRT_TO_BUS=y |
| 227 | CONFIG_UNEVICTABLE_LRU=y | ||
| 219 | CONFIG_FORCE_MAX_ZONEORDER=11 | 228 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 220 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 230 | # CONFIG_CMDLINE_BOOL is not set |
| 231 | CONFIG_EXTRA_TARGETS="" | ||
| 222 | # CONFIG_PM is not set | 232 | # CONFIG_PM is not set |
| 223 | CONFIG_SECCOMP=y | 233 | CONFIG_SECCOMP=y |
| 224 | CONFIG_ISA_DMA_API=y | 234 | CONFIG_ISA_DMA_API=y |
| @@ -229,6 +239,7 @@ CONFIG_ISA_DMA_API=y | |||
| 229 | CONFIG_ZONE_DMA=y | 239 | CONFIG_ZONE_DMA=y |
| 230 | CONFIG_PPC_INDIRECT_PCI=y | 240 | CONFIG_PPC_INDIRECT_PCI=y |
| 231 | CONFIG_4xx_SOC=y | 241 | CONFIG_4xx_SOC=y |
| 242 | CONFIG_PPC_PCI_CHOICE=y | ||
| 232 | CONFIG_PCI=y | 243 | CONFIG_PCI=y |
| 233 | CONFIG_PCI_DOMAINS=y | 244 | CONFIG_PCI_DOMAINS=y |
| 234 | CONFIG_PCI_SYSCALL=y | 245 | CONFIG_PCI_SYSCALL=y |
| @@ -256,10 +267,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
| 256 | CONFIG_TASK_SIZE=0xc0000000 | 267 | CONFIG_TASK_SIZE=0xc0000000 |
| 257 | CONFIG_CONSISTENT_START=0xff100000 | 268 | CONFIG_CONSISTENT_START=0xff100000 |
| 258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 269 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 259 | |||
| 260 | # | ||
| 261 | # Networking | ||
| 262 | # | ||
| 263 | CONFIG_NET=y | 270 | CONFIG_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" | |||
| 346 | CONFIG_STANDALONE=y | 348 | CONFIG_STANDALONE=y |
| 347 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 349 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 348 | CONFIG_FW_LOADER=y | 350 | CONFIG_FW_LOADER=y |
| 351 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 352 | CONFIG_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 | ||
| 452 | CONFIG_MISC_DEVICES=y | 457 | CONFIG_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 | ||
| 458 | CONFIG_HAVE_IDE=y | 464 | CONFIG_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 |
| 483 | CONFIG_NETDEVICES=y | 489 | CONFIG_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 | ||
| 514 | CONFIG_NETDEV_1000=y | 523 | CONFIG_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 | ||
| 534 | CONFIG_NETDEV_10000=y | 544 | CONFIG_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 | |||
| 618 | CONFIG_DEVPORT=y | 631 | CONFIG_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 |
| 634 | CONFIG_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 |
| 713 | CONFIG_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 |
| 699 | CONFIG_DNOTIFY=y | 716 | CONFIG_DNOTIFY=y |
| @@ -723,6 +740,7 @@ CONFIG_INOTIFY_USER=y | |||
| 723 | CONFIG_PROC_FS=y | 740 | CONFIG_PROC_FS=y |
| 724 | CONFIG_PROC_KCORE=y | 741 | CONFIG_PROC_KCORE=y |
| 725 | CONFIG_PROC_SYSCTL=y | 742 | CONFIG_PROC_SYSCTL=y |
| 743 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 726 | CONFIG_SYSFS=y | 744 | CONFIG_SYSFS=y |
| 727 | CONFIG_TMPFS=y | 745 | CONFIG_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 |
| 744 | CONFIG_CRAMFS=y | 761 | CONFIG_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 | |||
| 754 | CONFIG_NFS_V3=y | 772 | CONFIG_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 | ||
| 758 | CONFIG_ROOT_NFS=y | 775 | CONFIG_ROOT_NFS=y |
| 776 | # CONFIG_NFSD is not set | ||
| 759 | CONFIG_LOCKD=y | 777 | CONFIG_LOCKD=y |
| 760 | CONFIG_LOCKD_V4=y | 778 | CONFIG_LOCKD_V4=y |
| 761 | CONFIG_NFS_COMMON=y | 779 | CONFIG_NFS_COMMON=y |
| 762 | CONFIG_SUNRPC=y | 780 | CONFIG_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 | # |
| 783 | CONFIG_BITREVERSE=y | 801 | CONFIG_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 |
| 788 | CONFIG_CRC32=y | 806 | CONFIG_CRC32=y |
| 789 | # CONFIG_CRC7 is not set | 807 | # CONFIG_CRC7 is not set |
| @@ -809,6 +827,8 @@ CONFIG_DEBUG_FS=y | |||
| 809 | CONFIG_DEBUG_KERNEL=y | 827 | CONFIG_DEBUG_KERNEL=y |
| 810 | # CONFIG_DEBUG_SHIRQ is not set | 828 | # CONFIG_DEBUG_SHIRQ is not set |
| 811 | CONFIG_DETECT_SOFTLOCKUP=y | 829 | CONFIG_DETECT_SOFTLOCKUP=y |
| 830 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 831 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 812 | CONFIG_SCHED_DEBUG=y | 832 | CONFIG_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 | ||
| 859 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 860 | CONFIG_NOP_TRACER=y | ||
| 861 | CONFIG_HAVE_FTRACE=y | ||
| 862 | CONFIG_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 |
| 870 | CONFIG_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 |
| 851 | CONFIG_CRYPTO=y | 891 | CONFIG_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 | ||
| 856 | CONFIG_CRYPTO_ALGAPI=y | 897 | CONFIG_CRYPTO_ALGAPI=y |
| 898 | CONFIG_CRYPTO_AEAD=y | ||
| 857 | CONFIG_CRYPTO_BLKCIPHER=y | 899 | CONFIG_CRYPTO_BLKCIPHER=y |
| 900 | CONFIG_CRYPTO_HASH=y | ||
| 901 | CONFIG_CRYPTO_RNG=y | ||
| 858 | CONFIG_CRYPTO_MANAGER=y | 902 | CONFIG_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 |
| 894 | CONFIG_CRYPTO_MD5=y | 938 | CONFIG_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 | ||
| 926 | CONFIG_CRYPTO_HW=y | 979 | CONFIG_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 | |||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | 19 | CONFIG_NOT_COHERENT_CACHE=y |
| 20 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 21 | CONFIG_WORD_SIZE=32 | 21 | CONFIG_WORD_SIZE=32 |
| 22 | CONFIG_PPC_MERGE=y | 22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 23 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| 24 | CONFIG_GENERIC_CMOS_UPDATE=y | 24 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 25 | CONFIG_GENERIC_TIME=y | 25 | CONFIG_GENERIC_TIME=y |
| 26 | CONFIG_GENERIC_TIME_VSYSCALL=y | 26 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 27 | CONFIG_GENERIC_CLOCKEVENTS=y | 27 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_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 |
| 31 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 90 | CONFIG_KALLSYMS=y |
| 93 | CONFIG_KALLSYMS_ALL=y | 91 | CONFIG_KALLSYMS_ALL=y |
| 94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 92 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y | |||
| 105 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 106 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 107 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 108 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 108 | CONFIG_PCI_QUIRKS=y | ||
| 109 | CONFIG_SLUB_DEBUG=y | 109 | CONFIG_SLUB_DEBUG=y |
| 110 | # CONFIG_SLAB is not set | 110 | # CONFIG_SLAB is not set |
| 111 | CONFIG_SLUB=y | 111 | CONFIG_SLUB=y |
| @@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 119 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_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 | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 127 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 128 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_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 |
| 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 152 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 157 | CONFIG_CLASSIC_RCU=y | 153 | CONFIG_CLASSIC_RCU=y |
| 154 | # CONFIG_FREEZER is not set | ||
| 158 | CONFIG_PPC4xx_PCI_EXPRESS=y | 155 | CONFIG_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=y | 167 | CONFIG_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 | ||
| 171 | CONFIG_405EX=y | 172 | CONFIG_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 |
| 192 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 192 | CONFIG_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 |
| 202 | CONFIG_BINFMT_ELF=y | 202 | CONFIG_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 |
| 215 | CONFIG_FLATMEM=y | 217 | CONFIG_FLATMEM=y |
| 216 | CONFIG_FLAT_NODE_MEM_MAP=y | 218 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 217 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | 219 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | CONFIG_MIGRATION=y | 221 | CONFIG_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 | ||
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
| 224 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
| 225 | CONFIG_VIRT_TO_BUS=y | 226 | CONFIG_VIRT_TO_BUS=y |
| 227 | CONFIG_UNEVICTABLE_LRU=y | ||
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 228 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 227 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_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 | |||
| 511 | CONFIG_IBM_NEW_EMAC_RGMII=y | 508 | CONFIG_IBM_NEW_EMAC_RGMII=y |
| 512 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 509 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 513 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 510 | CONFIG_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 |
| 671 | CONFIG_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 |
| 668 | CONFIG_DNOTIFY=y | 674 | CONFIG_DNOTIFY=y |
| @@ -692,6 +698,7 @@ CONFIG_INOTIFY_USER=y | |||
| 692 | CONFIG_PROC_FS=y | 698 | CONFIG_PROC_FS=y |
| 693 | CONFIG_PROC_KCORE=y | 699 | CONFIG_PROC_KCORE=y |
| 694 | CONFIG_PROC_SYSCTL=y | 700 | CONFIG_PROC_SYSCTL=y |
| 701 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 695 | CONFIG_SYSFS=y | 702 | CONFIG_SYSFS=y |
| 696 | CONFIG_TMPFS=y | 703 | CONFIG_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 | |||
| 729 | CONFIG_LOCKD_V4=y | 736 | CONFIG_LOCKD_V4=y |
| 730 | CONFIG_NFS_COMMON=y | 737 | CONFIG_NFS_COMMON=y |
| 731 | CONFIG_SUNRPC=y | 738 | CONFIG_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 | # |
| 751 | CONFIG_BITREVERSE=y | 759 | CONFIG_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 |
| 817 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 818 | CONFIG_NOP_TRACER=y | ||
| 808 | CONFIG_HAVE_FTRACE=y | 819 | CONFIG_HAVE_FTRACE=y |
| 809 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 820 | CONFIG_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 |
| 814 | CONFIG_HAVE_ARCH_KGDB=y | 828 | CONFIG_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 |
| 833 | CONFIG_CRYPTO=y | 849 | CONFIG_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 | ||
| 838 | CONFIG_CRYPTO_ALGAPI=y | 855 | CONFIG_CRYPTO_ALGAPI=y |
| 856 | CONFIG_CRYPTO_AEAD=y | ||
| 839 | CONFIG_CRYPTO_BLKCIPHER=y | 857 | CONFIG_CRYPTO_BLKCIPHER=y |
| 858 | CONFIG_CRYPTO_HASH=y | ||
| 859 | CONFIG_CRYPTO_RNG=y | ||
| 840 | CONFIG_CRYPTO_MANAGER=y | 860 | CONFIG_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 | ||
| 912 | CONFIG_CRYPTO_HW=y | 937 | CONFIG_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 | |||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | 19 | CONFIG_NOT_COHERENT_CACHE=y |
| 20 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 21 | CONFIG_WORD_SIZE=32 | 21 | CONFIG_WORD_SIZE=32 |
| 22 | CONFIG_PPC_MERGE=y | 22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 23 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| 24 | CONFIG_GENERIC_CMOS_UPDATE=y | 24 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 25 | CONFIG_GENERIC_TIME=y | 25 | CONFIG_GENERIC_TIME=y |
| 26 | CONFIG_GENERIC_TIME_VSYSCALL=y | 26 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 27 | CONFIG_GENERIC_CLOCKEVENTS=y | 27 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_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 |
| 31 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 90 | CONFIG_KALLSYMS=y |
| 93 | CONFIG_KALLSYMS_ALL=y | 91 | CONFIG_KALLSYMS_ALL=y |
| 94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 92 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y | |||
| 105 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 106 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 107 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 108 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 108 | CONFIG_PCI_QUIRKS=y | ||
| 109 | CONFIG_SLUB_DEBUG=y | 109 | CONFIG_SLUB_DEBUG=y |
| 110 | # CONFIG_SLAB is not set | 110 | # CONFIG_SLAB is not set |
| 111 | CONFIG_SLUB=y | 111 | CONFIG_SLUB=y |
| @@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 119 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_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 | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 127 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 128 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_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 |
| 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 152 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 157 | CONFIG_CLASSIC_RCU=y | 153 | CONFIG_CLASSIC_RCU=y |
| 154 | # CONFIG_FREEZER is not set | ||
| 158 | CONFIG_PPC4xx_PCI_EXPRESS=y | 155 | CONFIG_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 |
| 168 | CONFIG_MAKALU=y | 168 | CONFIG_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 | ||
| 171 | CONFIG_405EX=y | 172 | CONFIG_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 |
| 192 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 192 | CONFIG_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 |
| 202 | CONFIG_BINFMT_ELF=y | 202 | CONFIG_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 |
| 215 | CONFIG_FLATMEM=y | 217 | CONFIG_FLATMEM=y |
| 216 | CONFIG_FLAT_NODE_MEM_MAP=y | 218 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 217 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | 219 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | CONFIG_MIGRATION=y | 221 | CONFIG_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 | ||
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
| 224 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
| 225 | CONFIG_VIRT_TO_BUS=y | 226 | CONFIG_VIRT_TO_BUS=y |
| 227 | CONFIG_UNEVICTABLE_LRU=y | ||
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 228 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 227 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_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 | |||
| 511 | CONFIG_IBM_NEW_EMAC_RGMII=y | 508 | CONFIG_IBM_NEW_EMAC_RGMII=y |
| 512 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 509 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 513 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 510 | CONFIG_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 |
| 671 | CONFIG_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 |
| 668 | CONFIG_DNOTIFY=y | 674 | CONFIG_DNOTIFY=y |
| @@ -692,6 +698,7 @@ CONFIG_INOTIFY_USER=y | |||
| 692 | CONFIG_PROC_FS=y | 698 | CONFIG_PROC_FS=y |
| 693 | CONFIG_PROC_KCORE=y | 699 | CONFIG_PROC_KCORE=y |
| 694 | CONFIG_PROC_SYSCTL=y | 700 | CONFIG_PROC_SYSCTL=y |
| 701 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 695 | CONFIG_SYSFS=y | 702 | CONFIG_SYSFS=y |
| 696 | CONFIG_TMPFS=y | 703 | CONFIG_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 | |||
| 729 | CONFIG_LOCKD_V4=y | 736 | CONFIG_LOCKD_V4=y |
| 730 | CONFIG_NFS_COMMON=y | 737 | CONFIG_NFS_COMMON=y |
| 731 | CONFIG_SUNRPC=y | 738 | CONFIG_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 | # |
| 751 | CONFIG_BITREVERSE=y | 759 | CONFIG_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 |
| 817 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 818 | CONFIG_NOP_TRACER=y | ||
| 808 | CONFIG_HAVE_FTRACE=y | 819 | CONFIG_HAVE_FTRACE=y |
| 809 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 820 | CONFIG_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 |
| 814 | CONFIG_HAVE_ARCH_KGDB=y | 828 | CONFIG_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 |
| 833 | CONFIG_CRYPTO=y | 849 | CONFIG_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 | ||
| 838 | CONFIG_CRYPTO_ALGAPI=y | 855 | CONFIG_CRYPTO_ALGAPI=y |
| 856 | CONFIG_CRYPTO_AEAD=y | ||
| 839 | CONFIG_CRYPTO_BLKCIPHER=y | 857 | CONFIG_CRYPTO_BLKCIPHER=y |
| 858 | CONFIG_CRYPTO_HASH=y | ||
| 859 | CONFIG_CRYPTO_RNG=y | ||
| 840 | CONFIG_CRYPTO_MANAGER=y | 860 | CONFIG_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 | ||
| 912 | CONFIG_CRYPTO_HW=y | 937 | CONFIG_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 | |||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | 19 | CONFIG_NOT_COHERENT_CACHE=y |
| 20 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 21 | CONFIG_WORD_SIZE=32 | 21 | CONFIG_WORD_SIZE=32 |
| 22 | CONFIG_PPC_MERGE=y | 22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 23 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| 24 | CONFIG_GENERIC_CMOS_UPDATE=y | 24 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 25 | CONFIG_GENERIC_TIME=y | 25 | CONFIG_GENERIC_TIME=y |
| 26 | CONFIG_GENERIC_TIME_VSYSCALL=y | 26 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 27 | CONFIG_GENERIC_CLOCKEVENTS=y | 27 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_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 |
| 31 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 90 | CONFIG_KALLSYMS=y |
| 93 | CONFIG_KALLSYMS_ALL=y | 91 | CONFIG_KALLSYMS_ALL=y |
| 94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 92 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y | |||
| 105 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 106 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 107 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 108 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 108 | CONFIG_PCI_QUIRKS=y | ||
| 109 | CONFIG_SLUB_DEBUG=y | 109 | CONFIG_SLUB_DEBUG=y |
| 110 | # CONFIG_SLAB is not set | 110 | # CONFIG_SLAB is not set |
| 111 | CONFIG_SLUB=y | 111 | CONFIG_SLUB=y |
| @@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 119 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_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 | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 127 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 128 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_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 |
| 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 152 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 157 | CONFIG_CLASSIC_RCU=y | 153 | CONFIG_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 |
| 169 | CONFIG_WALNUT=y | 169 | CONFIG_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 | ||
| 171 | CONFIG_405GP=y | 172 | CONFIG_405GP=y |
| 172 | CONFIG_IBM405_ERR77=y | 173 | CONFIG_IBM405_ERR77=y |
| 173 | CONFIG_IBM405_ERR51=y | 174 | CONFIG_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 |
| 195 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 195 | CONFIG_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 |
| 205 | CONFIG_BINFMT_ELF=y | 205 | CONFIG_BINFMT_ELF=y |
| 206 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 207 | # CONFIG_HAVE_AOUT is not set | ||
| 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 |
| 218 | CONFIG_FLATMEM=y | 220 | CONFIG_FLATMEM=y |
| 219 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 220 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | 224 | CONFIG_MIGRATION=y |
| 225 | CONFIG_RESOURCES_64BIT=y | 225 | CONFIG_RESOURCES_64BIT=y |
| 226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 226 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 227 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 228 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_UNEVICTABLE_LRU=y | ||
| 229 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 230 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_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 | ||
| 525 | CONFIG_NETDEV_1000=y | 526 | CONFIG_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 | ||
| 545 | CONFIG_NETDEV_10000=y | 547 | CONFIG_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 |
| 730 | CONFIG_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 |
| 719 | CONFIG_DNOTIFY=y | 733 | CONFIG_DNOTIFY=y |
| @@ -743,6 +757,7 @@ CONFIG_INOTIFY_USER=y | |||
| 743 | CONFIG_PROC_FS=y | 757 | CONFIG_PROC_FS=y |
| 744 | CONFIG_PROC_KCORE=y | 758 | CONFIG_PROC_KCORE=y |
| 745 | CONFIG_PROC_SYSCTL=y | 759 | CONFIG_PROC_SYSCTL=y |
| 760 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 746 | CONFIG_SYSFS=y | 761 | CONFIG_SYSFS=y |
| 747 | CONFIG_TMPFS=y | 762 | CONFIG_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 | |||
| 780 | CONFIG_LOCKD_V4=y | 795 | CONFIG_LOCKD_V4=y |
| 781 | CONFIG_NFS_COMMON=y | 796 | CONFIG_NFS_COMMON=y |
| 782 | CONFIG_SUNRPC=y | 797 | CONFIG_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 | # |
| 802 | CONFIG_BITREVERSE=y | 818 | CONFIG_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 |
| 876 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 877 | CONFIG_NOP_TRACER=y | ||
| 859 | CONFIG_HAVE_FTRACE=y | 878 | CONFIG_HAVE_FTRACE=y |
| 860 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 879 | CONFIG_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 |
| 865 | CONFIG_HAVE_ARCH_KGDB=y | 887 | CONFIG_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 |
| 884 | CONFIG_CRYPTO=y | 908 | CONFIG_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 | ||
| 889 | CONFIG_CRYPTO_ALGAPI=y | 914 | CONFIG_CRYPTO_ALGAPI=y |
| 915 | CONFIG_CRYPTO_AEAD=y | ||
| 890 | CONFIG_CRYPTO_BLKCIPHER=y | 916 | CONFIG_CRYPTO_BLKCIPHER=y |
| 917 | CONFIG_CRYPTO_HASH=y | ||
| 918 | CONFIG_CRYPTO_RNG=y | ||
| 891 | CONFIG_CRYPTO_MANAGER=y | 919 | CONFIG_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 | ||
| 963 | CONFIG_CRYPTO_HW=y | 996 | CONFIG_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 | |||
| 23 | CONFIG_NOT_COHERENT_CACHE=y | 23 | CONFIG_NOT_COHERENT_CACHE=y |
| 24 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 25 | CONFIG_WORD_SIZE=32 | 25 | CONFIG_WORD_SIZE=32 |
| 26 | CONFIG_PPC_MERGE=y | 26 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 27 | CONFIG_MMU=y | 27 | CONFIG_MMU=y |
| 28 | CONFIG_GENERIC_CMOS_UPDATE=y | 28 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 29 | CONFIG_GENERIC_TIME=y | 29 | CONFIG_GENERIC_TIME=y |
| @@ -103,7 +103,9 @@ CONFIG_SIGNALFD=y | |||
| 103 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 104 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 105 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 106 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 108 | CONFIG_PCI_QUIRKS=y | ||
| 107 | CONFIG_SLUB_DEBUG=y | 109 | CONFIG_SLUB_DEBUG=y |
| 108 | # CONFIG_SLAB is not set | 110 | # CONFIG_SLAB is not set |
| 109 | CONFIG_SLUB=y | 111 | CONFIG_SLUB=y |
| @@ -117,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 117 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 118 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_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 | ||
| 123 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 125 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 126 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_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 |
| 154 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 152 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 155 | CONFIG_CLASSIC_RCU=y | 153 | CONFIG_CLASSIC_RCU=y |
| 154 | # CONFIG_FREEZER is not set | ||
| 156 | CONFIG_PPC4xx_PCI_EXPRESS=y | 155 | CONFIG_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 |
| 177 | CONFIG_PPC44x_SIMPLE=y | 176 | CONFIG_PPC44x_SIMPLE=y |
| 177 | # CONFIG_PPC4xx_GPIO is not set | ||
| 178 | CONFIG_460EX=y | 178 | CONFIG_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 |
| 209 | CONFIG_BINFMT_ELF=y | 209 | CONFIG_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 |
| 222 | CONFIG_FLATMEM=y | 224 | CONFIG_FLATMEM=y |
| 223 | CONFIG_FLAT_NODE_MEM_MAP=y | 225 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 224 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | 226 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 228 | CONFIG_MIGRATION=y | 228 | CONFIG_MIGRATION=y |
| 229 | CONFIG_RESOURCES_64BIT=y | 229 | CONFIG_RESOURCES_64BIT=y |
| 230 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 230 | CONFIG_ZONE_DMA_FLAG=1 | 231 | CONFIG_ZONE_DMA_FLAG=1 |
| 231 | CONFIG_BOUNCE=y | 232 | CONFIG_BOUNCE=y |
| 232 | CONFIG_VIRT_TO_BUS=y | 233 | CONFIG_VIRT_TO_BUS=y |
| 234 | CONFIG_UNEVICTABLE_LRU=y | ||
| 233 | CONFIG_FORCE_MAX_ZONEORDER=11 | 235 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 234 | CONFIG_PROC_DEVICETREE=y | 236 | CONFIG_PROC_DEVICETREE=y |
| 235 | CONFIG_CMDLINE_BOOL=y | 237 | CONFIG_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 |
| 441 | CONFIG_IBM_NEW_EMAC_TAH=y | 438 | CONFIG_IBM_NEW_EMAC_TAH=y |
| 442 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 439 | CONFIG_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 |
| 601 | CONFIG_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 |
| 599 | CONFIG_DNOTIFY=y | 604 | CONFIG_DNOTIFY=y |
| @@ -623,6 +628,7 @@ CONFIG_INOTIFY_USER=y | |||
| 623 | CONFIG_PROC_FS=y | 628 | CONFIG_PROC_FS=y |
| 624 | CONFIG_PROC_KCORE=y | 629 | CONFIG_PROC_KCORE=y |
| 625 | CONFIG_PROC_SYSCTL=y | 630 | CONFIG_PROC_SYSCTL=y |
| 631 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 626 | CONFIG_SYSFS=y | 632 | CONFIG_SYSFS=y |
| 627 | CONFIG_TMPFS=y | 633 | CONFIG_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 | |||
| 659 | CONFIG_LOCKD_V4=y | 665 | CONFIG_LOCKD_V4=y |
| 660 | CONFIG_NFS_COMMON=y | 666 | CONFIG_NFS_COMMON=y |
| 661 | CONFIG_SUNRPC=y | 667 | CONFIG_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 | # |
| 681 | CONFIG_BITREVERSE=y | 688 | CONFIG_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 |
| 738 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 746 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 747 | CONFIG_NOP_TRACER=y | ||
| 739 | CONFIG_HAVE_FTRACE=y | 748 | CONFIG_HAVE_FTRACE=y |
| 740 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 749 | CONFIG_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 |
| 745 | CONFIG_HAVE_ARCH_KGDB=y | 757 | CONFIG_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 | |||
| 23 | CONFIG_NOT_COHERENT_CACHE=y | 23 | CONFIG_NOT_COHERENT_CACHE=y |
| 24 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 25 | CONFIG_WORD_SIZE=32 | 25 | CONFIG_WORD_SIZE=32 |
| 26 | CONFIG_PPC_MERGE=y | 26 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 27 | CONFIG_MMU=y | 27 | CONFIG_MMU=y |
| 28 | CONFIG_GENERIC_CMOS_UPDATE=y | 28 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 29 | CONFIG_GENERIC_TIME=y | 29 | CONFIG_GENERIC_TIME=y |
| 30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 30 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 31 | CONFIG_GENERIC_CLOCKEVENTS=y | 31 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_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 |
| 35 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 94 | CONFIG_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 | |||
| 109 | CONFIG_TIMERFD=y | 107 | CONFIG_TIMERFD=y |
| 110 | CONFIG_EVENTFD=y | 108 | CONFIG_EVENTFD=y |
| 111 | CONFIG_SHMEM=y | 109 | CONFIG_SHMEM=y |
| 110 | CONFIG_AIO=y | ||
| 112 | CONFIG_VM_EVENT_COUNTERS=y | 111 | CONFIG_VM_EVENT_COUNTERS=y |
| 112 | CONFIG_PCI_QUIRKS=y | ||
| 113 | CONFIG_SLUB_DEBUG=y | 113 | CONFIG_SLUB_DEBUG=y |
| 114 | # CONFIG_SLAB is not set | 114 | # CONFIG_SLAB is not set |
| 115 | CONFIG_SLUB=y | 115 | CONFIG_SLUB=y |
| @@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 123 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
| 124 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
| 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 125 | CONFIG_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 | ||
| 129 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 131 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 132 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_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 |
| 160 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 161 | CONFIG_CLASSIC_RCU=y | 157 | CONFIG_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 |
| 180 | CONFIG_PPC44x_SIMPLE=y | ||
| 181 | # CONFIG_PPC4xx_GPIO is not set | ||
| 181 | CONFIG_440EP=y | 182 | CONFIG_440EP=y |
| 182 | CONFIG_IBM440EP_ERR42=y | 183 | CONFIG_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 |
| 203 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 203 | CONFIG_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 |
| 213 | CONFIG_BINFMT_ELF=y | 213 | CONFIG_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 |
| 226 | CONFIG_FLATMEM=y | 228 | CONFIG_FLATMEM=y |
| 227 | CONFIG_FLAT_NODE_MEM_MAP=y | 229 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 228 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 230 | CONFIG_PAGEFLAGS_EXTENDED=y | 230 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 232 | CONFIG_MIGRATION=y | 232 | CONFIG_MIGRATION=y |
| 233 | CONFIG_RESOURCES_64BIT=y | 233 | CONFIG_RESOURCES_64BIT=y |
| 234 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 234 | CONFIG_ZONE_DMA_FLAG=1 | 235 | CONFIG_ZONE_DMA_FLAG=1 |
| 235 | CONFIG_BOUNCE=y | 236 | CONFIG_BOUNCE=y |
| 236 | CONFIG_VIRT_TO_BUS=y | 237 | CONFIG_VIRT_TO_BUS=y |
| 238 | CONFIG_UNEVICTABLE_LRU=y | ||
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 238 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
| 239 | CONFIG_CMDLINE_BOOL=y | 241 | CONFIG_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 | ||
| 455 | CONFIG_NETDEV_1000=y | 456 | CONFIG_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 | ||
| 475 | CONFIG_NETDEV_10000=y | 477 | CONFIG_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 |
| 660 | CONFIG_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 |
| 649 | CONFIG_DNOTIFY=y | 663 | CONFIG_DNOTIFY=y |
| @@ -673,6 +687,7 @@ CONFIG_INOTIFY_USER=y | |||
| 673 | CONFIG_PROC_FS=y | 687 | CONFIG_PROC_FS=y |
| 674 | CONFIG_PROC_KCORE=y | 688 | CONFIG_PROC_KCORE=y |
| 675 | CONFIG_PROC_SYSCTL=y | 689 | CONFIG_PROC_SYSCTL=y |
| 690 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 676 | CONFIG_SYSFS=y | 691 | CONFIG_SYSFS=y |
| 677 | CONFIG_TMPFS=y | 692 | CONFIG_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 | |||
| 709 | CONFIG_LOCKD_V4=y | 724 | CONFIG_LOCKD_V4=y |
| 710 | CONFIG_NFS_COMMON=y | 725 | CONFIG_NFS_COMMON=y |
| 711 | CONFIG_SUNRPC=y | 726 | CONFIG_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 | # |
| 731 | CONFIG_BITREVERSE=y | 747 | CONFIG_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 |
| 805 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 806 | CONFIG_NOP_TRACER=y | ||
| 788 | CONFIG_HAVE_FTRACE=y | 807 | CONFIG_HAVE_FTRACE=y |
| 789 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 808 | CONFIG_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 |
| 794 | CONFIG_HAVE_ARCH_KGDB=y | 816 | CONFIG_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 |
| 813 | CONFIG_CRYPTO=y | 837 | CONFIG_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 | ||
| 818 | CONFIG_CRYPTO_ALGAPI=y | 843 | CONFIG_CRYPTO_ALGAPI=y |
| 844 | CONFIG_CRYPTO_AEAD=y | ||
| 819 | CONFIG_CRYPTO_BLKCIPHER=y | 845 | CONFIG_CRYPTO_BLKCIPHER=y |
| 846 | CONFIG_CRYPTO_HASH=y | ||
| 847 | CONFIG_CRYPTO_RNG=y | ||
| 820 | CONFIG_CRYPTO_MANAGER=y | 848 | CONFIG_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 | ||
| 892 | CONFIG_CRYPTO_HW=y | 925 | CONFIG_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 | |||
| 23 | CONFIG_NOT_COHERENT_CACHE=y | 23 | CONFIG_NOT_COHERENT_CACHE=y |
| 24 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 25 | CONFIG_WORD_SIZE=32 | 25 | CONFIG_WORD_SIZE=32 |
| 26 | CONFIG_PPC_MERGE=y | 26 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 27 | CONFIG_MMU=y | 27 | CONFIG_MMU=y |
| 28 | CONFIG_GENERIC_CMOS_UPDATE=y | 28 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 29 | CONFIG_GENERIC_TIME=y | 29 | CONFIG_GENERIC_TIME=y |
| 30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 30 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 31 | CONFIG_GENERIC_CLOCKEVENTS=y | 31 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_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 |
| 35 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 90 | CONFIG_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 | |||
| 105 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 106 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 107 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 108 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 108 | CONFIG_PCI_QUIRKS=y | ||
| 109 | CONFIG_SLUB_DEBUG=y | 109 | CONFIG_SLUB_DEBUG=y |
| 110 | # CONFIG_SLAB is not set | 110 | # CONFIG_SLAB is not set |
| 111 | CONFIG_SLUB=y | 111 | CONFIG_SLUB=y |
| @@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 119 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_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 | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 127 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
| 128 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_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 |
| 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 152 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 157 | CONFIG_CLASSIC_RCU=y | 153 | CONFIG_CLASSIC_RCU=y |
| 154 | # CONFIG_FREEZER is not set | ||
| 158 | CONFIG_PPC4xx_PCI_EXPRESS=y | 155 | CONFIG_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 | ||
| 174 | CONFIG_CANYONLANDS=y | 172 | CONFIG_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 |
| 176 | CONFIG_PPC44x_SIMPLE=y | ||
| 177 | # CONFIG_PPC4xx_GPIO is not set | ||
| 177 | CONFIG_460EX=y | 178 | CONFIG_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 |
| 203 | CONFIG_HZ=250 | 204 | CONFIG_HZ=250 |
| 204 | # CONFIG_SCHED_HRTICK is not set | 205 | CONFIG_SCHED_HRTICK=y |
| 205 | CONFIG_PREEMPT_NONE=y | 206 | CONFIG_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 |
| 208 | CONFIG_BINFMT_ELF=y | 209 | CONFIG_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 |
| 221 | CONFIG_FLATMEM=y | 224 | CONFIG_FLATMEM=y |
| 222 | CONFIG_FLAT_NODE_MEM_MAP=y | 225 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 223 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 225 | CONFIG_PAGEFLAGS_EXTENDED=y | 226 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 227 | CONFIG_MIGRATION=y | 228 | CONFIG_MIGRATION=y |
| 228 | CONFIG_RESOURCES_64BIT=y | 229 | CONFIG_RESOURCES_64BIT=y |
| 230 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 229 | CONFIG_ZONE_DMA_FLAG=1 | 231 | CONFIG_ZONE_DMA_FLAG=1 |
| 230 | CONFIG_BOUNCE=y | 232 | CONFIG_BOUNCE=y |
| 231 | CONFIG_VIRT_TO_BUS=y | 233 | CONFIG_VIRT_TO_BUS=y |
| 234 | CONFIG_UNEVICTABLE_LRU=y | ||
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | 235 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 233 | CONFIG_PROC_DEVICETREE=y | 236 | CONFIG_PROC_DEVICETREE=y |
| 234 | CONFIG_CMDLINE_BOOL=y | 237 | CONFIG_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 | |||
| 439 | CONFIG_IBM_NEW_EMAC_RGMII=y | 437 | CONFIG_IBM_NEW_EMAC_RGMII=y |
| 440 | CONFIG_IBM_NEW_EMAC_TAH=y | 438 | CONFIG_IBM_NEW_EMAC_TAH=y |
| 441 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 439 | CONFIG_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 |
| 601 | CONFIG_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 |
| 597 | CONFIG_DNOTIFY=y | 604 | CONFIG_DNOTIFY=y |
| @@ -621,6 +628,7 @@ CONFIG_INOTIFY_USER=y | |||
| 621 | CONFIG_PROC_FS=y | 628 | CONFIG_PROC_FS=y |
| 622 | CONFIG_PROC_KCORE=y | 629 | CONFIG_PROC_KCORE=y |
| 623 | CONFIG_PROC_SYSCTL=y | 630 | CONFIG_PROC_SYSCTL=y |
| 631 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 624 | CONFIG_SYSFS=y | 632 | CONFIG_SYSFS=y |
| 625 | CONFIG_TMPFS=y | 633 | CONFIG_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 | |||
| 657 | CONFIG_LOCKD_V4=y | 665 | CONFIG_LOCKD_V4=y |
| 658 | CONFIG_NFS_COMMON=y | 666 | CONFIG_NFS_COMMON=y |
| 659 | CONFIG_SUNRPC=y | 667 | CONFIG_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 | # |
| 679 | CONFIG_BITREVERSE=y | 688 | CONFIG_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 |
| 746 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 747 | CONFIG_NOP_TRACER=y | ||
| 736 | CONFIG_HAVE_FTRACE=y | 748 | CONFIG_HAVE_FTRACE=y |
| 737 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 749 | CONFIG_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 |
| 742 | CONFIG_HAVE_ARCH_KGDB=y | 757 | CONFIG_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 | |||
| 22 | CONFIG_NOT_COHERENT_CACHE=y | 22 | CONFIG_NOT_COHERENT_CACHE=y |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| 29 | CONFIG_GENERIC_TIME_VSYSCALL=y | 29 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 30 | CONFIG_GENERIC_CLOCKEVENTS=y | 30 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_GET_USER_PAGES_FAST is not set | ||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 91 | CONFIG_SYSCTL=y | 90 | CONFIG_SYSCTL=y |
| 92 | CONFIG_EMBEDDED=y | 91 | CONFIG_EMBEDDED=y |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 92 | CONFIG_SYSCTL_SYSCALL=y |
| 94 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 95 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 96 | CONFIG_KALLSYMS_ALL=y | 94 | CONFIG_KALLSYMS_ALL=y |
| 97 | CONFIG_KALLSYMS_EXTRA_PASS=y | 95 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -108,7 +106,9 @@ CONFIG_SIGNALFD=y | |||
| 108 | CONFIG_TIMERFD=y | 106 | CONFIG_TIMERFD=y |
| 109 | CONFIG_EVENTFD=y | 107 | CONFIG_EVENTFD=y |
| 110 | CONFIG_SHMEM=y | 108 | CONFIG_SHMEM=y |
| 109 | CONFIG_AIO=y | ||
| 111 | CONFIG_VM_EVENT_COUNTERS=y | 110 | CONFIG_VM_EVENT_COUNTERS=y |
| 111 | CONFIG_PCI_QUIRKS=y | ||
| 112 | CONFIG_SLUB_DEBUG=y | 112 | CONFIG_SLUB_DEBUG=y |
| 113 | # CONFIG_SLAB is not set | 113 | # CONFIG_SLAB is not set |
| 114 | CONFIG_SLUB=y | 114 | CONFIG_SLUB=y |
| @@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 122 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 123 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 128 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 130 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 131 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_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 |
| 159 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 155 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 160 | CONFIG_CLASSIC_RCU=y | 156 | CONFIG_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 | ||
| 180 | CONFIG_440GP=y | 181 | CONFIG_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 |
| 202 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 202 | CONFIG_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 |
| 212 | CONFIG_BINFMT_ELF=y | 212 | CONFIG_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 |
| 214 | CONFIG_MATH_EMULATION=y | 216 | CONFIG_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 |
| 225 | CONFIG_FLATMEM=y | 227 | CONFIG_FLATMEM=y |
| 226 | CONFIG_FLAT_NODE_MEM_MAP=y | 228 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 227 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 229 | CONFIG_PAGEFLAGS_EXTENDED=y | 229 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 231 | CONFIG_MIGRATION=y | 231 | CONFIG_MIGRATION=y |
| 232 | CONFIG_RESOURCES_64BIT=y | 232 | CONFIG_RESOURCES_64BIT=y |
| 233 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 233 | CONFIG_ZONE_DMA_FLAG=1 | 234 | CONFIG_ZONE_DMA_FLAG=1 |
| 234 | CONFIG_BOUNCE=y | 235 | CONFIG_BOUNCE=y |
| 235 | CONFIG_VIRT_TO_BUS=y | 236 | CONFIG_VIRT_TO_BUS=y |
| 237 | CONFIG_UNEVICTABLE_LRU=y | ||
| 236 | CONFIG_FORCE_MAX_ZONEORDER=11 | 238 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 237 | CONFIG_PROC_DEVICETREE=y | 239 | CONFIG_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 | ||
| 530 | CONFIG_NETDEV_1000=y | 531 | CONFIG_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 | ||
| 550 | CONFIG_NETDEV_10000=y | 552 | CONFIG_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 |
| 735 | CONFIG_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 |
| 724 | CONFIG_DNOTIFY=y | 738 | CONFIG_DNOTIFY=y |
| @@ -748,6 +762,7 @@ CONFIG_INOTIFY_USER=y | |||
| 748 | CONFIG_PROC_FS=y | 762 | CONFIG_PROC_FS=y |
| 749 | CONFIG_PROC_KCORE=y | 763 | CONFIG_PROC_KCORE=y |
| 750 | CONFIG_PROC_SYSCTL=y | 764 | CONFIG_PROC_SYSCTL=y |
| 765 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 751 | CONFIG_SYSFS=y | 766 | CONFIG_SYSFS=y |
| 752 | CONFIG_TMPFS=y | 767 | CONFIG_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 | |||
| 795 | CONFIG_LOCKD_V4=y | 810 | CONFIG_LOCKD_V4=y |
| 796 | CONFIG_NFS_COMMON=y | 811 | CONFIG_NFS_COMMON=y |
| 797 | CONFIG_SUNRPC=y | 812 | CONFIG_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 | # |
| 817 | CONFIG_BITREVERSE=y | 833 | CONFIG_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 |
| 892 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 893 | CONFIG_NOP_TRACER=y | ||
| 875 | CONFIG_HAVE_FTRACE=y | 894 | CONFIG_HAVE_FTRACE=y |
| 876 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 895 | CONFIG_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 |
| 881 | CONFIG_HAVE_ARCH_KGDB=y | 903 | CONFIG_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 |
| 900 | CONFIG_CRYPTO=y | 924 | CONFIG_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 | ||
| 905 | CONFIG_CRYPTO_ALGAPI=y | 930 | CONFIG_CRYPTO_ALGAPI=y |
| 931 | CONFIG_CRYPTO_AEAD=y | ||
| 906 | CONFIG_CRYPTO_BLKCIPHER=y | 932 | CONFIG_CRYPTO_BLKCIPHER=y |
| 933 | CONFIG_CRYPTO_HASH=y | ||
| 934 | CONFIG_CRYPTO_RNG=y | ||
| 907 | CONFIG_CRYPTO_MANAGER=y | 935 | CONFIG_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 | |||
| 22 | CONFIG_NOT_COHERENT_CACHE=y | 22 | CONFIG_NOT_COHERENT_CACHE=y |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| 29 | CONFIG_GENERIC_TIME_VSYSCALL=y | 29 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 30 | CONFIG_GENERIC_CLOCKEVENTS=y | 30 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_GET_USER_PAGES_FAST is not set | ||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -87,7 +86,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 86 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 87 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 88 | CONFIG_SYSCTL_SYSCALL=y |
| 90 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 91 | CONFIG_KALLSYMS=y | 89 | CONFIG_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 | |||
| 104 | CONFIG_TIMERFD=y | 102 | CONFIG_TIMERFD=y |
| 105 | CONFIG_EVENTFD=y | 103 | CONFIG_EVENTFD=y |
| 106 | CONFIG_SHMEM=y | 104 | CONFIG_SHMEM=y |
| 105 | CONFIG_AIO=y | ||
| 107 | CONFIG_VM_EVENT_COUNTERS=y | 106 | CONFIG_VM_EVENT_COUNTERS=y |
| 107 | CONFIG_PCI_QUIRKS=y | ||
| 108 | CONFIG_SLUB_DEBUG=y | 108 | CONFIG_SLUB_DEBUG=y |
| 109 | # CONFIG_SLAB is not set | 109 | # CONFIG_SLAB is not set |
| 110 | CONFIG_SLUB=y | 110 | CONFIG_SLUB=y |
| @@ -118,10 +118,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 118 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 120 | CONFIG_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 | ||
| 124 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 126 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 127 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_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 |
| 155 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 156 | CONFIG_CLASSIC_RCU=y | 152 | CONFIG_CLASSIC_RCU=y |
| 153 | # CONFIG_FREEZER is not set | ||
| 157 | CONFIG_PPC4xx_PCI_EXPRESS=y | 154 | CONFIG_PPC4xx_PCI_EXPRESS=y |
| 158 | 155 | ||
| 159 | # | 156 | # |
| @@ -170,9 +167,13 @@ CONFIG_PPC4xx_PCI_EXPRESS=y | |||
| 170 | CONFIG_KATMAI=y | 167 | CONFIG_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 |
| 175 | CONFIG_PPC44x_SIMPLE=y | ||
| 176 | # CONFIG_PPC4xx_GPIO is not set | ||
| 176 | CONFIG_440SPe=y | 177 | CONFIG_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 |
| 197 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 197 | CONFIG_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 |
| 207 | CONFIG_BINFMT_ELF=y | 207 | CONFIG_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 |
| 220 | CONFIG_FLATMEM=y | 222 | CONFIG_FLATMEM=y |
| 221 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 222 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | 224 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 226 | CONFIG_MIGRATION=y | 226 | CONFIG_MIGRATION=y |
| 227 | CONFIG_RESOURCES_64BIT=y | 227 | CONFIG_RESOURCES_64BIT=y |
| 228 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 228 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 229 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| 230 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
| 232 | CONFIG_UNEVICTABLE_LRU=y | ||
| 231 | CONFIG_FORCE_MAX_ZONEORDER=11 | 233 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 232 | CONFIG_PROC_DEVICETREE=y | 234 | CONFIG_PROC_DEVICETREE=y |
| 233 | CONFIG_CMDLINE_BOOL=y | 235 | CONFIG_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 |
| 448 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 445 | CONFIG_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 | ||
| 451 | CONFIG_NETDEV_1000=y | 452 | CONFIG_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 | ||
| 471 | CONFIG_NETDEV_10000=y | 473 | CONFIG_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 |
| 657 | CONFIG_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 |
| 646 | CONFIG_DNOTIFY=y | 660 | CONFIG_DNOTIFY=y |
| @@ -670,6 +684,7 @@ CONFIG_INOTIFY_USER=y | |||
| 670 | CONFIG_PROC_FS=y | 684 | CONFIG_PROC_FS=y |
| 671 | CONFIG_PROC_KCORE=y | 685 | CONFIG_PROC_KCORE=y |
| 672 | CONFIG_PROC_SYSCTL=y | 686 | CONFIG_PROC_SYSCTL=y |
| 687 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 673 | CONFIG_SYSFS=y | 688 | CONFIG_SYSFS=y |
| 674 | CONFIG_TMPFS=y | 689 | CONFIG_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 | |||
| 706 | CONFIG_LOCKD_V4=y | 721 | CONFIG_LOCKD_V4=y |
| 707 | CONFIG_NFS_COMMON=y | 722 | CONFIG_NFS_COMMON=y |
| 708 | CONFIG_SUNRPC=y | 723 | CONFIG_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 | # |
| 728 | CONFIG_BITREVERSE=y | 744 | CONFIG_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 |
| 802 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 803 | CONFIG_NOP_TRACER=y | ||
| 785 | CONFIG_HAVE_FTRACE=y | 804 | CONFIG_HAVE_FTRACE=y |
| 786 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 805 | CONFIG_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 |
| 791 | CONFIG_HAVE_ARCH_KGDB=y | 813 | CONFIG_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 |
| 809 | CONFIG_CRYPTO=y | 833 | CONFIG_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 | ||
| 814 | CONFIG_CRYPTO_ALGAPI=y | 839 | CONFIG_CRYPTO_ALGAPI=y |
| 840 | CONFIG_CRYPTO_AEAD=y | ||
| 815 | CONFIG_CRYPTO_BLKCIPHER=y | 841 | CONFIG_CRYPTO_BLKCIPHER=y |
| 842 | CONFIG_CRYPTO_HASH=y | ||
| 843 | CONFIG_CRYPTO_RNG=y | ||
| 816 | CONFIG_CRYPTO_MANAGER=y | 844 | CONFIG_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 | ||
| 888 | CONFIG_CRYPTO_HW=y | 921 | CONFIG_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 | |||
| 22 | CONFIG_NOT_COHERENT_CACHE=y | 22 | CONFIG_NOT_COHERENT_CACHE=y |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| 29 | CONFIG_GENERIC_TIME_VSYSCALL=y | 29 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 30 | CONFIG_GENERIC_CLOCKEVENTS=y | 30 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_GET_USER_PAGES_FAST is not set | ||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 91 | CONFIG_SYSCTL=y | 90 | CONFIG_SYSCTL=y |
| 92 | CONFIG_EMBEDDED=y | 91 | CONFIG_EMBEDDED=y |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 92 | CONFIG_SYSCTL_SYSCALL=y |
| 94 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 95 | CONFIG_KALLSYMS=y | 93 | CONFIG_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 | |||
| 108 | CONFIG_TIMERFD=y | 106 | CONFIG_TIMERFD=y |
| 109 | CONFIG_EVENTFD=y | 107 | CONFIG_EVENTFD=y |
| 110 | CONFIG_SHMEM=y | 108 | CONFIG_SHMEM=y |
| 109 | CONFIG_AIO=y | ||
| 111 | CONFIG_VM_EVENT_COUNTERS=y | 110 | CONFIG_VM_EVENT_COUNTERS=y |
| 111 | CONFIG_PCI_QUIRKS=y | ||
| 112 | CONFIG_SLUB_DEBUG=y | 112 | CONFIG_SLUB_DEBUG=y |
| 113 | # CONFIG_SLAB is not set | 113 | # CONFIG_SLAB is not set |
| 114 | CONFIG_SLUB=y | 114 | CONFIG_SLUB=y |
| @@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 122 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 123 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 128 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 130 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 131 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_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 |
| 159 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 155 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 160 | CONFIG_CLASSIC_RCU=y | 156 | CONFIG_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 |
| 175 | CONFIG_RAINIER=y | 172 | CONFIG_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 |
| 179 | CONFIG_PPC44x_SIMPLE=y | ||
| 180 | # CONFIG_PPC4xx_GPIO is not set | ||
| 180 | CONFIG_440GRX=y | 181 | CONFIG_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 |
| 201 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 201 | CONFIG_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 |
| 211 | CONFIG_BINFMT_ELF=y | 211 | CONFIG_BINFMT_ELF=y |
| 212 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 213 | # CONFIG_HAVE_AOUT is not set | ||
| 212 | # CONFIG_BINFMT_MISC is not set | 214 | # CONFIG_BINFMT_MISC is not set |
| 213 | CONFIG_MATH_EMULATION=y | 215 | CONFIG_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 |
| 224 | CONFIG_FLATMEM=y | 226 | CONFIG_FLATMEM=y |
| 225 | CONFIG_FLAT_NODE_MEM_MAP=y | 227 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 226 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 227 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 228 | CONFIG_PAGEFLAGS_EXTENDED=y | 228 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 230 | CONFIG_MIGRATION=y | 230 | CONFIG_MIGRATION=y |
| 231 | CONFIG_RESOURCES_64BIT=y | 231 | CONFIG_RESOURCES_64BIT=y |
| 232 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 232 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 233 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| 234 | CONFIG_VIRT_TO_BUS=y | 235 | CONFIG_VIRT_TO_BUS=y |
| 236 | CONFIG_UNEVICTABLE_LRU=y | ||
| 235 | CONFIG_FORCE_MAX_ZONEORDER=11 | 237 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 236 | CONFIG_PROC_DEVICETREE=y | 238 | CONFIG_PROC_DEVICETREE=y |
| 237 | CONFIG_CMDLINE_BOOL=y | 239 | CONFIG_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 | ||
| 535 | CONFIG_NETDEV_10000=y | 533 | CONFIG_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 |
| 716 | CONFIG_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 |
| 709 | CONFIG_DNOTIFY=y | 719 | CONFIG_DNOTIFY=y |
| @@ -733,6 +743,7 @@ CONFIG_INOTIFY_USER=y | |||
| 733 | CONFIG_PROC_FS=y | 743 | CONFIG_PROC_FS=y |
| 734 | CONFIG_PROC_KCORE=y | 744 | CONFIG_PROC_KCORE=y |
| 735 | CONFIG_PROC_SYSCTL=y | 745 | CONFIG_PROC_SYSCTL=y |
| 746 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 736 | CONFIG_SYSFS=y | 747 | CONFIG_SYSFS=y |
| 737 | CONFIG_TMPFS=y | 748 | CONFIG_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 | |||
| 780 | CONFIG_LOCKD_V4=y | 791 | CONFIG_LOCKD_V4=y |
| 781 | CONFIG_NFS_COMMON=y | 792 | CONFIG_NFS_COMMON=y |
| 782 | CONFIG_SUNRPC=y | 793 | CONFIG_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 | # |
| 802 | CONFIG_BITREVERSE=y | 814 | CONFIG_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 |
| 873 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 874 | CONFIG_NOP_TRACER=y | ||
| 860 | CONFIG_HAVE_FTRACE=y | 875 | CONFIG_HAVE_FTRACE=y |
| 861 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 876 | CONFIG_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 |
| 866 | CONFIG_HAVE_ARCH_KGDB=y | 884 | CONFIG_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 |
| 898 | CONFIG_CRYPTO=y | 918 | CONFIG_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 | ||
| 903 | CONFIG_CRYPTO_ALGAPI=y | 924 | CONFIG_CRYPTO_ALGAPI=y |
| 925 | CONFIG_CRYPTO_AEAD=y | ||
| 904 | CONFIG_CRYPTO_BLKCIPHER=y | 926 | CONFIG_CRYPTO_BLKCIPHER=y |
| 927 | CONFIG_CRYPTO_HASH=y | ||
| 928 | CONFIG_CRYPTO_RNG=y | ||
| 905 | CONFIG_CRYPTO_MANAGER=y | 929 | CONFIG_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 | ||
| 977 | CONFIG_CRYPTO_HW=y | 1006 | CONFIG_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 | |||
| 23 | CONFIG_NOT_COHERENT_CACHE=y | 23 | CONFIG_NOT_COHERENT_CACHE=y |
| 24 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 25 | CONFIG_WORD_SIZE=32 | 25 | CONFIG_WORD_SIZE=32 |
| 26 | CONFIG_PPC_MERGE=y | 26 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 27 | CONFIG_MMU=y | 27 | CONFIG_MMU=y |
| 28 | CONFIG_GENERIC_CMOS_UPDATE=y | 28 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 29 | CONFIG_GENERIC_TIME=y | 29 | CONFIG_GENERIC_TIME=y |
| 30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 30 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 31 | CONFIG_GENERIC_CLOCKEVENTS=y | 31 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_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 |
| 35 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -93,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 93 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 94 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 95 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 97 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
| 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 99 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
| @@ -109,7 +107,9 @@ CONFIG_SIGNALFD=y | |||
| 109 | CONFIG_TIMERFD=y | 107 | CONFIG_TIMERFD=y |
| 110 | CONFIG_EVENTFD=y | 108 | CONFIG_EVENTFD=y |
| 111 | CONFIG_SHMEM=y | 109 | CONFIG_SHMEM=y |
| 110 | CONFIG_AIO=y | ||
| 112 | CONFIG_VM_EVENT_COUNTERS=y | 111 | CONFIG_VM_EVENT_COUNTERS=y |
| 112 | CONFIG_PCI_QUIRKS=y | ||
| 113 | CONFIG_SLUB_DEBUG=y | 113 | CONFIG_SLUB_DEBUG=y |
| 114 | # CONFIG_SLAB is not set | 114 | # CONFIG_SLAB is not set |
| 115 | CONFIG_SLUB=y | 115 | CONFIG_SLUB=y |
| @@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 123 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
| 124 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
| 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 125 | CONFIG_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 | ||
| 129 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 131 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 132 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_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 |
| 160 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 161 | CONFIG_CLASSIC_RCU=y | 157 | CONFIG_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 | ||
| 181 | CONFIG_440EP=y | 182 | CONFIG_440EP=y |
| 182 | CONFIG_IBM440EP_ERR42=y | 183 | CONFIG_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 |
| 203 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 203 | CONFIG_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 |
| 213 | CONFIG_BINFMT_ELF=y | 213 | CONFIG_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 |
| 226 | CONFIG_FLATMEM=y | 228 | CONFIG_FLATMEM=y |
| 227 | CONFIG_FLAT_NODE_MEM_MAP=y | 229 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 228 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 230 | CONFIG_PAGEFLAGS_EXTENDED=y | 230 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 232 | CONFIG_MIGRATION=y | 232 | CONFIG_MIGRATION=y |
| 233 | CONFIG_RESOURCES_64BIT=y | 233 | CONFIG_RESOURCES_64BIT=y |
| 234 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 234 | CONFIG_ZONE_DMA_FLAG=1 | 235 | CONFIG_ZONE_DMA_FLAG=1 |
| 235 | CONFIG_BOUNCE=y | 236 | CONFIG_BOUNCE=y |
| 236 | CONFIG_VIRT_TO_BUS=y | 237 | CONFIG_VIRT_TO_BUS=y |
| 238 | CONFIG_UNEVICTABLE_LRU=y | ||
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 238 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
| 239 | CONFIG_CMDLINE_BOOL=y | 241 | CONFIG_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 | # |
| 575 | CONFIG_INPUT=y | 576 | CONFIG_INPUT=y |
| 576 | # CONFIG_INPUT_FF_MEMLESS is not set | 577 | CONFIG_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 | |||
| 673 | CONFIG_I2C=y | 675 | CONFIG_I2C=y |
| 674 | CONFIG_I2C_BOARDINFO=y | 676 | CONFIG_I2C_BOARDINFO=y |
| 675 | # CONFIG_I2C_CHARDEV is not set | 677 | # CONFIG_I2C_CHARDEV is not set |
| 678 | CONFIG_I2C_HELPER_AUTO=y | ||
| 676 | CONFIG_I2C_ALGOBIT=y | 679 | CONFIG_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 | |||
| 788 | CONFIG_FB=y | 794 | CONFIG_FB=y |
| 789 | # CONFIG_FIRMWARE_EDID is not set | 795 | # CONFIG_FIRMWARE_EDID is not set |
| 790 | CONFIG_FB_DDC=y | 796 | CONFIG_FB_DDC=y |
| 797 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 791 | CONFIG_FB_CFB_FILLRECT=y | 798 | CONFIG_FB_CFB_FILLRECT=y |
| 792 | CONFIG_FB_CFB_COPYAREA=y | 799 | CONFIG_FB_CFB_COPYAREA=y |
| 793 | CONFIG_FB_CFB_IMAGEBLIT=y | 800 | CONFIG_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 | ||
| 842 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 851 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 843 | CONFIG_LCD_CLASS_DEVICE=y | 852 | CONFIG_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 | # |
| 877 | CONFIG_USB_HID=y | 886 | CONFIG_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 | # | ||
| 893 | CONFIG_HID_COMPAT=y | ||
| 894 | CONFIG_HID_A4TECH=y | ||
| 895 | CONFIG_HID_APPLE=y | ||
| 896 | CONFIG_HID_BELKIN=y | ||
| 897 | CONFIG_HID_BRIGHT=y | ||
| 898 | CONFIG_HID_CHERRY=y | ||
| 899 | CONFIG_HID_CHICONY=y | ||
| 900 | CONFIG_HID_CYPRESS=y | ||
| 901 | CONFIG_HID_DELL=y | ||
| 902 | CONFIG_HID_EZKEY=y | ||
| 903 | CONFIG_HID_GYRATION=y | ||
| 904 | CONFIG_HID_LOGITECH=y | ||
| 905 | # CONFIG_LOGITECH_FF is not set | ||
| 906 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 907 | CONFIG_HID_MICROSOFT=y | ||
| 908 | CONFIG_HID_MONTEREY=y | ||
| 909 | CONFIG_HID_PANTHERLORD=y | ||
| 910 | # CONFIG_PANTHERLORD_FF is not set | ||
| 911 | CONFIG_HID_PETALYNX=y | ||
| 912 | CONFIG_HID_SAMSUNG=y | ||
| 913 | CONFIG_HID_SONY=y | ||
| 914 | CONFIG_HID_SUNPLUS=y | ||
| 915 | CONFIG_THRUSTMASTER_FF=m | ||
| 916 | CONFIG_ZEROPLUS_FF=m | ||
| 881 | CONFIG_USB_SUPPORT=y | 917 | CONFIG_USB_SUPPORT=y |
| 882 | CONFIG_USB_ARCH_HAS_HCD=y | 918 | CONFIG_USB_ARCH_HAS_HCD=y |
| 883 | CONFIG_USB_ARCH_HAS_OHCI=y | 919 | CONFIG_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 | |||
| 1058 | CONFIG_EXT3_FS_XATTR=y | 1105 | CONFIG_EXT3_FS_XATTR=y |
| 1059 | CONFIG_EXT3_FS_POSIX_ACL=y | 1106 | CONFIG_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 |
| 1062 | CONFIG_JBD=y | 1109 | CONFIG_JBD=y |
| 1063 | CONFIG_FS_MBCACHE=y | 1110 | CONFIG_FS_MBCACHE=y |
| 1064 | CONFIG_REISERFS_FS=y | 1111 | CONFIG_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 |
| 1069 | CONFIG_FS_POSIX_ACL=y | 1116 | CONFIG_FS_POSIX_ACL=y |
| 1117 | CONFIG_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 |
| 1072 | CONFIG_DNOTIFY=y | 1120 | CONFIG_DNOTIFY=y |
| @@ -1102,6 +1150,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1102 | CONFIG_PROC_FS=y | 1150 | CONFIG_PROC_FS=y |
| 1103 | CONFIG_PROC_KCORE=y | 1151 | CONFIG_PROC_KCORE=y |
| 1104 | CONFIG_PROC_SYSCTL=y | 1152 | CONFIG_PROC_SYSCTL=y |
| 1153 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1105 | CONFIG_SYSFS=y | 1154 | CONFIG_SYSFS=y |
| 1106 | CONFIG_TMPFS=y | 1155 | CONFIG_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 | # |
| 1198 | CONFIG_BITREVERSE=y | 1247 | CONFIG_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 |
| 1202 | CONFIG_CRC_T10DIF=y | 1250 | CONFIG_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 |
| 1280 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1281 | CONFIG_NOP_TRACER=y | ||
| 1231 | CONFIG_HAVE_FTRACE=y | 1282 | CONFIG_HAVE_FTRACE=y |
| 1232 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1283 | CONFIG_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 |
| 1237 | CONFIG_HAVE_ARCH_KGDB=y | 1286 | CONFIG_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 | |||
| 23 | CONFIG_NOT_COHERENT_CACHE=y | 23 | CONFIG_NOT_COHERENT_CACHE=y |
| 24 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 25 | CONFIG_WORD_SIZE=32 | 25 | CONFIG_WORD_SIZE=32 |
| 26 | CONFIG_PPC_MERGE=y | 26 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 27 | CONFIG_MMU=y | 27 | CONFIG_MMU=y |
| 28 | CONFIG_GENERIC_CMOS_UPDATE=y | 28 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 29 | CONFIG_GENERIC_TIME=y | 29 | CONFIG_GENERIC_TIME=y |
| 30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 30 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 31 | CONFIG_GENERIC_CLOCKEVENTS=y | 31 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_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 |
| 35 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 94 | CONFIG_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 | |||
| 109 | CONFIG_TIMERFD=y | 107 | CONFIG_TIMERFD=y |
| 110 | CONFIG_EVENTFD=y | 108 | CONFIG_EVENTFD=y |
| 111 | CONFIG_SHMEM=y | 109 | CONFIG_SHMEM=y |
| 110 | CONFIG_AIO=y | ||
| 112 | CONFIG_VM_EVENT_COUNTERS=y | 111 | CONFIG_VM_EVENT_COUNTERS=y |
| 112 | CONFIG_PCI_QUIRKS=y | ||
| 113 | CONFIG_SLUB_DEBUG=y | 113 | CONFIG_SLUB_DEBUG=y |
| 114 | # CONFIG_SLAB is not set | 114 | # CONFIG_SLAB is not set |
| 115 | CONFIG_SLUB=y | 115 | CONFIG_SLUB=y |
| @@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 123 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
| 124 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
| 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 125 | CONFIG_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 | ||
| 129 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 131 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 132 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_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 |
| 160 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 161 | CONFIG_CLASSIC_RCU=y | 157 | CONFIG_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 |
| 180 | CONFIG_PPC44x_SIMPLE=y | ||
| 181 | # CONFIG_PPC4xx_GPIO is not set | ||
| 181 | CONFIG_440EPX=y | 182 | CONFIG_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 |
| 207 | CONFIG_HZ=250 | 208 | CONFIG_HZ=250 |
| 208 | # CONFIG_SCHED_HRTICK is not set | 209 | CONFIG_SCHED_HRTICK=y |
| 209 | CONFIG_PREEMPT_NONE=y | 210 | CONFIG_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 |
| 212 | CONFIG_BINFMT_ELF=y | 213 | CONFIG_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 |
| 225 | CONFIG_FLATMEM=y | 228 | CONFIG_FLATMEM=y |
| 226 | CONFIG_FLAT_NODE_MEM_MAP=y | 229 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 227 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 229 | CONFIG_PAGEFLAGS_EXTENDED=y | 230 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 231 | CONFIG_MIGRATION=y | 232 | CONFIG_MIGRATION=y |
| 232 | CONFIG_RESOURCES_64BIT=y | 233 | CONFIG_RESOURCES_64BIT=y |
| 234 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 233 | CONFIG_ZONE_DMA_FLAG=1 | 235 | CONFIG_ZONE_DMA_FLAG=1 |
| 234 | CONFIG_BOUNCE=y | 236 | CONFIG_BOUNCE=y |
| 235 | CONFIG_VIRT_TO_BUS=y | 237 | CONFIG_VIRT_TO_BUS=y |
| 238 | CONFIG_UNEVICTABLE_LRU=y | ||
| 236 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 237 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
| 238 | CONFIG_CMDLINE_BOOL=y | 241 | CONFIG_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 | |||
| 527 | CONFIG_IBM_NEW_EMAC_RGMII=y | 525 | CONFIG_IBM_NEW_EMAC_RGMII=y |
| 528 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 526 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 529 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 527 | CONFIG_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 | ||
| 532 | CONFIG_NETDEV_1000=y | 534 | CONFIG_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 | ||
| 552 | CONFIG_NETDEV_10000=y | 555 | CONFIG_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 |
| 738 | CONFIG_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 |
| 726 | CONFIG_DNOTIFY=y | 741 | CONFIG_DNOTIFY=y |
| @@ -750,6 +765,7 @@ CONFIG_INOTIFY_USER=y | |||
| 750 | CONFIG_PROC_FS=y | 765 | CONFIG_PROC_FS=y |
| 751 | CONFIG_PROC_KCORE=y | 766 | CONFIG_PROC_KCORE=y |
| 752 | CONFIG_PROC_SYSCTL=y | 767 | CONFIG_PROC_SYSCTL=y |
| 768 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 753 | CONFIG_SYSFS=y | 769 | CONFIG_SYSFS=y |
| 754 | CONFIG_TMPFS=y | 770 | CONFIG_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 | |||
| 797 | CONFIG_LOCKD_V4=y | 813 | CONFIG_LOCKD_V4=y |
| 798 | CONFIG_NFS_COMMON=y | 814 | CONFIG_NFS_COMMON=y |
| 799 | CONFIG_SUNRPC=y | 815 | CONFIG_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 | # |
| 819 | CONFIG_BITREVERSE=y | 836 | CONFIG_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 |
| 895 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 896 | CONFIG_NOP_TRACER=y | ||
| 877 | CONFIG_HAVE_FTRACE=y | 897 | CONFIG_HAVE_FTRACE=y |
| 878 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 898 | CONFIG_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 |
| 883 | CONFIG_HAVE_ARCH_KGDB=y | 906 | CONFIG_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 |
| 915 | CONFIG_CRYPTO=y | 940 | CONFIG_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 | ||
| 920 | CONFIG_CRYPTO_ALGAPI=y | 946 | CONFIG_CRYPTO_ALGAPI=y |
| 947 | CONFIG_CRYPTO_AEAD=y | ||
| 921 | CONFIG_CRYPTO_BLKCIPHER=y | 948 | CONFIG_CRYPTO_BLKCIPHER=y |
| 949 | CONFIG_CRYPTO_HASH=y | ||
| 950 | CONFIG_CRYPTO_RNG=y | ||
| 922 | CONFIG_CRYPTO_MANAGER=y | 951 | CONFIG_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 | ||
| 994 | CONFIG_CRYPTO_HW=y | 1028 | CONFIG_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 | |||
| 22 | CONFIG_NOT_COHERENT_CACHE=y | 22 | CONFIG_NOT_COHERENT_CACHE=y |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| 29 | CONFIG_GENERIC_TIME_VSYSCALL=y | 29 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 30 | CONFIG_GENERIC_CLOCKEVENTS=y | 30 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_GET_USER_PAGES_FAST is not set | ||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 91 | CONFIG_SYSCTL=y | 90 | CONFIG_SYSCTL=y |
| 92 | CONFIG_EMBEDDED=y | 91 | CONFIG_EMBEDDED=y |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 92 | CONFIG_SYSCTL_SYSCALL=y |
| 94 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 95 | CONFIG_KALLSYMS=y | 93 | CONFIG_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 | |||
| 108 | CONFIG_TIMERFD=y | 106 | CONFIG_TIMERFD=y |
| 109 | CONFIG_EVENTFD=y | 107 | CONFIG_EVENTFD=y |
| 110 | CONFIG_SHMEM=y | 108 | CONFIG_SHMEM=y |
| 109 | CONFIG_AIO=y | ||
| 111 | CONFIG_VM_EVENT_COUNTERS=y | 110 | CONFIG_VM_EVENT_COUNTERS=y |
| 111 | CONFIG_PCI_QUIRKS=y | ||
| 112 | CONFIG_SLUB_DEBUG=y | 112 | CONFIG_SLUB_DEBUG=y |
| 113 | # CONFIG_SLAB is not set | 113 | # CONFIG_SLAB is not set |
| 114 | CONFIG_SLUB=y | 114 | CONFIG_SLUB=y |
| @@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 122 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 123 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 128 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 130 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 131 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_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 |
| 159 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 155 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 160 | CONFIG_CLASSIC_RCU=y | 156 | CONFIG_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 |
| 179 | CONFIG_PPC44x_SIMPLE=y | ||
| 180 | # CONFIG_PPC4xx_GPIO is not set | ||
| 180 | CONFIG_440GX=y | 181 | CONFIG_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 |
| 201 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 201 | CONFIG_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 |
| 211 | CONFIG_BINFMT_ELF=y | 211 | CONFIG_BINFMT_ELF=y |
| 212 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 213 | # CONFIG_HAVE_AOUT is not set | ||
| 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 |
| 224 | CONFIG_FLATMEM=y | 226 | CONFIG_FLATMEM=y |
| 225 | CONFIG_FLAT_NODE_MEM_MAP=y | 227 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 226 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 227 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 228 | CONFIG_PAGEFLAGS_EXTENDED=y | 228 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 230 | CONFIG_MIGRATION=y | 230 | CONFIG_MIGRATION=y |
| 231 | CONFIG_RESOURCES_64BIT=y | 231 | CONFIG_RESOURCES_64BIT=y |
| 232 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 232 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 233 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| 234 | CONFIG_VIRT_TO_BUS=y | 235 | CONFIG_VIRT_TO_BUS=y |
| 236 | CONFIG_UNEVICTABLE_LRU=y | ||
| 235 | CONFIG_FORCE_MAX_ZONEORDER=11 | 237 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 236 | CONFIG_PROC_DEVICETREE=y | 238 | CONFIG_PROC_DEVICETREE=y |
| 237 | CONFIG_CMDLINE_BOOL=y | 239 | CONFIG_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 | |||
| 528 | CONFIG_IBM_NEW_EMAC_RGMII=y | 525 | CONFIG_IBM_NEW_EMAC_RGMII=y |
| 529 | CONFIG_IBM_NEW_EMAC_TAH=y | 526 | CONFIG_IBM_NEW_EMAC_TAH=y |
| 530 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 527 | CONFIG_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 | ||
| 533 | CONFIG_NETDEV_1000=y | 534 | CONFIG_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 | ||
| 553 | CONFIG_NETDEV_10000=y | 555 | CONFIG_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 |
| 738 | CONFIG_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 |
| 727 | CONFIG_DNOTIFY=y | 741 | CONFIG_DNOTIFY=y |
| @@ -751,6 +765,7 @@ CONFIG_INOTIFY_USER=y | |||
| 751 | CONFIG_PROC_FS=y | 765 | CONFIG_PROC_FS=y |
| 752 | CONFIG_PROC_KCORE=y | 766 | CONFIG_PROC_KCORE=y |
| 753 | CONFIG_PROC_SYSCTL=y | 767 | CONFIG_PROC_SYSCTL=y |
| 768 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 754 | CONFIG_SYSFS=y | 769 | CONFIG_SYSFS=y |
| 755 | CONFIG_TMPFS=y | 770 | CONFIG_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 | |||
| 788 | CONFIG_LOCKD_V4=y | 803 | CONFIG_LOCKD_V4=y |
| 789 | CONFIG_NFS_COMMON=y | 804 | CONFIG_NFS_COMMON=y |
| 790 | CONFIG_SUNRPC=y | 805 | CONFIG_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 | # |
| 810 | CONFIG_BITREVERSE=y | 826 | CONFIG_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 |
| 884 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 885 | CONFIG_NOP_TRACER=y | ||
| 867 | CONFIG_HAVE_FTRACE=y | 886 | CONFIG_HAVE_FTRACE=y |
| 868 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 887 | CONFIG_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 |
| 873 | CONFIG_HAVE_ARCH_KGDB=y | 895 | CONFIG_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 |
| 892 | CONFIG_CRYPTO=y | 916 | CONFIG_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 | ||
| 897 | CONFIG_CRYPTO_ALGAPI=y | 922 | CONFIG_CRYPTO_ALGAPI=y |
| 923 | CONFIG_CRYPTO_AEAD=y | ||
| 898 | CONFIG_CRYPTO_BLKCIPHER=y | 924 | CONFIG_CRYPTO_BLKCIPHER=y |
| 925 | CONFIG_CRYPTO_HASH=y | ||
| 926 | CONFIG_CRYPTO_RNG=y | ||
| 899 | CONFIG_CRYPTO_MANAGER=y | 927 | CONFIG_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 | ||
| 971 | CONFIG_CRYPTO_HW=y | 1004 | CONFIG_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 | |||
| 23 | CONFIG_NOT_COHERENT_CACHE=y | 23 | CONFIG_NOT_COHERENT_CACHE=y |
| 24 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 25 | CONFIG_WORD_SIZE=32 | 25 | CONFIG_WORD_SIZE=32 |
| 26 | CONFIG_PPC_MERGE=y | 26 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 27 | CONFIG_MMU=y | 27 | CONFIG_MMU=y |
| 28 | CONFIG_GENERIC_CMOS_UPDATE=y | 28 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 29 | CONFIG_GENERIC_TIME=y | 29 | CONFIG_GENERIC_TIME=y |
| 30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 30 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 31 | CONFIG_GENERIC_CLOCKEVENTS=y | 31 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_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 |
| 35 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 94 | CONFIG_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 | |||
| 109 | CONFIG_TIMERFD=y | 107 | CONFIG_TIMERFD=y |
| 110 | CONFIG_EVENTFD=y | 108 | CONFIG_EVENTFD=y |
| 111 | CONFIG_SHMEM=y | 109 | CONFIG_SHMEM=y |
| 110 | CONFIG_AIO=y | ||
| 112 | CONFIG_VM_EVENT_COUNTERS=y | 111 | CONFIG_VM_EVENT_COUNTERS=y |
| 113 | CONFIG_SLAB=y | 112 | CONFIG_SLAB=y |
| 114 | # CONFIG_SLUB is not set | 113 | # CONFIG_SLUB is not set |
| @@ -122,10 +121,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 122 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 123 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 128 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 130 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 131 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_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 |
| 159 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 154 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 160 | CONFIG_CLASSIC_RCU=y | 155 | CONFIG_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 |
| 175 | CONFIG_WARP=y | 171 | CONFIG_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 | ||
| 179 | CONFIG_440EP=y | 179 | CONFIG_440EP=y |
| 180 | CONFIG_IBM440EP_ERR42=y | 180 | CONFIG_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 |
| 201 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 200 | CONFIG_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 |
| 211 | CONFIG_BINFMT_ELF=y | 210 | CONFIG_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 |
| 224 | CONFIG_FLATMEM=y | 225 | CONFIG_FLATMEM=y |
| 225 | CONFIG_FLAT_NODE_MEM_MAP=y | 226 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 226 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 227 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 228 | CONFIG_PAGEFLAGS_EXTENDED=y | 227 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 228 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 230 | CONFIG_MIGRATION=y | 229 | CONFIG_MIGRATION=y |
| 231 | CONFIG_RESOURCES_64BIT=y | 230 | CONFIG_RESOURCES_64BIT=y |
| 231 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 232 | CONFIG_ZONE_DMA_FLAG=1 | 232 | CONFIG_ZONE_DMA_FLAG=1 |
| 233 | CONFIG_BOUNCE=y | 233 | CONFIG_BOUNCE=y |
| 234 | CONFIG_VIRT_TO_BUS=y | 234 | CONFIG_VIRT_TO_BUS=y |
| 235 | CONFIG_UNEVICTABLE_LRU=y | ||
| 235 | CONFIG_FORCE_MAX_ZONEORDER=11 | 236 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 236 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
| 237 | CONFIG_CMDLINE_BOOL=y | 238 | CONFIG_CMDLINE_BOOL=y |
| @@ -308,7 +309,6 @@ CONFIG_INET_TCP_DIAG=y | |||
| 308 | CONFIG_TCP_CONG_CUBIC=y | 309 | CONFIG_TCP_CONG_CUBIC=y |
| 309 | CONFIG_DEFAULT_TCP_CONG="cubic" | 310 | CONFIG_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 |
| 314 | CONFIG_NETFILTER=y | 314 | CONFIG_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 | ||
| 337 | CONFIG_VLAN_8021Q=y | 340 | CONFIG_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 | |||
| 629 | CONFIG_I2C=y | 629 | CONFIG_I2C=y |
| 630 | CONFIG_I2C_BOARDINFO=y | 630 | CONFIG_I2C_BOARDINFO=y |
| 631 | # CONFIG_I2C_CHARDEV is not set | 631 | # CONFIG_I2C_CHARDEV is not set |
| 632 | CONFIG_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 |
| 679 | CONFIG_HWMON=y | 680 | CONFIG_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 |
| 797 | CONFIG_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 | |||
| 805 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 813 | CONFIG_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 |
| 843 | CONFIG_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 |
| 873 | CONFIG_MMC=m | 883 | CONFIG_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 | # |
| 880 | CONFIG_MMC_BLOCK=m | 890 | CONFIG_MMC_BLOCK=m |
| 881 | CONFIG_MMC_BLOCK_BOUNCE=y | 891 | CONFIG_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 |
| 920 | CONFIG_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 |
| 911 | CONFIG_DNOTIFY=y | 923 | CONFIG_DNOTIFY=y |
| @@ -938,6 +950,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 938 | CONFIG_PROC_FS=y | 950 | CONFIG_PROC_FS=y |
| 939 | CONFIG_PROC_KCORE=y | 951 | CONFIG_PROC_KCORE=y |
| 940 | CONFIG_PROC_SYSCTL=y | 952 | CONFIG_PROC_SYSCTL=y |
| 953 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 941 | CONFIG_SYSFS=y | 954 | CONFIG_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 | |||
| 984 | CONFIG_LOCKD_V4=y | 997 | CONFIG_LOCKD_V4=y |
| 985 | CONFIG_NFS_COMMON=y | 998 | CONFIG_NFS_COMMON=y |
| 986 | CONFIG_SUNRPC=y | 999 | CONFIG_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 | # |
| 1045 | CONFIG_BITREVERSE=y | 1059 | CONFIG_BITREVERSE=y |
| 1046 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1047 | CONFIG_CRC_CCITT=y | 1060 | CONFIG_CRC_CCITT=y |
| 1048 | # CONFIG_CRC16 is not set | 1061 | # CONFIG_CRC16 is not set |
| 1049 | CONFIG_CRC_T10DIF=y | 1062 | CONFIG_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 |
| 1117 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1118 | CONFIG_NOP_TRACER=y | ||
| 1102 | CONFIG_HAVE_FTRACE=y | 1119 | CONFIG_HAVE_FTRACE=y |
| 1103 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1120 | CONFIG_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 |
| 1108 | CONFIG_HAVE_ARCH_KGDB=y | 1128 | CONFIG_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 |
| 1127 | CONFIG_CRYPTO=y | 1149 | CONFIG_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 | ||
| 1204 | CONFIG_CRYPTO_HW=y | 1232 | CONFIG_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 |
| 91 | CONFIG_BLK_DEV_INITRD=y | 91 | CONFIG_BLK_DEV_INITRD=y |
| 92 | CONFIG_INITRAMFS_SOURCE="" | 92 | CONFIG_INITRAMFS_SOURCE="" |
| 93 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 93 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 94 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 95 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
| 96 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| @@ -101,7 +101,7 @@ CONFIG_HOTPLUG=y | |||
| 101 | CONFIG_PRINTK=y | 101 | CONFIG_PRINTK=y |
| 102 | CONFIG_BUG=y | 102 | CONFIG_BUG=y |
| 103 | CONFIG_ELF_CORE=y | 103 | CONFIG_ELF_CORE=y |
| 104 | CONFIG_COMPAT_BRK=y | 104 | # CONFIG_COMPAT_BRK is not set |
| 105 | CONFIG_BASE_FULL=y | 105 | CONFIG_BASE_FULL=y |
| 106 | CONFIG_FUTEX=y | 106 | CONFIG_FUTEX=y |
| 107 | CONFIG_ANON_INODES=y | 107 | CONFIG_ANON_INODES=y |
| @@ -934,7 +934,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 934 | CONFIG_SERIAL_CORE=y | 934 | CONFIG_SERIAL_CORE=y |
| 935 | CONFIG_SERIAL_CORE_CONSOLE=y | 935 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 936 | # CONFIG_SERIAL_JSM is not set | 936 | # CONFIG_SERIAL_JSM is not set |
| 937 | CONFIG_SERIAL_OF_PLATFORM=y | 937 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 938 | CONFIG_UNIX98_PTYS=y | 938 | CONFIG_UNIX98_PTYS=y |
| 939 | CONFIG_LEGACY_PTYS=y | 939 | CONFIG_LEGACY_PTYS=y |
| 940 | CONFIG_LEGACY_PTY_COUNT=256 | 940 | CONFIG_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 | |||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | 19 | CONFIG_NOT_COHERENT_CACHE=y |
| 20 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 21 | CONFIG_WORD_SIZE=32 | 21 | CONFIG_WORD_SIZE=32 |
| 22 | CONFIG_PPC_MERGE=y | 22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 23 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| 24 | CONFIG_GENERIC_CMOS_UPDATE=y | 24 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 25 | CONFIG_GENERIC_TIME=y | 25 | CONFIG_GENERIC_TIME=y |
| 26 | CONFIG_GENERIC_TIME_VSYSCALL=y | 26 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 27 | CONFIG_GENERIC_CLOCKEVENTS=y | 27 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_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 |
| 31 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -37,6 +36,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 37 | CONFIG_GENERIC_HWEIGHT=y | 36 | CONFIG_GENERIC_HWEIGHT=y |
| 38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 37 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 38 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 39 | CONFIG_GENERIC_GPIO=y | ||
| 40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 41 | CONFIG_PPC=y | 41 | CONFIG_PPC=y |
| 42 | CONFIG_EARLY_PRINTK=y | 42 | CONFIG_EARLY_PRINTK=y |
| @@ -88,7 +88,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 89 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 92 | CONFIG_KALLSYMS=y | 91 | CONFIG_KALLSYMS=y |
| 93 | CONFIG_KALLSYMS_ALL=y | 92 | CONFIG_KALLSYMS_ALL=y |
| 94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 93 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -105,7 +104,9 @@ CONFIG_SIGNALFD=y | |||
| 105 | CONFIG_TIMERFD=y | 104 | CONFIG_TIMERFD=y |
| 106 | CONFIG_EVENTFD=y | 105 | CONFIG_EVENTFD=y |
| 107 | CONFIG_SHMEM=y | 106 | CONFIG_SHMEM=y |
| 107 | CONFIG_AIO=y | ||
| 108 | CONFIG_VM_EVENT_COUNTERS=y | 108 | CONFIG_VM_EVENT_COUNTERS=y |
| 109 | CONFIG_PCI_QUIRKS=y | ||
| 109 | CONFIG_SLUB_DEBUG=y | 110 | CONFIG_SLUB_DEBUG=y |
| 110 | # CONFIG_SLAB is not set | 111 | # CONFIG_SLAB is not set |
| 111 | CONFIG_SLUB=y | 112 | CONFIG_SLUB=y |
| @@ -119,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 119 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 122 | CONFIG_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 | ||
| 125 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 127 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 128 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_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 |
| 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 153 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 157 | CONFIG_CLASSIC_RCU=y | 154 | CONFIG_CLASSIC_RCU=y |
| 155 | # CONFIG_FREEZER is not set | ||
| 158 | CONFIG_PPC4xx_PCI_EXPRESS=y | 156 | CONFIG_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 |
| 164 | CONFIG_PPC4xx_GPIO=y | ||
| 166 | CONFIG_XILINX_VIRTEX=y | 165 | CONFIG_XILINX_VIRTEX=y |
| 166 | CONFIG_ACADIA=y | ||
| 167 | CONFIG_EP405=y | 167 | CONFIG_EP405=y |
| 168 | CONFIG_HCU4=y | ||
| 168 | CONFIG_KILAUEA=y | 169 | CONFIG_KILAUEA=y |
| 169 | CONFIG_MAKALU=y | 170 | CONFIG_MAKALU=y |
| 170 | CONFIG_WALNUT=y | 171 | CONFIG_WALNUT=y |
| 171 | CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y | 172 | CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y |
| 173 | CONFIG_PPC40x_SIMPLE=y | ||
| 172 | CONFIG_405GP=y | 174 | CONFIG_405GP=y |
| 173 | CONFIG_405EX=y | 175 | CONFIG_405EX=y |
| 176 | CONFIG_405EZ=y | ||
| 177 | CONFIG_405GPR=y | ||
| 174 | CONFIG_XILINX_VIRTEX_II_PRO=y | 178 | CONFIG_XILINX_VIRTEX_II_PRO=y |
| 175 | CONFIG_XILINX_VIRTEX_4_FX=y | 179 | CONFIG_XILINX_VIRTEX_4_FX=y |
| 176 | CONFIG_IBM405_ERR77=y | 180 | CONFIG_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 |
| 199 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 202 | CONFIG_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 |
| 209 | CONFIG_BINFMT_ELF=y | 212 | CONFIG_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 |
| 222 | CONFIG_FLATMEM=y | 227 | CONFIG_FLATMEM=y |
| 223 | CONFIG_FLAT_NODE_MEM_MAP=y | 228 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 224 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | 229 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 228 | CONFIG_MIGRATION=y | 231 | CONFIG_MIGRATION=y |
| 229 | CONFIG_RESOURCES_64BIT=y | 232 | CONFIG_RESOURCES_64BIT=y |
| 233 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 230 | CONFIG_ZONE_DMA_FLAG=1 | 234 | CONFIG_ZONE_DMA_FLAG=1 |
| 231 | CONFIG_BOUNCE=y | 235 | CONFIG_BOUNCE=y |
| 232 | CONFIG_VIRT_TO_BUS=y | 236 | CONFIG_VIRT_TO_BUS=y |
| 237 | CONFIG_UNEVICTABLE_LRU=y | ||
| 233 | CONFIG_FORCE_MAX_ZONEORDER=11 | 238 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 234 | CONFIG_PROC_DEVICETREE=y | 239 | CONFIG_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 | # | 369 | CONFIG_WIRELESS=y |
| 364 | # Wireless | ||
| 365 | # | ||
| 366 | # CONFIG_CFG80211 is not set | 370 | # CONFIG_CFG80211 is not set |
| 371 | CONFIG_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 |
| 478 | CONFIG_OF_DEVICE=y | 483 | CONFIG_OF_DEVICE=y |
| 484 | CONFIG_OF_GPIO=y | ||
| 479 | CONFIG_OF_I2C=m | 485 | CONFIG_OF_I2C=m |
| 480 | # CONFIG_PARPORT is not set | 486 | # CONFIG_PARPORT is not set |
| 481 | CONFIG_BLK_DEV=y | 487 | CONFIG_BLK_DEV=y |
| @@ -556,8 +562,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
| 556 | CONFIG_IBM_NEW_EMAC_RGMII=y | 562 | CONFIG_IBM_NEW_EMAC_RGMII=y |
| 557 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 563 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 558 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 564 | CONFIG_IBM_NEW_EMAC_EMAC4=y |
| 565 | CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL=y | ||
| 566 | CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT=y | ||
| 567 | CONFIG_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 | ||
| 561 | CONFIG_NETDEV_1000=y | 571 | CONFIG_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 | ||
| 581 | CONFIG_NETDEV_10000=y | 592 | CONFIG_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 | |||
| 667 | CONFIG_I2C=m | 681 | CONFIG_I2C=m |
| 668 | CONFIG_I2C_BOARDINFO=y | 682 | CONFIG_I2C_BOARDINFO=y |
| 669 | CONFIG_I2C_CHARDEV=m | 683 | CONFIG_I2C_CHARDEV=m |
| 684 | CONFIG_I2C_HELPER_AUTO=y | ||
| 685 | CONFIG_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 | # |
| 712 | CONFIG_I2C_GPIO=m | ||
| 696 | CONFIG_I2C_IBM_IIC=m | 713 | CONFIG_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 |
| 735 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 753 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 736 | # CONFIG_GPIOLIB is not set | 754 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
| 755 | CONFIG_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 | |||
| 816 | CONFIG_EXT3_FS_XATTR=y | 862 | CONFIG_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 |
| 820 | CONFIG_JBD=m | 866 | CONFIG_JBD=m |
| 821 | # CONFIG_JBD_DEBUG is not set | 867 | # CONFIG_JBD_DEBUG is not set |
| 822 | CONFIG_FS_MBCACHE=y | 868 | CONFIG_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 |
| 872 | CONFIG_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 |
| 828 | CONFIG_DNOTIFY=y | 875 | CONFIG_DNOTIFY=y |
| @@ -855,6 +902,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 855 | CONFIG_PROC_FS=y | 902 | CONFIG_PROC_FS=y |
| 856 | CONFIG_PROC_KCORE=y | 903 | CONFIG_PROC_KCORE=y |
| 857 | CONFIG_PROC_SYSCTL=y | 904 | CONFIG_PROC_SYSCTL=y |
| 905 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 858 | CONFIG_SYSFS=y | 906 | CONFIG_SYSFS=y |
| 859 | CONFIG_TMPFS=y | 907 | CONFIG_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 | |||
| 908 | CONFIG_LOCKD_V4=y | 956 | CONFIG_LOCKD_V4=y |
| 909 | CONFIG_NFS_COMMON=y | 957 | CONFIG_NFS_COMMON=y |
| 910 | CONFIG_SUNRPC=y | 958 | CONFIG_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 | # |
| 969 | CONFIG_BITREVERSE=y | 1018 | CONFIG_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 |
| 972 | CONFIG_CRC16=m | 1020 | CONFIG_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 |
| 1079 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1080 | CONFIG_NOP_TRACER=y | ||
| 1029 | CONFIG_HAVE_FTRACE=y | 1081 | CONFIG_HAVE_FTRACE=y |
| 1030 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1082 | CONFIG_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 |
| 1035 | CONFIG_HAVE_ARCH_KGDB=y | 1090 | CONFIG_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 |
| 1054 | CONFIG_CRYPTO=y | 1111 | CONFIG_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 | ||
| 1059 | CONFIG_CRYPTO_ALGAPI=y | 1117 | CONFIG_CRYPTO_ALGAPI=y |
| 1118 | CONFIG_CRYPTO_AEAD=y | ||
| 1060 | CONFIG_CRYPTO_BLKCIPHER=y | 1119 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1120 | CONFIG_CRYPTO_HASH=y | ||
| 1121 | CONFIG_CRYPTO_RNG=y | ||
| 1061 | CONFIG_CRYPTO_MANAGER=y | 1122 | CONFIG_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 | # |
| 1131 | CONFIG_CRYPTO_DEFLATE=m | 1192 | CONFIG_CRYPTO_DEFLATE=m |
| 1132 | CONFIG_CRYPTO_LZO=m | 1193 | CONFIG_CRYPTO_LZO=m |
| 1194 | |||
| 1195 | # | ||
| 1196 | # Random Number Generation | ||
| 1197 | # | ||
| 1198 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1133 | CONFIG_CRYPTO_HW=y | 1199 | CONFIG_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 | |||
| 23 | CONFIG_NOT_COHERENT_CACHE=y | 23 | CONFIG_NOT_COHERENT_CACHE=y |
| 24 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 25 | CONFIG_WORD_SIZE=32 | 25 | CONFIG_WORD_SIZE=32 |
| 26 | CONFIG_PPC_MERGE=y | 26 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 27 | CONFIG_MMU=y | 27 | CONFIG_MMU=y |
| 28 | CONFIG_GENERIC_CMOS_UPDATE=y | 28 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 29 | CONFIG_GENERIC_TIME=y | 29 | CONFIG_GENERIC_TIME=y |
| 30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 30 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 31 | CONFIG_GENERIC_CLOCKEVENTS=y | 31 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_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 |
| 35 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -41,6 +40,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 41 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
| 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 41 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 42 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 43 | CONFIG_GENERIC_GPIO=y | ||
| 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 45 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
| 46 | CONFIG_EARLY_PRINTK=y | 46 | CONFIG_EARLY_PRINTK=y |
| @@ -92,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 93 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 96 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
| 97 | CONFIG_KALLSYMS_ALL=y | 96 | CONFIG_KALLSYMS_ALL=y |
| 98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 97 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -109,7 +108,9 @@ CONFIG_SIGNALFD=y | |||
| 109 | CONFIG_TIMERFD=y | 108 | CONFIG_TIMERFD=y |
| 110 | CONFIG_EVENTFD=y | 109 | CONFIG_EVENTFD=y |
| 111 | CONFIG_SHMEM=y | 110 | CONFIG_SHMEM=y |
| 111 | CONFIG_AIO=y | ||
| 112 | CONFIG_VM_EVENT_COUNTERS=y | 112 | CONFIG_VM_EVENT_COUNTERS=y |
| 113 | CONFIG_PCI_QUIRKS=y | ||
| 113 | CONFIG_SLUB_DEBUG=y | 114 | CONFIG_SLUB_DEBUG=y |
| 114 | # CONFIG_SLAB is not set | 115 | # CONFIG_SLAB is not set |
| 115 | CONFIG_SLUB=y | 116 | CONFIG_SLUB=y |
| @@ -123,10 +124,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 123 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 124 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 126 | CONFIG_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 | ||
| 129 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 131 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
| 132 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_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 |
| 160 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 157 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 158 | CONFIG_PREEMPT_NOTIFIERS=y | ||
| 161 | CONFIG_CLASSIC_RCU=y | 159 | CONFIG_CLASSIC_RCU=y |
| 160 | # CONFIG_FREEZER is not set | ||
| 162 | CONFIG_PPC4xx_PCI_EXPRESS=y | 161 | CONFIG_PPC4xx_PCI_EXPRESS=y |
| 163 | 162 | ||
| 164 | # | 163 | # |
| @@ -175,9 +174,13 @@ CONFIG_TAISHAN=y | |||
| 175 | CONFIG_KATMAI=y | 174 | CONFIG_KATMAI=y |
| 176 | CONFIG_RAINIER=y | 175 | CONFIG_RAINIER=y |
| 177 | CONFIG_WARP=y | 176 | CONFIG_WARP=y |
| 177 | CONFIG_ARCHES=y | ||
| 178 | CONFIG_CANYONLANDS=y | 178 | CONFIG_CANYONLANDS=y |
| 179 | CONFIG_GLACIER=y | ||
| 179 | CONFIG_YOSEMITE=y | 180 | CONFIG_YOSEMITE=y |
| 180 | CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y | 181 | CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y |
| 182 | CONFIG_PPC44x_SIMPLE=y | ||
| 183 | CONFIG_PPC4xx_GPIO=y | ||
| 181 | CONFIG_440EP=y | 184 | CONFIG_440EP=y |
| 182 | CONFIG_440EPX=y | 185 | CONFIG_440EPX=y |
| 183 | CONFIG_440GRX=y | 186 | CONFIG_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 |
| 212 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 214 | CONFIG_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 |
| 222 | CONFIG_BINFMT_ELF=y | 224 | CONFIG_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 |
| 224 | CONFIG_MATH_EMULATION=y | 228 | CONFIG_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 |
| 235 | CONFIG_FLATMEM=y | 239 | CONFIG_FLATMEM=y |
| 236 | CONFIG_FLAT_NODE_MEM_MAP=y | 240 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 237 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 238 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 239 | CONFIG_PAGEFLAGS_EXTENDED=y | 241 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 240 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 242 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 241 | CONFIG_MIGRATION=y | 243 | CONFIG_MIGRATION=y |
| 242 | CONFIG_RESOURCES_64BIT=y | 244 | CONFIG_RESOURCES_64BIT=y |
| 245 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 243 | CONFIG_ZONE_DMA_FLAG=1 | 246 | CONFIG_ZONE_DMA_FLAG=1 |
| 244 | CONFIG_BOUNCE=y | 247 | CONFIG_BOUNCE=y |
| 245 | CONFIG_VIRT_TO_BUS=y | 248 | CONFIG_VIRT_TO_BUS=y |
| 249 | CONFIG_UNEVICTABLE_LRU=y | ||
| 246 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 247 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_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 |
| 489 | CONFIG_OF_DEVICE=y | 488 | CONFIG_OF_DEVICE=y |
| 489 | CONFIG_OF_GPIO=y | ||
| 490 | CONFIG_OF_I2C=m | 490 | CONFIG_OF_I2C=m |
| 491 | # CONFIG_PARPORT is not set | 491 | # CONFIG_PARPORT is not set |
| 492 | CONFIG_BLK_DEV=y | 492 | CONFIG_BLK_DEV=y |
| @@ -600,8 +600,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
| 600 | CONFIG_IBM_NEW_EMAC_RGMII=y | 600 | CONFIG_IBM_NEW_EMAC_RGMII=y |
| 601 | CONFIG_IBM_NEW_EMAC_TAH=y | 601 | CONFIG_IBM_NEW_EMAC_TAH=y |
| 602 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 602 | CONFIG_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 | ||
| 605 | CONFIG_NETDEV_1000=y | 609 | CONFIG_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 | ||
| 625 | CONFIG_NETDEV_10000=y | 630 | CONFIG_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 | |||
| 721 | CONFIG_I2C=m | 729 | CONFIG_I2C=m |
| 722 | CONFIG_I2C_BOARDINFO=y | 730 | CONFIG_I2C_BOARDINFO=y |
| 723 | CONFIG_I2C_CHARDEV=m | 731 | CONFIG_I2C_CHARDEV=m |
| 732 | CONFIG_I2C_HELPER_AUTO=y | ||
| 733 | CONFIG_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 | # |
| 760 | CONFIG_I2C_GPIO=m | ||
| 750 | CONFIG_I2C_IBM_IIC=m | 761 | CONFIG_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 |
| 790 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 802 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 791 | # CONFIG_GPIOLIB is not set | 803 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
| 804 | CONFIG_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 | |||
| 967 | CONFIG_EXT3_FS_XATTR=y | 1013 | CONFIG_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 |
| 971 | CONFIG_JBD=m | 1017 | CONFIG_JBD=m |
| 972 | CONFIG_FS_MBCACHE=y | 1018 | CONFIG_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 |
| 1022 | CONFIG_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 |
| 978 | CONFIG_DNOTIFY=y | 1025 | CONFIG_DNOTIFY=y |
| @@ -1005,6 +1052,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1005 | CONFIG_PROC_FS=y | 1052 | CONFIG_PROC_FS=y |
| 1006 | CONFIG_PROC_KCORE=y | 1053 | CONFIG_PROC_KCORE=y |
| 1007 | CONFIG_PROC_SYSCTL=y | 1054 | CONFIG_PROC_SYSCTL=y |
| 1055 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1008 | CONFIG_SYSFS=y | 1056 | CONFIG_SYSFS=y |
| 1009 | CONFIG_TMPFS=y | 1057 | CONFIG_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 | |||
| 1058 | CONFIG_LOCKD_V4=y | 1106 | CONFIG_LOCKD_V4=y |
| 1059 | CONFIG_NFS_COMMON=y | 1107 | CONFIG_NFS_COMMON=y |
| 1060 | CONFIG_SUNRPC=y | 1108 | CONFIG_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 | # |
| 1119 | CONFIG_BITREVERSE=y | 1168 | CONFIG_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 |
| 1122 | CONFIG_CRC16=m | 1170 | CONFIG_CRC16=m |
| 1123 | CONFIG_CRC_T10DIF=m | 1171 | CONFIG_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 |
| 1229 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1230 | CONFIG_NOP_TRACER=y | ||
| 1179 | CONFIG_HAVE_FTRACE=y | 1231 | CONFIG_HAVE_FTRACE=y |
| 1180 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1232 | CONFIG_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 |
| 1185 | CONFIG_HAVE_ARCH_KGDB=y | 1240 | CONFIG_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 |
| 1203 | CONFIG_CRYPTO=y | 1259 | CONFIG_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 | ||
| 1208 | CONFIG_CRYPTO_ALGAPI=y | 1265 | CONFIG_CRYPTO_ALGAPI=y |
| 1266 | CONFIG_CRYPTO_AEAD=y | ||
| 1209 | CONFIG_CRYPTO_BLKCIPHER=y | 1267 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1268 | CONFIG_CRYPTO_HASH=y | ||
| 1269 | CONFIG_CRYPTO_RNG=y | ||
| 1210 | CONFIG_CRYPTO_MANAGER=y | 1270 | CONFIG_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 | # |
| 1280 | CONFIG_CRYPTO_DEFLATE=m | 1340 | CONFIG_CRYPTO_DEFLATE=m |
| 1281 | CONFIG_CRYPTO_LZO=m | 1341 | CONFIG_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 | 1349 | CONFIG_VIRTUALIZATION=y |
| 1350 | CONFIG_KVM=y | ||
| 1351 | CONFIG_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); |
| 93 | extern void iommu_free_coherent(struct iommu_table *tbl, size_t size, | 93 | extern 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); |
| 95 | extern dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl, | 95 | extern 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, |
| 99 | extern 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, | 100 | extern 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 | ||
| 103 | extern void iommu_init_early_pSeries(void); | 104 | extern void iommu_init_early_pSeries(void); |
| 104 | extern void iommu_init_early_iSeries(void); | 105 | extern 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 | ||
| 29 | extern unsigned long __kdump_flag; | ||
| 30 | |||
| 31 | #if defined(CONFIG_CRASH_DUMP) && !defined(CONFIG_RELOCATABLE) | 23 | #if defined(CONFIG_CRASH_DUMP) && !defined(CONFIG_RELOCATABLE) |
| 32 | extern void reserve_kdump_trampoline(void); | 24 | extern void reserve_kdump_trampoline(void); |
| 33 | extern void setup_kdump_trampoline(void); | 25 | extern 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 | ||
| 209 | extern void pcibios_claim_one_bus(struct pci_bus *b); | 209 | extern void pcibios_claim_one_bus(struct pci_bus *b); |
| 210 | 210 | ||
| 211 | extern void pcibios_allocate_bus_resources(struct pci_bus *bus); | ||
| 212 | |||
| 211 | extern void pcibios_resource_survey(void); | 213 | extern void pcibios_resource_survey(void); |
| 212 | 214 | ||
| 213 | extern struct pci_controller *init_phb_dynamic(struct device_node *dn); | 215 | extern 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 | */ |
| 38 | static dma_addr_t dma_iommu_map_single(struct device *dev, void *vaddr, | 37 | static 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 | ||
| 48 | static void dma_iommu_unmap_single(struct device *dev, dma_addr_t dma_handle, | 47 | static 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) | |||
| 94 | struct dma_mapping_ops dma_iommu_ops = { | 92 | struct 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 | }; |
| 103 | EXPORT_SYMBOL(dma_iommu_ops); | 101 | EXPORT_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 | ||
| 82 | static dma_addr_t ibmebus_map_single(struct device *dev, | 82 | static 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 | ||
| 91 | static void ibmebus_unmap_single(struct device *dev, | 92 | static 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) | |||
| 129 | static struct dma_mapping_ops ibmebus_dma_ops = { | 130 | static 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 | ||
| 139 | static int ibmebus_match_path(struct device *dev, void *data) | 140 | static 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 | ||
| 461 | static void iommu_table_clear(struct iommu_table *tbl) | 462 | static 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 | */ |
| 572 | dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl, | 572 | dma_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 | ||
| 607 | void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle, | 610 | void 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 */ |
| 256 | extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start, | 256 | extern 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 */ |
| 262 | void default_machine_kexec(struct kimage *image) | 261 | void 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 | ||
| 1242 | static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) | 1242 | void 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); | ||
| 1300 | clear_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); | ||
| 1296 | clear_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 | ||
| 1307 | static inline void __devinit alloc_resource(struct pci_dev *dev, int idx) | 1304 | static 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 | ||
| 1373 | void __init pcibios_resource_survey(void) | 1370 | void __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 | */ |
| 412 | static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame, | 412 | static 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, ¤t->blocked) | 984 | || put_sigset_t(&old_ctx->uc_sigmask, ¤t->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 | ||
| 76 | static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | 76 | static 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 | ¤t->blocked, sizeof(sigset_t))) | 313 | ¤t->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 | ||
| 519 | static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr, | 519 | static 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 | ||
| 541 | static void vio_dma_iommu_unmap_single(struct device *dev, | 541 | static 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, | |||
| 603 | struct dma_mapping_ops vio_dma_mapping_ops = { | 603 | struct 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) | |||
| 830 | static int pm_rtas_activate_spu_profiling(u32 node) | 837 | static 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 | |||
| 35 | config HCU4 | 35 | config 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 | ||
| 596 | static dma_addr_t dma_fixed_map_single(struct device *dev, void *ptr, | 596 | static 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 | ||
| 610 | static void dma_fixed_unmap_single(struct device *dev, dma_addr_t dma_addr, | 610 | static 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 | ||
| 623 | static int dma_fixed_map_sg(struct device *dev, struct scatterlist *sg, | 622 | static 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); | |||
| 652 | struct dma_mapping_ops dma_iommu_fixed_ops = { | 651 | struct 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 | ||
| 663 | static void cell_dma_dev_setup_fixed(struct device *dev); | 662 | static 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 | ||
| 58 | static __initdata struct of_device_id of_bus_ids[] = { | ||
| 59 | { .type = "soc", }, | ||
| 60 | { .compatible = "simple-bus", }, | ||
| 61 | {}, | ||
| 62 | }; | ||
| 63 | |||
| 64 | static int __init declare_of_platform_devices(void) | ||
| 65 | { | ||
| 66 | of_platform_bus_probe(NULL, of_bus_ids, NULL); | ||
| 67 | return 0; | ||
| 68 | } | ||
| 69 | machine_device_initcall(linkstation, declare_of_platform_devices); | ||
| 70 | |||
| 57 | static int __init linkstation_add_bridge(struct device_node *dev) | 71 | static 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); | |||
| 215 | dma_addr_t iseries_hv_map(void *vaddr, size_t size, | 215 | dma_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 | ||
| 222 | void iseries_hv_unmap(dma_addr_t dma_handle, size_t size, | 223 | void 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 | ||
| 228 | void __init iommu_vio_init(void) | 229 | void __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 | ||
| 564 | static dma_addr_t ps3_sb_map_single(struct device *_dev, void *ptr, size_t size, | 563 | static 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 | ||
| 583 | static dma_addr_t ps3_ioc0_map_single(struct device *_dev, void *ptr, | 584 | static 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 | ||
| 618 | static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr, | 620 | static 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) | |||
| 689 | static struct dma_mapping_ops ps3_sb_dma_ops = { | 691 | static 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 | ||
| 699 | static struct dma_mapping_ops ps3_ioc0_dma_ops = { | 701 | static 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 | ||
| 567 | static 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 | ||
| 606 | static 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 | ||
| 788 | static unsigned int mpic_type_to_vecpri(struct mpic *mpic, unsigned int type) | 839 | static 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 | ||
| 1354 | static void print_bug_trap(struct pt_regs *regs) | 1354 | static 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 | ||
| 1378 | static void excprint(struct pt_regs *fp) | 1380 | static void excprint(struct pt_regs *fp) |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index cb2c87df70ce..80119b3398e7 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -24,7 +24,7 @@ config SUPERH32 | |||
| 24 | select HAVE_KPROBES | 24 | select HAVE_KPROBES |
| 25 | select HAVE_KRETPROBES | 25 | select HAVE_KRETPROBES |
| 26 | select HAVE_ARCH_TRACEHOOK | 26 | select HAVE_ARCH_TRACEHOOK |
| 27 | select HAVE_FTRACE | 27 | select HAVE_FUNCTION_TRACER |
| 28 | 28 | ||
| 29 | config SUPERH64 | 29 | config SUPERH64 |
| 30 | def_bool y if CPU_SH5 | 30 | def_bool y if CPU_SH5 |
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 1f409bf81809..c43eb0d7fa3b 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # arch/sh/Makefile | 2 | # arch/sh/Makefile |
| 3 | # | 3 | # |
| 4 | # Copyright (C) 1999 Kaz Kojima | 4 | # Copyright (C) 1999 Kaz Kojima |
| 5 | # Copyright (C) 2002, 2003, 2004 Paul Mundt | 5 | # Copyright (C) 2002 - 2008 Paul Mundt |
| 6 | # Copyright (C) 2002 M. R. Brown | 6 | # Copyright (C) 2002 M. R. Brown |
| 7 | # | 7 | # |
| 8 | # This file is subject to the terms and conditions of the GNU General Public | 8 | # This file is subject to the terms and conditions of the GNU General Public |
| @@ -18,16 +18,12 @@ isa-$(CONFIG_CPU_SH4) := sh4 | |||
| 18 | isa-$(CONFIG_CPU_SH4A) := sh4a | 18 | isa-$(CONFIG_CPU_SH4A) := sh4a |
| 19 | isa-$(CONFIG_CPU_SH4AL_DSP) := sh4al | 19 | isa-$(CONFIG_CPU_SH4AL_DSP) := sh4al |
| 20 | isa-$(CONFIG_CPU_SH5) := shmedia | 20 | isa-$(CONFIG_CPU_SH5) := shmedia |
| 21 | isa-$(CONFIG_SH_DSP) := $(isa-y)-dsp | ||
| 22 | 21 | ||
| 23 | ifndef CONFIG_SH_DSP | 22 | ifeq ($(CONFIG_SUPERH32),y) |
| 24 | ifndef CONFIG_SH_FPU | 23 | isa-$(CONFIG_SH_DSP) := $(isa-y)-dsp |
| 25 | isa-y := $(isa-y)-nofpu | 24 | isa-y := $(isa-y)-up |
| 26 | endif | ||
| 27 | endif | 25 | endif |
| 28 | 26 | ||
| 29 | isa-y := $(isa-y)-up | ||
| 30 | |||
| 31 | cflags-$(CONFIG_CPU_SH2) := $(call cc-option,-m2,) | 27 | cflags-$(CONFIG_CPU_SH2) := $(call cc-option,-m2,) |
| 32 | cflags-$(CONFIG_CPU_SH2A) += $(call cc-option,-m2a,) \ | 28 | cflags-$(CONFIG_CPU_SH2A) += $(call cc-option,-m2a,) \ |
| 33 | $(call cc-option,-m2a-nofpu,) | 29 | $(call cc-option,-m2a-nofpu,) |
| @@ -38,6 +34,22 @@ cflags-$(CONFIG_CPU_SH4A) += $(call cc-option,-m4a,) \ | |||
| 38 | $(call cc-option,-m4a-nofpu,) | 34 | $(call cc-option,-m4a-nofpu,) |
| 39 | cflags-$(CONFIG_CPU_SH5) := $(call cc-option,-m5-32media-nofpu,) | 35 | cflags-$(CONFIG_CPU_SH5) := $(call cc-option,-m5-32media-nofpu,) |
| 40 | 36 | ||
| 37 | ifeq ($(cflags-y),) | ||
| 38 | # | ||
| 39 | # In the case where we are stuck with a compiler that has been uselessly | ||
| 40 | # restricted to a particular ISA, a favourite default of newer GCCs when | ||
| 41 | # extensive multilib targets are not provided, ensure we get the best fit | ||
| 42 | # regarding FP generation. This is necessary to avoid references to FP | ||
| 43 | # variants in libgcc where integer variants exist, which otherwise result | ||
| 44 | # in link errors. This is intentionally stupid (albeit many orders of | ||
| 45 | # magnitude less than GCC's default behaviour), as anything with a large | ||
| 46 | # number of multilib targets better have been built correctly for | ||
| 47 | # the target in mind. | ||
| 48 | # | ||
| 49 | cflags-y += $(shell $(CC) $(KBUILD_CFLAGS) -print-multi-lib | \ | ||
| 50 | grep nofpu | sed q | sed -e 's/^/-/;s/;.*$$//') | ||
| 51 | endif | ||
| 52 | |||
| 41 | cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb | 53 | cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb |
| 42 | cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml | 54 | cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml |
| 43 | 55 | ||
| @@ -65,7 +77,8 @@ OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment \ | |||
| 65 | -R .stab -R .stabstr -S | 77 | -R .stab -R .stabstr -S |
| 66 | 78 | ||
| 67 | # Give the various platforms the opportunity to set default image types | 79 | # Give the various platforms the opportunity to set default image types |
| 68 | defaultimage-$(CONFIG_SUPERH32) := zImage | 80 | defaultimage-$(CONFIG_SUPERH32) := zImage |
| 81 | defaultimage-$(CONFIG_SH_SH7785LCR) := uImage | ||
| 69 | 82 | ||
| 70 | # Set some sensible Kbuild defaults | 83 | # Set some sensible Kbuild defaults |
| 71 | KBUILD_DEFCONFIG := shx3_defconfig | 84 | KBUILD_DEFCONFIG := shx3_defconfig |
diff --git a/arch/sh/boot/compressed/Makefile_32 b/arch/sh/boot/compressed/Makefile_32 index 301e6d503256..b96a055b053e 100644 --- a/arch/sh/boot/compressed/Makefile_32 +++ b/arch/sh/boot/compressed/Makefile_32 | |||
| @@ -23,7 +23,7 @@ IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ | |||
| 23 | 23 | ||
| 24 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) | 24 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) |
| 25 | 25 | ||
| 26 | ifeq ($(CONFIG_FTRACE),y) | 26 | ifeq ($(CONFIG_FUNCTION_TRACER),y) |
| 27 | ORIG_CFLAGS := $(KBUILD_CFLAGS) | 27 | ORIG_CFLAGS := $(KBUILD_CFLAGS) |
| 28 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) | 28 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) |
| 29 | endif | 29 | endif |
diff --git a/arch/sh/cchips/Kconfig b/arch/sh/cchips/Kconfig index 7892361eedc8..f43d18373f22 100644 --- a/arch/sh/cchips/Kconfig +++ b/arch/sh/cchips/Kconfig | |||
| @@ -22,20 +22,6 @@ config HD64461 | |||
| 22 | Say Y if you want support for the HD64461. | 22 | Say Y if you want support for the HD64461. |
| 23 | Otherwise, say N. | 23 | Otherwise, say N. |
| 24 | 24 | ||
| 25 | config HD64465 | ||
| 26 | bool "Hitachi HD64465 companion chip support" | ||
| 27 | ---help--- | ||
| 28 | The Hitachi HD64465 provides an interface for | ||
| 29 | the SH7750 CPU, supporting a LCD controller, | ||
| 30 | CRT color controller, IrDA, USB, PCMCIA, | ||
| 31 | keyboard controller, and a printer interface. | ||
| 32 | |||
| 33 | More information is available at | ||
| 34 | <http://global.hitachi.com/New/cnews/E/1998/981019B.html>. | ||
| 35 | |||
| 36 | Say Y if you want support for the HD64465. | ||
| 37 | Otherwise, say N. | ||
| 38 | |||
| 39 | endchoice | 25 | endchoice |
| 40 | 26 | ||
| 41 | # These will also be split into the Kconfig's below | 27 | # These will also be split into the Kconfig's below |
| @@ -61,23 +47,4 @@ config HD64461_ENABLER | |||
| 61 | via the HD64461 companion chip. | 47 | via the HD64461 companion chip. |
| 62 | Otherwise, say N. | 48 | Otherwise, say N. |
| 63 | 49 | ||
| 64 | config HD64465_IOBASE | ||
| 65 | hex "HD64465 start address" | ||
| 66 | depends on HD64465 | ||
| 67 | default "0xb0000000" | ||
| 68 | help | ||
| 69 | The default setting of the HD64465 IO base address is 0xb0000000. | ||
| 70 | |||
| 71 | Do not change this unless you know what you are doing. | ||
| 72 | |||
| 73 | config HD64465_IRQ | ||
| 74 | int "HD64465 IRQ" | ||
| 75 | depends on HD64465 | ||
| 76 | default "5" | ||
| 77 | help | ||
| 78 | The default setting of the HD64465 IRQ is 5. | ||
| 79 | |||
| 80 | Do not change this unless you know what you are doing. | ||
| 81 | |||
| 82 | endmenu | 50 | endmenu |
| 83 | |||
diff --git a/arch/sh/cchips/hd6446x/Makefile b/arch/sh/cchips/hd6446x/Makefile index f7de4076e242..9682e3ab668f 100644 --- a/arch/sh/cchips/hd6446x/Makefile +++ b/arch/sh/cchips/hd6446x/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | obj-$(CONFIG_HD64461) += hd64461.o | 1 | obj-$(CONFIG_HD64461) += hd64461.o |
| 2 | obj-$(CONFIG_HD64465) += hd64465/ | ||
| 3 | 2 | ||
| 4 | EXTRA_CFLAGS += -Werror | 3 | EXTRA_CFLAGS += -Werror |
diff --git a/arch/sh/cchips/hd6446x/hd64465/Makefile b/arch/sh/cchips/hd6446x/hd64465/Makefile deleted file mode 100644 index f66edcb52c5b..000000000000 --- a/arch/sh/cchips/hd6446x/hd64465/Makefile +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Makefile for the HD64465 | ||
| 3 | # | ||
| 4 | |||
| 5 | obj-y := setup.o io.o gpio.o | ||
| 6 | |||
diff --git a/arch/sh/cchips/hd6446x/hd64465/gpio.c b/arch/sh/cchips/hd6446x/hd64465/gpio.c deleted file mode 100644 index 43431855ec86..000000000000 --- a/arch/sh/cchips/hd6446x/hd64465/gpio.c +++ /dev/null | |||
| @@ -1,196 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * $Id: gpio.c,v 1.4 2003/05/19 22:24:18 lethal Exp $ | ||
| 3 | * by Greg Banks <gbanks@pocketpenguins.com> | ||
| 4 | * (c) 2000 PocketPenguins Inc | ||
| 5 | * | ||
| 6 | * GPIO pin support for HD64465 companion chip. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #include <linux/kernel.h> | ||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/module.h> | ||
| 12 | #include <linux/sched.h> | ||
| 13 | #include <linux/ioport.h> | ||
| 14 | #include <asm/io.h> | ||
| 15 | #include <asm/hd64465/gpio.h> | ||
| 16 | |||
| 17 | #define _PORTOF(portpin) (((portpin)>>3)&0x7) | ||
| 18 | #define _PINOF(portpin) ((portpin)&0x7) | ||
| 19 | |||
| 20 | /* Register addresses parametrised on port */ | ||
| 21 | #define GPIO_CR(port) (HD64465_REG_GPACR+((port)<<1)) | ||
| 22 | #define GPIO_DR(port) (HD64465_REG_GPADR+((port)<<1)) | ||
| 23 | #define GPIO_ICR(port) (HD64465_REG_GPAICR+((port)<<1)) | ||
| 24 | #define GPIO_ISR(port) (HD64465_REG_GPAISR+((port)<<1)) | ||
| 25 | |||
| 26 | #define GPIO_NPORTS 5 | ||
| 27 | |||
| 28 | #define MODNAME "hd64465_gpio" | ||
| 29 | |||
| 30 | EXPORT_SYMBOL(hd64465_gpio_configure); | ||
| 31 | EXPORT_SYMBOL(hd64465_gpio_get_pin); | ||
| 32 | EXPORT_SYMBOL(hd64465_gpio_get_port); | ||
| 33 | EXPORT_SYMBOL(hd64465_gpio_register_irq); | ||
| 34 | EXPORT_SYMBOL(hd64465_gpio_set_pin); | ||
| 35 | EXPORT_SYMBOL(hd64465_gpio_set_port); | ||
| 36 | EXPORT_SYMBOL(hd64465_gpio_unregister_irq); | ||
| 37 | |||
| 38 | /* TODO: each port should be protected with a spinlock */ | ||
| 39 | |||
| 40 | |||
| 41 | void hd64465_gpio_configure(int portpin, int direction) | ||
| 42 | { | ||
| 43 | unsigned short cr; | ||
| 44 | unsigned int shift = (_PINOF(portpin)<<1); | ||
| 45 | |||
| 46 | cr = inw(GPIO_CR(_PORTOF(portpin))); | ||
| 47 | cr &= ~(3<<shift); | ||
| 48 | cr |= direction<<shift; | ||
| 49 | outw(cr, GPIO_CR(_PORTOF(portpin))); | ||
| 50 | } | ||
| 51 | |||
| 52 | void hd64465_gpio_set_pin(int portpin, unsigned int value) | ||
| 53 | { | ||
| 54 | unsigned short d; | ||
| 55 | unsigned short mask = 1<<(_PINOF(portpin)); | ||
| 56 | |||
| 57 | d = inw(GPIO_DR(_PORTOF(portpin))); | ||
| 58 | if (value) | ||
| 59 | d |= mask; | ||
| 60 | else | ||
| 61 | d &= ~mask; | ||
| 62 | outw(d, GPIO_DR(_PORTOF(portpin))); | ||
| 63 | } | ||
| 64 | |||
| 65 | unsigned int hd64465_gpio_get_pin(int portpin) | ||
| 66 | { | ||
| 67 | return inw(GPIO_DR(_PORTOF(portpin))) & (1<<(_PINOF(portpin))); | ||
| 68 | } | ||
| 69 | |||
| 70 | /* TODO: for cleaner atomicity semantics, add a mask to this routine */ | ||
| 71 | |||
| 72 | void hd64465_gpio_set_port(int port, unsigned int value) | ||
| 73 | { | ||
| 74 | outw(value, GPIO_DR(port)); | ||
| 75 | } | ||
| 76 | |||
| 77 | unsigned int hd64465_gpio_get_port(int port) | ||
| 78 | { | ||
| 79 | return inw(GPIO_DR(port)); | ||
| 80 | } | ||
| 81 | |||
| 82 | |||
| 83 | static struct { | ||
| 84 | void (*func)(int portpin, void *dev); | ||
| 85 | void *dev; | ||
| 86 | } handlers[GPIO_NPORTS * 8]; | ||
| 87 | |||
| 88 | static irqreturn_t hd64465_gpio_interrupt(int irq, void *dev) | ||
| 89 | { | ||
| 90 | unsigned short port, pin, isr, mask, portpin; | ||
| 91 | |||
| 92 | for (port=0 ; port<GPIO_NPORTS ; port++) { | ||
| 93 | isr = inw(GPIO_ISR(port)); | ||
| 94 | |||
| 95 | for (pin=0 ; pin<8 ; pin++) { | ||
| 96 | mask = 1<<pin; | ||
| 97 | if (isr & mask) { | ||
| 98 | portpin = (port<<3)|pin; | ||
| 99 | if (handlers[portpin].func != 0) | ||
| 100 | handlers[portpin].func(portpin, handlers[portpin].dev); | ||
| 101 | else | ||
| 102 | printk(KERN_NOTICE "unexpected GPIO interrupt, pin %c%d\n", | ||
| 103 | port+'A', (int)pin); | ||
| 104 | } | ||
| 105 | } | ||
| 106 | |||
| 107 | /* Write 1s back to ISR to clear it? That's what the manual says.. */ | ||
| 108 | outw(isr, GPIO_ISR(port)); | ||
| 109 | } | ||
| 110 | |||
| 111 | return IRQ_HANDLED; | ||
| 112 | } | ||
| 113 | |||
| 114 | void hd64465_gpio_register_irq(int portpin, int mode, | ||
| 115 | void (*handler)(int portpin, void *dev), void *dev) | ||
| 116 | { | ||
| 117 | unsigned long flags; | ||
| 118 | unsigned short icr, mask; | ||
| 119 | |||
| 120 | if (handler == 0) | ||
| 121 | return; | ||
| 122 | |||
| 123 | local_irq_save(flags); | ||
| 124 | |||
| 125 | handlers[portpin].func = handler; | ||
| 126 | handlers[portpin].dev = dev; | ||
| 127 | |||
| 128 | /* | ||
| 129 | * Configure Interrupt Control Register | ||
| 130 | */ | ||
| 131 | icr = inw(GPIO_ICR(_PORTOF(portpin))); | ||
| 132 | mask = (1<<_PINOF(portpin)); | ||
| 133 | |||
| 134 | /* unmask interrupt */ | ||
| 135 | icr &= ~mask; | ||
| 136 | |||
| 137 | /* set TS bit */ | ||
| 138 | mask <<= 8; | ||
| 139 | icr &= ~mask; | ||
| 140 | if (mode == HD64465_GPIO_RISING) | ||
| 141 | icr |= mask; | ||
| 142 | |||
| 143 | outw(icr, GPIO_ICR(_PORTOF(portpin))); | ||
| 144 | |||
| 145 | local_irq_restore(flags); | ||
| 146 | } | ||
| 147 | |||
| 148 | void hd64465_gpio_unregister_irq(int portpin) | ||
| 149 | { | ||
| 150 | unsigned long flags; | ||
| 151 | unsigned short icr; | ||
| 152 | |||
| 153 | local_irq_save(flags); | ||
| 154 | |||
| 155 | /* | ||
| 156 | * Configure Interrupt Control Register | ||
| 157 | */ | ||
| 158 | icr = inw(GPIO_ICR(_PORTOF(portpin))); | ||
| 159 | icr |= (1<<_PINOF(portpin)); /* mask interrupt */ | ||
| 160 | outw(icr, GPIO_ICR(_PORTOF(portpin))); | ||
| 161 | |||
| 162 | handlers[portpin].func = 0; | ||
| 163 | handlers[portpin].dev = 0; | ||
| 164 | |||
| 165 | local_irq_restore(flags); | ||
| 166 | } | ||
| 167 | |||
| 168 | static int __init hd64465_gpio_init(void) | ||
| 169 | { | ||
| 170 | if (!request_region(HD64465_REG_GPACR, 0x1000, MODNAME)) | ||
| 171 | return -EBUSY; | ||
| 172 | if (request_irq(HD64465_IRQ_GPIO, hd64465_gpio_interrupt, | ||
| 173 | IRQF_DISABLED, MODNAME, 0)) | ||
| 174 | goto out_irqfailed; | ||
| 175 | |||
| 176 | printk("HD64465 GPIO layer on irq %d\n", HD64465_IRQ_GPIO); | ||
| 177 | |||
| 178 | return 0; | ||
| 179 | |||
| 180 | out_irqfailed: | ||
| 181 | release_region(HD64465_REG_GPACR, 0x1000); | ||
| 182 | |||
| 183 | return -EINVAL; | ||
| 184 | } | ||
| 185 | |||
| 186 | static void __exit hd64465_gpio_exit(void) | ||
| 187 | { | ||
| 188 | release_region(HD64465_REG_GPACR, 0x1000); | ||
| 189 | free_irq(HD64465_IRQ_GPIO, 0); | ||
| 190 | } | ||
| 191 | |||
| 192 | module_init(hd64465_gpio_init); | ||
| 193 | module_exit(hd64465_gpio_exit); | ||
| 194 | |||
| 195 | MODULE_LICENSE("GPL"); | ||
| 196 | |||
diff --git a/arch/sh/cchips/hd6446x/hd64465/io.c b/arch/sh/cchips/hd6446x/hd64465/io.c deleted file mode 100644 index 58704d066ae2..000000000000 --- a/arch/sh/cchips/hd6446x/hd64465/io.c +++ /dev/null | |||
| @@ -1,211 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * $Id: io.c,v 1.4 2003/08/03 03:05:10 lethal Exp $ | ||
| 3 | * by Greg Banks <gbanks@pocketpenguins.com> | ||
| 4 | * (c) 2000 PocketPenguins Inc | ||
| 5 | * | ||
| 6 | * Derived from io_hd64461.c, which bore the message: | ||
| 7 | * Copyright (C) 2000 YAEGASHI Takeshi | ||
| 8 | * | ||
| 9 | * Typical I/O routines for HD64465 system. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/kernel.h> | ||
| 13 | #include <linux/module.h> | ||
| 14 | #include <asm/io.h> | ||
| 15 | #include <asm/hd64465/hd64465.h> | ||
| 16 | |||
| 17 | |||
| 18 | #define HD64465_DEBUG 0 | ||
| 19 | |||
| 20 | #if HD64465_DEBUG | ||
| 21 | #define DPRINTK(args...) printk(args) | ||
| 22 | #define DIPRINTK(n, args...) if (hd64465_io_debug>(n)) printk(args) | ||
| 23 | #else | ||
| 24 | #define DPRINTK(args...) | ||
| 25 | #define DIPRINTK(n, args...) | ||
| 26 | #endif | ||
| 27 | |||
| 28 | |||
| 29 | |||
| 30 | /* This is a hack suitable only for debugging IO port problems */ | ||
| 31 | int hd64465_io_debug; | ||
| 32 | EXPORT_SYMBOL(hd64465_io_debug); | ||
| 33 | |||
| 34 | /* Low iomap maps port 0-1K to addresses in 8byte chunks */ | ||
| 35 | #define HD64465_IOMAP_LO_THRESH 0x400 | ||
| 36 | #define HD64465_IOMAP_LO_SHIFT 3 | ||
| 37 | #define HD64465_IOMAP_LO_MASK ((1<<HD64465_IOMAP_LO_SHIFT)-1) | ||
| 38 | #define HD64465_IOMAP_LO_NMAP (HD64465_IOMAP_LO_THRESH>>HD64465_IOMAP_LO_SHIFT) | ||
| 39 | static unsigned long hd64465_iomap_lo[HD64465_IOMAP_LO_NMAP]; | ||
| 40 | static unsigned char hd64465_iomap_lo_shift[HD64465_IOMAP_LO_NMAP]; | ||
| 41 | |||
| 42 | /* High iomap maps port 1K-64K to addresses in 1K chunks */ | ||
| 43 | #define HD64465_IOMAP_HI_THRESH 0x10000 | ||
| 44 | #define HD64465_IOMAP_HI_SHIFT 10 | ||
| 45 | #define HD64465_IOMAP_HI_MASK ((1<<HD64465_IOMAP_HI_SHIFT)-1) | ||
| 46 | #define HD64465_IOMAP_HI_NMAP (HD64465_IOMAP_HI_THRESH>>HD64465_IOMAP_HI_SHIFT) | ||
| 47 | static unsigned long hd64465_iomap_hi[HD64465_IOMAP_HI_NMAP]; | ||
| 48 | static unsigned char hd64465_iomap_hi_shift[HD64465_IOMAP_HI_NMAP]; | ||
| 49 | |||
| 50 | #define PORT2ADDR(x) (sh_mv.mv_isa_port2addr(x)) | ||
| 51 | |||
| 52 | void hd64465_port_map(unsigned short baseport, unsigned int nports, | ||
| 53 | unsigned long addr, unsigned char shift) | ||
| 54 | { | ||
| 55 | unsigned int port, endport = baseport + nports; | ||
| 56 | |||
| 57 | DPRINTK("hd64465_port_map(base=0x%04hx, n=0x%04hx, addr=0x%08lx,endport=0x%04x)\n", | ||
| 58 | baseport, nports, addr,endport); | ||
| 59 | |||
| 60 | for (port = baseport ; | ||
| 61 | port < endport && port < HD64465_IOMAP_LO_THRESH ; | ||
| 62 | port += (1<<HD64465_IOMAP_LO_SHIFT)) { | ||
| 63 | DPRINTK(" maplo[0x%x] = 0x%08lx\n", port, addr); | ||
| 64 | hd64465_iomap_lo[port>>HD64465_IOMAP_LO_SHIFT] = addr; | ||
| 65 | hd64465_iomap_lo_shift[port>>HD64465_IOMAP_LO_SHIFT] = shift; | ||
| 66 | addr += (1<<(HD64465_IOMAP_LO_SHIFT)); | ||
| 67 | } | ||
| 68 | |||
| 69 | for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH); | ||
| 70 | port < endport && port < HD64465_IOMAP_HI_THRESH ; | ||
| 71 | port += (1<<HD64465_IOMAP_HI_SHIFT)) { | ||
| 72 | DPRINTK(" maphi[0x%x] = 0x%08lx\n", port, addr); | ||
| 73 | hd64465_iomap_hi[port>>HD64465_IOMAP_HI_SHIFT] = addr; | ||
| 74 | hd64465_iomap_hi_shift[port>>HD64465_IOMAP_HI_SHIFT] = shift; | ||
| 75 | addr += (1<<(HD64465_IOMAP_HI_SHIFT)); | ||
| 76 | } | ||
| 77 | } | ||
| 78 | EXPORT_SYMBOL(hd64465_port_map); | ||
| 79 | |||
| 80 | void hd64465_port_unmap(unsigned short baseport, unsigned int nports) | ||
| 81 | { | ||
| 82 | unsigned int port, endport = baseport + nports; | ||
| 83 | |||
| 84 | DPRINTK("hd64465_port_unmap(base=0x%04hx, n=0x%04hx)\n", | ||
| 85 | baseport, nports); | ||
| 86 | |||
| 87 | for (port = baseport ; | ||
| 88 | port < endport && port < HD64465_IOMAP_LO_THRESH ; | ||
| 89 | port += (1<<HD64465_IOMAP_LO_SHIFT)) { | ||
| 90 | hd64465_iomap_lo[port>>HD64465_IOMAP_LO_SHIFT] = 0; | ||
| 91 | } | ||
| 92 | |||
| 93 | for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH); | ||
| 94 | port < endport && port < HD64465_IOMAP_HI_THRESH ; | ||
| 95 | port += (1<<HD64465_IOMAP_HI_SHIFT)) { | ||
| 96 | hd64465_iomap_hi[port>>HD64465_IOMAP_HI_SHIFT] = 0; | ||
| 97 | } | ||
| 98 | } | ||
| 99 | EXPORT_SYMBOL(hd64465_port_unmap); | ||
| 100 | |||
| 101 | unsigned long hd64465_isa_port2addr(unsigned long port) | ||
| 102 | { | ||
| 103 | unsigned long addr = 0; | ||
| 104 | unsigned char shift; | ||
| 105 | |||
| 106 | /* handle remapping of low IO ports */ | ||
| 107 | if (port < HD64465_IOMAP_LO_THRESH) { | ||
| 108 | addr = hd64465_iomap_lo[port >> HD64465_IOMAP_LO_SHIFT]; | ||
| 109 | shift = hd64465_iomap_lo_shift[port >> HD64465_IOMAP_LO_SHIFT]; | ||
| 110 | if (addr != 0) | ||
| 111 | addr += (port & HD64465_IOMAP_LO_MASK) << shift; | ||
| 112 | else | ||
| 113 | printk(KERN_NOTICE "io_hd64465: access to un-mapped port %lx\n", port); | ||
| 114 | } else if (port < HD64465_IOMAP_HI_THRESH) { | ||
| 115 | addr = hd64465_iomap_hi[port >> HD64465_IOMAP_HI_SHIFT]; | ||
| 116 | shift = hd64465_iomap_hi_shift[port >> HD64465_IOMAP_HI_SHIFT]; | ||
| 117 | if (addr != 0) | ||
| 118 | addr += (port & HD64465_IOMAP_HI_MASK) << shift; | ||
| 119 | else | ||
| 120 | printk(KERN_NOTICE "io_hd64465: access to un-mapped port %lx\n", port); | ||
| 121 | } | ||
| 122 | |||
| 123 | /* HD64465 internal devices (0xb0000000) */ | ||
| 124 | else if (port < 0x20000) | ||
| 125 | addr = CONFIG_HD64465_IOBASE + port - 0x10000; | ||
| 126 | |||
| 127 | /* Whole physical address space (0xa0000000) */ | ||
| 128 | else | ||
| 129 | addr = P2SEGADDR(port); | ||
| 130 | |||
| 131 | DIPRINTK(2, "PORT2ADDR(0x%08lx) = 0x%08lx\n", port, addr); | ||
| 132 | |||
| 133 | return addr; | ||
| 134 | } | ||
| 135 | |||
| 136 | static inline void delay(void) | ||
| 137 | { | ||
| 138 | ctrl_inw(0xa0000000); | ||
| 139 | } | ||
| 140 | |||
| 141 | unsigned char hd64465_inb(unsigned long port) | ||
| 142 | { | ||
| 143 | unsigned long addr = PORT2ADDR(port); | ||
| 144 | unsigned long b = (addr == 0 ? 0 : *(volatile unsigned char*)addr); | ||
| 145 | |||
| 146 | DIPRINTK(0, "inb(%08lx) = %02x\n", addr, (unsigned)b); | ||
| 147 | return b; | ||
| 148 | } | ||
| 149 | |||
| 150 | unsigned char hd64465_inb_p(unsigned long port) | ||
| 151 | { | ||
| 152 | unsigned long v; | ||
| 153 | unsigned long addr = PORT2ADDR(port); | ||
| 154 | |||
| 155 | v = (addr == 0 ? 0 : *(volatile unsigned char*)addr); | ||
| 156 | delay(); | ||
| 157 | DIPRINTK(0, "inb_p(%08lx) = %02x\n", addr, (unsigned)v); | ||
| 158 | return v; | ||
| 159 | } | ||
| 160 | |||
| 161 | unsigned short hd64465_inw(unsigned long port) | ||
| 162 | { | ||
| 163 | unsigned long addr = PORT2ADDR(port); | ||
| 164 | unsigned long b = (addr == 0 ? 0 : *(volatile unsigned short*)addr); | ||
| 165 | DIPRINTK(0, "inw(%08lx) = %04lx\n", addr, b); | ||
| 166 | return b; | ||
| 167 | } | ||
| 168 | |||
| 169 | unsigned int hd64465_inl(unsigned long port) | ||
| 170 | { | ||
| 171 | unsigned long addr = PORT2ADDR(port); | ||
| 172 | unsigned int b = (addr == 0 ? 0 : *(volatile unsigned long*)addr); | ||
| 173 | DIPRINTK(0, "inl(%08lx) = %08x\n", addr, b); | ||
| 174 | return b; | ||
| 175 | } | ||
| 176 | |||
| 177 | void hd64465_outb(unsigned char b, unsigned long port) | ||
| 178 | { | ||
| 179 | unsigned long addr = PORT2ADDR(port); | ||
| 180 | |||
| 181 | DIPRINTK(0, "outb(%02x, %08lx)\n", (unsigned)b, addr); | ||
| 182 | if (addr != 0) | ||
| 183 | *(volatile unsigned char*)addr = b; | ||
| 184 | } | ||
| 185 | |||
| 186 | void hd64465_outb_p(unsigned char b, unsigned long port) | ||
| 187 | { | ||
| 188 | unsigned long addr = PORT2ADDR(port); | ||
| 189 | |||
| 190 | DIPRINTK(0, "outb_p(%02x, %08lx)\n", (unsigned)b, addr); | ||
| 191 | if (addr != 0) | ||
| 192 | *(volatile unsigned char*)addr = b; | ||
| 193 | delay(); | ||
| 194 | } | ||
| 195 | |||
| 196 | void hd64465_outw(unsigned short b, unsigned long port) | ||
| 197 | { | ||
| 198 | unsigned long addr = PORT2ADDR(port); | ||
| 199 | DIPRINTK(0, "outw(%04x, %08lx)\n", (unsigned)b, addr); | ||
| 200 | if (addr != 0) | ||
| 201 | *(volatile unsigned short*)addr = b; | ||
| 202 | } | ||
| 203 | |||
| 204 | void hd64465_outl(unsigned int b, unsigned long port) | ||
| 205 | { | ||
| 206 | unsigned long addr = PORT2ADDR(port); | ||
| 207 | DIPRINTK(0, "outl(%08x, %08lx)\n", b, addr); | ||
| 208 | if (addr != 0) | ||
| 209 | *(volatile unsigned long*)addr = b; | ||
| 210 | } | ||
| 211 | |||
diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c deleted file mode 100644 index 9b8820c36701..000000000000 --- a/arch/sh/cchips/hd6446x/hd64465/setup.c +++ /dev/null | |||
| @@ -1,181 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * $Id: setup.c,v 1.4 2003/08/03 03:05:10 lethal Exp $ | ||
| 3 | * | ||
| 4 | * Setup and IRQ handling code for the HD64465 companion chip. | ||
| 5 | * by Greg Banks <gbanks@pocketpenguins.com> | ||
| 6 | * Copyright (c) 2000 PocketPenguins Inc | ||
| 7 | * | ||
| 8 | * Derived from setup_hd64461.c which bore the message: | ||
| 9 | * Copyright (C) 2000 YAEGASHI Takeshi | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/sched.h> | ||
| 13 | #include <linux/module.h> | ||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/param.h> | ||
| 16 | #include <linux/ioport.h> | ||
| 17 | #include <linux/interrupt.h> | ||
| 18 | #include <linux/init.h> | ||
| 19 | #include <linux/irq.h> | ||
| 20 | #include <asm/io.h> | ||
| 21 | #include <asm/irq.h> | ||
| 22 | #include <asm/hd64465/hd64465.h> | ||
| 23 | |||
| 24 | static void disable_hd64465_irq(unsigned int irq) | ||
| 25 | { | ||
| 26 | unsigned short nimr; | ||
| 27 | unsigned short mask = 1 << (irq - HD64465_IRQ_BASE); | ||
| 28 | |||
| 29 | pr_debug("disable_hd64465_irq(%d): mask=%x\n", irq, mask); | ||
| 30 | nimr = inw(HD64465_REG_NIMR); | ||
| 31 | nimr |= mask; | ||
| 32 | outw(nimr, HD64465_REG_NIMR); | ||
| 33 | } | ||
| 34 | |||
| 35 | static void enable_hd64465_irq(unsigned int irq) | ||
| 36 | { | ||
| 37 | unsigned short nimr; | ||
| 38 | unsigned short mask = 1 << (irq - HD64465_IRQ_BASE); | ||
| 39 | |||
| 40 | pr_debug("enable_hd64465_irq(%d): mask=%x\n", irq, mask); | ||
| 41 | nimr = inw(HD64465_REG_NIMR); | ||
| 42 | nimr &= ~mask; | ||
| 43 | outw(nimr, HD64465_REG_NIMR); | ||
| 44 | } | ||
| 45 | |||
| 46 | static void mask_and_ack_hd64465(unsigned int irq) | ||
| 47 | { | ||
| 48 | disable_hd64465_irq(irq); | ||
| 49 | } | ||
| 50 | |||
| 51 | static void end_hd64465_irq(unsigned int irq) | ||
| 52 | { | ||
| 53 | if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) | ||
| 54 | enable_hd64465_irq(irq); | ||
| 55 | } | ||
| 56 | |||
| 57 | static unsigned int startup_hd64465_irq(unsigned int irq) | ||
| 58 | { | ||
| 59 | enable_hd64465_irq(irq); | ||
| 60 | return 0; | ||
| 61 | } | ||
| 62 | |||
| 63 | static void shutdown_hd64465_irq(unsigned int irq) | ||
| 64 | { | ||
| 65 | disable_hd64465_irq(irq); | ||
| 66 | } | ||
| 67 | |||
| 68 | static struct hw_interrupt_type hd64465_irq_type = { | ||
| 69 | .typename = "HD64465-IRQ", | ||
| 70 | .startup = startup_hd64465_irq, | ||
| 71 | .shutdown = shutdown_hd64465_irq, | ||
| 72 | .enable = enable_hd64465_irq, | ||
| 73 | .disable = disable_hd64465_irq, | ||
| 74 | .ack = mask_and_ack_hd64465, | ||
| 75 | .end = end_hd64465_irq, | ||
| 76 | }; | ||
| 77 | |||
| 78 | static irqreturn_t hd64465_interrupt(int irq, void *dev_id) | ||
| 79 | { | ||
| 80 | printk(KERN_INFO | ||
| 81 | "HD64465: spurious interrupt, nirr: 0x%x nimr: 0x%x\n", | ||
| 82 | inw(HD64465_REG_NIRR), inw(HD64465_REG_NIMR)); | ||
| 83 | |||
| 84 | return IRQ_NONE; | ||
| 85 | } | ||
| 86 | |||
| 87 | /* | ||
| 88 | * Support for a secondary IRQ demux step. This is necessary | ||
| 89 | * because the HD64465 presents a very thin interface to the | ||
| 90 | * PCMCIA bus; a lot of features (such as remapping interrupts) | ||
| 91 | * normally done in hardware by other PCMCIA host bridges is | ||
| 92 | * instead done in software. | ||
| 93 | */ | ||
| 94 | static struct { | ||
| 95 | int (*func)(int, void *); | ||
| 96 | void *dev; | ||
| 97 | } hd64465_demux[HD64465_IRQ_NUM]; | ||
| 98 | |||
| 99 | void hd64465_register_irq_demux(int irq, | ||
| 100 | int (*demux)(int irq, void *dev), void *dev) | ||
| 101 | { | ||
| 102 | hd64465_demux[irq - HD64465_IRQ_BASE].func = demux; | ||
| 103 | hd64465_demux[irq - HD64465_IRQ_BASE].dev = dev; | ||
| 104 | } | ||
| 105 | EXPORT_SYMBOL(hd64465_register_irq_demux); | ||
| 106 | |||
| 107 | void hd64465_unregister_irq_demux(int irq) | ||
| 108 | { | ||
| 109 | hd64465_demux[irq - HD64465_IRQ_BASE].func = 0; | ||
| 110 | } | ||
| 111 | EXPORT_SYMBOL(hd64465_unregister_irq_demux); | ||
| 112 | |||
| 113 | int hd64465_irq_demux(int irq) | ||
| 114 | { | ||
| 115 | if (irq == CONFIG_HD64465_IRQ) { | ||
| 116 | unsigned short i, bit; | ||
| 117 | unsigned short nirr = inw(HD64465_REG_NIRR); | ||
| 118 | unsigned short nimr = inw(HD64465_REG_NIMR); | ||
| 119 | |||
| 120 | pr_debug("hd64465_irq_demux, nirr=%04x, nimr=%04x\n", nirr, nimr); | ||
| 121 | nirr &= ~nimr; | ||
| 122 | for (bit = 1, i = 0 ; i < HD64465_IRQ_NUM ; bit <<= 1, i++) | ||
| 123 | if (nirr & bit) | ||
| 124 | break; | ||
| 125 | |||
| 126 | if (i < HD64465_IRQ_NUM) { | ||
| 127 | irq = HD64465_IRQ_BASE + i; | ||
| 128 | if (hd64465_demux[i].func != 0) | ||
| 129 | irq = hd64465_demux[i].func(irq, hd64465_demux[i].dev); | ||
| 130 | } | ||
| 131 | } | ||
| 132 | return irq; | ||
| 133 | } | ||
| 134 | |||
| 135 | static struct irqaction irq0 = { | ||
| 136 | .handler = hd64465_interrupt, | ||
| 137 | .flags = IRQF_DISABLED, | ||
| 138 | .mask = CPU_MASK_NONE, | ||
| 139 | .name = "HD64465", | ||
| 140 | }; | ||
| 141 | |||
| 142 | static int __init setup_hd64465(void) | ||
| 143 | { | ||
| 144 | int i; | ||
| 145 | unsigned short rev; | ||
| 146 | unsigned short smscr; | ||
| 147 | |||
| 148 | if (!MACH_HD64465) | ||
| 149 | return 0; | ||
| 150 | |||
| 151 | printk(KERN_INFO "HD64465 configured at 0x%x on irq %d(mapped into %d to %d)\n", | ||
| 152 | CONFIG_HD64465_IOBASE, | ||
| 153 | CONFIG_HD64465_IRQ, | ||
| 154 | HD64465_IRQ_BASE, | ||
| 155 | HD64465_IRQ_BASE+HD64465_IRQ_NUM-1); | ||
| 156 | |||
| 157 | if (inw(HD64465_REG_SDID) != HD64465_SDID) { | ||
| 158 | printk(KERN_ERR "HD64465 device ID not found, check base address\n"); | ||
| 159 | } | ||
| 160 | |||
| 161 | rev = inw(HD64465_REG_SRR); | ||
| 162 | printk(KERN_INFO "HD64465 hardware revision %d.%d\n", (rev >> 8) & 0xff, rev & 0xff); | ||
| 163 | |||
| 164 | outw(0xffff, HD64465_REG_NIMR); /* mask all interrupts */ | ||
| 165 | |||
| 166 | for (i = 0; i < HD64465_IRQ_NUM ; i++) { | ||
| 167 | irq_desc[HD64465_IRQ_BASE + i].chip = &hd64465_irq_type; | ||
| 168 | } | ||
| 169 | |||
| 170 | setup_irq(CONFIG_HD64465_IRQ, &irq0); | ||
| 171 | |||
| 172 | /* wake up the UART from STANDBY at this point */ | ||
| 173 | smscr = inw(HD64465_REG_SMSCR); | ||
| 174 | outw(smscr & (~HD64465_SMSCR_UARTST), HD64465_REG_SMSCR); | ||
| 175 | |||
| 176 | /* remap IO ports for first ISA serial port to HD64465 UART */ | ||
| 177 | hd64465_port_map(0x3f8, 8, CONFIG_HD64465_IOBASE + 0x8000, 1); | ||
| 178 | |||
| 179 | return 0; | ||
| 180 | } | ||
| 181 | module_init(setup_hd64465); | ||
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index 624c47aa66d3..30cac42f25e7 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_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 | 3 | # Linux kernel version: 2.6.28-rc2 |
| 4 | # Tue Oct 21 12:57:28 2008 | 4 | # Fri Oct 31 15:58:06 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
| 7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
| @@ -73,7 +73,6 @@ CONFIG_EVENTFD=y | |||
| 73 | CONFIG_SHMEM=y | 73 | CONFIG_SHMEM=y |
| 74 | CONFIG_AIO=y | 74 | CONFIG_AIO=y |
| 75 | CONFIG_VM_EVENT_COUNTERS=y | 75 | CONFIG_VM_EVENT_COUNTERS=y |
| 76 | CONFIG_PCI_QUIRKS=y | ||
| 77 | CONFIG_SLAB=y | 76 | CONFIG_SLAB=y |
| 78 | # CONFIG_SLUB is not set | 77 | # CONFIG_SLUB is not set |
| 79 | # CONFIG_SLOB is not set | 78 | # CONFIG_SLOB is not set |
| @@ -285,7 +284,7 @@ CONFIG_GUSA=y | |||
| 285 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | 284 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 |
| 286 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 285 | CONFIG_BOOT_LINK_OFFSET=0x00800000 |
| 287 | CONFIG_CMDLINE_BOOL=y | 286 | CONFIG_CMDLINE_BOOL=y |
| 288 | CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on" | 287 | CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp" |
| 289 | 288 | ||
| 290 | # | 289 | # |
| 291 | # Bus options | 290 | # Bus options |
| @@ -718,6 +717,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 718 | # CONFIG_MFD_SM501 is not set | 717 | # CONFIG_MFD_SM501 is not set |
| 719 | # CONFIG_HTC_PASIC3 is not set | 718 | # CONFIG_HTC_PASIC3 is not set |
| 720 | # CONFIG_MFD_TMIO is not set | 719 | # CONFIG_MFD_TMIO is not set |
| 720 | # CONFIG_PMIC_DA903X is not set | ||
| 721 | # CONFIG_MFD_WM8400 is not set | 721 | # CONFIG_MFD_WM8400 is not set |
| 722 | # CONFIG_MFD_WM8350_I2C is not set | 722 | # CONFIG_MFD_WM8350_I2C is not set |
| 723 | 723 | ||
| @@ -969,7 +969,23 @@ CONFIG_TMPFS=y | |||
| 969 | # CONFIG_ROMFS_FS is not set | 969 | # CONFIG_ROMFS_FS is not set |
| 970 | # CONFIG_SYSV_FS is not set | 970 | # CONFIG_SYSV_FS is not set |
| 971 | # CONFIG_UFS_FS is not set | 971 | # CONFIG_UFS_FS is not set |
| 972 | # CONFIG_NETWORK_FILESYSTEMS is not set | 972 | CONFIG_NETWORK_FILESYSTEMS=y |
| 973 | CONFIG_NFS_FS=y | ||
| 974 | # CONFIG_NFS_V3 is not set | ||
| 975 | # CONFIG_NFS_V4 is not set | ||
| 976 | CONFIG_ROOT_NFS=y | ||
| 977 | # CONFIG_NFSD is not set | ||
| 978 | CONFIG_LOCKD=y | ||
| 979 | CONFIG_NFS_COMMON=y | ||
| 980 | CONFIG_SUNRPC=y | ||
| 981 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 982 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 983 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 984 | # CONFIG_SMB_FS is not set | ||
| 985 | # CONFIG_CIFS is not set | ||
| 986 | # CONFIG_NCP_FS is not set | ||
| 987 | # CONFIG_CODA_FS is not set | ||
| 988 | # CONFIG_AFS_FS is not set | ||
| 973 | 989 | ||
| 974 | # | 990 | # |
| 975 | # Partition Types | 991 | # Partition Types |
| @@ -1019,7 +1035,12 @@ CONFIG_CRYPTO=y | |||
| 1019 | # Crypto core or helper | 1035 | # Crypto core or helper |
| 1020 | # | 1036 | # |
| 1021 | # CONFIG_CRYPTO_FIPS is not set | 1037 | # CONFIG_CRYPTO_FIPS is not set |
| 1022 | # CONFIG_CRYPTO_MANAGER is not set | 1038 | CONFIG_CRYPTO_ALGAPI=y |
| 1039 | CONFIG_CRYPTO_AEAD=y | ||
| 1040 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1041 | CONFIG_CRYPTO_HASH=y | ||
| 1042 | CONFIG_CRYPTO_RNG=y | ||
| 1043 | CONFIG_CRYPTO_MANAGER=y | ||
| 1023 | # CONFIG_CRYPTO_GF128MUL is not set | 1044 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1024 | # CONFIG_CRYPTO_NULL is not set | 1045 | # CONFIG_CRYPTO_NULL is not set |
| 1025 | # CONFIG_CRYPTO_CRYPTD is not set | 1046 | # CONFIG_CRYPTO_CRYPTD is not set |
| @@ -1096,7 +1117,7 @@ CONFIG_CRYPTO=y | |||
| 1096 | # Random Number Generation | 1117 | # Random Number Generation |
| 1097 | # | 1118 | # |
| 1098 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1119 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1099 | CONFIG_CRYPTO_HW=y | 1120 | # CONFIG_CRYPTO_HW is not set |
| 1100 | 1121 | ||
| 1101 | # | 1122 | # |
| 1102 | # Library routines | 1123 | # Library routines |
diff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig new file mode 100644 index 000000000000..9afff67d9ff2 --- /dev/null +++ b/arch/sh/configs/ul2_defconfig | |||
| @@ -0,0 +1,1169 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.28-rc2 | ||
| 4 | # Tue Oct 28 17:35:17 2008 | ||
| 5 | # | ||
| 6 | CONFIG_SUPERH=y | ||
| 7 | CONFIG_SUPERH32=y | ||
| 8 | CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" | ||
| 9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 10 | CONFIG_GENERIC_BUG=y | ||
| 11 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 12 | CONFIG_GENERIC_HWEIGHT=y | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 15 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 16 | # CONFIG_GENERIC_GPIO is not set | ||
| 17 | CONFIG_GENERIC_TIME=y | ||
| 18 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 19 | CONFIG_SYS_SUPPORTS_NUMA=y | ||
| 20 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 21 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 22 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 23 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 24 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 25 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 27 | |||
| 28 | # | ||
| 29 | # General setup | ||
| 30 | # | ||
| 31 | CONFIG_EXPERIMENTAL=y | ||
| 32 | CONFIG_BROKEN_ON_SMP=y | ||
| 33 | CONFIG_LOCK_KERNEL=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | CONFIG_LOCALVERSION_AUTO=y | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 41 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 42 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 43 | # CONFIG_TASKSTATS is not set | ||
| 44 | # CONFIG_AUDIT is not set | ||
| 45 | CONFIG_IKCONFIG=y | ||
| 46 | CONFIG_IKCONFIG_PROC=y | ||
| 47 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 48 | # CONFIG_CGROUPS is not set | ||
| 49 | # CONFIG_GROUP_SCHED is not set | ||
| 50 | CONFIG_SYSFS_DEPRECATED=y | ||
| 51 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 52 | # CONFIG_RELAY is not set | ||
| 53 | # CONFIG_NAMESPACES is not set | ||
| 54 | CONFIG_BLK_DEV_INITRD=y | ||
| 55 | CONFIG_INITRAMFS_SOURCE="" | ||
| 56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 57 | CONFIG_SYSCTL=y | ||
| 58 | CONFIG_EMBEDDED=y | ||
| 59 | CONFIG_UID16=y | ||
| 60 | CONFIG_SYSCTL_SYSCALL=y | ||
| 61 | CONFIG_KALLSYMS=y | ||
| 62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 63 | CONFIG_HOTPLUG=y | ||
| 64 | CONFIG_PRINTK=y | ||
| 65 | CONFIG_BUG=y | ||
| 66 | CONFIG_ELF_CORE=y | ||
| 67 | CONFIG_COMPAT_BRK=y | ||
| 68 | CONFIG_BASE_FULL=y | ||
| 69 | CONFIG_FUTEX=y | ||
| 70 | CONFIG_ANON_INODES=y | ||
| 71 | CONFIG_EPOLL=y | ||
| 72 | CONFIG_SIGNALFD=y | ||
| 73 | CONFIG_TIMERFD=y | ||
| 74 | CONFIG_EVENTFD=y | ||
| 75 | CONFIG_SHMEM=y | ||
| 76 | CONFIG_AIO=y | ||
| 77 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 78 | CONFIG_SLUB_DEBUG=y | ||
| 79 | # CONFIG_SLAB is not set | ||
| 80 | CONFIG_SLUB=y | ||
| 81 | # CONFIG_SLOB is not set | ||
| 82 | CONFIG_PROFILING=y | ||
| 83 | # CONFIG_MARKERS is not set | ||
| 84 | # CONFIG_OPROFILE is not set | ||
| 85 | CONFIG_HAVE_OPROFILE=y | ||
| 86 | # CONFIG_KPROBES is not set | ||
| 87 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 88 | CONFIG_HAVE_KPROBES=y | ||
| 89 | CONFIG_HAVE_KRETPROBES=y | ||
| 90 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 91 | CONFIG_HAVE_CLK=y | ||
| 92 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 93 | CONFIG_SLABINFO=y | ||
| 94 | CONFIG_RT_MUTEXES=y | ||
| 95 | # CONFIG_TINY_SHMEM is not set | ||
| 96 | CONFIG_BASE_SMALL=0 | ||
| 97 | CONFIG_MODULES=y | ||
| 98 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 99 | CONFIG_MODULE_UNLOAD=y | ||
| 100 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 101 | # CONFIG_MODVERSIONS is not set | ||
| 102 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 103 | CONFIG_KMOD=y | ||
| 104 | CONFIG_BLOCK=y | ||
| 105 | # CONFIG_LBD is not set | ||
| 106 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 107 | # CONFIG_LSF is not set | ||
| 108 | # CONFIG_BLK_DEV_BSG is not set | ||
| 109 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 110 | |||
| 111 | # | ||
| 112 | # IO Schedulers | ||
| 113 | # | ||
| 114 | CONFIG_IOSCHED_NOOP=y | ||
| 115 | # CONFIG_IOSCHED_AS is not set | ||
| 116 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 117 | # CONFIG_IOSCHED_CFQ is not set | ||
| 118 | # CONFIG_DEFAULT_AS is not set | ||
| 119 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 120 | # CONFIG_DEFAULT_CFQ is not set | ||
| 121 | CONFIG_DEFAULT_NOOP=y | ||
| 122 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 123 | CONFIG_CLASSIC_RCU=y | ||
| 124 | # CONFIG_FREEZER is not set | ||
| 125 | |||
| 126 | # | ||
| 127 | # System type | ||
| 128 | # | ||
| 129 | CONFIG_CPU_SH4=y | ||
| 130 | CONFIG_CPU_SH4A=y | ||
| 131 | CONFIG_CPU_SH4AL_DSP=y | ||
| 132 | CONFIG_CPU_SHX2=y | ||
| 133 | # CONFIG_CPU_SUBTYPE_SH7619 is not set | ||
| 134 | # CONFIG_CPU_SUBTYPE_SH7203 is not set | ||
| 135 | # CONFIG_CPU_SUBTYPE_SH7206 is not set | ||
| 136 | # CONFIG_CPU_SUBTYPE_SH7263 is not set | ||
| 137 | # CONFIG_CPU_SUBTYPE_MXG is not set | ||
| 138 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | ||
| 139 | # CONFIG_CPU_SUBTYPE_SH7706 is not set | ||
| 140 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | ||
| 141 | # CONFIG_CPU_SUBTYPE_SH7708 is not set | ||
| 142 | # CONFIG_CPU_SUBTYPE_SH7709 is not set | ||
| 143 | # CONFIG_CPU_SUBTYPE_SH7710 is not set | ||
| 144 | # CONFIG_CPU_SUBTYPE_SH7712 is not set | ||
| 145 | # CONFIG_CPU_SUBTYPE_SH7720 is not set | ||
| 146 | # CONFIG_CPU_SUBTYPE_SH7721 is not set | ||
| 147 | # CONFIG_CPU_SUBTYPE_SH7750 is not set | ||
| 148 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | ||
| 149 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | ||
| 150 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | ||
| 151 | # CONFIG_CPU_SUBTYPE_SH7751 is not set | ||
| 152 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | ||
| 153 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | ||
| 154 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | ||
| 155 | # CONFIG_CPU_SUBTYPE_SH7723 is not set | ||
| 156 | # CONFIG_CPU_SUBTYPE_SH7763 is not set | ||
| 157 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | ||
| 158 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | ||
| 159 | # CONFIG_CPU_SUBTYPE_SH7785 is not set | ||
| 160 | # CONFIG_CPU_SUBTYPE_SHX3 is not set | ||
| 161 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | ||
| 162 | # CONFIG_CPU_SUBTYPE_SH7722 is not set | ||
| 163 | CONFIG_CPU_SUBTYPE_SH7366=y | ||
| 164 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set | ||
| 165 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set | ||
| 166 | |||
| 167 | # | ||
| 168 | # Memory management options | ||
| 169 | # | ||
| 170 | CONFIG_QUICKLIST=y | ||
| 171 | CONFIG_MMU=y | ||
| 172 | CONFIG_PAGE_OFFSET=0x80000000 | ||
| 173 | CONFIG_MEMORY_START=0x08000000 | ||
| 174 | CONFIG_MEMORY_SIZE=0x01f00000 | ||
| 175 | CONFIG_29BIT=y | ||
| 176 | # CONFIG_X2TLB is not set | ||
| 177 | CONFIG_VSYSCALL=y | ||
| 178 | CONFIG_NUMA=y | ||
| 179 | CONFIG_NODES_SHIFT=1 | ||
| 180 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 181 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | ||
| 182 | CONFIG_MAX_ACTIVE_REGIONS=1 | ||
| 183 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 184 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 185 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 186 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 187 | CONFIG_PAGE_SIZE_4KB=y | ||
| 188 | # CONFIG_PAGE_SIZE_8KB is not set | ||
| 189 | # CONFIG_PAGE_SIZE_16KB is not set | ||
| 190 | # CONFIG_PAGE_SIZE_64KB is not set | ||
| 191 | CONFIG_ENTRY_OFFSET=0x00001000 | ||
| 192 | CONFIG_HUGETLB_PAGE_SIZE_64K=y | ||
| 193 | # CONFIG_HUGETLB_PAGE_SIZE_256K is not set | ||
| 194 | # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set | ||
| 195 | # CONFIG_HUGETLB_PAGE_SIZE_4MB is not set | ||
| 196 | # CONFIG_HUGETLB_PAGE_SIZE_64MB is not set | ||
| 197 | # CONFIG_HUGETLB_PAGE_SIZE_512MB is not set | ||
| 198 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 199 | # CONFIG_FLATMEM_MANUAL is not set | ||
| 200 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 201 | CONFIG_SPARSEMEM_MANUAL=y | ||
| 202 | CONFIG_SPARSEMEM=y | ||
| 203 | CONFIG_NEED_MULTIPLE_NODES=y | ||
| 204 | CONFIG_HAVE_MEMORY_PRESENT=y | ||
| 205 | CONFIG_SPARSEMEM_STATIC=y | ||
| 206 | # CONFIG_MEMORY_HOTPLUG is not set | ||
| 207 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 208 | # CONFIG_MIGRATION is not set | ||
| 209 | # CONFIG_RESOURCES_64BIT is not set | ||
| 210 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 211 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 212 | CONFIG_NR_QUICK=2 | ||
| 213 | CONFIG_UNEVICTABLE_LRU=y | ||
| 214 | |||
| 215 | # | ||
| 216 | # Cache configuration | ||
| 217 | # | ||
| 218 | # CONFIG_SH_DIRECT_MAPPED is not set | ||
| 219 | CONFIG_CACHE_WRITEBACK=y | ||
| 220 | # CONFIG_CACHE_WRITETHROUGH is not set | ||
| 221 | # CONFIG_CACHE_OFF is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # Processor features | ||
| 225 | # | ||
| 226 | CONFIG_CPU_LITTLE_ENDIAN=y | ||
| 227 | # CONFIG_CPU_BIG_ENDIAN is not set | ||
| 228 | # CONFIG_SH_FPU_EMU is not set | ||
| 229 | # CONFIG_SH_DSP is not set | ||
| 230 | # CONFIG_SH_STORE_QUEUES is not set | ||
| 231 | CONFIG_CPU_HAS_INTEVT=y | ||
| 232 | CONFIG_CPU_HAS_SR_RB=y | ||
| 233 | CONFIG_CPU_HAS_PTEA=y | ||
| 234 | CONFIG_CPU_HAS_DSP=y | ||
| 235 | |||
| 236 | # | ||
| 237 | # Board support | ||
| 238 | # | ||
| 239 | |||
| 240 | # | ||
| 241 | # Timer and clock configuration | ||
| 242 | # | ||
| 243 | CONFIG_SH_TMU=y | ||
| 244 | CONFIG_SH_TIMER_IRQ=16 | ||
| 245 | CONFIG_SH_PCLK_FREQ=33333333 | ||
| 246 | CONFIG_TICK_ONESHOT=y | ||
| 247 | # CONFIG_NO_HZ is not set | ||
| 248 | CONFIG_HIGH_RES_TIMERS=y | ||
| 249 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 250 | |||
| 251 | # | ||
| 252 | # CPU Frequency scaling | ||
| 253 | # | ||
| 254 | # CONFIG_CPU_FREQ is not set | ||
| 255 | |||
| 256 | # | ||
| 257 | # DMA support | ||
| 258 | # | ||
| 259 | # CONFIG_SH_DMA is not set | ||
| 260 | |||
| 261 | # | ||
| 262 | # Companion Chips | ||
| 263 | # | ||
| 264 | |||
| 265 | # | ||
| 266 | # Additional SuperH Device Drivers | ||
| 267 | # | ||
| 268 | # CONFIG_HEARTBEAT is not set | ||
| 269 | # CONFIG_PUSH_SWITCH is not set | ||
| 270 | |||
| 271 | # | ||
| 272 | # Kernel features | ||
| 273 | # | ||
| 274 | CONFIG_HZ_100=y | ||
| 275 | # CONFIG_HZ_250 is not set | ||
| 276 | # CONFIG_HZ_300 is not set | ||
| 277 | # CONFIG_HZ_1000 is not set | ||
| 278 | CONFIG_HZ=100 | ||
| 279 | CONFIG_SCHED_HRTICK=y | ||
| 280 | CONFIG_KEXEC=y | ||
| 281 | # CONFIG_CRASH_DUMP is not set | ||
| 282 | # CONFIG_SECCOMP is not set | ||
| 283 | # CONFIG_PREEMPT_NONE is not set | ||
| 284 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 285 | CONFIG_PREEMPT=y | ||
| 286 | # CONFIG_PREEMPT_RCU is not set | ||
| 287 | CONFIG_GUSA=y | ||
| 288 | |||
| 289 | # | ||
| 290 | # Boot options | ||
| 291 | # | ||
| 292 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | ||
| 293 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | ||
| 294 | CONFIG_CMDLINE_BOOL=y | ||
| 295 | CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=dhcp" | ||
| 296 | |||
| 297 | # | ||
| 298 | # Bus options | ||
| 299 | # | ||
| 300 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 301 | # CONFIG_PCCARD is not set | ||
| 302 | |||
| 303 | # | ||
| 304 | # Executable file formats | ||
| 305 | # | ||
| 306 | CONFIG_BINFMT_ELF=y | ||
| 307 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 308 | # CONFIG_HAVE_AOUT is not set | ||
| 309 | # CONFIG_BINFMT_MISC is not set | ||
| 310 | CONFIG_NET=y | ||
| 311 | |||
| 312 | # | ||
| 313 | # Networking options | ||
| 314 | # | ||
| 315 | CONFIG_PACKET=y | ||
| 316 | CONFIG_PACKET_MMAP=y | ||
| 317 | CONFIG_UNIX=y | ||
| 318 | CONFIG_XFRM=y | ||
| 319 | # CONFIG_XFRM_USER is not set | ||
| 320 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 321 | # CONFIG_XFRM_MIGRATE is not set | ||
| 322 | # CONFIG_XFRM_STATISTICS is not set | ||
| 323 | # CONFIG_NET_KEY is not set | ||
| 324 | CONFIG_INET=y | ||
| 325 | # CONFIG_IP_MULTICAST is not set | ||
| 326 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 327 | CONFIG_IP_FIB_HASH=y | ||
| 328 | CONFIG_IP_PNP=y | ||
| 329 | CONFIG_IP_PNP_DHCP=y | ||
| 330 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 331 | # CONFIG_IP_PNP_RARP is not set | ||
| 332 | # CONFIG_NET_IPIP is not set | ||
| 333 | # CONFIG_NET_IPGRE is not set | ||
| 334 | # CONFIG_ARPD is not set | ||
| 335 | # CONFIG_SYN_COOKIES is not set | ||
| 336 | # CONFIG_INET_AH is not set | ||
| 337 | # CONFIG_INET_ESP is not set | ||
| 338 | # CONFIG_INET_IPCOMP is not set | ||
| 339 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 340 | # CONFIG_INET_TUNNEL is not set | ||
| 341 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 342 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 343 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 344 | # CONFIG_INET_LRO is not set | ||
| 345 | CONFIG_INET_DIAG=y | ||
| 346 | CONFIG_INET_TCP_DIAG=y | ||
| 347 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 348 | CONFIG_TCP_CONG_CUBIC=y | ||
| 349 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 350 | # CONFIG_TCP_MD5SIG is not set | ||
| 351 | # CONFIG_IPV6 is not set | ||
| 352 | # CONFIG_NETWORK_SECMARK is not set | ||
| 353 | # CONFIG_NETFILTER is not set | ||
| 354 | # CONFIG_IP_DCCP is not set | ||
| 355 | # CONFIG_IP_SCTP is not set | ||
| 356 | # CONFIG_TIPC is not set | ||
| 357 | # CONFIG_ATM is not set | ||
| 358 | # CONFIG_BRIDGE is not set | ||
| 359 | # CONFIG_NET_DSA is not set | ||
| 360 | # CONFIG_VLAN_8021Q is not set | ||
| 361 | # CONFIG_DECNET is not set | ||
| 362 | # CONFIG_LLC2 is not set | ||
| 363 | # CONFIG_IPX is not set | ||
| 364 | # CONFIG_ATALK is not set | ||
| 365 | # CONFIG_X25 is not set | ||
| 366 | # CONFIG_LAPB is not set | ||
| 367 | # CONFIG_ECONET is not set | ||
| 368 | # CONFIG_WAN_ROUTER is not set | ||
| 369 | # CONFIG_NET_SCHED is not set | ||
| 370 | |||
| 371 | # | ||
| 372 | # Network testing | ||
| 373 | # | ||
| 374 | # CONFIG_NET_PKTGEN is not set | ||
| 375 | # CONFIG_HAMRADIO is not set | ||
| 376 | # CONFIG_CAN is not set | ||
| 377 | # CONFIG_IRDA is not set | ||
| 378 | # CONFIG_BT is not set | ||
| 379 | # CONFIG_AF_RXRPC is not set | ||
| 380 | # CONFIG_PHONET is not set | ||
| 381 | CONFIG_WIRELESS=y | ||
| 382 | CONFIG_CFG80211=y | ||
| 383 | CONFIG_NL80211=y | ||
| 384 | # CONFIG_WIRELESS_OLD_REGULATORY is not set | ||
| 385 | CONFIG_WIRELESS_EXT=y | ||
| 386 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 387 | CONFIG_MAC80211=y | ||
| 388 | |||
| 389 | # | ||
| 390 | # Rate control algorithm selection | ||
| 391 | # | ||
| 392 | CONFIG_MAC80211_RC_PID=y | ||
| 393 | # CONFIG_MAC80211_RC_MINSTREL is not set | ||
| 394 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 395 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | ||
| 396 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 397 | # CONFIG_MAC80211_MESH is not set | ||
| 398 | # CONFIG_MAC80211_LEDS is not set | ||
| 399 | # CONFIG_MAC80211_DEBUG_MENU is not set | ||
| 400 | CONFIG_IEEE80211=m | ||
| 401 | CONFIG_IEEE80211_DEBUG=y | ||
| 402 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 403 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 404 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 405 | # CONFIG_RFKILL is not set | ||
| 406 | # CONFIG_NET_9P is not set | ||
| 407 | |||
| 408 | # | ||
| 409 | # Device Drivers | ||
| 410 | # | ||
| 411 | |||
| 412 | # | ||
| 413 | # Generic Driver Options | ||
| 414 | # | ||
| 415 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 416 | CONFIG_STANDALONE=y | ||
| 417 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 418 | CONFIG_FW_LOADER=y | ||
| 419 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 420 | CONFIG_EXTRA_FIRMWARE="" | ||
| 421 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 422 | # CONFIG_CONNECTOR is not set | ||
| 423 | CONFIG_MTD=y | ||
| 424 | # CONFIG_MTD_DEBUG is not set | ||
| 425 | CONFIG_MTD_CONCAT=y | ||
| 426 | CONFIG_MTD_PARTITIONS=y | ||
| 427 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 428 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 429 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 430 | |||
| 431 | # | ||
| 432 | # User Modules And Translation Layers | ||
| 433 | # | ||
| 434 | CONFIG_MTD_CHAR=y | ||
| 435 | CONFIG_MTD_BLKDEVS=y | ||
| 436 | CONFIG_MTD_BLOCK=y | ||
| 437 | # CONFIG_FTL is not set | ||
| 438 | # CONFIG_NFTL is not set | ||
| 439 | # CONFIG_INFTL is not set | ||
| 440 | # CONFIG_RFD_FTL is not set | ||
| 441 | # CONFIG_SSFDC is not set | ||
| 442 | # CONFIG_MTD_OOPS is not set | ||
| 443 | |||
| 444 | # | ||
| 445 | # RAM/ROM/Flash chip drivers | ||
| 446 | # | ||
| 447 | CONFIG_MTD_CFI=y | ||
| 448 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 449 | CONFIG_MTD_GEN_PROBE=y | ||
| 450 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 451 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 452 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 453 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 454 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 455 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 456 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 457 | CONFIG_MTD_CFI_I1=y | ||
| 458 | CONFIG_MTD_CFI_I2=y | ||
| 459 | # CONFIG_MTD_CFI_I4 is not set | ||
| 460 | # CONFIG_MTD_CFI_I8 is not set | ||
| 461 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
| 462 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 463 | # CONFIG_MTD_CFI_STAA is not set | ||
| 464 | CONFIG_MTD_CFI_UTIL=y | ||
| 465 | CONFIG_MTD_RAM=y | ||
| 466 | # CONFIG_MTD_ROM is not set | ||
| 467 | # CONFIG_MTD_ABSENT is not set | ||
| 468 | |||
| 469 | # | ||
| 470 | # Mapping drivers for chip access | ||
| 471 | # | ||
| 472 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 473 | # CONFIG_MTD_PHYSMAP is not set | ||
| 474 | # CONFIG_MTD_PLATRAM is not set | ||
| 475 | |||
| 476 | # | ||
| 477 | # Self-contained MTD device drivers | ||
| 478 | # | ||
| 479 | # CONFIG_MTD_SLRAM is not set | ||
| 480 | # CONFIG_MTD_PHRAM is not set | ||
| 481 | # CONFIG_MTD_MTDRAM is not set | ||
| 482 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 483 | |||
| 484 | # | ||
| 485 | # Disk-On-Chip Device Drivers | ||
| 486 | # | ||
| 487 | # CONFIG_MTD_DOC2000 is not set | ||
| 488 | # CONFIG_MTD_DOC2001 is not set | ||
| 489 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 490 | # CONFIG_MTD_NAND is not set | ||
| 491 | # CONFIG_MTD_ONENAND is not set | ||
| 492 | |||
| 493 | # | ||
| 494 | # UBI - Unsorted block images | ||
| 495 | # | ||
| 496 | # CONFIG_MTD_UBI is not set | ||
| 497 | # CONFIG_PARPORT is not set | ||
| 498 | CONFIG_BLK_DEV=y | ||
| 499 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 500 | # CONFIG_BLK_DEV_LOOP is not set | ||
| 501 | # CONFIG_BLK_DEV_NBD is not set | ||
| 502 | # CONFIG_BLK_DEV_UB is not set | ||
| 503 | CONFIG_BLK_DEV_RAM=y | ||
| 504 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 505 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 506 | # CONFIG_BLK_DEV_XIP is not set | ||
| 507 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 508 | # CONFIG_ATA_OVER_ETH is not set | ||
| 509 | # CONFIG_BLK_DEV_HD is not set | ||
| 510 | CONFIG_MISC_DEVICES=y | ||
| 511 | # CONFIG_EEPROM_93CX6 is not set | ||
| 512 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 513 | CONFIG_HAVE_IDE=y | ||
| 514 | # CONFIG_IDE is not set | ||
| 515 | |||
| 516 | # | ||
| 517 | # SCSI device support | ||
| 518 | # | ||
| 519 | # CONFIG_RAID_ATTRS is not set | ||
| 520 | CONFIG_SCSI=y | ||
| 521 | CONFIG_SCSI_DMA=y | ||
| 522 | # CONFIG_SCSI_TGT is not set | ||
| 523 | # CONFIG_SCSI_NETLINK is not set | ||
| 524 | CONFIG_SCSI_PROC_FS=y | ||
| 525 | |||
| 526 | # | ||
| 527 | # SCSI support type (disk, tape, CD-ROM) | ||
| 528 | # | ||
| 529 | CONFIG_BLK_DEV_SD=y | ||
| 530 | # CONFIG_CHR_DEV_ST is not set | ||
| 531 | # CONFIG_CHR_DEV_OSST is not set | ||
| 532 | # CONFIG_BLK_DEV_SR is not set | ||
| 533 | # CONFIG_CHR_DEV_SG is not set | ||
| 534 | # CONFIG_CHR_DEV_SCH is not set | ||
| 535 | |||
| 536 | # | ||
| 537 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 538 | # | ||
| 539 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 540 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 541 | # CONFIG_SCSI_LOGGING is not set | ||
| 542 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 543 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 544 | |||
| 545 | # | ||
| 546 | # SCSI Transports | ||
| 547 | # | ||
| 548 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 549 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 550 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 551 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 552 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 553 | CONFIG_SCSI_LOWLEVEL=y | ||
| 554 | # CONFIG_ISCSI_TCP is not set | ||
| 555 | # CONFIG_SCSI_DEBUG is not set | ||
| 556 | # CONFIG_SCSI_DH is not set | ||
| 557 | CONFIG_ATA=y | ||
| 558 | # CONFIG_ATA_NONSTANDARD is not set | ||
| 559 | CONFIG_SATA_PMP=y | ||
| 560 | CONFIG_ATA_SFF=y | ||
| 561 | # CONFIG_SATA_MV is not set | ||
| 562 | CONFIG_PATA_PLATFORM=y | ||
| 563 | # CONFIG_MD is not set | ||
| 564 | CONFIG_NETDEVICES=y | ||
| 565 | # CONFIG_DUMMY is not set | ||
| 566 | # CONFIG_BONDING is not set | ||
| 567 | # CONFIG_MACVLAN is not set | ||
| 568 | # CONFIG_EQUALIZER is not set | ||
| 569 | # CONFIG_TUN is not set | ||
| 570 | # CONFIG_VETH is not set | ||
| 571 | # CONFIG_PHYLIB is not set | ||
| 572 | CONFIG_NET_ETHERNET=y | ||
| 573 | CONFIG_MII=y | ||
| 574 | # CONFIG_AX88796 is not set | ||
| 575 | # CONFIG_STNIC is not set | ||
| 576 | # CONFIG_SMC91X is not set | ||
| 577 | # CONFIG_SMC911X is not set | ||
| 578 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 579 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 580 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 581 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 582 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 583 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 584 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 585 | # CONFIG_B44 is not set | ||
| 586 | # CONFIG_NETDEV_1000 is not set | ||
| 587 | # CONFIG_NETDEV_10000 is not set | ||
| 588 | |||
| 589 | # | ||
| 590 | # Wireless LAN | ||
| 591 | # | ||
| 592 | # CONFIG_WLAN_PRE80211 is not set | ||
| 593 | CONFIG_WLAN_80211=y | ||
| 594 | CONFIG_LIBERTAS=m | ||
| 595 | # CONFIG_LIBERTAS_USB is not set | ||
| 596 | CONFIG_LIBERTAS_SDIO=m | ||
| 597 | CONFIG_LIBERTAS_DEBUG=y | ||
| 598 | # CONFIG_LIBERTAS_THINFIRM is not set | ||
| 599 | # CONFIG_USB_ZD1201 is not set | ||
| 600 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 601 | # CONFIG_RTL8187 is not set | ||
| 602 | # CONFIG_MAC80211_HWSIM is not set | ||
| 603 | # CONFIG_P54_COMMON is not set | ||
| 604 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 605 | # CONFIG_HOSTAP is not set | ||
| 606 | # CONFIG_B43 is not set | ||
| 607 | # CONFIG_B43LEGACY is not set | ||
| 608 | # CONFIG_ZD1211RW is not set | ||
| 609 | # CONFIG_RT2X00 is not set | ||
| 610 | |||
| 611 | # | ||
| 612 | # USB Network Adapters | ||
| 613 | # | ||
| 614 | # CONFIG_USB_CATC is not set | ||
| 615 | # CONFIG_USB_KAWETH is not set | ||
| 616 | # CONFIG_USB_PEGASUS is not set | ||
| 617 | # CONFIG_USB_RTL8150 is not set | ||
| 618 | CONFIG_USB_USBNET=y | ||
| 619 | CONFIG_USB_NET_AX8817X=y | ||
| 620 | CONFIG_USB_NET_CDCETHER=y | ||
| 621 | # CONFIG_USB_NET_DM9601 is not set | ||
| 622 | # CONFIG_USB_NET_SMSC95XX is not set | ||
| 623 | # CONFIG_USB_NET_GL620A is not set | ||
| 624 | # CONFIG_USB_NET_NET1080 is not set | ||
| 625 | # CONFIG_USB_NET_PLUSB is not set | ||
| 626 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 627 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
| 628 | # CONFIG_USB_NET_CDC_SUBSET is not set | ||
| 629 | # CONFIG_USB_NET_ZAURUS is not set | ||
| 630 | # CONFIG_WAN is not set | ||
| 631 | # CONFIG_PPP is not set | ||
| 632 | # CONFIG_SLIP is not set | ||
| 633 | # CONFIG_NETCONSOLE is not set | ||
| 634 | # CONFIG_NETPOLL is not set | ||
| 635 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 636 | # CONFIG_ISDN is not set | ||
| 637 | # CONFIG_PHONE is not set | ||
| 638 | |||
| 639 | # | ||
| 640 | # Input device support | ||
| 641 | # | ||
| 642 | CONFIG_INPUT=y | ||
| 643 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 644 | # CONFIG_INPUT_POLLDEV is not set | ||
| 645 | |||
| 646 | # | ||
| 647 | # Userland interfaces | ||
| 648 | # | ||
| 649 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 650 | # CONFIG_INPUT_JOYDEV is not set | ||
| 651 | # CONFIG_INPUT_EVDEV is not set | ||
| 652 | # CONFIG_INPUT_EVBUG is not set | ||
| 653 | |||
| 654 | # | ||
| 655 | # Input Device Drivers | ||
| 656 | # | ||
| 657 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 658 | # CONFIG_INPUT_MOUSE is not set | ||
| 659 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 660 | # CONFIG_INPUT_TABLET is not set | ||
| 661 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 662 | # CONFIG_INPUT_MISC is not set | ||
| 663 | |||
| 664 | # | ||
| 665 | # Hardware I/O ports | ||
| 666 | # | ||
| 667 | # CONFIG_SERIO is not set | ||
| 668 | # CONFIG_GAMEPORT is not set | ||
| 669 | |||
| 670 | # | ||
| 671 | # Character devices | ||
| 672 | # | ||
| 673 | # CONFIG_VT is not set | ||
| 674 | CONFIG_DEVKMEM=y | ||
| 675 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 676 | |||
| 677 | # | ||
| 678 | # Serial drivers | ||
| 679 | # | ||
| 680 | # CONFIG_SERIAL_8250 is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Non-8250 serial port support | ||
| 684 | # | ||
| 685 | CONFIG_SERIAL_SH_SCI=y | ||
| 686 | CONFIG_SERIAL_SH_SCI_NR_UARTS=1 | ||
| 687 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
| 688 | CONFIG_SERIAL_CORE=y | ||
| 689 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 690 | # CONFIG_UNIX98_PTYS is not set | ||
| 691 | # CONFIG_LEGACY_PTYS is not set | ||
| 692 | # CONFIG_IPMI_HANDLER is not set | ||
| 693 | # CONFIG_HW_RANDOM is not set | ||
| 694 | # CONFIG_R3964 is not set | ||
| 695 | # CONFIG_RAW_DRIVER is not set | ||
| 696 | # CONFIG_TCG_TPM is not set | ||
| 697 | # CONFIG_I2C is not set | ||
| 698 | # CONFIG_SPI is not set | ||
| 699 | # CONFIG_W1 is not set | ||
| 700 | # CONFIG_POWER_SUPPLY is not set | ||
| 701 | CONFIG_HWMON=y | ||
| 702 | # CONFIG_HWMON_VID is not set | ||
| 703 | # CONFIG_SENSORS_F71805F is not set | ||
| 704 | # CONFIG_SENSORS_F71882FG is not set | ||
| 705 | # CONFIG_SENSORS_IT87 is not set | ||
| 706 | # CONFIG_SENSORS_PC87360 is not set | ||
| 707 | # CONFIG_SENSORS_PC87427 is not set | ||
| 708 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 709 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 710 | # CONFIG_SENSORS_VT1211 is not set | ||
| 711 | # CONFIG_SENSORS_W83627HF is not set | ||
| 712 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 713 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 714 | # CONFIG_THERMAL is not set | ||
| 715 | # CONFIG_THERMAL_HWMON is not set | ||
| 716 | # CONFIG_WATCHDOG is not set | ||
| 717 | |||
| 718 | # | ||
| 719 | # Sonics Silicon Backplane | ||
| 720 | # | ||
| 721 | CONFIG_SSB_POSSIBLE=y | ||
| 722 | # CONFIG_SSB is not set | ||
| 723 | |||
| 724 | # | ||
| 725 | # Multifunction device drivers | ||
| 726 | # | ||
| 727 | # CONFIG_MFD_CORE is not set | ||
| 728 | # CONFIG_MFD_SM501 is not set | ||
| 729 | # CONFIG_HTC_PASIC3 is not set | ||
| 730 | # CONFIG_MFD_TMIO is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # Multimedia devices | ||
| 734 | # | ||
| 735 | |||
| 736 | # | ||
| 737 | # Multimedia core support | ||
| 738 | # | ||
| 739 | # CONFIG_VIDEO_DEV is not set | ||
| 740 | # CONFIG_DVB_CORE is not set | ||
| 741 | # CONFIG_VIDEO_MEDIA is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # Multimedia drivers | ||
| 745 | # | ||
| 746 | # CONFIG_DAB is not set | ||
| 747 | |||
| 748 | # | ||
| 749 | # Graphics support | ||
| 750 | # | ||
| 751 | # CONFIG_VGASTATE is not set | ||
| 752 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 753 | # CONFIG_FB is not set | ||
| 754 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 755 | |||
| 756 | # | ||
| 757 | # Display device support | ||
| 758 | # | ||
| 759 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 760 | # CONFIG_SOUND is not set | ||
| 761 | # CONFIG_HID_SUPPORT is not set | ||
| 762 | CONFIG_USB_SUPPORT=y | ||
| 763 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 764 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
| 765 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 766 | CONFIG_USB=y | ||
| 767 | # CONFIG_USB_DEBUG is not set | ||
| 768 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 769 | |||
| 770 | # | ||
| 771 | # Miscellaneous USB options | ||
| 772 | # | ||
| 773 | # CONFIG_USB_DEVICEFS is not set | ||
| 774 | CONFIG_USB_DEVICE_CLASS=y | ||
| 775 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 776 | # CONFIG_USB_OTG is not set | ||
| 777 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 778 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 779 | CONFIG_USB_MON=y | ||
| 780 | # CONFIG_USB_WUSB is not set | ||
| 781 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 782 | |||
| 783 | # | ||
| 784 | # USB Host Controller Drivers | ||
| 785 | # | ||
| 786 | # CONFIG_USB_C67X00_HCD is not set | ||
| 787 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 788 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 789 | # CONFIG_USB_SL811_HCD is not set | ||
| 790 | CONFIG_USB_R8A66597_HCD=y | ||
| 791 | # CONFIG_SUPERH_ON_CHIP_R8A66597 is not set | ||
| 792 | # CONFIG_USB_HWA_HCD is not set | ||
| 793 | |||
| 794 | # | ||
| 795 | # USB Device Class drivers | ||
| 796 | # | ||
| 797 | # CONFIG_USB_ACM is not set | ||
| 798 | # CONFIG_USB_PRINTER is not set | ||
| 799 | # CONFIG_USB_WDM is not set | ||
| 800 | # CONFIG_USB_TMC is not set | ||
| 801 | |||
| 802 | # | ||
| 803 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 804 | # | ||
| 805 | |||
| 806 | # | ||
| 807 | # may also be needed; see USB_STORAGE Help for more information | ||
| 808 | # | ||
| 809 | CONFIG_USB_STORAGE=y | ||
| 810 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 811 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 812 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 813 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 814 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 815 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 816 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 817 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 818 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 819 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 820 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 821 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 822 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 823 | # CONFIG_USB_LIBUSUAL is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # USB Imaging devices | ||
| 827 | # | ||
| 828 | # CONFIG_USB_MDC800 is not set | ||
| 829 | # CONFIG_USB_MICROTEK is not set | ||
| 830 | |||
| 831 | # | ||
| 832 | # USB port drivers | ||
| 833 | # | ||
| 834 | # CONFIG_USB_SERIAL is not set | ||
| 835 | |||
| 836 | # | ||
| 837 | # USB Miscellaneous drivers | ||
| 838 | # | ||
| 839 | # CONFIG_USB_EMI62 is not set | ||
| 840 | # CONFIG_USB_EMI26 is not set | ||
| 841 | # CONFIG_USB_ADUTUX is not set | ||
| 842 | # CONFIG_USB_SEVSEG is not set | ||
| 843 | # CONFIG_USB_RIO500 is not set | ||
| 844 | # CONFIG_USB_LEGOTOWER is not set | ||
| 845 | # CONFIG_USB_LCD is not set | ||
| 846 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 847 | # CONFIG_USB_LED is not set | ||
| 848 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 849 | # CONFIG_USB_CYTHERM is not set | ||
| 850 | # CONFIG_USB_PHIDGET is not set | ||
| 851 | # CONFIG_USB_IDMOUSE is not set | ||
| 852 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 853 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 854 | # CONFIG_USB_LD is not set | ||
| 855 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 856 | # CONFIG_USB_IOWARRIOR is not set | ||
| 857 | # CONFIG_USB_ISIGHTFW is not set | ||
| 858 | # CONFIG_USB_VST is not set | ||
| 859 | # CONFIG_USB_GADGET is not set | ||
| 860 | CONFIG_MMC=y | ||
| 861 | # CONFIG_MMC_DEBUG is not set | ||
| 862 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 863 | |||
| 864 | # | ||
| 865 | # MMC/SD/SDIO Card Drivers | ||
| 866 | # | ||
| 867 | CONFIG_MMC_BLOCK=y | ||
| 868 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 869 | # CONFIG_SDIO_UART is not set | ||
| 870 | # CONFIG_MMC_TEST is not set | ||
| 871 | |||
| 872 | # | ||
| 873 | # MMC/SD/SDIO Host Controller Drivers | ||
| 874 | # | ||
| 875 | # CONFIG_MMC_SDHCI is not set | ||
| 876 | # CONFIG_MEMSTICK is not set | ||
| 877 | # CONFIG_NEW_LEDS is not set | ||
| 878 | # CONFIG_ACCESSIBILITY is not set | ||
| 879 | # CONFIG_RTC_CLASS is not set | ||
| 880 | # CONFIG_DMADEVICES is not set | ||
| 881 | # CONFIG_UIO is not set | ||
| 882 | # CONFIG_STAGING is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # File systems | ||
| 886 | # | ||
| 887 | CONFIG_EXT2_FS=y | ||
| 888 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 889 | # CONFIG_EXT2_FS_XIP is not set | ||
| 890 | CONFIG_EXT3_FS=y | ||
| 891 | CONFIG_EXT3_FS_XATTR=y | ||
| 892 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 893 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 894 | # CONFIG_EXT4_FS is not set | ||
| 895 | CONFIG_JBD=y | ||
| 896 | CONFIG_FS_MBCACHE=y | ||
| 897 | # CONFIG_REISERFS_FS is not set | ||
| 898 | # CONFIG_JFS_FS is not set | ||
| 899 | # CONFIG_FS_POSIX_ACL is not set | ||
| 900 | CONFIG_FILE_LOCKING=y | ||
| 901 | # CONFIG_XFS_FS is not set | ||
| 902 | # CONFIG_OCFS2_FS is not set | ||
| 903 | CONFIG_DNOTIFY=y | ||
| 904 | CONFIG_INOTIFY=y | ||
| 905 | CONFIG_INOTIFY_USER=y | ||
| 906 | # CONFIG_QUOTA is not set | ||
| 907 | # CONFIG_AUTOFS_FS is not set | ||
| 908 | # CONFIG_AUTOFS4_FS is not set | ||
| 909 | # CONFIG_FUSE_FS is not set | ||
| 910 | |||
| 911 | # | ||
| 912 | # CD-ROM/DVD Filesystems | ||
| 913 | # | ||
| 914 | # CONFIG_ISO9660_FS is not set | ||
| 915 | # CONFIG_UDF_FS is not set | ||
| 916 | |||
| 917 | # | ||
| 918 | # DOS/FAT/NT Filesystems | ||
| 919 | # | ||
| 920 | CONFIG_FAT_FS=y | ||
| 921 | # CONFIG_MSDOS_FS is not set | ||
| 922 | CONFIG_VFAT_FS=y | ||
| 923 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 924 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 925 | # CONFIG_NTFS_FS is not set | ||
| 926 | |||
| 927 | # | ||
| 928 | # Pseudo filesystems | ||
| 929 | # | ||
| 930 | CONFIG_PROC_FS=y | ||
| 931 | CONFIG_PROC_KCORE=y | ||
| 932 | CONFIG_PROC_SYSCTL=y | ||
| 933 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 934 | CONFIG_SYSFS=y | ||
| 935 | CONFIG_TMPFS=y | ||
| 936 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 937 | CONFIG_HUGETLBFS=y | ||
| 938 | CONFIG_HUGETLB_PAGE=y | ||
| 939 | # CONFIG_CONFIGFS_FS is not set | ||
| 940 | |||
| 941 | # | ||
| 942 | # Miscellaneous filesystems | ||
| 943 | # | ||
| 944 | # CONFIG_ADFS_FS is not set | ||
| 945 | # CONFIG_AFFS_FS is not set | ||
| 946 | # CONFIG_HFS_FS is not set | ||
| 947 | # CONFIG_HFSPLUS_FS is not set | ||
| 948 | # CONFIG_BEFS_FS is not set | ||
| 949 | # CONFIG_BFS_FS is not set | ||
| 950 | # CONFIG_EFS_FS is not set | ||
| 951 | # CONFIG_JFFS2_FS is not set | ||
| 952 | CONFIG_CRAMFS=y | ||
| 953 | # CONFIG_VXFS_FS is not set | ||
| 954 | # CONFIG_MINIX_FS is not set | ||
| 955 | # CONFIG_OMFS_FS is not set | ||
| 956 | # CONFIG_HPFS_FS is not set | ||
| 957 | # CONFIG_QNX4FS_FS is not set | ||
| 958 | # CONFIG_ROMFS_FS is not set | ||
| 959 | # CONFIG_SYSV_FS is not set | ||
| 960 | # CONFIG_UFS_FS is not set | ||
| 961 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 962 | CONFIG_NFS_FS=y | ||
| 963 | # CONFIG_NFS_V3 is not set | ||
| 964 | # CONFIG_NFS_V4 is not set | ||
| 965 | CONFIG_ROOT_NFS=y | ||
| 966 | CONFIG_NFSD=y | ||
| 967 | # CONFIG_NFSD_V3 is not set | ||
| 968 | # CONFIG_NFSD_V4 is not set | ||
| 969 | CONFIG_LOCKD=y | ||
| 970 | CONFIG_EXPORTFS=y | ||
| 971 | CONFIG_NFS_COMMON=y | ||
| 972 | CONFIG_SUNRPC=y | ||
| 973 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 974 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 975 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 976 | # CONFIG_SMB_FS is not set | ||
| 977 | # CONFIG_CIFS is not set | ||
| 978 | # CONFIG_NCP_FS is not set | ||
| 979 | # CONFIG_CODA_FS is not set | ||
| 980 | # CONFIG_AFS_FS is not set | ||
| 981 | |||
| 982 | # | ||
| 983 | # Partition Types | ||
| 984 | # | ||
| 985 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 986 | CONFIG_MSDOS_PARTITION=y | ||
| 987 | CONFIG_NLS=y | ||
| 988 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 989 | CONFIG_NLS_CODEPAGE_437=y | ||
| 990 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 991 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 992 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 993 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 994 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 995 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 996 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 997 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 998 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 999 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1000 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1001 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1002 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1003 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1004 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1005 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1006 | CONFIG_NLS_CODEPAGE_932=y | ||
| 1007 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1008 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1009 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1010 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1011 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1012 | # CONFIG_NLS_ASCII is not set | ||
| 1013 | CONFIG_NLS_ISO8859_1=y | ||
| 1014 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1015 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1016 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1017 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1018 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1019 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1020 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1021 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1022 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1023 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1024 | # CONFIG_NLS_KOI8_R is not set | ||
| 1025 | # CONFIG_NLS_KOI8_U is not set | ||
| 1026 | # CONFIG_NLS_UTF8 is not set | ||
| 1027 | # CONFIG_DLM is not set | ||
| 1028 | |||
| 1029 | # | ||
| 1030 | # Kernel hacking | ||
| 1031 | # | ||
| 1032 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 1033 | # CONFIG_PRINTK_TIME is not set | ||
| 1034 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
| 1035 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
| 1036 | CONFIG_FRAME_WARN=1024 | ||
| 1037 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 1038 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1039 | # CONFIG_DEBUG_FS is not set | ||
| 1040 | # CONFIG_HEADERS_CHECK is not set | ||
| 1041 | # CONFIG_DEBUG_KERNEL is not set | ||
| 1042 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1043 | # CONFIG_SLUB_STATS is not set | ||
| 1044 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1045 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1046 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1047 | # CONFIG_LATENCYTOP is not set | ||
| 1048 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 1049 | CONFIG_NOP_TRACER=y | ||
| 1050 | CONFIG_HAVE_FTRACE=y | ||
| 1051 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1052 | # CONFIG_SAMPLES is not set | ||
| 1053 | # CONFIG_SH_STANDARD_BIOS is not set | ||
| 1054 | # CONFIG_EARLY_SCIF_CONSOLE is not set | ||
| 1055 | # CONFIG_SH_KGDB is not set | ||
| 1056 | |||
| 1057 | # | ||
| 1058 | # Security options | ||
| 1059 | # | ||
| 1060 | # CONFIG_KEYS is not set | ||
| 1061 | # CONFIG_SECURITY is not set | ||
| 1062 | # CONFIG_SECURITYFS is not set | ||
| 1063 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1064 | CONFIG_CRYPTO=y | ||
| 1065 | |||
| 1066 | # | ||
| 1067 | # Crypto core or helper | ||
| 1068 | # | ||
| 1069 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1070 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1071 | CONFIG_CRYPTO_AEAD=y | ||
| 1072 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1073 | CONFIG_CRYPTO_HASH=y | ||
| 1074 | CONFIG_CRYPTO_RNG=y | ||
| 1075 | CONFIG_CRYPTO_MANAGER=y | ||
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1077 | # CONFIG_CRYPTO_NULL is not set | ||
| 1078 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1079 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1080 | # CONFIG_CRYPTO_TEST is not set | ||
| 1081 | |||
| 1082 | # | ||
| 1083 | # Authenticated Encryption with Associated Data | ||
| 1084 | # | ||
| 1085 | # CONFIG_CRYPTO_CCM is not set | ||
| 1086 | # CONFIG_CRYPTO_GCM is not set | ||
| 1087 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1088 | |||
| 1089 | # | ||
| 1090 | # Block modes | ||
| 1091 | # | ||
| 1092 | # CONFIG_CRYPTO_CBC is not set | ||
| 1093 | # CONFIG_CRYPTO_CTR is not set | ||
| 1094 | # CONFIG_CRYPTO_CTS is not set | ||
| 1095 | CONFIG_CRYPTO_ECB=y | ||
| 1096 | # CONFIG_CRYPTO_LRW is not set | ||
| 1097 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1098 | # CONFIG_CRYPTO_XTS is not set | ||
| 1099 | |||
| 1100 | # | ||
| 1101 | # Hash modes | ||
| 1102 | # | ||
| 1103 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1104 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1105 | |||
| 1106 | # | ||
| 1107 | # Digest | ||
| 1108 | # | ||
| 1109 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1110 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1111 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1112 | CONFIG_CRYPTO_MICHAEL_MIC=y | ||
| 1113 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1114 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1115 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1116 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1117 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1118 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1119 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1120 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1121 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1122 | |||
| 1123 | # | ||
| 1124 | # Ciphers | ||
| 1125 | # | ||
| 1126 | CONFIG_CRYPTO_AES=y | ||
| 1127 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1128 | CONFIG_CRYPTO_ARC4=y | ||
| 1129 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1130 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1131 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1132 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1133 | # CONFIG_CRYPTO_DES is not set | ||
| 1134 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1135 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1136 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1137 | # CONFIG_CRYPTO_SEED is not set | ||
| 1138 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1139 | # CONFIG_CRYPTO_TEA is not set | ||
| 1140 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1141 | |||
| 1142 | # | ||
| 1143 | # Compression | ||
| 1144 | # | ||
| 1145 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1146 | # CONFIG_CRYPTO_LZO is not set | ||
| 1147 | |||
| 1148 | # | ||
| 1149 | # Random Number Generation | ||
| 1150 | # | ||
| 1151 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1152 | CONFIG_CRYPTO_HW=y | ||
| 1153 | |||
| 1154 | # | ||
| 1155 | # Library routines | ||
| 1156 | # | ||
| 1157 | CONFIG_BITREVERSE=y | ||
| 1158 | # CONFIG_CRC_CCITT is not set | ||
| 1159 | # CONFIG_CRC16 is not set | ||
| 1160 | # CONFIG_CRC_T10DIF is not set | ||
| 1161 | # CONFIG_CRC_ITU_T is not set | ||
| 1162 | CONFIG_CRC32=y | ||
| 1163 | # CONFIG_CRC7 is not set | ||
| 1164 | # CONFIG_LIBCRC32C is not set | ||
| 1165 | CONFIG_ZLIB_INFLATE=y | ||
| 1166 | CONFIG_PLIST=y | ||
| 1167 | CONFIG_HAS_IOMEM=y | ||
| 1168 | CONFIG_HAS_IOPORT=y | ||
| 1169 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/sh/include/asm/byteorder.h b/arch/sh/include/asm/byteorder.h index 4c13e6117563..f5fa0653ebc6 100644 --- a/arch/sh/include/asm/byteorder.h +++ b/arch/sh/include/asm/byteorder.h | |||
| @@ -8,7 +8,15 @@ | |||
| 8 | #include <linux/compiler.h> | 8 | #include <linux/compiler.h> |
| 9 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 10 | 10 | ||
| 11 | static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) | 11 | #ifdef __LITTLE_ENDIAN__ |
| 12 | # define __LITTLE_ENDIAN | ||
| 13 | #else | ||
| 14 | # define __BIG_ENDIAN | ||
| 15 | #endif | ||
| 16 | |||
| 17 | #define __SWAB_64_THRU_32__ | ||
| 18 | |||
| 19 | static inline __attribute_const__ __u32 __arch_swab32(__u32 x) | ||
| 12 | { | 20 | { |
| 13 | __asm__( | 21 | __asm__( |
| 14 | #ifdef __SH5__ | 22 | #ifdef __SH5__ |
| @@ -24,8 +32,9 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) | |||
| 24 | 32 | ||
| 25 | return x; | 33 | return x; |
| 26 | } | 34 | } |
| 35 | #define __arch_swab32 __arch_swab32 | ||
| 27 | 36 | ||
| 28 | static inline __attribute_const__ __u16 ___arch__swab16(__u16 x) | 37 | static inline __attribute_const__ __u16 __arch_swab16(__u16 x) |
| 29 | { | 38 | { |
| 30 | __asm__( | 39 | __asm__( |
| 31 | #ifdef __SH5__ | 40 | #ifdef __SH5__ |
| @@ -39,32 +48,21 @@ static inline __attribute_const__ __u16 ___arch__swab16(__u16 x) | |||
| 39 | 48 | ||
| 40 | return x; | 49 | return x; |
| 41 | } | 50 | } |
| 51 | #define __arch_swab16 __arch_swab16 | ||
| 42 | 52 | ||
| 43 | static inline __u64 ___arch__swab64(__u64 val) | 53 | static inline __u64 __arch_swab64(__u64 val) |
| 44 | { | 54 | { |
| 45 | union { | 55 | union { |
| 46 | struct { __u32 a,b; } s; | 56 | struct { __u32 a,b; } s; |
| 47 | __u64 u; | 57 | __u64 u; |
| 48 | } v, w; | 58 | } v, w; |
| 49 | v.u = val; | 59 | v.u = val; |
| 50 | w.s.b = ___arch__swab32(v.s.a); | 60 | w.s.b = __arch_swab32(v.s.a); |
| 51 | w.s.a = ___arch__swab32(v.s.b); | 61 | w.s.a = __arch_swab32(v.s.b); |
| 52 | return w.u; | 62 | return w.u; |
| 53 | } | 63 | } |
| 64 | #define __arch_swab64 __arch_swab64 | ||
| 54 | 65 | ||
| 55 | #define __arch__swab64(x) ___arch__swab64(x) | 66 | #include <linux/byteorder.h> |
| 56 | #define __arch__swab32(x) ___arch__swab32(x) | ||
| 57 | #define __arch__swab16(x) ___arch__swab16(x) | ||
| 58 | |||
| 59 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | ||
| 60 | # define __BYTEORDER_HAS_U64__ | ||
| 61 | # define __SWAB_64_THRU_32__ | ||
| 62 | #endif | ||
| 63 | |||
| 64 | #ifdef __LITTLE_ENDIAN__ | ||
| 65 | #include <linux/byteorder/little_endian.h> | ||
| 66 | #else | ||
| 67 | #include <linux/byteorder/big_endian.h> | ||
| 68 | #endif | ||
| 69 | 67 | ||
| 70 | #endif /* __ASM_SH_BYTEORDER_H */ | 68 | #endif /* __ASM_SH_BYTEORDER_H */ |
diff --git a/arch/sh/include/asm/hd64465/gpio.h b/arch/sh/include/asm/hd64465/gpio.h deleted file mode 100644 index a3cdca2713dd..000000000000 --- a/arch/sh/include/asm/hd64465/gpio.h +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | #ifndef _ASM_SH_HD64465_GPIO_ | ||
| 2 | #define _ASM_SH_HD64465_GPIO_ 1 | ||
| 3 | /* | ||
| 4 | * $Id: gpio.h,v 1.3 2003/05/04 19:30:14 lethal Exp $ | ||
| 5 | * | ||
| 6 | * Hitachi HD64465 companion chip: General Purpose IO pins support. | ||
| 7 | * This layer enables other device drivers to configure GPIO | ||
| 8 | * pins, get and set their values, and register an interrupt | ||
| 9 | * routine for when input pins change in hardware. | ||
| 10 | * | ||
| 11 | * by Greg Banks <gbanks@pocketpenguins.com> | ||
| 12 | * (c) 2000 PocketPenguins Inc. | ||
| 13 | */ | ||
| 14 | #include <asm/hd64465.h> | ||
| 15 | |||
| 16 | /* Macro to construct a portpin number (used in all | ||
| 17 | * subsequent functions) from a port letter and a pin | ||
| 18 | * number, e.g. HD64465_GPIO_PORTPIN('A', 5). | ||
| 19 | */ | ||
| 20 | #define HD64465_GPIO_PORTPIN(port,pin) (((port)-'A')<<3|(pin)) | ||
| 21 | |||
| 22 | /* Pin configuration constants for _configure() */ | ||
| 23 | #define HD64465_GPIO_FUNCTION2 0 /* use the pin's *other* function */ | ||
| 24 | #define HD64465_GPIO_OUT 1 /* output */ | ||
| 25 | #define HD64465_GPIO_IN_PULLUP 2 /* input, pull-up MOS on */ | ||
| 26 | #define HD64465_GPIO_IN 3 /* input */ | ||
| 27 | |||
| 28 | /* Configure a pin's direction */ | ||
| 29 | extern void hd64465_gpio_configure(int portpin, int direction); | ||
| 30 | |||
| 31 | /* Get, set value */ | ||
| 32 | extern void hd64465_gpio_set_pin(int portpin, unsigned int value); | ||
| 33 | extern unsigned int hd64465_gpio_get_pin(int portpin); | ||
| 34 | extern void hd64465_gpio_set_port(int port, unsigned int value); | ||
| 35 | extern unsigned int hd64465_gpio_get_port(int port); | ||
| 36 | |||
| 37 | /* mode constants for _register_irq() */ | ||
| 38 | #define HD64465_GPIO_FALLING 0 | ||
| 39 | #define HD64465_GPIO_RISING 1 | ||
| 40 | |||
| 41 | /* Interrupt on external value change */ | ||
| 42 | extern void hd64465_gpio_register_irq(int portpin, int mode, | ||
| 43 | void (*handler)(int portpin, void *dev), void *dev); | ||
| 44 | extern void hd64465_gpio_unregister_irq(int portpin); | ||
| 45 | |||
| 46 | #endif /* _ASM_SH_HD64465_GPIO_ */ | ||
diff --git a/arch/sh/include/asm/hd64465/hd64465.h b/arch/sh/include/asm/hd64465/hd64465.h deleted file mode 100644 index cfd0e803d2a2..000000000000 --- a/arch/sh/include/asm/hd64465/hd64465.h +++ /dev/null | |||
| @@ -1,256 +0,0 @@ | |||
| 1 | #ifndef _ASM_SH_HD64465_ | ||
| 2 | #define _ASM_SH_HD64465_ 1 | ||
| 3 | /* | ||
| 4 | * $Id: hd64465.h,v 1.3 2003/05/04 19:30:15 lethal Exp $ | ||
| 5 | * | ||
| 6 | * Hitachi HD64465 companion chip support | ||
| 7 | * | ||
| 8 | * by Greg Banks <gbanks@pocketpenguins.com> | ||
| 9 | * (c) 2000 PocketPenguins Inc. | ||
| 10 | * | ||
| 11 | * Derived from <asm/hd64461.h> which bore the message: | ||
| 12 | * Copyright (C) 2000 YAEGASHI Takeshi | ||
| 13 | */ | ||
| 14 | #include <asm/io.h> | ||
| 15 | #include <asm/irq.h> | ||
| 16 | |||
| 17 | /* | ||
| 18 | * Note that registers are defined here as virtual port numbers, | ||
| 19 | * which have no meaning except to get translated by hd64465_isa_port2addr() | ||
| 20 | * to an address in the range 0xb0000000-0xb3ffffff. Note that | ||
| 21 | * this translation happens to consist of adding the lower 16 bits | ||
| 22 | * of the virtual port number to 0xb0000000. Note also that the manual | ||
| 23 | * shows addresses as absolute physical addresses starting at 0x10000000, | ||
| 24 | * so e.g. the NIRR register is listed as 0x15000 here, 0x10005000 in the | ||
| 25 | * manual, and accessed using address 0xb0005000 - Greg. | ||
| 26 | */ | ||
| 27 | |||
| 28 | /* System registers */ | ||
| 29 | #define HD64465_REG_SRR 0x1000c /* System Revision Register */ | ||
| 30 | #define HD64465_REG_SDID 0x10010 /* System Device ID Reg */ | ||
| 31 | #define HD64465_SDID 0x8122 /* 64465 device ID */ | ||
| 32 | |||
| 33 | /* Power Management registers */ | ||
| 34 | #define HD64465_REG_SMSCR 0x10000 /* System Module Standby Control Reg */ | ||
| 35 | #define HD64465_SMSCR_PS2ST 0x4000 /* PS/2 Standby */ | ||
| 36 | #define HD64465_SMSCR_ADCST 0x1000 /* ADC Standby */ | ||
| 37 | #define HD64465_SMSCR_UARTST 0x0800 /* UART Standby */ | ||
| 38 | #define HD64465_SMSCR_SCDIST 0x0200 /* Serial Codec Standby */ | ||
| 39 | #define HD64465_SMSCR_PPST 0x0100 /* Parallel Port Standby */ | ||
| 40 | #define HD64465_SMSCR_PC0ST 0x0040 /* PCMCIA0 Standby */ | ||
| 41 | #define HD64465_SMSCR_PC1ST 0x0020 /* PCMCIA1 Standby */ | ||
| 42 | #define HD64465_SMSCR_AFEST 0x0010 /* AFE Standby */ | ||
| 43 | #define HD64465_SMSCR_TM0ST 0x0008 /* Timer0 Standby */ | ||
| 44 | #define HD64465_SMSCR_TM1ST 0x0004 /* Timer1 Standby */ | ||
| 45 | #define HD64465_SMSCR_IRDAST 0x0002 /* IRDA Standby */ | ||
| 46 | #define HD64465_SMSCR_KBCST 0x0001 /* Keyboard Controller Standby */ | ||
| 47 | |||
| 48 | /* Interrupt Controller registers */ | ||
| 49 | #define HD64465_REG_NIRR 0x15000 /* Interrupt Request Register */ | ||
| 50 | #define HD64465_REG_NIMR 0x15002 /* Interrupt Mask Register */ | ||
| 51 | #define HD64465_REG_NITR 0x15004 /* Interrupt Trigger Mode Register */ | ||
| 52 | |||
| 53 | /* Timer registers */ | ||
| 54 | #define HD64465_REG_TCVR1 0x16000 /* Timer 1 constant value register */ | ||
| 55 | #define HD64465_REG_TCVR0 0x16002 /* Timer 0 constant value register */ | ||
| 56 | #define HD64465_REG_TRVR1 0x16004 /* Timer 1 read value register */ | ||
| 57 | #define HD64465_REG_TRVR0 0x16006 /* Timer 0 read value register */ | ||
| 58 | #define HD64465_REG_TCR1 0x16008 /* Timer 1 control register */ | ||
| 59 | #define HD64465_REG_TCR0 0x1600A /* Timer 0 control register */ | ||
| 60 | #define HD64465_TCR_EADT 0x10 /* Enable ADTRIG# signal */ | ||
| 61 | #define HD64465_TCR_ETMO 0x08 /* Enable TMO signal */ | ||
| 62 | #define HD64465_TCR_PST_MASK 0x06 /* Clock Prescale */ | ||
| 63 | #define HD64465_TCR_PST_1 0x06 /* 1:1 */ | ||
| 64 | #define HD64465_TCR_PST_4 0x04 /* 1:4 */ | ||
| 65 | #define HD64465_TCR_PST_8 0x02 /* 1:8 */ | ||
| 66 | #define HD64465_TCR_PST_16 0x00 /* 1:16 */ | ||
| 67 | #define HD64465_TCR_TSTP 0x01 /* Start/Stop timer */ | ||
| 68 | #define HD64465_REG_TIRR 0x1600C /* Timer interrupt request register */ | ||
| 69 | #define HD64465_REG_TIDR 0x1600E /* Timer interrupt disable register */ | ||
| 70 | #define HD64465_REG_PWM1CS 0x16010 /* PWM 1 clock scale register */ | ||
| 71 | #define HD64465_REG_PWM1LPC 0x16012 /* PWM 1 low pulse width counter register */ | ||
| 72 | #define HD64465_REG_PWM1HPC 0x16014 /* PWM 1 high pulse width counter register */ | ||
| 73 | #define HD64465_REG_PWM0CS 0x16018 /* PWM 0 clock scale register */ | ||
| 74 | #define HD64465_REG_PWM0LPC 0x1601A /* PWM 0 low pulse width counter register */ | ||
| 75 | #define HD64465_REG_PWM0HPC 0x1601C /* PWM 0 high pulse width counter register */ | ||
| 76 | |||
| 77 | /* Analog/Digital Converter registers */ | ||
| 78 | #define HD64465_REG_ADDRA 0x1E000 /* A/D data register A */ | ||
| 79 | #define HD64465_REG_ADDRB 0x1E002 /* A/D data register B */ | ||
| 80 | #define HD64465_REG_ADDRC 0x1E004 /* A/D data register C */ | ||
| 81 | #define HD64465_REG_ADDRD 0x1E006 /* A/D data register D */ | ||
| 82 | #define HD64465_REG_ADCSR 0x1E008 /* A/D control/status register */ | ||
| 83 | #define HD64465_ADCSR_ADF 0x80 /* A/D End Flag */ | ||
| 84 | #define HD64465_ADCSR_ADST 0x40 /* A/D Start Flag */ | ||
| 85 | #define HD64465_ADCSR_ADIS 0x20 /* A/D Interrupt Status */ | ||
| 86 | #define HD64465_ADCSR_TRGE 0x10 /* A/D Trigger Enable */ | ||
| 87 | #define HD64465_ADCSR_ADIE 0x08 /* A/D Interrupt Enable */ | ||
| 88 | #define HD64465_ADCSR_SCAN 0x04 /* A/D Scan Mode */ | ||
| 89 | #define HD64465_ADCSR_CH_MASK 0x03 /* A/D Channel */ | ||
| 90 | #define HD64465_REG_ADCALCR 0x1E00A /* A/D calibration sample control */ | ||
| 91 | #define HD64465_REG_ADCAL 0x1E00C /* A/D calibration data register */ | ||
| 92 | |||
| 93 | |||
| 94 | /* General Purpose I/O ports registers */ | ||
| 95 | #define HD64465_REG_GPACR 0x14000 /* Port A Control Register */ | ||
| 96 | #define HD64465_REG_GPBCR 0x14002 /* Port B Control Register */ | ||
| 97 | #define HD64465_REG_GPCCR 0x14004 /* Port C Control Register */ | ||
| 98 | #define HD64465_REG_GPDCR 0x14006 /* Port D Control Register */ | ||
| 99 | #define HD64465_REG_GPECR 0x14008 /* Port E Control Register */ | ||
| 100 | #define HD64465_REG_GPADR 0x14010 /* Port A Data Register */ | ||
| 101 | #define HD64465_REG_GPBDR 0x14012 /* Port B Data Register */ | ||
| 102 | #define HD64465_REG_GPCDR 0x14014 /* Port C Data Register */ | ||
| 103 | #define HD64465_REG_GPDDR 0x14016 /* Port D Data Register */ | ||
| 104 | #define HD64465_REG_GPEDR 0x14018 /* Port E Data Register */ | ||
| 105 | #define HD64465_REG_GPAICR 0x14020 /* Port A Interrupt Control Register */ | ||
| 106 | #define HD64465_REG_GPBICR 0x14022 /* Port B Interrupt Control Register */ | ||
| 107 | #define HD64465_REG_GPCICR 0x14024 /* Port C Interrupt Control Register */ | ||
| 108 | #define HD64465_REG_GPDICR 0x14026 /* Port D Interrupt Control Register */ | ||
| 109 | #define HD64465_REG_GPEICR 0x14028 /* Port E Interrupt Control Register */ | ||
| 110 | #define HD64465_REG_GPAISR 0x14040 /* Port A Interrupt Status Register */ | ||
| 111 | #define HD64465_REG_GPBISR 0x14042 /* Port B Interrupt Status Register */ | ||
| 112 | #define HD64465_REG_GPCISR 0x14044 /* Port C Interrupt Status Register */ | ||
| 113 | #define HD64465_REG_GPDISR 0x14046 /* Port D Interrupt Status Register */ | ||
| 114 | #define HD64465_REG_GPEISR 0x14048 /* Port E Interrupt Status Register */ | ||
| 115 | |||
| 116 | /* PCMCIA bridge interface */ | ||
| 117 | #define HD64465_REG_PCC0ISR 0x12000 /* socket 0 interface status */ | ||
| 118 | #define HD64465_PCCISR_PREADY 0x80 /* mem card ready / io card IREQ */ | ||
| 119 | #define HD64465_PCCISR_PIREQ 0x80 | ||
| 120 | #define HD64465_PCCISR_PMWP 0x40 /* mem card write-protected */ | ||
| 121 | #define HD64465_PCCISR_PVS2 0x20 /* voltage select pin 2 */ | ||
| 122 | #define HD64465_PCCISR_PVS1 0x10 /* voltage select pin 1 */ | ||
| 123 | #define HD64465_PCCISR_PCD_MASK 0x0c /* card detect */ | ||
| 124 | #define HD64465_PCCISR_PBVD_MASK 0x03 /* battery voltage */ | ||
| 125 | #define HD64465_PCCISR_PBVD_BATGOOD 0x03 /* battery good */ | ||
| 126 | #define HD64465_PCCISR_PBVD_BATWARN 0x01 /* battery low warning */ | ||
| 127 | #define HD64465_PCCISR_PBVD_BATDEAD1 0x02 /* battery dead */ | ||
| 128 | #define HD64465_PCCISR_PBVD_BATDEAD2 0x00 /* battery dead */ | ||
| 129 | #define HD64465_REG_PCC0GCR 0x12002 /* socket 0 general control */ | ||
| 130 | #define HD64465_PCCGCR_PDRV 0x80 /* output drive */ | ||
| 131 | #define HD64465_PCCGCR_PCCR 0x40 /* PC card reset */ | ||
| 132 | #define HD64465_PCCGCR_PCCT 0x20 /* PC card type, 1=IO&mem, 0=mem */ | ||
| 133 | #define HD64465_PCCGCR_PVCC0 0x10 /* voltage control pin VCC0SEL0 */ | ||
| 134 | #define HD64465_PCCGCR_PMMOD 0x08 /* memory mode */ | ||
| 135 | #define HD64465_PCCGCR_PPA25 0x04 /* pin A25 */ | ||
| 136 | #define HD64465_PCCGCR_PPA24 0x02 /* pin A24 */ | ||
| 137 | #define HD64465_PCCGCR_PREG 0x01 /* ping PCC0REG# */ | ||
| 138 | #define HD64465_REG_PCC0CSCR 0x12004 /* socket 0 card status change */ | ||
| 139 | #define HD64465_PCCCSCR_PSCDI 0x80 /* sw card detect intr */ | ||
| 140 | #define HD64465_PCCCSCR_PSWSEL 0x40 /* power select */ | ||
| 141 | #define HD64465_PCCCSCR_PIREQ 0x20 /* IREQ intr req */ | ||
| 142 | #define HD64465_PCCCSCR_PSC 0x10 /* STSCHG (status change) pin */ | ||
| 143 | #define HD64465_PCCCSCR_PCDC 0x08 /* CD (card detect) change */ | ||
| 144 | #define HD64465_PCCCSCR_PRC 0x04 /* ready change */ | ||
| 145 | #define HD64465_PCCCSCR_PBW 0x02 /* battery warning change */ | ||
| 146 | #define HD64465_PCCCSCR_PBD 0x01 /* battery dead change */ | ||
| 147 | #define HD64465_REG_PCC0CSCIER 0x12006 /* socket 0 card status change interrupt enable */ | ||
| 148 | #define HD64465_PCCCSCIER_PCRE 0x80 /* change reset enable */ | ||
| 149 | #define HD64465_PCCCSCIER_PIREQE_MASK 0x60 /* IREQ enable */ | ||
| 150 | #define HD64465_PCCCSCIER_PIREQE_DISABLED 0x00 /* IREQ disabled */ | ||
| 151 | #define HD64465_PCCCSCIER_PIREQE_LEVEL 0x20 /* IREQ level-triggered */ | ||
| 152 | #define HD64465_PCCCSCIER_PIREQE_FALLING 0x40 /* IREQ falling-edge-trig */ | ||
| 153 | #define HD64465_PCCCSCIER_PIREQE_RISING 0x60 /* IREQ rising-edge-trig */ | ||
| 154 | #define HD64465_PCCCSCIER_PSCE 0x10 /* status change enable */ | ||
| 155 | #define HD64465_PCCCSCIER_PCDE 0x08 /* card detect change enable */ | ||
| 156 | #define HD64465_PCCCSCIER_PRE 0x04 /* ready change enable */ | ||
| 157 | #define HD64465_PCCCSCIER_PBWE 0x02 /* battery warn change enable */ | ||
| 158 | #define HD64465_PCCCSCIER_PBDE 0x01 /* battery dead change enable*/ | ||
| 159 | #define HD64465_REG_PCC0SCR 0x12008 /* socket 0 software control */ | ||
| 160 | #define HD64465_PCCSCR_SHDN 0x10 /* TPS2206 SHutDowN pin */ | ||
| 161 | #define HD64465_PCCSCR_SWP 0x01 /* write protect */ | ||
| 162 | #define HD64465_REG_PCCPSR 0x1200A /* serial power switch control */ | ||
| 163 | #define HD64465_REG_PCC1ISR 0x12010 /* socket 1 interface status */ | ||
| 164 | #define HD64465_REG_PCC1GCR 0x12012 /* socket 1 general control */ | ||
| 165 | #define HD64465_REG_PCC1CSCR 0x12014 /* socket 1 card status change */ | ||
| 166 | #define HD64465_REG_PCC1CSCIER 0x12016 /* socket 1 card status change interrupt enable */ | ||
| 167 | #define HD64465_REG_PCC1SCR 0x12018 /* socket 1 software control */ | ||
| 168 | |||
| 169 | |||
| 170 | /* PS/2 Keyboard and mouse controller -- *not* register compatible */ | ||
| 171 | #define HD64465_REG_KBCSR 0x1dc00 /* Keyboard Control/Status reg */ | ||
| 172 | #define HD64465_KBCSR_KBCIE 0x8000 /* KBCK Input Enable */ | ||
| 173 | #define HD64465_KBCSR_KBCOE 0x4000 /* KBCK Output Enable */ | ||
| 174 | #define HD64465_KBCSR_KBDOE 0x2000 /* KB DATA Output Enable */ | ||
| 175 | #define HD64465_KBCSR_KBCD 0x1000 /* KBCK Driven */ | ||
| 176 | #define HD64465_KBCSR_KBDD 0x0800 /* KB DATA Driven */ | ||
| 177 | #define HD64465_KBCSR_KBCS 0x0400 /* KBCK pin Status */ | ||
| 178 | #define HD64465_KBCSR_KBDS 0x0200 /* KB DATA pin Status */ | ||
| 179 | #define HD64465_KBCSR_KBDP 0x0100 /* KB DATA Parity bit */ | ||
| 180 | #define HD64465_KBCSR_KBD_MASK 0x00ff /* KD DATA shift reg */ | ||
| 181 | #define HD64465_REG_KBISR 0x1dc04 /* Keyboard Interrupt Status reg */ | ||
| 182 | #define HD64465_KBISR_KBRDF 0x0001 /* KB Received Data Full */ | ||
| 183 | #define HD64465_REG_MSCSR 0x1dc10 /* Mouse Control/Status reg */ | ||
| 184 | #define HD64465_REG_MSISR 0x1dc14 /* Mouse Interrupt Status reg */ | ||
| 185 | |||
| 186 | |||
| 187 | /* | ||
| 188 | * Logical address at which the HD64465 is mapped. Note that this | ||
| 189 | * should always be in the P2 segment (uncached and untranslated). | ||
| 190 | */ | ||
| 191 | #ifndef CONFIG_HD64465_IOBASE | ||
| 192 | #define CONFIG_HD64465_IOBASE 0xb0000000 | ||
| 193 | #endif | ||
| 194 | /* | ||
| 195 | * The HD64465 multiplexes all its modules' interrupts onto | ||
| 196 | * this single interrupt. | ||
| 197 | */ | ||
| 198 | #ifndef CONFIG_HD64465_IRQ | ||
| 199 | #define CONFIG_HD64465_IRQ 5 | ||
| 200 | #endif | ||
| 201 | |||
| 202 | |||
| 203 | #define _HD64465_IO_MASK 0xf8000000 | ||
| 204 | #define is_hd64465_addr(addr) \ | ||
| 205 | ((addr & _HD64465_IO_MASK) == (CONFIG_HD64465_IOBASE & _HD64465_IO_MASK)) | ||
| 206 | |||
| 207 | /* | ||
| 208 | * A range of 16 virtual interrupts generated by | ||
| 209 | * demuxing the HD64465 muxed interrupt. | ||
| 210 | */ | ||
| 211 | #define HD64465_IRQ_BASE OFFCHIP_IRQ_BASE | ||
| 212 | #define HD64465_IRQ_NUM 16 | ||
| 213 | #define HD64465_IRQ_ADC (HD64465_IRQ_BASE+0) | ||
| 214 | #define HD64465_IRQ_USB (HD64465_IRQ_BASE+1) | ||
| 215 | #define HD64465_IRQ_SCDI (HD64465_IRQ_BASE+2) | ||
| 216 | #define HD64465_IRQ_PARALLEL (HD64465_IRQ_BASE+3) | ||
| 217 | /* bit 4 is reserved */ | ||
| 218 | #define HD64465_IRQ_UART (HD64465_IRQ_BASE+5) | ||
| 219 | #define HD64465_IRQ_IRDA (HD64465_IRQ_BASE+6) | ||
| 220 | #define HD64465_IRQ_PS2MOUSE (HD64465_IRQ_BASE+7) | ||
| 221 | #define HD64465_IRQ_KBC (HD64465_IRQ_BASE+8) | ||
| 222 | #define HD64465_IRQ_TIMER1 (HD64465_IRQ_BASE+9) | ||
| 223 | #define HD64465_IRQ_TIMER0 (HD64465_IRQ_BASE+10) | ||
| 224 | #define HD64465_IRQ_GPIO (HD64465_IRQ_BASE+11) | ||
| 225 | #define HD64465_IRQ_AFE (HD64465_IRQ_BASE+12) | ||
| 226 | #define HD64465_IRQ_PCMCIA1 (HD64465_IRQ_BASE+13) | ||
| 227 | #define HD64465_IRQ_PCMCIA0 (HD64465_IRQ_BASE+14) | ||
| 228 | #define HD64465_IRQ_PS2KBD (HD64465_IRQ_BASE+15) | ||
| 229 | |||
| 230 | /* Constants for PCMCIA mappings */ | ||
| 231 | #define HD64465_PCC_WINDOW 0x01000000 | ||
| 232 | |||
| 233 | #define HD64465_PCC0_BASE 0xb8000000 /* area 6 */ | ||
| 234 | #define HD64465_PCC0_ATTR (HD64465_PCC0_BASE) | ||
| 235 | #define HD64465_PCC0_COMM (HD64465_PCC0_BASE+HD64465_PCC_WINDOW) | ||
| 236 | #define HD64465_PCC0_IO (HD64465_PCC0_BASE+2*HD64465_PCC_WINDOW) | ||
| 237 | |||
| 238 | #define HD64465_PCC1_BASE 0xb4000000 /* area 5 */ | ||
| 239 | #define HD64465_PCC1_ATTR (HD64465_PCC1_BASE) | ||
| 240 | #define HD64465_PCC1_COMM (HD64465_PCC1_BASE+HD64465_PCC_WINDOW) | ||
| 241 | #define HD64465_PCC1_IO (HD64465_PCC1_BASE+2*HD64465_PCC_WINDOW) | ||
| 242 | |||
| 243 | /* | ||
| 244 | * Base of USB controller interface (as memory) | ||
| 245 | */ | ||
| 246 | #define HD64465_USB_BASE (CONFIG_HD64465_IOBASE+0xb000) | ||
| 247 | #define HD64465_USB_LEN 0x1000 | ||
| 248 | /* | ||
| 249 | * Base of embedded SRAM, used for USB controller. | ||
| 250 | */ | ||
| 251 | #define HD64465_SRAM_BASE (CONFIG_HD64465_IOBASE+0x9000) | ||
| 252 | #define HD64465_SRAM_LEN 0x1000 | ||
| 253 | |||
| 254 | |||
| 255 | |||
| 256 | #endif /* _ASM_SH_HD64465_ */ | ||
diff --git a/arch/sh/include/asm/hd64465/io.h b/arch/sh/include/asm/hd64465/io.h deleted file mode 100644 index 139f1472e5bb..000000000000 --- a/arch/sh/include/asm/hd64465/io.h +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * include/asm-sh/hd64465/io.h | ||
| 3 | * | ||
| 4 | * By Greg Banks <gbanks@pocketpenguins.com> | ||
| 5 | * (c) 2000 PocketPenguins Inc. | ||
| 6 | * | ||
| 7 | * Derived from io_hd64461.h, which bore the message: | ||
| 8 | * Copyright 2000 Stuart Menefy (stuart.menefy@st.com) | ||
| 9 | * | ||
| 10 | * May be copied or modified under the terms of the GNU General Public | ||
| 11 | * License. See linux/COPYING for more information. | ||
| 12 | * | ||
| 13 | * IO functions for an HD64465 "Windows CE Intelligent Peripheral Controller". | ||
| 14 | */ | ||
| 15 | |||
| 16 | #ifndef _ASM_SH_IO_HD64465_H | ||
| 17 | #define _ASM_SH_IO_HD64465_H | ||
| 18 | |||
| 19 | extern unsigned char hd64465_inb(unsigned long port); | ||
| 20 | extern unsigned short hd64465_inw(unsigned long port); | ||
| 21 | extern unsigned int hd64465_inl(unsigned long port); | ||
| 22 | |||
| 23 | extern void hd64465_outb(unsigned char value, unsigned long port); | ||
| 24 | extern void hd64465_outw(unsigned short value, unsigned long port); | ||
| 25 | extern void hd64465_outl(unsigned int value, unsigned long port); | ||
| 26 | |||
| 27 | extern unsigned char hd64465_inb_p(unsigned long port); | ||
| 28 | extern void hd64465_outb_p(unsigned char value, unsigned long port); | ||
| 29 | |||
| 30 | extern unsigned long hd64465_isa_port2addr(unsigned long offset); | ||
| 31 | extern int hd64465_irq_demux(int irq); | ||
| 32 | /* Provision for generic secondary demux step -- used by PCMCIA code */ | ||
| 33 | extern void hd64465_register_irq_demux(int irq, | ||
| 34 | int (*demux)(int irq, void *dev), void *dev); | ||
| 35 | extern void hd64465_unregister_irq_demux(int irq); | ||
| 36 | /* Set this variable to 1 to see port traffic */ | ||
| 37 | extern int hd64465_io_debug; | ||
| 38 | /* Map a range of ports to a range of kernel virtual memory. | ||
| 39 | */ | ||
| 40 | extern void hd64465_port_map(unsigned short baseport, unsigned int nports, | ||
| 41 | unsigned long addr, unsigned char shift); | ||
| 42 | extern void hd64465_port_unmap(unsigned short baseport, unsigned int nports); | ||
| 43 | |||
| 44 | #endif /* _ASM_SH_IO_HD64465_H */ | ||
diff --git a/arch/sh/include/asm/serial.h b/arch/sh/include/asm/serial.h index e13cc948ee60..11f854dd1363 100644 --- a/arch/sh/include/asm/serial.h +++ b/arch/sh/include/asm/serial.h | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | #ifndef _ASM_SERIAL_H | 7 | #ifndef _ASM_SERIAL_H |
| 8 | #define _ASM_SERIAL_H | 8 | #define _ASM_SERIAL_H |
| 9 | 9 | ||
| 10 | #include <linux/kernel.h> | ||
| 11 | |||
| 12 | /* | 10 | /* |
| 13 | * This assumes you have a 1.8432 MHz clock for your UART. | 11 | * This assumes you have a 1.8432 MHz clock for your UART. |
| 14 | * | 12 | * |
| @@ -18,19 +16,4 @@ | |||
| 18 | */ | 16 | */ |
| 19 | #define BASE_BAUD ( 1843200 / 16 ) | 17 | #define BASE_BAUD ( 1843200 / 16 ) |
| 20 | 18 | ||
| 21 | #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) | ||
| 22 | |||
| 23 | #ifdef CONFIG_HD64465 | ||
| 24 | #include <asm/hd64465/hd64465.h> | ||
| 25 | |||
| 26 | #define SERIAL_PORT_DFNS \ | ||
| 27 | /* UART CLK PORT IRQ FLAGS */ \ | ||
| 28 | { 0, BASE_BAUD, 0x3F8, HD64465_IRQ_UART, STD_COM_FLAGS } /* ttyS0 */ | ||
| 29 | |||
| 30 | #else | ||
| 31 | |||
| 32 | #define SERIAL_PORT_DFNS | ||
| 33 | |||
| 34 | #endif | ||
| 35 | |||
| 36 | #endif /* _ASM_SERIAL_H */ | 19 | #endif /* _ASM_SERIAL_H */ |
diff --git a/arch/sh/include/cpu-sh4/cpu/rtc.h b/arch/sh/include/cpu-sh4/cpu/rtc.h index 25b1e6adfe8c..95e6fb76c24d 100644 --- a/arch/sh/include/cpu-sh4/cpu/rtc.h +++ b/arch/sh/include/cpu-sh4/cpu/rtc.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef __ASM_SH_CPU_SH4_RTC_H | 1 | #ifndef __ASM_SH_CPU_SH4_RTC_H |
| 2 | #define __ASM_SH_CPU_SH4_RTC_H | 2 | #define __ASM_SH_CPU_SH4_RTC_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_CPU_SUBTYPE_SH7723 | 4 | #if defined(CONFIG_CPU_SUBTYPE_SH7722) || defined(CONFIG_CPU_SUBTYPE_SH7723) |
| 5 | #define rtc_reg_size sizeof(u16) | 5 | #define rtc_reg_size sizeof(u16) |
| 6 | #else | 6 | #else |
| 7 | #define rtc_reg_size sizeof(u32) | 7 | #define rtc_reg_size sizeof(u32) |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c index 6851dba02f31..e17db39b97aa 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c | |||
| @@ -36,6 +36,32 @@ static struct platform_device iic_device = { | |||
| 36 | .resource = iic_resources, | 36 | .resource = iic_resources, |
| 37 | }; | 37 | }; |
| 38 | 38 | ||
| 39 | static struct resource usb_host_resources[] = { | ||
| 40 | [0] = { | ||
| 41 | .name = "r8a66597_hcd", | ||
| 42 | .start = 0xa4d80000, | ||
| 43 | .end = 0xa4d800ff, | ||
| 44 | .flags = IORESOURCE_MEM, | ||
| 45 | }, | ||
| 46 | [1] = { | ||
| 47 | .name = "r8a66597_hcd", | ||
| 48 | .start = 65, | ||
| 49 | .end = 65, | ||
| 50 | .flags = IORESOURCE_IRQ, | ||
| 51 | }, | ||
| 52 | }; | ||
| 53 | |||
| 54 | static struct platform_device usb_host_device = { | ||
| 55 | .name = "r8a66597_hcd", | ||
| 56 | .id = -1, | ||
| 57 | .dev = { | ||
| 58 | .dma_mask = NULL, | ||
| 59 | .coherent_dma_mask = 0xffffffff, | ||
| 60 | }, | ||
| 61 | .num_resources = ARRAY_SIZE(usb_host_resources), | ||
| 62 | .resource = usb_host_resources, | ||
| 63 | }; | ||
| 64 | |||
| 39 | static struct uio_info vpu_platform_data = { | 65 | static struct uio_info vpu_platform_data = { |
| 40 | .name = "VPU5", | 66 | .name = "VPU5", |
| 41 | .version = "0", | 67 | .version = "0", |
| @@ -142,6 +168,7 @@ static struct platform_device sci_device = { | |||
| 142 | static struct platform_device *sh7366_devices[] __initdata = { | 168 | static struct platform_device *sh7366_devices[] __initdata = { |
| 143 | &iic_device, | 169 | &iic_device, |
| 144 | &sci_device, | 170 | &sci_device, |
| 171 | &usb_host_device, | ||
| 145 | &vpu_device, | 172 | &vpu_device, |
| 146 | &veu0_device, | 173 | &veu0_device, |
| 147 | &veu1_device, | 174 | &veu1_device, |
| @@ -158,6 +185,7 @@ static int __init sh7366_devices_setup(void) | |||
| 158 | clk_always_enable("mstp022"); /* INTC */ | 185 | clk_always_enable("mstp022"); /* INTC */ |
| 159 | clk_always_enable("mstp020"); /* SuperHyway */ | 186 | clk_always_enable("mstp020"); /* SuperHyway */ |
| 160 | clk_always_enable("mstp109"); /* I2C */ | 187 | clk_always_enable("mstp109"); /* I2C */ |
| 188 | clk_always_enable("mstp211"); /* USB */ | ||
| 161 | clk_always_enable("mstp207"); /* VEU-2 */ | 189 | clk_always_enable("mstp207"); /* VEU-2 */ |
| 162 | clk_always_enable("mstp202"); /* VEU-1 */ | 190 | clk_always_enable("mstp202"); /* VEU-1 */ |
| 163 | clk_always_enable("mstp201"); /* VPU */ | 191 | clk_always_enable("mstp201"); /* VPU */ |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index de1ede92176e..ef77ee1d9f53 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * SH7722 Setup | 2 | * SH7722 Setup |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2006 - 2007 Paul Mundt | 4 | * Copyright (C) 2006 - 2008 Paul Mundt |
| 5 | * | 5 | * |
| 6 | * This file is subject to the terms and conditions of the GNU General Public | 6 | * This file is subject to the terms and conditions of the GNU General Public |
| 7 | * License. See the file "COPYING" in the main directory of this archive | 7 | * License. See the file "COPYING" in the main directory of this archive |
| @@ -16,6 +16,36 @@ | |||
| 16 | #include <asm/clock.h> | 16 | #include <asm/clock.h> |
| 17 | #include <asm/mmzone.h> | 17 | #include <asm/mmzone.h> |
| 18 | 18 | ||
| 19 | static struct resource rtc_resources[] = { | ||
| 20 | [0] = { | ||
| 21 | .start = 0xa465fec0, | ||
| 22 | .end = 0xa465fec0 + 0x58 - 1, | ||
| 23 | .flags = IORESOURCE_IO, | ||
| 24 | }, | ||
| 25 | [1] = { | ||
| 26 | /* Period IRQ */ | ||
| 27 | .start = 45, | ||
| 28 | .flags = IORESOURCE_IRQ, | ||
| 29 | }, | ||
| 30 | [2] = { | ||
| 31 | /* Carry IRQ */ | ||
| 32 | .start = 46, | ||
| 33 | .flags = IORESOURCE_IRQ, | ||
| 34 | }, | ||
| 35 | [3] = { | ||
| 36 | /* Alarm IRQ */ | ||
| 37 | .start = 44, | ||
| 38 | .flags = IORESOURCE_IRQ, | ||
| 39 | }, | ||
| 40 | }; | ||
| 41 | |||
| 42 | static struct platform_device rtc_device = { | ||
| 43 | .name = "sh-rtc", | ||
| 44 | .id = -1, | ||
| 45 | .num_resources = ARRAY_SIZE(rtc_resources), | ||
| 46 | .resource = rtc_resources, | ||
| 47 | }; | ||
| 48 | |||
| 19 | static struct resource usbf_resources[] = { | 49 | static struct resource usbf_resources[] = { |
| 20 | [0] = { | 50 | [0] = { |
| 21 | .name = "m66592_udc", | 51 | .name = "m66592_udc", |
| @@ -150,6 +180,7 @@ static struct platform_device sci_device = { | |||
| 150 | }; | 180 | }; |
| 151 | 181 | ||
| 152 | static struct platform_device *sh7722_devices[] __initdata = { | 182 | static struct platform_device *sh7722_devices[] __initdata = { |
| 183 | &rtc_device, | ||
| 153 | &usbf_device, | 184 | &usbf_device, |
| 154 | &iic_device, | 185 | &iic_device, |
| 155 | &sci_device, | 186 | &sci_device, |
| @@ -202,7 +233,6 @@ enum { | |||
| 202 | IRDA, JPU, LCDC, | 233 | IRDA, JPU, LCDC, |
| 203 | 234 | ||
| 204 | /* interrupt groups */ | 235 | /* interrupt groups */ |
| 205 | |||
| 206 | SIM, RTC, DMAC0123, VIOVOU, USB, DMAC45, FLCTL, I2C, SDHI, | 236 | SIM, RTC, DMAC0123, VIOVOU, USB, DMAC45, FLCTL, I2C, SDHI, |
| 207 | }; | 237 | }; |
| 208 | 238 | ||
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 1a5cf9dd82de..5b7efc4016fa 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
| @@ -372,7 +372,7 @@ syscall_exit: | |||
| 372 | 7: .long do_syscall_trace_enter | 372 | 7: .long do_syscall_trace_enter |
| 373 | 8: .long do_syscall_trace_leave | 373 | 8: .long do_syscall_trace_leave |
| 374 | 374 | ||
| 375 | #ifdef CONFIG_FTRACE | 375 | #ifdef CONFIG_FUNCTION_TRACER |
| 376 | .align 2 | 376 | .align 2 |
| 377 | .globl _mcount | 377 | .globl _mcount |
| 378 | .type _mcount,@function | 378 | .type _mcount,@function |
| @@ -414,4 +414,4 @@ skip_trace: | |||
| 414 | ftrace_stub: | 414 | ftrace_stub: |
| 415 | rts | 415 | rts |
| 416 | nop | 416 | nop |
| 417 | #endif /* CONFIG_FTRACE */ | 417 | #endif /* CONFIG_FUNCTION_TRACER */ |
diff --git a/arch/sh/kernel/sh_ksyms_32.c b/arch/sh/kernel/sh_ksyms_32.c index d366a7443720..92ae5e6c099e 100644 --- a/arch/sh/kernel/sh_ksyms_32.c +++ b/arch/sh/kernel/sh_ksyms_32.c | |||
| @@ -50,7 +50,10 @@ EXPORT_SYMBOL(__udelay); | |||
| 50 | EXPORT_SYMBOL(__ndelay); | 50 | EXPORT_SYMBOL(__ndelay); |
| 51 | EXPORT_SYMBOL(__const_udelay); | 51 | EXPORT_SYMBOL(__const_udelay); |
| 52 | 52 | ||
| 53 | #define DECLARE_EXPORT(name) extern void name(void);EXPORT_SYMBOL(name) | 53 | #define DECLARE_EXPORT(name) \ |
| 54 | extern void name(void);EXPORT_SYMBOL(name) | ||
| 55 | #define MAYBE_DECLARE_EXPORT(name) \ | ||
| 56 | extern void name(void) __weak;EXPORT_SYMBOL(name) | ||
| 54 | 57 | ||
| 55 | /* These symbols are generated by the compiler itself */ | 58 | /* These symbols are generated by the compiler itself */ |
| 56 | DECLARE_EXPORT(__udivsi3); | 59 | DECLARE_EXPORT(__udivsi3); |
| @@ -109,10 +112,8 @@ DECLARE_EXPORT(__movmemSI12_i4); | |||
| 109 | * compiler which include backported patches. | 112 | * compiler which include backported patches. |
| 110 | */ | 113 | */ |
| 111 | DECLARE_EXPORT(__udiv_qrnnd_16); | 114 | DECLARE_EXPORT(__udiv_qrnnd_16); |
| 112 | #if !defined(CONFIG_CPU_SH2) | 115 | MAYBE_DECLARE_EXPORT(__sdivsi3_i4i); |
| 113 | DECLARE_EXPORT(__sdivsi3_i4i); | 116 | MAYBE_DECLARE_EXPORT(__udivsi3_i4i); |
| 114 | DECLARE_EXPORT(__udivsi3_i4i); | ||
| 115 | #endif | ||
| 116 | #endif | 117 | #endif |
| 117 | #else /* GCC 3.x */ | 118 | #else /* GCC 3.x */ |
| 118 | DECLARE_EXPORT(__movstr_i4_even); | 119 | DECLARE_EXPORT(__movstr_i4_even); |
| @@ -133,7 +134,7 @@ EXPORT_SYMBOL(flush_dcache_page); | |||
| 133 | EXPORT_SYMBOL(clear_user_page); | 134 | EXPORT_SYMBOL(clear_user_page); |
| 134 | #endif | 135 | #endif |
| 135 | 136 | ||
| 136 | #ifdef CONFIG_FTRACE | 137 | #ifdef CONFIG_FUNCTION_TRACER |
| 137 | EXPORT_SYMBOL(mcount); | 138 | EXPORT_SYMBOL(mcount); |
| 138 | #endif | 139 | #endif |
| 139 | EXPORT_SYMBOL(csum_partial); | 140 | EXPORT_SYMBOL(csum_partial); |
diff --git a/arch/sh/mm/cache-sh2a.c b/arch/sh/mm/cache-sh2a.c index 62c0c5f35120..24d86a794065 100644 --- a/arch/sh/mm/cache-sh2a.c +++ b/arch/sh/mm/cache-sh2a.c | |||
| @@ -59,7 +59,7 @@ void __flush_purge_region(void *start, int size) | |||
| 59 | 59 | ||
| 60 | for (v = begin; v < end; v+=L1_CACHE_BYTES) { | 60 | for (v = begin; v < end; v+=L1_CACHE_BYTES) { |
| 61 | ctrl_outl((v & CACHE_PHYSADDR_MASK), | 61 | ctrl_outl((v & CACHE_PHYSADDR_MASK), |
| 62 | CACHE_OC_ADDRESS_ARRAY | (v & 0x000003f0) | 0x00000008); | 62 | CACHE_OC_ADDRESS_ARRAY | (v & 0x000007f0) | 0x00000008); |
| 63 | } | 63 | } |
| 64 | back_to_cached(); | 64 | back_to_cached(); |
| 65 | local_irq_restore(flags); | 65 | local_irq_restore(flags); |
| @@ -82,14 +82,14 @@ void __flush_invalidate_region(void *start, int size) | |||
| 82 | /* I-cache invalidate */ | 82 | /* I-cache invalidate */ |
| 83 | for (v = begin; v < end; v+=L1_CACHE_BYTES) { | 83 | for (v = begin; v < end; v+=L1_CACHE_BYTES) { |
| 84 | ctrl_outl((v & CACHE_PHYSADDR_MASK), | 84 | ctrl_outl((v & CACHE_PHYSADDR_MASK), |
| 85 | CACHE_IC_ADDRESS_ARRAY | (v & 0x000003f0) | 0x00000008); | 85 | CACHE_IC_ADDRESS_ARRAY | (v & 0x000007f0) | 0x00000008); |
| 86 | } | 86 | } |
| 87 | #else | 87 | #else |
| 88 | for (v = begin; v < end; v+=L1_CACHE_BYTES) { | 88 | for (v = begin; v < end; v+=L1_CACHE_BYTES) { |
| 89 | ctrl_outl((v & CACHE_PHYSADDR_MASK), | 89 | ctrl_outl((v & CACHE_PHYSADDR_MASK), |
| 90 | CACHE_IC_ADDRESS_ARRAY | (v & 0x000003f0) | 0x00000008); | 90 | CACHE_IC_ADDRESS_ARRAY | (v & 0x000007f0) | 0x00000008); |
| 91 | ctrl_outl((v & CACHE_PHYSADDR_MASK), | 91 | ctrl_outl((v & CACHE_PHYSADDR_MASK), |
| 92 | CACHE_OC_ADDRESS_ARRAY | (v & 0x000003f0) | 0x00000008); | 92 | CACHE_OC_ADDRESS_ARRAY | (v & 0x000007f0) | 0x00000008); |
| 93 | } | 93 | } |
| 94 | #endif | 94 | #endif |
| 95 | back_to_cached(); | 95 | back_to_cached(); |
diff --git a/arch/sh/oprofile/op_model_sh7750.c b/arch/sh/oprofile/op_model_sh7750.c index 6b9a98e07004..008b3b03750a 100644 --- a/arch/sh/oprofile/op_model_sh7750.c +++ b/arch/sh/oprofile/op_model_sh7750.c | |||
| @@ -255,10 +255,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
| 255 | return -ENODEV; | 255 | return -ENODEV; |
| 256 | 256 | ||
| 257 | ops = &sh7750_perf_counter_ops; | 257 | ops = &sh7750_perf_counter_ops; |
| 258 | ops->cpu_type = (char *)get_cpu_subtype(¤t_cpu_data); | 258 | ops->cpu_type = "sh/sh7750"; |
| 259 | 259 | ||
| 260 | printk(KERN_INFO "oprofile: using SH-4 (%s) performance monitoring.\n", | 260 | printk(KERN_INFO "oprofile: using SH-4 performance monitoring.\n"); |
| 261 | sh7750_perf_counter_ops.cpu_type); | ||
| 262 | 261 | ||
| 263 | /* Clear the counters */ | 262 | /* Clear the counters */ |
| 264 | ctrl_outw(ctrl_inw(PMCR1) | PMCR_PMCLR, PMCR1); | 263 | ctrl_outw(ctrl_inw(PMCR1) | PMCR_PMCLR, PMCR1); |
| @@ -270,4 +269,3 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
| 270 | void oprofile_arch_exit(void) | 269 | void oprofile_arch_exit(void) |
| 271 | { | 270 | { |
| 272 | } | 271 | } |
| 273 | |||
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types index d4fb11f7e2ee..d0c2928d1066 100644 --- a/arch/sh/tools/mach-types +++ b/arch/sh/tools/mach-types | |||
| @@ -13,7 +13,6 @@ RTS7751R2D SH_RTS7751R2D | |||
| 13 | # List of companion chips / MFDs. | 13 | # List of companion chips / MFDs. |
| 14 | # | 14 | # |
| 15 | HD64461 HD64461 | 15 | HD64461 HD64461 |
| 16 | HD64465 HD64465 | ||
| 17 | 16 | ||
| 18 | # | 17 | # |
| 19 | # List of boards. | 18 | # List of boards. |
diff --git a/arch/sparc/include/asm/byteorder.h b/arch/sparc/include/asm/byteorder.h index bcd83aa351c5..5a70f137f1f7 100644 --- a/arch/sparc/include/asm/byteorder.h +++ b/arch/sparc/include/asm/byteorder.h | |||
| @@ -4,15 +4,14 @@ | |||
| 4 | #include <asm/types.h> | 4 | #include <asm/types.h> |
| 5 | #include <asm/asi.h> | 5 | #include <asm/asi.h> |
| 6 | 6 | ||
| 7 | #ifdef __GNUC__ | 7 | #define __BIG_ENDIAN |
| 8 | 8 | ||
| 9 | #ifdef CONFIG_SPARC32 | 9 | #ifdef CONFIG_SPARC32 |
| 10 | #define __SWAB_64_THRU_32__ | 10 | #define __SWAB_64_THRU_32__ |
| 11 | #endif | 11 | #endif |
| 12 | 12 | ||
| 13 | #ifdef CONFIG_SPARC64 | 13 | #ifdef CONFIG_SPARC64 |
| 14 | 14 | static inline __u16 __arch_swab16p(const __u16 *addr) | |
| 15 | static inline __u16 ___arch__swab16p(const __u16 *addr) | ||
| 16 | { | 15 | { |
| 17 | __u16 ret; | 16 | __u16 ret; |
| 18 | 17 | ||
| @@ -21,8 +20,9 @@ static inline __u16 ___arch__swab16p(const __u16 *addr) | |||
| 21 | : "r" (addr), "i" (ASI_PL)); | 20 | : "r" (addr), "i" (ASI_PL)); |
| 22 | return ret; | 21 | return ret; |
| 23 | } | 22 | } |
| 23 | #define __arch_swab16p __arch_swab16p | ||
| 24 | 24 | ||
| 25 | static inline __u32 ___arch__swab32p(const __u32 *addr) | 25 | static inline __u32 __arch_swab32p(const __u32 *addr) |
| 26 | { | 26 | { |
| 27 | __u32 ret; | 27 | __u32 ret; |
| 28 | 28 | ||
| @@ -31,8 +31,9 @@ static inline __u32 ___arch__swab32p(const __u32 *addr) | |||
| 31 | : "r" (addr), "i" (ASI_PL)); | 31 | : "r" (addr), "i" (ASI_PL)); |
| 32 | return ret; | 32 | return ret; |
| 33 | } | 33 | } |
| 34 | #define __arch_swab32p __arch_swab32p | ||
| 34 | 35 | ||
| 35 | static inline __u64 ___arch__swab64p(const __u64 *addr) | 36 | static inline __u64 __arch_swab64p(const __u64 *addr) |
| 36 | { | 37 | { |
| 37 | __u64 ret; | 38 | __u64 ret; |
| 38 | 39 | ||
| @@ -41,17 +42,10 @@ static inline __u64 ___arch__swab64p(const __u64 *addr) | |||
| 41 | : "r" (addr), "i" (ASI_PL)); | 42 | : "r" (addr), "i" (ASI_PL)); |
| 42 | return ret; | 43 | return ret; |
| 43 | } | 44 | } |
| 44 | 45 | #define __arch_swab64p __arch_swab64p | |
| 45 | #define __arch__swab16p(x) ___arch__swab16p(x) | ||
| 46 | #define __arch__swab32p(x) ___arch__swab32p(x) | ||
| 47 | #define __arch__swab64p(x) ___arch__swab64p(x) | ||
| 48 | 46 | ||
| 49 | #endif /* CONFIG_SPARC64 */ | 47 | #endif /* CONFIG_SPARC64 */ |
| 50 | 48 | ||
| 51 | #define __BYTEORDER_HAS_U64__ | 49 | #include <linux/byteorder.h> |
| 52 | |||
| 53 | #endif | ||
| 54 | |||
| 55 | #include <linux/byteorder/big_endian.h> | ||
| 56 | 50 | ||
| 57 | #endif /* _SPARC_BYTEORDER_H */ | 51 | #endif /* _SPARC_BYTEORDER_H */ |
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 62c1d94cb434..00f7383c7657 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
| @@ -119,35 +119,16 @@ static unsigned char mostek_read_byte(struct device *dev, u32 ofs) | |||
| 119 | { | 119 | { |
| 120 | struct platform_device *pdev = to_platform_device(dev); | 120 | struct platform_device *pdev = to_platform_device(dev); |
| 121 | struct m48t59_plat_data *pdata = pdev->dev.platform_data; | 121 | struct m48t59_plat_data *pdata = pdev->dev.platform_data; |
| 122 | void __iomem *regs = pdata->ioaddr; | 122 | |
| 123 | unsigned char val = readb(regs + ofs); | 123 | return readb(pdata->ioaddr + ofs); |
| 124 | |||
| 125 | /* the year 0 is 1968 */ | ||
| 126 | if (ofs == pdata->offset + M48T59_YEAR) { | ||
| 127 | val += 0x68; | ||
| 128 | if ((val & 0xf) > 9) | ||
| 129 | val += 6; | ||
| 130 | } | ||
| 131 | return val; | ||
| 132 | } | 124 | } |
| 133 | 125 | ||
| 134 | static void mostek_write_byte(struct device *dev, u32 ofs, u8 val) | 126 | static void mostek_write_byte(struct device *dev, u32 ofs, u8 val) |
| 135 | { | 127 | { |
| 136 | struct platform_device *pdev = to_platform_device(dev); | 128 | struct platform_device *pdev = to_platform_device(dev); |
| 137 | struct m48t59_plat_data *pdata = pdev->dev.platform_data; | 129 | struct m48t59_plat_data *pdata = pdev->dev.platform_data; |
| 138 | void __iomem *regs = pdata->ioaddr; | 130 | |
| 139 | 131 | writeb(val, pdata->ioaddr + ofs); | |
| 140 | if (ofs == pdata->offset + M48T59_YEAR) { | ||
| 141 | if (val < 0x68) | ||
| 142 | val += 0x32; | ||
| 143 | else | ||
| 144 | val -= 0x68; | ||
| 145 | if ((val & 0xf) > 9) | ||
| 146 | val += 6; | ||
| 147 | if ((val & 0xf0) > 0x9A) | ||
| 148 | val += 0x60; | ||
| 149 | } | ||
| 150 | writeb(val, regs + ofs); | ||
| 151 | } | 132 | } |
| 152 | 133 | ||
| 153 | static struct m48t59_plat_data m48t59_data = { | 134 | static struct m48t59_plat_data m48t59_data = { |
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index 80d71a5ce1e3..141da3759091 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c | |||
| @@ -490,6 +490,7 @@ static struct of_device_id __initdata bq4802_match[] = { | |||
| 490 | .name = "rtc", | 490 | .name = "rtc", |
| 491 | .compatible = "bq4802", | 491 | .compatible = "bq4802", |
| 492 | }, | 492 | }, |
| 493 | {}, | ||
| 493 | }; | 494 | }; |
| 494 | 495 | ||
| 495 | static struct of_platform_driver bq4802_driver = { | 496 | static struct of_platform_driver bq4802_driver = { |
| @@ -503,39 +504,16 @@ static struct of_platform_driver bq4802_driver = { | |||
| 503 | static unsigned char mostek_read_byte(struct device *dev, u32 ofs) | 504 | static unsigned char mostek_read_byte(struct device *dev, u32 ofs) |
| 504 | { | 505 | { |
| 505 | struct platform_device *pdev = to_platform_device(dev); | 506 | struct platform_device *pdev = to_platform_device(dev); |
| 506 | struct m48t59_plat_data *pdata = pdev->dev.platform_data; | 507 | void __iomem *regs = (void __iomem *) pdev->resource[0].start; |
| 507 | void __iomem *regs; | 508 | |
| 508 | unsigned char val; | 509 | return readb(regs + ofs); |
| 509 | |||
| 510 | regs = (void __iomem *) pdev->resource[0].start; | ||
| 511 | val = readb(regs + ofs); | ||
| 512 | |||
| 513 | /* the year 0 is 1968 */ | ||
| 514 | if (ofs == pdata->offset + M48T59_YEAR) { | ||
| 515 | val += 0x68; | ||
| 516 | if ((val & 0xf) > 9) | ||
| 517 | val += 6; | ||
| 518 | } | ||
| 519 | return val; | ||
| 520 | } | 510 | } |
| 521 | 511 | ||
| 522 | static void mostek_write_byte(struct device *dev, u32 ofs, u8 val) | 512 | static void mostek_write_byte(struct device *dev, u32 ofs, u8 val) |
| 523 | { | 513 | { |
| 524 | struct platform_device *pdev = to_platform_device(dev); | 514 | struct platform_device *pdev = to_platform_device(dev); |
| 525 | struct m48t59_plat_data *pdata = pdev->dev.platform_data; | 515 | void __iomem *regs = (void __iomem *) pdev->resource[0].start; |
| 526 | void __iomem *regs; | 516 | |
| 527 | |||
| 528 | regs = (void __iomem *) pdev->resource[0].start; | ||
| 529 | if (ofs == pdata->offset + M48T59_YEAR) { | ||
| 530 | if (val < 0x68) | ||
| 531 | val += 0x32; | ||
| 532 | else | ||
| 533 | val -= 0x68; | ||
| 534 | if ((val & 0xf) > 9) | ||
| 535 | val += 6; | ||
| 536 | if ((val & 0xf0) > 0x9A) | ||
| 537 | val += 0x60; | ||
| 538 | } | ||
| 539 | writeb(val, regs + ofs); | 517 | writeb(val, regs + ofs); |
| 540 | } | 518 | } |
| 541 | 519 | ||
diff --git a/arch/sparc64/lib/PeeCeeI.c b/arch/sparc64/lib/PeeCeeI.c index 8b313f11bc8d..46053e6ddd7b 100644 --- a/arch/sparc64/lib/PeeCeeI.c +++ b/arch/sparc64/lib/PeeCeeI.c | |||
| @@ -20,107 +20,62 @@ void outsw(unsigned long __addr, const void *src, unsigned long count) | |||
| 20 | { | 20 | { |
| 21 | void __iomem *addr = (void __iomem *) __addr; | 21 | void __iomem *addr = (void __iomem *) __addr; |
| 22 | 22 | ||
| 23 | if (count) { | 23 | while (count--) { |
| 24 | u16 *ps = (u16 *)src; | 24 | __raw_writew(*(u16 *)src, addr); |
| 25 | u32 *pi; | 25 | src += sizeof(u16); |
| 26 | |||
| 27 | if (((u64)src) & 0x2) { | ||
| 28 | u16 val = le16_to_cpup(ps); | ||
| 29 | outw(val, addr); | ||
| 30 | ps++; | ||
| 31 | count--; | ||
| 32 | } | ||
| 33 | pi = (u32 *)ps; | ||
| 34 | while (count >= 2) { | ||
| 35 | u32 w = le32_to_cpup(pi); | ||
| 36 | |||
| 37 | pi++; | ||
| 38 | outw(w >> 0, addr); | ||
| 39 | outw(w >> 16, addr); | ||
| 40 | count -= 2; | ||
| 41 | } | ||
| 42 | ps = (u16 *)pi; | ||
| 43 | if (count) { | ||
| 44 | u16 val = le16_to_cpup(ps); | ||
| 45 | outw(val, addr); | ||
| 46 | } | ||
| 47 | } | 26 | } |
| 48 | } | 27 | } |
| 49 | 28 | ||
| 50 | void outsl(unsigned long __addr, const void *src, unsigned long count) | 29 | void outsl(unsigned long __addr, const void *src, unsigned long count) |
| 51 | { | 30 | { |
| 52 | void __iomem *addr = (void __iomem *) __addr; | 31 | void __iomem *addr = (void __iomem *) __addr; |
| 32 | u32 l, l2; | ||
| 53 | 33 | ||
| 54 | if (count) { | 34 | if (!count) |
| 55 | if ((((u64)src) & 0x3) == 0) { | 35 | return; |
| 56 | u32 *p = (u32 *)src; | ||
| 57 | while (count--) { | ||
| 58 | u32 val = cpu_to_le32p(p); | ||
| 59 | outl(val, addr); | ||
| 60 | p++; | ||
| 61 | } | ||
| 62 | } else { | ||
| 63 | u8 *pb; | ||
| 64 | u16 *ps = (u16 *)src; | ||
| 65 | u32 l = 0, l2; | ||
| 66 | u32 *pi; | ||
| 67 | |||
| 68 | switch (((u64)src) & 0x3) { | ||
| 69 | case 0x2: | ||
| 70 | count -= 1; | ||
| 71 | l = cpu_to_le16p(ps) << 16; | ||
| 72 | ps++; | ||
| 73 | pi = (u32 *)ps; | ||
| 74 | while (count--) { | ||
| 75 | l2 = cpu_to_le32p(pi); | ||
| 76 | pi++; | ||
| 77 | outl(((l >> 16) | (l2 << 16)), addr); | ||
| 78 | l = l2; | ||
| 79 | } | ||
| 80 | ps = (u16 *)pi; | ||
| 81 | l2 = cpu_to_le16p(ps); | ||
| 82 | outl(((l >> 16) | (l2 << 16)), addr); | ||
| 83 | break; | ||
| 84 | |||
| 85 | case 0x1: | ||
| 86 | count -= 1; | ||
| 87 | pb = (u8 *)src; | ||
| 88 | l = (*pb++ << 8); | ||
| 89 | ps = (u16 *)pb; | ||
| 90 | l2 = cpu_to_le16p(ps); | ||
| 91 | ps++; | ||
| 92 | l |= (l2 << 16); | ||
| 93 | pi = (u32 *)ps; | ||
| 94 | while (count--) { | ||
| 95 | l2 = cpu_to_le32p(pi); | ||
| 96 | pi++; | ||
| 97 | outl(((l >> 8) | (l2 << 24)), addr); | ||
| 98 | l = l2; | ||
| 99 | } | ||
| 100 | pb = (u8 *)pi; | ||
| 101 | outl(((l >> 8) | (*pb << 24)), addr); | ||
| 102 | break; | ||
| 103 | 36 | ||
| 104 | case 0x3: | 37 | switch (((unsigned long)src) & 0x3) { |
| 105 | count -= 1; | 38 | case 0x0: |
| 106 | pb = (u8 *)src; | 39 | /* src is naturally aligned */ |
| 107 | l = (*pb++ << 24); | 40 | while (count--) { |
| 108 | pi = (u32 *)pb; | 41 | __raw_writel(*(u32 *)src, addr); |
| 109 | while (count--) { | 42 | src += sizeof(u32); |
| 110 | l2 = cpu_to_le32p(pi); | 43 | } |
| 111 | pi++; | 44 | break; |
| 112 | outl(((l >> 24) | (l2 << 8)), addr); | 45 | case 0x2: |
| 113 | l = l2; | 46 | /* 2-byte alignment */ |
| 114 | } | 47 | while (count--) { |
| 115 | ps = (u16 *)pi; | 48 | l = (*(u16 *)src) << 16; |
| 116 | l2 = cpu_to_le16p(ps); | 49 | l |= *(u16 *)(src + sizeof(u16)); |
| 117 | ps++; | 50 | __raw_writel(l, addr); |
| 118 | pb = (u8 *)ps; | 51 | src += sizeof(u32); |
| 119 | l2 |= (*pb << 16); | 52 | } |
| 120 | outl(((l >> 24) | (l2 << 8)), addr); | 53 | break; |
| 121 | break; | 54 | case 0x1: |
| 122 | } | 55 | /* Hold three bytes in l each time, grab a byte from l2 */ |
| 56 | l = (*(u8 *)src) << 24; | ||
| 57 | l |= (*(u16 *)(src + sizeof(u8))) << 8; | ||
| 58 | src += sizeof(u8) + sizeof(u16); | ||
| 59 | while (count--) { | ||
| 60 | l2 = *(u32 *)src; | ||
| 61 | l |= (l2 >> 24); | ||
| 62 | __raw_writel(l, addr); | ||
| 63 | l = l2 << 8; | ||
| 64 | src += sizeof(u32); | ||
| 65 | } | ||
| 66 | break; | ||
| 67 | case 0x3: | ||
| 68 | /* Hold a byte in l each time, grab 3 bytes from l2 */ | ||
| 69 | l = (*(u8 *)src) << 24; | ||
| 70 | src += sizeof(u8); | ||
| 71 | while (count--) { | ||
| 72 | l2 = *(u32 *)src; | ||
| 73 | l |= (l2 >> 8); | ||
| 74 | __raw_writel(l, addr); | ||
| 75 | l = l2 << 24; | ||
| 76 | src += sizeof(u32); | ||
| 123 | } | 77 | } |
| 78 | break; | ||
| 124 | } | 79 | } |
| 125 | } | 80 | } |
| 126 | 81 | ||
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 52dc2d8b8f22..8e37be19bbf5 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -738,7 +738,6 @@ static void piix_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
| 738 | * do_pata_set_dmamode - Initialize host controller PATA PIO timings | 738 | * do_pata_set_dmamode - Initialize host controller PATA PIO timings |
| 739 | * @ap: Port whose timings we are configuring | 739 | * @ap: Port whose timings we are configuring |
| 740 | * @adev: Drive in question | 740 | * @adev: Drive in question |
| 741 | * @udma: udma mode, 0 - 6 | ||
| 742 | * @isich: set if the chip is an ICH device | 741 | * @isich: set if the chip is an ICH device |
| 743 | * | 742 | * |
| 744 | * Set UDMA mode for device, in host controller PCI config space. | 743 | * Set UDMA mode for device, in host controller PCI config space. |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 2ff633c119e2..82af7011f2dd 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -1268,7 +1268,7 @@ u64 ata_tf_to_lba48(const struct ata_taskfile *tf) | |||
| 1268 | 1268 | ||
| 1269 | sectors |= ((u64)(tf->hob_lbah & 0xff)) << 40; | 1269 | sectors |= ((u64)(tf->hob_lbah & 0xff)) << 40; |
| 1270 | sectors |= ((u64)(tf->hob_lbam & 0xff)) << 32; | 1270 | sectors |= ((u64)(tf->hob_lbam & 0xff)) << 32; |
| 1271 | sectors |= (tf->hob_lbal & 0xff) << 24; | 1271 | sectors |= ((u64)(tf->hob_lbal & 0xff)) << 24; |
| 1272 | sectors |= (tf->lbah & 0xff) << 16; | 1272 | sectors |= (tf->lbah & 0xff) << 16; |
| 1273 | sectors |= (tf->lbam & 0xff) << 8; | 1273 | sectors |= (tf->lbam & 0xff) << 8; |
| 1274 | sectors |= (tf->lbal & 0xff); | 1274 | sectors |= (tf->lbal & 0xff); |
| @@ -1602,7 +1602,6 @@ unsigned long ata_id_xfermask(const u16 *id) | |||
| 1602 | /** | 1602 | /** |
| 1603 | * ata_pio_queue_task - Queue port_task | 1603 | * ata_pio_queue_task - Queue port_task |
| 1604 | * @ap: The ata_port to queue port_task for | 1604 | * @ap: The ata_port to queue port_task for |
| 1605 | * @fn: workqueue function to be scheduled | ||
| 1606 | * @data: data for @fn to use | 1605 | * @data: data for @fn to use |
| 1607 | * @delay: delay time in msecs for workqueue function | 1606 | * @delay: delay time in msecs for workqueue function |
| 1608 | * | 1607 | * |
| @@ -2159,6 +2158,10 @@ retry: | |||
| 2159 | static inline u8 ata_dev_knobble(struct ata_device *dev) | 2158 | static inline u8 ata_dev_knobble(struct ata_device *dev) |
| 2160 | { | 2159 | { |
| 2161 | struct ata_port *ap = dev->link->ap; | 2160 | struct ata_port *ap = dev->link->ap; |
| 2161 | |||
| 2162 | if (ata_dev_blacklisted(dev) & ATA_HORKAGE_BRIDGE_OK) | ||
| 2163 | return 0; | ||
| 2164 | |||
| 2162 | return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id))); | 2165 | return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id))); |
| 2163 | } | 2166 | } |
| 2164 | 2167 | ||
| @@ -4063,6 +4066,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { | |||
| 4063 | { "TSSTcorp CDDVDW SH-S202N", "SB00", ATA_HORKAGE_IVB, }, | 4066 | { "TSSTcorp CDDVDW SH-S202N", "SB00", ATA_HORKAGE_IVB, }, |
| 4064 | { "TSSTcorp CDDVDW SH-S202N", "SB01", ATA_HORKAGE_IVB, }, | 4067 | { "TSSTcorp CDDVDW SH-S202N", "SB01", ATA_HORKAGE_IVB, }, |
| 4065 | 4068 | ||
| 4069 | /* Devices that do not need bridging limits applied */ | ||
| 4070 | { "MTRON MSP-SATA*", NULL, ATA_HORKAGE_BRIDGE_OK, }, | ||
| 4071 | |||
| 4066 | /* End Marker */ | 4072 | /* End Marker */ |
| 4067 | { } | 4073 | { } |
| 4068 | }; | 4074 | }; |
| @@ -4648,7 +4654,6 @@ static void ata_verify_xfer(struct ata_queued_cmd *qc) | |||
| 4648 | /** | 4654 | /** |
| 4649 | * ata_qc_complete - Complete an active ATA command | 4655 | * ata_qc_complete - Complete an active ATA command |
| 4650 | * @qc: Command to complete | 4656 | * @qc: Command to complete |
| 4651 | * @err_mask: ATA Status register contents | ||
| 4652 | * | 4657 | * |
| 4653 | * Indicate to the mid and upper layers that an ATA | 4658 | * Indicate to the mid and upper layers that an ATA |
| 4654 | * command has completed, with either an ok or not-ok status. | 4659 | * command has completed, with either an ok or not-ok status. |
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 5b72e734300a..62367fe4d5dc 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
| @@ -44,11 +44,16 @@ | |||
| 44 | #include <linux/libata.h> | 44 | #include <linux/libata.h> |
| 45 | 45 | ||
| 46 | #define DRV_NAME "sata_via" | 46 | #define DRV_NAME "sata_via" |
| 47 | #define DRV_VERSION "2.3" | 47 | #define DRV_VERSION "2.4" |
| 48 | 48 | ||
| 49 | /* | ||
| 50 | * vt8251 is different from other sata controllers of VIA. It has two | ||
| 51 | * channels, each channel has both Master and Slave slot. | ||
| 52 | */ | ||
| 49 | enum board_ids_enum { | 53 | enum board_ids_enum { |
| 50 | vt6420, | 54 | vt6420, |
| 51 | vt6421, | 55 | vt6421, |
| 56 | vt8251, | ||
| 52 | }; | 57 | }; |
| 53 | 58 | ||
| 54 | enum { | 59 | enum { |
| @@ -70,6 +75,8 @@ enum { | |||
| 70 | static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); | 75 | static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); |
| 71 | static int svia_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val); | 76 | static int svia_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val); |
| 72 | static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val); | 77 | static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val); |
| 78 | static int vt8251_scr_read(struct ata_link *link, unsigned int scr, u32 *val); | ||
| 79 | static int vt8251_scr_write(struct ata_link *link, unsigned int scr, u32 val); | ||
| 73 | static void svia_tf_load(struct ata_port *ap, const struct ata_taskfile *tf); | 80 | static void svia_tf_load(struct ata_port *ap, const struct ata_taskfile *tf); |
| 74 | static void svia_noop_freeze(struct ata_port *ap); | 81 | static void svia_noop_freeze(struct ata_port *ap); |
| 75 | static int vt6420_prereset(struct ata_link *link, unsigned long deadline); | 82 | static int vt6420_prereset(struct ata_link *link, unsigned long deadline); |
| @@ -79,12 +86,12 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev); | |||
| 79 | 86 | ||
| 80 | static const struct pci_device_id svia_pci_tbl[] = { | 87 | static const struct pci_device_id svia_pci_tbl[] = { |
| 81 | { PCI_VDEVICE(VIA, 0x5337), vt6420 }, | 88 | { PCI_VDEVICE(VIA, 0x5337), vt6420 }, |
| 82 | { PCI_VDEVICE(VIA, 0x0591), vt6420 }, | 89 | { PCI_VDEVICE(VIA, 0x0591), vt6420 }, /* 2 sata chnls (Master) */ |
| 83 | { PCI_VDEVICE(VIA, 0x3149), vt6420 }, | 90 | { PCI_VDEVICE(VIA, 0x3149), vt6420 }, /* 2 sata chnls (Master) */ |
| 84 | { PCI_VDEVICE(VIA, 0x3249), vt6421 }, | 91 | { PCI_VDEVICE(VIA, 0x3249), vt6421 }, /* 2 sata chnls, 1 pata chnl */ |
| 85 | { PCI_VDEVICE(VIA, 0x5287), vt6420 }, | ||
| 86 | { PCI_VDEVICE(VIA, 0x5372), vt6420 }, | 92 | { PCI_VDEVICE(VIA, 0x5372), vt6420 }, |
| 87 | { PCI_VDEVICE(VIA, 0x7372), vt6420 }, | 93 | { PCI_VDEVICE(VIA, 0x7372), vt6420 }, |
| 94 | { PCI_VDEVICE(VIA, 0x5287), vt8251 }, /* 2 sata chnls (Master/Slave) */ | ||
| 88 | 95 | ||
| 89 | { } /* terminate list */ | 96 | { } /* terminate list */ |
| 90 | }; | 97 | }; |
| @@ -128,6 +135,13 @@ static struct ata_port_operations vt6421_sata_ops = { | |||
| 128 | .scr_write = svia_scr_write, | 135 | .scr_write = svia_scr_write, |
| 129 | }; | 136 | }; |
| 130 | 137 | ||
| 138 | static struct ata_port_operations vt8251_ops = { | ||
| 139 | .inherits = &svia_base_ops, | ||
| 140 | .hardreset = sata_std_hardreset, | ||
| 141 | .scr_read = vt8251_scr_read, | ||
| 142 | .scr_write = vt8251_scr_write, | ||
| 143 | }; | ||
| 144 | |||
| 131 | static const struct ata_port_info vt6420_port_info = { | 145 | static const struct ata_port_info vt6420_port_info = { |
| 132 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 146 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
| 133 | .pio_mask = 0x1f, | 147 | .pio_mask = 0x1f, |
| @@ -152,6 +166,15 @@ static struct ata_port_info vt6421_pport_info = { | |||
| 152 | .port_ops = &vt6421_pata_ops, | 166 | .port_ops = &vt6421_pata_ops, |
| 153 | }; | 167 | }; |
| 154 | 168 | ||
| 169 | static struct ata_port_info vt8251_port_info = { | ||
| 170 | .flags = ATA_FLAG_SATA | ATA_FLAG_SLAVE_POSS | | ||
| 171 | ATA_FLAG_NO_LEGACY, | ||
| 172 | .pio_mask = 0x1f, | ||
| 173 | .mwdma_mask = 0x07, | ||
| 174 | .udma_mask = ATA_UDMA6, | ||
| 175 | .port_ops = &vt8251_ops, | ||
| 176 | }; | ||
| 177 | |||
| 155 | MODULE_AUTHOR("Jeff Garzik"); | 178 | MODULE_AUTHOR("Jeff Garzik"); |
| 156 | MODULE_DESCRIPTION("SCSI low-level driver for VIA SATA controllers"); | 179 | MODULE_DESCRIPTION("SCSI low-level driver for VIA SATA controllers"); |
| 157 | MODULE_LICENSE("GPL"); | 180 | MODULE_LICENSE("GPL"); |
| @@ -174,6 +197,83 @@ static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val) | |||
| 174 | return 0; | 197 | return 0; |
| 175 | } | 198 | } |
| 176 | 199 | ||
| 200 | static int vt8251_scr_read(struct ata_link *link, unsigned int scr, u32 *val) | ||
| 201 | { | ||
| 202 | static const u8 ipm_tbl[] = { 1, 2, 6, 0 }; | ||
| 203 | struct pci_dev *pdev = to_pci_dev(link->ap->host->dev); | ||
| 204 | int slot = 2 * link->ap->port_no + link->pmp; | ||
| 205 | u32 v = 0; | ||
| 206 | u8 raw; | ||
| 207 | |||
| 208 | switch (scr) { | ||
| 209 | case SCR_STATUS: | ||
| 210 | pci_read_config_byte(pdev, 0xA0 + slot, &raw); | ||
| 211 | |||
| 212 | /* read the DET field, bit0 and 1 of the config byte */ | ||
| 213 | v |= raw & 0x03; | ||
| 214 | |||
| 215 | /* read the SPD field, bit4 of the configure byte */ | ||
| 216 | if (raw & (1 << 4)) | ||
| 217 | v |= 0x02 << 4; | ||
| 218 | else | ||
| 219 | v |= 0x01 << 4; | ||
| 220 | |||
| 221 | /* read the IPM field, bit2 and 3 of the config byte */ | ||
| 222 | v |= ipm_tbl[(raw >> 2) & 0x3]; | ||
| 223 | break; | ||
| 224 | |||
| 225 | case SCR_ERROR: | ||
| 226 | /* devices other than 5287 uses 0xA8 as base */ | ||
| 227 | WARN_ON(pdev->device != 0x5287); | ||
| 228 | pci_read_config_dword(pdev, 0xB0 + slot * 4, &v); | ||
| 229 | break; | ||
| 230 | |||
| 231 | case SCR_CONTROL: | ||
| 232 | pci_read_config_byte(pdev, 0xA4 + slot, &raw); | ||
| 233 | |||
| 234 | /* read the DET field, bit0 and bit1 */ | ||
| 235 | v |= ((raw & 0x02) << 1) | (raw & 0x01); | ||
| 236 | |||
| 237 | /* read the IPM field, bit2 and bit3 */ | ||
| 238 | v |= ((raw >> 2) & 0x03) << 8; | ||
| 239 | break; | ||
| 240 | |||
| 241 | default: | ||
| 242 | return -EINVAL; | ||
| 243 | } | ||
| 244 | |||
| 245 | *val = v; | ||
| 246 | return 0; | ||
| 247 | } | ||
| 248 | |||
| 249 | static int vt8251_scr_write(struct ata_link *link, unsigned int scr, u32 val) | ||
| 250 | { | ||
| 251 | struct pci_dev *pdev = to_pci_dev(link->ap->host->dev); | ||
| 252 | int slot = 2 * link->ap->port_no + link->pmp; | ||
| 253 | u32 v = 0; | ||
| 254 | |||
| 255 | switch (scr) { | ||
| 256 | case SCR_ERROR: | ||
| 257 | /* devices other than 5287 uses 0xA8 as base */ | ||
| 258 | WARN_ON(pdev->device != 0x5287); | ||
| 259 | pci_write_config_dword(pdev, 0xB0 + slot * 4, val); | ||
| 260 | return 0; | ||
| 261 | |||
| 262 | case SCR_CONTROL: | ||
| 263 | /* set the DET field */ | ||
| 264 | v |= ((val & 0x4) >> 1) | (val & 0x1); | ||
| 265 | |||
| 266 | /* set the IPM field */ | ||
| 267 | v |= ((val >> 8) & 0x3) << 2; | ||
| 268 | |||
| 269 | pci_write_config_byte(pdev, 0xA4 + slot, v); | ||
| 270 | return 0; | ||
| 271 | |||
| 272 | default: | ||
| 273 | return -EINVAL; | ||
| 274 | } | ||
| 275 | } | ||
| 276 | |||
| 177 | /** | 277 | /** |
| 178 | * svia_tf_load - send taskfile registers to host controller | 278 | * svia_tf_load - send taskfile registers to host controller |
| 179 | * @ap: Port to which output is sent | 279 | * @ap: Port to which output is sent |
| @@ -396,6 +496,30 @@ static int vt6421_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) | |||
| 396 | return 0; | 496 | return 0; |
| 397 | } | 497 | } |
| 398 | 498 | ||
| 499 | static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) | ||
| 500 | { | ||
| 501 | const struct ata_port_info *ppi[] = { &vt8251_port_info, NULL }; | ||
| 502 | struct ata_host *host; | ||
| 503 | int i, rc; | ||
| 504 | |||
| 505 | rc = ata_pci_sff_prepare_host(pdev, ppi, &host); | ||
| 506 | if (rc) | ||
| 507 | return rc; | ||
| 508 | *r_host = host; | ||
| 509 | |||
| 510 | rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME); | ||
| 511 | if (rc) { | ||
| 512 | dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n"); | ||
| 513 | return rc; | ||
| 514 | } | ||
| 515 | |||
| 516 | /* 8251 hosts four sata ports as M/S of the two channels */ | ||
| 517 | for (i = 0; i < host->n_ports; i++) | ||
| 518 | ata_slave_link_init(host->ports[i]); | ||
| 519 | |||
| 520 | return 0; | ||
| 521 | } | ||
| 522 | |||
| 399 | static void svia_configure(struct pci_dev *pdev) | 523 | static void svia_configure(struct pci_dev *pdev) |
| 400 | { | 524 | { |
| 401 | u8 tmp8; | 525 | u8 tmp8; |
| @@ -451,10 +575,10 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 451 | if (rc) | 575 | if (rc) |
| 452 | return rc; | 576 | return rc; |
| 453 | 577 | ||
| 454 | if (board_id == vt6420) | 578 | if (board_id == vt6421) |
| 455 | bar_sizes = &svia_bar_sizes[0]; | ||
| 456 | else | ||
| 457 | bar_sizes = &vt6421_bar_sizes[0]; | 579 | bar_sizes = &vt6421_bar_sizes[0]; |
| 580 | else | ||
| 581 | bar_sizes = &svia_bar_sizes[0]; | ||
| 458 | 582 | ||
| 459 | for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++) | 583 | for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++) |
| 460 | if ((pci_resource_start(pdev, i) == 0) || | 584 | if ((pci_resource_start(pdev, i) == 0) || |
| @@ -467,12 +591,19 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 467 | return -ENODEV; | 591 | return -ENODEV; |
| 468 | } | 592 | } |
| 469 | 593 | ||
| 470 | if (board_id == vt6420) | 594 | switch (board_id) { |
| 595 | case vt6420: | ||
| 471 | rc = vt6420_prepare_host(pdev, &host); | 596 | rc = vt6420_prepare_host(pdev, &host); |
| 472 | else | 597 | break; |
| 598 | case vt6421: | ||
| 473 | rc = vt6421_prepare_host(pdev, &host); | 599 | rc = vt6421_prepare_host(pdev, &host); |
| 474 | if (rc) | 600 | break; |
| 475 | return rc; | 601 | case vt8251: |
| 602 | rc = vt8251_prepare_host(pdev, &host); | ||
| 603 | break; | ||
| 604 | default: | ||
| 605 | return -EINVAL; | ||
| 606 | } | ||
| 476 | 607 | ||
| 477 | svia_configure(pdev); | 608 | svia_configure(pdev); |
| 478 | 609 | ||
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 9aaa86b232b1..2eecb779437b 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c | |||
| @@ -495,9 +495,10 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode) | |||
| 495 | return cdrom_open(gd.cd_info, bdev, mode); | 495 | return cdrom_open(gd.cd_info, bdev, mode); |
| 496 | } | 496 | } |
| 497 | 497 | ||
| 498 | static int gdrom_bdops_release(struct block_device *bdev, fmode_t mode) | 498 | static int gdrom_bdops_release(struct gendisk *disk, fmode_t mode) |
| 499 | { | 499 | { |
| 500 | return cdrom_release(gd.cd_info, mode); | 500 | cdrom_release(gd.cd_info, mode); |
| 501 | return 0; | ||
| 501 | } | 502 | } |
| 502 | 503 | ||
| 503 | static int gdrom_bdops_mediachanged(struct gendisk *disk) | 504 | static int gdrom_bdops_mediachanged(struct gendisk *disk) |
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 408f5f92cb4e..53fdc7ff3870 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
| @@ -427,9 +427,6 @@ static int hpet_release(struct inode *inode, struct file *file) | |||
| 427 | if (irq) | 427 | if (irq) |
| 428 | free_irq(irq, devp); | 428 | free_irq(irq, devp); |
| 429 | 429 | ||
| 430 | if (file->f_flags & FASYNC) | ||
| 431 | hpet_fasync(-1, file, 0); | ||
| 432 | |||
| 433 | file->private_data = NULL; | 430 | file->private_data = NULL; |
| 434 | return 0; | 431 | return 0; |
| 435 | } | 432 | } |
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c index 1d7b429f7ffa..41fc11dc921c 100644 --- a/drivers/char/ipmi/ipmi_devintf.c +++ b/drivers/char/ipmi/ipmi_devintf.c | |||
| @@ -162,8 +162,6 @@ static int ipmi_release(struct inode *inode, struct file *file) | |||
| 162 | if (rv) | 162 | if (rv) |
| 163 | return rv; | 163 | return rv; |
| 164 | 164 | ||
| 165 | ipmi_fasync (-1, file, 0); | ||
| 166 | |||
| 167 | /* FIXME - free the messages in the list. */ | 165 | /* FIXME - free the messages in the list. */ |
| 168 | kfree(priv); | 166 | kfree(priv); |
| 169 | 167 | ||
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 235fab0bdf79..a4d57e31f713 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
| @@ -870,7 +870,6 @@ static int ipmi_close(struct inode *ino, struct file *filep) | |||
| 870 | clear_bit(0, &ipmi_wdog_open); | 870 | clear_bit(0, &ipmi_wdog_open); |
| 871 | } | 871 | } |
| 872 | 872 | ||
| 873 | ipmi_fasync(-1, filep, 0); | ||
| 874 | expect_close = 0; | 873 | expect_close = 0; |
| 875 | 874 | ||
| 876 | return 0; | 875 | return 0; |
diff --git a/drivers/char/random.c b/drivers/char/random.c index 705a839f1796..675076f5fca8 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -1139,18 +1139,12 @@ static int random_fasync(int fd, struct file *filp, int on) | |||
| 1139 | return fasync_helper(fd, filp, on, &fasync); | 1139 | return fasync_helper(fd, filp, on, &fasync); |
| 1140 | } | 1140 | } |
| 1141 | 1141 | ||
| 1142 | static int random_release(struct inode *inode, struct file *filp) | ||
| 1143 | { | ||
| 1144 | return fasync_helper(-1, filp, 0, &fasync); | ||
| 1145 | } | ||
| 1146 | |||
| 1147 | const struct file_operations random_fops = { | 1142 | const struct file_operations random_fops = { |
| 1148 | .read = random_read, | 1143 | .read = random_read, |
| 1149 | .write = random_write, | 1144 | .write = random_write, |
| 1150 | .poll = random_poll, | 1145 | .poll = random_poll, |
| 1151 | .unlocked_ioctl = random_ioctl, | 1146 | .unlocked_ioctl = random_ioctl, |
| 1152 | .fasync = random_fasync, | 1147 | .fasync = random_fasync, |
| 1153 | .release = random_release, | ||
| 1154 | }; | 1148 | }; |
| 1155 | 1149 | ||
| 1156 | const struct file_operations urandom_fops = { | 1150 | const struct file_operations urandom_fops = { |
| @@ -1158,7 +1152,6 @@ const struct file_operations urandom_fops = { | |||
| 1158 | .write = random_write, | 1152 | .write = random_write, |
| 1159 | .unlocked_ioctl = random_ioctl, | 1153 | .unlocked_ioctl = random_ioctl, |
| 1160 | .fasync = random_fasync, | 1154 | .fasync = random_fasync, |
| 1161 | .release = random_release, | ||
| 1162 | }; | 1155 | }; |
| 1163 | 1156 | ||
| 1164 | /*************************************************************** | 1157 | /*************************************************************** |
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 32dc89720d58..20d6efb6324e 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
| @@ -788,8 +788,6 @@ static int rtc_release(struct inode *inode, struct file *file) | |||
| 788 | } | 788 | } |
| 789 | spin_unlock_irq(&rtc_lock); | 789 | spin_unlock_irq(&rtc_lock); |
| 790 | 790 | ||
| 791 | if (file->f_flags & FASYNC) | ||
| 792 | rtc_fasync(-1, file, 0); | ||
| 793 | no_irq: | 791 | no_irq: |
| 794 | #endif | 792 | #endif |
| 795 | 793 | ||
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index 85e0eb76eeab..2457b07dabd6 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c | |||
| @@ -898,7 +898,6 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on) | |||
| 898 | 898 | ||
| 899 | static int sonypi_misc_release(struct inode *inode, struct file *file) | 899 | static int sonypi_misc_release(struct inode *inode, struct file *file) |
| 900 | { | 900 | { |
| 901 | sonypi_misc_fasync(-1, file, 0); | ||
| 902 | mutex_lock(&sonypi_device.lock); | 901 | mutex_lock(&sonypi_device.lock); |
| 903 | sonypi_device.open_count--; | 902 | sonypi_device.open_count--; |
| 904 | mutex_unlock(&sonypi_device.lock); | 903 | mutex_unlock(&sonypi_device.lock); |
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 0d46627663b1..78eeed5caaff 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c | |||
| @@ -406,8 +406,6 @@ int drm_release(struct inode *inode, struct file *filp) | |||
| 406 | if (dev->driver->driver_features & DRIVER_GEM) | 406 | if (dev->driver->driver_features & DRIVER_GEM) |
| 407 | drm_gem_release(dev, file_priv); | 407 | drm_gem_release(dev, file_priv); |
| 408 | 408 | ||
| 409 | drm_fasync(-1, filp, 0); | ||
| 410 | |||
| 411 | mutex_lock(&dev->ctxlist_mutex); | 409 | mutex_lock(&dev->ctxlist_mutex); |
| 412 | if (!list_empty(&dev->ctxlist)) { | 410 | if (!list_empty(&dev->ctxlist)) { |
| 413 | struct drm_ctx_list *pos, *n; | 411 | struct drm_ctx_list *pos, *n; |
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 3ac320785fc5..83e851a5ed30 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c | |||
| @@ -242,8 +242,6 @@ static int hiddev_release(struct inode * inode, struct file * file) | |||
| 242 | struct hiddev_list *list = file->private_data; | 242 | struct hiddev_list *list = file->private_data; |
| 243 | unsigned long flags; | 243 | unsigned long flags; |
| 244 | 244 | ||
| 245 | hiddev_fasync(-1, file, 0); | ||
| 246 | |||
| 247 | spin_lock_irqsave(&list->hiddev->list_lock, flags); | 245 | spin_lock_irqsave(&list->hiddev->list_lock, flags); |
| 248 | list_del(&list->node); | 246 | list_del(&list->node); |
| 249 | spin_unlock_irqrestore(&list->hiddev->list_lock, flags); | 247 | spin_unlock_irqrestore(&list->hiddev->list_lock, flags); |
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 2f83543a9dfc..965cfdb84ebc 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
| @@ -1828,9 +1828,6 @@ static int dv1394_release(struct inode *inode, struct file *file) | |||
| 1828 | /* OK to free the DMA buffer, no more mappings can exist */ | 1828 | /* OK to free the DMA buffer, no more mappings can exist */ |
| 1829 | do_dv1394_shutdown(video, 1); | 1829 | do_dv1394_shutdown(video, 1); |
| 1830 | 1830 | ||
| 1831 | /* clean up async I/O users */ | ||
| 1832 | dv1394_fasync(-1, file, 0); | ||
| 1833 | |||
| 1834 | /* give someone else a turn */ | 1831 | /* give someone else a turn */ |
| 1835 | clear_bit(0, &video->open); | 1832 | clear_bit(0, &video->open); |
| 1836 | 1833 | ||
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index d85af1b67027..eb36a81dd09b 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c | |||
| @@ -358,8 +358,6 @@ static int ib_uverbs_event_close(struct inode *inode, struct file *filp) | |||
| 358 | } | 358 | } |
| 359 | spin_unlock_irq(&file->lock); | 359 | spin_unlock_irq(&file->lock); |
| 360 | 360 | ||
| 361 | ib_uverbs_event_fasync(-1, filp, 0); | ||
| 362 | |||
| 363 | if (file->is_async) { | 361 | if (file->is_async) { |
| 364 | ib_unregister_event_handler(&file->uverbs_file->event_handler); | 362 | ib_unregister_event_handler(&file->uverbs_file->event_handler); |
| 365 | kref_put(&file->uverbs_file->ref, ib_uverbs_release_file); | 363 | kref_put(&file->uverbs_file->ref, ib_uverbs_release_file); |
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 3524bef62be6..1070db330d35 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -235,7 +235,6 @@ static int evdev_release(struct inode *inode, struct file *file) | |||
| 235 | evdev_ungrab(evdev, client); | 235 | evdev_ungrab(evdev, client); |
| 236 | mutex_unlock(&evdev->mutex); | 236 | mutex_unlock(&evdev->mutex); |
| 237 | 237 | ||
| 238 | evdev_fasync(-1, file, 0); | ||
| 239 | evdev_detach_client(evdev, client); | 238 | evdev_detach_client(evdev, client); |
| 240 | kfree(client); | 239 | kfree(client); |
| 241 | 240 | ||
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 65d7077a75a1..a85b1485e774 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
| @@ -244,7 +244,6 @@ static int joydev_release(struct inode *inode, struct file *file) | |||
| 244 | struct joydev_client *client = file->private_data; | 244 | struct joydev_client *client = file->private_data; |
| 245 | struct joydev *joydev = client->joydev; | 245 | struct joydev *joydev = client->joydev; |
| 246 | 246 | ||
| 247 | joydev_fasync(-1, file, 0); | ||
| 248 | joydev_detach_client(joydev, client); | 247 | joydev_detach_client(joydev, client); |
| 249 | kfree(client); | 248 | kfree(client); |
| 250 | 249 | ||
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index 82ec6b1b6467..216a559f55ea 100644 --- a/drivers/input/misc/hp_sdc_rtc.c +++ b/drivers/input/misc/hp_sdc_rtc.c | |||
| @@ -71,7 +71,6 @@ static int hp_sdc_rtc_ioctl(struct inode *inode, struct file *file, | |||
| 71 | static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait); | 71 | static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait); |
| 72 | 72 | ||
| 73 | static int hp_sdc_rtc_open(struct inode *inode, struct file *file); | 73 | static int hp_sdc_rtc_open(struct inode *inode, struct file *file); |
| 74 | static int hp_sdc_rtc_release(struct inode *inode, struct file *file); | ||
| 75 | static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on); | 74 | static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on); |
| 76 | 75 | ||
| 77 | static int hp_sdc_rtc_read_proc(char *page, char **start, off_t off, | 76 | static int hp_sdc_rtc_read_proc(char *page, char **start, off_t off, |
| @@ -414,17 +413,6 @@ static int hp_sdc_rtc_open(struct inode *inode, struct file *file) | |||
| 414 | return 0; | 413 | return 0; |
| 415 | } | 414 | } |
| 416 | 415 | ||
| 417 | static int hp_sdc_rtc_release(struct inode *inode, struct file *file) | ||
| 418 | { | ||
| 419 | /* Turn off interrupts? */ | ||
| 420 | |||
| 421 | if (file->f_flags & FASYNC) { | ||
| 422 | hp_sdc_rtc_fasync (-1, file, 0); | ||
| 423 | } | ||
| 424 | |||
| 425 | return 0; | ||
| 426 | } | ||
| 427 | |||
| 428 | static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on) | 416 | static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on) |
| 429 | { | 417 | { |
| 430 | return fasync_helper (fd, filp, on, &hp_sdc_rtc_async_queue); | 418 | return fasync_helper (fd, filp, on, &hp_sdc_rtc_async_queue); |
| @@ -680,7 +668,6 @@ static const struct file_operations hp_sdc_rtc_fops = { | |||
| 680 | .poll = hp_sdc_rtc_poll, | 668 | .poll = hp_sdc_rtc_poll, |
| 681 | .ioctl = hp_sdc_rtc_ioctl, | 669 | .ioctl = hp_sdc_rtc_ioctl, |
| 682 | .open = hp_sdc_rtc_open, | 670 | .open = hp_sdc_rtc_open, |
| 683 | .release = hp_sdc_rtc_release, | ||
| 684 | .fasync = hp_sdc_rtc_fasync, | 671 | .fasync = hp_sdc_rtc_fasync, |
| 685 | }; | 672 | }; |
| 686 | 673 | ||
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 8137e50ded87..d8c056fe7e98 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -519,7 +519,6 @@ static int mousedev_release(struct inode *inode, struct file *file) | |||
| 519 | struct mousedev_client *client = file->private_data; | 519 | struct mousedev_client *client = file->private_data; |
| 520 | struct mousedev *mousedev = client->mousedev; | 520 | struct mousedev *mousedev = client->mousedev; |
| 521 | 521 | ||
| 522 | mousedev_fasync(-1, file, 0); | ||
| 523 | mousedev_detach_client(mousedev, client); | 522 | mousedev_detach_client(mousedev, client); |
| 524 | kfree(client); | 523 | kfree(client); |
| 525 | 524 | ||
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index 470770c09260..06bbd0e74c6f 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c | |||
| @@ -135,7 +135,6 @@ static int serio_raw_release(struct inode *inode, struct file *file) | |||
| 135 | 135 | ||
| 136 | mutex_lock(&serio_raw_mutex); | 136 | mutex_lock(&serio_raw_mutex); |
| 137 | 137 | ||
| 138 | serio_raw_fasync(-1, file, 0); | ||
| 139 | serio_raw_cleanup(serio_raw); | 138 | serio_raw_cleanup(serio_raw); |
| 140 | 139 | ||
| 141 | mutex_unlock(&serio_raw_mutex); | 140 | mutex_unlock(&serio_raw_mutex); |
diff --git a/drivers/leds/leds-hp-disk.c b/drivers/leds/leds-hp-disk.c index 74645ab15660..44fa757d8254 100644 --- a/drivers/leds/leds-hp-disk.c +++ b/drivers/leds/leds-hp-disk.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/input.h> | 28 | #include <linux/input.h> |
| 29 | #include <linux/kthread.h> | 29 | #include <linux/kthread.h> |
| 30 | #include <linux/version.h> | ||
| 31 | #include <linux/leds.h> | 30 | #include <linux/leds.h> |
| 32 | #include <acpi/acpi_drivers.h> | 31 | #include <acpi/acpi_drivers.h> |
| 33 | 32 | ||
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index f5233f3d9eff..b89f476cd0a9 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
| @@ -559,12 +559,6 @@ mptctl_fasync(int fd, struct file *filep, int mode) | |||
| 559 | return ret; | 559 | return ret; |
| 560 | } | 560 | } |
| 561 | 561 | ||
| 562 | static int | ||
| 563 | mptctl_release(struct inode *inode, struct file *filep) | ||
| 564 | { | ||
| 565 | return fasync_helper(-1, filep, 0, &async_queue); | ||
| 566 | } | ||
| 567 | |||
| 568 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 562 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 569 | /* | 563 | /* |
| 570 | * MPT ioctl handler | 564 | * MPT ioctl handler |
| @@ -2706,7 +2700,6 @@ mptctl_hp_targetinfo(unsigned long arg) | |||
| 2706 | static const struct file_operations mptctl_fops = { | 2700 | static const struct file_operations mptctl_fops = { |
| 2707 | .owner = THIS_MODULE, | 2701 | .owner = THIS_MODULE, |
| 2708 | .llseek = no_llseek, | 2702 | .llseek = no_llseek, |
| 2709 | .release = mptctl_release, | ||
| 2710 | .fasync = mptctl_fasync, | 2703 | .fasync = mptctl_fasync, |
| 2711 | .unlocked_ioctl = mptctl_ioctl, | 2704 | .unlocked_ioctl = mptctl_ioctl, |
| 2712 | #ifdef CONFIG_COMPAT | 2705 | #ifdef CONFIG_COMPAT |
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index a3fabdbe6ca6..f3384c32b9a1 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c | |||
| @@ -1097,28 +1097,17 @@ static int cfg_fasync(int fd, struct file *fp, int on) | |||
| 1097 | static int cfg_release(struct inode *inode, struct file *file) | 1097 | static int cfg_release(struct inode *inode, struct file *file) |
| 1098 | { | 1098 | { |
| 1099 | ulong id = (ulong) file->private_data; | 1099 | ulong id = (ulong) file->private_data; |
| 1100 | struct i2o_cfg_info *p1, *p2; | 1100 | struct i2o_cfg_info *p, **q; |
| 1101 | unsigned long flags; | 1101 | unsigned long flags; |
| 1102 | 1102 | ||
| 1103 | lock_kernel(); | 1103 | lock_kernel(); |
| 1104 | p1 = p2 = NULL; | ||
| 1105 | |||
| 1106 | spin_lock_irqsave(&i2o_config_lock, flags); | 1104 | spin_lock_irqsave(&i2o_config_lock, flags); |
| 1107 | for (p1 = open_files; p1;) { | 1105 | for (q = &open_files; (p = *q) != NULL; q = &p->next) { |
| 1108 | if (p1->q_id == id) { | 1106 | if (p->q_id == id) { |
| 1109 | 1107 | *q = p->next; | |
| 1110 | if (p1->fasync) | 1108 | kfree(p); |
| 1111 | cfg_fasync(-1, file, 0); | ||
| 1112 | if (p2) | ||
| 1113 | p2->next = p1->next; | ||
| 1114 | else | ||
| 1115 | open_files = p1->next; | ||
| 1116 | |||
| 1117 | kfree(p1); | ||
| 1118 | break; | 1109 | break; |
| 1119 | } | 1110 | } |
| 1120 | p2 = p1; | ||
| 1121 | p1 = p1->next; | ||
| 1122 | } | 1111 | } |
| 1123 | spin_unlock_irqrestore(&i2o_config_lock, flags); | 1112 | spin_unlock_irqrestore(&i2o_config_lock, flags); |
| 1124 | unlock_kernel(); | 1113 | unlock_kernel(); |
diff --git a/drivers/misc/panasonic-laptop.c b/drivers/misc/panasonic-laptop.c index a2cb598d8ab5..4a1bc64485d5 100644 --- a/drivers/misc/panasonic-laptop.c +++ b/drivers/misc/panasonic-laptop.c | |||
| @@ -116,7 +116,6 @@ | |||
| 116 | * | 116 | * |
| 117 | */ | 117 | */ |
| 118 | 118 | ||
| 119 | #include <linux/version.h> | ||
| 120 | #include <linux/kernel.h> | 119 | #include <linux/kernel.h> |
| 121 | #include <linux/module.h> | 120 | #include <linux/module.h> |
| 122 | #include <linux/init.h> | 121 | #include <linux/init.h> |
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index f483c4221f76..06f07e19dc70 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
| @@ -1920,7 +1920,6 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on) | |||
| 1920 | 1920 | ||
| 1921 | static int sonypi_misc_release(struct inode *inode, struct file *file) | 1921 | static int sonypi_misc_release(struct inode *inode, struct file *file) |
| 1922 | { | 1922 | { |
| 1923 | sonypi_misc_fasync(-1, file, 0); | ||
| 1924 | atomic_dec(&sonypi_compat.open_count); | 1923 | atomic_dec(&sonypi_compat.open_count); |
| 1925 | return 0; | 1924 | return 0; |
| 1926 | } | 1925 | } |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 6daea0c91862..33b6d1b122fb 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -1070,8 +1070,6 @@ static int tun_chr_close(struct inode *inode, struct file *file) | |||
| 1070 | 1070 | ||
| 1071 | DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name); | 1071 | DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name); |
| 1072 | 1072 | ||
| 1073 | tun_chr_fasync(-1, file, 0); | ||
| 1074 | |||
| 1075 | rtnl_lock(); | 1073 | rtnl_lock(); |
| 1076 | 1074 | ||
| 1077 | /* Detach from net device */ | 1075 | /* Detach from net device */ |
diff --git a/drivers/of/device.c b/drivers/of/device.c index 51e5214071da..224ae6bc67b6 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c | |||
| @@ -105,7 +105,16 @@ EXPORT_SYMBOL(of_release_dev); | |||
| 105 | int of_device_register(struct of_device *ofdev) | 105 | int of_device_register(struct of_device *ofdev) |
| 106 | { | 106 | { |
| 107 | BUG_ON(ofdev->node == NULL); | 107 | BUG_ON(ofdev->node == NULL); |
| 108 | return device_register(&ofdev->dev); | 108 | |
| 109 | device_initialize(&ofdev->dev); | ||
| 110 | |||
| 111 | /* device_add will assume that this device is on the same node as | ||
| 112 | * the parent. If there is no parent defined, set the node | ||
| 113 | * explicitly */ | ||
| 114 | if (!ofdev->dev.parent) | ||
| 115 | set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->node)); | ||
| 116 | |||
| 117 | return device_add(&ofdev->dev); | ||
| 109 | } | 118 | } |
| 110 | EXPORT_SYMBOL(of_device_register); | 119 | EXPORT_SYMBOL(of_device_register); |
| 111 | 120 | ||
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index f57eeae3830a..222904411a13 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
| @@ -188,10 +188,6 @@ config PCMCIA_M8XX | |||
| 188 | 188 | ||
| 189 | This driver is also available as a module called m8xx_pcmcia. | 189 | This driver is also available as a module called m8xx_pcmcia. |
| 190 | 190 | ||
| 191 | config HD64465_PCMCIA | ||
| 192 | tristate "HD64465 host bridge support" | ||
| 193 | depends on HD64465 && PCMCIA | ||
| 194 | |||
| 195 | config PCMCIA_AU1X00 | 191 | config PCMCIA_AU1X00 |
| 196 | tristate "Au1x00 pcmcia support" | 192 | tristate "Au1x00 pcmcia support" |
| 197 | depends on SOC_AU1X00 && PCMCIA | 193 | depends on SOC_AU1X00 && PCMCIA |
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 23e492bf75cf..238629ad7f7c 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile | |||
| @@ -22,7 +22,6 @@ obj-$(CONFIG_I82365) += i82365.o | |||
| 22 | obj-$(CONFIG_I82092) += i82092.o | 22 | obj-$(CONFIG_I82092) += i82092.o |
| 23 | obj-$(CONFIG_TCIC) += tcic.o | 23 | obj-$(CONFIG_TCIC) += tcic.o |
| 24 | obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o | 24 | obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o |
| 25 | obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o | ||
| 26 | obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_core.o sa1100_cs.o | 25 | obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_core.o sa1100_cs.o |
| 27 | obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_core.o sa1111_cs.o | 26 | obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_core.o sa1111_cs.o |
| 28 | obj-$(CONFIG_M32R_PCC) += m32r_pcc.o | 27 | obj-$(CONFIG_M32R_PCC) += m32r_pcc.o |
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c deleted file mode 100644 index 9ef69cdb3183..000000000000 --- a/drivers/pcmcia/hd64465_ss.c +++ /dev/null | |||
| @@ -1,939 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Device driver for the PCMCIA controller module of the | ||
| 3 | * Hitachi HD64465 handheld companion chip. | ||
| 4 | * | ||
| 5 | * Note that the HD64465 provides a very thin PCMCIA host bridge | ||
| 6 | * layer, requiring a lot of the work of supporting cards to be | ||
| 7 | * performed by the processor. For example: mapping of card | ||
| 8 | * interrupts to processor IRQs is done by IRQ demuxing software; | ||
| 9 | * IO and memory mappings are fixed; setting voltages according | ||
| 10 | * to card Voltage Select pins etc is done in software. | ||
| 11 | * | ||
| 12 | * Note also that this driver uses only the simple, fixed, | ||
| 13 | * 16MB, 16-bit wide mappings to PCMCIA spaces defined by the | ||
| 14 | * HD64465. Larger mappings, smaller mappings, or mappings of | ||
| 15 | * different width to the same socket, are all possible only by | ||
| 16 | * involving the SH7750's MMU, which is considered unnecessary here. | ||
| 17 | * The downside is that it may be possible for some drivers to | ||
| 18 | * break because they need or expect 8-bit mappings. | ||
| 19 | * | ||
| 20 | * This driver currently supports only the following configuration: | ||
| 21 | * SH7750 CPU, HD64465, TPS2206 voltage control chip. | ||
| 22 | * | ||
| 23 | * by Greg Banks <gbanks@pocketpenguins.com> | ||
| 24 | * (c) 2000 PocketPenguins Inc | ||
| 25 | */ | ||
| 26 | |||
| 27 | #include <linux/types.h> | ||
| 28 | #include <linux/module.h> | ||
| 29 | #include <linux/init.h> | ||
| 30 | #include <linux/string.h> | ||
| 31 | #include <linux/kernel.h> | ||
| 32 | #include <linux/ioport.h> | ||
| 33 | #include <linux/mm.h> | ||
| 34 | #include <linux/vmalloc.h> | ||
| 35 | #include <asm/errno.h> | ||
| 36 | #include <linux/irq.h> | ||
| 37 | #include <linux/interrupt.h> | ||
| 38 | #include <linux/platform_device.h> | ||
| 39 | |||
| 40 | #include <asm/io.h> | ||
| 41 | #include <asm/hd64465/hd64465.h> | ||
| 42 | #include <asm/hd64465/io.h> | ||
| 43 | |||
| 44 | #include <pcmcia/cs_types.h> | ||
| 45 | #include <pcmcia/cs.h> | ||
| 46 | #include <pcmcia/cistpl.h> | ||
| 47 | #include <pcmcia/ds.h> | ||
| 48 | #include <pcmcia/ss.h> | ||
| 49 | |||
| 50 | #define MODNAME "hd64465_ss" | ||
| 51 | |||
| 52 | /* #define HD64465_DEBUG 1 */ | ||
| 53 | |||
| 54 | #if HD64465_DEBUG | ||
| 55 | #define DPRINTK(args...) printk(MODNAME ": " args) | ||
| 56 | #else | ||
| 57 | #define DPRINTK(args...) | ||
| 58 | #endif | ||
| 59 | |||
| 60 | extern int hd64465_io_debug; | ||
| 61 | extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags); | ||
| 62 | extern void p3_iounmap(void *addr); | ||
| 63 | |||
| 64 | /*============================================================*/ | ||
| 65 | |||
| 66 | #define HS_IO_MAP_SIZE (64*1024) | ||
| 67 | |||
| 68 | typedef struct hs_socket_t | ||
| 69 | { | ||
| 70 | unsigned int number; | ||
| 71 | u_int irq; | ||
| 72 | u_long mem_base; | ||
| 73 | void *io_base; | ||
| 74 | u_long mem_length; | ||
| 75 | u_int ctrl_base; | ||
| 76 | socket_state_t state; | ||
| 77 | pccard_io_map io_maps[MAX_IO_WIN]; | ||
| 78 | pccard_mem_map mem_maps[MAX_WIN]; | ||
| 79 | struct pcmcia_socket socket; | ||
| 80 | } hs_socket_t; | ||
| 81 | |||
| 82 | |||
| 83 | |||
| 84 | #define HS_MAX_SOCKETS 2 | ||
| 85 | static hs_socket_t hs_sockets[HS_MAX_SOCKETS]; | ||
| 86 | |||
| 87 | #define hs_in(sp, r) inb((sp)->ctrl_base + (r)) | ||
| 88 | #define hs_out(sp, v, r) outb(v, (sp)->ctrl_base + (r)) | ||
| 89 | |||
| 90 | |||
| 91 | /* translate a boolean value to a bit in a register */ | ||
| 92 | #define bool_to_regbit(sp, r, bi, bo) \ | ||
| 93 | do { \ | ||
| 94 | unsigned short v = hs_in(sp, r); \ | ||
| 95 | if (bo) \ | ||
| 96 | v |= (bi); \ | ||
| 97 | else \ | ||
| 98 | v &= ~(bi); \ | ||
| 99 | hs_out(sp, v, r); \ | ||
| 100 | } while(0) | ||
| 101 | |||
| 102 | /* register offsets from HD64465_REG_PCC[01]ISR */ | ||
| 103 | #define ISR 0x0 | ||
| 104 | #define GCR 0x2 | ||
| 105 | #define CSCR 0x4 | ||
| 106 | #define CSCIER 0x6 | ||
| 107 | #define SCR 0x8 | ||
| 108 | |||
| 109 | |||
| 110 | /* Mask and values for CSCIER register */ | ||
| 111 | #define IER_MASK 0x80 | ||
| 112 | #define IER_ON 0x3f /* interrupts on */ | ||
| 113 | #define IER_OFF 0x00 /* interrupts off */ | ||
| 114 | |||
| 115 | /*============================================================*/ | ||
| 116 | |||
| 117 | #if HD64465_DEBUG > 10 | ||
| 118 | |||
| 119 | static void cis_hex_dump(const unsigned char *x, int len) | ||
| 120 | { | ||
| 121 | int i; | ||
| 122 | |||
| 123 | for (i=0 ; i<len ; i++) | ||
| 124 | { | ||
| 125 | if (!(i & 0xf)) | ||
| 126 | printk("\n%08x", (unsigned)(x + i)); | ||
| 127 | printk(" %02x", *(volatile unsigned short*)x); | ||
| 128 | x += 2; | ||
| 129 | } | ||
| 130 | printk("\n"); | ||
| 131 | } | ||
| 132 | |||
| 133 | #endif | ||
| 134 | /*============================================================*/ | ||
| 135 | |||
| 136 | /* | ||
| 137 | * This code helps create the illusion that the IREQ line from | ||
| 138 | * the PC card is mapped to one of the CPU's IRQ lines by the | ||
| 139 | * host bridge hardware (which is how every host bridge *except* | ||
| 140 | * the HD64465 works). In particular, it supports enabling | ||
| 141 | * and disabling the IREQ line by code which knows nothing | ||
| 142 | * about the host bridge (e.g. device drivers, IDE code) using | ||
| 143 | * the request_irq(), free_irq(), probe_irq_on() and probe_irq_off() | ||
| 144 | * functions. Also, it supports sharing the mapped IRQ with | ||
| 145 | * real hardware IRQs from the -IRL0-3 lines. | ||
| 146 | */ | ||
| 147 | |||
| 148 | #define HS_NUM_MAPPED_IRQS 16 /* Limitation of the PCMCIA code */ | ||
| 149 | static struct | ||
| 150 | { | ||
| 151 | /* index is mapped irq number */ | ||
| 152 | hs_socket_t *sock; | ||
| 153 | hw_irq_controller *old_handler; | ||
| 154 | } hs_mapped_irq[HS_NUM_MAPPED_IRQS]; | ||
| 155 | |||
| 156 | static void hs_socket_enable_ireq(hs_socket_t *sp) | ||
| 157 | { | ||
| 158 | unsigned short cscier; | ||
| 159 | |||
| 160 | DPRINTK("hs_socket_enable_ireq(sock=%d)\n", sp->number); | ||
| 161 | |||
| 162 | cscier = hs_in(sp, CSCIER); | ||
| 163 | cscier &= ~HD64465_PCCCSCIER_PIREQE_MASK; | ||
| 164 | cscier |= HD64465_PCCCSCIER_PIREQE_LEVEL; | ||
| 165 | hs_out(sp, cscier, CSCIER); | ||
| 166 | } | ||
| 167 | |||
| 168 | static void hs_socket_disable_ireq(hs_socket_t *sp) | ||
| 169 | { | ||
| 170 | unsigned short cscier; | ||
| 171 | |||
| 172 | DPRINTK("hs_socket_disable_ireq(sock=%d)\n", sp->number); | ||
| 173 | |||
| 174 | cscier = hs_in(sp, CSCIER); | ||
| 175 | cscier &= ~HD64465_PCCCSCIER_PIREQE_MASK; | ||
| 176 | hs_out(sp, cscier, CSCIER); | ||
| 177 | } | ||
| 178 | |||
| 179 | static unsigned int hs_startup_irq(unsigned int irq) | ||
| 180 | { | ||
| 181 | hs_socket_enable_ireq(hs_mapped_irq[irq].sock); | ||
| 182 | hs_mapped_irq[irq].old_handler->startup(irq); | ||
| 183 | return 0; | ||
| 184 | } | ||
| 185 | |||
| 186 | static void hs_shutdown_irq(unsigned int irq) | ||
| 187 | { | ||
| 188 | hs_socket_disable_ireq(hs_mapped_irq[irq].sock); | ||
| 189 | hs_mapped_irq[irq].old_handler->shutdown(irq); | ||
| 190 | } | ||
| 191 | |||
| 192 | static void hs_enable_irq(unsigned int irq) | ||
| 193 | { | ||
| 194 | hs_socket_enable_ireq(hs_mapped_irq[irq].sock); | ||
| 195 | hs_mapped_irq[irq].old_handler->enable(irq); | ||
| 196 | } | ||
| 197 | |||
| 198 | static void hs_disable_irq(unsigned int irq) | ||
| 199 | { | ||
| 200 | hs_socket_disable_ireq(hs_mapped_irq[irq].sock); | ||
| 201 | hs_mapped_irq[irq].old_handler->disable(irq); | ||
| 202 | } | ||
| 203 | |||
| 204 | extern struct hw_interrupt_type no_irq_type; | ||
| 205 | |||
| 206 | static void hs_mask_and_ack_irq(unsigned int irq) | ||
| 207 | { | ||
| 208 | hs_socket_disable_ireq(hs_mapped_irq[irq].sock); | ||
| 209 | /* ack_none() spuriously complains about an unexpected IRQ */ | ||
| 210 | if (hs_mapped_irq[irq].old_handler != &no_irq_type) | ||
| 211 | hs_mapped_irq[irq].old_handler->ack(irq); | ||
| 212 | } | ||
| 213 | |||
| 214 | static void hs_end_irq(unsigned int irq) | ||
| 215 | { | ||
| 216 | hs_socket_enable_ireq(hs_mapped_irq[irq].sock); | ||
| 217 | hs_mapped_irq[irq].old_handler->end(irq); | ||
| 218 | } | ||
| 219 | |||
| 220 | |||
| 221 | static struct hw_interrupt_type hd64465_ss_irq_type = { | ||
| 222 | .typename = "PCMCIA-IRQ", | ||
| 223 | .startup = hs_startup_irq, | ||
| 224 | .shutdown = hs_shutdown_irq, | ||
| 225 | .enable = hs_enable_irq, | ||
| 226 | .disable = hs_disable_irq, | ||
| 227 | .ack = hs_mask_and_ack_irq, | ||
| 228 | .end = hs_end_irq | ||
| 229 | }; | ||
| 230 | |||
| 231 | /* | ||
| 232 | * This function should only ever be called with interrupts disabled. | ||
| 233 | */ | ||
| 234 | static void hs_map_irq(hs_socket_t *sp, unsigned int irq) | ||
| 235 | { | ||
| 236 | struct irq_desc *desc; | ||
| 237 | |||
| 238 | DPRINTK("hs_map_irq(sock=%d irq=%d)\n", sp->number, irq); | ||
| 239 | |||
| 240 | if (irq >= HS_NUM_MAPPED_IRQS) | ||
| 241 | return; | ||
| 242 | |||
| 243 | desc = irq_to_desc(irq); | ||
| 244 | hs_mapped_irq[irq].sock = sp; | ||
| 245 | /* insert ourselves as the irq controller */ | ||
| 246 | hs_mapped_irq[irq].old_handler = desc->chip; | ||
| 247 | desc->chip = &hd64465_ss_irq_type; | ||
| 248 | } | ||
| 249 | |||
| 250 | |||
| 251 | /* | ||
| 252 | * This function should only ever be called with interrupts disabled. | ||
| 253 | */ | ||
| 254 | static void hs_unmap_irq(hs_socket_t *sp, unsigned int irq) | ||
| 255 | { | ||
| 256 | struct irq_desc *desc; | ||
| 257 | |||
| 258 | DPRINTK("hs_unmap_irq(sock=%d irq=%d)\n", sp->number, irq); | ||
| 259 | |||
| 260 | if (irq >= HS_NUM_MAPPED_IRQS) | ||
| 261 | return; | ||
| 262 | |||
| 263 | desc = irq_to_desc(irq); | ||
| 264 | /* restore the original irq controller */ | ||
| 265 | desc->chip = hs_mapped_irq[irq].old_handler; | ||
| 266 | } | ||
| 267 | |||
| 268 | /*============================================================*/ | ||
| 269 | |||
| 270 | |||
| 271 | /* | ||
| 272 | * Set Vpp and Vcc (in tenths of a Volt). Does not | ||
| 273 | * support the hi-Z state. | ||
| 274 | * | ||
| 275 | * Note, this assumes the board uses a TPS2206 chip to control | ||
| 276 | * the Vcc and Vpp voltages to the hs_sockets. If your board | ||
| 277 | * uses the MIC2563 (also supported by the HD64465) then you | ||
| 278 | * will have to modify this function. | ||
| 279 | */ | ||
| 280 | /* 0V 3.3V 5.5V */ | ||
| 281 | static const u_char hs_tps2206_avcc[3] = { 0x00, 0x04, 0x08 }; | ||
| 282 | static const u_char hs_tps2206_bvcc[3] = { 0x00, 0x80, 0x40 }; | ||
| 283 | |||
| 284 | static int hs_set_voltages(hs_socket_t *sp, int Vcc, int Vpp) | ||
| 285 | { | ||
| 286 | u_int psr; | ||
| 287 | u_int vcci = 0; | ||
| 288 | u_int sock = sp->number; | ||
| 289 | |||
| 290 | DPRINTK("hs_set_voltage(%d, %d, %d)\n", sock, Vcc, Vpp); | ||
| 291 | |||
| 292 | switch (Vcc) | ||
| 293 | { | ||
| 294 | case 0: vcci = 0; break; | ||
| 295 | case 33: vcci = 1; break; | ||
| 296 | case 50: vcci = 2; break; | ||
| 297 | default: return 0; | ||
| 298 | } | ||
| 299 | |||
| 300 | /* Note: Vpp = 120 not supported -- Greg Banks */ | ||
| 301 | if (Vpp != 0 && Vpp != Vcc) | ||
| 302 | return 0; | ||
| 303 | |||
| 304 | /* The PSR register holds 8 of the 9 bits which control | ||
| 305 | * the TPS2206 via its serial interface. | ||
| 306 | */ | ||
| 307 | psr = inw(HD64465_REG_PCCPSR); | ||
| 308 | switch (sock) | ||
| 309 | { | ||
| 310 | case 0: | ||
| 311 | psr &= 0x0f; | ||
| 312 | psr |= hs_tps2206_avcc[vcci]; | ||
| 313 | psr |= (Vpp == 0 ? 0x00 : 0x02); | ||
| 314 | break; | ||
| 315 | case 1: | ||
| 316 | psr &= 0xf0; | ||
| 317 | psr |= hs_tps2206_bvcc[vcci]; | ||
| 318 | psr |= (Vpp == 0 ? 0x00 : 0x20); | ||
| 319 | break; | ||
| 320 | }; | ||
| 321 | outw(psr, HD64465_REG_PCCPSR); | ||
| 322 | |||
| 323 | return 1; | ||
| 324 | } | ||
| 325 | |||
| 326 | |||
| 327 | /*============================================================*/ | ||
| 328 | |||
| 329 | /* | ||
| 330 | * Drive the RESET line to the card. | ||
| 331 | */ | ||
| 332 | static void hs_reset_socket(hs_socket_t *sp, int on) | ||
| 333 | { | ||
| 334 | unsigned short v; | ||
| 335 | |||
| 336 | v = hs_in(sp, GCR); | ||
| 337 | if (on) | ||
| 338 | v |= HD64465_PCCGCR_PCCR; | ||
| 339 | else | ||
| 340 | v &= ~HD64465_PCCGCR_PCCR; | ||
| 341 | hs_out(sp, v, GCR); | ||
| 342 | } | ||
| 343 | |||
| 344 | /*============================================================*/ | ||
| 345 | |||
| 346 | static int hs_init(struct pcmcia_socket *s) | ||
| 347 | { | ||
| 348 | hs_socket_t *sp = container_of(s, struct hs_socket_t, socket); | ||
| 349 | |||
| 350 | DPRINTK("hs_init(%d)\n", sp->number); | ||
| 351 | |||
| 352 | return 0; | ||
| 353 | } | ||
| 354 | |||
| 355 | /*============================================================*/ | ||
| 356 | |||
| 357 | |||
| 358 | static int hs_get_status(struct pcmcia_socket *s, u_int *value) | ||
| 359 | { | ||
| 360 | hs_socket_t *sp = container_of(s, struct hs_socket_t, socket); | ||
| 361 | unsigned int isr; | ||
| 362 | u_int status = 0; | ||
| 363 | |||
| 364 | |||
| 365 | isr = hs_in(sp, ISR); | ||
| 366 | |||
| 367 | /* Card is seated and powered when *both* CD pins are low */ | ||
| 368 | if ((isr & HD64465_PCCISR_PCD_MASK) == 0) | ||
| 369 | { | ||
| 370 | status |= SS_DETECT; /* card present */ | ||
| 371 | |||
| 372 | switch (isr & HD64465_PCCISR_PBVD_MASK) | ||
| 373 | { | ||
| 374 | case HD64465_PCCISR_PBVD_BATGOOD: | ||
| 375 | break; | ||
| 376 | case HD64465_PCCISR_PBVD_BATWARN: | ||
| 377 | status |= SS_BATWARN; | ||
| 378 | break; | ||
| 379 | default: | ||
| 380 | status |= SS_BATDEAD; | ||
| 381 | break; | ||
| 382 | } | ||
| 383 | |||
| 384 | if (isr & HD64465_PCCISR_PREADY) | ||
| 385 | status |= SS_READY; | ||
| 386 | |||
| 387 | if (isr & HD64465_PCCISR_PMWP) | ||
| 388 | status |= SS_WRPROT; | ||
| 389 | |||
| 390 | /* Voltage Select pins interpreted as per Table 4-5 of the std. | ||
| 391 | * Assuming we have the TPS2206, the socket is a "Low Voltage | ||
| 392 | * key, 3.3V and 5V available, no X.XV available". | ||
| 393 | */ | ||
| 394 | switch (isr & (HD64465_PCCISR_PVS2|HD64465_PCCISR_PVS1)) | ||
| 395 | { | ||
| 396 | case HD64465_PCCISR_PVS1: | ||
| 397 | printk(KERN_NOTICE MODNAME ": cannot handle X.XV card, ignored\n"); | ||
| 398 | status = 0; | ||
| 399 | break; | ||
| 400 | case 0: | ||
| 401 | case HD64465_PCCISR_PVS2: | ||
| 402 | /* 3.3V */ | ||
| 403 | status |= SS_3VCARD; | ||
| 404 | break; | ||
| 405 | case HD64465_PCCISR_PVS2|HD64465_PCCISR_PVS1: | ||
| 406 | /* 5V */ | ||
| 407 | break; | ||
| 408 | } | ||
| 409 | |||
| 410 | /* TODO: SS_POWERON */ | ||
| 411 | /* TODO: SS_STSCHG */ | ||
| 412 | } | ||
| 413 | |||
| 414 | DPRINTK("hs_get_status(%d) = %x\n", sock, status); | ||
| 415 | |||
| 416 | *value = status; | ||
| 417 | return 0; | ||
| 418 | } | ||
| 419 | |||
| 420 | /*============================================================*/ | ||
| 421 | |||
| 422 | static int hs_set_socket(struct pcmcia_socket *s, socket_state_t *state) | ||
| 423 | { | ||
| 424 | hs_socket_t *sp = container_of(s, struct hs_socket_t, socket); | ||
| 425 | u_long flags; | ||
| 426 | u_int changed; | ||
| 427 | unsigned short cscier; | ||
| 428 | |||
| 429 | DPRINTK("hs_set_socket(sock=%d, flags=%x, csc_mask=%x, Vcc=%d, Vpp=%d, io_irq=%d)\n", | ||
| 430 | sock, state->flags, state->csc_mask, state->Vcc, state->Vpp, state->io_irq); | ||
| 431 | |||
| 432 | local_irq_save(flags); /* Don't want interrupts happening here */ | ||
| 433 | |||
| 434 | if (state->Vpp != sp->state.Vpp || | ||
| 435 | state->Vcc != sp->state.Vcc) { | ||
| 436 | if (!hs_set_voltages(sp, state->Vcc, state->Vpp)) { | ||
| 437 | local_irq_restore(flags); | ||
| 438 | return -EINVAL; | ||
| 439 | } | ||
| 440 | } | ||
| 441 | |||
| 442 | /* hd64465_io_debug = 1; */ | ||
| 443 | /* | ||
| 444 | * Handle changes in the Card Status Change mask, | ||
| 445 | * by propagating to the CSCR register | ||
| 446 | */ | ||
| 447 | changed = sp->state.csc_mask ^ state->csc_mask; | ||
| 448 | cscier = hs_in(sp, CSCIER); | ||
| 449 | |||
| 450 | if (changed & SS_DETECT) { | ||
| 451 | if (state->csc_mask & SS_DETECT) | ||
| 452 | cscier |= HD64465_PCCCSCIER_PCDE; | ||
| 453 | else | ||
| 454 | cscier &= ~HD64465_PCCCSCIER_PCDE; | ||
| 455 | } | ||
| 456 | |||
| 457 | if (changed & SS_READY) { | ||
| 458 | if (state->csc_mask & SS_READY) | ||
| 459 | cscier |= HD64465_PCCCSCIER_PRE; | ||
| 460 | else | ||
| 461 | cscier &= ~HD64465_PCCCSCIER_PRE; | ||
| 462 | } | ||
| 463 | |||
| 464 | if (changed & SS_BATDEAD) { | ||
| 465 | if (state->csc_mask & SS_BATDEAD) | ||
| 466 | cscier |= HD64465_PCCCSCIER_PBDE; | ||
| 467 | else | ||
| 468 | cscier &= ~HD64465_PCCCSCIER_PBDE; | ||
| 469 | } | ||
| 470 | |||
| 471 | if (changed & SS_BATWARN) { | ||
| 472 | if (state->csc_mask & SS_BATWARN) | ||
| 473 | cscier |= HD64465_PCCCSCIER_PBWE; | ||
| 474 | else | ||
| 475 | cscier &= ~HD64465_PCCCSCIER_PBWE; | ||
| 476 | } | ||
| 477 | |||
| 478 | if (changed & SS_STSCHG) { | ||
| 479 | if (state->csc_mask & SS_STSCHG) | ||
| 480 | cscier |= HD64465_PCCCSCIER_PSCE; | ||
| 481 | else | ||
| 482 | cscier &= ~HD64465_PCCCSCIER_PSCE; | ||
| 483 | } | ||
| 484 | |||
| 485 | hs_out(sp, cscier, CSCIER); | ||
| 486 | |||
| 487 | if (sp->state.io_irq && !state->io_irq) | ||
| 488 | hs_unmap_irq(sp, sp->state.io_irq); | ||
| 489 | else if (!sp->state.io_irq && state->io_irq) | ||
| 490 | hs_map_irq(sp, state->io_irq); | ||
| 491 | |||
| 492 | |||
| 493 | /* | ||
| 494 | * Handle changes in the flags field, | ||
| 495 | * by propagating to config registers. | ||
| 496 | */ | ||
| 497 | changed = sp->state.flags ^ state->flags; | ||
| 498 | |||
| 499 | if (changed & SS_IOCARD) { | ||
| 500 | DPRINTK("card type: %s\n", | ||
| 501 | (state->flags & SS_IOCARD ? "i/o" : "memory" )); | ||
| 502 | bool_to_regbit(sp, GCR, HD64465_PCCGCR_PCCT, | ||
| 503 | state->flags & SS_IOCARD); | ||
| 504 | } | ||
| 505 | |||
| 506 | if (changed & SS_RESET) { | ||
| 507 | DPRINTK("%s reset card\n", | ||
| 508 | (state->flags & SS_RESET ? "start" : "stop")); | ||
| 509 | bool_to_regbit(sp, GCR, HD64465_PCCGCR_PCCR, | ||
| 510 | state->flags & SS_RESET); | ||
| 511 | } | ||
| 512 | |||
| 513 | if (changed & SS_OUTPUT_ENA) { | ||
| 514 | DPRINTK("%sabling card output\n", | ||
| 515 | (state->flags & SS_OUTPUT_ENA ? "en" : "dis")); | ||
| 516 | bool_to_regbit(sp, GCR, HD64465_PCCGCR_PDRV, | ||
| 517 | state->flags & SS_OUTPUT_ENA); | ||
| 518 | } | ||
| 519 | |||
| 520 | /* TODO: SS_SPKR_ENA */ | ||
| 521 | |||
| 522 | /* hd64465_io_debug = 0; */ | ||
| 523 | sp->state = *state; | ||
| 524 | |||
| 525 | local_irq_restore(flags); | ||
| 526 | |||
| 527 | #if HD64465_DEBUG > 10 | ||
| 528 | if (state->flags & SS_OUTPUT_ENA) | ||
| 529 | cis_hex_dump((const unsigned char*)sp->mem_base, 0x100); | ||
| 530 | #endif | ||
| 531 | return 0; | ||
| 532 | } | ||
| 533 | |||
| 534 | /*============================================================*/ | ||
| 535 | |||
| 536 | static int hs_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io) | ||
| 537 | { | ||
| 538 | hs_socket_t *sp = container_of(s, struct hs_socket_t, socket); | ||
| 539 | int map = io->map; | ||
| 540 | int sock = sp->number; | ||
| 541 | struct pccard_io_map *sio; | ||
| 542 | pgprot_t prot; | ||
| 543 | |||
| 544 | DPRINTK("hs_set_io_map(sock=%d, map=%d, flags=0x%x, speed=%dns, start=%#lx, stop=%#lx)\n", | ||
| 545 | sock, map, io->flags, io->speed, io->start, io->stop); | ||
| 546 | if (map >= MAX_IO_WIN) | ||
| 547 | return -EINVAL; | ||
| 548 | sio = &sp->io_maps[map]; | ||
| 549 | |||
| 550 | /* check for null changes */ | ||
| 551 | if (io->flags == sio->flags && | ||
| 552 | io->start == sio->start && | ||
| 553 | io->stop == sio->stop) | ||
| 554 | return 0; | ||
| 555 | |||
| 556 | if (io->flags & MAP_AUTOSZ) | ||
| 557 | prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IODYN); | ||
| 558 | else if (io->flags & MAP_16BIT) | ||
| 559 | prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IO16); | ||
| 560 | else | ||
| 561 | prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IO8); | ||
| 562 | |||
| 563 | /* TODO: handle MAP_USE_WAIT */ | ||
| 564 | if (io->flags & MAP_USE_WAIT) | ||
| 565 | printk(KERN_INFO MODNAME ": MAP_USE_WAIT unimplemented\n"); | ||
| 566 | /* TODO: handle MAP_PREFETCH */ | ||
| 567 | if (io->flags & MAP_PREFETCH) | ||
| 568 | printk(KERN_INFO MODNAME ": MAP_PREFETCH unimplemented\n"); | ||
| 569 | /* TODO: handle MAP_WRPROT */ | ||
| 570 | if (io->flags & MAP_WRPROT) | ||
| 571 | printk(KERN_INFO MODNAME ": MAP_WRPROT unimplemented\n"); | ||
| 572 | /* TODO: handle MAP_0WS */ | ||
| 573 | if (io->flags & MAP_0WS) | ||
| 574 | printk(KERN_INFO MODNAME ": MAP_0WS unimplemented\n"); | ||
| 575 | |||
| 576 | if (io->flags & MAP_ACTIVE) { | ||
| 577 | unsigned long pstart, psize, paddrbase; | ||
| 578 | |||
| 579 | paddrbase = virt_to_phys((void*)(sp->mem_base + 2 * HD64465_PCC_WINDOW)); | ||
| 580 | pstart = io->start & PAGE_MASK; | ||
| 581 | psize = ((io->stop + PAGE_SIZE) & PAGE_MASK) - pstart; | ||
| 582 | |||
| 583 | /* | ||
| 584 | * Change PTEs in only that portion of the mapping requested | ||
| 585 | * by the caller. This means that most of the time, most of | ||
| 586 | * the PTEs in the io_vma will be unmapped and only the bottom | ||
| 587 | * page will be mapped. But the code allows for weird cards | ||
| 588 | * that might want IO ports > 4K. | ||
| 589 | */ | ||
| 590 | sp->io_base = p3_ioremap(paddrbase + pstart, psize, pgprot_val(prot)); | ||
| 591 | |||
| 592 | /* | ||
| 593 | * Change the mapping used by inb() outb() etc | ||
| 594 | */ | ||
| 595 | hd64465_port_map(io->start, | ||
| 596 | io->stop - io->start + 1, | ||
| 597 | (unsigned long)sp->io_base + io->start, 0); | ||
| 598 | } else { | ||
| 599 | hd64465_port_unmap(sio->start, sio->stop - sio->start + 1); | ||
| 600 | p3_iounmap(sp->io_base); | ||
| 601 | } | ||
| 602 | |||
| 603 | *sio = *io; | ||
| 604 | return 0; | ||
| 605 | } | ||
| 606 | |||
| 607 | /*============================================================*/ | ||
| 608 | |||
| 609 | static int hs_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem) | ||
| 610 | { | ||
| 611 | hs_socket_t *sp = container_of(s, struct hs_socket_t, socket); | ||
| 612 | struct pccard_mem_map *smem; | ||
| 613 | int map = mem->map; | ||
| 614 | unsigned long paddr; | ||
| 615 | |||
| 616 | #if 0 | ||
| 617 | DPRINTK("hs_set_mem_map(sock=%d, map=%d, flags=0x%x, card_start=0x%08x)\n", | ||
| 618 | sock, map, mem->flags, mem->card_start); | ||
| 619 | #endif | ||
| 620 | |||
| 621 | if (map >= MAX_WIN) | ||
| 622 | return -EINVAL; | ||
| 623 | smem = &sp->mem_maps[map]; | ||
| 624 | |||
| 625 | paddr = sp->mem_base; /* base of Attribute mapping */ | ||
| 626 | if (!(mem->flags & MAP_ATTRIB)) | ||
| 627 | paddr += HD64465_PCC_WINDOW; /* base of Common mapping */ | ||
| 628 | paddr += mem->card_start; | ||
| 629 | |||
| 630 | /* Because we specified SS_CAP_STATIC_MAP, we are obliged | ||
| 631 | * at this time to report the system address corresponding | ||
| 632 | * to the card address requested. This is how Socket Services | ||
| 633 | * queries our fixed mapping. I wish this fact had been | ||
| 634 | * documented - Greg Banks. | ||
| 635 | */ | ||
| 636 | mem->static_start = paddr; | ||
| 637 | |||
| 638 | *smem = *mem; | ||
| 639 | |||
| 640 | return 0; | ||
| 641 | } | ||
| 642 | |||
| 643 | /* TODO: do we need to use the MMU to access Common memory ??? */ | ||
| 644 | |||
| 645 | /*============================================================*/ | ||
| 646 | |||
| 647 | /* | ||
| 648 | * This function is registered with the HD64465 glue code to do a | ||
| 649 | * secondary demux step on the PCMCIA interrupts. It handles | ||
| 650 | * mapping the IREQ request from the card to a standard Linux | ||
| 651 | * IRQ, as requested by SocketServices. | ||
| 652 | */ | ||
| 653 | static int hs_irq_demux(int irq, void *dev) | ||
| 654 | { | ||
| 655 | hs_socket_t *sp = dev; | ||
| 656 | u_int cscr; | ||
| 657 | |||
| 658 | DPRINTK("hs_irq_demux(irq=%d)\n", irq); | ||
| 659 | |||
| 660 | if (sp->state.io_irq && | ||
| 661 | (cscr = hs_in(sp, CSCR)) & HD64465_PCCCSCR_PIREQ) { | ||
| 662 | cscr &= ~HD64465_PCCCSCR_PIREQ; | ||
| 663 | hs_out(sp, cscr, CSCR); | ||
| 664 | return sp->state.io_irq; | ||
| 665 | } | ||
| 666 | |||
| 667 | return irq; | ||
| 668 | } | ||
| 669 | |||
| 670 | /*============================================================*/ | ||
| 671 | |||
| 672 | /* | ||
| 673 | * Interrupt handling routine. | ||
| 674 | */ | ||
| 675 | |||
| 676 | static irqreturn_t hs_interrupt(int irq, void *dev) | ||
| 677 | { | ||
| 678 | hs_socket_t *sp = dev; | ||
| 679 | u_int events = 0; | ||
| 680 | u_int cscr; | ||
| 681 | |||
| 682 | cscr = hs_in(sp, CSCR); | ||
| 683 | |||
| 684 | DPRINTK("hs_interrupt, cscr=%04x\n", cscr); | ||
| 685 | |||
| 686 | /* check for bus-related changes to be reported to Socket Services */ | ||
| 687 | if (cscr & HD64465_PCCCSCR_PCDC) { | ||
| 688 | /* double-check for a 16-bit card, as we don't support CardBus */ | ||
| 689 | if ((hs_in(sp, ISR) & HD64465_PCCISR_PCD_MASK) != 0) { | ||
| 690 | printk(KERN_NOTICE MODNAME | ||
| 691 | ": socket %d, card not a supported card type or not inserted correctly\n", | ||
| 692 | sp->number); | ||
| 693 | /* Don't do the rest unless a card is present */ | ||
| 694 | cscr &= ~(HD64465_PCCCSCR_PCDC| | ||
| 695 | HD64465_PCCCSCR_PRC| | ||
| 696 | HD64465_PCCCSCR_PBW| | ||
| 697 | HD64465_PCCCSCR_PBD| | ||
| 698 | HD64465_PCCCSCR_PSC); | ||
| 699 | } else { | ||
| 700 | cscr &= ~HD64465_PCCCSCR_PCDC; | ||
| 701 | events |= SS_DETECT; /* card insertion or removal */ | ||
| 702 | } | ||
| 703 | } | ||
| 704 | if (cscr & HD64465_PCCCSCR_PRC) { | ||
| 705 | cscr &= ~HD64465_PCCCSCR_PRC; | ||
| 706 | events |= SS_READY; /* ready signal changed */ | ||
| 707 | } | ||
| 708 | if (cscr & HD64465_PCCCSCR_PBW) { | ||
| 709 | cscr &= ~HD64465_PCCCSCR_PSC; | ||
| 710 | events |= SS_BATWARN; /* battery warning */ | ||
| 711 | } | ||
| 712 | if (cscr & HD64465_PCCCSCR_PBD) { | ||
| 713 | cscr &= ~HD64465_PCCCSCR_PSC; | ||
| 714 | events |= SS_BATDEAD; /* battery dead */ | ||
| 715 | } | ||
| 716 | if (cscr & HD64465_PCCCSCR_PSC) { | ||
| 717 | cscr &= ~HD64465_PCCCSCR_PSC; | ||
| 718 | events |= SS_STSCHG; /* STSCHG (status changed) signal */ | ||
| 719 | } | ||
| 720 | |||
| 721 | if (cscr & HD64465_PCCCSCR_PIREQ) { | ||
| 722 | cscr &= ~HD64465_PCCCSCR_PIREQ; | ||
| 723 | |||
| 724 | /* This should have been dealt with during irq demux */ | ||
| 725 | printk(KERN_NOTICE MODNAME ": unexpected IREQ from card\n"); | ||
| 726 | } | ||
| 727 | |||
| 728 | hs_out(sp, cscr, CSCR); | ||
| 729 | |||
| 730 | if (events) | ||
| 731 | pcmcia_parse_events(&sp->socket, events); | ||
| 732 | |||
| 733 | return IRQ_HANDLED; | ||
| 734 | } | ||
| 735 | |||
| 736 | /*============================================================*/ | ||
| 737 | |||
| 738 | static struct pccard_operations hs_operations = { | ||
| 739 | .init = hs_init, | ||
| 740 | .get_status = hs_get_status, | ||
| 741 | .set_socket = hs_set_socket, | ||
| 742 | .set_io_map = hs_set_io_map, | ||
| 743 | .set_mem_map = hs_set_mem_map, | ||
| 744 | }; | ||
| 745 | |||
| 746 | static int hs_init_socket(hs_socket_t *sp, int irq, unsigned long mem_base, | ||
| 747 | unsigned int ctrl_base) | ||
| 748 | { | ||
| 749 | unsigned short v; | ||
| 750 | int i, err; | ||
| 751 | |||
| 752 | memset(sp, 0, sizeof(*sp)); | ||
| 753 | sp->irq = irq; | ||
| 754 | sp->mem_base = mem_base; | ||
| 755 | sp->mem_length = 4*HD64465_PCC_WINDOW; /* 16MB */ | ||
| 756 | sp->ctrl_base = ctrl_base; | ||
| 757 | |||
| 758 | for (i=0 ; i<MAX_IO_WIN ; i++) | ||
| 759 | sp->io_maps[i].map = i; | ||
| 760 | for (i=0 ; i<MAX_WIN ; i++) | ||
| 761 | sp->mem_maps[i].map = i; | ||
| 762 | |||
| 763 | hd64465_register_irq_demux(sp->irq, hs_irq_demux, sp); | ||
| 764 | |||
| 765 | if ((err = request_irq(sp->irq, hs_interrupt, IRQF_DISABLED, MODNAME, sp)) < 0) | ||
| 766 | return err; | ||
| 767 | if (request_mem_region(sp->mem_base, sp->mem_length, MODNAME) == 0) { | ||
| 768 | sp->mem_base = 0; | ||
| 769 | return -ENOMEM; | ||
| 770 | } | ||
| 771 | |||
| 772 | |||
| 773 | /* According to section 3.2 of the PCMCIA standard, low-voltage | ||
| 774 | * capable cards must implement cold insertion, i.e. Vpp and | ||
| 775 | * Vcc set to 0 before card is inserted. | ||
| 776 | */ | ||
| 777 | /*hs_set_voltages(sp, 0, 0);*/ | ||
| 778 | |||
| 779 | /* hi-Z the outputs to the card and set 16MB map mode */ | ||
| 780 | v = hs_in(sp, GCR); | ||
| 781 | v &= ~HD64465_PCCGCR_PCCT; /* memory-only card */ | ||
| 782 | hs_out(sp, v, GCR); | ||
| 783 | |||
| 784 | v = hs_in(sp, GCR); | ||
| 785 | v |= HD64465_PCCGCR_PDRV; /* enable outputs to card */ | ||
| 786 | hs_out(sp, v, GCR); | ||
| 787 | |||
| 788 | v = hs_in(sp, GCR); | ||
| 789 | v |= HD64465_PCCGCR_PMMOD; /* 16MB mapping mode */ | ||
| 790 | hs_out(sp, v, GCR); | ||
| 791 | |||
| 792 | v = hs_in(sp, GCR); | ||
| 793 | /* lowest 16MB of Common */ | ||
| 794 | v &= ~(HD64465_PCCGCR_PPA25|HD64465_PCCGCR_PPA24); | ||
| 795 | hs_out(sp, v, GCR); | ||
| 796 | |||
| 797 | hs_reset_socket(sp, 1); | ||
| 798 | |||
| 799 | printk(KERN_INFO "HD64465 PCMCIA bridge socket %d at 0x%08lx irq %d\n", | ||
| 800 | i, sp->mem_base, sp->irq); | ||
| 801 | |||
| 802 | return 0; | ||
| 803 | } | ||
| 804 | |||
| 805 | static void hs_exit_socket(hs_socket_t *sp) | ||
| 806 | { | ||
| 807 | unsigned short cscier, gcr; | ||
| 808 | unsigned long flags; | ||
| 809 | |||
| 810 | local_irq_save(flags); | ||
| 811 | |||
| 812 | /* turn off interrupts in hardware */ | ||
| 813 | cscier = hs_in(sp, CSCIER); | ||
| 814 | cscier = (cscier & IER_MASK) | IER_OFF; | ||
| 815 | hs_out(sp, cscier, CSCIER); | ||
| 816 | |||
| 817 | /* hi-Z the outputs to the card */ | ||
| 818 | gcr = hs_in(sp, GCR); | ||
| 819 | gcr &= HD64465_PCCGCR_PDRV; | ||
| 820 | hs_out(sp, gcr, GCR); | ||
| 821 | |||
| 822 | /* power the card down */ | ||
| 823 | hs_set_voltages(sp, 0, 0); | ||
| 824 | |||
| 825 | if (sp->mem_base != 0) | ||
| 826 | release_mem_region(sp->mem_base, sp->mem_length); | ||
| 827 | if (sp->irq != 0) { | ||
| 828 | free_irq(sp->irq, hs_interrupt); | ||
| 829 | hd64465_unregister_irq_demux(sp->irq); | ||
| 830 | } | ||
| 831 | |||
| 832 | local_irq_restore(flags); | ||
| 833 | } | ||
| 834 | |||
| 835 | static struct device_driver hd64465_driver = { | ||
| 836 | .name = "hd64465-pcmcia", | ||
| 837 | .bus = &platform_bus_type, | ||
| 838 | .suspend = pcmcia_socket_dev_suspend, | ||
| 839 | .resume = pcmcia_socket_dev_resume, | ||
| 840 | }; | ||
| 841 | |||
| 842 | static struct platform_device hd64465_device = { | ||
| 843 | .name = "hd64465-pcmcia", | ||
| 844 | .id = 0, | ||
| 845 | }; | ||
| 846 | |||
| 847 | static int __init init_hs(void) | ||
| 848 | { | ||
| 849 | int i; | ||
| 850 | unsigned short v; | ||
| 851 | |||
| 852 | /* hd64465_io_debug = 1; */ | ||
| 853 | if (driver_register(&hd64465_driver)) | ||
| 854 | return -EINVAL; | ||
| 855 | |||
| 856 | /* Wake both sockets out of STANDBY mode */ | ||
| 857 | /* TODO: wait 15ms */ | ||
| 858 | v = inw(HD64465_REG_SMSCR); | ||
| 859 | v &= ~(HD64465_SMSCR_PC0ST|HD64465_SMSCR_PC1ST); | ||
| 860 | outw(v, HD64465_REG_SMSCR); | ||
| 861 | |||
| 862 | /* keep power controller out of shutdown mode */ | ||
| 863 | v = inb(HD64465_REG_PCC0SCR); | ||
| 864 | v |= HD64465_PCCSCR_SHDN; | ||
| 865 | outb(v, HD64465_REG_PCC0SCR); | ||
| 866 | |||
| 867 | /* use serial (TPS2206) power controller */ | ||
| 868 | v = inb(HD64465_REG_PCC0CSCR); | ||
| 869 | v |= HD64465_PCCCSCR_PSWSEL; | ||
| 870 | outb(v, HD64465_REG_PCC0CSCR); | ||
| 871 | |||
| 872 | /* | ||
| 873 | * Setup hs_sockets[] structures and request system resources. | ||
| 874 | * TODO: on memory allocation failure, power down the socket | ||
| 875 | * before quitting. | ||
| 876 | */ | ||
| 877 | for (i=0; i<HS_MAX_SOCKETS; i++) { | ||
| 878 | hs_set_voltages(&hs_sockets[i], 0, 0); | ||
| 879 | |||
| 880 | hs_sockets[i].socket.features |= SS_CAP_PCCARD | SS_CAP_STATIC_MAP; /* mappings are fixed in host memory */ | ||
| 881 | hs_sockets[i].socket.resource_ops = &pccard_static_ops; | ||
| 882 | hs_sockets[i].socket.irq_mask = 0xffde;/*0xffff*/ /* IRQs mapped in s/w so can do any, really */ | ||
| 883 | hs_sockets[i].socket.map_size = HD64465_PCC_WINDOW; /* 16MB fixed window size */ | ||
| 884 | |||
| 885 | hs_sockets[i].socket.owner = THIS_MODULE; | ||
| 886 | hs_sockets[i].socket.ss_entry = &hs_operations; | ||
| 887 | } | ||
| 888 | |||
| 889 | i = hs_init_socket(&hs_sockets[0], | ||
| 890 | HD64465_IRQ_PCMCIA0, | ||
| 891 | HD64465_PCC0_BASE, | ||
| 892 | HD64465_REG_PCC0ISR); | ||
| 893 | if (i < 0) { | ||
| 894 | unregister_driver(&hd64465_driver); | ||
| 895 | return i; | ||
| 896 | } | ||
| 897 | i = hs_init_socket(&hs_sockets[1], | ||
| 898 | HD64465_IRQ_PCMCIA1, | ||
| 899 | HD64465_PCC1_BASE, | ||
| 900 | HD64465_REG_PCC1ISR); | ||
| 901 | if (i < 0) { | ||
| 902 | unregister_driver(&hd64465_driver); | ||
| 903 | return i; | ||
| 904 | } | ||
| 905 | |||
| 906 | /* hd64465_io_debug = 0; */ | ||
| 907 | |||
| 908 | platform_device_register(&hd64465_device); | ||
| 909 | |||
| 910 | for (i=0; i<HS_MAX_SOCKETS; i++) { | ||
| 911 | unsigned int ret; | ||
| 912 | hs_sockets[i].socket.dev.parent = &hd64465_device.dev; | ||
| 913 | hs_sockets[i].number = i; | ||
| 914 | ret = pcmcia_register_socket(&hs_sockets[i].socket); | ||
| 915 | if (ret && i) | ||
| 916 | pcmcia_unregister_socket(&hs_sockets[0].socket); | ||
| 917 | } | ||
| 918 | |||
| 919 | return 0; | ||
| 920 | } | ||
| 921 | |||
| 922 | static void __exit exit_hs(void) | ||
| 923 | { | ||
| 924 | int i; | ||
| 925 | |||
| 926 | for (i=0 ; i<HS_MAX_SOCKETS ; i++) { | ||
| 927 | pcmcia_unregister_socket(&hs_sockets[i].socket); | ||
| 928 | hs_exit_socket(&hs_sockets[i]); | ||
| 929 | } | ||
| 930 | |||
| 931 | platform_device_unregister(&hd64465_device); | ||
| 932 | unregister_driver(&hd64465_driver); | ||
| 933 | } | ||
| 934 | |||
| 935 | module_init(init_hs); | ||
| 936 | module_exit(exit_hs); | ||
| 937 | |||
| 938 | /*============================================================*/ | ||
| 939 | /*END*/ | ||
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 079e9ed907e0..ecdea44ae4e5 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c | |||
| @@ -446,9 +446,6 @@ static int rtc_dev_release(struct inode *inode, struct file *file) | |||
| 446 | if (rtc->ops->release) | 446 | if (rtc->ops->release) |
| 447 | rtc->ops->release(rtc->dev.parent); | 447 | rtc->ops->release(rtc->dev.parent); |
| 448 | 448 | ||
| 449 | if (file->f_flags & FASYNC) | ||
| 450 | rtc_dev_fasync(-1, file, 0); | ||
| 451 | |||
| 452 | clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); | 449 | clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); |
| 453 | return 0; | 450 | return 0; |
| 454 | } | 451 | } |
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c index 04b63dab6932..43afb7ab5289 100644 --- a/drivers/rtc/rtc-m48t59.c +++ b/drivers/rtc/rtc-m48t59.c | |||
| @@ -87,6 +87,10 @@ static int m48t59_rtc_read_time(struct device *dev, struct rtc_time *tm) | |||
| 87 | dev_dbg(dev, "Century bit is enabled\n"); | 87 | dev_dbg(dev, "Century bit is enabled\n"); |
| 88 | tm->tm_year += 100; /* one century */ | 88 | tm->tm_year += 100; /* one century */ |
| 89 | } | 89 | } |
| 90 | #ifdef CONFIG_SPARC | ||
| 91 | /* Sun SPARC machines count years since 1968 */ | ||
| 92 | tm->tm_year += 68; | ||
| 93 | #endif | ||
| 90 | 94 | ||
| 91 | tm->tm_wday = bcd2bin(val & 0x07); | 95 | tm->tm_wday = bcd2bin(val & 0x07); |
| 92 | tm->tm_hour = bcd2bin(M48T59_READ(M48T59_HOUR) & 0x3F); | 96 | tm->tm_hour = bcd2bin(M48T59_READ(M48T59_HOUR) & 0x3F); |
| @@ -110,11 +114,20 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm) | |||
| 110 | struct m48t59_private *m48t59 = platform_get_drvdata(pdev); | 114 | struct m48t59_private *m48t59 = platform_get_drvdata(pdev); |
| 111 | unsigned long flags; | 115 | unsigned long flags; |
| 112 | u8 val = 0; | 116 | u8 val = 0; |
| 117 | int year = tm->tm_year; | ||
| 118 | |||
| 119 | #ifdef CONFIG_SPARC | ||
| 120 | /* Sun SPARC machines count years since 1968 */ | ||
| 121 | year -= 68; | ||
| 122 | #endif | ||
| 113 | 123 | ||
| 114 | dev_dbg(dev, "RTC set time %04d-%02d-%02d %02d/%02d/%02d\n", | 124 | dev_dbg(dev, "RTC set time %04d-%02d-%02d %02d/%02d/%02d\n", |
| 115 | tm->tm_year + 1900, tm->tm_mon, tm->tm_mday, | 125 | year + 1900, tm->tm_mon, tm->tm_mday, |
| 116 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 126 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
| 117 | 127 | ||
| 128 | if (year < 0) | ||
| 129 | return -EINVAL; | ||
| 130 | |||
| 118 | spin_lock_irqsave(&m48t59->lock, flags); | 131 | spin_lock_irqsave(&m48t59->lock, flags); |
| 119 | /* Issue the WRITE command */ | 132 | /* Issue the WRITE command */ |
| 120 | M48T59_SET_BITS(M48T59_CNTL_WRITE, M48T59_CNTL); | 133 | M48T59_SET_BITS(M48T59_CNTL_WRITE, M48T59_CNTL); |
| @@ -125,9 +138,9 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm) | |||
| 125 | M48T59_WRITE((bin2bcd(tm->tm_mday) & 0x3F), M48T59_MDAY); | 138 | M48T59_WRITE((bin2bcd(tm->tm_mday) & 0x3F), M48T59_MDAY); |
| 126 | /* tm_mon is 0-11 */ | 139 | /* tm_mon is 0-11 */ |
| 127 | M48T59_WRITE((bin2bcd(tm->tm_mon + 1) & 0x1F), M48T59_MONTH); | 140 | M48T59_WRITE((bin2bcd(tm->tm_mon + 1) & 0x1F), M48T59_MONTH); |
| 128 | M48T59_WRITE(bin2bcd(tm->tm_year % 100), M48T59_YEAR); | 141 | M48T59_WRITE(bin2bcd(year % 100), M48T59_YEAR); |
| 129 | 142 | ||
| 130 | if (pdata->type == M48T59RTC_TYPE_M48T59 && (tm->tm_year / 100)) | 143 | if (pdata->type == M48T59RTC_TYPE_M48T59 && (year / 100)) |
| 131 | val = (M48T59_WDAY_CEB | M48T59_WDAY_CB); | 144 | val = (M48T59_WDAY_CEB | M48T59_WDAY_CB); |
| 132 | val |= (bin2bcd(tm->tm_wday) & 0x07); | 145 | val |= (bin2bcd(tm->tm_wday) & 0x07); |
| 133 | M48T59_WRITE(val, M48T59_WDAY); | 146 | M48T59_WRITE(val, M48T59_WDAY); |
| @@ -159,6 +172,10 @@ static int m48t59_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
| 159 | M48T59_SET_BITS(M48T59_CNTL_READ, M48T59_CNTL); | 172 | M48T59_SET_BITS(M48T59_CNTL_READ, M48T59_CNTL); |
| 160 | 173 | ||
| 161 | tm->tm_year = bcd2bin(M48T59_READ(M48T59_YEAR)); | 174 | tm->tm_year = bcd2bin(M48T59_READ(M48T59_YEAR)); |
| 175 | #ifdef CONFIG_SPARC | ||
| 176 | /* Sun SPARC machines count years since 1968 */ | ||
| 177 | tm->tm_year += 68; | ||
| 178 | #endif | ||
| 162 | /* tm_mon is 0-11 */ | 179 | /* tm_mon is 0-11 */ |
| 163 | tm->tm_mon = bcd2bin(M48T59_READ(M48T59_MONTH)) - 1; | 180 | tm->tm_mon = bcd2bin(M48T59_READ(M48T59_MONTH)) - 1; |
| 164 | 181 | ||
| @@ -192,11 +209,20 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
| 192 | struct rtc_time *tm = &alrm->time; | 209 | struct rtc_time *tm = &alrm->time; |
| 193 | u8 mday, hour, min, sec; | 210 | u8 mday, hour, min, sec; |
| 194 | unsigned long flags; | 211 | unsigned long flags; |
| 212 | int year = tm->tm_year; | ||
| 213 | |||
| 214 | #ifdef CONFIG_SPARC | ||
| 215 | /* Sun SPARC machines count years since 1968 */ | ||
| 216 | year -= 68; | ||
| 217 | #endif | ||
| 195 | 218 | ||
| 196 | /* If no irq, we don't support ALARM */ | 219 | /* If no irq, we don't support ALARM */ |
| 197 | if (m48t59->irq == NO_IRQ) | 220 | if (m48t59->irq == NO_IRQ) |
| 198 | return -EIO; | 221 | return -EIO; |
| 199 | 222 | ||
| 223 | if (year < 0) | ||
| 224 | return -EINVAL; | ||
| 225 | |||
| 200 | /* | 226 | /* |
| 201 | * 0xff means "always match" | 227 | * 0xff means "always match" |
| 202 | */ | 228 | */ |
| @@ -228,7 +254,7 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
| 228 | spin_unlock_irqrestore(&m48t59->lock, flags); | 254 | spin_unlock_irqrestore(&m48t59->lock, flags); |
| 229 | 255 | ||
| 230 | dev_dbg(dev, "RTC set alarm time %04d-%02d-%02d %02d/%02d/%02d\n", | 256 | dev_dbg(dev, "RTC set alarm time %04d-%02d-%02d %02d/%02d/%02d\n", |
| 231 | tm->tm_year + 1900, tm->tm_mon, tm->tm_mday, | 257 | year + 1900, tm->tm_mon, tm->tm_mday, |
| 232 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 258 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
| 233 | return 0; | 259 | return 0; |
| 234 | } | 260 | } |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index afe1de998763..a454f94623d7 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
| @@ -2988,17 +2988,6 @@ static int megasas_mgmt_open(struct inode *inode, struct file *filep) | |||
| 2988 | } | 2988 | } |
| 2989 | 2989 | ||
| 2990 | /** | 2990 | /** |
| 2991 | * megasas_mgmt_release - char node "release" entry point | ||
| 2992 | */ | ||
| 2993 | static int megasas_mgmt_release(struct inode *inode, struct file *filep) | ||
| 2994 | { | ||
| 2995 | filep->private_data = NULL; | ||
| 2996 | fasync_helper(-1, filep, 0, &megasas_async_queue); | ||
| 2997 | |||
| 2998 | return 0; | ||
| 2999 | } | ||
| 3000 | |||
| 3001 | /** | ||
| 3002 | * megasas_mgmt_fasync - Async notifier registration from applications | 2991 | * megasas_mgmt_fasync - Async notifier registration from applications |
| 3003 | * | 2992 | * |
| 3004 | * This function adds the calling process to a driver global queue. When an | 2993 | * This function adds the calling process to a driver global queue. When an |
| @@ -3345,7 +3334,6 @@ megasas_mgmt_compat_ioctl(struct file *file, unsigned int cmd, | |||
| 3345 | static const struct file_operations megasas_mgmt_fops = { | 3334 | static const struct file_operations megasas_mgmt_fops = { |
| 3346 | .owner = THIS_MODULE, | 3335 | .owner = THIS_MODULE, |
| 3347 | .open = megasas_mgmt_open, | 3336 | .open = megasas_mgmt_open, |
| 3348 | .release = megasas_mgmt_release, | ||
| 3349 | .fasync = megasas_mgmt_fasync, | 3337 | .fasync = megasas_mgmt_fasync, |
| 3350 | .unlocked_ioctl = megasas_mgmt_ioctl, | 3338 | .unlocked_ioctl = megasas_mgmt_ioctl, |
| 3351 | #ifdef CONFIG_COMPAT | 3339 | #ifdef CONFIG_COMPAT |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 9adf35bd8b56..5103855242ae 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -327,7 +327,6 @@ sg_release(struct inode *inode, struct file *filp) | |||
| 327 | if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) | 327 | if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) |
| 328 | return -ENXIO; | 328 | return -ENXIO; |
| 329 | SCSI_LOG_TIMEOUT(3, printk("sg_release: %s\n", sdp->disk->disk_name)); | 329 | SCSI_LOG_TIMEOUT(3, printk("sg_release: %s\n", sdp->disk->disk_name)); |
| 330 | sg_fasync(-1, filp, 0); /* remove filp from async notification list */ | ||
| 331 | if (0 == sg_remove_sfp(sdp, sfp)) { /* Returns 1 when sdp gone */ | 330 | if (0 == sg_remove_sfp(sdp, sfp)) { /* Returns 1 when sdp gone */ |
| 332 | if (!sdp->detached) { | 331 | if (!sdp->detached) { |
| 333 | scsi_device_put(sdp->device); | 332 | scsi_device_put(sdp->device); |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index f0658d2c45b2..5c0f32c7fbf6 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
| @@ -250,8 +250,7 @@ static inline void h8300_sci_disable(struct uart_port *port) | |||
| 250 | } | 250 | } |
| 251 | #endif | 251 | #endif |
| 252 | 252 | ||
| 253 | #if defined(SCI_ONLY) || defined(SCI_AND_SCIF) && \ | 253 | #if defined(__H8300H__) || defined(__H8300S__) |
| 254 | defined(__H8300H__) || defined(__H8300S__) | ||
| 255 | static void sci_init_pins_sci(struct uart_port* port, unsigned int cflag) | 254 | static void sci_init_pins_sci(struct uart_port* port, unsigned int cflag) |
| 256 | { | 255 | { |
| 257 | int ch = (port->mapbase - SMR0) >> 3; | 256 | int ch = (port->mapbase - SMR0) >> 3; |
| @@ -285,11 +284,6 @@ static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag) | |||
| 285 | #define sci_init_pins_irda NULL | 284 | #define sci_init_pins_irda NULL |
| 286 | #endif | 285 | #endif |
| 287 | 286 | ||
| 288 | #ifdef SCI_ONLY | ||
| 289 | #define sci_init_pins_scif NULL | ||
| 290 | #endif | ||
| 291 | |||
| 292 | #if defined(SCIF_ONLY) || defined(SCI_AND_SCIF) | ||
| 293 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712) | 287 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712) |
| 294 | static void sci_init_pins_scif(struct uart_port* port, unsigned int cflag) | 288 | static void sci_init_pins_scif(struct uart_port* port, unsigned int cflag) |
| 295 | { | 289 | { |
| @@ -449,7 +443,6 @@ static inline int scif_rxroom(struct uart_port *port) | |||
| 449 | return sci_in(port, SCFDR) & SCIF_RFDC_MASK; | 443 | return sci_in(port, SCFDR) & SCIF_RFDC_MASK; |
| 450 | } | 444 | } |
| 451 | #endif | 445 | #endif |
| 452 | #endif /* SCIF_ONLY || SCI_AND_SCIF */ | ||
| 453 | 446 | ||
| 454 | static inline int sci_txroom(struct uart_port *port) | 447 | static inline int sci_txroom(struct uart_port *port) |
| 455 | { | 448 | { |
| @@ -485,11 +478,9 @@ static void sci_transmit_chars(struct uart_port *port) | |||
| 485 | return; | 478 | return; |
| 486 | } | 479 | } |
| 487 | 480 | ||
| 488 | #ifndef SCI_ONLY | ||
| 489 | if (port->type == PORT_SCIF) | 481 | if (port->type == PORT_SCIF) |
| 490 | count = scif_txroom(port); | 482 | count = scif_txroom(port); |
| 491 | else | 483 | else |
| 492 | #endif | ||
| 493 | count = sci_txroom(port); | 484 | count = sci_txroom(port); |
| 494 | 485 | ||
| 495 | do { | 486 | do { |
| @@ -519,12 +510,10 @@ static void sci_transmit_chars(struct uart_port *port) | |||
| 519 | } else { | 510 | } else { |
| 520 | ctrl = sci_in(port, SCSCR); | 511 | ctrl = sci_in(port, SCSCR); |
| 521 | 512 | ||
| 522 | #if !defined(SCI_ONLY) | ||
| 523 | if (port->type == PORT_SCIF) { | 513 | if (port->type == PORT_SCIF) { |
| 524 | sci_in(port, SCxSR); /* Dummy read */ | 514 | sci_in(port, SCxSR); /* Dummy read */ |
| 525 | sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port)); | 515 | sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port)); |
| 526 | } | 516 | } |
| 527 | #endif | ||
| 528 | 517 | ||
| 529 | ctrl |= SCI_CTRL_FLAGS_TIE; | 518 | ctrl |= SCI_CTRL_FLAGS_TIE; |
| 530 | sci_out(port, SCSCR, ctrl); | 519 | sci_out(port, SCSCR, ctrl); |
| @@ -547,11 +536,9 @@ static inline void sci_receive_chars(struct uart_port *port) | |||
| 547 | return; | 536 | return; |
| 548 | 537 | ||
| 549 | while (1) { | 538 | while (1) { |
| 550 | #if !defined(SCI_ONLY) | ||
| 551 | if (port->type == PORT_SCIF) | 539 | if (port->type == PORT_SCIF) |
| 552 | count = scif_rxroom(port); | 540 | count = scif_rxroom(port); |
| 553 | else | 541 | else |
| 554 | #endif | ||
| 555 | count = sci_rxroom(port); | 542 | count = sci_rxroom(port); |
| 556 | 543 | ||
| 557 | /* Don't copy more bytes than there is room for in the buffer */ | 544 | /* Don't copy more bytes than there is room for in the buffer */ |
| @@ -810,26 +797,27 @@ static irqreturn_t sci_br_interrupt(int irq, void *ptr) | |||
| 810 | 797 | ||
| 811 | static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr) | 798 | static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr) |
| 812 | { | 799 | { |
| 813 | unsigned short ssr_status, scr_status; | 800 | unsigned short ssr_status, scr_status; |
| 814 | struct uart_port *port = ptr; | 801 | struct uart_port *port = ptr; |
| 802 | irqreturn_t ret = IRQ_NONE; | ||
| 815 | 803 | ||
| 816 | ssr_status = sci_in(port,SCxSR); | 804 | ssr_status = sci_in(port,SCxSR); |
| 817 | scr_status = sci_in(port,SCSCR); | 805 | scr_status = sci_in(port,SCSCR); |
| 818 | 806 | ||
| 819 | /* Tx Interrupt */ | 807 | /* Tx Interrupt */ |
| 820 | if ((ssr_status & 0x0020) && (scr_status & 0x0080)) | 808 | if ((ssr_status & 0x0020) && (scr_status & SCI_CTRL_FLAGS_TIE)) |
| 821 | sci_tx_interrupt(irq, ptr); | 809 | ret = sci_tx_interrupt(irq, ptr); |
| 822 | /* Rx Interrupt */ | 810 | /* Rx Interrupt */ |
| 823 | if ((ssr_status & 0x0002) && (scr_status & 0x0040)) | 811 | if ((ssr_status & 0x0002) && (scr_status & SCI_CTRL_FLAGS_RIE)) |
| 824 | sci_rx_interrupt(irq, ptr); | 812 | ret = sci_rx_interrupt(irq, ptr); |
| 825 | /* Error Interrupt */ | 813 | /* Error Interrupt */ |
| 826 | if ((ssr_status & 0x0080) && (scr_status & 0x0400)) | 814 | if ((ssr_status & 0x0080) && (scr_status & SCI_CTRL_FLAGS_REIE)) |
| 827 | sci_er_interrupt(irq, ptr); | 815 | ret = sci_er_interrupt(irq, ptr); |
| 828 | /* Break Interrupt */ | 816 | /* Break Interrupt */ |
| 829 | if ((ssr_status & 0x0010) && (scr_status & 0x0200)) | 817 | if ((ssr_status & 0x0010) && (scr_status & SCI_CTRL_FLAGS_REIE)) |
| 830 | sci_br_interrupt(irq, ptr); | 818 | ret = sci_br_interrupt(irq, ptr); |
| 831 | 819 | ||
| 832 | return IRQ_HANDLED; | 820 | return ret; |
| 833 | } | 821 | } |
| 834 | 822 | ||
| 835 | #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_HAVE_CLK) | 823 | #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_HAVE_CLK) |
| @@ -1054,10 +1042,8 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, | |||
| 1054 | 1042 | ||
| 1055 | sci_out(port, SCSCR, 0x00); /* TE=0, RE=0, CKE1=0 */ | 1043 | sci_out(port, SCSCR, 0x00); /* TE=0, RE=0, CKE1=0 */ |
| 1056 | 1044 | ||
| 1057 | #if !defined(SCI_ONLY) | ||
| 1058 | if (port->type == PORT_SCIF) | 1045 | if (port->type == PORT_SCIF) |
| 1059 | sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST); | 1046 | sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST); |
| 1060 | #endif | ||
| 1061 | 1047 | ||
| 1062 | smr_val = sci_in(port, SCSMR) & 3; | 1048 | smr_val = sci_in(port, SCSMR) & 3; |
| 1063 | if ((termios->c_cflag & CSIZE) == CS7) | 1049 | if ((termios->c_cflag & CSIZE) == CS7) |
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 7cd28b226800..6163a45f968f 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | # define SCPCR 0xA4000116 /* 16 bit SCI and SCIF */ | 16 | # define SCPCR 0xA4000116 /* 16 bit SCI and SCIF */ |
| 17 | # define SCPDR 0xA4000136 /* 8 bit SCI and SCIF */ | 17 | # define SCPDR 0xA4000136 /* 8 bit SCI and SCIF */ |
| 18 | # define SCSCR_INIT(port) 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ | 18 | # define SCSCR_INIT(port) 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ |
| 19 | # define SCI_AND_SCIF | ||
| 20 | #elif defined(CONFIG_CPU_SUBTYPE_SH7705) | 19 | #elif defined(CONFIG_CPU_SUBTYPE_SH7705) |
| 21 | # define SCIF0 0xA4400000 | 20 | # define SCIF0 0xA4400000 |
| 22 | # define SCIF2 0xA4410000 | 21 | # define SCIF2 0xA4410000 |
| @@ -30,17 +29,15 @@ | |||
| 30 | * SCIF0 (0xA4400000) -> Internal clock, SCK pin as serial clock output | 29 | * SCIF0 (0xA4400000) -> Internal clock, SCK pin as serial clock output |
| 31 | */ | 30 | */ |
| 32 | # define SCSCR_INIT(port) (port->mapbase == SCIF2) ? 0xF3 : 0xF0 | 31 | # define SCSCR_INIT(port) (port->mapbase == SCIF2) ? 0xF3 : 0xF0 |
| 33 | # define SCIF_ONLY | ||
| 34 | #elif defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 32 | #elif defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
| 35 | defined(CONFIG_CPU_SUBTYPE_SH7721) | 33 | defined(CONFIG_CPU_SUBTYPE_SH7721) |
| 36 | # define SCSCR_INIT(port) 0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */ | 34 | # define SCSCR_INIT(port) 0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */ |
| 37 | # define SCIF_ONLY | ||
| 38 | #define SCIF_ORER 0x0200 /* overrun error bit */ | 35 | #define SCIF_ORER 0x0200 /* overrun error bit */ |
| 39 | #elif defined(CONFIG_SH_RTS7751R2D) | 36 | #elif defined(CONFIG_SH_RTS7751R2D) |
| 37 | # define SCSPTR1 0xFFE0001C /* 8 bit SCIF */ | ||
| 40 | # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */ | 38 | # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */ |
| 41 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 39 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 42 | # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 40 | # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 43 | # define SCIF_ONLY | ||
| 44 | #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || \ | 41 | #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || \ |
| 45 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ | 42 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ |
| 46 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ | 43 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ |
| @@ -53,28 +50,24 @@ | |||
| 53 | # define SCSCR_INIT(port) (((port)->type == PORT_SCI) ? \ | 50 | # define SCSCR_INIT(port) (((port)->type == PORT_SCI) ? \ |
| 54 | 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ : \ | 51 | 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ : \ |
| 55 | 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ ) | 52 | 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ ) |
| 56 | # define SCI_AND_SCIF | ||
| 57 | #elif defined(CONFIG_CPU_SUBTYPE_SH7760) | 53 | #elif defined(CONFIG_CPU_SUBTYPE_SH7760) |
| 58 | # define SCSPTR0 0xfe600024 /* 16 bit SCIF */ | 54 | # define SCSPTR0 0xfe600024 /* 16 bit SCIF */ |
| 59 | # define SCSPTR1 0xfe610024 /* 16 bit SCIF */ | 55 | # define SCSPTR1 0xfe610024 /* 16 bit SCIF */ |
| 60 | # define SCSPTR2 0xfe620024 /* 16 bit SCIF */ | 56 | # define SCSPTR2 0xfe620024 /* 16 bit SCIF */ |
| 61 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 57 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 62 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 58 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 63 | # define SCIF_ONLY | ||
| 64 | #elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712) | 59 | #elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712) |
| 65 | # define SCSPTR0 0xA4400000 /* 16 bit SCIF */ | 60 | # define SCSPTR0 0xA4400000 /* 16 bit SCIF */ |
| 66 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 61 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 67 | # define PACR 0xa4050100 | 62 | # define PACR 0xa4050100 |
| 68 | # define PBCR 0xa4050102 | 63 | # define PBCR 0xa4050102 |
| 69 | # define SCSCR_INIT(port) 0x3B | 64 | # define SCSCR_INIT(port) 0x3B |
| 70 | # define SCIF_ONLY | ||
| 71 | #elif defined(CONFIG_CPU_SUBTYPE_SH7343) | 65 | #elif defined(CONFIG_CPU_SUBTYPE_SH7343) |
| 72 | # define SCSPTR0 0xffe00010 /* 16 bit SCIF */ | 66 | # define SCSPTR0 0xffe00010 /* 16 bit SCIF */ |
| 73 | # define SCSPTR1 0xffe10010 /* 16 bit SCIF */ | 67 | # define SCSPTR1 0xffe10010 /* 16 bit SCIF */ |
| 74 | # define SCSPTR2 0xffe20010 /* 16 bit SCIF */ | 68 | # define SCSPTR2 0xffe20010 /* 16 bit SCIF */ |
| 75 | # define SCSPTR3 0xffe30010 /* 16 bit SCIF */ | 69 | # define SCSPTR3 0xffe30010 /* 16 bit SCIF */ |
| 76 | # define SCSCR_INIT(port) 0x32 /* TIE=0,RIE=0,TE=1,RE=1,REIE=0,CKE=1 */ | 70 | # define SCSCR_INIT(port) 0x32 /* TIE=0,RIE=0,TE=1,RE=1,REIE=0,CKE=1 */ |
| 77 | # define SCIF_ONLY | ||
| 78 | #elif defined(CONFIG_CPU_SUBTYPE_SH7722) | 71 | #elif defined(CONFIG_CPU_SUBTYPE_SH7722) |
| 79 | # define PADR 0xA4050120 | 72 | # define PADR 0xA4050120 |
| 80 | # define PSDR 0xA405013e | 73 | # define PSDR 0xA405013e |
| @@ -82,7 +75,6 @@ | |||
| 82 | # define PSCR 0xA405011E | 75 | # define PSCR 0xA405011E |
| 83 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 76 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 84 | # define SCSCR_INIT(port) 0x0038 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 77 | # define SCSCR_INIT(port) 0x0038 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 85 | # define SCIF_ONLY | ||
| 86 | #elif defined(CONFIG_CPU_SUBTYPE_SH7366) | 78 | #elif defined(CONFIG_CPU_SUBTYPE_SH7366) |
| 87 | # define SCPDR0 0xA405013E /* 16 bit SCIF0 PSDR */ | 79 | # define SCPDR0 0xA405013E /* 16 bit SCIF0 PSDR */ |
| 88 | # define SCSPTR0 SCPDR0 | 80 | # define SCSPTR0 SCPDR0 |
| @@ -97,12 +89,10 @@ | |||
| 97 | # define SCSPTR5 0xa4050128 | 89 | # define SCSPTR5 0xa4050128 |
| 98 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 90 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 99 | # define SCSCR_INIT(port) 0x0038 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 91 | # define SCSCR_INIT(port) 0x0038 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 100 | # define SCIF_ONLY | ||
| 101 | #elif defined(CONFIG_CPU_SUBTYPE_SH4_202) | 92 | #elif defined(CONFIG_CPU_SUBTYPE_SH4_202) |
| 102 | # define SCSPTR2 0xffe80020 /* 16 bit SCIF */ | 93 | # define SCSPTR2 0xffe80020 /* 16 bit SCIF */ |
| 103 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 94 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 104 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 95 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 105 | # define SCIF_ONLY | ||
| 106 | #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103) | 96 | #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103) |
| 107 | # define SCIF_BASE_ADDR 0x01030000 | 97 | # define SCIF_BASE_ADDR 0x01030000 |
| 108 | # define SCIF_ADDR_SH5 PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR | 98 | # define SCIF_ADDR_SH5 PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR |
| @@ -111,14 +101,11 @@ | |||
| 111 | # define SCSPTR2 ((port->mapbase)+SCIF_PTR2_OFFS) /* 16 bit SCIF */ | 101 | # define SCSPTR2 ((port->mapbase)+SCIF_PTR2_OFFS) /* 16 bit SCIF */ |
| 112 | # define SCLSR2 ((port->mapbase)+SCIF_LSR2_OFFS) /* 16 bit SCIF */ | 102 | # define SCLSR2 ((port->mapbase)+SCIF_LSR2_OFFS) /* 16 bit SCIF */ |
| 113 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0, TE=1,RE=1,REIE=1 */ | 103 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0, TE=1,RE=1,REIE=1 */ |
| 114 | # define SCIF_ONLY | ||
| 115 | #elif defined(CONFIG_H83007) || defined(CONFIG_H83068) | 104 | #elif defined(CONFIG_H83007) || defined(CONFIG_H83068) |
| 116 | # define SCSCR_INIT(port) 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ | 105 | # define SCSCR_INIT(port) 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ |
| 117 | # define SCI_ONLY | ||
| 118 | # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port) | 106 | # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port) |
| 119 | #elif defined(CONFIG_H8S2678) | 107 | #elif defined(CONFIG_H8S2678) |
| 120 | # define SCSCR_INIT(port) 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ | 108 | # define SCSCR_INIT(port) 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ |
| 121 | # define SCI_ONLY | ||
| 122 | # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port) | 109 | # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port) |
| 123 | #elif defined(CONFIG_CPU_SUBTYPE_SH7763) | 110 | #elif defined(CONFIG_CPU_SUBTYPE_SH7763) |
| 124 | # define SCSPTR0 0xffe00024 /* 16 bit SCIF */ | 111 | # define SCSPTR0 0xffe00024 /* 16 bit SCIF */ |
| @@ -126,20 +113,17 @@ | |||
| 126 | # define SCSPTR2 0xffe10020 /* 16 bit SCIF/IRDA */ | 113 | # define SCSPTR2 0xffe10020 /* 16 bit SCIF/IRDA */ |
| 127 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 114 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 128 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 115 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 129 | # define SCIF_ONLY | ||
| 130 | #elif defined(CONFIG_CPU_SUBTYPE_SH7770) | 116 | #elif defined(CONFIG_CPU_SUBTYPE_SH7770) |
| 131 | # define SCSPTR0 0xff923020 /* 16 bit SCIF */ | 117 | # define SCSPTR0 0xff923020 /* 16 bit SCIF */ |
| 132 | # define SCSPTR1 0xff924020 /* 16 bit SCIF */ | 118 | # define SCSPTR1 0xff924020 /* 16 bit SCIF */ |
| 133 | # define SCSPTR2 0xff925020 /* 16 bit SCIF */ | 119 | # define SCSPTR2 0xff925020 /* 16 bit SCIF */ |
| 134 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 120 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 135 | # define SCSCR_INIT(port) 0x3c /* TIE=0,RIE=0,TE=1,RE=1,REIE=1,cke=2 */ | 121 | # define SCSCR_INIT(port) 0x3c /* TIE=0,RIE=0,TE=1,RE=1,REIE=1,cke=2 */ |
| 136 | # define SCIF_ONLY | ||
| 137 | #elif defined(CONFIG_CPU_SUBTYPE_SH7780) | 122 | #elif defined(CONFIG_CPU_SUBTYPE_SH7780) |
| 138 | # define SCSPTR0 0xffe00024 /* 16 bit SCIF */ | 123 | # define SCSPTR0 0xffe00024 /* 16 bit SCIF */ |
| 139 | # define SCSPTR1 0xffe10024 /* 16 bit SCIF */ | 124 | # define SCSPTR1 0xffe10024 /* 16 bit SCIF */ |
| 140 | # define SCIF_ORER 0x0001 /* Overrun error bit */ | 125 | # define SCIF_ORER 0x0001 /* Overrun error bit */ |
| 141 | # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 126 | # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 142 | # define SCIF_ONLY | ||
| 143 | #elif defined(CONFIG_CPU_SUBTYPE_SH7785) | 127 | #elif defined(CONFIG_CPU_SUBTYPE_SH7785) |
| 144 | # define SCSPTR0 0xffea0024 /* 16 bit SCIF */ | 128 | # define SCSPTR0 0xffea0024 /* 16 bit SCIF */ |
| 145 | # define SCSPTR1 0xffeb0024 /* 16 bit SCIF */ | 129 | # define SCSPTR1 0xffeb0024 /* 16 bit SCIF */ |
| @@ -149,7 +133,6 @@ | |||
| 149 | # define SCSPTR5 0xffef0024 /* 16 bit SCIF */ | 133 | # define SCSPTR5 0xffef0024 /* 16 bit SCIF */ |
| 150 | # define SCIF_OPER 0x0001 /* Overrun error bit */ | 134 | # define SCIF_OPER 0x0001 /* Overrun error bit */ |
| 151 | # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 135 | # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 152 | # define SCIF_ONLY | ||
| 153 | #elif defined(CONFIG_CPU_SUBTYPE_SH7203) || \ | 136 | #elif defined(CONFIG_CPU_SUBTYPE_SH7203) || \ |
| 154 | defined(CONFIG_CPU_SUBTYPE_SH7206) || \ | 137 | defined(CONFIG_CPU_SUBTYPE_SH7206) || \ |
| 155 | defined(CONFIG_CPU_SUBTYPE_SH7263) | 138 | defined(CONFIG_CPU_SUBTYPE_SH7263) |
| @@ -158,14 +141,12 @@ | |||
| 158 | # define SCSPTR2 0xfffe9020 /* 16 bit SCIF */ | 141 | # define SCSPTR2 0xfffe9020 /* 16 bit SCIF */ |
| 159 | # define SCSPTR3 0xfffe9820 /* 16 bit SCIF */ | 142 | # define SCSPTR3 0xfffe9820 /* 16 bit SCIF */ |
| 160 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 143 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 161 | # define SCIF_ONLY | ||
| 162 | #elif defined(CONFIG_CPU_SUBTYPE_SH7619) | 144 | #elif defined(CONFIG_CPU_SUBTYPE_SH7619) |
| 163 | # define SCSPTR0 0xf8400020 /* 16 bit SCIF */ | 145 | # define SCSPTR0 0xf8400020 /* 16 bit SCIF */ |
| 164 | # define SCSPTR1 0xf8410020 /* 16 bit SCIF */ | 146 | # define SCSPTR1 0xf8410020 /* 16 bit SCIF */ |
| 165 | # define SCSPTR2 0xf8420020 /* 16 bit SCIF */ | 147 | # define SCSPTR2 0xf8420020 /* 16 bit SCIF */ |
| 166 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 148 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 167 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 149 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 168 | # define SCIF_ONLY | ||
| 169 | #elif defined(CONFIG_CPU_SUBTYPE_SHX3) | 150 | #elif defined(CONFIG_CPU_SUBTYPE_SHX3) |
| 170 | # define SCSPTR0 0xffc30020 /* 16 bit SCIF */ | 151 | # define SCSPTR0 0xffc30020 /* 16 bit SCIF */ |
| 171 | # define SCSPTR1 0xffc40020 /* 16 bit SCIF */ | 152 | # define SCSPTR1 0xffc40020 /* 16 bit SCIF */ |
| @@ -173,7 +154,6 @@ | |||
| 173 | # define SCSPTR3 0xffc60020 /* 16 bit SCIF */ | 154 | # define SCSPTR3 0xffc60020 /* 16 bit SCIF */ |
| 174 | # define SCIF_ORER 0x0001 /* Overrun error bit */ | 155 | # define SCIF_ORER 0x0001 /* Overrun error bit */ |
| 175 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 156 | # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 176 | # define SCIF_ONLY | ||
| 177 | #else | 157 | #else |
| 178 | # error CPU subtype not defined | 158 | # error CPU subtype not defined |
| 179 | #endif | 159 | #endif |
| @@ -186,6 +166,7 @@ | |||
| 186 | #if defined(CONFIG_CPU_SUBTYPE_SH7750) || \ | 166 | #if defined(CONFIG_CPU_SUBTYPE_SH7750) || \ |
| 187 | defined(CONFIG_CPU_SUBTYPE_SH7091) || \ | 167 | defined(CONFIG_CPU_SUBTYPE_SH7091) || \ |
| 188 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ | 168 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ |
| 169 | defined(CONFIG_CPU_SUBTYPE_SH7722) || \ | ||
| 189 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ | 170 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ |
| 190 | defined(CONFIG_CPU_SUBTYPE_SH7751) || \ | 171 | defined(CONFIG_CPU_SUBTYPE_SH7751) || \ |
| 191 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ | 172 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ |
| @@ -244,55 +225,28 @@ | |||
| 244 | # define SCIF_TXROOM_MAX 16 | 225 | # define SCIF_TXROOM_MAX 16 |
| 245 | #endif | 226 | #endif |
| 246 | 227 | ||
| 247 | #if defined(SCI_ONLY) | 228 | #define SCxSR_TEND(port) (((port)->type == PORT_SCI) ? SCI_TEND : SCIF_TEND) |
| 248 | # define SCxSR_TEND(port) SCI_TEND | 229 | #define SCxSR_ERRORS(port) (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS) |
| 249 | # define SCxSR_ERRORS(port) SCI_ERRORS | 230 | #define SCxSR_RDxF(port) (((port)->type == PORT_SCI) ? SCI_RDRF : SCIF_RDF) |
| 250 | # define SCxSR_RDxF(port) SCI_RDRF | 231 | #define SCxSR_TDxE(port) (((port)->type == PORT_SCI) ? SCI_TDRE : SCIF_TDFE) |
| 251 | # define SCxSR_TDxE(port) SCI_TDRE | 232 | #define SCxSR_FER(port) (((port)->type == PORT_SCI) ? SCI_FER : SCIF_FER) |
| 252 | # define SCxSR_ORER(port) SCI_ORER | 233 | #define SCxSR_PER(port) (((port)->type == PORT_SCI) ? SCI_PER : SCIF_PER) |
| 253 | # define SCxSR_FER(port) SCI_FER | 234 | #define SCxSR_BRK(port) (((port)->type == PORT_SCI) ? 0x00 : SCIF_BRK) |
| 254 | # define SCxSR_PER(port) SCI_PER | 235 | |
| 255 | # define SCxSR_BRK(port) 0x00 | ||
| 256 | # define SCxSR_RDxF_CLEAR(port) 0xbc | ||
| 257 | # define SCxSR_ERROR_CLEAR(port) 0xc4 | ||
| 258 | # define SCxSR_TDxE_CLEAR(port) 0x78 | ||
| 259 | # define SCxSR_BREAK_CLEAR(port) 0xc4 | ||
| 260 | #elif defined(SCIF_ONLY) | ||
| 261 | # define SCxSR_TEND(port) SCIF_TEND | ||
| 262 | # define SCxSR_ERRORS(port) SCIF_ERRORS | ||
| 263 | # define SCxSR_RDxF(port) SCIF_RDF | ||
| 264 | # define SCxSR_TDxE(port) SCIF_TDFE | ||
| 265 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) | 236 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) |
| 266 | # define SCxSR_ORER(port) SCIF_ORER | 237 | # define SCxSR_ORER(port) (((port)->type == PORT_SCI) ? SCI_ORER : SCIF_ORER) |
| 267 | #else | 238 | #else |
| 268 | # define SCxSR_ORER(port) 0x0000 | 239 | # define SCxSR_ORER(port) (((port)->type == PORT_SCI) ? SCI_ORER : 0x0000) |
| 269 | #endif | 240 | #endif |
| 270 | # define SCxSR_FER(port) SCIF_FER | 241 | |
| 271 | # define SCxSR_PER(port) SCIF_PER | ||
| 272 | # define SCxSR_BRK(port) SCIF_BRK | ||
| 273 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \ | 242 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \ |
| 274 | defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 243 | defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
| 275 | defined(CONFIG_CPU_SUBTYPE_SH7721) | 244 | defined(CONFIG_CPU_SUBTYPE_SH7721) |
| 276 | # define SCxSR_RDxF_CLEAR(port) (sci_in(port,SCxSR)&0xfffc) | 245 | # define SCxSR_RDxF_CLEAR(port) (sci_in(port, SCxSR) & 0xfffc) |
| 277 | # define SCxSR_ERROR_CLEAR(port) (sci_in(port,SCxSR)&0xfd73) | 246 | # define SCxSR_ERROR_CLEAR(port) (sci_in(port, SCxSR) & 0xfd73) |
| 278 | # define SCxSR_TDxE_CLEAR(port) (sci_in(port,SCxSR)&0xffdf) | 247 | # define SCxSR_TDxE_CLEAR(port) (sci_in(port, SCxSR) & 0xffdf) |
| 279 | # define SCxSR_BREAK_CLEAR(port) (sci_in(port,SCxSR)&0xffe3) | 248 | # define SCxSR_BREAK_CLEAR(port) (sci_in(port, SCxSR) & 0xffe3) |
| 280 | #else | ||
| 281 | /* SH7705 can also use this, clearing is same between 7705 and 7709 */ | ||
| 282 | # define SCxSR_RDxF_CLEAR(port) 0x00fc | ||
| 283 | # define SCxSR_ERROR_CLEAR(port) 0x0073 | ||
| 284 | # define SCxSR_TDxE_CLEAR(port) 0x00df | ||
| 285 | # define SCxSR_BREAK_CLEAR(port) 0x00e3 | ||
| 286 | #endif | ||
| 287 | #else | 249 | #else |
| 288 | # define SCxSR_TEND(port) (((port)->type == PORT_SCI) ? SCI_TEND : SCIF_TEND) | ||
| 289 | # define SCxSR_ERRORS(port) (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS) | ||
| 290 | # define SCxSR_RDxF(port) (((port)->type == PORT_SCI) ? SCI_RDRF : SCIF_RDF) | ||
| 291 | # define SCxSR_TDxE(port) (((port)->type == PORT_SCI) ? SCI_TDRE : SCIF_TDFE) | ||
| 292 | # define SCxSR_ORER(port) (((port)->type == PORT_SCI) ? SCI_ORER : 0x0000) | ||
| 293 | # define SCxSR_FER(port) (((port)->type == PORT_SCI) ? SCI_FER : SCIF_FER) | ||
| 294 | # define SCxSR_PER(port) (((port)->type == PORT_SCI) ? SCI_PER : SCIF_PER) | ||
| 295 | # define SCxSR_BRK(port) (((port)->type == PORT_SCI) ? 0x00 : SCIF_BRK) | ||
| 296 | # define SCxSR_RDxF_CLEAR(port) (((port)->type == PORT_SCI) ? 0xbc : 0x00fc) | 250 | # define SCxSR_RDxF_CLEAR(port) (((port)->type == PORT_SCI) ? 0xbc : 0x00fc) |
| 297 | # define SCxSR_ERROR_CLEAR(port) (((port)->type == PORT_SCI) ? 0xc4 : 0x0073) | 251 | # define SCxSR_ERROR_CLEAR(port) (((port)->type == PORT_SCI) ? 0xc4 : 0x0073) |
| 298 | # define SCxSR_TDxE_CLEAR(port) (((port)->type == PORT_SCI) ? 0x78 : 0x00df) | 252 | # define SCxSR_TDxE_CLEAR(port) (((port)->type == PORT_SCI) ? 0x78 : 0x00df) |
| @@ -574,18 +528,20 @@ static inline int sci_rxd_in(struct uart_port *port) | |||
| 574 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ | 528 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ |
| 575 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ | 529 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ |
| 576 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ | 530 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ |
| 577 | defined(CONFIG_CPU_SUBTYPE_SH7091) || \ | 531 | defined(CONFIG_CPU_SUBTYPE_SH7091) |
| 578 | defined(CONFIG_CPU_SUBTYPE_SH4_202) | ||
| 579 | static inline int sci_rxd_in(struct uart_port *port) | 532 | static inline int sci_rxd_in(struct uart_port *port) |
| 580 | { | 533 | { |
| 581 | #ifndef SCIF_ONLY | ||
| 582 | if (port->mapbase == 0xffe00000) | 534 | if (port->mapbase == 0xffe00000) |
| 583 | return ctrl_inb(SCSPTR1)&0x01 ? 1 : 0; /* SCI */ | 535 | return ctrl_inb(SCSPTR1)&0x01 ? 1 : 0; /* SCI */ |
| 584 | #endif | ||
| 585 | #ifndef SCI_ONLY | ||
| 586 | if (port->mapbase == 0xffe80000) | 536 | if (port->mapbase == 0xffe80000) |
| 587 | return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */ | 537 | return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */ |
| 588 | #endif | 538 | return 1; |
| 539 | } | ||
| 540 | #elif defined(CONFIG_CPU_SUBTYPE_SH4_202) | ||
| 541 | static inline int sci_rxd_in(struct uart_port *port) | ||
| 542 | { | ||
| 543 | if (port->mapbase == 0xffe80000) | ||
| 544 | return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */ | ||
| 589 | return 1; | 545 | return 1; |
| 590 | } | 546 | } |
| 591 | #elif defined(CONFIG_CPU_SUBTYPE_SH7760) | 547 | #elif defined(CONFIG_CPU_SUBTYPE_SH7760) |
| @@ -651,7 +607,7 @@ static inline int sci_rxd_in(struct uart_port *port) | |||
| 651 | #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103) | 607 | #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103) |
| 652 | static inline int sci_rxd_in(struct uart_port *port) | 608 | static inline int sci_rxd_in(struct uart_port *port) |
| 653 | { | 609 | { |
| 654 | return sci_in(port, SCSPTR)&0x0001 ? 1 : 0; /* SCIF */ | 610 | return sci_in(port, SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */ |
| 655 | } | 611 | } |
| 656 | #elif defined(__H8300H__) || defined(__H8300S__) | 612 | #elif defined(__H8300H__) || defined(__H8300S__) |
| 657 | static inline int sci_rxd_in(struct uart_port *port) | 613 | static inline int sci_rxd_in(struct uart_port *port) |
diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c index 0b33773bb4f6..cf8b01bcac8d 100644 --- a/drivers/staging/me4000/me4000.c +++ b/drivers/staging/me4000/me4000.c | |||
| @@ -1633,9 +1633,6 @@ static int me4000_release(struct inode *inode_p, struct file *file_p) | |||
| 1633 | 1633 | ||
| 1634 | free_irq(ext_int_context->irq, ext_int_context); | 1634 | free_irq(ext_int_context->irq, ext_int_context); |
| 1635 | 1635 | ||
| 1636 | /* Delete the fasync structure and free memory */ | ||
| 1637 | me4000_ext_int_fasync(0, file_p, 0); | ||
| 1638 | |||
| 1639 | /* Mark as unused */ | 1636 | /* Mark as unused */ |
| 1640 | ext_int_context->in_use = 0; | 1637 | ext_int_context->in_use = 0; |
| 1641 | } else { | 1638 | } else { |
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 41b6530b8f25..a913efc69669 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
| @@ -2328,7 +2328,6 @@ static int ixj_release(struct inode *inode, struct file *file_p) | |||
| 2328 | j->rec_codec = j->play_codec = 0; | 2328 | j->rec_codec = j->play_codec = 0; |
| 2329 | j->rec_frame_size = j->play_frame_size = 0; | 2329 | j->rec_frame_size = j->play_frame_size = 0; |
| 2330 | j->flags.cidsent = j->flags.cidring = 0; | 2330 | j->flags.cidsent = j->flags.cidring = 0; |
| 2331 | ixj_fasync(-1, file_p, 0); /* remove from list of async notification */ | ||
| 2332 | 2331 | ||
| 2333 | if(j->cardtype == QTI_LINEJACK && !j->readers && !j->writers) { | 2332 | if(j->cardtype == QTI_LINEJACK && !j->readers && !j->writers) { |
| 2334 | ixj_set_port(j, PORT_PSTN); | 2333 | ixj_set_port(j, PORT_PSTN); |
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index f9b4647255aa..2d2440cd57a9 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c | |||
| @@ -367,9 +367,6 @@ static int uio_release(struct inode *inode, struct file *filep) | |||
| 367 | ret = idev->info->release(idev->info, inode); | 367 | ret = idev->info->release(idev->info, inode); |
| 368 | 368 | ||
| 369 | module_put(idev->owner); | 369 | module_put(idev->owner); |
| 370 | |||
| 371 | if (filep->f_flags & FASYNC) | ||
| 372 | ret = uio_fasync(-1, filep, 0); | ||
| 373 | kfree(listener); | 370 | kfree(listener); |
| 374 | return ret; | 371 | return ret; |
| 375 | } | 372 | } |
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index f4585d3e90d7..eeb26c0f88e5 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
| @@ -1251,7 +1251,6 @@ dev_release (struct inode *inode, struct file *fd) | |||
| 1251 | * alternatively, all host requests will time out. | 1251 | * alternatively, all host requests will time out. |
| 1252 | */ | 1252 | */ |
| 1253 | 1253 | ||
| 1254 | fasync_helper (-1, fd, 0, &dev->fasync); | ||
| 1255 | kfree (dev->buf); | 1254 | kfree (dev->buf); |
| 1256 | dev->buf = NULL; | 1255 | dev->buf = NULL; |
| 1257 | put_dev (dev); | 1256 | put_dev (dev); |
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 18eaa78ecb4e..e5717a4fae67 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
| @@ -281,7 +281,8 @@ void ext3_abort (struct super_block * sb, const char * function, | |||
| 281 | EXT3_SB(sb)->s_mount_state |= EXT3_ERROR_FS; | 281 | EXT3_SB(sb)->s_mount_state |= EXT3_ERROR_FS; |
| 282 | sb->s_flags |= MS_RDONLY; | 282 | sb->s_flags |= MS_RDONLY; |
| 283 | EXT3_SB(sb)->s_mount_opt |= EXT3_MOUNT_ABORT; | 283 | EXT3_SB(sb)->s_mount_opt |= EXT3_MOUNT_ABORT; |
| 284 | journal_abort(EXT3_SB(sb)->s_journal, -EIO); | 284 | if (EXT3_SB(sb)->s_journal) |
| 285 | journal_abort(EXT3_SB(sb)->s_journal, -EIO); | ||
| 285 | } | 286 | } |
| 286 | 287 | ||
| 287 | void ext3_warning (struct super_block * sb, const char * function, | 288 | void ext3_warning (struct super_block * sb, const char * function, |
| @@ -390,11 +391,14 @@ static void ext3_put_super (struct super_block * sb) | |||
| 390 | { | 391 | { |
| 391 | struct ext3_sb_info *sbi = EXT3_SB(sb); | 392 | struct ext3_sb_info *sbi = EXT3_SB(sb); |
| 392 | struct ext3_super_block *es = sbi->s_es; | 393 | struct ext3_super_block *es = sbi->s_es; |
| 393 | int i; | 394 | int i, err; |
| 394 | 395 | ||
| 395 | ext3_xattr_put_super(sb); | 396 | ext3_xattr_put_super(sb); |
| 396 | if (journal_destroy(sbi->s_journal) < 0) | 397 | err = journal_destroy(sbi->s_journal); |
| 398 | sbi->s_journal = NULL; | ||
| 399 | if (err < 0) | ||
| 397 | ext3_abort(sb, __func__, "Couldn't clean up the journal"); | 400 | ext3_abort(sb, __func__, "Couldn't clean up the journal"); |
| 401 | |||
| 398 | if (!(sb->s_flags & MS_RDONLY)) { | 402 | if (!(sb->s_flags & MS_RDONLY)) { |
| 399 | EXT3_CLEAR_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER); | 403 | EXT3_CLEAR_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER); |
| 400 | es->s_state = cpu_to_le16(sbi->s_mount_state); | 404 | es->s_state = cpu_to_le16(sbi->s_mount_state); |
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index b9821be709bd..d2003cdc36aa 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c | |||
| @@ -589,21 +589,23 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, | |||
| 589 | return; | 589 | return; |
| 590 | } | 590 | } |
| 591 | 591 | ||
| 592 | int ext4_claim_free_blocks(struct ext4_sb_info *sbi, | 592 | /** |
| 593 | s64 nblocks) | 593 | * ext4_has_free_blocks() |
| 594 | * @sbi: in-core super block structure. | ||
| 595 | * @nblocks: number of needed blocks | ||
| 596 | * | ||
| 597 | * Check if filesystem has nblocks free & available for allocation. | ||
| 598 | * On success return 1, return 0 on failure. | ||
| 599 | */ | ||
| 600 | int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks) | ||
| 594 | { | 601 | { |
| 595 | s64 free_blocks, dirty_blocks; | 602 | s64 free_blocks, dirty_blocks, root_blocks; |
| 596 | s64 root_blocks = 0; | ||
| 597 | struct percpu_counter *fbc = &sbi->s_freeblocks_counter; | 603 | struct percpu_counter *fbc = &sbi->s_freeblocks_counter; |
| 598 | struct percpu_counter *dbc = &sbi->s_dirtyblocks_counter; | 604 | struct percpu_counter *dbc = &sbi->s_dirtyblocks_counter; |
| 599 | 605 | ||
| 600 | free_blocks = percpu_counter_read_positive(fbc); | 606 | free_blocks = percpu_counter_read_positive(fbc); |
| 601 | dirty_blocks = percpu_counter_read_positive(dbc); | 607 | dirty_blocks = percpu_counter_read_positive(dbc); |
| 602 | 608 | root_blocks = ext4_r_blocks_count(sbi->s_es); | |
| 603 | if (!capable(CAP_SYS_RESOURCE) && | ||
| 604 | sbi->s_resuid != current->fsuid && | ||
| 605 | (sbi->s_resgid == 0 || !in_group_p(sbi->s_resgid))) | ||
| 606 | root_blocks = ext4_r_blocks_count(sbi->s_es); | ||
| 607 | 609 | ||
| 608 | if (free_blocks - (nblocks + root_blocks + dirty_blocks) < | 610 | if (free_blocks - (nblocks + root_blocks + dirty_blocks) < |
| 609 | EXT4_FREEBLOCKS_WATERMARK) { | 611 | EXT4_FREEBLOCKS_WATERMARK) { |
| @@ -616,57 +618,32 @@ int ext4_claim_free_blocks(struct ext4_sb_info *sbi, | |||
| 616 | } | 618 | } |
| 617 | } | 619 | } |
| 618 | /* Check whether we have space after | 620 | /* Check whether we have space after |
| 619 | * accounting for current dirty blocks | 621 | * accounting for current dirty blocks & root reserved blocks. |
| 620 | */ | 622 | */ |
| 621 | if (free_blocks < ((root_blocks + nblocks) + dirty_blocks)) | 623 | if (free_blocks >= ((root_blocks + nblocks) + dirty_blocks)) |
| 622 | /* we don't have free space */ | 624 | return 1; |
| 623 | return -ENOSPC; | 625 | |
| 626 | /* Hm, nope. Are (enough) root reserved blocks available? */ | ||
| 627 | if (sbi->s_resuid == current->fsuid || | ||
| 628 | ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) || | ||
| 629 | capable(CAP_SYS_RESOURCE)) { | ||
| 630 | if (free_blocks >= (nblocks + dirty_blocks)) | ||
| 631 | return 1; | ||
| 632 | } | ||
| 624 | 633 | ||
| 625 | /* Add the blocks to nblocks */ | ||
| 626 | percpu_counter_add(dbc, nblocks); | ||
| 627 | return 0; | 634 | return 0; |
| 628 | } | 635 | } |
| 629 | 636 | ||
| 630 | /** | 637 | int ext4_claim_free_blocks(struct ext4_sb_info *sbi, |
| 631 | * ext4_has_free_blocks() | ||
| 632 | * @sbi: in-core super block structure. | ||
| 633 | * @nblocks: number of neeed blocks | ||
| 634 | * | ||
| 635 | * Check if filesystem has free blocks available for allocation. | ||
| 636 | * Return the number of blocks avaible for allocation for this request | ||
| 637 | * On success, return nblocks | ||
| 638 | */ | ||
| 639 | ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi, | ||
| 640 | s64 nblocks) | 638 | s64 nblocks) |
| 641 | { | 639 | { |
| 642 | s64 free_blocks, dirty_blocks; | 640 | if (ext4_has_free_blocks(sbi, nblocks)) { |
| 643 | s64 root_blocks = 0; | 641 | percpu_counter_add(&sbi->s_dirtyblocks_counter, nblocks); |
| 644 | struct percpu_counter *fbc = &sbi->s_freeblocks_counter; | ||
| 645 | struct percpu_counter *dbc = &sbi->s_dirtyblocks_counter; | ||
| 646 | |||
| 647 | free_blocks = percpu_counter_read_positive(fbc); | ||
| 648 | dirty_blocks = percpu_counter_read_positive(dbc); | ||
| 649 | |||
| 650 | if (!capable(CAP_SYS_RESOURCE) && | ||
| 651 | sbi->s_resuid != current->fsuid && | ||
| 652 | (sbi->s_resgid == 0 || !in_group_p(sbi->s_resgid))) | ||
| 653 | root_blocks = ext4_r_blocks_count(sbi->s_es); | ||
| 654 | |||
| 655 | if (free_blocks - (nblocks + root_blocks + dirty_blocks) < | ||
| 656 | EXT4_FREEBLOCKS_WATERMARK) { | ||
| 657 | free_blocks = percpu_counter_sum(fbc); | ||
| 658 | dirty_blocks = percpu_counter_sum(dbc); | ||
| 659 | } | ||
| 660 | if (free_blocks <= (root_blocks + dirty_blocks)) | ||
| 661 | /* we don't have free space */ | ||
| 662 | return 0; | 642 | return 0; |
| 663 | 643 | } else | |
| 664 | if (free_blocks - (root_blocks + dirty_blocks) < nblocks) | 644 | return -ENOSPC; |
| 665 | return free_blocks - (root_blocks + dirty_blocks); | ||
| 666 | return nblocks; | ||
| 667 | } | 645 | } |
| 668 | 646 | ||
| 669 | |||
| 670 | /** | 647 | /** |
| 671 | * ext4_should_retry_alloc() | 648 | * ext4_should_retry_alloc() |
| 672 | * @sb: super block | 649 | * @sb: super block |
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 4880cc3e6727..b0537c827024 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
| @@ -1003,8 +1003,7 @@ extern ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode, | |||
| 1003 | ext4_lblk_t iblock, ext4_fsblk_t goal, | 1003 | ext4_lblk_t iblock, ext4_fsblk_t goal, |
| 1004 | unsigned long *count, int *errp); | 1004 | unsigned long *count, int *errp); |
| 1005 | extern int ext4_claim_free_blocks(struct ext4_sb_info *sbi, s64 nblocks); | 1005 | extern int ext4_claim_free_blocks(struct ext4_sb_info *sbi, s64 nblocks); |
| 1006 | extern ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi, | 1006 | extern int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks); |
| 1007 | s64 nblocks); | ||
| 1008 | extern void ext4_free_blocks(handle_t *handle, struct inode *inode, | 1007 | extern void ext4_free_blocks(handle_t *handle, struct inode *inode, |
| 1009 | ext4_fsblk_t block, unsigned long count, int metadata); | 1008 | ext4_fsblk_t block, unsigned long count, int metadata); |
| 1010 | extern void ext4_free_blocks_sb(handle_t *handle, struct super_block *sb, | 1009 | extern void ext4_free_blocks_sb(handle_t *handle, struct super_block *sb, |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index bdddea14e782..994859df010e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -333,7 +333,8 @@ void ext4_abort(struct super_block *sb, const char *function, | |||
| 333 | EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; | 333 | EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; |
| 334 | sb->s_flags |= MS_RDONLY; | 334 | sb->s_flags |= MS_RDONLY; |
| 335 | EXT4_SB(sb)->s_mount_opt |= EXT4_MOUNT_ABORT; | 335 | EXT4_SB(sb)->s_mount_opt |= EXT4_MOUNT_ABORT; |
| 336 | jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO); | 336 | if (EXT4_SB(sb)->s_journal) |
| 337 | jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO); | ||
| 337 | } | 338 | } |
| 338 | 339 | ||
| 339 | void ext4_warning(struct super_block *sb, const char *function, | 340 | void ext4_warning(struct super_block *sb, const char *function, |
| @@ -442,14 +443,16 @@ static void ext4_put_super(struct super_block *sb) | |||
| 442 | { | 443 | { |
| 443 | struct ext4_sb_info *sbi = EXT4_SB(sb); | 444 | struct ext4_sb_info *sbi = EXT4_SB(sb); |
| 444 | struct ext4_super_block *es = sbi->s_es; | 445 | struct ext4_super_block *es = sbi->s_es; |
| 445 | int i; | 446 | int i, err; |
| 446 | 447 | ||
| 447 | ext4_mb_release(sb); | 448 | ext4_mb_release(sb); |
| 448 | ext4_ext_release(sb); | 449 | ext4_ext_release(sb); |
| 449 | ext4_xattr_put_super(sb); | 450 | ext4_xattr_put_super(sb); |
| 450 | if (jbd2_journal_destroy(sbi->s_journal) < 0) | 451 | err = jbd2_journal_destroy(sbi->s_journal); |
| 451 | ext4_abort(sb, __func__, "Couldn't clean up the journal"); | ||
| 452 | sbi->s_journal = NULL; | 452 | sbi->s_journal = NULL; |
| 453 | if (err < 0) | ||
| 454 | ext4_abort(sb, __func__, "Couldn't clean up the journal"); | ||
| 455 | |||
| 453 | if (!(sb->s_flags & MS_RDONLY)) { | 456 | if (!(sb->s_flags & MS_RDONLY)) { |
| 454 | EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER); | 457 | EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER); |
| 455 | es->s_state = cpu_to_le16(sbi->s_mount_state); | 458 | es->s_state = cpu_to_le16(sbi->s_mount_state); |
diff --git a/fs/file_table.c b/fs/file_table.c index efc06faede6c..5ad0eca6eea2 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
| @@ -269,6 +269,10 @@ void __fput(struct file *file) | |||
| 269 | eventpoll_release(file); | 269 | eventpoll_release(file); |
| 270 | locks_remove_flock(file); | 270 | locks_remove_flock(file); |
| 271 | 271 | ||
| 272 | if (unlikely(file->f_flags & FASYNC)) { | ||
| 273 | if (file->f_op && file->f_op->fasync) | ||
| 274 | file->f_op->fasync(-1, file, 0); | ||
| 275 | } | ||
| 272 | if (file->f_op && file->f_op->release) | 276 | if (file->f_op && file->f_op->release) |
| 273 | file->f_op->release(inode, file); | 277 | file->f_op->release(inode, file); |
| 274 | security_file_free(file); | 278 | security_file_free(file); |
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 87250b6a8682..b72361479be2 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c | |||
| @@ -1056,7 +1056,6 @@ static int fuse_dev_release(struct inode *inode, struct file *file) | |||
| 1056 | end_requests(fc, &fc->pending); | 1056 | end_requests(fc, &fc->pending); |
| 1057 | end_requests(fc, &fc->processing); | 1057 | end_requests(fc, &fc->processing); |
| 1058 | spin_unlock(&fc->lock); | 1058 | spin_unlock(&fc->lock); |
| 1059 | fasync_helper(-1, file, 0, &fc->fasync); | ||
| 1060 | fuse_conn_put(fc); | 1059 | fuse_conn_put(fc); |
| 1061 | } | 1060 | } |
| 1062 | 1061 | ||
diff --git a/fs/inotify_user.c b/fs/inotify_user.c index d85c7d931cdf..d367e9b92862 100644 --- a/fs/inotify_user.c +++ b/fs/inotify_user.c | |||
| @@ -537,9 +537,6 @@ static int inotify_release(struct inode *ignored, struct file *file) | |||
| 537 | inotify_dev_event_dequeue(dev); | 537 | inotify_dev_event_dequeue(dev); |
| 538 | mutex_unlock(&dev->ev_mutex); | 538 | mutex_unlock(&dev->ev_mutex); |
| 539 | 539 | ||
| 540 | if (file->f_flags & FASYNC) | ||
| 541 | inotify_fasync(-1, file, 0); | ||
| 542 | |||
| 543 | /* free this device: the put matching the get in inotify_init() */ | 540 | /* free this device: the put matching the get in inotify_init() */ |
| 544 | put_inotify_dev(dev); | 541 | put_inotify_dev(dev); |
| 545 | 542 | ||
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 8b119e16aa36..ebc667bc54a8 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
| @@ -974,6 +974,9 @@ restart_loop: | |||
| 974 | journal->j_committing_transaction = NULL; | 974 | journal->j_committing_transaction = NULL; |
| 975 | spin_unlock(&journal->j_state_lock); | 975 | spin_unlock(&journal->j_state_lock); |
| 976 | 976 | ||
| 977 | if (journal->j_commit_callback) | ||
| 978 | journal->j_commit_callback(journal, commit_transaction); | ||
| 979 | |||
| 977 | if (commit_transaction->t_checkpoint_list == NULL && | 980 | if (commit_transaction->t_checkpoint_list == NULL && |
| 978 | commit_transaction->t_checkpoint_io_list == NULL) { | 981 | commit_transaction->t_checkpoint_io_list == NULL) { |
| 979 | __jbd2_journal_drop_transaction(journal, commit_transaction); | 982 | __jbd2_journal_drop_transaction(journal, commit_transaction); |
| @@ -995,11 +998,8 @@ restart_loop: | |||
| 995 | } | 998 | } |
| 996 | spin_unlock(&journal->j_list_lock); | 999 | spin_unlock(&journal->j_list_lock); |
| 997 | 1000 | ||
| 998 | if (journal->j_commit_callback) | ||
| 999 | journal->j_commit_callback(journal, commit_transaction); | ||
| 1000 | |||
| 1001 | trace_mark(jbd2_end_commit, "dev %s transaction %d head %d", | 1001 | trace_mark(jbd2_end_commit, "dev %s transaction %d head %d", |
| 1002 | journal->j_devname, commit_transaction->t_tid, | 1002 | journal->j_devname, journal->j_commit_sequence, |
| 1003 | journal->j_tail_sequence); | 1003 | journal->j_tail_sequence); |
| 1004 | jbd_debug(1, "JBD: commit %d complete, head %d\n", | 1004 | jbd_debug(1, "JBD: commit %d complete, head %d\n", |
| 1005 | journal->j_commit_sequence, journal->j_tail_sequence); | 1005 | journal->j_commit_sequence, journal->j_tail_sequence); |
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index 014f6ce48172..4dfdcbc6bf68 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c | |||
| @@ -434,6 +434,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, | |||
| 434 | * reclaim all locks we hold on this server. | 434 | * reclaim all locks we hold on this server. |
| 435 | */ | 435 | */ |
| 436 | memset(&saddr, 0, sizeof(saddr)); | 436 | memset(&saddr, 0, sizeof(saddr)); |
| 437 | saddr.sin_family = AF_INET; | ||
| 437 | saddr.sin_addr.s_addr = argp->addr; | 438 | saddr.sin_addr.s_addr = argp->addr; |
| 438 | nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state); | 439 | nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state); |
| 439 | 440 | ||
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 548b0bb2b84d..3ca89e2a9381 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c | |||
| @@ -466,6 +466,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, | |||
| 466 | * reclaim all locks we hold on this server. | 466 | * reclaim all locks we hold on this server. |
| 467 | */ | 467 | */ |
| 468 | memset(&saddr, 0, sizeof(saddr)); | 468 | memset(&saddr, 0, sizeof(saddr)); |
| 469 | saddr.sin_family = AF_INET; | ||
| 469 | saddr.sin_addr.s_addr = argp->addr; | 470 | saddr.sin_addr.s_addr = argp->addr; |
| 470 | nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state); | 471 | nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state); |
| 471 | 472 | ||
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 0bc56f6d9276..848a03e83a42 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -1912,6 +1912,7 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, | |||
| 1912 | de = (struct buffered_dirent *)((char *)de + reclen); | 1912 | de = (struct buffered_dirent *)((char *)de + reclen); |
| 1913 | } | 1913 | } |
| 1914 | offset = vfs_llseek(file, 0, SEEK_CUR); | 1914 | offset = vfs_llseek(file, 0, SEEK_CUR); |
| 1915 | cdp->err = nfserr_eof; | ||
| 1915 | if (!buf.full) | 1916 | if (!buf.full) |
| 1916 | break; | 1917 | break; |
| 1917 | } | 1918 | } |
| @@ -717,14 +717,12 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on) | |||
| 717 | static int | 717 | static int |
| 718 | pipe_read_release(struct inode *inode, struct file *filp) | 718 | pipe_read_release(struct inode *inode, struct file *filp) |
| 719 | { | 719 | { |
| 720 | pipe_read_fasync(-1, filp, 0); | ||
| 721 | return pipe_release(inode, 1, 0); | 720 | return pipe_release(inode, 1, 0); |
| 722 | } | 721 | } |
| 723 | 722 | ||
| 724 | static int | 723 | static int |
| 725 | pipe_write_release(struct inode *inode, struct file *filp) | 724 | pipe_write_release(struct inode *inode, struct file *filp) |
| 726 | { | 725 | { |
| 727 | pipe_write_fasync(-1, filp, 0); | ||
| 728 | return pipe_release(inode, 0, 1); | 726 | return pipe_release(inode, 0, 1); |
| 729 | } | 727 | } |
| 730 | 728 | ||
| @@ -733,7 +731,6 @@ pipe_rdwr_release(struct inode *inode, struct file *filp) | |||
| 733 | { | 731 | { |
| 734 | int decr, decw; | 732 | int decr, decw; |
| 735 | 733 | ||
| 736 | pipe_rdwr_fasync(-1, filp, 0); | ||
| 737 | decr = (filp->f_mode & FMODE_READ) != 0; | 734 | decr = (filp->f_mode & FMODE_READ) != 0; |
| 738 | decw = (filp->f_mode & FMODE_WRITE) != 0; | 735 | decw = (filp->f_mode & FMODE_WRITE) != 0; |
| 739 | return pipe_release(inode, decr, decw); | 736 | return pipe_release(inode, decr, decw); |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 507f53ef8038..f5441edee55f 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -372,6 +372,7 @@ enum { | |||
| 372 | ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */ | 372 | ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */ |
| 373 | ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */ | 373 | ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */ |
| 374 | ATA_HORKAGE_STUCK_ERR = (1 << 9), /* stuck ERR on next PACKET */ | 374 | ATA_HORKAGE_STUCK_ERR = (1 << 9), /* stuck ERR on next PACKET */ |
| 375 | ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */ | ||
| 375 | 376 | ||
| 376 | /* DMA mask for user DMA control: User visible values; DO NOT | 377 | /* DMA mask for user DMA control: User visible values; DO NOT |
| 377 | renumber */ | 378 | renumber */ |
diff --git a/net/socket.c b/net/socket.c index 2b7a4b5c9b72..57550c3bcabe 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -990,7 +990,6 @@ static int sock_close(struct inode *inode, struct file *filp) | |||
| 990 | printk(KERN_DEBUG "sock_close: NULL inode\n"); | 990 | printk(KERN_DEBUG "sock_close: NULL inode\n"); |
| 991 | return 0; | 991 | return 0; |
| 992 | } | 992 | } |
| 993 | sock_fasync(-1, filp, 0); | ||
| 994 | sock_release(SOCKET_I(inode)); | 993 | sock_release(SOCKET_I(inode)); |
| 995 | return 0; | 994 | return 0; |
| 996 | } | 995 | } |
diff --git a/security/commoncap.c b/security/commoncap.c index 399bfdb9e2da..3976613db829 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -279,10 +279,10 @@ static int get_file_caps(struct linux_binprm *bprm) | |||
| 279 | struct vfs_cap_data vcaps; | 279 | struct vfs_cap_data vcaps; |
| 280 | struct inode *inode; | 280 | struct inode *inode; |
| 281 | 281 | ||
| 282 | if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID) { | 282 | bprm_clear_caps(bprm); |
| 283 | bprm_clear_caps(bprm); | 283 | |
| 284 | if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID) | ||
| 284 | return 0; | 285 | return 0; |
| 285 | } | ||
| 286 | 286 | ||
| 287 | dentry = dget(bprm->file->f_dentry); | 287 | dentry = dget(bprm->file->f_dentry); |
| 288 | inode = dentry->d_inode; | 288 | inode = dentry->d_inode; |
diff --git a/sound/core/control.c b/sound/core/control.c index b0bf42691047..636b3b52ef8b 100644 --- a/sound/core/control.c +++ b/sound/core/control.c | |||
| @@ -113,7 +113,6 @@ static int snd_ctl_release(struct inode *inode, struct file *file) | |||
| 113 | unsigned int idx; | 113 | unsigned int idx; |
| 114 | 114 | ||
| 115 | ctl = file->private_data; | 115 | ctl = file->private_data; |
| 116 | fasync_helper(-1, file, 0, &ctl->fasync); | ||
| 117 | file->private_data = NULL; | 116 | file->private_data = NULL; |
| 118 | card = ctl->card; | 117 | card = ctl->card; |
| 119 | write_lock_irqsave(&card->ctl_files_rwlock, flags); | 118 | write_lock_irqsave(&card->ctl_files_rwlock, flags); |
diff --git a/sound/core/init.c b/sound/core/init.c index ef2352c2e451..b47ff8b44be8 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
| @@ -264,8 +264,11 @@ static int snd_disconnect_release(struct inode *inode, struct file *file) | |||
| 264 | } | 264 | } |
| 265 | spin_unlock(&shutdown_lock); | 265 | spin_unlock(&shutdown_lock); |
| 266 | 266 | ||
| 267 | if (likely(df)) | 267 | if (likely(df)) { |
| 268 | if ((file->f_flags & FASYNC) && df->disconnected_f_op->fasync) | ||
| 269 | df->disconnected_f_op->fasync(-1, file, 0); | ||
| 268 | return df->disconnected_f_op->release(inode, file); | 270 | return df->disconnected_f_op->release(inode, file); |
| 271 | } | ||
| 269 | 272 | ||
| 270 | panic("%s(%p, %p) failed!", __func__, inode, file); | 273 | panic("%s(%p, %p) failed!", __func__, inode, file); |
| 271 | } | 274 | } |
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index aef18682c035..a789efc9df39 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -2169,7 +2169,6 @@ static int snd_pcm_release(struct inode *inode, struct file *file) | |||
| 2169 | if (snd_BUG_ON(!substream)) | 2169 | if (snd_BUG_ON(!substream)) |
| 2170 | return -ENXIO; | 2170 | return -ENXIO; |
| 2171 | pcm = substream->pcm; | 2171 | pcm = substream->pcm; |
| 2172 | fasync_helper(-1, file, 0, &substream->runtime->fasync); | ||
| 2173 | mutex_lock(&pcm->open_mutex); | 2172 | mutex_lock(&pcm->open_mutex); |
| 2174 | snd_pcm_release_substream(substream); | 2173 | snd_pcm_release_substream(substream); |
| 2175 | kfree(pcm_file); | 2174 | kfree(pcm_file); |
diff --git a/sound/core/timer.c b/sound/core/timer.c index e582face89d2..c584408c9f17 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
| @@ -1263,7 +1263,6 @@ static int snd_timer_user_release(struct inode *inode, struct file *file) | |||
| 1263 | if (file->private_data) { | 1263 | if (file->private_data) { |
| 1264 | tu = file->private_data; | 1264 | tu = file->private_data; |
| 1265 | file->private_data = NULL; | 1265 | file->private_data = NULL; |
| 1266 | fasync_helper(-1, file, 0, &tu->fasync); | ||
| 1267 | if (tu->timeri) | 1266 | if (tu->timeri) |
| 1268 | snd_timer_close(tu->timeri); | 1267 | snd_timer_close(tu->timeri); |
| 1269 | kfree(tu->queue); | 1268 | kfree(tu->queue); |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index c257ad8bdfbc..23ed6f04a718 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
| @@ -2534,6 +2534,8 @@ static int __devinit snd_dbri_create(struct snd_card *card, | |||
| 2534 | dbri->dma = dma_alloc_coherent(&op->dev, | 2534 | dbri->dma = dma_alloc_coherent(&op->dev, |
| 2535 | sizeof(struct dbri_dma), | 2535 | sizeof(struct dbri_dma), |
| 2536 | &dbri->dma_dvma, GFP_ATOMIC); | 2536 | &dbri->dma_dvma, GFP_ATOMIC); |
| 2537 | if (!dbri->dma) | ||
| 2538 | return -ENOMEM; | ||
| 2537 | memset((void *)dbri->dma, 0, sizeof(struct dbri_dma)); | 2539 | memset((void *)dbri->dma, 0, sizeof(struct dbri_dma)); |
| 2538 | 2540 | ||
| 2539 | dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n", | 2541 | dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n", |