diff options
325 files changed, 10561 insertions, 5949 deletions
diff --git a/.gitignore b/.gitignore index d24ad506e799..9bb1cb6d825d 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -26,6 +26,7 @@ tags | |||
| 26 | TAGS | 26 | TAGS |
| 27 | vmlinux* | 27 | vmlinux* |
| 28 | !vmlinux.lds.S | 28 | !vmlinux.lds.S |
| 29 | !vmlinux.lds.h | ||
| 29 | System.map | 30 | System.map |
| 30 | Module.markers | 31 | Module.markers |
| 31 | Module.symvers | 32 | Module.symvers |
diff --git a/Documentation/DocBook/kgdb.tmpl b/Documentation/DocBook/kgdb.tmpl index 028a8444d95e..e8acd1f03456 100644 --- a/Documentation/DocBook/kgdb.tmpl +++ b/Documentation/DocBook/kgdb.tmpl | |||
| @@ -84,10 +84,9 @@ | |||
| 84 | runs an instance of gdb against the vmlinux file which contains | 84 | runs an instance of gdb against the vmlinux file which contains |
| 85 | the symbols (not boot image such as bzImage, zImage, uImage...). | 85 | the symbols (not boot image such as bzImage, zImage, uImage...). |
| 86 | In gdb the developer specifies the connection parameters and | 86 | In gdb the developer specifies the connection parameters and |
| 87 | connects to kgdb. Depending on which kgdb I/O modules exist in | 87 | connects to kgdb. The type of connection a developer makes with |
| 88 | the kernel for a given architecture, it may be possible to debug | 88 | gdb depends on the availability of kgdb I/O modules compiled as |
| 89 | the test machine's kernel with the development machine using a | 89 | builtin's or kernel modules in the test machine's kernel. |
| 90 | rs232 or ethernet connection. | ||
| 91 | </para> | 90 | </para> |
| 92 | </chapter> | 91 | </chapter> |
| 93 | <chapter id="CompilingAKernel"> | 92 | <chapter id="CompilingAKernel"> |
| @@ -223,7 +222,7 @@ | |||
| 223 | </para> | 222 | </para> |
| 224 | <para> | 223 | <para> |
| 225 | IMPORTANT NOTE: Using this option with kgdb over the console | 224 | IMPORTANT NOTE: Using this option with kgdb over the console |
| 226 | (kgdboc) or kgdb over ethernet (kgdboe) is not supported. | 225 | (kgdboc) is not supported. |
| 227 | </para> | 226 | </para> |
| 228 | </sect1> | 227 | </sect1> |
| 229 | </chapter> | 228 | </chapter> |
| @@ -249,18 +248,11 @@ | |||
| 249 | (gdb) target remote /dev/ttyS0 | 248 | (gdb) target remote /dev/ttyS0 |
| 250 | </programlisting> | 249 | </programlisting> |
| 251 | <para> | 250 | <para> |
| 252 | Example (kgdb to a terminal server): | 251 | Example (kgdb to a terminal server on tcp port 2012): |
| 253 | </para> | 252 | </para> |
| 254 | <programlisting> | 253 | <programlisting> |
| 255 | % gdb ./vmlinux | 254 | % gdb ./vmlinux |
| 256 | (gdb) target remote udp:192.168.2.2:6443 | 255 | (gdb) target remote 192.168.2.2:2012 |
| 257 | </programlisting> | ||
| 258 | <para> | ||
| 259 | Example (kgdb over ethernet): | ||
| 260 | </para> | ||
| 261 | <programlisting> | ||
| 262 | % gdb ./vmlinux | ||
| 263 | (gdb) target remote udp:192.168.2.2:6443 | ||
| 264 | </programlisting> | 256 | </programlisting> |
| 265 | <para> | 257 | <para> |
| 266 | Once connected, you can debug a kernel the way you would debug an | 258 | Once connected, you can debug a kernel the way you would debug an |
diff --git a/Documentation/cpusets.txt b/Documentation/cpusets.txt index d803c5c68ab5..353504de3084 100644 --- a/Documentation/cpusets.txt +++ b/Documentation/cpusets.txt | |||
| @@ -542,7 +542,7 @@ otherwise initial value -1 that indicates the cpuset has no request. | |||
| 542 | 2 : search cores in a package. | 542 | 2 : search cores in a package. |
| 543 | 3 : search cpus in a node [= system wide on non-NUMA system] | 543 | 3 : search cpus in a node [= system wide on non-NUMA system] |
| 544 | ( 4 : search nodes in a chunk of node [on NUMA system] ) | 544 | ( 4 : search nodes in a chunk of node [on NUMA system] ) |
| 545 | ( 5~ : search system wide [on NUMA system]) | 545 | ( 5 : search system wide [on NUMA system] ) |
| 546 | 546 | ||
| 547 | This file is per-cpuset and affect the sched domain where the cpuset | 547 | This file is per-cpuset and affect the sched domain where the cpuset |
| 548 | belongs to. Therefore if the flag 'sched_load_balance' of a cpuset | 548 | belongs to. Therefore if the flag 'sched_load_balance' of a cpuset |
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index f4a8ebc1ef1a..2d845730d4e0 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface | |||
| @@ -2,17 +2,12 @@ Naming and data format standards for sysfs files | |||
| 2 | ------------------------------------------------ | 2 | ------------------------------------------------ |
| 3 | 3 | ||
| 4 | The libsensors library offers an interface to the raw sensors data | 4 | The libsensors library offers an interface to the raw sensors data |
| 5 | through the sysfs interface. See libsensors documentation and source for | 5 | through the sysfs interface. Since lm-sensors 3.0.0, libsensors is |
| 6 | further information. As of writing this document, libsensors | 6 | completely chip-independent. It assumes that all the kernel drivers |
| 7 | (from lm_sensors 2.8.3) is heavily chip-dependent. Adding or updating | 7 | implement the standard sysfs interface described in this document. |
| 8 | support for any given chip requires modifying the library's code. | 8 | This makes adding or updating support for any given chip very easy, as |
| 9 | This is because libsensors was written for the procfs interface | 9 | libsensors, and applications using it, do not need to be modified. |
| 10 | older kernel modules were using, which wasn't standardized enough. | 10 | This is a major improvement compared to lm-sensors 2. |
| 11 | Recent versions of libsensors (from lm_sensors 2.8.2 and later) have | ||
| 12 | support for the sysfs interface, though. | ||
| 13 | |||
| 14 | The new sysfs interface was designed to be as chip-independent as | ||
| 15 | possible. | ||
| 16 | 11 | ||
| 17 | Note that motherboards vary widely in the connections to sensor chips. | 12 | Note that motherboards vary widely in the connections to sensor chips. |
| 18 | There is no standard that ensures, for example, that the second | 13 | There is no standard that ensures, for example, that the second |
| @@ -35,19 +30,17 @@ access this data in a simple and consistent way. That said, such programs | |||
| 35 | will have to implement conversion, labeling and hiding of inputs. For | 30 | will have to implement conversion, labeling and hiding of inputs. For |
| 36 | this reason, it is still not recommended to bypass the library. | 31 | this reason, it is still not recommended to bypass the library. |
| 37 | 32 | ||
| 38 | If you are developing a userspace application please send us feedback on | ||
| 39 | this standard. | ||
| 40 | |||
| 41 | Note that this standard isn't completely established yet, so it is subject | ||
| 42 | to changes. If you are writing a new hardware monitoring driver those | ||
| 43 | features can't seem to fit in this interface, please contact us with your | ||
| 44 | extension proposal. Keep in mind that backward compatibility must be | ||
| 45 | preserved. | ||
| 46 | |||
| 47 | Each chip gets its own directory in the sysfs /sys/devices tree. To | 33 | Each chip gets its own directory in the sysfs /sys/devices tree. To |
| 48 | find all sensor chips, it is easier to follow the device symlinks from | 34 | find all sensor chips, it is easier to follow the device symlinks from |
| 49 | /sys/class/hwmon/hwmon*. | 35 | /sys/class/hwmon/hwmon*. |
| 50 | 36 | ||
| 37 | Up to lm-sensors 3.0.0, libsensors looks for hardware monitoring attributes | ||
| 38 | in the "physical" device directory. Since lm-sensors 3.0.1, attributes found | ||
| 39 | in the hwmon "class" device directory are also supported. Complex drivers | ||
| 40 | (e.g. drivers for multifunction chips) may want to use this possibility to | ||
| 41 | avoid namespace pollution. The only drawback will be that older versions of | ||
| 42 | libsensors won't support the driver in question. | ||
| 43 | |||
| 51 | All sysfs values are fixed point numbers. | 44 | All sysfs values are fixed point numbers. |
| 52 | 45 | ||
| 53 | There is only one value per file, unlike the older /proc specification. | 46 | There is only one value per file, unlike the older /proc specification. |
diff --git a/MAINTAINERS b/MAINTAINERS index cd587eec9fa7..8f0ec46a7096 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4431,10 +4431,10 @@ M: johnpol@2ka.mipt.ru | |||
| 4431 | S: Maintained | 4431 | S: Maintained |
| 4432 | 4432 | ||
| 4433 | W83791D HARDWARE MONITORING DRIVER | 4433 | W83791D HARDWARE MONITORING DRIVER |
| 4434 | P: Charles Spirakis | 4434 | P: Marc Hulsman |
| 4435 | M: bezaur@gmail.com | 4435 | M: m.hulsman@tudelft.nl |
| 4436 | L: lm-sensors@lm-sensors.org | 4436 | L: lm-sensors@lm-sensors.org |
| 4437 | S: Odd Fixes | 4437 | S: Maintained |
| 4438 | 4438 | ||
| 4439 | W83793 HARDWARE MONITORING DRIVER | 4439 | W83793 HARDWARE MONITORING DRIVER |
| 4440 | P: Rudolf Marek | 4440 | P: Rudolf Marek |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 26 | 3 | SUBLEVEL = 26 |
| 4 | EXTRAVERSION = -rc6 | 4 | EXTRAVERSION = -rc8 |
| 5 | NAME = Rotary Wombat | 5 | NAME = Rotary Wombat |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile index 4e1a8e2c4541..4759fe751aa1 100644 --- a/arch/alpha/Makefile +++ b/arch/alpha/Makefile | |||
| @@ -13,6 +13,7 @@ NM := $(NM) -B | |||
| 13 | LDFLAGS_vmlinux := -static -N #-relax | 13 | LDFLAGS_vmlinux := -static -N #-relax |
| 14 | CHECKFLAGS += -D__alpha__ -m64 | 14 | CHECKFLAGS += -D__alpha__ -m64 |
| 15 | cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data | 15 | cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data |
| 16 | cflags-y += $(call cc-option, -fno-jump-tables) | ||
| 16 | 17 | ||
| 17 | cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 | 18 | cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 |
| 18 | cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 | 19 | cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 |
diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c index c0750291b44a..d9980d47ab81 100644 --- a/arch/alpha/kernel/core_t2.c +++ b/arch/alpha/kernel/core_t2.c | |||
| @@ -74,6 +74,8 @@ | |||
| 74 | # define DBG(args) | 74 | # define DBG(args) |
| 75 | #endif | 75 | #endif |
| 76 | 76 | ||
| 77 | DEFINE_SPINLOCK(t2_hae_lock); | ||
| 78 | |||
| 77 | static volatile unsigned int t2_mcheck_any_expected; | 79 | static volatile unsigned int t2_mcheck_any_expected; |
| 78 | static volatile unsigned int t2_mcheck_last_taken; | 80 | static volatile unsigned int t2_mcheck_last_taken; |
| 79 | 81 | ||
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 36ab22a7ea12..5cf45fc51343 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
| @@ -71,6 +71,23 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_i | |||
| 71 | static void __init | 71 | static void __init |
| 72 | quirk_cypress(struct pci_dev *dev) | 72 | quirk_cypress(struct pci_dev *dev) |
| 73 | { | 73 | { |
| 74 | /* The Notorious Cy82C693 chip. */ | ||
| 75 | |||
| 76 | /* The generic legacy mode IDE fixup in drivers/pci/probe.c | ||
| 77 | doesn't work correctly with the Cypress IDE controller as | ||
| 78 | it has non-standard register layout. Fix that. */ | ||
| 79 | if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE) { | ||
| 80 | dev->resource[2].start = dev->resource[3].start = 0; | ||
| 81 | dev->resource[2].end = dev->resource[3].end = 0; | ||
| 82 | dev->resource[2].flags = dev->resource[3].flags = 0; | ||
| 83 | if (PCI_FUNC(dev->devfn) == 2) { | ||
| 84 | dev->resource[0].start = 0x170; | ||
| 85 | dev->resource[0].end = 0x177; | ||
| 86 | dev->resource[1].start = 0x376; | ||
| 87 | dev->resource[1].end = 0x376; | ||
| 88 | } | ||
| 89 | } | ||
| 90 | |||
| 74 | /* The Cypress bridge responds on the PCI bus in the address range | 91 | /* The Cypress bridge responds on the PCI bus in the address range |
| 75 | 0xffff0000-0xffffffff (conventional x86 BIOS ROM). There is no | 92 | 0xffff0000-0xffffffff (conventional x86 BIOS ROM). There is no |
| 76 | way to turn this off. The bridge also supports several extended | 93 | way to turn this off. The bridge also supports several extended |
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index dc57790250d2..c778779007fc 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c | |||
| @@ -447,7 +447,7 @@ struct unaligned_stat { | |||
| 447 | 447 | ||
| 448 | 448 | ||
| 449 | /* Macro for exception fixup code to access integer registers. */ | 449 | /* Macro for exception fixup code to access integer registers. */ |
| 450 | #define una_reg(r) (regs->regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) | 450 | #define una_reg(r) (_regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) |
| 451 | 451 | ||
| 452 | 452 | ||
| 453 | asmlinkage void | 453 | asmlinkage void |
| @@ -456,6 +456,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, | |||
| 456 | { | 456 | { |
| 457 | long error, tmp1, tmp2, tmp3, tmp4; | 457 | long error, tmp1, tmp2, tmp3, tmp4; |
| 458 | unsigned long pc = regs->pc - 4; | 458 | unsigned long pc = regs->pc - 4; |
| 459 | unsigned long *_regs = regs->regs; | ||
| 459 | const struct exception_table_entry *fixup; | 460 | const struct exception_table_entry *fixup; |
| 460 | 461 | ||
| 461 | unaligned[0].count++; | 462 | unaligned[0].count++; |
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 88f1a55c6c94..e67ee3f27698 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
| @@ -57,6 +57,7 @@ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ | |||
| 57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ | 57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ |
| 58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ | 58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ |
| 59 | core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ | 59 | core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ |
| 60 | core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ | ||
| 60 | core-$(CONFIG_KVM) += arch/ia64/kvm/ | 61 | core-$(CONFIG_KVM) += arch/ia64/kvm/ |
| 61 | 62 | ||
| 62 | drivers-$(CONFIG_PCI) += arch/ia64/pci/ | 63 | drivers-$(CONFIG_PCI) += arch/ia64/pci/ |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 082c31dcfd99..39752cdef6ff 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
| @@ -558,8 +558,6 @@ static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void) | |||
| 558 | if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) { | 558 | if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) { |
| 559 | rte = alloc_bootmem(sizeof(struct iosapic_rte_info) * | 559 | rte = alloc_bootmem(sizeof(struct iosapic_rte_info) * |
| 560 | NR_PREALLOCATE_RTE_ENTRIES); | 560 | NR_PREALLOCATE_RTE_ENTRIES); |
| 561 | if (!rte) | ||
| 562 | return NULL; | ||
| 563 | for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++) | 561 | for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++) |
| 564 | list_add(&rte->rte_list, &free_rte_list); | 562 | list_add(&rte->rte_list, &free_rte_list); |
| 565 | } | 563 | } |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 71d05133f556..7714a97b0104 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -1864,11 +1864,6 @@ pfm_flush(struct file *filp, fl_owner_t id) | |||
| 1864 | * invoked after, it will find an empty queue and no | 1864 | * invoked after, it will find an empty queue and no |
| 1865 | * signal will be sent. In both case, we are safe | 1865 | * signal will be sent. In both case, we are safe |
| 1866 | */ | 1866 | */ |
| 1867 | if (filp->f_flags & FASYNC) { | ||
| 1868 | DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue)); | ||
| 1869 | pfm_do_fasync (-1, filp, ctx, 0); | ||
| 1870 | } | ||
| 1871 | |||
| 1872 | PROTECT_CTX(ctx, flags); | 1867 | PROTECT_CTX(ctx, flags); |
| 1873 | 1868 | ||
| 1874 | state = ctx->ctx_state; | 1869 | state = ctx->ctx_state; |
| @@ -1999,6 +1994,11 @@ pfm_close(struct inode *inode, struct file *filp) | |||
| 1999 | return -EBADF; | 1994 | return -EBADF; |
| 2000 | } | 1995 | } |
| 2001 | 1996 | ||
| 1997 | if (filp->f_flags & FASYNC) { | ||
| 1998 | DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue)); | ||
| 1999 | pfm_do_fasync(-1, filp, ctx, 0); | ||
| 2000 | } | ||
| 2001 | |||
| 2002 | PROTECT_CTX(ctx, flags); | 2002 | PROTECT_CTX(ctx, flags); |
| 2003 | 2003 | ||
| 2004 | state = ctx->ctx_state; | 2004 | state = ctx->ctx_state; |
diff --git a/arch/ia64/kernel/sal.c b/arch/ia64/kernel/sal.c index 7e0259709c04..0464173ea568 100644 --- a/arch/ia64/kernel/sal.c +++ b/arch/ia64/kernel/sal.c | |||
| @@ -252,11 +252,10 @@ check_sal_cache_flush (void) | |||
| 252 | local_irq_save(flags); | 252 | local_irq_save(flags); |
| 253 | 253 | ||
| 254 | /* | 254 | /* |
| 255 | * Schedule a timer interrupt, wait until it's reported, and see if | 255 | * Send ourselves a timer interrupt, wait until it's reported, and see |
| 256 | * SAL_CACHE_FLUSH drops it. | 256 | * if SAL_CACHE_FLUSH drops it. |
| 257 | */ | 257 | */ |
| 258 | ia64_set_itv(IA64_TIMER_VECTOR); | 258 | platform_send_ipi(cpu, IA64_TIMER_VECTOR, IA64_IPI_DM_INT, 0); |
| 259 | ia64_set_itm(ia64_get_itc() + 1000); | ||
| 260 | 259 | ||
| 261 | while (!ia64_get_irr(IA64_TIMER_VECTOR)) | 260 | while (!ia64_get_irr(IA64_TIMER_VECTOR)) |
| 262 | cpu_relax(); | 261 | cpu_relax(); |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index f48a809c686d..4ae15c8c2488 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -578,8 +578,6 @@ setup_arch (char **cmdline_p) | |||
| 578 | cpu_init(); /* initialize the bootstrap CPU */ | 578 | cpu_init(); /* initialize the bootstrap CPU */ |
| 579 | mmu_context_init(); /* initialize context_id bitmap */ | 579 | mmu_context_init(); /* initialize context_id bitmap */ |
| 580 | 580 | ||
| 581 | check_sal_cache_flush(); | ||
| 582 | |||
| 583 | #ifdef CONFIG_ACPI | 581 | #ifdef CONFIG_ACPI |
| 584 | acpi_boot_init(); | 582 | acpi_boot_init(); |
| 585 | #endif | 583 | #endif |
| @@ -607,6 +605,7 @@ setup_arch (char **cmdline_p) | |||
| 607 | ia64_mca_init(); | 605 | ia64_mca_init(); |
| 608 | 606 | ||
| 609 | platform_setup(cmdline_p); | 607 | platform_setup(cmdline_p); |
| 608 | check_sal_cache_flush(); | ||
| 610 | paging_init(); | 609 | paging_init(); |
| 611 | } | 610 | } |
| 612 | 611 | ||
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 49d3120415eb..e585f9a2afb9 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c | |||
| @@ -512,6 +512,8 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si | |||
| 512 | int cpu; | 512 | int cpu; |
| 513 | char optstr[64]; | 513 | char optstr[64]; |
| 514 | 514 | ||
| 515 | if (count == 0 || count > sizeof(optstr)) | ||
| 516 | return -EINVAL; | ||
| 515 | if (copy_from_user(optstr, user, count)) | 517 | if (copy_from_user(optstr, user, count)) |
| 516 | return -EFAULT; | 518 | return -EFAULT; |
| 517 | optstr[count - 1] = '\0'; | 519 | optstr[count - 1] = '\0'; |
diff --git a/arch/ia64/uv/kernel/setup.c b/arch/ia64/uv/kernel/setup.c index 9aa743203c3c..cf5f28ae96c4 100644 --- a/arch/ia64/uv/kernel/setup.c +++ b/arch/ia64/uv/kernel/setup.c | |||
| @@ -17,6 +17,9 @@ | |||
| 17 | DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); | 17 | DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); |
| 18 | EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); | 18 | EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); |
| 19 | 19 | ||
| 20 | #ifdef CONFIG_IA64_SGI_UV | ||
| 21 | int sn_prom_type; | ||
| 22 | #endif | ||
| 20 | 23 | ||
| 21 | struct redir_addr { | 24 | struct redir_addr { |
| 22 | unsigned long redirect; | 25 | unsigned long redirect; |
| @@ -64,6 +67,15 @@ void __init uv_setup(char **cmdline_p) | |||
| 64 | m_n_config.s.m_skt = 37; | 67 | m_n_config.s.m_skt = 37; |
| 65 | m_n_config.s.n_skt = 0; | 68 | m_n_config.s.n_skt = 0; |
| 66 | mmr_base = 0; | 69 | mmr_base = 0; |
| 70 | #if 0 | ||
| 71 | /* Need BIOS calls - TDB */ | ||
| 72 | if (!ia64_sn_is_fake_prom()) | ||
| 73 | sn_prom_type = 1; | ||
| 74 | else | ||
| 75 | #endif | ||
| 76 | sn_prom_type = 2; | ||
| 77 | printk(KERN_INFO "Running on medusa with %s PROM\n", | ||
| 78 | (sn_prom_type == 1) ? "real" : "fake"); | ||
| 67 | } else { | 79 | } else { |
| 68 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); | 80 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); |
| 69 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); | 81 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 69648d01acc0..ad36c946ff96 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -538,19 +538,19 @@ cflags-$(CONFIG_SIBYTE_BCM1x80) += -Iinclude/asm-mips/mach-sibyte \ | |||
| 538 | # Sibyte SWARM board | 538 | # Sibyte SWARM board |
| 539 | # Sibyte BCM91x80 (BigSur) board | 539 | # Sibyte BCM91x80 (BigSur) board |
| 540 | # | 540 | # |
| 541 | libs-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/ | 541 | core-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/ |
| 542 | load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000 | 542 | load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000 |
| 543 | libs-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/ | 543 | core-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/ |
| 544 | load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000 | 544 | load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000 |
| 545 | libs-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/ | 545 | core-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/ |
| 546 | load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000 | 546 | load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000 |
| 547 | libs-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/ | 547 | core-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/ |
| 548 | load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000 | 548 | load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000 |
| 549 | libs-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ | 549 | core-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ |
| 550 | load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000 | 550 | load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000 |
| 551 | libs-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/ | 551 | core-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/ |
| 552 | load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000 | 552 | load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000 |
| 553 | libs-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ | 553 | core-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ |
| 554 | load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 | 554 | load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 |
| 555 | 555 | ||
| 556 | # | 556 | # |
| @@ -565,7 +565,11 @@ load-$(CONFIG_BCM47XX) := 0xffffffff80001000 | |||
| 565 | # | 565 | # |
| 566 | core-$(CONFIG_SNI_RM) += arch/mips/sni/ | 566 | core-$(CONFIG_SNI_RM) += arch/mips/sni/ |
| 567 | cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm | 567 | cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm |
| 568 | ifdef CONFIG_CPU_LITTLE_ENDIAN | ||
| 568 | load-$(CONFIG_SNI_RM) += 0xffffffff80600000 | 569 | load-$(CONFIG_SNI_RM) += 0xffffffff80600000 |
| 570 | else | ||
| 571 | load-$(CONFIG_SNI_RM) += 0xffffffff80030000 | ||
| 572 | endif | ||
| 569 | all-$(CONFIG_SNI_RM) := vmlinux.ecoff | 573 | all-$(CONFIG_SNI_RM) := vmlinux.ecoff |
| 570 | 574 | ||
| 571 | # | 575 | # |
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 8cae7753ef79..74d6d4a593be 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
| @@ -165,12 +165,12 @@ static struct resource au1xxx_usb_gdt_resources[] = { | |||
| 165 | static struct resource au1xxx_mmc_resources[] = { | 165 | static struct resource au1xxx_mmc_resources[] = { |
| 166 | [0] = { | 166 | [0] = { |
| 167 | .start = SD0_PHYS_ADDR, | 167 | .start = SD0_PHYS_ADDR, |
| 168 | .end = SD0_PHYS_ADDR + 0x40, | 168 | .end = SD0_PHYS_ADDR + 0x7ffff, |
| 169 | .flags = IORESOURCE_MEM, | 169 | .flags = IORESOURCE_MEM, |
| 170 | }, | 170 | }, |
| 171 | [1] = { | 171 | [1] = { |
| 172 | .start = SD1_PHYS_ADDR, | 172 | .start = SD1_PHYS_ADDR, |
| 173 | .end = SD1_PHYS_ADDR + 0x40, | 173 | .end = SD1_PHYS_ADDR + 0x7ffff, |
| 174 | .flags = IORESOURCE_MEM, | 174 | .flags = IORESOURCE_MEM, |
| 175 | }, | 175 | }, |
| 176 | [2] = { | 176 | [2] = { |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 117470b60e34..4b8799802788 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
| @@ -1,67 +1,58 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.25 |
| 4 | # Tue Feb 20 21:47:40 2007 | 4 | # Sat May 3 00:38:11 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_MIPS_MTX1 is not set | ||
| 13 | # CONFIG_MIPS_BOSPORUS is not set | ||
| 14 | # CONFIG_MIPS_PB1000 is not set | ||
| 15 | # CONFIG_MIPS_PB1100 is not set | ||
| 16 | # CONFIG_MIPS_PB1500 is not set | ||
| 17 | # CONFIG_MIPS_PB1550 is not set | ||
| 18 | # CONFIG_MIPS_PB1200 is not set | ||
| 19 | # CONFIG_MIPS_DB1000 is not set | ||
| 20 | # CONFIG_MIPS_DB1100 is not set | ||
| 21 | # CONFIG_MIPS_DB1500 is not set | ||
| 22 | # CONFIG_MIPS_DB1550 is not set | ||
| 23 | # CONFIG_MIPS_DB1200 is not set | ||
| 24 | # CONFIG_MIPS_MIRAGE is not set | ||
| 25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 18 | # CONFIG_LEMOTE_FULONG is not set | ||
| 29 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 30 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| 31 | # CONFIG_MIPS_SEAD is not set | 21 | # CONFIG_MIPS_SEAD is not set |
| 32 | # CONFIG_WR_PPMC is not set | ||
| 33 | # CONFIG_MIPS_SIM is not set | 22 | # CONFIG_MIPS_SIM is not set |
| 34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 23 | # CONFIG_MARKEINS is not set |
| 35 | # CONFIG_MIPS_XXS1500 is not set | 24 | # CONFIG_MACH_VR41XX is not set |
| 36 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 37 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 38 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
| 39 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 40 | # CONFIG_MARKEINS is not set | ||
| 41 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 42 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 43 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 44 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 45 | CONFIG_SIBYTE_SWARM=y | ||
| 46 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 47 | # CONFIG_SIBYTE_RHONE is not set | ||
| 48 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 49 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 50 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 34 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 51 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
| 36 | # CONFIG_SIBYTE_RHONE is not set | ||
| 37 | CONFIG_SIBYTE_SWARM=y | ||
| 38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 52 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 53 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
| 54 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 55 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 45 | # CONFIG_WR_PPMC is not set | ||
| 56 | CONFIG_SIBYTE_SB1250=y | 46 | CONFIG_SIBYTE_SB1250=y |
| 57 | CONFIG_SIBYTE_SB1xxx_SOC=y | 47 | CONFIG_SIBYTE_SB1xxx_SOC=y |
| 58 | CONFIG_CPU_SB1_PASS_1=y | 48 | # CONFIG_CPU_SB1_PASS_1 is not set |
| 59 | # CONFIG_CPU_SB1_PASS_2_1250 is not set | 49 | # CONFIG_CPU_SB1_PASS_2_1250 is not set |
| 60 | # CONFIG_CPU_SB1_PASS_2_2 is not set | 50 | CONFIG_CPU_SB1_PASS_2_2=y |
| 61 | # CONFIG_CPU_SB1_PASS_4 is not set | 51 | # CONFIG_CPU_SB1_PASS_4 is not set |
| 62 | # CONFIG_CPU_SB1_PASS_2_112x is not set | 52 | # CONFIG_CPU_SB1_PASS_2_112x is not set |
| 63 | # CONFIG_CPU_SB1_PASS_3 is not set | 53 | # CONFIG_CPU_SB1_PASS_3 is not set |
| 64 | CONFIG_SIBYTE_HAS_LDT=y | 54 | CONFIG_SIBYTE_HAS_LDT=y |
| 55 | CONFIG_SIBYTE_ENABLE_LDT_IF_PCI=y | ||
| 65 | # CONFIG_SIMULATION is not set | 56 | # CONFIG_SIMULATION is not set |
| 66 | # CONFIG_SB1_CEX_ALWAYS_FATAL is not set | 57 | # CONFIG_SB1_CEX_ALWAYS_FATAL is not set |
| 67 | # CONFIG_SB1_CERR_STALL is not set | 58 | # CONFIG_SB1_CERR_STALL is not set |
| @@ -69,20 +60,32 @@ CONFIG_SIBYTE_CFE=y | |||
| 69 | # CONFIG_SIBYTE_CFE_CONSOLE is not set | 60 | # CONFIG_SIBYTE_CFE_CONSOLE is not set |
| 70 | # CONFIG_SIBYTE_BUS_WATCHER is not set | 61 | # CONFIG_SIBYTE_BUS_WATCHER is not set |
| 71 | # CONFIG_SIBYTE_TBPROF is not set | 62 | # CONFIG_SIBYTE_TBPROF is not set |
| 63 | CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y | ||
| 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 64 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 73 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 65 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 74 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 66 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 67 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 75 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 76 | CONFIG_GENERIC_HWEIGHT=y | 69 | CONFIG_GENERIC_HWEIGHT=y |
| 77 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 71 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 78 | CONFIG_GENERIC_TIME=y | 72 | CONFIG_GENERIC_TIME=y |
| 73 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 79 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 74 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 80 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 75 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 76 | CONFIG_CEVT_SB1250=y | ||
| 77 | CONFIG_CSRC_SB1250=y | ||
| 78 | CONFIG_CFE=y | ||
| 81 | CONFIG_DMA_COHERENT=y | 79 | CONFIG_DMA_COHERENT=y |
| 80 | CONFIG_EARLY_PRINTK=y | ||
| 81 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
| 82 | # CONFIG_HOTPLUG_CPU is not set | ||
| 83 | # CONFIG_NO_IOPORT is not set | ||
| 82 | CONFIG_CPU_BIG_ENDIAN=y | 84 | CONFIG_CPU_BIG_ENDIAN=y |
| 83 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 85 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 84 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 86 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 85 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 87 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 88 | CONFIG_IRQ_CPU=y | ||
| 86 | CONFIG_SWAP_IO_SPACE=y | 89 | CONFIG_SWAP_IO_SPACE=y |
| 87 | CONFIG_BOOT_ELF32=y | 90 | CONFIG_BOOT_ELF32=y |
| 88 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 91 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| @@ -90,6 +93,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 90 | # | 93 | # |
| 91 | # CPU selection | 94 | # CPU selection |
| 92 | # | 95 | # |
| 96 | # CONFIG_CPU_LOONGSON2 is not set | ||
| 93 | # CONFIG_CPU_MIPS32_R1 is not set | 97 | # CONFIG_CPU_MIPS32_R1 is not set |
| 94 | # CONFIG_CPU_MIPS32_R2 is not set | 98 | # CONFIG_CPU_MIPS32_R2 is not set |
| 95 | # CONFIG_CPU_MIPS64_R1 is not set | 99 | # CONFIG_CPU_MIPS64_R1 is not set |
| @@ -130,8 +134,7 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
| 130 | CONFIG_MIPS_MT_DISABLED=y | 134 | CONFIG_MIPS_MT_DISABLED=y |
| 131 | # CONFIG_MIPS_MT_SMP is not set | 135 | # CONFIG_MIPS_MT_SMP is not set |
| 132 | # CONFIG_MIPS_MT_SMTC is not set | 136 | # CONFIG_MIPS_MT_SMTC is not set |
| 133 | # CONFIG_MIPS_VPE_LOADER is not set | 137 | CONFIG_SB1_PASS_2_WORKAROUNDS=y |
| 134 | CONFIG_SB1_PASS_1_WORKAROUNDS=y | ||
| 135 | CONFIG_CPU_HAS_LLSC=y | 138 | CONFIG_CPU_HAS_LLSC=y |
| 136 | CONFIG_CPU_HAS_SYNC=y | 139 | CONFIG_CPU_HAS_SYNC=y |
| 137 | CONFIG_GENERIC_HARDIRQS=y | 140 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -140,6 +143,7 @@ CONFIG_IRQ_PER_CPU=y | |||
| 140 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 143 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 141 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | 144 | CONFIG_SYS_SUPPORTS_HIGHMEM=y |
| 142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 145 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 146 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | 147 | CONFIG_SELECT_MEMORY_MODEL=y |
| 144 | CONFIG_FLATMEM_MANUAL=y | 148 | CONFIG_FLATMEM_MANUAL=y |
| 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 149 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -147,13 +151,19 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 147 | CONFIG_FLATMEM=y | 151 | CONFIG_FLATMEM=y |
| 148 | CONFIG_FLAT_NODE_MEM_MAP=y | 152 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 149 | # CONFIG_SPARSEMEM_STATIC is not set | 153 | # CONFIG_SPARSEMEM_STATIC is not set |
| 154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 151 | CONFIG_RESOURCES_64BIT=y | 156 | CONFIG_RESOURCES_64BIT=y |
| 152 | CONFIG_ZONE_DMA_FLAG=1 | 157 | CONFIG_ZONE_DMA_FLAG=0 |
| 158 | CONFIG_VIRT_TO_BUS=y | ||
| 153 | CONFIG_SMP=y | 159 | CONFIG_SMP=y |
| 154 | CONFIG_SYS_SUPPORTS_SMP=y | 160 | CONFIG_SYS_SUPPORTS_SMP=y |
| 155 | CONFIG_NR_CPUS_DEFAULT_2=y | 161 | CONFIG_NR_CPUS_DEFAULT_2=y |
| 156 | CONFIG_NR_CPUS=2 | 162 | CONFIG_NR_CPUS=2 |
| 163 | CONFIG_TICK_ONESHOT=y | ||
| 164 | # CONFIG_NO_HZ is not set | ||
| 165 | CONFIG_HIGH_RES_TIMERS=y | ||
| 166 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 157 | # CONFIG_HZ_48 is not set | 167 | # CONFIG_HZ_48 is not set |
| 158 | # CONFIG_HZ_100 is not set | 168 | # CONFIG_HZ_100 is not set |
| 159 | # CONFIG_HZ_128 is not set | 169 | # CONFIG_HZ_128 is not set |
| @@ -166,38 +176,49 @@ CONFIG_HZ=1000 | |||
| 166 | CONFIG_PREEMPT_NONE=y | 176 | CONFIG_PREEMPT_NONE=y |
| 167 | # CONFIG_PREEMPT_VOLUNTARY is not set | 177 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 168 | # CONFIG_PREEMPT is not set | 178 | # CONFIG_PREEMPT is not set |
| 169 | CONFIG_PREEMPT_BKL=y | ||
| 170 | # CONFIG_KEXEC is not set | 179 | # CONFIG_KEXEC is not set |
| 180 | CONFIG_SECCOMP=y | ||
| 171 | CONFIG_LOCKDEP_SUPPORT=y | 181 | CONFIG_LOCKDEP_SUPPORT=y |
| 172 | CONFIG_STACKTRACE_SUPPORT=y | 182 | CONFIG_STACKTRACE_SUPPORT=y |
| 173 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 183 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 174 | 184 | ||
| 175 | # | 185 | # |
| 176 | # Code maturity level options | 186 | # General setup |
| 177 | # | 187 | # |
| 178 | CONFIG_EXPERIMENTAL=y | 188 | CONFIG_EXPERIMENTAL=y |
| 179 | CONFIG_LOCK_KERNEL=y | 189 | CONFIG_LOCK_KERNEL=y |
| 180 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 190 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 181 | |||
| 182 | # | ||
| 183 | # General setup | ||
| 184 | # | ||
| 185 | CONFIG_LOCALVERSION="" | 191 | CONFIG_LOCALVERSION="" |
| 186 | CONFIG_LOCALVERSION_AUTO=y | 192 | CONFIG_LOCALVERSION_AUTO=y |
| 187 | CONFIG_SWAP=y | 193 | CONFIG_SWAP=y |
| 188 | CONFIG_SYSVIPC=y | 194 | CONFIG_SYSVIPC=y |
| 189 | # CONFIG_IPC_NS is not set | ||
| 190 | CONFIG_SYSVIPC_SYSCTL=y | 195 | CONFIG_SYSVIPC_SYSCTL=y |
| 191 | # CONFIG_POSIX_MQUEUE is not set | 196 | # CONFIG_POSIX_MQUEUE is not set |
| 192 | # CONFIG_BSD_PROCESS_ACCT is not set | 197 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 193 | # CONFIG_TASKSTATS is not set | 198 | # CONFIG_TASKSTATS is not set |
| 194 | # CONFIG_UTS_NS is not set | ||
| 195 | # CONFIG_AUDIT is not set | 199 | # CONFIG_AUDIT is not set |
| 196 | # CONFIG_IKCONFIG is not set | 200 | # CONFIG_IKCONFIG is not set |
| 201 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 197 | CONFIG_CGROUPS=y | 202 | CONFIG_CGROUPS=y |
| 203 | # CONFIG_CGROUP_DEBUG is not set | ||
| 204 | # CONFIG_CGROUP_NS is not set | ||
| 198 | CONFIG_CPUSETS=y | 205 | CONFIG_CPUSETS=y |
| 199 | CONFIG_SYSFS_DEPRECATED=y | 206 | CONFIG_GROUP_SCHED=y |
| 207 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 208 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 209 | CONFIG_USER_SCHED=y | ||
| 210 | # CONFIG_CGROUP_SCHED is not set | ||
| 211 | CONFIG_CGROUP_CPUACCT=y | ||
| 212 | # CONFIG_RESOURCE_COUNTERS is not set | ||
| 213 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 214 | # CONFIG_PROC_PID_CPUSET is not set | ||
| 200 | CONFIG_RELAY=y | 215 | CONFIG_RELAY=y |
| 216 | CONFIG_NAMESPACES=y | ||
| 217 | # CONFIG_UTS_NS is not set | ||
| 218 | # CONFIG_IPC_NS is not set | ||
| 219 | # CONFIG_USER_NS is not set | ||
| 220 | # CONFIG_PID_NS is not set | ||
| 221 | CONFIG_BLK_DEV_INITRD=y | ||
| 201 | CONFIG_INITRAMFS_SOURCE="" | 222 | CONFIG_INITRAMFS_SOURCE="" |
| 202 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 223 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 203 | CONFIG_SYSCTL=y | 224 | CONFIG_SYSCTL=y |
| @@ -209,20 +230,29 @@ CONFIG_HOTPLUG=y | |||
| 209 | CONFIG_PRINTK=y | 230 | CONFIG_PRINTK=y |
| 210 | CONFIG_BUG=y | 231 | CONFIG_BUG=y |
| 211 | CONFIG_ELF_CORE=y | 232 | CONFIG_ELF_CORE=y |
| 233 | # CONFIG_COMPAT_BRK is not set | ||
| 212 | CONFIG_BASE_FULL=y | 234 | CONFIG_BASE_FULL=y |
| 213 | CONFIG_FUTEX=y | 235 | CONFIG_FUTEX=y |
| 236 | CONFIG_ANON_INODES=y | ||
| 214 | CONFIG_EPOLL=y | 237 | CONFIG_EPOLL=y |
| 238 | CONFIG_SIGNALFD=y | ||
| 239 | CONFIG_TIMERFD=y | ||
| 240 | CONFIG_EVENTFD=y | ||
| 215 | CONFIG_SHMEM=y | 241 | CONFIG_SHMEM=y |
| 216 | CONFIG_SLAB=y | ||
| 217 | CONFIG_VM_EVENT_COUNTERS=y | 242 | CONFIG_VM_EVENT_COUNTERS=y |
| 243 | CONFIG_SLAB=y | ||
| 244 | # CONFIG_SLUB is not set | ||
| 245 | # CONFIG_SLOB is not set | ||
| 246 | # CONFIG_PROFILING is not set | ||
| 247 | # CONFIG_MARKERS is not set | ||
| 248 | CONFIG_HAVE_OPROFILE=y | ||
| 249 | # CONFIG_HAVE_KPROBES is not set | ||
| 250 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 251 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 252 | CONFIG_SLABINFO=y | ||
| 218 | CONFIG_RT_MUTEXES=y | 253 | CONFIG_RT_MUTEXES=y |
| 219 | # CONFIG_TINY_SHMEM is not set | 254 | # CONFIG_TINY_SHMEM is not set |
| 220 | CONFIG_BASE_SMALL=0 | 255 | CONFIG_BASE_SMALL=0 |
| 221 | # CONFIG_SLOB is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # Loadable module support | ||
| 225 | # | ||
| 226 | CONFIG_MODULES=y | 256 | CONFIG_MODULES=y |
| 227 | CONFIG_MODULE_UNLOAD=y | 257 | CONFIG_MODULE_UNLOAD=y |
| 228 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 258 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -230,12 +260,10 @@ CONFIG_MODVERSIONS=y | |||
| 230 | CONFIG_MODULE_SRCVERSION_ALL=y | 260 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 231 | CONFIG_KMOD=y | 261 | CONFIG_KMOD=y |
| 232 | CONFIG_STOP_MACHINE=y | 262 | CONFIG_STOP_MACHINE=y |
| 233 | |||
| 234 | # | ||
| 235 | # Block layer | ||
| 236 | # | ||
| 237 | CONFIG_BLOCK=y | 263 | CONFIG_BLOCK=y |
| 238 | # CONFIG_BLK_DEV_IO_TRACE is not set | 264 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 265 | CONFIG_BLK_DEV_BSG=y | ||
| 266 | CONFIG_BLOCK_COMPAT=y | ||
| 239 | 267 | ||
| 240 | # | 268 | # |
| 241 | # IO Schedulers | 269 | # IO Schedulers |
| @@ -249,22 +277,19 @@ CONFIG_DEFAULT_AS=y | |||
| 249 | # CONFIG_DEFAULT_CFQ is not set | 277 | # CONFIG_DEFAULT_CFQ is not set |
| 250 | # CONFIG_DEFAULT_NOOP is not set | 278 | # CONFIG_DEFAULT_NOOP is not set |
| 251 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 279 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 280 | CONFIG_CLASSIC_RCU=y | ||
| 252 | 281 | ||
| 253 | # | 282 | # |
| 254 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 283 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 255 | # | 284 | # |
| 256 | CONFIG_HW_HAS_PCI=y | 285 | CONFIG_HW_HAS_PCI=y |
| 257 | CONFIG_PCI=y | 286 | CONFIG_PCI=y |
| 287 | CONFIG_PCI_DOMAINS=y | ||
| 288 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 289 | # CONFIG_PCI_LEGACY is not set | ||
| 258 | CONFIG_MMU=y | 290 | CONFIG_MMU=y |
| 259 | 291 | CONFIG_ZONE_DMA32=y | |
| 260 | # | ||
| 261 | # PCCARD (PCMCIA/CardBus) support | ||
| 262 | # | ||
| 263 | # CONFIG_PCCARD is not set | 292 | # CONFIG_PCCARD is not set |
| 264 | |||
| 265 | # | ||
| 266 | # PCI Hotplug Support | ||
| 267 | # | ||
| 268 | # CONFIG_HOTPLUG_PCI is not set | 293 | # CONFIG_HOTPLUG_PCI is not set |
| 269 | 294 | ||
| 270 | # | 295 | # |
| @@ -272,7 +297,6 @@ CONFIG_MMU=y | |||
| 272 | # | 297 | # |
| 273 | CONFIG_BINFMT_ELF=y | 298 | CONFIG_BINFMT_ELF=y |
| 274 | # CONFIG_BINFMT_MISC is not set | 299 | # CONFIG_BINFMT_MISC is not set |
| 275 | # CONFIG_BUILD_ELF64 is not set | ||
| 276 | CONFIG_MIPS32_COMPAT=y | 300 | CONFIG_MIPS32_COMPAT=y |
| 277 | CONFIG_COMPAT=y | 301 | CONFIG_COMPAT=y |
| 278 | CONFIG_SYSVIPC_COMPAT=y | 302 | CONFIG_SYSVIPC_COMPAT=y |
| @@ -286,7 +310,6 @@ CONFIG_BINFMT_ELF32=y | |||
| 286 | CONFIG_PM=y | 310 | CONFIG_PM=y |
| 287 | # CONFIG_PM_LEGACY is not set | 311 | # CONFIG_PM_LEGACY is not set |
| 288 | # CONFIG_PM_DEBUG is not set | 312 | # CONFIG_PM_DEBUG is not set |
| 289 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
| 290 | 313 | ||
| 291 | # | 314 | # |
| 292 | # Networking | 315 | # Networking |
| @@ -296,7 +319,6 @@ CONFIG_NET=y | |||
| 296 | # | 319 | # |
| 297 | # Networking options | 320 | # Networking options |
| 298 | # | 321 | # |
| 299 | # CONFIG_NETDEBUG is not set | ||
| 300 | CONFIG_PACKET=y | 322 | CONFIG_PACKET=y |
| 301 | CONFIG_PACKET_MMAP=y | 323 | CONFIG_PACKET_MMAP=y |
| 302 | CONFIG_UNIX=y | 324 | CONFIG_UNIX=y |
| @@ -304,6 +326,7 @@ CONFIG_XFRM=y | |||
| 304 | CONFIG_XFRM_USER=m | 326 | CONFIG_XFRM_USER=m |
| 305 | # CONFIG_XFRM_SUB_POLICY is not set | 327 | # CONFIG_XFRM_SUB_POLICY is not set |
| 306 | CONFIG_XFRM_MIGRATE=y | 328 | CONFIG_XFRM_MIGRATE=y |
| 329 | # CONFIG_XFRM_STATISTICS is not set | ||
| 307 | CONFIG_NET_KEY=y | 330 | CONFIG_NET_KEY=y |
| 308 | CONFIG_NET_KEY_MIGRATE=y | 331 | CONFIG_NET_KEY_MIGRATE=y |
| 309 | CONFIG_INET=y | 332 | CONFIG_INET=y |
| @@ -326,6 +349,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 326 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 349 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 327 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 350 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 328 | CONFIG_INET_XFRM_MODE_BEET=m | 351 | CONFIG_INET_XFRM_MODE_BEET=m |
| 352 | CONFIG_INET_LRO=m | ||
| 329 | CONFIG_INET_DIAG=y | 353 | CONFIG_INET_DIAG=y |
| 330 | CONFIG_INET_TCP_DIAG=y | 354 | CONFIG_INET_TCP_DIAG=y |
| 331 | # CONFIG_TCP_CONG_ADVANCED is not set | 355 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -333,24 +357,15 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 333 | CONFIG_DEFAULT_TCP_CONG="cubic" | 357 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 334 | CONFIG_TCP_MD5SIG=y | 358 | CONFIG_TCP_MD5SIG=y |
| 335 | # CONFIG_IPV6 is not set | 359 | # CONFIG_IPV6 is not set |
| 336 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 337 | # CONFIG_INET6_TUNNEL is not set | ||
| 338 | CONFIG_NETWORK_SECMARK=y | 360 | CONFIG_NETWORK_SECMARK=y |
| 339 | # CONFIG_NETFILTER is not set | 361 | # CONFIG_NETFILTER is not set |
| 340 | |||
| 341 | # | ||
| 342 | # DCCP Configuration (EXPERIMENTAL) | ||
| 343 | # | ||
| 344 | # CONFIG_IP_DCCP is not set | 362 | # CONFIG_IP_DCCP is not set |
| 345 | 363 | CONFIG_IP_SCTP=m | |
| 346 | # | 364 | # CONFIG_SCTP_DBG_MSG is not set |
| 347 | # SCTP Configuration (EXPERIMENTAL) | 365 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| 348 | # | 366 | # CONFIG_SCTP_HMAC_NONE is not set |
| 349 | # CONFIG_IP_SCTP is not set | 367 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 350 | 368 | CONFIG_SCTP_HMAC_MD5=y | |
| 351 | # | ||
| 352 | # TIPC Configuration (EXPERIMENTAL) | ||
| 353 | # | ||
| 354 | # CONFIG_TIPC is not set | 369 | # CONFIG_TIPC is not set |
| 355 | # CONFIG_ATM is not set | 370 | # CONFIG_ATM is not set |
| 356 | # CONFIG_BRIDGE is not set | 371 | # CONFIG_BRIDGE is not set |
| @@ -363,26 +378,52 @@ CONFIG_NETWORK_SECMARK=y | |||
| 363 | # CONFIG_LAPB is not set | 378 | # CONFIG_LAPB is not set |
| 364 | # CONFIG_ECONET is not set | 379 | # CONFIG_ECONET is not set |
| 365 | # CONFIG_WAN_ROUTER is not set | 380 | # CONFIG_WAN_ROUTER is not set |
| 366 | |||
| 367 | # | ||
| 368 | # QoS and/or fair queueing | ||
| 369 | # | ||
| 370 | # CONFIG_NET_SCHED is not set | 381 | # CONFIG_NET_SCHED is not set |
| 382 | CONFIG_NET_SCH_FIFO=y | ||
| 371 | 383 | ||
| 372 | # | 384 | # |
| 373 | # Network testing | 385 | # Network testing |
| 374 | # | 386 | # |
| 375 | # CONFIG_NET_PKTGEN is not set | 387 | # CONFIG_NET_PKTGEN is not set |
| 376 | # CONFIG_HAMRADIO is not set | 388 | # CONFIG_HAMRADIO is not set |
| 389 | # CONFIG_CAN is not set | ||
| 377 | # CONFIG_IRDA is not set | 390 | # CONFIG_IRDA is not set |
| 378 | # CONFIG_BT is not set | 391 | # CONFIG_BT is not set |
| 392 | # CONFIG_AF_RXRPC is not set | ||
| 393 | |||
| 394 | # | ||
| 395 | # Wireless | ||
| 396 | # | ||
| 397 | CONFIG_CFG80211=m | ||
| 398 | CONFIG_NL80211=y | ||
| 399 | CONFIG_WIRELESS_EXT=y | ||
| 400 | CONFIG_MAC80211=m | ||
| 401 | |||
| 402 | # | ||
| 403 | # Rate control algorithm selection | ||
| 404 | # | ||
| 405 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 406 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 407 | |||
| 408 | # | ||
| 409 | # Selecting 'y' for an algorithm will | ||
| 410 | # | ||
| 411 | |||
| 412 | # | ||
| 413 | # build the algorithm into mac80211. | ||
| 414 | # | ||
| 415 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 416 | CONFIG_MAC80211_RC_PID=y | ||
| 417 | # CONFIG_MAC80211_MESH is not set | ||
| 418 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
| 419 | # CONFIG_MAC80211_DEBUG is not set | ||
| 379 | CONFIG_IEEE80211=m | 420 | CONFIG_IEEE80211=m |
| 380 | # CONFIG_IEEE80211_DEBUG is not set | 421 | # CONFIG_IEEE80211_DEBUG is not set |
| 381 | CONFIG_IEEE80211_CRYPT_WEP=m | 422 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 382 | CONFIG_IEEE80211_CRYPT_CCMP=m | 423 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 383 | CONFIG_IEEE80211_SOFTMAC=m | 424 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 384 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 425 | CONFIG_RFKILL=m |
| 385 | CONFIG_WIRELESS_EXT=y | 426 | # CONFIG_NET_9P is not set |
| 386 | 427 | ||
| 387 | # | 428 | # |
| 388 | # Device Drivers | 429 | # Device Drivers |
| @@ -391,34 +432,15 @@ CONFIG_WIRELESS_EXT=y | |||
| 391 | # | 432 | # |
| 392 | # Generic Driver Options | 433 | # Generic Driver Options |
| 393 | # | 434 | # |
| 435 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 394 | CONFIG_STANDALONE=y | 436 | CONFIG_STANDALONE=y |
| 395 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 437 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 396 | CONFIG_FW_LOADER=m | 438 | CONFIG_FW_LOADER=m |
| 397 | # CONFIG_SYS_HYPERVISOR is not set | 439 | # CONFIG_SYS_HYPERVISOR is not set |
| 398 | |||
| 399 | # | ||
| 400 | # Connector - unified userspace <-> kernelspace linker | ||
| 401 | # | ||
| 402 | CONFIG_CONNECTOR=m | 440 | CONFIG_CONNECTOR=m |
| 403 | |||
| 404 | # | ||
| 405 | # Memory Technology Devices (MTD) | ||
| 406 | # | ||
| 407 | # CONFIG_MTD is not set | 441 | # CONFIG_MTD is not set |
| 408 | |||
| 409 | # | ||
| 410 | # Parallel port support | ||
| 411 | # | ||
| 412 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 413 | 443 | CONFIG_BLK_DEV=y | |
| 414 | # | ||
| 415 | # Plug and Play support | ||
| 416 | # | ||
| 417 | # CONFIG_PNPACPI is not set | ||
| 418 | |||
| 419 | # | ||
| 420 | # Block devices | ||
| 421 | # | ||
| 422 | # CONFIG_BLK_CPQ_DA is not set | 444 | # CONFIG_BLK_CPQ_DA is not set |
| 423 | # CONFIG_BLK_CPQ_CISS_DA is not set | 445 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 424 | # CONFIG_BLK_DEV_DAC960 is not set | 446 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -427,49 +449,77 @@ CONFIG_CONNECTOR=m | |||
| 427 | # CONFIG_BLK_DEV_LOOP is not set | 449 | # CONFIG_BLK_DEV_LOOP is not set |
| 428 | # CONFIG_BLK_DEV_NBD is not set | 450 | # CONFIG_BLK_DEV_NBD is not set |
| 429 | # CONFIG_BLK_DEV_SX8 is not set | 451 | # CONFIG_BLK_DEV_SX8 is not set |
| 452 | # CONFIG_BLK_DEV_UB is not set | ||
| 430 | CONFIG_BLK_DEV_RAM=y | 453 | CONFIG_BLK_DEV_RAM=y |
| 431 | CONFIG_BLK_DEV_RAM_COUNT=16 | 454 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 432 | CONFIG_BLK_DEV_RAM_SIZE=9220 | 455 | CONFIG_BLK_DEV_RAM_SIZE=9220 |
| 433 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 456 | # CONFIG_BLK_DEV_XIP is not set |
| 434 | CONFIG_BLK_DEV_INITRD=y | ||
| 435 | CONFIG_CDROM_PKTCDVD=m | 457 | CONFIG_CDROM_PKTCDVD=m |
| 436 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 458 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 437 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 459 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 438 | CONFIG_ATA_OVER_ETH=m | 460 | CONFIG_ATA_OVER_ETH=m |
| 439 | 461 | CONFIG_MISC_DEVICES=y | |
| 440 | # | 462 | # CONFIG_PHANTOM is not set |
| 441 | # Misc devices | 463 | # CONFIG_EEPROM_93CX6 is not set |
| 442 | # | ||
| 443 | CONFIG_SGI_IOC4=m | 464 | CONFIG_SGI_IOC4=m |
| 444 | # CONFIG_TIFM_CORE is not set | 465 | # CONFIG_TIFM_CORE is not set |
| 445 | 466 | # CONFIG_ENCLOSURE_SERVICES is not set | |
| 446 | # | 467 | CONFIG_HAVE_IDE=y |
| 447 | # ATA/ATAPI/MFM/RLL support | ||
| 448 | # | ||
| 449 | CONFIG_IDE=y | 468 | CONFIG_IDE=y |
| 450 | CONFIG_IDE_MAX_HWIFS=4 | 469 | CONFIG_IDE_MAX_HWIFS=4 |
| 451 | CONFIG_BLK_DEV_IDE=y | 470 | CONFIG_BLK_DEV_IDE=y |
| 452 | 471 | ||
| 453 | # | 472 | # |
| 454 | # Please see Documentation/ide.txt for help/info on IDE drives | 473 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 455 | # | 474 | # |
| 456 | # CONFIG_BLK_DEV_IDE_SATA is not set | 475 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 457 | CONFIG_BLK_DEV_IDEDISK=y | 476 | CONFIG_BLK_DEV_IDEDISK=y |
| 458 | # CONFIG_IDEDISK_MULTI_MODE is not set | 477 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| 459 | CONFIG_BLK_DEV_IDECD=y | 478 | CONFIG_BLK_DEV_IDECD=y |
| 479 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 460 | CONFIG_BLK_DEV_IDETAPE=y | 480 | CONFIG_BLK_DEV_IDETAPE=y |
| 461 | CONFIG_BLK_DEV_IDEFLOPPY=y | 481 | CONFIG_BLK_DEV_IDEFLOPPY=y |
| 462 | # CONFIG_IDE_TASK_IOCTL is not set | 482 | # CONFIG_IDE_TASK_IOCTL is not set |
| 483 | CONFIG_IDE_PROC_FS=y | ||
| 463 | 484 | ||
| 464 | # | 485 | # |
| 465 | # IDE chipset support/bugfixes | 486 | # IDE chipset support/bugfixes |
| 466 | # | 487 | # |
| 467 | CONFIG_IDE_GENERIC=y | 488 | # CONFIG_IDE_GENERIC is not set |
| 468 | # CONFIG_BLK_DEV_IDEPCI is not set | 489 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 490 | |||
| 491 | # | ||
| 492 | # PCI IDE chipsets support | ||
| 493 | # | ||
| 494 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 495 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 496 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 497 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 498 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
| 499 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 500 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 501 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 502 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 503 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 504 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 505 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 506 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 507 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 508 | # CONFIG_BLK_DEV_PIIX is not set | ||
| 509 | # CONFIG_BLK_DEV_IT8213 is not set | ||
| 510 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 511 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 512 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 513 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 514 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 515 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 516 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 517 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 518 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 519 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
| 469 | CONFIG_BLK_DEV_IDE_SWARM=y | 520 | CONFIG_BLK_DEV_IDE_SWARM=y |
| 470 | # CONFIG_IDE_ARM is not set | ||
| 471 | # CONFIG_BLK_DEV_IDEDMA is not set | 521 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 472 | # CONFIG_IDEDMA_AUTO is not set | 522 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 473 | # CONFIG_BLK_DEV_HD is not set | 523 | # CONFIG_BLK_DEV_HD is not set |
| 474 | 524 | ||
| 475 | # | 525 | # |
| @@ -477,89 +527,68 @@ CONFIG_BLK_DEV_IDE_SWARM=y | |||
| 477 | # | 527 | # |
| 478 | CONFIG_RAID_ATTRS=m | 528 | CONFIG_RAID_ATTRS=m |
| 479 | # CONFIG_SCSI is not set | 529 | # CONFIG_SCSI is not set |
| 530 | # CONFIG_SCSI_DMA is not set | ||
| 480 | # CONFIG_SCSI_NETLINK is not set | 531 | # CONFIG_SCSI_NETLINK is not set |
| 481 | |||
| 482 | # | ||
| 483 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 484 | # | ||
| 485 | # CONFIG_ATA is not set | 532 | # CONFIG_ATA is not set |
| 486 | |||
| 487 | # | ||
| 488 | # Multi-device support (RAID and LVM) | ||
| 489 | # | ||
| 490 | # CONFIG_MD is not set | 533 | # CONFIG_MD is not set |
| 491 | |||
| 492 | # | ||
| 493 | # Fusion MPT device support | ||
| 494 | # | ||
| 495 | # CONFIG_FUSION is not set | 534 | # CONFIG_FUSION is not set |
| 496 | 535 | ||
| 497 | # | 536 | # |
| 498 | # IEEE 1394 (FireWire) support | 537 | # IEEE 1394 (FireWire) support |
| 499 | # | 538 | # |
| 539 | # CONFIG_FIREWIRE is not set | ||
| 500 | # CONFIG_IEEE1394 is not set | 540 | # CONFIG_IEEE1394 is not set |
| 501 | |||
| 502 | # | ||
| 503 | # I2O device support | ||
| 504 | # | ||
| 505 | # CONFIG_I2O is not set | 541 | # CONFIG_I2O is not set |
| 506 | |||
| 507 | # | ||
| 508 | # Network device support | ||
| 509 | # | ||
| 510 | CONFIG_NETDEVICES=y | 542 | CONFIG_NETDEVICES=y |
| 543 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
| 511 | # CONFIG_DUMMY is not set | 544 | # CONFIG_DUMMY is not set |
| 512 | # CONFIG_BONDING is not set | 545 | # CONFIG_BONDING is not set |
| 546 | CONFIG_MACVLAN=m | ||
| 513 | # CONFIG_EQUALIZER is not set | 547 | # CONFIG_EQUALIZER is not set |
| 514 | # CONFIG_TUN is not set | 548 | # CONFIG_TUN is not set |
| 515 | 549 | # CONFIG_VETH is not set | |
| 516 | # | ||
| 517 | # ARCnet devices | ||
| 518 | # | ||
| 519 | # CONFIG_ARCNET is not set | 550 | # CONFIG_ARCNET is not set |
| 520 | 551 | CONFIG_PHYLIB=y | |
| 521 | # | ||
| 522 | # PHY device support | ||
| 523 | # | ||
| 524 | CONFIG_PHYLIB=m | ||
| 525 | 552 | ||
| 526 | # | 553 | # |
| 527 | # MII PHY device drivers | 554 | # MII PHY device drivers |
| 528 | # | 555 | # |
| 529 | CONFIG_MARVELL_PHY=m | 556 | # CONFIG_MARVELL_PHY is not set |
| 530 | CONFIG_DAVICOM_PHY=m | 557 | # CONFIG_DAVICOM_PHY is not set |
| 531 | CONFIG_QSEMI_PHY=m | 558 | # CONFIG_QSEMI_PHY is not set |
| 532 | CONFIG_LXT_PHY=m | 559 | # CONFIG_LXT_PHY is not set |
| 533 | CONFIG_CICADA_PHY=m | 560 | # CONFIG_CICADA_PHY is not set |
| 534 | CONFIG_VITESSE_PHY=m | 561 | # CONFIG_VITESSE_PHY is not set |
| 535 | CONFIG_SMSC_PHY=m | 562 | # CONFIG_SMSC_PHY is not set |
| 536 | # CONFIG_BROADCOM_PHY is not set | 563 | CONFIG_BROADCOM_PHY=y |
| 564 | # CONFIG_ICPLUS_PHY is not set | ||
| 565 | # CONFIG_REALTEK_PHY is not set | ||
| 537 | # CONFIG_FIXED_PHY is not set | 566 | # CONFIG_FIXED_PHY is not set |
| 538 | 567 | # CONFIG_MDIO_BITBANG is not set | |
| 539 | # | ||
| 540 | # Ethernet (10 or 100Mbit) | ||
| 541 | # | ||
| 542 | CONFIG_NET_ETHERNET=y | 568 | CONFIG_NET_ETHERNET=y |
| 543 | CONFIG_MII=y | 569 | CONFIG_MII=y |
| 570 | # CONFIG_AX88796 is not set | ||
| 544 | # CONFIG_HAPPYMEAL is not set | 571 | # CONFIG_HAPPYMEAL is not set |
| 545 | # CONFIG_SUNGEM is not set | 572 | # CONFIG_SUNGEM is not set |
| 546 | # CONFIG_CASSINI is not set | 573 | # CONFIG_CASSINI is not set |
| 547 | # CONFIG_NET_VENDOR_3COM is not set | 574 | # CONFIG_NET_VENDOR_3COM is not set |
| 548 | # CONFIG_DM9000 is not set | 575 | # CONFIG_DM9000 is not set |
| 549 | |||
| 550 | # | ||
| 551 | # Tulip family network device support | ||
| 552 | # | ||
| 553 | # CONFIG_NET_TULIP is not set | 576 | # CONFIG_NET_TULIP is not set |
| 554 | # CONFIG_HP100 is not set | 577 | # CONFIG_HP100 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 | ||
| 555 | # CONFIG_NET_PCI is not set | 582 | # CONFIG_NET_PCI is not set |
| 556 | 583 | # CONFIG_B44 is not set | |
| 557 | # | 584 | CONFIG_NETDEV_1000=y |
| 558 | # Ethernet (1000 Mbit) | ||
| 559 | # | ||
| 560 | # CONFIG_ACENIC is not set | 585 | # CONFIG_ACENIC is not set |
| 561 | # CONFIG_DL2K is not set | 586 | # CONFIG_DL2K is not set |
| 562 | # CONFIG_E1000 is not set | 587 | # CONFIG_E1000 is not set |
| 588 | # CONFIG_E1000E is not set | ||
| 589 | # CONFIG_E1000E_ENABLED is not set | ||
| 590 | # CONFIG_IP1000 is not set | ||
| 591 | # CONFIG_IGB is not set | ||
| 563 | # CONFIG_NS83820 is not set | 592 | # CONFIG_NS83820 is not set |
| 564 | # CONFIG_HAMACHI is not set | 593 | # CONFIG_HAMACHI is not set |
| 565 | # CONFIG_YELLOWFIN is not set | 594 | # CONFIG_YELLOWFIN is not set |
| @@ -568,53 +597,70 @@ CONFIG_SB1250_MAC=y | |||
| 568 | # CONFIG_SIS190 is not set | 597 | # CONFIG_SIS190 is not set |
| 569 | # CONFIG_SKGE is not set | 598 | # CONFIG_SKGE is not set |
| 570 | # CONFIG_SKY2 is not set | 599 | # CONFIG_SKY2 is not set |
| 571 | # CONFIG_SK98LIN is not set | 600 | # CONFIG_VIA_VELOCITY is not set |
| 572 | # CONFIG_TIGON3 is not set | 601 | # CONFIG_TIGON3 is not set |
| 573 | # CONFIG_BNX2 is not set | 602 | # CONFIG_BNX2 is not set |
| 574 | CONFIG_QLA3XXX=m | 603 | # CONFIG_QLA3XXX is not set |
| 575 | # CONFIG_ATL1 is not set | 604 | # CONFIG_ATL1 is not set |
| 576 | 605 | CONFIG_NETDEV_10000=y | |
| 577 | # | ||
| 578 | # Ethernet (10000 Mbit) | ||
| 579 | # | ||
| 580 | # CONFIG_CHELSIO_T1 is not set | 606 | # CONFIG_CHELSIO_T1 is not set |
| 581 | CONFIG_CHELSIO_T3=m | 607 | # CONFIG_CHELSIO_T3 is not set |
| 608 | # CONFIG_IXGBE is not set | ||
| 582 | # CONFIG_IXGB is not set | 609 | # CONFIG_IXGB is not set |
| 583 | # CONFIG_S2IO is not set | 610 | # CONFIG_S2IO is not set |
| 584 | # CONFIG_MYRI10GE is not set | 611 | # CONFIG_MYRI10GE is not set |
| 585 | CONFIG_NETXEN_NIC=m | 612 | # CONFIG_NETXEN_NIC is not set |
| 586 | 613 | # CONFIG_NIU is not set | |
| 587 | # | 614 | # CONFIG_MLX4_CORE is not set |
| 588 | # Token Ring devices | 615 | # CONFIG_TEHUTI is not set |
| 589 | # | 616 | # CONFIG_BNX2X is not set |
| 590 | # CONFIG_TR is not set | 617 | # CONFIG_TR is not set |
| 591 | 618 | ||
| 592 | # | 619 | # |
| 593 | # Wireless LAN (non-hamradio) | 620 | # Wireless LAN |
| 594 | # | 621 | # |
| 595 | # CONFIG_NET_RADIO is not set | 622 | # CONFIG_WLAN_PRE80211 is not set |
| 596 | 623 | CONFIG_WLAN_80211=y | |
| 597 | # | 624 | # CONFIG_IPW2100 is not set |
| 598 | # Wan interfaces | 625 | # CONFIG_IPW2200 is not set |
| 599 | # | 626 | # CONFIG_LIBERTAS is not set |
| 627 | # CONFIG_HERMES is not set | ||
| 628 | # CONFIG_ATMEL is not set | ||
| 629 | # CONFIG_PRISM54 is not set | ||
| 630 | # CONFIG_USB_ZD1201 is not set | ||
| 631 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 632 | # CONFIG_RTL8180 is not set | ||
| 633 | # CONFIG_RTL8187 is not set | ||
| 634 | # CONFIG_ADM8211 is not set | ||
| 635 | # CONFIG_P54_COMMON is not set | ||
| 636 | # CONFIG_ATH5K is not set | ||
| 637 | # CONFIG_IWLCORE is not set | ||
| 638 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 639 | # CONFIG_IWL4965 is not set | ||
| 640 | # CONFIG_IWL3945 is not set | ||
| 641 | # CONFIG_HOSTAP is not set | ||
| 642 | # CONFIG_B43 is not set | ||
| 643 | # CONFIG_B43LEGACY is not set | ||
| 644 | # CONFIG_ZD1211RW is not set | ||
| 645 | # CONFIG_RT2X00 is not set | ||
| 646 | |||
| 647 | # | ||
| 648 | # USB Network Adapters | ||
| 649 | # | ||
| 650 | # CONFIG_USB_CATC is not set | ||
| 651 | # CONFIG_USB_KAWETH is not set | ||
| 652 | # CONFIG_USB_PEGASUS is not set | ||
| 653 | # CONFIG_USB_RTL8150 is not set | ||
| 654 | # CONFIG_USB_USBNET is not set | ||
| 600 | # CONFIG_WAN is not set | 655 | # CONFIG_WAN is not set |
| 601 | # CONFIG_FDDI is not set | 656 | # CONFIG_FDDI is not set |
| 602 | # CONFIG_HIPPI is not set | 657 | # CONFIG_HIPPI is not set |
| 603 | # CONFIG_PPP is not set | 658 | # CONFIG_PPP is not set |
| 604 | # CONFIG_SLIP is not set | 659 | # CONFIG_SLIP is not set |
| 605 | # CONFIG_SHAPER is not set | ||
| 606 | # CONFIG_NETCONSOLE is not set | 660 | # CONFIG_NETCONSOLE is not set |
| 607 | # CONFIG_NETPOLL is not set | 661 | # CONFIG_NETPOLL is not set |
| 608 | # CONFIG_NET_POLL_CONTROLLER is not set | 662 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 609 | |||
| 610 | # | ||
| 611 | # ISDN subsystem | ||
| 612 | # | ||
| 613 | # CONFIG_ISDN is not set | 663 | # CONFIG_ISDN is not set |
| 614 | |||
| 615 | # | ||
| 616 | # Telephony Support | ||
| 617 | # | ||
| 618 | # CONFIG_PHONE is not set | 664 | # CONFIG_PHONE is not set |
| 619 | 665 | ||
| 620 | # | 666 | # |
| @@ -637,24 +683,8 @@ CONFIG_SERIO_RAW=m | |||
| 637 | # Character devices | 683 | # Character devices |
| 638 | # | 684 | # |
| 639 | # CONFIG_VT is not set | 685 | # CONFIG_VT is not set |
| 640 | CONFIG_SERIAL_NONSTANDARD=y | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 641 | # CONFIG_COMPUTONE is not set | 687 | # CONFIG_NOZOMI is not set |
| 642 | # CONFIG_ROCKETPORT is not set | ||
| 643 | # CONFIG_CYCLADES is not set | ||
| 644 | # CONFIG_DIGIEPCA is not set | ||
| 645 | # CONFIG_MOXA_INTELLIO is not set | ||
| 646 | # CONFIG_MOXA_SMARTIO is not set | ||
| 647 | CONFIG_MOXA_SMARTIO_NEW=m | ||
| 648 | # CONFIG_ISI is not set | ||
| 649 | # CONFIG_SYNCLINKMP is not set | ||
| 650 | # CONFIG_SYNCLINK_GT is not set | ||
| 651 | # CONFIG_N_HDLC is not set | ||
| 652 | # CONFIG_SPECIALIX is not set | ||
| 653 | # CONFIG_SX is not set | ||
| 654 | # CONFIG_RIO is not set | ||
| 655 | # CONFIG_STALDRV is not set | ||
| 656 | CONFIG_SERIAL_SB1250_DUART=y | ||
| 657 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
| 658 | 688 | ||
| 659 | # | 689 | # |
| 660 | # Serial drivers | 690 | # Serial drivers |
| @@ -664,37 +694,22 @@ CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | |||
| 664 | # | 694 | # |
| 665 | # Non-8250 serial port support | 695 | # Non-8250 serial port support |
| 666 | # | 696 | # |
| 697 | CONFIG_SERIAL_SB1250_DUART=y | ||
| 698 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
| 699 | CONFIG_SERIAL_CORE=y | ||
| 700 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 667 | # CONFIG_SERIAL_JSM is not set | 701 | # CONFIG_SERIAL_JSM is not set |
| 668 | CONFIG_UNIX98_PTYS=y | 702 | CONFIG_UNIX98_PTYS=y |
| 669 | CONFIG_LEGACY_PTYS=y | 703 | CONFIG_LEGACY_PTYS=y |
| 670 | CONFIG_LEGACY_PTY_COUNT=256 | 704 | CONFIG_LEGACY_PTY_COUNT=256 |
| 671 | |||
| 672 | # | ||
| 673 | # IPMI | ||
| 674 | # | ||
| 675 | # CONFIG_IPMI_HANDLER is not set | 705 | # CONFIG_IPMI_HANDLER is not set |
| 676 | |||
| 677 | # | ||
| 678 | # Watchdog Cards | ||
| 679 | # | ||
| 680 | # CONFIG_WATCHDOG is not set | ||
| 681 | # CONFIG_HW_RANDOM is not set | 706 | # CONFIG_HW_RANDOM is not set |
| 682 | # CONFIG_RTC is not set | 707 | # CONFIG_RTC is not set |
| 683 | # CONFIG_GEN_RTC is not set | ||
| 684 | # CONFIG_DTLK is not set | ||
| 685 | # CONFIG_R3964 is not set | 708 | # CONFIG_R3964 is not set |
| 686 | # CONFIG_APPLICOM is not set | 709 | # CONFIG_APPLICOM is not set |
| 687 | # CONFIG_DRM is not set | ||
| 688 | # CONFIG_RAW_DRIVER is not set | 710 | # CONFIG_RAW_DRIVER is not set |
| 689 | |||
| 690 | # | ||
| 691 | # TPM devices | ||
| 692 | # | ||
| 693 | # CONFIG_TCG_TPM is not set | 711 | # CONFIG_TCG_TPM is not set |
| 694 | 712 | CONFIG_DEVPORT=y | |
| 695 | # | ||
| 696 | # I2C support | ||
| 697 | # | ||
| 698 | # CONFIG_I2C is not set | 713 | # CONFIG_I2C is not set |
| 699 | 714 | ||
| 700 | # | 715 | # |
| @@ -702,109 +717,139 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 702 | # | 717 | # |
| 703 | # CONFIG_SPI is not set | 718 | # CONFIG_SPI is not set |
| 704 | # CONFIG_SPI_MASTER is not set | 719 | # CONFIG_SPI_MASTER is not set |
| 720 | # CONFIG_W1 is not set | ||
| 721 | # CONFIG_POWER_SUPPLY is not set | ||
| 722 | # CONFIG_HWMON is not set | ||
| 723 | # CONFIG_THERMAL is not set | ||
| 724 | # CONFIG_WATCHDOG is not set | ||
| 705 | 725 | ||
| 706 | # | 726 | # |
| 707 | # Dallas's 1-wire bus | 727 | # Sonics Silicon Backplane |
| 708 | # | 728 | # |
| 709 | # CONFIG_W1 is not set | 729 | CONFIG_SSB_POSSIBLE=y |
| 730 | # CONFIG_SSB is not set | ||
| 710 | 731 | ||
| 711 | # | 732 | # |
| 712 | # Hardware Monitoring support | 733 | # Multifunction device drivers |
| 713 | # | 734 | # |
| 714 | # CONFIG_HWMON is not set | 735 | # CONFIG_MFD_SM501 is not set |
| 715 | # CONFIG_HWMON_VID is not set | ||
| 716 | 736 | ||
| 717 | # | 737 | # |
| 718 | # Multimedia devices | 738 | # Multimedia devices |
| 719 | # | 739 | # |
| 720 | # CONFIG_VIDEO_DEV is not set | 740 | # CONFIG_VIDEO_DEV is not set |
| 721 | 741 | # CONFIG_DVB_CORE is not set | |
| 722 | # | 742 | # CONFIG_DAB is not set |
| 723 | # Digital Video Broadcasting Devices | ||
| 724 | # | ||
| 725 | # CONFIG_DVB is not set | ||
| 726 | 743 | ||
| 727 | # | 744 | # |
| 728 | # Graphics support | 745 | # Graphics support |
| 729 | # | 746 | # |
| 730 | # CONFIG_FIRMWARE_EDID is not set | 747 | # CONFIG_DRM is not set |
| 748 | # CONFIG_VGASTATE is not set | ||
| 749 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 731 | # CONFIG_FB is not set | 750 | # CONFIG_FB is not set |
| 732 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 751 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 733 | 752 | ||
| 734 | # | 753 | # |
| 735 | # Sound | 754 | # Display device support |
| 736 | # | 755 | # |
| 737 | # CONFIG_SOUND is not set | 756 | # CONFIG_DISPLAY_SUPPORT is not set |
| 738 | 757 | ||
| 739 | # | 758 | # |
| 740 | # USB support | 759 | # Sound |
| 741 | # | 760 | # |
| 761 | # CONFIG_SOUND is not set | ||
| 762 | CONFIG_USB_SUPPORT=y | ||
| 742 | CONFIG_USB_ARCH_HAS_HCD=y | 763 | CONFIG_USB_ARCH_HAS_HCD=y |
| 743 | CONFIG_USB_ARCH_HAS_OHCI=y | 764 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 744 | CONFIG_USB_ARCH_HAS_EHCI=y | 765 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 745 | # CONFIG_USB is not set | 766 | CONFIG_USB=y |
| 746 | 767 | # CONFIG_USB_DEBUG is not set | |
| 747 | # | 768 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set |
| 748 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 749 | # | ||
| 750 | 769 | ||
| 751 | # | 770 | # |
| 752 | # USB Gadget Support | 771 | # Miscellaneous USB options |
| 753 | # | 772 | # |
| 754 | # CONFIG_USB_GADGET is not set | 773 | CONFIG_USB_DEVICEFS=y |
| 774 | CONFIG_USB_DEVICE_CLASS=y | ||
| 775 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 776 | # CONFIG_USB_SUSPEND is not set | ||
| 777 | # CONFIG_USB_PERSIST is not set | ||
| 778 | # CONFIG_USB_OTG is not set | ||
| 755 | 779 | ||
| 756 | # | 780 | # |
| 757 | # MMC/SD Card support | 781 | # USB Host Controller Drivers |
| 758 | # | 782 | # |
| 759 | # CONFIG_MMC is not set | 783 | # CONFIG_USB_EHCI_HCD is not set |
| 784 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 785 | CONFIG_USB_OHCI_HCD=y | ||
| 786 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 787 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 788 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 789 | # CONFIG_USB_UHCI_HCD is not set | ||
| 790 | # CONFIG_USB_SL811_HCD is not set | ||
| 791 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 760 | 792 | ||
| 761 | # | 793 | # |
| 762 | # LED devices | 794 | # USB Device Class drivers |
| 763 | # | 795 | # |
| 764 | # CONFIG_NEW_LEDS is not set | 796 | # CONFIG_USB_ACM is not set |
| 797 | # CONFIG_USB_PRINTER is not set | ||
| 765 | 798 | ||
| 766 | # | 799 | # |
| 767 | # LED drivers | 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 768 | # | 801 | # |
| 769 | 802 | ||
| 770 | # | 803 | # |
| 771 | # LED Triggers | 804 | # may also be needed; see USB_STORAGE Help for more information |
| 772 | # | 805 | # |
| 806 | # CONFIG_USB_LIBUSUAL is not set | ||
| 773 | 807 | ||
| 774 | # | 808 | # |
| 775 | # InfiniBand support | 809 | # USB Imaging devices |
| 776 | # | 810 | # |
| 777 | # CONFIG_INFINIBAND is not set | 811 | # CONFIG_USB_MDC800 is not set |
| 812 | CONFIG_USB_MON=y | ||
| 778 | 813 | ||
| 779 | # | 814 | # |
| 780 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 815 | # USB port drivers |
| 781 | # | 816 | # |
| 817 | # CONFIG_USB_SERIAL is not set | ||
| 782 | 818 | ||
| 783 | # | 819 | # |
| 784 | # Real Time Clock | 820 | # USB Miscellaneous drivers |
| 785 | # | 821 | # |
| 822 | # CONFIG_USB_EMI62 is not set | ||
| 823 | # CONFIG_USB_EMI26 is not set | ||
| 824 | # CONFIG_USB_ADUTUX is not set | ||
| 825 | # CONFIG_USB_AUERSWALD is not set | ||
| 826 | # CONFIG_USB_RIO500 is not set | ||
| 827 | # CONFIG_USB_LEGOTOWER is not set | ||
| 828 | # CONFIG_USB_LCD is not set | ||
| 829 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 830 | # CONFIG_USB_LED is not set | ||
| 831 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 832 | # CONFIG_USB_CYTHERM is not set | ||
| 833 | # CONFIG_USB_PHIDGET is not set | ||
| 834 | # CONFIG_USB_IDMOUSE is not set | ||
| 835 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 836 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 837 | # CONFIG_USB_LD is not set | ||
| 838 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 839 | # CONFIG_USB_IOWARRIOR is not set | ||
| 840 | # CONFIG_USB_TEST is not set | ||
| 841 | # CONFIG_USB_GADGET is not set | ||
| 842 | # CONFIG_MMC is not set | ||
| 843 | # CONFIG_MEMSTICK is not set | ||
| 844 | # CONFIG_NEW_LEDS is not set | ||
| 845 | # CONFIG_INFINIBAND is not set | ||
| 846 | CONFIG_RTC_LIB=y | ||
| 786 | # CONFIG_RTC_CLASS is not set | 847 | # CONFIG_RTC_CLASS is not set |
| 787 | 848 | ||
| 788 | # | 849 | # |
| 789 | # DMA Engine support | 850 | # Userspace I/O |
| 790 | # | ||
| 791 | # CONFIG_DMA_ENGINE is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # DMA Clients | ||
| 795 | # | ||
| 796 | |||
| 797 | # | ||
| 798 | # DMA Devices | ||
| 799 | # | ||
| 800 | |||
| 801 | # | ||
| 802 | # Auxiliary Display support | ||
| 803 | # | ||
| 804 | |||
| 805 | # | ||
| 806 | # Virtualization | ||
| 807 | # | 851 | # |
| 852 | # CONFIG_UIO is not set | ||
| 808 | 853 | ||
| 809 | # | 854 | # |
| 810 | # File systems | 855 | # File systems |
| @@ -823,15 +868,14 @@ CONFIG_FS_POSIX_ACL=y | |||
| 823 | # CONFIG_XFS_FS is not set | 868 | # CONFIG_XFS_FS is not set |
| 824 | # CONFIG_GFS2_FS is not set | 869 | # CONFIG_GFS2_FS is not set |
| 825 | # CONFIG_OCFS2_FS is not set | 870 | # CONFIG_OCFS2_FS is not set |
| 826 | # CONFIG_MINIX_FS is not set | 871 | CONFIG_DNOTIFY=y |
| 827 | # CONFIG_ROMFS_FS is not set | ||
| 828 | CONFIG_INOTIFY=y | 872 | CONFIG_INOTIFY=y |
| 829 | CONFIG_INOTIFY_USER=y | 873 | CONFIG_INOTIFY_USER=y |
| 830 | # CONFIG_QUOTA is not set | 874 | # CONFIG_QUOTA is not set |
| 831 | CONFIG_DNOTIFY=y | ||
| 832 | # CONFIG_AUTOFS_FS is not set | 875 | # CONFIG_AUTOFS_FS is not set |
| 833 | # CONFIG_AUTOFS4_FS is not set | 876 | # CONFIG_AUTOFS4_FS is not set |
| 834 | CONFIG_FUSE_FS=m | 877 | CONFIG_FUSE_FS=m |
| 878 | CONFIG_GENERIC_ACL=y | ||
| 835 | 879 | ||
| 836 | # | 880 | # |
| 837 | # CD-ROM/DVD Filesystems | 881 | # CD-ROM/DVD Filesystems |
| @@ -853,9 +897,9 @@ CONFIG_PROC_FS=y | |||
| 853 | CONFIG_PROC_KCORE=y | 897 | CONFIG_PROC_KCORE=y |
| 854 | CONFIG_PROC_SYSCTL=y | 898 | CONFIG_PROC_SYSCTL=y |
| 855 | CONFIG_SYSFS=y | 899 | CONFIG_SYSFS=y |
| 856 | # CONFIG_TMPFS is not set | 900 | CONFIG_TMPFS=y |
| 901 | CONFIG_TMPFS_POSIX_ACL=y | ||
| 857 | # CONFIG_HUGETLB_PAGE is not set | 902 | # CONFIG_HUGETLB_PAGE is not set |
| 858 | CONFIG_RAMFS=y | ||
| 859 | CONFIG_CONFIGFS_FS=m | 903 | CONFIG_CONFIGFS_FS=m |
| 860 | 904 | ||
| 861 | # | 905 | # |
| @@ -871,14 +915,13 @@ CONFIG_CONFIGFS_FS=m | |||
| 871 | # CONFIG_EFS_FS is not set | 915 | # CONFIG_EFS_FS is not set |
| 872 | # CONFIG_CRAMFS is not set | 916 | # CONFIG_CRAMFS is not set |
| 873 | # CONFIG_VXFS_FS is not set | 917 | # CONFIG_VXFS_FS is not set |
| 918 | # CONFIG_MINIX_FS is not set | ||
| 874 | # CONFIG_HPFS_FS is not set | 919 | # CONFIG_HPFS_FS is not set |
| 875 | # CONFIG_QNX4FS_FS is not set | 920 | # CONFIG_QNX4FS_FS is not set |
| 921 | # CONFIG_ROMFS_FS is not set | ||
| 876 | # CONFIG_SYSV_FS is not set | 922 | # CONFIG_SYSV_FS is not set |
| 877 | # CONFIG_UFS_FS is not set | 923 | # CONFIG_UFS_FS is not set |
| 878 | 924 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 879 | # | ||
| 880 | # Network File Systems | ||
| 881 | # | ||
| 882 | CONFIG_NFS_FS=y | 925 | CONFIG_NFS_FS=y |
| 883 | CONFIG_NFS_V3=y | 926 | CONFIG_NFS_V3=y |
| 884 | # CONFIG_NFS_V3_ACL is not set | 927 | # CONFIG_NFS_V3_ACL is not set |
| @@ -890,6 +933,7 @@ CONFIG_LOCKD=y | |||
| 890 | CONFIG_LOCKD_V4=y | 933 | CONFIG_LOCKD_V4=y |
| 891 | CONFIG_NFS_COMMON=y | 934 | CONFIG_NFS_COMMON=y |
| 892 | CONFIG_SUNRPC=y | 935 | CONFIG_SUNRPC=y |
| 936 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 893 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 937 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 894 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 938 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 895 | # CONFIG_SMB_FS is not set | 939 | # CONFIG_SMB_FS is not set |
| @@ -897,45 +941,29 @@ CONFIG_SUNRPC=y | |||
| 897 | # CONFIG_NCP_FS is not set | 941 | # CONFIG_NCP_FS is not set |
| 898 | # CONFIG_CODA_FS is not set | 942 | # CONFIG_CODA_FS is not set |
| 899 | # CONFIG_AFS_FS is not set | 943 | # CONFIG_AFS_FS is not set |
| 900 | # CONFIG_9P_FS is not set | ||
| 901 | 944 | ||
| 902 | # | 945 | # |
| 903 | # Partition Types | 946 | # Partition Types |
| 904 | # | 947 | # |
| 905 | # CONFIG_PARTITION_ADVANCED is not set | 948 | # CONFIG_PARTITION_ADVANCED is not set |
| 906 | CONFIG_MSDOS_PARTITION=y | 949 | CONFIG_MSDOS_PARTITION=y |
| 907 | |||
| 908 | # | ||
| 909 | # Native Language Support | ||
| 910 | # | ||
| 911 | # CONFIG_NLS is not set | 950 | # CONFIG_NLS is not set |
| 912 | |||
| 913 | # | ||
| 914 | # Distributed Lock Manager | ||
| 915 | # | ||
| 916 | CONFIG_DLM=m | 951 | CONFIG_DLM=m |
| 917 | CONFIG_DLM_TCP=y | ||
| 918 | # CONFIG_DLM_SCTP is not set | ||
| 919 | # CONFIG_DLM_DEBUG is not set | 952 | # CONFIG_DLM_DEBUG is not set |
| 920 | 953 | ||
| 921 | # | 954 | # |
| 922 | # Profiling support | ||
| 923 | # | ||
| 924 | # CONFIG_PROFILING is not set | ||
| 925 | |||
| 926 | # | ||
| 927 | # Kernel hacking | 955 | # Kernel hacking |
| 928 | # | 956 | # |
| 929 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 957 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 930 | # CONFIG_PRINTK_TIME is not set | 958 | # CONFIG_PRINTK_TIME is not set |
| 959 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 931 | CONFIG_ENABLE_MUST_CHECK=y | 960 | CONFIG_ENABLE_MUST_CHECK=y |
| 932 | # CONFIG_MAGIC_SYSRQ is not set | 961 | # CONFIG_MAGIC_SYSRQ is not set |
| 933 | # CONFIG_UNUSED_SYMBOLS is not set | 962 | # CONFIG_UNUSED_SYMBOLS is not set |
| 934 | # CONFIG_DEBUG_FS is not set | 963 | # CONFIG_DEBUG_FS is not set |
| 935 | # CONFIG_HEADERS_CHECK is not set | 964 | # CONFIG_HEADERS_CHECK is not set |
| 936 | # CONFIG_DEBUG_KERNEL is not set | 965 | # CONFIG_DEBUG_KERNEL is not set |
| 937 | CONFIG_LOG_BUF_SHIFT=15 | 966 | # CONFIG_SAMPLES is not set |
| 938 | CONFIG_CROSSCOMPILE=y | ||
| 939 | CONFIG_CMDLINE="" | 967 | CONFIG_CMDLINE="" |
| 940 | CONFIG_SYS_SUPPORTS_KGDB=y | 968 | CONFIG_SYS_SUPPORTS_KGDB=y |
| 941 | # CONFIG_SB1XXX_CORELIS is not set | 969 | # CONFIG_SB1XXX_CORELIS is not set |
| @@ -946,13 +974,12 @@ CONFIG_SYS_SUPPORTS_KGDB=y | |||
| 946 | CONFIG_KEYS=y | 974 | CONFIG_KEYS=y |
| 947 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 975 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 948 | # CONFIG_SECURITY is not set | 976 | # CONFIG_SECURITY is not set |
| 949 | 977 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
| 950 | # | ||
| 951 | # Cryptographic options | ||
| 952 | # | ||
| 953 | CONFIG_CRYPTO=y | 978 | CONFIG_CRYPTO=y |
| 954 | CONFIG_CRYPTO_ALGAPI=y | 979 | CONFIG_CRYPTO_ALGAPI=y |
| 980 | CONFIG_CRYPTO_AEAD=m | ||
| 955 | CONFIG_CRYPTO_BLKCIPHER=m | 981 | CONFIG_CRYPTO_BLKCIPHER=m |
| 982 | CONFIG_CRYPTO_SEQIV=m | ||
| 956 | CONFIG_CRYPTO_HASH=y | 983 | CONFIG_CRYPTO_HASH=y |
| 957 | CONFIG_CRYPTO_MANAGER=y | 984 | CONFIG_CRYPTO_MANAGER=y |
| 958 | CONFIG_CRYPTO_HMAC=y | 985 | CONFIG_CRYPTO_HMAC=y |
| @@ -970,6 +997,11 @@ CONFIG_CRYPTO_ECB=m | |||
| 970 | CONFIG_CRYPTO_CBC=m | 997 | CONFIG_CRYPTO_CBC=m |
| 971 | CONFIG_CRYPTO_PCBC=m | 998 | CONFIG_CRYPTO_PCBC=m |
| 972 | CONFIG_CRYPTO_LRW=m | 999 | CONFIG_CRYPTO_LRW=m |
| 1000 | CONFIG_CRYPTO_XTS=m | ||
| 1001 | CONFIG_CRYPTO_CTR=m | ||
| 1002 | CONFIG_CRYPTO_GCM=m | ||
| 1003 | CONFIG_CRYPTO_CCM=m | ||
| 1004 | CONFIG_CRYPTO_CRYPTD=m | ||
| 973 | CONFIG_CRYPTO_DES=m | 1005 | CONFIG_CRYPTO_DES=m |
| 974 | CONFIG_CRYPTO_FCRYPT=m | 1006 | CONFIG_CRYPTO_FCRYPT=m |
| 975 | CONFIG_CRYPTO_BLOWFISH=m | 1007 | CONFIG_CRYPTO_BLOWFISH=m |
| @@ -983,15 +1015,16 @@ CONFIG_CRYPTO_TEA=m | |||
| 983 | CONFIG_CRYPTO_ARC4=m | 1015 | CONFIG_CRYPTO_ARC4=m |
| 984 | CONFIG_CRYPTO_KHAZAD=m | 1016 | CONFIG_CRYPTO_KHAZAD=m |
| 985 | CONFIG_CRYPTO_ANUBIS=m | 1017 | CONFIG_CRYPTO_ANUBIS=m |
| 1018 | CONFIG_CRYPTO_SEED=m | ||
| 1019 | CONFIG_CRYPTO_SALSA20=m | ||
| 986 | CONFIG_CRYPTO_DEFLATE=m | 1020 | CONFIG_CRYPTO_DEFLATE=m |
| 987 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1021 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 988 | CONFIG_CRYPTO_CRC32C=m | 1022 | CONFIG_CRYPTO_CRC32C=m |
| 989 | CONFIG_CRYPTO_CAMELLIA=m | 1023 | CONFIG_CRYPTO_CAMELLIA=m |
| 990 | # CONFIG_CRYPTO_TEST is not set | 1024 | # CONFIG_CRYPTO_TEST is not set |
| 991 | 1025 | CONFIG_CRYPTO_AUTHENC=m | |
| 992 | # | 1026 | CONFIG_CRYPTO_LZO=m |
| 993 | # Hardware crypto devices | 1027 | # CONFIG_CRYPTO_HW is not set |
| 994 | # | ||
| 995 | 1028 | ||
| 996 | # | 1029 | # |
| 997 | # Library routines | 1030 | # Library routines |
| @@ -999,10 +1032,15 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
| 999 | CONFIG_BITREVERSE=y | 1032 | CONFIG_BITREVERSE=y |
| 1000 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1001 | CONFIG_CRC16=m | 1034 | CONFIG_CRC16=m |
| 1035 | # CONFIG_CRC_ITU_T is not set | ||
| 1002 | CONFIG_CRC32=y | 1036 | CONFIG_CRC32=y |
| 1037 | # CONFIG_CRC7 is not set | ||
| 1003 | CONFIG_LIBCRC32C=m | 1038 | CONFIG_LIBCRC32C=m |
| 1004 | CONFIG_ZLIB_INFLATE=m | 1039 | CONFIG_ZLIB_INFLATE=m |
| 1005 | CONFIG_ZLIB_DEFLATE=m | 1040 | CONFIG_ZLIB_DEFLATE=m |
| 1041 | CONFIG_LZO_COMPRESS=m | ||
| 1042 | CONFIG_LZO_DECOMPRESS=m | ||
| 1006 | CONFIG_PLIST=y | 1043 | CONFIG_PLIST=y |
| 1007 | CONFIG_HAS_IOMEM=y | 1044 | CONFIG_HAS_IOMEM=y |
| 1008 | CONFIG_HAS_IOPORT=y | 1045 | CONFIG_HAS_IOPORT=y |
| 1046 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig index af82e1a1823c..8dd3ae39bcad 100644 --- a/arch/mips/configs/tb0219_defconfig +++ b/arch/mips/configs/tb0219_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Wed Aug 8 16:11:47 2007 | 4 | # Mon May 12 11:54:51 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,23 +171,29 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| 168 | CONFIG_EMBEDDED=y | 186 | CONFIG_EMBEDDED=y |
| 169 | CONFIG_SYSCTL_SYSCALL=y | 187 | CONFIG_SYSCTL_SYSCALL=y |
| 188 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 170 | CONFIG_KALLSYMS=y | 189 | CONFIG_KALLSYMS=y |
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 190 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 172 | CONFIG_HOTPLUG=y | 191 | CONFIG_HOTPLUG=y |
| 173 | CONFIG_PRINTK=y | 192 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 193 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 194 | CONFIG_ELF_CORE=y |
| 195 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 196 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 197 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 198 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 199 | CONFIG_ANON_INODES=y |
| @@ -185,10 +206,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 206 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 207 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 208 | # CONFIG_SLOB is not set |
| 209 | # CONFIG_PROFILING is not set | ||
| 210 | # CONFIG_MARKERS is not set | ||
| 211 | CONFIG_HAVE_OPROFILE=y | ||
| 212 | # CONFIG_HAVE_KPROBES is not set | ||
| 213 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 214 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 215 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 216 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 217 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 218 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 219 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 220 | CONFIG_MODULES=y |
| 221 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 222 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 223 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 224 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +242,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 242 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 243 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 244 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 245 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 246 | ||
| 216 | # | 247 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 248 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 249 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 250 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 251 | CONFIG_PCI=y |
| 252 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 253 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 254 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 256 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 257 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 258 | ||
| @@ -237,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 266 | # |
| 238 | # Power management options | 267 | # Power management options |
| 239 | # | 268 | # |
| 269 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 270 | # CONFIG_PM is not set |
| 241 | 271 | ||
| 242 | # | 272 | # |
| @@ -278,6 +308,7 @@ CONFIG_INET_TUNNEL=m | |||
| 278 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 308 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 279 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 309 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 280 | # CONFIG_INET_XFRM_MODE_BEET is not set | 310 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 311 | # CONFIG_INET_LRO is not set | ||
| 281 | CONFIG_INET_DIAG=y | 312 | CONFIG_INET_DIAG=y |
| 282 | CONFIG_INET_TCP_DIAG=y | 313 | CONFIG_INET_TCP_DIAG=y |
| 283 | # CONFIG_TCP_CONG_ADVANCED is not set | 314 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -285,15 +316,10 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 285 | CONFIG_DEFAULT_TCP_CONG="cubic" | 316 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 286 | # CONFIG_TCP_MD5SIG is not set | 317 | # CONFIG_TCP_MD5SIG is not set |
| 287 | # CONFIG_IPV6 is not set | 318 | # CONFIG_IPV6 is not set |
| 288 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 289 | # CONFIG_INET6_TUNNEL is not set | ||
| 290 | CONFIG_NETWORK_SECMARK=y | 319 | CONFIG_NETWORK_SECMARK=y |
| 291 | # CONFIG_NETFILTER is not set | 320 | # CONFIG_NETFILTER is not set |
| 292 | # CONFIG_IP_DCCP is not set | 321 | # CONFIG_IP_DCCP is not set |
| 293 | # CONFIG_IP_SCTP is not set | 322 | # CONFIG_IP_SCTP is not set |
| 294 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 295 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 296 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
| 297 | # CONFIG_TIPC is not set | 323 | # CONFIG_TIPC is not set |
| 298 | # CONFIG_ATM is not set | 324 | # CONFIG_ATM is not set |
| 299 | # CONFIG_BRIDGE is not set | 325 | # CONFIG_BRIDGE is not set |
| @@ -306,10 +332,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 306 | # CONFIG_LAPB is not set | 332 | # CONFIG_LAPB is not set |
| 307 | # CONFIG_ECONET is not set | 333 | # CONFIG_ECONET is not set |
| 308 | # CONFIG_WAN_ROUTER is not set | 334 | # CONFIG_WAN_ROUTER is not set |
| 309 | |||
| 310 | # | ||
| 311 | # QoS and/or fair queueing | ||
| 312 | # | ||
| 313 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
| 314 | 336 | ||
| 315 | # | 337 | # |
| @@ -317,6 +339,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 317 | # | 339 | # |
| 318 | # CONFIG_NET_PKTGEN is not set | 340 | # CONFIG_NET_PKTGEN is not set |
| 319 | # CONFIG_HAMRADIO is not set | 341 | # CONFIG_HAMRADIO is not set |
| 342 | # CONFIG_CAN is not set | ||
| 320 | # CONFIG_IRDA is not set | 343 | # CONFIG_IRDA is not set |
| 321 | # CONFIG_BT is not set | 344 | # CONFIG_BT is not set |
| 322 | # CONFIG_AF_RXRPC is not set | 345 | # CONFIG_AF_RXRPC is not set |
| @@ -339,6 +362,7 @@ CONFIG_FIB_RULES=y | |||
| 339 | # | 362 | # |
| 340 | # Generic Driver Options | 363 | # Generic Driver Options |
| 341 | # | 364 | # |
| 365 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 342 | CONFIG_STANDALONE=y | 366 | CONFIG_STANDALONE=y |
| 343 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 367 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 344 | CONFIG_FW_LOADER=m | 368 | CONFIG_FW_LOADER=m |
| @@ -360,10 +384,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 360 | CONFIG_BLK_DEV_RAM=y | 384 | CONFIG_BLK_DEV_RAM=y |
| 361 | CONFIG_BLK_DEV_RAM_COUNT=16 | 385 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 362 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 386 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 363 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 387 | CONFIG_BLK_DEV_XIP=y |
| 364 | # CONFIG_CDROM_PKTCDVD is not set | 388 | # CONFIG_CDROM_PKTCDVD is not set |
| 365 | # CONFIG_ATA_OVER_ETH is not set | 389 | # CONFIG_ATA_OVER_ETH is not set |
| 366 | # CONFIG_MISC_DEVICES is not set | 390 | # CONFIG_MISC_DEVICES is not set |
| 391 | CONFIG_HAVE_IDE=y | ||
| 367 | # CONFIG_IDE is not set | 392 | # CONFIG_IDE is not set |
| 368 | 393 | ||
| 369 | # | 394 | # |
| @@ -375,10 +400,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 375 | # CONFIG_SCSI_NETLINK is not set | 400 | # CONFIG_SCSI_NETLINK is not set |
| 376 | # CONFIG_ATA is not set | 401 | # CONFIG_ATA is not set |
| 377 | # CONFIG_MD is not set | 402 | # CONFIG_MD is not set |
| 378 | |||
| 379 | # | ||
| 380 | # Fusion MPT device support | ||
| 381 | # | ||
| 382 | # CONFIG_FUSION is not set | 403 | # CONFIG_FUSION is not set |
| 383 | 404 | ||
| 384 | # | 405 | # |
| @@ -394,6 +415,7 @@ CONFIG_NETDEVICES=y | |||
| 394 | # CONFIG_MACVLAN is not set | 415 | # CONFIG_MACVLAN is not set |
| 395 | # CONFIG_EQUALIZER is not set | 416 | # CONFIG_EQUALIZER is not set |
| 396 | # CONFIG_TUN is not set | 417 | # CONFIG_TUN is not set |
| 418 | # CONFIG_VETH is not set | ||
| 397 | # CONFIG_ARCNET is not set | 419 | # CONFIG_ARCNET is not set |
| 398 | CONFIG_PHYLIB=m | 420 | CONFIG_PHYLIB=m |
| 399 | 421 | ||
| @@ -409,7 +431,8 @@ CONFIG_VITESSE_PHY=m | |||
| 409 | CONFIG_SMSC_PHY=m | 431 | CONFIG_SMSC_PHY=m |
| 410 | # CONFIG_BROADCOM_PHY is not set | 432 | # CONFIG_BROADCOM_PHY is not set |
| 411 | # CONFIG_ICPLUS_PHY is not set | 433 | # CONFIG_ICPLUS_PHY is not set |
| 412 | # CONFIG_FIXED_PHY is not set | 434 | # CONFIG_REALTEK_PHY is not set |
| 435 | # CONFIG_MDIO_BITBANG is not set | ||
| 413 | CONFIG_NET_ETHERNET=y | 436 | CONFIG_NET_ETHERNET=y |
| 414 | CONFIG_MII=y | 437 | CONFIG_MII=y |
| 415 | # CONFIG_AX88796 is not set | 438 | # CONFIG_AX88796 is not set |
| @@ -420,6 +443,10 @@ CONFIG_MII=y | |||
| 420 | # CONFIG_DM9000 is not set | 443 | # CONFIG_DM9000 is not set |
| 421 | # CONFIG_NET_TULIP is not set | 444 | # CONFIG_NET_TULIP is not set |
| 422 | # CONFIG_HP100 is not set | 445 | # CONFIG_HP100 is not set |
| 446 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 447 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 448 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 449 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 423 | CONFIG_NET_PCI=y | 450 | CONFIG_NET_PCI=y |
| 424 | # CONFIG_PCNET32 is not set | 451 | # CONFIG_PCNET32 is not set |
| 425 | # CONFIG_AMD8111_ETH is not set | 452 | # CONFIG_AMD8111_ETH is not set |
| @@ -427,7 +454,6 @@ CONFIG_NET_PCI=y | |||
| 427 | # CONFIG_B44 is not set | 454 | # CONFIG_B44 is not set |
| 428 | # CONFIG_FORCEDETH is not set | 455 | # CONFIG_FORCEDETH is not set |
| 429 | # CONFIG_TC35815 is not set | 456 | # CONFIG_TC35815 is not set |
| 430 | # CONFIG_DGRS is not set | ||
| 431 | # CONFIG_EEPRO100 is not set | 457 | # CONFIG_EEPRO100 is not set |
| 432 | # CONFIG_E100 is not set | 458 | # CONFIG_E100 is not set |
| 433 | # CONFIG_FEALNX is not set | 459 | # CONFIG_FEALNX is not set |
| @@ -439,6 +465,7 @@ CONFIG_8139TOO_PIO=y | |||
| 439 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 465 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 440 | # CONFIG_8139TOO_8129 is not set | 466 | # CONFIG_8139TOO_8129 is not set |
| 441 | # CONFIG_8139_OLD_RX_RESET is not set | 467 | # CONFIG_8139_OLD_RX_RESET is not set |
| 468 | # CONFIG_R6040 is not set | ||
| 442 | # CONFIG_SIS900 is not set | 469 | # CONFIG_SIS900 is not set |
| 443 | # CONFIG_EPIC100 is not set | 470 | # CONFIG_EPIC100 is not set |
| 444 | # CONFIG_SUNDANCE is not set | 471 | # CONFIG_SUNDANCE is not set |
| @@ -451,6 +478,10 @@ CONFIG_NETDEV_1000=y | |||
| 451 | # CONFIG_ACENIC is not set | 478 | # CONFIG_ACENIC is not set |
| 452 | # CONFIG_DL2K is not set | 479 | # CONFIG_DL2K is not set |
| 453 | # CONFIG_E1000 is not set | 480 | # CONFIG_E1000 is not set |
| 481 | # CONFIG_E1000E is not set | ||
| 482 | # CONFIG_E1000E_ENABLED is not set | ||
| 483 | # CONFIG_IP1000 is not set | ||
| 484 | # CONFIG_IGB is not set | ||
| 454 | # CONFIG_NS83820 is not set | 485 | # CONFIG_NS83820 is not set |
| 455 | # CONFIG_HAMACHI is not set | 486 | # CONFIG_HAMACHI is not set |
| 456 | # CONFIG_YELLOWFIN is not set | 487 | # CONFIG_YELLOWFIN is not set |
| @@ -472,6 +503,7 @@ CONFIG_VIA_VELOCITY=y | |||
| 472 | # | 503 | # |
| 473 | # CONFIG_WLAN_PRE80211 is not set | 504 | # CONFIG_WLAN_PRE80211 is not set |
| 474 | # CONFIG_WLAN_80211 is not set | 505 | # CONFIG_WLAN_80211 is not set |
| 506 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 475 | 507 | ||
| 476 | # | 508 | # |
| 477 | # USB Network Adapters | 509 | # USB Network Adapters |
| @@ -480,14 +512,12 @@ CONFIG_VIA_VELOCITY=y | |||
| 480 | # CONFIG_USB_KAWETH is not set | 512 | # CONFIG_USB_KAWETH is not set |
| 481 | # CONFIG_USB_PEGASUS is not set | 513 | # CONFIG_USB_PEGASUS is not set |
| 482 | # CONFIG_USB_RTL8150 is not set | 514 | # CONFIG_USB_RTL8150 is not set |
| 483 | # CONFIG_USB_USBNET_MII is not set | ||
| 484 | # CONFIG_USB_USBNET is not set | 515 | # CONFIG_USB_USBNET is not set |
| 485 | # CONFIG_WAN is not set | 516 | # CONFIG_WAN is not set |
| 486 | # CONFIG_FDDI is not set | 517 | # CONFIG_FDDI is not set |
| 487 | # CONFIG_HIPPI is not set | 518 | # CONFIG_HIPPI is not set |
| 488 | # CONFIG_PPP is not set | 519 | # CONFIG_PPP is not set |
| 489 | # CONFIG_SLIP is not set | 520 | # CONFIG_SLIP is not set |
| 490 | # CONFIG_SHAPER is not set | ||
| 491 | # CONFIG_NETCONSOLE is not set | 521 | # CONFIG_NETCONSOLE is not set |
| 492 | # CONFIG_NETPOLL is not set | 522 | # CONFIG_NETPOLL is not set |
| 493 | # CONFIG_NET_POLL_CONTROLLER is not set | 523 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -506,7 +536,6 @@ CONFIG_INPUT=y | |||
| 506 | # | 536 | # |
| 507 | # CONFIG_INPUT_MOUSEDEV is not set | 537 | # CONFIG_INPUT_MOUSEDEV is not set |
| 508 | # CONFIG_INPUT_JOYDEV is not set | 538 | # CONFIG_INPUT_JOYDEV is not set |
| 509 | # CONFIG_INPUT_TSDEV is not set | ||
| 510 | # CONFIG_INPUT_EVDEV is not set | 539 | # CONFIG_INPUT_EVDEV is not set |
| 511 | # CONFIG_INPUT_EVBUG is not set | 540 | # CONFIG_INPUT_EVBUG is not set |
| 512 | 541 | ||
| @@ -533,7 +562,9 @@ CONFIG_VT=y | |||
| 533 | CONFIG_VT_CONSOLE=y | 562 | CONFIG_VT_CONSOLE=y |
| 534 | CONFIG_HW_CONSOLE=y | 563 | CONFIG_HW_CONSOLE=y |
| 535 | CONFIG_VT_HW_CONSOLE_BINDING=y | 564 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 565 | # CONFIG_DEVKMEM is not set | ||
| 536 | # CONFIG_SERIAL_NONSTANDARD is not set | 566 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 567 | # CONFIG_NOZOMI is not set | ||
| 537 | 568 | ||
| 538 | # | 569 | # |
| 539 | # Serial drivers | 570 | # Serial drivers |
| @@ -552,52 +583,62 @@ CONFIG_UNIX98_PTYS=y | |||
| 552 | CONFIG_LEGACY_PTYS=y | 583 | CONFIG_LEGACY_PTYS=y |
| 553 | CONFIG_LEGACY_PTY_COUNT=256 | 584 | CONFIG_LEGACY_PTY_COUNT=256 |
| 554 | # CONFIG_IPMI_HANDLER is not set | 585 | # CONFIG_IPMI_HANDLER is not set |
| 555 | # CONFIG_WATCHDOG is not set | ||
| 556 | # CONFIG_HW_RANDOM is not set | 586 | # CONFIG_HW_RANDOM is not set |
| 557 | # CONFIG_RTC is not set | ||
| 558 | # CONFIG_R3964 is not set | 587 | # CONFIG_R3964 is not set |
| 559 | # CONFIG_APPLICOM is not set | 588 | # CONFIG_APPLICOM is not set |
| 560 | CONFIG_GPIO_TB0219=y | 589 | CONFIG_GPIO_TB0219=y |
| 561 | # CONFIG_DRM is not set | ||
| 562 | CONFIG_GPIO_VR41XX=y | 590 | CONFIG_GPIO_VR41XX=y |
| 563 | # CONFIG_RAW_DRIVER is not set | 591 | # CONFIG_RAW_DRIVER is not set |
| 564 | # CONFIG_TCG_TPM is not set | 592 | # CONFIG_TCG_TPM is not set |
| 565 | CONFIG_DEVPORT=y | 593 | CONFIG_DEVPORT=y |
| 566 | # CONFIG_I2C is not set | 594 | # CONFIG_I2C is not set |
| 567 | |||
| 568 | # | ||
| 569 | # SPI support | ||
| 570 | # | ||
| 571 | # CONFIG_SPI is not set | 595 | # CONFIG_SPI is not set |
| 572 | # CONFIG_SPI_MASTER is not set | ||
| 573 | # CONFIG_W1 is not set | 596 | # CONFIG_W1 is not set |
| 574 | # CONFIG_POWER_SUPPLY is not set | 597 | # CONFIG_POWER_SUPPLY is not set |
| 575 | # CONFIG_HWMON is not set | 598 | # CONFIG_HWMON is not set |
| 599 | # CONFIG_THERMAL is not set | ||
| 600 | # CONFIG_WATCHDOG is not set | ||
| 601 | |||
| 602 | # | ||
| 603 | # Sonics Silicon Backplane | ||
| 604 | # | ||
| 605 | CONFIG_SSB_POSSIBLE=y | ||
| 606 | # CONFIG_SSB is not set | ||
| 576 | 607 | ||
| 577 | # | 608 | # |
| 578 | # Multifunction device drivers | 609 | # Multifunction device drivers |
| 579 | # | 610 | # |
| 580 | # CONFIG_MFD_SM501 is not set | 611 | # CONFIG_MFD_SM501 is not set |
| 612 | # CONFIG_HTC_PASIC3 is not set | ||
| 581 | 613 | ||
| 582 | # | 614 | # |
| 583 | # Multimedia devices | 615 | # Multimedia devices |
| 584 | # | 616 | # |
| 617 | |||
| 618 | # | ||
| 619 | # Multimedia core support | ||
| 620 | # | ||
| 585 | # CONFIG_VIDEO_DEV is not set | 621 | # CONFIG_VIDEO_DEV is not set |
| 586 | # CONFIG_DVB_CORE is not set | 622 | # CONFIG_DVB_CORE is not set |
| 623 | |||
| 624 | # | ||
| 625 | # Multimedia drivers | ||
| 626 | # | ||
| 587 | # CONFIG_DAB is not set | 627 | # CONFIG_DAB is not set |
| 588 | 628 | ||
| 589 | # | 629 | # |
| 590 | # Graphics support | 630 | # Graphics support |
| 591 | # | 631 | # |
| 632 | # CONFIG_DRM is not set | ||
| 633 | # CONFIG_VGASTATE is not set | ||
| 634 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 635 | # CONFIG_FB is not set | ||
| 592 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 636 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 593 | 637 | ||
| 594 | # | 638 | # |
| 595 | # Display device support | 639 | # Display device support |
| 596 | # | 640 | # |
| 597 | # CONFIG_DISPLAY_SUPPORT is not set | 641 | # CONFIG_DISPLAY_SUPPORT is not set |
| 598 | # CONFIG_VGASTATE is not set | ||
| 599 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 600 | # CONFIG_FB is not set | ||
| 601 | 642 | ||
| 602 | # | 643 | # |
| 603 | # Console display driver support | 644 | # Console display driver support |
| @@ -616,6 +657,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 616 | CONFIG_USB_ARCH_HAS_EHCI=y | 657 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 617 | CONFIG_USB=m | 658 | CONFIG_USB=m |
| 618 | # CONFIG_USB_DEBUG is not set | 659 | # CONFIG_USB_DEBUG is not set |
| 660 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 619 | 661 | ||
| 620 | # | 662 | # |
| 621 | # Miscellaneous USB options | 663 | # Miscellaneous USB options |
| @@ -624,15 +666,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 624 | CONFIG_USB_DEVICE_CLASS=y | 666 | CONFIG_USB_DEVICE_CLASS=y |
| 625 | # CONFIG_USB_DYNAMIC_MINORS is not set | 667 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 626 | # CONFIG_USB_OTG is not set | 668 | # CONFIG_USB_OTG is not set |
| 669 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 670 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 627 | 671 | ||
| 628 | # | 672 | # |
| 629 | # USB Host Controller Drivers | 673 | # USB Host Controller Drivers |
| 630 | # | 674 | # |
| 675 | # CONFIG_USB_C67X00_HCD is not set | ||
| 631 | CONFIG_USB_EHCI_HCD=m | 676 | CONFIG_USB_EHCI_HCD=m |
| 632 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 633 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 677 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 634 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 678 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 635 | # CONFIG_USB_ISP116X_HCD is not set | 679 | # CONFIG_USB_ISP116X_HCD is not set |
| 680 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 636 | CONFIG_USB_OHCI_HCD=m | 681 | CONFIG_USB_OHCI_HCD=m |
| 637 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 682 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 638 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 683 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -665,10 +710,6 @@ CONFIG_USB_MON=y | |||
| 665 | # | 710 | # |
| 666 | # USB port drivers | 711 | # USB port drivers |
| 667 | # | 712 | # |
| 668 | |||
| 669 | # | ||
| 670 | # USB Serial Converter support | ||
| 671 | # | ||
| 672 | # CONFIG_USB_SERIAL is not set | 713 | # CONFIG_USB_SERIAL is not set |
| 673 | 714 | ||
| 674 | # | 715 | # |
| @@ -694,17 +735,11 @@ CONFIG_USB_MON=y | |||
| 694 | # CONFIG_USB_TRANCEVIBRATOR is not set | 735 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 695 | # CONFIG_USB_IOWARRIOR is not set | 736 | # CONFIG_USB_IOWARRIOR is not set |
| 696 | # CONFIG_USB_TEST is not set | 737 | # CONFIG_USB_TEST is not set |
| 697 | |||
| 698 | # | ||
| 699 | # USB DSL modem support | ||
| 700 | # | ||
| 701 | |||
| 702 | # | ||
| 703 | # USB Gadget Support | ||
| 704 | # | ||
| 705 | # CONFIG_USB_GADGET is not set | 738 | # CONFIG_USB_GADGET is not set |
| 706 | # CONFIG_MMC is not set | 739 | # CONFIG_MMC is not set |
| 740 | # CONFIG_MEMSTICK is not set | ||
| 707 | # CONFIG_NEW_LEDS is not set | 741 | # CONFIG_NEW_LEDS is not set |
| 742 | # CONFIG_ACCESSIBILITY is not set | ||
| 708 | # CONFIG_INFINIBAND is not set | 743 | # CONFIG_INFINIBAND is not set |
| 709 | CONFIG_RTC_LIB=y | 744 | CONFIG_RTC_LIB=y |
| 710 | CONFIG_RTC_CLASS=y | 745 | CONFIG_RTC_CLASS=y |
| @@ -729,9 +764,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 729 | # Platform RTC drivers | 764 | # Platform RTC drivers |
| 730 | # | 765 | # |
| 731 | # CONFIG_RTC_DRV_CMOS is not set | 766 | # CONFIG_RTC_DRV_CMOS is not set |
| 767 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 732 | # CONFIG_RTC_DRV_DS1553 is not set | 768 | # CONFIG_RTC_DRV_DS1553 is not set |
| 733 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 734 | # CONFIG_RTC_DRV_DS1742 is not set | 769 | # CONFIG_RTC_DRV_DS1742 is not set |
| 770 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 735 | # CONFIG_RTC_DRV_M48T86 is not set | 771 | # CONFIG_RTC_DRV_M48T86 is not set |
| 736 | # CONFIG_RTC_DRV_M48T59 is not set | 772 | # CONFIG_RTC_DRV_M48T59 is not set |
| 737 | # CONFIG_RTC_DRV_V3020 is not set | 773 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -740,23 +776,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 740 | # on-CPU RTC drivers | 776 | # on-CPU RTC drivers |
| 741 | # | 777 | # |
| 742 | CONFIG_RTC_DRV_VR41XX=y | 778 | CONFIG_RTC_DRV_VR41XX=y |
| 743 | |||
| 744 | # | ||
| 745 | # DMA Engine support | ||
| 746 | # | ||
| 747 | # CONFIG_DMA_ENGINE is not set | ||
| 748 | |||
| 749 | # | ||
| 750 | # DMA Clients | ||
| 751 | # | ||
| 752 | |||
| 753 | # | ||
| 754 | # DMA Devices | ||
| 755 | # | ||
| 756 | |||
| 757 | # | ||
| 758 | # Userspace I/O | ||
| 759 | # | ||
| 760 | # CONFIG_UIO is not set | 779 | # CONFIG_UIO is not set |
| 761 | 780 | ||
| 762 | # | 781 | # |
| @@ -771,20 +790,16 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 771 | # CONFIG_EXT3_FS_SECURITY is not set | 790 | # CONFIG_EXT3_FS_SECURITY is not set |
| 772 | # CONFIG_EXT4DEV_FS is not set | 791 | # CONFIG_EXT4DEV_FS is not set |
| 773 | CONFIG_JBD=y | 792 | CONFIG_JBD=y |
| 774 | # CONFIG_JBD_DEBUG is not set | ||
| 775 | CONFIG_FS_MBCACHE=y | 793 | CONFIG_FS_MBCACHE=y |
| 776 | # CONFIG_REISERFS_FS is not set | 794 | # CONFIG_REISERFS_FS is not set |
| 777 | # CONFIG_JFS_FS is not set | 795 | # CONFIG_JFS_FS is not set |
| 778 | CONFIG_FS_POSIX_ACL=y | 796 | CONFIG_FS_POSIX_ACL=y |
| 779 | # CONFIG_XFS_FS is not set | 797 | # CONFIG_XFS_FS is not set |
| 780 | # CONFIG_GFS2_FS is not set | ||
| 781 | # CONFIG_OCFS2_FS is not set | 798 | # CONFIG_OCFS2_FS is not set |
| 782 | # CONFIG_MINIX_FS is not set | 799 | CONFIG_DNOTIFY=y |
| 783 | CONFIG_ROMFS_FS=m | ||
| 784 | CONFIG_INOTIFY=y | 800 | CONFIG_INOTIFY=y |
| 785 | CONFIG_INOTIFY_USER=y | 801 | CONFIG_INOTIFY_USER=y |
| 786 | # CONFIG_QUOTA is not set | 802 | # CONFIG_QUOTA is not set |
| 787 | CONFIG_DNOTIFY=y | ||
| 788 | # CONFIG_AUTOFS_FS is not set | 803 | # CONFIG_AUTOFS_FS is not set |
| 789 | CONFIG_AUTOFS4_FS=y | 804 | CONFIG_AUTOFS4_FS=y |
| 790 | # CONFIG_FUSE_FS is not set | 805 | # CONFIG_FUSE_FS is not set |
| @@ -813,7 +828,6 @@ CONFIG_SYSFS=y | |||
| 813 | CONFIG_TMPFS=y | 828 | CONFIG_TMPFS=y |
| 814 | CONFIG_TMPFS_POSIX_ACL=y | 829 | CONFIG_TMPFS_POSIX_ACL=y |
| 815 | # CONFIG_HUGETLB_PAGE is not set | 830 | # CONFIG_HUGETLB_PAGE is not set |
| 816 | CONFIG_RAMFS=y | ||
| 817 | # CONFIG_CONFIGFS_FS is not set | 831 | # CONFIG_CONFIGFS_FS is not set |
| 818 | 832 | ||
| 819 | # | 833 | # |
| @@ -828,24 +842,21 @@ CONFIG_RAMFS=y | |||
| 828 | # CONFIG_EFS_FS is not set | 842 | # CONFIG_EFS_FS is not set |
| 829 | CONFIG_CRAMFS=m | 843 | CONFIG_CRAMFS=m |
| 830 | # CONFIG_VXFS_FS is not set | 844 | # CONFIG_VXFS_FS is not set |
| 845 | # CONFIG_MINIX_FS is not set | ||
| 831 | # CONFIG_HPFS_FS is not set | 846 | # CONFIG_HPFS_FS is not set |
| 832 | # CONFIG_QNX4FS_FS is not set | 847 | # CONFIG_QNX4FS_FS is not set |
| 848 | CONFIG_ROMFS_FS=m | ||
| 833 | # CONFIG_SYSV_FS is not set | 849 | # CONFIG_SYSV_FS is not set |
| 834 | # CONFIG_UFS_FS is not set | 850 | # CONFIG_UFS_FS is not set |
| 835 | 851 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 836 | # | ||
| 837 | # Network File Systems | ||
| 838 | # | ||
| 839 | CONFIG_NFS_FS=y | 852 | CONFIG_NFS_FS=y |
| 840 | CONFIG_NFS_V3=y | 853 | CONFIG_NFS_V3=y |
| 841 | # CONFIG_NFS_V3_ACL is not set | 854 | # CONFIG_NFS_V3_ACL is not set |
| 842 | # CONFIG_NFS_V4 is not set | 855 | # CONFIG_NFS_V4 is not set |
| 843 | # CONFIG_NFS_DIRECTIO is not set | ||
| 844 | CONFIG_NFSD=y | 856 | CONFIG_NFSD=y |
| 845 | CONFIG_NFSD_V3=y | 857 | CONFIG_NFSD_V3=y |
| 846 | # CONFIG_NFSD_V3_ACL is not set | 858 | # CONFIG_NFSD_V3_ACL is not set |
| 847 | # CONFIG_NFSD_V4 is not set | 859 | # CONFIG_NFSD_V4 is not set |
| 848 | CONFIG_NFSD_TCP=y | ||
| 849 | CONFIG_ROOT_NFS=y | 860 | CONFIG_ROOT_NFS=y |
| 850 | CONFIG_LOCKD=y | 861 | CONFIG_LOCKD=y |
| 851 | CONFIG_LOCKD_V4=y | 862 | CONFIG_LOCKD_V4=y |
| @@ -866,47 +877,38 @@ CONFIG_SUNRPC=y | |||
| 866 | # | 877 | # |
| 867 | # CONFIG_PARTITION_ADVANCED is not set | 878 | # CONFIG_PARTITION_ADVANCED is not set |
| 868 | CONFIG_MSDOS_PARTITION=y | 879 | CONFIG_MSDOS_PARTITION=y |
| 869 | |||
| 870 | # | ||
| 871 | # Native Language Support | ||
| 872 | # | ||
| 873 | # CONFIG_NLS is not set | 880 | # CONFIG_NLS is not set |
| 874 | |||
| 875 | # | ||
| 876 | # Distributed Lock Manager | ||
| 877 | # | ||
| 878 | # CONFIG_DLM is not set | 881 | # CONFIG_DLM is not set |
| 879 | 882 | ||
| 880 | # | 883 | # |
| 881 | # Profiling support | ||
| 882 | # | ||
| 883 | # CONFIG_PROFILING is not set | ||
| 884 | |||
| 885 | # | ||
| 886 | # Kernel hacking | 884 | # Kernel hacking |
| 887 | # | 885 | # |
| 888 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 886 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 889 | # CONFIG_PRINTK_TIME is not set | 887 | # CONFIG_PRINTK_TIME is not set |
| 888 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 890 | CONFIG_ENABLE_MUST_CHECK=y | 889 | CONFIG_ENABLE_MUST_CHECK=y |
| 890 | CONFIG_FRAME_WARN=1024 | ||
| 891 | # CONFIG_MAGIC_SYSRQ is not set | 891 | # CONFIG_MAGIC_SYSRQ is not set |
| 892 | # CONFIG_UNUSED_SYMBOLS is not set | 892 | # CONFIG_UNUSED_SYMBOLS is not set |
| 893 | # CONFIG_DEBUG_FS is not set | 893 | # CONFIG_DEBUG_FS is not set |
| 894 | # CONFIG_HEADERS_CHECK is not set | 894 | # CONFIG_HEADERS_CHECK is not set |
| 895 | # CONFIG_DEBUG_KERNEL is not set | 895 | # CONFIG_DEBUG_KERNEL is not set |
| 896 | CONFIG_CROSSCOMPILE=y | 896 | # CONFIG_SAMPLES is not set |
| 897 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 897 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 898 | 898 | ||
| 899 | # | 899 | # |
| 900 | # Security options | 900 | # Security options |
| 901 | # | 901 | # |
| 902 | # CONFIG_KEYS is not set | 902 | # CONFIG_KEYS is not set |
| 903 | # CONFIG_SECURITY is not set | 903 | # CONFIG_SECURITY is not set |
| 904 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 904 | # CONFIG_CRYPTO is not set | 905 | # CONFIG_CRYPTO is not set |
| 905 | 906 | ||
| 906 | # | 907 | # |
| 907 | # Library routines | 908 | # Library routines |
| 908 | # | 909 | # |
| 909 | CONFIG_BITREVERSE=y | 910 | CONFIG_BITREVERSE=y |
| 911 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 910 | CONFIG_CRC_CCITT=y | 912 | CONFIG_CRC_CCITT=y |
| 911 | # CONFIG_CRC16 is not set | 913 | # CONFIG_CRC16 is not set |
| 912 | # CONFIG_CRC_ITU_T is not set | 914 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index a95385b24546..2ba240e897c6 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Thu Aug 9 11:16:55 2007 | 4 | # Mon May 12 11:53:54 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,23 +171,29 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| 168 | CONFIG_EMBEDDED=y | 186 | CONFIG_EMBEDDED=y |
| 169 | CONFIG_SYSCTL_SYSCALL=y | 187 | CONFIG_SYSCTL_SYSCALL=y |
| 188 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 170 | CONFIG_KALLSYMS=y | 189 | CONFIG_KALLSYMS=y |
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 190 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 172 | CONFIG_HOTPLUG=y | 191 | CONFIG_HOTPLUG=y |
| 173 | CONFIG_PRINTK=y | 192 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 193 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 194 | CONFIG_ELF_CORE=y |
| 195 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 196 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 197 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 198 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 199 | CONFIG_ANON_INODES=y |
| @@ -185,10 +206,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 206 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 207 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 208 | # CONFIG_SLOB is not set |
| 209 | # CONFIG_PROFILING is not set | ||
| 210 | # CONFIG_MARKERS is not set | ||
| 211 | CONFIG_HAVE_OPROFILE=y | ||
| 212 | # CONFIG_HAVE_KPROBES is not set | ||
| 213 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 214 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 215 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 216 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 217 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 218 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 219 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 220 | CONFIG_MODULES=y |
| 221 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 222 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 223 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 224 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +242,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 242 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 243 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 244 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 245 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 246 | ||
| 216 | # | 247 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 248 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 249 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 250 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 251 | CONFIG_PCI=y |
| 252 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 253 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 254 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 256 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 257 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 258 | ||
| @@ -237,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 266 | # |
| 238 | # Power management options | 267 | # Power management options |
| 239 | # | 268 | # |
| 269 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 270 | # CONFIG_PM is not set |
| 241 | 271 | ||
| 242 | # | 272 | # |
| @@ -277,6 +307,7 @@ CONFIG_SYN_COOKIES=y | |||
| 277 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 307 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 278 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 308 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 279 | # CONFIG_INET_XFRM_MODE_BEET is not set | 309 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 310 | # CONFIG_INET_LRO is not set | ||
| 280 | CONFIG_INET_DIAG=y | 311 | CONFIG_INET_DIAG=y |
| 281 | CONFIG_INET_TCP_DIAG=y | 312 | CONFIG_INET_TCP_DIAG=y |
| 282 | # CONFIG_TCP_CONG_ADVANCED is not set | 313 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -284,15 +315,10 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 284 | CONFIG_DEFAULT_TCP_CONG="cubic" | 315 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 285 | # CONFIG_TCP_MD5SIG is not set | 316 | # CONFIG_TCP_MD5SIG is not set |
| 286 | # CONFIG_IPV6 is not set | 317 | # CONFIG_IPV6 is not set |
| 287 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 288 | # CONFIG_INET6_TUNNEL is not set | ||
| 289 | CONFIG_NETWORK_SECMARK=y | 318 | CONFIG_NETWORK_SECMARK=y |
| 290 | # CONFIG_NETFILTER is not set | 319 | # CONFIG_NETFILTER is not set |
| 291 | # CONFIG_IP_DCCP is not set | 320 | # CONFIG_IP_DCCP is not set |
| 292 | # CONFIG_IP_SCTP is not set | 321 | # CONFIG_IP_SCTP is not set |
| 293 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 294 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 295 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
| 296 | # CONFIG_TIPC is not set | 322 | # CONFIG_TIPC is not set |
| 297 | # CONFIG_ATM is not set | 323 | # CONFIG_ATM is not set |
| 298 | # CONFIG_BRIDGE is not set | 324 | # CONFIG_BRIDGE is not set |
| @@ -305,10 +331,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 305 | # CONFIG_LAPB is not set | 331 | # CONFIG_LAPB is not set |
| 306 | # CONFIG_ECONET is not set | 332 | # CONFIG_ECONET is not set |
| 307 | # CONFIG_WAN_ROUTER is not set | 333 | # CONFIG_WAN_ROUTER is not set |
| 308 | |||
| 309 | # | ||
| 310 | # QoS and/or fair queueing | ||
| 311 | # | ||
| 312 | # CONFIG_NET_SCHED is not set | 334 | # CONFIG_NET_SCHED is not set |
| 313 | 335 | ||
| 314 | # | 336 | # |
| @@ -316,6 +338,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 316 | # | 338 | # |
| 317 | # CONFIG_NET_PKTGEN is not set | 339 | # CONFIG_NET_PKTGEN is not set |
| 318 | # CONFIG_HAMRADIO is not set | 340 | # CONFIG_HAMRADIO is not set |
| 341 | # CONFIG_CAN is not set | ||
| 319 | # CONFIG_IRDA is not set | 342 | # CONFIG_IRDA is not set |
| 320 | # CONFIG_BT is not set | 343 | # CONFIG_BT is not set |
| 321 | # CONFIG_AF_RXRPC is not set | 344 | # CONFIG_AF_RXRPC is not set |
| @@ -338,6 +361,7 @@ CONFIG_FIB_RULES=y | |||
| 338 | # | 361 | # |
| 339 | # Generic Driver Options | 362 | # Generic Driver Options |
| 340 | # | 363 | # |
| 364 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 341 | CONFIG_STANDALONE=y | 365 | CONFIG_STANDALONE=y |
| 342 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 366 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 343 | CONFIG_FW_LOADER=y | 367 | CONFIG_FW_LOADER=y |
| @@ -359,10 +383,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 359 | CONFIG_BLK_DEV_RAM=y | 383 | CONFIG_BLK_DEV_RAM=y |
| 360 | CONFIG_BLK_DEV_RAM_COUNT=16 | 384 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 361 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 385 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 362 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 386 | CONFIG_BLK_DEV_XIP=y |
| 363 | # CONFIG_CDROM_PKTCDVD is not set | 387 | # CONFIG_CDROM_PKTCDVD is not set |
| 364 | # CONFIG_ATA_OVER_ETH is not set | 388 | # CONFIG_ATA_OVER_ETH is not set |
| 365 | # CONFIG_MISC_DEVICES is not set | 389 | # CONFIG_MISC_DEVICES is not set |
| 390 | CONFIG_HAVE_IDE=y | ||
| 366 | # CONFIG_IDE is not set | 391 | # CONFIG_IDE is not set |
| 367 | 392 | ||
| 368 | # | 393 | # |
| @@ -402,18 +427,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 402 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 427 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 403 | CONFIG_SCSI_SAS_ATTRS=m | 428 | CONFIG_SCSI_SAS_ATTRS=m |
| 404 | CONFIG_SCSI_SAS_LIBSAS=m | 429 | CONFIG_SCSI_SAS_LIBSAS=m |
| 430 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
| 405 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 431 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
| 432 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 406 | # CONFIG_SCSI_LOWLEVEL is not set | 433 | # CONFIG_SCSI_LOWLEVEL is not set |
| 407 | # CONFIG_ATA is not set | 434 | # CONFIG_ATA is not set |
| 408 | # CONFIG_MD is not set | 435 | # CONFIG_MD is not set |
| 409 | |||
| 410 | # | ||
| 411 | # Fusion MPT device support | ||
| 412 | # | ||
| 413 | # CONFIG_FUSION is not set | 436 | # CONFIG_FUSION is not set |
| 414 | # CONFIG_FUSION_SPI is not set | ||
| 415 | # CONFIG_FUSION_FC is not set | ||
| 416 | # CONFIG_FUSION_SAS is not set | ||
| 417 | 437 | ||
| 418 | # | 438 | # |
| 419 | # IEEE 1394 (FireWire) support | 439 | # IEEE 1394 (FireWire) support |
| @@ -428,6 +448,7 @@ CONFIG_NETDEVICES=y | |||
| 428 | # CONFIG_MACVLAN is not set | 448 | # CONFIG_MACVLAN is not set |
| 429 | # CONFIG_EQUALIZER is not set | 449 | # CONFIG_EQUALIZER is not set |
| 430 | # CONFIG_TUN is not set | 450 | # CONFIG_TUN is not set |
| 451 | # CONFIG_VETH is not set | ||
| 431 | # CONFIG_ARCNET is not set | 452 | # CONFIG_ARCNET is not set |
| 432 | # CONFIG_PHYLIB is not set | 453 | # CONFIG_PHYLIB is not set |
| 433 | CONFIG_NET_ETHERNET=y | 454 | CONFIG_NET_ETHERNET=y |
| @@ -440,6 +461,10 @@ CONFIG_MII=y | |||
| 440 | # CONFIG_DM9000 is not set | 461 | # CONFIG_DM9000 is not set |
| 441 | # CONFIG_NET_TULIP is not set | 462 | # CONFIG_NET_TULIP is not set |
| 442 | # CONFIG_HP100 is not set | 463 | # CONFIG_HP100 is not set |
| 464 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 465 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 466 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 467 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 443 | CONFIG_NET_PCI=y | 468 | CONFIG_NET_PCI=y |
| 444 | # CONFIG_PCNET32 is not set | 469 | # CONFIG_PCNET32 is not set |
| 445 | # CONFIG_AMD8111_ETH is not set | 470 | # CONFIG_AMD8111_ETH is not set |
| @@ -447,7 +472,6 @@ CONFIG_NET_PCI=y | |||
| 447 | # CONFIG_B44 is not set | 472 | # CONFIG_B44 is not set |
| 448 | # CONFIG_FORCEDETH is not set | 473 | # CONFIG_FORCEDETH is not set |
| 449 | # CONFIG_TC35815 is not set | 474 | # CONFIG_TC35815 is not set |
| 450 | # CONFIG_DGRS is not set | ||
| 451 | # CONFIG_EEPRO100 is not set | 475 | # CONFIG_EEPRO100 is not set |
| 452 | CONFIG_E100=y | 476 | CONFIG_E100=y |
| 453 | # CONFIG_FEALNX is not set | 477 | # CONFIG_FEALNX is not set |
| @@ -455,6 +479,7 @@ CONFIG_E100=y | |||
| 455 | # CONFIG_NE2K_PCI is not set | 479 | # CONFIG_NE2K_PCI is not set |
| 456 | # CONFIG_8139CP is not set | 480 | # CONFIG_8139CP is not set |
| 457 | # CONFIG_8139TOO is not set | 481 | # CONFIG_8139TOO is not set |
| 482 | # CONFIG_R6040 is not set | ||
| 458 | # CONFIG_SIS900 is not set | 483 | # CONFIG_SIS900 is not set |
| 459 | # CONFIG_EPIC100 is not set | 484 | # CONFIG_EPIC100 is not set |
| 460 | # CONFIG_SUNDANCE is not set | 485 | # CONFIG_SUNDANCE is not set |
| @@ -470,6 +495,7 @@ CONFIG_E100=y | |||
| 470 | # | 495 | # |
| 471 | # CONFIG_WLAN_PRE80211 is not set | 496 | # CONFIG_WLAN_PRE80211 is not set |
| 472 | # CONFIG_WLAN_80211 is not set | 497 | # CONFIG_WLAN_80211 is not set |
| 498 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 473 | 499 | ||
| 474 | # | 500 | # |
| 475 | # USB Network Adapters | 501 | # USB Network Adapters |
| @@ -478,7 +504,6 @@ CONFIG_USB_CATC=m | |||
| 478 | CONFIG_USB_KAWETH=m | 504 | CONFIG_USB_KAWETH=m |
| 479 | CONFIG_USB_PEGASUS=m | 505 | CONFIG_USB_PEGASUS=m |
| 480 | CONFIG_USB_RTL8150=m | 506 | CONFIG_USB_RTL8150=m |
| 481 | # CONFIG_USB_USBNET_MII is not set | ||
| 482 | # CONFIG_USB_USBNET is not set | 507 | # CONFIG_USB_USBNET is not set |
| 483 | # CONFIG_WAN is not set | 508 | # CONFIG_WAN is not set |
| 484 | # CONFIG_FDDI is not set | 509 | # CONFIG_FDDI is not set |
| @@ -486,7 +511,6 @@ CONFIG_USB_RTL8150=m | |||
| 486 | # CONFIG_PPP is not set | 511 | # CONFIG_PPP is not set |
| 487 | # CONFIG_SLIP is not set | 512 | # CONFIG_SLIP is not set |
| 488 | # CONFIG_NET_FC is not set | 513 | # CONFIG_NET_FC is not set |
| 489 | # CONFIG_SHAPER is not set | ||
| 490 | # CONFIG_NETCONSOLE is not set | 514 | # CONFIG_NETCONSOLE is not set |
| 491 | # CONFIG_NETPOLL is not set | 515 | # CONFIG_NETPOLL is not set |
| 492 | # CONFIG_NET_POLL_CONTROLLER is not set | 516 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -505,7 +529,6 @@ CONFIG_INPUT=y | |||
| 505 | # | 529 | # |
| 506 | # CONFIG_INPUT_MOUSEDEV is not set | 530 | # CONFIG_INPUT_MOUSEDEV is not set |
| 507 | # CONFIG_INPUT_JOYDEV is not set | 531 | # CONFIG_INPUT_JOYDEV is not set |
| 508 | # CONFIG_INPUT_TSDEV is not set | ||
| 509 | # CONFIG_INPUT_EVDEV is not set | 532 | # CONFIG_INPUT_EVDEV is not set |
| 510 | # CONFIG_INPUT_EVBUG is not set | 533 | # CONFIG_INPUT_EVBUG is not set |
| 511 | 534 | ||
| @@ -532,7 +555,9 @@ CONFIG_VT=y | |||
| 532 | CONFIG_VT_CONSOLE=y | 555 | CONFIG_VT_CONSOLE=y |
| 533 | CONFIG_HW_CONSOLE=y | 556 | CONFIG_HW_CONSOLE=y |
| 534 | CONFIG_VT_HW_CONSOLE_BINDING=y | 557 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 558 | # CONFIG_DEVKMEM is not set | ||
| 535 | # CONFIG_SERIAL_NONSTANDARD is not set | 559 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 560 | # CONFIG_NOZOMI is not set | ||
| 536 | 561 | ||
| 537 | # | 562 | # |
| 538 | # Serial drivers | 563 | # Serial drivers |
| @@ -551,52 +576,62 @@ CONFIG_UNIX98_PTYS=y | |||
| 551 | CONFIG_LEGACY_PTYS=y | 576 | CONFIG_LEGACY_PTYS=y |
| 552 | CONFIG_LEGACY_PTY_COUNT=256 | 577 | CONFIG_LEGACY_PTY_COUNT=256 |
| 553 | # CONFIG_IPMI_HANDLER is not set | 578 | # CONFIG_IPMI_HANDLER is not set |
| 554 | # CONFIG_WATCHDOG is not set | ||
| 555 | # CONFIG_HW_RANDOM is not set | 579 | # CONFIG_HW_RANDOM is not set |
| 556 | # CONFIG_RTC is not set | ||
| 557 | # CONFIG_R3964 is not set | 580 | # CONFIG_R3964 is not set |
| 558 | # CONFIG_APPLICOM is not set | 581 | # CONFIG_APPLICOM is not set |
| 559 | # CONFIG_GPIO_TB0219 is not set | 582 | # CONFIG_GPIO_TB0219 is not set |
| 560 | # CONFIG_DRM is not set | ||
| 561 | CONFIG_GPIO_VR41XX=y | 583 | CONFIG_GPIO_VR41XX=y |
| 562 | # CONFIG_RAW_DRIVER is not set | 584 | # CONFIG_RAW_DRIVER is not set |
| 563 | # CONFIG_TCG_TPM is not set | 585 | # CONFIG_TCG_TPM is not set |
| 564 | CONFIG_DEVPORT=y | 586 | CONFIG_DEVPORT=y |
| 565 | # CONFIG_I2C is not set | 587 | # CONFIG_I2C is not set |
| 566 | |||
| 567 | # | ||
| 568 | # SPI support | ||
| 569 | # | ||
| 570 | # CONFIG_SPI is not set | 588 | # CONFIG_SPI is not set |
| 571 | # CONFIG_SPI_MASTER is not set | ||
| 572 | # CONFIG_W1 is not set | 589 | # CONFIG_W1 is not set |
| 573 | # CONFIG_POWER_SUPPLY is not set | 590 | # CONFIG_POWER_SUPPLY is not set |
| 574 | # CONFIG_HWMON is not set | 591 | # CONFIG_HWMON is not set |
| 592 | # CONFIG_THERMAL is not set | ||
| 593 | # CONFIG_WATCHDOG is not set | ||
| 594 | |||
| 595 | # | ||
| 596 | # Sonics Silicon Backplane | ||
| 597 | # | ||
| 598 | CONFIG_SSB_POSSIBLE=y | ||
| 599 | # CONFIG_SSB is not set | ||
| 575 | 600 | ||
| 576 | # | 601 | # |
| 577 | # Multifunction device drivers | 602 | # Multifunction device drivers |
| 578 | # | 603 | # |
| 579 | # CONFIG_MFD_SM501 is not set | 604 | # CONFIG_MFD_SM501 is not set |
| 605 | # CONFIG_HTC_PASIC3 is not set | ||
| 580 | 606 | ||
| 581 | # | 607 | # |
| 582 | # Multimedia devices | 608 | # Multimedia devices |
| 583 | # | 609 | # |
| 610 | |||
| 611 | # | ||
| 612 | # Multimedia core support | ||
| 613 | # | ||
| 584 | # CONFIG_VIDEO_DEV is not set | 614 | # CONFIG_VIDEO_DEV is not set |
| 585 | # CONFIG_DVB_CORE is not set | 615 | # CONFIG_DVB_CORE is not set |
| 616 | |||
| 617 | # | ||
| 618 | # Multimedia drivers | ||
| 619 | # | ||
| 586 | # CONFIG_DAB is not set | 620 | # CONFIG_DAB is not set |
| 587 | 621 | ||
| 588 | # | 622 | # |
| 589 | # Graphics support | 623 | # Graphics support |
| 590 | # | 624 | # |
| 625 | # CONFIG_DRM is not set | ||
| 626 | # CONFIG_VGASTATE is not set | ||
| 627 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 628 | # CONFIG_FB is not set | ||
| 591 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 629 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 592 | 630 | ||
| 593 | # | 631 | # |
| 594 | # Display device support | 632 | # Display device support |
| 595 | # | 633 | # |
| 596 | # CONFIG_DISPLAY_SUPPORT is not set | 634 | # CONFIG_DISPLAY_SUPPORT is not set |
| 597 | # CONFIG_VGASTATE is not set | ||
| 598 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 599 | # CONFIG_FB is not set | ||
| 600 | 635 | ||
| 601 | # | 636 | # |
| 602 | # Console display driver support | 637 | # Console display driver support |
| @@ -615,6 +650,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 615 | CONFIG_USB_ARCH_HAS_EHCI=y | 650 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 616 | CONFIG_USB=y | 651 | CONFIG_USB=y |
| 617 | # CONFIG_USB_DEBUG is not set | 652 | # CONFIG_USB_DEBUG is not set |
| 653 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 618 | 654 | ||
| 619 | # | 655 | # |
| 620 | # Miscellaneous USB options | 656 | # Miscellaneous USB options |
| @@ -623,15 +659,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 623 | CONFIG_USB_DEVICE_CLASS=y | 659 | CONFIG_USB_DEVICE_CLASS=y |
| 624 | # CONFIG_USB_DYNAMIC_MINORS is not set | 660 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 625 | # CONFIG_USB_OTG is not set | 661 | # CONFIG_USB_OTG is not set |
| 662 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 663 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 626 | 664 | ||
| 627 | # | 665 | # |
| 628 | # USB Host Controller Drivers | 666 | # USB Host Controller Drivers |
| 629 | # | 667 | # |
| 668 | # CONFIG_USB_C67X00_HCD is not set | ||
| 630 | CONFIG_USB_EHCI_HCD=y | 669 | CONFIG_USB_EHCI_HCD=y |
| 631 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 632 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 670 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 633 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 671 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 634 | # CONFIG_USB_ISP116X_HCD is not set | 672 | # CONFIG_USB_ISP116X_HCD is not set |
| 673 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 635 | CONFIG_USB_OHCI_HCD=y | 674 | CONFIG_USB_OHCI_HCD=y |
| 636 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 675 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 637 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 676 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -657,13 +696,16 @@ CONFIG_USB_STORAGE=y | |||
| 657 | # CONFIG_USB_STORAGE_DEBUG is not set | 696 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 658 | # CONFIG_USB_STORAGE_DATAFAB is not set | 697 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 659 | # CONFIG_USB_STORAGE_FREECOM is not set | 698 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 699 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 660 | # CONFIG_USB_STORAGE_DPCM is not set | 700 | # CONFIG_USB_STORAGE_DPCM is not set |
| 661 | # CONFIG_USB_STORAGE_USBAT is not set | 701 | # CONFIG_USB_STORAGE_USBAT is not set |
| 662 | # CONFIG_USB_STORAGE_SDDR09 is not set | 702 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 663 | # CONFIG_USB_STORAGE_SDDR55 is not set | 703 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 664 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 704 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 665 | # CONFIG_USB_STORAGE_ALAUDA is not set | 705 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 706 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 666 | # CONFIG_USB_STORAGE_KARMA is not set | 707 | # CONFIG_USB_STORAGE_KARMA is not set |
| 708 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 667 | # CONFIG_USB_LIBUSUAL is not set | 709 | # CONFIG_USB_LIBUSUAL is not set |
| 668 | 710 | ||
| 669 | # | 711 | # |
| @@ -676,10 +718,6 @@ CONFIG_USB_STORAGE=y | |||
| 676 | # | 718 | # |
| 677 | # USB port drivers | 719 | # USB port drivers |
| 678 | # | 720 | # |
| 679 | |||
| 680 | # | ||
| 681 | # USB Serial Converter support | ||
| 682 | # | ||
| 683 | # CONFIG_USB_SERIAL is not set | 721 | # CONFIG_USB_SERIAL is not set |
| 684 | 722 | ||
| 685 | # | 723 | # |
| @@ -705,17 +743,11 @@ CONFIG_USB_STORAGE=y | |||
| 705 | # CONFIG_USB_TRANCEVIBRATOR is not set | 743 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 706 | # CONFIG_USB_IOWARRIOR is not set | 744 | # CONFIG_USB_IOWARRIOR is not set |
| 707 | # CONFIG_USB_TEST is not set | 745 | # CONFIG_USB_TEST is not set |
| 708 | |||
| 709 | # | ||
| 710 | # USB DSL modem support | ||
| 711 | # | ||
| 712 | |||
| 713 | # | ||
| 714 | # USB Gadget Support | ||
| 715 | # | ||
| 716 | # CONFIG_USB_GADGET is not set | 746 | # CONFIG_USB_GADGET is not set |
| 717 | # CONFIG_MMC is not set | 747 | # CONFIG_MMC is not set |
| 748 | # CONFIG_MEMSTICK is not set | ||
| 718 | # CONFIG_NEW_LEDS is not set | 749 | # CONFIG_NEW_LEDS is not set |
| 750 | # CONFIG_ACCESSIBILITY is not set | ||
| 719 | # CONFIG_INFINIBAND is not set | 751 | # CONFIG_INFINIBAND is not set |
| 720 | CONFIG_RTC_LIB=y | 752 | CONFIG_RTC_LIB=y |
| 721 | CONFIG_RTC_CLASS=y | 753 | CONFIG_RTC_CLASS=y |
| @@ -740,9 +772,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 740 | # Platform RTC drivers | 772 | # Platform RTC drivers |
| 741 | # | 773 | # |
| 742 | # CONFIG_RTC_DRV_CMOS is not set | 774 | # CONFIG_RTC_DRV_CMOS is not set |
| 775 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 743 | # CONFIG_RTC_DRV_DS1553 is not set | 776 | # CONFIG_RTC_DRV_DS1553 is not set |
| 744 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 745 | # CONFIG_RTC_DRV_DS1742 is not set | 777 | # CONFIG_RTC_DRV_DS1742 is not set |
| 778 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 746 | # CONFIG_RTC_DRV_M48T86 is not set | 779 | # CONFIG_RTC_DRV_M48T86 is not set |
| 747 | # CONFIG_RTC_DRV_M48T59 is not set | 780 | # CONFIG_RTC_DRV_M48T59 is not set |
| 748 | # CONFIG_RTC_DRV_V3020 is not set | 781 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -751,23 +784,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 751 | # on-CPU RTC drivers | 784 | # on-CPU RTC drivers |
| 752 | # | 785 | # |
| 753 | CONFIG_RTC_DRV_VR41XX=y | 786 | CONFIG_RTC_DRV_VR41XX=y |
| 754 | |||
| 755 | # | ||
| 756 | # DMA Engine support | ||
| 757 | # | ||
| 758 | # CONFIG_DMA_ENGINE is not set | ||
| 759 | |||
| 760 | # | ||
| 761 | # DMA Clients | ||
| 762 | # | ||
| 763 | |||
| 764 | # | ||
| 765 | # DMA Devices | ||
| 766 | # | ||
| 767 | |||
| 768 | # | ||
| 769 | # Userspace I/O | ||
| 770 | # | ||
| 771 | # CONFIG_UIO is not set | 787 | # CONFIG_UIO is not set |
| 772 | 788 | ||
| 773 | # | 789 | # |
| @@ -782,14 +798,11 @@ CONFIG_EXT2_FS=y | |||
| 782 | # CONFIG_JFS_FS is not set | 798 | # CONFIG_JFS_FS is not set |
| 783 | CONFIG_FS_POSIX_ACL=y | 799 | CONFIG_FS_POSIX_ACL=y |
| 784 | # CONFIG_XFS_FS is not set | 800 | # CONFIG_XFS_FS is not set |
| 785 | # CONFIG_GFS2_FS is not set | ||
| 786 | # CONFIG_OCFS2_FS is not set | 801 | # CONFIG_OCFS2_FS is not set |
| 787 | # CONFIG_MINIX_FS is not set | 802 | CONFIG_DNOTIFY=y |
| 788 | CONFIG_ROMFS_FS=m | ||
| 789 | CONFIG_INOTIFY=y | 803 | CONFIG_INOTIFY=y |
| 790 | CONFIG_INOTIFY_USER=y | 804 | CONFIG_INOTIFY_USER=y |
| 791 | # CONFIG_QUOTA is not set | 805 | # CONFIG_QUOTA is not set |
| 792 | CONFIG_DNOTIFY=y | ||
| 793 | # CONFIG_AUTOFS_FS is not set | 806 | # CONFIG_AUTOFS_FS is not set |
| 794 | CONFIG_AUTOFS4_FS=y | 807 | CONFIG_AUTOFS4_FS=y |
| 795 | # CONFIG_FUSE_FS is not set | 808 | # CONFIG_FUSE_FS is not set |
| @@ -818,7 +831,6 @@ CONFIG_SYSFS=y | |||
| 818 | CONFIG_TMPFS=y | 831 | CONFIG_TMPFS=y |
| 819 | CONFIG_TMPFS_POSIX_ACL=y | 832 | CONFIG_TMPFS_POSIX_ACL=y |
| 820 | # CONFIG_HUGETLB_PAGE is not set | 833 | # CONFIG_HUGETLB_PAGE is not set |
| 821 | CONFIG_RAMFS=y | ||
| 822 | # CONFIG_CONFIGFS_FS is not set | 834 | # CONFIG_CONFIGFS_FS is not set |
| 823 | 835 | ||
| 824 | # | 836 | # |
| @@ -833,24 +845,21 @@ CONFIG_RAMFS=y | |||
| 833 | # CONFIG_EFS_FS is not set | 845 | # CONFIG_EFS_FS is not set |
| 834 | CONFIG_CRAMFS=m | 846 | CONFIG_CRAMFS=m |
| 835 | # CONFIG_VXFS_FS is not set | 847 | # CONFIG_VXFS_FS is not set |
| 848 | # CONFIG_MINIX_FS is not set | ||
| 836 | # CONFIG_HPFS_FS is not set | 849 | # CONFIG_HPFS_FS is not set |
| 837 | # CONFIG_QNX4FS_FS is not set | 850 | # CONFIG_QNX4FS_FS is not set |
| 851 | CONFIG_ROMFS_FS=m | ||
| 838 | # CONFIG_SYSV_FS is not set | 852 | # CONFIG_SYSV_FS is not set |
| 839 | # CONFIG_UFS_FS is not set | 853 | # CONFIG_UFS_FS is not set |
| 840 | 854 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 841 | # | ||
| 842 | # Network File Systems | ||
| 843 | # | ||
| 844 | CONFIG_NFS_FS=y | 855 | CONFIG_NFS_FS=y |
| 845 | CONFIG_NFS_V3=y | 856 | CONFIG_NFS_V3=y |
| 846 | # CONFIG_NFS_V3_ACL is not set | 857 | # CONFIG_NFS_V3_ACL is not set |
| 847 | # CONFIG_NFS_V4 is not set | 858 | # CONFIG_NFS_V4 is not set |
| 848 | # CONFIG_NFS_DIRECTIO is not set | ||
| 849 | CONFIG_NFSD=m | 859 | CONFIG_NFSD=m |
| 850 | CONFIG_NFSD_V3=y | 860 | CONFIG_NFSD_V3=y |
| 851 | # CONFIG_NFSD_V3_ACL is not set | 861 | # CONFIG_NFSD_V3_ACL is not set |
| 852 | # CONFIG_NFSD_V4 is not set | 862 | # CONFIG_NFSD_V4 is not set |
| 853 | # CONFIG_NFSD_TCP is not set | ||
| 854 | CONFIG_ROOT_NFS=y | 863 | CONFIG_ROOT_NFS=y |
| 855 | CONFIG_LOCKD=y | 864 | CONFIG_LOCKD=y |
| 856 | CONFIG_LOCKD_V4=y | 865 | CONFIG_LOCKD_V4=y |
| @@ -871,47 +880,38 @@ CONFIG_SUNRPC=y | |||
| 871 | # | 880 | # |
| 872 | # CONFIG_PARTITION_ADVANCED is not set | 881 | # CONFIG_PARTITION_ADVANCED is not set |
| 873 | CONFIG_MSDOS_PARTITION=y | 882 | CONFIG_MSDOS_PARTITION=y |
| 874 | |||
| 875 | # | ||
| 876 | # Native Language Support | ||
| 877 | # | ||
| 878 | # CONFIG_NLS is not set | 883 | # CONFIG_NLS is not set |
| 879 | |||
| 880 | # | ||
| 881 | # Distributed Lock Manager | ||
| 882 | # | ||
| 883 | # CONFIG_DLM is not set | 884 | # CONFIG_DLM is not set |
| 884 | 885 | ||
| 885 | # | 886 | # |
| 886 | # Profiling support | ||
| 887 | # | ||
| 888 | # CONFIG_PROFILING is not set | ||
| 889 | |||
| 890 | # | ||
| 891 | # Kernel hacking | 887 | # Kernel hacking |
| 892 | # | 888 | # |
| 893 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 889 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 894 | # CONFIG_PRINTK_TIME is not set | 890 | # CONFIG_PRINTK_TIME is not set |
| 891 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 895 | CONFIG_ENABLE_MUST_CHECK=y | 892 | CONFIG_ENABLE_MUST_CHECK=y |
| 893 | CONFIG_FRAME_WARN=1024 | ||
| 896 | # CONFIG_MAGIC_SYSRQ is not set | 894 | # CONFIG_MAGIC_SYSRQ is not set |
| 897 | # CONFIG_UNUSED_SYMBOLS is not set | 895 | # CONFIG_UNUSED_SYMBOLS is not set |
| 898 | # CONFIG_DEBUG_FS is not set | 896 | # CONFIG_DEBUG_FS is not set |
| 899 | # CONFIG_HEADERS_CHECK is not set | 897 | # CONFIG_HEADERS_CHECK is not set |
| 900 | # CONFIG_DEBUG_KERNEL is not set | 898 | # CONFIG_DEBUG_KERNEL is not set |
| 901 | CONFIG_CROSSCOMPILE=y | 899 | # CONFIG_SAMPLES is not set |
| 902 | CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" | 900 | CONFIG_CMDLINE="cca=3 mem=32M console=ttyVR0,115200" |
| 903 | 901 | ||
| 904 | # | 902 | # |
| 905 | # Security options | 903 | # Security options |
| 906 | # | 904 | # |
| 907 | # CONFIG_KEYS is not set | 905 | # CONFIG_KEYS is not set |
| 908 | # CONFIG_SECURITY is not set | 906 | # CONFIG_SECURITY is not set |
| 907 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 909 | # CONFIG_CRYPTO is not set | 908 | # CONFIG_CRYPTO is not set |
| 910 | 909 | ||
| 911 | # | 910 | # |
| 912 | # Library routines | 911 | # Library routines |
| 913 | # | 912 | # |
| 914 | CONFIG_BITREVERSE=m | 913 | CONFIG_BITREVERSE=m |
| 914 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 915 | # CONFIG_CRC_CCITT is not set | 915 | # CONFIG_CRC_CCITT is not set |
| 916 | # CONFIG_CRC16 is not set | 916 | # CONFIG_CRC16 is not set |
| 917 | # CONFIG_CRC_ITU_T is not set | 917 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 40d4a40a970e..a5d0f3c55ed1 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Thu Aug 9 14:03:54 2007 | 4 | # Mon May 12 11:55:55 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,12 +171,15 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| @@ -173,6 +191,8 @@ CONFIG_HOTPLUG=y | |||
| 173 | CONFIG_PRINTK=y | 191 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 192 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 193 | CONFIG_ELF_CORE=y |
| 194 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 195 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 196 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 197 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 198 | CONFIG_ANON_INODES=y |
| @@ -185,10 +205,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 205 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 206 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 207 | # CONFIG_SLOB is not set |
| 208 | # CONFIG_PROFILING is not set | ||
| 209 | # CONFIG_MARKERS is not set | ||
| 210 | CONFIG_HAVE_OPROFILE=y | ||
| 211 | # CONFIG_HAVE_KPROBES is not set | ||
| 212 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 213 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 214 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 215 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 216 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 217 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 218 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 219 | CONFIG_MODULES=y |
| 220 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 221 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 222 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 223 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +241,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 241 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 242 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 243 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 244 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 245 | ||
| 216 | # | 246 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 247 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 248 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 249 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 250 | CONFIG_PCI=y |
| 251 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 252 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 253 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 254 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 257 | ||
| @@ -237,6 +265,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 265 | # |
| 238 | # Power management options | 266 | # Power management options |
| 239 | # | 267 | # |
| 268 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 269 | # CONFIG_PM is not set |
| 241 | 270 | ||
| 242 | # | 271 | # |
| @@ -278,6 +307,7 @@ CONFIG_INET_TUNNEL=m | |||
| 278 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 307 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 279 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 308 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 280 | # CONFIG_INET_XFRM_MODE_BEET is not set | 309 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 310 | # CONFIG_INET_LRO is not set | ||
| 281 | CONFIG_INET_DIAG=y | 311 | CONFIG_INET_DIAG=y |
| 282 | CONFIG_INET_TCP_DIAG=y | 312 | CONFIG_INET_TCP_DIAG=y |
| 283 | CONFIG_TCP_CONG_ADVANCED=y | 313 | CONFIG_TCP_CONG_ADVANCED=y |
| @@ -302,8 +332,6 @@ CONFIG_DEFAULT_BIC=y | |||
| 302 | CONFIG_DEFAULT_TCP_CONG="bic" | 332 | CONFIG_DEFAULT_TCP_CONG="bic" |
| 303 | # CONFIG_TCP_MD5SIG is not set | 333 | # CONFIG_TCP_MD5SIG is not set |
| 304 | # CONFIG_IPV6 is not set | 334 | # CONFIG_IPV6 is not set |
| 305 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 306 | # CONFIG_INET6_TUNNEL is not set | ||
| 307 | CONFIG_NETWORK_SECMARK=y | 335 | CONFIG_NETWORK_SECMARK=y |
| 308 | # CONFIG_NETFILTER is not set | 336 | # CONFIG_NETFILTER is not set |
| 309 | # CONFIG_IP_DCCP is not set | 337 | # CONFIG_IP_DCCP is not set |
| @@ -320,10 +348,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 320 | # CONFIG_LAPB is not set | 348 | # CONFIG_LAPB is not set |
| 321 | # CONFIG_ECONET is not set | 349 | # CONFIG_ECONET is not set |
| 322 | # CONFIG_WAN_ROUTER is not set | 350 | # CONFIG_WAN_ROUTER is not set |
| 323 | |||
| 324 | # | ||
| 325 | # QoS and/or fair queueing | ||
| 326 | # | ||
| 327 | # CONFIG_NET_SCHED is not set | 351 | # CONFIG_NET_SCHED is not set |
| 328 | 352 | ||
| 329 | # | 353 | # |
| @@ -331,6 +355,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 331 | # | 355 | # |
| 332 | # CONFIG_NET_PKTGEN is not set | 356 | # CONFIG_NET_PKTGEN is not set |
| 333 | # CONFIG_HAMRADIO is not set | 357 | # CONFIG_HAMRADIO is not set |
| 358 | # CONFIG_CAN is not set | ||
| 334 | # CONFIG_IRDA is not set | 359 | # CONFIG_IRDA is not set |
| 335 | # CONFIG_BT is not set | 360 | # CONFIG_BT is not set |
| 336 | # CONFIG_AF_RXRPC is not set | 361 | # CONFIG_AF_RXRPC is not set |
| @@ -353,6 +378,7 @@ CONFIG_FIB_RULES=y | |||
| 353 | # | 378 | # |
| 354 | # Generic Driver Options | 379 | # Generic Driver Options |
| 355 | # | 380 | # |
| 381 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 356 | CONFIG_STANDALONE=y | 382 | CONFIG_STANDALONE=y |
| 357 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 383 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 358 | CONFIG_FW_LOADER=m | 384 | CONFIG_FW_LOADER=m |
| @@ -374,10 +400,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 374 | CONFIG_BLK_DEV_RAM=y | 400 | CONFIG_BLK_DEV_RAM=y |
| 375 | CONFIG_BLK_DEV_RAM_COUNT=16 | 401 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 376 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 402 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 377 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 403 | CONFIG_BLK_DEV_XIP=y |
| 378 | # CONFIG_CDROM_PKTCDVD is not set | 404 | # CONFIG_CDROM_PKTCDVD is not set |
| 379 | # CONFIG_ATA_OVER_ETH is not set | 405 | # CONFIG_ATA_OVER_ETH is not set |
| 380 | # CONFIG_MISC_DEVICES is not set | 406 | # CONFIG_MISC_DEVICES is not set |
| 407 | CONFIG_HAVE_IDE=y | ||
| 381 | # CONFIG_IDE is not set | 408 | # CONFIG_IDE is not set |
| 382 | 409 | ||
| 383 | # | 410 | # |
| @@ -416,10 +443,14 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 416 | # CONFIG_SCSI_FC_ATTRS is not set | 443 | # CONFIG_SCSI_FC_ATTRS is not set |
| 417 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 444 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 418 | # CONFIG_SCSI_SAS_LIBSAS is not set | 445 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 446 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 419 | # CONFIG_SCSI_LOWLEVEL is not set | 447 | # CONFIG_SCSI_LOWLEVEL is not set |
| 420 | CONFIG_ATA=y | 448 | CONFIG_ATA=y |
| 421 | # CONFIG_ATA_NONSTANDARD is not set | 449 | # CONFIG_ATA_NONSTANDARD is not set |
| 450 | CONFIG_SATA_PMP=y | ||
| 422 | # CONFIG_SATA_AHCI is not set | 451 | # CONFIG_SATA_AHCI is not set |
| 452 | # CONFIG_SATA_SIL24 is not set | ||
| 453 | CONFIG_ATA_SFF=y | ||
| 423 | # CONFIG_SATA_SVW is not set | 454 | # CONFIG_SATA_SVW is not set |
| 424 | # CONFIG_ATA_PIIX is not set | 455 | # CONFIG_ATA_PIIX is not set |
| 425 | # CONFIG_SATA_MV is not set | 456 | # CONFIG_SATA_MV is not set |
| @@ -429,7 +460,6 @@ CONFIG_ATA=y | |||
| 429 | # CONFIG_SATA_PROMISE is not set | 460 | # CONFIG_SATA_PROMISE is not set |
| 430 | # CONFIG_SATA_SX4 is not set | 461 | # CONFIG_SATA_SX4 is not set |
| 431 | # CONFIG_SATA_SIL is not set | 462 | # CONFIG_SATA_SIL is not set |
| 432 | # CONFIG_SATA_SIL24 is not set | ||
| 433 | # CONFIG_SATA_SIS is not set | 463 | # CONFIG_SATA_SIS is not set |
| 434 | # CONFIG_SATA_ULI is not set | 464 | # CONFIG_SATA_ULI is not set |
| 435 | # CONFIG_SATA_VIA is not set | 465 | # CONFIG_SATA_VIA is not set |
| @@ -458,7 +488,9 @@ CONFIG_ATA=y | |||
| 458 | # CONFIG_PATA_MPIIX is not set | 488 | # CONFIG_PATA_MPIIX is not set |
| 459 | # CONFIG_PATA_OLDPIIX is not set | 489 | # CONFIG_PATA_OLDPIIX is not set |
| 460 | # CONFIG_PATA_NETCELL is not set | 490 | # CONFIG_PATA_NETCELL is not set |
| 491 | # CONFIG_PATA_NINJA32 is not set | ||
| 461 | # CONFIG_PATA_NS87410 is not set | 492 | # CONFIG_PATA_NS87410 is not set |
| 493 | # CONFIG_PATA_NS87415 is not set | ||
| 462 | # CONFIG_PATA_OPTI is not set | 494 | # CONFIG_PATA_OPTI is not set |
| 463 | # CONFIG_PATA_OPTIDMA is not set | 495 | # CONFIG_PATA_OPTIDMA is not set |
| 464 | # CONFIG_PATA_PDC_OLD is not set | 496 | # CONFIG_PATA_PDC_OLD is not set |
| @@ -472,15 +504,9 @@ CONFIG_PATA_SIL680=y | |||
| 472 | # CONFIG_PATA_VIA is not set | 504 | # CONFIG_PATA_VIA is not set |
| 473 | # CONFIG_PATA_WINBOND is not set | 505 | # CONFIG_PATA_WINBOND is not set |
| 474 | # CONFIG_PATA_PLATFORM is not set | 506 | # CONFIG_PATA_PLATFORM is not set |
| 507 | # CONFIG_PATA_SCH is not set | ||
| 475 | # CONFIG_MD is not set | 508 | # CONFIG_MD is not set |
| 476 | |||
| 477 | # | ||
| 478 | # Fusion MPT device support | ||
| 479 | # | ||
| 480 | # CONFIG_FUSION is not set | 509 | # CONFIG_FUSION is not set |
| 481 | # CONFIG_FUSION_SPI is not set | ||
| 482 | # CONFIG_FUSION_FC is not set | ||
| 483 | # CONFIG_FUSION_SAS is not set | ||
| 484 | 510 | ||
| 485 | # | 511 | # |
| 486 | # IEEE 1394 (FireWire) support | 512 | # IEEE 1394 (FireWire) support |
| @@ -520,6 +546,7 @@ CONFIG_NETDEVICES=y | |||
| 520 | # CONFIG_MACVLAN is not set | 546 | # CONFIG_MACVLAN is not set |
| 521 | # CONFIG_EQUALIZER is not set | 547 | # CONFIG_EQUALIZER is not set |
| 522 | # CONFIG_TUN is not set | 548 | # CONFIG_TUN is not set |
| 549 | # CONFIG_VETH is not set | ||
| 523 | # CONFIG_ARCNET is not set | 550 | # CONFIG_ARCNET is not set |
| 524 | # CONFIG_PHYLIB is not set | 551 | # CONFIG_PHYLIB is not set |
| 525 | CONFIG_NET_ETHERNET=y | 552 | CONFIG_NET_ETHERNET=y |
| @@ -532,6 +559,10 @@ CONFIG_MII=y | |||
| 532 | # CONFIG_DM9000 is not set | 559 | # CONFIG_DM9000 is not set |
| 533 | # CONFIG_NET_TULIP is not set | 560 | # CONFIG_NET_TULIP is not set |
| 534 | # CONFIG_HP100 is not set | 561 | # CONFIG_HP100 is not set |
| 562 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 563 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 564 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 565 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 535 | CONFIG_NET_PCI=y | 566 | CONFIG_NET_PCI=y |
| 536 | # CONFIG_PCNET32 is not set | 567 | # CONFIG_PCNET32 is not set |
| 537 | # CONFIG_AMD8111_ETH is not set | 568 | # CONFIG_AMD8111_ETH is not set |
| @@ -539,7 +570,6 @@ CONFIG_NET_PCI=y | |||
| 539 | # CONFIG_B44 is not set | 570 | # CONFIG_B44 is not set |
| 540 | # CONFIG_FORCEDETH is not set | 571 | # CONFIG_FORCEDETH is not set |
| 541 | # CONFIG_TC35815 is not set | 572 | # CONFIG_TC35815 is not set |
| 542 | # CONFIG_DGRS is not set | ||
| 543 | # CONFIG_EEPRO100 is not set | 573 | # CONFIG_EEPRO100 is not set |
| 544 | # CONFIG_E100 is not set | 574 | # CONFIG_E100 is not set |
| 545 | # CONFIG_FEALNX is not set | 575 | # CONFIG_FEALNX is not set |
| @@ -551,6 +581,7 @@ CONFIG_8139TOO_PIO=y | |||
| 551 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 581 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 552 | # CONFIG_8139TOO_8129 is not set | 582 | # CONFIG_8139TOO_8129 is not set |
| 553 | # CONFIG_8139_OLD_RX_RESET is not set | 583 | # CONFIG_8139_OLD_RX_RESET is not set |
| 584 | # CONFIG_R6040 is not set | ||
| 554 | # CONFIG_SIS900 is not set | 585 | # CONFIG_SIS900 is not set |
| 555 | # CONFIG_EPIC100 is not set | 586 | # CONFIG_EPIC100 is not set |
| 556 | # CONFIG_SUNDANCE is not set | 587 | # CONFIG_SUNDANCE is not set |
| @@ -563,6 +594,10 @@ CONFIG_NETDEV_1000=y | |||
| 563 | # CONFIG_ACENIC is not set | 594 | # CONFIG_ACENIC is not set |
| 564 | # CONFIG_DL2K is not set | 595 | # CONFIG_DL2K is not set |
| 565 | # CONFIG_E1000 is not set | 596 | # CONFIG_E1000 is not set |
| 597 | # CONFIG_E1000E is not set | ||
| 598 | # CONFIG_E1000E_ENABLED is not set | ||
| 599 | # CONFIG_IP1000 is not set | ||
| 600 | # CONFIG_IGB is not set | ||
| 566 | # CONFIG_NS83820 is not set | 601 | # CONFIG_NS83820 is not set |
| 567 | # CONFIG_HAMACHI is not set | 602 | # CONFIG_HAMACHI is not set |
| 568 | # CONFIG_YELLOWFIN is not set | 603 | # CONFIG_YELLOWFIN is not set |
| @@ -584,6 +619,7 @@ CONFIG_VIA_VELOCITY=y | |||
| 584 | # | 619 | # |
| 585 | # CONFIG_WLAN_PRE80211 is not set | 620 | # CONFIG_WLAN_PRE80211 is not set |
| 586 | # CONFIG_WLAN_80211 is not set | 621 | # CONFIG_WLAN_80211 is not set |
| 622 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 587 | 623 | ||
| 588 | # | 624 | # |
| 589 | # USB Network Adapters | 625 | # USB Network Adapters |
| @@ -592,7 +628,6 @@ CONFIG_VIA_VELOCITY=y | |||
| 592 | # CONFIG_USB_KAWETH is not set | 628 | # CONFIG_USB_KAWETH is not set |
| 593 | # CONFIG_USB_PEGASUS is not set | 629 | # CONFIG_USB_PEGASUS is not set |
| 594 | # CONFIG_USB_RTL8150 is not set | 630 | # CONFIG_USB_RTL8150 is not set |
| 595 | # CONFIG_USB_USBNET_MII is not set | ||
| 596 | # CONFIG_USB_USBNET is not set | 631 | # CONFIG_USB_USBNET is not set |
| 597 | # CONFIG_WAN is not set | 632 | # CONFIG_WAN is not set |
| 598 | # CONFIG_FDDI is not set | 633 | # CONFIG_FDDI is not set |
| @@ -600,7 +635,6 @@ CONFIG_VIA_VELOCITY=y | |||
| 600 | # CONFIG_PPP is not set | 635 | # CONFIG_PPP is not set |
| 601 | # CONFIG_SLIP is not set | 636 | # CONFIG_SLIP is not set |
| 602 | # CONFIG_NET_FC is not set | 637 | # CONFIG_NET_FC is not set |
| 603 | # CONFIG_SHAPER is not set | ||
| 604 | # CONFIG_NETCONSOLE is not set | 638 | # CONFIG_NETCONSOLE is not set |
| 605 | # CONFIG_NETPOLL is not set | 639 | # CONFIG_NETPOLL is not set |
| 606 | # CONFIG_NET_POLL_CONTROLLER is not set | 640 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -622,7 +656,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 622 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 656 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 623 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 657 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 624 | # CONFIG_INPUT_JOYDEV is not set | 658 | # CONFIG_INPUT_JOYDEV is not set |
| 625 | # CONFIG_INPUT_TSDEV is not set | ||
| 626 | # CONFIG_INPUT_EVDEV is not set | 659 | # CONFIG_INPUT_EVDEV is not set |
| 627 | # CONFIG_INPUT_EVBUG is not set | 660 | # CONFIG_INPUT_EVBUG is not set |
| 628 | 661 | ||
| @@ -649,7 +682,9 @@ CONFIG_VT=y | |||
| 649 | CONFIG_VT_CONSOLE=y | 682 | CONFIG_VT_CONSOLE=y |
| 650 | CONFIG_HW_CONSOLE=y | 683 | CONFIG_HW_CONSOLE=y |
| 651 | CONFIG_VT_HW_CONSOLE_BINDING=y | 684 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 685 | # CONFIG_DEVKMEM is not set | ||
| 652 | # CONFIG_SERIAL_NONSTANDARD is not set | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 687 | # CONFIG_NOZOMI is not set | ||
| 653 | 688 | ||
| 654 | # | 689 | # |
| 655 | # Serial drivers | 690 | # Serial drivers |
| @@ -668,49 +703,53 @@ CONFIG_UNIX98_PTYS=y | |||
| 668 | CONFIG_LEGACY_PTYS=y | 703 | CONFIG_LEGACY_PTYS=y |
| 669 | CONFIG_LEGACY_PTY_COUNT=256 | 704 | CONFIG_LEGACY_PTY_COUNT=256 |
| 670 | # CONFIG_IPMI_HANDLER is not set | 705 | # CONFIG_IPMI_HANDLER is not set |
| 671 | # CONFIG_WATCHDOG is not set | ||
| 672 | # CONFIG_HW_RANDOM is not set | 706 | # CONFIG_HW_RANDOM is not set |
| 673 | # CONFIG_RTC is not set | ||
| 674 | # CONFIG_R3964 is not set | 707 | # CONFIG_R3964 is not set |
| 675 | # CONFIG_APPLICOM is not set | 708 | # CONFIG_APPLICOM is not set |
| 676 | # CONFIG_GPIO_TB0219 is not set | 709 | # CONFIG_GPIO_TB0219 is not set |
| 677 | # CONFIG_DRM is not set | ||
| 678 | CONFIG_GPIO_VR41XX=y | 710 | CONFIG_GPIO_VR41XX=y |
| 679 | # CONFIG_RAW_DRIVER is not set | 711 | # CONFIG_RAW_DRIVER is not set |
| 680 | # CONFIG_TCG_TPM is not set | 712 | # CONFIG_TCG_TPM is not set |
| 681 | CONFIG_DEVPORT=y | 713 | CONFIG_DEVPORT=y |
| 682 | # CONFIG_I2C is not set | 714 | # CONFIG_I2C is not set |
| 683 | |||
| 684 | # | ||
| 685 | # SPI support | ||
| 686 | # | ||
| 687 | # CONFIG_SPI is not set | 715 | # CONFIG_SPI is not set |
| 688 | # CONFIG_SPI_MASTER is not set | ||
| 689 | # CONFIG_W1 is not set | 716 | # CONFIG_W1 is not set |
| 690 | # CONFIG_POWER_SUPPLY is not set | 717 | # CONFIG_POWER_SUPPLY is not set |
| 691 | # CONFIG_HWMON is not set | 718 | # CONFIG_HWMON is not set |
| 719 | # CONFIG_THERMAL is not set | ||
| 720 | # CONFIG_WATCHDOG is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # Sonics Silicon Backplane | ||
| 724 | # | ||
| 725 | CONFIG_SSB_POSSIBLE=y | ||
| 726 | # CONFIG_SSB is not set | ||
| 692 | 727 | ||
| 693 | # | 728 | # |
| 694 | # Multifunction device drivers | 729 | # Multifunction device drivers |
| 695 | # | 730 | # |
| 696 | CONFIG_MFD_SM501=y | 731 | CONFIG_MFD_SM501=y |
| 732 | # CONFIG_HTC_PASIC3 is not set | ||
| 697 | 733 | ||
| 698 | # | 734 | # |
| 699 | # Multimedia devices | 735 | # Multimedia devices |
| 700 | # | 736 | # |
| 737 | |||
| 738 | # | ||
| 739 | # Multimedia core support | ||
| 740 | # | ||
| 701 | # CONFIG_VIDEO_DEV is not set | 741 | # CONFIG_VIDEO_DEV is not set |
| 702 | # CONFIG_DVB_CORE is not set | 742 | # CONFIG_DVB_CORE is not set |
| 703 | # CONFIG_DAB is not set | ||
| 704 | 743 | ||
| 705 | # | 744 | # |
| 706 | # Graphics support | 745 | # Multimedia drivers |
| 707 | # | 746 | # |
| 708 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 747 | # CONFIG_DAB is not set |
| 709 | 748 | ||
| 710 | # | 749 | # |
| 711 | # Display device support | 750 | # Graphics support |
| 712 | # | 751 | # |
| 713 | # CONFIG_DISPLAY_SUPPORT is not set | 752 | # CONFIG_DRM is not set |
| 714 | # CONFIG_VGASTATE is not set | 753 | # CONFIG_VGASTATE is not set |
| 715 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 754 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| 716 | CONFIG_FB=y | 755 | CONFIG_FB=y |
| @@ -719,9 +758,11 @@ CONFIG_FB=y | |||
| 719 | CONFIG_FB_CFB_FILLRECT=y | 758 | CONFIG_FB_CFB_FILLRECT=y |
| 720 | CONFIG_FB_CFB_COPYAREA=y | 759 | CONFIG_FB_CFB_COPYAREA=y |
| 721 | CONFIG_FB_CFB_IMAGEBLIT=y | 760 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 761 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 722 | # CONFIG_FB_SYS_FILLRECT is not set | 762 | # CONFIG_FB_SYS_FILLRECT is not set |
| 723 | # CONFIG_FB_SYS_COPYAREA is not set | 763 | # CONFIG_FB_SYS_COPYAREA is not set |
| 724 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 764 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 765 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 725 | # CONFIG_FB_SYS_FOPS is not set | 766 | # CONFIG_FB_SYS_FOPS is not set |
| 726 | CONFIG_FB_DEFERRED_IO=y | 767 | CONFIG_FB_DEFERRED_IO=y |
| 727 | # CONFIG_FB_SVGALIB is not set | 768 | # CONFIG_FB_SVGALIB is not set |
| @@ -757,7 +798,14 @@ CONFIG_FB_DEFERRED_IO=y | |||
| 757 | # CONFIG_FB_ARK is not set | 798 | # CONFIG_FB_ARK is not set |
| 758 | # CONFIG_FB_PM3 is not set | 799 | # CONFIG_FB_PM3 is not set |
| 759 | CONFIG_FB_SM501=y | 800 | CONFIG_FB_SM501=y |
| 801 | # CONFIG_FB_COBALT is not set | ||
| 760 | # CONFIG_FB_VIRTUAL is not set | 802 | # CONFIG_FB_VIRTUAL is not set |
| 803 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 804 | |||
| 805 | # | ||
| 806 | # Display device support | ||
| 807 | # | ||
| 808 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 761 | 809 | ||
| 762 | # | 810 | # |
| 763 | # Console display driver support | 811 | # Console display driver support |
| @@ -787,6 +835,7 @@ CONFIG_FONT_8x16=y | |||
| 787 | CONFIG_HID_SUPPORT=y | 835 | CONFIG_HID_SUPPORT=y |
| 788 | CONFIG_HID=y | 836 | CONFIG_HID=y |
| 789 | # CONFIG_HID_DEBUG is not set | 837 | # CONFIG_HID_DEBUG is not set |
| 838 | # CONFIG_HIDRAW is not set | ||
| 790 | 839 | ||
| 791 | # | 840 | # |
| 792 | # USB Input Devices | 841 | # USB Input Devices |
| @@ -807,6 +856,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 807 | CONFIG_USB_ARCH_HAS_EHCI=y | 856 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 808 | CONFIG_USB=m | 857 | CONFIG_USB=m |
| 809 | # CONFIG_USB_DEBUG is not set | 858 | # CONFIG_USB_DEBUG is not set |
| 859 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 810 | 860 | ||
| 811 | # | 861 | # |
| 812 | # Miscellaneous USB options | 862 | # Miscellaneous USB options |
| @@ -815,15 +865,18 @@ CONFIG_USB=m | |||
| 815 | CONFIG_USB_DEVICE_CLASS=y | 865 | CONFIG_USB_DEVICE_CLASS=y |
| 816 | # CONFIG_USB_DYNAMIC_MINORS is not set | 866 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 817 | # CONFIG_USB_OTG is not set | 867 | # CONFIG_USB_OTG is not set |
| 868 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 869 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 818 | 870 | ||
| 819 | # | 871 | # |
| 820 | # USB Host Controller Drivers | 872 | # USB Host Controller Drivers |
| 821 | # | 873 | # |
| 874 | # CONFIG_USB_C67X00_HCD is not set | ||
| 822 | CONFIG_USB_EHCI_HCD=m | 875 | CONFIG_USB_EHCI_HCD=m |
| 823 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 824 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 876 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 825 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 877 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 826 | # CONFIG_USB_ISP116X_HCD is not set | 878 | # CONFIG_USB_ISP116X_HCD is not set |
| 879 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 827 | CONFIG_USB_OHCI_HCD=m | 880 | CONFIG_USB_OHCI_HCD=m |
| 828 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 881 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 829 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 882 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -849,13 +902,16 @@ CONFIG_USB_STORAGE=m | |||
| 849 | # CONFIG_USB_STORAGE_DEBUG is not set | 902 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 850 | # CONFIG_USB_STORAGE_DATAFAB is not set | 903 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 851 | # CONFIG_USB_STORAGE_FREECOM is not set | 904 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 905 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 852 | # CONFIG_USB_STORAGE_DPCM is not set | 906 | # CONFIG_USB_STORAGE_DPCM is not set |
| 853 | # CONFIG_USB_STORAGE_USBAT is not set | 907 | # CONFIG_USB_STORAGE_USBAT is not set |
| 854 | # CONFIG_USB_STORAGE_SDDR09 is not set | 908 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 855 | # CONFIG_USB_STORAGE_SDDR55 is not set | 909 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 856 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 910 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 857 | # CONFIG_USB_STORAGE_ALAUDA is not set | 911 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 912 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 858 | # CONFIG_USB_STORAGE_KARMA is not set | 913 | # CONFIG_USB_STORAGE_KARMA is not set |
| 914 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 859 | # CONFIG_USB_LIBUSUAL is not set | 915 | # CONFIG_USB_LIBUSUAL is not set |
| 860 | 916 | ||
| 861 | # | 917 | # |
| @@ -868,10 +924,6 @@ CONFIG_USB_MON=y | |||
| 868 | # | 924 | # |
| 869 | # USB port drivers | 925 | # USB port drivers |
| 870 | # | 926 | # |
| 871 | |||
| 872 | # | ||
| 873 | # USB Serial Converter support | ||
| 874 | # | ||
| 875 | # CONFIG_USB_SERIAL is not set | 927 | # CONFIG_USB_SERIAL is not set |
| 876 | 928 | ||
| 877 | # | 929 | # |
| @@ -896,36 +948,14 @@ CONFIG_USB_MON=y | |||
| 896 | # CONFIG_USB_LD is not set | 948 | # CONFIG_USB_LD is not set |
| 897 | # CONFIG_USB_TRANCEVIBRATOR is not set | 949 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 898 | # CONFIG_USB_IOWARRIOR is not set | 950 | # CONFIG_USB_IOWARRIOR is not set |
| 899 | |||
| 900 | # | ||
| 901 | # USB DSL modem support | ||
| 902 | # | ||
| 903 | |||
| 904 | # | ||
| 905 | # USB Gadget Support | ||
| 906 | # | ||
| 907 | # CONFIG_USB_GADGET is not set | 951 | # CONFIG_USB_GADGET is not set |
| 908 | # CONFIG_MMC is not set | 952 | # CONFIG_MMC is not set |
| 953 | # CONFIG_MEMSTICK is not set | ||
| 909 | # CONFIG_NEW_LEDS is not set | 954 | # CONFIG_NEW_LEDS is not set |
| 955 | # CONFIG_ACCESSIBILITY is not set | ||
| 910 | # CONFIG_INFINIBAND is not set | 956 | # CONFIG_INFINIBAND is not set |
| 957 | CONFIG_RTC_LIB=y | ||
| 911 | # CONFIG_RTC_CLASS is not set | 958 | # CONFIG_RTC_CLASS is not set |
| 912 | |||
| 913 | # | ||
| 914 | # DMA Engine support | ||
| 915 | # | ||
| 916 | # CONFIG_DMA_ENGINE is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # DMA Clients | ||
| 920 | # | ||
| 921 | |||
| 922 | # | ||
| 923 | # DMA Devices | ||
| 924 | # | ||
| 925 | |||
| 926 | # | ||
| 927 | # Userspace I/O | ||
| 928 | # | ||
| 929 | # CONFIG_UIO is not set | 959 | # CONFIG_UIO is not set |
| 930 | 960 | ||
| 931 | # | 961 | # |
| @@ -940,25 +970,21 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 940 | # CONFIG_EXT3_FS_SECURITY is not set | 970 | # CONFIG_EXT3_FS_SECURITY is not set |
| 941 | # CONFIG_EXT4DEV_FS is not set | 971 | # CONFIG_EXT4DEV_FS is not set |
| 942 | CONFIG_JBD=y | 972 | CONFIG_JBD=y |
| 943 | # CONFIG_JBD_DEBUG is not set | ||
| 944 | CONFIG_FS_MBCACHE=y | 973 | CONFIG_FS_MBCACHE=y |
| 945 | # CONFIG_REISERFS_FS is not set | 974 | # CONFIG_REISERFS_FS is not set |
| 946 | # CONFIG_JFS_FS is not set | 975 | # CONFIG_JFS_FS is not set |
| 947 | CONFIG_FS_POSIX_ACL=y | 976 | CONFIG_FS_POSIX_ACL=y |
| 948 | CONFIG_XFS_FS=y | 977 | CONFIG_XFS_FS=y |
| 949 | CONFIG_XFS_QUOTA=y | 978 | CONFIG_XFS_QUOTA=y |
| 950 | # CONFIG_XFS_SECURITY is not set | ||
| 951 | CONFIG_XFS_POSIX_ACL=y | 979 | CONFIG_XFS_POSIX_ACL=y |
| 952 | # CONFIG_XFS_RT is not set | 980 | # CONFIG_XFS_RT is not set |
| 953 | # CONFIG_GFS2_FS is not set | 981 | # CONFIG_XFS_DEBUG is not set |
| 954 | # CONFIG_OCFS2_FS is not set | 982 | # CONFIG_OCFS2_FS is not set |
| 955 | # CONFIG_MINIX_FS is not set | 983 | CONFIG_DNOTIFY=y |
| 956 | CONFIG_ROMFS_FS=m | ||
| 957 | CONFIG_INOTIFY=y | 984 | CONFIG_INOTIFY=y |
| 958 | CONFIG_INOTIFY_USER=y | 985 | CONFIG_INOTIFY_USER=y |
| 959 | # CONFIG_QUOTA is not set | 986 | # CONFIG_QUOTA is not set |
| 960 | CONFIG_QUOTACTL=y | 987 | CONFIG_QUOTACTL=y |
| 961 | CONFIG_DNOTIFY=y | ||
| 962 | # CONFIG_AUTOFS_FS is not set | 988 | # CONFIG_AUTOFS_FS is not set |
| 963 | CONFIG_AUTOFS4_FS=y | 989 | CONFIG_AUTOFS4_FS=y |
| 964 | # CONFIG_FUSE_FS is not set | 990 | # CONFIG_FUSE_FS is not set |
| @@ -987,7 +1013,6 @@ CONFIG_SYSFS=y | |||
| 987 | CONFIG_TMPFS=y | 1013 | CONFIG_TMPFS=y |
| 988 | CONFIG_TMPFS_POSIX_ACL=y | 1014 | CONFIG_TMPFS_POSIX_ACL=y |
| 989 | # CONFIG_HUGETLB_PAGE is not set | 1015 | # CONFIG_HUGETLB_PAGE is not set |
| 990 | CONFIG_RAMFS=y | ||
| 991 | # CONFIG_CONFIGFS_FS is not set | 1016 | # CONFIG_CONFIGFS_FS is not set |
| 992 | 1017 | ||
| 993 | # | 1018 | # |
| @@ -1002,24 +1027,21 @@ CONFIG_RAMFS=y | |||
| 1002 | # CONFIG_EFS_FS is not set | 1027 | # CONFIG_EFS_FS is not set |
| 1003 | CONFIG_CRAMFS=m | 1028 | CONFIG_CRAMFS=m |
| 1004 | # CONFIG_VXFS_FS is not set | 1029 | # CONFIG_VXFS_FS is not set |
| 1030 | # CONFIG_MINIX_FS is not set | ||
| 1005 | # CONFIG_HPFS_FS is not set | 1031 | # CONFIG_HPFS_FS is not set |
| 1006 | # CONFIG_QNX4FS_FS is not set | 1032 | # CONFIG_QNX4FS_FS is not set |
| 1033 | CONFIG_ROMFS_FS=m | ||
| 1007 | # CONFIG_SYSV_FS is not set | 1034 | # CONFIG_SYSV_FS is not set |
| 1008 | # CONFIG_UFS_FS is not set | 1035 | # CONFIG_UFS_FS is not set |
| 1009 | 1036 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1010 | # | ||
| 1011 | # Network File Systems | ||
| 1012 | # | ||
| 1013 | CONFIG_NFS_FS=y | 1037 | CONFIG_NFS_FS=y |
| 1014 | CONFIG_NFS_V3=y | 1038 | CONFIG_NFS_V3=y |
| 1015 | # CONFIG_NFS_V3_ACL is not set | 1039 | # CONFIG_NFS_V3_ACL is not set |
| 1016 | # CONFIG_NFS_V4 is not set | 1040 | # CONFIG_NFS_V4 is not set |
| 1017 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1018 | CONFIG_NFSD=m | 1041 | CONFIG_NFSD=m |
| 1019 | CONFIG_NFSD_V3=y | 1042 | CONFIG_NFSD_V3=y |
| 1020 | # CONFIG_NFSD_V3_ACL is not set | 1043 | # CONFIG_NFSD_V3_ACL is not set |
| 1021 | # CONFIG_NFSD_V4 is not set | 1044 | # CONFIG_NFSD_V4 is not set |
| 1022 | CONFIG_NFSD_TCP=y | ||
| 1023 | CONFIG_ROOT_NFS=y | 1045 | CONFIG_ROOT_NFS=y |
| 1024 | CONFIG_LOCKD=y | 1046 | CONFIG_LOCKD=y |
| 1025 | CONFIG_LOCKD_V4=y | 1047 | CONFIG_LOCKD_V4=y |
| @@ -1040,47 +1062,38 @@ CONFIG_SUNRPC=y | |||
| 1040 | # | 1062 | # |
| 1041 | # CONFIG_PARTITION_ADVANCED is not set | 1063 | # CONFIG_PARTITION_ADVANCED is not set |
| 1042 | CONFIG_MSDOS_PARTITION=y | 1064 | CONFIG_MSDOS_PARTITION=y |
| 1043 | |||
| 1044 | # | ||
| 1045 | # Native Language Support | ||
| 1046 | # | ||
| 1047 | # CONFIG_NLS is not set | 1065 | # CONFIG_NLS is not set |
| 1048 | |||
| 1049 | # | ||
| 1050 | # Distributed Lock Manager | ||
| 1051 | # | ||
| 1052 | # CONFIG_DLM is not set | 1066 | # CONFIG_DLM is not set |
| 1053 | 1067 | ||
| 1054 | # | 1068 | # |
| 1055 | # Profiling support | ||
| 1056 | # | ||
| 1057 | # CONFIG_PROFILING is not set | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # Kernel hacking | 1069 | # Kernel hacking |
| 1061 | # | 1070 | # |
| 1062 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1071 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1063 | # CONFIG_PRINTK_TIME is not set | 1072 | # CONFIG_PRINTK_TIME is not set |
| 1073 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1064 | CONFIG_ENABLE_MUST_CHECK=y | 1074 | CONFIG_ENABLE_MUST_CHECK=y |
| 1075 | CONFIG_FRAME_WARN=1024 | ||
| 1065 | # CONFIG_MAGIC_SYSRQ is not set | 1076 | # CONFIG_MAGIC_SYSRQ is not set |
| 1066 | # CONFIG_UNUSED_SYMBOLS is not set | 1077 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1067 | # CONFIG_DEBUG_FS is not set | 1078 | # CONFIG_DEBUG_FS is not set |
| 1068 | # CONFIG_HEADERS_CHECK is not set | 1079 | # CONFIG_HEADERS_CHECK is not set |
| 1069 | # CONFIG_DEBUG_KERNEL is not set | 1080 | # CONFIG_DEBUG_KERNEL is not set |
| 1070 | CONFIG_CROSSCOMPILE=y | 1081 | # CONFIG_SAMPLES is not set |
| 1071 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 1082 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 1072 | 1083 | ||
| 1073 | # | 1084 | # |
| 1074 | # Security options | 1085 | # Security options |
| 1075 | # | 1086 | # |
| 1076 | # CONFIG_KEYS is not set | 1087 | # CONFIG_KEYS is not set |
| 1077 | # CONFIG_SECURITY is not set | 1088 | # CONFIG_SECURITY is not set |
| 1089 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1078 | # CONFIG_CRYPTO is not set | 1090 | # CONFIG_CRYPTO is not set |
| 1079 | 1091 | ||
| 1080 | # | 1092 | # |
| 1081 | # Library routines | 1093 | # Library routines |
| 1082 | # | 1094 | # |
| 1083 | CONFIG_BITREVERSE=y | 1095 | CONFIG_BITREVERSE=y |
| 1096 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1084 | CONFIG_CRC_CCITT=y | 1097 | CONFIG_CRC_CCITT=y |
| 1085 | # CONFIG_CRC16 is not set | 1098 | # CONFIG_CRC16 is not set |
| 1086 | # CONFIG_CRC_ITU_T is not set | 1099 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c index 28dfd2e2989a..23066985a734 100644 --- a/arch/mips/fw/arc/identify.c +++ b/arch/mips/fw/arc/identify.c | |||
| @@ -67,6 +67,11 @@ static struct smatch mach_table[] = { | |||
| 67 | .liname = "SNI RM200_PCI", | 67 | .liname = "SNI RM200_PCI", |
| 68 | .type = MACH_SNI_RM200_PCI, | 68 | .type = MACH_SNI_RM200_PCI, |
| 69 | .flags = PROM_FLAG_DONT_FREE_TEMP, | 69 | .flags = PROM_FLAG_DONT_FREE_TEMP, |
| 70 | }, { | ||
| 71 | .arcname = "RM200PCI-R5K", | ||
| 72 | .liname = "SNI RM200_PCI-R5K", | ||
| 73 | .type = MACH_SNI_RM200_PCI, | ||
| 74 | .flags = PROM_FLAG_DONT_FREE_TEMP, | ||
| 70 | } | 75 | } |
| 71 | }; | 76 | }; |
| 72 | 77 | ||
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 63370cdd3c90..cdf87a9dd4ba 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
| @@ -216,6 +216,7 @@ int smp_call_function(void (*func) (void *info), void *info, int retry, | |||
| 216 | { | 216 | { |
| 217 | return smp_call_function_mask(cpu_online_map, func, info, retry, wait); | 217 | return smp_call_function_mask(cpu_online_map, func, info, retry, wait); |
| 218 | } | 218 | } |
| 219 | EXPORT_SYMBOL(smp_call_function); | ||
| 219 | 220 | ||
| 220 | void smp_call_function_interrupt(void) | 221 | void smp_call_function_interrupt(void) |
| 221 | { | 222 | { |
| @@ -271,6 +272,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
| 271 | put_cpu(); | 272 | put_cpu(); |
| 272 | return 0; | 273 | return 0; |
| 273 | } | 274 | } |
| 275 | EXPORT_SYMBOL(smp_call_function_single); | ||
| 274 | 276 | ||
| 275 | static void stop_this_cpu(void *dummy) | 277 | static void stop_this_cpu(void *dummy) |
| 276 | { | 278 | { |
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index cfeab669782f..a56c15026965 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
| @@ -34,11 +34,13 @@ static volatile int lasat_int_mask_shift; | |||
| 34 | 34 | ||
| 35 | void disable_lasat_irq(unsigned int irq_nr) | 35 | void disable_lasat_irq(unsigned int irq_nr) |
| 36 | { | 36 | { |
| 37 | irq_nr -= LASAT_IRQ_BASE; | ||
| 37 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; | 38 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; |
| 38 | } | 39 | } |
| 39 | 40 | ||
| 40 | void enable_lasat_irq(unsigned int irq_nr) | 41 | void enable_lasat_irq(unsigned int irq_nr) |
| 41 | { | 42 | { |
| 43 | irq_nr -= LASAT_IRQ_BASE; | ||
| 42 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; | 44 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; |
| 43 | } | 45 | } |
| 44 | 46 | ||
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c index ec2f658c3709..31e328b3814d 100644 --- a/arch/mips/lasat/lasat_board.c +++ b/arch/mips/lasat/lasat_board.c | |||
| @@ -23,18 +23,19 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/string.h> | 24 | #include <linux/string.h> |
| 25 | #include <linux/ctype.h> | 25 | #include <linux/ctype.h> |
| 26 | #include <linux/mutex.h> | ||
| 26 | #include <asm/bootinfo.h> | 27 | #include <asm/bootinfo.h> |
| 27 | #include <asm/addrspace.h> | 28 | #include <asm/addrspace.h> |
| 28 | #include "at93c.h" | 29 | #include "at93c.h" |
| 29 | /* New model description table */ | 30 | /* New model description table */ |
| 30 | #include "lasat_models.h" | 31 | #include "lasat_models.h" |
| 31 | 32 | ||
| 33 | static DEFINE_MUTEX(lasat_eeprom_mutex); | ||
| 34 | |||
| 32 | #define EEPROM_CRC(data, len) (~crc32(~0, data, len)) | 35 | #define EEPROM_CRC(data, len) (~crc32(~0, data, len)) |
| 33 | 36 | ||
| 34 | struct lasat_info lasat_board_info; | 37 | struct lasat_info lasat_board_info; |
| 35 | 38 | ||
| 36 | void update_bcastaddr(void); | ||
| 37 | |||
| 38 | int EEPROMRead(unsigned int pos, unsigned char *data, int len) | 39 | int EEPROMRead(unsigned int pos, unsigned char *data, int len) |
| 39 | { | 40 | { |
| 40 | int i; | 41 | int i; |
| @@ -258,10 +259,6 @@ int lasat_init_board_info(void) | |||
| 258 | sprintf(lasat_board_info.li_typestr, "%d", 10 * c); | 259 | sprintf(lasat_board_info.li_typestr, "%d", 10 * c); |
| 259 | } | 260 | } |
| 260 | 261 | ||
| 261 | #if defined(CONFIG_INET) && defined(CONFIG_SYSCTL) | ||
| 262 | update_bcastaddr(); | ||
| 263 | #endif | ||
| 264 | |||
| 265 | return 0; | 262 | return 0; |
| 266 | } | 263 | } |
| 267 | 264 | ||
| @@ -269,6 +266,8 @@ void lasat_write_eeprom_info(void) | |||
| 269 | { | 266 | { |
| 270 | unsigned long crc; | 267 | unsigned long crc; |
| 271 | 268 | ||
| 269 | mutex_lock(&lasat_eeprom_mutex); | ||
| 270 | |||
| 272 | /* Generate the CRC */ | 271 | /* Generate the CRC */ |
| 273 | crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info), | 272 | crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info), |
| 274 | sizeof(struct lasat_eeprom_struct) - 4); | 273 | sizeof(struct lasat_eeprom_struct) - 4); |
| @@ -277,4 +276,6 @@ void lasat_write_eeprom_info(void) | |||
| 277 | /* Write the EEPROM info */ | 276 | /* Write the EEPROM info */ |
| 278 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, | 277 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, |
| 279 | sizeof(struct lasat_eeprom_struct)); | 278 | sizeof(struct lasat_eeprom_struct)); |
| 279 | |||
| 280 | mutex_unlock(&lasat_eeprom_mutex); | ||
| 280 | } | 281 | } |
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 389336c4ecc5..866881ec0cf8 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
| @@ -29,15 +29,13 @@ | |||
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/net.h> | 30 | #include <linux/net.h> |
| 31 | #include <linux/inet.h> | 31 | #include <linux/inet.h> |
| 32 | #include <linux/mutex.h> | ||
| 33 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
| 34 | 33 | ||
| 35 | #include <asm/time.h> | 34 | #include <asm/time.h> |
| 36 | 35 | ||
| 37 | #include "sysctl.h" | 36 | #ifdef CONFIG_DS1603 |
| 38 | #include "ds1603.h" | 37 | #include "ds1603.h" |
| 39 | 38 | #endif | |
| 40 | static DEFINE_MUTEX(lasat_info_mutex); | ||
| 41 | 39 | ||
| 42 | /* Strategy function to write EEPROM after changing string entry */ | 40 | /* Strategy function to write EEPROM after changing string entry */ |
| 43 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | 41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, |
| @@ -46,18 +44,15 @@ int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | |||
| 46 | { | 44 | { |
| 47 | int r; | 45 | int r; |
| 48 | 46 | ||
| 49 | mutex_lock(&lasat_info_mutex); | ||
| 50 | r = sysctl_string(table, name, | 47 | r = sysctl_string(table, name, |
| 51 | nlen, oldval, oldlenp, newval, newlen); | 48 | nlen, oldval, oldlenp, newval, newlen); |
| 52 | if (r < 0) { | 49 | if (r < 0) |
| 53 | mutex_unlock(&lasat_info_mutex); | ||
| 54 | return r; | 50 | return r; |
| 55 | } | 51 | |
| 56 | if (newval && newlen) | 52 | if (newval && newlen) |
| 57 | lasat_write_eeprom_info(); | 53 | lasat_write_eeprom_info(); |
| 58 | mutex_unlock(&lasat_info_mutex); | ||
| 59 | 54 | ||
| 60 | return 1; | 55 | return 0; |
| 61 | } | 56 | } |
| 62 | 57 | ||
| 63 | 58 | ||
| @@ -67,14 +62,11 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp, | |||
| 67 | { | 62 | { |
| 68 | int r; | 63 | int r; |
| 69 | 64 | ||
| 70 | mutex_lock(&lasat_info_mutex); | ||
| 71 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); | 65 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); |
| 72 | if ((!write) || r) { | 66 | if ((!write) || r) |
| 73 | mutex_unlock(&lasat_info_mutex); | ||
| 74 | return r; | 67 | return r; |
| 75 | } | 68 | |
| 76 | lasat_write_eeprom_info(); | 69 | lasat_write_eeprom_info(); |
| 77 | mutex_unlock(&lasat_info_mutex); | ||
| 78 | 70 | ||
| 79 | return 0; | 71 | return 0; |
| 80 | } | 72 | } |
| @@ -85,28 +77,24 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp, | |||
| 85 | { | 77 | { |
| 86 | int r; | 78 | int r; |
| 87 | 79 | ||
| 88 | mutex_lock(&lasat_info_mutex); | ||
| 89 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 80 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 90 | if ((!write) || r) { | 81 | if ((!write) || r) |
| 91 | mutex_unlock(&lasat_info_mutex); | ||
| 92 | return r; | 82 | return r; |
| 93 | } | 83 | |
| 94 | lasat_write_eeprom_info(); | 84 | lasat_write_eeprom_info(); |
| 95 | mutex_unlock(&lasat_info_mutex); | ||
| 96 | 85 | ||
| 97 | return 0; | 86 | return 0; |
| 98 | } | 87 | } |
| 99 | 88 | ||
| 89 | #ifdef CONFIG_DS1603 | ||
| 100 | static int rtctmp; | 90 | static int rtctmp; |
| 101 | 91 | ||
| 102 | #ifdef CONFIG_DS1603 | ||
| 103 | /* proc function to read/write RealTime Clock */ | 92 | /* proc function to read/write RealTime Clock */ |
| 104 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | 93 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, |
| 105 | void *buffer, size_t *lenp, loff_t *ppos) | 94 | void *buffer, size_t *lenp, loff_t *ppos) |
| 106 | { | 95 | { |
| 107 | int r; | 96 | int r; |
| 108 | 97 | ||
| 109 | mutex_lock(&lasat_info_mutex); | ||
| 110 | if (!write) { | 98 | if (!write) { |
| 111 | rtctmp = read_persistent_clock(); | 99 | rtctmp = read_persistent_clock(); |
| 112 | /* check for time < 0 and set to 0 */ | 100 | /* check for time < 0 and set to 0 */ |
| @@ -114,12 +102,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | |||
| 114 | rtctmp = 0; | 102 | rtctmp = 0; |
| 115 | } | 103 | } |
| 116 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 104 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 117 | if ((!write) || r) { | 105 | if (r) |
| 118 | mutex_unlock(&lasat_info_mutex); | ||
| 119 | return r; | 106 | return r; |
| 120 | } | 107 | |
| 121 | rtc_mips_set_mmss(rtctmp); | 108 | if (write) |
| 122 | mutex_unlock(&lasat_info_mutex); | 109 | rtc_mips_set_mmss(rtctmp); |
| 123 | 110 | ||
| 124 | return 0; | 111 | return 0; |
| 125 | } | 112 | } |
| @@ -132,17 +119,14 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen, | |||
| 132 | { | 119 | { |
| 133 | int r; | 120 | int r; |
| 134 | 121 | ||
| 135 | mutex_lock(&lasat_info_mutex); | ||
| 136 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 122 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 137 | if (r < 0) { | 123 | if (r < 0) |
| 138 | mutex_unlock(&lasat_info_mutex); | ||
| 139 | return r; | 124 | return r; |
| 140 | } | 125 | |
| 141 | if (newval && newlen) | 126 | if (newval && newlen) |
| 142 | lasat_write_eeprom_info(); | 127 | lasat_write_eeprom_info(); |
| 143 | mutex_unlock(&lasat_info_mutex); | ||
| 144 | 128 | ||
| 145 | return 1; | 129 | return 0; |
| 146 | } | 130 | } |
| 147 | 131 | ||
| 148 | #ifdef CONFIG_DS1603 | 132 | #ifdef CONFIG_DS1603 |
| @@ -153,50 +137,27 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen, | |||
| 153 | { | 137 | { |
| 154 | int r; | 138 | int r; |
| 155 | 139 | ||
| 156 | mutex_lock(&lasat_info_mutex); | ||
| 157 | rtctmp = read_persistent_clock(); | 140 | rtctmp = read_persistent_clock(); |
| 158 | if (rtctmp < 0) | 141 | if (rtctmp < 0) |
| 159 | rtctmp = 0; | 142 | rtctmp = 0; |
| 160 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 143 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 161 | if (r < 0) { | 144 | if (r < 0) |
| 162 | mutex_unlock(&lasat_info_mutex); | ||
| 163 | return r; | 145 | return r; |
| 164 | } | ||
| 165 | if (newval && newlen) | 146 | if (newval && newlen) |
| 166 | rtc_mips_set_mmss(rtctmp); | 147 | rtc_mips_set_mmss(rtctmp); |
| 167 | mutex_unlock(&lasat_info_mutex); | ||
| 168 | 148 | ||
| 169 | return 1; | 149 | return r; |
| 170 | } | 150 | } |
| 171 | #endif | 151 | #endif |
| 172 | 152 | ||
| 173 | #ifdef CONFIG_INET | 153 | #ifdef CONFIG_INET |
| 174 | static char lasat_bcastaddr[16]; | ||
| 175 | |||
| 176 | void update_bcastaddr(void) | ||
| 177 | { | ||
| 178 | unsigned int ip; | ||
| 179 | |||
| 180 | ip = (lasat_board_info.li_eeprom_info.ipaddr & | ||
| 181 | lasat_board_info.li_eeprom_info.netmask) | | ||
| 182 | ~lasat_board_info.li_eeprom_info.netmask; | ||
| 183 | |||
| 184 | sprintf(lasat_bcastaddr, "%d.%d.%d.%d", | ||
| 185 | (ip) & 0xff, | ||
| 186 | (ip >> 8) & 0xff, | ||
| 187 | (ip >> 16) & 0xff, | ||
| 188 | (ip >> 24) & 0xff); | ||
| 189 | } | ||
| 190 | |||
| 191 | static char proc_lasat_ipbuf[32]; | ||
| 192 | |||
| 193 | /* Parsing of IP address */ | ||
| 194 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | 154 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, |
| 195 | void *buffer, size_t *lenp, loff_t *ppos) | 155 | void *buffer, size_t *lenp, loff_t *ppos) |
| 196 | { | 156 | { |
| 197 | unsigned int ip; | 157 | unsigned int ip; |
| 198 | char *p, c; | 158 | char *p, c; |
| 199 | int len; | 159 | int len; |
| 160 | char ipbuf[32]; | ||
| 200 | 161 | ||
| 201 | if (!table->data || !table->maxlen || !*lenp || | 162 | if (!table->data || !table->maxlen || !*lenp || |
| 202 | (*ppos && !write)) { | 163 | (*ppos && !write)) { |
| @@ -204,117 +165,88 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
| 204 | return 0; | 165 | return 0; |
| 205 | } | 166 | } |
| 206 | 167 | ||
| 207 | mutex_lock(&lasat_info_mutex); | ||
| 208 | if (write) { | 168 | if (write) { |
| 209 | len = 0; | 169 | len = 0; |
| 210 | p = buffer; | 170 | p = buffer; |
| 211 | while (len < *lenp) { | 171 | while (len < *lenp) { |
| 212 | if (get_user(c, p++)) { | 172 | if (get_user(c, p++)) |
| 213 | mutex_unlock(&lasat_info_mutex); | ||
| 214 | return -EFAULT; | 173 | return -EFAULT; |
| 215 | } | ||
| 216 | if (c == 0 || c == '\n') | 174 | if (c == 0 || c == '\n') |
| 217 | break; | 175 | break; |
| 218 | len++; | 176 | len++; |
| 219 | } | 177 | } |
| 220 | if (len >= sizeof(proc_lasat_ipbuf)-1) | 178 | if (len >= sizeof(ipbuf)-1) |
| 221 | len = sizeof(proc_lasat_ipbuf) - 1; | 179 | len = sizeof(ipbuf) - 1; |
| 222 | if (copy_from_user(proc_lasat_ipbuf, buffer, len)) { | 180 | if (copy_from_user(ipbuf, buffer, len)) |
| 223 | mutex_unlock(&lasat_info_mutex); | ||
| 224 | return -EFAULT; | 181 | return -EFAULT; |
| 225 | } | 182 | ipbuf[len] = 0; |
| 226 | proc_lasat_ipbuf[len] = 0; | ||
| 227 | *ppos += *lenp; | 183 | *ppos += *lenp; |
| 228 | /* Now see if we can convert it to a valid IP */ | 184 | /* Now see if we can convert it to a valid IP */ |
| 229 | ip = in_aton(proc_lasat_ipbuf); | 185 | ip = in_aton(ipbuf); |
| 230 | *(unsigned int *)(table->data) = ip; | 186 | *(unsigned int *)(table->data) = ip; |
| 231 | lasat_write_eeprom_info(); | 187 | lasat_write_eeprom_info(); |
| 232 | } else { | 188 | } else { |
| 233 | ip = *(unsigned int *)(table->data); | 189 | ip = *(unsigned int *)(table->data); |
| 234 | sprintf(proc_lasat_ipbuf, "%d.%d.%d.%d", | 190 | sprintf(ipbuf, "%d.%d.%d.%d", |
| 235 | (ip) & 0xff, | 191 | (ip) & 0xff, |
| 236 | (ip >> 8) & 0xff, | 192 | (ip >> 8) & 0xff, |
| 237 | (ip >> 16) & 0xff, | 193 | (ip >> 16) & 0xff, |
| 238 | (ip >> 24) & 0xff); | 194 | (ip >> 24) & 0xff); |
| 239 | len = strlen(proc_lasat_ipbuf); | 195 | len = strlen(ipbuf); |
| 240 | if (len > *lenp) | 196 | if (len > *lenp) |
| 241 | len = *lenp; | 197 | len = *lenp; |
| 242 | if (len) | 198 | if (len) |
| 243 | if (copy_to_user(buffer, proc_lasat_ipbuf, len)) { | 199 | if (copy_to_user(buffer, ipbuf, len)) |
| 244 | mutex_unlock(&lasat_info_mutex); | ||
| 245 | return -EFAULT; | 200 | return -EFAULT; |
| 246 | } | ||
| 247 | if (len < *lenp) { | 201 | if (len < *lenp) { |
| 248 | if (put_user('\n', ((char *) buffer) + len)) { | 202 | if (put_user('\n', ((char *) buffer) + len)) |
| 249 | mutex_unlock(&lasat_info_mutex); | ||
| 250 | return -EFAULT; | 203 | return -EFAULT; |
| 251 | } | ||
| 252 | len++; | 204 | len++; |
| 253 | } | 205 | } |
| 254 | *lenp = len; | 206 | *lenp = len; |
| 255 | *ppos += len; | 207 | *ppos += len; |
| 256 | } | 208 | } |
| 257 | update_bcastaddr(); | ||
| 258 | mutex_unlock(&lasat_info_mutex); | ||
| 259 | 209 | ||
| 260 | return 0; | 210 | return 0; |
| 261 | } | 211 | } |
| 262 | #endif /* defined(CONFIG_INET) */ | 212 | #endif |
| 263 | 213 | ||
| 264 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, | 214 | static int sysctl_lasat_prid(ctl_table *table, int *name, int nlen, |
| 265 | void *oldval, size_t *oldlenp, | 215 | void *oldval, size_t *oldlenp, |
| 266 | void *newval, size_t newlen) | 216 | void *newval, size_t newlen) |
| 267 | { | 217 | { |
| 268 | int r; | 218 | int r; |
| 269 | 219 | ||
| 270 | mutex_lock(&lasat_info_mutex); | ||
| 271 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 220 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 272 | if (r < 0) { | 221 | if (r < 0) |
| 273 | mutex_unlock(&lasat_info_mutex); | ||
| 274 | return r; | 222 | return r; |
| 275 | } | ||
| 276 | |||
| 277 | if (newval && newlen) { | 223 | if (newval && newlen) { |
| 278 | if (name && *name == LASAT_PRID) | 224 | lasat_board_info.li_eeprom_info.prid = *(int *)newval; |
| 279 | lasat_board_info.li_eeprom_info.prid = *(int *)newval; | ||
| 280 | |||
| 281 | lasat_write_eeprom_info(); | 225 | lasat_write_eeprom_info(); |
| 282 | lasat_init_board_info(); | 226 | lasat_init_board_info(); |
| 283 | } | 227 | } |
| 284 | mutex_unlock(&lasat_info_mutex); | ||
| 285 | |||
| 286 | return 0; | 228 | return 0; |
| 287 | } | 229 | } |
| 288 | 230 | ||
| 289 | int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp, | 231 | int proc_lasat_prid(ctl_table *table, int write, struct file *filp, |
| 290 | void *buffer, size_t *lenp, loff_t *ppos) | 232 | void *buffer, size_t *lenp, loff_t *ppos) |
| 291 | { | 233 | { |
| 292 | int r; | 234 | int r; |
| 293 | 235 | ||
| 294 | mutex_lock(&lasat_info_mutex); | ||
| 295 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 236 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 296 | if ((!write) || r) { | 237 | if (r < 0) |
| 297 | mutex_unlock(&lasat_info_mutex); | ||
| 298 | return r; | 238 | return r; |
| 239 | if (write) { | ||
| 240 | lasat_board_info.li_eeprom_info.prid = | ||
| 241 | lasat_board_info.li_prid; | ||
| 242 | lasat_write_eeprom_info(); | ||
| 243 | lasat_init_board_info(); | ||
| 299 | } | 244 | } |
| 300 | if (filp && filp->f_path.dentry) { | ||
| 301 | if (!strcmp(filp->f_path.dentry->d_name.name, "prid")) | ||
| 302 | lasat_board_info.li_eeprom_info.prid = | ||
| 303 | lasat_board_info.li_prid; | ||
| 304 | if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess")) | ||
| 305 | lasat_board_info.li_eeprom_info.debugaccess = | ||
| 306 | lasat_board_info.li_debugaccess; | ||
| 307 | } | ||
| 308 | lasat_write_eeprom_info(); | ||
| 309 | mutex_unlock(&lasat_info_mutex); | ||
| 310 | |||
| 311 | return 0; | 245 | return 0; |
| 312 | } | 246 | } |
| 313 | 247 | ||
| 314 | extern int lasat_boot_to_service; | 248 | extern int lasat_boot_to_service; |
| 315 | 249 | ||
| 316 | #ifdef CONFIG_SYSCTL | ||
| 317 | |||
| 318 | static ctl_table lasat_table[] = { | 250 | static ctl_table lasat_table[] = { |
| 319 | { | 251 | { |
| 320 | .ctl_name = CTL_UNNUMBERED, | 252 | .ctl_name = CTL_UNNUMBERED, |
| @@ -349,8 +281,8 @@ static ctl_table lasat_table[] = { | |||
| 349 | .data = &lasat_board_info.li_prid, | 281 | .data = &lasat_board_info.li_prid, |
| 350 | .maxlen = sizeof(int), | 282 | .maxlen = sizeof(int), |
| 351 | .mode = 0644, | 283 | .mode = 0644, |
| 352 | .proc_handler = &proc_lasat_eeprom_value, | 284 | .proc_handler = &proc_lasat_prid, |
| 353 | .strategy = &sysctl_lasat_eeprom_value | 285 | .strategy = &sysctl_lasat_prid |
| 354 | }, | 286 | }, |
| 355 | #ifdef CONFIG_INET | 287 | #ifdef CONFIG_INET |
| 356 | { | 288 | { |
| @@ -363,7 +295,7 @@ static ctl_table lasat_table[] = { | |||
| 363 | .strategy = &sysctl_lasat_intvec | 295 | .strategy = &sysctl_lasat_intvec |
| 364 | }, | 296 | }, |
| 365 | { | 297 | { |
| 366 | .ctl_name = LASAT_NETMASK, | 298 | .ctl_name = CTL_UNNUMBERED, |
| 367 | .procname = "netmask", | 299 | .procname = "netmask", |
| 368 | .data = &lasat_board_info.li_eeprom_info.netmask, | 300 | .data = &lasat_board_info.li_eeprom_info.netmask, |
| 369 | .maxlen = sizeof(int), | 301 | .maxlen = sizeof(int), |
| @@ -371,15 +303,6 @@ static ctl_table lasat_table[] = { | |||
| 371 | .proc_handler = &proc_lasat_ip, | 303 | .proc_handler = &proc_lasat_ip, |
| 372 | .strategy = &sysctl_lasat_intvec | 304 | .strategy = &sysctl_lasat_intvec |
| 373 | }, | 305 | }, |
| 374 | { | ||
| 375 | .ctl_name = CTL_UNNUMBERED, | ||
| 376 | .procname = "bcastaddr", | ||
| 377 | .data = &lasat_bcastaddr, | ||
| 378 | .maxlen = sizeof(lasat_bcastaddr), | ||
| 379 | .mode = 0600, | ||
| 380 | .proc_handler = &proc_dostring, | ||
| 381 | .strategy = &sysctl_string | ||
| 382 | }, | ||
| 383 | #endif | 306 | #endif |
| 384 | { | 307 | { |
| 385 | .ctl_name = CTL_UNNUMBERED, | 308 | .ctl_name = CTL_UNNUMBERED, |
| @@ -417,7 +340,7 @@ static ctl_table lasat_table[] = { | |||
| 417 | .data = &lasat_board_info.li_namestr, | 340 | .data = &lasat_board_info.li_namestr, |
| 418 | .maxlen = sizeof(lasat_board_info.li_namestr), | 341 | .maxlen = sizeof(lasat_board_info.li_namestr), |
| 419 | .mode = 0444, | 342 | .mode = 0444, |
| 420 | .proc_handler = &proc_dostring, | 343 | .proc_handler = &proc_dostring, |
| 421 | .strategy = &sysctl_string | 344 | .strategy = &sysctl_string |
| 422 | }, | 345 | }, |
| 423 | { | 346 | { |
| @@ -448,9 +371,12 @@ static int __init lasat_register_sysctl(void) | |||
| 448 | 371 | ||
| 449 | lasat_table_header = | 372 | lasat_table_header = |
| 450 | register_sysctl_table(lasat_root_table); | 373 | register_sysctl_table(lasat_root_table); |
| 374 | if (!lasat_table_header) { | ||
| 375 | printk(KERN_ERR "Unable to register LASAT sysctl\n"); | ||
| 376 | return -ENOMEM; | ||
| 377 | } | ||
| 451 | 378 | ||
| 452 | return 0; | 379 | return 0; |
| 453 | } | 380 | } |
| 454 | 381 | ||
| 455 | __initcall(lasat_register_sysctl); | 382 | __initcall(lasat_register_sysctl); |
| 456 | #endif /* CONFIG_SYSCTL */ | ||
diff --git a/arch/mips/lasat/sysctl.h b/arch/mips/lasat/sysctl.h deleted file mode 100644 index 341b97933423..000000000000 --- a/arch/mips/lasat/sysctl.h +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * LASAT sysctl values | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef _LASAT_SYSCTL_H | ||
| 6 | #define _LASAT_SYSCTL_H | ||
| 7 | |||
| 8 | /* /proc/sys/lasat */ | ||
| 9 | enum { | ||
| 10 | LASAT_CPU_HZ = 1, | ||
| 11 | LASAT_BUS_HZ, | ||
| 12 | LASAT_MODEL, | ||
| 13 | LASAT_PRID, | ||
| 14 | LASAT_IPADDR, | ||
| 15 | LASAT_NETMASK, | ||
| 16 | LASAT_BCAST, | ||
| 17 | LASAT_PASSWORD, | ||
| 18 | LASAT_SBOOT, | ||
| 19 | LASAT_RTC, | ||
| 20 | LASAT_NAMESTR, | ||
| 21 | LASAT_TYPESTR, | ||
| 22 | }; | ||
| 23 | |||
| 24 | #endif /* _LASAT_SYSCTL_H */ | ||
diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c index b7633fda4180..96236bf33838 100644 --- a/arch/mips/mips-boards/generic/amon.c +++ b/arch/mips/mips-boards/generic/amon.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | int amon_cpu_avail(int cpu) | 29 | int amon_cpu_avail(int cpu) |
| 30 | { | 30 | { |
| 31 | struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); | 31 | struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); |
| 32 | 32 | ||
| 33 | if (cpu < 0 || cpu >= NCPULAUNCH) { | 33 | if (cpu < 0 || cpu >= NCPULAUNCH) { |
| 34 | pr_debug("avail: cpu%d is out of range\n", cpu); | 34 | pr_debug("avail: cpu%d is out of range\n", cpu); |
| @@ -53,7 +53,7 @@ void amon_cpu_start(int cpu, | |||
| 53 | unsigned long gp, unsigned long a0) | 53 | unsigned long gp, unsigned long a0) |
| 54 | { | 54 | { |
| 55 | volatile struct cpulaunch *launch = | 55 | volatile struct cpulaunch *launch = |
| 56 | (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); | 56 | (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); |
| 57 | 57 | ||
| 58 | if (!amon_cpu_avail(cpu)) | 58 | if (!amon_cpu_avail(cpu)) |
| 59 | return; | 59 | return; |
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile index 8dc6e2ac4c03..db4ad654a6d3 100644 --- a/arch/mips/mips-boards/malta/Makefile +++ b/arch/mips/mips-boards/malta/Makefile | |||
| @@ -19,9 +19,8 @@ | |||
| 19 | # under Linux. | 19 | # under Linux. |
| 20 | # | 20 | # |
| 21 | 21 | ||
| 22 | obj-y := malta_int.o malta_platform.o malta_setup.o | 22 | obj-y := malta_int.o malta_mtd.o malta_platform.o malta_setup.o |
| 23 | 23 | ||
| 24 | obj-$(CONFIG_MTD) += malta_mtd.o | ||
| 25 | # FIXME FIXME FIXME | 24 | # FIXME FIXME FIXME |
| 26 | obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o | 25 | obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o |
| 27 | 26 | ||
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 643c8bcffff3..27096751ddce 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
| @@ -446,6 +446,7 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 446 | struct page *page = pfn_to_page(fcp_args->pfn); | 446 | struct page *page = pfn_to_page(fcp_args->pfn); |
| 447 | int exec = vma->vm_flags & VM_EXEC; | 447 | int exec = vma->vm_flags & VM_EXEC; |
| 448 | struct mm_struct *mm = vma->vm_mm; | 448 | struct mm_struct *mm = vma->vm_mm; |
| 449 | int map_coherent = 0; | ||
| 449 | pgd_t *pgdp; | 450 | pgd_t *pgdp; |
| 450 | pud_t *pudp; | 451 | pud_t *pudp; |
| 451 | pmd_t *pmdp; | 452 | pmd_t *pmdp; |
| @@ -479,7 +480,9 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 479 | * Use kmap_coherent or kmap_atomic to do flushes for | 480 | * Use kmap_coherent or kmap_atomic to do flushes for |
| 480 | * another ASID than the current one. | 481 | * another ASID than the current one. |
| 481 | */ | 482 | */ |
| 482 | if (cpu_has_dc_aliases) | 483 | map_coherent = (cpu_has_dc_aliases && |
| 484 | page_mapped(page) && !Page_dcache_dirty(page)); | ||
| 485 | if (map_coherent) | ||
| 483 | vaddr = kmap_coherent(page, addr); | 486 | vaddr = kmap_coherent(page, addr); |
| 484 | else | 487 | else |
| 485 | vaddr = kmap_atomic(page, KM_USER0); | 488 | vaddr = kmap_atomic(page, KM_USER0); |
| @@ -502,7 +505,7 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 502 | } | 505 | } |
| 503 | 506 | ||
| 504 | if (vaddr) { | 507 | if (vaddr) { |
| 505 | if (cpu_has_dc_aliases) | 508 | if (map_coherent) |
| 506 | kunmap_coherent(); | 509 | kunmap_coherent(); |
| 507 | else | 510 | else |
| 508 | kunmap_atomic(vaddr, KM_USER0); | 511 | kunmap_atomic(vaddr, KM_USER0); |
| @@ -1226,6 +1229,28 @@ void au1x00_fixup_config_od(void) | |||
| 1226 | } | 1229 | } |
| 1227 | } | 1230 | } |
| 1228 | 1231 | ||
| 1232 | /* CP0 hazard avoidance. */ | ||
| 1233 | #define NXP_BARRIER() \ | ||
| 1234 | __asm__ __volatile__( \ | ||
| 1235 | ".set noreorder\n\t" \ | ||
| 1236 | "nop; nop; nop; nop; nop; nop;\n\t" \ | ||
| 1237 | ".set reorder\n\t") | ||
| 1238 | |||
| 1239 | static void nxp_pr4450_fixup_config(void) | ||
| 1240 | { | ||
| 1241 | unsigned long config0; | ||
| 1242 | |||
| 1243 | config0 = read_c0_config(); | ||
| 1244 | |||
| 1245 | /* clear all three cache coherency fields */ | ||
| 1246 | config0 &= ~(0x7 | (7 << 25) | (7 << 28)); | ||
| 1247 | config0 |= (((_page_cachable_default >> _CACHE_SHIFT) << 0) | | ||
| 1248 | ((_page_cachable_default >> _CACHE_SHIFT) << 25) | | ||
| 1249 | ((_page_cachable_default >> _CACHE_SHIFT) << 28)); | ||
| 1250 | write_c0_config(config0); | ||
| 1251 | NXP_BARRIER(); | ||
| 1252 | } | ||
| 1253 | |||
| 1229 | static int __cpuinitdata cca = -1; | 1254 | static int __cpuinitdata cca = -1; |
| 1230 | 1255 | ||
| 1231 | static int __init cca_setup(char *str) | 1256 | static int __init cca_setup(char *str) |
| @@ -1271,6 +1296,10 @@ static void __cpuinit coherency_setup(void) | |||
| 1271 | case CPU_AU1500: /* rev. AB */ | 1296 | case CPU_AU1500: /* rev. AB */ |
| 1272 | au1x00_fixup_config_od(); | 1297 | au1x00_fixup_config_od(); |
| 1273 | break; | 1298 | break; |
| 1299 | |||
| 1300 | case PRID_IMP_PR4450: | ||
| 1301 | nxp_pr4450_fixup_config(); | ||
| 1302 | break; | ||
| 1274 | } | 1303 | } |
| 1275 | } | 1304 | } |
| 1276 | 1305 | ||
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index ecd562d2c348..137c14bafd6b 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -71,6 +71,7 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
| 71 | * don't have to care about aliases on other CPUs. | 71 | * don't have to care about aliases on other CPUs. |
| 72 | */ | 72 | */ |
| 73 | unsigned long empty_zero_page, zero_page_mask; | 73 | unsigned long empty_zero_page, zero_page_mask; |
| 74 | EXPORT_SYMBOL_GPL(empty_zero_page); | ||
| 74 | 75 | ||
| 75 | /* | 76 | /* |
| 76 | * Not static inline because used by IP27 special magic initialization code | 77 | * Not static inline because used by IP27 special magic initialization code |
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c index cab81f42eee5..1edf0cbbeede 100644 --- a/arch/mips/mm/page.c +++ b/arch/mips/mm/page.c | |||
| @@ -460,7 +460,7 @@ void __cpuinit build_copy_page(void) | |||
| 460 | build_copy_load_pref(&buf, -off); | 460 | build_copy_load_pref(&buf, -off); |
| 461 | off -= cache_line_size; | 461 | off -= cache_line_size; |
| 462 | } | 462 | } |
| 463 | off = cache_line_size ? min(8, pref_bias_copy_load / cache_line_size) * | 463 | off = cache_line_size ? min(8, pref_bias_copy_store / cache_line_size) * |
| 464 | cache_line_size : 0; | 464 | cache_line_size : 0; |
| 465 | while (off) { | 465 | while (off) { |
| 466 | build_copy_store_pref(&buf, -off); | 466 | build_copy_store_pref(&buf, -off); |
diff --git a/arch/mips/nxp/pnx8550/jbs/board_setup.c b/arch/mips/nxp/pnx8550/jbs/board_setup.c index f92826e0096d..57dd903ca408 100644 --- a/arch/mips/nxp/pnx8550/jbs/board_setup.c +++ b/arch/mips/nxp/pnx8550/jbs/board_setup.c | |||
| @@ -47,16 +47,7 @@ | |||
| 47 | 47 | ||
| 48 | void __init board_setup(void) | 48 | void __init board_setup(void) |
| 49 | { | 49 | { |
| 50 | unsigned long config0, configpr; | 50 | unsigned long configpr; |
| 51 | |||
| 52 | config0 = read_c0_config(); | ||
| 53 | |||
| 54 | /* clear all three cache coherency fields */ | ||
| 55 | config0 &= ~(0x7 | (7<<25) | (7<<28)); | ||
| 56 | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) | | ||
| 57 | (CONF_CM_DEFAULT<<28)); | ||
| 58 | write_c0_config(config0); | ||
| 59 | BARRIER; | ||
| 60 | 51 | ||
| 61 | configpr = read_c0_config7(); | 52 | configpr = read_c0_config7(); |
| 62 | configpr |= (1<<19); /* enable tlb */ | 53 | configpr |= (1<<19); /* enable tlb */ |
diff --git a/arch/mips/nxp/pnx8550/stb810/board_setup.c b/arch/mips/nxp/pnx8550/stb810/board_setup.c index 1282c27cfcb7..af2a55e0b4e9 100644 --- a/arch/mips/nxp/pnx8550/stb810/board_setup.c +++ b/arch/mips/nxp/pnx8550/stb810/board_setup.c | |||
| @@ -33,15 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | void __init board_setup(void) | 34 | void __init board_setup(void) |
| 35 | { | 35 | { |
| 36 | unsigned long config0, configpr; | 36 | unsigned long configpr; |
| 37 | |||
| 38 | config0 = read_c0_config(); | ||
| 39 | |||
| 40 | /* clear all three cache coherency fields */ | ||
| 41 | config0 &= ~(0x7 | (7<<25) | (7<<28)); | ||
| 42 | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) | | ||
| 43 | (CONF_CM_DEFAULT<<28)); | ||
| 44 | write_c0_config(config0); | ||
| 45 | 37 | ||
| 46 | configpr = read_c0_config7(); | 38 | configpr = read_c0_config7(); |
| 47 | configpr |= (1<<19); /* enable tlb */ | 39 | configpr |= (1<<19); /* enable tlb */ |
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index 42e4d2c800fa..2a09ad91ec8c 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
| @@ -207,6 +207,7 @@ struct pci_controller sb1250_controller = { | |||
| 207 | 207 | ||
| 208 | static int __init sb1250_pcibios_init(void) | 208 | static int __init sb1250_pcibios_init(void) |
| 209 | { | 209 | { |
| 210 | void __iomem *io_map_base; | ||
| 210 | uint32_t cmdreg; | 211 | uint32_t cmdreg; |
| 211 | uint64_t reg; | 212 | uint64_t reg; |
| 212 | extern int pci_probe_only; | 213 | extern int pci_probe_only; |
| @@ -253,12 +254,13 @@ static int __init sb1250_pcibios_init(void) | |||
| 253 | * works correctly with most of Linux's drivers. | 254 | * works correctly with most of Linux's drivers. |
| 254 | * XXX ehs: Should this happen in PCI Device mode? | 255 | * XXX ehs: Should this happen in PCI Device mode? |
| 255 | */ | 256 | */ |
| 256 | |||
| 257 | set_io_port_base((unsigned long) | ||
| 258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 65536)); | ||
| 259 | isa_slot_offset = (unsigned long) | 257 | isa_slot_offset = (unsigned long) |
| 260 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); | 258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); |
| 261 | 259 | ||
| 260 | io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024); | ||
| 261 | sb1250_controller.io_map_base = io_map_base; | ||
| 262 | set_io_port_base((unsigned long)io_map_base); | ||
| 263 | |||
| 262 | #ifdef CONFIG_SIBYTE_HAS_LDT | 264 | #ifdef CONFIG_SIBYTE_HAS_LDT |
| 263 | /* | 265 | /* |
| 264 | * Also check the LDT bridge's enable, just in case we didn't | 266 | * Also check the LDT bridge's enable, just in case we didn't |
diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c index 33c4f683d067..d1e049b55f34 100644 --- a/arch/mips/pci/pci-vr41xx.c +++ b/arch/mips/pci/pci-vr41xx.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2001-2003 MontaVista Software Inc. | 4 | * Copyright (C) 2001-2003 MontaVista Software Inc. |
| 5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> | 5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> |
| 6 | * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 6 | * Copyright (C) 2004-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> |
| 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| @@ -300,6 +300,18 @@ static int __init vr41xx_pciu_init(void) | |||
| 300 | ioport_resource.end = IO_PORT_RESOURCE_END; | 300 | ioport_resource.end = IO_PORT_RESOURCE_END; |
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | if (setup->master_io) { | ||
| 304 | void __iomem *io_map_base; | ||
| 305 | struct resource *res = vr41xx_pci_controller.io_resource; | ||
| 306 | master = setup->master_io; | ||
| 307 | io_map_base = ioremap(master->bus_base_address, | ||
| 308 | res->end - res->start + 1); | ||
| 309 | if (!io_map_base) | ||
| 310 | return -EBUSY; | ||
| 311 | |||
| 312 | vr41xx_pci_controller.io_map_base = (unsigned long)io_map_base; | ||
| 313 | } | ||
| 314 | |||
| 303 | register_pci_controller(&vr41xx_pci_controller); | 315 | register_pci_controller(&vr41xx_pci_controller); |
| 304 | 316 | ||
| 305 | return 0; | 317 | return 0; |
diff --git a/arch/mips/sibyte/swarm/Makefile b/arch/mips/sibyte/swarm/Makefile index 2d626039195c..1775755a2619 100644 --- a/arch/mips/sibyte/swarm/Makefile +++ b/arch/mips/sibyte/swarm/Makefile | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | lib-y = setup.o rtc_xicor1241.o rtc_m41t81.o | 1 | obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o |
| 2 | 2 | ||
| 3 | lib-$(CONFIG_KGDB) += dbg_io.o | 3 | obj-$(CONFIG_KGDB) += dbg_io.o |
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c index 3b0d579fc15d..9c623c88387b 100644 --- a/arch/mn10300/kernel/process.c +++ b/arch/mn10300/kernel/process.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/ptrace.h> | 20 | #include <linux/ptrace.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/user.h> | 22 | #include <linux/user.h> |
| 23 | #include <linux/a.out.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/reboot.h> | 25 | #include <linux/reboot.h> |
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 6b7ce2636851..017121ce896f 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/ptrace.h> | 17 | #include <linux/ptrace.h> |
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/user.h> | 19 | #include <linux/user.h> |
| 20 | #include <linux/a.out.h> | ||
| 21 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 9dcdc036cdf7..b7d4c4ce2fe6 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
| @@ -96,6 +96,8 @@ endif | |||
| 96 | else | 96 | else |
| 97 | KBUILD_CFLAGS += $(call cc-option,-mtune=power4) | 97 | KBUILD_CFLAGS += $(call cc-option,-mtune=power4) |
| 98 | endif | 98 | endif |
| 99 | else | ||
| 100 | LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o | ||
| 99 | endif | 101 | endif |
| 100 | 102 | ||
| 101 | ifeq ($(CONFIG_TUNE_CELL),y) | 103 | ifeq ($(CONFIG_TUNE_CELL),y) |
| @@ -154,7 +156,7 @@ all: zImage | |||
| 154 | 156 | ||
| 155 | CPPFLAGS_vmlinux.lds := -Upowerpc | 157 | CPPFLAGS_vmlinux.lds := -Upowerpc |
| 156 | 158 | ||
| 157 | BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% | 159 | BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.% |
| 158 | 160 | ||
| 159 | PHONY += $(BOOT_TARGETS) | 161 | PHONY += $(BOOT_TARGETS) |
| 160 | 162 | ||
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index d53b84e761a9..1cee2f9fdf06 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -51,7 +51,7 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ | |||
| 51 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) | 51 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) |
| 52 | 52 | ||
| 53 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c | 53 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c |
| 54 | src-wlib := string.S crt0.S stdio.c main.c \ | 54 | src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \ |
| 55 | $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \ | 55 | $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \ |
| 56 | ns16550.c serial.c simple_alloc.c div64.S util.S \ | 56 | ns16550.c serial.c simple_alloc.c div64.S util.S \ |
| 57 | gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ | 57 | gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ |
diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S new file mode 100644 index 000000000000..f3d9b35c07d4 --- /dev/null +++ b/arch/powerpc/boot/crtsavres.S | |||
| @@ -0,0 +1,233 @@ | |||
| 1 | /* | ||
| 2 | * Special support for eabi and SVR4 | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. | ||
| 5 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
| 6 | * Written By Michael Meissner | ||
| 7 | * | ||
| 8 | * Based on gcc/config/rs6000/crtsavres.asm from gcc | ||
| 9 | * | ||
| 10 | * This file is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2, or (at your option) any | ||
| 13 | * later version. | ||
| 14 | * | ||
| 15 | * In addition to the permissions in the GNU General Public License, the | ||
| 16 | * Free Software Foundation gives you unlimited permission to link the | ||
| 17 | * compiled version of this file with other programs, and to distribute | ||
| 18 | * those programs without any restriction coming from the use of this | ||
| 19 | * file. (The General Public License restrictions do apply in other | ||
| 20 | * respects; for example, they cover modification of the file, and | ||
| 21 | * distribution when not linked into another program.) | ||
| 22 | * | ||
| 23 | * This file is distributed in the hope that it will be useful, but | ||
| 24 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 26 | * General Public License for more details. | ||
| 27 | * | ||
| 28 | * You should have received a copy of the GNU General Public License | ||
| 29 | * along with this program; see the file COPYING. If not, write to | ||
| 30 | * the Free Software Foundation, 51 Franklin Street, Fifth Floor, | ||
| 31 | * Boston, MA 02110-1301, USA. | ||
| 32 | * | ||
| 33 | * As a special exception, if you link this library with files | ||
| 34 | * compiled with GCC to produce an executable, this does not cause | ||
| 35 | * the resulting executable to be covered by the GNU General Public License. | ||
| 36 | * This exception does not however invalidate any other reasons why | ||
| 37 | * the executable file might be covered by the GNU General Public License. | ||
| 38 | */ | ||
| 39 | |||
| 40 | .file "crtsavres.S" | ||
| 41 | .section ".text" | ||
| 42 | |||
| 43 | /* On PowerPC64 Linux, these functions are provided by the linker. */ | ||
| 44 | #ifndef __powerpc64__ | ||
| 45 | |||
| 46 | #define _GLOBAL(name) \ | ||
| 47 | .type name,@function; \ | ||
| 48 | .globl name; \ | ||
| 49 | name: | ||
| 50 | |||
| 51 | /* Routines for saving integer registers, called by the compiler. */ | ||
| 52 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 53 | /* function, just beyond the end of the integer save area. */ | ||
| 54 | |||
| 55 | _GLOBAL(_savegpr_14) | ||
| 56 | _GLOBAL(_save32gpr_14) | ||
| 57 | stw 14,-72(11) /* save gp registers */ | ||
| 58 | _GLOBAL(_savegpr_15) | ||
| 59 | _GLOBAL(_save32gpr_15) | ||
| 60 | stw 15,-68(11) | ||
| 61 | _GLOBAL(_savegpr_16) | ||
| 62 | _GLOBAL(_save32gpr_16) | ||
| 63 | stw 16,-64(11) | ||
| 64 | _GLOBAL(_savegpr_17) | ||
| 65 | _GLOBAL(_save32gpr_17) | ||
| 66 | stw 17,-60(11) | ||
| 67 | _GLOBAL(_savegpr_18) | ||
| 68 | _GLOBAL(_save32gpr_18) | ||
| 69 | stw 18,-56(11) | ||
| 70 | _GLOBAL(_savegpr_19) | ||
| 71 | _GLOBAL(_save32gpr_19) | ||
| 72 | stw 19,-52(11) | ||
| 73 | _GLOBAL(_savegpr_20) | ||
| 74 | _GLOBAL(_save32gpr_20) | ||
| 75 | stw 20,-48(11) | ||
| 76 | _GLOBAL(_savegpr_21) | ||
| 77 | _GLOBAL(_save32gpr_21) | ||
| 78 | stw 21,-44(11) | ||
| 79 | _GLOBAL(_savegpr_22) | ||
| 80 | _GLOBAL(_save32gpr_22) | ||
| 81 | stw 22,-40(11) | ||
| 82 | _GLOBAL(_savegpr_23) | ||
| 83 | _GLOBAL(_save32gpr_23) | ||
| 84 | stw 23,-36(11) | ||
| 85 | _GLOBAL(_savegpr_24) | ||
| 86 | _GLOBAL(_save32gpr_24) | ||
| 87 | stw 24,-32(11) | ||
| 88 | _GLOBAL(_savegpr_25) | ||
| 89 | _GLOBAL(_save32gpr_25) | ||
| 90 | stw 25,-28(11) | ||
| 91 | _GLOBAL(_savegpr_26) | ||
| 92 | _GLOBAL(_save32gpr_26) | ||
| 93 | stw 26,-24(11) | ||
| 94 | _GLOBAL(_savegpr_27) | ||
| 95 | _GLOBAL(_save32gpr_27) | ||
| 96 | stw 27,-20(11) | ||
| 97 | _GLOBAL(_savegpr_28) | ||
| 98 | _GLOBAL(_save32gpr_28) | ||
| 99 | stw 28,-16(11) | ||
| 100 | _GLOBAL(_savegpr_29) | ||
| 101 | _GLOBAL(_save32gpr_29) | ||
| 102 | stw 29,-12(11) | ||
| 103 | _GLOBAL(_savegpr_30) | ||
| 104 | _GLOBAL(_save32gpr_30) | ||
| 105 | stw 30,-8(11) | ||
| 106 | _GLOBAL(_savegpr_31) | ||
| 107 | _GLOBAL(_save32gpr_31) | ||
| 108 | stw 31,-4(11) | ||
| 109 | blr | ||
| 110 | |||
| 111 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 112 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 113 | /* function, just beyond the end of the integer restore area. */ | ||
| 114 | |||
| 115 | _GLOBAL(_restgpr_14) | ||
| 116 | _GLOBAL(_rest32gpr_14) | ||
| 117 | lwz 14,-72(11) /* restore gp registers */ | ||
| 118 | _GLOBAL(_restgpr_15) | ||
| 119 | _GLOBAL(_rest32gpr_15) | ||
| 120 | lwz 15,-68(11) | ||
| 121 | _GLOBAL(_restgpr_16) | ||
| 122 | _GLOBAL(_rest32gpr_16) | ||
| 123 | lwz 16,-64(11) | ||
| 124 | _GLOBAL(_restgpr_17) | ||
| 125 | _GLOBAL(_rest32gpr_17) | ||
| 126 | lwz 17,-60(11) | ||
| 127 | _GLOBAL(_restgpr_18) | ||
| 128 | _GLOBAL(_rest32gpr_18) | ||
| 129 | lwz 18,-56(11) | ||
| 130 | _GLOBAL(_restgpr_19) | ||
| 131 | _GLOBAL(_rest32gpr_19) | ||
| 132 | lwz 19,-52(11) | ||
| 133 | _GLOBAL(_restgpr_20) | ||
| 134 | _GLOBAL(_rest32gpr_20) | ||
| 135 | lwz 20,-48(11) | ||
| 136 | _GLOBAL(_restgpr_21) | ||
| 137 | _GLOBAL(_rest32gpr_21) | ||
| 138 | lwz 21,-44(11) | ||
| 139 | _GLOBAL(_restgpr_22) | ||
| 140 | _GLOBAL(_rest32gpr_22) | ||
| 141 | lwz 22,-40(11) | ||
| 142 | _GLOBAL(_restgpr_23) | ||
| 143 | _GLOBAL(_rest32gpr_23) | ||
| 144 | lwz 23,-36(11) | ||
| 145 | _GLOBAL(_restgpr_24) | ||
| 146 | _GLOBAL(_rest32gpr_24) | ||
| 147 | lwz 24,-32(11) | ||
| 148 | _GLOBAL(_restgpr_25) | ||
| 149 | _GLOBAL(_rest32gpr_25) | ||
| 150 | lwz 25,-28(11) | ||
| 151 | _GLOBAL(_restgpr_26) | ||
| 152 | _GLOBAL(_rest32gpr_26) | ||
| 153 | lwz 26,-24(11) | ||
| 154 | _GLOBAL(_restgpr_27) | ||
| 155 | _GLOBAL(_rest32gpr_27) | ||
| 156 | lwz 27,-20(11) | ||
| 157 | _GLOBAL(_restgpr_28) | ||
| 158 | _GLOBAL(_rest32gpr_28) | ||
| 159 | lwz 28,-16(11) | ||
| 160 | _GLOBAL(_restgpr_29) | ||
| 161 | _GLOBAL(_rest32gpr_29) | ||
| 162 | lwz 29,-12(11) | ||
| 163 | _GLOBAL(_restgpr_30) | ||
| 164 | _GLOBAL(_rest32gpr_30) | ||
| 165 | lwz 30,-8(11) | ||
| 166 | _GLOBAL(_restgpr_31) | ||
| 167 | _GLOBAL(_rest32gpr_31) | ||
| 168 | lwz 31,-4(11) | ||
| 169 | blr | ||
| 170 | |||
| 171 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 172 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 173 | /* function, just beyond the end of the integer restore area. */ | ||
| 174 | |||
| 175 | _GLOBAL(_restgpr_14_x) | ||
| 176 | _GLOBAL(_rest32gpr_14_x) | ||
| 177 | lwz 14,-72(11) /* restore gp registers */ | ||
| 178 | _GLOBAL(_restgpr_15_x) | ||
| 179 | _GLOBAL(_rest32gpr_15_x) | ||
| 180 | lwz 15,-68(11) | ||
| 181 | _GLOBAL(_restgpr_16_x) | ||
| 182 | _GLOBAL(_rest32gpr_16_x) | ||
| 183 | lwz 16,-64(11) | ||
| 184 | _GLOBAL(_restgpr_17_x) | ||
| 185 | _GLOBAL(_rest32gpr_17_x) | ||
| 186 | lwz 17,-60(11) | ||
| 187 | _GLOBAL(_restgpr_18_x) | ||
| 188 | _GLOBAL(_rest32gpr_18_x) | ||
| 189 | lwz 18,-56(11) | ||
| 190 | _GLOBAL(_restgpr_19_x) | ||
| 191 | _GLOBAL(_rest32gpr_19_x) | ||
| 192 | lwz 19,-52(11) | ||
| 193 | _GLOBAL(_restgpr_20_x) | ||
| 194 | _GLOBAL(_rest32gpr_20_x) | ||
| 195 | lwz 20,-48(11) | ||
| 196 | _GLOBAL(_restgpr_21_x) | ||
| 197 | _GLOBAL(_rest32gpr_21_x) | ||
| 198 | lwz 21,-44(11) | ||
| 199 | _GLOBAL(_restgpr_22_x) | ||
| 200 | _GLOBAL(_rest32gpr_22_x) | ||
| 201 | lwz 22,-40(11) | ||
| 202 | _GLOBAL(_restgpr_23_x) | ||
| 203 | _GLOBAL(_rest32gpr_23_x) | ||
| 204 | lwz 23,-36(11) | ||
| 205 | _GLOBAL(_restgpr_24_x) | ||
| 206 | _GLOBAL(_rest32gpr_24_x) | ||
| 207 | lwz 24,-32(11) | ||
| 208 | _GLOBAL(_restgpr_25_x) | ||
| 209 | _GLOBAL(_rest32gpr_25_x) | ||
| 210 | lwz 25,-28(11) | ||
| 211 | _GLOBAL(_restgpr_26_x) | ||
| 212 | _GLOBAL(_rest32gpr_26_x) | ||
| 213 | lwz 26,-24(11) | ||
| 214 | _GLOBAL(_restgpr_27_x) | ||
| 215 | _GLOBAL(_rest32gpr_27_x) | ||
| 216 | lwz 27,-20(11) | ||
| 217 | _GLOBAL(_restgpr_28_x) | ||
| 218 | _GLOBAL(_rest32gpr_28_x) | ||
| 219 | lwz 28,-16(11) | ||
| 220 | _GLOBAL(_restgpr_29_x) | ||
| 221 | _GLOBAL(_rest32gpr_29_x) | ||
| 222 | lwz 29,-12(11) | ||
| 223 | _GLOBAL(_restgpr_30_x) | ||
| 224 | _GLOBAL(_rest32gpr_30_x) | ||
| 225 | lwz 30,-8(11) | ||
| 226 | _GLOBAL(_restgpr_31_x) | ||
| 227 | _GLOBAL(_rest32gpr_31_x) | ||
| 228 | lwz 0,4(11) | ||
| 229 | lwz 31,-4(11) | ||
| 230 | mtlr 0 | ||
| 231 | mr 1,11 | ||
| 232 | blr | ||
| 233 | #endif | ||
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 5bc09ad016f5..f3083c779b66 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 711f9a30f9ab..0e872a60e091 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index c11ceb7d3299..1eb8defaff6f 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index fa298a8c81cc..4811b8107415 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
| @@ -409,7 +409,7 @@ | |||
| 409 | interrupts = <26 2>; | 409 | interrupts = <26 2>; |
| 410 | bus-range = <0 255>; | 410 | bus-range = <0 255>; |
| 411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 | 411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 |
| 412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>; | 412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>; |
| 413 | clock-frequency = <33333333>; | 413 | clock-frequency = <33333333>; |
| 414 | #interrupt-cells = <1>; | 414 | #interrupt-cells = <1>; |
| 415 | #size-cells = <2>; | 415 | #size-cells = <2>; |
| @@ -428,7 +428,7 @@ | |||
| 428 | 428 | ||
| 429 | 0x1000000 0x0 0x0 | 429 | 0x1000000 0x0 0x0 |
| 430 | 0x1000000 0x0 0x0 | 430 | 0x1000000 0x0 0x0 |
| 431 | 0x0 0x8000000>; | 431 | 0x0 0x100000>; |
| 432 | }; | 432 | }; |
| 433 | }; | 433 | }; |
| 434 | }; | 434 | }; |
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 7d18440e398f..5428f9f5ed85 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Fri Apr 11 11:10:09 2008 | 4 | # Mon Jun 9 08:52:21 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -196,7 +201,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 196 | # CONFIG_PREEMPT is not set | 201 | # CONFIG_PREEMPT is not set |
| 197 | CONFIG_BINFMT_ELF=y | 202 | CONFIG_BINFMT_ELF=y |
| 198 | # CONFIG_BINFMT_MISC is not set | 203 | # CONFIG_BINFMT_MISC is not set |
| 199 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 200 | # CONFIG_IOMMU_HELPER is not set | 204 | # CONFIG_IOMMU_HELPER is not set |
| 201 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 202 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| @@ -211,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -239,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 239 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
| 240 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 249 | ||
| 243 | # | 250 | # |
| 244 | # Advanced setup | 251 | # Advanced setup |
| @@ -248,11 +255,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 255 | # |
| 249 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 250 | # | 257 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 263 | ||
| 257 | # | 264 | # |
| 258 | # Networking | 265 | # Networking |
| @@ -300,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 307 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 309 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 310 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 311 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 312 | # CONFIG_IP_DCCP is not set |
| @@ -362,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 362 | # CONFIG_MTD_REDBOOT_PARTS is not set | 367 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 363 | # CONFIG_MTD_CMDLINE_PARTS is not set | 368 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 364 | CONFIG_MTD_OF_PARTS=y | 369 | CONFIG_MTD_OF_PARTS=y |
| 370 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 365 | 371 | ||
| 366 | # | 372 | # |
| 367 | # User Modules And Translation Layers | 373 | # User Modules And Translation Layers |
| @@ -445,6 +451,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 445 | # | 451 | # |
| 446 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
| 447 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | ||
| 448 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
| 449 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
| 450 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
| @@ -641,7 +648,6 @@ CONFIG_NETDEV_1000=y | |||
| 641 | # CONFIG_SIS190 is not set | 648 | # CONFIG_SIS190 is not set |
| 642 | # CONFIG_SKGE is not set | 649 | # CONFIG_SKGE is not set |
| 643 | # CONFIG_SKY2 is not set | 650 | # CONFIG_SKY2 is not set |
| 644 | # CONFIG_SK98LIN is not set | ||
| 645 | # CONFIG_VIA_VELOCITY is not set | 651 | # CONFIG_VIA_VELOCITY is not set |
| 646 | # CONFIG_TIGON3 is not set | 652 | # CONFIG_TIGON3 is not set |
| 647 | # CONFIG_BNX2 is not set | 653 | # CONFIG_BNX2 is not set |
| @@ -661,6 +667,7 @@ CONFIG_NETDEV_10000=y | |||
| 661 | # CONFIG_MLX4_CORE is not set | 667 | # CONFIG_MLX4_CORE is not set |
| 662 | # CONFIG_TEHUTI is not set | 668 | # CONFIG_TEHUTI is not set |
| 663 | # CONFIG_BNX2X is not set | 669 | # CONFIG_BNX2X is not set |
| 670 | # CONFIG_SFC is not set | ||
| 664 | # CONFIG_TR is not set | 671 | # CONFIG_TR is not set |
| 665 | 672 | ||
| 666 | # | 673 | # |
| @@ -668,6 +675,7 @@ CONFIG_NETDEV_10000=y | |||
| 668 | # | 675 | # |
| 669 | # CONFIG_WLAN_PRE80211 is not set | 676 | # CONFIG_WLAN_PRE80211 is not set |
| 670 | # CONFIG_WLAN_80211 is not set | 677 | # CONFIG_WLAN_80211 is not set |
| 678 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 671 | 679 | ||
| 672 | # | 680 | # |
| 673 | # USB Network Adapters | 681 | # USB Network Adapters |
| @@ -724,6 +732,7 @@ CONFIG_INPUT=y | |||
| 724 | # Character devices | 732 | # Character devices |
| 725 | # | 733 | # |
| 726 | # CONFIG_VT is not set | 734 | # CONFIG_VT is not set |
| 735 | CONFIG_DEVKMEM=y | ||
| 727 | # CONFIG_SERIAL_NONSTANDARD is not set | 736 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 728 | # CONFIG_NOZOMI is not set | 737 | # CONFIG_NOZOMI is not set |
| 729 | 738 | ||
| @@ -751,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 751 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 752 | CONFIG_HW_RANDOM=y | 761 | CONFIG_HW_RANDOM=y |
| 753 | # CONFIG_NVRAM is not set | 762 | # CONFIG_NVRAM is not set |
| 754 | # CONFIG_GEN_RTC is not set | ||
| 755 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 756 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 757 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -762,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 762 | CONFIG_I2C_CHARDEV=y | 770 | CONFIG_I2C_CHARDEV=y |
| 763 | 771 | ||
| 764 | # | 772 | # |
| 765 | # I2C Algorithms | ||
| 766 | # | ||
| 767 | # CONFIG_I2C_ALGOBIT is not set | ||
| 768 | # CONFIG_I2C_ALGOPCF is not set | ||
| 769 | # CONFIG_I2C_ALGOPCA is not set | ||
| 770 | |||
| 771 | # | ||
| 772 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 773 | # | 774 | # |
| 774 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -795,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 795 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 796 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 797 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 798 | 800 | ||
| 799 | # | 801 | # |
| 800 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -804,17 +806,12 @@ CONFIG_I2C_MPC=y | |||
| 804 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 805 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 806 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 807 | # CONFIG_TPS65010 is not set | ||
| 808 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 809 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 810 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 811 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 812 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 813 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 814 | |||
| 815 | # | ||
| 816 | # SPI support | ||
| 817 | # | ||
| 818 | CONFIG_SPI=y | 815 | CONFIG_SPI=y |
| 819 | # CONFIG_SPI_DEBUG is not set | 816 | # CONFIG_SPI_DEBUG is not set |
| 820 | CONFIG_SPI_MASTER=y | 817 | CONFIG_SPI_MASTER=y |
| @@ -919,12 +916,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 919 | # Multifunction device drivers | 916 | # Multifunction device drivers |
| 920 | # | 917 | # |
| 921 | # CONFIG_MFD_SM501 is not set | 918 | # CONFIG_MFD_SM501 is not set |
| 919 | # CONFIG_HTC_PASIC3 is not set | ||
| 922 | 920 | ||
| 923 | # | 921 | # |
| 924 | # Multimedia devices | 922 | # Multimedia devices |
| 925 | # | 923 | # |
| 924 | |||
| 925 | # | ||
| 926 | # Multimedia core support | ||
| 927 | # | ||
| 926 | # CONFIG_VIDEO_DEV is not set | 928 | # CONFIG_VIDEO_DEV is not set |
| 927 | # CONFIG_DVB_CORE is not set | 929 | # CONFIG_DVB_CORE is not set |
| 930 | # CONFIG_VIDEO_MEDIA is not set | ||
| 931 | |||
| 932 | # | ||
| 933 | # Multimedia drivers | ||
| 934 | # | ||
| 928 | CONFIG_DAB=y | 935 | CONFIG_DAB=y |
| 929 | # CONFIG_USB_DABUSB is not set | 936 | # CONFIG_USB_DABUSB is not set |
| 930 | 937 | ||
| @@ -977,16 +984,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 977 | CONFIG_USB_DEVICE_CLASS=y | 984 | CONFIG_USB_DEVICE_CLASS=y |
| 978 | # CONFIG_USB_DYNAMIC_MINORS is not set | 985 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 979 | # CONFIG_USB_OTG is not set | 986 | # CONFIG_USB_OTG is not set |
| 987 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 988 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 980 | 989 | ||
| 981 | # | 990 | # |
| 982 | # USB Host Controller Drivers | 991 | # USB Host Controller Drivers |
| 983 | # | 992 | # |
| 993 | # CONFIG_USB_C67X00_HCD is not set | ||
| 984 | CONFIG_USB_EHCI_HCD=y | 994 | CONFIG_USB_EHCI_HCD=y |
| 985 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 995 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 986 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 996 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 987 | CONFIG_USB_EHCI_FSL=y | 997 | CONFIG_USB_EHCI_FSL=y |
| 988 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 998 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 989 | # CONFIG_USB_ISP116X_HCD is not set | 999 | # CONFIG_USB_ISP116X_HCD is not set |
| 1000 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 990 | CONFIG_USB_OHCI_HCD=y | 1001 | CONFIG_USB_OHCI_HCD=y |
| 991 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1002 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 992 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1003 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1004,6 +1015,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1004 | # | 1015 | # |
| 1005 | # CONFIG_USB_ACM is not set | 1016 | # CONFIG_USB_ACM is not set |
| 1006 | # CONFIG_USB_PRINTER is not set | 1017 | # CONFIG_USB_PRINTER is not set |
| 1018 | # CONFIG_USB_WDM is not set | ||
| 1007 | 1019 | ||
| 1008 | # | 1020 | # |
| 1009 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1021 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1023,7 +1035,9 @@ CONFIG_USB_STORAGE=y | |||
| 1023 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1035 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1024 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1036 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1025 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1037 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1038 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1026 | # CONFIG_USB_STORAGE_KARMA is not set | 1039 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1040 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1027 | # CONFIG_USB_LIBUSUAL is not set | 1041 | # CONFIG_USB_LIBUSUAL is not set |
| 1028 | 1042 | ||
| 1029 | # | 1043 | # |
| @@ -1061,6 +1075,7 @@ CONFIG_USB_MON=y | |||
| 1061 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1075 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1062 | # CONFIG_USB_IOWARRIOR is not set | 1076 | # CONFIG_USB_IOWARRIOR is not set |
| 1063 | # CONFIG_USB_TEST is not set | 1077 | # CONFIG_USB_TEST is not set |
| 1078 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1064 | CONFIG_USB_GADGET=y | 1079 | CONFIG_USB_GADGET=y |
| 1065 | # CONFIG_USB_GADGET_DEBUG is not set | 1080 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1066 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1081 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1072,6 +1087,7 @@ CONFIG_USB_GADGET_NET2280=y | |||
| 1072 | CONFIG_USB_NET2280=y | 1087 | CONFIG_USB_NET2280=y |
| 1073 | # CONFIG_USB_GADGET_PXA2XX is not set | 1088 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 1074 | # CONFIG_USB_GADGET_M66592 is not set | 1089 | # CONFIG_USB_GADGET_M66592 is not set |
| 1090 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 1075 | # CONFIG_USB_GADGET_GOKU is not set | 1091 | # CONFIG_USB_GADGET_GOKU is not set |
| 1076 | # CONFIG_USB_GADGET_LH7A40X is not set | 1092 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 1077 | # CONFIG_USB_GADGET_OMAP is not set | 1093 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -1090,6 +1106,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1090 | # CONFIG_MMC is not set | 1106 | # CONFIG_MMC is not set |
| 1091 | # CONFIG_MEMSTICK is not set | 1107 | # CONFIG_MEMSTICK is not set |
| 1092 | # CONFIG_NEW_LEDS is not set | 1108 | # CONFIG_NEW_LEDS is not set |
| 1109 | # CONFIG_ACCESSIBILITY is not set | ||
| 1093 | # CONFIG_INFINIBAND is not set | 1110 | # CONFIG_INFINIBAND is not set |
| 1094 | # CONFIG_EDAC is not set | 1111 | # CONFIG_EDAC is not set |
| 1095 | CONFIG_RTC_LIB=y | 1112 | CONFIG_RTC_LIB=y |
| @@ -1144,11 +1161,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1144 | # | 1161 | # |
| 1145 | # on-CPU RTC drivers | 1162 | # on-CPU RTC drivers |
| 1146 | # | 1163 | # |
| 1164 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1147 | # CONFIG_DMADEVICES is not set | 1165 | # CONFIG_DMADEVICES is not set |
| 1148 | |||
| 1149 | # | ||
| 1150 | # Userspace I/O | ||
| 1151 | # | ||
| 1152 | # CONFIG_UIO is not set | 1166 | # CONFIG_UIO is not set |
| 1153 | 1167 | ||
| 1154 | # | 1168 | # |
| @@ -1168,7 +1182,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1168 | # CONFIG_JFS_FS is not set | 1182 | # CONFIG_JFS_FS is not set |
| 1169 | # CONFIG_FS_POSIX_ACL is not set | 1183 | # CONFIG_FS_POSIX_ACL is not set |
| 1170 | # CONFIG_XFS_FS is not set | 1184 | # CONFIG_XFS_FS is not set |
| 1171 | # CONFIG_GFS2_FS is not set | ||
| 1172 | # CONFIG_OCFS2_FS is not set | 1185 | # CONFIG_OCFS2_FS is not set |
| 1173 | CONFIG_DNOTIFY=y | 1186 | CONFIG_DNOTIFY=y |
| 1174 | CONFIG_INOTIFY=y | 1187 | CONFIG_INOTIFY=y |
| @@ -1237,7 +1250,6 @@ CONFIG_NFS_FS=y | |||
| 1237 | CONFIG_NFS_V3=y | 1250 | CONFIG_NFS_V3=y |
| 1238 | # CONFIG_NFS_V3_ACL is not set | 1251 | # CONFIG_NFS_V3_ACL is not set |
| 1239 | CONFIG_NFS_V4=y | 1252 | CONFIG_NFS_V4=y |
| 1240 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1241 | # CONFIG_NFSD is not set | 1253 | # CONFIG_NFSD is not set |
| 1242 | CONFIG_ROOT_NFS=y | 1254 | CONFIG_ROOT_NFS=y |
| 1243 | CONFIG_LOCKD=y | 1255 | CONFIG_LOCKD=y |
| @@ -1282,6 +1294,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1282 | # Library routines | 1294 | # Library routines |
| 1283 | # | 1295 | # |
| 1284 | CONFIG_BITREVERSE=y | 1296 | CONFIG_BITREVERSE=y |
| 1297 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1285 | # CONFIG_CRC_CCITT is not set | 1298 | # CONFIG_CRC_CCITT is not set |
| 1286 | # CONFIG_CRC16 is not set | 1299 | # CONFIG_CRC16 is not set |
| 1287 | # CONFIG_CRC_ITU_T is not set | 1300 | # CONFIG_CRC_ITU_T is not set |
| @@ -1302,6 +1315,7 @@ CONFIG_HAVE_LMB=y | |||
| 1302 | # CONFIG_PRINTK_TIME is not set | 1315 | # CONFIG_PRINTK_TIME is not set |
| 1303 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1316 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1304 | CONFIG_ENABLE_MUST_CHECK=y | 1317 | CONFIG_ENABLE_MUST_CHECK=y |
| 1318 | CONFIG_FRAME_WARN=1024 | ||
| 1305 | # CONFIG_MAGIC_SYSRQ is not set | 1319 | # CONFIG_MAGIC_SYSRQ is not set |
| 1306 | # CONFIG_UNUSED_SYMBOLS is not set | 1320 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1307 | # CONFIG_DEBUG_FS is not set | 1321 | # CONFIG_DEBUG_FS is not set |
| @@ -1312,6 +1326,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1312 | CONFIG_SCHED_DEBUG=y | 1326 | CONFIG_SCHED_DEBUG=y |
| 1313 | # CONFIG_SCHEDSTATS is not set | 1327 | # CONFIG_SCHEDSTATS is not set |
| 1314 | # CONFIG_TIMER_STATS is not set | 1328 | # CONFIG_TIMER_STATS is not set |
| 1329 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1315 | # CONFIG_SLUB_DEBUG_ON is not set | 1330 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1316 | # CONFIG_SLUB_STATS is not set | 1331 | # CONFIG_SLUB_STATS is not set |
| 1317 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1332 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1324,6 +1339,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1324 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1339 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1325 | # CONFIG_DEBUG_INFO is not set | 1340 | # CONFIG_DEBUG_INFO is not set |
| 1326 | # CONFIG_DEBUG_VM is not set | 1341 | # CONFIG_DEBUG_VM is not set |
| 1342 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1327 | # CONFIG_DEBUG_LIST is not set | 1343 | # CONFIG_DEBUG_LIST is not set |
| 1328 | # CONFIG_DEBUG_SG is not set | 1344 | # CONFIG_DEBUG_SG is not set |
| 1329 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1345 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1335,6 +1351,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1335 | # CONFIG_DEBUG_STACK_USAGE is not set | 1351 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1336 | # CONFIG_DEBUG_PAGEALLOC is not set | 1352 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1337 | # CONFIG_DEBUGGER is not set | 1353 | # CONFIG_DEBUGGER is not set |
| 1354 | # CONFIG_IRQSTACKS is not set | ||
| 1338 | # CONFIG_BDI_SWITCH is not set | 1355 | # CONFIG_BDI_SWITCH is not set |
| 1339 | # CONFIG_PPC_EARLY_DEBUG is not set | 1356 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1340 | 1357 | ||
| @@ -1345,51 +1362,81 @@ CONFIG_SCHED_DEBUG=y | |||
| 1345 | # CONFIG_SECURITY is not set | 1362 | # CONFIG_SECURITY is not set |
| 1346 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1363 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1347 | CONFIG_CRYPTO=y | 1364 | CONFIG_CRYPTO=y |
| 1365 | |||
| 1366 | # | ||
| 1367 | # Crypto core or helper | ||
| 1368 | # | ||
| 1348 | CONFIG_CRYPTO_ALGAPI=y | 1369 | CONFIG_CRYPTO_ALGAPI=y |
| 1349 | CONFIG_CRYPTO_BLKCIPHER=y | 1370 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1350 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1351 | CONFIG_CRYPTO_MANAGER=y | 1371 | CONFIG_CRYPTO_MANAGER=y |
| 1372 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1373 | # CONFIG_CRYPTO_NULL is not set | ||
| 1374 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1375 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1376 | # CONFIG_CRYPTO_TEST is not set | ||
| 1377 | |||
| 1378 | # | ||
| 1379 | # Authenticated Encryption with Associated Data | ||
| 1380 | # | ||
| 1381 | # CONFIG_CRYPTO_CCM is not set | ||
| 1382 | # CONFIG_CRYPTO_GCM is not set | ||
| 1383 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1384 | |||
| 1385 | # | ||
| 1386 | # Block modes | ||
| 1387 | # | ||
| 1388 | CONFIG_CRYPTO_CBC=y | ||
| 1389 | # CONFIG_CRYPTO_CTR is not set | ||
| 1390 | # CONFIG_CRYPTO_CTS is not set | ||
| 1391 | # CONFIG_CRYPTO_ECB is not set | ||
| 1392 | # CONFIG_CRYPTO_LRW is not set | ||
| 1393 | CONFIG_CRYPTO_PCBC=m | ||
| 1394 | # CONFIG_CRYPTO_XTS is not set | ||
| 1395 | |||
| 1396 | # | ||
| 1397 | # Hash modes | ||
| 1398 | # | ||
| 1352 | # CONFIG_CRYPTO_HMAC is not set | 1399 | # CONFIG_CRYPTO_HMAC is not set |
| 1353 | # CONFIG_CRYPTO_XCBC is not set | 1400 | # CONFIG_CRYPTO_XCBC is not set |
| 1354 | # CONFIG_CRYPTO_NULL is not set | 1401 | |
| 1402 | # | ||
| 1403 | # Digest | ||
| 1404 | # | ||
| 1405 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1355 | # CONFIG_CRYPTO_MD4 is not set | 1406 | # CONFIG_CRYPTO_MD4 is not set |
| 1356 | CONFIG_CRYPTO_MD5=y | 1407 | CONFIG_CRYPTO_MD5=y |
| 1408 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1357 | # CONFIG_CRYPTO_SHA1 is not set | 1409 | # CONFIG_CRYPTO_SHA1 is not set |
| 1358 | # CONFIG_CRYPTO_SHA256 is not set | 1410 | # CONFIG_CRYPTO_SHA256 is not set |
| 1359 | # CONFIG_CRYPTO_SHA512 is not set | 1411 | # CONFIG_CRYPTO_SHA512 is not set |
| 1360 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1361 | # CONFIG_CRYPTO_TGR192 is not set | 1412 | # CONFIG_CRYPTO_TGR192 is not set |
| 1362 | # CONFIG_CRYPTO_GF128MUL is not set | 1413 | # CONFIG_CRYPTO_WP512 is not set |
| 1363 | # CONFIG_CRYPTO_ECB is not set | 1414 | |
| 1364 | CONFIG_CRYPTO_CBC=y | 1415 | # |
| 1365 | CONFIG_CRYPTO_PCBC=m | 1416 | # Ciphers |
| 1366 | # CONFIG_CRYPTO_LRW is not set | 1417 | # |
| 1367 | # CONFIG_CRYPTO_XTS is not set | ||
| 1368 | # CONFIG_CRYPTO_CTR is not set | ||
| 1369 | # CONFIG_CRYPTO_GCM is not set | ||
| 1370 | # CONFIG_CRYPTO_CCM is not set | ||
| 1371 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1372 | CONFIG_CRYPTO_DES=y | ||
| 1373 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1374 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1375 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1376 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1377 | # CONFIG_CRYPTO_AES is not set | 1418 | # CONFIG_CRYPTO_AES is not set |
| 1419 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1420 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1421 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1422 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1378 | # CONFIG_CRYPTO_CAST5 is not set | 1423 | # CONFIG_CRYPTO_CAST5 is not set |
| 1379 | # CONFIG_CRYPTO_CAST6 is not set | 1424 | # CONFIG_CRYPTO_CAST6 is not set |
| 1380 | # CONFIG_CRYPTO_TEA is not set | 1425 | CONFIG_CRYPTO_DES=y |
| 1381 | # CONFIG_CRYPTO_ARC4 is not set | 1426 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1382 | # CONFIG_CRYPTO_KHAZAD is not set | 1427 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1383 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1384 | # CONFIG_CRYPTO_SEED is not set | ||
| 1385 | # CONFIG_CRYPTO_SALSA20 is not set | 1428 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1429 | # CONFIG_CRYPTO_SEED is not set | ||
| 1430 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1431 | # CONFIG_CRYPTO_TEA is not set | ||
| 1432 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1433 | |||
| 1434 | # | ||
| 1435 | # Compression | ||
| 1436 | # | ||
| 1386 | # CONFIG_CRYPTO_DEFLATE is not set | 1437 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1387 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1388 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1389 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1390 | # CONFIG_CRYPTO_TEST is not set | ||
| 1391 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1392 | # CONFIG_CRYPTO_LZO is not set | 1438 | # CONFIG_CRYPTO_LZO is not set |
| 1393 | CONFIG_CRYPTO_HW=y | 1439 | CONFIG_CRYPTO_HW=y |
| 1394 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1440 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1395 | # CONFIG_PPC_CLOCK is not set | 1441 | # CONFIG_PPC_CLOCK is not set |
| 1442 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index 1f57456dd81e..9bc3a03ae264 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:15 2008 | 4 | # Mon Jun 9 08:52:21 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -238,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 238 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
| 239 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 240 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 241 | 249 | ||
| 242 | # | 250 | # |
| 243 | # Advanced setup | 251 | # Advanced setup |
| @@ -247,11 +255,11 @@ CONFIG_PCI_LEGACY=y | |||
| 247 | # | 255 | # |
| 248 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 249 | # | 257 | # |
| 250 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 251 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 252 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 253 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 254 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 255 | 263 | ||
| 256 | # | 264 | # |
| 257 | # Networking | 265 | # Networking |
| @@ -299,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 307 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 309 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 310 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 311 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 312 | # CONFIG_IP_DCCP is not set |
| @@ -361,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 367 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 362 | # CONFIG_MTD_CMDLINE_PARTS is not set | 368 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 363 | # CONFIG_MTD_OF_PARTS is not set | 369 | # CONFIG_MTD_OF_PARTS is not set |
| 370 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 364 | 371 | ||
| 365 | # | 372 | # |
| 366 | # User Modules And Translation Layers | 373 | # User Modules And Translation Layers |
| @@ -444,6 +451,7 @@ CONFIG_MTD_NAND_IDS=y | |||
| 444 | # | 451 | # |
| 445 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
| 446 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | ||
| 447 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
| 448 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
| 449 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
| @@ -549,7 +557,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 549 | # CONFIG_SCSI_SRP is not set | 557 | # CONFIG_SCSI_SRP is not set |
| 550 | CONFIG_ATA=y | 558 | CONFIG_ATA=y |
| 551 | # CONFIG_ATA_NONSTANDARD is not set | 559 | # CONFIG_ATA_NONSTANDARD is not set |
| 560 | CONFIG_SATA_PMP=y | ||
| 552 | # CONFIG_SATA_AHCI is not set | 561 | # CONFIG_SATA_AHCI is not set |
| 562 | # CONFIG_SATA_SIL24 is not set | ||
| 563 | CONFIG_SATA_FSL=y | ||
| 564 | CONFIG_ATA_SFF=y | ||
| 553 | # CONFIG_SATA_SVW is not set | 565 | # CONFIG_SATA_SVW is not set |
| 554 | # CONFIG_ATA_PIIX is not set | 566 | # CONFIG_ATA_PIIX is not set |
| 555 | # CONFIG_SATA_MV is not set | 567 | # CONFIG_SATA_MV is not set |
| @@ -559,13 +571,11 @@ CONFIG_ATA=y | |||
| 559 | # CONFIG_SATA_PROMISE is not set | 571 | # CONFIG_SATA_PROMISE is not set |
| 560 | # CONFIG_SATA_SX4 is not set | 572 | # CONFIG_SATA_SX4 is not set |
| 561 | # CONFIG_SATA_SIL is not set | 573 | # CONFIG_SATA_SIL is not set |
| 562 | # CONFIG_SATA_SIL24 is not set | ||
| 563 | # CONFIG_SATA_SIS is not set | 574 | # CONFIG_SATA_SIS is not set |
| 564 | # CONFIG_SATA_ULI is not set | 575 | # CONFIG_SATA_ULI is not set |
| 565 | # CONFIG_SATA_VIA is not set | 576 | # CONFIG_SATA_VIA is not set |
| 566 | # CONFIG_SATA_VITESSE is not set | 577 | # CONFIG_SATA_VITESSE is not set |
| 567 | # CONFIG_SATA_INIC162X is not set | 578 | # CONFIG_SATA_INIC162X is not set |
| 568 | CONFIG_SATA_FSL=y | ||
| 569 | # CONFIG_PATA_ALI is not set | 579 | # CONFIG_PATA_ALI is not set |
| 570 | # CONFIG_PATA_AMD is not set | 580 | # CONFIG_PATA_AMD is not set |
| 571 | # CONFIG_PATA_ARTOP is not set | 581 | # CONFIG_PATA_ARTOP is not set |
| @@ -605,6 +615,7 @@ CONFIG_SATA_FSL=y | |||
| 605 | # CONFIG_PATA_VIA is not set | 615 | # CONFIG_PATA_VIA is not set |
| 606 | # CONFIG_PATA_WINBOND is not set | 616 | # CONFIG_PATA_WINBOND is not set |
| 607 | # CONFIG_PATA_PLATFORM is not set | 617 | # CONFIG_PATA_PLATFORM is not set |
| 618 | # CONFIG_PATA_SCH is not set | ||
| 608 | CONFIG_MD=y | 619 | CONFIG_MD=y |
| 609 | CONFIG_BLK_DEV_MD=y | 620 | CONFIG_BLK_DEV_MD=y |
| 610 | CONFIG_MD_LINEAR=y | 621 | CONFIG_MD_LINEAR=y |
| @@ -698,7 +709,6 @@ CONFIG_NETDEV_1000=y | |||
| 698 | # CONFIG_SIS190 is not set | 709 | # CONFIG_SIS190 is not set |
| 699 | # CONFIG_SKGE is not set | 710 | # CONFIG_SKGE is not set |
| 700 | # CONFIG_SKY2 is not set | 711 | # CONFIG_SKY2 is not set |
| 701 | # CONFIG_SK98LIN is not set | ||
| 702 | # CONFIG_VIA_VELOCITY is not set | 712 | # CONFIG_VIA_VELOCITY is not set |
| 703 | # CONFIG_TIGON3 is not set | 713 | # CONFIG_TIGON3 is not set |
| 704 | # CONFIG_BNX2 is not set | 714 | # CONFIG_BNX2 is not set |
| @@ -718,6 +728,7 @@ CONFIG_NETDEV_10000=y | |||
| 718 | # CONFIG_MLX4_CORE is not set | 728 | # CONFIG_MLX4_CORE is not set |
| 719 | # CONFIG_TEHUTI is not set | 729 | # CONFIG_TEHUTI is not set |
| 720 | # CONFIG_BNX2X is not set | 730 | # CONFIG_BNX2X is not set |
| 731 | # CONFIG_SFC is not set | ||
| 721 | # CONFIG_TR is not set | 732 | # CONFIG_TR is not set |
| 722 | 733 | ||
| 723 | # | 734 | # |
| @@ -725,6 +736,7 @@ CONFIG_NETDEV_10000=y | |||
| 725 | # | 736 | # |
| 726 | # CONFIG_WLAN_PRE80211 is not set | 737 | # CONFIG_WLAN_PRE80211 is not set |
| 727 | # CONFIG_WLAN_80211 is not set | 738 | # CONFIG_WLAN_80211 is not set |
| 739 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 728 | 740 | ||
| 729 | # | 741 | # |
| 730 | # USB Network Adapters | 742 | # USB Network Adapters |
| @@ -781,6 +793,7 @@ CONFIG_INPUT=y | |||
| 781 | # Character devices | 793 | # Character devices |
| 782 | # | 794 | # |
| 783 | # CONFIG_VT is not set | 795 | # CONFIG_VT is not set |
| 796 | CONFIG_DEVKMEM=y | ||
| 784 | # CONFIG_SERIAL_NONSTANDARD is not set | 797 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 785 | # CONFIG_NOZOMI is not set | 798 | # CONFIG_NOZOMI is not set |
| 786 | 799 | ||
| @@ -808,7 +821,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 808 | # CONFIG_IPMI_HANDLER is not set | 821 | # CONFIG_IPMI_HANDLER is not set |
| 809 | CONFIG_HW_RANDOM=y | 822 | CONFIG_HW_RANDOM=y |
| 810 | # CONFIG_NVRAM is not set | 823 | # CONFIG_NVRAM is not set |
| 811 | # CONFIG_GEN_RTC is not set | ||
| 812 | # CONFIG_R3964 is not set | 824 | # CONFIG_R3964 is not set |
| 813 | # CONFIG_APPLICOM is not set | 825 | # CONFIG_APPLICOM is not set |
| 814 | # CONFIG_RAW_DRIVER is not set | 826 | # CONFIG_RAW_DRIVER is not set |
| @@ -819,13 +831,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 819 | CONFIG_I2C_CHARDEV=y | 831 | CONFIG_I2C_CHARDEV=y |
| 820 | 832 | ||
| 821 | # | 833 | # |
| 822 | # I2C Algorithms | ||
| 823 | # | ||
| 824 | # CONFIG_I2C_ALGOBIT is not set | ||
| 825 | # CONFIG_I2C_ALGOPCF is not set | ||
| 826 | # CONFIG_I2C_ALGOPCA is not set | ||
| 827 | |||
| 828 | # | ||
| 829 | # I2C Hardware Bus support | 834 | # I2C Hardware Bus support |
| 830 | # | 835 | # |
| 831 | # CONFIG_I2C_ALI1535 is not set | 836 | # CONFIG_I2C_ALI1535 is not set |
| @@ -852,6 +857,7 @@ CONFIG_I2C_MPC=y | |||
| 852 | # CONFIG_I2C_VIA is not set | 857 | # CONFIG_I2C_VIA is not set |
| 853 | # CONFIG_I2C_VIAPRO is not set | 858 | # CONFIG_I2C_VIAPRO is not set |
| 854 | # CONFIG_I2C_VOODOO3 is not set | 859 | # CONFIG_I2C_VOODOO3 is not set |
| 860 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 855 | 861 | ||
| 856 | # | 862 | # |
| 857 | # Miscellaneous I2C Chip support | 863 | # Miscellaneous I2C Chip support |
| @@ -861,17 +867,12 @@ CONFIG_I2C_MPC=y | |||
| 861 | # CONFIG_SENSORS_PCF8574 is not set | 867 | # CONFIG_SENSORS_PCF8574 is not set |
| 862 | # CONFIG_PCF8575 is not set | 868 | # CONFIG_PCF8575 is not set |
| 863 | # CONFIG_SENSORS_PCF8591 is not set | 869 | # CONFIG_SENSORS_PCF8591 is not set |
| 864 | # CONFIG_TPS65010 is not set | ||
| 865 | # CONFIG_SENSORS_MAX6875 is not set | 870 | # CONFIG_SENSORS_MAX6875 is not set |
| 866 | # CONFIG_SENSORS_TSL2550 is not set | 871 | # CONFIG_SENSORS_TSL2550 is not set |
| 867 | # CONFIG_I2C_DEBUG_CORE is not set | 872 | # CONFIG_I2C_DEBUG_CORE is not set |
| 868 | # CONFIG_I2C_DEBUG_ALGO is not set | 873 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 869 | # CONFIG_I2C_DEBUG_BUS is not set | 874 | # CONFIG_I2C_DEBUG_BUS is not set |
| 870 | # CONFIG_I2C_DEBUG_CHIP is not set | 875 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 871 | |||
| 872 | # | ||
| 873 | # SPI support | ||
| 874 | # | ||
| 875 | CONFIG_SPI=y | 876 | CONFIG_SPI=y |
| 876 | # CONFIG_SPI_DEBUG is not set | 877 | # CONFIG_SPI_DEBUG is not set |
| 877 | CONFIG_SPI_MASTER=y | 878 | CONFIG_SPI_MASTER=y |
| @@ -976,12 +977,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 976 | # Multifunction device drivers | 977 | # Multifunction device drivers |
| 977 | # | 978 | # |
| 978 | # CONFIG_MFD_SM501 is not set | 979 | # CONFIG_MFD_SM501 is not set |
| 980 | # CONFIG_HTC_PASIC3 is not set | ||
| 979 | 981 | ||
| 980 | # | 982 | # |
| 981 | # Multimedia devices | 983 | # Multimedia devices |
| 982 | # | 984 | # |
| 985 | |||
| 986 | # | ||
| 987 | # Multimedia core support | ||
| 988 | # | ||
| 983 | # CONFIG_VIDEO_DEV is not set | 989 | # CONFIG_VIDEO_DEV is not set |
| 984 | # CONFIG_DVB_CORE is not set | 990 | # CONFIG_DVB_CORE is not set |
| 991 | # CONFIG_VIDEO_MEDIA is not set | ||
| 992 | |||
| 993 | # | ||
| 994 | # Multimedia drivers | ||
| 995 | # | ||
| 985 | CONFIG_DAB=y | 996 | CONFIG_DAB=y |
| 986 | # CONFIG_USB_DABUSB is not set | 997 | # CONFIG_USB_DABUSB is not set |
| 987 | 998 | ||
| @@ -1034,16 +1045,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1034 | CONFIG_USB_DEVICE_CLASS=y | 1045 | CONFIG_USB_DEVICE_CLASS=y |
| 1035 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1046 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1036 | # CONFIG_USB_OTG is not set | 1047 | # CONFIG_USB_OTG is not set |
| 1048 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1049 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1037 | 1050 | ||
| 1038 | # | 1051 | # |
| 1039 | # USB Host Controller Drivers | 1052 | # USB Host Controller Drivers |
| 1040 | # | 1053 | # |
| 1054 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1041 | CONFIG_USB_EHCI_HCD=y | 1055 | CONFIG_USB_EHCI_HCD=y |
| 1042 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1056 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1043 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1057 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1044 | CONFIG_USB_EHCI_FSL=y | 1058 | CONFIG_USB_EHCI_FSL=y |
| 1045 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1059 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1046 | # CONFIG_USB_ISP116X_HCD is not set | 1060 | # CONFIG_USB_ISP116X_HCD is not set |
| 1061 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1047 | CONFIG_USB_OHCI_HCD=y | 1062 | CONFIG_USB_OHCI_HCD=y |
| 1048 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1063 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1049 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1064 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1061,6 +1076,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1061 | # | 1076 | # |
| 1062 | # CONFIG_USB_ACM is not set | 1077 | # CONFIG_USB_ACM is not set |
| 1063 | # CONFIG_USB_PRINTER is not set | 1078 | # CONFIG_USB_PRINTER is not set |
| 1079 | # CONFIG_USB_WDM is not set | ||
| 1064 | 1080 | ||
| 1065 | # | 1081 | # |
| 1066 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1082 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1080,7 +1096,9 @@ CONFIG_USB_STORAGE=y | |||
| 1080 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1096 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1081 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1097 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1082 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1098 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1099 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1083 | # CONFIG_USB_STORAGE_KARMA is not set | 1100 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1101 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1084 | # CONFIG_USB_LIBUSUAL is not set | 1102 | # CONFIG_USB_LIBUSUAL is not set |
| 1085 | 1103 | ||
| 1086 | # | 1104 | # |
| @@ -1118,6 +1136,7 @@ CONFIG_USB_MON=y | |||
| 1118 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1136 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1119 | # CONFIG_USB_IOWARRIOR is not set | 1137 | # CONFIG_USB_IOWARRIOR is not set |
| 1120 | # CONFIG_USB_TEST is not set | 1138 | # CONFIG_USB_TEST is not set |
| 1139 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1121 | CONFIG_USB_GADGET=y | 1140 | CONFIG_USB_GADGET=y |
| 1122 | # CONFIG_USB_GADGET_DEBUG is not set | 1141 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1123 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1142 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1129,6 +1148,7 @@ CONFIG_USB_GADGET_NET2280=y | |||
| 1129 | CONFIG_USB_NET2280=y | 1148 | CONFIG_USB_NET2280=y |
| 1130 | # CONFIG_USB_GADGET_PXA2XX is not set | 1149 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 1131 | # CONFIG_USB_GADGET_M66592 is not set | 1150 | # CONFIG_USB_GADGET_M66592 is not set |
| 1151 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 1132 | # CONFIG_USB_GADGET_GOKU is not set | 1152 | # CONFIG_USB_GADGET_GOKU is not set |
| 1133 | # CONFIG_USB_GADGET_LH7A40X is not set | 1153 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 1134 | # CONFIG_USB_GADGET_OMAP is not set | 1154 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -1147,6 +1167,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1147 | # CONFIG_MMC is not set | 1167 | # CONFIG_MMC is not set |
| 1148 | # CONFIG_MEMSTICK is not set | 1168 | # CONFIG_MEMSTICK is not set |
| 1149 | # CONFIG_NEW_LEDS is not set | 1169 | # CONFIG_NEW_LEDS is not set |
| 1170 | # CONFIG_ACCESSIBILITY is not set | ||
| 1150 | # CONFIG_INFINIBAND is not set | 1171 | # CONFIG_INFINIBAND is not set |
| 1151 | # CONFIG_EDAC is not set | 1172 | # CONFIG_EDAC is not set |
| 1152 | CONFIG_RTC_LIB=y | 1173 | CONFIG_RTC_LIB=y |
| @@ -1201,11 +1222,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1201 | # | 1222 | # |
| 1202 | # on-CPU RTC drivers | 1223 | # on-CPU RTC drivers |
| 1203 | # | 1224 | # |
| 1225 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1204 | # CONFIG_DMADEVICES is not set | 1226 | # CONFIG_DMADEVICES is not set |
| 1205 | |||
| 1206 | # | ||
| 1207 | # Userspace I/O | ||
| 1208 | # | ||
| 1209 | # CONFIG_UIO is not set | 1227 | # CONFIG_UIO is not set |
| 1210 | 1228 | ||
| 1211 | # | 1229 | # |
| @@ -1225,7 +1243,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1225 | # CONFIG_JFS_FS is not set | 1243 | # CONFIG_JFS_FS is not set |
| 1226 | # CONFIG_FS_POSIX_ACL is not set | 1244 | # CONFIG_FS_POSIX_ACL is not set |
| 1227 | # CONFIG_XFS_FS is not set | 1245 | # CONFIG_XFS_FS is not set |
| 1228 | # CONFIG_GFS2_FS is not set | ||
| 1229 | # CONFIG_OCFS2_FS is not set | 1246 | # CONFIG_OCFS2_FS is not set |
| 1230 | CONFIG_DNOTIFY=y | 1247 | CONFIG_DNOTIFY=y |
| 1231 | CONFIG_INOTIFY=y | 1248 | CONFIG_INOTIFY=y |
| @@ -1294,7 +1311,6 @@ CONFIG_NFS_FS=y | |||
| 1294 | CONFIG_NFS_V3=y | 1311 | CONFIG_NFS_V3=y |
| 1295 | # CONFIG_NFS_V3_ACL is not set | 1312 | # CONFIG_NFS_V3_ACL is not set |
| 1296 | CONFIG_NFS_V4=y | 1313 | CONFIG_NFS_V4=y |
| 1297 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1298 | # CONFIG_NFSD is not set | 1314 | # CONFIG_NFSD is not set |
| 1299 | CONFIG_ROOT_NFS=y | 1315 | CONFIG_ROOT_NFS=y |
| 1300 | CONFIG_LOCKD=y | 1316 | CONFIG_LOCKD=y |
| @@ -1339,6 +1355,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1339 | # Library routines | 1355 | # Library routines |
| 1340 | # | 1356 | # |
| 1341 | CONFIG_BITREVERSE=y | 1357 | CONFIG_BITREVERSE=y |
| 1358 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1342 | # CONFIG_CRC_CCITT is not set | 1359 | # CONFIG_CRC_CCITT is not set |
| 1343 | # CONFIG_CRC16 is not set | 1360 | # CONFIG_CRC16 is not set |
| 1344 | # CONFIG_CRC_ITU_T is not set | 1361 | # CONFIG_CRC_ITU_T is not set |
| @@ -1351,6 +1368,7 @@ CONFIG_PLIST=y | |||
| 1351 | CONFIG_HAS_IOMEM=y | 1368 | CONFIG_HAS_IOMEM=y |
| 1352 | CONFIG_HAS_IOPORT=y | 1369 | CONFIG_HAS_IOPORT=y |
| 1353 | CONFIG_HAS_DMA=y | 1370 | CONFIG_HAS_DMA=y |
| 1371 | CONFIG_HAVE_LMB=y | ||
| 1354 | 1372 | ||
| 1355 | # | 1373 | # |
| 1356 | # Kernel hacking | 1374 | # Kernel hacking |
| @@ -1358,6 +1376,7 @@ CONFIG_HAS_DMA=y | |||
| 1358 | # CONFIG_PRINTK_TIME is not set | 1376 | # CONFIG_PRINTK_TIME is not set |
| 1359 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1377 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1360 | CONFIG_ENABLE_MUST_CHECK=y | 1378 | CONFIG_ENABLE_MUST_CHECK=y |
| 1379 | CONFIG_FRAME_WARN=1024 | ||
| 1361 | # CONFIG_MAGIC_SYSRQ is not set | 1380 | # CONFIG_MAGIC_SYSRQ is not set |
| 1362 | # CONFIG_UNUSED_SYMBOLS is not set | 1381 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1363 | # CONFIG_DEBUG_FS is not set | 1382 | # CONFIG_DEBUG_FS is not set |
| @@ -1368,6 +1387,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1368 | CONFIG_SCHED_DEBUG=y | 1387 | CONFIG_SCHED_DEBUG=y |
| 1369 | # CONFIG_SCHEDSTATS is not set | 1388 | # CONFIG_SCHEDSTATS is not set |
| 1370 | # CONFIG_TIMER_STATS is not set | 1389 | # CONFIG_TIMER_STATS is not set |
| 1390 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1371 | # CONFIG_SLUB_DEBUG_ON is not set | 1391 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1372 | # CONFIG_SLUB_STATS is not set | 1392 | # CONFIG_SLUB_STATS is not set |
| 1373 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1393 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1380,6 +1400,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1380 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1400 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1381 | # CONFIG_DEBUG_INFO is not set | 1401 | # CONFIG_DEBUG_INFO is not set |
| 1382 | # CONFIG_DEBUG_VM is not set | 1402 | # CONFIG_DEBUG_VM is not set |
| 1403 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1383 | # CONFIG_DEBUG_LIST is not set | 1404 | # CONFIG_DEBUG_LIST is not set |
| 1384 | # CONFIG_DEBUG_SG is not set | 1405 | # CONFIG_DEBUG_SG is not set |
| 1385 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1406 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1391,6 +1412,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1391 | # CONFIG_DEBUG_STACK_USAGE is not set | 1412 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1392 | # CONFIG_DEBUG_PAGEALLOC is not set | 1413 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1393 | # CONFIG_DEBUGGER is not set | 1414 | # CONFIG_DEBUGGER is not set |
| 1415 | # CONFIG_IRQSTACKS is not set | ||
| 1394 | # CONFIG_BDI_SWITCH is not set | 1416 | # CONFIG_BDI_SWITCH is not set |
| 1395 | # CONFIG_PPC_EARLY_DEBUG is not set | 1417 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1396 | 1418 | ||
| @@ -1401,51 +1423,81 @@ CONFIG_SCHED_DEBUG=y | |||
| 1401 | # CONFIG_SECURITY is not set | 1423 | # CONFIG_SECURITY is not set |
| 1402 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1424 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1403 | CONFIG_CRYPTO=y | 1425 | CONFIG_CRYPTO=y |
| 1426 | |||
| 1427 | # | ||
| 1428 | # Crypto core or helper | ||
| 1429 | # | ||
| 1404 | CONFIG_CRYPTO_ALGAPI=y | 1430 | CONFIG_CRYPTO_ALGAPI=y |
| 1405 | CONFIG_CRYPTO_BLKCIPHER=y | 1431 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1406 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1407 | CONFIG_CRYPTO_MANAGER=y | 1432 | CONFIG_CRYPTO_MANAGER=y |
| 1433 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1434 | # CONFIG_CRYPTO_NULL is not set | ||
| 1435 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1436 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1437 | # CONFIG_CRYPTO_TEST is not set | ||
| 1438 | |||
| 1439 | # | ||
| 1440 | # Authenticated Encryption with Associated Data | ||
| 1441 | # | ||
| 1442 | # CONFIG_CRYPTO_CCM is not set | ||
| 1443 | # CONFIG_CRYPTO_GCM is not set | ||
| 1444 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1445 | |||
| 1446 | # | ||
| 1447 | # Block modes | ||
| 1448 | # | ||
| 1449 | CONFIG_CRYPTO_CBC=y | ||
| 1450 | # CONFIG_CRYPTO_CTR is not set | ||
| 1451 | # CONFIG_CRYPTO_CTS is not set | ||
| 1452 | # CONFIG_CRYPTO_ECB is not set | ||
| 1453 | # CONFIG_CRYPTO_LRW is not set | ||
| 1454 | CONFIG_CRYPTO_PCBC=m | ||
| 1455 | # CONFIG_CRYPTO_XTS is not set | ||
| 1456 | |||
| 1457 | # | ||
| 1458 | # Hash modes | ||
| 1459 | # | ||
| 1408 | # CONFIG_CRYPTO_HMAC is not set | 1460 | # CONFIG_CRYPTO_HMAC is not set |
| 1409 | # CONFIG_CRYPTO_XCBC is not set | 1461 | # CONFIG_CRYPTO_XCBC is not set |
| 1410 | # CONFIG_CRYPTO_NULL is not set | 1462 | |
| 1463 | # | ||
| 1464 | # Digest | ||
| 1465 | # | ||
| 1466 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1411 | # CONFIG_CRYPTO_MD4 is not set | 1467 | # CONFIG_CRYPTO_MD4 is not set |
| 1412 | CONFIG_CRYPTO_MD5=y | 1468 | CONFIG_CRYPTO_MD5=y |
| 1469 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1413 | # CONFIG_CRYPTO_SHA1 is not set | 1470 | # CONFIG_CRYPTO_SHA1 is not set |
| 1414 | # CONFIG_CRYPTO_SHA256 is not set | 1471 | # CONFIG_CRYPTO_SHA256 is not set |
| 1415 | # CONFIG_CRYPTO_SHA512 is not set | 1472 | # CONFIG_CRYPTO_SHA512 is not set |
| 1416 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1417 | # CONFIG_CRYPTO_TGR192 is not set | 1473 | # CONFIG_CRYPTO_TGR192 is not set |
| 1418 | # CONFIG_CRYPTO_GF128MUL is not set | 1474 | # CONFIG_CRYPTO_WP512 is not set |
| 1419 | # CONFIG_CRYPTO_ECB is not set | 1475 | |
| 1420 | CONFIG_CRYPTO_CBC=y | 1476 | # |
| 1421 | CONFIG_CRYPTO_PCBC=m | 1477 | # Ciphers |
| 1422 | # CONFIG_CRYPTO_LRW is not set | 1478 | # |
| 1423 | # CONFIG_CRYPTO_XTS is not set | ||
| 1424 | # CONFIG_CRYPTO_CTR is not set | ||
| 1425 | # CONFIG_CRYPTO_GCM is not set | ||
| 1426 | # CONFIG_CRYPTO_CCM is not set | ||
| 1427 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1428 | CONFIG_CRYPTO_DES=y | ||
| 1429 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1430 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1431 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1432 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1433 | # CONFIG_CRYPTO_AES is not set | 1479 | # CONFIG_CRYPTO_AES is not set |
| 1480 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1481 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1482 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1483 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1434 | # CONFIG_CRYPTO_CAST5 is not set | 1484 | # CONFIG_CRYPTO_CAST5 is not set |
| 1435 | # CONFIG_CRYPTO_CAST6 is not set | 1485 | # CONFIG_CRYPTO_CAST6 is not set |
| 1436 | # CONFIG_CRYPTO_TEA is not set | 1486 | CONFIG_CRYPTO_DES=y |
| 1437 | # CONFIG_CRYPTO_ARC4 is not set | 1487 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1438 | # CONFIG_CRYPTO_KHAZAD is not set | 1488 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1439 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1440 | # CONFIG_CRYPTO_SEED is not set | ||
| 1441 | # CONFIG_CRYPTO_SALSA20 is not set | 1489 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1490 | # CONFIG_CRYPTO_SEED is not set | ||
| 1491 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1492 | # CONFIG_CRYPTO_TEA is not set | ||
| 1493 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1494 | |||
| 1495 | # | ||
| 1496 | # Compression | ||
| 1497 | # | ||
| 1442 | # CONFIG_CRYPTO_DEFLATE is not set | 1498 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1443 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1444 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1445 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1446 | # CONFIG_CRYPTO_TEST is not set | ||
| 1447 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1448 | # CONFIG_CRYPTO_LZO is not set | 1499 | # CONFIG_CRYPTO_LZO is not set |
| 1449 | CONFIG_CRYPTO_HW=y | 1500 | CONFIG_CRYPTO_HW=y |
| 1450 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1501 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1451 | # CONFIG_PPC_CLOCK is not set | 1502 | # CONFIG_PPC_CLOCK is not set |
| 1503 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index 50cceda8994f..1eca26f3659a 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:51 2008 | 4 | # Mon Jun 9 08:52:22 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -212,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -239,6 +246,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 239 | CONFIG_PCI_LEGACY=y | 246 | CONFIG_PCI_LEGACY=y |
| 240 | # CONFIG_PCCARD is not set | 247 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 248 | # CONFIG_HOTPLUG_PCI is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 250 | ||
| 243 | # | 251 | # |
| 244 | # Advanced setup | 252 | # Advanced setup |
| @@ -248,11 +256,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 256 | # |
| 249 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 250 | # | 258 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 264 | ||
| 257 | # | 265 | # |
| 258 | # Networking | 266 | # Networking |
| @@ -300,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -355,6 +361,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 355 | # CONFIG_CONNECTOR is not set | 361 | # CONFIG_CONNECTOR is not set |
| 356 | # CONFIG_MTD is not set | 362 | # CONFIG_MTD is not set |
| 357 | CONFIG_OF_DEVICE=y | 363 | CONFIG_OF_DEVICE=y |
| 364 | CONFIG_OF_I2C=y | ||
| 358 | # CONFIG_PARPORT is not set | 365 | # CONFIG_PARPORT is not set |
| 359 | CONFIG_BLK_DEV=y | 366 | CONFIG_BLK_DEV=y |
| 360 | # CONFIG_BLK_DEV_FD is not set | 367 | # CONFIG_BLK_DEV_FD is not set |
| @@ -522,7 +529,6 @@ CONFIG_NETDEV_1000=y | |||
| 522 | # CONFIG_SIS190 is not set | 529 | # CONFIG_SIS190 is not set |
| 523 | # CONFIG_SKGE is not set | 530 | # CONFIG_SKGE is not set |
| 524 | # CONFIG_SKY2 is not set | 531 | # CONFIG_SKY2 is not set |
| 525 | # CONFIG_SK98LIN is not set | ||
| 526 | # CONFIG_VIA_VELOCITY is not set | 532 | # CONFIG_VIA_VELOCITY is not set |
| 527 | # CONFIG_TIGON3 is not set | 533 | # CONFIG_TIGON3 is not set |
| 528 | # CONFIG_BNX2 is not set | 534 | # CONFIG_BNX2 is not set |
| @@ -546,6 +552,7 @@ CONFIG_NETDEV_10000=y | |||
| 546 | # CONFIG_MLX4_CORE is not set | 552 | # CONFIG_MLX4_CORE is not set |
| 547 | # CONFIG_TEHUTI is not set | 553 | # CONFIG_TEHUTI is not set |
| 548 | # CONFIG_BNX2X is not set | 554 | # CONFIG_BNX2X is not set |
| 555 | # CONFIG_SFC is not set | ||
| 549 | # CONFIG_TR is not set | 556 | # CONFIG_TR is not set |
| 550 | 557 | ||
| 551 | # | 558 | # |
| @@ -553,6 +560,7 @@ CONFIG_NETDEV_10000=y | |||
| 553 | # | 560 | # |
| 554 | # CONFIG_WLAN_PRE80211 is not set | 561 | # CONFIG_WLAN_PRE80211 is not set |
| 555 | # CONFIG_WLAN_80211 is not set | 562 | # CONFIG_WLAN_80211 is not set |
| 563 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 556 | # CONFIG_WAN is not set | 564 | # CONFIG_WAN is not set |
| 557 | # CONFIG_FDDI is not set | 565 | # CONFIG_FDDI is not set |
| 558 | # CONFIG_HIPPI is not set | 566 | # CONFIG_HIPPI is not set |
| @@ -600,6 +608,7 @@ CONFIG_INPUT=y | |||
| 600 | # Character devices | 608 | # Character devices |
| 601 | # | 609 | # |
| 602 | # CONFIG_VT is not set | 610 | # CONFIG_VT is not set |
| 611 | CONFIG_DEVKMEM=y | ||
| 603 | # CONFIG_SERIAL_NONSTANDARD is not set | 612 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 604 | # CONFIG_NOZOMI is not set | 613 | # CONFIG_NOZOMI is not set |
| 605 | 614 | ||
| @@ -628,7 +637,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 628 | # CONFIG_IPMI_HANDLER is not set | 637 | # CONFIG_IPMI_HANDLER is not set |
| 629 | CONFIG_HW_RANDOM=y | 638 | CONFIG_HW_RANDOM=y |
| 630 | # CONFIG_NVRAM is not set | 639 | # CONFIG_NVRAM is not set |
| 631 | # CONFIG_GEN_RTC is not set | ||
| 632 | # CONFIG_R3964 is not set | 640 | # CONFIG_R3964 is not set |
| 633 | # CONFIG_APPLICOM is not set | 641 | # CONFIG_APPLICOM is not set |
| 634 | # CONFIG_RAW_DRIVER is not set | 642 | # CONFIG_RAW_DRIVER is not set |
| @@ -639,13 +647,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 639 | CONFIG_I2C_CHARDEV=y | 647 | CONFIG_I2C_CHARDEV=y |
| 640 | 648 | ||
| 641 | # | 649 | # |
| 642 | # I2C Algorithms | ||
| 643 | # | ||
| 644 | # CONFIG_I2C_ALGOBIT is not set | ||
| 645 | # CONFIG_I2C_ALGOPCF is not set | ||
| 646 | # CONFIG_I2C_ALGOPCA is not set | ||
| 647 | |||
| 648 | # | ||
| 649 | # I2C Hardware Bus support | 650 | # I2C Hardware Bus support |
| 650 | # | 651 | # |
| 651 | # CONFIG_I2C_ALI1535 is not set | 652 | # CONFIG_I2C_ALI1535 is not set |
| @@ -671,6 +672,7 @@ CONFIG_I2C_MPC=y | |||
| 671 | # CONFIG_I2C_VIA is not set | 672 | # CONFIG_I2C_VIA is not set |
| 672 | # CONFIG_I2C_VIAPRO is not set | 673 | # CONFIG_I2C_VIAPRO is not set |
| 673 | # CONFIG_I2C_VOODOO3 is not set | 674 | # CONFIG_I2C_VOODOO3 is not set |
| 675 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 674 | 676 | ||
| 675 | # | 677 | # |
| 676 | # Miscellaneous I2C Chip support | 678 | # Miscellaneous I2C Chip support |
| @@ -680,19 +682,13 @@ CONFIG_I2C_MPC=y | |||
| 680 | # CONFIG_SENSORS_PCF8574 is not set | 682 | # CONFIG_SENSORS_PCF8574 is not set |
| 681 | # CONFIG_PCF8575 is not set | 683 | # CONFIG_PCF8575 is not set |
| 682 | # CONFIG_SENSORS_PCF8591 is not set | 684 | # CONFIG_SENSORS_PCF8591 is not set |
| 683 | # CONFIG_TPS65010 is not set | ||
| 684 | # CONFIG_SENSORS_MAX6875 is not set | 685 | # CONFIG_SENSORS_MAX6875 is not set |
| 685 | # CONFIG_SENSORS_TSL2550 is not set | 686 | # CONFIG_SENSORS_TSL2550 is not set |
| 686 | # CONFIG_I2C_DEBUG_CORE is not set | 687 | # CONFIG_I2C_DEBUG_CORE is not set |
| 687 | # CONFIG_I2C_DEBUG_ALGO is not set | 688 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 688 | # CONFIG_I2C_DEBUG_BUS is not set | 689 | # CONFIG_I2C_DEBUG_BUS is not set |
| 689 | # CONFIG_I2C_DEBUG_CHIP is not set | 690 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 690 | |||
| 691 | # | ||
| 692 | # SPI support | ||
| 693 | # | ||
| 694 | # CONFIG_SPI is not set | 691 | # CONFIG_SPI is not set |
| 695 | # CONFIG_SPI_MASTER is not set | ||
| 696 | # CONFIG_W1 is not set | 692 | # CONFIG_W1 is not set |
| 697 | # CONFIG_POWER_SUPPLY is not set | 693 | # CONFIG_POWER_SUPPLY is not set |
| 698 | CONFIG_HWMON=y | 694 | CONFIG_HWMON=y |
| @@ -775,12 +771,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 775 | # Multifunction device drivers | 771 | # Multifunction device drivers |
| 776 | # | 772 | # |
| 777 | # CONFIG_MFD_SM501 is not set | 773 | # CONFIG_MFD_SM501 is not set |
| 774 | # CONFIG_HTC_PASIC3 is not set | ||
| 778 | 775 | ||
| 779 | # | 776 | # |
| 780 | # Multimedia devices | 777 | # Multimedia devices |
| 781 | # | 778 | # |
| 779 | |||
| 780 | # | ||
| 781 | # Multimedia core support | ||
| 782 | # | ||
| 782 | # CONFIG_VIDEO_DEV is not set | 783 | # CONFIG_VIDEO_DEV is not set |
| 783 | # CONFIG_DVB_CORE is not set | 784 | # CONFIG_DVB_CORE is not set |
| 785 | # CONFIG_VIDEO_MEDIA is not set | ||
| 786 | |||
| 787 | # | ||
| 788 | # Multimedia drivers | ||
| 789 | # | ||
| 784 | CONFIG_DAB=y | 790 | CONFIG_DAB=y |
| 785 | 791 | ||
| 786 | # | 792 | # |
| @@ -811,6 +817,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 811 | CONFIG_USB_ARCH_HAS_OHCI=y | 817 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 812 | CONFIG_USB_ARCH_HAS_EHCI=y | 818 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 813 | # CONFIG_USB is not set | 819 | # CONFIG_USB is not set |
| 820 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 821 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 814 | 822 | ||
| 815 | # | 823 | # |
| 816 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 824 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -819,6 +827,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 819 | # CONFIG_MMC is not set | 827 | # CONFIG_MMC is not set |
| 820 | # CONFIG_MEMSTICK is not set | 828 | # CONFIG_MEMSTICK is not set |
| 821 | # CONFIG_NEW_LEDS is not set | 829 | # CONFIG_NEW_LEDS is not set |
| 830 | # CONFIG_ACCESSIBILITY is not set | ||
| 822 | # CONFIG_INFINIBAND is not set | 831 | # CONFIG_INFINIBAND is not set |
| 823 | # CONFIG_EDAC is not set | 832 | # CONFIG_EDAC is not set |
| 824 | CONFIG_RTC_LIB=y | 833 | CONFIG_RTC_LIB=y |
| @@ -870,11 +879,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 870 | # | 879 | # |
| 871 | # on-CPU RTC drivers | 880 | # on-CPU RTC drivers |
| 872 | # | 881 | # |
| 882 | # CONFIG_RTC_DRV_PPC is not set | ||
| 873 | # CONFIG_DMADEVICES is not set | 883 | # CONFIG_DMADEVICES is not set |
| 874 | |||
| 875 | # | ||
| 876 | # Userspace I/O | ||
| 877 | # | ||
| 878 | # CONFIG_UIO is not set | 884 | # CONFIG_UIO is not set |
| 879 | 885 | ||
| 880 | # | 886 | # |
| @@ -894,7 +900,6 @@ CONFIG_FS_MBCACHE=y | |||
| 894 | # CONFIG_JFS_FS is not set | 900 | # CONFIG_JFS_FS is not set |
| 895 | # CONFIG_FS_POSIX_ACL is not set | 901 | # CONFIG_FS_POSIX_ACL is not set |
| 896 | # CONFIG_XFS_FS is not set | 902 | # CONFIG_XFS_FS is not set |
| 897 | # CONFIG_GFS2_FS is not set | ||
| 898 | # CONFIG_OCFS2_FS is not set | 903 | # CONFIG_OCFS2_FS is not set |
| 899 | CONFIG_DNOTIFY=y | 904 | CONFIG_DNOTIFY=y |
| 900 | CONFIG_INOTIFY=y | 905 | CONFIG_INOTIFY=y |
| @@ -952,7 +957,6 @@ CONFIG_NFS_FS=y | |||
| 952 | CONFIG_NFS_V3=y | 957 | CONFIG_NFS_V3=y |
| 953 | # CONFIG_NFS_V3_ACL is not set | 958 | # CONFIG_NFS_V3_ACL is not set |
| 954 | CONFIG_NFS_V4=y | 959 | CONFIG_NFS_V4=y |
| 955 | # CONFIG_NFS_DIRECTIO is not set | ||
| 956 | # CONFIG_NFSD is not set | 960 | # CONFIG_NFSD is not set |
| 957 | CONFIG_ROOT_NFS=y | 961 | CONFIG_ROOT_NFS=y |
| 958 | CONFIG_LOCKD=y | 962 | CONFIG_LOCKD=y |
| @@ -995,6 +999,7 @@ CONFIG_UCC=y | |||
| 995 | # Library routines | 999 | # Library routines |
| 996 | # | 1000 | # |
| 997 | CONFIG_BITREVERSE=y | 1001 | CONFIG_BITREVERSE=y |
| 1002 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 998 | # CONFIG_CRC_CCITT is not set | 1003 | # CONFIG_CRC_CCITT is not set |
| 999 | # CONFIG_CRC16 is not set | 1004 | # CONFIG_CRC16 is not set |
| 1000 | # CONFIG_CRC_ITU_T is not set | 1005 | # CONFIG_CRC_ITU_T is not set |
| @@ -1005,6 +1010,7 @@ CONFIG_PLIST=y | |||
| 1005 | CONFIG_HAS_IOMEM=y | 1010 | CONFIG_HAS_IOMEM=y |
| 1006 | CONFIG_HAS_IOPORT=y | 1011 | CONFIG_HAS_IOPORT=y |
| 1007 | CONFIG_HAS_DMA=y | 1012 | CONFIG_HAS_DMA=y |
| 1013 | CONFIG_HAVE_LMB=y | ||
| 1008 | 1014 | ||
| 1009 | # | 1015 | # |
| 1010 | # Kernel hacking | 1016 | # Kernel hacking |
| @@ -1012,6 +1018,7 @@ CONFIG_HAS_DMA=y | |||
| 1012 | # CONFIG_PRINTK_TIME is not set | 1018 | # CONFIG_PRINTK_TIME is not set |
| 1013 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1019 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1014 | CONFIG_ENABLE_MUST_CHECK=y | 1020 | CONFIG_ENABLE_MUST_CHECK=y |
| 1021 | CONFIG_FRAME_WARN=1024 | ||
| 1015 | # CONFIG_MAGIC_SYSRQ is not set | 1022 | # CONFIG_MAGIC_SYSRQ is not set |
| 1016 | # CONFIG_UNUSED_SYMBOLS is not set | 1023 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1017 | # CONFIG_DEBUG_FS is not set | 1024 | # CONFIG_DEBUG_FS is not set |
| @@ -1021,6 +1028,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1021 | # CONFIG_SLUB_STATS is not set | 1028 | # CONFIG_SLUB_STATS is not set |
| 1022 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1029 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1023 | # CONFIG_SAMPLES is not set | 1030 | # CONFIG_SAMPLES is not set |
| 1031 | # CONFIG_IRQSTACKS is not set | ||
| 1024 | # CONFIG_PPC_EARLY_DEBUG is not set | 1032 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1025 | 1033 | ||
| 1026 | # | 1034 | # |
| @@ -1030,52 +1038,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1030 | # CONFIG_SECURITY is not set | 1038 | # CONFIG_SECURITY is not set |
| 1031 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1039 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1032 | CONFIG_CRYPTO=y | 1040 | CONFIG_CRYPTO=y |
| 1041 | |||
| 1042 | # | ||
| 1043 | # Crypto core or helper | ||
| 1044 | # | ||
| 1033 | CONFIG_CRYPTO_ALGAPI=y | 1045 | CONFIG_CRYPTO_ALGAPI=y |
| 1034 | CONFIG_CRYPTO_BLKCIPHER=y | 1046 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1035 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1036 | CONFIG_CRYPTO_MANAGER=y | 1047 | CONFIG_CRYPTO_MANAGER=y |
| 1048 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1049 | # CONFIG_CRYPTO_NULL is not set | ||
| 1050 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1051 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1052 | # CONFIG_CRYPTO_TEST is not set | ||
| 1053 | |||
| 1054 | # | ||
| 1055 | # Authenticated Encryption with Associated Data | ||
| 1056 | # | ||
| 1057 | # CONFIG_CRYPTO_CCM is not set | ||
| 1058 | # CONFIG_CRYPTO_GCM is not set | ||
| 1059 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1060 | |||
| 1061 | # | ||
| 1062 | # Block modes | ||
| 1063 | # | ||
| 1064 | CONFIG_CRYPTO_CBC=y | ||
| 1065 | # CONFIG_CRYPTO_CTR is not set | ||
| 1066 | # CONFIG_CRYPTO_CTS is not set | ||
| 1067 | CONFIG_CRYPTO_ECB=m | ||
| 1068 | # CONFIG_CRYPTO_LRW is not set | ||
| 1069 | CONFIG_CRYPTO_PCBC=m | ||
| 1070 | # CONFIG_CRYPTO_XTS is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Hash modes | ||
| 1074 | # | ||
| 1037 | # CONFIG_CRYPTO_HMAC is not set | 1075 | # CONFIG_CRYPTO_HMAC is not set |
| 1038 | # CONFIG_CRYPTO_XCBC is not set | 1076 | # CONFIG_CRYPTO_XCBC is not set |
| 1039 | # CONFIG_CRYPTO_NULL is not set | 1077 | |
| 1078 | # | ||
| 1079 | # Digest | ||
| 1080 | # | ||
| 1081 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1040 | # CONFIG_CRYPTO_MD4 is not set | 1082 | # CONFIG_CRYPTO_MD4 is not set |
| 1041 | CONFIG_CRYPTO_MD5=y | 1083 | CONFIG_CRYPTO_MD5=y |
| 1084 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1042 | # CONFIG_CRYPTO_SHA1 is not set | 1085 | # CONFIG_CRYPTO_SHA1 is not set |
| 1043 | # CONFIG_CRYPTO_SHA256 is not set | 1086 | # CONFIG_CRYPTO_SHA256 is not set |
| 1044 | # CONFIG_CRYPTO_SHA512 is not set | 1087 | # CONFIG_CRYPTO_SHA512 is not set |
| 1045 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1046 | # CONFIG_CRYPTO_TGR192 is not set | 1088 | # CONFIG_CRYPTO_TGR192 is not set |
| 1047 | # CONFIG_CRYPTO_GF128MUL is not set | 1089 | # CONFIG_CRYPTO_WP512 is not set |
| 1048 | CONFIG_CRYPTO_ECB=m | 1090 | |
| 1049 | CONFIG_CRYPTO_CBC=y | 1091 | # |
| 1050 | CONFIG_CRYPTO_PCBC=m | 1092 | # Ciphers |
| 1051 | # CONFIG_CRYPTO_LRW is not set | 1093 | # |
| 1052 | # CONFIG_CRYPTO_XTS is not set | ||
| 1053 | # CONFIG_CRYPTO_CTR is not set | ||
| 1054 | # CONFIG_CRYPTO_GCM is not set | ||
| 1055 | # CONFIG_CRYPTO_CCM is not set | ||
| 1056 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1057 | CONFIG_CRYPTO_DES=y | ||
| 1058 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1059 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1060 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1061 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1062 | # CONFIG_CRYPTO_AES is not set | 1094 | # CONFIG_CRYPTO_AES is not set |
| 1095 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1096 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1097 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1098 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1063 | # CONFIG_CRYPTO_CAST5 is not set | 1099 | # CONFIG_CRYPTO_CAST5 is not set |
| 1064 | # CONFIG_CRYPTO_CAST6 is not set | 1100 | # CONFIG_CRYPTO_CAST6 is not set |
| 1065 | # CONFIG_CRYPTO_TEA is not set | 1101 | CONFIG_CRYPTO_DES=y |
| 1066 | # CONFIG_CRYPTO_ARC4 is not set | 1102 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1067 | # CONFIG_CRYPTO_KHAZAD is not set | 1103 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1068 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1069 | # CONFIG_CRYPTO_SEED is not set | ||
| 1070 | # CONFIG_CRYPTO_SALSA20 is not set | 1104 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1105 | # CONFIG_CRYPTO_SEED is not set | ||
| 1106 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1107 | # CONFIG_CRYPTO_TEA is not set | ||
| 1108 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1109 | |||
| 1110 | # | ||
| 1111 | # Compression | ||
| 1112 | # | ||
| 1071 | # CONFIG_CRYPTO_DEFLATE is not set | 1113 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1072 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1073 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1074 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1075 | # CONFIG_CRYPTO_TEST is not set | ||
| 1076 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1077 | # CONFIG_CRYPTO_LZO is not set | 1114 | # CONFIG_CRYPTO_LZO is not set |
| 1078 | CONFIG_CRYPTO_HW=y | 1115 | CONFIG_CRYPTO_HW=y |
| 1079 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1116 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1080 | # CONFIG_PPC_CLOCK is not set | 1117 | # CONFIG_PPC_CLOCK is not set |
| 1081 | CONFIG_PPC_LIB_RHEAP=y | 1118 | CONFIG_PPC_LIB_RHEAP=y |
| 1119 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index ac913025713e..de95d327463c 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:16 2008 | 4 | # Mon Jun 9 08:52:24 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -212,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -239,6 +246,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 239 | CONFIG_PCI_LEGACY=y | 246 | CONFIG_PCI_LEGACY=y |
| 240 | # CONFIG_PCCARD is not set | 247 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 248 | # CONFIG_HOTPLUG_PCI is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 250 | ||
| 243 | # | 251 | # |
| 244 | # Advanced setup | 252 | # Advanced setup |
| @@ -248,11 +256,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 256 | # |
| 249 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 250 | # | 258 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 264 | ||
| 257 | # | 265 | # |
| 258 | # Networking | 266 | # Networking |
| @@ -300,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -355,6 +361,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 355 | # CONFIG_CONNECTOR is not set | 361 | # CONFIG_CONNECTOR is not set |
| 356 | # CONFIG_MTD is not set | 362 | # CONFIG_MTD is not set |
| 357 | CONFIG_OF_DEVICE=y | 363 | CONFIG_OF_DEVICE=y |
| 364 | CONFIG_OF_I2C=y | ||
| 358 | # CONFIG_PARPORT is not set | 365 | # CONFIG_PARPORT is not set |
| 359 | CONFIG_BLK_DEV=y | 366 | CONFIG_BLK_DEV=y |
| 360 | # CONFIG_BLK_DEV_FD is not set | 367 | # CONFIG_BLK_DEV_FD is not set |
| @@ -526,7 +533,6 @@ CONFIG_E1000=y | |||
| 526 | # CONFIG_SIS190 is not set | 533 | # CONFIG_SIS190 is not set |
| 527 | # CONFIG_SKGE is not set | 534 | # CONFIG_SKGE is not set |
| 528 | # CONFIG_SKY2 is not set | 535 | # CONFIG_SKY2 is not set |
| 529 | # CONFIG_SK98LIN is not set | ||
| 530 | # CONFIG_VIA_VELOCITY is not set | 536 | # CONFIG_VIA_VELOCITY is not set |
| 531 | # CONFIG_TIGON3 is not set | 537 | # CONFIG_TIGON3 is not set |
| 532 | # CONFIG_BNX2 is not set | 538 | # CONFIG_BNX2 is not set |
| @@ -550,6 +556,7 @@ CONFIG_NETDEV_10000=y | |||
| 550 | # CONFIG_MLX4_CORE is not set | 556 | # CONFIG_MLX4_CORE is not set |
| 551 | # CONFIG_TEHUTI is not set | 557 | # CONFIG_TEHUTI is not set |
| 552 | # CONFIG_BNX2X is not set | 558 | # CONFIG_BNX2X is not set |
| 559 | # CONFIG_SFC is not set | ||
| 553 | # CONFIG_TR is not set | 560 | # CONFIG_TR is not set |
| 554 | 561 | ||
| 555 | # | 562 | # |
| @@ -557,6 +564,7 @@ CONFIG_NETDEV_10000=y | |||
| 557 | # | 564 | # |
| 558 | # CONFIG_WLAN_PRE80211 is not set | 565 | # CONFIG_WLAN_PRE80211 is not set |
| 559 | # CONFIG_WLAN_80211 is not set | 566 | # CONFIG_WLAN_80211 is not set |
| 567 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 560 | 568 | ||
| 561 | # | 569 | # |
| 562 | # USB Network Adapters | 570 | # USB Network Adapters |
| @@ -613,6 +621,7 @@ CONFIG_INPUT=y | |||
| 613 | # Character devices | 621 | # Character devices |
| 614 | # | 622 | # |
| 615 | # CONFIG_VT is not set | 623 | # CONFIG_VT is not set |
| 624 | CONFIG_DEVKMEM=y | ||
| 616 | # CONFIG_SERIAL_NONSTANDARD is not set | 625 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 617 | # CONFIG_NOZOMI is not set | 626 | # CONFIG_NOZOMI is not set |
| 618 | 627 | ||
| @@ -653,13 +662,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 653 | CONFIG_I2C_CHARDEV=y | 662 | CONFIG_I2C_CHARDEV=y |
| 654 | 663 | ||
| 655 | # | 664 | # |
| 656 | # I2C Algorithms | ||
| 657 | # | ||
| 658 | # CONFIG_I2C_ALGOBIT is not set | ||
| 659 | # CONFIG_I2C_ALGOPCF is not set | ||
| 660 | # CONFIG_I2C_ALGOPCA is not set | ||
| 661 | |||
| 662 | # | ||
| 663 | # I2C Hardware Bus support | 665 | # I2C Hardware Bus support |
| 664 | # | 666 | # |
| 665 | # CONFIG_I2C_ALI1535 is not set | 667 | # CONFIG_I2C_ALI1535 is not set |
| @@ -686,6 +688,7 @@ CONFIG_I2C_MPC=y | |||
| 686 | # CONFIG_I2C_VIA is not set | 688 | # CONFIG_I2C_VIA is not set |
| 687 | # CONFIG_I2C_VIAPRO is not set | 689 | # CONFIG_I2C_VIAPRO is not set |
| 688 | # CONFIG_I2C_VOODOO3 is not set | 690 | # CONFIG_I2C_VOODOO3 is not set |
| 691 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 689 | 692 | ||
| 690 | # | 693 | # |
| 691 | # Miscellaneous I2C Chip support | 694 | # Miscellaneous I2C Chip support |
| @@ -695,17 +698,12 @@ CONFIG_I2C_MPC=y | |||
| 695 | # CONFIG_SENSORS_PCF8574 is not set | 698 | # CONFIG_SENSORS_PCF8574 is not set |
| 696 | # CONFIG_PCF8575 is not set | 699 | # CONFIG_PCF8575 is not set |
| 697 | # CONFIG_SENSORS_PCF8591 is not set | 700 | # CONFIG_SENSORS_PCF8591 is not set |
| 698 | # CONFIG_TPS65010 is not set | ||
| 699 | # CONFIG_SENSORS_MAX6875 is not set | 701 | # CONFIG_SENSORS_MAX6875 is not set |
| 700 | # CONFIG_SENSORS_TSL2550 is not set | 702 | # CONFIG_SENSORS_TSL2550 is not set |
| 701 | # CONFIG_I2C_DEBUG_CORE is not set | 703 | # CONFIG_I2C_DEBUG_CORE is not set |
| 702 | # CONFIG_I2C_DEBUG_ALGO is not set | 704 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 703 | # CONFIG_I2C_DEBUG_BUS is not set | 705 | # CONFIG_I2C_DEBUG_BUS is not set |
| 704 | # CONFIG_I2C_DEBUG_CHIP is not set | 706 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 705 | |||
| 706 | # | ||
| 707 | # SPI support | ||
| 708 | # | ||
| 709 | CONFIG_SPI=y | 707 | CONFIG_SPI=y |
| 710 | CONFIG_SPI_MASTER=y | 708 | CONFIG_SPI_MASTER=y |
| 711 | 709 | ||
| @@ -809,12 +807,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 809 | # Multifunction device drivers | 807 | # Multifunction device drivers |
| 810 | # | 808 | # |
| 811 | # CONFIG_MFD_SM501 is not set | 809 | # CONFIG_MFD_SM501 is not set |
| 810 | # CONFIG_HTC_PASIC3 is not set | ||
| 812 | 811 | ||
| 813 | # | 812 | # |
| 814 | # Multimedia devices | 813 | # Multimedia devices |
| 815 | # | 814 | # |
| 815 | |||
| 816 | # | ||
| 817 | # Multimedia core support | ||
| 818 | # | ||
| 816 | # CONFIG_VIDEO_DEV is not set | 819 | # CONFIG_VIDEO_DEV is not set |
| 817 | # CONFIG_DVB_CORE is not set | 820 | # CONFIG_DVB_CORE is not set |
| 821 | # CONFIG_VIDEO_MEDIA is not set | ||
| 822 | |||
| 823 | # | ||
| 824 | # Multimedia drivers | ||
| 825 | # | ||
| 818 | CONFIG_DAB=y | 826 | CONFIG_DAB=y |
| 819 | # CONFIG_USB_DABUSB is not set | 827 | # CONFIG_USB_DABUSB is not set |
| 820 | 828 | ||
| @@ -867,16 +875,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 867 | CONFIG_USB_DEVICE_CLASS=y | 875 | CONFIG_USB_DEVICE_CLASS=y |
| 868 | # CONFIG_USB_DYNAMIC_MINORS is not set | 876 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 869 | # CONFIG_USB_OTG is not set | 877 | # CONFIG_USB_OTG is not set |
| 878 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 879 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 870 | 880 | ||
| 871 | # | 881 | # |
| 872 | # USB Host Controller Drivers | 882 | # USB Host Controller Drivers |
| 873 | # | 883 | # |
| 884 | # CONFIG_USB_C67X00_HCD is not set | ||
| 874 | CONFIG_USB_EHCI_HCD=y | 885 | CONFIG_USB_EHCI_HCD=y |
| 875 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 886 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 876 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 887 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 877 | # CONFIG_USB_EHCI_FSL is not set | 888 | # CONFIG_USB_EHCI_FSL is not set |
| 878 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 889 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 879 | # CONFIG_USB_ISP116X_HCD is not set | 890 | # CONFIG_USB_ISP116X_HCD is not set |
| 891 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 880 | CONFIG_USB_OHCI_HCD=y | 892 | CONFIG_USB_OHCI_HCD=y |
| 881 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 893 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 882 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 894 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -894,6 +906,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 894 | # | 906 | # |
| 895 | # CONFIG_USB_ACM is not set | 907 | # CONFIG_USB_ACM is not set |
| 896 | # CONFIG_USB_PRINTER is not set | 908 | # CONFIG_USB_PRINTER is not set |
| 909 | # CONFIG_USB_WDM is not set | ||
| 897 | 910 | ||
| 898 | # | 911 | # |
| 899 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 912 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -913,7 +926,9 @@ CONFIG_USB_STORAGE=y | |||
| 913 | # CONFIG_USB_STORAGE_SDDR55 is not set | 926 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 914 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 927 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 915 | # CONFIG_USB_STORAGE_ALAUDA is not set | 928 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 929 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 916 | # CONFIG_USB_STORAGE_KARMA is not set | 930 | # CONFIG_USB_STORAGE_KARMA is not set |
| 931 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 917 | # CONFIG_USB_LIBUSUAL is not set | 932 | # CONFIG_USB_LIBUSUAL is not set |
| 918 | 933 | ||
| 919 | # | 934 | # |
| @@ -951,6 +966,7 @@ CONFIG_USB_MON=y | |||
| 951 | # CONFIG_USB_TRANCEVIBRATOR is not set | 966 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 952 | # CONFIG_USB_IOWARRIOR is not set | 967 | # CONFIG_USB_IOWARRIOR is not set |
| 953 | # CONFIG_USB_TEST is not set | 968 | # CONFIG_USB_TEST is not set |
| 969 | # CONFIG_USB_ISIGHTFW is not set | ||
| 954 | # CONFIG_USB_GADGET is not set | 970 | # CONFIG_USB_GADGET is not set |
| 955 | CONFIG_MMC=y | 971 | CONFIG_MMC=y |
| 956 | # CONFIG_MMC_DEBUG is not set | 972 | # CONFIG_MMC_DEBUG is not set |
| @@ -962,6 +978,7 @@ CONFIG_MMC=y | |||
| 962 | CONFIG_MMC_BLOCK=y | 978 | CONFIG_MMC_BLOCK=y |
| 963 | CONFIG_MMC_BLOCK_BOUNCE=y | 979 | CONFIG_MMC_BLOCK_BOUNCE=y |
| 964 | # CONFIG_SDIO_UART is not set | 980 | # CONFIG_SDIO_UART is not set |
| 981 | # CONFIG_MMC_TEST is not set | ||
| 965 | 982 | ||
| 966 | # | 983 | # |
| 967 | # MMC/SD Host Controller Drivers | 984 | # MMC/SD Host Controller Drivers |
| @@ -972,14 +989,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
| 972 | CONFIG_MMC_SPI=y | 989 | CONFIG_MMC_SPI=y |
| 973 | # CONFIG_MEMSTICK is not set | 990 | # CONFIG_MEMSTICK is not set |
| 974 | # CONFIG_NEW_LEDS is not set | 991 | # CONFIG_NEW_LEDS is not set |
| 992 | # CONFIG_ACCESSIBILITY is not set | ||
| 975 | # CONFIG_INFINIBAND is not set | 993 | # CONFIG_INFINIBAND is not set |
| 976 | # CONFIG_EDAC is not set | 994 | # CONFIG_EDAC is not set |
| 977 | # CONFIG_RTC_CLASS is not set | 995 | # CONFIG_RTC_CLASS is not set |
| 978 | # CONFIG_DMADEVICES is not set | 996 | # CONFIG_DMADEVICES is not set |
| 979 | |||
| 980 | # | ||
| 981 | # Userspace I/O | ||
| 982 | # | ||
| 983 | # CONFIG_UIO is not set | 997 | # CONFIG_UIO is not set |
| 984 | 998 | ||
| 985 | # | 999 | # |
| @@ -999,7 +1013,6 @@ CONFIG_FS_MBCACHE=y | |||
| 999 | # CONFIG_JFS_FS is not set | 1013 | # CONFIG_JFS_FS is not set |
| 1000 | # CONFIG_FS_POSIX_ACL is not set | 1014 | # CONFIG_FS_POSIX_ACL is not set |
| 1001 | # CONFIG_XFS_FS is not set | 1015 | # CONFIG_XFS_FS is not set |
| 1002 | # CONFIG_GFS2_FS is not set | ||
| 1003 | # CONFIG_OCFS2_FS is not set | 1016 | # CONFIG_OCFS2_FS is not set |
| 1004 | CONFIG_DNOTIFY=y | 1017 | CONFIG_DNOTIFY=y |
| 1005 | CONFIG_INOTIFY=y | 1018 | CONFIG_INOTIFY=y |
| @@ -1060,7 +1073,6 @@ CONFIG_NFS_FS=y | |||
| 1060 | CONFIG_NFS_V3=y | 1073 | CONFIG_NFS_V3=y |
| 1061 | # CONFIG_NFS_V3_ACL is not set | 1074 | # CONFIG_NFS_V3_ACL is not set |
| 1062 | CONFIG_NFS_V4=y | 1075 | CONFIG_NFS_V4=y |
| 1063 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1064 | # CONFIG_NFSD is not set | 1076 | # CONFIG_NFSD is not set |
| 1065 | CONFIG_ROOT_NFS=y | 1077 | CONFIG_ROOT_NFS=y |
| 1066 | CONFIG_LOCKD=y | 1078 | CONFIG_LOCKD=y |
| @@ -1147,6 +1159,7 @@ CONFIG_UCC=y | |||
| 1147 | # Library routines | 1159 | # Library routines |
| 1148 | # | 1160 | # |
| 1149 | CONFIG_BITREVERSE=y | 1161 | CONFIG_BITREVERSE=y |
| 1162 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1150 | # CONFIG_CRC_CCITT is not set | 1163 | # CONFIG_CRC_CCITT is not set |
| 1151 | # CONFIG_CRC16 is not set | 1164 | # CONFIG_CRC16 is not set |
| 1152 | CONFIG_CRC_ITU_T=y | 1165 | CONFIG_CRC_ITU_T=y |
| @@ -1157,6 +1170,7 @@ CONFIG_PLIST=y | |||
| 1157 | CONFIG_HAS_IOMEM=y | 1170 | CONFIG_HAS_IOMEM=y |
| 1158 | CONFIG_HAS_IOPORT=y | 1171 | CONFIG_HAS_IOPORT=y |
| 1159 | CONFIG_HAS_DMA=y | 1172 | CONFIG_HAS_DMA=y |
| 1173 | CONFIG_HAVE_LMB=y | ||
| 1160 | 1174 | ||
| 1161 | # | 1175 | # |
| 1162 | # Kernel hacking | 1176 | # Kernel hacking |
| @@ -1164,6 +1178,7 @@ CONFIG_HAS_DMA=y | |||
| 1164 | # CONFIG_PRINTK_TIME is not set | 1178 | # CONFIG_PRINTK_TIME is not set |
| 1165 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1179 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1166 | CONFIG_ENABLE_MUST_CHECK=y | 1180 | CONFIG_ENABLE_MUST_CHECK=y |
| 1181 | CONFIG_FRAME_WARN=1024 | ||
| 1167 | # CONFIG_MAGIC_SYSRQ is not set | 1182 | # CONFIG_MAGIC_SYSRQ is not set |
| 1168 | # CONFIG_UNUSED_SYMBOLS is not set | 1183 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1169 | # CONFIG_DEBUG_FS is not set | 1184 | # CONFIG_DEBUG_FS is not set |
| @@ -1173,6 +1188,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1173 | # CONFIG_SLUB_STATS is not set | 1188 | # CONFIG_SLUB_STATS is not set |
| 1174 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1189 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1175 | # CONFIG_SAMPLES is not set | 1190 | # CONFIG_SAMPLES is not set |
| 1191 | # CONFIG_IRQSTACKS is not set | ||
| 1176 | # CONFIG_PPC_EARLY_DEBUG is not set | 1192 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1177 | 1193 | ||
| 1178 | # | 1194 | # |
| @@ -1182,52 +1198,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1182 | # CONFIG_SECURITY is not set | 1198 | # CONFIG_SECURITY is not set |
| 1183 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1199 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1184 | CONFIG_CRYPTO=y | 1200 | CONFIG_CRYPTO=y |
| 1201 | |||
| 1202 | # | ||
| 1203 | # Crypto core or helper | ||
| 1204 | # | ||
| 1185 | CONFIG_CRYPTO_ALGAPI=y | 1205 | CONFIG_CRYPTO_ALGAPI=y |
| 1186 | CONFIG_CRYPTO_BLKCIPHER=y | 1206 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1187 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1188 | CONFIG_CRYPTO_MANAGER=y | 1207 | CONFIG_CRYPTO_MANAGER=y |
| 1208 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1209 | # CONFIG_CRYPTO_NULL is not set | ||
| 1210 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1211 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1212 | # CONFIG_CRYPTO_TEST is not set | ||
| 1213 | |||
| 1214 | # | ||
| 1215 | # Authenticated Encryption with Associated Data | ||
| 1216 | # | ||
| 1217 | # CONFIG_CRYPTO_CCM is not set | ||
| 1218 | # CONFIG_CRYPTO_GCM is not set | ||
| 1219 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1220 | |||
| 1221 | # | ||
| 1222 | # Block modes | ||
| 1223 | # | ||
| 1224 | CONFIG_CRYPTO_CBC=y | ||
| 1225 | # CONFIG_CRYPTO_CTR is not set | ||
| 1226 | # CONFIG_CRYPTO_CTS is not set | ||
| 1227 | CONFIG_CRYPTO_ECB=m | ||
| 1228 | # CONFIG_CRYPTO_LRW is not set | ||
| 1229 | CONFIG_CRYPTO_PCBC=m | ||
| 1230 | # CONFIG_CRYPTO_XTS is not set | ||
| 1231 | |||
| 1232 | # | ||
| 1233 | # Hash modes | ||
| 1234 | # | ||
| 1189 | # CONFIG_CRYPTO_HMAC is not set | 1235 | # CONFIG_CRYPTO_HMAC is not set |
| 1190 | # CONFIG_CRYPTO_XCBC is not set | 1236 | # CONFIG_CRYPTO_XCBC is not set |
| 1191 | # CONFIG_CRYPTO_NULL is not set | 1237 | |
| 1238 | # | ||
| 1239 | # Digest | ||
| 1240 | # | ||
| 1241 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1192 | # CONFIG_CRYPTO_MD4 is not set | 1242 | # CONFIG_CRYPTO_MD4 is not set |
| 1193 | CONFIG_CRYPTO_MD5=y | 1243 | CONFIG_CRYPTO_MD5=y |
| 1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1194 | # CONFIG_CRYPTO_SHA1 is not set | 1245 | # CONFIG_CRYPTO_SHA1 is not set |
| 1195 | # CONFIG_CRYPTO_SHA256 is not set | 1246 | # CONFIG_CRYPTO_SHA256 is not set |
| 1196 | # CONFIG_CRYPTO_SHA512 is not set | 1247 | # CONFIG_CRYPTO_SHA512 is not set |
| 1197 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1198 | # CONFIG_CRYPTO_TGR192 is not set | 1248 | # CONFIG_CRYPTO_TGR192 is not set |
| 1199 | # CONFIG_CRYPTO_GF128MUL is not set | 1249 | # CONFIG_CRYPTO_WP512 is not set |
| 1200 | CONFIG_CRYPTO_ECB=m | 1250 | |
| 1201 | CONFIG_CRYPTO_CBC=y | 1251 | # |
| 1202 | CONFIG_CRYPTO_PCBC=m | 1252 | # Ciphers |
| 1203 | # CONFIG_CRYPTO_LRW is not set | 1253 | # |
| 1204 | # CONFIG_CRYPTO_XTS is not set | ||
| 1205 | # CONFIG_CRYPTO_CTR is not set | ||
| 1206 | # CONFIG_CRYPTO_GCM is not set | ||
| 1207 | # CONFIG_CRYPTO_CCM is not set | ||
| 1208 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1209 | CONFIG_CRYPTO_DES=y | ||
| 1210 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1211 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1212 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1213 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1214 | # CONFIG_CRYPTO_AES is not set | 1254 | # CONFIG_CRYPTO_AES is not set |
| 1255 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1256 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1257 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1258 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1215 | # CONFIG_CRYPTO_CAST5 is not set | 1259 | # CONFIG_CRYPTO_CAST5 is not set |
| 1216 | # CONFIG_CRYPTO_CAST6 is not set | 1260 | # CONFIG_CRYPTO_CAST6 is not set |
| 1217 | # CONFIG_CRYPTO_TEA is not set | 1261 | CONFIG_CRYPTO_DES=y |
| 1218 | # CONFIG_CRYPTO_ARC4 is not set | 1262 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1219 | # CONFIG_CRYPTO_KHAZAD is not set | 1263 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1220 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1221 | # CONFIG_CRYPTO_SEED is not set | ||
| 1222 | # CONFIG_CRYPTO_SALSA20 is not set | 1264 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1265 | # CONFIG_CRYPTO_SEED is not set | ||
| 1266 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1267 | # CONFIG_CRYPTO_TEA is not set | ||
| 1268 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1269 | |||
| 1270 | # | ||
| 1271 | # Compression | ||
| 1272 | # | ||
| 1223 | # CONFIG_CRYPTO_DEFLATE is not set | 1273 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1224 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1225 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1226 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1227 | # CONFIG_CRYPTO_TEST is not set | ||
| 1228 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1229 | # CONFIG_CRYPTO_LZO is not set | 1274 | # CONFIG_CRYPTO_LZO is not set |
| 1230 | CONFIG_CRYPTO_HW=y | 1275 | CONFIG_CRYPTO_HW=y |
| 1231 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1276 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1232 | # CONFIG_PPC_CLOCK is not set | 1277 | # CONFIG_PPC_CLOCK is not set |
| 1233 | CONFIG_PPC_LIB_RHEAP=y | 1278 | CONFIG_PPC_LIB_RHEAP=y |
| 1279 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index e1de399a7bdd..b47fc9185708 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:17 2008 | 4 | # Mon Jun 9 08:52:25 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -432,6 +438,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 432 | # | 438 | # |
| 433 | # CONFIG_MTD_UBI is not set | 439 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
| 441 | CONFIG_OF_I2C=y | ||
| 435 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 436 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
| 437 | # CONFIG_BLK_DEV_FD is not set | 444 | # CONFIG_BLK_DEV_FD is not set |
| @@ -541,7 +548,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 541 | # CONFIG_SCSI_SRP is not set | 548 | # CONFIG_SCSI_SRP is not set |
| 542 | CONFIG_ATA=y | 549 | CONFIG_ATA=y |
| 543 | # CONFIG_ATA_NONSTANDARD is not set | 550 | # CONFIG_ATA_NONSTANDARD is not set |
| 551 | CONFIG_SATA_PMP=y | ||
| 544 | # CONFIG_SATA_AHCI is not set | 552 | # CONFIG_SATA_AHCI is not set |
| 553 | # CONFIG_SATA_SIL24 is not set | ||
| 554 | # CONFIG_SATA_FSL is not set | ||
| 555 | CONFIG_ATA_SFF=y | ||
| 545 | # CONFIG_SATA_SVW is not set | 556 | # CONFIG_SATA_SVW is not set |
| 546 | # CONFIG_ATA_PIIX is not set | 557 | # CONFIG_ATA_PIIX is not set |
| 547 | # CONFIG_SATA_MV is not set | 558 | # CONFIG_SATA_MV is not set |
| @@ -551,13 +562,11 @@ CONFIG_ATA=y | |||
| 551 | # CONFIG_SATA_PROMISE is not set | 562 | # CONFIG_SATA_PROMISE is not set |
| 552 | # CONFIG_SATA_SX4 is not set | 563 | # CONFIG_SATA_SX4 is not set |
| 553 | CONFIG_SATA_SIL=y | 564 | CONFIG_SATA_SIL=y |
| 554 | # CONFIG_SATA_SIL24 is not set | ||
| 555 | # CONFIG_SATA_SIS is not set | 565 | # CONFIG_SATA_SIS is not set |
| 556 | # CONFIG_SATA_ULI is not set | 566 | # CONFIG_SATA_ULI is not set |
| 557 | # CONFIG_SATA_VIA is not set | 567 | # CONFIG_SATA_VIA is not set |
| 558 | # CONFIG_SATA_VITESSE is not set | 568 | # CONFIG_SATA_VITESSE is not set |
| 559 | # CONFIG_SATA_INIC162X is not set | 569 | # CONFIG_SATA_INIC162X is not set |
| 560 | # CONFIG_SATA_FSL is not set | ||
| 561 | # CONFIG_PATA_ALI is not set | 570 | # CONFIG_PATA_ALI is not set |
| 562 | # CONFIG_PATA_AMD is not set | 571 | # CONFIG_PATA_AMD is not set |
| 563 | # CONFIG_PATA_ARTOP is not set | 572 | # CONFIG_PATA_ARTOP is not set |
| @@ -598,6 +607,7 @@ CONFIG_SATA_SIL=y | |||
| 598 | # CONFIG_PATA_WINBOND is not set | 607 | # CONFIG_PATA_WINBOND is not set |
| 599 | CONFIG_PATA_PLATFORM=y | 608 | CONFIG_PATA_PLATFORM=y |
| 600 | CONFIG_PATA_OF_PLATFORM=y | 609 | CONFIG_PATA_OF_PLATFORM=y |
| 610 | # CONFIG_PATA_SCH is not set | ||
| 601 | CONFIG_MD=y | 611 | CONFIG_MD=y |
| 602 | CONFIG_BLK_DEV_MD=y | 612 | CONFIG_BLK_DEV_MD=y |
| 603 | CONFIG_MD_LINEAR=y | 613 | CONFIG_MD_LINEAR=y |
| @@ -659,7 +669,6 @@ CONFIG_NETDEV_1000=y | |||
| 659 | # CONFIG_SIS190 is not set | 669 | # CONFIG_SIS190 is not set |
| 660 | # CONFIG_SKGE is not set | 670 | # CONFIG_SKGE is not set |
| 661 | # CONFIG_SKY2 is not set | 671 | # CONFIG_SKY2 is not set |
| 662 | # CONFIG_SK98LIN is not set | ||
| 663 | # CONFIG_VIA_VELOCITY is not set | 672 | # CONFIG_VIA_VELOCITY is not set |
| 664 | # CONFIG_TIGON3 is not set | 673 | # CONFIG_TIGON3 is not set |
| 665 | # CONFIG_BNX2 is not set | 674 | # CONFIG_BNX2 is not set |
| @@ -679,6 +688,7 @@ CONFIG_NETDEV_10000=y | |||
| 679 | # CONFIG_MLX4_CORE is not set | 688 | # CONFIG_MLX4_CORE is not set |
| 680 | # CONFIG_TEHUTI is not set | 689 | # CONFIG_TEHUTI is not set |
| 681 | # CONFIG_BNX2X is not set | 690 | # CONFIG_BNX2X is not set |
| 691 | # CONFIG_SFC is not set | ||
| 682 | # CONFIG_TR is not set | 692 | # CONFIG_TR is not set |
| 683 | 693 | ||
| 684 | # | 694 | # |
| @@ -686,6 +696,7 @@ CONFIG_NETDEV_10000=y | |||
| 686 | # | 696 | # |
| 687 | # CONFIG_WLAN_PRE80211 is not set | 697 | # CONFIG_WLAN_PRE80211 is not set |
| 688 | # CONFIG_WLAN_80211 is not set | 698 | # CONFIG_WLAN_80211 is not set |
| 699 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 689 | 700 | ||
| 690 | # | 701 | # |
| 691 | # USB Network Adapters | 702 | # USB Network Adapters |
| @@ -722,6 +733,7 @@ CONFIG_NETDEV_10000=y | |||
| 722 | # Character devices | 733 | # Character devices |
| 723 | # | 734 | # |
| 724 | # CONFIG_VT is not set | 735 | # CONFIG_VT is not set |
| 736 | CONFIG_DEVKMEM=y | ||
| 725 | # CONFIG_SERIAL_NONSTANDARD is not set | 737 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 726 | # CONFIG_NOZOMI is not set | 738 | # CONFIG_NOZOMI is not set |
| 727 | 739 | ||
| @@ -749,7 +761,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 749 | # CONFIG_IPMI_HANDLER is not set | 761 | # CONFIG_IPMI_HANDLER is not set |
| 750 | CONFIG_HW_RANDOM=y | 762 | CONFIG_HW_RANDOM=y |
| 751 | # CONFIG_NVRAM is not set | 763 | # CONFIG_NVRAM is not set |
| 752 | # CONFIG_GEN_RTC is not set | ||
| 753 | # CONFIG_R3964 is not set | 764 | # CONFIG_R3964 is not set |
| 754 | # CONFIG_APPLICOM is not set | 765 | # CONFIG_APPLICOM is not set |
| 755 | # CONFIG_RAW_DRIVER is not set | 766 | # CONFIG_RAW_DRIVER is not set |
| @@ -760,13 +771,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 760 | CONFIG_I2C_CHARDEV=y | 771 | CONFIG_I2C_CHARDEV=y |
| 761 | 772 | ||
| 762 | # | 773 | # |
| 763 | # I2C Algorithms | ||
| 764 | # | ||
| 765 | # CONFIG_I2C_ALGOBIT is not set | ||
| 766 | # CONFIG_I2C_ALGOPCF is not set | ||
| 767 | # CONFIG_I2C_ALGOPCA is not set | ||
| 768 | |||
| 769 | # | ||
| 770 | # I2C Hardware Bus support | 774 | # I2C Hardware Bus support |
| 771 | # | 775 | # |
| 772 | # CONFIG_I2C_ALI1535 is not set | 776 | # CONFIG_I2C_ALI1535 is not set |
| @@ -793,6 +797,7 @@ CONFIG_I2C_MPC=y | |||
| 793 | # CONFIG_I2C_VIA is not set | 797 | # CONFIG_I2C_VIA is not set |
| 794 | # CONFIG_I2C_VIAPRO is not set | 798 | # CONFIG_I2C_VIAPRO is not set |
| 795 | # CONFIG_I2C_VOODOO3 is not set | 799 | # CONFIG_I2C_VOODOO3 is not set |
| 800 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 796 | 801 | ||
| 797 | # | 802 | # |
| 798 | # Miscellaneous I2C Chip support | 803 | # Miscellaneous I2C Chip support |
| @@ -802,17 +807,12 @@ CONFIG_I2C_MPC=y | |||
| 802 | CONFIG_SENSORS_PCF8574=y | 807 | CONFIG_SENSORS_PCF8574=y |
| 803 | # CONFIG_PCF8575 is not set | 808 | # CONFIG_PCF8575 is not set |
| 804 | # CONFIG_SENSORS_PCF8591 is not set | 809 | # CONFIG_SENSORS_PCF8591 is not set |
| 805 | # CONFIG_TPS65010 is not set | ||
| 806 | # CONFIG_SENSORS_MAX6875 is not set | 810 | # CONFIG_SENSORS_MAX6875 is not set |
| 807 | # CONFIG_SENSORS_TSL2550 is not set | 811 | # CONFIG_SENSORS_TSL2550 is not set |
| 808 | # CONFIG_I2C_DEBUG_CORE is not set | 812 | # CONFIG_I2C_DEBUG_CORE is not set |
| 809 | # CONFIG_I2C_DEBUG_ALGO is not set | 813 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 810 | # CONFIG_I2C_DEBUG_BUS is not set | 814 | # CONFIG_I2C_DEBUG_BUS is not set |
| 811 | # CONFIG_I2C_DEBUG_CHIP is not set | 815 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 812 | |||
| 813 | # | ||
| 814 | # SPI support | ||
| 815 | # | ||
| 816 | CONFIG_SPI=y | 816 | CONFIG_SPI=y |
| 817 | CONFIG_SPI_MASTER=y | 817 | CONFIG_SPI_MASTER=y |
| 818 | 818 | ||
| @@ -862,12 +862,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 862 | # Multifunction device drivers | 862 | # Multifunction device drivers |
| 863 | # | 863 | # |
| 864 | # CONFIG_MFD_SM501 is not set | 864 | # CONFIG_MFD_SM501 is not set |
| 865 | # CONFIG_HTC_PASIC3 is not set | ||
| 865 | 866 | ||
| 866 | # | 867 | # |
| 867 | # Multimedia devices | 868 | # Multimedia devices |
| 868 | # | 869 | # |
| 870 | |||
| 871 | # | ||
| 872 | # Multimedia core support | ||
| 873 | # | ||
| 869 | # CONFIG_VIDEO_DEV is not set | 874 | # CONFIG_VIDEO_DEV is not set |
| 870 | # CONFIG_DVB_CORE is not set | 875 | # CONFIG_DVB_CORE is not set |
| 876 | # CONFIG_VIDEO_MEDIA is not set | ||
| 877 | |||
| 878 | # | ||
| 879 | # Multimedia drivers | ||
| 880 | # | ||
| 871 | CONFIG_DAB=y | 881 | CONFIG_DAB=y |
| 872 | # CONFIG_USB_DABUSB is not set | 882 | # CONFIG_USB_DABUSB is not set |
| 873 | 883 | ||
| @@ -905,16 +915,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 905 | CONFIG_USB_DEVICE_CLASS=y | 915 | CONFIG_USB_DEVICE_CLASS=y |
| 906 | # CONFIG_USB_DYNAMIC_MINORS is not set | 916 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 907 | # CONFIG_USB_OTG is not set | 917 | # CONFIG_USB_OTG is not set |
| 918 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 908 | 920 | ||
| 909 | # | 921 | # |
| 910 | # USB Host Controller Drivers | 922 | # USB Host Controller Drivers |
| 911 | # | 923 | # |
| 924 | # CONFIG_USB_C67X00_HCD is not set | ||
| 912 | CONFIG_USB_EHCI_HCD=y | 925 | CONFIG_USB_EHCI_HCD=y |
| 913 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 926 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 914 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 927 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 915 | CONFIG_USB_EHCI_FSL=y | 928 | CONFIG_USB_EHCI_FSL=y |
| 916 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 929 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 917 | # CONFIG_USB_ISP116X_HCD is not set | 930 | # CONFIG_USB_ISP116X_HCD is not set |
| 931 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 918 | # CONFIG_USB_OHCI_HCD is not set | 932 | # CONFIG_USB_OHCI_HCD is not set |
| 919 | CONFIG_USB_UHCI_HCD=y | 933 | CONFIG_USB_UHCI_HCD=y |
| 920 | # CONFIG_USB_SL811_HCD is not set | 934 | # CONFIG_USB_SL811_HCD is not set |
| @@ -925,6 +939,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 925 | # | 939 | # |
| 926 | # CONFIG_USB_ACM is not set | 940 | # CONFIG_USB_ACM is not set |
| 927 | # CONFIG_USB_PRINTER is not set | 941 | # CONFIG_USB_PRINTER is not set |
| 942 | # CONFIG_USB_WDM is not set | ||
| 928 | 943 | ||
| 929 | # | 944 | # |
| 930 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 945 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -945,6 +960,7 @@ CONFIG_USB_STORAGE=y | |||
| 945 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 960 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 946 | # CONFIG_USB_STORAGE_ALAUDA is not set | 961 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 947 | # CONFIG_USB_STORAGE_KARMA is not set | 962 | # CONFIG_USB_STORAGE_KARMA is not set |
| 963 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 948 | # CONFIG_USB_LIBUSUAL is not set | 964 | # CONFIG_USB_LIBUSUAL is not set |
| 949 | 965 | ||
| 950 | # | 966 | # |
| @@ -982,10 +998,12 @@ CONFIG_USB_MON=y | |||
| 982 | # CONFIG_USB_TRANCEVIBRATOR is not set | 998 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 983 | # CONFIG_USB_IOWARRIOR is not set | 999 | # CONFIG_USB_IOWARRIOR is not set |
| 984 | # CONFIG_USB_TEST is not set | 1000 | # CONFIG_USB_TEST is not set |
| 1001 | # CONFIG_USB_ISIGHTFW is not set | ||
| 985 | # CONFIG_USB_GADGET is not set | 1002 | # CONFIG_USB_GADGET is not set |
| 986 | # CONFIG_MMC is not set | 1003 | # CONFIG_MMC is not set |
| 987 | # CONFIG_MEMSTICK is not set | 1004 | # CONFIG_MEMSTICK is not set |
| 988 | # CONFIG_NEW_LEDS is not set | 1005 | # CONFIG_NEW_LEDS is not set |
| 1006 | # CONFIG_ACCESSIBILITY is not set | ||
| 989 | # CONFIG_INFINIBAND is not set | 1007 | # CONFIG_INFINIBAND is not set |
| 990 | # CONFIG_EDAC is not set | 1008 | # CONFIG_EDAC is not set |
| 991 | CONFIG_RTC_LIB=y | 1009 | CONFIG_RTC_LIB=y |
| @@ -1040,11 +1058,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1040 | # | 1058 | # |
| 1041 | # on-CPU RTC drivers | 1059 | # on-CPU RTC drivers |
| 1042 | # | 1060 | # |
| 1061 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1043 | # CONFIG_DMADEVICES is not set | 1062 | # CONFIG_DMADEVICES is not set |
| 1044 | |||
| 1045 | # | ||
| 1046 | # Userspace I/O | ||
| 1047 | # | ||
| 1048 | # CONFIG_UIO is not set | 1063 | # CONFIG_UIO is not set |
| 1049 | 1064 | ||
| 1050 | # | 1065 | # |
| @@ -1064,7 +1079,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1064 | # CONFIG_JFS_FS is not set | 1079 | # CONFIG_JFS_FS is not set |
| 1065 | # CONFIG_FS_POSIX_ACL is not set | 1080 | # CONFIG_FS_POSIX_ACL is not set |
| 1066 | # CONFIG_XFS_FS is not set | 1081 | # CONFIG_XFS_FS is not set |
| 1067 | # CONFIG_GFS2_FS is not set | ||
| 1068 | # CONFIG_OCFS2_FS is not set | 1082 | # CONFIG_OCFS2_FS is not set |
| 1069 | CONFIG_DNOTIFY=y | 1083 | CONFIG_DNOTIFY=y |
| 1070 | CONFIG_INOTIFY=y | 1084 | CONFIG_INOTIFY=y |
| @@ -1126,7 +1140,6 @@ CONFIG_NFS_FS=y | |||
| 1126 | CONFIG_NFS_V3=y | 1140 | CONFIG_NFS_V3=y |
| 1127 | # CONFIG_NFS_V3_ACL is not set | 1141 | # CONFIG_NFS_V3_ACL is not set |
| 1128 | CONFIG_NFS_V4=y | 1142 | CONFIG_NFS_V4=y |
| 1129 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1130 | # CONFIG_NFSD is not set | 1143 | # CONFIG_NFSD is not set |
| 1131 | CONFIG_ROOT_NFS=y | 1144 | CONFIG_ROOT_NFS=y |
| 1132 | CONFIG_LOCKD=y | 1145 | CONFIG_LOCKD=y |
| @@ -1210,6 +1223,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1210 | # Library routines | 1223 | # Library routines |
| 1211 | # | 1224 | # |
| 1212 | CONFIG_BITREVERSE=y | 1225 | CONFIG_BITREVERSE=y |
| 1226 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1213 | # CONFIG_CRC_CCITT is not set | 1227 | # CONFIG_CRC_CCITT is not set |
| 1214 | # CONFIG_CRC16 is not set | 1228 | # CONFIG_CRC16 is not set |
| 1215 | # CONFIG_CRC_ITU_T is not set | 1229 | # CONFIG_CRC_ITU_T is not set |
| @@ -1220,6 +1234,7 @@ CONFIG_PLIST=y | |||
| 1220 | CONFIG_HAS_IOMEM=y | 1234 | CONFIG_HAS_IOMEM=y |
| 1221 | CONFIG_HAS_IOPORT=y | 1235 | CONFIG_HAS_IOPORT=y |
| 1222 | CONFIG_HAS_DMA=y | 1236 | CONFIG_HAS_DMA=y |
| 1237 | CONFIG_HAVE_LMB=y | ||
| 1223 | 1238 | ||
| 1224 | # | 1239 | # |
| 1225 | # Kernel hacking | 1240 | # Kernel hacking |
| @@ -1227,6 +1242,7 @@ CONFIG_HAS_DMA=y | |||
| 1227 | # CONFIG_PRINTK_TIME is not set | 1242 | # CONFIG_PRINTK_TIME is not set |
| 1228 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1243 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1229 | CONFIG_ENABLE_MUST_CHECK=y | 1244 | CONFIG_ENABLE_MUST_CHECK=y |
| 1245 | CONFIG_FRAME_WARN=1024 | ||
| 1230 | # CONFIG_MAGIC_SYSRQ is not set | 1246 | # CONFIG_MAGIC_SYSRQ is not set |
| 1231 | # CONFIG_UNUSED_SYMBOLS is not set | 1247 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1232 | # CONFIG_DEBUG_FS is not set | 1248 | # CONFIG_DEBUG_FS is not set |
| @@ -1236,6 +1252,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1236 | # CONFIG_SLUB_STATS is not set | 1252 | # CONFIG_SLUB_STATS is not set |
| 1237 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1253 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1238 | # CONFIG_SAMPLES is not set | 1254 | # CONFIG_SAMPLES is not set |
| 1255 | # CONFIG_IRQSTACKS is not set | ||
| 1239 | # CONFIG_PPC_EARLY_DEBUG is not set | 1256 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1240 | 1257 | ||
| 1241 | # | 1258 | # |
| @@ -1245,51 +1262,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1245 | # CONFIG_SECURITY is not set | 1262 | # CONFIG_SECURITY is not set |
| 1246 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1263 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1247 | CONFIG_CRYPTO=y | 1264 | CONFIG_CRYPTO=y |
| 1265 | |||
| 1266 | # | ||
| 1267 | # Crypto core or helper | ||
| 1268 | # | ||
| 1248 | CONFIG_CRYPTO_ALGAPI=y | 1269 | CONFIG_CRYPTO_ALGAPI=y |
| 1249 | CONFIG_CRYPTO_BLKCIPHER=y | 1270 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1250 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1251 | CONFIG_CRYPTO_MANAGER=y | 1271 | CONFIG_CRYPTO_MANAGER=y |
| 1272 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1273 | # CONFIG_CRYPTO_NULL is not set | ||
| 1274 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1275 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1276 | # CONFIG_CRYPTO_TEST is not set | ||
| 1277 | |||
| 1278 | # | ||
| 1279 | # Authenticated Encryption with Associated Data | ||
| 1280 | # | ||
| 1281 | # CONFIG_CRYPTO_CCM is not set | ||
| 1282 | # CONFIG_CRYPTO_GCM is not set | ||
| 1283 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1284 | |||
| 1285 | # | ||
| 1286 | # Block modes | ||
| 1287 | # | ||
| 1288 | CONFIG_CRYPTO_CBC=y | ||
| 1289 | # CONFIG_CRYPTO_CTR is not set | ||
| 1290 | # CONFIG_CRYPTO_CTS is not set | ||
| 1291 | # CONFIG_CRYPTO_ECB is not set | ||
| 1292 | # CONFIG_CRYPTO_LRW is not set | ||
| 1293 | CONFIG_CRYPTO_PCBC=m | ||
| 1294 | # CONFIG_CRYPTO_XTS is not set | ||
| 1295 | |||
| 1296 | # | ||
| 1297 | # Hash modes | ||
| 1298 | # | ||
| 1252 | # CONFIG_CRYPTO_HMAC is not set | 1299 | # CONFIG_CRYPTO_HMAC is not set |
| 1253 | # CONFIG_CRYPTO_XCBC is not set | 1300 | # CONFIG_CRYPTO_XCBC is not set |
| 1254 | # CONFIG_CRYPTO_NULL is not set | 1301 | |
| 1302 | # | ||
| 1303 | # Digest | ||
| 1304 | # | ||
| 1305 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1255 | # CONFIG_CRYPTO_MD4 is not set | 1306 | # CONFIG_CRYPTO_MD4 is not set |
| 1256 | CONFIG_CRYPTO_MD5=y | 1307 | CONFIG_CRYPTO_MD5=y |
| 1308 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1257 | # CONFIG_CRYPTO_SHA1 is not set | 1309 | # CONFIG_CRYPTO_SHA1 is not set |
| 1258 | # CONFIG_CRYPTO_SHA256 is not set | 1310 | # CONFIG_CRYPTO_SHA256 is not set |
| 1259 | # CONFIG_CRYPTO_SHA512 is not set | 1311 | # CONFIG_CRYPTO_SHA512 is not set |
| 1260 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1261 | # CONFIG_CRYPTO_TGR192 is not set | 1312 | # CONFIG_CRYPTO_TGR192 is not set |
| 1262 | # CONFIG_CRYPTO_GF128MUL is not set | 1313 | # CONFIG_CRYPTO_WP512 is not set |
| 1263 | # CONFIG_CRYPTO_ECB is not set | 1314 | |
| 1264 | CONFIG_CRYPTO_CBC=y | 1315 | # |
| 1265 | CONFIG_CRYPTO_PCBC=m | 1316 | # Ciphers |
| 1266 | # CONFIG_CRYPTO_LRW is not set | 1317 | # |
| 1267 | # CONFIG_CRYPTO_XTS is not set | ||
| 1268 | # CONFIG_CRYPTO_CTR is not set | ||
| 1269 | # CONFIG_CRYPTO_GCM is not set | ||
| 1270 | # CONFIG_CRYPTO_CCM is not set | ||
| 1271 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1272 | CONFIG_CRYPTO_DES=y | ||
| 1273 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1274 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1275 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1276 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1277 | # CONFIG_CRYPTO_AES is not set | 1318 | # CONFIG_CRYPTO_AES is not set |
| 1319 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1320 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1321 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1322 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1278 | # CONFIG_CRYPTO_CAST5 is not set | 1323 | # CONFIG_CRYPTO_CAST5 is not set |
| 1279 | # CONFIG_CRYPTO_CAST6 is not set | 1324 | # CONFIG_CRYPTO_CAST6 is not set |
| 1280 | # CONFIG_CRYPTO_TEA is not set | 1325 | CONFIG_CRYPTO_DES=y |
| 1281 | # CONFIG_CRYPTO_ARC4 is not set | 1326 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1282 | # CONFIG_CRYPTO_KHAZAD is not set | 1327 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1283 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1284 | # CONFIG_CRYPTO_SEED is not set | ||
| 1285 | # CONFIG_CRYPTO_SALSA20 is not set | 1328 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1329 | # CONFIG_CRYPTO_SEED is not set | ||
| 1330 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1331 | # CONFIG_CRYPTO_TEA is not set | ||
| 1332 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1333 | |||
| 1334 | # | ||
| 1335 | # Compression | ||
| 1336 | # | ||
| 1286 | # CONFIG_CRYPTO_DEFLATE is not set | 1337 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1287 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1288 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1289 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1290 | # CONFIG_CRYPTO_TEST is not set | ||
| 1291 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1292 | # CONFIG_CRYPTO_LZO is not set | 1338 | # CONFIG_CRYPTO_LZO is not set |
| 1293 | CONFIG_CRYPTO_HW=y | 1339 | CONFIG_CRYPTO_HW=y |
| 1294 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1295 | # CONFIG_PPC_CLOCK is not set | 1341 | # CONFIG_PPC_CLOCK is not set |
| 1342 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index b4e39cf82a8c..fdac4845bad9 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:18 2008 | 4 | # Mon Jun 9 08:52:26 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -432,6 +438,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 432 | # | 438 | # |
| 433 | # CONFIG_MTD_UBI is not set | 439 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
| 441 | CONFIG_OF_I2C=y | ||
| 435 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 436 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
| 437 | # CONFIG_BLK_DEV_FD is not set | 444 | # CONFIG_BLK_DEV_FD is not set |
| @@ -587,7 +594,6 @@ CONFIG_NETDEV_1000=y | |||
| 587 | # CONFIG_SIS190 is not set | 594 | # CONFIG_SIS190 is not set |
| 588 | # CONFIG_SKGE is not set | 595 | # CONFIG_SKGE is not set |
| 589 | # CONFIG_SKY2 is not set | 596 | # CONFIG_SKY2 is not set |
| 590 | # CONFIG_SK98LIN is not set | ||
| 591 | # CONFIG_VIA_VELOCITY is not set | 597 | # CONFIG_VIA_VELOCITY is not set |
| 592 | # CONFIG_TIGON3 is not set | 598 | # CONFIG_TIGON3 is not set |
| 593 | # CONFIG_BNX2 is not set | 599 | # CONFIG_BNX2 is not set |
| @@ -607,6 +613,7 @@ CONFIG_NETDEV_10000=y | |||
| 607 | # CONFIG_MLX4_CORE is not set | 613 | # CONFIG_MLX4_CORE is not set |
| 608 | # CONFIG_TEHUTI is not set | 614 | # CONFIG_TEHUTI is not set |
| 609 | # CONFIG_BNX2X is not set | 615 | # CONFIG_BNX2X is not set |
| 616 | # CONFIG_SFC is not set | ||
| 610 | # CONFIG_TR is not set | 617 | # CONFIG_TR is not set |
| 611 | 618 | ||
| 612 | # | 619 | # |
| @@ -614,6 +621,7 @@ CONFIG_NETDEV_10000=y | |||
| 614 | # | 621 | # |
| 615 | # CONFIG_WLAN_PRE80211 is not set | 622 | # CONFIG_WLAN_PRE80211 is not set |
| 616 | # CONFIG_WLAN_80211 is not set | 623 | # CONFIG_WLAN_80211 is not set |
| 624 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 617 | 625 | ||
| 618 | # | 626 | # |
| 619 | # USB Network Adapters | 627 | # USB Network Adapters |
| @@ -650,6 +658,7 @@ CONFIG_NETDEV_10000=y | |||
| 650 | # Character devices | 658 | # Character devices |
| 651 | # | 659 | # |
| 652 | # CONFIG_VT is not set | 660 | # CONFIG_VT is not set |
| 661 | CONFIG_DEVKMEM=y | ||
| 653 | # CONFIG_SERIAL_NONSTANDARD is not set | 662 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 654 | # CONFIG_NOZOMI is not set | 663 | # CONFIG_NOZOMI is not set |
| 655 | 664 | ||
| @@ -677,7 +686,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 677 | # CONFIG_IPMI_HANDLER is not set | 686 | # CONFIG_IPMI_HANDLER is not set |
| 678 | CONFIG_HW_RANDOM=y | 687 | CONFIG_HW_RANDOM=y |
| 679 | # CONFIG_NVRAM is not set | 688 | # CONFIG_NVRAM is not set |
| 680 | # CONFIG_GEN_RTC is not set | ||
| 681 | # CONFIG_R3964 is not set | 689 | # CONFIG_R3964 is not set |
| 682 | # CONFIG_APPLICOM is not set | 690 | # CONFIG_APPLICOM is not set |
| 683 | # CONFIG_RAW_DRIVER is not set | 691 | # CONFIG_RAW_DRIVER is not set |
| @@ -688,13 +696,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 688 | CONFIG_I2C_CHARDEV=y | 696 | CONFIG_I2C_CHARDEV=y |
| 689 | 697 | ||
| 690 | # | 698 | # |
| 691 | # I2C Algorithms | ||
| 692 | # | ||
| 693 | # CONFIG_I2C_ALGOBIT is not set | ||
| 694 | # CONFIG_I2C_ALGOPCF is not set | ||
| 695 | # CONFIG_I2C_ALGOPCA is not set | ||
| 696 | |||
| 697 | # | ||
| 698 | # I2C Hardware Bus support | 699 | # I2C Hardware Bus support |
| 699 | # | 700 | # |
| 700 | # CONFIG_I2C_ALI1535 is not set | 701 | # CONFIG_I2C_ALI1535 is not set |
| @@ -721,6 +722,7 @@ CONFIG_I2C_MPC=y | |||
| 721 | # CONFIG_I2C_VIA is not set | 722 | # CONFIG_I2C_VIA is not set |
| 722 | # CONFIG_I2C_VIAPRO is not set | 723 | # CONFIG_I2C_VIAPRO is not set |
| 723 | # CONFIG_I2C_VOODOO3 is not set | 724 | # CONFIG_I2C_VOODOO3 is not set |
| 725 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 724 | 726 | ||
| 725 | # | 727 | # |
| 726 | # Miscellaneous I2C Chip support | 728 | # Miscellaneous I2C Chip support |
| @@ -730,17 +732,12 @@ CONFIG_I2C_MPC=y | |||
| 730 | CONFIG_SENSORS_PCF8574=y | 732 | CONFIG_SENSORS_PCF8574=y |
| 731 | # CONFIG_PCF8575 is not set | 733 | # CONFIG_PCF8575 is not set |
| 732 | # CONFIG_SENSORS_PCF8591 is not set | 734 | # CONFIG_SENSORS_PCF8591 is not set |
| 733 | # CONFIG_TPS65010 is not set | ||
| 734 | # CONFIG_SENSORS_MAX6875 is not set | 735 | # CONFIG_SENSORS_MAX6875 is not set |
| 735 | # CONFIG_SENSORS_TSL2550 is not set | 736 | # CONFIG_SENSORS_TSL2550 is not set |
| 736 | # CONFIG_I2C_DEBUG_CORE is not set | 737 | # CONFIG_I2C_DEBUG_CORE is not set |
| 737 | # CONFIG_I2C_DEBUG_ALGO is not set | 738 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 738 | # CONFIG_I2C_DEBUG_BUS is not set | 739 | # CONFIG_I2C_DEBUG_BUS is not set |
| 739 | # CONFIG_I2C_DEBUG_CHIP is not set | 740 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 740 | |||
| 741 | # | ||
| 742 | # SPI support | ||
| 743 | # | ||
| 744 | CONFIG_SPI=y | 741 | CONFIG_SPI=y |
| 745 | CONFIG_SPI_MASTER=y | 742 | CONFIG_SPI_MASTER=y |
| 746 | 743 | ||
| @@ -790,12 +787,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 790 | # Multifunction device drivers | 787 | # Multifunction device drivers |
| 791 | # | 788 | # |
| 792 | # CONFIG_MFD_SM501 is not set | 789 | # CONFIG_MFD_SM501 is not set |
| 790 | # CONFIG_HTC_PASIC3 is not set | ||
| 793 | 791 | ||
| 794 | # | 792 | # |
| 795 | # Multimedia devices | 793 | # Multimedia devices |
| 796 | # | 794 | # |
| 795 | |||
| 796 | # | ||
| 797 | # Multimedia core support | ||
| 798 | # | ||
| 797 | # CONFIG_VIDEO_DEV is not set | 799 | # CONFIG_VIDEO_DEV is not set |
| 798 | # CONFIG_DVB_CORE is not set | 800 | # CONFIG_DVB_CORE is not set |
| 801 | # CONFIG_VIDEO_MEDIA is not set | ||
| 802 | |||
| 803 | # | ||
| 804 | # Multimedia drivers | ||
| 805 | # | ||
| 799 | CONFIG_DAB=y | 806 | CONFIG_DAB=y |
| 800 | # CONFIG_USB_DABUSB is not set | 807 | # CONFIG_USB_DABUSB is not set |
| 801 | 808 | ||
| @@ -833,16 +840,20 @@ CONFIG_USB=y | |||
| 833 | CONFIG_USB_DEVICE_CLASS=y | 840 | CONFIG_USB_DEVICE_CLASS=y |
| 834 | # CONFIG_USB_DYNAMIC_MINORS is not set | 841 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 835 | # CONFIG_USB_OTG is not set | 842 | # CONFIG_USB_OTG is not set |
| 843 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 844 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 836 | 845 | ||
| 837 | # | 846 | # |
| 838 | # USB Host Controller Drivers | 847 | # USB Host Controller Drivers |
| 839 | # | 848 | # |
| 849 | # CONFIG_USB_C67X00_HCD is not set | ||
| 840 | CONFIG_USB_EHCI_HCD=y | 850 | CONFIG_USB_EHCI_HCD=y |
| 841 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 851 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 842 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 852 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 843 | CONFIG_USB_EHCI_FSL=y | 853 | CONFIG_USB_EHCI_FSL=y |
| 844 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 854 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 845 | # CONFIG_USB_ISP116X_HCD is not set | 855 | # CONFIG_USB_ISP116X_HCD is not set |
| 856 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 846 | # CONFIG_USB_OHCI_HCD is not set | 857 | # CONFIG_USB_OHCI_HCD is not set |
| 847 | CONFIG_USB_UHCI_HCD=y | 858 | CONFIG_USB_UHCI_HCD=y |
| 848 | # CONFIG_USB_SL811_HCD is not set | 859 | # CONFIG_USB_SL811_HCD is not set |
| @@ -853,6 +864,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 853 | # | 864 | # |
| 854 | # CONFIG_USB_ACM is not set | 865 | # CONFIG_USB_ACM is not set |
| 855 | # CONFIG_USB_PRINTER is not set | 866 | # CONFIG_USB_PRINTER is not set |
| 867 | # CONFIG_USB_WDM is not set | ||
| 856 | 868 | ||
| 857 | # | 869 | # |
| 858 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 870 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -873,6 +885,7 @@ CONFIG_USB_STORAGE=y | |||
| 873 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 874 | # CONFIG_USB_STORAGE_ALAUDA is not set | 886 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 875 | # CONFIG_USB_STORAGE_KARMA is not set | 887 | # CONFIG_USB_STORAGE_KARMA is not set |
| 888 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 876 | # CONFIG_USB_LIBUSUAL is not set | 889 | # CONFIG_USB_LIBUSUAL is not set |
| 877 | 890 | ||
| 878 | # | 891 | # |
| @@ -909,10 +922,12 @@ CONFIG_USB_MON=y | |||
| 909 | # CONFIG_USB_LD is not set | 922 | # CONFIG_USB_LD is not set |
| 910 | # CONFIG_USB_TRANCEVIBRATOR is not set | 923 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 911 | # CONFIG_USB_IOWARRIOR is not set | 924 | # CONFIG_USB_IOWARRIOR is not set |
| 925 | # CONFIG_USB_ISIGHTFW is not set | ||
| 912 | # CONFIG_USB_GADGET is not set | 926 | # CONFIG_USB_GADGET is not set |
| 913 | # CONFIG_MMC is not set | 927 | # CONFIG_MMC is not set |
| 914 | # CONFIG_MEMSTICK is not set | 928 | # CONFIG_MEMSTICK is not set |
| 915 | # CONFIG_NEW_LEDS is not set | 929 | # CONFIG_NEW_LEDS is not set |
| 930 | # CONFIG_ACCESSIBILITY is not set | ||
| 916 | # CONFIG_INFINIBAND is not set | 931 | # CONFIG_INFINIBAND is not set |
| 917 | # CONFIG_EDAC is not set | 932 | # CONFIG_EDAC is not set |
| 918 | CONFIG_RTC_LIB=y | 933 | CONFIG_RTC_LIB=y |
| @@ -967,11 +982,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 967 | # | 982 | # |
| 968 | # on-CPU RTC drivers | 983 | # on-CPU RTC drivers |
| 969 | # | 984 | # |
| 985 | # CONFIG_RTC_DRV_PPC is not set | ||
| 970 | # CONFIG_DMADEVICES is not set | 986 | # CONFIG_DMADEVICES is not set |
| 971 | |||
| 972 | # | ||
| 973 | # Userspace I/O | ||
| 974 | # | ||
| 975 | # CONFIG_UIO is not set | 987 | # CONFIG_UIO is not set |
| 976 | 988 | ||
| 977 | # | 989 | # |
| @@ -991,7 +1003,6 @@ CONFIG_FS_MBCACHE=y | |||
| 991 | # CONFIG_JFS_FS is not set | 1003 | # CONFIG_JFS_FS is not set |
| 992 | # CONFIG_FS_POSIX_ACL is not set | 1004 | # CONFIG_FS_POSIX_ACL is not set |
| 993 | # CONFIG_XFS_FS is not set | 1005 | # CONFIG_XFS_FS is not set |
| 994 | # CONFIG_GFS2_FS is not set | ||
| 995 | # CONFIG_OCFS2_FS is not set | 1006 | # CONFIG_OCFS2_FS is not set |
| 996 | CONFIG_DNOTIFY=y | 1007 | CONFIG_DNOTIFY=y |
| 997 | CONFIG_INOTIFY=y | 1008 | CONFIG_INOTIFY=y |
| @@ -1053,7 +1064,6 @@ CONFIG_NFS_FS=y | |||
| 1053 | CONFIG_NFS_V3=y | 1064 | CONFIG_NFS_V3=y |
| 1054 | # CONFIG_NFS_V3_ACL is not set | 1065 | # CONFIG_NFS_V3_ACL is not set |
| 1055 | CONFIG_NFS_V4=y | 1066 | CONFIG_NFS_V4=y |
| 1056 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1057 | # CONFIG_NFSD is not set | 1067 | # CONFIG_NFSD is not set |
| 1058 | CONFIG_ROOT_NFS=y | 1068 | CONFIG_ROOT_NFS=y |
| 1059 | CONFIG_LOCKD=y | 1069 | CONFIG_LOCKD=y |
| @@ -1137,6 +1147,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1137 | # Library routines | 1147 | # Library routines |
| 1138 | # | 1148 | # |
| 1139 | CONFIG_BITREVERSE=y | 1149 | CONFIG_BITREVERSE=y |
| 1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1140 | # CONFIG_CRC_CCITT is not set | 1151 | # CONFIG_CRC_CCITT is not set |
| 1141 | # CONFIG_CRC16 is not set | 1152 | # CONFIG_CRC16 is not set |
| 1142 | # CONFIG_CRC_ITU_T is not set | 1153 | # CONFIG_CRC_ITU_T is not set |
| @@ -1147,6 +1158,7 @@ CONFIG_PLIST=y | |||
| 1147 | CONFIG_HAS_IOMEM=y | 1158 | CONFIG_HAS_IOMEM=y |
| 1148 | CONFIG_HAS_IOPORT=y | 1159 | CONFIG_HAS_IOPORT=y |
| 1149 | CONFIG_HAS_DMA=y | 1160 | CONFIG_HAS_DMA=y |
| 1161 | CONFIG_HAVE_LMB=y | ||
| 1150 | 1162 | ||
| 1151 | # | 1163 | # |
| 1152 | # Kernel hacking | 1164 | # Kernel hacking |
| @@ -1154,6 +1166,7 @@ CONFIG_HAS_DMA=y | |||
| 1154 | # CONFIG_PRINTK_TIME is not set | 1166 | # CONFIG_PRINTK_TIME is not set |
| 1155 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1167 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1156 | CONFIG_ENABLE_MUST_CHECK=y | 1168 | CONFIG_ENABLE_MUST_CHECK=y |
| 1169 | CONFIG_FRAME_WARN=1024 | ||
| 1157 | # CONFIG_MAGIC_SYSRQ is not set | 1170 | # CONFIG_MAGIC_SYSRQ is not set |
| 1158 | # CONFIG_UNUSED_SYMBOLS is not set | 1171 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1159 | # CONFIG_DEBUG_FS is not set | 1172 | # CONFIG_DEBUG_FS is not set |
| @@ -1163,6 +1176,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1163 | # CONFIG_SLUB_STATS is not set | 1176 | # CONFIG_SLUB_STATS is not set |
| 1164 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1177 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1165 | # CONFIG_SAMPLES is not set | 1178 | # CONFIG_SAMPLES is not set |
| 1179 | # CONFIG_IRQSTACKS is not set | ||
| 1166 | # CONFIG_PPC_EARLY_DEBUG is not set | 1180 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1167 | 1181 | ||
| 1168 | # | 1182 | # |
| @@ -1172,51 +1186,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1172 | # CONFIG_SECURITY is not set | 1186 | # CONFIG_SECURITY is not set |
| 1173 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1187 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1174 | CONFIG_CRYPTO=y | 1188 | CONFIG_CRYPTO=y |
| 1189 | |||
| 1190 | # | ||
| 1191 | # Crypto core or helper | ||
| 1192 | # | ||
| 1175 | CONFIG_CRYPTO_ALGAPI=y | 1193 | CONFIG_CRYPTO_ALGAPI=y |
| 1176 | CONFIG_CRYPTO_BLKCIPHER=y | 1194 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1177 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1178 | CONFIG_CRYPTO_MANAGER=y | 1195 | CONFIG_CRYPTO_MANAGER=y |
| 1196 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1197 | # CONFIG_CRYPTO_NULL is not set | ||
| 1198 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1199 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1200 | # CONFIG_CRYPTO_TEST is not set | ||
| 1201 | |||
| 1202 | # | ||
| 1203 | # Authenticated Encryption with Associated Data | ||
| 1204 | # | ||
| 1205 | # CONFIG_CRYPTO_CCM is not set | ||
| 1206 | # CONFIG_CRYPTO_GCM is not set | ||
| 1207 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1208 | |||
| 1209 | # | ||
| 1210 | # Block modes | ||
| 1211 | # | ||
| 1212 | CONFIG_CRYPTO_CBC=y | ||
| 1213 | # CONFIG_CRYPTO_CTR is not set | ||
| 1214 | # CONFIG_CRYPTO_CTS is not set | ||
| 1215 | # CONFIG_CRYPTO_ECB is not set | ||
| 1216 | # CONFIG_CRYPTO_LRW is not set | ||
| 1217 | CONFIG_CRYPTO_PCBC=m | ||
| 1218 | # CONFIG_CRYPTO_XTS is not set | ||
| 1219 | |||
| 1220 | # | ||
| 1221 | # Hash modes | ||
| 1222 | # | ||
| 1179 | # CONFIG_CRYPTO_HMAC is not set | 1223 | # CONFIG_CRYPTO_HMAC is not set |
| 1180 | # CONFIG_CRYPTO_XCBC is not set | 1224 | # CONFIG_CRYPTO_XCBC is not set |
| 1181 | # CONFIG_CRYPTO_NULL is not set | 1225 | |
| 1226 | # | ||
| 1227 | # Digest | ||
| 1228 | # | ||
| 1229 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1182 | # CONFIG_CRYPTO_MD4 is not set | 1230 | # CONFIG_CRYPTO_MD4 is not set |
| 1183 | CONFIG_CRYPTO_MD5=y | 1231 | CONFIG_CRYPTO_MD5=y |
| 1232 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1184 | # CONFIG_CRYPTO_SHA1 is not set | 1233 | # CONFIG_CRYPTO_SHA1 is not set |
| 1185 | # CONFIG_CRYPTO_SHA256 is not set | 1234 | # CONFIG_CRYPTO_SHA256 is not set |
| 1186 | # CONFIG_CRYPTO_SHA512 is not set | 1235 | # CONFIG_CRYPTO_SHA512 is not set |
| 1187 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1188 | # CONFIG_CRYPTO_TGR192 is not set | 1236 | # CONFIG_CRYPTO_TGR192 is not set |
| 1189 | # CONFIG_CRYPTO_GF128MUL is not set | 1237 | # CONFIG_CRYPTO_WP512 is not set |
| 1190 | # CONFIG_CRYPTO_ECB is not set | 1238 | |
| 1191 | CONFIG_CRYPTO_CBC=y | 1239 | # |
| 1192 | CONFIG_CRYPTO_PCBC=m | 1240 | # Ciphers |
| 1193 | # CONFIG_CRYPTO_LRW is not set | 1241 | # |
| 1194 | # CONFIG_CRYPTO_XTS is not set | ||
| 1195 | # CONFIG_CRYPTO_CTR is not set | ||
| 1196 | # CONFIG_CRYPTO_GCM is not set | ||
| 1197 | # CONFIG_CRYPTO_CCM is not set | ||
| 1198 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1199 | CONFIG_CRYPTO_DES=y | ||
| 1200 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1201 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1202 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1203 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1204 | # CONFIG_CRYPTO_AES is not set | 1242 | # CONFIG_CRYPTO_AES is not set |
| 1243 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1244 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1245 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1246 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1205 | # CONFIG_CRYPTO_CAST5 is not set | 1247 | # CONFIG_CRYPTO_CAST5 is not set |
| 1206 | # CONFIG_CRYPTO_CAST6 is not set | 1248 | # CONFIG_CRYPTO_CAST6 is not set |
| 1207 | # CONFIG_CRYPTO_TEA is not set | 1249 | CONFIG_CRYPTO_DES=y |
| 1208 | # CONFIG_CRYPTO_ARC4 is not set | 1250 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1209 | # CONFIG_CRYPTO_KHAZAD is not set | 1251 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1210 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1211 | # CONFIG_CRYPTO_SEED is not set | ||
| 1212 | # CONFIG_CRYPTO_SALSA20 is not set | 1252 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1253 | # CONFIG_CRYPTO_SEED is not set | ||
| 1254 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1255 | # CONFIG_CRYPTO_TEA is not set | ||
| 1256 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1257 | |||
| 1258 | # | ||
| 1259 | # Compression | ||
| 1260 | # | ||
| 1213 | # CONFIG_CRYPTO_DEFLATE is not set | 1261 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1214 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1215 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1216 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1217 | # CONFIG_CRYPTO_TEST is not set | ||
| 1218 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1219 | # CONFIG_CRYPTO_LZO is not set | 1262 | # CONFIG_CRYPTO_LZO is not set |
| 1220 | CONFIG_CRYPTO_HW=y | 1263 | CONFIG_CRYPTO_HW=y |
| 1221 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1264 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1222 | # CONFIG_PPC_CLOCK is not set | 1265 | # CONFIG_PPC_CLOCK is not set |
| 1266 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index b4e82c0e2be7..c82e96e984fc 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:56 2008 | 4 | # Mon Jun 9 08:52:26 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +359,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 353 | # CONFIG_CONNECTOR is not set | 359 | # CONFIG_CONNECTOR is not set |
| 354 | # CONFIG_MTD is not set | 360 | # CONFIG_MTD is not set |
| 355 | CONFIG_OF_DEVICE=y | 361 | CONFIG_OF_DEVICE=y |
| 362 | CONFIG_OF_I2C=y | ||
| 356 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
| 357 | CONFIG_BLK_DEV=y | 364 | CONFIG_BLK_DEV=y |
| 358 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
| @@ -471,7 +478,6 @@ CONFIG_NETDEV_1000=y | |||
| 471 | # CONFIG_SIS190 is not set | 478 | # CONFIG_SIS190 is not set |
| 472 | # CONFIG_SKGE is not set | 479 | # CONFIG_SKGE is not set |
| 473 | # CONFIG_SKY2 is not set | 480 | # CONFIG_SKY2 is not set |
| 474 | # CONFIG_SK98LIN is not set | ||
| 475 | # CONFIG_VIA_VELOCITY is not set | 481 | # CONFIG_VIA_VELOCITY is not set |
| 476 | # CONFIG_TIGON3 is not set | 482 | # CONFIG_TIGON3 is not set |
| 477 | # CONFIG_BNX2 is not set | 483 | # CONFIG_BNX2 is not set |
| @@ -491,6 +497,7 @@ CONFIG_NETDEV_10000=y | |||
| 491 | # CONFIG_MLX4_CORE is not set | 497 | # CONFIG_MLX4_CORE is not set |
| 492 | # CONFIG_TEHUTI is not set | 498 | # CONFIG_TEHUTI is not set |
| 493 | # CONFIG_BNX2X is not set | 499 | # CONFIG_BNX2X is not set |
| 500 | # CONFIG_SFC is not set | ||
| 494 | # CONFIG_TR is not set | 501 | # CONFIG_TR is not set |
| 495 | 502 | ||
| 496 | # | 503 | # |
| @@ -498,6 +505,7 @@ CONFIG_NETDEV_10000=y | |||
| 498 | # | 505 | # |
| 499 | # CONFIG_WLAN_PRE80211 is not set | 506 | # CONFIG_WLAN_PRE80211 is not set |
| 500 | # CONFIG_WLAN_80211 is not set | 507 | # CONFIG_WLAN_80211 is not set |
| 508 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 501 | # CONFIG_WAN is not set | 509 | # CONFIG_WAN is not set |
| 502 | # CONFIG_FDDI is not set | 510 | # CONFIG_FDDI is not set |
| 503 | # CONFIG_HIPPI is not set | 511 | # CONFIG_HIPPI is not set |
| @@ -544,6 +552,7 @@ CONFIG_INPUT=y | |||
| 544 | # Character devices | 552 | # Character devices |
| 545 | # | 553 | # |
| 546 | # CONFIG_VT is not set | 554 | # CONFIG_VT is not set |
| 555 | CONFIG_DEVKMEM=y | ||
| 547 | # CONFIG_SERIAL_NONSTANDARD is not set | 556 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 548 | # CONFIG_NOZOMI is not set | 557 | # CONFIG_NOZOMI is not set |
| 549 | 558 | ||
| @@ -571,7 +580,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 571 | # CONFIG_IPMI_HANDLER is not set | 580 | # CONFIG_IPMI_HANDLER is not set |
| 572 | # CONFIG_HW_RANDOM is not set | 581 | # CONFIG_HW_RANDOM is not set |
| 573 | # CONFIG_NVRAM is not set | 582 | # CONFIG_NVRAM is not set |
| 574 | # CONFIG_GEN_RTC is not set | ||
| 575 | # CONFIG_R3964 is not set | 583 | # CONFIG_R3964 is not set |
| 576 | # CONFIG_APPLICOM is not set | 584 | # CONFIG_APPLICOM is not set |
| 577 | # CONFIG_RAW_DRIVER is not set | 585 | # CONFIG_RAW_DRIVER is not set |
| @@ -582,13 +590,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 582 | CONFIG_I2C_CHARDEV=y | 590 | CONFIG_I2C_CHARDEV=y |
| 583 | 591 | ||
| 584 | # | 592 | # |
| 585 | # I2C Algorithms | ||
| 586 | # | ||
| 587 | # CONFIG_I2C_ALGOBIT is not set | ||
| 588 | # CONFIG_I2C_ALGOPCF is not set | ||
| 589 | # CONFIG_I2C_ALGOPCA is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # I2C Hardware Bus support | 593 | # I2C Hardware Bus support |
| 593 | # | 594 | # |
| 594 | # CONFIG_I2C_ALI1535 is not set | 595 | # CONFIG_I2C_ALI1535 is not set |
| @@ -614,6 +615,7 @@ CONFIG_I2C_MPC=y | |||
| 614 | # CONFIG_I2C_VIA is not set | 615 | # CONFIG_I2C_VIA is not set |
| 615 | # CONFIG_I2C_VIAPRO is not set | 616 | # CONFIG_I2C_VIAPRO is not set |
| 616 | # CONFIG_I2C_VOODOO3 is not set | 617 | # CONFIG_I2C_VOODOO3 is not set |
| 618 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 617 | 619 | ||
| 618 | # | 620 | # |
| 619 | # Miscellaneous I2C Chip support | 621 | # Miscellaneous I2C Chip support |
| @@ -623,19 +625,13 @@ CONFIG_I2C_MPC=y | |||
| 623 | # CONFIG_SENSORS_PCF8574 is not set | 625 | # CONFIG_SENSORS_PCF8574 is not set |
| 624 | # CONFIG_PCF8575 is not set | 626 | # CONFIG_PCF8575 is not set |
| 625 | # CONFIG_SENSORS_PCF8591 is not set | 627 | # CONFIG_SENSORS_PCF8591 is not set |
| 626 | # CONFIG_TPS65010 is not set | ||
| 627 | # CONFIG_SENSORS_MAX6875 is not set | 628 | # CONFIG_SENSORS_MAX6875 is not set |
| 628 | # CONFIG_SENSORS_TSL2550 is not set | 629 | # CONFIG_SENSORS_TSL2550 is not set |
| 629 | # CONFIG_I2C_DEBUG_CORE is not set | 630 | # CONFIG_I2C_DEBUG_CORE is not set |
| 630 | # CONFIG_I2C_DEBUG_ALGO is not set | 631 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 631 | # CONFIG_I2C_DEBUG_BUS is not set | 632 | # CONFIG_I2C_DEBUG_BUS is not set |
| 632 | # CONFIG_I2C_DEBUG_CHIP is not set | 633 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 633 | |||
| 634 | # | ||
| 635 | # SPI support | ||
| 636 | # | ||
| 637 | # CONFIG_SPI is not set | 634 | # CONFIG_SPI is not set |
| 638 | # CONFIG_SPI_MASTER is not set | ||
| 639 | # CONFIG_W1 is not set | 635 | # CONFIG_W1 is not set |
| 640 | # CONFIG_POWER_SUPPLY is not set | 636 | # CONFIG_POWER_SUPPLY is not set |
| 641 | CONFIG_HWMON=y | 637 | CONFIG_HWMON=y |
| @@ -718,12 +714,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 718 | # Multifunction device drivers | 714 | # Multifunction device drivers |
| 719 | # | 715 | # |
| 720 | # CONFIG_MFD_SM501 is not set | 716 | # CONFIG_MFD_SM501 is not set |
| 717 | # CONFIG_HTC_PASIC3 is not set | ||
| 721 | 718 | ||
| 722 | # | 719 | # |
| 723 | # Multimedia devices | 720 | # Multimedia devices |
| 724 | # | 721 | # |
| 722 | |||
| 723 | # | ||
| 724 | # Multimedia core support | ||
| 725 | # | ||
| 725 | # CONFIG_VIDEO_DEV is not set | 726 | # CONFIG_VIDEO_DEV is not set |
| 726 | # CONFIG_DVB_CORE is not set | 727 | # CONFIG_DVB_CORE is not set |
| 728 | # CONFIG_VIDEO_MEDIA is not set | ||
| 729 | |||
| 730 | # | ||
| 731 | # Multimedia drivers | ||
| 732 | # | ||
| 727 | CONFIG_DAB=y | 733 | CONFIG_DAB=y |
| 728 | 734 | ||
| 729 | # | 735 | # |
| @@ -754,6 +760,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 754 | CONFIG_USB_ARCH_HAS_OHCI=y | 760 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 755 | CONFIG_USB_ARCH_HAS_EHCI=y | 761 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 756 | # CONFIG_USB is not set | 762 | # CONFIG_USB is not set |
| 763 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 764 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 757 | 765 | ||
| 758 | # | 766 | # |
| 759 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 767 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -762,6 +770,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 762 | # CONFIG_MMC is not set | 770 | # CONFIG_MMC is not set |
| 763 | # CONFIG_MEMSTICK is not set | 771 | # CONFIG_MEMSTICK is not set |
| 764 | # CONFIG_NEW_LEDS is not set | 772 | # CONFIG_NEW_LEDS is not set |
| 773 | # CONFIG_ACCESSIBILITY is not set | ||
| 765 | # CONFIG_INFINIBAND is not set | 774 | # CONFIG_INFINIBAND is not set |
| 766 | # CONFIG_EDAC is not set | 775 | # CONFIG_EDAC is not set |
| 767 | CONFIG_RTC_LIB=y | 776 | CONFIG_RTC_LIB=y |
| @@ -813,11 +822,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 813 | # | 822 | # |
| 814 | # on-CPU RTC drivers | 823 | # on-CPU RTC drivers |
| 815 | # | 824 | # |
| 825 | # CONFIG_RTC_DRV_PPC is not set | ||
| 816 | # CONFIG_DMADEVICES is not set | 826 | # CONFIG_DMADEVICES is not set |
| 817 | |||
| 818 | # | ||
| 819 | # Userspace I/O | ||
| 820 | # | ||
| 821 | # CONFIG_UIO is not set | 827 | # CONFIG_UIO is not set |
| 822 | 828 | ||
| 823 | # | 829 | # |
| @@ -837,7 +843,6 @@ CONFIG_FS_MBCACHE=y | |||
| 837 | # CONFIG_JFS_FS is not set | 843 | # CONFIG_JFS_FS is not set |
| 838 | # CONFIG_FS_POSIX_ACL is not set | 844 | # CONFIG_FS_POSIX_ACL is not set |
| 839 | # CONFIG_XFS_FS is not set | 845 | # CONFIG_XFS_FS is not set |
| 840 | # CONFIG_GFS2_FS is not set | ||
| 841 | # CONFIG_OCFS2_FS is not set | 846 | # CONFIG_OCFS2_FS is not set |
| 842 | CONFIG_DNOTIFY=y | 847 | CONFIG_DNOTIFY=y |
| 843 | CONFIG_INOTIFY=y | 848 | CONFIG_INOTIFY=y |
| @@ -895,7 +900,6 @@ CONFIG_NFS_FS=y | |||
| 895 | CONFIG_NFS_V3=y | 900 | CONFIG_NFS_V3=y |
| 896 | # CONFIG_NFS_V3_ACL is not set | 901 | # CONFIG_NFS_V3_ACL is not set |
| 897 | CONFIG_NFS_V4=y | 902 | CONFIG_NFS_V4=y |
| 898 | # CONFIG_NFS_DIRECTIO is not set | ||
| 899 | # CONFIG_NFSD is not set | 903 | # CONFIG_NFSD is not set |
| 900 | CONFIG_ROOT_NFS=y | 904 | CONFIG_ROOT_NFS=y |
| 901 | CONFIG_LOCKD=y | 905 | CONFIG_LOCKD=y |
| @@ -936,6 +940,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 936 | # Library routines | 940 | # Library routines |
| 937 | # | 941 | # |
| 938 | CONFIG_BITREVERSE=y | 942 | CONFIG_BITREVERSE=y |
| 943 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 939 | # CONFIG_CRC_CCITT is not set | 944 | # CONFIG_CRC_CCITT is not set |
| 940 | # CONFIG_CRC16 is not set | 945 | # CONFIG_CRC16 is not set |
| 941 | # CONFIG_CRC_ITU_T is not set | 946 | # CONFIG_CRC_ITU_T is not set |
| @@ -946,6 +951,7 @@ CONFIG_PLIST=y | |||
| 946 | CONFIG_HAS_IOMEM=y | 951 | CONFIG_HAS_IOMEM=y |
| 947 | CONFIG_HAS_IOPORT=y | 952 | CONFIG_HAS_IOPORT=y |
| 948 | CONFIG_HAS_DMA=y | 953 | CONFIG_HAS_DMA=y |
| 954 | CONFIG_HAVE_LMB=y | ||
| 949 | 955 | ||
| 950 | # | 956 | # |
| 951 | # Kernel hacking | 957 | # Kernel hacking |
| @@ -953,6 +959,7 @@ CONFIG_HAS_DMA=y | |||
| 953 | # CONFIG_PRINTK_TIME is not set | 959 | # CONFIG_PRINTK_TIME is not set |
| 954 | CONFIG_ENABLE_WARN_DEPRECATED=y | 960 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 955 | CONFIG_ENABLE_MUST_CHECK=y | 961 | CONFIG_ENABLE_MUST_CHECK=y |
| 962 | CONFIG_FRAME_WARN=1024 | ||
| 956 | # CONFIG_MAGIC_SYSRQ is not set | 963 | # CONFIG_MAGIC_SYSRQ is not set |
| 957 | # CONFIG_UNUSED_SYMBOLS is not set | 964 | # CONFIG_UNUSED_SYMBOLS is not set |
| 958 | # CONFIG_DEBUG_FS is not set | 965 | # CONFIG_DEBUG_FS is not set |
| @@ -962,6 +969,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 962 | # CONFIG_SLUB_STATS is not set | 969 | # CONFIG_SLUB_STATS is not set |
| 963 | # CONFIG_DEBUG_BUGVERBOSE is not set | 970 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 964 | # CONFIG_SAMPLES is not set | 971 | # CONFIG_SAMPLES is not set |
| 972 | # CONFIG_IRQSTACKS is not set | ||
| 965 | # CONFIG_PPC_EARLY_DEBUG is not set | 973 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 966 | 974 | ||
| 967 | # | 975 | # |
| @@ -971,51 +979,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 971 | # CONFIG_SECURITY is not set | 979 | # CONFIG_SECURITY is not set |
| 972 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 980 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 973 | CONFIG_CRYPTO=y | 981 | CONFIG_CRYPTO=y |
| 982 | |||
| 983 | # | ||
| 984 | # Crypto core or helper | ||
| 985 | # | ||
| 974 | CONFIG_CRYPTO_ALGAPI=y | 986 | CONFIG_CRYPTO_ALGAPI=y |
| 975 | CONFIG_CRYPTO_BLKCIPHER=y | 987 | CONFIG_CRYPTO_BLKCIPHER=y |
| 976 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 977 | CONFIG_CRYPTO_MANAGER=y | 988 | CONFIG_CRYPTO_MANAGER=y |
| 989 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 990 | # CONFIG_CRYPTO_NULL is not set | ||
| 991 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 992 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 993 | # CONFIG_CRYPTO_TEST is not set | ||
| 994 | |||
| 995 | # | ||
| 996 | # Authenticated Encryption with Associated Data | ||
| 997 | # | ||
| 998 | # CONFIG_CRYPTO_CCM is not set | ||
| 999 | # CONFIG_CRYPTO_GCM is not set | ||
| 1000 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1001 | |||
| 1002 | # | ||
| 1003 | # Block modes | ||
| 1004 | # | ||
| 1005 | CONFIG_CRYPTO_CBC=y | ||
| 1006 | # CONFIG_CRYPTO_CTR is not set | ||
| 1007 | # CONFIG_CRYPTO_CTS is not set | ||
| 1008 | CONFIG_CRYPTO_ECB=m | ||
| 1009 | # CONFIG_CRYPTO_LRW is not set | ||
| 1010 | CONFIG_CRYPTO_PCBC=m | ||
| 1011 | # CONFIG_CRYPTO_XTS is not set | ||
| 1012 | |||
| 1013 | # | ||
| 1014 | # Hash modes | ||
| 1015 | # | ||
| 978 | # CONFIG_CRYPTO_HMAC is not set | 1016 | # CONFIG_CRYPTO_HMAC is not set |
| 979 | # CONFIG_CRYPTO_XCBC is not set | 1017 | # CONFIG_CRYPTO_XCBC is not set |
| 980 | # CONFIG_CRYPTO_NULL is not set | 1018 | |
| 1019 | # | ||
| 1020 | # Digest | ||
| 1021 | # | ||
| 1022 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 981 | # CONFIG_CRYPTO_MD4 is not set | 1023 | # CONFIG_CRYPTO_MD4 is not set |
| 982 | CONFIG_CRYPTO_MD5=y | 1024 | CONFIG_CRYPTO_MD5=y |
| 1025 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 983 | # CONFIG_CRYPTO_SHA1 is not set | 1026 | # CONFIG_CRYPTO_SHA1 is not set |
| 984 | # CONFIG_CRYPTO_SHA256 is not set | 1027 | # CONFIG_CRYPTO_SHA256 is not set |
| 985 | # CONFIG_CRYPTO_SHA512 is not set | 1028 | # CONFIG_CRYPTO_SHA512 is not set |
| 986 | # CONFIG_CRYPTO_WP512 is not set | ||
| 987 | # CONFIG_CRYPTO_TGR192 is not set | 1029 | # CONFIG_CRYPTO_TGR192 is not set |
| 988 | # CONFIG_CRYPTO_GF128MUL is not set | 1030 | # CONFIG_CRYPTO_WP512 is not set |
| 989 | CONFIG_CRYPTO_ECB=m | 1031 | |
| 990 | CONFIG_CRYPTO_CBC=y | 1032 | # |
| 991 | CONFIG_CRYPTO_PCBC=m | 1033 | # Ciphers |
| 992 | # CONFIG_CRYPTO_LRW is not set | 1034 | # |
| 993 | # CONFIG_CRYPTO_XTS is not set | ||
| 994 | # CONFIG_CRYPTO_CTR is not set | ||
| 995 | # CONFIG_CRYPTO_GCM is not set | ||
| 996 | # CONFIG_CRYPTO_CCM is not set | ||
| 997 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 998 | CONFIG_CRYPTO_DES=y | ||
| 999 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1000 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1001 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1002 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1003 | # CONFIG_CRYPTO_AES is not set | 1035 | # CONFIG_CRYPTO_AES is not set |
| 1036 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1037 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1038 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1039 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1004 | # CONFIG_CRYPTO_CAST5 is not set | 1040 | # CONFIG_CRYPTO_CAST5 is not set |
| 1005 | # CONFIG_CRYPTO_CAST6 is not set | 1041 | # CONFIG_CRYPTO_CAST6 is not set |
| 1006 | # CONFIG_CRYPTO_TEA is not set | 1042 | CONFIG_CRYPTO_DES=y |
| 1007 | # CONFIG_CRYPTO_ARC4 is not set | 1043 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1008 | # CONFIG_CRYPTO_KHAZAD is not set | 1044 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1009 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1010 | # CONFIG_CRYPTO_SEED is not set | ||
| 1011 | # CONFIG_CRYPTO_SALSA20 is not set | 1045 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1046 | # CONFIG_CRYPTO_SEED is not set | ||
| 1047 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1048 | # CONFIG_CRYPTO_TEA is not set | ||
| 1049 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1050 | |||
| 1051 | # | ||
| 1052 | # Compression | ||
| 1053 | # | ||
| 1012 | # CONFIG_CRYPTO_DEFLATE is not set | 1054 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1014 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1015 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1016 | # CONFIG_CRYPTO_TEST is not set | ||
| 1017 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1018 | # CONFIG_CRYPTO_LZO is not set | 1055 | # CONFIG_CRYPTO_LZO is not set |
| 1019 | CONFIG_CRYPTO_HW=y | 1056 | CONFIG_CRYPTO_HW=y |
| 1020 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1057 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1021 | # CONFIG_PPC_CLOCK is not set | 1058 | # CONFIG_PPC_CLOCK is not set |
| 1059 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index d50a96eddcdc..20fd9f58cf42 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:57 2008 | 4 | # Mon Jun 9 08:52:27 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +359,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 353 | # CONFIG_CONNECTOR is not set | 359 | # CONFIG_CONNECTOR is not set |
| 354 | # CONFIG_MTD is not set | 360 | # CONFIG_MTD is not set |
| 355 | CONFIG_OF_DEVICE=y | 361 | CONFIG_OF_DEVICE=y |
| 362 | CONFIG_OF_I2C=y | ||
| 356 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
| 357 | CONFIG_BLK_DEV=y | 364 | CONFIG_BLK_DEV=y |
| 358 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
| @@ -520,7 +527,6 @@ CONFIG_NETDEV_1000=y | |||
| 520 | # CONFIG_SIS190 is not set | 527 | # CONFIG_SIS190 is not set |
| 521 | # CONFIG_SKGE is not set | 528 | # CONFIG_SKGE is not set |
| 522 | # CONFIG_SKY2 is not set | 529 | # CONFIG_SKY2 is not set |
| 523 | # CONFIG_SK98LIN is not set | ||
| 524 | # CONFIG_VIA_VELOCITY is not set | 530 | # CONFIG_VIA_VELOCITY is not set |
| 525 | # CONFIG_TIGON3 is not set | 531 | # CONFIG_TIGON3 is not set |
| 526 | # CONFIG_BNX2 is not set | 532 | # CONFIG_BNX2 is not set |
| @@ -544,6 +550,7 @@ CONFIG_NETDEV_10000=y | |||
| 544 | # CONFIG_MLX4_CORE is not set | 550 | # CONFIG_MLX4_CORE is not set |
| 545 | # CONFIG_TEHUTI is not set | 551 | # CONFIG_TEHUTI is not set |
| 546 | # CONFIG_BNX2X is not set | 552 | # CONFIG_BNX2X is not set |
| 553 | # CONFIG_SFC is not set | ||
| 547 | # CONFIG_TR is not set | 554 | # CONFIG_TR is not set |
| 548 | 555 | ||
| 549 | # | 556 | # |
| @@ -551,6 +558,7 @@ CONFIG_NETDEV_10000=y | |||
| 551 | # | 558 | # |
| 552 | # CONFIG_WLAN_PRE80211 is not set | 559 | # CONFIG_WLAN_PRE80211 is not set |
| 553 | # CONFIG_WLAN_80211 is not set | 560 | # CONFIG_WLAN_80211 is not set |
| 561 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 554 | # CONFIG_WAN is not set | 562 | # CONFIG_WAN is not set |
| 555 | # CONFIG_FDDI is not set | 563 | # CONFIG_FDDI is not set |
| 556 | # CONFIG_HIPPI is not set | 564 | # CONFIG_HIPPI is not set |
| @@ -598,6 +606,7 @@ CONFIG_INPUT=y | |||
| 598 | # Character devices | 606 | # Character devices |
| 599 | # | 607 | # |
| 600 | # CONFIG_VT is not set | 608 | # CONFIG_VT is not set |
| 609 | CONFIG_DEVKMEM=y | ||
| 601 | # CONFIG_SERIAL_NONSTANDARD is not set | 610 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 602 | # CONFIG_NOZOMI is not set | 611 | # CONFIG_NOZOMI is not set |
| 603 | 612 | ||
| @@ -626,7 +635,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 626 | # CONFIG_IPMI_HANDLER is not set | 635 | # CONFIG_IPMI_HANDLER is not set |
| 627 | CONFIG_HW_RANDOM=y | 636 | CONFIG_HW_RANDOM=y |
| 628 | # CONFIG_NVRAM is not set | 637 | # CONFIG_NVRAM is not set |
| 629 | # CONFIG_GEN_RTC is not set | ||
| 630 | # CONFIG_R3964 is not set | 638 | # CONFIG_R3964 is not set |
| 631 | # CONFIG_APPLICOM is not set | 639 | # CONFIG_APPLICOM is not set |
| 632 | # CONFIG_RAW_DRIVER is not set | 640 | # CONFIG_RAW_DRIVER is not set |
| @@ -637,13 +645,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 637 | CONFIG_I2C_CHARDEV=y | 645 | CONFIG_I2C_CHARDEV=y |
| 638 | 646 | ||
| 639 | # | 647 | # |
| 640 | # I2C Algorithms | ||
| 641 | # | ||
| 642 | # CONFIG_I2C_ALGOBIT is not set | ||
| 643 | # CONFIG_I2C_ALGOPCF is not set | ||
| 644 | # CONFIG_I2C_ALGOPCA is not set | ||
| 645 | |||
| 646 | # | ||
| 647 | # I2C Hardware Bus support | 648 | # I2C Hardware Bus support |
| 648 | # | 649 | # |
| 649 | # CONFIG_I2C_ALI1535 is not set | 650 | # CONFIG_I2C_ALI1535 is not set |
| @@ -669,6 +670,7 @@ CONFIG_I2C_MPC=y | |||
| 669 | # CONFIG_I2C_VIA is not set | 670 | # CONFIG_I2C_VIA is not set |
| 670 | # CONFIG_I2C_VIAPRO is not set | 671 | # CONFIG_I2C_VIAPRO is not set |
| 671 | # CONFIG_I2C_VOODOO3 is not set | 672 | # CONFIG_I2C_VOODOO3 is not set |
| 673 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 672 | 674 | ||
| 673 | # | 675 | # |
| 674 | # Miscellaneous I2C Chip support | 676 | # Miscellaneous I2C Chip support |
| @@ -678,19 +680,13 @@ CONFIG_I2C_MPC=y | |||
| 678 | # CONFIG_SENSORS_PCF8574 is not set | 680 | # CONFIG_SENSORS_PCF8574 is not set |
| 679 | # CONFIG_PCF8575 is not set | 681 | # CONFIG_PCF8575 is not set |
| 680 | # CONFIG_SENSORS_PCF8591 is not set | 682 | # CONFIG_SENSORS_PCF8591 is not set |
| 681 | # CONFIG_TPS65010 is not set | ||
| 682 | # CONFIG_SENSORS_MAX6875 is not set | 683 | # CONFIG_SENSORS_MAX6875 is not set |
| 683 | # CONFIG_SENSORS_TSL2550 is not set | 684 | # CONFIG_SENSORS_TSL2550 is not set |
| 684 | # CONFIG_I2C_DEBUG_CORE is not set | 685 | # CONFIG_I2C_DEBUG_CORE is not set |
| 685 | # CONFIG_I2C_DEBUG_ALGO is not set | 686 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 686 | # CONFIG_I2C_DEBUG_BUS is not set | 687 | # CONFIG_I2C_DEBUG_BUS is not set |
| 687 | # CONFIG_I2C_DEBUG_CHIP is not set | 688 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 688 | |||
| 689 | # | ||
| 690 | # SPI support | ||
| 691 | # | ||
| 692 | # CONFIG_SPI is not set | 689 | # CONFIG_SPI is not set |
| 693 | # CONFIG_SPI_MASTER is not set | ||
| 694 | # CONFIG_W1 is not set | 690 | # CONFIG_W1 is not set |
| 695 | # CONFIG_POWER_SUPPLY is not set | 691 | # CONFIG_POWER_SUPPLY is not set |
| 696 | CONFIG_HWMON=y | 692 | CONFIG_HWMON=y |
| @@ -773,12 +769,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 773 | # Multifunction device drivers | 769 | # Multifunction device drivers |
| 774 | # | 770 | # |
| 775 | # CONFIG_MFD_SM501 is not set | 771 | # CONFIG_MFD_SM501 is not set |
| 772 | # CONFIG_HTC_PASIC3 is not set | ||
| 776 | 773 | ||
| 777 | # | 774 | # |
| 778 | # Multimedia devices | 775 | # Multimedia devices |
| 779 | # | 776 | # |
| 777 | |||
| 778 | # | ||
| 779 | # Multimedia core support | ||
| 780 | # | ||
| 780 | # CONFIG_VIDEO_DEV is not set | 781 | # CONFIG_VIDEO_DEV is not set |
| 781 | # CONFIG_DVB_CORE is not set | 782 | # CONFIG_DVB_CORE is not set |
| 783 | # CONFIG_VIDEO_MEDIA is not set | ||
| 784 | |||
| 785 | # | ||
| 786 | # Multimedia drivers | ||
| 787 | # | ||
| 782 | CONFIG_DAB=y | 788 | CONFIG_DAB=y |
| 783 | 789 | ||
| 784 | # | 790 | # |
| @@ -809,6 +815,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 809 | CONFIG_USB_ARCH_HAS_OHCI=y | 815 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 810 | CONFIG_USB_ARCH_HAS_EHCI=y | 816 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 811 | # CONFIG_USB is not set | 817 | # CONFIG_USB is not set |
| 818 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 819 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 812 | 820 | ||
| 813 | # | 821 | # |
| 814 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 822 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -817,6 +825,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 817 | # CONFIG_MMC is not set | 825 | # CONFIG_MMC is not set |
| 818 | # CONFIG_MEMSTICK is not set | 826 | # CONFIG_MEMSTICK is not set |
| 819 | # CONFIG_NEW_LEDS is not set | 827 | # CONFIG_NEW_LEDS is not set |
| 828 | # CONFIG_ACCESSIBILITY is not set | ||
| 820 | # CONFIG_INFINIBAND is not set | 829 | # CONFIG_INFINIBAND is not set |
| 821 | # CONFIG_EDAC is not set | 830 | # CONFIG_EDAC is not set |
| 822 | CONFIG_RTC_LIB=y | 831 | CONFIG_RTC_LIB=y |
| @@ -868,11 +877,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 868 | # | 877 | # |
| 869 | # on-CPU RTC drivers | 878 | # on-CPU RTC drivers |
| 870 | # | 879 | # |
| 880 | # CONFIG_RTC_DRV_PPC is not set | ||
| 871 | # CONFIG_DMADEVICES is not set | 881 | # CONFIG_DMADEVICES is not set |
| 872 | |||
| 873 | # | ||
| 874 | # Userspace I/O | ||
| 875 | # | ||
| 876 | # CONFIG_UIO is not set | 882 | # CONFIG_UIO is not set |
| 877 | 883 | ||
| 878 | # | 884 | # |
| @@ -892,7 +898,6 @@ CONFIG_FS_MBCACHE=y | |||
| 892 | # CONFIG_JFS_FS is not set | 898 | # CONFIG_JFS_FS is not set |
| 893 | # CONFIG_FS_POSIX_ACL is not set | 899 | # CONFIG_FS_POSIX_ACL is not set |
| 894 | # CONFIG_XFS_FS is not set | 900 | # CONFIG_XFS_FS is not set |
| 895 | # CONFIG_GFS2_FS is not set | ||
| 896 | # CONFIG_OCFS2_FS is not set | 901 | # CONFIG_OCFS2_FS is not set |
| 897 | CONFIG_DNOTIFY=y | 902 | CONFIG_DNOTIFY=y |
| 898 | CONFIG_INOTIFY=y | 903 | CONFIG_INOTIFY=y |
| @@ -950,7 +955,6 @@ CONFIG_NFS_FS=y | |||
| 950 | CONFIG_NFS_V3=y | 955 | CONFIG_NFS_V3=y |
| 951 | # CONFIG_NFS_V3_ACL is not set | 956 | # CONFIG_NFS_V3_ACL is not set |
| 952 | CONFIG_NFS_V4=y | 957 | CONFIG_NFS_V4=y |
| 953 | # CONFIG_NFS_DIRECTIO is not set | ||
| 954 | # CONFIG_NFSD is not set | 958 | # CONFIG_NFSD is not set |
| 955 | CONFIG_ROOT_NFS=y | 959 | CONFIG_ROOT_NFS=y |
| 956 | CONFIG_LOCKD=y | 960 | CONFIG_LOCKD=y |
| @@ -993,6 +997,7 @@ CONFIG_UCC=y | |||
| 993 | # Library routines | 997 | # Library routines |
| 994 | # | 998 | # |
| 995 | CONFIG_BITREVERSE=y | 999 | CONFIG_BITREVERSE=y |
| 1000 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 996 | # CONFIG_CRC_CCITT is not set | 1001 | # CONFIG_CRC_CCITT is not set |
| 997 | # CONFIG_CRC16 is not set | 1002 | # CONFIG_CRC16 is not set |
| 998 | # CONFIG_CRC_ITU_T is not set | 1003 | # CONFIG_CRC_ITU_T is not set |
| @@ -1003,6 +1008,7 @@ CONFIG_PLIST=y | |||
| 1003 | CONFIG_HAS_IOMEM=y | 1008 | CONFIG_HAS_IOMEM=y |
| 1004 | CONFIG_HAS_IOPORT=y | 1009 | CONFIG_HAS_IOPORT=y |
| 1005 | CONFIG_HAS_DMA=y | 1010 | CONFIG_HAS_DMA=y |
| 1011 | CONFIG_HAVE_LMB=y | ||
| 1006 | 1012 | ||
| 1007 | # | 1013 | # |
| 1008 | # Kernel hacking | 1014 | # Kernel hacking |
| @@ -1010,6 +1016,7 @@ CONFIG_HAS_DMA=y | |||
| 1010 | # CONFIG_PRINTK_TIME is not set | 1016 | # CONFIG_PRINTK_TIME is not set |
| 1011 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1017 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1012 | CONFIG_ENABLE_MUST_CHECK=y | 1018 | CONFIG_ENABLE_MUST_CHECK=y |
| 1019 | CONFIG_FRAME_WARN=1024 | ||
| 1013 | # CONFIG_MAGIC_SYSRQ is not set | 1020 | # CONFIG_MAGIC_SYSRQ is not set |
| 1014 | # CONFIG_UNUSED_SYMBOLS is not set | 1021 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1015 | # CONFIG_DEBUG_FS is not set | 1022 | # CONFIG_DEBUG_FS is not set |
| @@ -1019,6 +1026,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1019 | # CONFIG_SLUB_STATS is not set | 1026 | # CONFIG_SLUB_STATS is not set |
| 1020 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1027 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1021 | # CONFIG_SAMPLES is not set | 1028 | # CONFIG_SAMPLES is not set |
| 1029 | # CONFIG_IRQSTACKS is not set | ||
| 1022 | # CONFIG_PPC_EARLY_DEBUG is not set | 1030 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1023 | 1031 | ||
| 1024 | # | 1032 | # |
| @@ -1028,52 +1036,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1028 | # CONFIG_SECURITY is not set | 1036 | # CONFIG_SECURITY is not set |
| 1029 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1037 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1030 | CONFIG_CRYPTO=y | 1038 | CONFIG_CRYPTO=y |
| 1039 | |||
| 1040 | # | ||
| 1041 | # Crypto core or helper | ||
| 1042 | # | ||
| 1031 | CONFIG_CRYPTO_ALGAPI=y | 1043 | CONFIG_CRYPTO_ALGAPI=y |
| 1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1044 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1033 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1034 | CONFIG_CRYPTO_MANAGER=y | 1045 | CONFIG_CRYPTO_MANAGER=y |
| 1046 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1047 | # CONFIG_CRYPTO_NULL is not set | ||
| 1048 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1049 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1050 | # CONFIG_CRYPTO_TEST is not set | ||
| 1051 | |||
| 1052 | # | ||
| 1053 | # Authenticated Encryption with Associated Data | ||
| 1054 | # | ||
| 1055 | # CONFIG_CRYPTO_CCM is not set | ||
| 1056 | # CONFIG_CRYPTO_GCM is not set | ||
| 1057 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # Block modes | ||
| 1061 | # | ||
| 1062 | CONFIG_CRYPTO_CBC=y | ||
| 1063 | # CONFIG_CRYPTO_CTR is not set | ||
| 1064 | # CONFIG_CRYPTO_CTS is not set | ||
| 1065 | CONFIG_CRYPTO_ECB=m | ||
| 1066 | # CONFIG_CRYPTO_LRW is not set | ||
| 1067 | CONFIG_CRYPTO_PCBC=m | ||
| 1068 | # CONFIG_CRYPTO_XTS is not set | ||
| 1069 | |||
| 1070 | # | ||
| 1071 | # Hash modes | ||
| 1072 | # | ||
| 1035 | # CONFIG_CRYPTO_HMAC is not set | 1073 | # CONFIG_CRYPTO_HMAC is not set |
| 1036 | # CONFIG_CRYPTO_XCBC is not set | 1074 | # CONFIG_CRYPTO_XCBC is not set |
| 1037 | # CONFIG_CRYPTO_NULL is not set | 1075 | |
| 1076 | # | ||
| 1077 | # Digest | ||
| 1078 | # | ||
| 1079 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1038 | # CONFIG_CRYPTO_MD4 is not set | 1080 | # CONFIG_CRYPTO_MD4 is not set |
| 1039 | CONFIG_CRYPTO_MD5=y | 1081 | CONFIG_CRYPTO_MD5=y |
| 1082 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1040 | # CONFIG_CRYPTO_SHA1 is not set | 1083 | # CONFIG_CRYPTO_SHA1 is not set |
| 1041 | # CONFIG_CRYPTO_SHA256 is not set | 1084 | # CONFIG_CRYPTO_SHA256 is not set |
| 1042 | # CONFIG_CRYPTO_SHA512 is not set | 1085 | # CONFIG_CRYPTO_SHA512 is not set |
| 1043 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1044 | # CONFIG_CRYPTO_TGR192 is not set | 1086 | # CONFIG_CRYPTO_TGR192 is not set |
| 1045 | # CONFIG_CRYPTO_GF128MUL is not set | 1087 | # CONFIG_CRYPTO_WP512 is not set |
| 1046 | CONFIG_CRYPTO_ECB=m | 1088 | |
| 1047 | CONFIG_CRYPTO_CBC=y | 1089 | # |
| 1048 | CONFIG_CRYPTO_PCBC=m | 1090 | # Ciphers |
| 1049 | # CONFIG_CRYPTO_LRW is not set | 1091 | # |
| 1050 | # CONFIG_CRYPTO_XTS is not set | ||
| 1051 | # CONFIG_CRYPTO_CTR is not set | ||
| 1052 | # CONFIG_CRYPTO_GCM is not set | ||
| 1053 | # CONFIG_CRYPTO_CCM is not set | ||
| 1054 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1055 | CONFIG_CRYPTO_DES=y | ||
| 1056 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1057 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1058 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1059 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1060 | # CONFIG_CRYPTO_AES is not set | 1092 | # CONFIG_CRYPTO_AES is not set |
| 1093 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1094 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1095 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1096 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1061 | # CONFIG_CRYPTO_CAST5 is not set | 1097 | # CONFIG_CRYPTO_CAST5 is not set |
| 1062 | # CONFIG_CRYPTO_CAST6 is not set | 1098 | # CONFIG_CRYPTO_CAST6 is not set |
| 1063 | # CONFIG_CRYPTO_TEA is not set | 1099 | CONFIG_CRYPTO_DES=y |
| 1064 | # CONFIG_CRYPTO_ARC4 is not set | 1100 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1065 | # CONFIG_CRYPTO_KHAZAD is not set | 1101 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1066 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1067 | # CONFIG_CRYPTO_SEED is not set | ||
| 1068 | # CONFIG_CRYPTO_SALSA20 is not set | 1102 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1103 | # CONFIG_CRYPTO_SEED is not set | ||
| 1104 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1105 | # CONFIG_CRYPTO_TEA is not set | ||
| 1106 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1107 | |||
| 1108 | # | ||
| 1109 | # Compression | ||
| 1110 | # | ||
| 1069 | # CONFIG_CRYPTO_DEFLATE is not set | 1111 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1070 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1072 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1073 | # CONFIG_CRYPTO_TEST is not set | ||
| 1074 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1075 | # CONFIG_CRYPTO_LZO is not set | 1112 | # CONFIG_CRYPTO_LZO is not set |
| 1076 | CONFIG_CRYPTO_HW=y | 1113 | CONFIG_CRYPTO_HW=y |
| 1077 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1114 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1078 | # CONFIG_PPC_CLOCK is not set | 1115 | # CONFIG_PPC_CLOCK is not set |
| 1079 | CONFIG_PPC_LIB_RHEAP=y | 1116 | CONFIG_PPC_LIB_RHEAP=y |
| 1117 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index f377cde785b0..0f94d9f56beb 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:23 2008 | 4 | # Mon Jun 9 08:52:28 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -211,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 226 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_SYSCALL is not set | 241 | # CONFIG_PCI_SYSCALL is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,11 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 259 | ||
| 252 | # | 260 | # |
| 253 | # Networking | 261 | # Networking |
| @@ -295,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -350,6 +356,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 350 | # CONFIG_CONNECTOR is not set | 356 | # CONFIG_CONNECTOR is not set |
| 351 | # CONFIG_MTD is not set | 357 | # CONFIG_MTD is not set |
| 352 | CONFIG_OF_DEVICE=y | 358 | CONFIG_OF_DEVICE=y |
| 359 | CONFIG_OF_I2C=y | ||
| 353 | # CONFIG_PARPORT is not set | 360 | # CONFIG_PARPORT is not set |
| 354 | CONFIG_BLK_DEV=y | 361 | CONFIG_BLK_DEV=y |
| 355 | # CONFIG_BLK_DEV_FD is not set | 362 | # CONFIG_BLK_DEV_FD is not set |
| @@ -411,8 +418,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 411 | # CONFIG_SCSI_DEBUG is not set | 418 | # CONFIG_SCSI_DEBUG is not set |
| 412 | CONFIG_ATA=y | 419 | CONFIG_ATA=y |
| 413 | # CONFIG_ATA_NONSTANDARD is not set | 420 | # CONFIG_ATA_NONSTANDARD is not set |
| 414 | # CONFIG_SATA_MV is not set | 421 | CONFIG_SATA_PMP=y |
| 415 | CONFIG_SATA_FSL=y | 422 | CONFIG_SATA_FSL=y |
| 423 | CONFIG_ATA_SFF=y | ||
| 424 | # CONFIG_SATA_MV is not set | ||
| 416 | # CONFIG_PATA_PLATFORM is not set | 425 | # CONFIG_PATA_PLATFORM is not set |
| 417 | # CONFIG_MD is not set | 426 | # CONFIG_MD is not set |
| 418 | # CONFIG_MACINTOSH_DRIVERS is not set | 427 | # CONFIG_MACINTOSH_DRIVERS is not set |
| @@ -459,6 +468,7 @@ CONFIG_NETDEV_10000=y | |||
| 459 | # | 468 | # |
| 460 | # CONFIG_WLAN_PRE80211 is not set | 469 | # CONFIG_WLAN_PRE80211 is not set |
| 461 | # CONFIG_WLAN_80211 is not set | 470 | # CONFIG_WLAN_80211 is not set |
| 471 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 462 | # CONFIG_WAN is not set | 472 | # CONFIG_WAN is not set |
| 463 | # CONFIG_PPP is not set | 473 | # CONFIG_PPP is not set |
| 464 | # CONFIG_SLIP is not set | 474 | # CONFIG_SLIP is not set |
| @@ -503,6 +513,7 @@ CONFIG_INPUT=y | |||
| 503 | # Character devices | 513 | # Character devices |
| 504 | # | 514 | # |
| 505 | # CONFIG_VT is not set | 515 | # CONFIG_VT is not set |
| 516 | CONFIG_DEVKMEM=y | ||
| 506 | # CONFIG_SERIAL_NONSTANDARD is not set | 517 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 507 | 518 | ||
| 508 | # | 519 | # |
| @@ -537,13 +548,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 537 | CONFIG_I2C_CHARDEV=y | 548 | CONFIG_I2C_CHARDEV=y |
| 538 | 549 | ||
| 539 | # | 550 | # |
| 540 | # I2C Algorithms | ||
| 541 | # | ||
| 542 | # CONFIG_I2C_ALGOBIT is not set | ||
| 543 | # CONFIG_I2C_ALGOPCF is not set | ||
| 544 | # CONFIG_I2C_ALGOPCA is not set | ||
| 545 | |||
| 546 | # | ||
| 547 | # I2C Hardware Bus support | 551 | # I2C Hardware Bus support |
| 548 | # | 552 | # |
| 549 | CONFIG_I2C_MPC=y | 553 | CONFIG_I2C_MPC=y |
| @@ -552,6 +556,7 @@ CONFIG_I2C_MPC=y | |||
| 552 | # CONFIG_I2C_SIMTEC is not set | 556 | # CONFIG_I2C_SIMTEC is not set |
| 553 | # CONFIG_I2C_TAOS_EVM is not set | 557 | # CONFIG_I2C_TAOS_EVM is not set |
| 554 | # CONFIG_I2C_STUB is not set | 558 | # CONFIG_I2C_STUB is not set |
| 559 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 555 | 560 | ||
| 556 | # | 561 | # |
| 557 | # Miscellaneous I2C Chip support | 562 | # Miscellaneous I2C Chip support |
| @@ -561,19 +566,13 @@ CONFIG_I2C_MPC=y | |||
| 561 | # CONFIG_SENSORS_PCF8574 is not set | 566 | # CONFIG_SENSORS_PCF8574 is not set |
| 562 | # CONFIG_PCF8575 is not set | 567 | # CONFIG_PCF8575 is not set |
| 563 | # CONFIG_SENSORS_PCF8591 is not set | 568 | # CONFIG_SENSORS_PCF8591 is not set |
| 564 | # CONFIG_TPS65010 is not set | ||
| 565 | # CONFIG_SENSORS_MAX6875 is not set | 569 | # CONFIG_SENSORS_MAX6875 is not set |
| 566 | # CONFIG_SENSORS_TSL2550 is not set | 570 | # CONFIG_SENSORS_TSL2550 is not set |
| 567 | # CONFIG_I2C_DEBUG_CORE is not set | 571 | # CONFIG_I2C_DEBUG_CORE is not set |
| 568 | # CONFIG_I2C_DEBUG_ALGO is not set | 572 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 569 | # CONFIG_I2C_DEBUG_BUS is not set | 573 | # CONFIG_I2C_DEBUG_BUS is not set |
| 570 | # CONFIG_I2C_DEBUG_CHIP is not set | 574 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 571 | |||
| 572 | # | ||
| 573 | # SPI support | ||
| 574 | # | ||
| 575 | # CONFIG_SPI is not set | 575 | # CONFIG_SPI is not set |
| 576 | # CONFIG_SPI_MASTER is not set | ||
| 577 | # CONFIG_W1 is not set | 576 | # CONFIG_W1 is not set |
| 578 | # CONFIG_POWER_SUPPLY is not set | 577 | # CONFIG_POWER_SUPPLY is not set |
| 579 | CONFIG_HWMON=y | 578 | CONFIG_HWMON=y |
| @@ -646,12 +645,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 646 | # Multifunction device drivers | 645 | # Multifunction device drivers |
| 647 | # | 646 | # |
| 648 | # CONFIG_MFD_SM501 is not set | 647 | # CONFIG_MFD_SM501 is not set |
| 648 | # CONFIG_HTC_PASIC3 is not set | ||
| 649 | 649 | ||
| 650 | # | 650 | # |
| 651 | # Multimedia devices | 651 | # Multimedia devices |
| 652 | # | 652 | # |
| 653 | |||
| 654 | # | ||
| 655 | # Multimedia core support | ||
| 656 | # | ||
| 653 | # CONFIG_VIDEO_DEV is not set | 657 | # CONFIG_VIDEO_DEV is not set |
| 654 | # CONFIG_DVB_CORE is not set | 658 | # CONFIG_DVB_CORE is not set |
| 659 | # CONFIG_VIDEO_MEDIA is not set | ||
| 660 | |||
| 661 | # | ||
| 662 | # Multimedia drivers | ||
| 663 | # | ||
| 655 | CONFIG_DAB=y | 664 | CONFIG_DAB=y |
| 656 | 665 | ||
| 657 | # | 666 | # |
| @@ -680,6 +689,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 680 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 689 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 681 | CONFIG_USB_ARCH_HAS_EHCI=y | 690 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 682 | # CONFIG_USB is not set | 691 | # CONFIG_USB is not set |
| 692 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 693 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 683 | 694 | ||
| 684 | # | 695 | # |
| 685 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -688,13 +699,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 688 | # CONFIG_MMC is not set | 699 | # CONFIG_MMC is not set |
| 689 | # CONFIG_MEMSTICK is not set | 700 | # CONFIG_MEMSTICK is not set |
| 690 | # CONFIG_NEW_LEDS is not set | 701 | # CONFIG_NEW_LEDS is not set |
| 702 | # CONFIG_ACCESSIBILITY is not set | ||
| 691 | # CONFIG_EDAC is not set | 703 | # CONFIG_EDAC is not set |
| 692 | # CONFIG_RTC_CLASS is not set | 704 | # CONFIG_RTC_CLASS is not set |
| 693 | # CONFIG_DMADEVICES is not set | 705 | # CONFIG_DMADEVICES is not set |
| 694 | |||
| 695 | # | ||
| 696 | # Userspace I/O | ||
| 697 | # | ||
| 698 | # CONFIG_UIO is not set | 706 | # CONFIG_UIO is not set |
| 699 | 707 | ||
| 700 | # | 708 | # |
| @@ -714,7 +722,6 @@ CONFIG_FS_MBCACHE=y | |||
| 714 | # CONFIG_JFS_FS is not set | 722 | # CONFIG_JFS_FS is not set |
| 715 | # CONFIG_FS_POSIX_ACL is not set | 723 | # CONFIG_FS_POSIX_ACL is not set |
| 716 | # CONFIG_XFS_FS is not set | 724 | # CONFIG_XFS_FS is not set |
| 717 | # CONFIG_GFS2_FS is not set | ||
| 718 | # CONFIG_OCFS2_FS is not set | 725 | # CONFIG_OCFS2_FS is not set |
| 719 | CONFIG_DNOTIFY=y | 726 | CONFIG_DNOTIFY=y |
| 720 | CONFIG_INOTIFY=y | 727 | CONFIG_INOTIFY=y |
| @@ -772,7 +779,6 @@ CONFIG_NFS_FS=y | |||
| 772 | CONFIG_NFS_V3=y | 779 | CONFIG_NFS_V3=y |
| 773 | # CONFIG_NFS_V3_ACL is not set | 780 | # CONFIG_NFS_V3_ACL is not set |
| 774 | CONFIG_NFS_V4=y | 781 | CONFIG_NFS_V4=y |
| 775 | # CONFIG_NFS_DIRECTIO is not set | ||
| 776 | # CONFIG_NFSD is not set | 782 | # CONFIG_NFSD is not set |
| 777 | CONFIG_ROOT_NFS=y | 783 | CONFIG_ROOT_NFS=y |
| 778 | CONFIG_LOCKD=y | 784 | CONFIG_LOCKD=y |
| @@ -817,6 +823,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 817 | # Library routines | 823 | # Library routines |
| 818 | # | 824 | # |
| 819 | CONFIG_BITREVERSE=y | 825 | CONFIG_BITREVERSE=y |
| 826 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 820 | # CONFIG_CRC_CCITT is not set | 827 | # CONFIG_CRC_CCITT is not set |
| 821 | # CONFIG_CRC16 is not set | 828 | # CONFIG_CRC16 is not set |
| 822 | # CONFIG_CRC_ITU_T is not set | 829 | # CONFIG_CRC_ITU_T is not set |
| @@ -827,6 +834,7 @@ CONFIG_PLIST=y | |||
| 827 | CONFIG_HAS_IOMEM=y | 834 | CONFIG_HAS_IOMEM=y |
| 828 | CONFIG_HAS_IOPORT=y | 835 | CONFIG_HAS_IOPORT=y |
| 829 | CONFIG_HAS_DMA=y | 836 | CONFIG_HAS_DMA=y |
| 837 | CONFIG_HAVE_LMB=y | ||
| 830 | 838 | ||
| 831 | # | 839 | # |
| 832 | # Kernel hacking | 840 | # Kernel hacking |
| @@ -834,6 +842,7 @@ CONFIG_HAS_DMA=y | |||
| 834 | # CONFIG_PRINTK_TIME is not set | 842 | # CONFIG_PRINTK_TIME is not set |
| 835 | CONFIG_ENABLE_WARN_DEPRECATED=y | 843 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 836 | CONFIG_ENABLE_MUST_CHECK=y | 844 | CONFIG_ENABLE_MUST_CHECK=y |
| 845 | CONFIG_FRAME_WARN=1024 | ||
| 837 | # CONFIG_MAGIC_SYSRQ is not set | 846 | # CONFIG_MAGIC_SYSRQ is not set |
| 838 | # CONFIG_UNUSED_SYMBOLS is not set | 847 | # CONFIG_UNUSED_SYMBOLS is not set |
| 839 | # CONFIG_DEBUG_FS is not set | 848 | # CONFIG_DEBUG_FS is not set |
| @@ -841,6 +850,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 841 | # CONFIG_DEBUG_KERNEL is not set | 850 | # CONFIG_DEBUG_KERNEL is not set |
| 842 | # CONFIG_DEBUG_BUGVERBOSE is not set | 851 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 843 | # CONFIG_SAMPLES is not set | 852 | # CONFIG_SAMPLES is not set |
| 853 | # CONFIG_IRQSTACKS is not set | ||
| 844 | # CONFIG_PPC_EARLY_DEBUG is not set | 854 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 845 | 855 | ||
| 846 | # | 856 | # |
| @@ -850,50 +860,80 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 850 | # CONFIG_SECURITY is not set | 860 | # CONFIG_SECURITY is not set |
| 851 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 861 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 852 | CONFIG_CRYPTO=y | 862 | CONFIG_CRYPTO=y |
| 863 | |||
| 864 | # | ||
| 865 | # Crypto core or helper | ||
| 866 | # | ||
| 853 | CONFIG_CRYPTO_ALGAPI=y | 867 | CONFIG_CRYPTO_ALGAPI=y |
| 854 | CONFIG_CRYPTO_BLKCIPHER=y | 868 | CONFIG_CRYPTO_BLKCIPHER=y |
| 855 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 856 | CONFIG_CRYPTO_MANAGER=y | 869 | CONFIG_CRYPTO_MANAGER=y |
| 870 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 871 | # CONFIG_CRYPTO_NULL is not set | ||
| 872 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 873 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 874 | # CONFIG_CRYPTO_TEST is not set | ||
| 875 | |||
| 876 | # | ||
| 877 | # Authenticated Encryption with Associated Data | ||
| 878 | # | ||
| 879 | # CONFIG_CRYPTO_CCM is not set | ||
| 880 | # CONFIG_CRYPTO_GCM is not set | ||
| 881 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 882 | |||
| 883 | # | ||
| 884 | # Block modes | ||
| 885 | # | ||
| 886 | CONFIG_CRYPTO_CBC=y | ||
| 887 | # CONFIG_CRYPTO_CTR is not set | ||
| 888 | # CONFIG_CRYPTO_CTS is not set | ||
| 889 | CONFIG_CRYPTO_ECB=m | ||
| 890 | # CONFIG_CRYPTO_LRW is not set | ||
| 891 | CONFIG_CRYPTO_PCBC=m | ||
| 892 | # CONFIG_CRYPTO_XTS is not set | ||
| 893 | |||
| 894 | # | ||
| 895 | # Hash modes | ||
| 896 | # | ||
| 857 | # CONFIG_CRYPTO_HMAC is not set | 897 | # CONFIG_CRYPTO_HMAC is not set |
| 858 | # CONFIG_CRYPTO_XCBC is not set | 898 | # CONFIG_CRYPTO_XCBC is not set |
| 859 | # CONFIG_CRYPTO_NULL is not set | 899 | |
| 900 | # | ||
| 901 | # Digest | ||
| 902 | # | ||
| 903 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 860 | # CONFIG_CRYPTO_MD4 is not set | 904 | # CONFIG_CRYPTO_MD4 is not set |
| 861 | CONFIG_CRYPTO_MD5=y | 905 | CONFIG_CRYPTO_MD5=y |
| 906 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 862 | # CONFIG_CRYPTO_SHA1 is not set | 907 | # CONFIG_CRYPTO_SHA1 is not set |
| 863 | # CONFIG_CRYPTO_SHA256 is not set | 908 | # CONFIG_CRYPTO_SHA256 is not set |
| 864 | # CONFIG_CRYPTO_SHA512 is not set | 909 | # CONFIG_CRYPTO_SHA512 is not set |
| 865 | # CONFIG_CRYPTO_WP512 is not set | ||
| 866 | # CONFIG_CRYPTO_TGR192 is not set | 910 | # CONFIG_CRYPTO_TGR192 is not set |
| 867 | # CONFIG_CRYPTO_GF128MUL is not set | 911 | # CONFIG_CRYPTO_WP512 is not set |
| 868 | CONFIG_CRYPTO_ECB=m | 912 | |
| 869 | CONFIG_CRYPTO_CBC=y | 913 | # |
| 870 | CONFIG_CRYPTO_PCBC=m | 914 | # Ciphers |
| 871 | # CONFIG_CRYPTO_LRW is not set | 915 | # |
| 872 | # CONFIG_CRYPTO_XTS is not set | ||
| 873 | # CONFIG_CRYPTO_CTR is not set | ||
| 874 | # CONFIG_CRYPTO_GCM is not set | ||
| 875 | # CONFIG_CRYPTO_CCM is not set | ||
| 876 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 877 | CONFIG_CRYPTO_DES=y | ||
| 878 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 881 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 882 | # CONFIG_CRYPTO_AES is not set | 916 | # CONFIG_CRYPTO_AES is not set |
| 917 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 918 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 919 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 920 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 883 | # CONFIG_CRYPTO_CAST5 is not set | 921 | # CONFIG_CRYPTO_CAST5 is not set |
| 884 | # CONFIG_CRYPTO_CAST6 is not set | 922 | # CONFIG_CRYPTO_CAST6 is not set |
| 885 | # CONFIG_CRYPTO_TEA is not set | 923 | CONFIG_CRYPTO_DES=y |
| 886 | # CONFIG_CRYPTO_ARC4 is not set | 924 | # CONFIG_CRYPTO_FCRYPT is not set |
| 887 | # CONFIG_CRYPTO_KHAZAD is not set | 925 | # CONFIG_CRYPTO_KHAZAD is not set |
| 888 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 889 | # CONFIG_CRYPTO_SEED is not set | ||
| 890 | # CONFIG_CRYPTO_SALSA20 is not set | 926 | # CONFIG_CRYPTO_SALSA20 is not set |
| 927 | # CONFIG_CRYPTO_SEED is not set | ||
| 928 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 929 | # CONFIG_CRYPTO_TEA is not set | ||
| 930 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 931 | |||
| 932 | # | ||
| 933 | # Compression | ||
| 934 | # | ||
| 891 | # CONFIG_CRYPTO_DEFLATE is not set | 935 | # CONFIG_CRYPTO_DEFLATE is not set |
| 892 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 894 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 895 | # CONFIG_CRYPTO_TEST is not set | ||
| 896 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 897 | # CONFIG_CRYPTO_LZO is not set | 936 | # CONFIG_CRYPTO_LZO is not set |
| 898 | CONFIG_CRYPTO_HW=y | 937 | CONFIG_CRYPTO_HW=y |
| 899 | # CONFIG_PPC_CLOCK is not set | 938 | # CONFIG_PPC_CLOCK is not set |
| 939 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index a6331769d88f..0d448556f53a 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:24 2008 | 4 | # Tue Jun 10 09:17:12 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -211,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 226 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_SYSCALL is not set | 241 | # CONFIG_PCI_SYSCALL is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,11 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 259 | ||
| 252 | # | 260 | # |
| 253 | # Networking | 261 | # Networking |
| @@ -290,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -345,6 +351,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 345 | # CONFIG_CONNECTOR is not set | 351 | # CONFIG_CONNECTOR is not set |
| 346 | # CONFIG_MTD is not set | 352 | # CONFIG_MTD is not set |
| 347 | CONFIG_OF_DEVICE=y | 353 | CONFIG_OF_DEVICE=y |
| 354 | CONFIG_OF_I2C=y | ||
| 348 | # CONFIG_PARPORT is not set | 355 | # CONFIG_PARPORT is not set |
| 349 | CONFIG_BLK_DEV=y | 356 | CONFIG_BLK_DEV=y |
| 350 | # CONFIG_BLK_DEV_FD is not set | 357 | # CONFIG_BLK_DEV_FD is not set |
| @@ -352,6 +359,7 @@ CONFIG_BLK_DEV=y | |||
| 352 | CONFIG_BLK_DEV_LOOP=y | 359 | CONFIG_BLK_DEV_LOOP=y |
| 353 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 360 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 354 | # CONFIG_BLK_DEV_NBD is not set | 361 | # CONFIG_BLK_DEV_NBD is not set |
| 362 | # CONFIG_BLK_DEV_UB is not set | ||
| 355 | CONFIG_BLK_DEV_RAM=y | 363 | CONFIG_BLK_DEV_RAM=y |
| 356 | CONFIG_BLK_DEV_RAM_COUNT=16 | 364 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 357 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 365 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| @@ -406,8 +414,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 406 | # CONFIG_SCSI_DEBUG is not set | 414 | # CONFIG_SCSI_DEBUG is not set |
| 407 | CONFIG_ATA=y | 415 | CONFIG_ATA=y |
| 408 | # CONFIG_ATA_NONSTANDARD is not set | 416 | # CONFIG_ATA_NONSTANDARD is not set |
| 409 | # CONFIG_SATA_MV is not set | 417 | CONFIG_SATA_PMP=y |
| 410 | CONFIG_SATA_FSL=y | 418 | CONFIG_SATA_FSL=y |
| 419 | CONFIG_ATA_SFF=y | ||
| 420 | # CONFIG_SATA_MV is not set | ||
| 411 | # CONFIG_PATA_PLATFORM is not set | 421 | # CONFIG_PATA_PLATFORM is not set |
| 412 | CONFIG_MD=y | 422 | CONFIG_MD=y |
| 413 | CONFIG_BLK_DEV_MD=y | 423 | CONFIG_BLK_DEV_MD=y |
| @@ -444,7 +454,7 @@ CONFIG_MARVELL_PHY=y | |||
| 444 | # CONFIG_BROADCOM_PHY is not set | 454 | # CONFIG_BROADCOM_PHY is not set |
| 445 | # CONFIG_ICPLUS_PHY is not set | 455 | # CONFIG_ICPLUS_PHY is not set |
| 446 | # CONFIG_REALTEK_PHY is not set | 456 | # CONFIG_REALTEK_PHY is not set |
| 447 | # CONFIG_FIXED_PHY is not set | 457 | CONFIG_FIXED_PHY=y |
| 448 | # CONFIG_MDIO_BITBANG is not set | 458 | # CONFIG_MDIO_BITBANG is not set |
| 449 | CONFIG_NET_ETHERNET=y | 459 | CONFIG_NET_ETHERNET=y |
| 450 | CONFIG_MII=y | 460 | CONFIG_MII=y |
| @@ -464,6 +474,16 @@ CONFIG_GFAR_NAPI=y | |||
| 464 | # | 474 | # |
| 465 | # CONFIG_WLAN_PRE80211 is not set | 475 | # CONFIG_WLAN_PRE80211 is not set |
| 466 | # CONFIG_WLAN_80211 is not set | 476 | # CONFIG_WLAN_80211 is not set |
| 477 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # USB Network Adapters | ||
| 481 | # | ||
| 482 | # CONFIG_USB_CATC is not set | ||
| 483 | # CONFIG_USB_KAWETH is not set | ||
| 484 | # CONFIG_USB_PEGASUS is not set | ||
| 485 | # CONFIG_USB_RTL8150 is not set | ||
| 486 | # CONFIG_USB_USBNET is not set | ||
| 467 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
| 468 | # CONFIG_PPP is not set | 488 | # CONFIG_PPP is not set |
| 469 | # CONFIG_SLIP is not set | 489 | # CONFIG_SLIP is not set |
| @@ -508,6 +528,7 @@ CONFIG_INPUT=y | |||
| 508 | # Character devices | 528 | # Character devices |
| 509 | # | 529 | # |
| 510 | # CONFIG_VT is not set | 530 | # CONFIG_VT is not set |
| 531 | CONFIG_DEVKMEM=y | ||
| 511 | # CONFIG_SERIAL_NONSTANDARD is not set | 532 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 512 | 533 | ||
| 513 | # | 534 | # |
| @@ -542,13 +563,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 542 | CONFIG_I2C_CHARDEV=y | 563 | CONFIG_I2C_CHARDEV=y |
| 543 | 564 | ||
| 544 | # | 565 | # |
| 545 | # I2C Algorithms | ||
| 546 | # | ||
| 547 | # CONFIG_I2C_ALGOBIT is not set | ||
| 548 | # CONFIG_I2C_ALGOPCF is not set | ||
| 549 | # CONFIG_I2C_ALGOPCA is not set | ||
| 550 | |||
| 551 | # | ||
| 552 | # I2C Hardware Bus support | 566 | # I2C Hardware Bus support |
| 553 | # | 567 | # |
| 554 | CONFIG_I2C_MPC=y | 568 | CONFIG_I2C_MPC=y |
| @@ -557,6 +571,8 @@ CONFIG_I2C_MPC=y | |||
| 557 | # CONFIG_I2C_SIMTEC is not set | 571 | # CONFIG_I2C_SIMTEC is not set |
| 558 | # CONFIG_I2C_TAOS_EVM is not set | 572 | # CONFIG_I2C_TAOS_EVM is not set |
| 559 | # CONFIG_I2C_STUB is not set | 573 | # CONFIG_I2C_STUB is not set |
| 574 | # CONFIG_I2C_TINY_USB is not set | ||
| 575 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 560 | 576 | ||
| 561 | # | 577 | # |
| 562 | # Miscellaneous I2C Chip support | 578 | # Miscellaneous I2C Chip support |
| @@ -566,19 +582,13 @@ CONFIG_I2C_MPC=y | |||
| 566 | # CONFIG_SENSORS_PCF8574 is not set | 582 | # CONFIG_SENSORS_PCF8574 is not set |
| 567 | # CONFIG_PCF8575 is not set | 583 | # CONFIG_PCF8575 is not set |
| 568 | # CONFIG_SENSORS_PCF8591 is not set | 584 | # CONFIG_SENSORS_PCF8591 is not set |
| 569 | # CONFIG_TPS65010 is not set | ||
| 570 | # CONFIG_SENSORS_MAX6875 is not set | 585 | # CONFIG_SENSORS_MAX6875 is not set |
| 571 | # CONFIG_SENSORS_TSL2550 is not set | 586 | # CONFIG_SENSORS_TSL2550 is not set |
| 572 | # CONFIG_I2C_DEBUG_CORE is not set | 587 | # CONFIG_I2C_DEBUG_CORE is not set |
| 573 | # CONFIG_I2C_DEBUG_ALGO is not set | 588 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 574 | # CONFIG_I2C_DEBUG_BUS is not set | 589 | # CONFIG_I2C_DEBUG_BUS is not set |
| 575 | # CONFIG_I2C_DEBUG_CHIP is not set | 590 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 576 | |||
| 577 | # | ||
| 578 | # SPI support | ||
| 579 | # | ||
| 580 | # CONFIG_SPI is not set | 591 | # CONFIG_SPI is not set |
| 581 | # CONFIG_SPI_MASTER is not set | ||
| 582 | # CONFIG_W1 is not set | 592 | # CONFIG_W1 is not set |
| 583 | # CONFIG_POWER_SUPPLY is not set | 593 | # CONFIG_POWER_SUPPLY is not set |
| 584 | CONFIG_HWMON=y | 594 | CONFIG_HWMON=y |
| @@ -642,6 +652,11 @@ CONFIG_WATCHDOG=y | |||
| 642 | CONFIG_83xx_WDT=y | 652 | CONFIG_83xx_WDT=y |
| 643 | 653 | ||
| 644 | # | 654 | # |
| 655 | # USB-based Watchdog Cards | ||
| 656 | # | ||
| 657 | # CONFIG_USBPCWATCHDOG is not set | ||
| 658 | |||
| 659 | # | ||
| 645 | # Sonics Silicon Backplane | 660 | # Sonics Silicon Backplane |
| 646 | # | 661 | # |
| 647 | CONFIG_SSB_POSSIBLE=y | 662 | CONFIG_SSB_POSSIBLE=y |
| @@ -651,13 +666,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 651 | # Multifunction device drivers | 666 | # Multifunction device drivers |
| 652 | # | 667 | # |
| 653 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
| 669 | # CONFIG_HTC_PASIC3 is not set | ||
| 654 | 670 | ||
| 655 | # | 671 | # |
| 656 | # Multimedia devices | 672 | # Multimedia devices |
| 657 | # | 673 | # |
| 674 | |||
| 675 | # | ||
| 676 | # Multimedia core support | ||
| 677 | # | ||
| 658 | # CONFIG_VIDEO_DEV is not set | 678 | # CONFIG_VIDEO_DEV is not set |
| 659 | # CONFIG_DVB_CORE is not set | 679 | # CONFIG_DVB_CORE is not set |
| 680 | # CONFIG_VIDEO_MEDIA is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Multimedia drivers | ||
| 684 | # | ||
| 660 | CONFIG_DAB=y | 685 | CONFIG_DAB=y |
| 686 | # CONFIG_USB_DABUSB is not set | ||
| 661 | 687 | ||
| 662 | # | 688 | # |
| 663 | # Graphics support | 689 | # Graphics support |
| @@ -680,6 +706,14 @@ CONFIG_HID_SUPPORT=y | |||
| 680 | CONFIG_HID=y | 706 | CONFIG_HID=y |
| 681 | # CONFIG_HID_DEBUG is not set | 707 | # CONFIG_HID_DEBUG is not set |
| 682 | # CONFIG_HIDRAW is not set | 708 | # CONFIG_HIDRAW is not set |
| 709 | |||
| 710 | # | ||
| 711 | # USB Input Devices | ||
| 712 | # | ||
| 713 | CONFIG_USB_HID=y | ||
| 714 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 715 | # CONFIG_HID_FF is not set | ||
| 716 | # CONFIG_USB_HIDDEV is not set | ||
| 683 | CONFIG_USB_SUPPORT=y | 717 | CONFIG_USB_SUPPORT=y |
| 684 | CONFIG_USB_ARCH_HAS_HCD=y | 718 | CONFIG_USB_ARCH_HAS_HCD=y |
| 685 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 719 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| @@ -695,33 +729,83 @@ CONFIG_USB=y | |||
| 695 | CONFIG_USB_DEVICE_CLASS=y | 729 | CONFIG_USB_DEVICE_CLASS=y |
| 696 | # CONFIG_USB_DYNAMIC_MINORS is not set | 730 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 697 | # CONFIG_USB_OTG is not set | 731 | # CONFIG_USB_OTG is not set |
| 732 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 733 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 698 | 734 | ||
| 699 | # | 735 | # |
| 700 | # USB Host Controller Drivers | 736 | # USB Host Controller Drivers |
| 701 | # | 737 | # |
| 738 | # CONFIG_USB_C67X00_HCD is not set | ||
| 702 | CONFIG_USB_EHCI_HCD=y | 739 | CONFIG_USB_EHCI_HCD=y |
| 703 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 740 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 704 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 741 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 705 | CONFIG_USB_EHCI_FSL=y | 742 | CONFIG_USB_EHCI_FSL=y |
| 706 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 743 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 707 | # CONFIG_USB_ISP116X_HCD is not set | 744 | # CONFIG_USB_ISP116X_HCD is not set |
| 745 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 708 | # CONFIG_USB_SL811_HCD is not set | 746 | # CONFIG_USB_SL811_HCD is not set |
| 709 | # CONFIG_USB_R8A66597_HCD is not set | 747 | # CONFIG_USB_R8A66597_HCD is not set |
| 710 | 748 | ||
| 711 | # | 749 | # |
| 750 | # USB Device Class drivers | ||
| 751 | # | ||
| 752 | # CONFIG_USB_ACM is not set | ||
| 753 | # CONFIG_USB_PRINTER is not set | ||
| 754 | # CONFIG_USB_WDM is not set | ||
| 755 | |||
| 756 | # | ||
| 712 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 757 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 713 | # | 758 | # |
| 759 | |||
| 760 | # | ||
| 761 | # may also be needed; see USB_STORAGE Help for more information | ||
| 762 | # | ||
| 763 | # CONFIG_USB_STORAGE is not set | ||
| 764 | # CONFIG_USB_LIBUSUAL is not set | ||
| 765 | |||
| 766 | # | ||
| 767 | # USB Imaging devices | ||
| 768 | # | ||
| 769 | # CONFIG_USB_MDC800 is not set | ||
| 770 | # CONFIG_USB_MICROTEK is not set | ||
| 771 | CONFIG_USB_MON=y | ||
| 772 | |||
| 773 | # | ||
| 774 | # USB port drivers | ||
| 775 | # | ||
| 776 | # CONFIG_USB_SERIAL is not set | ||
| 777 | |||
| 778 | # | ||
| 779 | # USB Miscellaneous drivers | ||
| 780 | # | ||
| 781 | # CONFIG_USB_EMI62 is not set | ||
| 782 | # CONFIG_USB_EMI26 is not set | ||
| 783 | # CONFIG_USB_ADUTUX is not set | ||
| 784 | # CONFIG_USB_AUERSWALD is not set | ||
| 785 | # CONFIG_USB_RIO500 is not set | ||
| 786 | # CONFIG_USB_LEGOTOWER is not set | ||
| 787 | # CONFIG_USB_LCD is not set | ||
| 788 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 789 | # CONFIG_USB_LED is not set | ||
| 790 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 791 | # CONFIG_USB_CYTHERM is not set | ||
| 792 | # CONFIG_USB_PHIDGET is not set | ||
| 793 | # CONFIG_USB_IDMOUSE is not set | ||
| 794 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 795 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 796 | # CONFIG_USB_SISUSBVGA is not set | ||
| 797 | # CONFIG_USB_LD is not set | ||
| 798 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 799 | # CONFIG_USB_IOWARRIOR is not set | ||
| 800 | # CONFIG_USB_ISIGHTFW is not set | ||
| 714 | # CONFIG_USB_GADGET is not set | 801 | # CONFIG_USB_GADGET is not set |
| 715 | # CONFIG_MMC is not set | 802 | # CONFIG_MMC is not set |
| 716 | # CONFIG_MEMSTICK is not set | 803 | # CONFIG_MEMSTICK is not set |
| 717 | # CONFIG_NEW_LEDS is not set | 804 | # CONFIG_NEW_LEDS is not set |
| 805 | # CONFIG_ACCESSIBILITY is not set | ||
| 718 | # CONFIG_EDAC is not set | 806 | # CONFIG_EDAC is not set |
| 719 | # CONFIG_RTC_CLASS is not set | 807 | # CONFIG_RTC_CLASS is not set |
| 720 | # CONFIG_DMADEVICES is not set | 808 | # CONFIG_DMADEVICES is not set |
| 721 | |||
| 722 | # | ||
| 723 | # Userspace I/O | ||
| 724 | # | ||
| 725 | # CONFIG_UIO is not set | 809 | # CONFIG_UIO is not set |
| 726 | 810 | ||
| 727 | # | 811 | # |
| @@ -741,7 +825,6 @@ CONFIG_FS_MBCACHE=y | |||
| 741 | # CONFIG_JFS_FS is not set | 825 | # CONFIG_JFS_FS is not set |
| 742 | # CONFIG_FS_POSIX_ACL is not set | 826 | # CONFIG_FS_POSIX_ACL is not set |
| 743 | # CONFIG_XFS_FS is not set | 827 | # CONFIG_XFS_FS is not set |
| 744 | # CONFIG_GFS2_FS is not set | ||
| 745 | # CONFIG_OCFS2_FS is not set | 828 | # CONFIG_OCFS2_FS is not set |
| 746 | CONFIG_DNOTIFY=y | 829 | CONFIG_DNOTIFY=y |
| 747 | CONFIG_INOTIFY=y | 830 | CONFIG_INOTIFY=y |
| @@ -799,7 +882,6 @@ CONFIG_NFS_FS=y | |||
| 799 | CONFIG_NFS_V3=y | 882 | CONFIG_NFS_V3=y |
| 800 | # CONFIG_NFS_V3_ACL is not set | 883 | # CONFIG_NFS_V3_ACL is not set |
| 801 | CONFIG_NFS_V4=y | 884 | CONFIG_NFS_V4=y |
| 802 | # CONFIG_NFS_DIRECTIO is not set | ||
| 803 | # CONFIG_NFSD is not set | 885 | # CONFIG_NFSD is not set |
| 804 | CONFIG_ROOT_NFS=y | 886 | CONFIG_ROOT_NFS=y |
| 805 | CONFIG_LOCKD=y | 887 | CONFIG_LOCKD=y |
| @@ -844,6 +926,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 844 | # Library routines | 926 | # Library routines |
| 845 | # | 927 | # |
| 846 | CONFIG_BITREVERSE=y | 928 | CONFIG_BITREVERSE=y |
| 929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 847 | # CONFIG_CRC_CCITT is not set | 930 | # CONFIG_CRC_CCITT is not set |
| 848 | # CONFIG_CRC16 is not set | 931 | # CONFIG_CRC16 is not set |
| 849 | # CONFIG_CRC_ITU_T is not set | 932 | # CONFIG_CRC_ITU_T is not set |
| @@ -854,6 +937,7 @@ CONFIG_PLIST=y | |||
| 854 | CONFIG_HAS_IOMEM=y | 937 | CONFIG_HAS_IOMEM=y |
| 855 | CONFIG_HAS_IOPORT=y | 938 | CONFIG_HAS_IOPORT=y |
| 856 | CONFIG_HAS_DMA=y | 939 | CONFIG_HAS_DMA=y |
| 940 | CONFIG_HAVE_LMB=y | ||
| 857 | 941 | ||
| 858 | # | 942 | # |
| 859 | # Kernel hacking | 943 | # Kernel hacking |
| @@ -861,6 +945,7 @@ CONFIG_HAS_DMA=y | |||
| 861 | # CONFIG_PRINTK_TIME is not set | 945 | # CONFIG_PRINTK_TIME is not set |
| 862 | CONFIG_ENABLE_WARN_DEPRECATED=y | 946 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 863 | # CONFIG_ENABLE_MUST_CHECK is not set | 947 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 948 | CONFIG_FRAME_WARN=1024 | ||
| 864 | # CONFIG_MAGIC_SYSRQ is not set | 949 | # CONFIG_MAGIC_SYSRQ is not set |
| 865 | # CONFIG_UNUSED_SYMBOLS is not set | 950 | # CONFIG_UNUSED_SYMBOLS is not set |
| 866 | # CONFIG_DEBUG_FS is not set | 951 | # CONFIG_DEBUG_FS is not set |
| @@ -868,6 +953,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
| 868 | # CONFIG_DEBUG_KERNEL is not set | 953 | # CONFIG_DEBUG_KERNEL is not set |
| 869 | # CONFIG_DEBUG_BUGVERBOSE is not set | 954 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 870 | # CONFIG_SAMPLES is not set | 955 | # CONFIG_SAMPLES is not set |
| 956 | # CONFIG_IRQSTACKS is not set | ||
| 871 | # CONFIG_PPC_EARLY_DEBUG is not set | 957 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 872 | 958 | ||
| 873 | # | 959 | # |
| @@ -881,50 +967,80 @@ CONFIG_ASYNC_CORE=y | |||
| 881 | CONFIG_ASYNC_MEMCPY=y | 967 | CONFIG_ASYNC_MEMCPY=y |
| 882 | CONFIG_ASYNC_XOR=y | 968 | CONFIG_ASYNC_XOR=y |
| 883 | CONFIG_CRYPTO=y | 969 | CONFIG_CRYPTO=y |
| 970 | |||
| 971 | # | ||
| 972 | # Crypto core or helper | ||
| 973 | # | ||
| 884 | CONFIG_CRYPTO_ALGAPI=y | 974 | CONFIG_CRYPTO_ALGAPI=y |
| 885 | CONFIG_CRYPTO_BLKCIPHER=y | 975 | CONFIG_CRYPTO_BLKCIPHER=y |
| 886 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 887 | CONFIG_CRYPTO_MANAGER=y | 976 | CONFIG_CRYPTO_MANAGER=y |
| 977 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 978 | # CONFIG_CRYPTO_NULL is not set | ||
| 979 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 980 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 981 | # CONFIG_CRYPTO_TEST is not set | ||
| 982 | |||
| 983 | # | ||
| 984 | # Authenticated Encryption with Associated Data | ||
| 985 | # | ||
| 986 | # CONFIG_CRYPTO_CCM is not set | ||
| 987 | # CONFIG_CRYPTO_GCM is not set | ||
| 988 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 989 | |||
| 990 | # | ||
| 991 | # Block modes | ||
| 992 | # | ||
| 993 | CONFIG_CRYPTO_CBC=y | ||
| 994 | # CONFIG_CRYPTO_CTR is not set | ||
| 995 | # CONFIG_CRYPTO_CTS is not set | ||
| 996 | CONFIG_CRYPTO_ECB=m | ||
| 997 | # CONFIG_CRYPTO_LRW is not set | ||
| 998 | CONFIG_CRYPTO_PCBC=m | ||
| 999 | # CONFIG_CRYPTO_XTS is not set | ||
| 1000 | |||
| 1001 | # | ||
| 1002 | # Hash modes | ||
| 1003 | # | ||
| 888 | # CONFIG_CRYPTO_HMAC is not set | 1004 | # CONFIG_CRYPTO_HMAC is not set |
| 889 | # CONFIG_CRYPTO_XCBC is not set | 1005 | # CONFIG_CRYPTO_XCBC is not set |
| 890 | # CONFIG_CRYPTO_NULL is not set | 1006 | |
| 1007 | # | ||
| 1008 | # Digest | ||
| 1009 | # | ||
| 1010 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 891 | # CONFIG_CRYPTO_MD4 is not set | 1011 | # CONFIG_CRYPTO_MD4 is not set |
| 892 | CONFIG_CRYPTO_MD5=y | 1012 | CONFIG_CRYPTO_MD5=y |
| 1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_SHA1 is not set | 1014 | # CONFIG_CRYPTO_SHA1 is not set |
| 894 | # CONFIG_CRYPTO_SHA256 is not set | 1015 | # CONFIG_CRYPTO_SHA256 is not set |
| 895 | # CONFIG_CRYPTO_SHA512 is not set | 1016 | # CONFIG_CRYPTO_SHA512 is not set |
| 896 | # CONFIG_CRYPTO_WP512 is not set | ||
| 897 | # CONFIG_CRYPTO_TGR192 is not set | 1017 | # CONFIG_CRYPTO_TGR192 is not set |
| 898 | # CONFIG_CRYPTO_GF128MUL is not set | 1018 | # CONFIG_CRYPTO_WP512 is not set |
| 899 | CONFIG_CRYPTO_ECB=m | 1019 | |
| 900 | CONFIG_CRYPTO_CBC=y | 1020 | # |
| 901 | CONFIG_CRYPTO_PCBC=m | 1021 | # Ciphers |
| 902 | # CONFIG_CRYPTO_LRW is not set | 1022 | # |
| 903 | # CONFIG_CRYPTO_XTS is not set | ||
| 904 | # CONFIG_CRYPTO_CTR is not set | ||
| 905 | # CONFIG_CRYPTO_GCM is not set | ||
| 906 | # CONFIG_CRYPTO_CCM is not set | ||
| 907 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 908 | CONFIG_CRYPTO_DES=y | ||
| 909 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 910 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 911 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 912 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 913 | # CONFIG_CRYPTO_AES is not set | 1023 | # CONFIG_CRYPTO_AES is not set |
| 1024 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1025 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1026 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1027 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 914 | # CONFIG_CRYPTO_CAST5 is not set | 1028 | # CONFIG_CRYPTO_CAST5 is not set |
| 915 | # CONFIG_CRYPTO_CAST6 is not set | 1029 | # CONFIG_CRYPTO_CAST6 is not set |
| 916 | # CONFIG_CRYPTO_TEA is not set | 1030 | CONFIG_CRYPTO_DES=y |
| 917 | # CONFIG_CRYPTO_ARC4 is not set | 1031 | # CONFIG_CRYPTO_FCRYPT is not set |
| 918 | # CONFIG_CRYPTO_KHAZAD is not set | 1032 | # CONFIG_CRYPTO_KHAZAD is not set |
| 919 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 920 | # CONFIG_CRYPTO_SEED is not set | ||
| 921 | # CONFIG_CRYPTO_SALSA20 is not set | 1033 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1034 | # CONFIG_CRYPTO_SEED is not set | ||
| 1035 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1036 | # CONFIG_CRYPTO_TEA is not set | ||
| 1037 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1038 | |||
| 1039 | # | ||
| 1040 | # Compression | ||
| 1041 | # | ||
| 922 | # CONFIG_CRYPTO_DEFLATE is not set | 1042 | # CONFIG_CRYPTO_DEFLATE is not set |
| 923 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 924 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 925 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 926 | # CONFIG_CRYPTO_TEST is not set | ||
| 927 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 928 | # CONFIG_CRYPTO_LZO is not set | 1043 | # CONFIG_CRYPTO_LZO is not set |
| 929 | CONFIG_CRYPTO_HW=y | 1044 | CONFIG_CRYPTO_HW=y |
| 930 | # CONFIG_PPC_CLOCK is not set | 1045 | # CONFIG_PPC_CLOCK is not set |
| 1046 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index 1f1518229f6d..1752918be2c1 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:38 2008 | 4 | # Mon Jun 9 08:52:30 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -109,12 +112,14 @@ CONFIG_SLAB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| 115 | # CONFIG_TINY_SHMEM is not set | 119 | # CONFIG_TINY_SHMEM is not set |
| 116 | CONFIG_BASE_SMALL=0 | 120 | CONFIG_BASE_SMALL=0 |
| 117 | CONFIG_MODULES=y | 121 | CONFIG_MODULES=y |
| 122 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 118 | CONFIG_MODULE_UNLOAD=y | 123 | CONFIG_MODULE_UNLOAD=y |
| 119 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 120 | # CONFIG_MODVERSIONS is not set | 125 | # CONFIG_MODVERSIONS is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | CONFIG_PROC_DEVICETREE=y | 224 | CONFIG_PROC_DEVICETREE=y |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -232,6 +239,7 @@ CONFIG_FSL_SOC=y | |||
| 232 | # CONFIG_PCI_SYSCALL is not set | 239 | # CONFIG_PCI_SYSCALL is not set |
| 233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 234 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 235 | 243 | ||
| 236 | # | 244 | # |
| 237 | # Advanced setup | 245 | # Advanced setup |
| @@ -241,11 +249,11 @@ CONFIG_FSL_SOC=y | |||
| 241 | # | 249 | # |
| 242 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 243 | # | 251 | # |
| 244 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 245 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 246 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 247 | CONFIG_TASK_SIZE=0xc0000000 | 256 | CONFIG_TASK_SIZE=0xc0000000 |
| 248 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 249 | 257 | ||
| 250 | # | 258 | # |
| 251 | # Networking | 259 | # Networking |
| @@ -293,8 +301,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 293 | CONFIG_DEFAULT_TCP_CONG="cubic" | 301 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 294 | # CONFIG_TCP_MD5SIG is not set | 302 | # CONFIG_TCP_MD5SIG is not set |
| 295 | # CONFIG_IPV6 is not set | 303 | # CONFIG_IPV6 is not set |
| 296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 297 | # CONFIG_INET6_TUNNEL is not set | ||
| 298 | # CONFIG_NETWORK_SECMARK is not set | 304 | # CONFIG_NETWORK_SECMARK is not set |
| 299 | # CONFIG_NETFILTER is not set | 305 | # CONFIG_NETFILTER is not set |
| 300 | # CONFIG_IP_DCCP is not set | 306 | # CONFIG_IP_DCCP is not set |
| @@ -348,6 +354,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 348 | # CONFIG_CONNECTOR is not set | 354 | # CONFIG_CONNECTOR is not set |
| 349 | # CONFIG_MTD is not set | 355 | # CONFIG_MTD is not set |
| 350 | CONFIG_OF_DEVICE=y | 356 | CONFIG_OF_DEVICE=y |
| 357 | CONFIG_OF_I2C=y | ||
| 351 | # CONFIG_PARPORT is not set | 358 | # CONFIG_PARPORT is not set |
| 352 | CONFIG_BLK_DEV=y | 359 | CONFIG_BLK_DEV=y |
| 353 | # CONFIG_BLK_DEV_FD is not set | 360 | # CONFIG_BLK_DEV_FD is not set |
| @@ -420,6 +427,7 @@ CONFIG_GIANFAR=y | |||
| 420 | # | 427 | # |
| 421 | # CONFIG_WLAN_PRE80211 is not set | 428 | # CONFIG_WLAN_PRE80211 is not set |
| 422 | # CONFIG_WLAN_80211 is not set | 429 | # CONFIG_WLAN_80211 is not set |
| 430 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 423 | # CONFIG_WAN is not set | 431 | # CONFIG_WAN is not set |
| 424 | # CONFIG_PPP is not set | 432 | # CONFIG_PPP is not set |
| 425 | # CONFIG_SLIP is not set | 433 | # CONFIG_SLIP is not set |
| @@ -464,6 +472,7 @@ CONFIG_INPUT=y | |||
| 464 | # Character devices | 472 | # Character devices |
| 465 | # | 473 | # |
| 466 | # CONFIG_VT is not set | 474 | # CONFIG_VT is not set |
| 475 | CONFIG_DEVKMEM=y | ||
| 467 | # CONFIG_SERIAL_NONSTANDARD is not set | 476 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 468 | 477 | ||
| 469 | # | 478 | # |
| @@ -498,13 +507,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 498 | CONFIG_I2C_CHARDEV=y | 507 | CONFIG_I2C_CHARDEV=y |
| 499 | 508 | ||
| 500 | # | 509 | # |
| 501 | # I2C Algorithms | ||
| 502 | # | ||
| 503 | # CONFIG_I2C_ALGOBIT is not set | ||
| 504 | # CONFIG_I2C_ALGOPCF is not set | ||
| 505 | # CONFIG_I2C_ALGOPCA is not set | ||
| 506 | |||
| 507 | # | ||
| 508 | # I2C Hardware Bus support | 510 | # I2C Hardware Bus support |
| 509 | # | 511 | # |
| 510 | CONFIG_I2C_MPC=y | 512 | CONFIG_I2C_MPC=y |
| @@ -513,6 +515,7 @@ CONFIG_I2C_MPC=y | |||
| 513 | # CONFIG_I2C_SIMTEC is not set | 515 | # CONFIG_I2C_SIMTEC is not set |
| 514 | # CONFIG_I2C_TAOS_EVM is not set | 516 | # CONFIG_I2C_TAOS_EVM is not set |
| 515 | # CONFIG_I2C_STUB is not set | 517 | # CONFIG_I2C_STUB is not set |
| 518 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 516 | 519 | ||
| 517 | # | 520 | # |
| 518 | # Miscellaneous I2C Chip support | 521 | # Miscellaneous I2C Chip support |
| @@ -522,19 +525,13 @@ CONFIG_I2C_MPC=y | |||
| 522 | # CONFIG_SENSORS_PCF8574 is not set | 525 | # CONFIG_SENSORS_PCF8574 is not set |
| 523 | # CONFIG_PCF8575 is not set | 526 | # CONFIG_PCF8575 is not set |
| 524 | # CONFIG_SENSORS_PCF8591 is not set | 527 | # CONFIG_SENSORS_PCF8591 is not set |
| 525 | # CONFIG_TPS65010 is not set | ||
| 526 | # CONFIG_SENSORS_MAX6875 is not set | 528 | # CONFIG_SENSORS_MAX6875 is not set |
| 527 | # CONFIG_SENSORS_TSL2550 is not set | 529 | # CONFIG_SENSORS_TSL2550 is not set |
| 528 | # CONFIG_I2C_DEBUG_CORE is not set | 530 | # CONFIG_I2C_DEBUG_CORE is not set |
| 529 | # CONFIG_I2C_DEBUG_ALGO is not set | 531 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 530 | # CONFIG_I2C_DEBUG_BUS is not set | 532 | # CONFIG_I2C_DEBUG_BUS is not set |
| 531 | # CONFIG_I2C_DEBUG_CHIP is not set | 533 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 532 | |||
| 533 | # | ||
| 534 | # SPI support | ||
| 535 | # | ||
| 536 | # CONFIG_SPI is not set | 534 | # CONFIG_SPI is not set |
| 537 | # CONFIG_SPI_MASTER is not set | ||
| 538 | # CONFIG_W1 is not set | 535 | # CONFIG_W1 is not set |
| 539 | # CONFIG_POWER_SUPPLY is not set | 536 | # CONFIG_POWER_SUPPLY is not set |
| 540 | CONFIG_HWMON=y | 537 | CONFIG_HWMON=y |
| @@ -607,12 +604,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 607 | # Multifunction device drivers | 604 | # Multifunction device drivers |
| 608 | # | 605 | # |
| 609 | # CONFIG_MFD_SM501 is not set | 606 | # CONFIG_MFD_SM501 is not set |
| 607 | # CONFIG_HTC_PASIC3 is not set | ||
| 610 | 608 | ||
| 611 | # | 609 | # |
| 612 | # Multimedia devices | 610 | # Multimedia devices |
| 613 | # | 611 | # |
| 612 | |||
| 613 | # | ||
| 614 | # Multimedia core support | ||
| 615 | # | ||
| 614 | # CONFIG_VIDEO_DEV is not set | 616 | # CONFIG_VIDEO_DEV is not set |
| 615 | # CONFIG_DVB_CORE is not set | 617 | # CONFIG_DVB_CORE is not set |
| 618 | # CONFIG_VIDEO_MEDIA is not set | ||
| 619 | |||
| 620 | # | ||
| 621 | # Multimedia drivers | ||
| 622 | # | ||
| 616 | # CONFIG_DAB is not set | 623 | # CONFIG_DAB is not set |
| 617 | 624 | ||
| 618 | # | 625 | # |
| @@ -640,13 +647,10 @@ CONFIG_HID=y | |||
| 640 | # CONFIG_MMC is not set | 647 | # CONFIG_MMC is not set |
| 641 | # CONFIG_MEMSTICK is not set | 648 | # CONFIG_MEMSTICK is not set |
| 642 | # CONFIG_NEW_LEDS is not set | 649 | # CONFIG_NEW_LEDS is not set |
| 650 | # CONFIG_ACCESSIBILITY is not set | ||
| 643 | # CONFIG_EDAC is not set | 651 | # CONFIG_EDAC is not set |
| 644 | # CONFIG_RTC_CLASS is not set | 652 | # CONFIG_RTC_CLASS is not set |
| 645 | # CONFIG_DMADEVICES is not set | 653 | # CONFIG_DMADEVICES is not set |
| 646 | |||
| 647 | # | ||
| 648 | # Userspace I/O | ||
| 649 | # | ||
| 650 | # CONFIG_UIO is not set | 654 | # CONFIG_UIO is not set |
| 651 | 655 | ||
| 652 | # | 656 | # |
| @@ -659,7 +663,6 @@ CONFIG_HID=y | |||
| 659 | # CONFIG_JFS_FS is not set | 663 | # CONFIG_JFS_FS is not set |
| 660 | # CONFIG_FS_POSIX_ACL is not set | 664 | # CONFIG_FS_POSIX_ACL is not set |
| 661 | # CONFIG_XFS_FS is not set | 665 | # CONFIG_XFS_FS is not set |
| 662 | # CONFIG_GFS2_FS is not set | ||
| 663 | # CONFIG_OCFS2_FS is not set | 666 | # CONFIG_OCFS2_FS is not set |
| 664 | CONFIG_DNOTIFY=y | 667 | CONFIG_DNOTIFY=y |
| 665 | CONFIG_INOTIFY=y | 668 | CONFIG_INOTIFY=y |
| @@ -717,7 +720,6 @@ CONFIG_NFS_FS=y | |||
| 717 | CONFIG_NFS_V3=y | 720 | CONFIG_NFS_V3=y |
| 718 | # CONFIG_NFS_V3_ACL is not set | 721 | # CONFIG_NFS_V3_ACL is not set |
| 719 | CONFIG_NFS_V4=y | 722 | CONFIG_NFS_V4=y |
| 720 | # CONFIG_NFS_DIRECTIO is not set | ||
| 721 | # CONFIG_NFSD is not set | 723 | # CONFIG_NFSD is not set |
| 722 | CONFIG_ROOT_NFS=y | 724 | CONFIG_ROOT_NFS=y |
| 723 | CONFIG_LOCKD=y | 725 | CONFIG_LOCKD=y |
| @@ -746,6 +748,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 746 | # Library routines | 748 | # Library routines |
| 747 | # | 749 | # |
| 748 | CONFIG_BITREVERSE=y | 750 | CONFIG_BITREVERSE=y |
| 751 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 749 | # CONFIG_CRC_CCITT is not set | 752 | # CONFIG_CRC_CCITT is not set |
| 750 | # CONFIG_CRC16 is not set | 753 | # CONFIG_CRC16 is not set |
| 751 | # CONFIG_CRC_ITU_T is not set | 754 | # CONFIG_CRC_ITU_T is not set |
| @@ -756,6 +759,7 @@ CONFIG_PLIST=y | |||
| 756 | CONFIG_HAS_IOMEM=y | 759 | CONFIG_HAS_IOMEM=y |
| 757 | CONFIG_HAS_IOPORT=y | 760 | CONFIG_HAS_IOPORT=y |
| 758 | CONFIG_HAS_DMA=y | 761 | CONFIG_HAS_DMA=y |
| 762 | CONFIG_HAVE_LMB=y | ||
| 759 | 763 | ||
| 760 | # | 764 | # |
| 761 | # Kernel hacking | 765 | # Kernel hacking |
| @@ -763,6 +767,7 @@ CONFIG_HAS_DMA=y | |||
| 763 | # CONFIG_PRINTK_TIME is not set | 767 | # CONFIG_PRINTK_TIME is not set |
| 764 | CONFIG_ENABLE_WARN_DEPRECATED=y | 768 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 765 | CONFIG_ENABLE_MUST_CHECK=y | 769 | CONFIG_ENABLE_MUST_CHECK=y |
| 770 | CONFIG_FRAME_WARN=1024 | ||
| 766 | # CONFIG_MAGIC_SYSRQ is not set | 771 | # CONFIG_MAGIC_SYSRQ is not set |
| 767 | # CONFIG_UNUSED_SYMBOLS is not set | 772 | # CONFIG_UNUSED_SYMBOLS is not set |
| 768 | # CONFIG_DEBUG_FS is not set | 773 | # CONFIG_DEBUG_FS is not set |
| @@ -770,6 +775,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 770 | # CONFIG_DEBUG_KERNEL is not set | 775 | # CONFIG_DEBUG_KERNEL is not set |
| 771 | # CONFIG_DEBUG_BUGVERBOSE is not set | 776 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 772 | # CONFIG_SAMPLES is not set | 777 | # CONFIG_SAMPLES is not set |
| 778 | # CONFIG_IRQSTACKS is not set | ||
| 773 | # CONFIG_PPC_EARLY_DEBUG is not set | 779 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 774 | 780 | ||
| 775 | # | 781 | # |
| @@ -779,50 +785,80 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 779 | # CONFIG_SECURITY is not set | 785 | # CONFIG_SECURITY is not set |
| 780 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 786 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 781 | CONFIG_CRYPTO=y | 787 | CONFIG_CRYPTO=y |
| 788 | |||
| 789 | # | ||
| 790 | # Crypto core or helper | ||
| 791 | # | ||
| 782 | CONFIG_CRYPTO_ALGAPI=y | 792 | CONFIG_CRYPTO_ALGAPI=y |
| 783 | CONFIG_CRYPTO_BLKCIPHER=y | 793 | CONFIG_CRYPTO_BLKCIPHER=y |
| 784 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 785 | CONFIG_CRYPTO_MANAGER=y | 794 | CONFIG_CRYPTO_MANAGER=y |
| 795 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 796 | # CONFIG_CRYPTO_NULL is not set | ||
| 797 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 798 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 799 | # CONFIG_CRYPTO_TEST is not set | ||
| 800 | |||
| 801 | # | ||
| 802 | # Authenticated Encryption with Associated Data | ||
| 803 | # | ||
| 804 | # CONFIG_CRYPTO_CCM is not set | ||
| 805 | # CONFIG_CRYPTO_GCM is not set | ||
| 806 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 807 | |||
| 808 | # | ||
| 809 | # Block modes | ||
| 810 | # | ||
| 811 | CONFIG_CRYPTO_CBC=y | ||
| 812 | # CONFIG_CRYPTO_CTR is not set | ||
| 813 | # CONFIG_CRYPTO_CTS is not set | ||
| 814 | CONFIG_CRYPTO_ECB=m | ||
| 815 | # CONFIG_CRYPTO_LRW is not set | ||
| 816 | CONFIG_CRYPTO_PCBC=m | ||
| 817 | # CONFIG_CRYPTO_XTS is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # Hash modes | ||
| 821 | # | ||
| 786 | # CONFIG_CRYPTO_HMAC is not set | 822 | # CONFIG_CRYPTO_HMAC is not set |
| 787 | # CONFIG_CRYPTO_XCBC is not set | 823 | # CONFIG_CRYPTO_XCBC is not set |
| 788 | # CONFIG_CRYPTO_NULL is not set | 824 | |
| 825 | # | ||
| 826 | # Digest | ||
| 827 | # | ||
| 828 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 789 | # CONFIG_CRYPTO_MD4 is not set | 829 | # CONFIG_CRYPTO_MD4 is not set |
| 790 | CONFIG_CRYPTO_MD5=y | 830 | CONFIG_CRYPTO_MD5=y |
| 831 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 791 | # CONFIG_CRYPTO_SHA1 is not set | 832 | # CONFIG_CRYPTO_SHA1 is not set |
| 792 | # CONFIG_CRYPTO_SHA256 is not set | 833 | # CONFIG_CRYPTO_SHA256 is not set |
| 793 | # CONFIG_CRYPTO_SHA512 is not set | 834 | # CONFIG_CRYPTO_SHA512 is not set |
| 794 | # CONFIG_CRYPTO_WP512 is not set | ||
| 795 | # CONFIG_CRYPTO_TGR192 is not set | 835 | # CONFIG_CRYPTO_TGR192 is not set |
| 796 | # CONFIG_CRYPTO_GF128MUL is not set | 836 | # CONFIG_CRYPTO_WP512 is not set |
| 797 | CONFIG_CRYPTO_ECB=m | 837 | |
| 798 | CONFIG_CRYPTO_CBC=y | 838 | # |
| 799 | CONFIG_CRYPTO_PCBC=m | 839 | # Ciphers |
| 800 | # CONFIG_CRYPTO_LRW is not set | 840 | # |
| 801 | # CONFIG_CRYPTO_XTS is not set | ||
| 802 | # CONFIG_CRYPTO_CTR is not set | ||
| 803 | # CONFIG_CRYPTO_GCM is not set | ||
| 804 | # CONFIG_CRYPTO_CCM is not set | ||
| 805 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 806 | CONFIG_CRYPTO_DES=y | ||
| 807 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 808 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 809 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 810 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 811 | # CONFIG_CRYPTO_AES is not set | 841 | # CONFIG_CRYPTO_AES is not set |
| 842 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 843 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 844 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 845 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 812 | # CONFIG_CRYPTO_CAST5 is not set | 846 | # CONFIG_CRYPTO_CAST5 is not set |
| 813 | # CONFIG_CRYPTO_CAST6 is not set | 847 | # CONFIG_CRYPTO_CAST6 is not set |
| 814 | # CONFIG_CRYPTO_TEA is not set | 848 | CONFIG_CRYPTO_DES=y |
| 815 | # CONFIG_CRYPTO_ARC4 is not set | 849 | # CONFIG_CRYPTO_FCRYPT is not set |
| 816 | # CONFIG_CRYPTO_KHAZAD is not set | 850 | # CONFIG_CRYPTO_KHAZAD is not set |
| 817 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 818 | # CONFIG_CRYPTO_SEED is not set | ||
| 819 | # CONFIG_CRYPTO_SALSA20 is not set | 851 | # CONFIG_CRYPTO_SALSA20 is not set |
| 852 | # CONFIG_CRYPTO_SEED is not set | ||
| 853 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 854 | # CONFIG_CRYPTO_TEA is not set | ||
| 855 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 856 | |||
| 857 | # | ||
| 858 | # Compression | ||
| 859 | # | ||
| 820 | # CONFIG_CRYPTO_DEFLATE is not set | 860 | # CONFIG_CRYPTO_DEFLATE is not set |
| 821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 822 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 823 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 824 | # CONFIG_CRYPTO_TEST is not set | ||
| 825 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 826 | # CONFIG_CRYPTO_LZO is not set | 861 | # CONFIG_CRYPTO_LZO is not set |
| 827 | # CONFIG_CRYPTO_HW is not set | 862 | # CONFIG_CRYPTO_HW is not set |
| 828 | # CONFIG_PPC_CLOCK is not set | 863 | # CONFIG_PPC_CLOCK is not set |
| 864 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index 2d0debcefdbf..b82bb042308a 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.24 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Feb 11 16:25:19 2008 | 4 | # Mon Jun 9 08:52:30 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -68,23 +70,22 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 68 | # CONFIG_POSIX_MQUEUE is not set | 70 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_USER_NS is not set | ||
| 72 | # CONFIG_PID_NS is not set | ||
| 73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
| 74 | # CONFIG_IKCONFIG is not set | 74 | # CONFIG_IKCONFIG is not set |
| 75 | CONFIG_LOG_BUF_SHIFT=14 | 75 | CONFIG_LOG_BUF_SHIFT=14 |
| 76 | # CONFIG_CGROUPS is not set | 76 | # CONFIG_CGROUPS is not set |
| 77 | CONFIG_FAIR_GROUP_SCHED=y | 77 | # CONFIG_GROUP_SCHED is not set |
| 78 | CONFIG_FAIR_USER_SCHED=y | ||
| 79 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 80 | CONFIG_SYSFS_DEPRECATED=y | 78 | CONFIG_SYSFS_DEPRECATED=y |
| 79 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 81 | # CONFIG_RELAY is not set | 80 | # CONFIG_RELAY is not set |
| 81 | # CONFIG_NAMESPACES is not set | ||
| 82 | CONFIG_BLK_DEV_INITRD=y | 82 | CONFIG_BLK_DEV_INITRD=y |
| 83 | CONFIG_INITRAMFS_SOURCE="" | 83 | CONFIG_INITRAMFS_SOURCE="" |
| 84 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 84 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 85 | CONFIG_SYSCTL=y | 85 | CONFIG_SYSCTL=y |
| 86 | CONFIG_EMBEDDED=y | 86 | CONFIG_EMBEDDED=y |
| 87 | CONFIG_SYSCTL_SYSCALL=y | 87 | CONFIG_SYSCTL_SYSCALL=y |
| 88 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 88 | CONFIG_KALLSYMS=y | 89 | CONFIG_KALLSYMS=y |
| 89 | # CONFIG_KALLSYMS_ALL is not set | 90 | # CONFIG_KALLSYMS_ALL is not set |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -92,6 +93,7 @@ CONFIG_HOTPLUG=y | |||
| 92 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| 93 | CONFIG_BUG=y | 94 | CONFIG_BUG=y |
| 94 | CONFIG_ELF_CORE=y | 95 | CONFIG_ELF_CORE=y |
| 96 | CONFIG_COMPAT_BRK=y | ||
| 95 | CONFIG_BASE_FULL=y | 97 | CONFIG_BASE_FULL=y |
| 96 | CONFIG_FUTEX=y | 98 | CONFIG_FUTEX=y |
| 97 | CONFIG_ANON_INODES=y | 99 | CONFIG_ANON_INODES=y |
| @@ -109,6 +111,8 @@ CONFIG_SLUB=y | |||
| 109 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
| 110 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | ||
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| @@ -134,7 +138,6 @@ CONFIG_DEFAULT_AS=y | |||
| 134 | # CONFIG_DEFAULT_NOOP is not set | 138 | # CONFIG_DEFAULT_NOOP is not set |
| 135 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 139 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 136 | CONFIG_CLASSIC_RCU=y | 140 | CONFIG_CLASSIC_RCU=y |
| 137 | # CONFIG_PREEMPT_RCU is not set | ||
| 138 | 141 | ||
| 139 | # | 142 | # |
| 140 | # Platform support | 143 | # Platform support |
| @@ -191,12 +194,13 @@ CONFIG_HZ=250 | |||
| 191 | CONFIG_PREEMPT_NONE=y | 194 | CONFIG_PREEMPT_NONE=y |
| 192 | # CONFIG_PREEMPT_VOLUNTARY is not set | 195 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 193 | # CONFIG_PREEMPT is not set | 196 | # CONFIG_PREEMPT is not set |
| 194 | CONFIG_RCU_TRACE=y | ||
| 195 | CONFIG_BINFMT_ELF=y | 197 | CONFIG_BINFMT_ELF=y |
| 196 | CONFIG_BINFMT_MISC=y | 198 | CONFIG_BINFMT_MISC=y |
| 197 | CONFIG_MATH_EMULATION=y | 199 | CONFIG_MATH_EMULATION=y |
| 198 | # CONFIG_IOMMU_HELPER is not set | 200 | # CONFIG_IOMMU_HELPER is not set |
| 199 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 201 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 202 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 203 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 200 | CONFIG_ARCH_FLATMEM_ENABLE=y | 204 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 201 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 205 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 202 | CONFIG_SELECT_MEMORY_MODEL=y | 206 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -207,16 +211,17 @@ CONFIG_FLATMEM=y | |||
| 207 | CONFIG_FLAT_NODE_MEM_MAP=y | 211 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 208 | # CONFIG_SPARSEMEM_STATIC is not set | 212 | # CONFIG_SPARSEMEM_STATIC is not set |
| 209 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 214 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 211 | # CONFIG_RESOURCES_64BIT is not set | 216 | # CONFIG_RESOURCES_64BIT is not set |
| 212 | CONFIG_ZONE_DMA_FLAG=1 | 217 | CONFIG_ZONE_DMA_FLAG=1 |
| 213 | CONFIG_BOUNCE=y | 218 | CONFIG_BOUNCE=y |
| 214 | CONFIG_VIRT_TO_BUS=y | 219 | CONFIG_VIRT_TO_BUS=y |
| 220 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 215 | # CONFIG_PROC_DEVICETREE is not set | 221 | # CONFIG_PROC_DEVICETREE is not set |
| 216 | # CONFIG_CMDLINE_BOOL is not set | 222 | # CONFIG_CMDLINE_BOOL is not set |
| 217 | # CONFIG_PM is not set | 223 | # CONFIG_PM is not set |
| 218 | # CONFIG_SECCOMP is not set | 224 | # CONFIG_SECCOMP is not set |
| 219 | CONFIG_WANT_DEVICE_TREE=y | ||
| 220 | CONFIG_ISA_DMA_API=y | 225 | CONFIG_ISA_DMA_API=y |
| 221 | 226 | ||
| 222 | # | 227 | # |
| @@ -229,6 +234,7 @@ CONFIG_FSL_SOC=y | |||
| 229 | # CONFIG_PCI_SYSCALL is not set | 234 | # CONFIG_PCI_SYSCALL is not set |
| 230 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 231 | # CONFIG_PCCARD is not set | 236 | # CONFIG_PCCARD is not set |
| 237 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 238 | ||
| 233 | # | 239 | # |
| 234 | # Advanced setup | 240 | # Advanced setup |
| @@ -238,11 +244,12 @@ CONFIG_FSL_SOC=y | |||
| 238 | # | 244 | # |
| 239 | # Default settings for advanced configuration options are used | 245 | # Default settings for advanced configuration options are used |
| 240 | # | 246 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 247 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 248 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 249 | CONFIG_KERNEL_START=0xc0000000 |
| 250 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 251 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 252 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 253 | ||
| 247 | # | 254 | # |
| 248 | # Networking | 255 | # Networking |
| @@ -290,8 +297,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 297 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 298 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 299 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 300 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 301 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 302 | # CONFIG_IP_DCCP is not set |
| @@ -351,6 +356,8 @@ CONFIG_MTD_CONCAT=y | |||
| 351 | CONFIG_MTD_PARTITIONS=y | 356 | CONFIG_MTD_PARTITIONS=y |
| 352 | # CONFIG_MTD_REDBOOT_PARTS is not set | 357 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 353 | # CONFIG_MTD_CMDLINE_PARTS is not set | 358 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 359 | # CONFIG_MTD_OF_PARTS is not set | ||
| 360 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 354 | 361 | ||
| 355 | # | 362 | # |
| 356 | # User Modules And Translation Layers | 363 | # User Modules And Translation Layers |
| @@ -430,17 +437,19 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 430 | CONFIG_BLK_DEV_RAM=y | 437 | CONFIG_BLK_DEV_RAM=y |
| 431 | CONFIG_BLK_DEV_RAM_COUNT=16 | 438 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 432 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 439 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| 433 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 440 | # CONFIG_BLK_DEV_XIP is not set |
| 434 | # CONFIG_CDROM_PKTCDVD is not set | 441 | # CONFIG_CDROM_PKTCDVD is not set |
| 435 | # CONFIG_ATA_OVER_ETH is not set | 442 | # CONFIG_ATA_OVER_ETH is not set |
| 436 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
| 437 | # CONFIG_EEPROM_93CX6 is not set | 444 | # CONFIG_EEPROM_93CX6 is not set |
| 445 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 446 | CONFIG_HAVE_IDE=y | ||
| 438 | CONFIG_IDE=y | 447 | CONFIG_IDE=y |
| 439 | CONFIG_IDE_MAX_HWIFS=4 | 448 | CONFIG_IDE_MAX_HWIFS=4 |
| 440 | CONFIG_BLK_DEV_IDE=y | 449 | CONFIG_BLK_DEV_IDE=y |
| 441 | 450 | ||
| 442 | # | 451 | # |
| 443 | # Please see Documentation/ide.txt for help/info on IDE drives | 452 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 444 | # | 453 | # |
| 445 | # CONFIG_BLK_DEV_IDE_SATA is not set | 454 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 446 | # CONFIG_BLK_DEV_IDEDISK is not set | 455 | # CONFIG_BLK_DEV_IDEDISK is not set |
| @@ -457,7 +466,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 457 | CONFIG_IDE_GENERIC=y | 466 | CONFIG_IDE_GENERIC=y |
| 458 | # CONFIG_BLK_DEV_PLATFORM is not set | 467 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 459 | # CONFIG_BLK_DEV_IDEDMA is not set | 468 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 460 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 469 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 461 | # CONFIG_BLK_DEV_HD is not set | 470 | # CONFIG_BLK_DEV_HD is not set |
| 462 | 471 | ||
| 463 | # | 472 | # |
| @@ -517,6 +526,7 @@ CONFIG_NETDEV_10000=y | |||
| 517 | # | 526 | # |
| 518 | # CONFIG_WLAN_PRE80211 is not set | 527 | # CONFIG_WLAN_PRE80211 is not set |
| 519 | # CONFIG_WLAN_80211 is not set | 528 | # CONFIG_WLAN_80211 is not set |
| 529 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 520 | # CONFIG_WAN is not set | 530 | # CONFIG_WAN is not set |
| 521 | # CONFIG_PPP is not set | 531 | # CONFIG_PPP is not set |
| 522 | # CONFIG_SLIP is not set | 532 | # CONFIG_SLIP is not set |
| @@ -561,6 +571,7 @@ CONFIG_INPUT=y | |||
| 561 | # Character devices | 571 | # Character devices |
| 562 | # | 572 | # |
| 563 | # CONFIG_VT is not set | 573 | # CONFIG_VT is not set |
| 574 | CONFIG_DEVKMEM=y | ||
| 564 | # CONFIG_SERIAL_NONSTANDARD is not set | 575 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 565 | 576 | ||
| 566 | # | 577 | # |
| @@ -594,12 +605,7 @@ CONFIG_GEN_RTC=y | |||
| 594 | # CONFIG_RAW_DRIVER is not set | 605 | # CONFIG_RAW_DRIVER is not set |
| 595 | # CONFIG_TCG_TPM is not set | 606 | # CONFIG_TCG_TPM is not set |
| 596 | # CONFIG_I2C is not set | 607 | # CONFIG_I2C is not set |
| 597 | |||
| 598 | # | ||
| 599 | # SPI support | ||
| 600 | # | ||
| 601 | # CONFIG_SPI is not set | 608 | # CONFIG_SPI is not set |
| 602 | # CONFIG_SPI_MASTER is not set | ||
| 603 | # CONFIG_W1 is not set | 609 | # CONFIG_W1 is not set |
| 604 | # CONFIG_POWER_SUPPLY is not set | 610 | # CONFIG_POWER_SUPPLY is not set |
| 605 | CONFIG_HWMON=y | 611 | CONFIG_HWMON=y |
| @@ -615,6 +621,7 @@ CONFIG_HWMON=y | |||
| 615 | # CONFIG_SENSORS_W83627HF is not set | 621 | # CONFIG_SENSORS_W83627HF is not set |
| 616 | # CONFIG_SENSORS_W83627EHF is not set | 622 | # CONFIG_SENSORS_W83627EHF is not set |
| 617 | # CONFIG_HWMON_DEBUG_CHIP is not set | 623 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 624 | # CONFIG_THERMAL is not set | ||
| 618 | # CONFIG_WATCHDOG is not set | 625 | # CONFIG_WATCHDOG is not set |
| 619 | 626 | ||
| 620 | # | 627 | # |
| @@ -627,12 +634,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 627 | # Multifunction device drivers | 634 | # Multifunction device drivers |
| 628 | # | 635 | # |
| 629 | # CONFIG_MFD_SM501 is not set | 636 | # CONFIG_MFD_SM501 is not set |
| 637 | # CONFIG_HTC_PASIC3 is not set | ||
| 630 | 638 | ||
| 631 | # | 639 | # |
| 632 | # Multimedia devices | 640 | # Multimedia devices |
| 633 | # | 641 | # |
| 642 | |||
| 643 | # | ||
| 644 | # Multimedia core support | ||
| 645 | # | ||
| 634 | # CONFIG_VIDEO_DEV is not set | 646 | # CONFIG_VIDEO_DEV is not set |
| 635 | # CONFIG_DVB_CORE is not set | 647 | # CONFIG_DVB_CORE is not set |
| 648 | # CONFIG_VIDEO_MEDIA is not set | ||
| 649 | |||
| 650 | # | ||
| 651 | # Multimedia drivers | ||
| 652 | # | ||
| 636 | CONFIG_DAB=y | 653 | CONFIG_DAB=y |
| 637 | 654 | ||
| 638 | # | 655 | # |
| @@ -660,19 +677,20 @@ CONFIG_USB_SUPPORT=y | |||
| 660 | # CONFIG_USB_ARCH_HAS_HCD is not set | 677 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 661 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 678 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 662 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 679 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 680 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 681 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 663 | 682 | ||
| 664 | # | 683 | # |
| 665 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 684 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 666 | # | 685 | # |
| 667 | # CONFIG_USB_GADGET is not set | 686 | # CONFIG_USB_GADGET is not set |
| 668 | # CONFIG_MMC is not set | 687 | # CONFIG_MMC is not set |
| 688 | # CONFIG_MEMSTICK is not set | ||
| 669 | # CONFIG_NEW_LEDS is not set | 689 | # CONFIG_NEW_LEDS is not set |
| 690 | # CONFIG_ACCESSIBILITY is not set | ||
| 670 | # CONFIG_EDAC is not set | 691 | # CONFIG_EDAC is not set |
| 671 | # CONFIG_RTC_CLASS is not set | 692 | # CONFIG_RTC_CLASS is not set |
| 672 | 693 | # CONFIG_DMADEVICES is not set | |
| 673 | # | ||
| 674 | # Userspace I/O | ||
| 675 | # | ||
| 676 | # CONFIG_UIO is not set | 694 | # CONFIG_UIO is not set |
| 677 | 695 | ||
| 678 | # | 696 | # |
| @@ -693,14 +711,11 @@ CONFIG_FS_MBCACHE=y | |||
| 693 | # CONFIG_JFS_FS is not set | 711 | # CONFIG_JFS_FS is not set |
| 694 | # CONFIG_FS_POSIX_ACL is not set | 712 | # CONFIG_FS_POSIX_ACL is not set |
| 695 | # CONFIG_XFS_FS is not set | 713 | # CONFIG_XFS_FS is not set |
| 696 | # CONFIG_GFS2_FS is not set | ||
| 697 | # CONFIG_OCFS2_FS is not set | 714 | # CONFIG_OCFS2_FS is not set |
| 698 | # CONFIG_MINIX_FS is not set | 715 | CONFIG_DNOTIFY=y |
| 699 | # CONFIG_ROMFS_FS is not set | ||
| 700 | CONFIG_INOTIFY=y | 716 | CONFIG_INOTIFY=y |
| 701 | CONFIG_INOTIFY_USER=y | 717 | CONFIG_INOTIFY_USER=y |
| 702 | # CONFIG_QUOTA is not set | 718 | # CONFIG_QUOTA is not set |
| 703 | CONFIG_DNOTIFY=y | ||
| 704 | # CONFIG_AUTOFS_FS is not set | 719 | # CONFIG_AUTOFS_FS is not set |
| 705 | # CONFIG_AUTOFS4_FS is not set | 720 | # CONFIG_AUTOFS4_FS is not set |
| 706 | # CONFIG_FUSE_FS is not set | 721 | # CONFIG_FUSE_FS is not set |
| @@ -743,15 +758,16 @@ CONFIG_TMPFS=y | |||
| 743 | # CONFIG_JFFS2_FS is not set | 758 | # CONFIG_JFFS2_FS is not set |
| 744 | # CONFIG_CRAMFS is not set | 759 | # CONFIG_CRAMFS is not set |
| 745 | # CONFIG_VXFS_FS is not set | 760 | # CONFIG_VXFS_FS is not set |
| 761 | # CONFIG_MINIX_FS is not set | ||
| 746 | # CONFIG_HPFS_FS is not set | 762 | # CONFIG_HPFS_FS is not set |
| 747 | # CONFIG_QNX4FS_FS is not set | 763 | # CONFIG_QNX4FS_FS is not set |
| 764 | # CONFIG_ROMFS_FS is not set | ||
| 748 | # CONFIG_SYSV_FS is not set | 765 | # CONFIG_SYSV_FS is not set |
| 749 | # CONFIG_UFS_FS is not set | 766 | # CONFIG_UFS_FS is not set |
| 750 | CONFIG_NETWORK_FILESYSTEMS=y | 767 | CONFIG_NETWORK_FILESYSTEMS=y |
| 751 | CONFIG_NFS_FS=y | 768 | CONFIG_NFS_FS=y |
| 752 | # CONFIG_NFS_V3 is not set | 769 | # CONFIG_NFS_V3 is not set |
| 753 | # CONFIG_NFS_V4 is not set | 770 | # CONFIG_NFS_V4 is not set |
| 754 | # CONFIG_NFS_DIRECTIO is not set | ||
| 755 | # CONFIG_NFSD is not set | 771 | # CONFIG_NFSD is not set |
| 756 | CONFIG_ROOT_NFS=y | 772 | CONFIG_ROOT_NFS=y |
| 757 | CONFIG_LOCKD=y | 773 | CONFIG_LOCKD=y |
| @@ -790,6 +806,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 790 | # Library routines | 806 | # Library routines |
| 791 | # | 807 | # |
| 792 | CONFIG_BITREVERSE=y | 808 | CONFIG_BITREVERSE=y |
| 809 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 793 | # CONFIG_CRC_CCITT is not set | 810 | # CONFIG_CRC_CCITT is not set |
| 794 | # CONFIG_CRC16 is not set | 811 | # CONFIG_CRC16 is not set |
| 795 | # CONFIG_CRC_ITU_T is not set | 812 | # CONFIG_CRC_ITU_T is not set |
| @@ -800,6 +817,7 @@ CONFIG_PLIST=y | |||
| 800 | CONFIG_HAS_IOMEM=y | 817 | CONFIG_HAS_IOMEM=y |
| 801 | CONFIG_HAS_IOPORT=y | 818 | CONFIG_HAS_IOPORT=y |
| 802 | CONFIG_HAS_DMA=y | 819 | CONFIG_HAS_DMA=y |
| 820 | CONFIG_HAVE_LMB=y | ||
| 803 | 821 | ||
| 804 | # | 822 | # |
| 805 | # Kernel hacking | 823 | # Kernel hacking |
| @@ -807,6 +825,7 @@ CONFIG_HAS_DMA=y | |||
| 807 | # CONFIG_PRINTK_TIME is not set | 825 | # CONFIG_PRINTK_TIME is not set |
| 808 | CONFIG_ENABLE_WARN_DEPRECATED=y | 826 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 809 | CONFIG_ENABLE_MUST_CHECK=y | 827 | CONFIG_ENABLE_MUST_CHECK=y |
| 828 | CONFIG_FRAME_WARN=1024 | ||
| 810 | # CONFIG_MAGIC_SYSRQ is not set | 829 | # CONFIG_MAGIC_SYSRQ is not set |
| 811 | # CONFIG_UNUSED_SYMBOLS is not set | 830 | # CONFIG_UNUSED_SYMBOLS is not set |
| 812 | CONFIG_DEBUG_FS=y | 831 | CONFIG_DEBUG_FS=y |
| @@ -817,7 +836,9 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 817 | CONFIG_SCHED_DEBUG=y | 836 | CONFIG_SCHED_DEBUG=y |
| 818 | # CONFIG_SCHEDSTATS is not set | 837 | # CONFIG_SCHEDSTATS is not set |
| 819 | # CONFIG_TIMER_STATS is not set | 838 | # CONFIG_TIMER_STATS is not set |
| 839 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 820 | # CONFIG_SLUB_DEBUG_ON is not set | 840 | # CONFIG_SLUB_DEBUG_ON is not set |
| 841 | # CONFIG_SLUB_STATS is not set | ||
| 821 | # CONFIG_DEBUG_RT_MUTEXES is not set | 842 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 822 | # CONFIG_RT_MUTEX_TESTER is not set | 843 | # CONFIG_RT_MUTEX_TESTER is not set |
| 823 | # CONFIG_DEBUG_SPINLOCK is not set | 844 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -829,9 +850,9 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 829 | # CONFIG_DEBUG_BUGVERBOSE is not set | 850 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 830 | # CONFIG_DEBUG_INFO is not set | 851 | # CONFIG_DEBUG_INFO is not set |
| 831 | # CONFIG_DEBUG_VM is not set | 852 | # CONFIG_DEBUG_VM is not set |
| 853 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 832 | # CONFIG_DEBUG_LIST is not set | 854 | # CONFIG_DEBUG_LIST is not set |
| 833 | # CONFIG_DEBUG_SG is not set | 855 | # CONFIG_DEBUG_SG is not set |
| 834 | CONFIG_FORCED_INLINING=y | ||
| 835 | # CONFIG_BOOT_PRINTK_DELAY is not set | 856 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 836 | # CONFIG_BACKTRACE_SELF_TEST is not set | 857 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 837 | # CONFIG_FAULT_INJECTION is not set | 858 | # CONFIG_FAULT_INJECTION is not set |
| @@ -841,6 +862,7 @@ CONFIG_FORCED_INLINING=y | |||
| 841 | # CONFIG_DEBUG_PAGEALLOC is not set | 862 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 842 | # CONFIG_DEBUGGER is not set | 863 | # CONFIG_DEBUGGER is not set |
| 843 | # CONFIG_KGDB_CONSOLE is not set | 864 | # CONFIG_KGDB_CONSOLE is not set |
| 865 | # CONFIG_IRQSTACKS is not set | ||
| 844 | # CONFIG_VIRQ_DEBUG is not set | 866 | # CONFIG_VIRQ_DEBUG is not set |
| 845 | # CONFIG_BDI_SWITCH is not set | 867 | # CONFIG_BDI_SWITCH is not set |
| 846 | # CONFIG_PPC_EARLY_DEBUG is not set | 868 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -852,48 +874,78 @@ CONFIG_FORCED_INLINING=y | |||
| 852 | # CONFIG_SECURITY is not set | 874 | # CONFIG_SECURITY is not set |
| 853 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 875 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 854 | CONFIG_CRYPTO=y | 876 | CONFIG_CRYPTO=y |
| 855 | # CONFIG_CRYPTO_SEQIV is not set | 877 | |
| 878 | # | ||
| 879 | # Crypto core or helper | ||
| 880 | # | ||
| 856 | # CONFIG_CRYPTO_MANAGER is not set | 881 | # CONFIG_CRYPTO_MANAGER is not set |
| 882 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 883 | # CONFIG_CRYPTO_NULL is not set | ||
| 884 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 885 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 886 | |||
| 887 | # | ||
| 888 | # Authenticated Encryption with Associated Data | ||
| 889 | # | ||
| 890 | # CONFIG_CRYPTO_CCM is not set | ||
| 891 | # CONFIG_CRYPTO_GCM is not set | ||
| 892 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 893 | |||
| 894 | # | ||
| 895 | # Block modes | ||
| 896 | # | ||
| 897 | # CONFIG_CRYPTO_CBC is not set | ||
| 898 | # CONFIG_CRYPTO_CTR is not set | ||
| 899 | # CONFIG_CRYPTO_CTS is not set | ||
| 900 | # CONFIG_CRYPTO_ECB is not set | ||
| 901 | # CONFIG_CRYPTO_LRW is not set | ||
| 902 | # CONFIG_CRYPTO_PCBC is not set | ||
| 903 | # CONFIG_CRYPTO_XTS is not set | ||
| 904 | |||
| 905 | # | ||
| 906 | # Hash modes | ||
| 907 | # | ||
| 857 | # CONFIG_CRYPTO_HMAC is not set | 908 | # CONFIG_CRYPTO_HMAC is not set |
| 858 | # CONFIG_CRYPTO_XCBC is not set | 909 | # CONFIG_CRYPTO_XCBC is not set |
| 859 | # CONFIG_CRYPTO_NULL is not set | 910 | |
| 911 | # | ||
| 912 | # Digest | ||
| 913 | # | ||
| 914 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 860 | # CONFIG_CRYPTO_MD4 is not set | 915 | # CONFIG_CRYPTO_MD4 is not set |
| 861 | # CONFIG_CRYPTO_MD5 is not set | 916 | # CONFIG_CRYPTO_MD5 is not set |
| 917 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 862 | # CONFIG_CRYPTO_SHA1 is not set | 918 | # CONFIG_CRYPTO_SHA1 is not set |
| 863 | # CONFIG_CRYPTO_SHA256 is not set | 919 | # CONFIG_CRYPTO_SHA256 is not set |
| 864 | # CONFIG_CRYPTO_SHA512 is not set | 920 | # CONFIG_CRYPTO_SHA512 is not set |
| 865 | # CONFIG_CRYPTO_WP512 is not set | ||
| 866 | # CONFIG_CRYPTO_TGR192 is not set | 921 | # CONFIG_CRYPTO_TGR192 is not set |
| 867 | # CONFIG_CRYPTO_GF128MUL is not set | 922 | # CONFIG_CRYPTO_WP512 is not set |
| 868 | # CONFIG_CRYPTO_ECB is not set | 923 | |
| 869 | # CONFIG_CRYPTO_CBC is not set | 924 | # |
| 870 | # CONFIG_CRYPTO_PCBC is not set | 925 | # Ciphers |
| 871 | # CONFIG_CRYPTO_LRW is not set | 926 | # |
| 872 | # CONFIG_CRYPTO_XTS is not set | ||
| 873 | # CONFIG_CRYPTO_CTR is not set | ||
| 874 | # CONFIG_CRYPTO_GCM is not set | ||
| 875 | # CONFIG_CRYPTO_CCM is not set | ||
| 876 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 877 | # CONFIG_CRYPTO_DES is not set | ||
| 878 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 881 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 882 | # CONFIG_CRYPTO_AES is not set | 927 | # CONFIG_CRYPTO_AES is not set |
| 928 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 929 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 930 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 931 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 883 | # CONFIG_CRYPTO_CAST5 is not set | 932 | # CONFIG_CRYPTO_CAST5 is not set |
| 884 | # CONFIG_CRYPTO_CAST6 is not set | 933 | # CONFIG_CRYPTO_CAST6 is not set |
| 885 | # CONFIG_CRYPTO_TEA is not set | 934 | # CONFIG_CRYPTO_DES is not set |
| 886 | # CONFIG_CRYPTO_ARC4 is not set | 935 | # CONFIG_CRYPTO_FCRYPT is not set |
| 887 | # CONFIG_CRYPTO_KHAZAD is not set | 936 | # CONFIG_CRYPTO_KHAZAD is not set |
| 888 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 889 | # CONFIG_CRYPTO_SEED is not set | ||
| 890 | # CONFIG_CRYPTO_SALSA20 is not set | 937 | # CONFIG_CRYPTO_SALSA20 is not set |
| 938 | # CONFIG_CRYPTO_SEED is not set | ||
| 939 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 940 | # CONFIG_CRYPTO_TEA is not set | ||
| 941 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 942 | |||
| 943 | # | ||
| 944 | # Compression | ||
| 945 | # | ||
| 891 | # CONFIG_CRYPTO_DEFLATE is not set | 946 | # CONFIG_CRYPTO_DEFLATE is not set |
| 892 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 894 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 895 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 896 | # CONFIG_CRYPTO_LZO is not set | 947 | # CONFIG_CRYPTO_LZO is not set |
| 897 | CONFIG_CRYPTO_HW=y | 948 | CONFIG_CRYPTO_HW=y |
| 898 | # CONFIG_PPC_CLOCK is not set | 949 | # CONFIG_PPC_CLOCK is not set |
| 899 | CONFIG_PPC_LIB_RHEAP=y | 950 | CONFIG_PPC_LIB_RHEAP=y |
| 951 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig index b998539da86e..f33fd516fd54 100644 --- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:25 2008 | 4 | # Mon Jun 9 08:52:31 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC8540_ADS=y | |||
| 153 | # CONFIG_MPC85xx_CDS is not set | 157 | # CONFIG_MPC85xx_CDS is not set |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -208,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -229,6 +236,7 @@ CONFIG_FSL_SOC=y | |||
| 229 | # CONFIG_PCI_SYSCALL is not set | 236 | # CONFIG_PCI_SYSCALL is not set |
| 230 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 237 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 231 | # CONFIG_PCCARD is not set | 238 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 240 | ||
| 233 | # | 241 | # |
| 234 | # Advanced setup | 242 | # Advanced setup |
| @@ -238,11 +246,12 @@ CONFIG_FSL_SOC=y | |||
| 238 | # | 246 | # |
| 239 | # Default settings for advanced configuration options are used | 247 | # Default settings for advanced configuration options are used |
| 240 | # | 248 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 249 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 250 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 251 | CONFIG_KERNEL_START=0xc0000000 |
| 252 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 253 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 254 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 255 | ||
| 247 | # | 256 | # |
| 248 | # Networking | 257 | # Networking |
| @@ -290,8 +299,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 299 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 300 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 301 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 303 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 304 | # CONFIG_IP_DCCP is not set |
| @@ -419,6 +426,7 @@ CONFIG_NETDEV_10000=y | |||
| 419 | # | 426 | # |
| 420 | # CONFIG_WLAN_PRE80211 is not set | 427 | # CONFIG_WLAN_PRE80211 is not set |
| 421 | # CONFIG_WLAN_80211 is not set | 428 | # CONFIG_WLAN_80211 is not set |
| 429 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 422 | # CONFIG_WAN is not set | 430 | # CONFIG_WAN is not set |
| 423 | # CONFIG_PPP is not set | 431 | # CONFIG_PPP is not set |
| 424 | # CONFIG_SLIP is not set | 432 | # CONFIG_SLIP is not set |
| @@ -463,6 +471,7 @@ CONFIG_INPUT=y | |||
| 463 | # Character devices | 471 | # Character devices |
| 464 | # | 472 | # |
| 465 | # CONFIG_VT is not set | 473 | # CONFIG_VT is not set |
| 474 | CONFIG_DEVKMEM=y | ||
| 466 | # CONFIG_SERIAL_NONSTANDARD is not set | 475 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 467 | 476 | ||
| 468 | # | 477 | # |
| @@ -494,12 +503,7 @@ CONFIG_GEN_RTC=y | |||
| 494 | # CONFIG_RAW_DRIVER is not set | 503 | # CONFIG_RAW_DRIVER is not set |
| 495 | # CONFIG_TCG_TPM is not set | 504 | # CONFIG_TCG_TPM is not set |
| 496 | # CONFIG_I2C is not set | 505 | # CONFIG_I2C is not set |
| 497 | |||
| 498 | # | ||
| 499 | # SPI support | ||
| 500 | # | ||
| 501 | # CONFIG_SPI is not set | 506 | # CONFIG_SPI is not set |
| 502 | # CONFIG_SPI_MASTER is not set | ||
| 503 | # CONFIG_W1 is not set | 507 | # CONFIG_W1 is not set |
| 504 | # CONFIG_POWER_SUPPLY is not set | 508 | # CONFIG_POWER_SUPPLY is not set |
| 505 | CONFIG_HWMON=y | 509 | CONFIG_HWMON=y |
| @@ -528,12 +532,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 528 | # Multifunction device drivers | 532 | # Multifunction device drivers |
| 529 | # | 533 | # |
| 530 | # CONFIG_MFD_SM501 is not set | 534 | # CONFIG_MFD_SM501 is not set |
| 535 | # CONFIG_HTC_PASIC3 is not set | ||
| 531 | 536 | ||
| 532 | # | 537 | # |
| 533 | # Multimedia devices | 538 | # Multimedia devices |
| 534 | # | 539 | # |
| 540 | |||
| 541 | # | ||
| 542 | # Multimedia core support | ||
| 543 | # | ||
| 535 | # CONFIG_VIDEO_DEV is not set | 544 | # CONFIG_VIDEO_DEV is not set |
| 536 | # CONFIG_DVB_CORE is not set | 545 | # CONFIG_DVB_CORE is not set |
| 546 | # CONFIG_VIDEO_MEDIA is not set | ||
| 547 | |||
| 548 | # | ||
| 549 | # Multimedia drivers | ||
| 550 | # | ||
| 537 | CONFIG_DAB=y | 551 | CONFIG_DAB=y |
| 538 | 552 | ||
| 539 | # | 553 | # |
| @@ -561,6 +575,8 @@ CONFIG_USB_SUPPORT=y | |||
| 561 | # CONFIG_USB_ARCH_HAS_HCD is not set | 575 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 562 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 576 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 563 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 577 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 578 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 579 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 564 | 580 | ||
| 565 | # | 581 | # |
| 566 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 582 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -569,13 +585,10 @@ CONFIG_USB_SUPPORT=y | |||
| 569 | # CONFIG_MMC is not set | 585 | # CONFIG_MMC is not set |
| 570 | # CONFIG_MEMSTICK is not set | 586 | # CONFIG_MEMSTICK is not set |
| 571 | # CONFIG_NEW_LEDS is not set | 587 | # CONFIG_NEW_LEDS is not set |
| 588 | # CONFIG_ACCESSIBILITY is not set | ||
| 572 | # CONFIG_EDAC is not set | 589 | # CONFIG_EDAC is not set |
| 573 | # CONFIG_RTC_CLASS is not set | 590 | # CONFIG_RTC_CLASS is not set |
| 574 | # CONFIG_DMADEVICES is not set | 591 | # CONFIG_DMADEVICES is not set |
| 575 | |||
| 576 | # | ||
| 577 | # Userspace I/O | ||
| 578 | # | ||
| 579 | # CONFIG_UIO is not set | 592 | # CONFIG_UIO is not set |
| 580 | 593 | ||
| 581 | # | 594 | # |
| @@ -595,7 +608,6 @@ CONFIG_FS_MBCACHE=y | |||
| 595 | # CONFIG_JFS_FS is not set | 608 | # CONFIG_JFS_FS is not set |
| 596 | # CONFIG_FS_POSIX_ACL is not set | 609 | # CONFIG_FS_POSIX_ACL is not set |
| 597 | # CONFIG_XFS_FS is not set | 610 | # CONFIG_XFS_FS is not set |
| 598 | # CONFIG_GFS2_FS is not set | ||
| 599 | # CONFIG_OCFS2_FS is not set | 611 | # CONFIG_OCFS2_FS is not set |
| 600 | CONFIG_DNOTIFY=y | 612 | CONFIG_DNOTIFY=y |
| 601 | CONFIG_INOTIFY=y | 613 | CONFIG_INOTIFY=y |
| @@ -652,7 +664,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 652 | CONFIG_NFS_FS=y | 664 | CONFIG_NFS_FS=y |
| 653 | # CONFIG_NFS_V3 is not set | 665 | # CONFIG_NFS_V3 is not set |
| 654 | # CONFIG_NFS_V4 is not set | 666 | # CONFIG_NFS_V4 is not set |
| 655 | # CONFIG_NFS_DIRECTIO is not set | ||
| 656 | # CONFIG_NFSD is not set | 667 | # CONFIG_NFSD is not set |
| 657 | CONFIG_ROOT_NFS=y | 668 | CONFIG_ROOT_NFS=y |
| 658 | CONFIG_LOCKD=y | 669 | CONFIG_LOCKD=y |
| @@ -691,6 +702,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 691 | # Library routines | 702 | # Library routines |
| 692 | # | 703 | # |
| 693 | CONFIG_BITREVERSE=y | 704 | CONFIG_BITREVERSE=y |
| 705 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 694 | # CONFIG_CRC_CCITT is not set | 706 | # CONFIG_CRC_CCITT is not set |
| 695 | # CONFIG_CRC16 is not set | 707 | # CONFIG_CRC16 is not set |
| 696 | # CONFIG_CRC_ITU_T is not set | 708 | # CONFIG_CRC_ITU_T is not set |
| @@ -701,6 +713,7 @@ CONFIG_PLIST=y | |||
| 701 | CONFIG_HAS_IOMEM=y | 713 | CONFIG_HAS_IOMEM=y |
| 702 | CONFIG_HAS_IOPORT=y | 714 | CONFIG_HAS_IOPORT=y |
| 703 | CONFIG_HAS_DMA=y | 715 | CONFIG_HAS_DMA=y |
| 716 | CONFIG_HAVE_LMB=y | ||
| 704 | 717 | ||
| 705 | # | 718 | # |
| 706 | # Kernel hacking | 719 | # Kernel hacking |
| @@ -708,6 +721,7 @@ CONFIG_HAS_DMA=y | |||
| 708 | # CONFIG_PRINTK_TIME is not set | 721 | # CONFIG_PRINTK_TIME is not set |
| 709 | CONFIG_ENABLE_WARN_DEPRECATED=y | 722 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 710 | CONFIG_ENABLE_MUST_CHECK=y | 723 | CONFIG_ENABLE_MUST_CHECK=y |
| 724 | CONFIG_FRAME_WARN=1024 | ||
| 711 | # CONFIG_MAGIC_SYSRQ is not set | 725 | # CONFIG_MAGIC_SYSRQ is not set |
| 712 | # CONFIG_UNUSED_SYMBOLS is not set | 726 | # CONFIG_UNUSED_SYMBOLS is not set |
| 713 | # CONFIG_DEBUG_FS is not set | 727 | # CONFIG_DEBUG_FS is not set |
| @@ -718,6 +732,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 718 | CONFIG_SCHED_DEBUG=y | 732 | CONFIG_SCHED_DEBUG=y |
| 719 | # CONFIG_SCHEDSTATS is not set | 733 | # CONFIG_SCHEDSTATS is not set |
| 720 | # CONFIG_TIMER_STATS is not set | 734 | # CONFIG_TIMER_STATS is not set |
| 735 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 721 | # CONFIG_SLUB_DEBUG_ON is not set | 736 | # CONFIG_SLUB_DEBUG_ON is not set |
| 722 | # CONFIG_SLUB_STATS is not set | 737 | # CONFIG_SLUB_STATS is not set |
| 723 | # CONFIG_DEBUG_RT_MUTEXES is not set | 738 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -730,6 +745,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 730 | # CONFIG_DEBUG_BUGVERBOSE is not set | 745 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 731 | # CONFIG_DEBUG_INFO is not set | 746 | # CONFIG_DEBUG_INFO is not set |
| 732 | # CONFIG_DEBUG_VM is not set | 747 | # CONFIG_DEBUG_VM is not set |
| 748 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 733 | # CONFIG_DEBUG_LIST is not set | 749 | # CONFIG_DEBUG_LIST is not set |
| 734 | # CONFIG_DEBUG_SG is not set | 750 | # CONFIG_DEBUG_SG is not set |
| 735 | # CONFIG_BOOT_PRINTK_DELAY is not set | 751 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -740,6 +756,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 740 | # CONFIG_DEBUG_STACK_USAGE is not set | 756 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 741 | # CONFIG_DEBUG_PAGEALLOC is not set | 757 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 742 | # CONFIG_DEBUGGER is not set | 758 | # CONFIG_DEBUGGER is not set |
| 759 | # CONFIG_IRQSTACKS is not set | ||
| 743 | # CONFIG_BDI_SWITCH is not set | 760 | # CONFIG_BDI_SWITCH is not set |
| 744 | # CONFIG_PPC_EARLY_DEBUG is not set | 761 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 745 | 762 | ||
| @@ -750,47 +767,77 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 750 | # CONFIG_SECURITY is not set | 767 | # CONFIG_SECURITY is not set |
| 751 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 768 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 752 | CONFIG_CRYPTO=y | 769 | CONFIG_CRYPTO=y |
| 753 | # CONFIG_CRYPTO_SEQIV is not set | 770 | |
| 771 | # | ||
| 772 | # Crypto core or helper | ||
| 773 | # | ||
| 754 | # CONFIG_CRYPTO_MANAGER is not set | 774 | # CONFIG_CRYPTO_MANAGER is not set |
| 775 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 776 | # CONFIG_CRYPTO_NULL is not set | ||
| 777 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 778 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 779 | |||
| 780 | # | ||
| 781 | # Authenticated Encryption with Associated Data | ||
| 782 | # | ||
| 783 | # CONFIG_CRYPTO_CCM is not set | ||
| 784 | # CONFIG_CRYPTO_GCM is not set | ||
| 785 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 786 | |||
| 787 | # | ||
| 788 | # Block modes | ||
| 789 | # | ||
| 790 | # CONFIG_CRYPTO_CBC is not set | ||
| 791 | # CONFIG_CRYPTO_CTR is not set | ||
| 792 | # CONFIG_CRYPTO_CTS is not set | ||
| 793 | # CONFIG_CRYPTO_ECB is not set | ||
| 794 | # CONFIG_CRYPTO_LRW is not set | ||
| 795 | # CONFIG_CRYPTO_PCBC is not set | ||
| 796 | # CONFIG_CRYPTO_XTS is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # Hash modes | ||
| 800 | # | ||
| 755 | # CONFIG_CRYPTO_HMAC is not set | 801 | # CONFIG_CRYPTO_HMAC is not set |
| 756 | # CONFIG_CRYPTO_XCBC is not set | 802 | # CONFIG_CRYPTO_XCBC is not set |
| 757 | # CONFIG_CRYPTO_NULL is not set | 803 | |
| 804 | # | ||
| 805 | # Digest | ||
| 806 | # | ||
| 807 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 758 | # CONFIG_CRYPTO_MD4 is not set | 808 | # CONFIG_CRYPTO_MD4 is not set |
| 759 | # CONFIG_CRYPTO_MD5 is not set | 809 | # CONFIG_CRYPTO_MD5 is not set |
| 810 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 760 | # CONFIG_CRYPTO_SHA1 is not set | 811 | # CONFIG_CRYPTO_SHA1 is not set |
| 761 | # CONFIG_CRYPTO_SHA256 is not set | 812 | # CONFIG_CRYPTO_SHA256 is not set |
| 762 | # CONFIG_CRYPTO_SHA512 is not set | 813 | # CONFIG_CRYPTO_SHA512 is not set |
| 763 | # CONFIG_CRYPTO_WP512 is not set | ||
| 764 | # CONFIG_CRYPTO_TGR192 is not set | 814 | # CONFIG_CRYPTO_TGR192 is not set |
| 765 | # CONFIG_CRYPTO_GF128MUL is not set | 815 | # CONFIG_CRYPTO_WP512 is not set |
| 766 | # CONFIG_CRYPTO_ECB is not set | 816 | |
| 767 | # CONFIG_CRYPTO_CBC is not set | 817 | # |
| 768 | # CONFIG_CRYPTO_PCBC is not set | 818 | # Ciphers |
| 769 | # CONFIG_CRYPTO_LRW is not set | 819 | # |
| 770 | # CONFIG_CRYPTO_XTS is not set | ||
| 771 | # CONFIG_CRYPTO_CTR is not set | ||
| 772 | # CONFIG_CRYPTO_GCM is not set | ||
| 773 | # CONFIG_CRYPTO_CCM is not set | ||
| 774 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 775 | # CONFIG_CRYPTO_DES is not set | ||
| 776 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 777 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 778 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 779 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 780 | # CONFIG_CRYPTO_AES is not set | 820 | # CONFIG_CRYPTO_AES is not set |
| 821 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 822 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 823 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 824 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 781 | # CONFIG_CRYPTO_CAST5 is not set | 825 | # CONFIG_CRYPTO_CAST5 is not set |
| 782 | # CONFIG_CRYPTO_CAST6 is not set | 826 | # CONFIG_CRYPTO_CAST6 is not set |
| 783 | # CONFIG_CRYPTO_TEA is not set | 827 | # CONFIG_CRYPTO_DES is not set |
| 784 | # CONFIG_CRYPTO_ARC4 is not set | 828 | # CONFIG_CRYPTO_FCRYPT is not set |
| 785 | # CONFIG_CRYPTO_KHAZAD is not set | 829 | # CONFIG_CRYPTO_KHAZAD is not set |
| 786 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 787 | # CONFIG_CRYPTO_SEED is not set | ||
| 788 | # CONFIG_CRYPTO_SALSA20 is not set | 830 | # CONFIG_CRYPTO_SALSA20 is not set |
| 831 | # CONFIG_CRYPTO_SEED is not set | ||
| 832 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 833 | # CONFIG_CRYPTO_TEA is not set | ||
| 834 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 835 | |||
| 836 | # | ||
| 837 | # Compression | ||
| 838 | # | ||
| 789 | # CONFIG_CRYPTO_DEFLATE is not set | 839 | # CONFIG_CRYPTO_DEFLATE is not set |
| 790 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 791 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 792 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 793 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 794 | # CONFIG_CRYPTO_LZO is not set | 840 | # CONFIG_CRYPTO_LZO is not set |
| 795 | CONFIG_CRYPTO_HW=y | 841 | CONFIG_CRYPTO_HW=y |
| 796 | # CONFIG_PPC_CLOCK is not set | 842 | # CONFIG_PPC_CLOCK is not set |
| 843 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig index a9f113b243ae..042a85ea7b72 100644 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:03 2008 | 4 | # Mon Jun 9 08:52:32 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -203,7 +208,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 208 | # CONFIG_PREEMPT is not set |
| 204 | CONFIG_BINFMT_ELF=y | 209 | CONFIG_BINFMT_ELF=y |
| 205 | CONFIG_BINFMT_MISC=m | 210 | CONFIG_BINFMT_MISC=m |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 207 | CONFIG_MATH_EMULATION=y | 211 | CONFIG_MATH_EMULATION=y |
| 208 | # CONFIG_IOMMU_HELPER is not set | 212 | # CONFIG_IOMMU_HELPER is not set |
| 209 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 213 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -219,11 +223,13 @@ CONFIG_FLATMEM=y | |||
| 219 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 220 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 223 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 224 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 225 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| 226 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 227 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 229 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| @@ -248,6 +254,7 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # CONFIG_PCI_DEBUG is not set | 254 | # CONFIG_PCI_DEBUG is not set |
| 249 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 250 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 257 | # CONFIG_HAS_RAPIDIO is not set | ||
| 251 | 258 | ||
| 252 | # | 259 | # |
| 253 | # Advanced setup | 260 | # Advanced setup |
| @@ -257,11 +264,12 @@ CONFIG_PCI_LEGACY=y | |||
| 257 | # | 264 | # |
| 258 | # Default settings for advanced configuration options are used | 265 | # Default settings for advanced configuration options are used |
| 259 | # | 266 | # |
| 260 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 261 | CONFIG_LOWMEM_SIZE=0x30000000 | 267 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 268 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 262 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
| 270 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 263 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
| 264 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 265 | 273 | ||
| 266 | # | 274 | # |
| 267 | # Networking | 275 | # Networking |
| @@ -332,8 +340,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 332 | CONFIG_INET6_XFRM_MODE_BEET=y | 340 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 333 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 341 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 334 | CONFIG_IPV6_SIT=y | 342 | CONFIG_IPV6_SIT=y |
| 343 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 335 | # CONFIG_IPV6_TUNNEL is not set | 344 | # CONFIG_IPV6_TUNNEL is not set |
| 336 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 345 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 346 | # CONFIG_IPV6_MROUTE is not set | ||
| 337 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
| 338 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
| 339 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
| @@ -395,6 +405,7 @@ CONFIG_FW_LOADER=y | |||
| 395 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
| 396 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
| 397 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
| 408 | CONFIG_OF_I2C=y | ||
| 398 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
| 399 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
| 400 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
| @@ -501,7 +512,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 501 | # CONFIG_SCSI_SRP is not set | 512 | # CONFIG_SCSI_SRP is not set |
| 502 | CONFIG_ATA=y | 513 | CONFIG_ATA=y |
| 503 | # CONFIG_ATA_NONSTANDARD is not set | 514 | # CONFIG_ATA_NONSTANDARD is not set |
| 515 | CONFIG_SATA_PMP=y | ||
| 504 | CONFIG_SATA_AHCI=y | 516 | CONFIG_SATA_AHCI=y |
| 517 | # CONFIG_SATA_SIL24 is not set | ||
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_ATA_SFF=y | ||
| 505 | # CONFIG_SATA_SVW is not set | 520 | # CONFIG_SATA_SVW is not set |
| 506 | # CONFIG_ATA_PIIX is not set | 521 | # CONFIG_ATA_PIIX is not set |
| 507 | # CONFIG_SATA_MV is not set | 522 | # CONFIG_SATA_MV is not set |
| @@ -511,13 +526,11 @@ CONFIG_SATA_AHCI=y | |||
| 511 | # CONFIG_SATA_PROMISE is not set | 526 | # CONFIG_SATA_PROMISE is not set |
| 512 | # CONFIG_SATA_SX4 is not set | 527 | # CONFIG_SATA_SX4 is not set |
| 513 | # CONFIG_SATA_SIL is not set | 528 | # CONFIG_SATA_SIL is not set |
| 514 | # CONFIG_SATA_SIL24 is not set | ||
| 515 | # CONFIG_SATA_SIS is not set | 529 | # CONFIG_SATA_SIS is not set |
| 516 | # CONFIG_SATA_ULI is not set | 530 | # CONFIG_SATA_ULI is not set |
| 517 | # CONFIG_SATA_VIA is not set | 531 | # CONFIG_SATA_VIA is not set |
| 518 | # CONFIG_SATA_VITESSE is not set | 532 | # CONFIG_SATA_VITESSE is not set |
| 519 | # CONFIG_SATA_INIC162X is not set | 533 | # CONFIG_SATA_INIC162X is not set |
| 520 | # CONFIG_SATA_FSL is not set | ||
| 521 | CONFIG_PATA_ALI=y | 534 | CONFIG_PATA_ALI=y |
| 522 | # CONFIG_PATA_AMD is not set | 535 | # CONFIG_PATA_AMD is not set |
| 523 | # CONFIG_PATA_ARTOP is not set | 536 | # CONFIG_PATA_ARTOP is not set |
| @@ -557,6 +570,7 @@ CONFIG_PATA_ALI=y | |||
| 557 | # CONFIG_PATA_VIA is not set | 570 | # CONFIG_PATA_VIA is not set |
| 558 | # CONFIG_PATA_WINBOND is not set | 571 | # CONFIG_PATA_WINBOND is not set |
| 559 | # CONFIG_PATA_PLATFORM is not set | 572 | # CONFIG_PATA_PLATFORM is not set |
| 573 | # CONFIG_PATA_SCH is not set | ||
| 560 | # CONFIG_MD is not set | 574 | # CONFIG_MD is not set |
| 561 | # CONFIG_FUSION is not set | 575 | # CONFIG_FUSION is not set |
| 562 | 576 | ||
| @@ -622,7 +636,6 @@ CONFIG_NETDEV_1000=y | |||
| 622 | # CONFIG_SIS190 is not set | 636 | # CONFIG_SIS190 is not set |
| 623 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
| 624 | # CONFIG_SKY2 is not set | 638 | # CONFIG_SKY2 is not set |
| 625 | # CONFIG_SK98LIN is not set | ||
| 626 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
| 627 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
| 628 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
| @@ -642,6 +655,7 @@ CONFIG_NETDEV_10000=y | |||
| 642 | # CONFIG_MLX4_CORE is not set | 655 | # CONFIG_MLX4_CORE is not set |
| 643 | # CONFIG_TEHUTI is not set | 656 | # CONFIG_TEHUTI is not set |
| 644 | # CONFIG_BNX2X is not set | 657 | # CONFIG_BNX2X is not set |
| 658 | # CONFIG_SFC is not set | ||
| 645 | # CONFIG_TR is not set | 659 | # CONFIG_TR is not set |
| 646 | 660 | ||
| 647 | # | 661 | # |
| @@ -649,6 +663,7 @@ CONFIG_NETDEV_10000=y | |||
| 649 | # | 663 | # |
| 650 | # CONFIG_WLAN_PRE80211 is not set | 664 | # CONFIG_WLAN_PRE80211 is not set |
| 651 | # CONFIG_WLAN_80211 is not set | 665 | # CONFIG_WLAN_80211 is not set |
| 666 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 652 | 667 | ||
| 653 | # | 668 | # |
| 654 | # USB Network Adapters | 669 | # USB Network Adapters |
| @@ -713,6 +728,7 @@ CONFIG_VT=y | |||
| 713 | CONFIG_VT_CONSOLE=y | 728 | CONFIG_VT_CONSOLE=y |
| 714 | CONFIG_HW_CONSOLE=y | 729 | CONFIG_HW_CONSOLE=y |
| 715 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 731 | CONFIG_DEVKMEM=y | ||
| 716 | # CONFIG_SERIAL_NONSTANDARD is not set | 732 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 717 | # CONFIG_NOZOMI is not set | 733 | # CONFIG_NOZOMI is not set |
| 718 | 734 | ||
| @@ -744,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 744 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 745 | # CONFIG_HW_RANDOM is not set | 761 | # CONFIG_HW_RANDOM is not set |
| 746 | CONFIG_NVRAM=y | 762 | CONFIG_NVRAM=y |
| 747 | # CONFIG_GEN_RTC is not set | ||
| 748 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 749 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 750 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -755,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 755 | # CONFIG_I2C_CHARDEV is not set | 770 | # CONFIG_I2C_CHARDEV is not set |
| 756 | 771 | ||
| 757 | # | 772 | # |
| 758 | # I2C Algorithms | ||
| 759 | # | ||
| 760 | # CONFIG_I2C_ALGOBIT is not set | ||
| 761 | # CONFIG_I2C_ALGOPCF is not set | ||
| 762 | # CONFIG_I2C_ALGOPCA is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 766 | # | 774 | # |
| 767 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -788,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 788 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 789 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 790 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 791 | 800 | ||
| 792 | # | 801 | # |
| 793 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -797,19 +806,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 797 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 798 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 799 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 800 | # CONFIG_TPS65010 is not set | ||
| 801 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 802 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 803 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 804 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 805 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 806 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 807 | |||
| 808 | # | ||
| 809 | # SPI support | ||
| 810 | # | ||
| 811 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
| 812 | # CONFIG_SPI_MASTER is not set | ||
| 813 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
| 814 | # CONFIG_POWER_SUPPLY is not set | 817 | # CONFIG_POWER_SUPPLY is not set |
| 815 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
| @@ -826,13 +829,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 826 | # Multifunction device drivers | 829 | # Multifunction device drivers |
| 827 | # | 830 | # |
| 828 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
| 832 | # CONFIG_HTC_PASIC3 is not set | ||
| 829 | 833 | ||
| 830 | # | 834 | # |
| 831 | # Multimedia devices | 835 | # Multimedia devices |
| 832 | # | 836 | # |
| 837 | |||
| 838 | # | ||
| 839 | # Multimedia core support | ||
| 840 | # | ||
| 833 | # CONFIG_VIDEO_DEV is not set | 841 | # CONFIG_VIDEO_DEV is not set |
| 834 | CONFIG_DVB_CORE=m | 842 | CONFIG_DVB_CORE=m |
| 835 | # CONFIG_DVB_CORE_ATTACH is not set | 843 | CONFIG_VIDEO_MEDIA=m |
| 844 | |||
| 845 | # | ||
| 846 | # Multimedia drivers | ||
| 847 | # | ||
| 848 | # CONFIG_MEDIA_ATTACH is not set | ||
| 849 | CONFIG_MEDIA_TUNER=m | ||
| 850 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 851 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 852 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 853 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 854 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 855 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 856 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 857 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 858 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 836 | CONFIG_DVB_CAPTURE_DRIVERS=y | 859 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 837 | 860 | ||
| 838 | # | 861 | # |
| @@ -875,14 +898,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 875 | # | 898 | # |
| 876 | # DVB-S (satellite) frontends | 899 | # DVB-S (satellite) frontends |
| 877 | # | 900 | # |
| 878 | # CONFIG_DVB_STV0299 is not set | ||
| 879 | # CONFIG_DVB_CX24110 is not set | 901 | # CONFIG_DVB_CX24110 is not set |
| 880 | # CONFIG_DVB_CX24123 is not set | 902 | # CONFIG_DVB_CX24123 is not set |
| 881 | # CONFIG_DVB_TDA8083 is not set | ||
| 882 | # CONFIG_DVB_MT312 is not set | 903 | # CONFIG_DVB_MT312 is not set |
| 883 | # CONFIG_DVB_VES1X93 is not set | ||
| 884 | # CONFIG_DVB_S5H1420 is not set | 904 | # CONFIG_DVB_S5H1420 is not set |
| 905 | # CONFIG_DVB_STV0299 is not set | ||
| 906 | # CONFIG_DVB_TDA8083 is not set | ||
| 885 | # CONFIG_DVB_TDA10086 is not set | 907 | # CONFIG_DVB_TDA10086 is not set |
| 908 | # CONFIG_DVB_VES1X93 is not set | ||
| 909 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 910 | # CONFIG_DVB_TDA826X is not set | ||
| 911 | # CONFIG_DVB_TUA6100 is not set | ||
| 886 | 912 | ||
| 887 | # | 913 | # |
| 888 | # DVB-T (terrestrial) frontends | 914 | # DVB-T (terrestrial) frontends |
| @@ -900,6 +926,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 900 | # CONFIG_DVB_DIB3000MC is not set | 926 | # CONFIG_DVB_DIB3000MC is not set |
| 901 | # CONFIG_DVB_DIB7000M is not set | 927 | # CONFIG_DVB_DIB7000M is not set |
| 902 | # CONFIG_DVB_DIB7000P is not set | 928 | # CONFIG_DVB_DIB7000P is not set |
| 929 | # CONFIG_DVB_TDA10048 is not set | ||
| 903 | 930 | ||
| 904 | # | 931 | # |
| 905 | # DVB-C (cable) frontends | 932 | # DVB-C (cable) frontends |
| @@ -918,27 +945,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 918 | # CONFIG_DVB_BCM3510 is not set | 945 | # CONFIG_DVB_BCM3510 is not set |
| 919 | # CONFIG_DVB_LGDT330X is not set | 946 | # CONFIG_DVB_LGDT330X is not set |
| 920 | # CONFIG_DVB_S5H1409 is not set | 947 | # CONFIG_DVB_S5H1409 is not set |
| 948 | # CONFIG_DVB_AU8522 is not set | ||
| 949 | # CONFIG_DVB_S5H1411 is not set | ||
| 921 | 950 | ||
| 922 | # | 951 | # |
| 923 | # Tuners/PLL support | 952 | # Digital terrestrial only tuners/PLL |
| 924 | # | 953 | # |
| 925 | # CONFIG_DVB_PLL is not set | 954 | # CONFIG_DVB_PLL is not set |
| 926 | # CONFIG_DVB_TDA826X is not set | ||
| 927 | # CONFIG_DVB_TDA827X is not set | ||
| 928 | # CONFIG_DVB_TDA18271 is not set | ||
| 929 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 930 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 931 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 932 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 933 | # CONFIG_DVB_TUNER_DIB0070 is not set | 955 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 934 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 935 | 956 | ||
| 936 | # | 957 | # |
| 937 | # Miscellaneous devices | 958 | # SEC control devices for DVB-S |
| 938 | # | 959 | # |
| 939 | # CONFIG_DVB_LNBP21 is not set | 960 | # CONFIG_DVB_LNBP21 is not set |
| 961 | # CONFIG_DVB_ISL6405 is not set | ||
| 940 | # CONFIG_DVB_ISL6421 is not set | 962 | # CONFIG_DVB_ISL6421 is not set |
| 941 | # CONFIG_DVB_TUA6100 is not set | ||
| 942 | CONFIG_DAB=y | 963 | CONFIG_DAB=y |
| 943 | # CONFIG_USB_DABUSB is not set | 964 | # CONFIG_USB_DABUSB is not set |
| 944 | 965 | ||
| @@ -1005,6 +1026,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1005 | # CONFIG_SND_AU8810 is not set | 1026 | # CONFIG_SND_AU8810 is not set |
| 1006 | # CONFIG_SND_AU8820 is not set | 1027 | # CONFIG_SND_AU8820 is not set |
| 1007 | # CONFIG_SND_AU8830 is not set | 1028 | # CONFIG_SND_AU8830 is not set |
| 1029 | # CONFIG_SND_AW2 is not set | ||
| 1008 | # CONFIG_SND_AZT3328 is not set | 1030 | # CONFIG_SND_AZT3328 is not set |
| 1009 | # CONFIG_SND_BT87X is not set | 1031 | # CONFIG_SND_BT87X is not set |
| 1010 | # CONFIG_SND_CA0106 is not set | 1032 | # CONFIG_SND_CA0106 is not set |
| @@ -1079,11 +1101,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1079 | # CONFIG_SND_SOC is not set | 1101 | # CONFIG_SND_SOC is not set |
| 1080 | 1102 | ||
| 1081 | # | 1103 | # |
| 1082 | # SoC Audio support for SuperH | 1104 | # ALSA SoC audio for Freescale SOCs |
| 1083 | # | 1105 | # |
| 1084 | 1106 | ||
| 1085 | # | 1107 | # |
| 1086 | # ALSA SoC audio for Freescale SOCs | 1108 | # SoC Audio for the Texas Instruments OMAP |
| 1087 | # | 1109 | # |
| 1088 | 1110 | ||
| 1089 | # | 1111 | # |
| @@ -1118,16 +1140,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1118 | CONFIG_USB_DEVICE_CLASS=y | 1140 | CONFIG_USB_DEVICE_CLASS=y |
| 1119 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1141 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1120 | # CONFIG_USB_OTG is not set | 1142 | # CONFIG_USB_OTG is not set |
| 1143 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1144 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1121 | 1145 | ||
| 1122 | # | 1146 | # |
| 1123 | # USB Host Controller Drivers | 1147 | # USB Host Controller Drivers |
| 1124 | # | 1148 | # |
| 1149 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1125 | CONFIG_USB_EHCI_HCD=y | 1150 | CONFIG_USB_EHCI_HCD=y |
| 1126 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1151 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1127 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1152 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1128 | # CONFIG_USB_EHCI_FSL is not set | 1153 | # CONFIG_USB_EHCI_FSL is not set |
| 1129 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1154 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1130 | # CONFIG_USB_ISP116X_HCD is not set | 1155 | # CONFIG_USB_ISP116X_HCD is not set |
| 1156 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1131 | CONFIG_USB_OHCI_HCD=y | 1157 | CONFIG_USB_OHCI_HCD=y |
| 1132 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1158 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1133 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1159 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1145,6 +1171,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1145 | # | 1171 | # |
| 1146 | # CONFIG_USB_ACM is not set | 1172 | # CONFIG_USB_ACM is not set |
| 1147 | # CONFIG_USB_PRINTER is not set | 1173 | # CONFIG_USB_PRINTER is not set |
| 1174 | # CONFIG_USB_WDM is not set | ||
| 1148 | 1175 | ||
| 1149 | # | 1176 | # |
| 1150 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1177 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1164,7 +1191,9 @@ CONFIG_USB_STORAGE=y | |||
| 1164 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1191 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1165 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1192 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1166 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1193 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1194 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1167 | # CONFIG_USB_STORAGE_KARMA is not set | 1195 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1196 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1168 | # CONFIG_USB_LIBUSUAL is not set | 1197 | # CONFIG_USB_LIBUSUAL is not set |
| 1169 | 1198 | ||
| 1170 | # | 1199 | # |
| @@ -1202,10 +1231,12 @@ CONFIG_USB_MON=y | |||
| 1202 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1231 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1203 | # CONFIG_USB_IOWARRIOR is not set | 1232 | # CONFIG_USB_IOWARRIOR is not set |
| 1204 | # CONFIG_USB_TEST is not set | 1233 | # CONFIG_USB_TEST is not set |
| 1234 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1205 | # CONFIG_USB_GADGET is not set | 1235 | # CONFIG_USB_GADGET is not set |
| 1206 | # CONFIG_MMC is not set | 1236 | # CONFIG_MMC is not set |
| 1207 | # CONFIG_MEMSTICK is not set | 1237 | # CONFIG_MEMSTICK is not set |
| 1208 | # CONFIG_NEW_LEDS is not set | 1238 | # CONFIG_NEW_LEDS is not set |
| 1239 | # CONFIG_ACCESSIBILITY is not set | ||
| 1209 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
| 1210 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
| 1211 | CONFIG_RTC_LIB=y | 1242 | CONFIG_RTC_LIB=y |
| @@ -1257,23 +1288,19 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1257 | # | 1288 | # |
| 1258 | # on-CPU RTC drivers | 1289 | # on-CPU RTC drivers |
| 1259 | # | 1290 | # |
| 1291 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1260 | CONFIG_DMADEVICES=y | 1292 | CONFIG_DMADEVICES=y |
| 1261 | 1293 | ||
| 1262 | # | 1294 | # |
| 1263 | # DMA Devices | 1295 | # DMA Devices |
| 1264 | # | 1296 | # |
| 1265 | CONFIG_FSL_DMA=y | 1297 | CONFIG_FSL_DMA=y |
| 1266 | # CONFIG_FSL_DMA_SELFTEST is not set | ||
| 1267 | CONFIG_DMA_ENGINE=y | 1298 | CONFIG_DMA_ENGINE=y |
| 1268 | 1299 | ||
| 1269 | # | 1300 | # |
| 1270 | # DMA Clients | 1301 | # DMA Clients |
| 1271 | # | 1302 | # |
| 1272 | # CONFIG_NET_DMA is not set | 1303 | # CONFIG_NET_DMA is not set |
| 1273 | |||
| 1274 | # | ||
| 1275 | # Userspace I/O | ||
| 1276 | # | ||
| 1277 | # CONFIG_UIO is not set | 1304 | # CONFIG_UIO is not set |
| 1278 | 1305 | ||
| 1279 | # | 1306 | # |
| @@ -1293,7 +1320,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1293 | # CONFIG_JFS_FS is not set | 1320 | # CONFIG_JFS_FS is not set |
| 1294 | # CONFIG_FS_POSIX_ACL is not set | 1321 | # CONFIG_FS_POSIX_ACL is not set |
| 1295 | # CONFIG_XFS_FS is not set | 1322 | # CONFIG_XFS_FS is not set |
| 1296 | # CONFIG_GFS2_FS is not set | ||
| 1297 | # CONFIG_OCFS2_FS is not set | 1323 | # CONFIG_OCFS2_FS is not set |
| 1298 | CONFIG_DNOTIFY=y | 1324 | CONFIG_DNOTIFY=y |
| 1299 | CONFIG_INOTIFY=y | 1325 | CONFIG_INOTIFY=y |
| @@ -1363,10 +1389,9 @@ CONFIG_NFS_FS=y | |||
| 1363 | CONFIG_NFS_V3=y | 1389 | CONFIG_NFS_V3=y |
| 1364 | # CONFIG_NFS_V3_ACL is not set | 1390 | # CONFIG_NFS_V3_ACL is not set |
| 1365 | CONFIG_NFS_V4=y | 1391 | CONFIG_NFS_V4=y |
| 1366 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1367 | CONFIG_NFSD=y | 1392 | CONFIG_NFSD=y |
| 1368 | # CONFIG_NFSD_V3 is not set | 1393 | # CONFIG_NFSD_V3 is not set |
| 1369 | CONFIG_NFSD_TCP=y | 1394 | # CONFIG_NFSD_V4 is not set |
| 1370 | CONFIG_ROOT_NFS=y | 1395 | CONFIG_ROOT_NFS=y |
| 1371 | CONFIG_LOCKD=y | 1396 | CONFIG_LOCKD=y |
| 1372 | CONFIG_LOCKD_V4=y | 1397 | CONFIG_LOCKD_V4=y |
| @@ -1450,9 +1475,10 @@ CONFIG_NLS_UTF8=m | |||
| 1450 | # Library routines | 1475 | # Library routines |
| 1451 | # | 1476 | # |
| 1452 | CONFIG_BITREVERSE=y | 1477 | CONFIG_BITREVERSE=y |
| 1478 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1453 | # CONFIG_CRC_CCITT is not set | 1479 | # CONFIG_CRC_CCITT is not set |
| 1454 | # CONFIG_CRC16 is not set | 1480 | # CONFIG_CRC16 is not set |
| 1455 | # CONFIG_CRC_ITU_T is not set | 1481 | CONFIG_CRC_ITU_T=m |
| 1456 | CONFIG_CRC32=y | 1482 | CONFIG_CRC32=y |
| 1457 | # CONFIG_CRC7 is not set | 1483 | # CONFIG_CRC7 is not set |
| 1458 | CONFIG_LIBCRC32C=m | 1484 | CONFIG_LIBCRC32C=m |
| @@ -1469,6 +1495,7 @@ CONFIG_HAVE_LMB=y | |||
| 1469 | # CONFIG_PRINTK_TIME is not set | 1495 | # CONFIG_PRINTK_TIME is not set |
| 1470 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1496 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1471 | CONFIG_ENABLE_MUST_CHECK=y | 1497 | CONFIG_ENABLE_MUST_CHECK=y |
| 1498 | CONFIG_FRAME_WARN=1024 | ||
| 1472 | # CONFIG_MAGIC_SYSRQ is not set | 1499 | # CONFIG_MAGIC_SYSRQ is not set |
| 1473 | # CONFIG_UNUSED_SYMBOLS is not set | 1500 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1474 | # CONFIG_DEBUG_FS is not set | 1501 | # CONFIG_DEBUG_FS is not set |
| @@ -1479,6 +1506,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1479 | CONFIG_SCHED_DEBUG=y | 1506 | CONFIG_SCHED_DEBUG=y |
| 1480 | # CONFIG_SCHEDSTATS is not set | 1507 | # CONFIG_SCHEDSTATS is not set |
| 1481 | # CONFIG_TIMER_STATS is not set | 1508 | # CONFIG_TIMER_STATS is not set |
| 1509 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1482 | # CONFIG_SLUB_DEBUG_ON is not set | 1510 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1483 | # CONFIG_SLUB_STATS is not set | 1511 | # CONFIG_SLUB_STATS is not set |
| 1484 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1512 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1492,6 +1520,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1492 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1520 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1493 | CONFIG_DEBUG_INFO=y | 1521 | CONFIG_DEBUG_INFO=y |
| 1494 | # CONFIG_DEBUG_VM is not set | 1522 | # CONFIG_DEBUG_VM is not set |
| 1523 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1495 | # CONFIG_DEBUG_LIST is not set | 1524 | # CONFIG_DEBUG_LIST is not set |
| 1496 | # CONFIG_DEBUG_SG is not set | 1525 | # CONFIG_DEBUG_SG is not set |
| 1497 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1526 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1503,6 +1532,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1503 | # CONFIG_DEBUG_STACK_USAGE is not set | 1532 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1504 | # CONFIG_DEBUG_PAGEALLOC is not set | 1533 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1505 | # CONFIG_DEBUGGER is not set | 1534 | # CONFIG_DEBUGGER is not set |
| 1535 | # CONFIG_IRQSTACKS is not set | ||
| 1506 | # CONFIG_BDI_SWITCH is not set | 1536 | # CONFIG_BDI_SWITCH is not set |
| 1507 | # CONFIG_PPC_EARLY_DEBUG is not set | 1537 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1508 | 1538 | ||
| @@ -1513,52 +1543,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1513 | # CONFIG_SECURITY is not set | 1543 | # CONFIG_SECURITY is not set |
| 1514 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1544 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1515 | CONFIG_CRYPTO=y | 1545 | CONFIG_CRYPTO=y |
| 1546 | |||
| 1547 | # | ||
| 1548 | # Crypto core or helper | ||
| 1549 | # | ||
| 1516 | CONFIG_CRYPTO_ALGAPI=y | 1550 | CONFIG_CRYPTO_ALGAPI=y |
| 1517 | CONFIG_CRYPTO_BLKCIPHER=y | 1551 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1518 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1519 | CONFIG_CRYPTO_HASH=y | 1552 | CONFIG_CRYPTO_HASH=y |
| 1520 | CONFIG_CRYPTO_MANAGER=y | 1553 | CONFIG_CRYPTO_MANAGER=y |
| 1554 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1555 | # CONFIG_CRYPTO_NULL is not set | ||
| 1556 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1557 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1558 | # CONFIG_CRYPTO_TEST is not set | ||
| 1559 | |||
| 1560 | # | ||
| 1561 | # Authenticated Encryption with Associated Data | ||
| 1562 | # | ||
| 1563 | # CONFIG_CRYPTO_CCM is not set | ||
| 1564 | # CONFIG_CRYPTO_GCM is not set | ||
| 1565 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1566 | |||
| 1567 | # | ||
| 1568 | # Block modes | ||
| 1569 | # | ||
| 1570 | CONFIG_CRYPTO_CBC=y | ||
| 1571 | # CONFIG_CRYPTO_CTR is not set | ||
| 1572 | # CONFIG_CRYPTO_CTS is not set | ||
| 1573 | # CONFIG_CRYPTO_ECB is not set | ||
| 1574 | # CONFIG_CRYPTO_LRW is not set | ||
| 1575 | CONFIG_CRYPTO_PCBC=m | ||
| 1576 | # CONFIG_CRYPTO_XTS is not set | ||
| 1577 | |||
| 1578 | # | ||
| 1579 | # Hash modes | ||
| 1580 | # | ||
| 1521 | CONFIG_CRYPTO_HMAC=y | 1581 | CONFIG_CRYPTO_HMAC=y |
| 1522 | # CONFIG_CRYPTO_XCBC is not set | 1582 | # CONFIG_CRYPTO_XCBC is not set |
| 1523 | # CONFIG_CRYPTO_NULL is not set | 1583 | |
| 1584 | # | ||
| 1585 | # Digest | ||
| 1586 | # | ||
| 1587 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1524 | # CONFIG_CRYPTO_MD4 is not set | 1588 | # CONFIG_CRYPTO_MD4 is not set |
| 1525 | CONFIG_CRYPTO_MD5=y | 1589 | CONFIG_CRYPTO_MD5=y |
| 1590 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1526 | CONFIG_CRYPTO_SHA1=m | 1591 | CONFIG_CRYPTO_SHA1=m |
| 1527 | # CONFIG_CRYPTO_SHA256 is not set | 1592 | # CONFIG_CRYPTO_SHA256 is not set |
| 1528 | # CONFIG_CRYPTO_SHA512 is not set | 1593 | # CONFIG_CRYPTO_SHA512 is not set |
| 1529 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1530 | # CONFIG_CRYPTO_TGR192 is not set | 1594 | # CONFIG_CRYPTO_TGR192 is not set |
| 1531 | # CONFIG_CRYPTO_GF128MUL is not set | 1595 | # CONFIG_CRYPTO_WP512 is not set |
| 1532 | # CONFIG_CRYPTO_ECB is not set | 1596 | |
| 1533 | CONFIG_CRYPTO_CBC=y | 1597 | # |
| 1534 | CONFIG_CRYPTO_PCBC=m | 1598 | # Ciphers |
| 1535 | # CONFIG_CRYPTO_LRW is not set | 1599 | # |
| 1536 | # CONFIG_CRYPTO_XTS is not set | ||
| 1537 | # CONFIG_CRYPTO_CTR is not set | ||
| 1538 | # CONFIG_CRYPTO_GCM is not set | ||
| 1539 | # CONFIG_CRYPTO_CCM is not set | ||
| 1540 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1541 | CONFIG_CRYPTO_DES=y | ||
| 1542 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1543 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1544 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1545 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1546 | # CONFIG_CRYPTO_AES is not set | 1600 | # CONFIG_CRYPTO_AES is not set |
| 1601 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1602 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1603 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1604 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1547 | # CONFIG_CRYPTO_CAST5 is not set | 1605 | # CONFIG_CRYPTO_CAST5 is not set |
| 1548 | # CONFIG_CRYPTO_CAST6 is not set | 1606 | # CONFIG_CRYPTO_CAST6 is not set |
| 1549 | # CONFIG_CRYPTO_TEA is not set | 1607 | CONFIG_CRYPTO_DES=y |
| 1550 | # CONFIG_CRYPTO_ARC4 is not set | 1608 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1551 | # CONFIG_CRYPTO_KHAZAD is not set | 1609 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1552 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1553 | # CONFIG_CRYPTO_SEED is not set | ||
| 1554 | # CONFIG_CRYPTO_SALSA20 is not set | 1610 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1611 | # CONFIG_CRYPTO_SEED is not set | ||
| 1612 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1613 | # CONFIG_CRYPTO_TEA is not set | ||
| 1614 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1615 | |||
| 1616 | # | ||
| 1617 | # Compression | ||
| 1618 | # | ||
| 1555 | # CONFIG_CRYPTO_DEFLATE is not set | 1619 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1556 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1557 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1558 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1559 | # CONFIG_CRYPTO_TEST is not set | ||
| 1560 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1561 | # CONFIG_CRYPTO_LZO is not set | 1620 | # CONFIG_CRYPTO_LZO is not set |
| 1562 | CONFIG_CRYPTO_HW=y | 1621 | CONFIG_CRYPTO_HW=y |
| 1563 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1622 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1564 | # CONFIG_PPC_CLOCK is not set | 1623 | # CONFIG_PPC_CLOCK is not set |
| 1624 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig index 851ac9115617..e19592b42043 100644 --- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:27 2008 | 4 | # Mon Jun 9 08:52:33 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC8560_ADS=y | |||
| 153 | # CONFIG_MPC85xx_CDS is not set | 157 | # CONFIG_MPC85xx_CDS is not set |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | # CONFIG_PROC_DEVICETREE is not set | 225 | # CONFIG_PROC_DEVICETREE is not set |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -238,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 238 | CONFIG_PCI_DEBUG=y | 245 | CONFIG_PCI_DEBUG=y |
| 239 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 240 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 241 | 249 | ||
| 242 | # | 250 | # |
| 243 | # Advanced setup | 251 | # Advanced setup |
| @@ -247,11 +255,12 @@ CONFIG_PCI_DEBUG=y | |||
| 247 | # | 255 | # |
| 248 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 249 | # | 257 | # |
| 250 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 251 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 252 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 262 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 253 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 254 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 255 | 264 | ||
| 256 | # | 265 | # |
| 257 | # Networking | 266 | # Networking |
| @@ -299,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -462,7 +469,6 @@ CONFIG_E1000_NAPI=y | |||
| 462 | # CONFIG_SIS190 is not set | 469 | # CONFIG_SIS190 is not set |
| 463 | # CONFIG_SKGE is not set | 470 | # CONFIG_SKGE is not set |
| 464 | # CONFIG_SKY2 is not set | 471 | # CONFIG_SKY2 is not set |
| 465 | # CONFIG_SK98LIN is not set | ||
| 466 | # CONFIG_VIA_VELOCITY is not set | 472 | # CONFIG_VIA_VELOCITY is not set |
| 467 | # CONFIG_TIGON3 is not set | 473 | # CONFIG_TIGON3 is not set |
| 468 | # CONFIG_BNX2 is not set | 474 | # CONFIG_BNX2 is not set |
| @@ -482,6 +488,7 @@ CONFIG_NETDEV_10000=y | |||
| 482 | # CONFIG_MLX4_CORE is not set | 488 | # CONFIG_MLX4_CORE is not set |
| 483 | # CONFIG_TEHUTI is not set | 489 | # CONFIG_TEHUTI is not set |
| 484 | # CONFIG_BNX2X is not set | 490 | # CONFIG_BNX2X is not set |
| 491 | # CONFIG_SFC is not set | ||
| 485 | # CONFIG_TR is not set | 492 | # CONFIG_TR is not set |
| 486 | 493 | ||
| 487 | # | 494 | # |
| @@ -489,6 +496,7 @@ CONFIG_NETDEV_10000=y | |||
| 489 | # | 496 | # |
| 490 | # CONFIG_WLAN_PRE80211 is not set | 497 | # CONFIG_WLAN_PRE80211 is not set |
| 491 | # CONFIG_WLAN_80211 is not set | 498 | # CONFIG_WLAN_80211 is not set |
| 499 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 492 | # CONFIG_WAN is not set | 500 | # CONFIG_WAN is not set |
| 493 | # CONFIG_FDDI is not set | 501 | # CONFIG_FDDI is not set |
| 494 | # CONFIG_HIPPI is not set | 502 | # CONFIG_HIPPI is not set |
| @@ -535,6 +543,7 @@ CONFIG_INPUT=y | |||
| 535 | # Character devices | 543 | # Character devices |
| 536 | # | 544 | # |
| 537 | # CONFIG_VT is not set | 545 | # CONFIG_VT is not set |
| 546 | CONFIG_DEVKMEM=y | ||
| 538 | # CONFIG_SERIAL_NONSTANDARD is not set | 547 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 539 | # CONFIG_NOZOMI is not set | 548 | # CONFIG_NOZOMI is not set |
| 540 | 549 | ||
| @@ -572,12 +581,7 @@ CONFIG_GEN_RTC=y | |||
| 572 | # CONFIG_TCG_TPM is not set | 581 | # CONFIG_TCG_TPM is not set |
| 573 | CONFIG_DEVPORT=y | 582 | CONFIG_DEVPORT=y |
| 574 | # CONFIG_I2C is not set | 583 | # CONFIG_I2C is not set |
| 575 | |||
| 576 | # | ||
| 577 | # SPI support | ||
| 578 | # | ||
| 579 | # CONFIG_SPI is not set | 584 | # CONFIG_SPI is not set |
| 580 | # CONFIG_SPI_MASTER is not set | ||
| 581 | # CONFIG_W1 is not set | 585 | # CONFIG_W1 is not set |
| 582 | # CONFIG_POWER_SUPPLY is not set | 586 | # CONFIG_POWER_SUPPLY is not set |
| 583 | CONFIG_HWMON=y | 587 | CONFIG_HWMON=y |
| @@ -610,12 +614,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 610 | # Multifunction device drivers | 614 | # Multifunction device drivers |
| 611 | # | 615 | # |
| 612 | # CONFIG_MFD_SM501 is not set | 616 | # CONFIG_MFD_SM501 is not set |
| 617 | # CONFIG_HTC_PASIC3 is not set | ||
| 613 | 618 | ||
| 614 | # | 619 | # |
| 615 | # Multimedia devices | 620 | # Multimedia devices |
| 616 | # | 621 | # |
| 622 | |||
| 623 | # | ||
| 624 | # Multimedia core support | ||
| 625 | # | ||
| 617 | # CONFIG_VIDEO_DEV is not set | 626 | # CONFIG_VIDEO_DEV is not set |
| 618 | # CONFIG_DVB_CORE is not set | 627 | # CONFIG_DVB_CORE is not set |
| 628 | # CONFIG_VIDEO_MEDIA is not set | ||
| 629 | |||
| 630 | # | ||
| 631 | # Multimedia drivers | ||
| 632 | # | ||
| 619 | CONFIG_DAB=y | 633 | CONFIG_DAB=y |
| 620 | 634 | ||
| 621 | # | 635 | # |
| @@ -646,6 +660,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 646 | CONFIG_USB_ARCH_HAS_OHCI=y | 660 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 647 | CONFIG_USB_ARCH_HAS_EHCI=y | 661 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 648 | # CONFIG_USB is not set | 662 | # CONFIG_USB is not set |
| 663 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 664 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 649 | 665 | ||
| 650 | # | 666 | # |
| 651 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 667 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -654,14 +670,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 654 | # CONFIG_MMC is not set | 670 | # CONFIG_MMC is not set |
| 655 | # CONFIG_MEMSTICK is not set | 671 | # CONFIG_MEMSTICK is not set |
| 656 | # CONFIG_NEW_LEDS is not set | 672 | # CONFIG_NEW_LEDS is not set |
| 673 | # CONFIG_ACCESSIBILITY is not set | ||
| 657 | # CONFIG_INFINIBAND is not set | 674 | # CONFIG_INFINIBAND is not set |
| 658 | # CONFIG_EDAC is not set | 675 | # CONFIG_EDAC is not set |
| 659 | # CONFIG_RTC_CLASS is not set | 676 | # CONFIG_RTC_CLASS is not set |
| 660 | # CONFIG_DMADEVICES is not set | 677 | # CONFIG_DMADEVICES is not set |
| 661 | |||
| 662 | # | ||
| 663 | # Userspace I/O | ||
| 664 | # | ||
| 665 | # CONFIG_UIO is not set | 678 | # CONFIG_UIO is not set |
| 666 | 679 | ||
| 667 | # | 680 | # |
| @@ -681,7 +694,6 @@ CONFIG_FS_MBCACHE=y | |||
| 681 | # CONFIG_JFS_FS is not set | 694 | # CONFIG_JFS_FS is not set |
| 682 | # CONFIG_FS_POSIX_ACL is not set | 695 | # CONFIG_FS_POSIX_ACL is not set |
| 683 | # CONFIG_XFS_FS is not set | 696 | # CONFIG_XFS_FS is not set |
| 684 | # CONFIG_GFS2_FS is not set | ||
| 685 | # CONFIG_OCFS2_FS is not set | 697 | # CONFIG_OCFS2_FS is not set |
| 686 | CONFIG_DNOTIFY=y | 698 | CONFIG_DNOTIFY=y |
| 687 | CONFIG_INOTIFY=y | 699 | CONFIG_INOTIFY=y |
| @@ -738,7 +750,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 738 | CONFIG_NFS_FS=y | 750 | CONFIG_NFS_FS=y |
| 739 | # CONFIG_NFS_V3 is not set | 751 | # CONFIG_NFS_V3 is not set |
| 740 | # CONFIG_NFS_V4 is not set | 752 | # CONFIG_NFS_V4 is not set |
| 741 | # CONFIG_NFS_DIRECTIO is not set | ||
| 742 | # CONFIG_NFSD is not set | 753 | # CONFIG_NFSD is not set |
| 743 | CONFIG_ROOT_NFS=y | 754 | CONFIG_ROOT_NFS=y |
| 744 | CONFIG_LOCKD=y | 755 | CONFIG_LOCKD=y |
| @@ -777,6 +788,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 777 | # Library routines | 788 | # Library routines |
| 778 | # | 789 | # |
| 779 | CONFIG_BITREVERSE=y | 790 | CONFIG_BITREVERSE=y |
| 791 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 780 | # CONFIG_CRC_CCITT is not set | 792 | # CONFIG_CRC_CCITT is not set |
| 781 | # CONFIG_CRC16 is not set | 793 | # CONFIG_CRC16 is not set |
| 782 | # CONFIG_CRC_ITU_T is not set | 794 | # CONFIG_CRC_ITU_T is not set |
| @@ -787,6 +799,7 @@ CONFIG_PLIST=y | |||
| 787 | CONFIG_HAS_IOMEM=y | 799 | CONFIG_HAS_IOMEM=y |
| 788 | CONFIG_HAS_IOPORT=y | 800 | CONFIG_HAS_IOPORT=y |
| 789 | CONFIG_HAS_DMA=y | 801 | CONFIG_HAS_DMA=y |
| 802 | CONFIG_HAVE_LMB=y | ||
| 790 | 803 | ||
| 791 | # | 804 | # |
| 792 | # Kernel hacking | 805 | # Kernel hacking |
| @@ -794,6 +807,7 @@ CONFIG_HAS_DMA=y | |||
| 794 | # CONFIG_PRINTK_TIME is not set | 807 | # CONFIG_PRINTK_TIME is not set |
| 795 | CONFIG_ENABLE_WARN_DEPRECATED=y | 808 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 796 | CONFIG_ENABLE_MUST_CHECK=y | 809 | CONFIG_ENABLE_MUST_CHECK=y |
| 810 | CONFIG_FRAME_WARN=1024 | ||
| 797 | # CONFIG_MAGIC_SYSRQ is not set | 811 | # CONFIG_MAGIC_SYSRQ is not set |
| 798 | # CONFIG_UNUSED_SYMBOLS is not set | 812 | # CONFIG_UNUSED_SYMBOLS is not set |
| 799 | # CONFIG_DEBUG_FS is not set | 813 | # CONFIG_DEBUG_FS is not set |
| @@ -804,6 +818,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 804 | CONFIG_SCHED_DEBUG=y | 818 | CONFIG_SCHED_DEBUG=y |
| 805 | # CONFIG_SCHEDSTATS is not set | 819 | # CONFIG_SCHEDSTATS is not set |
| 806 | # CONFIG_TIMER_STATS is not set | 820 | # CONFIG_TIMER_STATS is not set |
| 821 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 807 | # CONFIG_SLUB_DEBUG_ON is not set | 822 | # CONFIG_SLUB_DEBUG_ON is not set |
| 808 | # CONFIG_SLUB_STATS is not set | 823 | # CONFIG_SLUB_STATS is not set |
| 809 | # CONFIG_DEBUG_RT_MUTEXES is not set | 824 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -816,6 +831,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 816 | # CONFIG_DEBUG_BUGVERBOSE is not set | 831 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 817 | # CONFIG_DEBUG_INFO is not set | 832 | # CONFIG_DEBUG_INFO is not set |
| 818 | # CONFIG_DEBUG_VM is not set | 833 | # CONFIG_DEBUG_VM is not set |
| 834 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 819 | # CONFIG_DEBUG_LIST is not set | 835 | # CONFIG_DEBUG_LIST is not set |
| 820 | # CONFIG_DEBUG_SG is not set | 836 | # CONFIG_DEBUG_SG is not set |
| 821 | # CONFIG_BOOT_PRINTK_DELAY is not set | 837 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -827,6 +843,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 827 | # CONFIG_DEBUG_PAGEALLOC is not set | 843 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 828 | # CONFIG_DEBUGGER is not set | 844 | # CONFIG_DEBUGGER is not set |
| 829 | # CONFIG_KGDB_CONSOLE is not set | 845 | # CONFIG_KGDB_CONSOLE is not set |
| 846 | # CONFIG_IRQSTACKS is not set | ||
| 830 | # CONFIG_BDI_SWITCH is not set | 847 | # CONFIG_BDI_SWITCH is not set |
| 831 | # CONFIG_PPC_EARLY_DEBUG is not set | 848 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 832 | 849 | ||
| @@ -837,49 +854,79 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 837 | # CONFIG_SECURITY is not set | 854 | # CONFIG_SECURITY is not set |
| 838 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 855 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 839 | CONFIG_CRYPTO=y | 856 | CONFIG_CRYPTO=y |
| 840 | # CONFIG_CRYPTO_SEQIV is not set | 857 | |
| 858 | # | ||
| 859 | # Crypto core or helper | ||
| 860 | # | ||
| 841 | # CONFIG_CRYPTO_MANAGER is not set | 861 | # CONFIG_CRYPTO_MANAGER is not set |
| 862 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 863 | # CONFIG_CRYPTO_NULL is not set | ||
| 864 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 865 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 866 | |||
| 867 | # | ||
| 868 | # Authenticated Encryption with Associated Data | ||
| 869 | # | ||
| 870 | # CONFIG_CRYPTO_CCM is not set | ||
| 871 | # CONFIG_CRYPTO_GCM is not set | ||
| 872 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 873 | |||
| 874 | # | ||
| 875 | # Block modes | ||
| 876 | # | ||
| 877 | # CONFIG_CRYPTO_CBC is not set | ||
| 878 | # CONFIG_CRYPTO_CTR is not set | ||
| 879 | # CONFIG_CRYPTO_CTS is not set | ||
| 880 | # CONFIG_CRYPTO_ECB is not set | ||
| 881 | # CONFIG_CRYPTO_LRW is not set | ||
| 882 | # CONFIG_CRYPTO_PCBC is not set | ||
| 883 | # CONFIG_CRYPTO_XTS is not set | ||
| 884 | |||
| 885 | # | ||
| 886 | # Hash modes | ||
| 887 | # | ||
| 842 | # CONFIG_CRYPTO_HMAC is not set | 888 | # CONFIG_CRYPTO_HMAC is not set |
| 843 | # CONFIG_CRYPTO_XCBC is not set | 889 | # CONFIG_CRYPTO_XCBC is not set |
| 844 | # CONFIG_CRYPTO_NULL is not set | 890 | |
| 891 | # | ||
| 892 | # Digest | ||
| 893 | # | ||
| 894 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 845 | # CONFIG_CRYPTO_MD4 is not set | 895 | # CONFIG_CRYPTO_MD4 is not set |
| 846 | # CONFIG_CRYPTO_MD5 is not set | 896 | # CONFIG_CRYPTO_MD5 is not set |
| 897 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 847 | # CONFIG_CRYPTO_SHA1 is not set | 898 | # CONFIG_CRYPTO_SHA1 is not set |
| 848 | # CONFIG_CRYPTO_SHA256 is not set | 899 | # CONFIG_CRYPTO_SHA256 is not set |
| 849 | # CONFIG_CRYPTO_SHA512 is not set | 900 | # CONFIG_CRYPTO_SHA512 is not set |
| 850 | # CONFIG_CRYPTO_WP512 is not set | ||
| 851 | # CONFIG_CRYPTO_TGR192 is not set | 901 | # CONFIG_CRYPTO_TGR192 is not set |
| 852 | # CONFIG_CRYPTO_GF128MUL is not set | 902 | # CONFIG_CRYPTO_WP512 is not set |
| 853 | # CONFIG_CRYPTO_ECB is not set | 903 | |
| 854 | # CONFIG_CRYPTO_CBC is not set | 904 | # |
| 855 | # CONFIG_CRYPTO_PCBC is not set | 905 | # Ciphers |
| 856 | # CONFIG_CRYPTO_LRW is not set | 906 | # |
| 857 | # CONFIG_CRYPTO_XTS is not set | ||
| 858 | # CONFIG_CRYPTO_CTR is not set | ||
| 859 | # CONFIG_CRYPTO_GCM is not set | ||
| 860 | # CONFIG_CRYPTO_CCM is not set | ||
| 861 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 862 | # CONFIG_CRYPTO_DES is not set | ||
| 863 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 864 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 865 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 866 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 867 | # CONFIG_CRYPTO_AES is not set | 907 | # CONFIG_CRYPTO_AES is not set |
| 908 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 909 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 910 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 911 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 868 | # CONFIG_CRYPTO_CAST5 is not set | 912 | # CONFIG_CRYPTO_CAST5 is not set |
| 869 | # CONFIG_CRYPTO_CAST6 is not set | 913 | # CONFIG_CRYPTO_CAST6 is not set |
| 870 | # CONFIG_CRYPTO_TEA is not set | 914 | # CONFIG_CRYPTO_DES is not set |
| 871 | # CONFIG_CRYPTO_ARC4 is not set | 915 | # CONFIG_CRYPTO_FCRYPT is not set |
| 872 | # CONFIG_CRYPTO_KHAZAD is not set | 916 | # CONFIG_CRYPTO_KHAZAD is not set |
| 873 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 874 | # CONFIG_CRYPTO_SEED is not set | ||
| 875 | # CONFIG_CRYPTO_SALSA20 is not set | 917 | # CONFIG_CRYPTO_SALSA20 is not set |
| 918 | # CONFIG_CRYPTO_SEED is not set | ||
| 919 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 920 | # CONFIG_CRYPTO_TEA is not set | ||
| 921 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 922 | |||
| 923 | # | ||
| 924 | # Compression | ||
| 925 | # | ||
| 876 | # CONFIG_CRYPTO_DEFLATE is not set | 926 | # CONFIG_CRYPTO_DEFLATE is not set |
| 877 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 878 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 879 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 880 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 881 | # CONFIG_CRYPTO_LZO is not set | 927 | # CONFIG_CRYPTO_LZO is not set |
| 882 | CONFIG_CRYPTO_HW=y | 928 | CONFIG_CRYPTO_HW=y |
| 883 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 929 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 884 | # CONFIG_PPC_CLOCK is not set | 930 | # CONFIG_PPC_CLOCK is not set |
| 885 | CONFIG_PPC_LIB_RHEAP=y | 931 | CONFIG_PPC_LIB_RHEAP=y |
| 932 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig index 2b866b385607..28004e93aeee 100644 --- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:05 2008 | 4 | # Mon Jun 9 08:52:34 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,12 +114,14 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -156,6 +161,7 @@ CONFIG_MPC85xx=y | |||
| 156 | # CONFIG_MPC85xx_CDS is not set | 161 | # CONFIG_MPC85xx_CDS is not set |
| 157 | CONFIG_MPC85xx_MDS=y | 162 | CONFIG_MPC85xx_MDS=y |
| 158 | # CONFIG_MPC85xx_DS is not set | 163 | # CONFIG_MPC85xx_DS is not set |
| 164 | # CONFIG_KSI8560 is not set | ||
| 159 | # CONFIG_STX_GP3 is not set | 165 | # CONFIG_STX_GP3 is not set |
| 160 | # CONFIG_TQM8540 is not set | 166 | # CONFIG_TQM8540 is not set |
| 161 | # CONFIG_TQM8541 is not set | 167 | # CONFIG_TQM8541 is not set |
| @@ -212,11 +218,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 218 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 219 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 221 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 223 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 226 | CONFIG_VIRT_TO_BUS=y |
| 227 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 228 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 229 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 230 | # CONFIG_PM is not set |
| @@ -240,6 +248,7 @@ CONFIG_PCI_LEGACY=y | |||
| 240 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
| 241 | # CONFIG_PCCARD is not set | 249 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HOTPLUG_PCI is not set | 250 | # CONFIG_HOTPLUG_PCI is not set |
| 251 | # CONFIG_HAS_RAPIDIO is not set | ||
| 243 | 252 | ||
| 244 | # | 253 | # |
| 245 | # Advanced setup | 254 | # Advanced setup |
| @@ -249,11 +258,12 @@ CONFIG_PCI_LEGACY=y | |||
| 249 | # | 258 | # |
| 250 | # Default settings for advanced configuration options are used | 259 | # Default settings for advanced configuration options are used |
| 251 | # | 260 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 261 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 262 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 263 | CONFIG_KERNEL_START=0xc0000000 |
| 264 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 265 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 267 | ||
| 258 | # | 268 | # |
| 259 | # Networking | 269 | # Networking |
| @@ -301,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 301 | CONFIG_DEFAULT_TCP_CONG="cubic" | 311 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 302 | # CONFIG_TCP_MD5SIG is not set | 312 | # CONFIG_TCP_MD5SIG is not set |
| 303 | # CONFIG_IPV6 is not set | 313 | # CONFIG_IPV6 is not set |
| 304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 305 | # CONFIG_INET6_TUNNEL is not set | ||
| 306 | # CONFIG_NETWORK_SECMARK is not set | 314 | # CONFIG_NETWORK_SECMARK is not set |
| 307 | # CONFIG_NETFILTER is not set | 315 | # CONFIG_NETFILTER is not set |
| 308 | # CONFIG_IP_DCCP is not set | 316 | # CONFIG_IP_DCCP is not set |
| @@ -358,6 +366,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 358 | # CONFIG_CONNECTOR is not set | 366 | # CONFIG_CONNECTOR is not set |
| 359 | # CONFIG_MTD is not set | 367 | # CONFIG_MTD is not set |
| 360 | CONFIG_OF_DEVICE=y | 368 | CONFIG_OF_DEVICE=y |
| 369 | CONFIG_OF_I2C=y | ||
| 361 | # CONFIG_PARPORT is not set | 370 | # CONFIG_PARPORT is not set |
| 362 | CONFIG_BLK_DEV=y | 371 | CONFIG_BLK_DEV=y |
| 363 | # CONFIG_BLK_DEV_FD is not set | 372 | # CONFIG_BLK_DEV_FD is not set |
| @@ -525,7 +534,6 @@ CONFIG_NETDEV_1000=y | |||
| 525 | # CONFIG_SIS190 is not set | 534 | # CONFIG_SIS190 is not set |
| 526 | # CONFIG_SKGE is not set | 535 | # CONFIG_SKGE is not set |
| 527 | # CONFIG_SKY2 is not set | 536 | # CONFIG_SKY2 is not set |
| 528 | # CONFIG_SK98LIN is not set | ||
| 529 | # CONFIG_VIA_VELOCITY is not set | 537 | # CONFIG_VIA_VELOCITY is not set |
| 530 | # CONFIG_TIGON3 is not set | 538 | # CONFIG_TIGON3 is not set |
| 531 | # CONFIG_BNX2 is not set | 539 | # CONFIG_BNX2 is not set |
| @@ -546,6 +554,7 @@ CONFIG_NETDEV_10000=y | |||
| 546 | # CONFIG_MLX4_CORE is not set | 554 | # CONFIG_MLX4_CORE is not set |
| 547 | # CONFIG_TEHUTI is not set | 555 | # CONFIG_TEHUTI is not set |
| 548 | # CONFIG_BNX2X is not set | 556 | # CONFIG_BNX2X is not set |
| 557 | # CONFIG_SFC is not set | ||
| 549 | # CONFIG_TR is not set | 558 | # CONFIG_TR is not set |
| 550 | 559 | ||
| 551 | # | 560 | # |
| @@ -553,6 +562,7 @@ CONFIG_NETDEV_10000=y | |||
| 553 | # | 562 | # |
| 554 | # CONFIG_WLAN_PRE80211 is not set | 563 | # CONFIG_WLAN_PRE80211 is not set |
| 555 | # CONFIG_WLAN_80211 is not set | 564 | # CONFIG_WLAN_80211 is not set |
| 565 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 556 | # CONFIG_WAN is not set | 566 | # CONFIG_WAN is not set |
| 557 | # CONFIG_FDDI is not set | 567 | # CONFIG_FDDI is not set |
| 558 | # CONFIG_HIPPI is not set | 568 | # CONFIG_HIPPI is not set |
| @@ -600,6 +610,7 @@ CONFIG_INPUT=y | |||
| 600 | # Character devices | 610 | # Character devices |
| 601 | # | 611 | # |
| 602 | # CONFIG_VT is not set | 612 | # CONFIG_VT is not set |
| 613 | CONFIG_DEVKMEM=y | ||
| 603 | # CONFIG_SERIAL_NONSTANDARD is not set | 614 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 604 | # CONFIG_NOZOMI is not set | 615 | # CONFIG_NOZOMI is not set |
| 605 | 616 | ||
| @@ -629,7 +640,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 629 | # CONFIG_IPMI_HANDLER is not set | 640 | # CONFIG_IPMI_HANDLER is not set |
| 630 | CONFIG_HW_RANDOM=y | 641 | CONFIG_HW_RANDOM=y |
| 631 | # CONFIG_NVRAM is not set | 642 | # CONFIG_NVRAM is not set |
| 632 | # CONFIG_GEN_RTC is not set | ||
| 633 | # CONFIG_R3964 is not set | 643 | # CONFIG_R3964 is not set |
| 634 | # CONFIG_APPLICOM is not set | 644 | # CONFIG_APPLICOM is not set |
| 635 | # CONFIG_RAW_DRIVER is not set | 645 | # CONFIG_RAW_DRIVER is not set |
| @@ -640,13 +650,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 640 | CONFIG_I2C_CHARDEV=y | 650 | CONFIG_I2C_CHARDEV=y |
| 641 | 651 | ||
| 642 | # | 652 | # |
| 643 | # I2C Algorithms | ||
| 644 | # | ||
| 645 | # CONFIG_I2C_ALGOBIT is not set | ||
| 646 | # CONFIG_I2C_ALGOPCF is not set | ||
| 647 | # CONFIG_I2C_ALGOPCA is not set | ||
| 648 | |||
| 649 | # | ||
| 650 | # I2C Hardware Bus support | 653 | # I2C Hardware Bus support |
| 651 | # | 654 | # |
| 652 | # CONFIG_I2C_ALI1535 is not set | 655 | # CONFIG_I2C_ALI1535 is not set |
| @@ -672,6 +675,7 @@ CONFIG_I2C_MPC=y | |||
| 672 | # CONFIG_I2C_VIA is not set | 675 | # CONFIG_I2C_VIA is not set |
| 673 | # CONFIG_I2C_VIAPRO is not set | 676 | # CONFIG_I2C_VIAPRO is not set |
| 674 | # CONFIG_I2C_VOODOO3 is not set | 677 | # CONFIG_I2C_VOODOO3 is not set |
| 678 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 675 | 679 | ||
| 676 | # | 680 | # |
| 677 | # Miscellaneous I2C Chip support | 681 | # Miscellaneous I2C Chip support |
| @@ -681,19 +685,13 @@ CONFIG_I2C_MPC=y | |||
| 681 | # CONFIG_SENSORS_PCF8574 is not set | 685 | # CONFIG_SENSORS_PCF8574 is not set |
| 682 | # CONFIG_PCF8575 is not set | 686 | # CONFIG_PCF8575 is not set |
| 683 | # CONFIG_SENSORS_PCF8591 is not set | 687 | # CONFIG_SENSORS_PCF8591 is not set |
| 684 | # CONFIG_TPS65010 is not set | ||
| 685 | # CONFIG_SENSORS_MAX6875 is not set | 688 | # CONFIG_SENSORS_MAX6875 is not set |
| 686 | # CONFIG_SENSORS_TSL2550 is not set | 689 | # CONFIG_SENSORS_TSL2550 is not set |
| 687 | # CONFIG_I2C_DEBUG_CORE is not set | 690 | # CONFIG_I2C_DEBUG_CORE is not set |
| 688 | # CONFIG_I2C_DEBUG_ALGO is not set | 691 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 689 | # CONFIG_I2C_DEBUG_BUS is not set | 692 | # CONFIG_I2C_DEBUG_BUS is not set |
| 690 | # CONFIG_I2C_DEBUG_CHIP is not set | 693 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 691 | |||
| 692 | # | ||
| 693 | # SPI support | ||
| 694 | # | ||
| 695 | # CONFIG_SPI is not set | 694 | # CONFIG_SPI is not set |
| 696 | # CONFIG_SPI_MASTER is not set | ||
| 697 | # CONFIG_W1 is not set | 695 | # CONFIG_W1 is not set |
| 698 | # CONFIG_POWER_SUPPLY is not set | 696 | # CONFIG_POWER_SUPPLY is not set |
| 699 | CONFIG_HWMON=y | 697 | CONFIG_HWMON=y |
| @@ -776,12 +774,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 776 | # Multifunction device drivers | 774 | # Multifunction device drivers |
| 777 | # | 775 | # |
| 778 | # CONFIG_MFD_SM501 is not set | 776 | # CONFIG_MFD_SM501 is not set |
| 777 | # CONFIG_HTC_PASIC3 is not set | ||
| 779 | 778 | ||
| 780 | # | 779 | # |
| 781 | # Multimedia devices | 780 | # Multimedia devices |
| 782 | # | 781 | # |
| 782 | |||
| 783 | # | ||
| 784 | # Multimedia core support | ||
| 785 | # | ||
| 783 | # CONFIG_VIDEO_DEV is not set | 786 | # CONFIG_VIDEO_DEV is not set |
| 784 | # CONFIG_DVB_CORE is not set | 787 | # CONFIG_DVB_CORE is not set |
| 788 | # CONFIG_VIDEO_MEDIA is not set | ||
| 789 | |||
| 790 | # | ||
| 791 | # Multimedia drivers | ||
| 792 | # | ||
| 785 | CONFIG_DAB=y | 793 | CONFIG_DAB=y |
| 786 | 794 | ||
| 787 | # | 795 | # |
| @@ -812,6 +820,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 812 | CONFIG_USB_ARCH_HAS_OHCI=y | 820 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 813 | CONFIG_USB_ARCH_HAS_EHCI=y | 821 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 814 | # CONFIG_USB is not set | 822 | # CONFIG_USB is not set |
| 823 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 824 | # CONFIG_USB_OTG_BLACKLIST_HUB 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' |
| @@ -820,6 +830,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 820 | # CONFIG_MMC is not set | 830 | # CONFIG_MMC is not set |
| 821 | # CONFIG_MEMSTICK is not set | 831 | # CONFIG_MEMSTICK is not set |
| 822 | # CONFIG_NEW_LEDS is not set | 832 | # CONFIG_NEW_LEDS is not set |
| 833 | # CONFIG_ACCESSIBILITY is not set | ||
| 823 | # CONFIG_INFINIBAND is not set | 834 | # CONFIG_INFINIBAND is not set |
| 824 | # CONFIG_EDAC is not set | 835 | # CONFIG_EDAC is not set |
| 825 | CONFIG_RTC_LIB=y | 836 | CONFIG_RTC_LIB=y |
| @@ -871,11 +882,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 871 | # | 882 | # |
| 872 | # on-CPU RTC drivers | 883 | # on-CPU RTC drivers |
| 873 | # | 884 | # |
| 885 | # CONFIG_RTC_DRV_PPC is not set | ||
| 874 | # CONFIG_DMADEVICES is not set | 886 | # CONFIG_DMADEVICES is not set |
| 875 | |||
| 876 | # | ||
| 877 | # Userspace I/O | ||
| 878 | # | ||
| 879 | # CONFIG_UIO is not set | 887 | # CONFIG_UIO is not set |
| 880 | 888 | ||
| 881 | # | 889 | # |
| @@ -895,7 +903,6 @@ CONFIG_FS_MBCACHE=y | |||
| 895 | # CONFIG_JFS_FS is not set | 903 | # CONFIG_JFS_FS is not set |
| 896 | # CONFIG_FS_POSIX_ACL is not set | 904 | # CONFIG_FS_POSIX_ACL is not set |
| 897 | # CONFIG_XFS_FS is not set | 905 | # CONFIG_XFS_FS is not set |
| 898 | # CONFIG_GFS2_FS is not set | ||
| 899 | # CONFIG_OCFS2_FS is not set | 906 | # CONFIG_OCFS2_FS is not set |
| 900 | CONFIG_DNOTIFY=y | 907 | CONFIG_DNOTIFY=y |
| 901 | CONFIG_INOTIFY=y | 908 | CONFIG_INOTIFY=y |
| @@ -953,7 +960,6 @@ CONFIG_NFS_FS=y | |||
| 953 | CONFIG_NFS_V3=y | 960 | CONFIG_NFS_V3=y |
| 954 | # CONFIG_NFS_V3_ACL is not set | 961 | # CONFIG_NFS_V3_ACL is not set |
| 955 | CONFIG_NFS_V4=y | 962 | CONFIG_NFS_V4=y |
| 956 | # CONFIG_NFS_DIRECTIO is not set | ||
| 957 | # CONFIG_NFSD is not set | 963 | # CONFIG_NFSD is not set |
| 958 | CONFIG_ROOT_NFS=y | 964 | CONFIG_ROOT_NFS=y |
| 959 | CONFIG_LOCKD=y | 965 | CONFIG_LOCKD=y |
| @@ -994,6 +1000,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 994 | # Library routines | 1000 | # Library routines |
| 995 | # | 1001 | # |
| 996 | CONFIG_BITREVERSE=y | 1002 | CONFIG_BITREVERSE=y |
| 1003 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 997 | # CONFIG_CRC_CCITT is not set | 1004 | # CONFIG_CRC_CCITT is not set |
| 998 | # CONFIG_CRC16 is not set | 1005 | # CONFIG_CRC16 is not set |
| 999 | # CONFIG_CRC_ITU_T is not set | 1006 | # CONFIG_CRC_ITU_T is not set |
| @@ -1004,6 +1011,7 @@ CONFIG_PLIST=y | |||
| 1004 | CONFIG_HAS_IOMEM=y | 1011 | CONFIG_HAS_IOMEM=y |
| 1005 | CONFIG_HAS_IOPORT=y | 1012 | CONFIG_HAS_IOPORT=y |
| 1006 | CONFIG_HAS_DMA=y | 1013 | CONFIG_HAS_DMA=y |
| 1014 | CONFIG_HAVE_LMB=y | ||
| 1007 | 1015 | ||
| 1008 | # | 1016 | # |
| 1009 | # Kernel hacking | 1017 | # Kernel hacking |
| @@ -1011,6 +1019,7 @@ CONFIG_HAS_DMA=y | |||
| 1011 | # CONFIG_PRINTK_TIME is not set | 1019 | # CONFIG_PRINTK_TIME is not set |
| 1012 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1020 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1013 | CONFIG_ENABLE_MUST_CHECK=y | 1021 | CONFIG_ENABLE_MUST_CHECK=y |
| 1022 | CONFIG_FRAME_WARN=1024 | ||
| 1014 | # CONFIG_MAGIC_SYSRQ is not set | 1023 | # CONFIG_MAGIC_SYSRQ is not set |
| 1015 | # CONFIG_UNUSED_SYMBOLS is not set | 1024 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1016 | # CONFIG_DEBUG_FS is not set | 1025 | # CONFIG_DEBUG_FS is not set |
| @@ -1021,6 +1030,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1021 | CONFIG_SCHED_DEBUG=y | 1030 | CONFIG_SCHED_DEBUG=y |
| 1022 | # CONFIG_SCHEDSTATS is not set | 1031 | # CONFIG_SCHEDSTATS is not set |
| 1023 | # CONFIG_TIMER_STATS is not set | 1032 | # CONFIG_TIMER_STATS is not set |
| 1033 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1024 | # CONFIG_SLUB_DEBUG_ON is not set | 1034 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1025 | # CONFIG_SLUB_STATS is not set | 1035 | # CONFIG_SLUB_STATS is not set |
| 1026 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1036 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1033,6 +1043,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1033 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1043 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1034 | # CONFIG_DEBUG_INFO is not set | 1044 | # CONFIG_DEBUG_INFO is not set |
| 1035 | # CONFIG_DEBUG_VM is not set | 1045 | # CONFIG_DEBUG_VM is not set |
| 1046 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1036 | # CONFIG_DEBUG_LIST is not set | 1047 | # CONFIG_DEBUG_LIST is not set |
| 1037 | # CONFIG_DEBUG_SG is not set | 1048 | # CONFIG_DEBUG_SG is not set |
| 1038 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1049 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1045,6 +1056,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1045 | # CONFIG_DEBUG_PAGEALLOC is not set | 1056 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1046 | CONFIG_DEBUGGER=y | 1057 | CONFIG_DEBUGGER=y |
| 1047 | # CONFIG_XMON is not set | 1058 | # CONFIG_XMON is not set |
| 1059 | # CONFIG_IRQSTACKS is not set | ||
| 1048 | # CONFIG_BDI_SWITCH is not set | 1060 | # CONFIG_BDI_SWITCH is not set |
| 1049 | CONFIG_PPC_EARLY_DEBUG=y | 1061 | CONFIG_PPC_EARLY_DEBUG=y |
| 1050 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 1062 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
| @@ -1066,52 +1078,82 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
| 1066 | # CONFIG_SECURITY is not set | 1078 | # CONFIG_SECURITY is not set |
| 1067 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1079 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1068 | CONFIG_CRYPTO=y | 1080 | CONFIG_CRYPTO=y |
| 1081 | |||
| 1082 | # | ||
| 1083 | # Crypto core or helper | ||
| 1084 | # | ||
| 1069 | CONFIG_CRYPTO_ALGAPI=y | 1085 | CONFIG_CRYPTO_ALGAPI=y |
| 1070 | CONFIG_CRYPTO_BLKCIPHER=y | 1086 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1071 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1072 | CONFIG_CRYPTO_MANAGER=y | 1087 | CONFIG_CRYPTO_MANAGER=y |
| 1088 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1089 | # CONFIG_CRYPTO_NULL is not set | ||
| 1090 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1091 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1092 | # CONFIG_CRYPTO_TEST is not set | ||
| 1093 | |||
| 1094 | # | ||
| 1095 | # Authenticated Encryption with Associated Data | ||
| 1096 | # | ||
| 1097 | # CONFIG_CRYPTO_CCM is not set | ||
| 1098 | # CONFIG_CRYPTO_GCM is not set | ||
| 1099 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1100 | |||
| 1101 | # | ||
| 1102 | # Block modes | ||
| 1103 | # | ||
| 1104 | CONFIG_CRYPTO_CBC=y | ||
| 1105 | # CONFIG_CRYPTO_CTR is not set | ||
| 1106 | # CONFIG_CRYPTO_CTS is not set | ||
| 1107 | CONFIG_CRYPTO_ECB=m | ||
| 1108 | # CONFIG_CRYPTO_LRW is not set | ||
| 1109 | CONFIG_CRYPTO_PCBC=m | ||
| 1110 | # CONFIG_CRYPTO_XTS is not set | ||
| 1111 | |||
| 1112 | # | ||
| 1113 | # Hash modes | ||
| 1114 | # | ||
| 1073 | # CONFIG_CRYPTO_HMAC is not set | 1115 | # CONFIG_CRYPTO_HMAC is not set |
| 1074 | # CONFIG_CRYPTO_XCBC is not set | 1116 | # CONFIG_CRYPTO_XCBC is not set |
| 1075 | # CONFIG_CRYPTO_NULL is not set | 1117 | |
| 1118 | # | ||
| 1119 | # Digest | ||
| 1120 | # | ||
| 1121 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1076 | # CONFIG_CRYPTO_MD4 is not set | 1122 | # CONFIG_CRYPTO_MD4 is not set |
| 1077 | CONFIG_CRYPTO_MD5=y | 1123 | CONFIG_CRYPTO_MD5=y |
| 1124 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1078 | # CONFIG_CRYPTO_SHA1 is not set | 1125 | # CONFIG_CRYPTO_SHA1 is not set |
| 1079 | # CONFIG_CRYPTO_SHA256 is not set | 1126 | # CONFIG_CRYPTO_SHA256 is not set |
| 1080 | # CONFIG_CRYPTO_SHA512 is not set | 1127 | # CONFIG_CRYPTO_SHA512 is not set |
| 1081 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1082 | # CONFIG_CRYPTO_TGR192 is not set | 1128 | # CONFIG_CRYPTO_TGR192 is not set |
| 1083 | # CONFIG_CRYPTO_GF128MUL is not set | 1129 | # CONFIG_CRYPTO_WP512 is not set |
| 1084 | CONFIG_CRYPTO_ECB=m | 1130 | |
| 1085 | CONFIG_CRYPTO_CBC=y | 1131 | # |
| 1086 | CONFIG_CRYPTO_PCBC=m | 1132 | # Ciphers |
| 1087 | # CONFIG_CRYPTO_LRW is not set | 1133 | # |
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | # CONFIG_CRYPTO_CTR is not set | ||
| 1090 | # CONFIG_CRYPTO_GCM is not set | ||
| 1091 | # CONFIG_CRYPTO_CCM is not set | ||
| 1092 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1093 | CONFIG_CRYPTO_DES=y | ||
| 1094 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1095 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1096 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1097 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1098 | # CONFIG_CRYPTO_AES is not set | 1134 | # CONFIG_CRYPTO_AES is not set |
| 1135 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1136 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1137 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1138 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1099 | # CONFIG_CRYPTO_CAST5 is not set | 1139 | # CONFIG_CRYPTO_CAST5 is not set |
| 1100 | # CONFIG_CRYPTO_CAST6 is not set | 1140 | # CONFIG_CRYPTO_CAST6 is not set |
| 1101 | # CONFIG_CRYPTO_TEA is not set | 1141 | CONFIG_CRYPTO_DES=y |
| 1102 | # CONFIG_CRYPTO_ARC4 is not set | 1142 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1103 | # CONFIG_CRYPTO_KHAZAD is not set | 1143 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1104 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1105 | # CONFIG_CRYPTO_SEED is not set | ||
| 1106 | # CONFIG_CRYPTO_SALSA20 is not set | 1144 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1145 | # CONFIG_CRYPTO_SEED is not set | ||
| 1146 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1147 | # CONFIG_CRYPTO_TEA is not set | ||
| 1148 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1149 | |||
| 1150 | # | ||
| 1151 | # Compression | ||
| 1152 | # | ||
| 1107 | # CONFIG_CRYPTO_DEFLATE is not set | 1153 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1109 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1110 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1111 | # CONFIG_CRYPTO_TEST is not set | ||
| 1112 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1113 | # CONFIG_CRYPTO_LZO is not set | 1154 | # CONFIG_CRYPTO_LZO is not set |
| 1114 | CONFIG_CRYPTO_HW=y | 1155 | CONFIG_CRYPTO_HW=y |
| 1115 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1156 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1116 | # CONFIG_PPC_CLOCK is not set | 1157 | # CONFIG_PPC_CLOCK is not set |
| 1117 | CONFIG_PPC_LIB_RHEAP=y | 1158 | CONFIG_PPC_LIB_RHEAP=y |
| 1159 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig index 53aa6f3173a5..03627cfebcb4 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:06 2008 | 4 | # Mon Jun 9 08:52:35 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_MPC85xx=y | |||
| 162 | # CONFIG_MPC85xx_CDS is not set | 167 | # CONFIG_MPC85xx_CDS is not set |
| 163 | # CONFIG_MPC85xx_MDS is not set | 168 | # CONFIG_MPC85xx_MDS is not set |
| 164 | CONFIG_MPC85xx_DS=y | 169 | CONFIG_MPC85xx_DS=y |
| 170 | # CONFIG_KSI8560 is not set | ||
| 165 | # CONFIG_STX_GP3 is not set | 171 | # CONFIG_STX_GP3 is not set |
| 166 | # CONFIG_TQM8540 is not set | 172 | # CONFIG_TQM8540 is not set |
| 167 | # CONFIG_TQM8541 is not set | 173 | # CONFIG_TQM8541 is not set |
| @@ -217,11 +223,13 @@ CONFIG_FLATMEM=y | |||
| 217 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 218 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| 224 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 225 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| @@ -246,6 +254,7 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # CONFIG_PCI_DEBUG is not set | 254 | # CONFIG_PCI_DEBUG is not set |
| 247 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 248 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 257 | # CONFIG_HAS_RAPIDIO is not set | ||
| 249 | 258 | ||
| 250 | # | 259 | # |
| 251 | # Advanced setup | 260 | # Advanced setup |
| @@ -255,11 +264,12 @@ CONFIG_PCI_LEGACY=y | |||
| 255 | # | 264 | # |
| 256 | # Default settings for advanced configuration options are used | 265 | # Default settings for advanced configuration options are used |
| 257 | # | 266 | # |
| 258 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 259 | CONFIG_LOWMEM_SIZE=0x30000000 | 267 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 268 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 260 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
| 270 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 263 | 273 | ||
| 264 | # | 274 | # |
| 265 | # Networking | 275 | # Networking |
| @@ -330,8 +340,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 330 | CONFIG_INET6_XFRM_MODE_BEET=y | 340 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 331 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 341 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 332 | CONFIG_IPV6_SIT=y | 342 | CONFIG_IPV6_SIT=y |
| 343 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 333 | # CONFIG_IPV6_TUNNEL is not set | 344 | # CONFIG_IPV6_TUNNEL is not set |
| 334 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 345 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 346 | # CONFIG_IPV6_MROUTE is not set | ||
| 335 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
| 336 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
| 337 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
| @@ -393,6 +405,7 @@ CONFIG_FW_LOADER=y | |||
| 393 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
| 394 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
| 395 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
| 408 | CONFIG_OF_I2C=y | ||
| 396 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
| 397 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
| 398 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
| @@ -499,7 +512,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 499 | # CONFIG_SCSI_SRP is not set | 512 | # CONFIG_SCSI_SRP is not set |
| 500 | CONFIG_ATA=y | 513 | CONFIG_ATA=y |
| 501 | # CONFIG_ATA_NONSTANDARD is not set | 514 | # CONFIG_ATA_NONSTANDARD is not set |
| 515 | CONFIG_SATA_PMP=y | ||
| 502 | CONFIG_SATA_AHCI=y | 516 | CONFIG_SATA_AHCI=y |
| 517 | # CONFIG_SATA_SIL24 is not set | ||
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_ATA_SFF=y | ||
| 503 | # CONFIG_SATA_SVW is not set | 520 | # CONFIG_SATA_SVW is not set |
| 504 | # CONFIG_ATA_PIIX is not set | 521 | # CONFIG_ATA_PIIX is not set |
| 505 | # CONFIG_SATA_MV is not set | 522 | # CONFIG_SATA_MV is not set |
| @@ -509,13 +526,11 @@ CONFIG_SATA_AHCI=y | |||
| 509 | # CONFIG_SATA_PROMISE is not set | 526 | # CONFIG_SATA_PROMISE is not set |
| 510 | # CONFIG_SATA_SX4 is not set | 527 | # CONFIG_SATA_SX4 is not set |
| 511 | # CONFIG_SATA_SIL is not set | 528 | # CONFIG_SATA_SIL is not set |
| 512 | # CONFIG_SATA_SIL24 is not set | ||
| 513 | # CONFIG_SATA_SIS is not set | 529 | # CONFIG_SATA_SIS is not set |
| 514 | # CONFIG_SATA_ULI is not set | 530 | # CONFIG_SATA_ULI is not set |
| 515 | # CONFIG_SATA_VIA is not set | 531 | # CONFIG_SATA_VIA is not set |
| 516 | # CONFIG_SATA_VITESSE is not set | 532 | # CONFIG_SATA_VITESSE is not set |
| 517 | # CONFIG_SATA_INIC162X is not set | 533 | # CONFIG_SATA_INIC162X is not set |
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_PATA_ALI=y | 534 | CONFIG_PATA_ALI=y |
| 520 | # CONFIG_PATA_AMD is not set | 535 | # CONFIG_PATA_AMD is not set |
| 521 | # CONFIG_PATA_ARTOP is not set | 536 | # CONFIG_PATA_ARTOP is not set |
| @@ -555,6 +570,7 @@ CONFIG_PATA_ALI=y | |||
| 555 | # CONFIG_PATA_VIA is not set | 570 | # CONFIG_PATA_VIA is not set |
| 556 | # CONFIG_PATA_WINBOND is not set | 571 | # CONFIG_PATA_WINBOND is not set |
| 557 | # CONFIG_PATA_PLATFORM is not set | 572 | # CONFIG_PATA_PLATFORM is not set |
| 573 | # CONFIG_PATA_SCH is not set | ||
| 558 | # CONFIG_MD is not set | 574 | # CONFIG_MD is not set |
| 559 | # CONFIG_FUSION is not set | 575 | # CONFIG_FUSION is not set |
| 560 | 576 | ||
| @@ -620,7 +636,6 @@ CONFIG_NETDEV_1000=y | |||
| 620 | # CONFIG_SIS190 is not set | 636 | # CONFIG_SIS190 is not set |
| 621 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
| 622 | # CONFIG_SKY2 is not set | 638 | # CONFIG_SKY2 is not set |
| 623 | # CONFIG_SK98LIN is not set | ||
| 624 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
| 625 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
| 626 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
| @@ -640,6 +655,7 @@ CONFIG_NETDEV_10000=y | |||
| 640 | # CONFIG_MLX4_CORE is not set | 655 | # CONFIG_MLX4_CORE is not set |
| 641 | # CONFIG_TEHUTI is not set | 656 | # CONFIG_TEHUTI is not set |
| 642 | # CONFIG_BNX2X is not set | 657 | # CONFIG_BNX2X is not set |
| 658 | # CONFIG_SFC is not set | ||
| 643 | # CONFIG_TR is not set | 659 | # CONFIG_TR is not set |
| 644 | 660 | ||
| 645 | # | 661 | # |
| @@ -647,6 +663,7 @@ CONFIG_NETDEV_10000=y | |||
| 647 | # | 663 | # |
| 648 | # CONFIG_WLAN_PRE80211 is not set | 664 | # CONFIG_WLAN_PRE80211 is not set |
| 649 | # CONFIG_WLAN_80211 is not set | 665 | # CONFIG_WLAN_80211 is not set |
| 666 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 650 | 667 | ||
| 651 | # | 668 | # |
| 652 | # USB Network Adapters | 669 | # USB Network Adapters |
| @@ -711,6 +728,7 @@ CONFIG_VT=y | |||
| 711 | CONFIG_VT_CONSOLE=y | 728 | CONFIG_VT_CONSOLE=y |
| 712 | CONFIG_HW_CONSOLE=y | 729 | CONFIG_HW_CONSOLE=y |
| 713 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 731 | CONFIG_DEVKMEM=y | ||
| 714 | # CONFIG_SERIAL_NONSTANDARD is not set | 732 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 715 | # CONFIG_NOZOMI is not set | 733 | # CONFIG_NOZOMI is not set |
| 716 | 734 | ||
| @@ -742,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 742 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 743 | # CONFIG_HW_RANDOM is not set | 761 | # CONFIG_HW_RANDOM is not set |
| 744 | CONFIG_NVRAM=y | 762 | CONFIG_NVRAM=y |
| 745 | # CONFIG_GEN_RTC is not set | ||
| 746 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 747 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 748 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -753,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 753 | # CONFIG_I2C_CHARDEV is not set | 770 | # CONFIG_I2C_CHARDEV is not set |
| 754 | 771 | ||
| 755 | # | 772 | # |
| 756 | # I2C Algorithms | ||
| 757 | # | ||
| 758 | # CONFIG_I2C_ALGOBIT is not set | ||
| 759 | # CONFIG_I2C_ALGOPCF is not set | ||
| 760 | # CONFIG_I2C_ALGOPCA is not set | ||
| 761 | |||
| 762 | # | ||
| 763 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 764 | # | 774 | # |
| 765 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -786,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 786 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 787 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 788 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 789 | 800 | ||
| 790 | # | 801 | # |
| 791 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -795,19 +806,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 795 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 796 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 797 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 798 | # CONFIG_TPS65010 is not set | ||
| 799 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 800 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 801 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 802 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 803 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 804 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 805 | |||
| 806 | # | ||
| 807 | # SPI support | ||
| 808 | # | ||
| 809 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
| 810 | # CONFIG_SPI_MASTER is not set | ||
| 811 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
| 812 | # CONFIG_POWER_SUPPLY is not set | 817 | # CONFIG_POWER_SUPPLY is not set |
| 813 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
| @@ -824,13 +829,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 824 | # Multifunction device drivers | 829 | # Multifunction device drivers |
| 825 | # | 830 | # |
| 826 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
| 832 | # CONFIG_HTC_PASIC3 is not set | ||
| 827 | 833 | ||
| 828 | # | 834 | # |
| 829 | # Multimedia devices | 835 | # Multimedia devices |
| 830 | # | 836 | # |
| 837 | |||
| 838 | # | ||
| 839 | # Multimedia core support | ||
| 840 | # | ||
| 831 | # CONFIG_VIDEO_DEV is not set | 841 | # CONFIG_VIDEO_DEV is not set |
| 832 | CONFIG_DVB_CORE=m | 842 | CONFIG_DVB_CORE=m |
| 833 | # CONFIG_DVB_CORE_ATTACH is not set | 843 | CONFIG_VIDEO_MEDIA=m |
| 844 | |||
| 845 | # | ||
| 846 | # Multimedia drivers | ||
| 847 | # | ||
| 848 | # CONFIG_MEDIA_ATTACH is not set | ||
| 849 | CONFIG_MEDIA_TUNER=m | ||
| 850 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 851 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 852 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 853 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 854 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 855 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 856 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 857 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 858 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 834 | CONFIG_DVB_CAPTURE_DRIVERS=y | 859 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 835 | 860 | ||
| 836 | # | 861 | # |
| @@ -873,14 +898,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 873 | # | 898 | # |
| 874 | # DVB-S (satellite) frontends | 899 | # DVB-S (satellite) frontends |
| 875 | # | 900 | # |
| 876 | # CONFIG_DVB_STV0299 is not set | ||
| 877 | # CONFIG_DVB_CX24110 is not set | 901 | # CONFIG_DVB_CX24110 is not set |
| 878 | # CONFIG_DVB_CX24123 is not set | 902 | # CONFIG_DVB_CX24123 is not set |
| 879 | # CONFIG_DVB_TDA8083 is not set | ||
| 880 | # CONFIG_DVB_MT312 is not set | 903 | # CONFIG_DVB_MT312 is not set |
| 881 | # CONFIG_DVB_VES1X93 is not set | ||
| 882 | # CONFIG_DVB_S5H1420 is not set | 904 | # CONFIG_DVB_S5H1420 is not set |
| 905 | # CONFIG_DVB_STV0299 is not set | ||
| 906 | # CONFIG_DVB_TDA8083 is not set | ||
| 883 | # CONFIG_DVB_TDA10086 is not set | 907 | # CONFIG_DVB_TDA10086 is not set |
| 908 | # CONFIG_DVB_VES1X93 is not set | ||
| 909 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 910 | # CONFIG_DVB_TDA826X is not set | ||
| 911 | # CONFIG_DVB_TUA6100 is not set | ||
| 884 | 912 | ||
| 885 | # | 913 | # |
| 886 | # DVB-T (terrestrial) frontends | 914 | # DVB-T (terrestrial) frontends |
| @@ -898,6 +926,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 898 | # CONFIG_DVB_DIB3000MC is not set | 926 | # CONFIG_DVB_DIB3000MC is not set |
| 899 | # CONFIG_DVB_DIB7000M is not set | 927 | # CONFIG_DVB_DIB7000M is not set |
| 900 | # CONFIG_DVB_DIB7000P is not set | 928 | # CONFIG_DVB_DIB7000P is not set |
| 929 | # CONFIG_DVB_TDA10048 is not set | ||
| 901 | 930 | ||
| 902 | # | 931 | # |
| 903 | # DVB-C (cable) frontends | 932 | # DVB-C (cable) frontends |
| @@ -916,27 +945,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 916 | # CONFIG_DVB_BCM3510 is not set | 945 | # CONFIG_DVB_BCM3510 is not set |
| 917 | # CONFIG_DVB_LGDT330X is not set | 946 | # CONFIG_DVB_LGDT330X is not set |
| 918 | # CONFIG_DVB_S5H1409 is not set | 947 | # CONFIG_DVB_S5H1409 is not set |
| 948 | # CONFIG_DVB_AU8522 is not set | ||
| 949 | # CONFIG_DVB_S5H1411 is not set | ||
| 919 | 950 | ||
| 920 | # | 951 | # |
| 921 | # Tuners/PLL support | 952 | # Digital terrestrial only tuners/PLL |
| 922 | # | 953 | # |
| 923 | # CONFIG_DVB_PLL is not set | 954 | # CONFIG_DVB_PLL is not set |
| 924 | # CONFIG_DVB_TDA826X is not set | ||
| 925 | # CONFIG_DVB_TDA827X is not set | ||
| 926 | # CONFIG_DVB_TDA18271 is not set | ||
| 927 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 928 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 929 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 930 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 931 | # CONFIG_DVB_TUNER_DIB0070 is not set | 955 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 932 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 933 | 956 | ||
| 934 | # | 957 | # |
| 935 | # Miscellaneous devices | 958 | # SEC control devices for DVB-S |
| 936 | # | 959 | # |
| 937 | # CONFIG_DVB_LNBP21 is not set | 960 | # CONFIG_DVB_LNBP21 is not set |
| 961 | # CONFIG_DVB_ISL6405 is not set | ||
| 938 | # CONFIG_DVB_ISL6421 is not set | 962 | # CONFIG_DVB_ISL6421 is not set |
| 939 | # CONFIG_DVB_TUA6100 is not set | ||
| 940 | CONFIG_DAB=y | 963 | CONFIG_DAB=y |
| 941 | # CONFIG_USB_DABUSB is not set | 964 | # CONFIG_USB_DABUSB is not set |
| 942 | 965 | ||
| @@ -1003,6 +1026,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1003 | # CONFIG_SND_AU8810 is not set | 1026 | # CONFIG_SND_AU8810 is not set |
| 1004 | # CONFIG_SND_AU8820 is not set | 1027 | # CONFIG_SND_AU8820 is not set |
| 1005 | # CONFIG_SND_AU8830 is not set | 1028 | # CONFIG_SND_AU8830 is not set |
| 1029 | # CONFIG_SND_AW2 is not set | ||
| 1006 | # CONFIG_SND_AZT3328 is not set | 1030 | # CONFIG_SND_AZT3328 is not set |
| 1007 | # CONFIG_SND_BT87X is not set | 1031 | # CONFIG_SND_BT87X is not set |
| 1008 | # CONFIG_SND_CA0106 is not set | 1032 | # CONFIG_SND_CA0106 is not set |
| @@ -1077,11 +1101,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1077 | # CONFIG_SND_SOC is not set | 1101 | # CONFIG_SND_SOC is not set |
| 1078 | 1102 | ||
| 1079 | # | 1103 | # |
| 1080 | # SoC Audio support for SuperH | 1104 | # ALSA SoC audio for Freescale SOCs |
| 1081 | # | 1105 | # |
| 1082 | 1106 | ||
| 1083 | # | 1107 | # |
| 1084 | # ALSA SoC audio for Freescale SOCs | 1108 | # SoC Audio for the Texas Instruments OMAP |
| 1085 | # | 1109 | # |
| 1086 | 1110 | ||
| 1087 | # | 1111 | # |
| @@ -1116,16 +1140,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1116 | CONFIG_USB_DEVICE_CLASS=y | 1140 | CONFIG_USB_DEVICE_CLASS=y |
| 1117 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1141 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1118 | # CONFIG_USB_OTG is not set | 1142 | # CONFIG_USB_OTG is not set |
| 1143 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1144 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1119 | 1145 | ||
| 1120 | # | 1146 | # |
| 1121 | # USB Host Controller Drivers | 1147 | # USB Host Controller Drivers |
| 1122 | # | 1148 | # |
| 1149 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1123 | CONFIG_USB_EHCI_HCD=y | 1150 | CONFIG_USB_EHCI_HCD=y |
| 1124 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1151 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1125 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1152 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1126 | # CONFIG_USB_EHCI_FSL is not set | 1153 | # CONFIG_USB_EHCI_FSL is not set |
| 1127 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1154 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1128 | # CONFIG_USB_ISP116X_HCD is not set | 1155 | # CONFIG_USB_ISP116X_HCD is not set |
| 1156 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1129 | CONFIG_USB_OHCI_HCD=y | 1157 | CONFIG_USB_OHCI_HCD=y |
| 1130 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1158 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1131 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1159 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1143,6 +1171,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1143 | # | 1171 | # |
| 1144 | # CONFIG_USB_ACM is not set | 1172 | # CONFIG_USB_ACM is not set |
| 1145 | # CONFIG_USB_PRINTER is not set | 1173 | # CONFIG_USB_PRINTER is not set |
| 1174 | # CONFIG_USB_WDM is not set | ||
| 1146 | 1175 | ||
| 1147 | # | 1176 | # |
| 1148 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1177 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1162,7 +1191,9 @@ CONFIG_USB_STORAGE=y | |||
| 1162 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1191 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1163 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1192 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1164 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1193 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1194 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1165 | # CONFIG_USB_STORAGE_KARMA is not set | 1195 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1196 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1166 | # CONFIG_USB_LIBUSUAL is not set | 1197 | # CONFIG_USB_LIBUSUAL is not set |
| 1167 | 1198 | ||
| 1168 | # | 1199 | # |
| @@ -1200,10 +1231,12 @@ CONFIG_USB_MON=y | |||
| 1200 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1231 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1201 | # CONFIG_USB_IOWARRIOR is not set | 1232 | # CONFIG_USB_IOWARRIOR is not set |
| 1202 | # CONFIG_USB_TEST is not set | 1233 | # CONFIG_USB_TEST is not set |
| 1234 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1203 | # CONFIG_USB_GADGET is not set | 1235 | # CONFIG_USB_GADGET is not set |
| 1204 | # CONFIG_MMC is not set | 1236 | # CONFIG_MMC is not set |
| 1205 | # CONFIG_MEMSTICK is not set | 1237 | # CONFIG_MEMSTICK is not set |
| 1206 | # CONFIG_NEW_LEDS is not set | 1238 | # CONFIG_NEW_LEDS is not set |
| 1239 | # CONFIG_ACCESSIBILITY is not set | ||
| 1207 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
| 1208 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
| 1209 | CONFIG_RTC_LIB=y | 1242 | CONFIG_RTC_LIB=y |
| @@ -1255,11 +1288,8 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1255 | # | 1288 | # |
| 1256 | # on-CPU RTC drivers | 1289 | # on-CPU RTC drivers |
| 1257 | # | 1290 | # |
| 1291 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1258 | # CONFIG_DMADEVICES is not set | 1292 | # CONFIG_DMADEVICES is not set |
| 1259 | |||
| 1260 | # | ||
| 1261 | # Userspace I/O | ||
| 1262 | # | ||
| 1263 | # CONFIG_UIO is not set | 1293 | # CONFIG_UIO is not set |
| 1264 | 1294 | ||
| 1265 | # | 1295 | # |
| @@ -1279,7 +1309,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1279 | # CONFIG_JFS_FS is not set | 1309 | # CONFIG_JFS_FS is not set |
| 1280 | # CONFIG_FS_POSIX_ACL is not set | 1310 | # CONFIG_FS_POSIX_ACL is not set |
| 1281 | # CONFIG_XFS_FS is not set | 1311 | # CONFIG_XFS_FS is not set |
| 1282 | # CONFIG_GFS2_FS is not set | ||
| 1283 | # CONFIG_OCFS2_FS is not set | 1312 | # CONFIG_OCFS2_FS is not set |
| 1284 | CONFIG_DNOTIFY=y | 1313 | CONFIG_DNOTIFY=y |
| 1285 | CONFIG_INOTIFY=y | 1314 | CONFIG_INOTIFY=y |
| @@ -1349,10 +1378,9 @@ CONFIG_NFS_FS=y | |||
| 1349 | CONFIG_NFS_V3=y | 1378 | CONFIG_NFS_V3=y |
| 1350 | # CONFIG_NFS_V3_ACL is not set | 1379 | # CONFIG_NFS_V3_ACL is not set |
| 1351 | CONFIG_NFS_V4=y | 1380 | CONFIG_NFS_V4=y |
| 1352 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1353 | CONFIG_NFSD=y | 1381 | CONFIG_NFSD=y |
| 1354 | # CONFIG_NFSD_V3 is not set | 1382 | # CONFIG_NFSD_V3 is not set |
| 1355 | CONFIG_NFSD_TCP=y | 1383 | # CONFIG_NFSD_V4 is not set |
| 1356 | CONFIG_ROOT_NFS=y | 1384 | CONFIG_ROOT_NFS=y |
| 1357 | CONFIG_LOCKD=y | 1385 | CONFIG_LOCKD=y |
| 1358 | CONFIG_LOCKD_V4=y | 1386 | CONFIG_LOCKD_V4=y |
| @@ -1436,9 +1464,10 @@ CONFIG_NLS_UTF8=m | |||
| 1436 | # Library routines | 1464 | # Library routines |
| 1437 | # | 1465 | # |
| 1438 | CONFIG_BITREVERSE=y | 1466 | CONFIG_BITREVERSE=y |
| 1467 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1439 | # CONFIG_CRC_CCITT is not set | 1468 | # CONFIG_CRC_CCITT is not set |
| 1440 | # CONFIG_CRC16 is not set | 1469 | # CONFIG_CRC16 is not set |
| 1441 | # CONFIG_CRC_ITU_T is not set | 1470 | CONFIG_CRC_ITU_T=m |
| 1442 | CONFIG_CRC32=y | 1471 | CONFIG_CRC32=y |
| 1443 | # CONFIG_CRC7 is not set | 1472 | # CONFIG_CRC7 is not set |
| 1444 | CONFIG_LIBCRC32C=m | 1473 | CONFIG_LIBCRC32C=m |
| @@ -1447,6 +1476,7 @@ CONFIG_PLIST=y | |||
| 1447 | CONFIG_HAS_IOMEM=y | 1476 | CONFIG_HAS_IOMEM=y |
| 1448 | CONFIG_HAS_IOPORT=y | 1477 | CONFIG_HAS_IOPORT=y |
| 1449 | CONFIG_HAS_DMA=y | 1478 | CONFIG_HAS_DMA=y |
| 1479 | CONFIG_HAVE_LMB=y | ||
| 1450 | 1480 | ||
| 1451 | # | 1481 | # |
| 1452 | # Kernel hacking | 1482 | # Kernel hacking |
| @@ -1454,6 +1484,7 @@ CONFIG_HAS_DMA=y | |||
| 1454 | # CONFIG_PRINTK_TIME is not set | 1484 | # CONFIG_PRINTK_TIME is not set |
| 1455 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1485 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1456 | CONFIG_ENABLE_MUST_CHECK=y | 1486 | CONFIG_ENABLE_MUST_CHECK=y |
| 1487 | CONFIG_FRAME_WARN=1024 | ||
| 1457 | # CONFIG_MAGIC_SYSRQ is not set | 1488 | # CONFIG_MAGIC_SYSRQ is not set |
| 1458 | # CONFIG_UNUSED_SYMBOLS is not set | 1489 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1459 | # CONFIG_DEBUG_FS is not set | 1490 | # CONFIG_DEBUG_FS is not set |
| @@ -1464,6 +1495,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1464 | CONFIG_SCHED_DEBUG=y | 1495 | CONFIG_SCHED_DEBUG=y |
| 1465 | # CONFIG_SCHEDSTATS is not set | 1496 | # CONFIG_SCHEDSTATS is not set |
| 1466 | # CONFIG_TIMER_STATS is not set | 1497 | # CONFIG_TIMER_STATS is not set |
| 1498 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1467 | # CONFIG_SLUB_DEBUG_ON is not set | 1499 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1468 | # CONFIG_SLUB_STATS is not set | 1500 | # CONFIG_SLUB_STATS is not set |
| 1469 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1501 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1477,6 +1509,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1477 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1509 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1478 | CONFIG_DEBUG_INFO=y | 1510 | CONFIG_DEBUG_INFO=y |
| 1479 | # CONFIG_DEBUG_VM is not set | 1511 | # CONFIG_DEBUG_VM is not set |
| 1512 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1480 | # CONFIG_DEBUG_LIST is not set | 1513 | # CONFIG_DEBUG_LIST is not set |
| 1481 | # CONFIG_DEBUG_SG is not set | 1514 | # CONFIG_DEBUG_SG is not set |
| 1482 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1515 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1488,6 +1521,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1488 | # CONFIG_DEBUG_STACK_USAGE is not set | 1521 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1489 | # CONFIG_DEBUG_PAGEALLOC is not set | 1522 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1490 | # CONFIG_DEBUGGER is not set | 1523 | # CONFIG_DEBUGGER is not set |
| 1524 | # CONFIG_IRQSTACKS is not set | ||
| 1491 | # CONFIG_BDI_SWITCH is not set | 1525 | # CONFIG_BDI_SWITCH is not set |
| 1492 | # CONFIG_PPC_EARLY_DEBUG is not set | 1526 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1493 | 1527 | ||
| @@ -1498,52 +1532,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1498 | # CONFIG_SECURITY is not set | 1532 | # CONFIG_SECURITY is not set |
| 1499 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1533 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1500 | CONFIG_CRYPTO=y | 1534 | CONFIG_CRYPTO=y |
| 1535 | |||
| 1536 | # | ||
| 1537 | # Crypto core or helper | ||
| 1538 | # | ||
| 1501 | CONFIG_CRYPTO_ALGAPI=y | 1539 | CONFIG_CRYPTO_ALGAPI=y |
| 1502 | CONFIG_CRYPTO_BLKCIPHER=y | 1540 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1503 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1504 | CONFIG_CRYPTO_HASH=y | 1541 | CONFIG_CRYPTO_HASH=y |
| 1505 | CONFIG_CRYPTO_MANAGER=y | 1542 | CONFIG_CRYPTO_MANAGER=y |
| 1543 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1544 | # CONFIG_CRYPTO_NULL is not set | ||
| 1545 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1546 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1547 | # CONFIG_CRYPTO_TEST is not set | ||
| 1548 | |||
| 1549 | # | ||
| 1550 | # Authenticated Encryption with Associated Data | ||
| 1551 | # | ||
| 1552 | # CONFIG_CRYPTO_CCM is not set | ||
| 1553 | # CONFIG_CRYPTO_GCM is not set | ||
| 1554 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1555 | |||
| 1556 | # | ||
| 1557 | # Block modes | ||
| 1558 | # | ||
| 1559 | CONFIG_CRYPTO_CBC=y | ||
| 1560 | # CONFIG_CRYPTO_CTR is not set | ||
| 1561 | # CONFIG_CRYPTO_CTS is not set | ||
| 1562 | # CONFIG_CRYPTO_ECB is not set | ||
| 1563 | # CONFIG_CRYPTO_LRW is not set | ||
| 1564 | CONFIG_CRYPTO_PCBC=m | ||
| 1565 | # CONFIG_CRYPTO_XTS is not set | ||
| 1566 | |||
| 1567 | # | ||
| 1568 | # Hash modes | ||
| 1569 | # | ||
| 1506 | CONFIG_CRYPTO_HMAC=y | 1570 | CONFIG_CRYPTO_HMAC=y |
| 1507 | # CONFIG_CRYPTO_XCBC is not set | 1571 | # CONFIG_CRYPTO_XCBC is not set |
| 1508 | # CONFIG_CRYPTO_NULL is not set | 1572 | |
| 1573 | # | ||
| 1574 | # Digest | ||
| 1575 | # | ||
| 1576 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1509 | # CONFIG_CRYPTO_MD4 is not set | 1577 | # CONFIG_CRYPTO_MD4 is not set |
| 1510 | CONFIG_CRYPTO_MD5=y | 1578 | CONFIG_CRYPTO_MD5=y |
| 1579 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1511 | CONFIG_CRYPTO_SHA1=m | 1580 | CONFIG_CRYPTO_SHA1=m |
| 1512 | # CONFIG_CRYPTO_SHA256 is not set | 1581 | # CONFIG_CRYPTO_SHA256 is not set |
| 1513 | # CONFIG_CRYPTO_SHA512 is not set | 1582 | # CONFIG_CRYPTO_SHA512 is not set |
| 1514 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1515 | # CONFIG_CRYPTO_TGR192 is not set | 1583 | # CONFIG_CRYPTO_TGR192 is not set |
| 1516 | # CONFIG_CRYPTO_GF128MUL is not set | 1584 | # CONFIG_CRYPTO_WP512 is not set |
| 1517 | # CONFIG_CRYPTO_ECB is not set | 1585 | |
| 1518 | CONFIG_CRYPTO_CBC=y | 1586 | # |
| 1519 | CONFIG_CRYPTO_PCBC=m | 1587 | # Ciphers |
| 1520 | # CONFIG_CRYPTO_LRW is not set | 1588 | # |
| 1521 | # CONFIG_CRYPTO_XTS is not set | ||
| 1522 | # CONFIG_CRYPTO_CTR is not set | ||
| 1523 | # CONFIG_CRYPTO_GCM is not set | ||
| 1524 | # CONFIG_CRYPTO_CCM is not set | ||
| 1525 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1526 | CONFIG_CRYPTO_DES=y | ||
| 1527 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1528 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1529 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1530 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1531 | # CONFIG_CRYPTO_AES is not set | 1589 | # CONFIG_CRYPTO_AES is not set |
| 1590 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1591 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1592 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1593 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1532 | # CONFIG_CRYPTO_CAST5 is not set | 1594 | # CONFIG_CRYPTO_CAST5 is not set |
| 1533 | # CONFIG_CRYPTO_CAST6 is not set | 1595 | # CONFIG_CRYPTO_CAST6 is not set |
| 1534 | # CONFIG_CRYPTO_TEA is not set | 1596 | CONFIG_CRYPTO_DES=y |
| 1535 | # CONFIG_CRYPTO_ARC4 is not set | 1597 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1536 | # CONFIG_CRYPTO_KHAZAD is not set | 1598 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1537 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1538 | # CONFIG_CRYPTO_SEED is not set | ||
| 1539 | # CONFIG_CRYPTO_SALSA20 is not set | 1599 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1600 | # CONFIG_CRYPTO_SEED is not set | ||
| 1601 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1602 | # CONFIG_CRYPTO_TEA is not set | ||
| 1603 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1604 | |||
| 1605 | # | ||
| 1606 | # Compression | ||
| 1607 | # | ||
| 1540 | # CONFIG_CRYPTO_DEFLATE is not set | 1608 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1541 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1542 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1543 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1544 | # CONFIG_CRYPTO_TEST is not set | ||
| 1545 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1546 | # CONFIG_CRYPTO_LZO is not set | 1609 | # CONFIG_CRYPTO_LZO is not set |
| 1547 | CONFIG_CRYPTO_HW=y | 1610 | CONFIG_CRYPTO_HW=y |
| 1548 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1611 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1549 | # CONFIG_PPC_CLOCK is not set | 1612 | # CONFIG_PPC_CLOCK is not set |
| 1613 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig index a469fe918816..b09f0032a10b 100644 --- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:30 2008 | 4 | # Mon Jun 9 08:52:36 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC85xx=y | |||
| 153 | CONFIG_MPC85xx_CDS=y | 157 | CONFIG_MPC85xx_CDS=y |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -208,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -236,6 +243,7 @@ CONFIG_PCI_LEGACY=y | |||
| 236 | # CONFIG_PCI_DEBUG is not set | 243 | # CONFIG_PCI_DEBUG is not set |
| 237 | # CONFIG_PCCARD is not set | 244 | # CONFIG_PCCARD is not set |
| 238 | # CONFIG_HOTPLUG_PCI is not set | 245 | # CONFIG_HOTPLUG_PCI is not set |
| 246 | # CONFIG_HAS_RAPIDIO is not set | ||
| 239 | 247 | ||
| 240 | # | 248 | # |
| 241 | # Advanced setup | 249 | # Advanced setup |
| @@ -245,11 +253,12 @@ CONFIG_PCI_LEGACY=y | |||
| 245 | # | 253 | # |
| 246 | # Default settings for advanced configuration options are used | 254 | # Default settings for advanced configuration options are used |
| 247 | # | 255 | # |
| 248 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 249 | CONFIG_LOWMEM_SIZE=0x30000000 | 256 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 257 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 250 | CONFIG_KERNEL_START=0xc0000000 | 258 | CONFIG_KERNEL_START=0xc0000000 |
| 259 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 260 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 251 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 252 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 253 | 262 | ||
| 254 | # | 263 | # |
| 255 | # Networking | 264 | # Networking |
| @@ -297,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 297 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 298 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 299 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 300 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 301 | # CONFIG_INET6_TUNNEL is not set | ||
| 302 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 303 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 304 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -437,7 +444,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 437 | CONFIG_BLK_DEV_VIA82CXXX=y | 444 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 438 | # CONFIG_BLK_DEV_TC86C001 is not set | 445 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 439 | CONFIG_BLK_DEV_IDEDMA=y | 446 | CONFIG_BLK_DEV_IDEDMA=y |
| 440 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 447 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 441 | # CONFIG_BLK_DEV_HD is not set | 448 | # CONFIG_BLK_DEV_HD is not set |
| 442 | 449 | ||
| 443 | # | 450 | # |
| @@ -515,7 +522,6 @@ CONFIG_E1000_NAPI=y | |||
| 515 | # CONFIG_SIS190 is not set | 522 | # CONFIG_SIS190 is not set |
| 516 | # CONFIG_SKGE is not set | 523 | # CONFIG_SKGE is not set |
| 517 | # CONFIG_SKY2 is not set | 524 | # CONFIG_SKY2 is not set |
| 518 | # CONFIG_SK98LIN is not set | ||
| 519 | # CONFIG_VIA_VELOCITY is not set | 525 | # CONFIG_VIA_VELOCITY is not set |
| 520 | # CONFIG_TIGON3 is not set | 526 | # CONFIG_TIGON3 is not set |
| 521 | # CONFIG_BNX2 is not set | 527 | # CONFIG_BNX2 is not set |
| @@ -535,6 +541,7 @@ CONFIG_NETDEV_10000=y | |||
| 535 | # CONFIG_MLX4_CORE is not set | 541 | # CONFIG_MLX4_CORE is not set |
| 536 | # CONFIG_TEHUTI is not set | 542 | # CONFIG_TEHUTI is not set |
| 537 | # CONFIG_BNX2X is not set | 543 | # CONFIG_BNX2X is not set |
| 544 | # CONFIG_SFC is not set | ||
| 538 | # CONFIG_TR is not set | 545 | # CONFIG_TR is not set |
| 539 | 546 | ||
| 540 | # | 547 | # |
| @@ -542,6 +549,7 @@ CONFIG_NETDEV_10000=y | |||
| 542 | # | 549 | # |
| 543 | # CONFIG_WLAN_PRE80211 is not set | 550 | # CONFIG_WLAN_PRE80211 is not set |
| 544 | # CONFIG_WLAN_80211 is not set | 551 | # CONFIG_WLAN_80211 is not set |
| 552 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 545 | # CONFIG_WAN is not set | 553 | # CONFIG_WAN is not set |
| 546 | # CONFIG_FDDI is not set | 554 | # CONFIG_FDDI is not set |
| 547 | # CONFIG_HIPPI is not set | 555 | # CONFIG_HIPPI is not set |
| @@ -588,6 +596,7 @@ CONFIG_INPUT=y | |||
| 588 | # Character devices | 596 | # Character devices |
| 589 | # | 597 | # |
| 590 | # CONFIG_VT is not set | 598 | # CONFIG_VT is not set |
| 599 | CONFIG_DEVKMEM=y | ||
| 591 | # CONFIG_SERIAL_NONSTANDARD is not set | 600 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 592 | # CONFIG_NOZOMI is not set | 601 | # CONFIG_NOZOMI is not set |
| 593 | 602 | ||
| @@ -624,12 +633,7 @@ CONFIG_GEN_RTC=y | |||
| 624 | # CONFIG_TCG_TPM is not set | 633 | # CONFIG_TCG_TPM is not set |
| 625 | CONFIG_DEVPORT=y | 634 | CONFIG_DEVPORT=y |
| 626 | # CONFIG_I2C is not set | 635 | # CONFIG_I2C is not set |
| 627 | |||
| 628 | # | ||
| 629 | # SPI support | ||
| 630 | # | ||
| 631 | # CONFIG_SPI is not set | 636 | # CONFIG_SPI is not set |
| 632 | # CONFIG_SPI_MASTER is not set | ||
| 633 | # CONFIG_W1 is not set | 637 | # CONFIG_W1 is not set |
| 634 | # CONFIG_POWER_SUPPLY is not set | 638 | # CONFIG_POWER_SUPPLY is not set |
| 635 | CONFIG_HWMON=y | 639 | CONFIG_HWMON=y |
| @@ -662,12 +666,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 662 | # Multifunction device drivers | 666 | # Multifunction device drivers |
| 663 | # | 667 | # |
| 664 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
| 669 | # CONFIG_HTC_PASIC3 is not set | ||
| 665 | 670 | ||
| 666 | # | 671 | # |
| 667 | # Multimedia devices | 672 | # Multimedia devices |
| 668 | # | 673 | # |
| 674 | |||
| 675 | # | ||
| 676 | # Multimedia core support | ||
| 677 | # | ||
| 669 | # CONFIG_VIDEO_DEV is not set | 678 | # CONFIG_VIDEO_DEV is not set |
| 670 | # CONFIG_DVB_CORE is not set | 679 | # CONFIG_DVB_CORE is not set |
| 680 | # CONFIG_VIDEO_MEDIA is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Multimedia drivers | ||
| 684 | # | ||
| 671 | CONFIG_DAB=y | 685 | CONFIG_DAB=y |
| 672 | 686 | ||
| 673 | # | 687 | # |
| @@ -698,6 +712,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 698 | CONFIG_USB_ARCH_HAS_OHCI=y | 712 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 699 | CONFIG_USB_ARCH_HAS_EHCI=y | 713 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 700 | # CONFIG_USB is not set | 714 | # CONFIG_USB is not set |
| 715 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 716 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 701 | 717 | ||
| 702 | # | 718 | # |
| 703 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 719 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -706,14 +722,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 706 | # CONFIG_MMC is not set | 722 | # CONFIG_MMC is not set |
| 707 | # CONFIG_MEMSTICK is not set | 723 | # CONFIG_MEMSTICK is not set |
| 708 | # CONFIG_NEW_LEDS is not set | 724 | # CONFIG_NEW_LEDS is not set |
| 725 | # CONFIG_ACCESSIBILITY is not set | ||
| 709 | # CONFIG_INFINIBAND is not set | 726 | # CONFIG_INFINIBAND is not set |
| 710 | # CONFIG_EDAC is not set | 727 | # CONFIG_EDAC is not set |
| 711 | # CONFIG_RTC_CLASS is not set | 728 | # CONFIG_RTC_CLASS is not set |
| 712 | # CONFIG_DMADEVICES is not set | 729 | # CONFIG_DMADEVICES is not set |
| 713 | |||
| 714 | # | ||
| 715 | # Userspace I/O | ||
| 716 | # | ||
| 717 | # CONFIG_UIO is not set | 730 | # CONFIG_UIO is not set |
| 718 | 731 | ||
| 719 | # | 732 | # |
| @@ -733,7 +746,6 @@ CONFIG_FS_MBCACHE=y | |||
| 733 | # CONFIG_JFS_FS is not set | 746 | # CONFIG_JFS_FS is not set |
| 734 | # CONFIG_FS_POSIX_ACL is not set | 747 | # CONFIG_FS_POSIX_ACL is not set |
| 735 | # CONFIG_XFS_FS is not set | 748 | # CONFIG_XFS_FS is not set |
| 736 | # CONFIG_GFS2_FS is not set | ||
| 737 | # CONFIG_OCFS2_FS is not set | 749 | # CONFIG_OCFS2_FS is not set |
| 738 | CONFIG_DNOTIFY=y | 750 | CONFIG_DNOTIFY=y |
| 739 | CONFIG_INOTIFY=y | 751 | CONFIG_INOTIFY=y |
| @@ -790,7 +802,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 790 | CONFIG_NFS_FS=y | 802 | CONFIG_NFS_FS=y |
| 791 | # CONFIG_NFS_V3 is not set | 803 | # CONFIG_NFS_V3 is not set |
| 792 | # CONFIG_NFS_V4 is not set | 804 | # CONFIG_NFS_V4 is not set |
| 793 | # CONFIG_NFS_DIRECTIO is not set | ||
| 794 | # CONFIG_NFSD is not set | 805 | # CONFIG_NFSD is not set |
| 795 | CONFIG_ROOT_NFS=y | 806 | CONFIG_ROOT_NFS=y |
| 796 | CONFIG_LOCKD=y | 807 | CONFIG_LOCKD=y |
| @@ -829,6 +840,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 829 | # Library routines | 840 | # Library routines |
| 830 | # | 841 | # |
| 831 | CONFIG_BITREVERSE=y | 842 | CONFIG_BITREVERSE=y |
| 843 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 832 | # CONFIG_CRC_CCITT is not set | 844 | # CONFIG_CRC_CCITT is not set |
| 833 | # CONFIG_CRC16 is not set | 845 | # CONFIG_CRC16 is not set |
| 834 | # CONFIG_CRC_ITU_T is not set | 846 | # CONFIG_CRC_ITU_T is not set |
| @@ -839,6 +851,7 @@ CONFIG_PLIST=y | |||
| 839 | CONFIG_HAS_IOMEM=y | 851 | CONFIG_HAS_IOMEM=y |
| 840 | CONFIG_HAS_IOPORT=y | 852 | CONFIG_HAS_IOPORT=y |
| 841 | CONFIG_HAS_DMA=y | 853 | CONFIG_HAS_DMA=y |
| 854 | CONFIG_HAVE_LMB=y | ||
| 842 | 855 | ||
| 843 | # | 856 | # |
| 844 | # Kernel hacking | 857 | # Kernel hacking |
| @@ -846,6 +859,7 @@ CONFIG_HAS_DMA=y | |||
| 846 | # CONFIG_PRINTK_TIME is not set | 859 | # CONFIG_PRINTK_TIME is not set |
| 847 | CONFIG_ENABLE_WARN_DEPRECATED=y | 860 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 848 | CONFIG_ENABLE_MUST_CHECK=y | 861 | CONFIG_ENABLE_MUST_CHECK=y |
| 862 | CONFIG_FRAME_WARN=1024 | ||
| 849 | # CONFIG_MAGIC_SYSRQ is not set | 863 | # CONFIG_MAGIC_SYSRQ is not set |
| 850 | # CONFIG_UNUSED_SYMBOLS is not set | 864 | # CONFIG_UNUSED_SYMBOLS is not set |
| 851 | # CONFIG_DEBUG_FS is not set | 865 | # CONFIG_DEBUG_FS is not set |
| @@ -856,6 +870,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 856 | CONFIG_SCHED_DEBUG=y | 870 | CONFIG_SCHED_DEBUG=y |
| 857 | # CONFIG_SCHEDSTATS is not set | 871 | # CONFIG_SCHEDSTATS is not set |
| 858 | # CONFIG_TIMER_STATS is not set | 872 | # CONFIG_TIMER_STATS is not set |
| 873 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 859 | # CONFIG_SLUB_DEBUG_ON is not set | 874 | # CONFIG_SLUB_DEBUG_ON is not set |
| 860 | # CONFIG_SLUB_STATS is not set | 875 | # CONFIG_SLUB_STATS is not set |
| 861 | # CONFIG_DEBUG_RT_MUTEXES is not set | 876 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -868,6 +883,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 868 | # CONFIG_DEBUG_BUGVERBOSE is not set | 883 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 869 | # CONFIG_DEBUG_INFO is not set | 884 | # CONFIG_DEBUG_INFO is not set |
| 870 | # CONFIG_DEBUG_VM is not set | 885 | # CONFIG_DEBUG_VM is not set |
| 886 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 871 | # CONFIG_DEBUG_LIST is not set | 887 | # CONFIG_DEBUG_LIST is not set |
| 872 | # CONFIG_DEBUG_SG is not set | 888 | # CONFIG_DEBUG_SG is not set |
| 873 | # CONFIG_BOOT_PRINTK_DELAY is not set | 889 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -878,6 +894,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 878 | # CONFIG_DEBUG_STACK_USAGE is not set | 894 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 879 | # CONFIG_DEBUG_PAGEALLOC is not set | 895 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 880 | # CONFIG_DEBUGGER is not set | 896 | # CONFIG_DEBUGGER is not set |
| 897 | # CONFIG_IRQSTACKS is not set | ||
| 881 | # CONFIG_BDI_SWITCH is not set | 898 | # CONFIG_BDI_SWITCH is not set |
| 882 | # CONFIG_PPC_EARLY_DEBUG is not set | 899 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 883 | 900 | ||
| @@ -888,48 +905,78 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 888 | # CONFIG_SECURITY is not set | 905 | # CONFIG_SECURITY is not set |
| 889 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 906 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 890 | CONFIG_CRYPTO=y | 907 | CONFIG_CRYPTO=y |
| 891 | # CONFIG_CRYPTO_SEQIV is not set | 908 | |
| 909 | # | ||
| 910 | # Crypto core or helper | ||
| 911 | # | ||
| 892 | # CONFIG_CRYPTO_MANAGER is not set | 912 | # CONFIG_CRYPTO_MANAGER is not set |
| 913 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 914 | # CONFIG_CRYPTO_NULL is not set | ||
| 915 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 916 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # Authenticated Encryption with Associated Data | ||
| 920 | # | ||
| 921 | # CONFIG_CRYPTO_CCM is not set | ||
| 922 | # CONFIG_CRYPTO_GCM is not set | ||
| 923 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 924 | |||
| 925 | # | ||
| 926 | # Block modes | ||
| 927 | # | ||
| 928 | # CONFIG_CRYPTO_CBC is not set | ||
| 929 | # CONFIG_CRYPTO_CTR is not set | ||
| 930 | # CONFIG_CRYPTO_CTS is not set | ||
| 931 | # CONFIG_CRYPTO_ECB is not set | ||
| 932 | # CONFIG_CRYPTO_LRW is not set | ||
| 933 | # CONFIG_CRYPTO_PCBC is not set | ||
| 934 | # CONFIG_CRYPTO_XTS is not set | ||
| 935 | |||
| 936 | # | ||
| 937 | # Hash modes | ||
| 938 | # | ||
| 893 | # CONFIG_CRYPTO_HMAC is not set | 939 | # CONFIG_CRYPTO_HMAC is not set |
| 894 | # CONFIG_CRYPTO_XCBC is not set | 940 | # CONFIG_CRYPTO_XCBC is not set |
| 895 | # CONFIG_CRYPTO_NULL is not set | 941 | |
| 942 | # | ||
| 943 | # Digest | ||
| 944 | # | ||
| 945 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 896 | # CONFIG_CRYPTO_MD4 is not set | 946 | # CONFIG_CRYPTO_MD4 is not set |
| 897 | # CONFIG_CRYPTO_MD5 is not set | 947 | # CONFIG_CRYPTO_MD5 is not set |
| 948 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 898 | # CONFIG_CRYPTO_SHA1 is not set | 949 | # CONFIG_CRYPTO_SHA1 is not set |
| 899 | # CONFIG_CRYPTO_SHA256 is not set | 950 | # CONFIG_CRYPTO_SHA256 is not set |
| 900 | # CONFIG_CRYPTO_SHA512 is not set | 951 | # CONFIG_CRYPTO_SHA512 is not set |
| 901 | # CONFIG_CRYPTO_WP512 is not set | ||
| 902 | # CONFIG_CRYPTO_TGR192 is not set | 952 | # CONFIG_CRYPTO_TGR192 is not set |
| 903 | # CONFIG_CRYPTO_GF128MUL is not set | 953 | # CONFIG_CRYPTO_WP512 is not set |
| 904 | # CONFIG_CRYPTO_ECB is not set | 954 | |
| 905 | # CONFIG_CRYPTO_CBC is not set | 955 | # |
| 906 | # CONFIG_CRYPTO_PCBC is not set | 956 | # Ciphers |
| 907 | # CONFIG_CRYPTO_LRW is not set | 957 | # |
| 908 | # CONFIG_CRYPTO_XTS is not set | ||
| 909 | # CONFIG_CRYPTO_CTR is not set | ||
| 910 | # CONFIG_CRYPTO_GCM is not set | ||
| 911 | # CONFIG_CRYPTO_CCM is not set | ||
| 912 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 913 | # CONFIG_CRYPTO_DES is not set | ||
| 914 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 915 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 916 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 917 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 918 | # CONFIG_CRYPTO_AES is not set | 958 | # CONFIG_CRYPTO_AES is not set |
| 959 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 960 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 961 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 962 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 919 | # CONFIG_CRYPTO_CAST5 is not set | 963 | # CONFIG_CRYPTO_CAST5 is not set |
| 920 | # CONFIG_CRYPTO_CAST6 is not set | 964 | # CONFIG_CRYPTO_CAST6 is not set |
| 921 | # CONFIG_CRYPTO_TEA is not set | 965 | # CONFIG_CRYPTO_DES is not set |
| 922 | # CONFIG_CRYPTO_ARC4 is not set | 966 | # CONFIG_CRYPTO_FCRYPT is not set |
| 923 | # CONFIG_CRYPTO_KHAZAD is not set | 967 | # CONFIG_CRYPTO_KHAZAD is not set |
| 924 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 925 | # CONFIG_CRYPTO_SEED is not set | ||
| 926 | # CONFIG_CRYPTO_SALSA20 is not set | 968 | # CONFIG_CRYPTO_SALSA20 is not set |
| 969 | # CONFIG_CRYPTO_SEED is not set | ||
| 970 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 971 | # CONFIG_CRYPTO_TEA is not set | ||
| 972 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 973 | |||
| 974 | # | ||
| 975 | # Compression | ||
| 976 | # | ||
| 927 | # CONFIG_CRYPTO_DEFLATE is not set | 977 | # CONFIG_CRYPTO_DEFLATE is not set |
| 928 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 929 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 930 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 931 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 932 | # CONFIG_CRYPTO_LZO is not set | 978 | # CONFIG_CRYPTO_LZO is not set |
| 933 | CONFIG_CRYPTO_HW=y | 979 | CONFIG_CRYPTO_HW=y |
| 934 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 980 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 935 | # CONFIG_PPC_CLOCK is not set | 981 | # CONFIG_PPC_CLOCK is not set |
| 982 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig index 67f67978c742..24f7f44b4821 100644 --- a/arch/powerpc/configs/85xx/sbc8548_defconfig +++ b/arch/powerpc/configs/85xx/sbc8548_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:39 2008 | 4 | # Mon Jun 9 08:52:37 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 94 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 92 | CONFIG_HOTPLUG=y | 95 | CONFIG_HOTPLUG=y |
| @@ -111,6 +114,7 @@ CONFIG_SLAB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -206,11 +211,13 @@ CONFIG_FLATMEM=y | |||
| 206 | CONFIG_FLAT_NODE_MEM_MAP=y | 211 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 207 | # CONFIG_SPARSEMEM_STATIC is not set | 212 | # CONFIG_SPARSEMEM_STATIC is not set |
| 208 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 214 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 209 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 210 | # CONFIG_RESOURCES_64BIT is not set | 216 | # CONFIG_RESOURCES_64BIT is not set |
| 211 | CONFIG_ZONE_DMA_FLAG=1 | 217 | CONFIG_ZONE_DMA_FLAG=1 |
| 212 | CONFIG_BOUNCE=y | 218 | CONFIG_BOUNCE=y |
| 213 | CONFIG_VIRT_TO_BUS=y | 219 | CONFIG_VIRT_TO_BUS=y |
| 220 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 214 | CONFIG_PROC_DEVICETREE=y | 221 | CONFIG_PROC_DEVICETREE=y |
| 215 | # CONFIG_CMDLINE_BOOL is not set | 222 | # CONFIG_CMDLINE_BOOL is not set |
| 216 | # CONFIG_PM is not set | 223 | # CONFIG_PM is not set |
| @@ -233,6 +240,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 233 | CONFIG_PCI_LEGACY=y | 240 | CONFIG_PCI_LEGACY=y |
| 234 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 235 | # CONFIG_HOTPLUG_PCI is not set | 242 | # CONFIG_HOTPLUG_PCI is not set |
| 243 | # CONFIG_HAS_RAPIDIO is not set | ||
| 236 | 244 | ||
| 237 | # | 245 | # |
| 238 | # Advanced setup | 246 | # Advanced setup |
| @@ -242,11 +250,12 @@ CONFIG_PCI_LEGACY=y | |||
| 242 | # | 250 | # |
| 243 | # Default settings for advanced configuration options are used | 251 | # Default settings for advanced configuration options are used |
| 244 | # | 252 | # |
| 245 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 246 | CONFIG_LOWMEM_SIZE=0x30000000 | 253 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 254 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 247 | CONFIG_KERNEL_START=0xc0000000 | 255 | CONFIG_KERNEL_START=0xc0000000 |
| 256 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 257 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 248 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 249 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 250 | 259 | ||
| 251 | # | 260 | # |
| 252 | # Networking | 261 | # Networking |
| @@ -294,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -449,7 +456,6 @@ CONFIG_NETDEV_1000=y | |||
| 449 | # CONFIG_SIS190 is not set | 456 | # CONFIG_SIS190 is not set |
| 450 | # CONFIG_SKGE is not set | 457 | # CONFIG_SKGE is not set |
| 451 | # CONFIG_SKY2 is not set | 458 | # CONFIG_SKY2 is not set |
| 452 | # CONFIG_SK98LIN is not set | ||
| 453 | # CONFIG_VIA_VELOCITY is not set | 459 | # CONFIG_VIA_VELOCITY is not set |
| 454 | # CONFIG_TIGON3 is not set | 460 | # CONFIG_TIGON3 is not set |
| 455 | # CONFIG_BNX2 is not set | 461 | # CONFIG_BNX2 is not set |
| @@ -469,6 +475,7 @@ CONFIG_NETDEV_10000=y | |||
| 469 | # CONFIG_MLX4_CORE is not set | 475 | # CONFIG_MLX4_CORE is not set |
| 470 | # CONFIG_TEHUTI is not set | 476 | # CONFIG_TEHUTI is not set |
| 471 | # CONFIG_BNX2X is not set | 477 | # CONFIG_BNX2X is not set |
| 478 | # CONFIG_SFC is not set | ||
| 472 | # CONFIG_TR is not set | 479 | # CONFIG_TR is not set |
| 473 | 480 | ||
| 474 | # | 481 | # |
| @@ -476,6 +483,7 @@ CONFIG_NETDEV_10000=y | |||
| 476 | # | 483 | # |
| 477 | # CONFIG_WLAN_PRE80211 is not set | 484 | # CONFIG_WLAN_PRE80211 is not set |
| 478 | # CONFIG_WLAN_80211 is not set | 485 | # CONFIG_WLAN_80211 is not set |
| 486 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 479 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
| 480 | # CONFIG_FDDI is not set | 488 | # CONFIG_FDDI is not set |
| 481 | # CONFIG_HIPPI is not set | 489 | # CONFIG_HIPPI is not set |
| @@ -522,6 +530,7 @@ CONFIG_INPUT=y | |||
| 522 | # Character devices | 530 | # Character devices |
| 523 | # | 531 | # |
| 524 | # CONFIG_VT is not set | 532 | # CONFIG_VT is not set |
| 533 | CONFIG_DEVKMEM=y | ||
| 525 | # CONFIG_SERIAL_NONSTANDARD is not set | 534 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 526 | # CONFIG_NOZOMI is not set | 535 | # CONFIG_NOZOMI is not set |
| 527 | 536 | ||
| @@ -558,12 +567,7 @@ CONFIG_GEN_RTC=y | |||
| 558 | # CONFIG_TCG_TPM is not set | 567 | # CONFIG_TCG_TPM is not set |
| 559 | CONFIG_DEVPORT=y | 568 | CONFIG_DEVPORT=y |
| 560 | # CONFIG_I2C is not set | 569 | # CONFIG_I2C is not set |
| 561 | |||
| 562 | # | ||
| 563 | # SPI support | ||
| 564 | # | ||
| 565 | # CONFIG_SPI is not set | 570 | # CONFIG_SPI is not set |
| 566 | # CONFIG_SPI_MASTER is not set | ||
| 567 | # CONFIG_W1 is not set | 571 | # CONFIG_W1 is not set |
| 568 | # CONFIG_POWER_SUPPLY is not set | 572 | # CONFIG_POWER_SUPPLY is not set |
| 569 | CONFIG_HWMON=y | 573 | CONFIG_HWMON=y |
| @@ -596,12 +600,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 596 | # Multifunction device drivers | 600 | # Multifunction device drivers |
| 597 | # | 601 | # |
| 598 | # CONFIG_MFD_SM501 is not set | 602 | # CONFIG_MFD_SM501 is not set |
| 603 | # CONFIG_HTC_PASIC3 is not set | ||
| 599 | 604 | ||
| 600 | # | 605 | # |
| 601 | # Multimedia devices | 606 | # Multimedia devices |
| 602 | # | 607 | # |
| 608 | |||
| 609 | # | ||
| 610 | # Multimedia core support | ||
| 611 | # | ||
| 603 | # CONFIG_VIDEO_DEV is not set | 612 | # CONFIG_VIDEO_DEV is not set |
| 604 | # CONFIG_DVB_CORE is not set | 613 | # CONFIG_DVB_CORE is not set |
| 614 | # CONFIG_VIDEO_MEDIA is not set | ||
| 615 | |||
| 616 | # | ||
| 617 | # Multimedia drivers | ||
| 618 | # | ||
| 605 | CONFIG_DAB=y | 619 | CONFIG_DAB=y |
| 606 | 620 | ||
| 607 | # | 621 | # |
| @@ -628,14 +642,11 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 628 | # CONFIG_MMC is not set | 642 | # CONFIG_MMC is not set |
| 629 | # CONFIG_MEMSTICK is not set | 643 | # CONFIG_MEMSTICK is not set |
| 630 | # CONFIG_NEW_LEDS is not set | 644 | # CONFIG_NEW_LEDS is not set |
| 645 | # CONFIG_ACCESSIBILITY is not set | ||
| 631 | # CONFIG_INFINIBAND is not set | 646 | # CONFIG_INFINIBAND is not set |
| 632 | # CONFIG_EDAC is not set | 647 | # CONFIG_EDAC is not set |
| 633 | # CONFIG_RTC_CLASS is not set | 648 | # CONFIG_RTC_CLASS is not set |
| 634 | # CONFIG_DMADEVICES is not set | 649 | # CONFIG_DMADEVICES is not set |
| 635 | |||
| 636 | # | ||
| 637 | # Userspace I/O | ||
| 638 | # | ||
| 639 | # CONFIG_UIO is not set | 650 | # CONFIG_UIO is not set |
| 640 | 651 | ||
| 641 | # | 652 | # |
| @@ -648,7 +659,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 648 | # CONFIG_JFS_FS is not set | 659 | # CONFIG_JFS_FS is not set |
| 649 | # CONFIG_FS_POSIX_ACL is not set | 660 | # CONFIG_FS_POSIX_ACL is not set |
| 650 | # CONFIG_XFS_FS is not set | 661 | # CONFIG_XFS_FS is not set |
| 651 | # CONFIG_GFS2_FS is not set | ||
| 652 | # CONFIG_OCFS2_FS is not set | 662 | # CONFIG_OCFS2_FS is not set |
| 653 | CONFIG_DNOTIFY=y | 663 | CONFIG_DNOTIFY=y |
| 654 | CONFIG_INOTIFY=y | 664 | CONFIG_INOTIFY=y |
| @@ -705,7 +715,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 705 | CONFIG_NFS_FS=y | 715 | CONFIG_NFS_FS=y |
| 706 | # CONFIG_NFS_V3 is not set | 716 | # CONFIG_NFS_V3 is not set |
| 707 | # CONFIG_NFS_V4 is not set | 717 | # CONFIG_NFS_V4 is not set |
| 708 | # CONFIG_NFS_DIRECTIO is not set | ||
| 709 | # CONFIG_NFSD is not set | 718 | # CONFIG_NFSD is not set |
| 710 | CONFIG_ROOT_NFS=y | 719 | CONFIG_ROOT_NFS=y |
| 711 | CONFIG_LOCKD=y | 720 | CONFIG_LOCKD=y |
| @@ -732,6 +741,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 732 | # Library routines | 741 | # Library routines |
| 733 | # | 742 | # |
| 734 | CONFIG_BITREVERSE=y | 743 | CONFIG_BITREVERSE=y |
| 744 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 735 | # CONFIG_CRC_CCITT is not set | 745 | # CONFIG_CRC_CCITT is not set |
| 736 | # CONFIG_CRC16 is not set | 746 | # CONFIG_CRC16 is not set |
| 737 | # CONFIG_CRC_ITU_T is not set | 747 | # CONFIG_CRC_ITU_T is not set |
| @@ -742,6 +752,7 @@ CONFIG_PLIST=y | |||
| 742 | CONFIG_HAS_IOMEM=y | 752 | CONFIG_HAS_IOMEM=y |
| 743 | CONFIG_HAS_IOPORT=y | 753 | CONFIG_HAS_IOPORT=y |
| 744 | CONFIG_HAS_DMA=y | 754 | CONFIG_HAS_DMA=y |
| 755 | CONFIG_HAVE_LMB=y | ||
| 745 | 756 | ||
| 746 | # | 757 | # |
| 747 | # Kernel hacking | 758 | # Kernel hacking |
| @@ -749,6 +760,7 @@ CONFIG_HAS_DMA=y | |||
| 749 | # CONFIG_PRINTK_TIME is not set | 760 | # CONFIG_PRINTK_TIME is not set |
| 750 | CONFIG_ENABLE_WARN_DEPRECATED=y | 761 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 751 | CONFIG_ENABLE_MUST_CHECK=y | 762 | CONFIG_ENABLE_MUST_CHECK=y |
| 763 | CONFIG_FRAME_WARN=1024 | ||
| 752 | # CONFIG_MAGIC_SYSRQ is not set | 764 | # CONFIG_MAGIC_SYSRQ is not set |
| 753 | # CONFIG_UNUSED_SYMBOLS is not set | 765 | # CONFIG_UNUSED_SYMBOLS is not set |
| 754 | # CONFIG_DEBUG_FS is not set | 766 | # CONFIG_DEBUG_FS is not set |
| @@ -756,6 +768,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 756 | # CONFIG_DEBUG_KERNEL is not set | 768 | # CONFIG_DEBUG_KERNEL is not set |
| 757 | # CONFIG_DEBUG_BUGVERBOSE is not set | 769 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 758 | # CONFIG_SAMPLES is not set | 770 | # CONFIG_SAMPLES is not set |
| 771 | # CONFIG_IRQSTACKS is not set | ||
| 759 | # CONFIG_PPC_EARLY_DEBUG is not set | 772 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 760 | 773 | ||
| 761 | # | 774 | # |
| @@ -765,48 +778,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 765 | # CONFIG_SECURITY is not set | 778 | # CONFIG_SECURITY is not set |
| 766 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 779 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 767 | CONFIG_CRYPTO=y | 780 | CONFIG_CRYPTO=y |
| 768 | # CONFIG_CRYPTO_SEQIV is not set | 781 | |
| 782 | # | ||
| 783 | # Crypto core or helper | ||
| 784 | # | ||
| 769 | # CONFIG_CRYPTO_MANAGER is not set | 785 | # CONFIG_CRYPTO_MANAGER is not set |
| 786 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 787 | # CONFIG_CRYPTO_NULL is not set | ||
| 788 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 789 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 790 | |||
| 791 | # | ||
| 792 | # Authenticated Encryption with Associated Data | ||
| 793 | # | ||
| 794 | # CONFIG_CRYPTO_CCM is not set | ||
| 795 | # CONFIG_CRYPTO_GCM is not set | ||
| 796 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # Block modes | ||
| 800 | # | ||
| 801 | # CONFIG_CRYPTO_CBC is not set | ||
| 802 | # CONFIG_CRYPTO_CTR is not set | ||
| 803 | # CONFIG_CRYPTO_CTS is not set | ||
| 804 | # CONFIG_CRYPTO_ECB is not set | ||
| 805 | # CONFIG_CRYPTO_LRW is not set | ||
| 806 | # CONFIG_CRYPTO_PCBC is not set | ||
| 807 | # CONFIG_CRYPTO_XTS is not set | ||
| 808 | |||
| 809 | # | ||
| 810 | # Hash modes | ||
| 811 | # | ||
| 770 | # CONFIG_CRYPTO_HMAC is not set | 812 | # CONFIG_CRYPTO_HMAC is not set |
| 771 | # CONFIG_CRYPTO_XCBC is not set | 813 | # CONFIG_CRYPTO_XCBC is not set |
| 772 | # CONFIG_CRYPTO_NULL is not set | 814 | |
| 815 | # | ||
| 816 | # Digest | ||
| 817 | # | ||
| 818 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 773 | # CONFIG_CRYPTO_MD4 is not set | 819 | # CONFIG_CRYPTO_MD4 is not set |
| 774 | # CONFIG_CRYPTO_MD5 is not set | 820 | # CONFIG_CRYPTO_MD5 is not set |
| 821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 775 | # CONFIG_CRYPTO_SHA1 is not set | 822 | # CONFIG_CRYPTO_SHA1 is not set |
| 776 | # CONFIG_CRYPTO_SHA256 is not set | 823 | # CONFIG_CRYPTO_SHA256 is not set |
| 777 | # CONFIG_CRYPTO_SHA512 is not set | 824 | # CONFIG_CRYPTO_SHA512 is not set |
| 778 | # CONFIG_CRYPTO_WP512 is not set | ||
| 779 | # CONFIG_CRYPTO_TGR192 is not set | 825 | # CONFIG_CRYPTO_TGR192 is not set |
| 780 | # CONFIG_CRYPTO_GF128MUL is not set | 826 | # CONFIG_CRYPTO_WP512 is not set |
| 781 | # CONFIG_CRYPTO_ECB is not set | 827 | |
| 782 | # CONFIG_CRYPTO_CBC is not set | 828 | # |
| 783 | # CONFIG_CRYPTO_PCBC is not set | 829 | # Ciphers |
| 784 | # CONFIG_CRYPTO_LRW is not set | 830 | # |
| 785 | # CONFIG_CRYPTO_XTS is not set | ||
| 786 | # CONFIG_CRYPTO_CTR is not set | ||
| 787 | # CONFIG_CRYPTO_GCM is not set | ||
| 788 | # CONFIG_CRYPTO_CCM is not set | ||
| 789 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 790 | # CONFIG_CRYPTO_DES is not set | ||
| 791 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 792 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 793 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 794 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 795 | # CONFIG_CRYPTO_AES is not set | 831 | # CONFIG_CRYPTO_AES is not set |
| 832 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 833 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 834 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 835 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 796 | # CONFIG_CRYPTO_CAST5 is not set | 836 | # CONFIG_CRYPTO_CAST5 is not set |
| 797 | # CONFIG_CRYPTO_CAST6 is not set | 837 | # CONFIG_CRYPTO_CAST6 is not set |
| 798 | # CONFIG_CRYPTO_TEA is not set | 838 | # CONFIG_CRYPTO_DES is not set |
| 799 | # CONFIG_CRYPTO_ARC4 is not set | 839 | # CONFIG_CRYPTO_FCRYPT is not set |
| 800 | # CONFIG_CRYPTO_KHAZAD is not set | 840 | # CONFIG_CRYPTO_KHAZAD is not set |
| 801 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 802 | # CONFIG_CRYPTO_SEED is not set | ||
| 803 | # CONFIG_CRYPTO_SALSA20 is not set | 841 | # CONFIG_CRYPTO_SALSA20 is not set |
| 842 | # CONFIG_CRYPTO_SEED is not set | ||
| 843 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 844 | # CONFIG_CRYPTO_TEA is not set | ||
| 845 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 846 | |||
| 847 | # | ||
| 848 | # Compression | ||
| 849 | # | ||
| 804 | # CONFIG_CRYPTO_DEFLATE is not set | 850 | # CONFIG_CRYPTO_DEFLATE is not set |
| 805 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 806 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 807 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 808 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 809 | # CONFIG_CRYPTO_LZO is not set | 851 | # CONFIG_CRYPTO_LZO is not set |
| 810 | CONFIG_CRYPTO_HW=y | 852 | CONFIG_CRYPTO_HW=y |
| 811 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 853 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 812 | # CONFIG_PPC_CLOCK is not set | 854 | # CONFIG_PPC_CLOCK is not set |
| 855 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index fef605579e29..655518dcd73f 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:39 2008 | 4 | # Mon Jun 9 08:52:38 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -112,6 +115,7 @@ CONFIG_SLAB=y | |||
| 112 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
| 113 | CONFIG_HAVE_KPROBES=y | 116 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 117 | CONFIG_HAVE_KRETPROBES=y |
| 118 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_PROC_PAGE_MONITOR=y |
| 116 | CONFIG_SLABINFO=y | 120 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 121 | CONFIG_RT_MUTEXES=y |
| @@ -152,6 +156,7 @@ CONFIG_MPC85xx=y | |||
| 152 | # CONFIG_MPC85xx_CDS is not set | 156 | # CONFIG_MPC85xx_CDS is not set |
| 153 | # CONFIG_MPC85xx_MDS is not set | 157 | # CONFIG_MPC85xx_MDS is not set |
| 154 | # CONFIG_MPC85xx_DS is not set | 158 | # CONFIG_MPC85xx_DS is not set |
| 159 | # CONFIG_KSI8560 is not set | ||
| 155 | # CONFIG_STX_GP3 is not set | 160 | # CONFIG_STX_GP3 is not set |
| 156 | # CONFIG_TQM8540 is not set | 161 | # CONFIG_TQM8540 is not set |
| 157 | # CONFIG_TQM8541 is not set | 162 | # CONFIG_TQM8541 is not set |
| @@ -207,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 207 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 208 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 209 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 211 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 212 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 213 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 214 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 215 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
| 216 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 217 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -228,6 +235,7 @@ CONFIG_FSL_SOC=y | |||
| 228 | # CONFIG_PCI_SYSCALL is not set | 235 | # CONFIG_PCI_SYSCALL is not set |
| 229 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 230 | # CONFIG_PCCARD is not set | 237 | # CONFIG_PCCARD is not set |
| 238 | # CONFIG_HAS_RAPIDIO is not set | ||
| 231 | 239 | ||
| 232 | # | 240 | # |
| 233 | # Advanced setup | 241 | # Advanced setup |
| @@ -237,11 +245,12 @@ CONFIG_FSL_SOC=y | |||
| 237 | # | 245 | # |
| 238 | # Default settings for advanced configuration options are used | 246 | # Default settings for advanced configuration options are used |
| 239 | # | 247 | # |
| 240 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 241 | CONFIG_LOWMEM_SIZE=0x30000000 | 248 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 249 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 242 | CONFIG_KERNEL_START=0xc0000000 | 250 | CONFIG_KERNEL_START=0xc0000000 |
| 251 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 243 | CONFIG_TASK_SIZE=0xc0000000 | 253 | CONFIG_TASK_SIZE=0xc0000000 |
| 244 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 245 | 254 | ||
| 246 | # | 255 | # |
| 247 | # Networking | 256 | # Networking |
| @@ -289,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 289 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 290 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 291 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 292 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 293 | # CONFIG_INET6_TUNNEL is not set | ||
| 294 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 295 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 296 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -418,6 +425,7 @@ CONFIG_NETDEV_10000=y | |||
| 418 | # | 425 | # |
| 419 | # CONFIG_WLAN_PRE80211 is not set | 426 | # CONFIG_WLAN_PRE80211 is not set |
| 420 | # CONFIG_WLAN_80211 is not set | 427 | # CONFIG_WLAN_80211 is not set |
| 428 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 421 | # CONFIG_WAN is not set | 429 | # CONFIG_WAN is not set |
| 422 | # CONFIG_PPP is not set | 430 | # CONFIG_PPP is not set |
| 423 | # CONFIG_SLIP is not set | 431 | # CONFIG_SLIP is not set |
| @@ -462,6 +470,7 @@ CONFIG_INPUT=y | |||
| 462 | # Character devices | 470 | # Character devices |
| 463 | # | 471 | # |
| 464 | # CONFIG_VT is not set | 472 | # CONFIG_VT is not set |
| 473 | CONFIG_DEVKMEM=y | ||
| 465 | # CONFIG_SERIAL_NONSTANDARD is not set | 474 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 466 | 475 | ||
| 467 | # | 476 | # |
| @@ -487,17 +496,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 487 | # CONFIG_IPMI_HANDLER is not set | 496 | # CONFIG_IPMI_HANDLER is not set |
| 488 | # CONFIG_HW_RANDOM is not set | 497 | # CONFIG_HW_RANDOM is not set |
| 489 | # CONFIG_NVRAM is not set | 498 | # CONFIG_NVRAM is not set |
| 490 | # CONFIG_GEN_RTC is not set | ||
| 491 | # CONFIG_R3964 is not set | 499 | # CONFIG_R3964 is not set |
| 492 | # CONFIG_RAW_DRIVER is not set | 500 | # CONFIG_RAW_DRIVER is not set |
| 493 | # CONFIG_TCG_TPM is not set | 501 | # CONFIG_TCG_TPM is not set |
| 494 | # CONFIG_I2C is not set | 502 | # CONFIG_I2C is not set |
| 495 | |||
| 496 | # | ||
| 497 | # SPI support | ||
| 498 | # | ||
| 499 | # CONFIG_SPI is not set | 503 | # CONFIG_SPI is not set |
| 500 | # CONFIG_SPI_MASTER is not set | ||
| 501 | # CONFIG_W1 is not set | 504 | # CONFIG_W1 is not set |
| 502 | # CONFIG_POWER_SUPPLY is not set | 505 | # CONFIG_POWER_SUPPLY is not set |
| 503 | CONFIG_HWMON=y | 506 | CONFIG_HWMON=y |
| @@ -526,12 +529,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 526 | # Multifunction device drivers | 529 | # Multifunction device drivers |
| 527 | # | 530 | # |
| 528 | # CONFIG_MFD_SM501 is not set | 531 | # CONFIG_MFD_SM501 is not set |
| 532 | # CONFIG_HTC_PASIC3 is not set | ||
| 529 | 533 | ||
| 530 | # | 534 | # |
| 531 | # Multimedia devices | 535 | # Multimedia devices |
| 532 | # | 536 | # |
| 537 | |||
| 538 | # | ||
| 539 | # Multimedia core support | ||
| 540 | # | ||
| 533 | # CONFIG_VIDEO_DEV is not set | 541 | # CONFIG_VIDEO_DEV is not set |
| 534 | # CONFIG_DVB_CORE is not set | 542 | # CONFIG_DVB_CORE is not set |
| 543 | # CONFIG_VIDEO_MEDIA is not set | ||
| 544 | |||
| 545 | # | ||
| 546 | # Multimedia drivers | ||
| 547 | # | ||
| 535 | CONFIG_DAB=y | 548 | CONFIG_DAB=y |
| 536 | 549 | ||
| 537 | # | 550 | # |
| @@ -559,6 +572,8 @@ CONFIG_USB_SUPPORT=y | |||
| 559 | # CONFIG_USB_ARCH_HAS_HCD is not set | 572 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 560 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 573 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 561 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 574 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 575 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 576 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 562 | 577 | ||
| 563 | # | 578 | # |
| 564 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 579 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -567,6 +582,7 @@ CONFIG_USB_SUPPORT=y | |||
| 567 | # CONFIG_MMC is not set | 582 | # CONFIG_MMC is not set |
| 568 | # CONFIG_MEMSTICK is not set | 583 | # CONFIG_MEMSTICK is not set |
| 569 | # CONFIG_NEW_LEDS is not set | 584 | # CONFIG_NEW_LEDS is not set |
| 585 | # CONFIG_ACCESSIBILITY is not set | ||
| 570 | # CONFIG_EDAC is not set | 586 | # CONFIG_EDAC is not set |
| 571 | CONFIG_RTC_LIB=y | 587 | CONFIG_RTC_LIB=y |
| 572 | CONFIG_RTC_CLASS=y | 588 | CONFIG_RTC_CLASS=y |
| @@ -602,11 +618,8 @@ CONFIG_RTC_DRV_M48T59=y | |||
| 602 | # | 618 | # |
| 603 | # on-CPU RTC drivers | 619 | # on-CPU RTC drivers |
| 604 | # | 620 | # |
| 621 | # CONFIG_RTC_DRV_PPC is not set | ||
| 605 | # CONFIG_DMADEVICES is not set | 622 | # CONFIG_DMADEVICES is not set |
| 606 | |||
| 607 | # | ||
| 608 | # Userspace I/O | ||
| 609 | # | ||
| 610 | # CONFIG_UIO is not set | 623 | # CONFIG_UIO is not set |
| 611 | 624 | ||
| 612 | # | 625 | # |
| @@ -619,7 +632,6 @@ CONFIG_RTC_DRV_M48T59=y | |||
| 619 | # CONFIG_JFS_FS is not set | 632 | # CONFIG_JFS_FS is not set |
| 620 | # CONFIG_FS_POSIX_ACL is not set | 633 | # CONFIG_FS_POSIX_ACL is not set |
| 621 | # CONFIG_XFS_FS is not set | 634 | # CONFIG_XFS_FS is not set |
| 622 | # CONFIG_GFS2_FS is not set | ||
| 623 | # CONFIG_OCFS2_FS is not set | 635 | # CONFIG_OCFS2_FS is not set |
| 624 | CONFIG_DNOTIFY=y | 636 | CONFIG_DNOTIFY=y |
| 625 | CONFIG_INOTIFY=y | 637 | CONFIG_INOTIFY=y |
| @@ -676,7 +688,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 676 | CONFIG_NFS_FS=y | 688 | CONFIG_NFS_FS=y |
| 677 | # CONFIG_NFS_V3 is not set | 689 | # CONFIG_NFS_V3 is not set |
| 678 | # CONFIG_NFS_V4 is not set | 690 | # CONFIG_NFS_V4 is not set |
| 679 | # CONFIG_NFS_DIRECTIO is not set | ||
| 680 | # CONFIG_NFSD is not set | 691 | # CONFIG_NFSD is not set |
| 681 | CONFIG_ROOT_NFS=y | 692 | CONFIG_ROOT_NFS=y |
| 682 | CONFIG_LOCKD=y | 693 | CONFIG_LOCKD=y |
| @@ -715,6 +726,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 715 | # Library routines | 726 | # Library routines |
| 716 | # | 727 | # |
| 717 | CONFIG_BITREVERSE=y | 728 | CONFIG_BITREVERSE=y |
| 729 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 718 | # CONFIG_CRC_CCITT is not set | 730 | # CONFIG_CRC_CCITT is not set |
| 719 | # CONFIG_CRC16 is not set | 731 | # CONFIG_CRC16 is not set |
| 720 | # CONFIG_CRC_ITU_T is not set | 732 | # CONFIG_CRC_ITU_T is not set |
| @@ -725,6 +737,7 @@ CONFIG_PLIST=y | |||
| 725 | CONFIG_HAS_IOMEM=y | 737 | CONFIG_HAS_IOMEM=y |
| 726 | CONFIG_HAS_IOPORT=y | 738 | CONFIG_HAS_IOPORT=y |
| 727 | CONFIG_HAS_DMA=y | 739 | CONFIG_HAS_DMA=y |
| 740 | CONFIG_HAVE_LMB=y | ||
| 728 | 741 | ||
| 729 | # | 742 | # |
| 730 | # Kernel hacking | 743 | # Kernel hacking |
| @@ -732,6 +745,7 @@ CONFIG_HAS_DMA=y | |||
| 732 | # CONFIG_PRINTK_TIME is not set | 745 | # CONFIG_PRINTK_TIME is not set |
| 733 | CONFIG_ENABLE_WARN_DEPRECATED=y | 746 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 734 | CONFIG_ENABLE_MUST_CHECK=y | 747 | CONFIG_ENABLE_MUST_CHECK=y |
| 748 | CONFIG_FRAME_WARN=1024 | ||
| 735 | CONFIG_MAGIC_SYSRQ=y | 749 | CONFIG_MAGIC_SYSRQ=y |
| 736 | # CONFIG_UNUSED_SYMBOLS is not set | 750 | # CONFIG_UNUSED_SYMBOLS is not set |
| 737 | # CONFIG_DEBUG_FS is not set | 751 | # CONFIG_DEBUG_FS is not set |
| @@ -742,6 +756,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 742 | CONFIG_SCHED_DEBUG=y | 756 | CONFIG_SCHED_DEBUG=y |
| 743 | # CONFIG_SCHEDSTATS is not set | 757 | # CONFIG_SCHEDSTATS is not set |
| 744 | # CONFIG_TIMER_STATS is not set | 758 | # CONFIG_TIMER_STATS is not set |
| 759 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 745 | # CONFIG_DEBUG_SLAB is not set | 760 | # CONFIG_DEBUG_SLAB is not set |
| 746 | # CONFIG_DEBUG_RT_MUTEXES is not set | 761 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 747 | # CONFIG_RT_MUTEX_TESTER is not set | 762 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -753,6 +768,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 753 | # CONFIG_DEBUG_BUGVERBOSE is not set | 768 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 754 | # CONFIG_DEBUG_INFO is not set | 769 | # CONFIG_DEBUG_INFO is not set |
| 755 | # CONFIG_DEBUG_VM is not set | 770 | # CONFIG_DEBUG_VM is not set |
| 771 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 756 | # CONFIG_DEBUG_LIST is not set | 772 | # CONFIG_DEBUG_LIST is not set |
| 757 | # CONFIG_DEBUG_SG is not set | 773 | # CONFIG_DEBUG_SG is not set |
| 758 | # CONFIG_BOOT_PRINTK_DELAY is not set | 774 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -763,6 +779,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 763 | # CONFIG_DEBUG_STACK_USAGE is not set | 779 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 764 | # CONFIG_DEBUG_PAGEALLOC is not set | 780 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 765 | # CONFIG_DEBUGGER is not set | 781 | # CONFIG_DEBUGGER is not set |
| 782 | # CONFIG_IRQSTACKS is not set | ||
| 766 | # CONFIG_BDI_SWITCH is not set | 783 | # CONFIG_BDI_SWITCH is not set |
| 767 | CONFIG_PPC_EARLY_DEBUG=y | 784 | CONFIG_PPC_EARLY_DEBUG=y |
| 768 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 785 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
| @@ -784,47 +801,77 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
| 784 | # CONFIG_SECURITY is not set | 801 | # CONFIG_SECURITY is not set |
| 785 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 802 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 786 | CONFIG_CRYPTO=y | 803 | CONFIG_CRYPTO=y |
| 787 | # CONFIG_CRYPTO_SEQIV is not set | 804 | |
| 805 | # | ||
| 806 | # Crypto core or helper | ||
| 807 | # | ||
| 788 | # CONFIG_CRYPTO_MANAGER is not set | 808 | # CONFIG_CRYPTO_MANAGER is not set |
| 809 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 810 | # CONFIG_CRYPTO_NULL is not set | ||
| 811 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 812 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 813 | |||
| 814 | # | ||
| 815 | # Authenticated Encryption with Associated Data | ||
| 816 | # | ||
| 817 | # CONFIG_CRYPTO_CCM is not set | ||
| 818 | # CONFIG_CRYPTO_GCM is not set | ||
| 819 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 820 | |||
| 821 | # | ||
| 822 | # Block modes | ||
| 823 | # | ||
| 824 | # CONFIG_CRYPTO_CBC is not set | ||
| 825 | # CONFIG_CRYPTO_CTR is not set | ||
| 826 | # CONFIG_CRYPTO_CTS is not set | ||
| 827 | # CONFIG_CRYPTO_ECB is not set | ||
| 828 | # CONFIG_CRYPTO_LRW is not set | ||
| 829 | # CONFIG_CRYPTO_PCBC is not set | ||
| 830 | # CONFIG_CRYPTO_XTS is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # Hash modes | ||
| 834 | # | ||
| 789 | # CONFIG_CRYPTO_HMAC is not set | 835 | # CONFIG_CRYPTO_HMAC is not set |
| 790 | # CONFIG_CRYPTO_XCBC is not set | 836 | # CONFIG_CRYPTO_XCBC is not set |
| 791 | # CONFIG_CRYPTO_NULL is not set | 837 | |
| 838 | # | ||
| 839 | # Digest | ||
| 840 | # | ||
| 841 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 792 | # CONFIG_CRYPTO_MD4 is not set | 842 | # CONFIG_CRYPTO_MD4 is not set |
| 793 | # CONFIG_CRYPTO_MD5 is not set | 843 | # CONFIG_CRYPTO_MD5 is not set |
| 844 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 794 | # CONFIG_CRYPTO_SHA1 is not set | 845 | # CONFIG_CRYPTO_SHA1 is not set |
| 795 | # CONFIG_CRYPTO_SHA256 is not set | 846 | # CONFIG_CRYPTO_SHA256 is not set |
| 796 | # CONFIG_CRYPTO_SHA512 is not set | 847 | # CONFIG_CRYPTO_SHA512 is not set |
| 797 | # CONFIG_CRYPTO_WP512 is not set | ||
| 798 | # CONFIG_CRYPTO_TGR192 is not set | 848 | # CONFIG_CRYPTO_TGR192 is not set |
| 799 | # CONFIG_CRYPTO_GF128MUL is not set | 849 | # CONFIG_CRYPTO_WP512 is not set |
| 800 | # CONFIG_CRYPTO_ECB is not set | 850 | |
| 801 | # CONFIG_CRYPTO_CBC is not set | 851 | # |
| 802 | # CONFIG_CRYPTO_PCBC is not set | 852 | # Ciphers |
| 803 | # CONFIG_CRYPTO_LRW is not set | 853 | # |
| 804 | # CONFIG_CRYPTO_XTS is not set | ||
| 805 | # CONFIG_CRYPTO_CTR is not set | ||
| 806 | # CONFIG_CRYPTO_GCM is not set | ||
| 807 | # CONFIG_CRYPTO_CCM is not set | ||
| 808 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 809 | # CONFIG_CRYPTO_DES is not set | ||
| 810 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 811 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 812 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 813 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 814 | # CONFIG_CRYPTO_AES is not set | 854 | # CONFIG_CRYPTO_AES is not set |
| 855 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 856 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 857 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 858 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 815 | # CONFIG_CRYPTO_CAST5 is not set | 859 | # CONFIG_CRYPTO_CAST5 is not set |
| 816 | # CONFIG_CRYPTO_CAST6 is not set | 860 | # CONFIG_CRYPTO_CAST6 is not set |
| 817 | # CONFIG_CRYPTO_TEA is not set | 861 | # CONFIG_CRYPTO_DES is not set |
| 818 | # CONFIG_CRYPTO_ARC4 is not set | 862 | # CONFIG_CRYPTO_FCRYPT is not set |
| 819 | # CONFIG_CRYPTO_KHAZAD is not set | 863 | # CONFIG_CRYPTO_KHAZAD is not set |
| 820 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 821 | # CONFIG_CRYPTO_SEED is not set | ||
| 822 | # CONFIG_CRYPTO_SALSA20 is not set | 864 | # CONFIG_CRYPTO_SALSA20 is not set |
| 865 | # CONFIG_CRYPTO_SEED is not set | ||
| 866 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 867 | # CONFIG_CRYPTO_TEA is not set | ||
| 868 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 869 | |||
| 870 | # | ||
| 871 | # Compression | ||
| 872 | # | ||
| 823 | # CONFIG_CRYPTO_DEFLATE is not set | 873 | # CONFIG_CRYPTO_DEFLATE is not set |
| 824 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 825 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 826 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 827 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 828 | # CONFIG_CRYPTO_LZO is not set | 874 | # CONFIG_CRYPTO_LZO is not set |
| 829 | CONFIG_CRYPTO_HW=y | 875 | CONFIG_CRYPTO_HW=y |
| 830 | # CONFIG_PPC_CLOCK is not set | 876 | # CONFIG_PPC_CLOCK is not set |
| 877 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index 1d303c49bb0c..7804ca1ecc94 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:42 2008 | 4 | # Mon Jun 9 08:52:38 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -114,12 +117,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 114 | # CONFIG_KPROBES is not set | 117 | # CONFIG_KPROBES is not set |
| 115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 118 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| 121 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
| 122 | CONFIG_MODULES=y | 126 | CONFIG_MODULES=y |
| 127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 123 | # CONFIG_MODULE_UNLOAD is not set | 128 | # CONFIG_MODULE_UNLOAD is not set |
| 124 | CONFIG_MODVERSIONS=y | 129 | CONFIG_MODVERSIONS=y |
| 125 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 130 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| @@ -158,6 +163,7 @@ CONFIG_MPC85xx=y | |||
| 158 | # CONFIG_MPC85xx_CDS is not set | 163 | # CONFIG_MPC85xx_CDS is not set |
| 159 | # CONFIG_MPC85xx_MDS is not set | 164 | # CONFIG_MPC85xx_MDS is not set |
| 160 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
| 166 | # CONFIG_KSI8560 is not set | ||
| 161 | CONFIG_STX_GP3=y | 167 | CONFIG_STX_GP3=y |
| 162 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
| 163 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
| @@ -215,11 +221,13 @@ CONFIG_FLATMEM=y | |||
| 215 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 216 | # CONFIG_SPARSEMEM_STATIC is not set | 222 | # CONFIG_SPARSEMEM_STATIC is not set |
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 219 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 222 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 223 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 225 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| @@ -243,6 +251,7 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # CONFIG_PCI_DEBUG is not set | 251 | # CONFIG_PCI_DEBUG is not set |
| 244 | # CONFIG_PCCARD is not set | 252 | # CONFIG_PCCARD is not set |
| 245 | # CONFIG_HOTPLUG_PCI is not set | 253 | # CONFIG_HOTPLUG_PCI is not set |
| 254 | # CONFIG_HAS_RAPIDIO is not set | ||
| 246 | 255 | ||
| 247 | # | 256 | # |
| 248 | # Advanced setup | 257 | # Advanced setup |
| @@ -252,11 +261,12 @@ CONFIG_PCI_LEGACY=y | |||
| 252 | # | 261 | # |
| 253 | # Default settings for advanced configuration options are used | 262 | # Default settings for advanced configuration options are used |
| 254 | # | 263 | # |
| 255 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 256 | CONFIG_LOWMEM_SIZE=0x30000000 | 264 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 265 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 257 | CONFIG_KERNEL_START=0xc0000000 | 266 | CONFIG_KERNEL_START=0xc0000000 |
| 267 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 268 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 269 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 270 | ||
| 261 | # | 271 | # |
| 262 | # Networking | 272 | # Networking |
| @@ -304,8 +314,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 304 | # CONFIG_TCP_MD5SIG is not set | 314 | # CONFIG_TCP_MD5SIG is not set |
| 305 | # CONFIG_IP_VS is not set | 315 | # CONFIG_IP_VS is not set |
| 306 | # CONFIG_IPV6 is not set | 316 | # CONFIG_IPV6 is not set |
| 307 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 308 | # CONFIG_INET6_TUNNEL is not set | ||
| 309 | # CONFIG_NETWORK_SECMARK is not set | 317 | # CONFIG_NETWORK_SECMARK is not set |
| 310 | CONFIG_NETFILTER=y | 318 | CONFIG_NETFILTER=y |
| 311 | # CONFIG_NETFILTER_DEBUG is not set | 319 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -418,6 +426,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 418 | # CONFIG_CONNECTOR is not set | 426 | # CONFIG_CONNECTOR is not set |
| 419 | # CONFIG_MTD is not set | 427 | # CONFIG_MTD is not set |
| 420 | CONFIG_OF_DEVICE=y | 428 | CONFIG_OF_DEVICE=y |
| 429 | CONFIG_OF_I2C=m | ||
| 421 | CONFIG_PARPORT=m | 430 | CONFIG_PARPORT=m |
| 422 | CONFIG_PARPORT_PC=m | 431 | CONFIG_PARPORT_PC=m |
| 423 | # CONFIG_PARPORT_PC_FIFO is not set | 432 | # CONFIG_PARPORT_PC_FIFO is not set |
| @@ -505,7 +514,7 @@ CONFIG_IDE_GENERIC=y | |||
| 505 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 514 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 506 | # CONFIG_BLK_DEV_TC86C001 is not set | 515 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 507 | # CONFIG_BLK_DEV_IDEDMA is not set | 516 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 508 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 517 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 509 | # CONFIG_BLK_DEV_HD is not set | 518 | # CONFIG_BLK_DEV_HD is not set |
| 510 | 519 | ||
| 511 | # | 520 | # |
| @@ -653,7 +662,6 @@ CONFIG_NETDEV_1000=y | |||
| 653 | # CONFIG_SIS190 is not set | 662 | # CONFIG_SIS190 is not set |
| 654 | # CONFIG_SKGE is not set | 663 | # CONFIG_SKGE is not set |
| 655 | # CONFIG_SKY2 is not set | 664 | # CONFIG_SKY2 is not set |
| 656 | # CONFIG_SK98LIN is not set | ||
| 657 | # CONFIG_VIA_VELOCITY is not set | 665 | # CONFIG_VIA_VELOCITY is not set |
| 658 | # CONFIG_TIGON3 is not set | 666 | # CONFIG_TIGON3 is not set |
| 659 | # CONFIG_BNX2 is not set | 667 | # CONFIG_BNX2 is not set |
| @@ -673,6 +681,7 @@ CONFIG_NETDEV_10000=y | |||
| 673 | # CONFIG_MLX4_CORE is not set | 681 | # CONFIG_MLX4_CORE is not set |
| 674 | # CONFIG_TEHUTI is not set | 682 | # CONFIG_TEHUTI is not set |
| 675 | # CONFIG_BNX2X is not set | 683 | # CONFIG_BNX2X is not set |
| 684 | # CONFIG_SFC is not set | ||
| 676 | # CONFIG_TR is not set | 685 | # CONFIG_TR is not set |
| 677 | 686 | ||
| 678 | # | 687 | # |
| @@ -680,6 +689,7 @@ CONFIG_NETDEV_10000=y | |||
| 680 | # | 689 | # |
| 681 | # CONFIG_WLAN_PRE80211 is not set | 690 | # CONFIG_WLAN_PRE80211 is not set |
| 682 | # CONFIG_WLAN_80211 is not set | 691 | # CONFIG_WLAN_80211 is not set |
| 692 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 683 | # CONFIG_WAN is not set | 693 | # CONFIG_WAN is not set |
| 684 | # CONFIG_FDDI is not set | 694 | # CONFIG_FDDI is not set |
| 685 | # CONFIG_HIPPI is not set | 695 | # CONFIG_HIPPI is not set |
| @@ -753,6 +763,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 753 | # Character devices | 763 | # Character devices |
| 754 | # | 764 | # |
| 755 | # CONFIG_VT is not set | 765 | # CONFIG_VT is not set |
| 766 | CONFIG_DEVKMEM=y | ||
| 756 | # CONFIG_SERIAL_NONSTANDARD is not set | 767 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 757 | # CONFIG_NOZOMI is not set | 768 | # CONFIG_NOZOMI is not set |
| 758 | 769 | ||
| @@ -796,13 +807,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 796 | CONFIG_I2C_CHARDEV=m | 807 | CONFIG_I2C_CHARDEV=m |
| 797 | 808 | ||
| 798 | # | 809 | # |
| 799 | # I2C Algorithms | ||
| 800 | # | ||
| 801 | CONFIG_I2C_ALGOBIT=m | ||
| 802 | # CONFIG_I2C_ALGOPCF is not set | ||
| 803 | # CONFIG_I2C_ALGOPCA is not set | ||
| 804 | |||
| 805 | # | ||
| 806 | # I2C Hardware Bus support | 810 | # I2C Hardware Bus support |
| 807 | # | 811 | # |
| 808 | # CONFIG_I2C_ALI1535 is not set | 812 | # CONFIG_I2C_ALI1535 is not set |
| @@ -829,6 +833,7 @@ CONFIG_I2C_ALGOBIT=m | |||
| 829 | # CONFIG_I2C_VIA is not set | 833 | # CONFIG_I2C_VIA is not set |
| 830 | # CONFIG_I2C_VIAPRO is not set | 834 | # CONFIG_I2C_VIAPRO is not set |
| 831 | # CONFIG_I2C_VOODOO3 is not set | 835 | # CONFIG_I2C_VOODOO3 is not set |
| 836 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 832 | 837 | ||
| 833 | # | 838 | # |
| 834 | # Miscellaneous I2C Chip support | 839 | # Miscellaneous I2C Chip support |
| @@ -838,19 +843,13 @@ CONFIG_I2C_ALGOBIT=m | |||
| 838 | # CONFIG_SENSORS_PCF8574 is not set | 843 | # CONFIG_SENSORS_PCF8574 is not set |
| 839 | # CONFIG_PCF8575 is not set | 844 | # CONFIG_PCF8575 is not set |
| 840 | # CONFIG_SENSORS_PCF8591 is not set | 845 | # CONFIG_SENSORS_PCF8591 is not set |
| 841 | # CONFIG_TPS65010 is not set | ||
| 842 | # CONFIG_SENSORS_MAX6875 is not set | 846 | # CONFIG_SENSORS_MAX6875 is not set |
| 843 | # CONFIG_SENSORS_TSL2550 is not set | 847 | # CONFIG_SENSORS_TSL2550 is not set |
| 844 | # CONFIG_I2C_DEBUG_CORE is not set | 848 | # CONFIG_I2C_DEBUG_CORE is not set |
| 845 | # CONFIG_I2C_DEBUG_ALGO is not set | 849 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 846 | # CONFIG_I2C_DEBUG_BUS is not set | 850 | # CONFIG_I2C_DEBUG_BUS is not set |
| 847 | # CONFIG_I2C_DEBUG_CHIP is not set | 851 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 848 | |||
| 849 | # | ||
| 850 | # SPI support | ||
| 851 | # | ||
| 852 | # CONFIG_SPI is not set | 852 | # CONFIG_SPI is not set |
| 853 | # CONFIG_SPI_MASTER is not set | ||
| 854 | # CONFIG_W1 is not set | 853 | # CONFIG_W1 is not set |
| 855 | # CONFIG_POWER_SUPPLY is not set | 854 | # CONFIG_POWER_SUPPLY is not set |
| 856 | CONFIG_HWMON=y | 855 | CONFIG_HWMON=y |
| @@ -920,12 +919,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 920 | # Multifunction device drivers | 919 | # Multifunction device drivers |
| 921 | # | 920 | # |
| 922 | # CONFIG_MFD_SM501 is not set | 921 | # CONFIG_MFD_SM501 is not set |
| 922 | # CONFIG_HTC_PASIC3 is not set | ||
| 923 | 923 | ||
| 924 | # | 924 | # |
| 925 | # Multimedia devices | 925 | # Multimedia devices |
| 926 | # | 926 | # |
| 927 | |||
| 928 | # | ||
| 929 | # Multimedia core support | ||
| 930 | # | ||
| 927 | # CONFIG_VIDEO_DEV is not set | 931 | # CONFIG_VIDEO_DEV is not set |
| 928 | # CONFIG_DVB_CORE is not set | 932 | # CONFIG_DVB_CORE is not set |
| 933 | # CONFIG_VIDEO_MEDIA is not set | ||
| 934 | |||
| 935 | # | ||
| 936 | # Multimedia drivers | ||
| 937 | # | ||
| 929 | CONFIG_DAB=y | 938 | CONFIG_DAB=y |
| 930 | 939 | ||
| 931 | # | 940 | # |
| @@ -973,6 +982,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 973 | CONFIG_USB_ARCH_HAS_OHCI=y | 982 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 974 | CONFIG_USB_ARCH_HAS_EHCI=y | 983 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 975 | # CONFIG_USB is not set | 984 | # CONFIG_USB is not set |
| 985 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 986 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 976 | 987 | ||
| 977 | # | 988 | # |
| 978 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 989 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -981,15 +992,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 981 | # CONFIG_MMC is not set | 992 | # CONFIG_MMC is not set |
| 982 | # CONFIG_MEMSTICK is not set | 993 | # CONFIG_MEMSTICK is not set |
| 983 | # CONFIG_NEW_LEDS is not set | 994 | # CONFIG_NEW_LEDS is not set |
| 995 | # CONFIG_ACCESSIBILITY is not set | ||
| 984 | # CONFIG_INFINIBAND is not set | 996 | # CONFIG_INFINIBAND is not set |
| 985 | # CONFIG_EDAC is not set | 997 | # CONFIG_EDAC is not set |
| 986 | # CONFIG_RTC_CLASS is not set | 998 | # CONFIG_RTC_CLASS is not set |
| 987 | # CONFIG_DMADEVICES is not set | 999 | # CONFIG_DMADEVICES is not set |
| 988 | # CONFIG_AUXDISPLAY is not set | 1000 | # CONFIG_AUXDISPLAY is not set |
| 989 | |||
| 990 | # | ||
| 991 | # Userspace I/O | ||
| 992 | # | ||
| 993 | # CONFIG_UIO is not set | 1001 | # CONFIG_UIO is not set |
| 994 | 1002 | ||
| 995 | # | 1003 | # |
| @@ -1009,7 +1017,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1009 | # CONFIG_JFS_FS is not set | 1017 | # CONFIG_JFS_FS is not set |
| 1010 | # CONFIG_FS_POSIX_ACL is not set | 1018 | # CONFIG_FS_POSIX_ACL is not set |
| 1011 | # CONFIG_XFS_FS is not set | 1019 | # CONFIG_XFS_FS is not set |
| 1012 | # CONFIG_GFS2_FS is not set | ||
| 1013 | # CONFIG_OCFS2_FS is not set | 1020 | # CONFIG_OCFS2_FS is not set |
| 1014 | CONFIG_DNOTIFY=y | 1021 | CONFIG_DNOTIFY=y |
| 1015 | CONFIG_INOTIFY=y | 1022 | CONFIG_INOTIFY=y |
| @@ -1073,7 +1080,6 @@ CONFIG_NFS_FS=y | |||
| 1073 | CONFIG_NFS_V3=y | 1080 | CONFIG_NFS_V3=y |
| 1074 | # CONFIG_NFS_V3_ACL is not set | 1081 | # CONFIG_NFS_V3_ACL is not set |
| 1075 | # CONFIG_NFS_V4 is not set | 1082 | # CONFIG_NFS_V4 is not set |
| 1076 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1077 | # CONFIG_NFSD is not set | 1083 | # CONFIG_NFSD is not set |
| 1078 | CONFIG_ROOT_NFS=y | 1084 | CONFIG_ROOT_NFS=y |
| 1079 | CONFIG_LOCKD=y | 1085 | CONFIG_LOCKD=y |
| @@ -1141,9 +1147,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1141 | # Library routines | 1147 | # Library routines |
| 1142 | # | 1148 | # |
| 1143 | CONFIG_BITREVERSE=y | 1149 | CONFIG_BITREVERSE=y |
| 1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1144 | CONFIG_CRC_CCITT=y | 1151 | CONFIG_CRC_CCITT=y |
| 1145 | # CONFIG_CRC16 is not set | 1152 | # CONFIG_CRC16 is not set |
| 1146 | # CONFIG_CRC_ITU_T is not set | 1153 | CONFIG_CRC_ITU_T=m |
| 1147 | CONFIG_CRC32=y | 1154 | CONFIG_CRC32=y |
| 1148 | # CONFIG_CRC7 is not set | 1155 | # CONFIG_CRC7 is not set |
| 1149 | # CONFIG_LIBCRC32C is not set | 1156 | # CONFIG_LIBCRC32C is not set |
| @@ -1152,6 +1159,7 @@ CONFIG_PLIST=y | |||
| 1152 | CONFIG_HAS_IOMEM=y | 1159 | CONFIG_HAS_IOMEM=y |
| 1153 | CONFIG_HAS_IOPORT=y | 1160 | CONFIG_HAS_IOPORT=y |
| 1154 | CONFIG_HAS_DMA=y | 1161 | CONFIG_HAS_DMA=y |
| 1162 | CONFIG_HAVE_LMB=y | ||
| 1155 | 1163 | ||
| 1156 | # | 1164 | # |
| 1157 | # Kernel hacking | 1165 | # Kernel hacking |
| @@ -1159,6 +1167,7 @@ CONFIG_HAS_DMA=y | |||
| 1159 | # CONFIG_PRINTK_TIME is not set | 1167 | # CONFIG_PRINTK_TIME is not set |
| 1160 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1168 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1161 | CONFIG_ENABLE_MUST_CHECK=y | 1169 | CONFIG_ENABLE_MUST_CHECK=y |
| 1170 | CONFIG_FRAME_WARN=1024 | ||
| 1162 | # CONFIG_MAGIC_SYSRQ is not set | 1171 | # CONFIG_MAGIC_SYSRQ is not set |
| 1163 | # CONFIG_UNUSED_SYMBOLS is not set | 1172 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1164 | # CONFIG_DEBUG_FS is not set | 1173 | # CONFIG_DEBUG_FS is not set |
| @@ -1169,6 +1178,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1169 | CONFIG_SCHED_DEBUG=y | 1178 | CONFIG_SCHED_DEBUG=y |
| 1170 | # CONFIG_SCHEDSTATS is not set | 1179 | # CONFIG_SCHEDSTATS is not set |
| 1171 | # CONFIG_TIMER_STATS is not set | 1180 | # CONFIG_TIMER_STATS is not set |
| 1181 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1172 | # CONFIG_SLUB_DEBUG_ON is not set | 1182 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1173 | # CONFIG_SLUB_STATS is not set | 1183 | # CONFIG_SLUB_STATS is not set |
| 1174 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1184 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1182,6 +1192,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1182 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1192 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1183 | # CONFIG_DEBUG_INFO is not set | 1193 | # CONFIG_DEBUG_INFO is not set |
| 1184 | # CONFIG_DEBUG_VM is not set | 1194 | # CONFIG_DEBUG_VM is not set |
| 1195 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1185 | # CONFIG_DEBUG_LIST is not set | 1196 | # CONFIG_DEBUG_LIST is not set |
| 1186 | # CONFIG_DEBUG_SG is not set | 1197 | # CONFIG_DEBUG_SG is not set |
| 1187 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1198 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1194,6 +1205,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1194 | # CONFIG_DEBUG_PAGEALLOC is not set | 1205 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1195 | # CONFIG_DEBUGGER is not set | 1206 | # CONFIG_DEBUGGER is not set |
| 1196 | # CONFIG_KGDB_CONSOLE is not set | 1207 | # CONFIG_KGDB_CONSOLE is not set |
| 1208 | # CONFIG_IRQSTACKS is not set | ||
| 1197 | CONFIG_BDI_SWITCH=y | 1209 | CONFIG_BDI_SWITCH=y |
| 1198 | # CONFIG_PPC_EARLY_DEBUG is not set | 1210 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1199 | 1211 | ||
| @@ -1204,50 +1216,80 @@ CONFIG_BDI_SWITCH=y | |||
| 1204 | # CONFIG_SECURITY is not set | 1216 | # CONFIG_SECURITY is not set |
| 1205 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1217 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1206 | CONFIG_CRYPTO=y | 1218 | CONFIG_CRYPTO=y |
| 1207 | # CONFIG_CRYPTO_SEQIV is not set | 1219 | |
| 1220 | # | ||
| 1221 | # Crypto core or helper | ||
| 1222 | # | ||
| 1208 | # CONFIG_CRYPTO_MANAGER is not set | 1223 | # CONFIG_CRYPTO_MANAGER is not set |
| 1224 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1225 | # CONFIG_CRYPTO_NULL is not set | ||
| 1226 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1227 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1228 | # CONFIG_CRYPTO_TEST is not set | ||
| 1229 | |||
| 1230 | # | ||
| 1231 | # Authenticated Encryption with Associated Data | ||
| 1232 | # | ||
| 1233 | # CONFIG_CRYPTO_CCM is not set | ||
| 1234 | # CONFIG_CRYPTO_GCM is not set | ||
| 1235 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1236 | |||
| 1237 | # | ||
| 1238 | # Block modes | ||
| 1239 | # | ||
| 1240 | # CONFIG_CRYPTO_CBC is not set | ||
| 1241 | # CONFIG_CRYPTO_CTR is not set | ||
| 1242 | # CONFIG_CRYPTO_CTS is not set | ||
| 1243 | # CONFIG_CRYPTO_ECB is not set | ||
| 1244 | # CONFIG_CRYPTO_LRW is not set | ||
| 1245 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1246 | # CONFIG_CRYPTO_XTS is not set | ||
| 1247 | |||
| 1248 | # | ||
| 1249 | # Hash modes | ||
| 1250 | # | ||
| 1209 | # CONFIG_CRYPTO_HMAC is not set | 1251 | # CONFIG_CRYPTO_HMAC is not set |
| 1210 | # CONFIG_CRYPTO_XCBC is not set | 1252 | # CONFIG_CRYPTO_XCBC is not set |
| 1211 | # CONFIG_CRYPTO_NULL is not set | 1253 | |
| 1254 | # | ||
| 1255 | # Digest | ||
| 1256 | # | ||
| 1257 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1212 | # CONFIG_CRYPTO_MD4 is not set | 1258 | # CONFIG_CRYPTO_MD4 is not set |
| 1213 | # CONFIG_CRYPTO_MD5 is not set | 1259 | # CONFIG_CRYPTO_MD5 is not set |
| 1260 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1214 | # CONFIG_CRYPTO_SHA1 is not set | 1261 | # CONFIG_CRYPTO_SHA1 is not set |
| 1215 | # CONFIG_CRYPTO_SHA256 is not set | 1262 | # CONFIG_CRYPTO_SHA256 is not set |
| 1216 | # CONFIG_CRYPTO_SHA512 is not set | 1263 | # CONFIG_CRYPTO_SHA512 is not set |
| 1217 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1218 | # CONFIG_CRYPTO_TGR192 is not set | 1264 | # CONFIG_CRYPTO_TGR192 is not set |
| 1219 | # CONFIG_CRYPTO_GF128MUL is not set | 1265 | # CONFIG_CRYPTO_WP512 is not set |
| 1220 | # CONFIG_CRYPTO_ECB is not set | 1266 | |
| 1221 | # CONFIG_CRYPTO_CBC is not set | 1267 | # |
| 1222 | # CONFIG_CRYPTO_PCBC is not set | 1268 | # Ciphers |
| 1223 | # CONFIG_CRYPTO_LRW is not set | 1269 | # |
| 1224 | # CONFIG_CRYPTO_XTS is not set | ||
| 1225 | # CONFIG_CRYPTO_CTR is not set | ||
| 1226 | # CONFIG_CRYPTO_GCM is not set | ||
| 1227 | # CONFIG_CRYPTO_CCM is not set | ||
| 1228 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1229 | # CONFIG_CRYPTO_DES is not set | ||
| 1230 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1231 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1232 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1233 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1234 | # CONFIG_CRYPTO_AES is not set | 1270 | # CONFIG_CRYPTO_AES is not set |
| 1271 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1272 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1273 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1274 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1235 | # CONFIG_CRYPTO_CAST5 is not set | 1275 | # CONFIG_CRYPTO_CAST5 is not set |
| 1236 | # CONFIG_CRYPTO_CAST6 is not set | 1276 | # CONFIG_CRYPTO_CAST6 is not set |
| 1237 | # CONFIG_CRYPTO_TEA is not set | 1277 | # CONFIG_CRYPTO_DES is not set |
| 1238 | # CONFIG_CRYPTO_ARC4 is not set | 1278 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1239 | # CONFIG_CRYPTO_KHAZAD is not set | 1279 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1240 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1241 | # CONFIG_CRYPTO_SEED is not set | ||
| 1242 | # CONFIG_CRYPTO_SALSA20 is not set | 1280 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1281 | # CONFIG_CRYPTO_SEED is not set | ||
| 1282 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1283 | # CONFIG_CRYPTO_TEA is not set | ||
| 1284 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1285 | |||
| 1286 | # | ||
| 1287 | # Compression | ||
| 1288 | # | ||
| 1243 | # CONFIG_CRYPTO_DEFLATE is not set | 1289 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1245 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1246 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1247 | # CONFIG_CRYPTO_TEST is not set | ||
| 1248 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1249 | # CONFIG_CRYPTO_LZO is not set | 1290 | # CONFIG_CRYPTO_LZO is not set |
| 1250 | CONFIG_CRYPTO_HW=y | 1291 | CONFIG_CRYPTO_HW=y |
| 1251 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1292 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1252 | # CONFIG_PPC_CLOCK is not set | 1293 | # CONFIG_PPC_CLOCK is not set |
| 1253 | CONFIG_PPC_LIB_RHEAP=y | 1294 | CONFIG_PPC_LIB_RHEAP=y |
| 1295 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index d39ee3b35bfc..e0b5559e84aa 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:43 2008 | 4 | # Mon Jun 9 08:52:39 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | CONFIG_TQM8540=y | 160 | CONFIG_TQM8540=y |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -171,7 +176,6 @@ CONFIG_MPIC=y | |||
| 171 | # CONFIG_GENERIC_IOMAP is not set | 176 | # CONFIG_GENERIC_IOMAP is not set |
| 172 | # CONFIG_CPU_FREQ is not set | 177 | # CONFIG_CPU_FREQ is not set |
| 173 | # CONFIG_CPM2 is not set | 178 | # CONFIG_CPM2 is not set |
| 174 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 175 | # CONFIG_FSL_ULI1575 is not set | 179 | # CONFIG_FSL_ULI1575 is not set |
| 176 | 180 | ||
| 177 | # | 181 | # |
| @@ -208,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | # CONFIG_PROC_DEVICETREE is not set | 222 | # CONFIG_PROC_DEVICETREE is not set |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -233,6 +239,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 233 | CONFIG_ARCH_SUPPORTS_MSI=y | 239 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 234 | # CONFIG_PCI_MSI is not set | 240 | # CONFIG_PCI_MSI is not set |
| 235 | CONFIG_PCI_LEGACY=y | 241 | CONFIG_PCI_LEGACY=y |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 236 | 243 | ||
| 237 | # | 244 | # |
| 238 | # Advanced setup | 245 | # Advanced setup |
| @@ -242,11 +249,12 @@ CONFIG_PCI_LEGACY=y | |||
| 242 | # | 249 | # |
| 243 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 244 | # | 251 | # |
| 245 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 246 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 247 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 248 | CONFIG_TASK_SIZE=0xc0000000 | 257 | CONFIG_TASK_SIZE=0xc0000000 |
| 249 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 250 | 258 | ||
| 251 | # | 259 | # |
| 252 | # Networking | 260 | # Networking |
| @@ -294,8 +302,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 302 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 303 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 304 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 305 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 306 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 307 | # CONFIG_IP_DCCP is not set |
| @@ -352,6 +358,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 352 | # CONFIG_MTD_REDBOOT_PARTS is not set | 358 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 353 | CONFIG_MTD_CMDLINE_PARTS=y | 359 | CONFIG_MTD_CMDLINE_PARTS=y |
| 354 | # CONFIG_MTD_OF_PARTS is not set | 360 | # CONFIG_MTD_OF_PARTS is not set |
| 361 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 355 | 362 | ||
| 356 | # | 363 | # |
| 357 | # User Modules And Translation Layers | 364 | # User Modules And Translation Layers |
| @@ -423,6 +430,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 423 | # | 430 | # |
| 424 | # CONFIG_MTD_UBI is not set | 431 | # CONFIG_MTD_UBI is not set |
| 425 | CONFIG_OF_DEVICE=y | 432 | CONFIG_OF_DEVICE=y |
| 433 | CONFIG_OF_I2C=y | ||
| 426 | # CONFIG_PARPORT is not set | 434 | # CONFIG_PARPORT is not set |
| 427 | CONFIG_BLK_DEV=y | 435 | CONFIG_BLK_DEV=y |
| 428 | # CONFIG_BLK_DEV_FD is not set | 436 | # CONFIG_BLK_DEV_FD is not set |
| @@ -506,7 +514,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 506 | CONFIG_BLK_DEV_VIA82CXXX=y | 514 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 507 | # CONFIG_BLK_DEV_TC86C001 is not set | 515 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 508 | CONFIG_BLK_DEV_IDEDMA=y | 516 | CONFIG_BLK_DEV_IDEDMA=y |
| 509 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 517 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 510 | # CONFIG_BLK_DEV_HD is not set | 518 | # CONFIG_BLK_DEV_HD is not set |
| 511 | 519 | ||
| 512 | # | 520 | # |
| @@ -600,7 +608,6 @@ CONFIG_NETDEV_1000=y | |||
| 600 | # CONFIG_SIS190 is not set | 608 | # CONFIG_SIS190 is not set |
| 601 | # CONFIG_SKGE is not set | 609 | # CONFIG_SKGE is not set |
| 602 | # CONFIG_SKY2 is not set | 610 | # CONFIG_SKY2 is not set |
| 603 | # CONFIG_SK98LIN is not set | ||
| 604 | # CONFIG_VIA_VELOCITY is not set | 611 | # CONFIG_VIA_VELOCITY is not set |
| 605 | # CONFIG_TIGON3 is not set | 612 | # CONFIG_TIGON3 is not set |
| 606 | # CONFIG_BNX2 is not set | 613 | # CONFIG_BNX2 is not set |
| @@ -620,6 +627,7 @@ CONFIG_NETDEV_10000=y | |||
| 620 | # CONFIG_MLX4_CORE is not set | 627 | # CONFIG_MLX4_CORE is not set |
| 621 | # CONFIG_TEHUTI is not set | 628 | # CONFIG_TEHUTI is not set |
| 622 | # CONFIG_BNX2X is not set | 629 | # CONFIG_BNX2X is not set |
| 630 | # CONFIG_SFC is not set | ||
| 623 | # CONFIG_TR is not set | 631 | # CONFIG_TR is not set |
| 624 | 632 | ||
| 625 | # | 633 | # |
| @@ -627,6 +635,7 @@ CONFIG_NETDEV_10000=y | |||
| 627 | # | 635 | # |
| 628 | # CONFIG_WLAN_PRE80211 is not set | 636 | # CONFIG_WLAN_PRE80211 is not set |
| 629 | # CONFIG_WLAN_80211 is not set | 637 | # CONFIG_WLAN_80211 is not set |
| 638 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 630 | # CONFIG_WAN is not set | 639 | # CONFIG_WAN is not set |
| 631 | # CONFIG_FDDI is not set | 640 | # CONFIG_FDDI is not set |
| 632 | # CONFIG_HIPPI is not set | 641 | # CONFIG_HIPPI is not set |
| @@ -673,6 +682,7 @@ CONFIG_INPUT=y | |||
| 673 | # Character devices | 682 | # Character devices |
| 674 | # | 683 | # |
| 675 | # CONFIG_VT is not set | 684 | # CONFIG_VT is not set |
| 685 | CONFIG_DEVKMEM=y | ||
| 676 | # CONFIG_SERIAL_NONSTANDARD is not set | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 677 | # CONFIG_NOZOMI is not set | 687 | # CONFIG_NOZOMI is not set |
| 678 | 688 | ||
| @@ -713,13 +723,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 713 | CONFIG_I2C_CHARDEV=y | 723 | CONFIG_I2C_CHARDEV=y |
| 714 | 724 | ||
| 715 | # | 725 | # |
| 716 | # I2C Algorithms | ||
| 717 | # | ||
| 718 | # CONFIG_I2C_ALGOBIT is not set | ||
| 719 | # CONFIG_I2C_ALGOPCF is not set | ||
| 720 | # CONFIG_I2C_ALGOPCA is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # I2C Hardware Bus support | 726 | # I2C Hardware Bus support |
| 724 | # | 727 | # |
| 725 | # CONFIG_I2C_ALI1535 is not set | 728 | # CONFIG_I2C_ALI1535 is not set |
| @@ -744,6 +747,7 @@ CONFIG_I2C_MPC=y | |||
| 744 | # CONFIG_I2C_VIA is not set | 747 | # CONFIG_I2C_VIA is not set |
| 745 | # CONFIG_I2C_VIAPRO is not set | 748 | # CONFIG_I2C_VIAPRO is not set |
| 746 | # CONFIG_I2C_VOODOO3 is not set | 749 | # CONFIG_I2C_VOODOO3 is not set |
| 750 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 747 | 751 | ||
| 748 | # | 752 | # |
| 749 | # Miscellaneous I2C Chip support | 753 | # Miscellaneous I2C Chip support |
| @@ -753,19 +757,13 @@ CONFIG_I2C_MPC=y | |||
| 753 | # CONFIG_SENSORS_PCF8574 is not set | 757 | # CONFIG_SENSORS_PCF8574 is not set |
| 754 | # CONFIG_PCF8575 is not set | 758 | # CONFIG_PCF8575 is not set |
| 755 | # CONFIG_SENSORS_PCF8591 is not set | 759 | # CONFIG_SENSORS_PCF8591 is not set |
| 756 | # CONFIG_TPS65010 is not set | ||
| 757 | # CONFIG_SENSORS_MAX6875 is not set | 760 | # CONFIG_SENSORS_MAX6875 is not set |
| 758 | # CONFIG_SENSORS_TSL2550 is not set | 761 | # CONFIG_SENSORS_TSL2550 is not set |
| 759 | # CONFIG_I2C_DEBUG_CORE is not set | 762 | # CONFIG_I2C_DEBUG_CORE is not set |
| 760 | # CONFIG_I2C_DEBUG_ALGO is not set | 763 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 761 | # CONFIG_I2C_DEBUG_BUS is not set | 764 | # CONFIG_I2C_DEBUG_BUS is not set |
| 762 | # CONFIG_I2C_DEBUG_CHIP is not set | 765 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 763 | |||
| 764 | # | ||
| 765 | # SPI support | ||
| 766 | # | ||
| 767 | # CONFIG_SPI is not set | 766 | # CONFIG_SPI is not set |
| 768 | # CONFIG_SPI_MASTER is not set | ||
| 769 | # CONFIG_W1 is not set | 767 | # CONFIG_W1 is not set |
| 770 | # CONFIG_POWER_SUPPLY is not set | 768 | # CONFIG_POWER_SUPPLY is not set |
| 771 | CONFIG_HWMON=y | 769 | CONFIG_HWMON=y |
| @@ -835,12 +833,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 835 | # Multifunction device drivers | 833 | # Multifunction device drivers |
| 836 | # | 834 | # |
| 837 | # CONFIG_MFD_SM501 is not set | 835 | # CONFIG_MFD_SM501 is not set |
| 836 | # CONFIG_HTC_PASIC3 is not set | ||
| 838 | 837 | ||
| 839 | # | 838 | # |
| 840 | # Multimedia devices | 839 | # Multimedia devices |
| 841 | # | 840 | # |
| 841 | |||
| 842 | # | ||
| 843 | # Multimedia core support | ||
| 844 | # | ||
| 842 | # CONFIG_VIDEO_DEV is not set | 845 | # CONFIG_VIDEO_DEV is not set |
| 843 | # CONFIG_DVB_CORE is not set | 846 | # CONFIG_DVB_CORE is not set |
| 847 | # CONFIG_VIDEO_MEDIA is not set | ||
| 848 | |||
| 849 | # | ||
| 850 | # Multimedia drivers | ||
| 851 | # | ||
| 844 | CONFIG_DAB=y | 852 | CONFIG_DAB=y |
| 845 | 853 | ||
| 846 | # | 854 | # |
| @@ -871,6 +879,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 871 | CONFIG_USB_ARCH_HAS_OHCI=y | 879 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 872 | CONFIG_USB_ARCH_HAS_EHCI=y | 880 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 873 | # CONFIG_USB is not set | 881 | # CONFIG_USB is not set |
| 882 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 883 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 874 | 884 | ||
| 875 | # | 885 | # |
| 876 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -879,14 +889,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 879 | # CONFIG_MMC is not set | 889 | # CONFIG_MMC is not set |
| 880 | # CONFIG_MEMSTICK is not set | 890 | # CONFIG_MEMSTICK is not set |
| 881 | # CONFIG_NEW_LEDS is not set | 891 | # CONFIG_NEW_LEDS is not set |
| 892 | # CONFIG_ACCESSIBILITY is not set | ||
| 882 | # CONFIG_INFINIBAND is not set | 893 | # CONFIG_INFINIBAND is not set |
| 883 | # CONFIG_EDAC is not set | 894 | # CONFIG_EDAC is not set |
| 884 | # CONFIG_RTC_CLASS is not set | 895 | # CONFIG_RTC_CLASS is not set |
| 885 | # CONFIG_DMADEVICES is not set | 896 | # CONFIG_DMADEVICES is not set |
| 886 | |||
| 887 | # | ||
| 888 | # Userspace I/O | ||
| 889 | # | ||
| 890 | # CONFIG_UIO is not set | 897 | # CONFIG_UIO is not set |
| 891 | 898 | ||
| 892 | # | 899 | # |
| @@ -906,7 +913,6 @@ CONFIG_FS_MBCACHE=y | |||
| 906 | # CONFIG_JFS_FS is not set | 913 | # CONFIG_JFS_FS is not set |
| 907 | # CONFIG_FS_POSIX_ACL is not set | 914 | # CONFIG_FS_POSIX_ACL is not set |
| 908 | # CONFIG_XFS_FS is not set | 915 | # CONFIG_XFS_FS is not set |
| 909 | # CONFIG_GFS2_FS is not set | ||
| 910 | # CONFIG_OCFS2_FS is not set | 916 | # CONFIG_OCFS2_FS is not set |
| 911 | CONFIG_DNOTIFY=y | 917 | CONFIG_DNOTIFY=y |
| 912 | CONFIG_INOTIFY=y | 918 | CONFIG_INOTIFY=y |
| @@ -974,7 +980,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 974 | CONFIG_NFS_FS=y | 980 | CONFIG_NFS_FS=y |
| 975 | # CONFIG_NFS_V3 is not set | 981 | # CONFIG_NFS_V3 is not set |
| 976 | # CONFIG_NFS_V4 is not set | 982 | # CONFIG_NFS_V4 is not set |
| 977 | # CONFIG_NFS_DIRECTIO is not set | ||
| 978 | # CONFIG_NFSD is not set | 983 | # CONFIG_NFSD is not set |
| 979 | CONFIG_ROOT_NFS=y | 984 | CONFIG_ROOT_NFS=y |
| 980 | CONFIG_LOCKD=y | 985 | CONFIG_LOCKD=y |
| @@ -1013,6 +1018,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1013 | # Library routines | 1018 | # Library routines |
| 1014 | # | 1019 | # |
| 1015 | CONFIG_BITREVERSE=y | 1020 | CONFIG_BITREVERSE=y |
| 1021 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1016 | # CONFIG_CRC_CCITT is not set | 1022 | # CONFIG_CRC_CCITT is not set |
| 1017 | # CONFIG_CRC16 is not set | 1023 | # CONFIG_CRC16 is not set |
| 1018 | # CONFIG_CRC_ITU_T is not set | 1024 | # CONFIG_CRC_ITU_T is not set |
| @@ -1025,6 +1031,7 @@ CONFIG_PLIST=y | |||
| 1025 | CONFIG_HAS_IOMEM=y | 1031 | CONFIG_HAS_IOMEM=y |
| 1026 | CONFIG_HAS_IOPORT=y | 1032 | CONFIG_HAS_IOPORT=y |
| 1027 | CONFIG_HAS_DMA=y | 1033 | CONFIG_HAS_DMA=y |
| 1034 | CONFIG_HAVE_LMB=y | ||
| 1028 | 1035 | ||
| 1029 | # | 1036 | # |
| 1030 | # Kernel hacking | 1037 | # Kernel hacking |
| @@ -1032,6 +1039,7 @@ CONFIG_HAS_DMA=y | |||
| 1032 | # CONFIG_PRINTK_TIME is not set | 1039 | # CONFIG_PRINTK_TIME is not set |
| 1033 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1040 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1034 | CONFIG_ENABLE_MUST_CHECK=y | 1041 | CONFIG_ENABLE_MUST_CHECK=y |
| 1042 | CONFIG_FRAME_WARN=1024 | ||
| 1035 | # CONFIG_MAGIC_SYSRQ is not set | 1043 | # CONFIG_MAGIC_SYSRQ is not set |
| 1036 | # CONFIG_UNUSED_SYMBOLS is not set | 1044 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1037 | # CONFIG_DEBUG_FS is not set | 1045 | # CONFIG_DEBUG_FS is not set |
| @@ -1041,6 +1049,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1041 | # CONFIG_SLUB_STATS is not set | 1049 | # CONFIG_SLUB_STATS is not set |
| 1042 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1050 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1043 | # CONFIG_SAMPLES is not set | 1051 | # CONFIG_SAMPLES is not set |
| 1052 | # CONFIG_IRQSTACKS is not set | ||
| 1044 | # CONFIG_PPC_EARLY_DEBUG is not set | 1053 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1045 | 1054 | ||
| 1046 | # | 1055 | # |
| @@ -1050,48 +1059,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1050 | # CONFIG_SECURITY is not set | 1059 | # CONFIG_SECURITY is not set |
| 1051 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1060 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1052 | CONFIG_CRYPTO=y | 1061 | CONFIG_CRYPTO=y |
| 1053 | # CONFIG_CRYPTO_SEQIV is not set | 1062 | |
| 1063 | # | ||
| 1064 | # Crypto core or helper | ||
| 1065 | # | ||
| 1054 | # CONFIG_CRYPTO_MANAGER is not set | 1066 | # CONFIG_CRYPTO_MANAGER is not set |
| 1067 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1068 | # CONFIG_CRYPTO_NULL is not set | ||
| 1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1070 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Authenticated Encryption with Associated Data | ||
| 1074 | # | ||
| 1075 | # CONFIG_CRYPTO_CCM is not set | ||
| 1076 | # CONFIG_CRYPTO_GCM is not set | ||
| 1077 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1078 | |||
| 1079 | # | ||
| 1080 | # Block modes | ||
| 1081 | # | ||
| 1082 | # CONFIG_CRYPTO_CBC is not set | ||
| 1083 | # CONFIG_CRYPTO_CTR is not set | ||
| 1084 | # CONFIG_CRYPTO_CTS is not set | ||
| 1085 | # CONFIG_CRYPTO_ECB is not set | ||
| 1086 | # CONFIG_CRYPTO_LRW is not set | ||
| 1087 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | |||
| 1090 | # | ||
| 1091 | # Hash modes | ||
| 1092 | # | ||
| 1055 | # CONFIG_CRYPTO_HMAC is not set | 1093 | # CONFIG_CRYPTO_HMAC is not set |
| 1056 | # CONFIG_CRYPTO_XCBC is not set | 1094 | # CONFIG_CRYPTO_XCBC is not set |
| 1057 | # CONFIG_CRYPTO_NULL is not set | 1095 | |
| 1096 | # | ||
| 1097 | # Digest | ||
| 1098 | # | ||
| 1099 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1058 | # CONFIG_CRYPTO_MD4 is not set | 1100 | # CONFIG_CRYPTO_MD4 is not set |
| 1059 | # CONFIG_CRYPTO_MD5 is not set | 1101 | # CONFIG_CRYPTO_MD5 is not set |
| 1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1060 | # CONFIG_CRYPTO_SHA1 is not set | 1103 | # CONFIG_CRYPTO_SHA1 is not set |
| 1061 | # CONFIG_CRYPTO_SHA256 is not set | 1104 | # CONFIG_CRYPTO_SHA256 is not set |
| 1062 | # CONFIG_CRYPTO_SHA512 is not set | 1105 | # CONFIG_CRYPTO_SHA512 is not set |
| 1063 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1064 | # CONFIG_CRYPTO_TGR192 is not set | 1106 | # CONFIG_CRYPTO_TGR192 is not set |
| 1065 | # CONFIG_CRYPTO_GF128MUL is not set | 1107 | # CONFIG_CRYPTO_WP512 is not set |
| 1066 | # CONFIG_CRYPTO_ECB is not set | 1108 | |
| 1067 | # CONFIG_CRYPTO_CBC is not set | 1109 | # |
| 1068 | # CONFIG_CRYPTO_PCBC is not set | 1110 | # Ciphers |
| 1069 | # CONFIG_CRYPTO_LRW is not set | 1111 | # |
| 1070 | # CONFIG_CRYPTO_XTS is not set | ||
| 1071 | # CONFIG_CRYPTO_CTR is not set | ||
| 1072 | # CONFIG_CRYPTO_GCM is not set | ||
| 1073 | # CONFIG_CRYPTO_CCM is not set | ||
| 1074 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1075 | # CONFIG_CRYPTO_DES is not set | ||
| 1076 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1077 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1078 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1079 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1080 | # CONFIG_CRYPTO_AES is not set | 1112 | # CONFIG_CRYPTO_AES is not set |
| 1113 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1114 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1115 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1116 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1081 | # CONFIG_CRYPTO_CAST5 is not set | 1117 | # CONFIG_CRYPTO_CAST5 is not set |
| 1082 | # CONFIG_CRYPTO_CAST6 is not set | 1118 | # CONFIG_CRYPTO_CAST6 is not set |
| 1083 | # CONFIG_CRYPTO_TEA is not set | 1119 | # CONFIG_CRYPTO_DES is not set |
| 1084 | # CONFIG_CRYPTO_ARC4 is not set | 1120 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1085 | # CONFIG_CRYPTO_KHAZAD is not set | 1121 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1086 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1087 | # CONFIG_CRYPTO_SEED is not set | ||
| 1088 | # CONFIG_CRYPTO_SALSA20 is not set | 1122 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1123 | # CONFIG_CRYPTO_SEED is not set | ||
| 1124 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1125 | # CONFIG_CRYPTO_TEA is not set | ||
| 1126 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Compression | ||
| 1130 | # | ||
| 1089 | # CONFIG_CRYPTO_DEFLATE is not set | 1131 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1090 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1091 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1092 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1093 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1094 | # CONFIG_CRYPTO_LZO is not set | 1132 | # CONFIG_CRYPTO_LZO is not set |
| 1095 | CONFIG_CRYPTO_HW=y | 1133 | CONFIG_CRYPTO_HW=y |
| 1096 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1134 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1097 | # CONFIG_PPC_CLOCK is not set | 1135 | # CONFIG_PPC_CLOCK is not set |
| 1136 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index cbf6ad2d71da..6f9067b49e07 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:44 2008 | 4 | # Mon Jun 9 08:52:40 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | CONFIG_TQM8541=y | 161 | CONFIG_TQM8541=y |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index bbff962c8472..03120b5b52fa 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:44 2008 | 4 | # Mon Jun 9 08:52:41 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index 63c5ec8b6515..3113257edf5a 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:45 2008 | 4 | # Mon Jun 9 08:52:42 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index a3cc94a2ff06..6740f2a3aa3d 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc2 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Wed Feb 20 12:26:07 2008 | 4 | # Mon Jun 9 08:52:08 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | 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 | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -75,6 +77,7 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
| 75 | CONFIG_USER_SCHED=y | 77 | CONFIG_USER_SCHED=y |
| 76 | # CONFIG_CGROUP_SCHED is not set | 78 | # CONFIG_CGROUP_SCHED is not set |
| 77 | CONFIG_SYSFS_DEPRECATED=y | 79 | CONFIG_SYSFS_DEPRECATED=y |
| 80 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 78 | # CONFIG_RELAY is not set | 81 | # CONFIG_RELAY is not set |
| 79 | # CONFIG_NAMESPACES is not set | 82 | # CONFIG_NAMESPACES is not set |
| 80 | # CONFIG_BLK_DEV_INITRD is not set | 83 | # CONFIG_BLK_DEV_INITRD is not set |
| @@ -107,6 +110,8 @@ CONFIG_SLUB=y | |||
| 107 | # CONFIG_MARKERS is not set | 110 | # CONFIG_MARKERS is not set |
| 108 | CONFIG_HAVE_OPROFILE=y | 111 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 112 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | ||
| 114 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 110 | CONFIG_PROC_PAGE_MONITOR=y | 115 | CONFIG_PROC_PAGE_MONITOR=y |
| 111 | CONFIG_SLABINFO=y | 116 | CONFIG_SLABINFO=y |
| 112 | # CONFIG_TINY_SHMEM is not set | 117 | # CONFIG_TINY_SHMEM is not set |
| @@ -131,7 +136,6 @@ CONFIG_DEFAULT_DEADLINE=y | |||
| 131 | # CONFIG_DEFAULT_NOOP is not set | 136 | # CONFIG_DEFAULT_NOOP is not set |
| 132 | CONFIG_DEFAULT_IOSCHED="deadline" | 137 | CONFIG_DEFAULT_IOSCHED="deadline" |
| 133 | CONFIG_CLASSIC_RCU=y | 138 | CONFIG_CLASSIC_RCU=y |
| 134 | # CONFIG_PREEMPT_RCU is not set | ||
| 135 | 139 | ||
| 136 | # | 140 | # |
| 137 | # Platform support | 141 | # Platform support |
| @@ -194,7 +198,6 @@ CONFIG_HZ=1000 | |||
| 194 | CONFIG_PREEMPT_NONE=y | 198 | CONFIG_PREEMPT_NONE=y |
| 195 | # CONFIG_PREEMPT_VOLUNTARY is not set | 199 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 196 | # CONFIG_PREEMPT is not set | 200 | # CONFIG_PREEMPT is not set |
| 197 | CONFIG_RCU_TRACE=y | ||
| 198 | CONFIG_BINFMT_ELF=y | 201 | CONFIG_BINFMT_ELF=y |
| 199 | # CONFIG_BINFMT_MISC is not set | 202 | # CONFIG_BINFMT_MISC is not set |
| 200 | # CONFIG_MATH_EMULATION is not set | 203 | # CONFIG_MATH_EMULATION is not set |
| @@ -213,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 213 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 214 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 217 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 218 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 219 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 220 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 221 | # CONFIG_PROC_DEVICETREE is not set | 226 | # CONFIG_PROC_DEVICETREE is not set |
| 222 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 223 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -235,6 +240,7 @@ CONFIG_FSL_SOC=y | |||
| 235 | # CONFIG_PCI_QSPAN is not set | 240 | # CONFIG_PCI_QSPAN is not set |
| 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 241 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 237 | # CONFIG_PCCARD is not set | 242 | # CONFIG_PCCARD is not set |
| 243 | # CONFIG_HAS_RAPIDIO is not set | ||
| 238 | 244 | ||
| 239 | # | 245 | # |
| 240 | # Advanced setup | 246 | # Advanced setup |
| @@ -244,13 +250,13 @@ CONFIG_FSL_SOC=y | |||
| 244 | # | 250 | # |
| 245 | # Default settings for advanced configuration options are used | 251 | # Default settings for advanced configuration options are used |
| 246 | # | 252 | # |
| 247 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 248 | CONFIG_LOWMEM_SIZE=0x30000000 | 253 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 254 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 249 | CONFIG_KERNEL_START=0xc0000000 | 255 | CONFIG_KERNEL_START=0xc0000000 |
| 256 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 250 | CONFIG_TASK_SIZE=0x80000000 | 257 | CONFIG_TASK_SIZE=0x80000000 |
| 251 | CONFIG_CONSISTENT_START=0xfd000000 | 258 | CONFIG_CONSISTENT_START=0xfd000000 |
| 252 | CONFIG_CONSISTENT_SIZE=0x00200000 | 259 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 253 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 254 | 260 | ||
| 255 | # | 261 | # |
| 256 | # Networking | 262 | # Networking |
| @@ -293,8 +299,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 293 | CONFIG_DEFAULT_TCP_CONG="cubic" | 299 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 294 | # CONFIG_TCP_MD5SIG is not set | 300 | # CONFIG_TCP_MD5SIG is not set |
| 295 | # CONFIG_IPV6 is not set | 301 | # CONFIG_IPV6 is not set |
| 296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 297 | # CONFIG_INET6_TUNNEL is not set | ||
| 298 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 299 | # CONFIG_NETFILTER is not set | 303 | # CONFIG_NETFILTER is not set |
| 300 | # CONFIG_IP_DCCP is not set | 304 | # CONFIG_IP_DCCP is not set |
| @@ -482,6 +486,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 482 | # | 486 | # |
| 483 | # CONFIG_WLAN_PRE80211 is not set | 487 | # CONFIG_WLAN_PRE80211 is not set |
| 484 | # CONFIG_WLAN_80211 is not set | 488 | # CONFIG_WLAN_80211 is not set |
| 489 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 485 | # CONFIG_WAN is not set | 490 | # CONFIG_WAN is not set |
| 486 | # CONFIG_PPP is not set | 491 | # CONFIG_PPP is not set |
| 487 | # CONFIG_SLIP is not set | 492 | # CONFIG_SLIP is not set |
| @@ -548,6 +553,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 548 | # Character devices | 553 | # Character devices |
| 549 | # | 554 | # |
| 550 | # CONFIG_VT is not set | 555 | # CONFIG_VT is not set |
| 556 | CONFIG_DEVKMEM=y | ||
| 551 | # CONFIG_SERIAL_NONSTANDARD is not set | 557 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 552 | 558 | ||
| 553 | # | 559 | # |
| @@ -580,12 +586,7 @@ CONFIG_GEN_RTC=y | |||
| 580 | # CONFIG_RAW_DRIVER is not set | 586 | # CONFIG_RAW_DRIVER is not set |
| 581 | # CONFIG_TCG_TPM is not set | 587 | # CONFIG_TCG_TPM is not set |
| 582 | # CONFIG_I2C is not set | 588 | # CONFIG_I2C is not set |
| 583 | |||
| 584 | # | ||
| 585 | # SPI support | ||
| 586 | # | ||
| 587 | # CONFIG_SPI is not set | 589 | # CONFIG_SPI is not set |
| 588 | # CONFIG_SPI_MASTER is not set | ||
| 589 | # CONFIG_W1 is not set | 590 | # CONFIG_W1 is not set |
| 590 | # CONFIG_POWER_SUPPLY is not set | 591 | # CONFIG_POWER_SUPPLY is not set |
| 591 | # CONFIG_HWMON is not set | 592 | # CONFIG_HWMON is not set |
| @@ -602,12 +603,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 602 | # Multifunction device drivers | 603 | # Multifunction device drivers |
| 603 | # | 604 | # |
| 604 | # CONFIG_MFD_SM501 is not set | 605 | # CONFIG_MFD_SM501 is not set |
| 606 | # CONFIG_HTC_PASIC3 is not set | ||
| 605 | 607 | ||
| 606 | # | 608 | # |
| 607 | # Multimedia devices | 609 | # Multimedia devices |
| 608 | # | 610 | # |
| 611 | |||
| 612 | # | ||
| 613 | # Multimedia core support | ||
| 614 | # | ||
| 609 | # CONFIG_VIDEO_DEV is not set | 615 | # CONFIG_VIDEO_DEV is not set |
| 610 | # CONFIG_DVB_CORE is not set | 616 | # CONFIG_DVB_CORE is not set |
| 617 | # CONFIG_VIDEO_MEDIA is not set | ||
| 618 | |||
| 619 | # | ||
| 620 | # Multimedia drivers | ||
| 621 | # | ||
| 611 | CONFIG_DAB=y | 622 | CONFIG_DAB=y |
| 612 | 623 | ||
| 613 | # | 624 | # |
| @@ -632,12 +643,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 632 | # CONFIG_MMC is not set | 643 | # CONFIG_MMC is not set |
| 633 | # CONFIG_MEMSTICK is not set | 644 | # CONFIG_MEMSTICK is not set |
| 634 | # CONFIG_NEW_LEDS is not set | 645 | # CONFIG_NEW_LEDS is not set |
| 646 | # CONFIG_ACCESSIBILITY is not set | ||
| 635 | # CONFIG_EDAC is not set | 647 | # CONFIG_EDAC is not set |
| 636 | # CONFIG_RTC_CLASS is not set | 648 | # CONFIG_RTC_CLASS is not set |
| 637 | 649 | # CONFIG_DMADEVICES is not set | |
| 638 | # | ||
| 639 | # Userspace I/O | ||
| 640 | # | ||
| 641 | # CONFIG_UIO is not set | 650 | # CONFIG_UIO is not set |
| 642 | 651 | ||
| 643 | # | 652 | # |
| @@ -650,7 +659,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 650 | # CONFIG_JFS_FS is not set | 659 | # CONFIG_JFS_FS is not set |
| 651 | # CONFIG_FS_POSIX_ACL is not set | 660 | # CONFIG_FS_POSIX_ACL is not set |
| 652 | # CONFIG_XFS_FS is not set | 661 | # CONFIG_XFS_FS is not set |
| 653 | # CONFIG_GFS2_FS is not set | ||
| 654 | # CONFIG_OCFS2_FS is not set | 662 | # CONFIG_OCFS2_FS is not set |
| 655 | # CONFIG_DNOTIFY is not set | 663 | # CONFIG_DNOTIFY is not set |
| 656 | # CONFIG_INOTIFY is not set | 664 | # CONFIG_INOTIFY is not set |
| @@ -708,7 +716,6 @@ CONFIG_NFS_FS=y | |||
| 708 | CONFIG_NFS_V3=y | 716 | CONFIG_NFS_V3=y |
| 709 | # CONFIG_NFS_V3_ACL is not set | 717 | # CONFIG_NFS_V3_ACL is not set |
| 710 | # CONFIG_NFS_V4 is not set | 718 | # CONFIG_NFS_V4 is not set |
| 711 | # CONFIG_NFS_DIRECTIO is not set | ||
| 712 | # CONFIG_NFSD is not set | 719 | # CONFIG_NFSD is not set |
| 713 | CONFIG_ROOT_NFS=y | 720 | CONFIG_ROOT_NFS=y |
| 714 | CONFIG_LOCKD=y | 721 | CONFIG_LOCKD=y |
| @@ -751,6 +758,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 751 | # | 758 | # |
| 752 | # Library routines | 759 | # Library routines |
| 753 | # | 760 | # |
| 761 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 754 | # CONFIG_CRC_CCITT is not set | 762 | # CONFIG_CRC_CCITT is not set |
| 755 | # CONFIG_CRC16 is not set | 763 | # CONFIG_CRC16 is not set |
| 756 | # CONFIG_CRC_ITU_T is not set | 764 | # CONFIG_CRC_ITU_T is not set |
| @@ -761,6 +769,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 761 | CONFIG_HAS_IOMEM=y | 769 | CONFIG_HAS_IOMEM=y |
| 762 | CONFIG_HAS_IOPORT=y | 770 | CONFIG_HAS_IOPORT=y |
| 763 | CONFIG_HAS_DMA=y | 771 | CONFIG_HAS_DMA=y |
| 772 | CONFIG_HAVE_LMB=y | ||
| 764 | 773 | ||
| 765 | # | 774 | # |
| 766 | # Kernel hacking | 775 | # Kernel hacking |
| @@ -768,6 +777,7 @@ CONFIG_HAS_DMA=y | |||
| 768 | # CONFIG_PRINTK_TIME is not set | 777 | # CONFIG_PRINTK_TIME is not set |
| 769 | CONFIG_ENABLE_WARN_DEPRECATED=y | 778 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 770 | CONFIG_ENABLE_MUST_CHECK=y | 779 | CONFIG_ENABLE_MUST_CHECK=y |
| 780 | CONFIG_FRAME_WARN=1024 | ||
| 771 | CONFIG_MAGIC_SYSRQ=y | 781 | CONFIG_MAGIC_SYSRQ=y |
| 772 | # CONFIG_UNUSED_SYMBOLS is not set | 782 | # CONFIG_UNUSED_SYMBOLS is not set |
| 773 | CONFIG_DEBUG_FS=y | 783 | CONFIG_DEBUG_FS=y |
| @@ -778,6 +788,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 778 | CONFIG_SCHED_DEBUG=y | 788 | CONFIG_SCHED_DEBUG=y |
| 779 | # CONFIG_SCHEDSTATS is not set | 789 | # CONFIG_SCHEDSTATS is not set |
| 780 | # CONFIG_TIMER_STATS is not set | 790 | # CONFIG_TIMER_STATS is not set |
| 791 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 781 | # CONFIG_SLUB_DEBUG_ON is not set | 792 | # CONFIG_SLUB_DEBUG_ON is not set |
| 782 | # CONFIG_SLUB_STATS is not set | 793 | # CONFIG_SLUB_STATS is not set |
| 783 | # CONFIG_DEBUG_SPINLOCK is not set | 794 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -788,6 +799,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 788 | CONFIG_DEBUG_BUGVERBOSE=y | 799 | CONFIG_DEBUG_BUGVERBOSE=y |
| 789 | CONFIG_DEBUG_INFO=y | 800 | CONFIG_DEBUG_INFO=y |
| 790 | # CONFIG_DEBUG_VM is not set | 801 | # CONFIG_DEBUG_VM is not set |
| 802 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 791 | # CONFIG_DEBUG_LIST is not set | 803 | # CONFIG_DEBUG_LIST is not set |
| 792 | # CONFIG_DEBUG_SG is not set | 804 | # CONFIG_DEBUG_SG is not set |
| 793 | # CONFIG_BOOT_PRINTK_DELAY is not set | 805 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -798,6 +810,7 @@ CONFIG_DEBUG_INFO=y | |||
| 798 | # CONFIG_DEBUG_STACK_USAGE is not set | 810 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 799 | # CONFIG_DEBUG_PAGEALLOC is not set | 811 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 800 | # CONFIG_DEBUGGER is not set | 812 | # CONFIG_DEBUGGER is not set |
| 813 | # CONFIG_IRQSTACKS is not set | ||
| 801 | # CONFIG_VIRQ_DEBUG is not set | 814 | # CONFIG_VIRQ_DEBUG is not set |
| 802 | # CONFIG_BDI_SWITCH is not set | 815 | # CONFIG_BDI_SWITCH is not set |
| 803 | # CONFIG_PPC_EARLY_DEBUG is not set | 816 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -811,3 +824,4 @@ CONFIG_DEBUG_INFO=y | |||
| 811 | # CONFIG_CRYPTO is not set | 824 | # CONFIG_CRYPTO is not set |
| 812 | # CONFIG_PPC_CLOCK is not set | 825 | # CONFIG_PPC_CLOCK is not set |
| 813 | CONFIG_PPC_LIB_RHEAP=y | 826 | CONFIG_PPC_LIB_RHEAP=y |
| 827 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index 2b1504e0a111..ba2a463b9305 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:09 2008 | 4 | # Mon Jun 9 08:52:09 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,18 +72,16 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | # CONFIG_BLK_DEV_INITRD is not set | 79 | # CONFIG_BLK_DEV_INITRD is not set |
| 80 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 82 | CONFIG_SYSCTL=y | 81 | CONFIG_SYSCTL=y |
| 83 | CONFIG_EMBEDDED=y | 82 | CONFIG_EMBEDDED=y |
| 84 | CONFIG_SYSCTL_SYSCALL=y | 83 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 85 | CONFIG_KALLSYMS=y | 85 | CONFIG_KALLSYMS=y |
| 86 | CONFIG_KALLSYMS_ALL=y | 86 | CONFIG_KALLSYMS_ALL=y |
| 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -107,6 +107,7 @@ CONFIG_SLAB=y | |||
| 107 | CONFIG_HAVE_OPROFILE=y | 107 | CONFIG_HAVE_OPROFILE=y |
| 108 | CONFIG_HAVE_KPROBES=y | 108 | CONFIG_HAVE_KPROBES=y |
| 109 | CONFIG_HAVE_KRETPROBES=y | 109 | CONFIG_HAVE_KRETPROBES=y |
| 110 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 110 | CONFIG_PROC_PAGE_MONITOR=y | 111 | CONFIG_PROC_PAGE_MONITOR=y |
| 111 | CONFIG_SLABINFO=y | 112 | CONFIG_SLABINFO=y |
| 112 | CONFIG_RT_MUTEXES=y | 113 | CONFIG_RT_MUTEXES=y |
| @@ -194,11 +195,13 @@ CONFIG_FLATMEM=y | |||
| 194 | CONFIG_FLAT_NODE_MEM_MAP=y | 195 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 195 | # CONFIG_SPARSEMEM_STATIC is not set | 196 | # CONFIG_SPARSEMEM_STATIC is not set |
| 196 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 197 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 198 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 197 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 198 | # CONFIG_RESOURCES_64BIT is not set | 200 | # CONFIG_RESOURCES_64BIT is not set |
| 199 | CONFIG_ZONE_DMA_FLAG=1 | 201 | CONFIG_ZONE_DMA_FLAG=1 |
| 200 | CONFIG_BOUNCE=y | 202 | CONFIG_BOUNCE=y |
| 201 | CONFIG_VIRT_TO_BUS=y | 203 | CONFIG_VIRT_TO_BUS=y |
| 204 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 202 | CONFIG_PROC_DEVICETREE=y | 205 | CONFIG_PROC_DEVICETREE=y |
| 203 | # CONFIG_CMDLINE_BOOL is not set | 206 | # CONFIG_CMDLINE_BOOL is not set |
| 204 | # CONFIG_PM is not set | 207 | # CONFIG_PM is not set |
| @@ -215,6 +218,7 @@ CONFIG_FSL_SOC=y | |||
| 215 | # CONFIG_PCI_SYSCALL is not set | 218 | # CONFIG_PCI_SYSCALL is not set |
| 216 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 219 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 217 | # CONFIG_PCCARD is not set | 220 | # CONFIG_PCCARD is not set |
| 221 | # CONFIG_HAS_RAPIDIO is not set | ||
| 218 | 222 | ||
| 219 | # | 223 | # |
| 220 | # Advanced setup | 224 | # Advanced setup |
| @@ -224,11 +228,11 @@ CONFIG_FSL_SOC=y | |||
| 224 | # | 228 | # |
| 225 | # Default settings for advanced configuration options are used | 229 | # Default settings for advanced configuration options are used |
| 226 | # | 230 | # |
| 227 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 228 | CONFIG_LOWMEM_SIZE=0x30000000 | 231 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 232 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 229 | CONFIG_KERNEL_START=0xc0000000 | 233 | CONFIG_KERNEL_START=0xc0000000 |
| 234 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 230 | CONFIG_TASK_SIZE=0xc0000000 | 235 | CONFIG_TASK_SIZE=0xc0000000 |
| 231 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 232 | 236 | ||
| 233 | # | 237 | # |
| 234 | # Networking | 238 | # Networking |
| @@ -283,6 +287,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 283 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 287 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 284 | CONFIG_INET6_XFRM_MODE_BEET=y | 288 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 285 | CONFIG_IPV6_SIT=y | 289 | CONFIG_IPV6_SIT=y |
| 290 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 286 | # CONFIG_IPV6_TUNNEL is not set | 291 | # CONFIG_IPV6_TUNNEL is not set |
| 287 | # CONFIG_NETWORK_SECMARK is not set | 292 | # CONFIG_NETWORK_SECMARK is not set |
| 288 | CONFIG_NETFILTER=y | 293 | CONFIG_NETFILTER=y |
| @@ -498,6 +503,7 @@ CONFIG_NETDEV_10000=y | |||
| 498 | # | 503 | # |
| 499 | # CONFIG_WLAN_PRE80211 is not set | 504 | # CONFIG_WLAN_PRE80211 is not set |
| 500 | # CONFIG_WLAN_80211 is not set | 505 | # CONFIG_WLAN_80211 is not set |
| 506 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 501 | # CONFIG_WAN is not set | 507 | # CONFIG_WAN is not set |
| 502 | # CONFIG_PPP is not set | 508 | # CONFIG_PPP is not set |
| 503 | # CONFIG_SLIP is not set | 509 | # CONFIG_SLIP is not set |
| @@ -521,6 +527,7 @@ CONFIG_NETDEV_10000=y | |||
| 521 | # Character devices | 527 | # Character devices |
| 522 | # | 528 | # |
| 523 | # CONFIG_VT is not set | 529 | # CONFIG_VT is not set |
| 530 | CONFIG_DEVKMEM=y | ||
| 524 | # CONFIG_SERIAL_NONSTANDARD is not set | 531 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 525 | 532 | ||
| 526 | # | 533 | # |
| @@ -552,12 +559,7 @@ CONFIG_HW_RANDOM=y | |||
| 552 | # CONFIG_R3964 is not set | 559 | # CONFIG_R3964 is not set |
| 553 | # CONFIG_RAW_DRIVER is not set | 560 | # CONFIG_RAW_DRIVER is not set |
| 554 | # CONFIG_I2C is not set | 561 | # CONFIG_I2C is not set |
| 555 | |||
| 556 | # | ||
| 557 | # SPI support | ||
| 558 | # | ||
| 559 | # CONFIG_SPI is not set | 562 | # CONFIG_SPI is not set |
| 560 | # CONFIG_SPI_MASTER is not set | ||
| 561 | # CONFIG_W1 is not set | 563 | # CONFIG_W1 is not set |
| 562 | # CONFIG_POWER_SUPPLY is not set | 564 | # CONFIG_POWER_SUPPLY is not set |
| 563 | # CONFIG_HWMON is not set | 565 | # CONFIG_HWMON is not set |
| @@ -574,12 +576,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 574 | # Multifunction device drivers | 576 | # Multifunction device drivers |
| 575 | # | 577 | # |
| 576 | # CONFIG_MFD_SM501 is not set | 578 | # CONFIG_MFD_SM501 is not set |
| 579 | # CONFIG_HTC_PASIC3 is not set | ||
| 577 | 580 | ||
| 578 | # | 581 | # |
| 579 | # Multimedia devices | 582 | # Multimedia devices |
| 580 | # | 583 | # |
| 584 | |||
| 585 | # | ||
| 586 | # Multimedia core support | ||
| 587 | # | ||
| 581 | # CONFIG_VIDEO_DEV is not set | 588 | # CONFIG_VIDEO_DEV is not set |
| 582 | # CONFIG_DVB_CORE is not set | 589 | # CONFIG_DVB_CORE is not set |
| 590 | # CONFIG_VIDEO_MEDIA is not set | ||
| 591 | |||
| 592 | # | ||
| 593 | # Multimedia drivers | ||
| 594 | # | ||
| 583 | CONFIG_DAB=y | 595 | CONFIG_DAB=y |
| 584 | 596 | ||
| 585 | # | 597 | # |
| @@ -603,12 +615,9 @@ CONFIG_DAB=y | |||
| 603 | # CONFIG_MMC is not set | 615 | # CONFIG_MMC is not set |
| 604 | # CONFIG_MEMSTICK is not set | 616 | # CONFIG_MEMSTICK is not set |
| 605 | # CONFIG_NEW_LEDS is not set | 617 | # CONFIG_NEW_LEDS is not set |
| 618 | # CONFIG_ACCESSIBILITY is not set | ||
| 606 | # CONFIG_RTC_CLASS is not set | 619 | # CONFIG_RTC_CLASS is not set |
| 607 | # CONFIG_DMADEVICES is not set | 620 | # CONFIG_DMADEVICES is not set |
| 608 | |||
| 609 | # | ||
| 610 | # Userspace I/O | ||
| 611 | # | ||
| 612 | # CONFIG_UIO is not set | 621 | # CONFIG_UIO is not set |
| 613 | 622 | ||
| 614 | # | 623 | # |
| @@ -675,7 +684,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 675 | CONFIG_NFS_FS=y | 684 | CONFIG_NFS_FS=y |
| 676 | CONFIG_NFS_V3=y | 685 | CONFIG_NFS_V3=y |
| 677 | # CONFIG_NFS_V3_ACL is not set | 686 | # CONFIG_NFS_V3_ACL is not set |
| 678 | # CONFIG_NFS_DIRECTIO is not set | ||
| 679 | # CONFIG_NFSD is not set | 687 | # CONFIG_NFSD is not set |
| 680 | CONFIG_ROOT_NFS=y | 688 | CONFIG_ROOT_NFS=y |
| 681 | CONFIG_LOCKD=y | 689 | CONFIG_LOCKD=y |
| @@ -752,6 +760,7 @@ CONFIG_NLS_UTF8=y | |||
| 752 | # | 760 | # |
| 753 | # Library routines | 761 | # Library routines |
| 754 | # | 762 | # |
| 763 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 755 | # CONFIG_CRC_CCITT is not set | 764 | # CONFIG_CRC_CCITT is not set |
| 756 | # CONFIG_CRC16 is not set | 765 | # CONFIG_CRC16 is not set |
| 757 | # CONFIG_CRC_ITU_T is not set | 766 | # CONFIG_CRC_ITU_T is not set |
| @@ -763,6 +772,7 @@ CONFIG_PLIST=y | |||
| 763 | CONFIG_HAS_IOMEM=y | 772 | CONFIG_HAS_IOMEM=y |
| 764 | CONFIG_HAS_IOPORT=y | 773 | CONFIG_HAS_IOPORT=y |
| 765 | CONFIG_HAS_DMA=y | 774 | CONFIG_HAS_DMA=y |
| 775 | CONFIG_HAVE_LMB=y | ||
| 766 | 776 | ||
| 767 | # | 777 | # |
| 768 | # Kernel hacking | 778 | # Kernel hacking |
| @@ -770,6 +780,7 @@ CONFIG_HAS_DMA=y | |||
| 770 | # CONFIG_PRINTK_TIME is not set | 780 | # CONFIG_PRINTK_TIME is not set |
| 771 | CONFIG_ENABLE_WARN_DEPRECATED=y | 781 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 772 | CONFIG_ENABLE_MUST_CHECK=y | 782 | CONFIG_ENABLE_MUST_CHECK=y |
| 783 | CONFIG_FRAME_WARN=1024 | ||
| 773 | CONFIG_MAGIC_SYSRQ=y | 784 | CONFIG_MAGIC_SYSRQ=y |
| 774 | # CONFIG_UNUSED_SYMBOLS is not set | 785 | # CONFIG_UNUSED_SYMBOLS is not set |
| 775 | # CONFIG_DEBUG_FS is not set | 786 | # CONFIG_DEBUG_FS is not set |
| @@ -780,6 +791,7 @@ CONFIG_DEBUG_KERNEL=y | |||
| 780 | # CONFIG_SCHED_DEBUG is not set | 791 | # CONFIG_SCHED_DEBUG is not set |
| 781 | # CONFIG_SCHEDSTATS is not set | 792 | # CONFIG_SCHEDSTATS is not set |
| 782 | # CONFIG_TIMER_STATS is not set | 793 | # CONFIG_TIMER_STATS is not set |
| 794 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 783 | # CONFIG_DEBUG_SLAB is not set | 795 | # CONFIG_DEBUG_SLAB is not set |
| 784 | # CONFIG_DEBUG_RT_MUTEXES is not set | 796 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 785 | # CONFIG_RT_MUTEX_TESTER is not set | 797 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -791,6 +803,7 @@ CONFIG_DEBUG_KERNEL=y | |||
| 791 | CONFIG_DEBUG_BUGVERBOSE=y | 803 | CONFIG_DEBUG_BUGVERBOSE=y |
| 792 | CONFIG_DEBUG_INFO=y | 804 | CONFIG_DEBUG_INFO=y |
| 793 | # CONFIG_DEBUG_VM is not set | 805 | # CONFIG_DEBUG_VM is not set |
| 806 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 794 | # CONFIG_DEBUG_LIST is not set | 807 | # CONFIG_DEBUG_LIST is not set |
| 795 | # CONFIG_DEBUG_SG is not set | 808 | # CONFIG_DEBUG_SG is not set |
| 796 | # CONFIG_BOOT_PRINTK_DELAY is not set | 809 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -802,6 +815,7 @@ CONFIG_DEBUG_INFO=y | |||
| 802 | # CONFIG_DEBUG_PAGEALLOC is not set | 815 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 803 | # CONFIG_DEBUGGER is not set | 816 | # CONFIG_DEBUGGER is not set |
| 804 | # CONFIG_KGDB_CONSOLE is not set | 817 | # CONFIG_KGDB_CONSOLE is not set |
| 818 | # CONFIG_IRQSTACKS is not set | ||
| 805 | CONFIG_BDI_SWITCH=y | 819 | CONFIG_BDI_SWITCH=y |
| 806 | # CONFIG_PPC_EARLY_DEBUG is not set | 820 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 807 | 821 | ||
| @@ -811,45 +825,75 @@ CONFIG_BDI_SWITCH=y | |||
| 811 | # CONFIG_KEYS is not set | 825 | # CONFIG_KEYS is not set |
| 812 | # CONFIG_SECURITY is not set | 826 | # CONFIG_SECURITY is not set |
| 813 | CONFIG_CRYPTO=y | 827 | CONFIG_CRYPTO=y |
| 828 | |||
| 829 | # | ||
| 830 | # Crypto core or helper | ||
| 831 | # | ||
| 814 | CONFIG_CRYPTO_ALGAPI=y | 832 | CONFIG_CRYPTO_ALGAPI=y |
| 815 | CONFIG_CRYPTO_BLKCIPHER=y | 833 | CONFIG_CRYPTO_BLKCIPHER=y |
| 816 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 817 | CONFIG_CRYPTO_MANAGER=y | 834 | CONFIG_CRYPTO_MANAGER=y |
| 818 | # CONFIG_CRYPTO_HMAC is not set | ||
| 819 | # CONFIG_CRYPTO_NULL is not set | 835 | # CONFIG_CRYPTO_NULL is not set |
| 836 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 837 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 838 | |||
| 839 | # | ||
| 840 | # Authenticated Encryption with Associated Data | ||
| 841 | # | ||
| 842 | # CONFIG_CRYPTO_CCM is not set | ||
| 843 | # CONFIG_CRYPTO_GCM is not set | ||
| 844 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 845 | |||
| 846 | # | ||
| 847 | # Block modes | ||
| 848 | # | ||
| 849 | CONFIG_CRYPTO_CBC=y | ||
| 850 | # CONFIG_CRYPTO_CTR is not set | ||
| 851 | # CONFIG_CRYPTO_CTS is not set | ||
| 852 | CONFIG_CRYPTO_ECB=y | ||
| 853 | CONFIG_CRYPTO_PCBC=y | ||
| 854 | |||
| 855 | # | ||
| 856 | # Hash modes | ||
| 857 | # | ||
| 858 | # CONFIG_CRYPTO_HMAC is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Digest | ||
| 862 | # | ||
| 863 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 820 | # CONFIG_CRYPTO_MD4 is not set | 864 | # CONFIG_CRYPTO_MD4 is not set |
| 821 | CONFIG_CRYPTO_MD5=y | 865 | CONFIG_CRYPTO_MD5=y |
| 866 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 822 | # CONFIG_CRYPTO_SHA1 is not set | 867 | # CONFIG_CRYPTO_SHA1 is not set |
| 823 | # CONFIG_CRYPTO_SHA256 is not set | 868 | # CONFIG_CRYPTO_SHA256 is not set |
| 824 | # CONFIG_CRYPTO_SHA512 is not set | 869 | # CONFIG_CRYPTO_SHA512 is not set |
| 825 | # CONFIG_CRYPTO_WP512 is not set | ||
| 826 | # CONFIG_CRYPTO_TGR192 is not set | 870 | # CONFIG_CRYPTO_TGR192 is not set |
| 827 | CONFIG_CRYPTO_ECB=y | 871 | # CONFIG_CRYPTO_WP512 is not set |
| 828 | CONFIG_CRYPTO_CBC=y | 872 | |
| 829 | CONFIG_CRYPTO_PCBC=y | 873 | # |
| 830 | # CONFIG_CRYPTO_CTR is not set | 874 | # Ciphers |
| 831 | # CONFIG_CRYPTO_GCM is not set | 875 | # |
| 832 | # CONFIG_CRYPTO_CCM is not set | ||
| 833 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 834 | CONFIG_CRYPTO_DES=y | ||
| 835 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 836 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 837 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 838 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 839 | # CONFIG_CRYPTO_AES is not set | 876 | # CONFIG_CRYPTO_AES is not set |
| 877 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 878 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 840 | # CONFIG_CRYPTO_CAST5 is not set | 881 | # CONFIG_CRYPTO_CAST5 is not set |
| 841 | # CONFIG_CRYPTO_CAST6 is not set | 882 | # CONFIG_CRYPTO_CAST6 is not set |
| 842 | # CONFIG_CRYPTO_TEA is not set | 883 | CONFIG_CRYPTO_DES=y |
| 843 | # CONFIG_CRYPTO_ARC4 is not set | 884 | # CONFIG_CRYPTO_FCRYPT is not set |
| 844 | # CONFIG_CRYPTO_KHAZAD is not set | 885 | # CONFIG_CRYPTO_KHAZAD is not set |
| 845 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 846 | # CONFIG_CRYPTO_SEED is not set | 886 | # CONFIG_CRYPTO_SEED is not set |
| 887 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 888 | # CONFIG_CRYPTO_TEA is not set | ||
| 889 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 890 | |||
| 891 | # | ||
| 892 | # Compression | ||
| 893 | # | ||
| 847 | # CONFIG_CRYPTO_DEFLATE is not set | 894 | # CONFIG_CRYPTO_DEFLATE is not set |
| 848 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 849 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 850 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 851 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 852 | # CONFIG_CRYPTO_LZO is not set | 895 | # CONFIG_CRYPTO_LZO is not set |
| 853 | # CONFIG_CRYPTO_HW is not set | 896 | # CONFIG_CRYPTO_HW is not set |
| 854 | # CONFIG_PPC_CLOCK is not set | 897 | # CONFIG_PPC_CLOCK is not set |
| 855 | CONFIG_PPC_LIB_RHEAP=y | 898 | CONFIG_PPC_LIB_RHEAP=y |
| 899 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index 125b4764aadd..ac72b48542dc 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:10 2008 | 4 | # Mon Jun 9 08:52:09 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | 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 | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -108,6 +110,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 110 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 111 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 112 | CONFIG_HAVE_KRETPROBES=y |
| 113 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 114 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
| 113 | # CONFIG_TINY_SHMEM is not set | 116 | # CONFIG_TINY_SHMEM is not set |
| @@ -212,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -234,6 +239,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_QSPAN is not set | 239 | # CONFIG_PCI_QSPAN is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 243 | ||
| 238 | # | 244 | # |
| 239 | # Advanced setup | 245 | # Advanced setup |
| @@ -243,13 +249,13 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 249 | # |
| 244 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 245 | # | 251 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0x80000000 | 256 | CONFIG_TASK_SIZE=0x80000000 |
| 250 | CONFIG_CONSISTENT_START=0xfd000000 | 257 | CONFIG_CONSISTENT_START=0xfd000000 |
| 251 | CONFIG_CONSISTENT_SIZE=0x00200000 | 258 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 252 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 253 | 259 | ||
| 254 | # | 260 | # |
| 255 | # Networking | 261 | # Networking |
| @@ -292,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 292 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 293 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 294 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 295 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 296 | # CONFIG_INET6_TUNNEL is not set | ||
| 297 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 298 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 299 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -481,6 +485,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 481 | # | 485 | # |
| 482 | # CONFIG_WLAN_PRE80211 is not set | 486 | # CONFIG_WLAN_PRE80211 is not set |
| 483 | # CONFIG_WLAN_80211 is not set | 487 | # CONFIG_WLAN_80211 is not set |
| 488 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 484 | # CONFIG_WAN is not set | 489 | # CONFIG_WAN is not set |
| 485 | # CONFIG_PPP is not set | 490 | # CONFIG_PPP is not set |
| 486 | # CONFIG_SLIP is not set | 491 | # CONFIG_SLIP is not set |
| @@ -505,6 +510,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 505 | # Character devices | 510 | # Character devices |
| 506 | # | 511 | # |
| 507 | # CONFIG_VT is not set | 512 | # CONFIG_VT is not set |
| 513 | CONFIG_DEVKMEM=y | ||
| 508 | # CONFIG_SERIAL_NONSTANDARD is not set | 514 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 509 | 515 | ||
| 510 | # | 516 | # |
| @@ -537,12 +543,7 @@ CONFIG_GEN_RTC=y | |||
| 537 | # CONFIG_RAW_DRIVER is not set | 543 | # CONFIG_RAW_DRIVER is not set |
| 538 | # CONFIG_TCG_TPM is not set | 544 | # CONFIG_TCG_TPM is not set |
| 539 | # CONFIG_I2C is not set | 545 | # CONFIG_I2C is not set |
| 540 | |||
| 541 | # | ||
| 542 | # SPI support | ||
| 543 | # | ||
| 544 | # CONFIG_SPI is not set | 546 | # CONFIG_SPI is not set |
| 545 | # CONFIG_SPI_MASTER is not set | ||
| 546 | # CONFIG_W1 is not set | 547 | # CONFIG_W1 is not set |
| 547 | # CONFIG_POWER_SUPPLY is not set | 548 | # CONFIG_POWER_SUPPLY is not set |
| 548 | # CONFIG_HWMON is not set | 549 | # CONFIG_HWMON is not set |
| @@ -559,12 +560,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 559 | # Multifunction device drivers | 560 | # Multifunction device drivers |
| 560 | # | 561 | # |
| 561 | # CONFIG_MFD_SM501 is not set | 562 | # CONFIG_MFD_SM501 is not set |
| 563 | # CONFIG_HTC_PASIC3 is not set | ||
| 562 | 564 | ||
| 563 | # | 565 | # |
| 564 | # Multimedia devices | 566 | # Multimedia devices |
| 565 | # | 567 | # |
| 568 | |||
| 569 | # | ||
| 570 | # Multimedia core support | ||
| 571 | # | ||
| 566 | # CONFIG_VIDEO_DEV is not set | 572 | # CONFIG_VIDEO_DEV is not set |
| 567 | # CONFIG_DVB_CORE is not set | 573 | # CONFIG_DVB_CORE is not set |
| 574 | # CONFIG_VIDEO_MEDIA is not set | ||
| 575 | |||
| 576 | # | ||
| 577 | # Multimedia drivers | ||
| 578 | # | ||
| 568 | CONFIG_DAB=y | 579 | CONFIG_DAB=y |
| 569 | 580 | ||
| 570 | # | 581 | # |
| @@ -588,13 +599,10 @@ CONFIG_DAB=y | |||
| 588 | # CONFIG_MMC is not set | 599 | # CONFIG_MMC is not set |
| 589 | # CONFIG_MEMSTICK is not set | 600 | # CONFIG_MEMSTICK is not set |
| 590 | # CONFIG_NEW_LEDS is not set | 601 | # CONFIG_NEW_LEDS is not set |
| 602 | # CONFIG_ACCESSIBILITY is not set | ||
| 591 | # CONFIG_EDAC is not set | 603 | # CONFIG_EDAC is not set |
| 592 | # CONFIG_RTC_CLASS is not set | 604 | # CONFIG_RTC_CLASS is not set |
| 593 | # CONFIG_DMADEVICES is not set | 605 | # CONFIG_DMADEVICES is not set |
| 594 | |||
| 595 | # | ||
| 596 | # Userspace I/O | ||
| 597 | # | ||
| 598 | # CONFIG_UIO is not set | 606 | # CONFIG_UIO is not set |
| 599 | 607 | ||
| 600 | # | 608 | # |
| @@ -607,7 +615,6 @@ CONFIG_DAB=y | |||
| 607 | # CONFIG_JFS_FS is not set | 615 | # CONFIG_JFS_FS is not set |
| 608 | # CONFIG_FS_POSIX_ACL is not set | 616 | # CONFIG_FS_POSIX_ACL is not set |
| 609 | # CONFIG_XFS_FS is not set | 617 | # CONFIG_XFS_FS is not set |
| 610 | # CONFIG_GFS2_FS is not set | ||
| 611 | # CONFIG_OCFS2_FS is not set | 618 | # CONFIG_OCFS2_FS is not set |
| 612 | # CONFIG_DNOTIFY is not set | 619 | # CONFIG_DNOTIFY is not set |
| 613 | # CONFIG_INOTIFY is not set | 620 | # CONFIG_INOTIFY is not set |
| @@ -665,7 +672,6 @@ CONFIG_NFS_FS=y | |||
| 665 | CONFIG_NFS_V3=y | 672 | CONFIG_NFS_V3=y |
| 666 | # CONFIG_NFS_V3_ACL is not set | 673 | # CONFIG_NFS_V3_ACL is not set |
| 667 | # CONFIG_NFS_V4 is not set | 674 | # CONFIG_NFS_V4 is not set |
| 668 | # CONFIG_NFS_DIRECTIO is not set | ||
| 669 | # CONFIG_NFSD is not set | 675 | # CONFIG_NFSD is not set |
| 670 | CONFIG_ROOT_NFS=y | 676 | CONFIG_ROOT_NFS=y |
| 671 | CONFIG_LOCKD=y | 677 | CONFIG_LOCKD=y |
| @@ -708,6 +714,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 708 | # | 714 | # |
| 709 | # Library routines | 715 | # Library routines |
| 710 | # | 716 | # |
| 717 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 711 | # CONFIG_CRC_CCITT is not set | 718 | # CONFIG_CRC_CCITT is not set |
| 712 | # CONFIG_CRC16 is not set | 719 | # CONFIG_CRC16 is not set |
| 713 | # CONFIG_CRC_ITU_T is not set | 720 | # CONFIG_CRC_ITU_T is not set |
| @@ -718,6 +725,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 718 | CONFIG_HAS_IOMEM=y | 725 | CONFIG_HAS_IOMEM=y |
| 719 | CONFIG_HAS_IOPORT=y | 726 | CONFIG_HAS_IOPORT=y |
| 720 | CONFIG_HAS_DMA=y | 727 | CONFIG_HAS_DMA=y |
| 728 | CONFIG_HAVE_LMB=y | ||
| 721 | 729 | ||
| 722 | # | 730 | # |
| 723 | # Kernel hacking | 731 | # Kernel hacking |
| @@ -725,6 +733,7 @@ CONFIG_HAS_DMA=y | |||
| 725 | # CONFIG_PRINTK_TIME is not set | 733 | # CONFIG_PRINTK_TIME is not set |
| 726 | CONFIG_ENABLE_WARN_DEPRECATED=y | 734 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 727 | CONFIG_ENABLE_MUST_CHECK=y | 735 | CONFIG_ENABLE_MUST_CHECK=y |
| 736 | CONFIG_FRAME_WARN=1024 | ||
| 728 | CONFIG_MAGIC_SYSRQ=y | 737 | CONFIG_MAGIC_SYSRQ=y |
| 729 | # CONFIG_UNUSED_SYMBOLS is not set | 738 | # CONFIG_UNUSED_SYMBOLS is not set |
| 730 | # CONFIG_DEBUG_FS is not set | 739 | # CONFIG_DEBUG_FS is not set |
| @@ -735,6 +744,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 735 | CONFIG_SCHED_DEBUG=y | 744 | CONFIG_SCHED_DEBUG=y |
| 736 | # CONFIG_SCHEDSTATS is not set | 745 | # CONFIG_SCHEDSTATS is not set |
| 737 | # CONFIG_TIMER_STATS is not set | 746 | # CONFIG_TIMER_STATS is not set |
| 747 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 738 | # CONFIG_SLUB_DEBUG_ON is not set | 748 | # CONFIG_SLUB_DEBUG_ON is not set |
| 739 | # CONFIG_SLUB_STATS is not set | 749 | # CONFIG_SLUB_STATS is not set |
| 740 | # CONFIG_DEBUG_SPINLOCK is not set | 750 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -745,6 +755,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 745 | CONFIG_DEBUG_BUGVERBOSE=y | 755 | CONFIG_DEBUG_BUGVERBOSE=y |
| 746 | CONFIG_DEBUG_INFO=y | 756 | CONFIG_DEBUG_INFO=y |
| 747 | # CONFIG_DEBUG_VM is not set | 757 | # CONFIG_DEBUG_VM is not set |
| 758 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 748 | # CONFIG_DEBUG_LIST is not set | 759 | # CONFIG_DEBUG_LIST is not set |
| 749 | # CONFIG_DEBUG_SG is not set | 760 | # CONFIG_DEBUG_SG is not set |
| 750 | # CONFIG_BOOT_PRINTK_DELAY is not set | 761 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -755,6 +766,7 @@ CONFIG_DEBUG_INFO=y | |||
| 755 | # CONFIG_DEBUG_STACK_USAGE is not set | 766 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 756 | # CONFIG_DEBUG_PAGEALLOC is not set | 767 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 757 | # CONFIG_DEBUGGER is not set | 768 | # CONFIG_DEBUGGER is not set |
| 769 | # CONFIG_IRQSTACKS is not set | ||
| 758 | # CONFIG_BDI_SWITCH is not set | 770 | # CONFIG_BDI_SWITCH is not set |
| 759 | # CONFIG_PPC_EARLY_DEBUG is not set | 771 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 760 | 772 | ||
| @@ -767,3 +779,4 @@ CONFIG_DEBUG_INFO=y | |||
| 767 | # CONFIG_CRYPTO is not set | 779 | # CONFIG_CRYPTO is not set |
| 768 | # CONFIG_PPC_CLOCK is not set | 780 | # CONFIG_PPC_CLOCK is not set |
| 769 | CONFIG_PPC_LIB_RHEAP=y | 781 | CONFIG_PPC_LIB_RHEAP=y |
| 782 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index db34909831a2..0ccc6e493dcb 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_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-rc3 | 3 | # Linux kernel version: 2.6.26-rc6 |
| 4 | # Tue May 20 20:01:18 2008 | 4 | # Mon Jun 16 21:08:31 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -597,7 +597,61 @@ CONFIG_ATA=y | |||
| 597 | CONFIG_SATA_PMP=y | 597 | CONFIG_SATA_PMP=y |
| 598 | # CONFIG_SATA_AHCI is not set | 598 | # CONFIG_SATA_AHCI is not set |
| 599 | # CONFIG_SATA_SIL24 is not set | 599 | # CONFIG_SATA_SIL24 is not set |
| 600 | # CONFIG_ATA_SFF is not set | 600 | CONFIG_ATA_SFF=y |
| 601 | CONFIG_SATA_SVW=y | ||
| 602 | # CONFIG_ATA_PIIX is not set | ||
| 603 | # CONFIG_SATA_MV is not set | ||
| 604 | # CONFIG_SATA_NV is not set | ||
| 605 | # CONFIG_PDC_ADMA is not set | ||
| 606 | # CONFIG_SATA_QSTOR is not set | ||
| 607 | # CONFIG_SATA_PROMISE is not set | ||
| 608 | # CONFIG_SATA_SX4 is not set | ||
| 609 | # CONFIG_SATA_SIL is not set | ||
| 610 | # CONFIG_SATA_SIS is not set | ||
| 611 | # CONFIG_SATA_ULI is not set | ||
| 612 | # CONFIG_SATA_VIA is not set | ||
| 613 | # CONFIG_SATA_VITESSE is not set | ||
| 614 | # CONFIG_SATA_INIC162X is not set | ||
| 615 | # CONFIG_PATA_ALI is not set | ||
| 616 | # CONFIG_PATA_AMD is not set | ||
| 617 | # CONFIG_PATA_ARTOP is not set | ||
| 618 | # CONFIG_PATA_ATIIXP is not set | ||
| 619 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 620 | # CONFIG_PATA_CMD64X is not set | ||
| 621 | # CONFIG_PATA_CS5520 is not set | ||
| 622 | # CONFIG_PATA_CS5530 is not set | ||
| 623 | # CONFIG_PATA_CYPRESS is not set | ||
| 624 | # CONFIG_PATA_EFAR is not set | ||
| 625 | # CONFIG_ATA_GENERIC is not set | ||
| 626 | # CONFIG_PATA_HPT366 is not set | ||
| 627 | # CONFIG_PATA_HPT37X is not set | ||
| 628 | # CONFIG_PATA_HPT3X2N is not set | ||
| 629 | # CONFIG_PATA_HPT3X3 is not set | ||
| 630 | # CONFIG_PATA_IT821X is not set | ||
| 631 | # CONFIG_PATA_IT8213 is not set | ||
| 632 | # CONFIG_PATA_JMICRON is not set | ||
| 633 | # CONFIG_PATA_TRIFLEX is not set | ||
| 634 | # CONFIG_PATA_MARVELL is not set | ||
| 635 | # CONFIG_PATA_MPIIX is not set | ||
| 636 | # CONFIG_PATA_OLDPIIX is not set | ||
| 637 | # CONFIG_PATA_NETCELL is not set | ||
| 638 | # CONFIG_PATA_NINJA32 is not set | ||
| 639 | # CONFIG_PATA_NS87410 is not set | ||
| 640 | # CONFIG_PATA_NS87415 is not set | ||
| 641 | # CONFIG_PATA_OPTI is not set | ||
| 642 | # CONFIG_PATA_OPTIDMA is not set | ||
| 643 | # CONFIG_PATA_PDC_OLD is not set | ||
| 644 | # CONFIG_PATA_RADISYS is not set | ||
| 645 | # CONFIG_PATA_RZ1000 is not set | ||
| 646 | # CONFIG_PATA_SC1200 is not set | ||
| 647 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 648 | # CONFIG_PATA_PDC2027X is not set | ||
| 649 | # CONFIG_PATA_SIL680 is not set | ||
| 650 | # CONFIG_PATA_SIS is not set | ||
| 651 | # CONFIG_PATA_VIA is not set | ||
| 652 | # CONFIG_PATA_WINBOND is not set | ||
| 653 | # CONFIG_PATA_PLATFORM is not set | ||
| 654 | # CONFIG_PATA_SCH is not set | ||
| 601 | CONFIG_MD=y | 655 | CONFIG_MD=y |
| 602 | CONFIG_BLK_DEV_MD=y | 656 | CONFIG_BLK_DEV_MD=y |
| 603 | CONFIG_MD_LINEAR=y | 657 | CONFIG_MD_LINEAR=y |
| @@ -1230,6 +1284,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1230 | # | 1284 | # |
| 1231 | CONFIG_USB_ACM=m | 1285 | CONFIG_USB_ACM=m |
| 1232 | CONFIG_USB_PRINTER=y | 1286 | CONFIG_USB_PRINTER=y |
| 1287 | # CONFIG_USB_WDM is not set | ||
| 1233 | 1288 | ||
| 1234 | # | 1289 | # |
| 1235 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1290 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1345,6 +1400,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1345 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1400 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1346 | # CONFIG_USB_IOWARRIOR is not set | 1401 | # CONFIG_USB_IOWARRIOR is not set |
| 1347 | # CONFIG_USB_TEST is not set | 1402 | # CONFIG_USB_TEST is not set |
| 1403 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1348 | # CONFIG_USB_GADGET is not set | 1404 | # CONFIG_USB_GADGET is not set |
| 1349 | # CONFIG_MMC is not set | 1405 | # CONFIG_MMC is not set |
| 1350 | # CONFIG_MEMSTICK is not set | 1406 | # CONFIG_MEMSTICK is not set |
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 22a943afc3c0..48434c2c7628 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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:10 2008 | 4 | # Mon Jun 9 08:52:10 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -91,6 +93,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 91 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 92 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 94 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 95 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -118,12 +121,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 118 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 119 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 121 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
| 122 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 123 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
| 124 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
| 125 | CONFIG_BASE_SMALL=0 | 129 | CONFIG_BASE_SMALL=0 |
| 126 | CONFIG_MODULES=y | 130 | CONFIG_MODULES=y |
| 131 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 127 | CONFIG_MODULE_UNLOAD=y | 132 | CONFIG_MODULE_UNLOAD=y |
| 128 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 133 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 129 | # CONFIG_MODVERSIONS is not set | 134 | # CONFIG_MODVERSIONS is not set |
| @@ -223,11 +228,13 @@ CONFIG_FLATMEM=y | |||
| 223 | CONFIG_FLAT_NODE_MEM_MAP=y | 228 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 224 | # CONFIG_SPARSEMEM_STATIC is not set | 229 | # CONFIG_SPARSEMEM_STATIC is not set |
| 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 231 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 227 | # CONFIG_RESOURCES_64BIT is not set | 233 | # CONFIG_RESOURCES_64BIT is not set |
| 228 | CONFIG_ZONE_DMA_FLAG=1 | 234 | CONFIG_ZONE_DMA_FLAG=1 |
| 229 | CONFIG_BOUNCE=y | 235 | CONFIG_BOUNCE=y |
| 230 | CONFIG_VIRT_TO_BUS=y | 236 | CONFIG_VIRT_TO_BUS=y |
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 231 | CONFIG_PROC_DEVICETREE=y | 238 | CONFIG_PROC_DEVICETREE=y |
| 232 | # CONFIG_CMDLINE_BOOL is not set | 239 | # CONFIG_CMDLINE_BOOL is not set |
| 233 | # CONFIG_PM is not set | 240 | # CONFIG_PM is not set |
| @@ -251,6 +258,7 @@ CONFIG_PCI_LEGACY=y | |||
| 251 | # CONFIG_PCI_DEBUG is not set | 258 | # CONFIG_PCI_DEBUG is not set |
| 252 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
| 253 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
| 261 | # CONFIG_HAS_RAPIDIO is not set | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Advanced setup | 264 | # Advanced setup |
| @@ -260,11 +268,11 @@ CONFIG_PCI_LEGACY=y | |||
| 260 | # | 268 | # |
| 261 | # Default settings for advanced configuration options are used | 269 | # Default settings for advanced configuration options are used |
| 262 | # | 270 | # |
| 263 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 264 | CONFIG_LOWMEM_SIZE=0x30000000 | 271 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 265 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
| 274 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 266 | CONFIG_TASK_SIZE=0xc0000000 | 275 | CONFIG_TASK_SIZE=0xc0000000 |
| 267 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 268 | 276 | ||
| 269 | # | 277 | # |
| 270 | # Networking | 278 | # Networking |
| @@ -313,8 +321,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 313 | # CONFIG_TCP_MD5SIG is not set | 321 | # CONFIG_TCP_MD5SIG is not set |
| 314 | # CONFIG_IP_VS is not set | 322 | # CONFIG_IP_VS is not set |
| 315 | # CONFIG_IPV6 is not set | 323 | # CONFIG_IPV6 is not set |
| 316 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 317 | # CONFIG_INET6_TUNNEL is not set | ||
| 318 | # CONFIG_NETWORK_SECMARK is not set | 324 | # CONFIG_NETWORK_SECMARK is not set |
| 319 | CONFIG_NETFILTER=y | 325 | CONFIG_NETFILTER=y |
| 320 | # CONFIG_NETFILTER_DEBUG is not set | 326 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -329,6 +335,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 329 | # CONFIG_NF_CT_ACCT is not set | 335 | # CONFIG_NF_CT_ACCT is not set |
| 330 | # CONFIG_NF_CONNTRACK_MARK is not set | 336 | # CONFIG_NF_CONNTRACK_MARK is not set |
| 331 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 337 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
| 338 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
| 332 | CONFIG_NF_CT_PROTO_GRE=m | 339 | CONFIG_NF_CT_PROTO_GRE=m |
| 333 | CONFIG_NF_CT_PROTO_SCTP=m | 340 | CONFIG_NF_CT_PROTO_SCTP=m |
| 334 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 341 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
| @@ -407,6 +414,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m | |||
| 407 | # CONFIG_IP_NF_TARGET_NETMAP is not set | 414 | # CONFIG_IP_NF_TARGET_NETMAP is not set |
| 408 | # CONFIG_NF_NAT_SNMP_BASIC is not set | 415 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
| 409 | CONFIG_NF_NAT_PROTO_GRE=m | 416 | CONFIG_NF_NAT_PROTO_GRE=m |
| 417 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
| 410 | CONFIG_NF_NAT_FTP=m | 418 | CONFIG_NF_NAT_FTP=m |
| 411 | CONFIG_NF_NAT_IRC=m | 419 | CONFIG_NF_NAT_IRC=m |
| 412 | CONFIG_NF_NAT_TFTP=m | 420 | CONFIG_NF_NAT_TFTP=m |
| @@ -459,8 +467,6 @@ CONFIG_IEEE80211_DEBUG=y | |||
| 459 | CONFIG_IEEE80211_CRYPT_WEP=m | 467 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 460 | CONFIG_IEEE80211_CRYPT_CCMP=m | 468 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 461 | CONFIG_IEEE80211_CRYPT_TKIP=m | 469 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 462 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 463 | CONFIG_IEEE80211_SOFTMAC_DEBUG=y | ||
| 464 | # CONFIG_RFKILL is not set | 470 | # CONFIG_RFKILL is not set |
| 465 | # CONFIG_NET_9P is not set | 471 | # CONFIG_NET_9P is not set |
| 466 | 472 | ||
| @@ -486,6 +492,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 486 | # CONFIG_MTD_REDBOOT_PARTS is not set | 492 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 487 | # CONFIG_MTD_CMDLINE_PARTS is not set | 493 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 488 | # CONFIG_MTD_OF_PARTS is not set | 494 | # CONFIG_MTD_OF_PARTS is not set |
| 495 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 489 | 496 | ||
| 490 | # | 497 | # |
| 491 | # User Modules And Translation Layers | 498 | # User Modules And Translation Layers |
| @@ -565,6 +572,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 565 | # | 572 | # |
| 566 | # CONFIG_MTD_UBI is not set | 573 | # CONFIG_MTD_UBI is not set |
| 567 | CONFIG_OF_DEVICE=y | 574 | CONFIG_OF_DEVICE=y |
| 575 | CONFIG_OF_I2C=y | ||
| 568 | # CONFIG_PARPORT is not set | 576 | # CONFIG_PARPORT is not set |
| 569 | CONFIG_BLK_DEV=y | 577 | CONFIG_BLK_DEV=y |
| 570 | # CONFIG_BLK_DEV_FD is not set | 578 | # CONFIG_BLK_DEV_FD is not set |
| @@ -670,7 +678,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 670 | # CONFIG_SCSI_SRP is not set | 678 | # CONFIG_SCSI_SRP is not set |
| 671 | CONFIG_ATA=y | 679 | CONFIG_ATA=y |
| 672 | # CONFIG_ATA_NONSTANDARD is not set | 680 | # CONFIG_ATA_NONSTANDARD is not set |
| 681 | CONFIG_SATA_PMP=y | ||
| 673 | # CONFIG_SATA_AHCI is not set | 682 | # CONFIG_SATA_AHCI is not set |
| 683 | # CONFIG_SATA_SIL24 is not set | ||
| 684 | # CONFIG_SATA_FSL is not set | ||
| 685 | CONFIG_ATA_SFF=y | ||
| 674 | # CONFIG_SATA_SVW is not set | 686 | # CONFIG_SATA_SVW is not set |
| 675 | # CONFIG_ATA_PIIX is not set | 687 | # CONFIG_ATA_PIIX is not set |
| 676 | # CONFIG_SATA_MV is not set | 688 | # CONFIG_SATA_MV is not set |
| @@ -680,13 +692,11 @@ CONFIG_ATA=y | |||
| 680 | # CONFIG_SATA_PROMISE is not set | 692 | # CONFIG_SATA_PROMISE is not set |
| 681 | # CONFIG_SATA_SX4 is not set | 693 | # CONFIG_SATA_SX4 is not set |
| 682 | # CONFIG_SATA_SIL is not set | 694 | # CONFIG_SATA_SIL is not set |
| 683 | # CONFIG_SATA_SIL24 is not set | ||
| 684 | # CONFIG_SATA_SIS is not set | 695 | # CONFIG_SATA_SIS is not set |
| 685 | # CONFIG_SATA_ULI is not set | 696 | # CONFIG_SATA_ULI is not set |
| 686 | # CONFIG_SATA_VIA is not set | 697 | # CONFIG_SATA_VIA is not set |
| 687 | # CONFIG_SATA_VITESSE is not set | 698 | # CONFIG_SATA_VITESSE is not set |
| 688 | # CONFIG_SATA_INIC162X is not set | 699 | # CONFIG_SATA_INIC162X is not set |
| 689 | # CONFIG_SATA_FSL is not set | ||
| 690 | # CONFIG_PATA_ALI is not set | 700 | # CONFIG_PATA_ALI is not set |
| 691 | # CONFIG_PATA_AMD is not set | 701 | # CONFIG_PATA_AMD is not set |
| 692 | # CONFIG_PATA_ARTOP is not set | 702 | # CONFIG_PATA_ARTOP is not set |
| @@ -726,6 +736,7 @@ CONFIG_PATA_SIL680=y | |||
| 726 | # CONFIG_PATA_VIA is not set | 736 | # CONFIG_PATA_VIA is not set |
| 727 | # CONFIG_PATA_WINBOND is not set | 737 | # CONFIG_PATA_WINBOND is not set |
| 728 | # CONFIG_PATA_PLATFORM is not set | 738 | # CONFIG_PATA_PLATFORM is not set |
| 739 | # CONFIG_PATA_SCH is not set | ||
| 729 | # CONFIG_MD is not set | 740 | # CONFIG_MD is not set |
| 730 | # CONFIG_FUSION is not set | 741 | # CONFIG_FUSION is not set |
| 731 | 742 | ||
| @@ -785,7 +796,6 @@ CONFIG_R8169=y | |||
| 785 | # CONFIG_SIS190 is not set | 796 | # CONFIG_SIS190 is not set |
| 786 | # CONFIG_SKGE is not set | 797 | # CONFIG_SKGE is not set |
| 787 | # CONFIG_SKY2 is not set | 798 | # CONFIG_SKY2 is not set |
| 788 | # CONFIG_SK98LIN is not set | ||
| 789 | # CONFIG_VIA_VELOCITY is not set | 799 | # CONFIG_VIA_VELOCITY is not set |
| 790 | # CONFIG_TIGON3 is not set | 800 | # CONFIG_TIGON3 is not set |
| 791 | # CONFIG_BNX2 is not set | 801 | # CONFIG_BNX2 is not set |
| @@ -805,6 +815,7 @@ CONFIG_NETDEV_10000=y | |||
| 805 | # CONFIG_MLX4_CORE is not set | 815 | # CONFIG_MLX4_CORE is not set |
| 806 | # CONFIG_TEHUTI is not set | 816 | # CONFIG_TEHUTI is not set |
| 807 | # CONFIG_BNX2X is not set | 817 | # CONFIG_BNX2X is not set |
| 818 | # CONFIG_SFC is not set | ||
| 808 | # CONFIG_TR is not set | 819 | # CONFIG_TR is not set |
| 809 | 820 | ||
| 810 | # | 821 | # |
| @@ -812,6 +823,7 @@ CONFIG_NETDEV_10000=y | |||
| 812 | # | 823 | # |
| 813 | # CONFIG_WLAN_PRE80211 is not set | 824 | # CONFIG_WLAN_PRE80211 is not set |
| 814 | # CONFIG_WLAN_80211 is not set | 825 | # CONFIG_WLAN_80211 is not set |
| 826 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 815 | 827 | ||
| 816 | # | 828 | # |
| 817 | # USB Network Adapters | 829 | # USB Network Adapters |
| @@ -886,6 +898,7 @@ CONFIG_VT=y | |||
| 886 | CONFIG_VT_CONSOLE=y | 898 | CONFIG_VT_CONSOLE=y |
| 887 | CONFIG_HW_CONSOLE=y | 899 | CONFIG_HW_CONSOLE=y |
| 888 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 900 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 901 | CONFIG_DEVKMEM=y | ||
| 889 | # CONFIG_SERIAL_NONSTANDARD is not set | 902 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 890 | # CONFIG_NOZOMI is not set | 903 | # CONFIG_NOZOMI is not set |
| 891 | 904 | ||
| @@ -913,7 +926,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 913 | # CONFIG_IPMI_HANDLER is not set | 926 | # CONFIG_IPMI_HANDLER is not set |
| 914 | CONFIG_HW_RANDOM=y | 927 | CONFIG_HW_RANDOM=y |
| 915 | # CONFIG_NVRAM is not set | 928 | # CONFIG_NVRAM is not set |
| 916 | # CONFIG_GEN_RTC is not set | ||
| 917 | # CONFIG_R3964 is not set | 929 | # CONFIG_R3964 is not set |
| 918 | # CONFIG_APPLICOM is not set | 930 | # CONFIG_APPLICOM is not set |
| 919 | # CONFIG_RAW_DRIVER is not set | 931 | # CONFIG_RAW_DRIVER is not set |
| @@ -924,13 +936,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 924 | CONFIG_I2C_CHARDEV=y | 936 | CONFIG_I2C_CHARDEV=y |
| 925 | 937 | ||
| 926 | # | 938 | # |
| 927 | # I2C Algorithms | ||
| 928 | # | ||
| 929 | # CONFIG_I2C_ALGOBIT is not set | ||
| 930 | # CONFIG_I2C_ALGOPCF is not set | ||
| 931 | # CONFIG_I2C_ALGOPCA is not set | ||
| 932 | |||
| 933 | # | ||
| 934 | # I2C Hardware Bus support | 939 | # I2C Hardware Bus support |
| 935 | # | 940 | # |
| 936 | # CONFIG_I2C_ALI1535 is not set | 941 | # CONFIG_I2C_ALI1535 is not set |
| @@ -957,6 +962,7 @@ CONFIG_I2C_MPC=y | |||
| 957 | # CONFIG_I2C_VIA is not set | 962 | # CONFIG_I2C_VIA is not set |
| 958 | # CONFIG_I2C_VIAPRO is not set | 963 | # CONFIG_I2C_VIAPRO is not set |
| 959 | # CONFIG_I2C_VOODOO3 is not set | 964 | # CONFIG_I2C_VOODOO3 is not set |
| 965 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 960 | 966 | ||
| 961 | # | 967 | # |
| 962 | # Miscellaneous I2C Chip support | 968 | # Miscellaneous I2C Chip support |
| @@ -966,19 +972,13 @@ CONFIG_SENSORS_EEPROM=m | |||
| 966 | # CONFIG_SENSORS_PCF8574 is not set | 972 | # CONFIG_SENSORS_PCF8574 is not set |
| 967 | # CONFIG_PCF8575 is not set | 973 | # CONFIG_PCF8575 is not set |
| 968 | # CONFIG_SENSORS_PCF8591 is not set | 974 | # CONFIG_SENSORS_PCF8591 is not set |
| 969 | # CONFIG_TPS65010 is not set | ||
| 970 | # CONFIG_SENSORS_MAX6875 is not set | 975 | # CONFIG_SENSORS_MAX6875 is not set |
| 971 | # CONFIG_SENSORS_TSL2550 is not set | 976 | # CONFIG_SENSORS_TSL2550 is not set |
| 972 | # CONFIG_I2C_DEBUG_CORE is not set | 977 | # CONFIG_I2C_DEBUG_CORE is not set |
| 973 | # CONFIG_I2C_DEBUG_ALGO is not set | 978 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 974 | # CONFIG_I2C_DEBUG_BUS is not set | 979 | # CONFIG_I2C_DEBUG_BUS is not set |
| 975 | # CONFIG_I2C_DEBUG_CHIP is not set | 980 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 976 | |||
| 977 | # | ||
| 978 | # SPI support | ||
| 979 | # | ||
| 980 | # CONFIG_SPI is not set | 981 | # CONFIG_SPI is not set |
| 981 | # CONFIG_SPI_MASTER is not set | ||
| 982 | # CONFIG_W1 is not set | 982 | # CONFIG_W1 is not set |
| 983 | # CONFIG_POWER_SUPPLY is not set | 983 | # CONFIG_POWER_SUPPLY is not set |
| 984 | CONFIG_HWMON=y | 984 | CONFIG_HWMON=y |
| @@ -1048,12 +1048,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1048 | # Multifunction device drivers | 1048 | # Multifunction device drivers |
| 1049 | # | 1049 | # |
| 1050 | # CONFIG_MFD_SM501 is not set | 1050 | # CONFIG_MFD_SM501 is not set |
| 1051 | # CONFIG_HTC_PASIC3 is not set | ||
| 1051 | 1052 | ||
| 1052 | # | 1053 | # |
| 1053 | # Multimedia devices | 1054 | # Multimedia devices |
| 1054 | # | 1055 | # |
| 1056 | |||
| 1057 | # | ||
| 1058 | # Multimedia core support | ||
| 1059 | # | ||
| 1055 | # CONFIG_VIDEO_DEV is not set | 1060 | # CONFIG_VIDEO_DEV is not set |
| 1056 | # CONFIG_DVB_CORE is not set | 1061 | # CONFIG_DVB_CORE is not set |
| 1062 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1063 | |||
| 1064 | # | ||
| 1065 | # Multimedia drivers | ||
| 1066 | # | ||
| 1057 | # CONFIG_DAB is not set | 1067 | # CONFIG_DAB is not set |
| 1058 | 1068 | ||
| 1059 | # | 1069 | # |
| @@ -1115,12 +1125,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1115 | # | 1125 | # |
| 1116 | # USB Host Controller Drivers | 1126 | # USB Host Controller Drivers |
| 1117 | # | 1127 | # |
| 1128 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1118 | CONFIG_USB_EHCI_HCD=y | 1129 | CONFIG_USB_EHCI_HCD=y |
| 1119 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1130 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1120 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1131 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1121 | # CONFIG_USB_EHCI_FSL is not set | 1132 | # CONFIG_USB_EHCI_FSL is not set |
| 1122 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1133 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1123 | # CONFIG_USB_ISP116X_HCD is not set | 1134 | # CONFIG_USB_ISP116X_HCD is not set |
| 1135 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1124 | CONFIG_USB_OHCI_HCD=y | 1136 | CONFIG_USB_OHCI_HCD=y |
| 1125 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1137 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1126 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1138 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1138,6 +1150,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1138 | # | 1150 | # |
| 1139 | # CONFIG_USB_ACM is not set | 1151 | # CONFIG_USB_ACM is not set |
| 1140 | CONFIG_USB_PRINTER=m | 1152 | CONFIG_USB_PRINTER=m |
| 1153 | # CONFIG_USB_WDM is not set | ||
| 1141 | 1154 | ||
| 1142 | # | 1155 | # |
| 1143 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1156 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1159,6 +1172,7 @@ CONFIG_USB_STORAGE=m | |||
| 1159 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1172 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1160 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1173 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1161 | # CONFIG_USB_STORAGE_KARMA is not set | 1174 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1175 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1162 | # CONFIG_USB_LIBUSUAL is not set | 1176 | # CONFIG_USB_LIBUSUAL is not set |
| 1163 | 1177 | ||
| 1164 | # | 1178 | # |
| @@ -1202,9 +1216,11 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1202 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1216 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
| 1203 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1217 | # CONFIG_USB_SERIAL_MOS7720 is not set |
| 1204 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1218 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1219 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 1205 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1220 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1206 | # CONFIG_USB_SERIAL_PL2303 is not set | 1221 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 1207 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1222 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1223 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
| 1208 | # CONFIG_USB_SERIAL_HP4X is not set | 1224 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1209 | # CONFIG_USB_SERIAL_SAFE is not set | 1225 | # CONFIG_USB_SERIAL_SAFE is not set |
| 1210 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1226 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
| @@ -1238,10 +1254,12 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1238 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1254 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1239 | # CONFIG_USB_IOWARRIOR is not set | 1255 | # CONFIG_USB_IOWARRIOR is not set |
| 1240 | # CONFIG_USB_TEST is not set | 1256 | # CONFIG_USB_TEST is not set |
| 1257 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1241 | # CONFIG_USB_GADGET is not set | 1258 | # CONFIG_USB_GADGET is not set |
| 1242 | # CONFIG_MMC is not set | 1259 | # CONFIG_MMC is not set |
| 1243 | # CONFIG_MEMSTICK is not set | 1260 | # CONFIG_MEMSTICK is not set |
| 1244 | # CONFIG_NEW_LEDS is not set | 1261 | # CONFIG_NEW_LEDS is not set |
| 1262 | # CONFIG_ACCESSIBILITY is not set | ||
| 1245 | # CONFIG_INFINIBAND is not set | 1263 | # CONFIG_INFINIBAND is not set |
| 1246 | # CONFIG_EDAC is not set | 1264 | # CONFIG_EDAC is not set |
| 1247 | CONFIG_RTC_LIB=y | 1265 | CONFIG_RTC_LIB=y |
| @@ -1293,11 +1311,8 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1293 | # | 1311 | # |
| 1294 | # on-CPU RTC drivers | 1312 | # on-CPU RTC drivers |
| 1295 | # | 1313 | # |
| 1314 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1296 | # CONFIG_DMADEVICES is not set | 1315 | # CONFIG_DMADEVICES is not set |
| 1297 | |||
| 1298 | # | ||
| 1299 | # Userspace I/O | ||
| 1300 | # | ||
| 1301 | # CONFIG_UIO is not set | 1316 | # CONFIG_UIO is not set |
| 1302 | 1317 | ||
| 1303 | # | 1318 | # |
| @@ -1318,10 +1333,9 @@ CONFIG_FS_MBCACHE=y | |||
| 1318 | CONFIG_FS_POSIX_ACL=y | 1333 | CONFIG_FS_POSIX_ACL=y |
| 1319 | CONFIG_XFS_FS=m | 1334 | CONFIG_XFS_FS=m |
| 1320 | # CONFIG_XFS_QUOTA is not set | 1335 | # CONFIG_XFS_QUOTA is not set |
| 1321 | # CONFIG_XFS_SECURITY is not set | ||
| 1322 | # CONFIG_XFS_POSIX_ACL is not set | 1336 | # CONFIG_XFS_POSIX_ACL is not set |
| 1323 | # CONFIG_XFS_RT is not set | 1337 | # CONFIG_XFS_RT is not set |
| 1324 | # CONFIG_GFS2_FS is not set | 1338 | # CONFIG_XFS_DEBUG is not set |
| 1325 | # CONFIG_OCFS2_FS is not set | 1339 | # CONFIG_OCFS2_FS is not set |
| 1326 | CONFIG_DNOTIFY=y | 1340 | CONFIG_DNOTIFY=y |
| 1327 | CONFIG_INOTIFY=y | 1341 | CONFIG_INOTIFY=y |
| @@ -1388,12 +1402,10 @@ CONFIG_NFS_FS=y | |||
| 1388 | CONFIG_NFS_V3=y | 1402 | CONFIG_NFS_V3=y |
| 1389 | CONFIG_NFS_V3_ACL=y | 1403 | CONFIG_NFS_V3_ACL=y |
| 1390 | CONFIG_NFS_V4=y | 1404 | CONFIG_NFS_V4=y |
| 1391 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1392 | CONFIG_NFSD=m | 1405 | CONFIG_NFSD=m |
| 1393 | CONFIG_NFSD_V3=y | 1406 | CONFIG_NFSD_V3=y |
| 1394 | # CONFIG_NFSD_V3_ACL is not set | 1407 | # CONFIG_NFSD_V3_ACL is not set |
| 1395 | # CONFIG_NFSD_V4 is not set | 1408 | # CONFIG_NFSD_V4 is not set |
| 1396 | CONFIG_NFSD_TCP=y | ||
| 1397 | CONFIG_ROOT_NFS=y | 1409 | CONFIG_ROOT_NFS=y |
| 1398 | CONFIG_LOCKD=y | 1410 | CONFIG_LOCKD=y |
| 1399 | CONFIG_LOCKD_V4=y | 1411 | CONFIG_LOCKD_V4=y |
| @@ -1467,9 +1479,10 @@ CONFIG_NLS_UTF8=m | |||
| 1467 | # Library routines | 1479 | # Library routines |
| 1468 | # | 1480 | # |
| 1469 | CONFIG_BITREVERSE=y | 1481 | CONFIG_BITREVERSE=y |
| 1482 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1470 | CONFIG_CRC_CCITT=m | 1483 | CONFIG_CRC_CCITT=m |
| 1471 | # CONFIG_CRC16 is not set | 1484 | # CONFIG_CRC16 is not set |
| 1472 | # CONFIG_CRC_ITU_T is not set | 1485 | CONFIG_CRC_ITU_T=m |
| 1473 | CONFIG_CRC32=y | 1486 | CONFIG_CRC32=y |
| 1474 | # CONFIG_CRC7 is not set | 1487 | # CONFIG_CRC7 is not set |
| 1475 | CONFIG_LIBCRC32C=m | 1488 | CONFIG_LIBCRC32C=m |
| @@ -1481,6 +1494,7 @@ CONFIG_PLIST=y | |||
| 1481 | CONFIG_HAS_IOMEM=y | 1494 | CONFIG_HAS_IOMEM=y |
| 1482 | CONFIG_HAS_IOPORT=y | 1495 | CONFIG_HAS_IOPORT=y |
| 1483 | CONFIG_HAS_DMA=y | 1496 | CONFIG_HAS_DMA=y |
| 1497 | CONFIG_HAVE_LMB=y | ||
| 1484 | 1498 | ||
| 1485 | # | 1499 | # |
| 1486 | # Kernel hacking | 1500 | # Kernel hacking |
| @@ -1488,6 +1502,7 @@ CONFIG_HAS_DMA=y | |||
| 1488 | # CONFIG_PRINTK_TIME is not set | 1502 | # CONFIG_PRINTK_TIME is not set |
| 1489 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1503 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1490 | CONFIG_ENABLE_MUST_CHECK=y | 1504 | CONFIG_ENABLE_MUST_CHECK=y |
| 1505 | CONFIG_FRAME_WARN=1024 | ||
| 1491 | CONFIG_MAGIC_SYSRQ=y | 1506 | CONFIG_MAGIC_SYSRQ=y |
| 1492 | # CONFIG_UNUSED_SYMBOLS is not set | 1507 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1493 | # CONFIG_DEBUG_FS is not set | 1508 | # CONFIG_DEBUG_FS is not set |
| @@ -1498,6 +1513,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1498 | CONFIG_SCHED_DEBUG=y | 1513 | CONFIG_SCHED_DEBUG=y |
| 1499 | # CONFIG_SCHEDSTATS is not set | 1514 | # CONFIG_SCHEDSTATS is not set |
| 1500 | # CONFIG_TIMER_STATS is not set | 1515 | # CONFIG_TIMER_STATS is not set |
| 1516 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1501 | # CONFIG_SLUB_DEBUG_ON is not set | 1517 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1502 | # CONFIG_SLUB_STATS is not set | 1518 | # CONFIG_SLUB_STATS is not set |
| 1503 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1519 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1510,6 +1526,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1510 | CONFIG_DEBUG_BUGVERBOSE=y | 1526 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1511 | # CONFIG_DEBUG_INFO is not set | 1527 | # CONFIG_DEBUG_INFO is not set |
| 1512 | # CONFIG_DEBUG_VM is not set | 1528 | # CONFIG_DEBUG_VM is not set |
| 1529 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1513 | # CONFIG_DEBUG_LIST is not set | 1530 | # CONFIG_DEBUG_LIST is not set |
| 1514 | # CONFIG_DEBUG_SG is not set | 1531 | # CONFIG_DEBUG_SG is not set |
| 1515 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1532 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1521,6 +1538,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1521 | # CONFIG_DEBUG_STACK_USAGE is not set | 1538 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1522 | # CONFIG_DEBUG_PAGEALLOC is not set | 1539 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1523 | # CONFIG_DEBUGGER is not set | 1540 | # CONFIG_DEBUGGER is not set |
| 1541 | # CONFIG_IRQSTACKS is not set | ||
| 1524 | # CONFIG_BDI_SWITCH is not set | 1542 | # CONFIG_BDI_SWITCH is not set |
| 1525 | # CONFIG_BOOTX_TEXT is not set | 1543 | # CONFIG_BOOTX_TEXT is not set |
| 1526 | # CONFIG_PPC_EARLY_DEBUG is not set | 1544 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1532,52 +1550,82 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1532 | # CONFIG_SECURITY is not set | 1550 | # CONFIG_SECURITY is not set |
| 1533 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1551 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1534 | CONFIG_CRYPTO=y | 1552 | CONFIG_CRYPTO=y |
| 1553 | |||
| 1554 | # | ||
| 1555 | # Crypto core or helper | ||
| 1556 | # | ||
| 1535 | CONFIG_CRYPTO_ALGAPI=y | 1557 | CONFIG_CRYPTO_ALGAPI=y |
| 1536 | CONFIG_CRYPTO_BLKCIPHER=y | 1558 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1537 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1538 | CONFIG_CRYPTO_MANAGER=y | 1559 | CONFIG_CRYPTO_MANAGER=y |
| 1560 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1561 | # CONFIG_CRYPTO_NULL is not set | ||
| 1562 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1563 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1564 | # CONFIG_CRYPTO_TEST is not set | ||
| 1565 | |||
| 1566 | # | ||
| 1567 | # Authenticated Encryption with Associated Data | ||
| 1568 | # | ||
| 1569 | # CONFIG_CRYPTO_CCM is not set | ||
| 1570 | # CONFIG_CRYPTO_GCM is not set | ||
| 1571 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1572 | |||
| 1573 | # | ||
| 1574 | # Block modes | ||
| 1575 | # | ||
| 1576 | CONFIG_CRYPTO_CBC=y | ||
| 1577 | # CONFIG_CRYPTO_CTR is not set | ||
| 1578 | # CONFIG_CRYPTO_CTS is not set | ||
| 1579 | CONFIG_CRYPTO_ECB=m | ||
| 1580 | # CONFIG_CRYPTO_LRW is not set | ||
| 1581 | CONFIG_CRYPTO_PCBC=m | ||
| 1582 | # CONFIG_CRYPTO_XTS is not set | ||
| 1583 | |||
| 1584 | # | ||
| 1585 | # Hash modes | ||
| 1586 | # | ||
| 1539 | # CONFIG_CRYPTO_HMAC is not set | 1587 | # CONFIG_CRYPTO_HMAC is not set |
| 1540 | # CONFIG_CRYPTO_XCBC is not set | 1588 | # CONFIG_CRYPTO_XCBC is not set |
| 1541 | # CONFIG_CRYPTO_NULL is not set | 1589 | |
| 1590 | # | ||
| 1591 | # Digest | ||
| 1592 | # | ||
| 1593 | CONFIG_CRYPTO_CRC32C=m | ||
| 1542 | CONFIG_CRYPTO_MD4=m | 1594 | CONFIG_CRYPTO_MD4=m |
| 1543 | CONFIG_CRYPTO_MD5=y | 1595 | CONFIG_CRYPTO_MD5=y |
| 1596 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1544 | CONFIG_CRYPTO_SHA1=m | 1597 | CONFIG_CRYPTO_SHA1=m |
| 1545 | # CONFIG_CRYPTO_SHA256 is not set | 1598 | # CONFIG_CRYPTO_SHA256 is not set |
| 1546 | # CONFIG_CRYPTO_SHA512 is not set | 1599 | # CONFIG_CRYPTO_SHA512 is not set |
| 1547 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1548 | # CONFIG_CRYPTO_TGR192 is not set | 1600 | # CONFIG_CRYPTO_TGR192 is not set |
| 1549 | # CONFIG_CRYPTO_GF128MUL is not set | 1601 | # CONFIG_CRYPTO_WP512 is not set |
| 1550 | CONFIG_CRYPTO_ECB=m | 1602 | |
| 1551 | CONFIG_CRYPTO_CBC=y | 1603 | # |
| 1552 | CONFIG_CRYPTO_PCBC=m | 1604 | # Ciphers |
| 1553 | # CONFIG_CRYPTO_LRW is not set | 1605 | # |
| 1554 | # CONFIG_CRYPTO_XTS is not set | ||
| 1555 | # CONFIG_CRYPTO_CTR is not set | ||
| 1556 | # CONFIG_CRYPTO_GCM is not set | ||
| 1557 | # CONFIG_CRYPTO_CCM is not set | ||
| 1558 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1559 | CONFIG_CRYPTO_DES=y | ||
| 1560 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1561 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1562 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1563 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1564 | CONFIG_CRYPTO_SERPENT=m | ||
| 1565 | CONFIG_CRYPTO_AES=m | 1606 | CONFIG_CRYPTO_AES=m |
| 1607 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1608 | CONFIG_CRYPTO_ARC4=m | ||
| 1609 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1610 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1566 | # CONFIG_CRYPTO_CAST5 is not set | 1611 | # CONFIG_CRYPTO_CAST5 is not set |
| 1567 | # CONFIG_CRYPTO_CAST6 is not set | 1612 | # CONFIG_CRYPTO_CAST6 is not set |
| 1568 | # CONFIG_CRYPTO_TEA is not set | 1613 | CONFIG_CRYPTO_DES=y |
| 1569 | CONFIG_CRYPTO_ARC4=m | 1614 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1570 | # CONFIG_CRYPTO_KHAZAD is not set | 1615 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1571 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1572 | # CONFIG_CRYPTO_SEED is not set | ||
| 1573 | # CONFIG_CRYPTO_SALSA20 is not set | 1616 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1617 | # CONFIG_CRYPTO_SEED is not set | ||
| 1618 | CONFIG_CRYPTO_SERPENT=m | ||
| 1619 | # CONFIG_CRYPTO_TEA is not set | ||
| 1620 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1621 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1622 | |||
| 1623 | # | ||
| 1624 | # Compression | ||
| 1625 | # | ||
| 1574 | CONFIG_CRYPTO_DEFLATE=m | 1626 | CONFIG_CRYPTO_DEFLATE=m |
| 1575 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1576 | CONFIG_CRYPTO_CRC32C=m | ||
| 1577 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1578 | # CONFIG_CRYPTO_TEST is not set | ||
| 1579 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1580 | # CONFIG_CRYPTO_LZO is not set | 1627 | # CONFIG_CRYPTO_LZO is not set |
| 1581 | CONFIG_CRYPTO_HW=y | 1628 | CONFIG_CRYPTO_HW=y |
| 1582 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1629 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1583 | # CONFIG_PPC_CLOCK is not set | 1630 | # CONFIG_PPC_CLOCK is not set |
| 1631 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index a3d52e3f2ded..066c583c1f8a 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:11 2008 | 4 | # Mon Jun 9 08:52:11 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -209,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -235,6 +241,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 235 | CONFIG_PCI_LEGACY=y | 241 | CONFIG_PCI_LEGACY=y |
| 236 | # CONFIG_PCCARD is not set | 242 | # CONFIG_PCCARD is not set |
| 237 | # CONFIG_HOTPLUG_PCI is not set | 243 | # CONFIG_HOTPLUG_PCI is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 238 | 245 | ||
| 239 | # | 246 | # |
| 240 | # Advanced setup | 247 | # Advanced setup |
| @@ -244,11 +251,11 @@ CONFIG_PCI_LEGACY=y | |||
| 244 | # | 251 | # |
| 245 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 246 | # | 253 | # |
| 247 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 248 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 249 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 250 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 251 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 252 | 259 | ||
| 253 | # | 260 | # |
| 254 | # Networking | 261 | # Networking |
| @@ -296,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 296 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 297 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 298 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 299 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 300 | # CONFIG_INET6_TUNNEL is not set | ||
| 301 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 302 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 303 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -454,7 +459,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 454 | # CONFIG_SCSI_SRP is not set | 459 | # CONFIG_SCSI_SRP is not set |
| 455 | CONFIG_ATA=y | 460 | CONFIG_ATA=y |
| 456 | # CONFIG_ATA_NONSTANDARD is not set | 461 | # CONFIG_ATA_NONSTANDARD is not set |
| 462 | CONFIG_SATA_PMP=y | ||
| 457 | # CONFIG_SATA_AHCI is not set | 463 | # CONFIG_SATA_AHCI is not set |
| 464 | # CONFIG_SATA_SIL24 is not set | ||
| 465 | CONFIG_ATA_SFF=y | ||
| 458 | # CONFIG_SATA_SVW is not set | 466 | # CONFIG_SATA_SVW is not set |
| 459 | # CONFIG_ATA_PIIX is not set | 467 | # CONFIG_ATA_PIIX is not set |
| 460 | CONFIG_SATA_MV=y | 468 | CONFIG_SATA_MV=y |
| @@ -464,7 +472,6 @@ CONFIG_SATA_MV=y | |||
| 464 | # CONFIG_SATA_PROMISE is not set | 472 | # CONFIG_SATA_PROMISE is not set |
| 465 | # CONFIG_SATA_SX4 is not set | 473 | # CONFIG_SATA_SX4 is not set |
| 466 | # CONFIG_SATA_SIL is not set | 474 | # CONFIG_SATA_SIL is not set |
| 467 | # CONFIG_SATA_SIL24 is not set | ||
| 468 | # CONFIG_SATA_SIS is not set | 475 | # CONFIG_SATA_SIS is not set |
| 469 | # CONFIG_SATA_ULI is not set | 476 | # CONFIG_SATA_ULI is not set |
| 470 | # CONFIG_SATA_VIA is not set | 477 | # CONFIG_SATA_VIA is not set |
| @@ -509,6 +516,7 @@ CONFIG_SATA_MV=y | |||
| 509 | # CONFIG_PATA_VIA is not set | 516 | # CONFIG_PATA_VIA is not set |
| 510 | # CONFIG_PATA_WINBOND is not set | 517 | # CONFIG_PATA_WINBOND is not set |
| 511 | # CONFIG_PATA_PLATFORM is not set | 518 | # CONFIG_PATA_PLATFORM is not set |
| 519 | # CONFIG_PATA_SCH is not set | ||
| 512 | # CONFIG_MD is not set | 520 | # CONFIG_MD is not set |
| 513 | # CONFIG_FUSION is not set | 521 | # CONFIG_FUSION is not set |
| 514 | 522 | ||
| @@ -596,7 +604,6 @@ CONFIG_NETDEV_1000=y | |||
| 596 | # CONFIG_SIS190 is not set | 604 | # CONFIG_SIS190 is not set |
| 597 | # CONFIG_SKGE is not set | 605 | # CONFIG_SKGE is not set |
| 598 | # CONFIG_SKY2 is not set | 606 | # CONFIG_SKY2 is not set |
| 599 | # CONFIG_SK98LIN is not set | ||
| 600 | # CONFIG_VIA_VELOCITY is not set | 607 | # CONFIG_VIA_VELOCITY is not set |
| 601 | # CONFIG_TIGON3 is not set | 608 | # CONFIG_TIGON3 is not set |
| 602 | # CONFIG_BNX2 is not set | 609 | # CONFIG_BNX2 is not set |
| @@ -616,6 +623,7 @@ CONFIG_NETDEV_10000=y | |||
| 616 | # CONFIG_MLX4_CORE is not set | 623 | # CONFIG_MLX4_CORE is not set |
| 617 | # CONFIG_TEHUTI is not set | 624 | # CONFIG_TEHUTI is not set |
| 618 | # CONFIG_BNX2X is not set | 625 | # CONFIG_BNX2X is not set |
| 626 | # CONFIG_SFC is not set | ||
| 619 | # CONFIG_TR is not set | 627 | # CONFIG_TR is not set |
| 620 | 628 | ||
| 621 | # | 629 | # |
| @@ -623,6 +631,7 @@ CONFIG_NETDEV_10000=y | |||
| 623 | # | 631 | # |
| 624 | # CONFIG_WLAN_PRE80211 is not set | 632 | # CONFIG_WLAN_PRE80211 is not set |
| 625 | # CONFIG_WLAN_80211 is not set | 633 | # CONFIG_WLAN_80211 is not set |
| 634 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 626 | # CONFIG_WAN is not set | 635 | # CONFIG_WAN is not set |
| 627 | # CONFIG_FDDI is not set | 636 | # CONFIG_FDDI is not set |
| 628 | # CONFIG_HIPPI is not set | 637 | # CONFIG_HIPPI is not set |
| @@ -670,6 +679,7 @@ CONFIG_INPUT=y | |||
| 670 | # Character devices | 679 | # Character devices |
| 671 | # | 680 | # |
| 672 | # CONFIG_VT is not set | 681 | # CONFIG_VT is not set |
| 682 | CONFIG_DEVKMEM=y | ||
| 673 | # CONFIG_SERIAL_NONSTANDARD is not set | 683 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 674 | # CONFIG_NOZOMI is not set | 684 | # CONFIG_NOZOMI is not set |
| 675 | 685 | ||
| @@ -705,12 +715,7 @@ CONFIG_GEN_RTC=y | |||
| 705 | # CONFIG_TCG_TPM is not set | 715 | # CONFIG_TCG_TPM is not set |
| 706 | CONFIG_DEVPORT=y | 716 | CONFIG_DEVPORT=y |
| 707 | # CONFIG_I2C is not set | 717 | # CONFIG_I2C is not set |
| 708 | |||
| 709 | # | ||
| 710 | # SPI support | ||
| 711 | # | ||
| 712 | # CONFIG_SPI is not set | 718 | # CONFIG_SPI is not set |
| 713 | # CONFIG_SPI_MASTER is not set | ||
| 714 | # CONFIG_W1 is not set | 719 | # CONFIG_W1 is not set |
| 715 | # CONFIG_POWER_SUPPLY is not set | 720 | # CONFIG_POWER_SUPPLY is not set |
| 716 | CONFIG_HWMON=y | 721 | CONFIG_HWMON=y |
| @@ -743,12 +748,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 743 | # Multifunction device drivers | 748 | # Multifunction device drivers |
| 744 | # | 749 | # |
| 745 | # CONFIG_MFD_SM501 is not set | 750 | # CONFIG_MFD_SM501 is not set |
| 751 | # CONFIG_HTC_PASIC3 is not set | ||
| 746 | 752 | ||
| 747 | # | 753 | # |
| 748 | # Multimedia devices | 754 | # Multimedia devices |
| 749 | # | 755 | # |
| 756 | |||
| 757 | # | ||
| 758 | # Multimedia core support | ||
| 759 | # | ||
| 750 | # CONFIG_VIDEO_DEV is not set | 760 | # CONFIG_VIDEO_DEV is not set |
| 751 | # CONFIG_DVB_CORE is not set | 761 | # CONFIG_DVB_CORE is not set |
| 762 | # CONFIG_VIDEO_MEDIA is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # Multimedia drivers | ||
| 766 | # | ||
| 752 | CONFIG_DAB=y | 767 | CONFIG_DAB=y |
| 753 | 768 | ||
| 754 | # | 769 | # |
| @@ -779,6 +794,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 779 | CONFIG_USB_ARCH_HAS_OHCI=y | 794 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 780 | CONFIG_USB_ARCH_HAS_EHCI=y | 795 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 781 | # CONFIG_USB is not set | 796 | # CONFIG_USB is not set |
| 797 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 798 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 782 | 799 | ||
| 783 | # | 800 | # |
| 784 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 801 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -787,14 +804,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 787 | # CONFIG_MMC is not set | 804 | # CONFIG_MMC is not set |
| 788 | # CONFIG_MEMSTICK is not set | 805 | # CONFIG_MEMSTICK is not set |
| 789 | # CONFIG_NEW_LEDS is not set | 806 | # CONFIG_NEW_LEDS is not set |
| 807 | # CONFIG_ACCESSIBILITY is not set | ||
| 790 | # CONFIG_INFINIBAND is not set | 808 | # CONFIG_INFINIBAND is not set |
| 791 | # CONFIG_EDAC is not set | 809 | # CONFIG_EDAC is not set |
| 792 | # CONFIG_RTC_CLASS is not set | 810 | # CONFIG_RTC_CLASS is not set |
| 793 | # CONFIG_DMADEVICES is not set | 811 | # CONFIG_DMADEVICES is not set |
| 794 | |||
| 795 | # | ||
| 796 | # Userspace I/O | ||
| 797 | # | ||
| 798 | # CONFIG_UIO is not set | 812 | # CONFIG_UIO is not set |
| 799 | 813 | ||
| 800 | # | 814 | # |
| @@ -814,7 +828,6 @@ CONFIG_FS_MBCACHE=y | |||
| 814 | # CONFIG_JFS_FS is not set | 828 | # CONFIG_JFS_FS is not set |
| 815 | # CONFIG_FS_POSIX_ACL is not set | 829 | # CONFIG_FS_POSIX_ACL is not set |
| 816 | # CONFIG_XFS_FS is not set | 830 | # CONFIG_XFS_FS is not set |
| 817 | # CONFIG_GFS2_FS is not set | ||
| 818 | # CONFIG_OCFS2_FS is not set | 831 | # CONFIG_OCFS2_FS is not set |
| 819 | CONFIG_DNOTIFY=y | 832 | CONFIG_DNOTIFY=y |
| 820 | CONFIG_INOTIFY=y | 833 | CONFIG_INOTIFY=y |
| @@ -871,7 +884,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 871 | CONFIG_NFS_FS=y | 884 | CONFIG_NFS_FS=y |
| 872 | # CONFIG_NFS_V3 is not set | 885 | # CONFIG_NFS_V3 is not set |
| 873 | # CONFIG_NFS_V4 is not set | 886 | # CONFIG_NFS_V4 is not set |
| 874 | # CONFIG_NFS_DIRECTIO is not set | ||
| 875 | # CONFIG_NFSD is not set | 887 | # CONFIG_NFSD is not set |
| 876 | CONFIG_ROOT_NFS=y | 888 | CONFIG_ROOT_NFS=y |
| 877 | CONFIG_LOCKD=y | 889 | CONFIG_LOCKD=y |
| @@ -914,6 +926,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 914 | # Library routines | 926 | # Library routines |
| 915 | # | 927 | # |
| 916 | CONFIG_BITREVERSE=y | 928 | CONFIG_BITREVERSE=y |
| 929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 917 | # CONFIG_CRC_CCITT is not set | 930 | # CONFIG_CRC_CCITT is not set |
| 918 | # CONFIG_CRC16 is not set | 931 | # CONFIG_CRC16 is not set |
| 919 | # CONFIG_CRC_ITU_T is not set | 932 | # CONFIG_CRC_ITU_T is not set |
| @@ -924,6 +937,7 @@ CONFIG_PLIST=y | |||
| 924 | CONFIG_HAS_IOMEM=y | 937 | CONFIG_HAS_IOMEM=y |
| 925 | CONFIG_HAS_IOPORT=y | 938 | CONFIG_HAS_IOPORT=y |
| 926 | CONFIG_HAS_DMA=y | 939 | CONFIG_HAS_DMA=y |
| 940 | CONFIG_HAVE_LMB=y | ||
| 927 | 941 | ||
| 928 | # | 942 | # |
| 929 | # Kernel hacking | 943 | # Kernel hacking |
| @@ -931,6 +945,7 @@ CONFIG_HAS_DMA=y | |||
| 931 | # CONFIG_PRINTK_TIME is not set | 945 | # CONFIG_PRINTK_TIME is not set |
| 932 | CONFIG_ENABLE_WARN_DEPRECATED=y | 946 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 933 | CONFIG_ENABLE_MUST_CHECK=y | 947 | CONFIG_ENABLE_MUST_CHECK=y |
| 948 | CONFIG_FRAME_WARN=1024 | ||
| 934 | # CONFIG_MAGIC_SYSRQ is not set | 949 | # CONFIG_MAGIC_SYSRQ is not set |
| 935 | # CONFIG_UNUSED_SYMBOLS is not set | 950 | # CONFIG_UNUSED_SYMBOLS is not set |
| 936 | # CONFIG_DEBUG_FS is not set | 951 | # CONFIG_DEBUG_FS is not set |
| @@ -940,6 +955,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 940 | # CONFIG_SLUB_STATS is not set | 955 | # CONFIG_SLUB_STATS is not set |
| 941 | # CONFIG_DEBUG_BUGVERBOSE is not set | 956 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 942 | # CONFIG_SAMPLES is not set | 957 | # CONFIG_SAMPLES is not set |
| 958 | # CONFIG_IRQSTACKS is not set | ||
| 943 | # CONFIG_BOOTX_TEXT is not set | 959 | # CONFIG_BOOTX_TEXT is not set |
| 944 | # CONFIG_PPC_EARLY_DEBUG is not set | 960 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 945 | 961 | ||
| @@ -950,48 +966,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 950 | # CONFIG_SECURITY is not set | 966 | # CONFIG_SECURITY is not set |
| 951 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 967 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 952 | CONFIG_CRYPTO=y | 968 | CONFIG_CRYPTO=y |
| 953 | # CONFIG_CRYPTO_SEQIV is not set | 969 | |
| 970 | # | ||
| 971 | # Crypto core or helper | ||
| 972 | # | ||
| 954 | # CONFIG_CRYPTO_MANAGER is not set | 973 | # CONFIG_CRYPTO_MANAGER is not set |
| 974 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 975 | # CONFIG_CRYPTO_NULL is not set | ||
| 976 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 977 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 978 | |||
| 979 | # | ||
| 980 | # Authenticated Encryption with Associated Data | ||
| 981 | # | ||
| 982 | # CONFIG_CRYPTO_CCM is not set | ||
| 983 | # CONFIG_CRYPTO_GCM is not set | ||
| 984 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 985 | |||
| 986 | # | ||
| 987 | # Block modes | ||
| 988 | # | ||
| 989 | # CONFIG_CRYPTO_CBC is not set | ||
| 990 | # CONFIG_CRYPTO_CTR is not set | ||
| 991 | # CONFIG_CRYPTO_CTS is not set | ||
| 992 | # CONFIG_CRYPTO_ECB is not set | ||
| 993 | # CONFIG_CRYPTO_LRW is not set | ||
| 994 | # CONFIG_CRYPTO_PCBC is not set | ||
| 995 | # CONFIG_CRYPTO_XTS is not set | ||
| 996 | |||
| 997 | # | ||
| 998 | # Hash modes | ||
| 999 | # | ||
| 955 | # CONFIG_CRYPTO_HMAC is not set | 1000 | # CONFIG_CRYPTO_HMAC is not set |
| 956 | # CONFIG_CRYPTO_XCBC is not set | 1001 | # CONFIG_CRYPTO_XCBC is not set |
| 957 | # CONFIG_CRYPTO_NULL is not set | 1002 | |
| 1003 | # | ||
| 1004 | # Digest | ||
| 1005 | # | ||
| 1006 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 958 | # CONFIG_CRYPTO_MD4 is not set | 1007 | # CONFIG_CRYPTO_MD4 is not set |
| 959 | # CONFIG_CRYPTO_MD5 is not set | 1008 | # CONFIG_CRYPTO_MD5 is not set |
| 1009 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 960 | # CONFIG_CRYPTO_SHA1 is not set | 1010 | # CONFIG_CRYPTO_SHA1 is not set |
| 961 | # CONFIG_CRYPTO_SHA256 is not set | 1011 | # CONFIG_CRYPTO_SHA256 is not set |
| 962 | # CONFIG_CRYPTO_SHA512 is not set | 1012 | # CONFIG_CRYPTO_SHA512 is not set |
| 963 | # CONFIG_CRYPTO_WP512 is not set | ||
| 964 | # CONFIG_CRYPTO_TGR192 is not set | 1013 | # CONFIG_CRYPTO_TGR192 is not set |
| 965 | # CONFIG_CRYPTO_GF128MUL is not set | 1014 | # CONFIG_CRYPTO_WP512 is not set |
| 966 | # CONFIG_CRYPTO_ECB is not set | 1015 | |
| 967 | # CONFIG_CRYPTO_CBC is not set | 1016 | # |
| 968 | # CONFIG_CRYPTO_PCBC is not set | 1017 | # Ciphers |
| 969 | # CONFIG_CRYPTO_LRW is not set | 1018 | # |
| 970 | # CONFIG_CRYPTO_XTS is not set | ||
| 971 | # CONFIG_CRYPTO_CTR is not set | ||
| 972 | # CONFIG_CRYPTO_GCM is not set | ||
| 973 | # CONFIG_CRYPTO_CCM is not set | ||
| 974 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 975 | # CONFIG_CRYPTO_DES is not set | ||
| 976 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 977 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 978 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 979 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 980 | # CONFIG_CRYPTO_AES is not set | 1019 | # CONFIG_CRYPTO_AES is not set |
| 1020 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1021 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1022 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1023 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 981 | # CONFIG_CRYPTO_CAST5 is not set | 1024 | # CONFIG_CRYPTO_CAST5 is not set |
| 982 | # CONFIG_CRYPTO_CAST6 is not set | 1025 | # CONFIG_CRYPTO_CAST6 is not set |
| 983 | # CONFIG_CRYPTO_TEA is not set | 1026 | # CONFIG_CRYPTO_DES is not set |
| 984 | # CONFIG_CRYPTO_ARC4 is not set | 1027 | # CONFIG_CRYPTO_FCRYPT is not set |
| 985 | # CONFIG_CRYPTO_KHAZAD is not set | 1028 | # CONFIG_CRYPTO_KHAZAD is not set |
| 986 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 987 | # CONFIG_CRYPTO_SEED is not set | ||
| 988 | # CONFIG_CRYPTO_SALSA20 is not set | 1029 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1030 | # CONFIG_CRYPTO_SEED is not set | ||
| 1031 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1032 | # CONFIG_CRYPTO_TEA is not set | ||
| 1033 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1034 | |||
| 1035 | # | ||
| 1036 | # Compression | ||
| 1037 | # | ||
| 989 | # CONFIG_CRYPTO_DEFLATE is not set | 1038 | # CONFIG_CRYPTO_DEFLATE is not set |
| 990 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 991 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 992 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 993 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 994 | # CONFIG_CRYPTO_LZO is not set | 1039 | # CONFIG_CRYPTO_LZO is not set |
| 995 | CONFIG_CRYPTO_HW=y | 1040 | CONFIG_CRYPTO_HW=y |
| 996 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1041 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 997 | # CONFIG_PPC_CLOCK is not set | 1042 | # CONFIG_PPC_CLOCK is not set |
| 1043 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 0264c5757f78..30d7834b7db1 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:13 2008 | 4 | # Mon Jun 9 08:52:12 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,18 +72,16 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | # CONFIG_BLK_DEV_INITRD is not set | 79 | # CONFIG_BLK_DEV_INITRD is not set |
| 80 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 82 | CONFIG_SYSCTL=y | 81 | CONFIG_SYSCTL=y |
| 83 | CONFIG_EMBEDDED=y | 82 | CONFIG_EMBEDDED=y |
| 84 | CONFIG_SYSCTL_SYSCALL=y | 83 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 85 | CONFIG_KALLSYMS=y | 85 | CONFIG_KALLSYMS=y |
| 86 | CONFIG_KALLSYMS_ALL=y | 86 | CONFIG_KALLSYMS_ALL=y |
| 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -108,6 +108,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 108 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 109 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 110 | CONFIG_HAVE_KRETPROBES=y |
| 111 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 112 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 113 | CONFIG_SLABINFO=y |
| 113 | CONFIG_RT_MUTEXES=y | 114 | CONFIG_RT_MUTEXES=y |
| @@ -196,11 +197,13 @@ CONFIG_FLATMEM=y | |||
| 196 | CONFIG_FLAT_NODE_MEM_MAP=y | 197 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 197 | # CONFIG_SPARSEMEM_STATIC is not set | 198 | # CONFIG_SPARSEMEM_STATIC is not set |
| 198 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 200 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 200 | # CONFIG_RESOURCES_64BIT is not set | 202 | # CONFIG_RESOURCES_64BIT is not set |
| 201 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
| 202 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
| 203 | CONFIG_VIRT_TO_BUS=y | 205 | CONFIG_VIRT_TO_BUS=y |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 204 | CONFIG_PROC_DEVICETREE=y | 207 | CONFIG_PROC_DEVICETREE=y |
| 205 | # CONFIG_CMDLINE_BOOL is not set | 208 | # CONFIG_CMDLINE_BOOL is not set |
| 206 | # CONFIG_PM is not set | 209 | # CONFIG_PM is not set |
| @@ -224,6 +227,7 @@ CONFIG_PCI_LEGACY=y | |||
| 224 | # CONFIG_PCI_DEBUG is not set | 227 | # CONFIG_PCI_DEBUG is not set |
| 225 | # CONFIG_PCCARD is not set | 228 | # CONFIG_PCCARD is not set |
| 226 | # CONFIG_HOTPLUG_PCI is not set | 229 | # CONFIG_HOTPLUG_PCI is not set |
| 230 | # CONFIG_HAS_RAPIDIO is not set | ||
| 227 | 231 | ||
| 228 | # | 232 | # |
| 229 | # Advanced setup | 233 | # Advanced setup |
| @@ -233,11 +237,11 @@ CONFIG_PCI_LEGACY=y | |||
| 233 | # | 237 | # |
| 234 | # Default settings for advanced configuration options are used | 238 | # Default settings for advanced configuration options are used |
| 235 | # | 239 | # |
| 236 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 237 | CONFIG_LOWMEM_SIZE=0x30000000 | 240 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 241 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 238 | CONFIG_KERNEL_START=0xc0000000 | 242 | CONFIG_KERNEL_START=0xc0000000 |
| 243 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 239 | CONFIG_TASK_SIZE=0xc0000000 | 244 | CONFIG_TASK_SIZE=0xc0000000 |
| 240 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 241 | 245 | ||
| 242 | # | 246 | # |
| 243 | # Networking | 247 | # Networking |
| @@ -292,6 +296,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 292 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 296 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 293 | CONFIG_INET6_XFRM_MODE_BEET=y | 297 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 294 | CONFIG_IPV6_SIT=y | 298 | CONFIG_IPV6_SIT=y |
| 299 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 295 | # CONFIG_IPV6_TUNNEL is not set | 300 | # CONFIG_IPV6_TUNNEL is not set |
| 296 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 297 | CONFIG_NETFILTER=y | 302 | CONFIG_NETFILTER=y |
| @@ -536,7 +541,6 @@ CONFIG_NETDEV_1000=y | |||
| 536 | # CONFIG_SIS190 is not set | 541 | # CONFIG_SIS190 is not set |
| 537 | # CONFIG_SKGE is not set | 542 | # CONFIG_SKGE is not set |
| 538 | # CONFIG_SKY2 is not set | 543 | # CONFIG_SKY2 is not set |
| 539 | # CONFIG_SK98LIN is not set | ||
| 540 | # CONFIG_VIA_VELOCITY is not set | 544 | # CONFIG_VIA_VELOCITY is not set |
| 541 | # CONFIG_TIGON3 is not set | 545 | # CONFIG_TIGON3 is not set |
| 542 | # CONFIG_BNX2 is not set | 546 | # CONFIG_BNX2 is not set |
| @@ -554,6 +558,7 @@ CONFIG_NETDEV_10000=y | |||
| 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_SFC is not set | ||
| 557 | # CONFIG_TR is not set | 562 | # CONFIG_TR is not set |
| 558 | 563 | ||
| 559 | # | 564 | # |
| @@ -561,6 +566,7 @@ CONFIG_NETDEV_10000=y | |||
| 561 | # | 566 | # |
| 562 | # CONFIG_WLAN_PRE80211 is not set | 567 | # CONFIG_WLAN_PRE80211 is not set |
| 563 | # CONFIG_WLAN_80211 is not set | 568 | # CONFIG_WLAN_80211 is not set |
| 569 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 564 | # CONFIG_WAN is not set | 570 | # CONFIG_WAN is not set |
| 565 | # CONFIG_FDDI is not set | 571 | # CONFIG_FDDI is not set |
| 566 | CONFIG_PPP=y | 572 | CONFIG_PPP=y |
| @@ -634,6 +640,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 634 | # Character devices | 640 | # Character devices |
| 635 | # | 641 | # |
| 636 | # CONFIG_VT is not set | 642 | # CONFIG_VT is not set |
| 643 | CONFIG_DEVKMEM=y | ||
| 637 | # CONFIG_SERIAL_NONSTANDARD is not set | 644 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 638 | 645 | ||
| 639 | # | 646 | # |
| @@ -668,12 +675,7 @@ CONFIG_HW_RANDOM=y | |||
| 668 | # CONFIG_RAW_DRIVER is not set | 675 | # CONFIG_RAW_DRIVER is not set |
| 669 | CONFIG_DEVPORT=y | 676 | CONFIG_DEVPORT=y |
| 670 | # CONFIG_I2C is not set | 677 | # CONFIG_I2C is not set |
| 671 | |||
| 672 | # | ||
| 673 | # SPI support | ||
| 674 | # | ||
| 675 | # CONFIG_SPI is not set | 678 | # CONFIG_SPI is not set |
| 676 | # CONFIG_SPI_MASTER is not set | ||
| 677 | # CONFIG_W1 is not set | 679 | # CONFIG_W1 is not set |
| 678 | # CONFIG_POWER_SUPPLY is not set | 680 | # CONFIG_POWER_SUPPLY is not set |
| 679 | # CONFIG_HWMON is not set | 681 | # CONFIG_HWMON is not set |
| @@ -690,12 +692,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 690 | # Multifunction device drivers | 692 | # Multifunction device drivers |
| 691 | # | 693 | # |
| 692 | # CONFIG_MFD_SM501 is not set | 694 | # CONFIG_MFD_SM501 is not set |
| 695 | # CONFIG_HTC_PASIC3 is not set | ||
| 693 | 696 | ||
| 694 | # | 697 | # |
| 695 | # Multimedia devices | 698 | # Multimedia devices |
| 696 | # | 699 | # |
| 700 | |||
| 701 | # | ||
| 702 | # Multimedia core support | ||
| 703 | # | ||
| 697 | # CONFIG_VIDEO_DEV is not set | 704 | # CONFIG_VIDEO_DEV is not set |
| 698 | # CONFIG_DVB_CORE is not set | 705 | # CONFIG_DVB_CORE is not set |
| 706 | # CONFIG_VIDEO_MEDIA is not set | ||
| 707 | |||
| 708 | # | ||
| 709 | # Multimedia drivers | ||
| 710 | # | ||
| 699 | CONFIG_DAB=y | 711 | CONFIG_DAB=y |
| 700 | 712 | ||
| 701 | # | 713 | # |
| @@ -722,13 +734,10 @@ CONFIG_DAB=y | |||
| 722 | # CONFIG_MMC is not set | 734 | # CONFIG_MMC is not set |
| 723 | # CONFIG_MEMSTICK is not set | 735 | # CONFIG_MEMSTICK is not set |
| 724 | # CONFIG_NEW_LEDS is not set | 736 | # CONFIG_NEW_LEDS is not set |
| 737 | # CONFIG_ACCESSIBILITY is not set | ||
| 725 | # CONFIG_INFINIBAND is not set | 738 | # CONFIG_INFINIBAND is not set |
| 726 | # CONFIG_RTC_CLASS is not set | 739 | # CONFIG_RTC_CLASS is not set |
| 727 | # CONFIG_DMADEVICES is not set | 740 | # CONFIG_DMADEVICES is not set |
| 728 | |||
| 729 | # | ||
| 730 | # Userspace I/O | ||
| 731 | # | ||
| 732 | # CONFIG_UIO is not set | 741 | # CONFIG_UIO is not set |
| 733 | 742 | ||
| 734 | # | 743 | # |
| @@ -798,7 +807,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 798 | CONFIG_NFS_FS=y | 807 | CONFIG_NFS_FS=y |
| 799 | CONFIG_NFS_V3=y | 808 | CONFIG_NFS_V3=y |
| 800 | CONFIG_NFS_V3_ACL=y | 809 | CONFIG_NFS_V3_ACL=y |
| 801 | # CONFIG_NFS_DIRECTIO is not set | ||
| 802 | # CONFIG_NFSD is not set | 810 | # CONFIG_NFSD is not set |
| 803 | CONFIG_ROOT_NFS=y | 811 | CONFIG_ROOT_NFS=y |
| 804 | CONFIG_LOCKD=y | 812 | CONFIG_LOCKD=y |
| @@ -877,6 +885,7 @@ CONFIG_NLS_UTF8=y | |||
| 877 | # Library routines | 885 | # Library routines |
| 878 | # | 886 | # |
| 879 | CONFIG_BITREVERSE=y | 887 | CONFIG_BITREVERSE=y |
| 888 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 880 | CONFIG_CRC_CCITT=y | 889 | CONFIG_CRC_CCITT=y |
| 881 | # CONFIG_CRC16 is not set | 890 | # CONFIG_CRC16 is not set |
| 882 | # CONFIG_CRC_ITU_T is not set | 891 | # CONFIG_CRC_ITU_T is not set |
| @@ -889,6 +898,7 @@ CONFIG_PLIST=y | |||
| 889 | CONFIG_HAS_IOMEM=y | 898 | CONFIG_HAS_IOMEM=y |
| 890 | CONFIG_HAS_IOPORT=y | 899 | CONFIG_HAS_IOPORT=y |
| 891 | CONFIG_HAS_DMA=y | 900 | CONFIG_HAS_DMA=y |
| 901 | CONFIG_HAVE_LMB=y | ||
| 892 | 902 | ||
| 893 | # | 903 | # |
| 894 | # Kernel hacking | 904 | # Kernel hacking |
| @@ -896,6 +906,7 @@ CONFIG_HAS_DMA=y | |||
| 896 | # CONFIG_PRINTK_TIME is not set | 906 | # CONFIG_PRINTK_TIME is not set |
| 897 | CONFIG_ENABLE_WARN_DEPRECATED=y | 907 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 898 | CONFIG_ENABLE_MUST_CHECK=y | 908 | CONFIG_ENABLE_MUST_CHECK=y |
| 909 | CONFIG_FRAME_WARN=1024 | ||
| 899 | CONFIG_MAGIC_SYSRQ=y | 910 | CONFIG_MAGIC_SYSRQ=y |
| 900 | # CONFIG_UNUSED_SYMBOLS is not set | 911 | # CONFIG_UNUSED_SYMBOLS is not set |
| 901 | # CONFIG_DEBUG_FS is not set | 912 | # CONFIG_DEBUG_FS is not set |
| @@ -906,6 +917,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 906 | CONFIG_SCHED_DEBUG=y | 917 | CONFIG_SCHED_DEBUG=y |
| 907 | # CONFIG_SCHEDSTATS is not set | 918 | # CONFIG_SCHEDSTATS is not set |
| 908 | # CONFIG_TIMER_STATS is not set | 919 | # CONFIG_TIMER_STATS is not set |
| 920 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 909 | # CONFIG_SLUB_DEBUG_ON is not set | 921 | # CONFIG_SLUB_DEBUG_ON is not set |
| 910 | # CONFIG_SLUB_STATS is not set | 922 | # CONFIG_SLUB_STATS is not set |
| 911 | # CONFIG_DEBUG_RT_MUTEXES is not set | 923 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -918,6 +930,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 918 | CONFIG_DEBUG_BUGVERBOSE=y | 930 | CONFIG_DEBUG_BUGVERBOSE=y |
| 919 | CONFIG_DEBUG_INFO=y | 931 | CONFIG_DEBUG_INFO=y |
| 920 | # CONFIG_DEBUG_VM is not set | 932 | # CONFIG_DEBUG_VM is not set |
| 933 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 921 | # CONFIG_DEBUG_LIST is not set | 934 | # CONFIG_DEBUG_LIST is not set |
| 922 | # CONFIG_DEBUG_SG is not set | 935 | # CONFIG_DEBUG_SG is not set |
| 923 | # CONFIG_BOOT_PRINTK_DELAY is not set | 936 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -929,6 +942,7 @@ CONFIG_DEBUG_INFO=y | |||
| 929 | # CONFIG_DEBUG_PAGEALLOC is not set | 942 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 930 | # CONFIG_DEBUGGER is not set | 943 | # CONFIG_DEBUGGER is not set |
| 931 | # CONFIG_KGDB_CONSOLE is not set | 944 | # CONFIG_KGDB_CONSOLE is not set |
| 945 | # CONFIG_IRQSTACKS is not set | ||
| 932 | CONFIG_BDI_SWITCH=y | 946 | CONFIG_BDI_SWITCH=y |
| 933 | # CONFIG_PPC_EARLY_DEBUG is not set | 947 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 934 | 948 | ||
| @@ -938,45 +952,75 @@ CONFIG_BDI_SWITCH=y | |||
| 938 | # CONFIG_KEYS is not set | 952 | # CONFIG_KEYS is not set |
| 939 | # CONFIG_SECURITY is not set | 953 | # CONFIG_SECURITY is not set |
| 940 | CONFIG_CRYPTO=y | 954 | CONFIG_CRYPTO=y |
| 955 | |||
| 956 | # | ||
| 957 | # Crypto core or helper | ||
| 958 | # | ||
| 941 | CONFIG_CRYPTO_ALGAPI=y | 959 | CONFIG_CRYPTO_ALGAPI=y |
| 942 | CONFIG_CRYPTO_BLKCIPHER=y | 960 | CONFIG_CRYPTO_BLKCIPHER=y |
| 943 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 944 | CONFIG_CRYPTO_MANAGER=y | 961 | CONFIG_CRYPTO_MANAGER=y |
| 945 | # CONFIG_CRYPTO_HMAC is not set | ||
| 946 | # CONFIG_CRYPTO_NULL is not set | 962 | # CONFIG_CRYPTO_NULL is not set |
| 963 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 964 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 965 | |||
| 966 | # | ||
| 967 | # Authenticated Encryption with Associated Data | ||
| 968 | # | ||
| 969 | # CONFIG_CRYPTO_CCM is not set | ||
| 970 | # CONFIG_CRYPTO_GCM is not set | ||
| 971 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 972 | |||
| 973 | # | ||
| 974 | # Block modes | ||
| 975 | # | ||
| 976 | CONFIG_CRYPTO_CBC=y | ||
| 977 | # CONFIG_CRYPTO_CTR is not set | ||
| 978 | # CONFIG_CRYPTO_CTS is not set | ||
| 979 | CONFIG_CRYPTO_ECB=y | ||
| 980 | CONFIG_CRYPTO_PCBC=y | ||
| 981 | |||
| 982 | # | ||
| 983 | # Hash modes | ||
| 984 | # | ||
| 985 | # CONFIG_CRYPTO_HMAC is not set | ||
| 986 | |||
| 987 | # | ||
| 988 | # Digest | ||
| 989 | # | ||
| 990 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 947 | # CONFIG_CRYPTO_MD4 is not set | 991 | # CONFIG_CRYPTO_MD4 is not set |
| 948 | CONFIG_CRYPTO_MD5=y | 992 | CONFIG_CRYPTO_MD5=y |
| 993 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 949 | # CONFIG_CRYPTO_SHA1 is not set | 994 | # CONFIG_CRYPTO_SHA1 is not set |
| 950 | # CONFIG_CRYPTO_SHA256 is not set | 995 | # CONFIG_CRYPTO_SHA256 is not set |
| 951 | # CONFIG_CRYPTO_SHA512 is not set | 996 | # CONFIG_CRYPTO_SHA512 is not set |
| 952 | # CONFIG_CRYPTO_WP512 is not set | ||
| 953 | # CONFIG_CRYPTO_TGR192 is not set | 997 | # CONFIG_CRYPTO_TGR192 is not set |
| 954 | CONFIG_CRYPTO_ECB=y | 998 | # CONFIG_CRYPTO_WP512 is not set |
| 955 | CONFIG_CRYPTO_CBC=y | 999 | |
| 956 | CONFIG_CRYPTO_PCBC=y | 1000 | # |
| 957 | # CONFIG_CRYPTO_CTR is not set | 1001 | # Ciphers |
| 958 | # CONFIG_CRYPTO_GCM is not set | 1002 | # |
| 959 | # CONFIG_CRYPTO_CCM is not set | ||
| 960 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 961 | CONFIG_CRYPTO_DES=y | ||
| 962 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 963 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 964 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 965 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 966 | # CONFIG_CRYPTO_AES is not set | 1003 | # CONFIG_CRYPTO_AES is not set |
| 1004 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1005 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1006 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1007 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 967 | # CONFIG_CRYPTO_CAST5 is not set | 1008 | # CONFIG_CRYPTO_CAST5 is not set |
| 968 | # CONFIG_CRYPTO_CAST6 is not set | 1009 | # CONFIG_CRYPTO_CAST6 is not set |
| 969 | # CONFIG_CRYPTO_TEA is not set | 1010 | CONFIG_CRYPTO_DES=y |
| 970 | # CONFIG_CRYPTO_ARC4 is not set | 1011 | # CONFIG_CRYPTO_FCRYPT is not set |
| 971 | # CONFIG_CRYPTO_KHAZAD is not set | 1012 | # CONFIG_CRYPTO_KHAZAD is not set |
| 972 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 973 | # CONFIG_CRYPTO_SEED is not set | 1013 | # CONFIG_CRYPTO_SEED is not set |
| 1014 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1015 | # CONFIG_CRYPTO_TEA is not set | ||
| 1016 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1017 | |||
| 1018 | # | ||
| 1019 | # Compression | ||
| 1020 | # | ||
| 974 | # CONFIG_CRYPTO_DEFLATE is not set | 1021 | # CONFIG_CRYPTO_DEFLATE is not set |
| 975 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 976 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 977 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 978 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 979 | # CONFIG_CRYPTO_LZO is not set | 1022 | # CONFIG_CRYPTO_LZO is not set |
| 980 | # CONFIG_CRYPTO_HW is not set | 1023 | # CONFIG_CRYPTO_HW is not set |
| 981 | # CONFIG_PPC_CLOCK is not set | 1024 | # CONFIG_PPC_CLOCK is not set |
| 982 | CONFIG_PPC_LIB_RHEAP=y | 1025 | CONFIG_PPC_LIB_RHEAP=y |
| 1026 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 9e0dd8201691..4293c8be06e1 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc9 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Tue Apr 15 18:07:36 2008 | 4 | # Mon Jun 9 08:52:14 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -201,7 +206,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 201 | # CONFIG_PREEMPT is not set | 206 | # CONFIG_PREEMPT is not set |
| 202 | CONFIG_BINFMT_ELF=y | 207 | CONFIG_BINFMT_ELF=y |
| 203 | # CONFIG_BINFMT_MISC is not set | 208 | # CONFIG_BINFMT_MISC is not set |
| 204 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 205 | CONFIG_MATH_EMULATION=y | 209 | CONFIG_MATH_EMULATION=y |
| 206 | # CONFIG_IOMMU_HELPER is not set | 210 | # CONFIG_IOMMU_HELPER is not set |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 211 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -217,11 +221,13 @@ CONFIG_FLATMEM=y | |||
| 217 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 218 | # CONFIG_SPARSEMEM_STATIC is not set | 222 | # CONFIG_SPARSEMEM_STATIC is not set |
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 224 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 225 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 227 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| @@ -240,6 +246,7 @@ CONFIG_FSL_SOC=y | |||
| 240 | # CONFIG_PCI_SYSCALL is not set | 246 | # CONFIG_PCI_SYSCALL is not set |
| 241 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 242 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 243 | 250 | ||
| 244 | # | 251 | # |
| 245 | # Advanced setup | 252 | # Advanced setup |
| @@ -249,11 +256,11 @@ CONFIG_FSL_SOC=y | |||
| 249 | # | 256 | # |
| 250 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 251 | # | 258 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 264 | ||
| 258 | # | 265 | # |
| 259 | # Networking | 266 | # Networking |
| @@ -301,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 301 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 302 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 303 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 305 | # CONFIG_INET6_TUNNEL is not set | ||
| 306 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 307 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 308 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -361,6 +366,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 366 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 362 | # CONFIG_MTD_CMDLINE_PARTS is not set | 367 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 363 | CONFIG_MTD_OF_PARTS=y | 368 | CONFIG_MTD_OF_PARTS=y |
| 369 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 364 | 370 | ||
| 365 | # | 371 | # |
| 366 | # User Modules And Translation Layers | 372 | # User Modules And Translation Layers |
| @@ -439,6 +445,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 439 | # | 445 | # |
| 440 | # CONFIG_MTD_UBI is not set | 446 | # CONFIG_MTD_UBI is not set |
| 441 | CONFIG_OF_DEVICE=y | 447 | CONFIG_OF_DEVICE=y |
| 448 | CONFIG_OF_I2C=y | ||
| 442 | # CONFIG_PARPORT is not set | 449 | # CONFIG_PARPORT is not set |
| 443 | CONFIG_BLK_DEV=y | 450 | CONFIG_BLK_DEV=y |
| 444 | # CONFIG_BLK_DEV_FD is not set | 451 | # CONFIG_BLK_DEV_FD is not set |
| @@ -501,8 +508,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 501 | # CONFIG_SCSI_DEBUG is not set | 508 | # CONFIG_SCSI_DEBUG is not set |
| 502 | CONFIG_ATA=y | 509 | CONFIG_ATA=y |
| 503 | # CONFIG_ATA_NONSTANDARD is not set | 510 | # CONFIG_ATA_NONSTANDARD is not set |
| 504 | # CONFIG_SATA_MV is not set | 511 | CONFIG_SATA_PMP=y |
| 505 | CONFIG_SATA_FSL=y | 512 | CONFIG_SATA_FSL=y |
| 513 | CONFIG_ATA_SFF=y | ||
| 514 | # CONFIG_SATA_MV is not set | ||
| 506 | # CONFIG_PATA_PLATFORM is not set | 515 | # CONFIG_PATA_PLATFORM is not set |
| 507 | # CONFIG_MD is not set | 516 | # CONFIG_MD is not set |
| 508 | # CONFIG_MACINTOSH_DRIVERS is not set | 517 | # CONFIG_MACINTOSH_DRIVERS is not set |
| @@ -554,6 +563,7 @@ CONFIG_NETDEV_10000=y | |||
| 554 | # | 563 | # |
| 555 | # CONFIG_WLAN_PRE80211 is not set | 564 | # CONFIG_WLAN_PRE80211 is not set |
| 556 | # CONFIG_WLAN_80211 is not set | 565 | # CONFIG_WLAN_80211 is not set |
| 566 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 557 | 567 | ||
| 558 | # | 568 | # |
| 559 | # USB Network Adapters | 569 | # USB Network Adapters |
| @@ -607,6 +617,7 @@ CONFIG_INPUT=y | |||
| 607 | # Character devices | 617 | # Character devices |
| 608 | # | 618 | # |
| 609 | # CONFIG_VT is not set | 619 | # CONFIG_VT is not set |
| 620 | CONFIG_DEVKMEM=y | ||
| 610 | # CONFIG_SERIAL_NONSTANDARD is not set | 621 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 611 | 622 | ||
| 612 | # | 623 | # |
| @@ -642,13 +653,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 642 | CONFIG_I2C_CHARDEV=y | 653 | CONFIG_I2C_CHARDEV=y |
| 643 | 654 | ||
| 644 | # | 655 | # |
| 645 | # I2C Algorithms | ||
| 646 | # | ||
| 647 | # CONFIG_I2C_ALGOBIT is not set | ||
| 648 | # CONFIG_I2C_ALGOPCF is not set | ||
| 649 | # CONFIG_I2C_ALGOPCA is not set | ||
| 650 | |||
| 651 | # | ||
| 652 | # I2C Hardware Bus support | 656 | # I2C Hardware Bus support |
| 653 | # | 657 | # |
| 654 | CONFIG_I2C_MPC=y | 658 | CONFIG_I2C_MPC=y |
| @@ -658,6 +662,7 @@ CONFIG_I2C_MPC=y | |||
| 658 | # CONFIG_I2C_TAOS_EVM is not set | 662 | # CONFIG_I2C_TAOS_EVM is not set |
| 659 | # CONFIG_I2C_STUB is not set | 663 | # CONFIG_I2C_STUB is not set |
| 660 | # CONFIG_I2C_TINY_USB is not set | 664 | # CONFIG_I2C_TINY_USB is not set |
| 665 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 661 | 666 | ||
| 662 | # | 667 | # |
| 663 | # Miscellaneous I2C Chip support | 668 | # Miscellaneous I2C Chip support |
| @@ -667,19 +672,13 @@ CONFIG_I2C_MPC=y | |||
| 667 | # CONFIG_SENSORS_PCF8574 is not set | 672 | # CONFIG_SENSORS_PCF8574 is not set |
| 668 | # CONFIG_PCF8575 is not set | 673 | # CONFIG_PCF8575 is not set |
| 669 | # CONFIG_SENSORS_PCF8591 is not set | 674 | # CONFIG_SENSORS_PCF8591 is not set |
| 670 | # CONFIG_TPS65010 is not set | ||
| 671 | # CONFIG_SENSORS_MAX6875 is not set | 675 | # CONFIG_SENSORS_MAX6875 is not set |
| 672 | # CONFIG_SENSORS_TSL2550 is not set | 676 | # CONFIG_SENSORS_TSL2550 is not set |
| 673 | # CONFIG_I2C_DEBUG_CORE is not set | 677 | # CONFIG_I2C_DEBUG_CORE is not set |
| 674 | # CONFIG_I2C_DEBUG_ALGO is not set | 678 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 675 | # CONFIG_I2C_DEBUG_BUS is not set | 679 | # CONFIG_I2C_DEBUG_BUS is not set |
| 676 | # CONFIG_I2C_DEBUG_CHIP is not set | 680 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 677 | |||
| 678 | # | ||
| 679 | # SPI support | ||
| 680 | # | ||
| 681 | # CONFIG_SPI is not set | 681 | # CONFIG_SPI is not set |
| 682 | # CONFIG_SPI_MASTER is not set | ||
| 683 | # CONFIG_W1 is not set | 682 | # CONFIG_W1 is not set |
| 684 | # CONFIG_POWER_SUPPLY is not set | 683 | # CONFIG_POWER_SUPPLY is not set |
| 685 | CONFIG_HWMON=y | 684 | CONFIG_HWMON=y |
| @@ -757,12 +756,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 757 | # Multifunction device drivers | 756 | # Multifunction device drivers |
| 758 | # | 757 | # |
| 759 | # CONFIG_MFD_SM501 is not set | 758 | # CONFIG_MFD_SM501 is not set |
| 759 | # CONFIG_HTC_PASIC3 is not set | ||
| 760 | 760 | ||
| 761 | # | 761 | # |
| 762 | # Multimedia devices | 762 | # Multimedia devices |
| 763 | # | 763 | # |
| 764 | |||
| 765 | # | ||
| 766 | # Multimedia core support | ||
| 767 | # | ||
| 764 | # CONFIG_VIDEO_DEV is not set | 768 | # CONFIG_VIDEO_DEV is not set |
| 765 | # CONFIG_DVB_CORE is not set | 769 | # CONFIG_DVB_CORE is not set |
| 770 | # CONFIG_VIDEO_MEDIA is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # Multimedia drivers | ||
| 774 | # | ||
| 766 | CONFIG_DAB=y | 775 | CONFIG_DAB=y |
| 767 | # CONFIG_USB_DABUSB is not set | 776 | # CONFIG_USB_DABUSB is not set |
| 768 | 777 | ||
| @@ -810,16 +819,20 @@ CONFIG_USB=y | |||
| 810 | CONFIG_USB_DEVICE_CLASS=y | 819 | CONFIG_USB_DEVICE_CLASS=y |
| 811 | # CONFIG_USB_DYNAMIC_MINORS is not set | 820 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 812 | # CONFIG_USB_OTG is not set | 821 | # CONFIG_USB_OTG is not set |
| 822 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 823 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 813 | 824 | ||
| 814 | # | 825 | # |
| 815 | # USB Host Controller Drivers | 826 | # USB Host Controller Drivers |
| 816 | # | 827 | # |
| 828 | # CONFIG_USB_C67X00_HCD is not set | ||
| 817 | CONFIG_USB_EHCI_HCD=y | 829 | CONFIG_USB_EHCI_HCD=y |
| 818 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 830 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 819 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 831 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 820 | CONFIG_USB_EHCI_FSL=y | 832 | CONFIG_USB_EHCI_FSL=y |
| 821 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 833 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 822 | # CONFIG_USB_ISP116X_HCD is not set | 834 | # CONFIG_USB_ISP116X_HCD is not set |
| 835 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 823 | # CONFIG_USB_SL811_HCD is not set | 836 | # CONFIG_USB_SL811_HCD is not set |
| 824 | # CONFIG_USB_R8A66597_HCD is not set | 837 | # CONFIG_USB_R8A66597_HCD is not set |
| 825 | 838 | ||
| @@ -828,6 +841,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 828 | # | 841 | # |
| 829 | # CONFIG_USB_ACM is not set | 842 | # CONFIG_USB_ACM is not set |
| 830 | # CONFIG_USB_PRINTER is not set | 843 | # CONFIG_USB_PRINTER is not set |
| 844 | # CONFIG_USB_WDM is not set | ||
| 831 | 845 | ||
| 832 | # | 846 | # |
| 833 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 847 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -873,17 +887,15 @@ CONFIG_USB_MON=y | |||
| 873 | # CONFIG_USB_LD is not set | 887 | # CONFIG_USB_LD is not set |
| 874 | # CONFIG_USB_TRANCEVIBRATOR is not set | 888 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 875 | # CONFIG_USB_IOWARRIOR is not set | 889 | # CONFIG_USB_IOWARRIOR is not set |
| 890 | # CONFIG_USB_ISIGHTFW is not set | ||
| 876 | # CONFIG_USB_GADGET is not set | 891 | # CONFIG_USB_GADGET is not set |
| 877 | # CONFIG_MMC is not set | 892 | # CONFIG_MMC is not set |
| 878 | # CONFIG_MEMSTICK is not set | 893 | # CONFIG_MEMSTICK is not set |
| 879 | # CONFIG_NEW_LEDS is not set | 894 | # CONFIG_NEW_LEDS is not set |
| 895 | # CONFIG_ACCESSIBILITY is not set | ||
| 880 | # CONFIG_EDAC is not set | 896 | # CONFIG_EDAC is not set |
| 881 | # CONFIG_RTC_CLASS is not set | 897 | # CONFIG_RTC_CLASS is not set |
| 882 | # CONFIG_DMADEVICES is not set | 898 | # CONFIG_DMADEVICES is not set |
| 883 | |||
| 884 | # | ||
| 885 | # Userspace I/O | ||
| 886 | # | ||
| 887 | # CONFIG_UIO is not set | 899 | # CONFIG_UIO is not set |
| 888 | 900 | ||
| 889 | # | 901 | # |
| @@ -903,7 +915,6 @@ CONFIG_FS_MBCACHE=y | |||
| 903 | # CONFIG_JFS_FS is not set | 915 | # CONFIG_JFS_FS is not set |
| 904 | # CONFIG_FS_POSIX_ACL is not set | 916 | # CONFIG_FS_POSIX_ACL is not set |
| 905 | # CONFIG_XFS_FS is not set | 917 | # CONFIG_XFS_FS is not set |
| 906 | # CONFIG_GFS2_FS is not set | ||
| 907 | # CONFIG_OCFS2_FS is not set | 918 | # CONFIG_OCFS2_FS is not set |
| 908 | CONFIG_DNOTIFY=y | 919 | CONFIG_DNOTIFY=y |
| 909 | CONFIG_INOTIFY=y | 920 | CONFIG_INOTIFY=y |
| @@ -962,7 +973,6 @@ CONFIG_NFS_FS=y | |||
| 962 | CONFIG_NFS_V3=y | 973 | CONFIG_NFS_V3=y |
| 963 | # CONFIG_NFS_V3_ACL is not set | 974 | # CONFIG_NFS_V3_ACL is not set |
| 964 | CONFIG_NFS_V4=y | 975 | CONFIG_NFS_V4=y |
| 965 | # CONFIG_NFS_DIRECTIO is not set | ||
| 966 | # CONFIG_NFSD is not set | 976 | # CONFIG_NFSD is not set |
| 967 | CONFIG_ROOT_NFS=y | 977 | CONFIG_ROOT_NFS=y |
| 968 | CONFIG_LOCKD=y | 978 | CONFIG_LOCKD=y |
| @@ -1009,6 +1019,7 @@ CONFIG_UCC=y | |||
| 1009 | # Library routines | 1019 | # Library routines |
| 1010 | # | 1020 | # |
| 1011 | CONFIG_BITREVERSE=y | 1021 | CONFIG_BITREVERSE=y |
| 1022 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1012 | # CONFIG_CRC_CCITT is not set | 1023 | # CONFIG_CRC_CCITT is not set |
| 1013 | # CONFIG_CRC16 is not set | 1024 | # CONFIG_CRC16 is not set |
| 1014 | # CONFIG_CRC_ITU_T is not set | 1025 | # CONFIG_CRC_ITU_T is not set |
| @@ -1027,6 +1038,7 @@ CONFIG_HAVE_LMB=y | |||
| 1027 | # CONFIG_PRINTK_TIME is not set | 1038 | # CONFIG_PRINTK_TIME is not set |
| 1028 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1039 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1029 | CONFIG_ENABLE_MUST_CHECK=y | 1040 | CONFIG_ENABLE_MUST_CHECK=y |
| 1041 | CONFIG_FRAME_WARN=1024 | ||
| 1030 | # CONFIG_MAGIC_SYSRQ is not set | 1042 | # CONFIG_MAGIC_SYSRQ is not set |
| 1031 | # CONFIG_UNUSED_SYMBOLS is not set | 1043 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1032 | # CONFIG_DEBUG_FS is not set | 1044 | # CONFIG_DEBUG_FS is not set |
| @@ -1034,6 +1046,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1034 | # CONFIG_DEBUG_KERNEL is not set | 1046 | # CONFIG_DEBUG_KERNEL is not set |
| 1035 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1047 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1036 | # CONFIG_SAMPLES is not set | 1048 | # CONFIG_SAMPLES is not set |
| 1049 | # CONFIG_IRQSTACKS is not set | ||
| 1037 | # CONFIG_PPC_EARLY_DEBUG is not set | 1050 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1038 | 1051 | ||
| 1039 | # | 1052 | # |
| @@ -1043,51 +1056,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1043 | # CONFIG_SECURITY is not set | 1056 | # CONFIG_SECURITY is not set |
| 1044 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1057 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1045 | CONFIG_CRYPTO=y | 1058 | CONFIG_CRYPTO=y |
| 1059 | |||
| 1060 | # | ||
| 1061 | # Crypto core or helper | ||
| 1062 | # | ||
| 1046 | CONFIG_CRYPTO_ALGAPI=y | 1063 | CONFIG_CRYPTO_ALGAPI=y |
| 1047 | CONFIG_CRYPTO_BLKCIPHER=y | 1064 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1048 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1049 | CONFIG_CRYPTO_MANAGER=y | 1065 | CONFIG_CRYPTO_MANAGER=y |
| 1066 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1067 | # CONFIG_CRYPTO_NULL is not set | ||
| 1068 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1069 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1070 | # CONFIG_CRYPTO_TEST is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Authenticated Encryption with Associated Data | ||
| 1074 | # | ||
| 1075 | # CONFIG_CRYPTO_CCM is not set | ||
| 1076 | # CONFIG_CRYPTO_GCM is not set | ||
| 1077 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1078 | |||
| 1079 | # | ||
| 1080 | # Block modes | ||
| 1081 | # | ||
| 1082 | CONFIG_CRYPTO_CBC=y | ||
| 1083 | # CONFIG_CRYPTO_CTR is not set | ||
| 1084 | # CONFIG_CRYPTO_CTS is not set | ||
| 1085 | CONFIG_CRYPTO_ECB=m | ||
| 1086 | # CONFIG_CRYPTO_LRW is not set | ||
| 1087 | CONFIG_CRYPTO_PCBC=m | ||
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | |||
| 1090 | # | ||
| 1091 | # Hash modes | ||
| 1092 | # | ||
| 1050 | # CONFIG_CRYPTO_HMAC is not set | 1093 | # CONFIG_CRYPTO_HMAC is not set |
| 1051 | # CONFIG_CRYPTO_XCBC is not set | 1094 | # CONFIG_CRYPTO_XCBC is not set |
| 1052 | # CONFIG_CRYPTO_NULL is not set | 1095 | |
| 1096 | # | ||
| 1097 | # Digest | ||
| 1098 | # | ||
| 1099 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1053 | # CONFIG_CRYPTO_MD4 is not set | 1100 | # CONFIG_CRYPTO_MD4 is not set |
| 1054 | CONFIG_CRYPTO_MD5=y | 1101 | CONFIG_CRYPTO_MD5=y |
| 1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1055 | # CONFIG_CRYPTO_SHA1 is not set | 1103 | # CONFIG_CRYPTO_SHA1 is not set |
| 1056 | # CONFIG_CRYPTO_SHA256 is not set | 1104 | # CONFIG_CRYPTO_SHA256 is not set |
| 1057 | # CONFIG_CRYPTO_SHA512 is not set | 1105 | # CONFIG_CRYPTO_SHA512 is not set |
| 1058 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1059 | # CONFIG_CRYPTO_TGR192 is not set | 1106 | # CONFIG_CRYPTO_TGR192 is not set |
| 1060 | # CONFIG_CRYPTO_GF128MUL is not set | 1107 | # CONFIG_CRYPTO_WP512 is not set |
| 1061 | CONFIG_CRYPTO_ECB=m | 1108 | |
| 1062 | CONFIG_CRYPTO_CBC=y | 1109 | # |
| 1063 | CONFIG_CRYPTO_PCBC=m | 1110 | # Ciphers |
| 1064 | # CONFIG_CRYPTO_LRW is not set | 1111 | # |
| 1065 | # CONFIG_CRYPTO_XTS is not set | ||
| 1066 | # CONFIG_CRYPTO_CTR is not set | ||
| 1067 | # CONFIG_CRYPTO_GCM is not set | ||
| 1068 | # CONFIG_CRYPTO_CCM is not set | ||
| 1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1070 | CONFIG_CRYPTO_DES=y | ||
| 1071 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1072 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1073 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1074 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1075 | # CONFIG_CRYPTO_AES is not set | 1112 | # CONFIG_CRYPTO_AES is not set |
| 1113 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1114 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1115 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1116 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1076 | # CONFIG_CRYPTO_CAST5 is not set | 1117 | # CONFIG_CRYPTO_CAST5 is not set |
| 1077 | # CONFIG_CRYPTO_CAST6 is not set | 1118 | # CONFIG_CRYPTO_CAST6 is not set |
| 1078 | # CONFIG_CRYPTO_TEA is not set | 1119 | CONFIG_CRYPTO_DES=y |
| 1079 | # CONFIG_CRYPTO_ARC4 is not set | 1120 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1080 | # CONFIG_CRYPTO_KHAZAD is not set | 1121 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1081 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1082 | # CONFIG_CRYPTO_SEED is not set | ||
| 1083 | # CONFIG_CRYPTO_SALSA20 is not set | 1122 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1123 | # CONFIG_CRYPTO_SEED is not set | ||
| 1124 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1125 | # CONFIG_CRYPTO_TEA is not set | ||
| 1126 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Compression | ||
| 1130 | # | ||
| 1084 | # CONFIG_CRYPTO_DEFLATE is not set | 1131 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1085 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1086 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1087 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1088 | # CONFIG_CRYPTO_TEST is not set | ||
| 1089 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1090 | # CONFIG_CRYPTO_LZO is not set | 1132 | # CONFIG_CRYPTO_LZO is not set |
| 1091 | CONFIG_CRYPTO_HW=y | 1133 | CONFIG_CRYPTO_HW=y |
| 1092 | # CONFIG_PPC_CLOCK is not set | 1134 | # CONFIG_PPC_CLOCK is not set |
| 1093 | CONFIG_PPC_LIB_RHEAP=y | 1135 | CONFIG_PPC_LIB_RHEAP=y |
| 1136 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 2075722911bb..3efab71a603b 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:08 2008 | 4 | # Mon Jun 9 09:03:46 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_MPC8560_ADS=y | |||
| 162 | CONFIG_MPC85xx_CDS=y | 167 | CONFIG_MPC85xx_CDS=y |
| 163 | CONFIG_MPC85xx_MDS=y | 168 | CONFIG_MPC85xx_MDS=y |
| 164 | CONFIG_MPC85xx_DS=y | 169 | CONFIG_MPC85xx_DS=y |
| 170 | CONFIG_KSI8560=y | ||
| 165 | # CONFIG_STX_GP3 is not set | 171 | # CONFIG_STX_GP3 is not set |
| 166 | CONFIG_TQM8540=y | 172 | CONFIG_TQM8540=y |
| 167 | CONFIG_TQM8541=y | 173 | CONFIG_TQM8541=y |
| @@ -221,11 +227,13 @@ CONFIG_FLATMEM=y | |||
| 221 | CONFIG_FLAT_NODE_MEM_MAP=y | 227 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 222 | # CONFIG_SPARSEMEM_STATIC is not set | 228 | # CONFIG_SPARSEMEM_STATIC is not set |
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 230 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 225 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
| 226 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 227 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| 228 | CONFIG_VIRT_TO_BUS=y | 235 | CONFIG_VIRT_TO_BUS=y |
| 236 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 229 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
| 230 | # CONFIG_CMDLINE_BOOL is not set | 238 | # CONFIG_CMDLINE_BOOL is not set |
| 231 | # CONFIG_PM is not set | 239 | # CONFIG_PM is not set |
| @@ -250,6 +258,7 @@ CONFIG_PCI_LEGACY=y | |||
| 250 | # CONFIG_PCI_DEBUG is not set | 258 | # CONFIG_PCI_DEBUG is not set |
| 251 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
| 252 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
| 261 | # CONFIG_HAS_RAPIDIO is not set | ||
| 253 | 262 | ||
| 254 | # | 263 | # |
| 255 | # Advanced setup | 264 | # Advanced setup |
| @@ -259,11 +268,12 @@ CONFIG_PCI_LEGACY=y | |||
| 259 | # | 268 | # |
| 260 | # Default settings for advanced configuration options are used | 269 | # Default settings for advanced configuration options are used |
| 261 | # | 270 | # |
| 262 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 263 | CONFIG_LOWMEM_SIZE=0x30000000 | 271 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 264 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
| 274 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 275 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 265 | CONFIG_TASK_SIZE=0xc0000000 | 276 | CONFIG_TASK_SIZE=0xc0000000 |
| 266 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 267 | 277 | ||
| 268 | # | 278 | # |
| 269 | # Networking | 279 | # Networking |
| @@ -334,8 +344,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 334 | CONFIG_INET6_XFRM_MODE_BEET=y | 344 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 345 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 336 | CONFIG_IPV6_SIT=y | 346 | CONFIG_IPV6_SIT=y |
| 347 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 337 | # CONFIG_IPV6_TUNNEL is not set | 348 | # CONFIG_IPV6_TUNNEL is not set |
| 338 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 349 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 350 | # CONFIG_IPV6_MROUTE is not set | ||
| 339 | # CONFIG_NETWORK_SECMARK is not set | 351 | # CONFIG_NETWORK_SECMARK is not set |
| 340 | # CONFIG_NETFILTER is not set | 352 | # CONFIG_NETFILTER is not set |
| 341 | # CONFIG_IP_DCCP is not set | 353 | # CONFIG_IP_DCCP is not set |
| @@ -397,6 +409,7 @@ CONFIG_FW_LOADER=y | |||
| 397 | # CONFIG_CONNECTOR is not set | 409 | # CONFIG_CONNECTOR is not set |
| 398 | # CONFIG_MTD is not set | 410 | # CONFIG_MTD is not set |
| 399 | CONFIG_OF_DEVICE=y | 411 | CONFIG_OF_DEVICE=y |
| 412 | CONFIG_OF_I2C=y | ||
| 400 | # CONFIG_PARPORT is not set | 413 | # CONFIG_PARPORT is not set |
| 401 | CONFIG_BLK_DEV=y | 414 | CONFIG_BLK_DEV=y |
| 402 | # CONFIG_BLK_DEV_FD is not set | 415 | # CONFIG_BLK_DEV_FD is not set |
| @@ -503,7 +516,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 503 | # CONFIG_SCSI_SRP is not set | 516 | # CONFIG_SCSI_SRP is not set |
| 504 | CONFIG_ATA=y | 517 | CONFIG_ATA=y |
| 505 | # CONFIG_ATA_NONSTANDARD is not set | 518 | # CONFIG_ATA_NONSTANDARD is not set |
| 519 | CONFIG_SATA_PMP=y | ||
| 506 | CONFIG_SATA_AHCI=y | 520 | CONFIG_SATA_AHCI=y |
| 521 | # CONFIG_SATA_SIL24 is not set | ||
| 522 | CONFIG_SATA_FSL=y | ||
| 523 | CONFIG_ATA_SFF=y | ||
| 507 | # CONFIG_SATA_SVW is not set | 524 | # CONFIG_SATA_SVW is not set |
| 508 | # CONFIG_ATA_PIIX is not set | 525 | # CONFIG_ATA_PIIX is not set |
| 509 | # CONFIG_SATA_MV is not set | 526 | # CONFIG_SATA_MV is not set |
| @@ -513,13 +530,11 @@ CONFIG_SATA_AHCI=y | |||
| 513 | # CONFIG_SATA_PROMISE is not set | 530 | # CONFIG_SATA_PROMISE is not set |
| 514 | # CONFIG_SATA_SX4 is not set | 531 | # CONFIG_SATA_SX4 is not set |
| 515 | # CONFIG_SATA_SIL is not set | 532 | # CONFIG_SATA_SIL is not set |
| 516 | # CONFIG_SATA_SIL24 is not set | ||
| 517 | # CONFIG_SATA_SIS is not set | 533 | # CONFIG_SATA_SIS is not set |
| 518 | # CONFIG_SATA_ULI is not set | 534 | # CONFIG_SATA_ULI is not set |
| 519 | # CONFIG_SATA_VIA is not set | 535 | # CONFIG_SATA_VIA is not set |
| 520 | # CONFIG_SATA_VITESSE is not set | 536 | # CONFIG_SATA_VITESSE is not set |
| 521 | # CONFIG_SATA_INIC162X is not set | 537 | # CONFIG_SATA_INIC162X is not set |
| 522 | # CONFIG_SATA_FSL is not set | ||
| 523 | CONFIG_PATA_ALI=y | 538 | CONFIG_PATA_ALI=y |
| 524 | # CONFIG_PATA_AMD is not set | 539 | # CONFIG_PATA_AMD is not set |
| 525 | # CONFIG_PATA_ARTOP is not set | 540 | # CONFIG_PATA_ARTOP is not set |
| @@ -559,6 +574,7 @@ CONFIG_PATA_ALI=y | |||
| 559 | # CONFIG_PATA_VIA is not set | 574 | # CONFIG_PATA_VIA is not set |
| 560 | # CONFIG_PATA_WINBOND is not set | 575 | # CONFIG_PATA_WINBOND is not set |
| 561 | # CONFIG_PATA_PLATFORM is not set | 576 | # CONFIG_PATA_PLATFORM is not set |
| 577 | # CONFIG_PATA_SCH is not set | ||
| 562 | # CONFIG_MD is not set | 578 | # CONFIG_MD is not set |
| 563 | # CONFIG_FUSION is not set | 579 | # CONFIG_FUSION is not set |
| 564 | 580 | ||
| @@ -625,7 +641,6 @@ CONFIG_NETDEV_1000=y | |||
| 625 | # CONFIG_SIS190 is not set | 641 | # CONFIG_SIS190 is not set |
| 626 | # CONFIG_SKGE is not set | 642 | # CONFIG_SKGE is not set |
| 627 | # CONFIG_SKY2 is not set | 643 | # CONFIG_SKY2 is not set |
| 628 | # CONFIG_SK98LIN is not set | ||
| 629 | # CONFIG_VIA_VELOCITY is not set | 644 | # CONFIG_VIA_VELOCITY is not set |
| 630 | # CONFIG_TIGON3 is not set | 645 | # CONFIG_TIGON3 is not set |
| 631 | # CONFIG_BNX2 is not set | 646 | # CONFIG_BNX2 is not set |
| @@ -646,6 +661,7 @@ CONFIG_NETDEV_10000=y | |||
| 646 | # CONFIG_MLX4_CORE is not set | 661 | # CONFIG_MLX4_CORE is not set |
| 647 | # CONFIG_TEHUTI is not set | 662 | # CONFIG_TEHUTI is not set |
| 648 | # CONFIG_BNX2X is not set | 663 | # CONFIG_BNX2X is not set |
| 664 | # CONFIG_SFC is not set | ||
| 649 | # CONFIG_TR is not set | 665 | # CONFIG_TR is not set |
| 650 | 666 | ||
| 651 | # | 667 | # |
| @@ -653,6 +669,7 @@ CONFIG_NETDEV_10000=y | |||
| 653 | # | 669 | # |
| 654 | # CONFIG_WLAN_PRE80211 is not set | 670 | # CONFIG_WLAN_PRE80211 is not set |
| 655 | # CONFIG_WLAN_80211 is not set | 671 | # CONFIG_WLAN_80211 is not set |
| 672 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 656 | 673 | ||
| 657 | # | 674 | # |
| 658 | # USB Network Adapters | 675 | # USB Network Adapters |
| @@ -717,6 +734,7 @@ CONFIG_VT=y | |||
| 717 | CONFIG_VT_CONSOLE=y | 734 | CONFIG_VT_CONSOLE=y |
| 718 | CONFIG_HW_CONSOLE=y | 735 | CONFIG_HW_CONSOLE=y |
| 719 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 736 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 737 | CONFIG_DEVKMEM=y | ||
| 720 | # CONFIG_SERIAL_NONSTANDARD is not set | 738 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 721 | # CONFIG_NOZOMI is not set | 739 | # CONFIG_NOZOMI is not set |
| 722 | 740 | ||
| @@ -750,7 +768,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 750 | # CONFIG_IPMI_HANDLER is not set | 768 | # CONFIG_IPMI_HANDLER is not set |
| 751 | # CONFIG_HW_RANDOM is not set | 769 | # CONFIG_HW_RANDOM is not set |
| 752 | CONFIG_NVRAM=y | 770 | CONFIG_NVRAM=y |
| 753 | # CONFIG_GEN_RTC is not set | ||
| 754 | # CONFIG_R3964 is not set | 771 | # CONFIG_R3964 is not set |
| 755 | # CONFIG_APPLICOM is not set | 772 | # CONFIG_APPLICOM is not set |
| 756 | # CONFIG_RAW_DRIVER is not set | 773 | # CONFIG_RAW_DRIVER is not set |
| @@ -761,13 +778,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 761 | # CONFIG_I2C_CHARDEV is not set | 778 | # CONFIG_I2C_CHARDEV is not set |
| 762 | 779 | ||
| 763 | # | 780 | # |
| 764 | # I2C Algorithms | ||
| 765 | # | ||
| 766 | # CONFIG_I2C_ALGOBIT is not set | ||
| 767 | # CONFIG_I2C_ALGOPCF is not set | ||
| 768 | # CONFIG_I2C_ALGOPCA is not set | ||
| 769 | |||
| 770 | # | ||
| 771 | # I2C Hardware Bus support | 781 | # I2C Hardware Bus support |
| 772 | # | 782 | # |
| 773 | # CONFIG_I2C_ALI1535 is not set | 783 | # CONFIG_I2C_ALI1535 is not set |
| @@ -794,6 +804,7 @@ CONFIG_I2C_MPC=y | |||
| 794 | # CONFIG_I2C_VIA is not set | 804 | # CONFIG_I2C_VIA is not set |
| 795 | # CONFIG_I2C_VIAPRO is not set | 805 | # CONFIG_I2C_VIAPRO is not set |
| 796 | # CONFIG_I2C_VOODOO3 is not set | 806 | # CONFIG_I2C_VOODOO3 is not set |
| 807 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 797 | 808 | ||
| 798 | # | 809 | # |
| 799 | # Miscellaneous I2C Chip support | 810 | # Miscellaneous I2C Chip support |
| @@ -803,19 +814,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 803 | # CONFIG_SENSORS_PCF8574 is not set | 814 | # CONFIG_SENSORS_PCF8574 is not set |
| 804 | # CONFIG_PCF8575 is not set | 815 | # CONFIG_PCF8575 is not set |
| 805 | # CONFIG_SENSORS_PCF8591 is not set | 816 | # CONFIG_SENSORS_PCF8591 is not set |
| 806 | # CONFIG_TPS65010 is not set | ||
| 807 | # CONFIG_SENSORS_MAX6875 is not set | 817 | # CONFIG_SENSORS_MAX6875 is not set |
| 808 | # CONFIG_SENSORS_TSL2550 is not set | 818 | # CONFIG_SENSORS_TSL2550 is not set |
| 809 | # CONFIG_I2C_DEBUG_CORE is not set | 819 | # CONFIG_I2C_DEBUG_CORE is not set |
| 810 | # CONFIG_I2C_DEBUG_ALGO is not set | 820 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 811 | # CONFIG_I2C_DEBUG_BUS is not set | 821 | # CONFIG_I2C_DEBUG_BUS is not set |
| 812 | # CONFIG_I2C_DEBUG_CHIP is not set | 822 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 813 | |||
| 814 | # | ||
| 815 | # SPI support | ||
| 816 | # | ||
| 817 | # CONFIG_SPI is not set | 823 | # CONFIG_SPI is not set |
| 818 | # CONFIG_SPI_MASTER is not set | ||
| 819 | # CONFIG_W1 is not set | 824 | # CONFIG_W1 is not set |
| 820 | # CONFIG_POWER_SUPPLY is not set | 825 | # CONFIG_POWER_SUPPLY is not set |
| 821 | # CONFIG_HWMON is not set | 826 | # CONFIG_HWMON is not set |
| @@ -832,13 +837,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 832 | # Multifunction device drivers | 837 | # Multifunction device drivers |
| 833 | # | 838 | # |
| 834 | # CONFIG_MFD_SM501 is not set | 839 | # CONFIG_MFD_SM501 is not set |
| 840 | # CONFIG_HTC_PASIC3 is not set | ||
| 835 | 841 | ||
| 836 | # | 842 | # |
| 837 | # Multimedia devices | 843 | # Multimedia devices |
| 838 | # | 844 | # |
| 845 | |||
| 846 | # | ||
| 847 | # Multimedia core support | ||
| 848 | # | ||
| 839 | # CONFIG_VIDEO_DEV is not set | 849 | # CONFIG_VIDEO_DEV is not set |
| 840 | CONFIG_DVB_CORE=m | 850 | CONFIG_DVB_CORE=m |
| 841 | # CONFIG_DVB_CORE_ATTACH is not set | 851 | CONFIG_VIDEO_MEDIA=m |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia drivers | ||
| 855 | # | ||
| 856 | # CONFIG_MEDIA_ATTACH is not set | ||
| 857 | CONFIG_MEDIA_TUNER=m | ||
| 858 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 859 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 860 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 861 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 862 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 863 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 864 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 865 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 866 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 842 | CONFIG_DVB_CAPTURE_DRIVERS=y | 867 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 843 | 868 | ||
| 844 | # | 869 | # |
| @@ -881,14 +906,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 881 | # | 906 | # |
| 882 | # DVB-S (satellite) frontends | 907 | # DVB-S (satellite) frontends |
| 883 | # | 908 | # |
| 884 | # CONFIG_DVB_STV0299 is not set | ||
| 885 | # CONFIG_DVB_CX24110 is not set | 909 | # CONFIG_DVB_CX24110 is not set |
| 886 | # CONFIG_DVB_CX24123 is not set | 910 | # CONFIG_DVB_CX24123 is not set |
| 887 | # CONFIG_DVB_TDA8083 is not set | ||
| 888 | # CONFIG_DVB_MT312 is not set | 911 | # CONFIG_DVB_MT312 is not set |
| 889 | # CONFIG_DVB_VES1X93 is not set | ||
| 890 | # CONFIG_DVB_S5H1420 is not set | 912 | # CONFIG_DVB_S5H1420 is not set |
| 913 | # CONFIG_DVB_STV0299 is not set | ||
| 914 | # CONFIG_DVB_TDA8083 is not set | ||
| 891 | # CONFIG_DVB_TDA10086 is not set | 915 | # CONFIG_DVB_TDA10086 is not set |
| 916 | # CONFIG_DVB_VES1X93 is not set | ||
| 917 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 918 | # CONFIG_DVB_TDA826X is not set | ||
| 919 | # CONFIG_DVB_TUA6100 is not set | ||
| 892 | 920 | ||
| 893 | # | 921 | # |
| 894 | # DVB-T (terrestrial) frontends | 922 | # DVB-T (terrestrial) frontends |
| @@ -906,6 +934,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 906 | # CONFIG_DVB_DIB3000MC is not set | 934 | # CONFIG_DVB_DIB3000MC is not set |
| 907 | # CONFIG_DVB_DIB7000M is not set | 935 | # CONFIG_DVB_DIB7000M is not set |
| 908 | # CONFIG_DVB_DIB7000P is not set | 936 | # CONFIG_DVB_DIB7000P is not set |
| 937 | # CONFIG_DVB_TDA10048 is not set | ||
| 909 | 938 | ||
| 910 | # | 939 | # |
| 911 | # DVB-C (cable) frontends | 940 | # DVB-C (cable) frontends |
| @@ -924,27 +953,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 924 | # CONFIG_DVB_BCM3510 is not set | 953 | # CONFIG_DVB_BCM3510 is not set |
| 925 | # CONFIG_DVB_LGDT330X is not set | 954 | # CONFIG_DVB_LGDT330X is not set |
| 926 | # CONFIG_DVB_S5H1409 is not set | 955 | # CONFIG_DVB_S5H1409 is not set |
| 956 | # CONFIG_DVB_AU8522 is not set | ||
| 957 | # CONFIG_DVB_S5H1411 is not set | ||
| 927 | 958 | ||
| 928 | # | 959 | # |
| 929 | # Tuners/PLL support | 960 | # Digital terrestrial only tuners/PLL |
| 930 | # | 961 | # |
| 931 | # CONFIG_DVB_PLL is not set | 962 | # CONFIG_DVB_PLL is not set |
| 932 | # CONFIG_DVB_TDA826X is not set | ||
| 933 | # CONFIG_DVB_TDA827X is not set | ||
| 934 | # CONFIG_DVB_TDA18271 is not set | ||
| 935 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 936 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 937 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 938 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 939 | # CONFIG_DVB_TUNER_DIB0070 is not set | 963 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 940 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 941 | 964 | ||
| 942 | # | 965 | # |
| 943 | # Miscellaneous devices | 966 | # SEC control devices for DVB-S |
| 944 | # | 967 | # |
| 945 | # CONFIG_DVB_LNBP21 is not set | 968 | # CONFIG_DVB_LNBP21 is not set |
| 969 | # CONFIG_DVB_ISL6405 is not set | ||
| 946 | # CONFIG_DVB_ISL6421 is not set | 970 | # CONFIG_DVB_ISL6421 is not set |
| 947 | # CONFIG_DVB_TUA6100 is not set | ||
| 948 | CONFIG_DAB=y | 971 | CONFIG_DAB=y |
| 949 | # CONFIG_USB_DABUSB is not set | 972 | # CONFIG_USB_DABUSB is not set |
| 950 | 973 | ||
| @@ -1011,6 +1034,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1011 | # CONFIG_SND_AU8810 is not set | 1034 | # CONFIG_SND_AU8810 is not set |
| 1012 | # CONFIG_SND_AU8820 is not set | 1035 | # CONFIG_SND_AU8820 is not set |
| 1013 | # CONFIG_SND_AU8830 is not set | 1036 | # CONFIG_SND_AU8830 is not set |
| 1037 | # CONFIG_SND_AW2 is not set | ||
| 1014 | # CONFIG_SND_AZT3328 is not set | 1038 | # CONFIG_SND_AZT3328 is not set |
| 1015 | # CONFIG_SND_BT87X is not set | 1039 | # CONFIG_SND_BT87X is not set |
| 1016 | # CONFIG_SND_CA0106 is not set | 1040 | # CONFIG_SND_CA0106 is not set |
| @@ -1085,11 +1109,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1085 | # CONFIG_SND_SOC is not set | 1109 | # CONFIG_SND_SOC is not set |
| 1086 | 1110 | ||
| 1087 | # | 1111 | # |
| 1088 | # SoC Audio support for SuperH | 1112 | # ALSA SoC audio for Freescale SOCs |
| 1089 | # | 1113 | # |
| 1090 | 1114 | ||
| 1091 | # | 1115 | # |
| 1092 | # ALSA SoC audio for Freescale SOCs | 1116 | # SoC Audio for the Texas Instruments OMAP |
| 1093 | # | 1117 | # |
| 1094 | 1118 | ||
| 1095 | # | 1119 | # |
| @@ -1124,16 +1148,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1124 | CONFIG_USB_DEVICE_CLASS=y | 1148 | CONFIG_USB_DEVICE_CLASS=y |
| 1125 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1149 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1126 | # CONFIG_USB_OTG is not set | 1150 | # CONFIG_USB_OTG is not set |
| 1151 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1152 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1127 | 1153 | ||
| 1128 | # | 1154 | # |
| 1129 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
| 1130 | # | 1156 | # |
| 1157 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1131 | CONFIG_USB_EHCI_HCD=y | 1158 | CONFIG_USB_EHCI_HCD=y |
| 1132 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1159 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1133 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1160 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1134 | # CONFIG_USB_EHCI_FSL is not set | 1161 | CONFIG_USB_EHCI_FSL=y |
| 1135 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1162 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1136 | # CONFIG_USB_ISP116X_HCD is not set | 1163 | # CONFIG_USB_ISP116X_HCD is not set |
| 1164 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1137 | CONFIG_USB_OHCI_HCD=y | 1165 | CONFIG_USB_OHCI_HCD=y |
| 1138 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1166 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1139 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1167 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1151,6 +1179,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1151 | # | 1179 | # |
| 1152 | # CONFIG_USB_ACM is not set | 1180 | # CONFIG_USB_ACM is not set |
| 1153 | # CONFIG_USB_PRINTER is not set | 1181 | # CONFIG_USB_PRINTER is not set |
| 1182 | # CONFIG_USB_WDM is not set | ||
| 1154 | 1183 | ||
| 1155 | # | 1184 | # |
| 1156 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1185 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1170,7 +1199,9 @@ CONFIG_USB_STORAGE=y | |||
| 1170 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1199 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1171 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1200 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1172 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1173 | # CONFIG_USB_STORAGE_KARMA is not set | 1203 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1204 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1174 | # CONFIG_USB_LIBUSUAL is not set | 1205 | # CONFIG_USB_LIBUSUAL is not set |
| 1175 | 1206 | ||
| 1176 | # | 1207 | # |
| @@ -1208,12 +1239,21 @@ CONFIG_USB_MON=y | |||
| 1208 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1239 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1209 | # CONFIG_USB_IOWARRIOR is not set | 1240 | # CONFIG_USB_IOWARRIOR is not set |
| 1210 | # CONFIG_USB_TEST is not set | 1241 | # CONFIG_USB_TEST is not set |
| 1242 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1211 | # CONFIG_USB_GADGET is not set | 1243 | # CONFIG_USB_GADGET is not set |
| 1212 | # CONFIG_MMC is not set | 1244 | # CONFIG_MMC is not set |
| 1213 | # CONFIG_MEMSTICK is not set | 1245 | # CONFIG_MEMSTICK is not set |
| 1214 | # CONFIG_NEW_LEDS is not set | 1246 | # CONFIG_NEW_LEDS is not set |
| 1247 | # CONFIG_ACCESSIBILITY is not set | ||
| 1215 | # CONFIG_INFINIBAND is not set | 1248 | # CONFIG_INFINIBAND is not set |
| 1216 | # CONFIG_EDAC is not set | 1249 | CONFIG_EDAC=y |
| 1250 | |||
| 1251 | # | ||
| 1252 | # Reporting subsystems | ||
| 1253 | # | ||
| 1254 | # CONFIG_EDAC_DEBUG is not set | ||
| 1255 | CONFIG_EDAC_MM_EDAC=y | ||
| 1256 | CONFIG_EDAC_MPC85XX=y | ||
| 1217 | CONFIG_RTC_LIB=y | 1257 | CONFIG_RTC_LIB=y |
| 1218 | CONFIG_RTC_CLASS=y | 1258 | CONFIG_RTC_CLASS=y |
| 1219 | CONFIG_RTC_HCTOSYS=y | 1259 | CONFIG_RTC_HCTOSYS=y |
| @@ -1263,11 +1303,19 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1263 | # | 1303 | # |
| 1264 | # on-CPU RTC drivers | 1304 | # on-CPU RTC drivers |
| 1265 | # | 1305 | # |
| 1266 | # CONFIG_DMADEVICES is not set | 1306 | # CONFIG_RTC_DRV_PPC is not set |
| 1307 | CONFIG_DMADEVICES=y | ||
| 1267 | 1308 | ||
| 1268 | # | 1309 | # |
| 1269 | # Userspace I/O | 1310 | # DMA Devices |
| 1270 | # | 1311 | # |
| 1312 | CONFIG_FSL_DMA=y | ||
| 1313 | CONFIG_DMA_ENGINE=y | ||
| 1314 | |||
| 1315 | # | ||
| 1316 | # DMA Clients | ||
| 1317 | # | ||
| 1318 | # CONFIG_NET_DMA is not set | ||
| 1271 | # CONFIG_UIO is not set | 1319 | # CONFIG_UIO is not set |
| 1272 | 1320 | ||
| 1273 | # | 1321 | # |
| @@ -1287,7 +1335,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1287 | # CONFIG_JFS_FS is not set | 1335 | # CONFIG_JFS_FS is not set |
| 1288 | # CONFIG_FS_POSIX_ACL is not set | 1336 | # CONFIG_FS_POSIX_ACL is not set |
| 1289 | # CONFIG_XFS_FS is not set | 1337 | # CONFIG_XFS_FS is not set |
| 1290 | # CONFIG_GFS2_FS is not set | ||
| 1291 | # CONFIG_OCFS2_FS is not set | 1338 | # CONFIG_OCFS2_FS is not set |
| 1292 | CONFIG_DNOTIFY=y | 1339 | CONFIG_DNOTIFY=y |
| 1293 | CONFIG_INOTIFY=y | 1340 | CONFIG_INOTIFY=y |
| @@ -1357,10 +1404,9 @@ CONFIG_NFS_FS=y | |||
| 1357 | CONFIG_NFS_V3=y | 1404 | CONFIG_NFS_V3=y |
| 1358 | # CONFIG_NFS_V3_ACL is not set | 1405 | # CONFIG_NFS_V3_ACL is not set |
| 1359 | CONFIG_NFS_V4=y | 1406 | CONFIG_NFS_V4=y |
| 1360 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1361 | CONFIG_NFSD=y | 1407 | CONFIG_NFSD=y |
| 1362 | # CONFIG_NFSD_V3 is not set | 1408 | # CONFIG_NFSD_V3 is not set |
| 1363 | CONFIG_NFSD_TCP=y | 1409 | # CONFIG_NFSD_V4 is not set |
| 1364 | CONFIG_ROOT_NFS=y | 1410 | CONFIG_ROOT_NFS=y |
| 1365 | CONFIG_LOCKD=y | 1411 | CONFIG_LOCKD=y |
| 1366 | CONFIG_LOCKD_V4=y | 1412 | CONFIG_LOCKD_V4=y |
| @@ -1444,9 +1490,10 @@ CONFIG_NLS_UTF8=m | |||
| 1444 | # Library routines | 1490 | # Library routines |
| 1445 | # | 1491 | # |
| 1446 | CONFIG_BITREVERSE=y | 1492 | CONFIG_BITREVERSE=y |
| 1493 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1447 | # CONFIG_CRC_CCITT is not set | 1494 | # CONFIG_CRC_CCITT is not set |
| 1448 | # CONFIG_CRC16 is not set | 1495 | # CONFIG_CRC16 is not set |
| 1449 | # CONFIG_CRC_ITU_T is not set | 1496 | CONFIG_CRC_ITU_T=m |
| 1450 | CONFIG_CRC32=y | 1497 | CONFIG_CRC32=y |
| 1451 | # CONFIG_CRC7 is not set | 1498 | # CONFIG_CRC7 is not set |
| 1452 | CONFIG_LIBCRC32C=m | 1499 | CONFIG_LIBCRC32C=m |
| @@ -1455,6 +1502,7 @@ CONFIG_PLIST=y | |||
| 1455 | CONFIG_HAS_IOMEM=y | 1502 | CONFIG_HAS_IOMEM=y |
| 1456 | CONFIG_HAS_IOPORT=y | 1503 | CONFIG_HAS_IOPORT=y |
| 1457 | CONFIG_HAS_DMA=y | 1504 | CONFIG_HAS_DMA=y |
| 1505 | CONFIG_HAVE_LMB=y | ||
| 1458 | 1506 | ||
| 1459 | # | 1507 | # |
| 1460 | # Kernel hacking | 1508 | # Kernel hacking |
| @@ -1462,6 +1510,7 @@ CONFIG_HAS_DMA=y | |||
| 1462 | # CONFIG_PRINTK_TIME is not set | 1510 | # CONFIG_PRINTK_TIME is not set |
| 1463 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1511 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1464 | CONFIG_ENABLE_MUST_CHECK=y | 1512 | CONFIG_ENABLE_MUST_CHECK=y |
| 1513 | CONFIG_FRAME_WARN=1024 | ||
| 1465 | # CONFIG_MAGIC_SYSRQ is not set | 1514 | # CONFIG_MAGIC_SYSRQ is not set |
| 1466 | # CONFIG_UNUSED_SYMBOLS is not set | 1515 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1467 | # CONFIG_DEBUG_FS is not set | 1516 | # CONFIG_DEBUG_FS is not set |
| @@ -1472,6 +1521,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1472 | CONFIG_SCHED_DEBUG=y | 1521 | CONFIG_SCHED_DEBUG=y |
| 1473 | # CONFIG_SCHEDSTATS is not set | 1522 | # CONFIG_SCHEDSTATS is not set |
| 1474 | # CONFIG_TIMER_STATS is not set | 1523 | # CONFIG_TIMER_STATS is not set |
| 1524 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1475 | # CONFIG_SLUB_DEBUG_ON is not set | 1525 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1476 | # CONFIG_SLUB_STATS is not set | 1526 | # CONFIG_SLUB_STATS is not set |
| 1477 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1527 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1485,6 +1535,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1485 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1535 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1486 | CONFIG_DEBUG_INFO=y | 1536 | CONFIG_DEBUG_INFO=y |
| 1487 | # CONFIG_DEBUG_VM is not set | 1537 | # CONFIG_DEBUG_VM is not set |
| 1538 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1488 | # CONFIG_DEBUG_LIST is not set | 1539 | # CONFIG_DEBUG_LIST is not set |
| 1489 | # CONFIG_DEBUG_SG is not set | 1540 | # CONFIG_DEBUG_SG is not set |
| 1490 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1541 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1497,6 +1548,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1497 | # CONFIG_DEBUG_PAGEALLOC is not set | 1548 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1498 | # CONFIG_DEBUGGER is not set | 1549 | # CONFIG_DEBUGGER is not set |
| 1499 | # CONFIG_KGDB_CONSOLE is not set | 1550 | # CONFIG_KGDB_CONSOLE is not set |
| 1551 | # CONFIG_IRQSTACKS is not set | ||
| 1500 | # CONFIG_BDI_SWITCH is not set | 1552 | # CONFIG_BDI_SWITCH is not set |
| 1501 | # CONFIG_PPC_EARLY_DEBUG is not set | 1553 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1502 | 1554 | ||
| @@ -1507,53 +1559,83 @@ CONFIG_DEBUG_INFO=y | |||
| 1507 | # CONFIG_SECURITY is not set | 1559 | # CONFIG_SECURITY is not set |
| 1508 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1560 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1509 | CONFIG_CRYPTO=y | 1561 | CONFIG_CRYPTO=y |
| 1562 | |||
| 1563 | # | ||
| 1564 | # Crypto core or helper | ||
| 1565 | # | ||
| 1510 | CONFIG_CRYPTO_ALGAPI=y | 1566 | CONFIG_CRYPTO_ALGAPI=y |
| 1511 | CONFIG_CRYPTO_BLKCIPHER=y | 1567 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1512 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1513 | CONFIG_CRYPTO_HASH=y | 1568 | CONFIG_CRYPTO_HASH=y |
| 1514 | CONFIG_CRYPTO_MANAGER=y | 1569 | CONFIG_CRYPTO_MANAGER=y |
| 1570 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1571 | # CONFIG_CRYPTO_NULL is not set | ||
| 1572 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1573 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1574 | # CONFIG_CRYPTO_TEST is not set | ||
| 1575 | |||
| 1576 | # | ||
| 1577 | # Authenticated Encryption with Associated Data | ||
| 1578 | # | ||
| 1579 | # CONFIG_CRYPTO_CCM is not set | ||
| 1580 | # CONFIG_CRYPTO_GCM is not set | ||
| 1581 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1582 | |||
| 1583 | # | ||
| 1584 | # Block modes | ||
| 1585 | # | ||
| 1586 | CONFIG_CRYPTO_CBC=y | ||
| 1587 | # CONFIG_CRYPTO_CTR is not set | ||
| 1588 | # CONFIG_CRYPTO_CTS is not set | ||
| 1589 | # CONFIG_CRYPTO_ECB is not set | ||
| 1590 | # CONFIG_CRYPTO_LRW is not set | ||
| 1591 | CONFIG_CRYPTO_PCBC=m | ||
| 1592 | # CONFIG_CRYPTO_XTS is not set | ||
| 1593 | |||
| 1594 | # | ||
| 1595 | # Hash modes | ||
| 1596 | # | ||
| 1515 | CONFIG_CRYPTO_HMAC=y | 1597 | CONFIG_CRYPTO_HMAC=y |
| 1516 | # CONFIG_CRYPTO_XCBC is not set | 1598 | # CONFIG_CRYPTO_XCBC is not set |
| 1517 | # CONFIG_CRYPTO_NULL is not set | 1599 | |
| 1600 | # | ||
| 1601 | # Digest | ||
| 1602 | # | ||
| 1603 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1518 | # CONFIG_CRYPTO_MD4 is not set | 1604 | # CONFIG_CRYPTO_MD4 is not set |
| 1519 | CONFIG_CRYPTO_MD5=y | 1605 | CONFIG_CRYPTO_MD5=y |
| 1606 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1520 | CONFIG_CRYPTO_SHA1=m | 1607 | CONFIG_CRYPTO_SHA1=m |
| 1521 | # CONFIG_CRYPTO_SHA256 is not set | 1608 | # CONFIG_CRYPTO_SHA256 is not set |
| 1522 | # CONFIG_CRYPTO_SHA512 is not set | 1609 | # CONFIG_CRYPTO_SHA512 is not set |
| 1523 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1524 | # CONFIG_CRYPTO_TGR192 is not set | 1610 | # CONFIG_CRYPTO_TGR192 is not set |
| 1525 | # CONFIG_CRYPTO_GF128MUL is not set | 1611 | # CONFIG_CRYPTO_WP512 is not set |
| 1526 | # CONFIG_CRYPTO_ECB is not set | 1612 | |
| 1527 | CONFIG_CRYPTO_CBC=y | 1613 | # |
| 1528 | CONFIG_CRYPTO_PCBC=m | 1614 | # Ciphers |
| 1529 | # CONFIG_CRYPTO_LRW is not set | 1615 | # |
| 1530 | # CONFIG_CRYPTO_XTS is not set | ||
| 1531 | # CONFIG_CRYPTO_CTR is not set | ||
| 1532 | # CONFIG_CRYPTO_GCM is not set | ||
| 1533 | # CONFIG_CRYPTO_CCM is not set | ||
| 1534 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1535 | CONFIG_CRYPTO_DES=y | ||
| 1536 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1537 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1538 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1539 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1540 | # CONFIG_CRYPTO_AES is not set | 1616 | # CONFIG_CRYPTO_AES is not set |
| 1617 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1618 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1619 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1620 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1541 | # CONFIG_CRYPTO_CAST5 is not set | 1621 | # CONFIG_CRYPTO_CAST5 is not set |
| 1542 | # CONFIG_CRYPTO_CAST6 is not set | 1622 | # CONFIG_CRYPTO_CAST6 is not set |
| 1543 | # CONFIG_CRYPTO_TEA is not set | 1623 | CONFIG_CRYPTO_DES=y |
| 1544 | # CONFIG_CRYPTO_ARC4 is not set | 1624 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1545 | # CONFIG_CRYPTO_KHAZAD is not set | 1625 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1546 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1547 | # CONFIG_CRYPTO_SEED is not set | ||
| 1548 | # CONFIG_CRYPTO_SALSA20 is not set | 1626 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1627 | # CONFIG_CRYPTO_SEED is not set | ||
| 1628 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1629 | # CONFIG_CRYPTO_TEA is not set | ||
| 1630 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1631 | |||
| 1632 | # | ||
| 1633 | # Compression | ||
| 1634 | # | ||
| 1549 | # CONFIG_CRYPTO_DEFLATE is not set | 1635 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1550 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1551 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1552 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1553 | # CONFIG_CRYPTO_TEST is not set | ||
| 1554 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1555 | # CONFIG_CRYPTO_LZO is not set | 1636 | # CONFIG_CRYPTO_LZO is not set |
| 1556 | CONFIG_CRYPTO_HW=y | 1637 | CONFIG_CRYPTO_HW=y |
| 1557 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1638 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1558 | # CONFIG_PPC_CLOCK is not set | 1639 | # CONFIG_PPC_CLOCK is not set |
| 1559 | CONFIG_PPC_LIB_RHEAP=y | 1640 | CONFIG_PPC_LIB_RHEAP=y |
| 1641 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig index 7e5b9ce58d89..5612d40d0463 100644 --- a/arch/powerpc/configs/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:33 2008 | 4 | # Mon Jun 9 08:50:24 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -60,9 +62,10 @@ CONFIG_EXPERIMENTAL=y | |||
| 60 | CONFIG_BROKEN_ON_SMP=y | 62 | CONFIG_BROKEN_ON_SMP=y |
| 61 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 63 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 62 | CONFIG_LOCALVERSION="" | 64 | CONFIG_LOCALVERSION="" |
| 63 | # CONFIG_LOCALVERSION_AUTO is not set | 65 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | # CONFIG_SWAP is not set | 66 | # CONFIG_SWAP is not set |
| 65 | # CONFIG_SYSVIPC is not set | 67 | CONFIG_SYSVIPC=y |
| 68 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 66 | # CONFIG_POSIX_MQUEUE is not set | 69 | # CONFIG_POSIX_MQUEUE is not set |
| 67 | # CONFIG_BSD_PROCESS_ACCT is not set | 70 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 68 | # CONFIG_TASKSTATS is not set | 71 | # CONFIG_TASKSTATS is not set |
| @@ -86,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 91 | CONFIG_KALLSYMS_EXTRA_PASS=y | 95 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -110,14 +114,22 @@ CONFIG_SLUB=y | |||
| 110 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 117 | # CONFIG_KPROBES is not set | ||
| 113 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| 119 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
| 120 | # CONFIG_MODULES is not set | 126 | CONFIG_MODULES=y |
| 127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 128 | CONFIG_MODULE_UNLOAD=y | ||
| 129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 130 | # CONFIG_MODVERSIONS is not set | ||
| 131 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 132 | CONFIG_KMOD=y | ||
| 121 | CONFIG_BLOCK=y | 133 | CONFIG_BLOCK=y |
| 122 | # CONFIG_LBD is not set | 134 | # CONFIG_LBD is not set |
| 123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| @@ -151,6 +163,7 @@ CONFIG_PPC_86xx=y | |||
| 151 | # CONFIG_PPC_CELL_NATIVE is not set | 163 | # CONFIG_PPC_CELL_NATIVE is not set |
| 152 | # CONFIG_PQ2ADS is not set | 164 | # CONFIG_PQ2ADS is not set |
| 153 | # CONFIG_MPC8641_HPCN is not set | 165 | # CONFIG_MPC8641_HPCN is not set |
| 166 | # CONFIG_SBC8641D is not set | ||
| 154 | CONFIG_MPC8610_HPCD=y | 167 | CONFIG_MPC8610_HPCD=y |
| 155 | CONFIG_MPC8610=y | 168 | CONFIG_MPC8610=y |
| 156 | # CONFIG_IPIC is not set | 169 | # CONFIG_IPIC is not set |
| @@ -199,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 199 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 200 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 201 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 202 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 203 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 204 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 205 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 206 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=12 | ||
| 207 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
| 208 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 209 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -223,12 +238,14 @@ CONFIG_PCI_DOMAINS=y | |||
| 223 | CONFIG_PCI_SYSCALL=y | 238 | CONFIG_PCI_SYSCALL=y |
| 224 | CONFIG_PCIEPORTBUS=y | 239 | CONFIG_PCIEPORTBUS=y |
| 225 | CONFIG_PCIEAER=y | 240 | CONFIG_PCIEAER=y |
| 241 | # CONFIG_PCIEASPM is not set | ||
| 226 | CONFIG_ARCH_SUPPORTS_MSI=y | 242 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 227 | # CONFIG_PCI_MSI is not set | 243 | # CONFIG_PCI_MSI is not set |
| 228 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 229 | CONFIG_PCI_DEBUG=y | 245 | CONFIG_PCI_DEBUG=y |
| 230 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 231 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 249 | ||
| 233 | # | 250 | # |
| 234 | # Advanced setup | 251 | # Advanced setup |
| @@ -238,11 +255,11 @@ CONFIG_PCI_DEBUG=y | |||
| 238 | # | 255 | # |
| 239 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 240 | # | 257 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 263 | ||
| 247 | # | 264 | # |
| 248 | # Networking | 265 | # Networking |
| @@ -303,8 +320,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 303 | CONFIG_INET6_XFRM_MODE_BEET=y | 320 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 304 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 321 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 305 | CONFIG_IPV6_SIT=y | 322 | CONFIG_IPV6_SIT=y |
| 323 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 306 | # CONFIG_IPV6_TUNNEL is not set | 324 | # CONFIG_IPV6_TUNNEL is not set |
| 307 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 325 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 326 | # CONFIG_IPV6_MROUTE is not set | ||
| 308 | # CONFIG_NETWORK_SECMARK is not set | 327 | # CONFIG_NETWORK_SECMARK is not set |
| 309 | # CONFIG_NETFILTER is not set | 328 | # CONFIG_NETFILTER is not set |
| 310 | # CONFIG_IP_DCCP is not set | 329 | # CONFIG_IP_DCCP is not set |
| @@ -446,6 +465,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 446 | # | 465 | # |
| 447 | # CONFIG_MTD_UBI is not set | 466 | # CONFIG_MTD_UBI is not set |
| 448 | CONFIG_OF_DEVICE=y | 467 | CONFIG_OF_DEVICE=y |
| 468 | CONFIG_OF_I2C=y | ||
| 449 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
| 450 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
| 451 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
| @@ -504,6 +524,7 @@ CONFIG_CHR_DEV_SG=y | |||
| 504 | # CONFIG_SCSI_CONSTANTS is not set | 524 | # CONFIG_SCSI_CONSTANTS is not set |
| 505 | # CONFIG_SCSI_LOGGING is not set | 525 | # CONFIG_SCSI_LOGGING is not set |
| 506 | # CONFIG_SCSI_SCAN_ASYNC is not set | 526 | # CONFIG_SCSI_SCAN_ASYNC is not set |
| 527 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 507 | 528 | ||
| 508 | # | 529 | # |
| 509 | # SCSI Transports | 530 | # SCSI Transports |
| @@ -553,7 +574,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 553 | # CONFIG_SCSI_SRP is not set | 574 | # CONFIG_SCSI_SRP is not set |
| 554 | CONFIG_ATA=y | 575 | CONFIG_ATA=y |
| 555 | # CONFIG_ATA_NONSTANDARD is not set | 576 | # CONFIG_ATA_NONSTANDARD is not set |
| 577 | CONFIG_SATA_PMP=y | ||
| 556 | CONFIG_SATA_AHCI=y | 578 | CONFIG_SATA_AHCI=y |
| 579 | # CONFIG_SATA_SIL24 is not set | ||
| 580 | # CONFIG_SATA_FSL is not set | ||
| 581 | CONFIG_ATA_SFF=y | ||
| 557 | # CONFIG_SATA_SVW is not set | 582 | # CONFIG_SATA_SVW is not set |
| 558 | # CONFIG_ATA_PIIX is not set | 583 | # CONFIG_ATA_PIIX is not set |
| 559 | # CONFIG_SATA_MV is not set | 584 | # CONFIG_SATA_MV is not set |
| @@ -563,13 +588,11 @@ CONFIG_SATA_AHCI=y | |||
| 563 | # CONFIG_SATA_PROMISE is not set | 588 | # CONFIG_SATA_PROMISE is not set |
| 564 | # CONFIG_SATA_SX4 is not set | 589 | # CONFIG_SATA_SX4 is not set |
| 565 | # CONFIG_SATA_SIL is not set | 590 | # CONFIG_SATA_SIL is not set |
| 566 | # CONFIG_SATA_SIL24 is not set | ||
| 567 | # CONFIG_SATA_SIS is not set | 591 | # CONFIG_SATA_SIS is not set |
| 568 | # CONFIG_SATA_ULI is not set | 592 | # CONFIG_SATA_ULI is not set |
| 569 | # CONFIG_SATA_VIA is not set | 593 | # CONFIG_SATA_VIA is not set |
| 570 | # CONFIG_SATA_VITESSE is not set | 594 | # CONFIG_SATA_VITESSE is not set |
| 571 | # CONFIG_SATA_INIC162X is not set | 595 | # CONFIG_SATA_INIC162X is not set |
| 572 | # CONFIG_SATA_FSL is not set | ||
| 573 | CONFIG_PATA_ALI=y | 596 | CONFIG_PATA_ALI=y |
| 574 | # CONFIG_PATA_AMD is not set | 597 | # CONFIG_PATA_AMD is not set |
| 575 | # CONFIG_PATA_ARTOP is not set | 598 | # CONFIG_PATA_ARTOP is not set |
| @@ -609,6 +632,7 @@ CONFIG_PATA_ALI=y | |||
| 609 | # CONFIG_PATA_VIA is not set | 632 | # CONFIG_PATA_VIA is not set |
| 610 | # CONFIG_PATA_WINBOND is not set | 633 | # CONFIG_PATA_WINBOND is not set |
| 611 | # CONFIG_PATA_PLATFORM is not set | 634 | # CONFIG_PATA_PLATFORM is not set |
| 635 | # CONFIG_PATA_SCH is not set | ||
| 612 | # CONFIG_MD is not set | 636 | # CONFIG_MD is not set |
| 613 | # CONFIG_FUSION is not set | 637 | # CONFIG_FUSION is not set |
| 614 | 638 | ||
| @@ -628,25 +652,9 @@ CONFIG_DUMMY=y | |||
| 628 | # CONFIG_TUN is not set | 652 | # CONFIG_TUN is not set |
| 629 | # CONFIG_VETH is not set | 653 | # CONFIG_VETH is not set |
| 630 | # CONFIG_ARCNET is not set | 654 | # CONFIG_ARCNET is not set |
| 631 | CONFIG_PHYLIB=y | 655 | # CONFIG_PHYLIB is not set |
| 632 | |||
| 633 | # | ||
| 634 | # MII PHY device drivers | ||
| 635 | # | ||
| 636 | # CONFIG_MARVELL_PHY is not set | ||
| 637 | # CONFIG_DAVICOM_PHY is not set | ||
| 638 | # CONFIG_QSEMI_PHY is not set | ||
| 639 | # CONFIG_LXT_PHY is not set | ||
| 640 | # CONFIG_CICADA_PHY is not set | ||
| 641 | # CONFIG_VITESSE_PHY is not set | ||
| 642 | # CONFIG_SMSC_PHY is not set | ||
| 643 | # CONFIG_BROADCOM_PHY is not set | ||
| 644 | # CONFIG_ICPLUS_PHY is not set | ||
| 645 | # CONFIG_REALTEK_PHY is not set | ||
| 646 | # CONFIG_FIXED_PHY is not set | ||
| 647 | # CONFIG_MDIO_BITBANG is not set | ||
| 648 | CONFIG_NET_ETHERNET=y | 656 | CONFIG_NET_ETHERNET=y |
| 649 | CONFIG_MII=y | 657 | # CONFIG_MII is not set |
| 650 | # CONFIG_HAPPYMEAL is not set | 658 | # CONFIG_HAPPYMEAL is not set |
| 651 | # CONFIG_SUNGEM is not set | 659 | # CONFIG_SUNGEM is not set |
| 652 | # CONFIG_CASSINI is not set | 660 | # CONFIG_CASSINI is not set |
| @@ -663,64 +671,10 @@ CONFIG_ULI526X=y | |||
| 663 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 671 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 664 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 672 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 665 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 673 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 666 | CONFIG_NET_PCI=y | 674 | # CONFIG_NET_PCI is not set |
| 667 | # CONFIG_PCNET32 is not set | ||
| 668 | # CONFIG_AMD8111_ETH is not set | ||
| 669 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
| 670 | # CONFIG_B44 is not set | 675 | # CONFIG_B44 is not set |
| 671 | # CONFIG_FORCEDETH is not set | 676 | # CONFIG_NETDEV_1000 is not set |
| 672 | # CONFIG_EEPRO100 is not set | 677 | # CONFIG_NETDEV_10000 is not set |
| 673 | # CONFIG_E100 is not set | ||
| 674 | # CONFIG_FEALNX is not set | ||
| 675 | # CONFIG_NATSEMI is not set | ||
| 676 | # CONFIG_NE2K_PCI is not set | ||
| 677 | # CONFIG_8139CP is not set | ||
| 678 | CONFIG_8139TOO=y | ||
| 679 | CONFIG_8139TOO_PIO=y | ||
| 680 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
| 681 | # CONFIG_8139TOO_8129 is not set | ||
| 682 | # CONFIG_8139_OLD_RX_RESET is not set | ||
| 683 | # CONFIG_R6040 is not set | ||
| 684 | # CONFIG_SIS900 is not set | ||
| 685 | # CONFIG_EPIC100 is not set | ||
| 686 | # CONFIG_SUNDANCE is not set | ||
| 687 | # CONFIG_TLAN is not set | ||
| 688 | # CONFIG_VIA_RHINE is not set | ||
| 689 | # CONFIG_SC92031 is not set | ||
| 690 | CONFIG_NETDEV_1000=y | ||
| 691 | # CONFIG_ACENIC is not set | ||
| 692 | # CONFIG_DL2K is not set | ||
| 693 | # CONFIG_E1000 is not set | ||
| 694 | # CONFIG_E1000E is not set | ||
| 695 | # CONFIG_E1000E_ENABLED is not set | ||
| 696 | # CONFIG_IP1000 is not set | ||
| 697 | # CONFIG_IGB is not set | ||
| 698 | # CONFIG_NS83820 is not set | ||
| 699 | # CONFIG_HAMACHI is not set | ||
| 700 | # CONFIG_YELLOWFIN is not set | ||
| 701 | # CONFIG_R8169 is not set | ||
| 702 | # CONFIG_SIS190 is not set | ||
| 703 | # CONFIG_SKGE is not set | ||
| 704 | # CONFIG_SKY2 is not set | ||
| 705 | # CONFIG_SK98LIN is not set | ||
| 706 | # CONFIG_VIA_VELOCITY is not set | ||
| 707 | # CONFIG_TIGON3 is not set | ||
| 708 | # CONFIG_BNX2 is not set | ||
| 709 | # CONFIG_GIANFAR is not set | ||
| 710 | # CONFIG_QLA3XXX is not set | ||
| 711 | # CONFIG_ATL1 is not set | ||
| 712 | CONFIG_NETDEV_10000=y | ||
| 713 | # CONFIG_CHELSIO_T1 is not set | ||
| 714 | # CONFIG_CHELSIO_T3 is not set | ||
| 715 | # CONFIG_IXGBE is not set | ||
| 716 | # CONFIG_IXGB is not set | ||
| 717 | # CONFIG_S2IO is not set | ||
| 718 | # CONFIG_MYRI10GE is not set | ||
| 719 | # CONFIG_NETXEN_NIC is not set | ||
| 720 | # CONFIG_NIU is not set | ||
| 721 | # CONFIG_MLX4_CORE is not set | ||
| 722 | # CONFIG_TEHUTI is not set | ||
| 723 | # CONFIG_BNX2X is not set | ||
| 724 | # CONFIG_TR is not set | 678 | # CONFIG_TR is not set |
| 725 | 679 | ||
| 726 | # | 680 | # |
| @@ -728,6 +682,7 @@ CONFIG_NETDEV_10000=y | |||
| 728 | # | 682 | # |
| 729 | # CONFIG_WLAN_PRE80211 is not set | 683 | # CONFIG_WLAN_PRE80211 is not set |
| 730 | # CONFIG_WLAN_80211 is not set | 684 | # CONFIG_WLAN_80211 is not set |
| 685 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 731 | # CONFIG_WAN is not set | 686 | # CONFIG_WAN is not set |
| 732 | # CONFIG_FDDI is not set | 687 | # CONFIG_FDDI is not set |
| 733 | # CONFIG_HIPPI is not set | 688 | # CONFIG_HIPPI is not set |
| @@ -783,6 +738,7 @@ CONFIG_VT=y | |||
| 783 | CONFIG_VT_CONSOLE=y | 738 | CONFIG_VT_CONSOLE=y |
| 784 | CONFIG_HW_CONSOLE=y | 739 | CONFIG_HW_CONSOLE=y |
| 785 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 740 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 741 | CONFIG_DEVKMEM=y | ||
| 786 | # CONFIG_SERIAL_NONSTANDARD is not set | 742 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 787 | # CONFIG_NOZOMI is not set | 743 | # CONFIG_NOZOMI is not set |
| 788 | 744 | ||
| @@ -824,13 +780,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 824 | # CONFIG_I2C_CHARDEV is not set | 780 | # CONFIG_I2C_CHARDEV is not set |
| 825 | 781 | ||
| 826 | # | 782 | # |
| 827 | # I2C Algorithms | ||
| 828 | # | ||
| 829 | # CONFIG_I2C_ALGOBIT is not set | ||
| 830 | # CONFIG_I2C_ALGOPCF is not set | ||
| 831 | # CONFIG_I2C_ALGOPCA is not set | ||
| 832 | |||
| 833 | # | ||
| 834 | # I2C Hardware Bus support | 783 | # I2C Hardware Bus support |
| 835 | # | 784 | # |
| 836 | # CONFIG_I2C_ALI1535 is not set | 785 | # CONFIG_I2C_ALI1535 is not set |
| @@ -852,9 +801,11 @@ CONFIG_I2C_MPC=y | |||
| 852 | # CONFIG_I2C_SIS630 is not set | 801 | # CONFIG_I2C_SIS630 is not set |
| 853 | # CONFIG_I2C_SIS96X is not set | 802 | # CONFIG_I2C_SIS96X is not set |
| 854 | # CONFIG_I2C_TAOS_EVM is not set | 803 | # CONFIG_I2C_TAOS_EVM is not set |
| 804 | # CONFIG_I2C_STUB is not set | ||
| 855 | # CONFIG_I2C_VIA is not set | 805 | # CONFIG_I2C_VIA is not set |
| 856 | # CONFIG_I2C_VIAPRO is not set | 806 | # CONFIG_I2C_VIAPRO is not set |
| 857 | # CONFIG_I2C_VOODOO3 is not set | 807 | # CONFIG_I2C_VOODOO3 is not set |
| 808 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 858 | 809 | ||
| 859 | # | 810 | # |
| 860 | # Miscellaneous I2C Chip support | 811 | # Miscellaneous I2C Chip support |
| @@ -864,19 +815,13 @@ CONFIG_I2C_MPC=y | |||
| 864 | # CONFIG_SENSORS_PCF8574 is not set | 815 | # CONFIG_SENSORS_PCF8574 is not set |
| 865 | # CONFIG_PCF8575 is not set | 816 | # CONFIG_PCF8575 is not set |
| 866 | # CONFIG_SENSORS_PCF8591 is not set | 817 | # CONFIG_SENSORS_PCF8591 is not set |
| 867 | # CONFIG_TPS65010 is not set | ||
| 868 | # CONFIG_SENSORS_MAX6875 is not set | 818 | # CONFIG_SENSORS_MAX6875 is not set |
| 869 | # CONFIG_SENSORS_TSL2550 is not set | 819 | # CONFIG_SENSORS_TSL2550 is not set |
| 870 | # CONFIG_I2C_DEBUG_CORE is not set | 820 | # CONFIG_I2C_DEBUG_CORE is not set |
| 871 | # CONFIG_I2C_DEBUG_ALGO is not set | 821 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 872 | # CONFIG_I2C_DEBUG_BUS is not set | 822 | # CONFIG_I2C_DEBUG_BUS is not set |
| 873 | # CONFIG_I2C_DEBUG_CHIP is not set | 823 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 874 | |||
| 875 | # | ||
| 876 | # SPI support | ||
| 877 | # | ||
| 878 | # CONFIG_SPI is not set | 824 | # CONFIG_SPI is not set |
| 879 | # CONFIG_SPI_MASTER is not set | ||
| 880 | # CONFIG_W1 is not set | 825 | # CONFIG_W1 is not set |
| 881 | # CONFIG_POWER_SUPPLY is not set | 826 | # CONFIG_POWER_SUPPLY is not set |
| 882 | # CONFIG_HWMON is not set | 827 | # CONFIG_HWMON is not set |
| @@ -893,12 +838,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 893 | # Multifunction device drivers | 838 | # Multifunction device drivers |
| 894 | # | 839 | # |
| 895 | # CONFIG_MFD_SM501 is not set | 840 | # CONFIG_MFD_SM501 is not set |
| 841 | # CONFIG_HTC_PASIC3 is not set | ||
| 896 | 842 | ||
| 897 | # | 843 | # |
| 898 | # Multimedia devices | 844 | # Multimedia devices |
| 899 | # | 845 | # |
| 846 | |||
| 847 | # | ||
| 848 | # Multimedia core support | ||
| 849 | # | ||
| 900 | # CONFIG_VIDEO_DEV is not set | 850 | # CONFIG_VIDEO_DEV is not set |
| 901 | # CONFIG_DVB_CORE is not set | 851 | # CONFIG_DVB_CORE is not set |
| 852 | # CONFIG_VIDEO_MEDIA is not set | ||
| 853 | |||
| 854 | # | ||
| 855 | # Multimedia drivers | ||
| 856 | # | ||
| 902 | CONFIG_DAB=y | 857 | CONFIG_DAB=y |
| 903 | 858 | ||
| 904 | # | 859 | # |
| @@ -908,7 +863,56 @@ CONFIG_DAB=y | |||
| 908 | # CONFIG_DRM is not set | 863 | # CONFIG_DRM is not set |
| 909 | # CONFIG_VGASTATE is not set | 864 | # CONFIG_VGASTATE is not set |
| 910 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 865 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| 911 | # CONFIG_FB is not set | 866 | CONFIG_FB=y |
| 867 | # CONFIG_FIRMWARE_EDID is not set | ||
| 868 | # CONFIG_FB_DDC is not set | ||
| 869 | CONFIG_FB_CFB_FILLRECT=y | ||
| 870 | CONFIG_FB_CFB_COPYAREA=y | ||
| 871 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 872 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 873 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 874 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 875 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 876 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 877 | # CONFIG_FB_SYS_FOPS is not set | ||
| 878 | # CONFIG_FB_SVGALIB is not set | ||
| 879 | # CONFIG_FB_MACMODES is not set | ||
| 880 | # CONFIG_FB_BACKLIGHT is not set | ||
| 881 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 882 | # CONFIG_FB_TILEBLITTING is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # Frame buffer hardware drivers | ||
| 886 | # | ||
| 887 | # CONFIG_FB_CIRRUS is not set | ||
| 888 | # CONFIG_FB_PM2 is not set | ||
| 889 | # CONFIG_FB_CYBER2000 is not set | ||
| 890 | # CONFIG_FB_OF is not set | ||
| 891 | # CONFIG_FB_CT65550 is not set | ||
| 892 | # CONFIG_FB_ASILIANT is not set | ||
| 893 | # CONFIG_FB_IMSTT is not set | ||
| 894 | # CONFIG_FB_VGA16 is not set | ||
| 895 | # CONFIG_FB_S1D13XXX is not set | ||
| 896 | # CONFIG_FB_NVIDIA is not set | ||
| 897 | # CONFIG_FB_RIVA is not set | ||
| 898 | # CONFIG_FB_MATROX is not set | ||
| 899 | # CONFIG_FB_RADEON is not set | ||
| 900 | # CONFIG_FB_ATY128 is not set | ||
| 901 | # CONFIG_FB_ATY is not set | ||
| 902 | # CONFIG_FB_S3 is not set | ||
| 903 | # CONFIG_FB_SAVAGE is not set | ||
| 904 | # CONFIG_FB_SIS is not set | ||
| 905 | # CONFIG_FB_NEOMAGIC is not set | ||
| 906 | # CONFIG_FB_KYRO is not set | ||
| 907 | # CONFIG_FB_3DFX is not set | ||
| 908 | # CONFIG_FB_VOODOO1 is not set | ||
| 909 | # CONFIG_FB_VT8623 is not set | ||
| 910 | # CONFIG_FB_TRIDENT is not set | ||
| 911 | # CONFIG_FB_ARK is not set | ||
| 912 | # CONFIG_FB_PM3 is not set | ||
| 913 | CONFIG_FB_FSL_DIU=y | ||
| 914 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 915 | # CONFIG_FB_VIRTUAL is not set | ||
| 912 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 916 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 913 | 917 | ||
| 914 | # | 918 | # |
| @@ -922,6 +926,8 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 922 | CONFIG_VGA_CONSOLE=y | 926 | CONFIG_VGA_CONSOLE=y |
| 923 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 927 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 924 | CONFIG_DUMMY_CONSOLE=y | 928 | CONFIG_DUMMY_CONSOLE=y |
| 929 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 930 | # CONFIG_LOGO is not set | ||
| 925 | 931 | ||
| 926 | # | 932 | # |
| 927 | # Sound | 933 | # Sound |
| @@ -938,7 +944,7 @@ CONFIG_SND_PCM=y | |||
| 938 | CONFIG_SND_OSSEMUL=y | 944 | CONFIG_SND_OSSEMUL=y |
| 939 | CONFIG_SND_MIXER_OSS=y | 945 | CONFIG_SND_MIXER_OSS=y |
| 940 | CONFIG_SND_PCM_OSS=y | 946 | CONFIG_SND_PCM_OSS=y |
| 941 | # CONFIG_SND_PCM_OSS_PLUGINS is not set | 947 | CONFIG_SND_PCM_OSS_PLUGINS=y |
| 942 | # CONFIG_SND_DYNAMIC_MINORS is not set | 948 | # CONFIG_SND_DYNAMIC_MINORS is not set |
| 943 | # CONFIG_SND_SUPPORT_OLD_API is not set | 949 | # CONFIG_SND_SUPPORT_OLD_API is not set |
| 944 | CONFIG_SND_VERBOSE_PROCFS=y | 950 | CONFIG_SND_VERBOSE_PROCFS=y |
| @@ -965,6 +971,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 965 | # CONFIG_SND_AU8810 is not set | 971 | # CONFIG_SND_AU8810 is not set |
| 966 | # CONFIG_SND_AU8820 is not set | 972 | # CONFIG_SND_AU8820 is not set |
| 967 | # CONFIG_SND_AU8830 is not set | 973 | # CONFIG_SND_AU8830 is not set |
| 974 | # CONFIG_SND_AW2 is not set | ||
| 968 | # CONFIG_SND_AZT3328 is not set | 975 | # CONFIG_SND_AZT3328 is not set |
| 969 | # CONFIG_SND_BT87X is not set | 976 | # CONFIG_SND_BT87X is not set |
| 970 | # CONFIG_SND_CA0106 is not set | 977 | # CONFIG_SND_CA0106 is not set |
| @@ -1031,14 +1038,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1031 | CONFIG_SND_SOC=y | 1038 | CONFIG_SND_SOC=y |
| 1032 | 1039 | ||
| 1033 | # | 1040 | # |
| 1034 | # SoC Audio support for SuperH | ||
| 1035 | # | ||
| 1036 | |||
| 1037 | # | ||
| 1038 | # ALSA SoC audio for Freescale SOCs | 1041 | # ALSA SoC audio for Freescale SOCs |
| 1039 | # | 1042 | # |
| 1040 | CONFIG_SND_SOC_MPC8610=y | 1043 | CONFIG_SND_SOC_MPC8610=y |
| 1041 | CONFIG_SND_SOC_MPC8610_HPCD=y | 1044 | CONFIG_SND_SOC_MPC8610_HPCD=y |
| 1045 | |||
| 1046 | # | ||
| 1047 | # SoC Audio for the Texas Instruments OMAP | ||
| 1048 | # | ||
| 1042 | CONFIG_SND_SOC_CS4270=y | 1049 | CONFIG_SND_SOC_CS4270=y |
| 1043 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y | 1050 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y |
| 1044 | 1051 | ||
| @@ -1055,6 +1062,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 1055 | CONFIG_USB_ARCH_HAS_OHCI=y | 1062 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1056 | CONFIG_USB_ARCH_HAS_EHCI=y | 1063 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1057 | # CONFIG_USB is not set | 1064 | # CONFIG_USB is not set |
| 1065 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1066 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1058 | 1067 | ||
| 1059 | # | 1068 | # |
| 1060 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1069 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1063,14 +1072,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 1063 | # CONFIG_MMC is not set | 1072 | # CONFIG_MMC is not set |
| 1064 | # CONFIG_MEMSTICK is not set | 1073 | # CONFIG_MEMSTICK is not set |
| 1065 | # CONFIG_NEW_LEDS is not set | 1074 | # CONFIG_NEW_LEDS is not set |
| 1075 | # CONFIG_ACCESSIBILITY is not set | ||
| 1066 | # CONFIG_INFINIBAND is not set | 1076 | # CONFIG_INFINIBAND is not set |
| 1067 | # CONFIG_EDAC is not set | 1077 | # CONFIG_EDAC is not set |
| 1068 | # CONFIG_RTC_CLASS is not set | 1078 | # CONFIG_RTC_CLASS is not set |
| 1069 | # CONFIG_DMADEVICES is not set | 1079 | # CONFIG_DMADEVICES is not set |
| 1070 | |||
| 1071 | # | ||
| 1072 | # Userspace I/O | ||
| 1073 | # | ||
| 1074 | # CONFIG_UIO is not set | 1080 | # CONFIG_UIO is not set |
| 1075 | 1081 | ||
| 1076 | # | 1082 | # |
| @@ -1090,7 +1096,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1090 | # CONFIG_JFS_FS is not set | 1096 | # CONFIG_JFS_FS is not set |
| 1091 | # CONFIG_FS_POSIX_ACL is not set | 1097 | # CONFIG_FS_POSIX_ACL is not set |
| 1092 | # CONFIG_XFS_FS is not set | 1098 | # CONFIG_XFS_FS is not set |
| 1093 | # CONFIG_GFS2_FS is not set | ||
| 1094 | # CONFIG_OCFS2_FS is not set | 1099 | # CONFIG_OCFS2_FS is not set |
| 1095 | # CONFIG_DNOTIFY is not set | 1100 | # CONFIG_DNOTIFY is not set |
| 1096 | # CONFIG_INOTIFY is not set | 1101 | # CONFIG_INOTIFY is not set |
| @@ -1134,6 +1139,7 @@ CONFIG_TMPFS=y | |||
| 1134 | # CONFIG_BEFS_FS is not set | 1139 | # CONFIG_BEFS_FS is not set |
| 1135 | # CONFIG_BFS_FS is not set | 1140 | # CONFIG_BFS_FS is not set |
| 1136 | # CONFIG_EFS_FS is not set | 1141 | # CONFIG_EFS_FS is not set |
| 1142 | # CONFIG_JFFS2_FS is not set | ||
| 1137 | # CONFIG_CRAMFS is not set | 1143 | # CONFIG_CRAMFS is not set |
| 1138 | # CONFIG_VXFS_FS is not set | 1144 | # CONFIG_VXFS_FS is not set |
| 1139 | # CONFIG_MINIX_FS is not set | 1145 | # CONFIG_MINIX_FS is not set |
| @@ -1147,10 +1153,9 @@ CONFIG_NFS_FS=y | |||
| 1147 | CONFIG_NFS_V3=y | 1153 | CONFIG_NFS_V3=y |
| 1148 | # CONFIG_NFS_V3_ACL is not set | 1154 | # CONFIG_NFS_V3_ACL is not set |
| 1149 | # CONFIG_NFS_V4 is not set | 1155 | # CONFIG_NFS_V4 is not set |
| 1150 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1151 | CONFIG_NFSD=y | 1156 | CONFIG_NFSD=y |
| 1152 | # CONFIG_NFSD_V3 is not set | 1157 | # CONFIG_NFSD_V3 is not set |
| 1153 | CONFIG_NFSD_TCP=y | 1158 | # CONFIG_NFSD_V4 is not set |
| 1154 | CONFIG_ROOT_NFS=y | 1159 | CONFIG_ROOT_NFS=y |
| 1155 | CONFIG_LOCKD=y | 1160 | CONFIG_LOCKD=y |
| 1156 | CONFIG_LOCKD_V4=y | 1161 | CONFIG_LOCKD_V4=y |
| @@ -1234,6 +1239,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1234 | # Library routines | 1239 | # Library routines |
| 1235 | # | 1240 | # |
| 1236 | CONFIG_BITREVERSE=y | 1241 | CONFIG_BITREVERSE=y |
| 1242 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1237 | # CONFIG_CRC_CCITT is not set | 1243 | # CONFIG_CRC_CCITT is not set |
| 1238 | # CONFIG_CRC16 is not set | 1244 | # CONFIG_CRC16 is not set |
| 1239 | # CONFIG_CRC_ITU_T is not set | 1245 | # CONFIG_CRC_ITU_T is not set |
| @@ -1244,6 +1250,7 @@ CONFIG_PLIST=y | |||
| 1244 | CONFIG_HAS_IOMEM=y | 1250 | CONFIG_HAS_IOMEM=y |
| 1245 | CONFIG_HAS_IOPORT=y | 1251 | CONFIG_HAS_IOPORT=y |
| 1246 | CONFIG_HAS_DMA=y | 1252 | CONFIG_HAS_DMA=y |
| 1253 | CONFIG_HAVE_LMB=y | ||
| 1247 | 1254 | ||
| 1248 | # | 1255 | # |
| 1249 | # Kernel hacking | 1256 | # Kernel hacking |
| @@ -1251,6 +1258,7 @@ CONFIG_HAS_DMA=y | |||
| 1251 | # CONFIG_PRINTK_TIME is not set | 1258 | # CONFIG_PRINTK_TIME is not set |
| 1252 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1259 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1253 | CONFIG_ENABLE_MUST_CHECK=y | 1260 | CONFIG_ENABLE_MUST_CHECK=y |
| 1261 | CONFIG_FRAME_WARN=1024 | ||
| 1254 | # CONFIG_MAGIC_SYSRQ is not set | 1262 | # CONFIG_MAGIC_SYSRQ is not set |
| 1255 | # CONFIG_UNUSED_SYMBOLS is not set | 1263 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1256 | # CONFIG_DEBUG_FS is not set | 1264 | # CONFIG_DEBUG_FS is not set |
| @@ -1261,6 +1269,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1261 | CONFIG_SCHED_DEBUG=y | 1269 | CONFIG_SCHED_DEBUG=y |
| 1262 | # CONFIG_SCHEDSTATS is not set | 1270 | # CONFIG_SCHEDSTATS is not set |
| 1263 | # CONFIG_TIMER_STATS is not set | 1271 | # CONFIG_TIMER_STATS is not set |
| 1272 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1264 | # CONFIG_SLUB_DEBUG_ON is not set | 1273 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1265 | # CONFIG_SLUB_STATS is not set | 1274 | # CONFIG_SLUB_STATS is not set |
| 1266 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1275 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1274,9 +1283,11 @@ CONFIG_SCHED_DEBUG=y | |||
| 1274 | CONFIG_DEBUG_BUGVERBOSE=y | 1283 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1275 | CONFIG_DEBUG_INFO=y | 1284 | CONFIG_DEBUG_INFO=y |
| 1276 | # CONFIG_DEBUG_VM is not set | 1285 | # CONFIG_DEBUG_VM is not set |
| 1286 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1277 | # CONFIG_DEBUG_LIST is not set | 1287 | # CONFIG_DEBUG_LIST is not set |
| 1278 | # CONFIG_DEBUG_SG is not set | 1288 | # CONFIG_DEBUG_SG is not set |
| 1279 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1289 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1290 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1280 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1291 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1281 | # CONFIG_FAULT_INJECTION is not set | 1292 | # CONFIG_FAULT_INJECTION is not set |
| 1282 | # CONFIG_SAMPLES is not set | 1293 | # CONFIG_SAMPLES is not set |
| @@ -1284,6 +1295,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1284 | # CONFIG_DEBUG_STACK_USAGE is not set | 1295 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1285 | # CONFIG_DEBUG_PAGEALLOC is not set | 1296 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1286 | # CONFIG_DEBUGGER is not set | 1297 | # CONFIG_DEBUGGER is not set |
| 1298 | # CONFIG_IRQSTACKS is not set | ||
| 1287 | # CONFIG_BDI_SWITCH is not set | 1299 | # CONFIG_BDI_SWITCH is not set |
| 1288 | # CONFIG_PPC_EARLY_DEBUG is not set | 1300 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1289 | 1301 | ||
| @@ -1294,48 +1306,80 @@ CONFIG_DEBUG_INFO=y | |||
| 1294 | # CONFIG_SECURITY is not set | 1306 | # CONFIG_SECURITY is not set |
| 1295 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1307 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1296 | CONFIG_CRYPTO=y | 1308 | CONFIG_CRYPTO=y |
| 1297 | # CONFIG_CRYPTO_SEQIV is not set | 1309 | |
| 1310 | # | ||
| 1311 | # Crypto core or helper | ||
| 1312 | # | ||
| 1298 | # CONFIG_CRYPTO_MANAGER is not set | 1313 | # CONFIG_CRYPTO_MANAGER is not set |
| 1314 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1315 | # CONFIG_CRYPTO_NULL is not set | ||
| 1316 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1317 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1318 | # CONFIG_CRYPTO_TEST is not set | ||
| 1319 | |||
| 1320 | # | ||
| 1321 | # Authenticated Encryption with Associated Data | ||
| 1322 | # | ||
| 1323 | # CONFIG_CRYPTO_CCM is not set | ||
| 1324 | # CONFIG_CRYPTO_GCM is not set | ||
| 1325 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1326 | |||
| 1327 | # | ||
| 1328 | # Block modes | ||
| 1329 | # | ||
| 1330 | # CONFIG_CRYPTO_CBC is not set | ||
| 1331 | # CONFIG_CRYPTO_CTR is not set | ||
| 1332 | # CONFIG_CRYPTO_CTS is not set | ||
| 1333 | # CONFIG_CRYPTO_ECB is not set | ||
| 1334 | # CONFIG_CRYPTO_LRW is not set | ||
| 1335 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1336 | # CONFIG_CRYPTO_XTS is not set | ||
| 1337 | |||
| 1338 | # | ||
| 1339 | # Hash modes | ||
| 1340 | # | ||
| 1299 | # CONFIG_CRYPTO_HMAC is not set | 1341 | # CONFIG_CRYPTO_HMAC is not set |
| 1300 | # CONFIG_CRYPTO_XCBC is not set | 1342 | # CONFIG_CRYPTO_XCBC is not set |
| 1301 | # CONFIG_CRYPTO_NULL is not set | 1343 | |
| 1344 | # | ||
| 1345 | # Digest | ||
| 1346 | # | ||
| 1347 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1302 | # CONFIG_CRYPTO_MD4 is not set | 1348 | # CONFIG_CRYPTO_MD4 is not set |
| 1303 | # CONFIG_CRYPTO_MD5 is not set | 1349 | # CONFIG_CRYPTO_MD5 is not set |
| 1350 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1304 | # CONFIG_CRYPTO_SHA1 is not set | 1351 | # CONFIG_CRYPTO_SHA1 is not set |
| 1305 | # CONFIG_CRYPTO_SHA256 is not set | 1352 | # CONFIG_CRYPTO_SHA256 is not set |
| 1306 | # CONFIG_CRYPTO_SHA512 is not set | 1353 | # CONFIG_CRYPTO_SHA512 is not set |
| 1307 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1308 | # CONFIG_CRYPTO_TGR192 is not set | 1354 | # CONFIG_CRYPTO_TGR192 is not set |
| 1309 | # CONFIG_CRYPTO_GF128MUL is not set | 1355 | # CONFIG_CRYPTO_WP512 is not set |
| 1310 | # CONFIG_CRYPTO_ECB is not set | 1356 | |
| 1311 | # CONFIG_CRYPTO_CBC is not set | 1357 | # |
| 1312 | # CONFIG_CRYPTO_PCBC is not set | 1358 | # Ciphers |
| 1313 | # CONFIG_CRYPTO_LRW is not set | 1359 | # |
| 1314 | # CONFIG_CRYPTO_XTS is not set | ||
| 1315 | # CONFIG_CRYPTO_CTR is not set | ||
| 1316 | # CONFIG_CRYPTO_GCM is not set | ||
| 1317 | # CONFIG_CRYPTO_CCM is not set | ||
| 1318 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1319 | # CONFIG_CRYPTO_DES is not set | ||
| 1320 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1321 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1322 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1323 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1324 | # CONFIG_CRYPTO_AES is not set | 1360 | # CONFIG_CRYPTO_AES is not set |
| 1361 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1362 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1363 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1364 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1325 | # CONFIG_CRYPTO_CAST5 is not set | 1365 | # CONFIG_CRYPTO_CAST5 is not set |
| 1326 | # CONFIG_CRYPTO_CAST6 is not set | 1366 | # CONFIG_CRYPTO_CAST6 is not set |
| 1327 | # CONFIG_CRYPTO_TEA is not set | 1367 | # CONFIG_CRYPTO_DES is not set |
| 1328 | # CONFIG_CRYPTO_ARC4 is not set | 1368 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1329 | # CONFIG_CRYPTO_KHAZAD is not set | 1369 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1330 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1331 | # CONFIG_CRYPTO_SEED is not set | ||
| 1332 | # CONFIG_CRYPTO_SALSA20 is not set | 1370 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1371 | # CONFIG_CRYPTO_SEED is not set | ||
| 1372 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1373 | # CONFIG_CRYPTO_TEA is not set | ||
| 1374 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1375 | |||
| 1376 | # | ||
| 1377 | # Compression | ||
| 1378 | # | ||
| 1333 | # CONFIG_CRYPTO_DEFLATE is not set | 1379 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1334 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1335 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1336 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1337 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1338 | # CONFIG_CRYPTO_LZO is not set | 1380 | # CONFIG_CRYPTO_LZO is not set |
| 1339 | CONFIG_CRYPTO_HW=y | 1381 | CONFIG_CRYPTO_HW=y |
| 1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1382 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1341 | # CONFIG_PPC_CLOCK is not set | 1383 | # CONFIG_PPC_CLOCK is not set |
| 1384 | CONFIG_PPC_LIB_RHEAP=y | ||
| 1385 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index d01dcdb70bd7..4a8171507391 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:11 2008 | 4 | # Mon Jun 9 08:52:15 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_PPC_86xx=y | |||
| 162 | # CONFIG_PPC_CELL_NATIVE is not set | 167 | # CONFIG_PPC_CELL_NATIVE is not set |
| 163 | # CONFIG_PQ2ADS is not set | 168 | # CONFIG_PQ2ADS is not set |
| 164 | CONFIG_MPC8641_HPCN=y | 169 | CONFIG_MPC8641_HPCN=y |
| 170 | # CONFIG_SBC8641D is not set | ||
| 165 | # CONFIG_MPC8610_HPCD is not set | 171 | # CONFIG_MPC8610_HPCD is not set |
| 166 | CONFIG_MPC8641=y | 172 | CONFIG_MPC8641=y |
| 167 | # CONFIG_IPIC is not set | 173 | # CONFIG_IPIC is not set |
| @@ -211,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -240,6 +248,8 @@ CONFIG_PCI_LEGACY=y | |||
| 240 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
| 241 | # CONFIG_PCCARD is not set | 249 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HOTPLUG_PCI is not set | 250 | # CONFIG_HOTPLUG_PCI is not set |
| 251 | CONFIG_HAS_RAPIDIO=y | ||
| 252 | # CONFIG_RAPIDIO is not set | ||
| 243 | 253 | ||
| 244 | # | 254 | # |
| 245 | # Advanced setup | 255 | # Advanced setup |
| @@ -249,11 +259,11 @@ CONFIG_PCI_LEGACY=y | |||
| 249 | # | 259 | # |
| 250 | # Default settings for advanced configuration options are used | 260 | # Default settings for advanced configuration options are used |
| 251 | # | 261 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 262 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 263 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 264 | CONFIG_KERNEL_START=0xc0000000 |
| 265 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 267 | ||
| 258 | # | 268 | # |
| 259 | # Networking | 269 | # Networking |
| @@ -324,8 +334,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 324 | CONFIG_INET6_XFRM_MODE_BEET=y | 334 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 325 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 326 | CONFIG_IPV6_SIT=y | 336 | CONFIG_IPV6_SIT=y |
| 337 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 327 | # CONFIG_IPV6_TUNNEL is not set | 338 | # CONFIG_IPV6_TUNNEL is not set |
| 328 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 339 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 340 | # CONFIG_IPV6_MROUTE is not set | ||
| 329 | # CONFIG_NETWORK_SECMARK is not set | 341 | # CONFIG_NETWORK_SECMARK is not set |
| 330 | # CONFIG_NETFILTER is not set | 342 | # CONFIG_NETFILTER is not set |
| 331 | # CONFIG_IP_DCCP is not set | 343 | # CONFIG_IP_DCCP is not set |
| @@ -387,6 +399,7 @@ CONFIG_FW_LOADER=y | |||
| 387 | # CONFIG_CONNECTOR is not set | 399 | # CONFIG_CONNECTOR is not set |
| 388 | # CONFIG_MTD is not set | 400 | # CONFIG_MTD is not set |
| 389 | CONFIG_OF_DEVICE=y | 401 | CONFIG_OF_DEVICE=y |
| 402 | CONFIG_OF_I2C=y | ||
| 390 | # CONFIG_PARPORT is not set | 403 | # CONFIG_PARPORT is not set |
| 391 | CONFIG_BLK_DEV=y | 404 | CONFIG_BLK_DEV=y |
| 392 | # CONFIG_BLK_DEV_FD is not set | 405 | # CONFIG_BLK_DEV_FD is not set |
| @@ -493,7 +506,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 493 | # CONFIG_SCSI_SRP is not set | 506 | # CONFIG_SCSI_SRP is not set |
| 494 | CONFIG_ATA=y | 507 | CONFIG_ATA=y |
| 495 | # CONFIG_ATA_NONSTANDARD is not set | 508 | # CONFIG_ATA_NONSTANDARD is not set |
| 509 | CONFIG_SATA_PMP=y | ||
| 496 | CONFIG_SATA_AHCI=y | 510 | CONFIG_SATA_AHCI=y |
| 511 | # CONFIG_SATA_SIL24 is not set | ||
| 512 | # CONFIG_SATA_FSL is not set | ||
| 513 | CONFIG_ATA_SFF=y | ||
| 497 | # CONFIG_SATA_SVW is not set | 514 | # CONFIG_SATA_SVW is not set |
| 498 | # CONFIG_ATA_PIIX is not set | 515 | # CONFIG_ATA_PIIX is not set |
| 499 | # CONFIG_SATA_MV is not set | 516 | # CONFIG_SATA_MV is not set |
| @@ -503,13 +520,11 @@ CONFIG_SATA_AHCI=y | |||
| 503 | # CONFIG_SATA_PROMISE is not set | 520 | # CONFIG_SATA_PROMISE is not set |
| 504 | # CONFIG_SATA_SX4 is not set | 521 | # CONFIG_SATA_SX4 is not set |
| 505 | # CONFIG_SATA_SIL is not set | 522 | # CONFIG_SATA_SIL is not set |
| 506 | # CONFIG_SATA_SIL24 is not set | ||
| 507 | # CONFIG_SATA_SIS is not set | 523 | # CONFIG_SATA_SIS is not set |
| 508 | # CONFIG_SATA_ULI is not set | 524 | # CONFIG_SATA_ULI is not set |
| 509 | # CONFIG_SATA_VIA is not set | 525 | # CONFIG_SATA_VIA is not set |
| 510 | # CONFIG_SATA_VITESSE is not set | 526 | # CONFIG_SATA_VITESSE is not set |
| 511 | # CONFIG_SATA_INIC162X is not set | 527 | # CONFIG_SATA_INIC162X is not set |
| 512 | # CONFIG_SATA_FSL is not set | ||
| 513 | CONFIG_PATA_ALI=y | 528 | CONFIG_PATA_ALI=y |
| 514 | # CONFIG_PATA_AMD is not set | 529 | # CONFIG_PATA_AMD is not set |
| 515 | # CONFIG_PATA_ARTOP is not set | 530 | # CONFIG_PATA_ARTOP is not set |
| @@ -549,6 +564,7 @@ CONFIG_PATA_ALI=y | |||
| 549 | # CONFIG_PATA_VIA is not set | 564 | # CONFIG_PATA_VIA is not set |
| 550 | # CONFIG_PATA_WINBOND is not set | 565 | # CONFIG_PATA_WINBOND is not set |
| 551 | # CONFIG_PATA_PLATFORM is not set | 566 | # CONFIG_PATA_PLATFORM is not set |
| 567 | # CONFIG_PATA_SCH is not set | ||
| 552 | # CONFIG_MD is not set | 568 | # CONFIG_MD is not set |
| 553 | # CONFIG_FUSION is not set | 569 | # CONFIG_FUSION is not set |
| 554 | 570 | ||
| @@ -614,7 +630,6 @@ CONFIG_NETDEV_1000=y | |||
| 614 | # CONFIG_SIS190 is not set | 630 | # CONFIG_SIS190 is not set |
| 615 | # CONFIG_SKGE is not set | 631 | # CONFIG_SKGE is not set |
| 616 | # CONFIG_SKY2 is not set | 632 | # CONFIG_SKY2 is not set |
| 617 | # CONFIG_SK98LIN is not set | ||
| 618 | # CONFIG_VIA_VELOCITY is not set | 633 | # CONFIG_VIA_VELOCITY is not set |
| 619 | # CONFIG_TIGON3 is not set | 634 | # CONFIG_TIGON3 is not set |
| 620 | # CONFIG_BNX2 is not set | 635 | # CONFIG_BNX2 is not set |
| @@ -634,6 +649,7 @@ CONFIG_NETDEV_10000=y | |||
| 634 | # CONFIG_MLX4_CORE is not set | 649 | # CONFIG_MLX4_CORE is not set |
| 635 | # CONFIG_TEHUTI is not set | 650 | # CONFIG_TEHUTI is not set |
| 636 | # CONFIG_BNX2X is not set | 651 | # CONFIG_BNX2X is not set |
| 652 | # CONFIG_SFC is not set | ||
| 637 | # CONFIG_TR is not set | 653 | # CONFIG_TR is not set |
| 638 | 654 | ||
| 639 | # | 655 | # |
| @@ -641,6 +657,7 @@ CONFIG_NETDEV_10000=y | |||
| 641 | # | 657 | # |
| 642 | # CONFIG_WLAN_PRE80211 is not set | 658 | # CONFIG_WLAN_PRE80211 is not set |
| 643 | # CONFIG_WLAN_80211 is not set | 659 | # CONFIG_WLAN_80211 is not set |
| 660 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 644 | 661 | ||
| 645 | # | 662 | # |
| 646 | # USB Network Adapters | 663 | # USB Network Adapters |
| @@ -705,6 +722,7 @@ CONFIG_VT=y | |||
| 705 | CONFIG_VT_CONSOLE=y | 722 | CONFIG_VT_CONSOLE=y |
| 706 | CONFIG_HW_CONSOLE=y | 723 | CONFIG_HW_CONSOLE=y |
| 707 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 724 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 725 | CONFIG_DEVKMEM=y | ||
| 708 | # CONFIG_SERIAL_NONSTANDARD is not set | 726 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 709 | # CONFIG_NOZOMI is not set | 727 | # CONFIG_NOZOMI is not set |
| 710 | 728 | ||
| @@ -736,7 +754,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 736 | # CONFIG_IPMI_HANDLER is not set | 754 | # CONFIG_IPMI_HANDLER is not set |
| 737 | # CONFIG_HW_RANDOM is not set | 755 | # CONFIG_HW_RANDOM is not set |
| 738 | CONFIG_NVRAM=y | 756 | CONFIG_NVRAM=y |
| 739 | # CONFIG_GEN_RTC is not set | ||
| 740 | # CONFIG_R3964 is not set | 757 | # CONFIG_R3964 is not set |
| 741 | # CONFIG_APPLICOM is not set | 758 | # CONFIG_APPLICOM is not set |
| 742 | # CONFIG_RAW_DRIVER is not set | 759 | # CONFIG_RAW_DRIVER is not set |
| @@ -747,13 +764,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 747 | # CONFIG_I2C_CHARDEV is not set | 764 | # CONFIG_I2C_CHARDEV is not set |
| 748 | 765 | ||
| 749 | # | 766 | # |
| 750 | # I2C Algorithms | ||
| 751 | # | ||
| 752 | # CONFIG_I2C_ALGOBIT is not set | ||
| 753 | # CONFIG_I2C_ALGOPCF is not set | ||
| 754 | # CONFIG_I2C_ALGOPCA is not set | ||
| 755 | |||
| 756 | # | ||
| 757 | # I2C Hardware Bus support | 767 | # I2C Hardware Bus support |
| 758 | # | 768 | # |
| 759 | # CONFIG_I2C_ALI1535 is not set | 769 | # CONFIG_I2C_ALI1535 is not set |
| @@ -780,6 +790,7 @@ CONFIG_I2C_MPC=y | |||
| 780 | # CONFIG_I2C_VIA is not set | 790 | # CONFIG_I2C_VIA is not set |
| 781 | # CONFIG_I2C_VIAPRO is not set | 791 | # CONFIG_I2C_VIAPRO is not set |
| 782 | # CONFIG_I2C_VOODOO3 is not set | 792 | # CONFIG_I2C_VOODOO3 is not set |
| 793 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 783 | 794 | ||
| 784 | # | 795 | # |
| 785 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
| @@ -789,19 +800,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 789 | # CONFIG_SENSORS_PCF8574 is not set | 800 | # CONFIG_SENSORS_PCF8574 is not set |
| 790 | # CONFIG_PCF8575 is not set | 801 | # CONFIG_PCF8575 is not set |
| 791 | # CONFIG_SENSORS_PCF8591 is not set | 802 | # CONFIG_SENSORS_PCF8591 is not set |
| 792 | # CONFIG_TPS65010 is not set | ||
| 793 | # CONFIG_SENSORS_MAX6875 is not set | 803 | # CONFIG_SENSORS_MAX6875 is not set |
| 794 | # CONFIG_SENSORS_TSL2550 is not set | 804 | # CONFIG_SENSORS_TSL2550 is not set |
| 795 | # CONFIG_I2C_DEBUG_CORE is not set | 805 | # CONFIG_I2C_DEBUG_CORE is not set |
| 796 | # CONFIG_I2C_DEBUG_ALGO is not set | 806 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 797 | # CONFIG_I2C_DEBUG_BUS is not set | 807 | # CONFIG_I2C_DEBUG_BUS is not set |
| 798 | # CONFIG_I2C_DEBUG_CHIP is not set | 808 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 799 | |||
| 800 | # | ||
| 801 | # SPI support | ||
| 802 | # | ||
| 803 | # CONFIG_SPI is not set | 809 | # CONFIG_SPI is not set |
| 804 | # CONFIG_SPI_MASTER is not set | ||
| 805 | # CONFIG_W1 is not set | 810 | # CONFIG_W1 is not set |
| 806 | # CONFIG_POWER_SUPPLY is not set | 811 | # CONFIG_POWER_SUPPLY is not set |
| 807 | # CONFIG_HWMON is not set | 812 | # CONFIG_HWMON is not set |
| @@ -818,13 +823,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 818 | # Multifunction device drivers | 823 | # Multifunction device drivers |
| 819 | # | 824 | # |
| 820 | # CONFIG_MFD_SM501 is not set | 825 | # CONFIG_MFD_SM501 is not set |
| 826 | # CONFIG_HTC_PASIC3 is not set | ||
| 821 | 827 | ||
| 822 | # | 828 | # |
| 823 | # Multimedia devices | 829 | # Multimedia devices |
| 824 | # | 830 | # |
| 831 | |||
| 832 | # | ||
| 833 | # Multimedia core support | ||
| 834 | # | ||
| 825 | # CONFIG_VIDEO_DEV is not set | 835 | # CONFIG_VIDEO_DEV is not set |
| 826 | CONFIG_DVB_CORE=m | 836 | CONFIG_DVB_CORE=m |
| 827 | # CONFIG_DVB_CORE_ATTACH is not set | 837 | CONFIG_VIDEO_MEDIA=m |
| 838 | |||
| 839 | # | ||
| 840 | # Multimedia drivers | ||
| 841 | # | ||
| 842 | # CONFIG_MEDIA_ATTACH is not set | ||
| 843 | CONFIG_MEDIA_TUNER=m | ||
| 844 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 845 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 846 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 847 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 848 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 849 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 850 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 851 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 852 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 828 | CONFIG_DVB_CAPTURE_DRIVERS=y | 853 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 829 | 854 | ||
| 830 | # | 855 | # |
| @@ -867,14 +892,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 867 | # | 892 | # |
| 868 | # DVB-S (satellite) frontends | 893 | # DVB-S (satellite) frontends |
| 869 | # | 894 | # |
| 870 | # CONFIG_DVB_STV0299 is not set | ||
| 871 | # CONFIG_DVB_CX24110 is not set | 895 | # CONFIG_DVB_CX24110 is not set |
| 872 | # CONFIG_DVB_CX24123 is not set | 896 | # CONFIG_DVB_CX24123 is not set |
| 873 | # CONFIG_DVB_TDA8083 is not set | ||
| 874 | # CONFIG_DVB_MT312 is not set | 897 | # CONFIG_DVB_MT312 is not set |
| 875 | # CONFIG_DVB_VES1X93 is not set | ||
| 876 | # CONFIG_DVB_S5H1420 is not set | 898 | # CONFIG_DVB_S5H1420 is not set |
| 899 | # CONFIG_DVB_STV0299 is not set | ||
| 900 | # CONFIG_DVB_TDA8083 is not set | ||
| 877 | # CONFIG_DVB_TDA10086 is not set | 901 | # CONFIG_DVB_TDA10086 is not set |
| 902 | # CONFIG_DVB_VES1X93 is not set | ||
| 903 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 904 | # CONFIG_DVB_TDA826X is not set | ||
| 905 | # CONFIG_DVB_TUA6100 is not set | ||
| 878 | 906 | ||
| 879 | # | 907 | # |
| 880 | # DVB-T (terrestrial) frontends | 908 | # DVB-T (terrestrial) frontends |
| @@ -892,6 +920,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 892 | # CONFIG_DVB_DIB3000MC is not set | 920 | # CONFIG_DVB_DIB3000MC is not set |
| 893 | # CONFIG_DVB_DIB7000M is not set | 921 | # CONFIG_DVB_DIB7000M is not set |
| 894 | # CONFIG_DVB_DIB7000P is not set | 922 | # CONFIG_DVB_DIB7000P is not set |
| 923 | # CONFIG_DVB_TDA10048 is not set | ||
| 895 | 924 | ||
| 896 | # | 925 | # |
| 897 | # DVB-C (cable) frontends | 926 | # DVB-C (cable) frontends |
| @@ -910,27 +939,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 910 | # CONFIG_DVB_BCM3510 is not set | 939 | # CONFIG_DVB_BCM3510 is not set |
| 911 | # CONFIG_DVB_LGDT330X is not set | 940 | # CONFIG_DVB_LGDT330X is not set |
| 912 | # CONFIG_DVB_S5H1409 is not set | 941 | # CONFIG_DVB_S5H1409 is not set |
| 942 | # CONFIG_DVB_AU8522 is not set | ||
| 943 | # CONFIG_DVB_S5H1411 is not set | ||
| 913 | 944 | ||
| 914 | # | 945 | # |
| 915 | # Tuners/PLL support | 946 | # Digital terrestrial only tuners/PLL |
| 916 | # | 947 | # |
| 917 | # CONFIG_DVB_PLL is not set | 948 | # CONFIG_DVB_PLL is not set |
| 918 | # CONFIG_DVB_TDA826X is not set | ||
| 919 | # CONFIG_DVB_TDA827X is not set | ||
| 920 | # CONFIG_DVB_TDA18271 is not set | ||
| 921 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 922 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 923 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 924 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 925 | # CONFIG_DVB_TUNER_DIB0070 is not set | 949 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 926 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 927 | 950 | ||
| 928 | # | 951 | # |
| 929 | # Miscellaneous devices | 952 | # SEC control devices for DVB-S |
| 930 | # | 953 | # |
| 931 | # CONFIG_DVB_LNBP21 is not set | 954 | # CONFIG_DVB_LNBP21 is not set |
| 955 | # CONFIG_DVB_ISL6405 is not set | ||
| 932 | # CONFIG_DVB_ISL6421 is not set | 956 | # CONFIG_DVB_ISL6421 is not set |
| 933 | # CONFIG_DVB_TUA6100 is not set | ||
| 934 | CONFIG_DAB=y | 957 | CONFIG_DAB=y |
| 935 | # CONFIG_USB_DABUSB is not set | 958 | # CONFIG_USB_DABUSB is not set |
| 936 | 959 | ||
| @@ -997,6 +1020,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 997 | # CONFIG_SND_AU8810 is not set | 1020 | # CONFIG_SND_AU8810 is not set |
| 998 | # CONFIG_SND_AU8820 is not set | 1021 | # CONFIG_SND_AU8820 is not set |
| 999 | # CONFIG_SND_AU8830 is not set | 1022 | # CONFIG_SND_AU8830 is not set |
| 1023 | # CONFIG_SND_AW2 is not set | ||
| 1000 | # CONFIG_SND_AZT3328 is not set | 1024 | # CONFIG_SND_AZT3328 is not set |
| 1001 | # CONFIG_SND_BT87X is not set | 1025 | # CONFIG_SND_BT87X is not set |
| 1002 | # CONFIG_SND_CA0106 is not set | 1026 | # CONFIG_SND_CA0106 is not set |
| @@ -1071,11 +1095,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1071 | # CONFIG_SND_SOC is not set | 1095 | # CONFIG_SND_SOC is not set |
| 1072 | 1096 | ||
| 1073 | # | 1097 | # |
| 1074 | # SoC Audio support for SuperH | 1098 | # ALSA SoC audio for Freescale SOCs |
| 1075 | # | 1099 | # |
| 1076 | 1100 | ||
| 1077 | # | 1101 | # |
| 1078 | # ALSA SoC audio for Freescale SOCs | 1102 | # SoC Audio for the Texas Instruments OMAP |
| 1079 | # | 1103 | # |
| 1080 | 1104 | ||
| 1081 | # | 1105 | # |
| @@ -1110,16 +1134,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1110 | CONFIG_USB_DEVICE_CLASS=y | 1134 | CONFIG_USB_DEVICE_CLASS=y |
| 1111 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1135 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1112 | # CONFIG_USB_OTG is not set | 1136 | # CONFIG_USB_OTG is not set |
| 1137 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1138 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1113 | 1139 | ||
| 1114 | # | 1140 | # |
| 1115 | # USB Host Controller Drivers | 1141 | # USB Host Controller Drivers |
| 1116 | # | 1142 | # |
| 1143 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1117 | CONFIG_USB_EHCI_HCD=y | 1144 | CONFIG_USB_EHCI_HCD=y |
| 1118 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1145 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1119 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1146 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1120 | # CONFIG_USB_EHCI_FSL is not set | 1147 | # CONFIG_USB_EHCI_FSL is not set |
| 1121 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1148 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1122 | # CONFIG_USB_ISP116X_HCD is not set | 1149 | # CONFIG_USB_ISP116X_HCD is not set |
| 1150 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1123 | CONFIG_USB_OHCI_HCD=y | 1151 | CONFIG_USB_OHCI_HCD=y |
| 1124 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1152 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1125 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1153 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1137,6 +1165,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1137 | # | 1165 | # |
| 1138 | # CONFIG_USB_ACM is not set | 1166 | # CONFIG_USB_ACM is not set |
| 1139 | # CONFIG_USB_PRINTER is not set | 1167 | # CONFIG_USB_PRINTER is not set |
| 1168 | # CONFIG_USB_WDM is not set | ||
| 1140 | 1169 | ||
| 1141 | # | 1170 | # |
| 1142 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1171 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1156,7 +1185,9 @@ CONFIG_USB_STORAGE=y | |||
| 1156 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1185 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1157 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1186 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1158 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1187 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1188 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1159 | # CONFIG_USB_STORAGE_KARMA is not set | 1189 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1190 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1160 | # CONFIG_USB_LIBUSUAL is not set | 1191 | # CONFIG_USB_LIBUSUAL is not set |
| 1161 | 1192 | ||
| 1162 | # | 1193 | # |
| @@ -1194,10 +1225,12 @@ CONFIG_USB_MON=y | |||
| 1194 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1225 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1195 | # CONFIG_USB_IOWARRIOR is not set | 1226 | # CONFIG_USB_IOWARRIOR is not set |
| 1196 | # CONFIG_USB_TEST is not set | 1227 | # CONFIG_USB_TEST is not set |
| 1228 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1197 | # CONFIG_USB_GADGET is not set | 1229 | # CONFIG_USB_GADGET is not set |
| 1198 | # CONFIG_MMC is not set | 1230 | # CONFIG_MMC is not set |
| 1199 | # CONFIG_MEMSTICK is not set | 1231 | # CONFIG_MEMSTICK is not set |
| 1200 | # CONFIG_NEW_LEDS is not set | 1232 | # CONFIG_NEW_LEDS is not set |
| 1233 | # CONFIG_ACCESSIBILITY is not set | ||
| 1201 | # CONFIG_INFINIBAND is not set | 1234 | # CONFIG_INFINIBAND is not set |
| 1202 | # CONFIG_EDAC is not set | 1235 | # CONFIG_EDAC is not set |
| 1203 | CONFIG_RTC_LIB=y | 1236 | CONFIG_RTC_LIB=y |
| @@ -1249,11 +1282,8 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1249 | # | 1282 | # |
| 1250 | # on-CPU RTC drivers | 1283 | # on-CPU RTC drivers |
| 1251 | # | 1284 | # |
| 1285 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1252 | # CONFIG_DMADEVICES is not set | 1286 | # CONFIG_DMADEVICES is not set |
| 1253 | |||
| 1254 | # | ||
| 1255 | # Userspace I/O | ||
| 1256 | # | ||
| 1257 | # CONFIG_UIO is not set | 1287 | # CONFIG_UIO is not set |
| 1258 | 1288 | ||
| 1259 | # | 1289 | # |
| @@ -1273,7 +1303,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1273 | # CONFIG_JFS_FS is not set | 1303 | # CONFIG_JFS_FS is not set |
| 1274 | # CONFIG_FS_POSIX_ACL is not set | 1304 | # CONFIG_FS_POSIX_ACL is not set |
| 1275 | # CONFIG_XFS_FS is not set | 1305 | # CONFIG_XFS_FS is not set |
| 1276 | # CONFIG_GFS2_FS is not set | ||
| 1277 | # CONFIG_OCFS2_FS is not set | 1306 | # CONFIG_OCFS2_FS is not set |
| 1278 | CONFIG_DNOTIFY=y | 1307 | CONFIG_DNOTIFY=y |
| 1279 | CONFIG_INOTIFY=y | 1308 | CONFIG_INOTIFY=y |
| @@ -1343,10 +1372,9 @@ CONFIG_NFS_FS=y | |||
| 1343 | CONFIG_NFS_V3=y | 1372 | CONFIG_NFS_V3=y |
| 1344 | # CONFIG_NFS_V3_ACL is not set | 1373 | # CONFIG_NFS_V3_ACL is not set |
| 1345 | CONFIG_NFS_V4=y | 1374 | CONFIG_NFS_V4=y |
| 1346 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1347 | CONFIG_NFSD=y | 1375 | CONFIG_NFSD=y |
| 1348 | # CONFIG_NFSD_V3 is not set | 1376 | # CONFIG_NFSD_V3 is not set |
| 1349 | CONFIG_NFSD_TCP=y | 1377 | # CONFIG_NFSD_V4 is not set |
| 1350 | CONFIG_ROOT_NFS=y | 1378 | CONFIG_ROOT_NFS=y |
| 1351 | CONFIG_LOCKD=y | 1379 | CONFIG_LOCKD=y |
| 1352 | CONFIG_LOCKD_V4=y | 1380 | CONFIG_LOCKD_V4=y |
| @@ -1430,9 +1458,10 @@ CONFIG_NLS_UTF8=m | |||
| 1430 | # Library routines | 1458 | # Library routines |
| 1431 | # | 1459 | # |
| 1432 | CONFIG_BITREVERSE=y | 1460 | CONFIG_BITREVERSE=y |
| 1461 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1433 | # CONFIG_CRC_CCITT is not set | 1462 | # CONFIG_CRC_CCITT is not set |
| 1434 | # CONFIG_CRC16 is not set | 1463 | # CONFIG_CRC16 is not set |
| 1435 | # CONFIG_CRC_ITU_T is not set | 1464 | CONFIG_CRC_ITU_T=m |
| 1436 | CONFIG_CRC32=y | 1465 | CONFIG_CRC32=y |
| 1437 | # CONFIG_CRC7 is not set | 1466 | # CONFIG_CRC7 is not set |
| 1438 | CONFIG_LIBCRC32C=m | 1467 | CONFIG_LIBCRC32C=m |
| @@ -1441,6 +1470,7 @@ CONFIG_PLIST=y | |||
| 1441 | CONFIG_HAS_IOMEM=y | 1470 | CONFIG_HAS_IOMEM=y |
| 1442 | CONFIG_HAS_IOPORT=y | 1471 | CONFIG_HAS_IOPORT=y |
| 1443 | CONFIG_HAS_DMA=y | 1472 | CONFIG_HAS_DMA=y |
| 1473 | CONFIG_HAVE_LMB=y | ||
| 1444 | 1474 | ||
| 1445 | # | 1475 | # |
| 1446 | # Kernel hacking | 1476 | # Kernel hacking |
| @@ -1448,6 +1478,7 @@ CONFIG_HAS_DMA=y | |||
| 1448 | # CONFIG_PRINTK_TIME is not set | 1478 | # CONFIG_PRINTK_TIME is not set |
| 1449 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1479 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1450 | CONFIG_ENABLE_MUST_CHECK=y | 1480 | CONFIG_ENABLE_MUST_CHECK=y |
| 1481 | CONFIG_FRAME_WARN=1024 | ||
| 1451 | # CONFIG_MAGIC_SYSRQ is not set | 1482 | # CONFIG_MAGIC_SYSRQ is not set |
| 1452 | # CONFIG_UNUSED_SYMBOLS is not set | 1483 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1453 | # CONFIG_DEBUG_FS is not set | 1484 | # CONFIG_DEBUG_FS is not set |
| @@ -1458,6 +1489,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1458 | CONFIG_SCHED_DEBUG=y | 1489 | CONFIG_SCHED_DEBUG=y |
| 1459 | # CONFIG_SCHEDSTATS is not set | 1490 | # CONFIG_SCHEDSTATS is not set |
| 1460 | # CONFIG_TIMER_STATS is not set | 1491 | # CONFIG_TIMER_STATS is not set |
| 1492 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1461 | # CONFIG_SLUB_DEBUG_ON is not set | 1493 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1462 | # CONFIG_SLUB_STATS is not set | 1494 | # CONFIG_SLUB_STATS is not set |
| 1463 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1495 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1471,6 +1503,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1471 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1503 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1472 | CONFIG_DEBUG_INFO=y | 1504 | CONFIG_DEBUG_INFO=y |
| 1473 | # CONFIG_DEBUG_VM is not set | 1505 | # CONFIG_DEBUG_VM is not set |
| 1506 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1474 | # CONFIG_DEBUG_LIST is not set | 1507 | # CONFIG_DEBUG_LIST is not set |
| 1475 | # CONFIG_DEBUG_SG is not set | 1508 | # CONFIG_DEBUG_SG is not set |
| 1476 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1509 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1482,6 +1515,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1482 | # CONFIG_DEBUG_STACK_USAGE is not set | 1515 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1483 | # CONFIG_DEBUG_PAGEALLOC is not set | 1516 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1484 | # CONFIG_DEBUGGER is not set | 1517 | # CONFIG_DEBUGGER is not set |
| 1518 | # CONFIG_IRQSTACKS is not set | ||
| 1485 | # CONFIG_BDI_SWITCH is not set | 1519 | # CONFIG_BDI_SWITCH is not set |
| 1486 | # CONFIG_PPC_EARLY_DEBUG is not set | 1520 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1487 | 1521 | ||
| @@ -1492,52 +1526,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1492 | # CONFIG_SECURITY is not set | 1526 | # CONFIG_SECURITY is not set |
| 1493 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1527 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1494 | CONFIG_CRYPTO=y | 1528 | CONFIG_CRYPTO=y |
| 1529 | |||
| 1530 | # | ||
| 1531 | # Crypto core or helper | ||
| 1532 | # | ||
| 1495 | CONFIG_CRYPTO_ALGAPI=y | 1533 | CONFIG_CRYPTO_ALGAPI=y |
| 1496 | CONFIG_CRYPTO_BLKCIPHER=y | 1534 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1497 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1498 | CONFIG_CRYPTO_HASH=y | 1535 | CONFIG_CRYPTO_HASH=y |
| 1499 | CONFIG_CRYPTO_MANAGER=y | 1536 | CONFIG_CRYPTO_MANAGER=y |
| 1537 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1538 | # CONFIG_CRYPTO_NULL is not set | ||
| 1539 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1540 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1541 | # CONFIG_CRYPTO_TEST is not set | ||
| 1542 | |||
| 1543 | # | ||
| 1544 | # Authenticated Encryption with Associated Data | ||
| 1545 | # | ||
| 1546 | # CONFIG_CRYPTO_CCM is not set | ||
| 1547 | # CONFIG_CRYPTO_GCM is not set | ||
| 1548 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1549 | |||
| 1550 | # | ||
| 1551 | # Block modes | ||
| 1552 | # | ||
| 1553 | CONFIG_CRYPTO_CBC=y | ||
| 1554 | # CONFIG_CRYPTO_CTR is not set | ||
| 1555 | # CONFIG_CRYPTO_CTS is not set | ||
| 1556 | # CONFIG_CRYPTO_ECB is not set | ||
| 1557 | # CONFIG_CRYPTO_LRW is not set | ||
| 1558 | CONFIG_CRYPTO_PCBC=m | ||
| 1559 | # CONFIG_CRYPTO_XTS is not set | ||
| 1560 | |||
| 1561 | # | ||
| 1562 | # Hash modes | ||
| 1563 | # | ||
| 1500 | CONFIG_CRYPTO_HMAC=y | 1564 | CONFIG_CRYPTO_HMAC=y |
| 1501 | # CONFIG_CRYPTO_XCBC is not set | 1565 | # CONFIG_CRYPTO_XCBC is not set |
| 1502 | # CONFIG_CRYPTO_NULL is not set | 1566 | |
| 1567 | # | ||
| 1568 | # Digest | ||
| 1569 | # | ||
| 1570 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1503 | # CONFIG_CRYPTO_MD4 is not set | 1571 | # CONFIG_CRYPTO_MD4 is not set |
| 1504 | CONFIG_CRYPTO_MD5=y | 1572 | CONFIG_CRYPTO_MD5=y |
| 1573 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1505 | CONFIG_CRYPTO_SHA1=m | 1574 | CONFIG_CRYPTO_SHA1=m |
| 1506 | # CONFIG_CRYPTO_SHA256 is not set | 1575 | # CONFIG_CRYPTO_SHA256 is not set |
| 1507 | # CONFIG_CRYPTO_SHA512 is not set | 1576 | # CONFIG_CRYPTO_SHA512 is not set |
| 1508 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1509 | # CONFIG_CRYPTO_TGR192 is not set | 1577 | # CONFIG_CRYPTO_TGR192 is not set |
| 1510 | # CONFIG_CRYPTO_GF128MUL is not set | 1578 | # CONFIG_CRYPTO_WP512 is not set |
| 1511 | # CONFIG_CRYPTO_ECB is not set | 1579 | |
| 1512 | CONFIG_CRYPTO_CBC=y | 1580 | # |
| 1513 | CONFIG_CRYPTO_PCBC=m | 1581 | # Ciphers |
| 1514 | # CONFIG_CRYPTO_LRW is not set | 1582 | # |
| 1515 | # CONFIG_CRYPTO_XTS is not set | ||
| 1516 | # CONFIG_CRYPTO_CTR is not set | ||
| 1517 | # CONFIG_CRYPTO_GCM is not set | ||
| 1518 | # CONFIG_CRYPTO_CCM is not set | ||
| 1519 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1520 | CONFIG_CRYPTO_DES=y | ||
| 1521 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1522 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1523 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1524 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1525 | # CONFIG_CRYPTO_AES is not set | 1583 | # CONFIG_CRYPTO_AES is not set |
| 1584 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1585 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1586 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1587 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1526 | # CONFIG_CRYPTO_CAST5 is not set | 1588 | # CONFIG_CRYPTO_CAST5 is not set |
| 1527 | # CONFIG_CRYPTO_CAST6 is not set | 1589 | # CONFIG_CRYPTO_CAST6 is not set |
| 1528 | # CONFIG_CRYPTO_TEA is not set | 1590 | CONFIG_CRYPTO_DES=y |
| 1529 | # CONFIG_CRYPTO_ARC4 is not set | 1591 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1530 | # CONFIG_CRYPTO_KHAZAD is not set | 1592 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1531 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1532 | # CONFIG_CRYPTO_SEED is not set | ||
| 1533 | # CONFIG_CRYPTO_SALSA20 is not set | 1593 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1594 | # CONFIG_CRYPTO_SEED is not set | ||
| 1595 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1596 | # CONFIG_CRYPTO_TEA is not set | ||
| 1597 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1598 | |||
| 1599 | # | ||
| 1600 | # Compression | ||
| 1601 | # | ||
| 1534 | # CONFIG_CRYPTO_DEFLATE is not set | 1602 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1535 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1536 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1537 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1538 | # CONFIG_CRYPTO_TEST is not set | ||
| 1539 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1540 | # CONFIG_CRYPTO_LZO is not set | 1603 | # CONFIG_CRYPTO_LZO is not set |
| 1541 | CONFIG_CRYPTO_HW=y | 1604 | CONFIG_CRYPTO_HW=y |
| 1542 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1605 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1543 | # CONFIG_PPC_CLOCK is not set | 1606 | # CONFIG_PPC_CLOCK is not set |
| 1607 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 2d831db9ae5b..46fffbcd3f99 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:35 2008 | 4 | # Mon Jun 9 08:52:16 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | 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 | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -106,6 +108,7 @@ CONFIG_SLUB=y | |||
| 106 | CONFIG_HAVE_OPROFILE=y | 108 | CONFIG_HAVE_OPROFILE=y |
| 107 | CONFIG_HAVE_KPROBES=y | 109 | CONFIG_HAVE_KPROBES=y |
| 108 | CONFIG_HAVE_KRETPROBES=y | 110 | CONFIG_HAVE_KRETPROBES=y |
| 111 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 109 | CONFIG_PROC_PAGE_MONITOR=y | 112 | CONFIG_PROC_PAGE_MONITOR=y |
| 110 | CONFIG_SLABINFO=y | 113 | CONFIG_SLABINFO=y |
| 111 | CONFIG_RT_MUTEXES=y | 114 | CONFIG_RT_MUTEXES=y |
| @@ -210,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | # CONFIG_PROC_DEVICETREE is not set | 223 | # CONFIG_PROC_DEVICETREE is not set |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -231,6 +236,7 @@ CONFIG_FSL_SOC=y | |||
| 231 | # CONFIG_PCI_SYSCALL is not set | 236 | # CONFIG_PCI_SYSCALL is not set |
| 232 | # CONFIG_PCI_QSPAN is not set | 237 | # CONFIG_PCI_QSPAN is not set |
| 233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 238 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 239 | # CONFIG_HAS_RAPIDIO is not set | ||
| 234 | 240 | ||
| 235 | # | 241 | # |
| 236 | # Advanced setup | 242 | # Advanced setup |
| @@ -240,13 +246,13 @@ CONFIG_FSL_SOC=y | |||
| 240 | # | 246 | # |
| 241 | # Default settings for advanced configuration options are used | 247 | # Default settings for advanced configuration options are used |
| 242 | # | 248 | # |
| 243 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 244 | CONFIG_LOWMEM_SIZE=0x30000000 | 249 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 250 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 245 | CONFIG_KERNEL_START=0xc0000000 | 251 | CONFIG_KERNEL_START=0xc0000000 |
| 252 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 246 | CONFIG_TASK_SIZE=0x80000000 | 253 | CONFIG_TASK_SIZE=0x80000000 |
| 247 | CONFIG_CONSISTENT_START=0xfd000000 | 254 | CONFIG_CONSISTENT_START=0xfd000000 |
| 248 | CONFIG_CONSISTENT_SIZE=0x00200000 | 255 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 249 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 250 | 256 | ||
| 251 | # | 257 | # |
| 252 | # Networking | 258 | # Networking |
| @@ -294,8 +300,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 300 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 301 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 302 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 303 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 304 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 305 | # CONFIG_IP_DCCP is not set |
| @@ -419,6 +423,7 @@ CONFIG_NETDEV_10000=y | |||
| 419 | # | 423 | # |
| 420 | # CONFIG_WLAN_PRE80211 is not set | 424 | # CONFIG_WLAN_PRE80211 is not set |
| 421 | # CONFIG_WLAN_80211 is not set | 425 | # CONFIG_WLAN_80211 is not set |
| 426 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 422 | # CONFIG_WAN is not set | 427 | # CONFIG_WAN is not set |
| 423 | # CONFIG_PPP is not set | 428 | # CONFIG_PPP is not set |
| 424 | # CONFIG_SLIP is not set | 429 | # CONFIG_SLIP is not set |
| @@ -485,6 +490,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 485 | # Character devices | 490 | # Character devices |
| 486 | # | 491 | # |
| 487 | # CONFIG_VT is not set | 492 | # CONFIG_VT is not set |
| 493 | CONFIG_DEVKMEM=y | ||
| 488 | # CONFIG_SERIAL_NONSTANDARD is not set | 494 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 489 | 495 | ||
| 490 | # | 496 | # |
| @@ -517,12 +523,7 @@ CONFIG_GEN_RTC=y | |||
| 517 | # CONFIG_RAW_DRIVER is not set | 523 | # CONFIG_RAW_DRIVER is not set |
| 518 | # CONFIG_TCG_TPM is not set | 524 | # CONFIG_TCG_TPM is not set |
| 519 | # CONFIG_I2C is not set | 525 | # CONFIG_I2C is not set |
| 520 | |||
| 521 | # | ||
| 522 | # SPI support | ||
| 523 | # | ||
| 524 | # CONFIG_SPI is not set | 526 | # CONFIG_SPI is not set |
| 525 | # CONFIG_SPI_MASTER is not set | ||
| 526 | # CONFIG_W1 is not set | 527 | # CONFIG_W1 is not set |
| 527 | # CONFIG_POWER_SUPPLY is not set | 528 | # CONFIG_POWER_SUPPLY is not set |
| 528 | CONFIG_HWMON=y | 529 | CONFIG_HWMON=y |
| @@ -551,12 +552,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 551 | # Multifunction device drivers | 552 | # Multifunction device drivers |
| 552 | # | 553 | # |
| 553 | # CONFIG_MFD_SM501 is not set | 554 | # CONFIG_MFD_SM501 is not set |
| 555 | # CONFIG_HTC_PASIC3 is not set | ||
| 554 | 556 | ||
| 555 | # | 557 | # |
| 556 | # Multimedia devices | 558 | # Multimedia devices |
| 557 | # | 559 | # |
| 560 | |||
| 561 | # | ||
| 562 | # Multimedia core support | ||
| 563 | # | ||
| 558 | # CONFIG_VIDEO_DEV is not set | 564 | # CONFIG_VIDEO_DEV is not set |
| 559 | # CONFIG_DVB_CORE is not set | 565 | # CONFIG_DVB_CORE is not set |
| 566 | # CONFIG_VIDEO_MEDIA is not set | ||
| 567 | |||
| 568 | # | ||
| 569 | # Multimedia drivers | ||
| 570 | # | ||
| 560 | CONFIG_DAB=y | 571 | CONFIG_DAB=y |
| 561 | 572 | ||
| 562 | # | 573 | # |
| @@ -584,6 +595,8 @@ CONFIG_USB_SUPPORT=y | |||
| 584 | # CONFIG_USB_ARCH_HAS_HCD is not set | 595 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 585 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 596 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 586 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 597 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 598 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 599 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 587 | 600 | ||
| 588 | # | 601 | # |
| 589 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 602 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -592,13 +605,10 @@ CONFIG_USB_SUPPORT=y | |||
| 592 | # CONFIG_MMC is not set | 605 | # CONFIG_MMC is not set |
| 593 | # CONFIG_MEMSTICK is not set | 606 | # CONFIG_MEMSTICK is not set |
| 594 | # CONFIG_NEW_LEDS is not set | 607 | # CONFIG_NEW_LEDS is not set |
| 608 | # CONFIG_ACCESSIBILITY is not set | ||
| 595 | # CONFIG_EDAC is not set | 609 | # CONFIG_EDAC is not set |
| 596 | # CONFIG_RTC_CLASS is not set | 610 | # CONFIG_RTC_CLASS is not set |
| 597 | # CONFIG_DMADEVICES is not set | 611 | # CONFIG_DMADEVICES is not set |
| 598 | |||
| 599 | # | ||
| 600 | # Userspace I/O | ||
| 601 | # | ||
| 602 | # CONFIG_UIO is not set | 612 | # CONFIG_UIO is not set |
| 603 | 613 | ||
| 604 | # | 614 | # |
| @@ -620,7 +630,6 @@ CONFIG_FS_MBCACHE=y | |||
| 620 | # CONFIG_JFS_FS is not set | 630 | # CONFIG_JFS_FS is not set |
| 621 | # CONFIG_FS_POSIX_ACL is not set | 631 | # CONFIG_FS_POSIX_ACL is not set |
| 622 | # CONFIG_XFS_FS is not set | 632 | # CONFIG_XFS_FS is not set |
| 623 | # CONFIG_GFS2_FS is not set | ||
| 624 | # CONFIG_OCFS2_FS is not set | 633 | # CONFIG_OCFS2_FS is not set |
| 625 | CONFIG_DNOTIFY=y | 634 | CONFIG_DNOTIFY=y |
| 626 | CONFIG_INOTIFY=y | 635 | CONFIG_INOTIFY=y |
| @@ -678,7 +687,6 @@ CONFIG_NFS_FS=y | |||
| 678 | CONFIG_NFS_V3=y | 687 | CONFIG_NFS_V3=y |
| 679 | # CONFIG_NFS_V3_ACL is not set | 688 | # CONFIG_NFS_V3_ACL is not set |
| 680 | # CONFIG_NFS_V4 is not set | 689 | # CONFIG_NFS_V4 is not set |
| 681 | # CONFIG_NFS_DIRECTIO is not set | ||
| 682 | # CONFIG_NFSD is not set | 690 | # CONFIG_NFSD is not set |
| 683 | CONFIG_ROOT_NFS=y | 691 | CONFIG_ROOT_NFS=y |
| 684 | CONFIG_LOCKD=y | 692 | CONFIG_LOCKD=y |
| @@ -722,6 +730,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 722 | # Library routines | 730 | # Library routines |
| 723 | # | 731 | # |
| 724 | CONFIG_BITREVERSE=y | 732 | CONFIG_BITREVERSE=y |
| 733 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 725 | CONFIG_CRC_CCITT=y | 734 | CONFIG_CRC_CCITT=y |
| 726 | # CONFIG_CRC16 is not set | 735 | # CONFIG_CRC16 is not set |
| 727 | # CONFIG_CRC_ITU_T is not set | 736 | # CONFIG_CRC_ITU_T is not set |
| @@ -733,6 +742,7 @@ CONFIG_PLIST=y | |||
| 733 | CONFIG_HAS_IOMEM=y | 742 | CONFIG_HAS_IOMEM=y |
| 734 | CONFIG_HAS_IOPORT=y | 743 | CONFIG_HAS_IOPORT=y |
| 735 | CONFIG_HAS_DMA=y | 744 | CONFIG_HAS_DMA=y |
| 745 | CONFIG_HAVE_LMB=y | ||
| 736 | 746 | ||
| 737 | # | 747 | # |
| 738 | # Kernel hacking | 748 | # Kernel hacking |
| @@ -740,6 +750,7 @@ CONFIG_HAS_DMA=y | |||
| 740 | # CONFIG_PRINTK_TIME is not set | 750 | # CONFIG_PRINTK_TIME is not set |
| 741 | CONFIG_ENABLE_WARN_DEPRECATED=y | 751 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 742 | CONFIG_ENABLE_MUST_CHECK=y | 752 | CONFIG_ENABLE_MUST_CHECK=y |
| 753 | CONFIG_FRAME_WARN=1024 | ||
| 743 | # CONFIG_MAGIC_SYSRQ is not set | 754 | # CONFIG_MAGIC_SYSRQ is not set |
| 744 | # CONFIG_UNUSED_SYMBOLS is not set | 755 | # CONFIG_UNUSED_SYMBOLS is not set |
| 745 | # CONFIG_DEBUG_FS is not set | 756 | # CONFIG_DEBUG_FS is not set |
| @@ -748,6 +759,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 748 | # CONFIG_SLUB_DEBUG_ON is not set | 759 | # CONFIG_SLUB_DEBUG_ON is not set |
| 749 | # CONFIG_SLUB_STATS is not set | 760 | # CONFIG_SLUB_STATS is not set |
| 750 | # CONFIG_SAMPLES is not set | 761 | # CONFIG_SAMPLES is not set |
| 762 | # CONFIG_IRQSTACKS is not set | ||
| 751 | # CONFIG_PPC_EARLY_DEBUG is not set | 763 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 752 | 764 | ||
| 753 | # | 765 | # |
| @@ -757,48 +769,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 757 | # CONFIG_SECURITY is not set | 769 | # CONFIG_SECURITY is not set |
| 758 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 770 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 759 | CONFIG_CRYPTO=y | 771 | CONFIG_CRYPTO=y |
| 760 | # CONFIG_CRYPTO_SEQIV is not set | 772 | |
| 773 | # | ||
| 774 | # Crypto core or helper | ||
| 775 | # | ||
| 761 | # CONFIG_CRYPTO_MANAGER is not set | 776 | # CONFIG_CRYPTO_MANAGER is not set |
| 777 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 778 | # CONFIG_CRYPTO_NULL is not set | ||
| 779 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 780 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 781 | |||
| 782 | # | ||
| 783 | # Authenticated Encryption with Associated Data | ||
| 784 | # | ||
| 785 | # CONFIG_CRYPTO_CCM is not set | ||
| 786 | # CONFIG_CRYPTO_GCM is not set | ||
| 787 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 788 | |||
| 789 | # | ||
| 790 | # Block modes | ||
| 791 | # | ||
| 792 | # CONFIG_CRYPTO_CBC is not set | ||
| 793 | # CONFIG_CRYPTO_CTR is not set | ||
| 794 | # CONFIG_CRYPTO_CTS is not set | ||
| 795 | # CONFIG_CRYPTO_ECB is not set | ||
| 796 | # CONFIG_CRYPTO_LRW is not set | ||
| 797 | # CONFIG_CRYPTO_PCBC is not set | ||
| 798 | # CONFIG_CRYPTO_XTS is not set | ||
| 799 | |||
| 800 | # | ||
| 801 | # Hash modes | ||
| 802 | # | ||
| 762 | # CONFIG_CRYPTO_HMAC is not set | 803 | # CONFIG_CRYPTO_HMAC is not set |
| 763 | # CONFIG_CRYPTO_XCBC is not set | 804 | # CONFIG_CRYPTO_XCBC is not set |
| 764 | # CONFIG_CRYPTO_NULL is not set | 805 | |
| 806 | # | ||
| 807 | # Digest | ||
| 808 | # | ||
| 809 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 765 | # CONFIG_CRYPTO_MD4 is not set | 810 | # CONFIG_CRYPTO_MD4 is not set |
| 766 | # CONFIG_CRYPTO_MD5 is not set | 811 | # CONFIG_CRYPTO_MD5 is not set |
| 812 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 767 | # CONFIG_CRYPTO_SHA1 is not set | 813 | # CONFIG_CRYPTO_SHA1 is not set |
| 768 | # CONFIG_CRYPTO_SHA256 is not set | 814 | # CONFIG_CRYPTO_SHA256 is not set |
| 769 | # CONFIG_CRYPTO_SHA512 is not set | 815 | # CONFIG_CRYPTO_SHA512 is not set |
| 770 | # CONFIG_CRYPTO_WP512 is not set | ||
| 771 | # CONFIG_CRYPTO_TGR192 is not set | 816 | # CONFIG_CRYPTO_TGR192 is not set |
| 772 | # CONFIG_CRYPTO_GF128MUL is not set | 817 | # CONFIG_CRYPTO_WP512 is not set |
| 773 | # CONFIG_CRYPTO_ECB is not set | 818 | |
| 774 | # CONFIG_CRYPTO_CBC is not set | 819 | # |
| 775 | # CONFIG_CRYPTO_PCBC is not set | 820 | # Ciphers |
| 776 | # CONFIG_CRYPTO_LRW is not set | 821 | # |
| 777 | # CONFIG_CRYPTO_XTS is not set | ||
| 778 | # CONFIG_CRYPTO_CTR is not set | ||
| 779 | # CONFIG_CRYPTO_GCM is not set | ||
| 780 | # CONFIG_CRYPTO_CCM is not set | ||
| 781 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 782 | # CONFIG_CRYPTO_DES is not set | ||
| 783 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 784 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 785 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 786 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 787 | # CONFIG_CRYPTO_AES is not set | 822 | # CONFIG_CRYPTO_AES is not set |
| 823 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 824 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 825 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 826 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 788 | # CONFIG_CRYPTO_CAST5 is not set | 827 | # CONFIG_CRYPTO_CAST5 is not set |
| 789 | # CONFIG_CRYPTO_CAST6 is not set | 828 | # CONFIG_CRYPTO_CAST6 is not set |
| 790 | # CONFIG_CRYPTO_TEA is not set | 829 | # CONFIG_CRYPTO_DES is not set |
| 791 | # CONFIG_CRYPTO_ARC4 is not set | 830 | # CONFIG_CRYPTO_FCRYPT is not set |
| 792 | # CONFIG_CRYPTO_KHAZAD is not set | 831 | # CONFIG_CRYPTO_KHAZAD is not set |
| 793 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 794 | # CONFIG_CRYPTO_SEED is not set | ||
| 795 | # CONFIG_CRYPTO_SALSA20 is not set | 832 | # CONFIG_CRYPTO_SALSA20 is not set |
| 833 | # CONFIG_CRYPTO_SEED is not set | ||
| 834 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 835 | # CONFIG_CRYPTO_TEA is not set | ||
| 836 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 837 | |||
| 838 | # | ||
| 839 | # Compression | ||
| 840 | # | ||
| 796 | # CONFIG_CRYPTO_DEFLATE is not set | 841 | # CONFIG_CRYPTO_DEFLATE is not set |
| 797 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 798 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 799 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 800 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 801 | # CONFIG_CRYPTO_LZO is not set | 842 | # CONFIG_CRYPTO_LZO is not set |
| 802 | CONFIG_CRYPTO_HW=y | 843 | CONFIG_CRYPTO_HW=y |
| 803 | # CONFIG_PPC_CLOCK is not set | 844 | # CONFIG_PPC_CLOCK is not set |
| 804 | CONFIG_PPC_LIB_RHEAP=y | 845 | CONFIG_PPC_LIB_RHEAP=y |
| 846 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 82151b9bba26..9df78973005e 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:35 2008 | 4 | # Mon Jun 9 08:52:17 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | 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 | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -108,6 +110,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 110 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 111 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 112 | CONFIG_HAVE_KRETPROBES=y |
| 113 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 114 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
| 113 | # CONFIG_TINY_SHMEM is not set | 116 | # CONFIG_TINY_SHMEM is not set |
| @@ -219,11 +222,13 @@ CONFIG_FLATMEM=y | |||
| 219 | CONFIG_FLAT_NODE_MEM_MAP=y | 222 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 220 | # CONFIG_SPARSEMEM_STATIC is not set | 223 | # CONFIG_SPARSEMEM_STATIC is not set |
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 225 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 223 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
| 224 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
| 225 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
| 226 | CONFIG_VIRT_TO_BUS=y | 230 | CONFIG_VIRT_TO_BUS=y |
| 231 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 227 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
| 229 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
| @@ -241,6 +246,7 @@ CONFIG_FSL_SOC=y | |||
| 241 | # CONFIG_PCI_QSPAN is not set | 246 | # CONFIG_PCI_QSPAN is not set |
| 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 243 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 244 | 250 | ||
| 245 | # | 251 | # |
| 246 | # Advanced setup | 252 | # Advanced setup |
| @@ -250,13 +256,13 @@ CONFIG_FSL_SOC=y | |||
| 250 | # | 256 | # |
| 251 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 252 | # | 258 | # |
| 253 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 254 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 255 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_TASK_SIZE=0x80000000 | 263 | CONFIG_TASK_SIZE=0x80000000 |
| 257 | CONFIG_CONSISTENT_START=0xfd000000 | 264 | CONFIG_CONSISTENT_START=0xfd000000 |
| 258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 265 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 259 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 260 | 266 | ||
| 261 | # | 267 | # |
| 262 | # Networking | 268 | # Networking |
| @@ -299,8 +305,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 305 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 306 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 307 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 308 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 309 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 310 | # CONFIG_IP_DCCP is not set |
| @@ -492,6 +496,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 492 | # | 496 | # |
| 493 | # CONFIG_WLAN_PRE80211 is not set | 497 | # CONFIG_WLAN_PRE80211 is not set |
| 494 | # CONFIG_WLAN_80211 is not set | 498 | # CONFIG_WLAN_80211 is not set |
| 499 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 495 | # CONFIG_WAN is not set | 500 | # CONFIG_WAN is not set |
| 496 | # CONFIG_PPP is not set | 501 | # CONFIG_PPP is not set |
| 497 | # CONFIG_SLIP is not set | 502 | # CONFIG_SLIP is not set |
| @@ -516,6 +521,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 516 | # Character devices | 521 | # Character devices |
| 517 | # | 522 | # |
| 518 | # CONFIG_VT is not set | 523 | # CONFIG_VT is not set |
| 524 | CONFIG_DEVKMEM=y | ||
| 519 | # CONFIG_SERIAL_NONSTANDARD is not set | 525 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 520 | 526 | ||
| 521 | # | 527 | # |
| @@ -548,12 +554,7 @@ CONFIG_GEN_RTC=y | |||
| 548 | # CONFIG_RAW_DRIVER is not set | 554 | # CONFIG_RAW_DRIVER is not set |
| 549 | # CONFIG_TCG_TPM is not set | 555 | # CONFIG_TCG_TPM is not set |
| 550 | # CONFIG_I2C is not set | 556 | # CONFIG_I2C is not set |
| 551 | |||
| 552 | # | ||
| 553 | # SPI support | ||
| 554 | # | ||
| 555 | # CONFIG_SPI is not set | 557 | # CONFIG_SPI is not set |
| 556 | # CONFIG_SPI_MASTER is not set | ||
| 557 | # CONFIG_W1 is not set | 558 | # CONFIG_W1 is not set |
| 558 | # CONFIG_POWER_SUPPLY is not set | 559 | # CONFIG_POWER_SUPPLY is not set |
| 559 | # CONFIG_HWMON is not set | 560 | # CONFIG_HWMON is not set |
| @@ -570,12 +571,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 570 | # Multifunction device drivers | 571 | # Multifunction device drivers |
| 571 | # | 572 | # |
| 572 | # CONFIG_MFD_SM501 is not set | 573 | # CONFIG_MFD_SM501 is not set |
| 574 | # CONFIG_HTC_PASIC3 is not set | ||
| 573 | 575 | ||
| 574 | # | 576 | # |
| 575 | # Multimedia devices | 577 | # Multimedia devices |
| 576 | # | 578 | # |
| 579 | |||
| 580 | # | ||
| 581 | # Multimedia core support | ||
| 582 | # | ||
| 577 | # CONFIG_VIDEO_DEV is not set | 583 | # CONFIG_VIDEO_DEV is not set |
| 578 | # CONFIG_DVB_CORE is not set | 584 | # CONFIG_DVB_CORE is not set |
| 585 | # CONFIG_VIDEO_MEDIA is not set | ||
| 586 | |||
| 587 | # | ||
| 588 | # Multimedia drivers | ||
| 589 | # | ||
| 579 | CONFIG_DAB=y | 590 | CONFIG_DAB=y |
| 580 | 591 | ||
| 581 | # | 592 | # |
| @@ -599,13 +610,10 @@ CONFIG_DAB=y | |||
| 599 | # CONFIG_MMC is not set | 610 | # CONFIG_MMC is not set |
| 600 | # CONFIG_MEMSTICK is not set | 611 | # CONFIG_MEMSTICK is not set |
| 601 | # CONFIG_NEW_LEDS is not set | 612 | # CONFIG_NEW_LEDS is not set |
| 613 | # CONFIG_ACCESSIBILITY is not set | ||
| 602 | # CONFIG_EDAC is not set | 614 | # CONFIG_EDAC is not set |
| 603 | # CONFIG_RTC_CLASS is not set | 615 | # CONFIG_RTC_CLASS is not set |
| 604 | # CONFIG_DMADEVICES is not set | 616 | # CONFIG_DMADEVICES is not set |
| 605 | |||
| 606 | # | ||
| 607 | # Userspace I/O | ||
| 608 | # | ||
| 609 | # CONFIG_UIO is not set | 617 | # CONFIG_UIO is not set |
| 610 | 618 | ||
| 611 | # | 619 | # |
| @@ -618,7 +626,6 @@ CONFIG_DAB=y | |||
| 618 | # CONFIG_JFS_FS is not set | 626 | # CONFIG_JFS_FS is not set |
| 619 | # CONFIG_FS_POSIX_ACL is not set | 627 | # CONFIG_FS_POSIX_ACL is not set |
| 620 | # CONFIG_XFS_FS is not set | 628 | # CONFIG_XFS_FS is not set |
| 621 | # CONFIG_GFS2_FS is not set | ||
| 622 | # CONFIG_OCFS2_FS is not set | 629 | # CONFIG_OCFS2_FS is not set |
| 623 | # CONFIG_DNOTIFY is not set | 630 | # CONFIG_DNOTIFY is not set |
| 624 | # CONFIG_INOTIFY is not set | 631 | # CONFIG_INOTIFY is not set |
| @@ -676,7 +683,6 @@ CONFIG_NFS_FS=y | |||
| 676 | CONFIG_NFS_V3=y | 683 | CONFIG_NFS_V3=y |
| 677 | # CONFIG_NFS_V3_ACL is not set | 684 | # CONFIG_NFS_V3_ACL is not set |
| 678 | # CONFIG_NFS_V4 is not set | 685 | # CONFIG_NFS_V4 is not set |
| 679 | # CONFIG_NFS_DIRECTIO is not set | ||
| 680 | # CONFIG_NFSD is not set | 686 | # CONFIG_NFSD is not set |
| 681 | CONFIG_ROOT_NFS=y | 687 | CONFIG_ROOT_NFS=y |
| 682 | CONFIG_LOCKD=y | 688 | CONFIG_LOCKD=y |
| @@ -719,6 +725,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 719 | # | 725 | # |
| 720 | # Library routines | 726 | # Library routines |
| 721 | # | 727 | # |
| 728 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 722 | # CONFIG_CRC_CCITT is not set | 729 | # CONFIG_CRC_CCITT is not set |
| 723 | # CONFIG_CRC16 is not set | 730 | # CONFIG_CRC16 is not set |
| 724 | # CONFIG_CRC_ITU_T is not set | 731 | # CONFIG_CRC_ITU_T is not set |
| @@ -729,6 +736,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 729 | CONFIG_HAS_IOMEM=y | 736 | CONFIG_HAS_IOMEM=y |
| 730 | CONFIG_HAS_IOPORT=y | 737 | CONFIG_HAS_IOPORT=y |
| 731 | CONFIG_HAS_DMA=y | 738 | CONFIG_HAS_DMA=y |
| 739 | CONFIG_HAVE_LMB=y | ||
| 732 | 740 | ||
| 733 | # | 741 | # |
| 734 | # Kernel hacking | 742 | # Kernel hacking |
| @@ -736,6 +744,7 @@ CONFIG_HAS_DMA=y | |||
| 736 | # CONFIG_PRINTK_TIME is not set | 744 | # CONFIG_PRINTK_TIME is not set |
| 737 | CONFIG_ENABLE_WARN_DEPRECATED=y | 745 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 738 | CONFIG_ENABLE_MUST_CHECK=y | 746 | CONFIG_ENABLE_MUST_CHECK=y |
| 747 | CONFIG_FRAME_WARN=1024 | ||
| 739 | CONFIG_MAGIC_SYSRQ=y | 748 | CONFIG_MAGIC_SYSRQ=y |
| 740 | # CONFIG_UNUSED_SYMBOLS is not set | 749 | # CONFIG_UNUSED_SYMBOLS is not set |
| 741 | # CONFIG_DEBUG_FS is not set | 750 | # CONFIG_DEBUG_FS is not set |
| @@ -746,6 +755,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 746 | CONFIG_SCHED_DEBUG=y | 755 | CONFIG_SCHED_DEBUG=y |
| 747 | # CONFIG_SCHEDSTATS is not set | 756 | # CONFIG_SCHEDSTATS is not set |
| 748 | # CONFIG_TIMER_STATS is not set | 757 | # CONFIG_TIMER_STATS is not set |
| 758 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 749 | # CONFIG_SLUB_DEBUG_ON is not set | 759 | # CONFIG_SLUB_DEBUG_ON is not set |
| 750 | # CONFIG_SLUB_STATS is not set | 760 | # CONFIG_SLUB_STATS is not set |
| 751 | # CONFIG_DEBUG_SPINLOCK is not set | 761 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -756,6 +766,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 756 | CONFIG_DEBUG_BUGVERBOSE=y | 766 | CONFIG_DEBUG_BUGVERBOSE=y |
| 757 | CONFIG_DEBUG_INFO=y | 767 | CONFIG_DEBUG_INFO=y |
| 758 | # CONFIG_DEBUG_VM is not set | 768 | # CONFIG_DEBUG_VM is not set |
| 769 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 759 | # CONFIG_DEBUG_LIST is not set | 770 | # CONFIG_DEBUG_LIST is not set |
| 760 | # CONFIG_DEBUG_SG is not set | 771 | # CONFIG_DEBUG_SG is not set |
| 761 | # CONFIG_BOOT_PRINTK_DELAY is not set | 772 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -766,6 +777,7 @@ CONFIG_DEBUG_INFO=y | |||
| 766 | # CONFIG_DEBUG_STACK_USAGE is not set | 777 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 767 | # CONFIG_DEBUG_PAGEALLOC is not set | 778 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 768 | # CONFIG_DEBUGGER is not set | 779 | # CONFIG_DEBUGGER is not set |
| 780 | # CONFIG_IRQSTACKS is not set | ||
| 769 | # CONFIG_BDI_SWITCH is not set | 781 | # CONFIG_BDI_SWITCH is not set |
| 770 | # CONFIG_PPC_EARLY_DEBUG is not set | 782 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 771 | 783 | ||
| @@ -778,3 +790,4 @@ CONFIG_DEBUG_INFO=y | |||
| 778 | # CONFIG_CRYPTO is not set | 790 | # CONFIG_CRYPTO is not set |
| 779 | # CONFIG_PPC_CLOCK is not set | 791 | # CONFIG_PPC_CLOCK is not set |
| 780 | CONFIG_PPC_LIB_RHEAP=y | 792 | CONFIG_PPC_LIB_RHEAP=y |
| 793 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 40f84fa2bd29..ce250bc98584 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_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-rc3 | 3 | # Linux kernel version: 2.6.26-rc6 |
| 4 | # Tue May 20 20:03:02 2008 | 4 | # Mon Jun 16 21:11:19 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -763,7 +763,63 @@ CONFIG_ATA_NONSTANDARD=y | |||
| 763 | CONFIG_SATA_PMP=y | 763 | CONFIG_SATA_PMP=y |
| 764 | # CONFIG_SATA_AHCI is not set | 764 | # CONFIG_SATA_AHCI is not set |
| 765 | CONFIG_SATA_SIL24=y | 765 | CONFIG_SATA_SIL24=y |
| 766 | # CONFIG_ATA_SFF is not set | 766 | CONFIG_ATA_SFF=y |
| 767 | CONFIG_SATA_SVW=y | ||
| 768 | # CONFIG_ATA_PIIX is not set | ||
| 769 | # CONFIG_SATA_MV is not set | ||
| 770 | # CONFIG_SATA_NV is not set | ||
| 771 | # CONFIG_PDC_ADMA is not set | ||
| 772 | # CONFIG_SATA_QSTOR is not set | ||
| 773 | # CONFIG_SATA_PROMISE is not set | ||
| 774 | # CONFIG_SATA_SX4 is not set | ||
| 775 | # CONFIG_SATA_SIL is not set | ||
| 776 | # CONFIG_SATA_SIS is not set | ||
| 777 | # CONFIG_SATA_ULI is not set | ||
| 778 | # CONFIG_SATA_VIA is not set | ||
| 779 | # CONFIG_SATA_VITESSE is not set | ||
| 780 | # CONFIG_SATA_INIC162X is not set | ||
| 781 | # CONFIG_PATA_ALI is not set | ||
| 782 | # CONFIG_PATA_AMD is not set | ||
| 783 | # CONFIG_PATA_ARTOP is not set | ||
| 784 | # CONFIG_PATA_ATIIXP is not set | ||
| 785 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 786 | # CONFIG_PATA_CMD64X is not set | ||
| 787 | # CONFIG_PATA_CS5520 is not set | ||
| 788 | # CONFIG_PATA_CS5530 is not set | ||
| 789 | # CONFIG_PATA_CYPRESS is not set | ||
| 790 | # CONFIG_PATA_EFAR is not set | ||
| 791 | # CONFIG_ATA_GENERIC is not set | ||
| 792 | # CONFIG_PATA_HPT366 is not set | ||
| 793 | # CONFIG_PATA_HPT37X is not set | ||
| 794 | # CONFIG_PATA_HPT3X2N is not set | ||
| 795 | # CONFIG_PATA_HPT3X3 is not set | ||
| 796 | # CONFIG_PATA_IT821X is not set | ||
| 797 | # CONFIG_PATA_IT8213 is not set | ||
| 798 | # CONFIG_PATA_JMICRON is not set | ||
| 799 | # CONFIG_PATA_TRIFLEX is not set | ||
| 800 | # CONFIG_PATA_MARVELL is not set | ||
| 801 | # CONFIG_PATA_MPIIX is not set | ||
| 802 | # CONFIG_PATA_OLDPIIX is not set | ||
| 803 | # CONFIG_PATA_NETCELL is not set | ||
| 804 | # CONFIG_PATA_NINJA32 is not set | ||
| 805 | # CONFIG_PATA_NS87410 is not set | ||
| 806 | # CONFIG_PATA_NS87415 is not set | ||
| 807 | # CONFIG_PATA_OPTI is not set | ||
| 808 | # CONFIG_PATA_OPTIDMA is not set | ||
| 809 | # CONFIG_PATA_PCMCIA is not set | ||
| 810 | # CONFIG_PATA_PDC_OLD is not set | ||
| 811 | # CONFIG_PATA_RADISYS is not set | ||
| 812 | # CONFIG_PATA_RZ1000 is not set | ||
| 813 | # CONFIG_PATA_SC1200 is not set | ||
| 814 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 815 | # CONFIG_PATA_PDC2027X is not set | ||
| 816 | # CONFIG_PATA_SIL680 is not set | ||
| 817 | # CONFIG_PATA_SIS is not set | ||
| 818 | # CONFIG_PATA_VIA is not set | ||
| 819 | # CONFIG_PATA_WINBOND is not set | ||
| 820 | # CONFIG_PATA_PLATFORM is not set | ||
| 821 | # CONFIG_PATA_SCC is not set | ||
| 822 | # CONFIG_PATA_SCH is not set | ||
| 767 | CONFIG_MD=y | 823 | CONFIG_MD=y |
| 768 | CONFIG_BLK_DEV_MD=y | 824 | CONFIG_BLK_DEV_MD=y |
| 769 | CONFIG_MD_LINEAR=y | 825 | CONFIG_MD_LINEAR=y |
| @@ -1478,6 +1534,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1478 | # | 1534 | # |
| 1479 | # CONFIG_USB_ACM is not set | 1535 | # CONFIG_USB_ACM is not set |
| 1480 | # CONFIG_USB_PRINTER is not set | 1536 | # CONFIG_USB_PRINTER is not set |
| 1537 | # CONFIG_USB_WDM is not set | ||
| 1481 | 1538 | ||
| 1482 | # | 1539 | # |
| 1483 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1540 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1537,6 +1594,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1537 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1594 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1538 | # CONFIG_USB_IOWARRIOR is not set | 1595 | # CONFIG_USB_IOWARRIOR is not set |
| 1539 | # CONFIG_USB_TEST is not set | 1596 | # CONFIG_USB_TEST is not set |
| 1597 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1540 | # CONFIG_USB_GADGET is not set | 1598 | # CONFIG_USB_GADGET is not set |
| 1541 | # CONFIG_MMC is not set | 1599 | # CONFIG_MMC is not set |
| 1542 | # CONFIG_MEMSTICK is not set | 1600 | # CONFIG_MEMSTICK is not set |
| @@ -1597,6 +1655,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1597 | # CONFIG_RTC_DRV_PCF8583 is not set | 1655 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1598 | # CONFIG_RTC_DRV_M41T80 is not set | 1656 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1599 | # CONFIG_RTC_DRV_S35390A is not set | 1657 | # CONFIG_RTC_DRV_S35390A is not set |
| 1658 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1600 | 1659 | ||
| 1601 | # | 1660 | # |
| 1602 | # SPI RTC drivers | 1661 | # SPI RTC drivers |
| @@ -1617,6 +1676,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1617 | # | 1676 | # |
| 1618 | # on-CPU RTC drivers | 1677 | # on-CPU RTC drivers |
| 1619 | # | 1678 | # |
| 1679 | CONFIG_RTC_DRV_PPC=y | ||
| 1620 | # CONFIG_DMADEVICES is not set | 1680 | # CONFIG_DMADEVICES is not set |
| 1621 | # CONFIG_UIO is not set | 1681 | # CONFIG_UIO is not set |
| 1622 | 1682 | ||
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 1383eb696a20..bc3bf62ddc2f 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:36 2008 | 4 | # Mon Jun 9 08:52:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,19 +72,17 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | CONFIG_BLK_DEV_INITRD=y | 79 | CONFIG_BLK_DEV_INITRD=y |
| 82 | CONFIG_INITRAMFS_SOURCE="" | 80 | CONFIG_INITRAMFS_SOURCE="" |
| 81 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 83 | CONFIG_SYSCTL=y | 82 | CONFIG_SYSCTL=y |
| 84 | CONFIG_EMBEDDED=y | 83 | CONFIG_EMBEDDED=y |
| 85 | CONFIG_SYSCTL_SYSCALL=y | 84 | CONFIG_SYSCTL_SYSCALL=y |
| 85 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 86 | CONFIG_KALLSYMS=y | 86 | CONFIG_KALLSYMS=y |
| 87 | CONFIG_KALLSYMS_ALL=y | 87 | CONFIG_KALLSYMS_ALL=y |
| 88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -109,6 +109,7 @@ CONFIG_SLUB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 109 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 110 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 111 | CONFIG_HAVE_KRETPROBES=y |
| 112 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 113 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 114 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 115 | CONFIG_RT_MUTEXES=y |
| @@ -196,11 +197,13 @@ CONFIG_FLATMEM=y | |||
| 196 | CONFIG_FLAT_NODE_MEM_MAP=y | 197 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 197 | # CONFIG_SPARSEMEM_STATIC is not set | 198 | # CONFIG_SPARSEMEM_STATIC is not set |
| 198 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 200 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 200 | # CONFIG_RESOURCES_64BIT is not set | 202 | # CONFIG_RESOURCES_64BIT is not set |
| 201 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
| 202 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
| 203 | CONFIG_VIRT_TO_BUS=y | 205 | CONFIG_VIRT_TO_BUS=y |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 204 | CONFIG_PROC_DEVICETREE=y | 207 | CONFIG_PROC_DEVICETREE=y |
| 205 | # CONFIG_CMDLINE_BOOL is not set | 208 | # CONFIG_CMDLINE_BOOL is not set |
| 206 | # CONFIG_PM is not set | 209 | # CONFIG_PM is not set |
| @@ -225,6 +228,7 @@ CONFIG_PCI_LEGACY=y | |||
| 225 | # CONFIG_PCI_DEBUG is not set | 228 | # CONFIG_PCI_DEBUG is not set |
| 226 | # CONFIG_PCCARD is not set | 229 | # CONFIG_PCCARD is not set |
| 227 | # CONFIG_HOTPLUG_PCI is not set | 230 | # CONFIG_HOTPLUG_PCI is not set |
| 231 | # CONFIG_HAS_RAPIDIO is not set | ||
| 228 | 232 | ||
| 229 | # | 233 | # |
| 230 | # Advanced setup | 234 | # Advanced setup |
| @@ -234,11 +238,11 @@ CONFIG_PCI_LEGACY=y | |||
| 234 | # | 238 | # |
| 235 | # Default settings for advanced configuration options are used | 239 | # Default settings for advanced configuration options are used |
| 236 | # | 240 | # |
| 237 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 238 | CONFIG_LOWMEM_SIZE=0x30000000 | 241 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 242 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 239 | CONFIG_KERNEL_START=0xc0000000 | 243 | CONFIG_KERNEL_START=0xc0000000 |
| 244 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 240 | CONFIG_TASK_SIZE=0xc0000000 | 245 | CONFIG_TASK_SIZE=0xc0000000 |
| 241 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 242 | 246 | ||
| 243 | # | 247 | # |
| 244 | # Networking | 248 | # Networking |
| @@ -293,6 +297,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 293 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 297 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 294 | CONFIG_INET6_XFRM_MODE_BEET=y | 298 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 295 | CONFIG_IPV6_SIT=y | 299 | CONFIG_IPV6_SIT=y |
| 300 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 296 | # CONFIG_IPV6_TUNNEL is not set | 301 | # CONFIG_IPV6_TUNNEL is not set |
| 297 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 298 | CONFIG_NETFILTER=y | 303 | CONFIG_NETFILTER=y |
| @@ -513,7 +518,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 513 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 518 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 514 | # CONFIG_BLK_DEV_TC86C001 is not set | 519 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 515 | # CONFIG_BLK_DEV_IDEDMA is not set | 520 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 516 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 521 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 517 | # CONFIG_BLK_DEV_HD is not set | 522 | # CONFIG_BLK_DEV_HD is not set |
| 518 | 523 | ||
| 519 | # | 524 | # |
| @@ -593,7 +598,6 @@ CONFIG_NETDEV_1000=y | |||
| 593 | # CONFIG_SIS190 is not set | 598 | # CONFIG_SIS190 is not set |
| 594 | # CONFIG_SKGE is not set | 599 | # CONFIG_SKGE is not set |
| 595 | # CONFIG_SKY2 is not set | 600 | # CONFIG_SKY2 is not set |
| 596 | # CONFIG_SK98LIN is not set | ||
| 597 | # CONFIG_VIA_VELOCITY is not set | 601 | # CONFIG_VIA_VELOCITY is not set |
| 598 | # CONFIG_TIGON3 is not set | 602 | # CONFIG_TIGON3 is not set |
| 599 | # CONFIG_BNX2 is not set | 603 | # CONFIG_BNX2 is not set |
| @@ -611,6 +615,7 @@ CONFIG_NETDEV_10000=y | |||
| 611 | # CONFIG_MLX4_CORE is not set | 615 | # CONFIG_MLX4_CORE is not set |
| 612 | # CONFIG_TEHUTI is not set | 616 | # CONFIG_TEHUTI is not set |
| 613 | # CONFIG_BNX2X is not set | 617 | # CONFIG_BNX2X is not set |
| 618 | # CONFIG_SFC is not set | ||
| 614 | # CONFIG_TR is not set | 619 | # CONFIG_TR is not set |
| 615 | 620 | ||
| 616 | # | 621 | # |
| @@ -618,6 +623,7 @@ CONFIG_NETDEV_10000=y | |||
| 618 | # | 623 | # |
| 619 | # CONFIG_WLAN_PRE80211 is not set | 624 | # CONFIG_WLAN_PRE80211 is not set |
| 620 | # CONFIG_WLAN_80211 is not set | 625 | # CONFIG_WLAN_80211 is not set |
| 626 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 621 | # CONFIG_WAN is not set | 627 | # CONFIG_WAN is not set |
| 622 | # CONFIG_FDDI is not set | 628 | # CONFIG_FDDI is not set |
| 623 | CONFIG_PPP=y | 629 | CONFIG_PPP=y |
| @@ -692,6 +698,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 692 | # Character devices | 698 | # Character devices |
| 693 | # | 699 | # |
| 694 | # CONFIG_VT is not set | 700 | # CONFIG_VT is not set |
| 701 | CONFIG_DEVKMEM=y | ||
| 695 | # CONFIG_SERIAL_NONSTANDARD is not set | 702 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 696 | 703 | ||
| 697 | # | 704 | # |
| @@ -726,12 +733,7 @@ CONFIG_HW_RANDOM=y | |||
| 726 | # CONFIG_RAW_DRIVER is not set | 733 | # CONFIG_RAW_DRIVER is not set |
| 727 | CONFIG_DEVPORT=y | 734 | CONFIG_DEVPORT=y |
| 728 | # CONFIG_I2C is not set | 735 | # CONFIG_I2C is not set |
| 729 | |||
| 730 | # | ||
| 731 | # SPI support | ||
| 732 | # | ||
| 733 | # CONFIG_SPI is not set | 736 | # CONFIG_SPI is not set |
| 734 | # CONFIG_SPI_MASTER is not set | ||
| 735 | # CONFIG_W1 is not set | 737 | # CONFIG_W1 is not set |
| 736 | # CONFIG_POWER_SUPPLY is not set | 738 | # CONFIG_POWER_SUPPLY is not set |
| 737 | # CONFIG_HWMON is not set | 739 | # CONFIG_HWMON is not set |
| @@ -748,12 +750,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 748 | # Multifunction device drivers | 750 | # Multifunction device drivers |
| 749 | # | 751 | # |
| 750 | # CONFIG_MFD_SM501 is not set | 752 | # CONFIG_MFD_SM501 is not set |
| 753 | # CONFIG_HTC_PASIC3 is not set | ||
| 751 | 754 | ||
| 752 | # | 755 | # |
| 753 | # Multimedia devices | 756 | # Multimedia devices |
| 754 | # | 757 | # |
| 758 | |||
| 759 | # | ||
| 760 | # Multimedia core support | ||
| 761 | # | ||
| 755 | # CONFIG_VIDEO_DEV is not set | 762 | # CONFIG_VIDEO_DEV is not set |
| 756 | # CONFIG_DVB_CORE is not set | 763 | # CONFIG_DVB_CORE is not set |
| 764 | # CONFIG_VIDEO_MEDIA is not set | ||
| 765 | |||
| 766 | # | ||
| 767 | # Multimedia drivers | ||
| 768 | # | ||
| 757 | CONFIG_DAB=y | 769 | CONFIG_DAB=y |
| 758 | 770 | ||
| 759 | # | 771 | # |
| @@ -781,11 +793,14 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 781 | CONFIG_USB_ARCH_HAS_OHCI=y | 793 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 782 | CONFIG_USB_ARCH_HAS_EHCI=y | 794 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 783 | # CONFIG_USB is not set | 795 | # CONFIG_USB is not set |
| 796 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 797 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 784 | 798 | ||
| 785 | # | 799 | # |
| 786 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 787 | # | 801 | # |
| 788 | CONFIG_USB_GADGET=y | 802 | CONFIG_USB_GADGET=y |
| 803 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 789 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 804 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| 790 | CONFIG_USB_GADGET_SELECTED=y | 805 | CONFIG_USB_GADGET_SELECTED=y |
| 791 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 806 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
| @@ -795,6 +810,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
| 795 | # CONFIG_USB_GADGET_PXA2XX is not set | 810 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 796 | CONFIG_USB_GADGET_M66592=y | 811 | CONFIG_USB_GADGET_M66592=y |
| 797 | CONFIG_USB_M66592=y | 812 | CONFIG_USB_M66592=y |
| 813 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 798 | # CONFIG_USB_GADGET_GOKU is not set | 814 | # CONFIG_USB_GADGET_GOKU is not set |
| 799 | # CONFIG_USB_GADGET_LH7A40X is not set | 815 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 800 | # CONFIG_USB_GADGET_OMAP is not set | 816 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -804,6 +820,7 @@ CONFIG_USB_M66592=y | |||
| 804 | CONFIG_USB_GADGET_DUALSPEED=y | 820 | CONFIG_USB_GADGET_DUALSPEED=y |
| 805 | # CONFIG_USB_ZERO is not set | 821 | # CONFIG_USB_ZERO is not set |
| 806 | CONFIG_USB_ETH=y | 822 | CONFIG_USB_ETH=y |
| 823 | CONFIG_USB_ETH_RNDIS=y | ||
| 807 | # CONFIG_USB_GADGETFS is not set | 824 | # CONFIG_USB_GADGETFS is not set |
| 808 | # CONFIG_USB_FILE_STORAGE is not set | 825 | # CONFIG_USB_FILE_STORAGE is not set |
| 809 | # CONFIG_USB_G_SERIAL is not set | 826 | # CONFIG_USB_G_SERIAL is not set |
| @@ -812,13 +829,10 @@ CONFIG_USB_ETH=y | |||
| 812 | # CONFIG_MMC is not set | 829 | # CONFIG_MMC is not set |
| 813 | # CONFIG_MEMSTICK is not set | 830 | # CONFIG_MEMSTICK is not set |
| 814 | # CONFIG_NEW_LEDS is not set | 831 | # CONFIG_NEW_LEDS is not set |
| 832 | # CONFIG_ACCESSIBILITY is not set | ||
| 815 | # CONFIG_INFINIBAND is not set | 833 | # CONFIG_INFINIBAND is not set |
| 816 | # CONFIG_RTC_CLASS is not set | 834 | # CONFIG_RTC_CLASS is not set |
| 817 | # CONFIG_DMADEVICES is not set | 835 | # CONFIG_DMADEVICES is not set |
| 818 | |||
| 819 | # | ||
| 820 | # Userspace I/O | ||
| 821 | # | ||
| 822 | # CONFIG_UIO is not set | 836 | # CONFIG_UIO is not set |
| 823 | 837 | ||
| 824 | # | 838 | # |
| @@ -888,7 +902,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 888 | CONFIG_NFS_FS=y | 902 | CONFIG_NFS_FS=y |
| 889 | CONFIG_NFS_V3=y | 903 | CONFIG_NFS_V3=y |
| 890 | CONFIG_NFS_V3_ACL=y | 904 | CONFIG_NFS_V3_ACL=y |
| 891 | # CONFIG_NFS_DIRECTIO is not set | ||
| 892 | # CONFIG_NFSD is not set | 905 | # CONFIG_NFSD is not set |
| 893 | CONFIG_ROOT_NFS=y | 906 | CONFIG_ROOT_NFS=y |
| 894 | CONFIG_LOCKD=y | 907 | CONFIG_LOCKD=y |
| @@ -967,6 +980,7 @@ CONFIG_NLS_UTF8=y | |||
| 967 | # Library routines | 980 | # Library routines |
| 968 | # | 981 | # |
| 969 | CONFIG_BITREVERSE=y | 982 | CONFIG_BITREVERSE=y |
| 983 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 970 | CONFIG_CRC_CCITT=y | 984 | CONFIG_CRC_CCITT=y |
| 971 | # CONFIG_CRC16 is not set | 985 | # CONFIG_CRC16 is not set |
| 972 | # CONFIG_CRC_ITU_T is not set | 986 | # CONFIG_CRC_ITU_T is not set |
| @@ -979,6 +993,7 @@ CONFIG_PLIST=y | |||
| 979 | CONFIG_HAS_IOMEM=y | 993 | CONFIG_HAS_IOMEM=y |
| 980 | CONFIG_HAS_IOPORT=y | 994 | CONFIG_HAS_IOPORT=y |
| 981 | CONFIG_HAS_DMA=y | 995 | CONFIG_HAS_DMA=y |
| 996 | CONFIG_HAVE_LMB=y | ||
| 982 | 997 | ||
| 983 | # | 998 | # |
| 984 | # Kernel hacking | 999 | # Kernel hacking |
| @@ -986,6 +1001,7 @@ CONFIG_HAS_DMA=y | |||
| 986 | # CONFIG_PRINTK_TIME is not set | 1001 | # CONFIG_PRINTK_TIME is not set |
| 987 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1002 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 988 | CONFIG_ENABLE_MUST_CHECK=y | 1003 | CONFIG_ENABLE_MUST_CHECK=y |
| 1004 | CONFIG_FRAME_WARN=1024 | ||
| 989 | CONFIG_MAGIC_SYSRQ=y | 1005 | CONFIG_MAGIC_SYSRQ=y |
| 990 | # CONFIG_UNUSED_SYMBOLS is not set | 1006 | # CONFIG_UNUSED_SYMBOLS is not set |
| 991 | # CONFIG_DEBUG_FS is not set | 1007 | # CONFIG_DEBUG_FS is not set |
| @@ -996,6 +1012,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 996 | # CONFIG_SCHED_DEBUG is not set | 1012 | # CONFIG_SCHED_DEBUG is not set |
| 997 | # CONFIG_SCHEDSTATS is not set | 1013 | # CONFIG_SCHEDSTATS is not set |
| 998 | # CONFIG_TIMER_STATS is not set | 1014 | # CONFIG_TIMER_STATS is not set |
| 1015 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 999 | # CONFIG_SLUB_DEBUG_ON is not set | 1016 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1000 | # CONFIG_SLUB_STATS is not set | 1017 | # CONFIG_SLUB_STATS is not set |
| 1001 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1018 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1008,6 +1025,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1008 | CONFIG_DEBUG_BUGVERBOSE=y | 1025 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1009 | CONFIG_DEBUG_INFO=y | 1026 | CONFIG_DEBUG_INFO=y |
| 1010 | # CONFIG_DEBUG_VM is not set | 1027 | # CONFIG_DEBUG_VM is not set |
| 1028 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1011 | # CONFIG_DEBUG_LIST is not set | 1029 | # CONFIG_DEBUG_LIST is not set |
| 1012 | # CONFIG_DEBUG_SG is not set | 1030 | # CONFIG_DEBUG_SG is not set |
| 1013 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1031 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1019,6 +1037,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1019 | # CONFIG_DEBUG_PAGEALLOC is not set | 1037 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1020 | # CONFIG_DEBUGGER is not set | 1038 | # CONFIG_DEBUGGER is not set |
| 1021 | # CONFIG_KGDB_CONSOLE is not set | 1039 | # CONFIG_KGDB_CONSOLE is not set |
| 1040 | # CONFIG_IRQSTACKS is not set | ||
| 1022 | CONFIG_BDI_SWITCH=y | 1041 | CONFIG_BDI_SWITCH=y |
| 1023 | # CONFIG_PPC_EARLY_DEBUG is not set | 1042 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1024 | 1043 | ||
| @@ -1028,46 +1047,76 @@ CONFIG_BDI_SWITCH=y | |||
| 1028 | # CONFIG_KEYS is not set | 1047 | # CONFIG_KEYS is not set |
| 1029 | # CONFIG_SECURITY is not set | 1048 | # CONFIG_SECURITY is not set |
| 1030 | CONFIG_CRYPTO=y | 1049 | CONFIG_CRYPTO=y |
| 1050 | |||
| 1051 | # | ||
| 1052 | # Crypto core or helper | ||
| 1053 | # | ||
| 1031 | CONFIG_CRYPTO_ALGAPI=y | 1054 | CONFIG_CRYPTO_ALGAPI=y |
| 1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1055 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1033 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1034 | CONFIG_CRYPTO_MANAGER=y | 1056 | CONFIG_CRYPTO_MANAGER=y |
| 1035 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1036 | # CONFIG_CRYPTO_NULL is not set | 1057 | # CONFIG_CRYPTO_NULL is not set |
| 1058 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1059 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1060 | |||
| 1061 | # | ||
| 1062 | # Authenticated Encryption with Associated Data | ||
| 1063 | # | ||
| 1064 | # CONFIG_CRYPTO_CCM is not set | ||
| 1065 | # CONFIG_CRYPTO_GCM is not set | ||
| 1066 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1067 | |||
| 1068 | # | ||
| 1069 | # Block modes | ||
| 1070 | # | ||
| 1071 | CONFIG_CRYPTO_CBC=y | ||
| 1072 | # CONFIG_CRYPTO_CTR is not set | ||
| 1073 | # CONFIG_CRYPTO_CTS is not set | ||
| 1074 | CONFIG_CRYPTO_ECB=y | ||
| 1075 | CONFIG_CRYPTO_PCBC=y | ||
| 1076 | |||
| 1077 | # | ||
| 1078 | # Hash modes | ||
| 1079 | # | ||
| 1080 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1081 | |||
| 1082 | # | ||
| 1083 | # Digest | ||
| 1084 | # | ||
| 1085 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1037 | # CONFIG_CRYPTO_MD4 is not set | 1086 | # CONFIG_CRYPTO_MD4 is not set |
| 1038 | CONFIG_CRYPTO_MD5=y | 1087 | CONFIG_CRYPTO_MD5=y |
| 1088 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1039 | # CONFIG_CRYPTO_SHA1 is not set | 1089 | # CONFIG_CRYPTO_SHA1 is not set |
| 1040 | # CONFIG_CRYPTO_SHA256 is not set | 1090 | # CONFIG_CRYPTO_SHA256 is not set |
| 1041 | # CONFIG_CRYPTO_SHA512 is not set | 1091 | # CONFIG_CRYPTO_SHA512 is not set |
| 1042 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1043 | # CONFIG_CRYPTO_TGR192 is not set | 1092 | # CONFIG_CRYPTO_TGR192 is not set |
| 1044 | CONFIG_CRYPTO_ECB=y | 1093 | # CONFIG_CRYPTO_WP512 is not set |
| 1045 | CONFIG_CRYPTO_CBC=y | 1094 | |
| 1046 | CONFIG_CRYPTO_PCBC=y | 1095 | # |
| 1047 | # CONFIG_CRYPTO_CTR is not set | 1096 | # Ciphers |
| 1048 | # CONFIG_CRYPTO_GCM is not set | 1097 | # |
| 1049 | # CONFIG_CRYPTO_CCM is not set | ||
| 1050 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1051 | CONFIG_CRYPTO_DES=y | ||
| 1052 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1053 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1054 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1055 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1056 | # CONFIG_CRYPTO_AES is not set | 1098 | # CONFIG_CRYPTO_AES is not set |
| 1099 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1100 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1101 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1102 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1057 | # CONFIG_CRYPTO_CAST5 is not set | 1103 | # CONFIG_CRYPTO_CAST5 is not set |
| 1058 | # CONFIG_CRYPTO_CAST6 is not set | 1104 | # CONFIG_CRYPTO_CAST6 is not set |
| 1059 | # CONFIG_CRYPTO_TEA is not set | 1105 | CONFIG_CRYPTO_DES=y |
| 1060 | # CONFIG_CRYPTO_ARC4 is not set | 1106 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1061 | # CONFIG_CRYPTO_KHAZAD is not set | 1107 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1062 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1063 | # CONFIG_CRYPTO_SEED is not set | 1108 | # CONFIG_CRYPTO_SEED is not set |
| 1109 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1110 | # CONFIG_CRYPTO_TEA is not set | ||
| 1111 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # Compression | ||
| 1115 | # | ||
| 1064 | # CONFIG_CRYPTO_DEFLATE is not set | 1116 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1065 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1066 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1067 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1068 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1069 | # CONFIG_CRYPTO_LZO is not set | 1117 | # CONFIG_CRYPTO_LZO is not set |
| 1070 | CONFIG_CRYPTO_HW=y | 1118 | CONFIG_CRYPTO_HW=y |
| 1071 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1119 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1072 | # CONFIG_PPC_CLOCK is not set | 1120 | # CONFIG_PPC_CLOCK is not set |
| 1073 | CONFIG_PPC_LIB_RHEAP=y | 1121 | CONFIG_PPC_LIB_RHEAP=y |
| 1122 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index f9121685f11a..c6b83577c055 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:15 2008 | 4 | # Mon Jun 9 08:52:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -33,6 +33,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 33 | CONFIG_GENERIC_HARDIRQS=y | 33 | CONFIG_GENERIC_HARDIRQS=y |
| 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 37 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 38 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -92,6 +94,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 93 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 95 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 97 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
| @@ -117,6 +120,7 @@ CONFIG_SLUB=y | |||
| 117 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| @@ -215,11 +219,13 @@ CONFIG_FLATMEM=y | |||
| 215 | CONFIG_FLAT_NODE_MEM_MAP=y | 219 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 216 | # CONFIG_SPARSEMEM_STATIC is not set | 220 | # CONFIG_SPARSEMEM_STATIC is not set |
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 219 | # CONFIG_RESOURCES_64BIT is not set | 224 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 225 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 226 | CONFIG_BOUNCE=y |
| 222 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 223 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 230 | # CONFIG_CMDLINE_BOOL is not set |
| 225 | # CONFIG_PM is not set | 231 | # CONFIG_PM is not set |
| @@ -241,6 +247,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 241 | CONFIG_PCI_LEGACY=y | 247 | CONFIG_PCI_LEGACY=y |
| 242 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 243 | # CONFIG_HOTPLUG_PCI is not set | 249 | # CONFIG_HOTPLUG_PCI is not set |
| 250 | # CONFIG_HAS_RAPIDIO is not set | ||
| 244 | 251 | ||
| 245 | # | 252 | # |
| 246 | # Advanced setup | 253 | # Advanced setup |
| @@ -250,13 +257,13 @@ CONFIG_PCI_LEGACY=y | |||
| 250 | # | 257 | # |
| 251 | # Default settings for advanced configuration options are used | 258 | # Default settings for advanced configuration options are used |
| 252 | # | 259 | # |
| 253 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 254 | CONFIG_LOWMEM_SIZE=0x30000000 | 260 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 261 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 255 | CONFIG_KERNEL_START=0xc0000000 | 262 | CONFIG_KERNEL_START=0xc0000000 |
| 263 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_TASK_SIZE=0xc0000000 | 264 | CONFIG_TASK_SIZE=0xc0000000 |
| 257 | CONFIG_CONSISTENT_START=0xff100000 | 265 | CONFIG_CONSISTENT_START=0xff100000 |
| 258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 266 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 267 | ||
| 261 | # | 268 | # |
| 262 | # Networking | 269 | # Networking |
| @@ -304,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 304 | CONFIG_DEFAULT_TCP_CONG="cubic" | 311 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 305 | # CONFIG_TCP_MD5SIG is not set | 312 | # CONFIG_TCP_MD5SIG is not set |
| 306 | # CONFIG_IPV6 is not set | 313 | # CONFIG_IPV6 is not set |
| 307 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 308 | # CONFIG_INET6_TUNNEL is not set | ||
| 309 | # CONFIG_NETWORK_SECMARK is not set | 314 | # CONFIG_NETWORK_SECMARK is not set |
| 310 | # CONFIG_NETFILTER is not set | 315 | # CONFIG_NETFILTER is not set |
| 311 | # CONFIG_IP_DCCP is not set | 316 | # CONFIG_IP_DCCP is not set |
| @@ -364,6 +369,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 364 | # CONFIG_MTD_REDBOOT_PARTS is not set | 369 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 365 | # CONFIG_MTD_CMDLINE_PARTS is not set | 370 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 366 | # CONFIG_MTD_OF_PARTS is not set | 371 | # CONFIG_MTD_OF_PARTS is not set |
| 372 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 367 | 373 | ||
| 368 | # | 374 | # |
| 369 | # User Modules And Translation Layers | 375 | # User Modules And Translation Layers |
| @@ -435,6 +441,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 435 | # | 441 | # |
| 436 | # CONFIG_MTD_UBI is not set | 442 | # CONFIG_MTD_UBI is not set |
| 437 | CONFIG_OF_DEVICE=y | 443 | CONFIG_OF_DEVICE=y |
| 444 | CONFIG_OF_I2C=y | ||
| 438 | # CONFIG_PARPORT is not set | 445 | # CONFIG_PARPORT is not set |
| 439 | CONFIG_BLK_DEV=y | 446 | CONFIG_BLK_DEV=y |
| 440 | # CONFIG_BLK_DEV_FD is not set | 447 | # CONFIG_BLK_DEV_FD is not set |
| @@ -519,7 +526,7 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y | |||
| 519 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 526 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 520 | # CONFIG_BLK_DEV_TC86C001 is not set | 527 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 521 | CONFIG_BLK_DEV_IDEDMA=y | 528 | CONFIG_BLK_DEV_IDEDMA=y |
| 522 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 529 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 523 | # CONFIG_BLK_DEV_HD is not set | 530 | # CONFIG_BLK_DEV_HD is not set |
| 524 | 531 | ||
| 525 | # | 532 | # |
| @@ -598,7 +605,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 598 | # CONFIG_SCSI_SRP is not set | 605 | # CONFIG_SCSI_SRP is not set |
| 599 | CONFIG_ATA=y | 606 | CONFIG_ATA=y |
| 600 | # CONFIG_ATA_NONSTANDARD is not set | 607 | # CONFIG_ATA_NONSTANDARD is not set |
| 608 | CONFIG_SATA_PMP=y | ||
| 601 | # CONFIG_SATA_AHCI is not set | 609 | # CONFIG_SATA_AHCI is not set |
| 610 | # CONFIG_SATA_SIL24 is not set | ||
| 611 | CONFIG_ATA_SFF=y | ||
| 602 | # CONFIG_SATA_SVW is not set | 612 | # CONFIG_SATA_SVW is not set |
| 603 | # CONFIG_ATA_PIIX is not set | 613 | # CONFIG_ATA_PIIX is not set |
| 604 | CONFIG_SATA_MV=y | 614 | CONFIG_SATA_MV=y |
| @@ -608,7 +618,6 @@ CONFIG_SATA_MV=y | |||
| 608 | # CONFIG_SATA_PROMISE is not set | 618 | # CONFIG_SATA_PROMISE is not set |
| 609 | # CONFIG_SATA_SX4 is not set | 619 | # CONFIG_SATA_SX4 is not set |
| 610 | # CONFIG_SATA_SIL is not set | 620 | # CONFIG_SATA_SIL is not set |
| 611 | # CONFIG_SATA_SIL24 is not set | ||
| 612 | # CONFIG_SATA_SIS is not set | 621 | # CONFIG_SATA_SIS is not set |
| 613 | # CONFIG_SATA_ULI is not set | 622 | # CONFIG_SATA_ULI is not set |
| 614 | # CONFIG_SATA_VIA is not set | 623 | # CONFIG_SATA_VIA is not set |
| @@ -653,6 +662,7 @@ CONFIG_SATA_MV=y | |||
| 653 | # CONFIG_PATA_VIA is not set | 662 | # CONFIG_PATA_VIA is not set |
| 654 | # CONFIG_PATA_WINBOND is not set | 663 | # CONFIG_PATA_WINBOND is not set |
| 655 | # CONFIG_PATA_PLATFORM is not set | 664 | # CONFIG_PATA_PLATFORM is not set |
| 665 | # CONFIG_PATA_SCH is not set | ||
| 656 | # CONFIG_MD is not set | 666 | # CONFIG_MD is not set |
| 657 | # CONFIG_FUSION is not set | 667 | # CONFIG_FUSION is not set |
| 658 | 668 | ||
| @@ -744,7 +754,6 @@ CONFIG_E1000=y | |||
| 744 | # CONFIG_SIS190 is not set | 754 | # CONFIG_SIS190 is not set |
| 745 | # CONFIG_SKGE is not set | 755 | # CONFIG_SKGE is not set |
| 746 | # CONFIG_SKY2 is not set | 756 | # CONFIG_SKY2 is not set |
| 747 | # CONFIG_SK98LIN is not set | ||
| 748 | # CONFIG_VIA_VELOCITY is not set | 757 | # CONFIG_VIA_VELOCITY is not set |
| 749 | # CONFIG_TIGON3 is not set | 758 | # CONFIG_TIGON3 is not set |
| 750 | # CONFIG_BNX2 is not set | 759 | # CONFIG_BNX2 is not set |
| @@ -763,6 +772,7 @@ CONFIG_NETDEV_10000=y | |||
| 763 | # CONFIG_MLX4_CORE is not set | 772 | # CONFIG_MLX4_CORE is not set |
| 764 | # CONFIG_TEHUTI is not set | 773 | # CONFIG_TEHUTI is not set |
| 765 | # CONFIG_BNX2X is not set | 774 | # CONFIG_BNX2X is not set |
| 775 | # CONFIG_SFC is not set | ||
| 766 | # CONFIG_TR is not set | 776 | # CONFIG_TR is not set |
| 767 | 777 | ||
| 768 | # | 778 | # |
| @@ -770,6 +780,7 @@ CONFIG_NETDEV_10000=y | |||
| 770 | # | 780 | # |
| 771 | # CONFIG_WLAN_PRE80211 is not set | 781 | # CONFIG_WLAN_PRE80211 is not set |
| 772 | # CONFIG_WLAN_80211 is not set | 782 | # CONFIG_WLAN_80211 is not set |
| 783 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 773 | 784 | ||
| 774 | # | 785 | # |
| 775 | # USB Network Adapters | 786 | # USB Network Adapters |
| @@ -832,6 +843,7 @@ CONFIG_VT=y | |||
| 832 | CONFIG_VT_CONSOLE=y | 843 | CONFIG_VT_CONSOLE=y |
| 833 | CONFIG_HW_CONSOLE=y | 844 | CONFIG_HW_CONSOLE=y |
| 834 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 845 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 846 | CONFIG_DEVKMEM=y | ||
| 835 | # CONFIG_SERIAL_NONSTANDARD is not set | 847 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 836 | # CONFIG_NOZOMI is not set | 848 | # CONFIG_NOZOMI is not set |
| 837 | 849 | ||
| @@ -855,7 +867,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 855 | # CONFIG_IPMI_HANDLER is not set | 867 | # CONFIG_IPMI_HANDLER is not set |
| 856 | # CONFIG_HW_RANDOM is not set | 868 | # CONFIG_HW_RANDOM is not set |
| 857 | # CONFIG_NVRAM is not set | 869 | # CONFIG_NVRAM is not set |
| 858 | # CONFIG_GEN_RTC is not set | ||
| 859 | # CONFIG_R3964 is not set | 870 | # CONFIG_R3964 is not set |
| 860 | # CONFIG_APPLICOM is not set | 871 | # CONFIG_APPLICOM is not set |
| 861 | # CONFIG_RAW_DRIVER is not set | 872 | # CONFIG_RAW_DRIVER is not set |
| @@ -866,13 +877,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 866 | CONFIG_I2C_CHARDEV=y | 877 | CONFIG_I2C_CHARDEV=y |
| 867 | 878 | ||
| 868 | # | 879 | # |
| 869 | # I2C Algorithms | ||
| 870 | # | ||
| 871 | # CONFIG_I2C_ALGOBIT is not set | ||
| 872 | # CONFIG_I2C_ALGOPCF is not set | ||
| 873 | # CONFIG_I2C_ALGOPCA is not set | ||
| 874 | |||
| 875 | # | ||
| 876 | # I2C Hardware Bus support | 880 | # I2C Hardware Bus support |
| 877 | # | 881 | # |
| 878 | # CONFIG_I2C_ALI1535 is not set | 882 | # CONFIG_I2C_ALI1535 is not set |
| @@ -898,6 +902,7 @@ CONFIG_I2C_CHARDEV=y | |||
| 898 | # CONFIG_I2C_VIA is not set | 902 | # CONFIG_I2C_VIA is not set |
| 899 | # CONFIG_I2C_VIAPRO is not set | 903 | # CONFIG_I2C_VIAPRO is not set |
| 900 | # CONFIG_I2C_VOODOO3 is not set | 904 | # CONFIG_I2C_VOODOO3 is not set |
| 905 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 901 | CONFIG_I2C_MV64XXX=y | 906 | CONFIG_I2C_MV64XXX=y |
| 902 | 907 | ||
| 903 | # | 908 | # |
| @@ -908,19 +913,13 @@ CONFIG_I2C_MV64XXX=y | |||
| 908 | # CONFIG_SENSORS_PCF8574 is not set | 913 | # CONFIG_SENSORS_PCF8574 is not set |
| 909 | # CONFIG_PCF8575 is not set | 914 | # CONFIG_PCF8575 is not set |
| 910 | # CONFIG_SENSORS_PCF8591 is not set | 915 | # CONFIG_SENSORS_PCF8591 is not set |
| 911 | # CONFIG_TPS65010 is not set | ||
| 912 | # CONFIG_SENSORS_MAX6875 is not set | 916 | # CONFIG_SENSORS_MAX6875 is not set |
| 913 | # CONFIG_SENSORS_TSL2550 is not set | 917 | # CONFIG_SENSORS_TSL2550 is not set |
| 914 | # CONFIG_I2C_DEBUG_CORE is not set | 918 | # CONFIG_I2C_DEBUG_CORE is not set |
| 915 | # CONFIG_I2C_DEBUG_ALGO is not set | 919 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 916 | # CONFIG_I2C_DEBUG_BUS is not set | 920 | # CONFIG_I2C_DEBUG_BUS is not set |
| 917 | # CONFIG_I2C_DEBUG_CHIP is not set | 921 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 918 | |||
| 919 | # | ||
| 920 | # SPI support | ||
| 921 | # | ||
| 922 | # CONFIG_SPI is not set | 922 | # CONFIG_SPI is not set |
| 923 | # CONFIG_SPI_MASTER is not set | ||
| 924 | # CONFIG_W1 is not set | 923 | # CONFIG_W1 is not set |
| 925 | # CONFIG_POWER_SUPPLY is not set | 924 | # CONFIG_POWER_SUPPLY is not set |
| 926 | CONFIG_HWMON=y | 925 | CONFIG_HWMON=y |
| @@ -990,12 +989,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 990 | # Multifunction device drivers | 989 | # Multifunction device drivers |
| 991 | # | 990 | # |
| 992 | # CONFIG_MFD_SM501 is not set | 991 | # CONFIG_MFD_SM501 is not set |
| 992 | # CONFIG_HTC_PASIC3 is not set | ||
| 993 | 993 | ||
| 994 | # | 994 | # |
| 995 | # Multimedia devices | 995 | # Multimedia devices |
| 996 | # | 996 | # |
| 997 | |||
| 998 | # | ||
| 999 | # Multimedia core support | ||
| 1000 | # | ||
| 997 | # CONFIG_VIDEO_DEV is not set | 1001 | # CONFIG_VIDEO_DEV is not set |
| 998 | # CONFIG_DVB_CORE is not set | 1002 | # CONFIG_DVB_CORE is not set |
| 1003 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1004 | |||
| 1005 | # | ||
| 1006 | # Multimedia drivers | ||
| 1007 | # | ||
| 999 | # CONFIG_DAB is not set | 1008 | # CONFIG_DAB is not set |
| 1000 | 1009 | ||
| 1001 | # | 1010 | # |
| @@ -1055,11 +1064,13 @@ CONFIG_USB_DEVICEFS=y | |||
| 1055 | # | 1064 | # |
| 1056 | # USB Host Controller Drivers | 1065 | # USB Host Controller Drivers |
| 1057 | # | 1066 | # |
| 1067 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1058 | CONFIG_USB_EHCI_HCD=y | 1068 | CONFIG_USB_EHCI_HCD=y |
| 1059 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1069 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1060 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1070 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1061 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1071 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1062 | # CONFIG_USB_ISP116X_HCD is not set | 1072 | # CONFIG_USB_ISP116X_HCD is not set |
| 1073 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1063 | CONFIG_USB_OHCI_HCD=y | 1074 | CONFIG_USB_OHCI_HCD=y |
| 1064 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1075 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1065 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1076 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1074,6 +1085,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1074 | # | 1085 | # |
| 1075 | # CONFIG_USB_ACM is not set | 1086 | # CONFIG_USB_ACM is not set |
| 1076 | # CONFIG_USB_PRINTER is not set | 1087 | # CONFIG_USB_PRINTER is not set |
| 1088 | # CONFIG_USB_WDM is not set | ||
| 1077 | 1089 | ||
| 1078 | # | 1090 | # |
| 1079 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1091 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1120,10 +1132,12 @@ CONFIG_USB_MON=y | |||
| 1120 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1132 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1121 | # CONFIG_USB_IOWARRIOR is not set | 1133 | # CONFIG_USB_IOWARRIOR is not set |
| 1122 | # CONFIG_USB_TEST is not set | 1134 | # CONFIG_USB_TEST is not set |
| 1135 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1123 | # CONFIG_USB_GADGET is not set | 1136 | # CONFIG_USB_GADGET is not set |
| 1124 | # CONFIG_MMC is not set | 1137 | # CONFIG_MMC is not set |
| 1125 | # CONFIG_MEMSTICK is not set | 1138 | # CONFIG_MEMSTICK is not set |
| 1126 | # CONFIG_NEW_LEDS is not set | 1139 | # CONFIG_NEW_LEDS is not set |
| 1140 | # CONFIG_ACCESSIBILITY is not set | ||
| 1127 | # CONFIG_INFINIBAND is not set | 1141 | # CONFIG_INFINIBAND is not set |
| 1128 | # CONFIG_EDAC is not set | 1142 | # CONFIG_EDAC is not set |
| 1129 | CONFIG_RTC_LIB=y | 1143 | CONFIG_RTC_LIB=y |
| @@ -1175,11 +1189,8 @@ CONFIG_RTC_DRV_MAX6900=y | |||
| 1175 | # | 1189 | # |
| 1176 | # on-CPU RTC drivers | 1190 | # on-CPU RTC drivers |
| 1177 | # | 1191 | # |
| 1192 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1178 | # CONFIG_DMADEVICES is not set | 1193 | # CONFIG_DMADEVICES is not set |
| 1179 | |||
| 1180 | # | ||
| 1181 | # Userspace I/O | ||
| 1182 | # | ||
| 1183 | # CONFIG_UIO is not set | 1194 | # CONFIG_UIO is not set |
| 1184 | 1195 | ||
| 1185 | # | 1196 | # |
| @@ -1199,7 +1210,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1199 | # CONFIG_JFS_FS is not set | 1210 | # CONFIG_JFS_FS is not set |
| 1200 | # CONFIG_FS_POSIX_ACL is not set | 1211 | # CONFIG_FS_POSIX_ACL is not set |
| 1201 | # CONFIG_XFS_FS is not set | 1212 | # CONFIG_XFS_FS is not set |
| 1202 | # CONFIG_GFS2_FS is not set | ||
| 1203 | # CONFIG_OCFS2_FS is not set | 1213 | # CONFIG_OCFS2_FS is not set |
| 1204 | CONFIG_DNOTIFY=y | 1214 | CONFIG_DNOTIFY=y |
| 1205 | CONFIG_INOTIFY=y | 1215 | CONFIG_INOTIFY=y |
| @@ -1257,7 +1267,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 1257 | CONFIG_NFS_FS=y | 1267 | CONFIG_NFS_FS=y |
| 1258 | # CONFIG_NFS_V3 is not set | 1268 | # CONFIG_NFS_V3 is not set |
| 1259 | # CONFIG_NFS_V4 is not set | 1269 | # CONFIG_NFS_V4 is not set |
| 1260 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1261 | # CONFIG_NFSD is not set | 1270 | # CONFIG_NFSD is not set |
| 1262 | CONFIG_ROOT_NFS=y | 1271 | CONFIG_ROOT_NFS=y |
| 1263 | CONFIG_LOCKD=y | 1272 | CONFIG_LOCKD=y |
| @@ -1300,6 +1309,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1300 | # Library routines | 1309 | # Library routines |
| 1301 | # | 1310 | # |
| 1302 | CONFIG_BITREVERSE=y | 1311 | CONFIG_BITREVERSE=y |
| 1312 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1303 | # CONFIG_CRC_CCITT is not set | 1313 | # CONFIG_CRC_CCITT is not set |
| 1304 | # CONFIG_CRC16 is not set | 1314 | # CONFIG_CRC16 is not set |
| 1305 | # CONFIG_CRC_ITU_T is not set | 1315 | # CONFIG_CRC_ITU_T is not set |
| @@ -1310,6 +1320,7 @@ CONFIG_PLIST=y | |||
| 1310 | CONFIG_HAS_IOMEM=y | 1320 | CONFIG_HAS_IOMEM=y |
| 1311 | CONFIG_HAS_IOPORT=y | 1321 | CONFIG_HAS_IOPORT=y |
| 1312 | CONFIG_HAS_DMA=y | 1322 | CONFIG_HAS_DMA=y |
| 1323 | CONFIG_HAVE_LMB=y | ||
| 1313 | 1324 | ||
| 1314 | # | 1325 | # |
| 1315 | # Kernel hacking | 1326 | # Kernel hacking |
| @@ -1317,6 +1328,7 @@ CONFIG_HAS_DMA=y | |||
| 1317 | # CONFIG_PRINTK_TIME is not set | 1328 | # CONFIG_PRINTK_TIME is not set |
| 1318 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1329 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1319 | CONFIG_ENABLE_MUST_CHECK=y | 1330 | CONFIG_ENABLE_MUST_CHECK=y |
| 1331 | CONFIG_FRAME_WARN=1024 | ||
| 1320 | # CONFIG_MAGIC_SYSRQ is not set | 1332 | # CONFIG_MAGIC_SYSRQ is not set |
| 1321 | # CONFIG_UNUSED_SYMBOLS is not set | 1333 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1322 | # CONFIG_DEBUG_FS is not set | 1334 | # CONFIG_DEBUG_FS is not set |
| @@ -1326,6 +1338,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1326 | # CONFIG_SLUB_STATS is not set | 1338 | # CONFIG_SLUB_STATS is not set |
| 1327 | CONFIG_DEBUG_BUGVERBOSE=y | 1339 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1328 | # CONFIG_SAMPLES is not set | 1340 | # CONFIG_SAMPLES is not set |
| 1341 | # CONFIG_IRQSTACKS is not set | ||
| 1329 | # CONFIG_BOOTX_TEXT is not set | 1342 | # CONFIG_BOOTX_TEXT is not set |
| 1330 | # CONFIG_PPC_EARLY_DEBUG is not set | 1343 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1331 | 1344 | ||
| @@ -1336,48 +1349,78 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1336 | # CONFIG_SECURITY is not set | 1349 | # CONFIG_SECURITY is not set |
| 1337 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1350 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1338 | CONFIG_CRYPTO=y | 1351 | CONFIG_CRYPTO=y |
| 1339 | # CONFIG_CRYPTO_SEQIV is not set | 1352 | |
| 1353 | # | ||
| 1354 | # Crypto core or helper | ||
| 1355 | # | ||
| 1340 | # CONFIG_CRYPTO_MANAGER is not set | 1356 | # CONFIG_CRYPTO_MANAGER is not set |
| 1357 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1358 | # CONFIG_CRYPTO_NULL is not set | ||
| 1359 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1360 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1361 | |||
| 1362 | # | ||
| 1363 | # Authenticated Encryption with Associated Data | ||
| 1364 | # | ||
| 1365 | # CONFIG_CRYPTO_CCM is not set | ||
| 1366 | # CONFIG_CRYPTO_GCM is not set | ||
| 1367 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1368 | |||
| 1369 | # | ||
| 1370 | # Block modes | ||
| 1371 | # | ||
| 1372 | # CONFIG_CRYPTO_CBC is not set | ||
| 1373 | # CONFIG_CRYPTO_CTR is not set | ||
| 1374 | # CONFIG_CRYPTO_CTS is not set | ||
| 1375 | # CONFIG_CRYPTO_ECB is not set | ||
| 1376 | # CONFIG_CRYPTO_LRW is not set | ||
| 1377 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1378 | # CONFIG_CRYPTO_XTS is not set | ||
| 1379 | |||
| 1380 | # | ||
| 1381 | # Hash modes | ||
| 1382 | # | ||
| 1341 | # CONFIG_CRYPTO_HMAC is not set | 1383 | # CONFIG_CRYPTO_HMAC is not set |
| 1342 | # CONFIG_CRYPTO_XCBC is not set | 1384 | # CONFIG_CRYPTO_XCBC is not set |
| 1343 | # CONFIG_CRYPTO_NULL is not set | 1385 | |
| 1386 | # | ||
| 1387 | # Digest | ||
| 1388 | # | ||
| 1389 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1344 | # CONFIG_CRYPTO_MD4 is not set | 1390 | # CONFIG_CRYPTO_MD4 is not set |
| 1345 | # CONFIG_CRYPTO_MD5 is not set | 1391 | # CONFIG_CRYPTO_MD5 is not set |
| 1392 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1346 | # CONFIG_CRYPTO_SHA1 is not set | 1393 | # CONFIG_CRYPTO_SHA1 is not set |
| 1347 | # CONFIG_CRYPTO_SHA256 is not set | 1394 | # CONFIG_CRYPTO_SHA256 is not set |
| 1348 | # CONFIG_CRYPTO_SHA512 is not set | 1395 | # CONFIG_CRYPTO_SHA512 is not set |
| 1349 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1350 | # CONFIG_CRYPTO_TGR192 is not set | 1396 | # CONFIG_CRYPTO_TGR192 is not set |
| 1351 | # CONFIG_CRYPTO_GF128MUL is not set | 1397 | # CONFIG_CRYPTO_WP512 is not set |
| 1352 | # CONFIG_CRYPTO_ECB is not set | 1398 | |
| 1353 | # CONFIG_CRYPTO_CBC is not set | 1399 | # |
| 1354 | # CONFIG_CRYPTO_PCBC is not set | 1400 | # Ciphers |
| 1355 | # CONFIG_CRYPTO_LRW is not set | 1401 | # |
| 1356 | # CONFIG_CRYPTO_XTS is not set | ||
| 1357 | # CONFIG_CRYPTO_CTR is not set | ||
| 1358 | # CONFIG_CRYPTO_GCM is not set | ||
| 1359 | # CONFIG_CRYPTO_CCM is not set | ||
| 1360 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1361 | # CONFIG_CRYPTO_DES is not set | ||
| 1362 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1363 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1364 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1365 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1366 | # CONFIG_CRYPTO_AES is not set | 1402 | # CONFIG_CRYPTO_AES is not set |
| 1403 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1404 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1405 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1406 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1367 | # CONFIG_CRYPTO_CAST5 is not set | 1407 | # CONFIG_CRYPTO_CAST5 is not set |
| 1368 | # CONFIG_CRYPTO_CAST6 is not set | 1408 | # CONFIG_CRYPTO_CAST6 is not set |
| 1369 | # CONFIG_CRYPTO_TEA is not set | 1409 | # CONFIG_CRYPTO_DES is not set |
| 1370 | # CONFIG_CRYPTO_ARC4 is not set | 1410 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1371 | # CONFIG_CRYPTO_KHAZAD is not set | 1411 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1372 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1373 | # CONFIG_CRYPTO_SEED is not set | ||
| 1374 | # CONFIG_CRYPTO_SALSA20 is not set | 1412 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1413 | # CONFIG_CRYPTO_SEED is not set | ||
| 1414 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1415 | # CONFIG_CRYPTO_TEA is not set | ||
| 1416 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1417 | |||
| 1418 | # | ||
| 1419 | # Compression | ||
| 1420 | # | ||
| 1375 | # CONFIG_CRYPTO_DEFLATE is not set | 1421 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1376 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1377 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1378 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1379 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1380 | # CONFIG_CRYPTO_LZO is not set | 1422 | # CONFIG_CRYPTO_LZO is not set |
| 1381 | CONFIG_CRYPTO_HW=y | 1423 | CONFIG_CRYPTO_HW=y |
| 1382 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1424 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1383 | # CONFIG_PPC_CLOCK is not set | 1425 | # CONFIG_PPC_CLOCK is not set |
| 1426 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/sbc8641d_defconfig index 3180125aa6c4..8227510b41a9 100644 --- a/arch/powerpc/configs/sbc8641d_defconfig +++ b/arch/powerpc/configs/sbc8641d_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Thu Apr 10 18:03:25 2008 | 4 | # Mon Jun 9 08:52:19 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_GENERIC_LOCKBREAK=y | 38 | CONFIG_GENERIC_LOCKBREAK=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_ALL is not set | 97 | # CONFIG_KALLSYMS_ALL is not set |
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -116,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 116 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 117 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 118 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 119 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
| 120 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 121 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
| 122 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
| 123 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
| 124 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
| 129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 125 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
| 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 127 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
| @@ -197,7 +202,6 @@ CONFIG_PREEMPT=y | |||
| 197 | # CONFIG_PREEMPT_RCU is not set | 202 | # CONFIG_PREEMPT_RCU is not set |
| 198 | CONFIG_BINFMT_ELF=y | 203 | CONFIG_BINFMT_ELF=y |
| 199 | CONFIG_BINFMT_MISC=m | 204 | CONFIG_BINFMT_MISC=m |
| 200 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 201 | # CONFIG_IOMMU_HELPER is not set | 205 | # CONFIG_IOMMU_HELPER is not set |
| 202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 203 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 207 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| @@ -213,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 213 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 214 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 217 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 218 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 219 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 220 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 221 | # CONFIG_PROC_DEVICETREE is not set | 227 | # CONFIG_PROC_DEVICETREE is not set |
| 222 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 223 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -237,12 +243,14 @@ CONFIG_PCI_DOMAINS=y | |||
| 237 | CONFIG_PCI_SYSCALL=y | 243 | CONFIG_PCI_SYSCALL=y |
| 238 | CONFIG_PCIEPORTBUS=y | 244 | CONFIG_PCIEPORTBUS=y |
| 239 | CONFIG_PCIEAER=y | 245 | CONFIG_PCIEAER=y |
| 246 | # CONFIG_PCIEASPM is not set | ||
| 240 | CONFIG_ARCH_SUPPORTS_MSI=y | 247 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 241 | # CONFIG_PCI_MSI is not set | 248 | # CONFIG_PCI_MSI is not set |
| 242 | CONFIG_PCI_LEGACY=y | 249 | CONFIG_PCI_LEGACY=y |
| 243 | # CONFIG_PCI_DEBUG is not set | 250 | # CONFIG_PCI_DEBUG is not set |
| 244 | # CONFIG_PCCARD is not set | 251 | # CONFIG_PCCARD is not set |
| 245 | # CONFIG_HOTPLUG_PCI is not set | 252 | # CONFIG_HOTPLUG_PCI is not set |
| 253 | # CONFIG_HAS_RAPIDIO is not set | ||
| 246 | 254 | ||
| 247 | # | 255 | # |
| 248 | # Advanced setup | 256 | # Advanced setup |
| @@ -252,11 +260,11 @@ CONFIG_PCI_LEGACY=y | |||
| 252 | # | 260 | # |
| 253 | # Default settings for advanced configuration options are used | 261 | # Default settings for advanced configuration options are used |
| 254 | # | 262 | # |
| 255 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 256 | CONFIG_LOWMEM_SIZE=0x30000000 | 263 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 264 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 257 | CONFIG_KERNEL_START=0xc0000000 | 265 | CONFIG_KERNEL_START=0xc0000000 |
| 266 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 267 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 268 | ||
| 261 | # | 269 | # |
| 262 | # Networking | 270 | # Networking |
| @@ -328,8 +336,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
| 328 | CONFIG_INET6_XFRM_MODE_BEET=m | 336 | CONFIG_INET6_XFRM_MODE_BEET=m |
| 329 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 337 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 330 | CONFIG_IPV6_SIT=m | 338 | CONFIG_IPV6_SIT=m |
| 339 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 331 | CONFIG_IPV6_TUNNEL=m | 340 | CONFIG_IPV6_TUNNEL=m |
| 332 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 341 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 342 | # CONFIG_IPV6_MROUTE is not set | ||
| 333 | # CONFIG_NETLABEL is not set | 343 | # CONFIG_NETLABEL is not set |
| 334 | # CONFIG_NETWORK_SECMARK is not set | 344 | # CONFIG_NETWORK_SECMARK is not set |
| 335 | CONFIG_NETFILTER=y | 345 | CONFIG_NETFILTER=y |
| @@ -534,6 +544,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 534 | # CONFIG_MTD_REDBOOT_PARTS is not set | 544 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 535 | # CONFIG_MTD_CMDLINE_PARTS is not set | 545 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 536 | # CONFIG_MTD_OF_PARTS is not set | 546 | # CONFIG_MTD_OF_PARTS is not set |
| 547 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 537 | 548 | ||
| 538 | # | 549 | # |
| 539 | # User Modules And Translation Layers | 550 | # User Modules And Translation Layers |
| @@ -610,6 +621,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 610 | # | 621 | # |
| 611 | # CONFIG_MTD_UBI is not set | 622 | # CONFIG_MTD_UBI is not set |
| 612 | CONFIG_OF_DEVICE=y | 623 | CONFIG_OF_DEVICE=y |
| 624 | CONFIG_OF_I2C=y | ||
| 613 | # CONFIG_PARPORT is not set | 625 | # CONFIG_PARPORT is not set |
| 614 | CONFIG_BLK_DEV=y | 626 | CONFIG_BLK_DEV=y |
| 615 | # CONFIG_BLK_DEV_FD is not set | 627 | # CONFIG_BLK_DEV_FD is not set |
| @@ -727,7 +739,6 @@ CONFIG_NETDEV_1000=y | |||
| 727 | # CONFIG_SIS190 is not set | 739 | # CONFIG_SIS190 is not set |
| 728 | # CONFIG_SKGE is not set | 740 | # CONFIG_SKGE is not set |
| 729 | # CONFIG_SKY2 is not set | 741 | # CONFIG_SKY2 is not set |
| 730 | # CONFIG_SK98LIN is not set | ||
| 731 | # CONFIG_VIA_VELOCITY is not set | 742 | # CONFIG_VIA_VELOCITY is not set |
| 732 | # CONFIG_TIGON3 is not set | 743 | # CONFIG_TIGON3 is not set |
| 733 | # CONFIG_BNX2 is not set | 744 | # CONFIG_BNX2 is not set |
| @@ -743,6 +754,7 @@ CONFIG_GIANFAR=y | |||
| 743 | # | 754 | # |
| 744 | # CONFIG_WLAN_PRE80211 is not set | 755 | # CONFIG_WLAN_PRE80211 is not set |
| 745 | # CONFIG_WLAN_80211 is not set | 756 | # CONFIG_WLAN_80211 is not set |
| 757 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 746 | # CONFIG_WAN is not set | 758 | # CONFIG_WAN is not set |
| 747 | CONFIG_ATM_DRIVERS=y | 759 | CONFIG_ATM_DRIVERS=y |
| 748 | # CONFIG_ATM_DUMMY is not set | 760 | # CONFIG_ATM_DUMMY is not set |
| @@ -825,6 +837,7 @@ CONFIG_VT=y | |||
| 825 | CONFIG_VT_CONSOLE=y | 837 | CONFIG_VT_CONSOLE=y |
| 826 | CONFIG_HW_CONSOLE=y | 838 | CONFIG_HW_CONSOLE=y |
| 827 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 839 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 840 | CONFIG_DEVKMEM=y | ||
| 828 | # CONFIG_SERIAL_NONSTANDARD is not set | 841 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 829 | # CONFIG_NOZOMI is not set | 842 | # CONFIG_NOZOMI is not set |
| 830 | 843 | ||
| @@ -863,13 +876,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 863 | CONFIG_I2C_CHARDEV=y | 876 | CONFIG_I2C_CHARDEV=y |
| 864 | 877 | ||
| 865 | # | 878 | # |
| 866 | # I2C Algorithms | ||
| 867 | # | ||
| 868 | # CONFIG_I2C_ALGOBIT is not set | ||
| 869 | # CONFIG_I2C_ALGOPCF is not set | ||
| 870 | # CONFIG_I2C_ALGOPCA is not set | ||
| 871 | |||
| 872 | # | ||
| 873 | # I2C Hardware Bus support | 879 | # I2C Hardware Bus support |
| 874 | # | 880 | # |
| 875 | # CONFIG_I2C_ALI1535 is not set | 881 | # CONFIG_I2C_ALI1535 is not set |
| @@ -895,6 +901,7 @@ CONFIG_I2C_MPC=y | |||
| 895 | # CONFIG_I2C_VIA is not set | 901 | # CONFIG_I2C_VIA is not set |
| 896 | # CONFIG_I2C_VIAPRO is not set | 902 | # CONFIG_I2C_VIAPRO is not set |
| 897 | # CONFIG_I2C_VOODOO3 is not set | 903 | # CONFIG_I2C_VOODOO3 is not set |
| 904 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 898 | 905 | ||
| 899 | # | 906 | # |
| 900 | # Miscellaneous I2C Chip support | 907 | # Miscellaneous I2C Chip support |
| @@ -904,19 +911,13 @@ CONFIG_I2C_MPC=y | |||
| 904 | # CONFIG_SENSORS_PCF8574 is not set | 911 | # CONFIG_SENSORS_PCF8574 is not set |
| 905 | # CONFIG_PCF8575 is not set | 912 | # CONFIG_PCF8575 is not set |
| 906 | # CONFIG_SENSORS_PCF8591 is not set | 913 | # CONFIG_SENSORS_PCF8591 is not set |
| 907 | # CONFIG_TPS65010 is not set | ||
| 908 | # CONFIG_SENSORS_MAX6875 is not set | 914 | # CONFIG_SENSORS_MAX6875 is not set |
| 909 | # CONFIG_SENSORS_TSL2550 is not set | 915 | # CONFIG_SENSORS_TSL2550 is not set |
| 910 | # CONFIG_I2C_DEBUG_CORE is not set | 916 | # CONFIG_I2C_DEBUG_CORE is not set |
| 911 | # CONFIG_I2C_DEBUG_ALGO is not set | 917 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 912 | # CONFIG_I2C_DEBUG_BUS is not set | 918 | # CONFIG_I2C_DEBUG_BUS is not set |
| 913 | # CONFIG_I2C_DEBUG_CHIP is not set | 919 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 914 | |||
| 915 | # | ||
| 916 | # SPI support | ||
| 917 | # | ||
| 918 | # CONFIG_SPI is not set | 920 | # CONFIG_SPI is not set |
| 919 | # CONFIG_SPI_MASTER is not set | ||
| 920 | # CONFIG_W1 is not set | 921 | # CONFIG_W1 is not set |
| 921 | # CONFIG_POWER_SUPPLY is not set | 922 | # CONFIG_POWER_SUPPLY is not set |
| 922 | CONFIG_HWMON=y | 923 | CONFIG_HWMON=y |
| @@ -998,12 +999,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 998 | # Multifunction device drivers | 999 | # Multifunction device drivers |
| 999 | # | 1000 | # |
| 1000 | # CONFIG_MFD_SM501 is not set | 1001 | # CONFIG_MFD_SM501 is not set |
| 1002 | # CONFIG_HTC_PASIC3 is not set | ||
| 1001 | 1003 | ||
| 1002 | # | 1004 | # |
| 1003 | # Multimedia devices | 1005 | # Multimedia devices |
| 1004 | # | 1006 | # |
| 1007 | |||
| 1008 | # | ||
| 1009 | # Multimedia core support | ||
| 1010 | # | ||
| 1005 | # CONFIG_VIDEO_DEV is not set | 1011 | # CONFIG_VIDEO_DEV is not set |
| 1006 | # CONFIG_DVB_CORE is not set | 1012 | # CONFIG_DVB_CORE is not set |
| 1013 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1014 | |||
| 1015 | # | ||
| 1016 | # Multimedia drivers | ||
| 1017 | # | ||
| 1007 | CONFIG_DAB=y | 1018 | CONFIG_DAB=y |
| 1008 | 1019 | ||
| 1009 | # | 1020 | # |
| @@ -1041,6 +1052,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 1041 | CONFIG_USB_ARCH_HAS_OHCI=y | 1052 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1042 | CONFIG_USB_ARCH_HAS_EHCI=y | 1053 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1043 | # CONFIG_USB is not set | 1054 | # CONFIG_USB is not set |
| 1055 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1056 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1044 | 1057 | ||
| 1045 | # | 1058 | # |
| 1046 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1059 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1049,14 +1062,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 1049 | # CONFIG_MMC is not set | 1062 | # CONFIG_MMC is not set |
| 1050 | # CONFIG_MEMSTICK is not set | 1063 | # CONFIG_MEMSTICK is not set |
| 1051 | # CONFIG_NEW_LEDS is not set | 1064 | # CONFIG_NEW_LEDS is not set |
| 1065 | # CONFIG_ACCESSIBILITY is not set | ||
| 1052 | # CONFIG_INFINIBAND is not set | 1066 | # CONFIG_INFINIBAND is not set |
| 1053 | # CONFIG_EDAC is not set | 1067 | # CONFIG_EDAC is not set |
| 1054 | # CONFIG_RTC_CLASS is not set | 1068 | # CONFIG_RTC_CLASS is not set |
| 1055 | # CONFIG_DMADEVICES is not set | 1069 | # CONFIG_DMADEVICES is not set |
| 1056 | |||
| 1057 | # | ||
| 1058 | # Userspace I/O | ||
| 1059 | # | ||
| 1060 | # CONFIG_UIO is not set | 1070 | # CONFIG_UIO is not set |
| 1061 | 1071 | ||
| 1062 | # | 1072 | # |
| @@ -1084,8 +1094,8 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
| 1084 | # CONFIG_JFS_FS is not set | 1094 | # CONFIG_JFS_FS is not set |
| 1085 | CONFIG_FS_POSIX_ACL=y | 1095 | CONFIG_FS_POSIX_ACL=y |
| 1086 | # CONFIG_XFS_FS is not set | 1096 | # CONFIG_XFS_FS is not set |
| 1087 | # CONFIG_GFS2_FS is not set | ||
| 1088 | CONFIG_OCFS2_FS=m | 1097 | CONFIG_OCFS2_FS=m |
| 1098 | CONFIG_OCFS2_FS_O2CB=m | ||
| 1089 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1099 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
| 1090 | # CONFIG_OCFS2_DEBUG_FS is not set | 1100 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1091 | CONFIG_DNOTIFY=y | 1101 | CONFIG_DNOTIFY=y |
| @@ -1145,7 +1155,6 @@ CONFIG_NFS_FS=y | |||
| 1145 | CONFIG_NFS_V3=y | 1155 | CONFIG_NFS_V3=y |
| 1146 | # CONFIG_NFS_V3_ACL is not set | 1156 | # CONFIG_NFS_V3_ACL is not set |
| 1147 | CONFIG_NFS_V4=y | 1157 | CONFIG_NFS_V4=y |
| 1148 | CONFIG_NFS_DIRECTIO=y | ||
| 1149 | # CONFIG_NFSD is not set | 1158 | # CONFIG_NFSD is not set |
| 1150 | CONFIG_ROOT_NFS=y | 1159 | CONFIG_ROOT_NFS=y |
| 1151 | CONFIG_LOCKD=y | 1160 | CONFIG_LOCKD=y |
| @@ -1221,6 +1230,7 @@ CONFIG_NLS_UTF8=m | |||
| 1221 | # Library routines | 1230 | # Library routines |
| 1222 | # | 1231 | # |
| 1223 | CONFIG_BITREVERSE=y | 1232 | CONFIG_BITREVERSE=y |
| 1233 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1224 | CONFIG_CRC_CCITT=m | 1234 | CONFIG_CRC_CCITT=m |
| 1225 | # CONFIG_CRC16 is not set | 1235 | # CONFIG_CRC16 is not set |
| 1226 | # CONFIG_CRC_ITU_T is not set | 1236 | # CONFIG_CRC_ITU_T is not set |
| @@ -1241,6 +1251,7 @@ CONFIG_HAVE_LMB=y | |||
| 1241 | # CONFIG_PRINTK_TIME is not set | 1251 | # CONFIG_PRINTK_TIME is not set |
| 1242 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1252 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1243 | CONFIG_ENABLE_MUST_CHECK=y | 1253 | CONFIG_ENABLE_MUST_CHECK=y |
| 1254 | CONFIG_FRAME_WARN=1024 | ||
| 1244 | CONFIG_MAGIC_SYSRQ=y | 1255 | CONFIG_MAGIC_SYSRQ=y |
| 1245 | # CONFIG_UNUSED_SYMBOLS is not set | 1256 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1246 | CONFIG_DEBUG_FS=y | 1257 | CONFIG_DEBUG_FS=y |
| @@ -1251,6 +1262,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1251 | CONFIG_SCHED_DEBUG=y | 1262 | CONFIG_SCHED_DEBUG=y |
| 1252 | # CONFIG_SCHEDSTATS is not set | 1263 | # CONFIG_SCHEDSTATS is not set |
| 1253 | # CONFIG_TIMER_STATS is not set | 1264 | # CONFIG_TIMER_STATS is not set |
| 1265 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1254 | # CONFIG_DEBUG_SLAB is not set | 1266 | # CONFIG_DEBUG_SLAB is not set |
| 1255 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1267 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1256 | # CONFIG_RT_MUTEX_TESTER is not set | 1268 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -1262,6 +1274,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1262 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1274 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1263 | CONFIG_DEBUG_INFO=y | 1275 | CONFIG_DEBUG_INFO=y |
| 1264 | # CONFIG_DEBUG_VM is not set | 1276 | # CONFIG_DEBUG_VM is not set |
| 1277 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1265 | # CONFIG_DEBUG_LIST is not set | 1278 | # CONFIG_DEBUG_LIST is not set |
| 1266 | # CONFIG_DEBUG_SG is not set | 1279 | # CONFIG_DEBUG_SG is not set |
| 1267 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1280 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1274,6 +1287,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1274 | # CONFIG_DEBUG_PAGEALLOC is not set | 1287 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1275 | CONFIG_DEBUGGER=y | 1288 | CONFIG_DEBUGGER=y |
| 1276 | # CONFIG_XMON is not set | 1289 | # CONFIG_XMON is not set |
| 1290 | # CONFIG_IRQSTACKS is not set | ||
| 1277 | # CONFIG_VIRQ_DEBUG is not set | 1291 | # CONFIG_VIRQ_DEBUG is not set |
| 1278 | # CONFIG_BDI_SWITCH is not set | 1292 | # CONFIG_BDI_SWITCH is not set |
| 1279 | # CONFIG_PPC_EARLY_DEBUG is not set | 1293 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1289,54 +1303,84 @@ CONFIG_SECURITY_CAPABILITIES=y | |||
| 1289 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1303 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1290 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | 1304 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
| 1291 | CONFIG_CRYPTO=y | 1305 | CONFIG_CRYPTO=y |
| 1306 | |||
| 1307 | # | ||
| 1308 | # Crypto core or helper | ||
| 1309 | # | ||
| 1292 | CONFIG_CRYPTO_ALGAPI=y | 1310 | CONFIG_CRYPTO_ALGAPI=y |
| 1293 | CONFIG_CRYPTO_AEAD=m | 1311 | CONFIG_CRYPTO_AEAD=m |
| 1294 | CONFIG_CRYPTO_BLKCIPHER=y | 1312 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1295 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1296 | CONFIG_CRYPTO_HASH=y | 1313 | CONFIG_CRYPTO_HASH=y |
| 1297 | CONFIG_CRYPTO_MANAGER=y | 1314 | CONFIG_CRYPTO_MANAGER=y |
| 1315 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1316 | CONFIG_CRYPTO_NULL=m | ||
| 1317 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1318 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1319 | CONFIG_CRYPTO_TEST=m | ||
| 1320 | |||
| 1321 | # | ||
| 1322 | # Authenticated Encryption with Associated Data | ||
| 1323 | # | ||
| 1324 | # CONFIG_CRYPTO_CCM is not set | ||
| 1325 | # CONFIG_CRYPTO_GCM is not set | ||
| 1326 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1327 | |||
| 1328 | # | ||
| 1329 | # Block modes | ||
| 1330 | # | ||
| 1331 | CONFIG_CRYPTO_CBC=y | ||
| 1332 | # CONFIG_CRYPTO_CTR is not set | ||
| 1333 | # CONFIG_CRYPTO_CTS is not set | ||
| 1334 | CONFIG_CRYPTO_ECB=m | ||
| 1335 | # CONFIG_CRYPTO_LRW is not set | ||
| 1336 | CONFIG_CRYPTO_PCBC=m | ||
| 1337 | # CONFIG_CRYPTO_XTS is not set | ||
| 1338 | |||
| 1339 | # | ||
| 1340 | # Hash modes | ||
| 1341 | # | ||
| 1298 | CONFIG_CRYPTO_HMAC=y | 1342 | CONFIG_CRYPTO_HMAC=y |
| 1299 | # CONFIG_CRYPTO_XCBC is not set | 1343 | # CONFIG_CRYPTO_XCBC is not set |
| 1300 | CONFIG_CRYPTO_NULL=m | 1344 | |
| 1345 | # | ||
| 1346 | # Digest | ||
| 1347 | # | ||
| 1348 | CONFIG_CRYPTO_CRC32C=m | ||
| 1301 | CONFIG_CRYPTO_MD4=m | 1349 | CONFIG_CRYPTO_MD4=m |
| 1302 | CONFIG_CRYPTO_MD5=y | 1350 | CONFIG_CRYPTO_MD5=y |
| 1351 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1303 | CONFIG_CRYPTO_SHA1=m | 1352 | CONFIG_CRYPTO_SHA1=m |
| 1304 | CONFIG_CRYPTO_SHA256=m | 1353 | CONFIG_CRYPTO_SHA256=m |
| 1305 | CONFIG_CRYPTO_SHA512=m | 1354 | CONFIG_CRYPTO_SHA512=m |
| 1306 | CONFIG_CRYPTO_WP512=m | ||
| 1307 | # CONFIG_CRYPTO_TGR192 is not set | 1355 | # CONFIG_CRYPTO_TGR192 is not set |
| 1308 | # CONFIG_CRYPTO_GF128MUL is not set | 1356 | CONFIG_CRYPTO_WP512=m |
| 1309 | CONFIG_CRYPTO_ECB=m | 1357 | |
| 1310 | CONFIG_CRYPTO_CBC=y | 1358 | # |
| 1311 | CONFIG_CRYPTO_PCBC=m | 1359 | # Ciphers |
| 1312 | # CONFIG_CRYPTO_LRW is not set | 1360 | # |
| 1313 | # CONFIG_CRYPTO_XTS is not set | ||
| 1314 | # CONFIG_CRYPTO_CTR is not set | ||
| 1315 | # CONFIG_CRYPTO_GCM is not set | ||
| 1316 | # CONFIG_CRYPTO_CCM is not set | ||
| 1317 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1318 | CONFIG_CRYPTO_DES=y | ||
| 1319 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1320 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1321 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1322 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1323 | CONFIG_CRYPTO_SERPENT=m | ||
| 1324 | CONFIG_CRYPTO_AES=m | 1361 | CONFIG_CRYPTO_AES=m |
| 1362 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1363 | CONFIG_CRYPTO_ARC4=m | ||
| 1364 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1365 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1325 | CONFIG_CRYPTO_CAST5=m | 1366 | CONFIG_CRYPTO_CAST5=m |
| 1326 | CONFIG_CRYPTO_CAST6=m | 1367 | CONFIG_CRYPTO_CAST6=m |
| 1327 | CONFIG_CRYPTO_TEA=m | 1368 | CONFIG_CRYPTO_DES=y |
| 1328 | CONFIG_CRYPTO_ARC4=m | 1369 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1329 | CONFIG_CRYPTO_KHAZAD=m | 1370 | CONFIG_CRYPTO_KHAZAD=m |
| 1330 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1331 | # CONFIG_CRYPTO_SEED is not set | ||
| 1332 | # CONFIG_CRYPTO_SALSA20 is not set | 1371 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1372 | # CONFIG_CRYPTO_SEED is not set | ||
| 1373 | CONFIG_CRYPTO_SERPENT=m | ||
| 1374 | CONFIG_CRYPTO_TEA=m | ||
| 1375 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1376 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1377 | |||
| 1378 | # | ||
| 1379 | # Compression | ||
| 1380 | # | ||
| 1333 | CONFIG_CRYPTO_DEFLATE=m | 1381 | CONFIG_CRYPTO_DEFLATE=m |
| 1334 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1335 | CONFIG_CRYPTO_CRC32C=m | ||
| 1336 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1337 | CONFIG_CRYPTO_TEST=m | ||
| 1338 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1339 | # CONFIG_CRYPTO_LZO is not set | 1382 | # CONFIG_CRYPTO_LZO is not set |
| 1340 | CONFIG_CRYPTO_HW=y | 1383 | CONFIG_CRYPTO_HW=y |
| 1341 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1384 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1342 | # CONFIG_PPC_CLOCK is not set | 1385 | # CONFIG_PPC_CLOCK is not set |
| 1386 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index fdbfd39a3aca..88f6aa8273be 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:19 2008 | 4 | # Mon Jun 9 08:52:20 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -85,6 +87,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 85 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 86 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 87 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 90 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 88 | # CONFIG_KALLSYMS is not set | 91 | # CONFIG_KALLSYMS is not set |
| 89 | CONFIG_HOTPLUG=y | 92 | CONFIG_HOTPLUG=y |
| 90 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| @@ -109,12 +112,14 @@ CONFIG_SLUB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| 115 | # CONFIG_TINY_SHMEM is not set | 119 | # CONFIG_TINY_SHMEM is not set |
| 116 | CONFIG_BASE_SMALL=0 | 120 | CONFIG_BASE_SMALL=0 |
| 117 | CONFIG_MODULES=y | 121 | CONFIG_MODULES=y |
| 122 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 118 | CONFIG_MODULE_UNLOAD=y | 123 | CONFIG_MODULE_UNLOAD=y |
| 119 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 120 | # CONFIG_MODVERSIONS is not set | 125 | # CONFIG_MODVERSIONS is not set |
| @@ -214,11 +219,13 @@ CONFIG_FLATMEM=y | |||
| 214 | CONFIG_FLAT_NODE_MEM_MAP=y | 219 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 215 | # CONFIG_SPARSEMEM_STATIC is not set | 220 | # CONFIG_SPARSEMEM_STATIC is not set |
| 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 218 | # CONFIG_RESOURCES_64BIT is not set | 224 | # CONFIG_RESOURCES_64BIT is not set |
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 225 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 226 | CONFIG_BOUNCE=y |
| 221 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 222 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
| 223 | CONFIG_CMDLINE_BOOL=y | 230 | CONFIG_CMDLINE_BOOL=y |
| 224 | CONFIG_CMDLINE="console=ttyS0,115200" | 231 | CONFIG_CMDLINE="console=ttyS0,115200" |
| @@ -242,6 +249,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 242 | CONFIG_PCI_LEGACY=y | 249 | CONFIG_PCI_LEGACY=y |
| 243 | # CONFIG_PCCARD is not set | 250 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HOTPLUG_PCI is not set | 251 | # CONFIG_HOTPLUG_PCI is not set |
| 252 | # CONFIG_HAS_RAPIDIO is not set | ||
| 245 | 253 | ||
| 246 | # | 254 | # |
| 247 | # Advanced setup | 255 | # Advanced setup |
| @@ -251,11 +259,11 @@ CONFIG_PCI_LEGACY=y | |||
| 251 | # | 259 | # |
| 252 | # Default settings for advanced configuration options are used | 260 | # Default settings for advanced configuration options are used |
| 253 | # | 261 | # |
| 254 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 255 | CONFIG_LOWMEM_SIZE=0x30000000 | 262 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 263 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 256 | CONFIG_KERNEL_START=0xc0000000 | 264 | CONFIG_KERNEL_START=0xc0000000 |
| 265 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 257 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 258 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 259 | 267 | ||
| 260 | # | 268 | # |
| 261 | # Networking | 269 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -358,6 +364,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 358 | # CONFIG_MTD_REDBOOT_PARTS is not set | 364 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 359 | # CONFIG_MTD_CMDLINE_PARTS is not set | 365 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 360 | # CONFIG_MTD_OF_PARTS is not set | 366 | # CONFIG_MTD_OF_PARTS is not set |
| 367 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 361 | 368 | ||
| 362 | # | 369 | # |
| 363 | # User Modules And Translation Layers | 370 | # User Modules And Translation Layers |
| @@ -433,6 +440,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 433 | # | 440 | # |
| 434 | # CONFIG_MTD_UBI is not set | 441 | # CONFIG_MTD_UBI is not set |
| 435 | CONFIG_OF_DEVICE=y | 442 | CONFIG_OF_DEVICE=y |
| 443 | CONFIG_OF_I2C=y | ||
| 436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
| 437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
| 438 | # CONFIG_BLK_DEV_FD is not set | 446 | # CONFIG_BLK_DEV_FD is not set |
| @@ -513,7 +521,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 513 | CONFIG_BLK_DEV_VIA82CXXX=y | 521 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 514 | # CONFIG_BLK_DEV_TC86C001 is not set | 522 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 515 | CONFIG_BLK_DEV_IDEDMA=y | 523 | CONFIG_BLK_DEV_IDEDMA=y |
| 516 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 524 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 517 | # CONFIG_BLK_DEV_HD is not set | 525 | # CONFIG_BLK_DEV_HD is not set |
| 518 | 526 | ||
| 519 | # | 527 | # |
| @@ -638,7 +646,6 @@ CONFIG_R8169=y | |||
| 638 | # CONFIG_SIS190 is not set | 646 | # CONFIG_SIS190 is not set |
| 639 | # CONFIG_SKGE is not set | 647 | # CONFIG_SKGE is not set |
| 640 | # CONFIG_SKY2 is not set | 648 | # CONFIG_SKY2 is not set |
| 641 | # CONFIG_SK98LIN is not set | ||
| 642 | # CONFIG_VIA_VELOCITY is not set | 649 | # CONFIG_VIA_VELOCITY is not set |
| 643 | # CONFIG_TIGON3 is not set | 650 | # CONFIG_TIGON3 is not set |
| 644 | # CONFIG_BNX2 is not set | 651 | # CONFIG_BNX2 is not set |
| @@ -654,6 +661,7 @@ CONFIG_R8169=y | |||
| 654 | # | 661 | # |
| 655 | # CONFIG_WLAN_PRE80211 is not set | 662 | # CONFIG_WLAN_PRE80211 is not set |
| 656 | # CONFIG_WLAN_80211 is not set | 663 | # CONFIG_WLAN_80211 is not set |
| 664 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 657 | 665 | ||
| 658 | # | 666 | # |
| 659 | # USB Network Adapters | 667 | # USB Network Adapters |
| @@ -690,6 +698,7 @@ CONFIG_R8169=y | |||
| 690 | # Character devices | 698 | # Character devices |
| 691 | # | 699 | # |
| 692 | # CONFIG_VT is not set | 700 | # CONFIG_VT is not set |
| 701 | CONFIG_DEVKMEM=y | ||
| 693 | # CONFIG_SERIAL_NONSTANDARD is not set | 702 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 694 | # CONFIG_NOZOMI is not set | 703 | # CONFIG_NOZOMI is not set |
| 695 | 704 | ||
| @@ -717,7 +726,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 717 | # CONFIG_IPMI_HANDLER is not set | 726 | # CONFIG_IPMI_HANDLER is not set |
| 718 | CONFIG_HW_RANDOM=m | 727 | CONFIG_HW_RANDOM=m |
| 719 | CONFIG_NVRAM=y | 728 | CONFIG_NVRAM=y |
| 720 | # CONFIG_GEN_RTC is not set | ||
| 721 | # CONFIG_R3964 is not set | 729 | # CONFIG_R3964 is not set |
| 722 | # CONFIG_APPLICOM is not set | 730 | # CONFIG_APPLICOM is not set |
| 723 | # CONFIG_RAW_DRIVER is not set | 731 | # CONFIG_RAW_DRIVER is not set |
| @@ -728,13 +736,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 728 | CONFIG_I2C_CHARDEV=y | 736 | CONFIG_I2C_CHARDEV=y |
| 729 | 737 | ||
| 730 | # | 738 | # |
| 731 | # I2C Algorithms | ||
| 732 | # | ||
| 733 | # CONFIG_I2C_ALGOBIT is not set | ||
| 734 | # CONFIG_I2C_ALGOPCF is not set | ||
| 735 | # CONFIG_I2C_ALGOPCA is not set | ||
| 736 | |||
| 737 | # | ||
| 738 | # I2C Hardware Bus support | 739 | # I2C Hardware Bus support |
| 739 | # | 740 | # |
| 740 | # CONFIG_I2C_ALI1535 is not set | 741 | # CONFIG_I2C_ALI1535 is not set |
| @@ -761,6 +762,7 @@ CONFIG_I2C_MPC=y | |||
| 761 | # CONFIG_I2C_VIA is not set | 762 | # CONFIG_I2C_VIA is not set |
| 762 | # CONFIG_I2C_VIAPRO is not set | 763 | # CONFIG_I2C_VIAPRO is not set |
| 763 | # CONFIG_I2C_VOODOO3 is not set | 764 | # CONFIG_I2C_VOODOO3 is not set |
| 765 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 764 | 766 | ||
| 765 | # | 767 | # |
| 766 | # Miscellaneous I2C Chip support | 768 | # Miscellaneous I2C Chip support |
| @@ -770,19 +772,13 @@ CONFIG_I2C_MPC=y | |||
| 770 | # CONFIG_SENSORS_PCF8574 is not set | 772 | # CONFIG_SENSORS_PCF8574 is not set |
| 771 | # CONFIG_PCF8575 is not set | 773 | # CONFIG_PCF8575 is not set |
| 772 | # CONFIG_SENSORS_PCF8591 is not set | 774 | # CONFIG_SENSORS_PCF8591 is not set |
| 773 | # CONFIG_TPS65010 is not set | ||
| 774 | # CONFIG_SENSORS_MAX6875 is not set | 775 | # CONFIG_SENSORS_MAX6875 is not set |
| 775 | # CONFIG_SENSORS_TSL2550 is not set | 776 | # CONFIG_SENSORS_TSL2550 is not set |
| 776 | # CONFIG_I2C_DEBUG_CORE is not set | 777 | # CONFIG_I2C_DEBUG_CORE is not set |
| 777 | # CONFIG_I2C_DEBUG_ALGO is not set | 778 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 778 | # CONFIG_I2C_DEBUG_BUS is not set | 779 | # CONFIG_I2C_DEBUG_BUS is not set |
| 779 | # CONFIG_I2C_DEBUG_CHIP is not set | 780 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 780 | |||
| 781 | # | ||
| 782 | # SPI support | ||
| 783 | # | ||
| 784 | # CONFIG_SPI is not set | 781 | # CONFIG_SPI is not set |
| 785 | # CONFIG_SPI_MASTER is not set | ||
| 786 | # CONFIG_W1 is not set | 782 | # CONFIG_W1 is not set |
| 787 | # CONFIG_POWER_SUPPLY is not set | 783 | # CONFIG_POWER_SUPPLY is not set |
| 788 | # CONFIG_HWMON is not set | 784 | # CONFIG_HWMON is not set |
| @@ -799,12 +795,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 799 | # Multifunction device drivers | 795 | # Multifunction device drivers |
| 800 | # | 796 | # |
| 801 | # CONFIG_MFD_SM501 is not set | 797 | # CONFIG_MFD_SM501 is not set |
| 798 | # CONFIG_HTC_PASIC3 is not set | ||
| 802 | 799 | ||
| 803 | # | 800 | # |
| 804 | # Multimedia devices | 801 | # Multimedia devices |
| 805 | # | 802 | # |
| 803 | |||
| 804 | # | ||
| 805 | # Multimedia core support | ||
| 806 | # | ||
| 806 | # CONFIG_VIDEO_DEV is not set | 807 | # CONFIG_VIDEO_DEV is not set |
| 807 | # CONFIG_DVB_CORE is not set | 808 | # CONFIG_DVB_CORE is not set |
| 809 | # CONFIG_VIDEO_MEDIA is not set | ||
| 810 | |||
| 811 | # | ||
| 812 | # Multimedia drivers | ||
| 813 | # | ||
| 808 | # CONFIG_DAB is not set | 814 | # CONFIG_DAB is not set |
| 809 | 815 | ||
| 810 | # | 816 | # |
| @@ -841,16 +847,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 841 | CONFIG_USB_DEVICE_CLASS=y | 847 | CONFIG_USB_DEVICE_CLASS=y |
| 842 | # CONFIG_USB_DYNAMIC_MINORS is not set | 848 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 843 | # CONFIG_USB_OTG is not set | 849 | # CONFIG_USB_OTG is not set |
| 850 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 851 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 844 | 852 | ||
| 845 | # | 853 | # |
| 846 | # USB Host Controller Drivers | 854 | # USB Host Controller Drivers |
| 847 | # | 855 | # |
| 856 | # CONFIG_USB_C67X00_HCD is not set | ||
| 848 | CONFIG_USB_EHCI_HCD=y | 857 | CONFIG_USB_EHCI_HCD=y |
| 849 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 858 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 850 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 859 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 851 | # CONFIG_USB_EHCI_FSL is not set | 860 | # CONFIG_USB_EHCI_FSL is not set |
| 852 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 861 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 853 | # CONFIG_USB_ISP116X_HCD is not set | 862 | # CONFIG_USB_ISP116X_HCD is not set |
| 863 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 854 | CONFIG_USB_OHCI_HCD=y | 864 | CONFIG_USB_OHCI_HCD=y |
| 855 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 865 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 856 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 866 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -865,6 +875,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 865 | # | 875 | # |
| 866 | # CONFIG_USB_ACM is not set | 876 | # CONFIG_USB_ACM is not set |
| 867 | # CONFIG_USB_PRINTER is not set | 877 | # CONFIG_USB_PRINTER is not set |
| 878 | # CONFIG_USB_WDM is not set | ||
| 868 | 879 | ||
| 869 | # | 880 | # |
| 870 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 881 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -885,6 +896,7 @@ CONFIG_USB_STORAGE=y | |||
| 885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 896 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 886 | # CONFIG_USB_STORAGE_ALAUDA is not set | 897 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 887 | # CONFIG_USB_STORAGE_KARMA is not set | 898 | # CONFIG_USB_STORAGE_KARMA is not set |
| 899 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 888 | # CONFIG_USB_LIBUSUAL is not set | 900 | # CONFIG_USB_LIBUSUAL is not set |
| 889 | 901 | ||
| 890 | # | 902 | # |
| @@ -922,10 +934,12 @@ CONFIG_USB_STORAGE=y | |||
| 922 | # CONFIG_USB_TRANCEVIBRATOR is not set | 934 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 923 | # CONFIG_USB_IOWARRIOR is not set | 935 | # CONFIG_USB_IOWARRIOR is not set |
| 924 | # CONFIG_USB_TEST is not set | 936 | # CONFIG_USB_TEST is not set |
| 937 | # CONFIG_USB_ISIGHTFW is not set | ||
| 925 | # CONFIG_USB_GADGET is not set | 938 | # CONFIG_USB_GADGET is not set |
| 926 | # CONFIG_MMC is not set | 939 | # CONFIG_MMC is not set |
| 927 | # CONFIG_MEMSTICK is not set | 940 | # CONFIG_MEMSTICK is not set |
| 928 | # CONFIG_NEW_LEDS is not set | 941 | # CONFIG_NEW_LEDS is not set |
| 942 | # CONFIG_ACCESSIBILITY is not set | ||
| 929 | # CONFIG_INFINIBAND is not set | 943 | # CONFIG_INFINIBAND is not set |
| 930 | # CONFIG_EDAC is not set | 944 | # CONFIG_EDAC is not set |
| 931 | CONFIG_RTC_LIB=y | 945 | CONFIG_RTC_LIB=y |
| @@ -977,11 +991,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 977 | # | 991 | # |
| 978 | # on-CPU RTC drivers | 992 | # on-CPU RTC drivers |
| 979 | # | 993 | # |
| 994 | # CONFIG_RTC_DRV_PPC is not set | ||
| 980 | # CONFIG_DMADEVICES is not set | 995 | # CONFIG_DMADEVICES is not set |
| 981 | |||
| 982 | # | ||
| 983 | # Userspace I/O | ||
| 984 | # | ||
| 985 | # CONFIG_UIO is not set | 996 | # CONFIG_UIO is not set |
| 986 | 997 | ||
| 987 | # | 998 | # |
| @@ -1002,10 +1013,9 @@ CONFIG_FS_MBCACHE=y | |||
| 1002 | # CONFIG_FS_POSIX_ACL is not set | 1013 | # CONFIG_FS_POSIX_ACL is not set |
| 1003 | CONFIG_XFS_FS=m | 1014 | CONFIG_XFS_FS=m |
| 1004 | # CONFIG_XFS_QUOTA is not set | 1015 | # CONFIG_XFS_QUOTA is not set |
| 1005 | # CONFIG_XFS_SECURITY is not set | ||
| 1006 | # CONFIG_XFS_POSIX_ACL is not set | 1016 | # CONFIG_XFS_POSIX_ACL is not set |
| 1007 | # CONFIG_XFS_RT is not set | 1017 | # CONFIG_XFS_RT is not set |
| 1008 | # CONFIG_GFS2_FS is not set | 1018 | # CONFIG_XFS_DEBUG is not set |
| 1009 | # CONFIG_OCFS2_FS is not set | 1019 | # CONFIG_OCFS2_FS is not set |
| 1010 | CONFIG_DNOTIFY=y | 1020 | CONFIG_DNOTIFY=y |
| 1011 | CONFIG_INOTIFY=y | 1021 | CONFIG_INOTIFY=y |
| @@ -1138,6 +1148,7 @@ CONFIG_NLS_UTF8=y | |||
| 1138 | # Library routines | 1148 | # Library routines |
| 1139 | # | 1149 | # |
| 1140 | CONFIG_BITREVERSE=y | 1150 | CONFIG_BITREVERSE=y |
| 1151 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1141 | # CONFIG_CRC_CCITT is not set | 1152 | # CONFIG_CRC_CCITT is not set |
| 1142 | # CONFIG_CRC16 is not set | 1153 | # CONFIG_CRC16 is not set |
| 1143 | # CONFIG_CRC_ITU_T is not set | 1154 | # CONFIG_CRC_ITU_T is not set |
| @@ -1150,6 +1161,7 @@ CONFIG_PLIST=y | |||
| 1150 | CONFIG_HAS_IOMEM=y | 1161 | CONFIG_HAS_IOMEM=y |
| 1151 | CONFIG_HAS_IOPORT=y | 1162 | CONFIG_HAS_IOPORT=y |
| 1152 | CONFIG_HAS_DMA=y | 1163 | CONFIG_HAS_DMA=y |
| 1164 | CONFIG_HAVE_LMB=y | ||
| 1153 | 1165 | ||
| 1154 | # | 1166 | # |
| 1155 | # Kernel hacking | 1167 | # Kernel hacking |
| @@ -1157,6 +1169,7 @@ CONFIG_HAS_DMA=y | |||
| 1157 | # CONFIG_PRINTK_TIME is not set | 1169 | # CONFIG_PRINTK_TIME is not set |
| 1158 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 1170 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
| 1159 | # CONFIG_ENABLE_MUST_CHECK is not set | 1171 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 1172 | CONFIG_FRAME_WARN=1024 | ||
| 1160 | # CONFIG_MAGIC_SYSRQ is not set | 1173 | # CONFIG_MAGIC_SYSRQ is not set |
| 1161 | # CONFIG_UNUSED_SYMBOLS is not set | 1174 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1162 | # CONFIG_DEBUG_FS is not set | 1175 | # CONFIG_DEBUG_FS is not set |
| @@ -1166,6 +1179,7 @@ CONFIG_HAS_DMA=y | |||
| 1166 | # CONFIG_SLUB_STATS is not set | 1179 | # CONFIG_SLUB_STATS is not set |
| 1167 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1180 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1168 | # CONFIG_SAMPLES is not set | 1181 | # CONFIG_SAMPLES is not set |
| 1182 | # CONFIG_IRQSTACKS is not set | ||
| 1169 | # CONFIG_BOOTX_TEXT is not set | 1183 | # CONFIG_BOOTX_TEXT is not set |
| 1170 | # CONFIG_PPC_EARLY_DEBUG is not set | 1184 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1171 | 1185 | ||
| @@ -1181,3 +1195,4 @@ CONFIG_ASYNC_MEMCPY=y | |||
| 1181 | CONFIG_ASYNC_XOR=y | 1195 | CONFIG_ASYNC_XOR=y |
| 1182 | # CONFIG_CRYPTO is not set | 1196 | # CONFIG_CRYPTO is not set |
| 1183 | # CONFIG_PPC_CLOCK is not set | 1197 | # CONFIG_PPC_CLOCK is not set |
| 1198 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index c2b9dc4fce5d..22b5d2c459a3 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S | |||
| @@ -368,7 +368,12 @@ interrupt_base: | |||
| 368 | 368 | ||
| 369 | rlwimi r11,r13,0,26,31 /* Insert static perms */ | 369 | rlwimi r11,r13,0,26,31 /* Insert static perms */ |
| 370 | 370 | ||
| 371 | rlwinm r11,r11,0,20,15 /* Clear U0-U3 */ | 371 | /* |
| 372 | * Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added | ||
| 373 | * on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see | ||
| 374 | * include/asm-powerpc/pgtable-ppc32.h for details). | ||
| 375 | */ | ||
| 376 | rlwinm r11,r11,0,20,10 | ||
| 372 | 377 | ||
| 373 | /* find the TLB index that caused the fault. It has to be here. */ | 378 | /* find the TLB index that caused the fault. It has to be here. */ |
| 374 | tlbsx r10, 0, r10 | 379 | tlbsx r10, 0, r10 |
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 2f73f705d564..bcc249d90c4d 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -1073,7 +1073,7 @@ static const struct file_operations virq_debug_fops = { | |||
| 1073 | static int __init irq_debugfs_init(void) | 1073 | static int __init irq_debugfs_init(void) |
| 1074 | { | 1074 | { |
| 1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, | 1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, |
| 1076 | NULL, &virq_debug_fops)) | 1076 | NULL, &virq_debug_fops) == NULL) |
| 1077 | return -ENOMEM; | 1077 | return -ENOMEM; |
| 1078 | 1078 | ||
| 1079 | return 0; | 1079 | return 0; |
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index cf6b5a7d8b3f..d3ac631cbd26 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/screen_info.h> | 8 | #include <linux/screen_info.h> |
| 9 | #include <linux/vt_kern.h> | 9 | #include <linux/vt_kern.h> |
| 10 | #include <linux/nvram.h> | 10 | #include <linux/nvram.h> |
| 11 | #include <linux/console.h> | ||
| 12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| 13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| @@ -160,7 +159,6 @@ EXPORT_SYMBOL(screen_info); | |||
| 160 | EXPORT_SYMBOL(timer_interrupt); | 159 | EXPORT_SYMBOL(timer_interrupt); |
| 161 | EXPORT_SYMBOL(irq_desc); | 160 | EXPORT_SYMBOL(irq_desc); |
| 162 | EXPORT_SYMBOL(tb_ticks_per_jiffy); | 161 | EXPORT_SYMBOL(tb_ticks_per_jiffy); |
| 163 | EXPORT_SYMBOL(console_drivers); | ||
| 164 | EXPORT_SYMBOL(cacheable_memcpy); | 162 | EXPORT_SYMBOL(cacheable_memcpy); |
| 165 | #endif | 163 | #endif |
| 166 | 164 | ||
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh index 31729a9387df..2c7e8e87f770 100644 --- a/arch/powerpc/kernel/prom_init_check.sh +++ b/arch/powerpc/kernel/prom_init_check.sh | |||
| @@ -48,6 +48,20 @@ do | |||
| 48 | fi | 48 | fi |
| 49 | done | 49 | done |
| 50 | 50 | ||
| 51 | # ignore register save/restore funcitons | ||
| 52 | if [ "${UNDEF:0:9}" = "_restgpr_" ]; then | ||
| 53 | OK=1 | ||
| 54 | fi | ||
| 55 | if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then | ||
| 56 | OK=1 | ||
| 57 | fi | ||
| 58 | if [ "${UNDEF:0:9}" = "_savegpr_" ]; then | ||
| 59 | OK=1 | ||
| 60 | fi | ||
| 61 | if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then | ||
| 62 | OK=1 | ||
| 63 | fi | ||
| 64 | |||
| 51 | if [ $OK -eq 0 ]; then | 65 | if [ $OK -eq 0 ]; then |
| 52 | ERROR=1 | 66 | ERROR=1 |
| 53 | echo "Error: External symbol '$UNDEF' referenced" \ | 67 | echo "Error: External symbol '$UNDEF' referenced" \ |
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index c21a626af676..ce245a850db2 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
| @@ -142,7 +142,7 @@ static void dump_one_vdso_page(struct page *pg, struct page *upg) | |||
| 142 | printk("kpg: %p (c:%d,f:%08lx)", __va(page_to_pfn(pg) << PAGE_SHIFT), | 142 | printk("kpg: %p (c:%d,f:%08lx)", __va(page_to_pfn(pg) << PAGE_SHIFT), |
| 143 | page_count(pg), | 143 | page_count(pg), |
| 144 | pg->flags); | 144 | pg->flags); |
| 145 | if (upg/* && pg != upg*/) { | 145 | if (upg && !IS_ERR(upg) /* && pg != upg*/) { |
| 146 | printk(" upg: %p (c:%d,f:%08lx)", __va(page_to_pfn(upg) | 146 | printk(" upg: %p (c:%d,f:%08lx)", __va(page_to_pfn(upg) |
| 147 | << PAGE_SHIFT), | 147 | << PAGE_SHIFT), |
| 148 | page_count(upg), | 148 | page_count(upg), |
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index c71d37dc6a88..e522b06cc42f 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
| @@ -9,7 +9,7 @@ endif | |||
| 9 | ifeq ($(CONFIG_PPC_MERGE),y) | 9 | ifeq ($(CONFIG_PPC_MERGE),y) |
| 10 | obj-y := string.o alloc.o \ | 10 | obj-y := string.o alloc.o \ |
| 11 | checksum_$(CONFIG_WORD_SIZE).o | 11 | checksum_$(CONFIG_WORD_SIZE).o |
| 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o | 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o |
| 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o | 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o |
| 14 | endif | 14 | endif |
| 15 | 15 | ||
diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S new file mode 100644 index 000000000000..70a9cd8a3008 --- /dev/null +++ b/arch/powerpc/lib/crtsavres.S | |||
| @@ -0,0 +1,229 @@ | |||
| 1 | /* | ||
| 2 | * Special support for eabi and SVR4 | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. | ||
| 5 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
| 6 | * Written By Michael Meissner | ||
| 7 | * | ||
| 8 | * Based on gcc/config/rs6000/crtsavres.asm from gcc | ||
| 9 | * | ||
| 10 | * This file is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2, or (at your option) any | ||
| 13 | * later version. | ||
| 14 | * | ||
| 15 | * In addition to the permissions in the GNU General Public License, the | ||
| 16 | * Free Software Foundation gives you unlimited permission to link the | ||
| 17 | * compiled version of this file with other programs, and to distribute | ||
| 18 | * those programs without any restriction coming from the use of this | ||
| 19 | * file. (The General Public License restrictions do apply in other | ||
| 20 | * respects; for example, they cover modification of the file, and | ||
| 21 | * distribution when not linked into another program.) | ||
| 22 | * | ||
| 23 | * This file is distributed in the hope that it will be useful, but | ||
| 24 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 26 | * General Public License for more details. | ||
| 27 | * | ||
| 28 | * You should have received a copy of the GNU General Public License | ||
| 29 | * along with this program; see the file COPYING. If not, write to | ||
| 30 | * the Free Software Foundation, 51 Franklin Street, Fifth Floor, | ||
| 31 | * Boston, MA 02110-1301, USA. | ||
| 32 | * | ||
| 33 | * As a special exception, if you link this library with files | ||
| 34 | * compiled with GCC to produce an executable, this does not cause | ||
| 35 | * the resulting executable to be covered by the GNU General Public License. | ||
| 36 | * This exception does not however invalidate any other reasons why | ||
| 37 | * the executable file might be covered by the GNU General Public License. | ||
| 38 | */ | ||
| 39 | |||
| 40 | #include <asm/ppc_asm.h> | ||
| 41 | |||
| 42 | .file "crtsavres.S" | ||
| 43 | .section ".text" | ||
| 44 | |||
| 45 | #ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE | ||
| 46 | |||
| 47 | /* Routines for saving integer registers, called by the compiler. */ | ||
| 48 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 49 | /* function, just beyond the end of the integer save area. */ | ||
| 50 | |||
| 51 | _GLOBAL(_savegpr_14) | ||
| 52 | _GLOBAL(_save32gpr_14) | ||
| 53 | stw 14,-72(11) /* save gp registers */ | ||
| 54 | _GLOBAL(_savegpr_15) | ||
| 55 | _GLOBAL(_save32gpr_15) | ||
| 56 | stw 15,-68(11) | ||
| 57 | _GLOBAL(_savegpr_16) | ||
| 58 | _GLOBAL(_save32gpr_16) | ||
| 59 | stw 16,-64(11) | ||
| 60 | _GLOBAL(_savegpr_17) | ||
| 61 | _GLOBAL(_save32gpr_17) | ||
| 62 | stw 17,-60(11) | ||
| 63 | _GLOBAL(_savegpr_18) | ||
| 64 | _GLOBAL(_save32gpr_18) | ||
| 65 | stw 18,-56(11) | ||
| 66 | _GLOBAL(_savegpr_19) | ||
| 67 | _GLOBAL(_save32gpr_19) | ||
| 68 | stw 19,-52(11) | ||
| 69 | _GLOBAL(_savegpr_20) | ||
| 70 | _GLOBAL(_save32gpr_20) | ||
| 71 | stw 20,-48(11) | ||
| 72 | _GLOBAL(_savegpr_21) | ||
| 73 | _GLOBAL(_save32gpr_21) | ||
| 74 | stw 21,-44(11) | ||
| 75 | _GLOBAL(_savegpr_22) | ||
| 76 | _GLOBAL(_save32gpr_22) | ||
| 77 | stw 22,-40(11) | ||
| 78 | _GLOBAL(_savegpr_23) | ||
| 79 | _GLOBAL(_save32gpr_23) | ||
| 80 | stw 23,-36(11) | ||
| 81 | _GLOBAL(_savegpr_24) | ||
| 82 | _GLOBAL(_save32gpr_24) | ||
| 83 | stw 24,-32(11) | ||
| 84 | _GLOBAL(_savegpr_25) | ||
| 85 | _GLOBAL(_save32gpr_25) | ||
| 86 | stw 25,-28(11) | ||
| 87 | _GLOBAL(_savegpr_26) | ||
| 88 | _GLOBAL(_save32gpr_26) | ||
| 89 | stw 26,-24(11) | ||
| 90 | _GLOBAL(_savegpr_27) | ||
| 91 | _GLOBAL(_save32gpr_27) | ||
| 92 | stw 27,-20(11) | ||
| 93 | _GLOBAL(_savegpr_28) | ||
| 94 | _GLOBAL(_save32gpr_28) | ||
| 95 | stw 28,-16(11) | ||
| 96 | _GLOBAL(_savegpr_29) | ||
| 97 | _GLOBAL(_save32gpr_29) | ||
| 98 | stw 29,-12(11) | ||
| 99 | _GLOBAL(_savegpr_30) | ||
| 100 | _GLOBAL(_save32gpr_30) | ||
| 101 | stw 30,-8(11) | ||
| 102 | _GLOBAL(_savegpr_31) | ||
| 103 | _GLOBAL(_save32gpr_31) | ||
| 104 | stw 31,-4(11) | ||
| 105 | blr | ||
| 106 | |||
| 107 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 108 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 109 | /* function, just beyond the end of the integer restore area. */ | ||
| 110 | |||
| 111 | _GLOBAL(_restgpr_14) | ||
| 112 | _GLOBAL(_rest32gpr_14) | ||
| 113 | lwz 14,-72(11) /* restore gp registers */ | ||
| 114 | _GLOBAL(_restgpr_15) | ||
| 115 | _GLOBAL(_rest32gpr_15) | ||
| 116 | lwz 15,-68(11) | ||
| 117 | _GLOBAL(_restgpr_16) | ||
| 118 | _GLOBAL(_rest32gpr_16) | ||
| 119 | lwz 16,-64(11) | ||
| 120 | _GLOBAL(_restgpr_17) | ||
| 121 | _GLOBAL(_rest32gpr_17) | ||
| 122 | lwz 17,-60(11) | ||
| 123 | _GLOBAL(_restgpr_18) | ||
| 124 | _GLOBAL(_rest32gpr_18) | ||
| 125 | lwz 18,-56(11) | ||
| 126 | _GLOBAL(_restgpr_19) | ||
| 127 | _GLOBAL(_rest32gpr_19) | ||
| 128 | lwz 19,-52(11) | ||
| 129 | _GLOBAL(_restgpr_20) | ||
| 130 | _GLOBAL(_rest32gpr_20) | ||
| 131 | lwz 20,-48(11) | ||
| 132 | _GLOBAL(_restgpr_21) | ||
| 133 | _GLOBAL(_rest32gpr_21) | ||
| 134 | lwz 21,-44(11) | ||
| 135 | _GLOBAL(_restgpr_22) | ||
| 136 | _GLOBAL(_rest32gpr_22) | ||
| 137 | lwz 22,-40(11) | ||
| 138 | _GLOBAL(_restgpr_23) | ||
| 139 | _GLOBAL(_rest32gpr_23) | ||
| 140 | lwz 23,-36(11) | ||
| 141 | _GLOBAL(_restgpr_24) | ||
| 142 | _GLOBAL(_rest32gpr_24) | ||
| 143 | lwz 24,-32(11) | ||
| 144 | _GLOBAL(_restgpr_25) | ||
| 145 | _GLOBAL(_rest32gpr_25) | ||
| 146 | lwz 25,-28(11) | ||
| 147 | _GLOBAL(_restgpr_26) | ||
| 148 | _GLOBAL(_rest32gpr_26) | ||
| 149 | lwz 26,-24(11) | ||
| 150 | _GLOBAL(_restgpr_27) | ||
| 151 | _GLOBAL(_rest32gpr_27) | ||
| 152 | lwz 27,-20(11) | ||
| 153 | _GLOBAL(_restgpr_28) | ||
| 154 | _GLOBAL(_rest32gpr_28) | ||
| 155 | lwz 28,-16(11) | ||
| 156 | _GLOBAL(_restgpr_29) | ||
| 157 | _GLOBAL(_rest32gpr_29) | ||
| 158 | lwz 29,-12(11) | ||
| 159 | _GLOBAL(_restgpr_30) | ||
| 160 | _GLOBAL(_rest32gpr_30) | ||
| 161 | lwz 30,-8(11) | ||
| 162 | _GLOBAL(_restgpr_31) | ||
| 163 | _GLOBAL(_rest32gpr_31) | ||
| 164 | lwz 31,-4(11) | ||
| 165 | blr | ||
| 166 | |||
| 167 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 168 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 169 | /* function, just beyond the end of the integer restore area. */ | ||
| 170 | |||
| 171 | _GLOBAL(_restgpr_14_x) | ||
| 172 | _GLOBAL(_rest32gpr_14_x) | ||
| 173 | lwz 14,-72(11) /* restore gp registers */ | ||
| 174 | _GLOBAL(_restgpr_15_x) | ||
| 175 | _GLOBAL(_rest32gpr_15_x) | ||
| 176 | lwz 15,-68(11) | ||
| 177 | _GLOBAL(_restgpr_16_x) | ||
| 178 | _GLOBAL(_rest32gpr_16_x) | ||
| 179 | lwz 16,-64(11) | ||
| 180 | _GLOBAL(_restgpr_17_x) | ||
| 181 | _GLOBAL(_rest32gpr_17_x) | ||
| 182 | lwz 17,-60(11) | ||
| 183 | _GLOBAL(_restgpr_18_x) | ||
| 184 | _GLOBAL(_rest32gpr_18_x) | ||
| 185 | lwz 18,-56(11) | ||
| 186 | _GLOBAL(_restgpr_19_x) | ||
| 187 | _GLOBAL(_rest32gpr_19_x) | ||
| 188 | lwz 19,-52(11) | ||
| 189 | _GLOBAL(_restgpr_20_x) | ||
| 190 | _GLOBAL(_rest32gpr_20_x) | ||
| 191 | lwz 20,-48(11) | ||
| 192 | _GLOBAL(_restgpr_21_x) | ||
| 193 | _GLOBAL(_rest32gpr_21_x) | ||
| 194 | lwz 21,-44(11) | ||
| 195 | _GLOBAL(_restgpr_22_x) | ||
| 196 | _GLOBAL(_rest32gpr_22_x) | ||
| 197 | lwz 22,-40(11) | ||
| 198 | _GLOBAL(_restgpr_23_x) | ||
| 199 | _GLOBAL(_rest32gpr_23_x) | ||
| 200 | lwz 23,-36(11) | ||
| 201 | _GLOBAL(_restgpr_24_x) | ||
| 202 | _GLOBAL(_rest32gpr_24_x) | ||
| 203 | lwz 24,-32(11) | ||
| 204 | _GLOBAL(_restgpr_25_x) | ||
| 205 | _GLOBAL(_rest32gpr_25_x) | ||
| 206 | lwz 25,-28(11) | ||
| 207 | _GLOBAL(_restgpr_26_x) | ||
| 208 | _GLOBAL(_rest32gpr_26_x) | ||
| 209 | lwz 26,-24(11) | ||
| 210 | _GLOBAL(_restgpr_27_x) | ||
| 211 | _GLOBAL(_rest32gpr_27_x) | ||
| 212 | lwz 27,-20(11) | ||
| 213 | _GLOBAL(_restgpr_28_x) | ||
| 214 | _GLOBAL(_rest32gpr_28_x) | ||
| 215 | lwz 28,-16(11) | ||
| 216 | _GLOBAL(_restgpr_29_x) | ||
| 217 | _GLOBAL(_rest32gpr_29_x) | ||
| 218 | lwz 29,-12(11) | ||
| 219 | _GLOBAL(_restgpr_30_x) | ||
| 220 | _GLOBAL(_rest32gpr_30_x) | ||
| 221 | lwz 30,-8(11) | ||
| 222 | _GLOBAL(_restgpr_31_x) | ||
| 223 | _GLOBAL(_rest32gpr_31_x) | ||
| 224 | lwz 0,4(11) | ||
| 225 | lwz 31,-4(11) | ||
| 226 | mtlr 0 | ||
| 227 | mr 1,11 | ||
| 228 | blr | ||
| 229 | #endif | ||
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S index 21d248486479..70f4c833fa32 100644 --- a/arch/powerpc/mm/hash_low_64.S +++ b/arch/powerpc/mm/hash_low_64.S | |||
| @@ -568,6 +568,10 @@ htab_inval_old_hpte: | |||
| 568 | ld r7,STK_PARM(r9)(r1) /* ssize */ | 568 | ld r7,STK_PARM(r9)(r1) /* ssize */ |
| 569 | ld r8,STK_PARM(r8)(r1) /* local */ | 569 | ld r8,STK_PARM(r8)(r1) /* local */ |
| 570 | bl .flush_hash_page | 570 | bl .flush_hash_page |
| 571 | /* Clear out _PAGE_HPTE_SUB bits in the new linux PTE */ | ||
| 572 | lis r0,_PAGE_HPTE_SUB@h | ||
| 573 | ori r0,r0,_PAGE_HPTE_SUB@l | ||
| 574 | andc r30,r30,r0 | ||
| 571 | b htab_insert_pte | 575 | b htab_insert_pte |
| 572 | 576 | ||
| 573 | htab_bail_ok: | 577 | htab_bail_ok: |
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 7ff29d53dc2d..ecbe580c3f32 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
| @@ -34,6 +34,7 @@ config MPC85xx_MDS | |||
| 34 | bool "Freescale MPC85xx MDS" | 34 | bool "Freescale MPC85xx MDS" |
| 35 | select DEFAULT_UIMAGE | 35 | select DEFAULT_UIMAGE |
| 36 | select QUICC_ENGINE | 36 | select QUICC_ENGINE |
| 37 | select PHYLIB | ||
| 37 | help | 38 | help |
| 38 | This option enables support for the MPC85xx MDS board | 39 | This option enables support for the MPC85xx MDS board |
| 39 | 40 | ||
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c index 70c660121ec4..78f905bc6a42 100644 --- a/arch/powerpc/platforms/cell/spu_base.c +++ b/arch/powerpc/platforms/cell/spu_base.c | |||
| @@ -219,15 +219,25 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea) | |||
| 219 | extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX | 219 | extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX |
| 220 | static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) | 220 | static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) |
| 221 | { | 221 | { |
| 222 | int ret; | ||
| 223 | |||
| 222 | pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea); | 224 | pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea); |
| 223 | 225 | ||
| 224 | /* Handle kernel space hash faults immediately. | 226 | /* |
| 225 | User hash faults need to be deferred to process context. */ | 227 | * Handle kernel space hash faults immediately. User hash |
| 226 | if ((dsisr & MFC_DSISR_PTE_NOT_FOUND) | 228 | * faults need to be deferred to process context. |
| 227 | && REGION_ID(ea) != USER_REGION_ID | 229 | */ |
| 228 | && hash_page(ea, _PAGE_PRESENT, 0x300) == 0) { | 230 | if ((dsisr & MFC_DSISR_PTE_NOT_FOUND) && |
| 229 | spu_restart_dma(spu); | 231 | (REGION_ID(ea) != USER_REGION_ID)) { |
| 230 | return 0; | 232 | |
| 233 | spin_unlock(&spu->register_lock); | ||
| 234 | ret = hash_page(ea, _PAGE_PRESENT, 0x300); | ||
| 235 | spin_lock(&spu->register_lock); | ||
| 236 | |||
| 237 | if (!ret) { | ||
| 238 | spu_restart_dma(spu); | ||
| 239 | return 0; | ||
| 240 | } | ||
| 231 | } | 241 | } |
| 232 | 242 | ||
| 233 | spu->class_1_dar = ea; | 243 | spu->class_1_dar = ea; |
| @@ -324,17 +334,13 @@ spu_irq_class_0(int irq, void *data) | |||
| 324 | stat = spu_int_stat_get(spu, 0) & mask; | 334 | stat = spu_int_stat_get(spu, 0) & mask; |
| 325 | 335 | ||
| 326 | spu->class_0_pending |= stat; | 336 | spu->class_0_pending |= stat; |
| 327 | spu->class_0_dsisr = spu_mfc_dsisr_get(spu); | ||
| 328 | spu->class_0_dar = spu_mfc_dar_get(spu); | 337 | spu->class_0_dar = spu_mfc_dar_get(spu); |
| 329 | spin_unlock(&spu->register_lock); | ||
| 330 | |||
| 331 | spu->stop_callback(spu, 0); | 338 | spu->stop_callback(spu, 0); |
| 332 | |||
| 333 | spu->class_0_pending = 0; | 339 | spu->class_0_pending = 0; |
| 334 | spu->class_0_dsisr = 0; | ||
| 335 | spu->class_0_dar = 0; | 340 | spu->class_0_dar = 0; |
| 336 | 341 | ||
| 337 | spu_int_stat_clear(spu, 0, stat); | 342 | spu_int_stat_clear(spu, 0, stat); |
| 343 | spin_unlock(&spu->register_lock); | ||
| 338 | 344 | ||
| 339 | return IRQ_HANDLED; | 345 | return IRQ_HANDLED; |
| 340 | } | 346 | } |
| @@ -357,13 +363,12 @@ spu_irq_class_1(int irq, void *data) | |||
| 357 | spu_mfc_dsisr_set(spu, 0ul); | 363 | spu_mfc_dsisr_set(spu, 0ul); |
| 358 | spu_int_stat_clear(spu, 1, stat); | 364 | spu_int_stat_clear(spu, 1, stat); |
| 359 | 365 | ||
| 360 | if (stat & CLASS1_SEGMENT_FAULT_INTR) | ||
| 361 | __spu_trap_data_seg(spu, dar); | ||
| 362 | |||
| 363 | spin_unlock(&spu->register_lock); | ||
| 364 | pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat, | 366 | pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat, |
| 365 | dar, dsisr); | 367 | dar, dsisr); |
| 366 | 368 | ||
| 369 | if (stat & CLASS1_SEGMENT_FAULT_INTR) | ||
| 370 | __spu_trap_data_seg(spu, dar); | ||
| 371 | |||
| 367 | if (stat & CLASS1_STORAGE_FAULT_INTR) | 372 | if (stat & CLASS1_STORAGE_FAULT_INTR) |
| 368 | __spu_trap_data_map(spu, dar, dsisr); | 373 | __spu_trap_data_map(spu, dar, dsisr); |
| 369 | 374 | ||
| @@ -376,6 +381,8 @@ spu_irq_class_1(int irq, void *data) | |||
| 376 | spu->class_1_dsisr = 0; | 381 | spu->class_1_dsisr = 0; |
| 377 | spu->class_1_dar = 0; | 382 | spu->class_1_dar = 0; |
| 378 | 383 | ||
| 384 | spin_unlock(&spu->register_lock); | ||
| 385 | |||
| 379 | return stat ? IRQ_HANDLED : IRQ_NONE; | 386 | return stat ? IRQ_HANDLED : IRQ_NONE; |
| 380 | } | 387 | } |
| 381 | 388 | ||
| @@ -394,14 +401,12 @@ spu_irq_class_2(int irq, void *data) | |||
| 394 | mask = spu_int_mask_get(spu, 2); | 401 | mask = spu_int_mask_get(spu, 2); |
| 395 | /* ignore interrupts we're not waiting for */ | 402 | /* ignore interrupts we're not waiting for */ |
| 396 | stat &= mask; | 403 | stat &= mask; |
| 397 | |||
| 398 | /* mailbox interrupts are level triggered. mask them now before | 404 | /* mailbox interrupts are level triggered. mask them now before |
| 399 | * acknowledging */ | 405 | * acknowledging */ |
| 400 | if (stat & mailbox_intrs) | 406 | if (stat & mailbox_intrs) |
| 401 | spu_int_mask_and(spu, 2, ~(stat & mailbox_intrs)); | 407 | spu_int_mask_and(spu, 2, ~(stat & mailbox_intrs)); |
| 402 | /* acknowledge all interrupts before the callbacks */ | 408 | /* acknowledge all interrupts before the callbacks */ |
| 403 | spu_int_stat_clear(spu, 2, stat); | 409 | spu_int_stat_clear(spu, 2, stat); |
| 404 | spin_unlock(&spu->register_lock); | ||
| 405 | 410 | ||
| 406 | pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask); | 411 | pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask); |
| 407 | 412 | ||
| @@ -421,6 +426,9 @@ spu_irq_class_2(int irq, void *data) | |||
| 421 | spu->wbox_callback(spu); | 426 | spu->wbox_callback(spu); |
| 422 | 427 | ||
| 423 | spu->stats.class2_intr++; | 428 | spu->stats.class2_intr++; |
| 429 | |||
| 430 | spin_unlock(&spu->register_lock); | ||
| 431 | |||
| 424 | return stat ? IRQ_HANDLED : IRQ_NONE; | 432 | return stat ? IRQ_HANDLED : IRQ_NONE; |
| 425 | } | 433 | } |
| 426 | 434 | ||
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index b7493b865812..f7edba6cb795 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c | |||
| @@ -27,7 +27,6 @@ void spufs_stop_callback(struct spu *spu, int irq) | |||
| 27 | switch(irq) { | 27 | switch(irq) { |
| 28 | case 0 : | 28 | case 0 : |
| 29 | ctx->csa.class_0_pending = spu->class_0_pending; | 29 | ctx->csa.class_0_pending = spu->class_0_pending; |
| 30 | ctx->csa.class_0_dsisr = spu->class_0_dsisr; | ||
| 31 | ctx->csa.class_0_dar = spu->class_0_dar; | 30 | ctx->csa.class_0_dar = spu->class_0_dar; |
| 32 | break; | 31 | break; |
| 33 | case 1 : | 32 | case 1 : |
| @@ -51,18 +50,22 @@ int spu_stopped(struct spu_context *ctx, u32 *stat) | |||
| 51 | u64 dsisr; | 50 | u64 dsisr; |
| 52 | u32 stopped; | 51 | u32 stopped; |
| 53 | 52 | ||
| 54 | *stat = ctx->ops->status_read(ctx); | ||
| 55 | |||
| 56 | if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags)) | ||
| 57 | return 1; | ||
| 58 | |||
| 59 | stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP | | 53 | stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP | |
| 60 | SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP; | 54 | SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP; |
| 61 | if (!(*stat & SPU_STATUS_RUNNING) && (*stat & stopped)) | 55 | |
| 56 | top: | ||
| 57 | *stat = ctx->ops->status_read(ctx); | ||
| 58 | if (*stat & stopped) { | ||
| 59 | /* | ||
| 60 | * If the spu hasn't finished stopping, we need to | ||
| 61 | * re-read the register to get the stopped value. | ||
| 62 | */ | ||
| 63 | if (*stat & SPU_STATUS_RUNNING) | ||
| 64 | goto top; | ||
| 62 | return 1; | 65 | return 1; |
| 66 | } | ||
| 63 | 67 | ||
| 64 | dsisr = ctx->csa.class_0_dsisr; | 68 | if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags)) |
| 65 | if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)) | ||
| 66 | return 1; | 69 | return 1; |
| 67 | 70 | ||
| 68 | dsisr = ctx->csa.class_1_dsisr; | 71 | dsisr = ctx->csa.class_1_dsisr; |
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 745dd51ec37f..e929e70a84e3 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/arch/powerpc/platforms/cell/spufs/sched.c | |||
| @@ -230,19 +230,23 @@ static void spu_bind_context(struct spu *spu, struct spu_context *ctx) | |||
| 230 | ctx->stats.slb_flt_base = spu->stats.slb_flt; | 230 | ctx->stats.slb_flt_base = spu->stats.slb_flt; |
| 231 | ctx->stats.class2_intr_base = spu->stats.class2_intr; | 231 | ctx->stats.class2_intr_base = spu->stats.class2_intr; |
| 232 | 232 | ||
| 233 | spu_associate_mm(spu, ctx->owner); | ||
| 234 | |||
| 235 | spin_lock_irq(&spu->register_lock); | ||
| 233 | spu->ctx = ctx; | 236 | spu->ctx = ctx; |
| 234 | spu->flags = 0; | 237 | spu->flags = 0; |
| 235 | ctx->spu = spu; | 238 | ctx->spu = spu; |
| 236 | ctx->ops = &spu_hw_ops; | 239 | ctx->ops = &spu_hw_ops; |
| 237 | spu->pid = current->pid; | 240 | spu->pid = current->pid; |
| 238 | spu->tgid = current->tgid; | 241 | spu->tgid = current->tgid; |
| 239 | spu_associate_mm(spu, ctx->owner); | ||
| 240 | spu->ibox_callback = spufs_ibox_callback; | 242 | spu->ibox_callback = spufs_ibox_callback; |
| 241 | spu->wbox_callback = spufs_wbox_callback; | 243 | spu->wbox_callback = spufs_wbox_callback; |
| 242 | spu->stop_callback = spufs_stop_callback; | 244 | spu->stop_callback = spufs_stop_callback; |
| 243 | spu->mfc_callback = spufs_mfc_callback; | 245 | spu->mfc_callback = spufs_mfc_callback; |
| 244 | mb(); | 246 | spin_unlock_irq(&spu->register_lock); |
| 247 | |||
| 245 | spu_unmap_mappings(ctx); | 248 | spu_unmap_mappings(ctx); |
| 249 | |||
| 246 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0); | 250 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0); |
| 247 | spu_restore(&ctx->csa, spu); | 251 | spu_restore(&ctx->csa, spu); |
| 248 | spu->timestamp = jiffies; | 252 | spu->timestamp = jiffies; |
| @@ -403,6 +407,8 @@ static int has_affinity(struct spu_context *ctx) | |||
| 403 | */ | 407 | */ |
| 404 | static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | 408 | static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) |
| 405 | { | 409 | { |
| 410 | u32 status; | ||
| 411 | |||
| 406 | spu_context_trace(spu_unbind_context__enter, ctx, spu); | 412 | spu_context_trace(spu_unbind_context__enter, ctx, spu); |
| 407 | 413 | ||
| 408 | spuctx_switch_state(ctx, SPU_UTIL_SYSTEM); | 414 | spuctx_switch_state(ctx, SPU_UTIL_SYSTEM); |
| @@ -423,18 +429,22 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | |||
| 423 | spu_unmap_mappings(ctx); | 429 | spu_unmap_mappings(ctx); |
| 424 | spu_save(&ctx->csa, spu); | 430 | spu_save(&ctx->csa, spu); |
| 425 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0); | 431 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0); |
| 432 | |||
| 433 | spin_lock_irq(&spu->register_lock); | ||
| 426 | spu->timestamp = jiffies; | 434 | spu->timestamp = jiffies; |
| 427 | ctx->state = SPU_STATE_SAVED; | 435 | ctx->state = SPU_STATE_SAVED; |
| 428 | spu->ibox_callback = NULL; | 436 | spu->ibox_callback = NULL; |
| 429 | spu->wbox_callback = NULL; | 437 | spu->wbox_callback = NULL; |
| 430 | spu->stop_callback = NULL; | 438 | spu->stop_callback = NULL; |
| 431 | spu->mfc_callback = NULL; | 439 | spu->mfc_callback = NULL; |
| 432 | spu_associate_mm(spu, NULL); | ||
| 433 | spu->pid = 0; | 440 | spu->pid = 0; |
| 434 | spu->tgid = 0; | 441 | spu->tgid = 0; |
| 435 | ctx->ops = &spu_backing_ops; | 442 | ctx->ops = &spu_backing_ops; |
| 436 | spu->flags = 0; | 443 | spu->flags = 0; |
| 437 | spu->ctx = NULL; | 444 | spu->ctx = NULL; |
| 445 | spin_unlock_irq(&spu->register_lock); | ||
| 446 | |||
| 447 | spu_associate_mm(spu, NULL); | ||
| 438 | 448 | ||
| 439 | ctx->stats.slb_flt += | 449 | ctx->stats.slb_flt += |
| 440 | (spu->stats.slb_flt - ctx->stats.slb_flt_base); | 450 | (spu->stats.slb_flt - ctx->stats.slb_flt_base); |
| @@ -444,6 +454,9 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | |||
| 444 | /* This maps the underlying spu state to idle */ | 454 | /* This maps the underlying spu state to idle */ |
| 445 | spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); | 455 | spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); |
| 446 | ctx->spu = NULL; | 456 | ctx->spu = NULL; |
| 457 | |||
| 458 | if (spu_stopped(ctx, &status)) | ||
| 459 | wake_up_all(&ctx->stop_wq); | ||
| 447 | } | 460 | } |
| 448 | 461 | ||
| 449 | /** | 462 | /** |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 68ea5eee39a8..8c1ca477c52c 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
| @@ -42,17 +42,20 @@ static inline const char * pcid_name (struct pci_dev *pdev) | |||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | #ifdef DEBUG | 44 | #ifdef DEBUG |
| 45 | static void print_device_node_tree (struct pci_dn *pdn, int dent) | 45 | static void print_device_node_tree(struct pci_dn *pdn, int dent) |
| 46 | { | 46 | { |
| 47 | int i; | 47 | int i; |
| 48 | if (!pdn) return; | 48 | struct device_node *pc; |
| 49 | for (i=0;i<dent; i++) | 49 | |
| 50 | if (!pdn) | ||
| 51 | return; | ||
| 52 | for (i = 0; i < dent; i++) | ||
| 50 | printk(" "); | 53 | printk(" "); |
| 51 | printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n", | 54 | printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n", |
| 52 | pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr, | 55 | pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr, |
| 53 | pdn->eeh_pe_config_addr, pdn->node->full_name); | 56 | pdn->eeh_pe_config_addr, pdn->node->full_name); |
| 54 | dent += 3; | 57 | dent += 3; |
| 55 | struct device_node *pc = pdn->node->child; | 58 | pc = pdn->node->child; |
| 56 | while (pc) { | 59 | while (pc) { |
| 57 | print_device_node_tree(PCI_DN(pc), dent); | 60 | print_device_node_tree(PCI_DN(pc), dent); |
| 58 | pc = pc->sibling; | 61 | pc = pc->sibling; |
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c index f68903e15bd5..42f7e384e6c4 100644 --- a/arch/powerpc/platforms/pseries/nvram.c +++ b/arch/powerpc/platforms/pseries/nvram.c | |||
| @@ -131,8 +131,10 @@ int __init pSeries_nvram_init(void) | |||
| 131 | return -ENODEV; | 131 | return -ENODEV; |
| 132 | 132 | ||
| 133 | nbytes_p = of_get_property(nvram, "#bytes", &proplen); | 133 | nbytes_p = of_get_property(nvram, "#bytes", &proplen); |
| 134 | if (nbytes_p == NULL || proplen != sizeof(unsigned int)) | 134 | if (nbytes_p == NULL || proplen != sizeof(unsigned int)) { |
| 135 | of_node_put(nvram); | ||
| 135 | return -EIO; | 136 | return -EIO; |
| 137 | } | ||
| 136 | 138 | ||
| 137 | nvram_size = *nbytes_p; | 139 | nvram_size = *nbytes_p; |
| 138 | 140 | ||
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 1702de9395ee..bfcf70ee8959 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
| @@ -2844,7 +2844,6 @@ static void dump_spu_fields(struct spu *spu) | |||
| 2844 | DUMP_FIELD(spu, "0x%lx", flags); | 2844 | DUMP_FIELD(spu, "0x%lx", flags); |
| 2845 | DUMP_FIELD(spu, "%d", class_0_pending); | 2845 | DUMP_FIELD(spu, "%d", class_0_pending); |
| 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); | 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); |
| 2847 | DUMP_FIELD(spu, "0x%lx", class_0_dsisr); | ||
| 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dar); | 2847 | DUMP_FIELD(spu, "0x%lx", class_1_dar); |
| 2849 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); | 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); |
| 2850 | DUMP_FIELD(spu, "0x%lx", irqs[0]); | 2849 | DUMP_FIELD(spu, "0x%lx", irqs[0]); |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 52e18e6d2ba0..e0edaaa6920a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -383,6 +383,7 @@ config VMI | |||
| 383 | config KVM_CLOCK | 383 | config KVM_CLOCK |
| 384 | bool "KVM paravirtualized clock" | 384 | bool "KVM paravirtualized clock" |
| 385 | select PARAVIRT | 385 | select PARAVIRT |
| 386 | select PARAVIRT_CLOCK | ||
| 386 | depends on !(X86_VISWS || X86_VOYAGER) | 387 | depends on !(X86_VISWS || X86_VOYAGER) |
| 387 | help | 388 | help |
| 388 | Turning on this option will allow you to run a paravirtualized clock | 389 | Turning on this option will allow you to run a paravirtualized clock |
| @@ -410,6 +411,10 @@ config PARAVIRT | |||
| 410 | over full virtualization. However, when run without a hypervisor | 411 | over full virtualization. However, when run without a hypervisor |
| 411 | the kernel is theoretically slower and slightly larger. | 412 | the kernel is theoretically slower and slightly larger. |
| 412 | 413 | ||
| 414 | config PARAVIRT_CLOCK | ||
| 415 | bool | ||
| 416 | default n | ||
| 417 | |||
| 413 | endif | 418 | endif |
| 414 | 419 | ||
| 415 | config MEMTEST_BOOTPARAM | 420 | config MEMTEST_BOOTPARAM |
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 5e618c3b4720..77807d4769c9 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -82,6 +82,7 @@ obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o | |||
| 82 | obj-$(CONFIG_KVM_GUEST) += kvm.o | 82 | obj-$(CONFIG_KVM_GUEST) += kvm.o |
| 83 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o | 83 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o |
| 84 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o | 84 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o |
| 85 | obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o | ||
| 85 | 86 | ||
| 86 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o | 87 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o |
| 87 | 88 | ||
diff --git a/arch/x86/kernel/geode_32.c b/arch/x86/kernel/geode_32.c index e8edd63ab000..9b08e852fd1a 100644 --- a/arch/x86/kernel/geode_32.c +++ b/arch/x86/kernel/geode_32.c | |||
| @@ -166,6 +166,8 @@ int geode_has_vsa2(void) | |||
| 166 | static int has_vsa2 = -1; | 166 | static int has_vsa2 = -1; |
| 167 | 167 | ||
| 168 | if (has_vsa2 == -1) { | 168 | if (has_vsa2 == -1) { |
| 169 | u16 val; | ||
| 170 | |||
| 169 | /* | 171 | /* |
| 170 | * The VSA has virtual registers that we can query for a | 172 | * The VSA has virtual registers that we can query for a |
| 171 | * signature. | 173 | * signature. |
| @@ -173,7 +175,8 @@ int geode_has_vsa2(void) | |||
| 173 | outw(VSA_VR_UNLOCK, VSA_VRC_INDEX); | 175 | outw(VSA_VR_UNLOCK, VSA_VRC_INDEX); |
| 174 | outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX); | 176 | outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX); |
| 175 | 177 | ||
| 176 | has_vsa2 = (inw(VSA_VRC_DATA) == VSA_SIG); | 178 | val = inw(VSA_VRC_DATA); |
| 179 | has_vsa2 = (val == AMD_VSA_SIG || val == GSW_VSA_SIG); | ||
| 177 | } | 180 | } |
| 178 | 181 | ||
| 179 | return has_vsa2; | 182 | return has_vsa2; |
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 08a30986d472..87edf1ceb1df 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/clocksource.h> | 19 | #include <linux/clocksource.h> |
| 20 | #include <linux/kvm_para.h> | 20 | #include <linux/kvm_para.h> |
| 21 | #include <asm/pvclock.h> | ||
| 21 | #include <asm/arch_hooks.h> | 22 | #include <asm/arch_hooks.h> |
| 22 | #include <asm/msr.h> | 23 | #include <asm/msr.h> |
| 23 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
| @@ -36,18 +37,9 @@ static int parse_no_kvmclock(char *arg) | |||
| 36 | early_param("no-kvmclock", parse_no_kvmclock); | 37 | early_param("no-kvmclock", parse_no_kvmclock); |
| 37 | 38 | ||
| 38 | /* The hypervisor will put information about time periodically here */ | 39 | /* The hypervisor will put information about time periodically here */ |
| 39 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct kvm_vcpu_time_info, hv_clock); | 40 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct pvclock_vcpu_time_info, hv_clock); |
| 40 | #define get_clock(cpu, field) per_cpu(hv_clock, cpu).field | 41 | static struct pvclock_wall_clock wall_clock; |
| 41 | 42 | ||
| 42 | static inline u64 kvm_get_delta(u64 last_tsc) | ||
| 43 | { | ||
| 44 | int cpu = smp_processor_id(); | ||
| 45 | u64 delta = native_read_tsc() - last_tsc; | ||
| 46 | return (delta * get_clock(cpu, tsc_to_system_mul)) >> KVM_SCALE; | ||
| 47 | } | ||
| 48 | |||
| 49 | static struct kvm_wall_clock wall_clock; | ||
| 50 | static cycle_t kvm_clock_read(void); | ||
| 51 | /* | 43 | /* |
| 52 | * The wallclock is the time of day when we booted. Since then, some time may | 44 | * The wallclock is the time of day when we booted. Since then, some time may |
| 53 | * have elapsed since the hypervisor wrote the data. So we try to account for | 45 | * have elapsed since the hypervisor wrote the data. So we try to account for |
| @@ -55,64 +47,37 @@ static cycle_t kvm_clock_read(void); | |||
| 55 | */ | 47 | */ |
| 56 | static unsigned long kvm_get_wallclock(void) | 48 | static unsigned long kvm_get_wallclock(void) |
| 57 | { | 49 | { |
| 58 | u32 wc_sec, wc_nsec; | 50 | struct pvclock_vcpu_time_info *vcpu_time; |
| 59 | u64 delta; | ||
| 60 | struct timespec ts; | 51 | struct timespec ts; |
| 61 | int version, nsec; | ||
| 62 | int low, high; | 52 | int low, high; |
| 63 | 53 | ||
| 64 | low = (int)__pa(&wall_clock); | 54 | low = (int)__pa(&wall_clock); |
| 65 | high = ((u64)__pa(&wall_clock) >> 32); | 55 | high = ((u64)__pa(&wall_clock) >> 32); |
| 56 | native_write_msr(MSR_KVM_WALL_CLOCK, low, high); | ||
| 66 | 57 | ||
| 67 | delta = kvm_clock_read(); | 58 | vcpu_time = &get_cpu_var(hv_clock); |
| 59 | pvclock_read_wallclock(&wall_clock, vcpu_time, &ts); | ||
| 60 | put_cpu_var(hv_clock); | ||
| 68 | 61 | ||
| 69 | native_write_msr(MSR_KVM_WALL_CLOCK, low, high); | 62 | return ts.tv_sec; |
| 70 | do { | ||
| 71 | version = wall_clock.wc_version; | ||
| 72 | rmb(); | ||
| 73 | wc_sec = wall_clock.wc_sec; | ||
| 74 | wc_nsec = wall_clock.wc_nsec; | ||
| 75 | rmb(); | ||
| 76 | } while ((wall_clock.wc_version != version) || (version & 1)); | ||
| 77 | |||
| 78 | delta = kvm_clock_read() - delta; | ||
| 79 | delta += wc_nsec; | ||
| 80 | nsec = do_div(delta, NSEC_PER_SEC); | ||
| 81 | set_normalized_timespec(&ts, wc_sec + delta, nsec); | ||
| 82 | /* | ||
| 83 | * Of all mechanisms of time adjustment I've tested, this one | ||
| 84 | * was the champion! | ||
| 85 | */ | ||
| 86 | return ts.tv_sec + 1; | ||
| 87 | } | 63 | } |
| 88 | 64 | ||
| 89 | static int kvm_set_wallclock(unsigned long now) | 65 | static int kvm_set_wallclock(unsigned long now) |
| 90 | { | 66 | { |
| 91 | return 0; | 67 | return -1; |
| 92 | } | 68 | } |
| 93 | 69 | ||
| 94 | /* | ||
| 95 | * This is our read_clock function. The host puts an tsc timestamp each time | ||
| 96 | * it updates a new time. Without the tsc adjustment, we can have a situation | ||
| 97 | * in which a vcpu starts to run earlier (smaller system_time), but probes | ||
| 98 | * time later (compared to another vcpu), leading to backwards time | ||
| 99 | */ | ||
| 100 | static cycle_t kvm_clock_read(void) | 70 | static cycle_t kvm_clock_read(void) |
| 101 | { | 71 | { |
| 102 | u64 last_tsc, now; | 72 | struct pvclock_vcpu_time_info *src; |
| 103 | int cpu; | 73 | cycle_t ret; |
| 104 | 74 | ||
| 105 | preempt_disable(); | 75 | src = &get_cpu_var(hv_clock); |
| 106 | cpu = smp_processor_id(); | 76 | ret = pvclock_clocksource_read(src); |
| 107 | 77 | put_cpu_var(hv_clock); | |
| 108 | last_tsc = get_clock(cpu, tsc_timestamp); | 78 | return ret; |
| 109 | now = get_clock(cpu, system_time); | ||
| 110 | |||
| 111 | now += kvm_get_delta(last_tsc); | ||
| 112 | preempt_enable(); | ||
| 113 | |||
| 114 | return now; | ||
| 115 | } | 79 | } |
| 80 | |||
| 116 | static struct clocksource kvm_clock = { | 81 | static struct clocksource kvm_clock = { |
| 117 | .name = "kvm-clock", | 82 | .name = "kvm-clock", |
| 118 | .read = kvm_clock_read, | 83 | .read = kvm_clock_read, |
| @@ -123,13 +88,14 @@ static struct clocksource kvm_clock = { | |||
| 123 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 88 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 124 | }; | 89 | }; |
| 125 | 90 | ||
| 126 | static int kvm_register_clock(void) | 91 | static int kvm_register_clock(char *txt) |
| 127 | { | 92 | { |
| 128 | int cpu = smp_processor_id(); | 93 | int cpu = smp_processor_id(); |
| 129 | int low, high; | 94 | int low, high; |
| 130 | low = (int)__pa(&per_cpu(hv_clock, cpu)) | 1; | 95 | low = (int)__pa(&per_cpu(hv_clock, cpu)) | 1; |
| 131 | high = ((u64)__pa(&per_cpu(hv_clock, cpu)) >> 32); | 96 | high = ((u64)__pa(&per_cpu(hv_clock, cpu)) >> 32); |
| 132 | 97 | printk(KERN_INFO "kvm-clock: cpu %d, msr %x:%x, %s\n", | |
| 98 | cpu, high, low, txt); | ||
| 133 | return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high); | 99 | return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high); |
| 134 | } | 100 | } |
| 135 | 101 | ||
| @@ -140,12 +106,20 @@ static void kvm_setup_secondary_clock(void) | |||
| 140 | * Now that the first cpu already had this clocksource initialized, | 106 | * Now that the first cpu already had this clocksource initialized, |
| 141 | * we shouldn't fail. | 107 | * we shouldn't fail. |
| 142 | */ | 108 | */ |
| 143 | WARN_ON(kvm_register_clock()); | 109 | WARN_ON(kvm_register_clock("secondary cpu clock")); |
| 144 | /* ok, done with our trickery, call native */ | 110 | /* ok, done with our trickery, call native */ |
| 145 | setup_secondary_APIC_clock(); | 111 | setup_secondary_APIC_clock(); |
| 146 | } | 112 | } |
| 147 | #endif | 113 | #endif |
| 148 | 114 | ||
| 115 | #ifdef CONFIG_SMP | ||
| 116 | void __init kvm_smp_prepare_boot_cpu(void) | ||
| 117 | { | ||
| 118 | WARN_ON(kvm_register_clock("primary cpu clock")); | ||
| 119 | native_smp_prepare_boot_cpu(); | ||
| 120 | } | ||
| 121 | #endif | ||
| 122 | |||
| 149 | /* | 123 | /* |
| 150 | * After the clock is registered, the host will keep writing to the | 124 | * After the clock is registered, the host will keep writing to the |
| 151 | * registered memory location. If the guest happens to shutdown, this memory | 125 | * registered memory location. If the guest happens to shutdown, this memory |
| @@ -174,7 +148,7 @@ void __init kvmclock_init(void) | |||
| 174 | return; | 148 | return; |
| 175 | 149 | ||
| 176 | if (kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) { | 150 | if (kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) { |
| 177 | if (kvm_register_clock()) | 151 | if (kvm_register_clock("boot clock")) |
| 178 | return; | 152 | return; |
| 179 | pv_time_ops.get_wallclock = kvm_get_wallclock; | 153 | pv_time_ops.get_wallclock = kvm_get_wallclock; |
| 180 | pv_time_ops.set_wallclock = kvm_set_wallclock; | 154 | pv_time_ops.set_wallclock = kvm_set_wallclock; |
| @@ -182,6 +156,9 @@ void __init kvmclock_init(void) | |||
| 182 | #ifdef CONFIG_X86_LOCAL_APIC | 156 | #ifdef CONFIG_X86_LOCAL_APIC |
| 183 | pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock; | 157 | pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock; |
| 184 | #endif | 158 | #endif |
| 159 | #ifdef CONFIG_SMP | ||
| 160 | smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu; | ||
| 161 | #endif | ||
| 185 | machine_ops.shutdown = kvm_shutdown; | 162 | machine_ops.shutdown = kvm_shutdown; |
| 186 | #ifdef CONFIG_KEXEC | 163 | #ifdef CONFIG_KEXEC |
| 187 | machine_ops.crash_shutdown = kvm_crash_shutdown; | 164 | machine_ops.crash_shutdown = kvm_crash_shutdown; |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 6d5483356e74..e2db9ac5c61c 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
| @@ -333,6 +333,7 @@ void flush_thread(void) | |||
| 333 | /* | 333 | /* |
| 334 | * Forget coprocessor state.. | 334 | * Forget coprocessor state.. |
| 335 | */ | 335 | */ |
| 336 | tsk->fpu_counter = 0; | ||
| 336 | clear_fpu(tsk); | 337 | clear_fpu(tsk); |
| 337 | clear_used_math(); | 338 | clear_used_math(); |
| 338 | } | 339 | } |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index ac54ff56df80..c6eb5c91e5f6 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -294,6 +294,7 @@ void flush_thread(void) | |||
| 294 | /* | 294 | /* |
| 295 | * Forget coprocessor state.. | 295 | * Forget coprocessor state.. |
| 296 | */ | 296 | */ |
| 297 | tsk->fpu_counter = 0; | ||
| 297 | clear_fpu(tsk); | 298 | clear_fpu(tsk); |
| 298 | clear_used_math(); | 299 | clear_used_math(); |
| 299 | } | 300 | } |
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c new file mode 100644 index 000000000000..05fbe9a0325a --- /dev/null +++ b/arch/x86/kernel/pvclock.c | |||
| @@ -0,0 +1,141 @@ | |||
| 1 | /* paravirtual clock -- common code used by kvm/xen | ||
| 2 | |||
| 3 | This program is free software; you can redistribute it and/or modify | ||
| 4 | it under the terms of the GNU General Public License as published by | ||
| 5 | the Free Software Foundation; either version 2 of the License, or | ||
| 6 | (at your option) any later version. | ||
| 7 | |||
| 8 | This program is distributed in the hope that it will be useful, | ||
| 9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | GNU General Public License for more details. | ||
| 12 | |||
| 13 | You should have received a copy of the GNU General Public License | ||
| 14 | along with this program; if not, write to the Free Software | ||
| 15 | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/percpu.h> | ||
| 20 | #include <asm/pvclock.h> | ||
| 21 | |||
| 22 | /* | ||
| 23 | * These are perodically updated | ||
| 24 | * xen: magic shared_info page | ||
| 25 | * kvm: gpa registered via msr | ||
| 26 | * and then copied here. | ||
| 27 | */ | ||
| 28 | struct pvclock_shadow_time { | ||
| 29 | u64 tsc_timestamp; /* TSC at last update of time vals. */ | ||
| 30 | u64 system_timestamp; /* Time, in nanosecs, since boot. */ | ||
| 31 | u32 tsc_to_nsec_mul; | ||
| 32 | int tsc_shift; | ||
| 33 | u32 version; | ||
| 34 | }; | ||
| 35 | |||
| 36 | /* | ||
| 37 | * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, | ||
| 38 | * yielding a 64-bit result. | ||
| 39 | */ | ||
| 40 | static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift) | ||
| 41 | { | ||
| 42 | u64 product; | ||
| 43 | #ifdef __i386__ | ||
| 44 | u32 tmp1, tmp2; | ||
| 45 | #endif | ||
| 46 | |||
| 47 | if (shift < 0) | ||
| 48 | delta >>= -shift; | ||
| 49 | else | ||
| 50 | delta <<= shift; | ||
| 51 | |||
| 52 | #ifdef __i386__ | ||
| 53 | __asm__ ( | ||
| 54 | "mul %5 ; " | ||
| 55 | "mov %4,%%eax ; " | ||
| 56 | "mov %%edx,%4 ; " | ||
| 57 | "mul %5 ; " | ||
| 58 | "xor %5,%5 ; " | ||
| 59 | "add %4,%%eax ; " | ||
| 60 | "adc %5,%%edx ; " | ||
| 61 | : "=A" (product), "=r" (tmp1), "=r" (tmp2) | ||
| 62 | : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); | ||
| 63 | #elif __x86_64__ | ||
| 64 | __asm__ ( | ||
| 65 | "mul %%rdx ; shrd $32,%%rdx,%%rax" | ||
| 66 | : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); | ||
| 67 | #else | ||
| 68 | #error implement me! | ||
| 69 | #endif | ||
| 70 | |||
| 71 | return product; | ||
| 72 | } | ||
| 73 | |||
| 74 | static u64 pvclock_get_nsec_offset(struct pvclock_shadow_time *shadow) | ||
| 75 | { | ||
| 76 | u64 delta = native_read_tsc() - shadow->tsc_timestamp; | ||
| 77 | return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift); | ||
| 78 | } | ||
| 79 | |||
| 80 | /* | ||
| 81 | * Reads a consistent set of time-base values from hypervisor, | ||
| 82 | * into a shadow data area. | ||
| 83 | */ | ||
| 84 | static unsigned pvclock_get_time_values(struct pvclock_shadow_time *dst, | ||
| 85 | struct pvclock_vcpu_time_info *src) | ||
| 86 | { | ||
| 87 | do { | ||
| 88 | dst->version = src->version; | ||
| 89 | rmb(); /* fetch version before data */ | ||
| 90 | dst->tsc_timestamp = src->tsc_timestamp; | ||
| 91 | dst->system_timestamp = src->system_time; | ||
| 92 | dst->tsc_to_nsec_mul = src->tsc_to_system_mul; | ||
| 93 | dst->tsc_shift = src->tsc_shift; | ||
| 94 | rmb(); /* test version after fetching data */ | ||
| 95 | } while ((src->version & 1) || (dst->version != src->version)); | ||
| 96 | |||
| 97 | return dst->version; | ||
| 98 | } | ||
| 99 | |||
| 100 | cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) | ||
| 101 | { | ||
| 102 | struct pvclock_shadow_time shadow; | ||
| 103 | unsigned version; | ||
| 104 | cycle_t ret, offset; | ||
| 105 | |||
| 106 | do { | ||
| 107 | version = pvclock_get_time_values(&shadow, src); | ||
| 108 | barrier(); | ||
| 109 | offset = pvclock_get_nsec_offset(&shadow); | ||
| 110 | ret = shadow.system_timestamp + offset; | ||
| 111 | barrier(); | ||
| 112 | } while (version != src->version); | ||
| 113 | |||
| 114 | return ret; | ||
| 115 | } | ||
| 116 | |||
| 117 | void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock, | ||
| 118 | struct pvclock_vcpu_time_info *vcpu_time, | ||
| 119 | struct timespec *ts) | ||
| 120 | { | ||
| 121 | u32 version; | ||
| 122 | u64 delta; | ||
| 123 | struct timespec now; | ||
| 124 | |||
| 125 | /* get wallclock at system boot */ | ||
| 126 | do { | ||
| 127 | version = wall_clock->version; | ||
| 128 | rmb(); /* fetch version before time */ | ||
| 129 | now.tv_sec = wall_clock->sec; | ||
| 130 | now.tv_nsec = wall_clock->nsec; | ||
| 131 | rmb(); /* fetch time before checking version */ | ||
| 132 | } while ((wall_clock->version & 1) || (version != wall_clock->version)); | ||
| 133 | |||
| 134 | delta = pvclock_clocksource_read(vcpu_time); /* time since system boot */ | ||
| 135 | delta += now.tv_sec * (u64)NSEC_PER_SEC + now.tv_nsec; | ||
| 136 | |||
| 137 | now.tv_nsec = do_div(delta, NSEC_PER_SEC); | ||
| 138 | now.tv_sec = delta; | ||
| 139 | |||
| 140 | set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); | ||
| 141 | } | ||
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 2c5f8b213e86..5a2f8e063887 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
| @@ -532,10 +532,16 @@ static void __init reserve_crashkernel(void) | |||
| 532 | (unsigned long)(crash_size >> 20), | 532 | (unsigned long)(crash_size >> 20), |
| 533 | (unsigned long)(crash_base >> 20), | 533 | (unsigned long)(crash_base >> 20), |
| 534 | (unsigned long)(total_mem >> 20)); | 534 | (unsigned long)(total_mem >> 20)); |
| 535 | |||
| 536 | if (reserve_bootmem(crash_base, crash_size, | ||
| 537 | BOOTMEM_EXCLUSIVE) < 0) { | ||
| 538 | printk(KERN_INFO "crashkernel reservation " | ||
| 539 | "failed - memory is in use\n"); | ||
| 540 | return; | ||
| 541 | } | ||
| 542 | |||
| 535 | crashk_res.start = crash_base; | 543 | crashk_res.start = crash_base; |
| 536 | crashk_res.end = crash_base + crash_size - 1; | 544 | crashk_res.end = crash_base + crash_size - 1; |
| 537 | reserve_bootmem(crash_base, crash_size, | ||
| 538 | BOOTMEM_DEFAULT); | ||
| 539 | } else | 545 | } else |
| 540 | printk(KERN_INFO "crashkernel reservation failed - " | 546 | printk(KERN_INFO "crashkernel reservation failed - " |
| 541 | "you have to specify a base address\n"); | 547 | "you have to specify a base address\n"); |
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index 068759db63dd..65b70637ad97 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
| @@ -14,7 +14,10 @@ | |||
| 14 | 14 | ||
| 15 | #include "mach_timer.h" | 15 | #include "mach_timer.h" |
| 16 | 16 | ||
| 17 | static int tsc_disabled; | 17 | /* native_sched_clock() is called before tsc_init(), so |
| 18 | we must start with the TSC soft disabled to prevent | ||
| 19 | erroneous rdtsc usage on !cpu_has_tsc processors */ | ||
| 20 | static int tsc_disabled = -1; | ||
| 18 | 21 | ||
| 19 | /* | 22 | /* |
| 20 | * On some systems the TSC frequency does not | 23 | * On some systems the TSC frequency does not |
| @@ -402,25 +405,20 @@ void __init tsc_init(void) | |||
| 402 | { | 405 | { |
| 403 | int cpu; | 406 | int cpu; |
| 404 | 407 | ||
| 405 | if (!cpu_has_tsc || tsc_disabled) { | 408 | if (!cpu_has_tsc || tsc_disabled > 0) |
| 406 | /* Disable the TSC in case of !cpu_has_tsc */ | ||
| 407 | tsc_disabled = 1; | ||
| 408 | return; | 409 | return; |
| 409 | } | ||
| 410 | 410 | ||
| 411 | cpu_khz = calculate_cpu_khz(); | 411 | cpu_khz = calculate_cpu_khz(); |
| 412 | tsc_khz = cpu_khz; | 412 | tsc_khz = cpu_khz; |
| 413 | 413 | ||
| 414 | if (!cpu_khz) { | 414 | if (!cpu_khz) { |
| 415 | mark_tsc_unstable("could not calculate TSC khz"); | 415 | mark_tsc_unstable("could not calculate TSC khz"); |
| 416 | /* | ||
| 417 | * We need to disable the TSC completely in this case | ||
| 418 | * to prevent sched_clock() from using it. | ||
| 419 | */ | ||
| 420 | tsc_disabled = 1; | ||
| 421 | return; | 416 | return; |
| 422 | } | 417 | } |
| 423 | 418 | ||
| 419 | /* now allow native_sched_clock() to use rdtsc */ | ||
| 420 | tsc_disabled = 0; | ||
| 421 | |||
| 424 | printk("Detected %lu.%03lu MHz processor.\n", | 422 | printk("Detected %lu.%03lu MHz processor.\n", |
| 425 | (unsigned long)cpu_khz / 1000, | 423 | (unsigned long)cpu_khz / 1000, |
| 426 | (unsigned long)cpu_khz % 1000); | 424 | (unsigned long)cpu_khz % 1000); |
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index f2f5d260874e..3829aa7b663f 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
| @@ -200,9 +200,12 @@ int __pit_timer_fn(struct kvm_kpit_state *ps) | |||
| 200 | 200 | ||
| 201 | atomic_inc(&pt->pending); | 201 | atomic_inc(&pt->pending); |
| 202 | smp_mb__after_atomic_inc(); | 202 | smp_mb__after_atomic_inc(); |
| 203 | if (vcpu0 && waitqueue_active(&vcpu0->wq)) { | 203 | if (vcpu0) { |
| 204 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; | 204 | set_bit(KVM_REQ_PENDING_TIMER, &vcpu0->requests); |
| 205 | wake_up_interruptible(&vcpu0->wq); | 205 | if (waitqueue_active(&vcpu0->wq)) { |
| 206 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; | ||
| 207 | wake_up_interruptible(&vcpu0->wq); | ||
| 208 | } | ||
| 206 | } | 209 | } |
| 207 | 210 | ||
| 208 | pt->timer.expires = ktime_add_ns(pt->timer.expires, pt->period); | 211 | pt->timer.expires = ktime_add_ns(pt->timer.expires, pt->period); |
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index c297c50eba63..ebc03f5ae162 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c | |||
| @@ -940,6 +940,7 @@ static int __apic_timer_fn(struct kvm_lapic *apic) | |||
| 940 | wait_queue_head_t *q = &apic->vcpu->wq; | 940 | wait_queue_head_t *q = &apic->vcpu->wq; |
| 941 | 941 | ||
| 942 | atomic_inc(&apic->timer.pending); | 942 | atomic_inc(&apic->timer.pending); |
| 943 | set_bit(KVM_REQ_PENDING_TIMER, &apic->vcpu->requests); | ||
| 943 | if (waitqueue_active(q)) { | 944 | if (waitqueue_active(q)) { |
| 944 | apic->vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; | 945 | apic->vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; |
| 945 | wake_up_interruptible(q); | 946 | wake_up_interruptible(q); |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index ee3f53098f0c..7e7c3969f7a2 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
| @@ -640,6 +640,7 @@ static void rmap_write_protect(struct kvm *kvm, u64 gfn) | |||
| 640 | rmap_remove(kvm, spte); | 640 | rmap_remove(kvm, spte); |
| 641 | --kvm->stat.lpages; | 641 | --kvm->stat.lpages; |
| 642 | set_shadow_pte(spte, shadow_trap_nonpresent_pte); | 642 | set_shadow_pte(spte, shadow_trap_nonpresent_pte); |
| 643 | spte = NULL; | ||
| 643 | write_protected = 1; | 644 | write_protected = 1; |
| 644 | } | 645 | } |
| 645 | spte = rmap_next(kvm, rmapp, spte); | 646 | spte = rmap_next(kvm, rmapp, spte); |
| @@ -1082,10 +1083,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, | |||
| 1082 | struct kvm_mmu_page *shadow; | 1083 | struct kvm_mmu_page *shadow; |
| 1083 | 1084 | ||
| 1084 | spte |= PT_WRITABLE_MASK; | 1085 | spte |= PT_WRITABLE_MASK; |
| 1085 | if (user_fault) { | ||
| 1086 | mmu_unshadow(vcpu->kvm, gfn); | ||
| 1087 | goto unshadowed; | ||
| 1088 | } | ||
| 1089 | 1086 | ||
| 1090 | shadow = kvm_mmu_lookup_page(vcpu->kvm, gfn); | 1087 | shadow = kvm_mmu_lookup_page(vcpu->kvm, gfn); |
| 1091 | if (shadow || | 1088 | if (shadow || |
| @@ -1102,8 +1099,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, | |||
| 1102 | } | 1099 | } |
| 1103 | } | 1100 | } |
| 1104 | 1101 | ||
| 1105 | unshadowed: | ||
| 1106 | |||
| 1107 | if (pte_access & ACC_WRITE_MASK) | 1102 | if (pte_access & ACC_WRITE_MASK) |
| 1108 | mark_page_dirty(vcpu->kvm, gfn); | 1103 | mark_page_dirty(vcpu->kvm, gfn); |
| 1109 | 1104 | ||
| @@ -1580,11 +1575,13 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu, | |||
| 1580 | u64 *spte, | 1575 | u64 *spte, |
| 1581 | const void *new) | 1576 | const void *new) |
| 1582 | { | 1577 | { |
| 1583 | if ((sp->role.level != PT_PAGE_TABLE_LEVEL) | 1578 | if (sp->role.level != PT_PAGE_TABLE_LEVEL) { |
| 1584 | && !vcpu->arch.update_pte.largepage) { | 1579 | if (!vcpu->arch.update_pte.largepage || |
| 1585 | ++vcpu->kvm->stat.mmu_pde_zapped; | 1580 | sp->role.glevels == PT32_ROOT_LEVEL) { |
| 1586 | return; | 1581 | ++vcpu->kvm->stat.mmu_pde_zapped; |
| 1587 | } | 1582 | return; |
| 1583 | } | ||
| 1584 | } | ||
| 1588 | 1585 | ||
| 1589 | ++vcpu->kvm->stat.mmu_pte_updated; | 1586 | ++vcpu->kvm->stat.mmu_pte_updated; |
| 1590 | if (sp->role.glevels == PT32_ROOT_LEVEL) | 1587 | if (sp->role.glevels == PT32_ROOT_LEVEL) |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 02efbe75f317..540e95179074 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -566,7 +566,7 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu) | |||
| 566 | load_transition_efer(vmx); | 566 | load_transition_efer(vmx); |
| 567 | } | 567 | } |
| 568 | 568 | ||
| 569 | static void vmx_load_host_state(struct vcpu_vmx *vmx) | 569 | static void __vmx_load_host_state(struct vcpu_vmx *vmx) |
| 570 | { | 570 | { |
| 571 | unsigned long flags; | 571 | unsigned long flags; |
| 572 | 572 | ||
| @@ -596,6 +596,13 @@ static void vmx_load_host_state(struct vcpu_vmx *vmx) | |||
| 596 | reload_host_efer(vmx); | 596 | reload_host_efer(vmx); |
| 597 | } | 597 | } |
| 598 | 598 | ||
| 599 | static void vmx_load_host_state(struct vcpu_vmx *vmx) | ||
| 600 | { | ||
| 601 | preempt_disable(); | ||
| 602 | __vmx_load_host_state(vmx); | ||
| 603 | preempt_enable(); | ||
| 604 | } | ||
| 605 | |||
| 599 | /* | 606 | /* |
| 600 | * Switches to specified vcpu, until a matching vcpu_put(), but assumes | 607 | * Switches to specified vcpu, until a matching vcpu_put(), but assumes |
| 601 | * vcpu mutex is already taken. | 608 | * vcpu mutex is already taken. |
| @@ -654,7 +661,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
| 654 | 661 | ||
| 655 | static void vmx_vcpu_put(struct kvm_vcpu *vcpu) | 662 | static void vmx_vcpu_put(struct kvm_vcpu *vcpu) |
| 656 | { | 663 | { |
| 657 | vmx_load_host_state(to_vmx(vcpu)); | 664 | __vmx_load_host_state(to_vmx(vcpu)); |
| 658 | } | 665 | } |
| 659 | 666 | ||
| 660 | static void vmx_fpu_activate(struct kvm_vcpu *vcpu) | 667 | static void vmx_fpu_activate(struct kvm_vcpu *vcpu) |
| @@ -884,11 +891,8 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) | |||
| 884 | switch (msr_index) { | 891 | switch (msr_index) { |
| 885 | #ifdef CONFIG_X86_64 | 892 | #ifdef CONFIG_X86_64 |
| 886 | case MSR_EFER: | 893 | case MSR_EFER: |
| 894 | vmx_load_host_state(vmx); | ||
| 887 | ret = kvm_set_msr_common(vcpu, msr_index, data); | 895 | ret = kvm_set_msr_common(vcpu, msr_index, data); |
| 888 | if (vmx->host_state.loaded) { | ||
| 889 | reload_host_efer(vmx); | ||
| 890 | load_transition_efer(vmx); | ||
| 891 | } | ||
| 892 | break; | 896 | break; |
| 893 | case MSR_FS_BASE: | 897 | case MSR_FS_BASE: |
| 894 | vmcs_writel(GUEST_FS_BASE, data); | 898 | vmcs_writel(GUEST_FS_BASE, data); |
| @@ -910,11 +914,10 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) | |||
| 910 | guest_write_tsc(data); | 914 | guest_write_tsc(data); |
| 911 | break; | 915 | break; |
| 912 | default: | 916 | default: |
| 917 | vmx_load_host_state(vmx); | ||
| 913 | msr = find_msr_entry(vmx, msr_index); | 918 | msr = find_msr_entry(vmx, msr_index); |
| 914 | if (msr) { | 919 | if (msr) { |
| 915 | msr->data = data; | 920 | msr->data = data; |
| 916 | if (vmx->host_state.loaded) | ||
| 917 | load_msrs(vmx->guest_msrs, vmx->save_nmsrs); | ||
| 918 | break; | 921 | break; |
| 919 | } | 922 | } |
| 920 | ret = kvm_set_msr_common(vcpu, msr_index, data); | 923 | ret = kvm_set_msr_common(vcpu, msr_index, data); |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 00acf1301a15..63a77caa59f1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -492,8 +492,8 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data) | |||
| 492 | static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | 492 | static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) |
| 493 | { | 493 | { |
| 494 | static int version; | 494 | static int version; |
| 495 | struct kvm_wall_clock wc; | 495 | struct pvclock_wall_clock wc; |
| 496 | struct timespec wc_ts; | 496 | struct timespec now, sys, boot; |
| 497 | 497 | ||
| 498 | if (!wall_clock) | 498 | if (!wall_clock) |
| 499 | return; | 499 | return; |
| @@ -502,10 +502,19 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | |||
| 502 | 502 | ||
| 503 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); | 503 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); |
| 504 | 504 | ||
| 505 | wc_ts = current_kernel_time(); | 505 | /* |
| 506 | wc.wc_sec = wc_ts.tv_sec; | 506 | * The guest calculates current wall clock time by adding |
| 507 | wc.wc_nsec = wc_ts.tv_nsec; | 507 | * system time (updated by kvm_write_guest_time below) to the |
| 508 | wc.wc_version = version; | 508 | * wall clock specified here. guest system time equals host |
| 509 | * system time for us, thus we must fill in host boot time here. | ||
| 510 | */ | ||
| 511 | now = current_kernel_time(); | ||
| 512 | ktime_get_ts(&sys); | ||
| 513 | boot = ns_to_timespec(timespec_to_ns(&now) - timespec_to_ns(&sys)); | ||
| 514 | |||
| 515 | wc.sec = boot.tv_sec; | ||
| 516 | wc.nsec = boot.tv_nsec; | ||
| 517 | wc.version = version; | ||
| 509 | 518 | ||
| 510 | kvm_write_guest(kvm, wall_clock, &wc, sizeof(wc)); | 519 | kvm_write_guest(kvm, wall_clock, &wc, sizeof(wc)); |
| 511 | 520 | ||
| @@ -513,6 +522,45 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | |||
| 513 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); | 522 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); |
| 514 | } | 523 | } |
| 515 | 524 | ||
| 525 | static uint32_t div_frac(uint32_t dividend, uint32_t divisor) | ||
| 526 | { | ||
| 527 | uint32_t quotient, remainder; | ||
| 528 | |||
| 529 | /* Don't try to replace with do_div(), this one calculates | ||
| 530 | * "(dividend << 32) / divisor" */ | ||
| 531 | __asm__ ( "divl %4" | ||
| 532 | : "=a" (quotient), "=d" (remainder) | ||
| 533 | : "0" (0), "1" (dividend), "r" (divisor) ); | ||
| 534 | return quotient; | ||
| 535 | } | ||
| 536 | |||
| 537 | static void kvm_set_time_scale(uint32_t tsc_khz, struct pvclock_vcpu_time_info *hv_clock) | ||
| 538 | { | ||
| 539 | uint64_t nsecs = 1000000000LL; | ||
| 540 | int32_t shift = 0; | ||
| 541 | uint64_t tps64; | ||
| 542 | uint32_t tps32; | ||
| 543 | |||
| 544 | tps64 = tsc_khz * 1000LL; | ||
| 545 | while (tps64 > nsecs*2) { | ||
| 546 | tps64 >>= 1; | ||
| 547 | shift--; | ||
| 548 | } | ||
| 549 | |||
| 550 | tps32 = (uint32_t)tps64; | ||
| 551 | while (tps32 <= (uint32_t)nsecs) { | ||
| 552 | tps32 <<= 1; | ||
| 553 | shift++; | ||
| 554 | } | ||
| 555 | |||
| 556 | hv_clock->tsc_shift = shift; | ||
| 557 | hv_clock->tsc_to_system_mul = div_frac(nsecs, tps32); | ||
| 558 | |||
| 559 | pr_debug("%s: tsc_khz %u, tsc_shift %d, tsc_mul %u\n", | ||
| 560 | __FUNCTION__, tsc_khz, hv_clock->tsc_shift, | ||
| 561 | hv_clock->tsc_to_system_mul); | ||
| 562 | } | ||
| 563 | |||
| 516 | static void kvm_write_guest_time(struct kvm_vcpu *v) | 564 | static void kvm_write_guest_time(struct kvm_vcpu *v) |
| 517 | { | 565 | { |
| 518 | struct timespec ts; | 566 | struct timespec ts; |
| @@ -523,6 +571,11 @@ static void kvm_write_guest_time(struct kvm_vcpu *v) | |||
| 523 | if ((!vcpu->time_page)) | 571 | if ((!vcpu->time_page)) |
| 524 | return; | 572 | return; |
| 525 | 573 | ||
| 574 | if (unlikely(vcpu->hv_clock_tsc_khz != tsc_khz)) { | ||
| 575 | kvm_set_time_scale(tsc_khz, &vcpu->hv_clock); | ||
| 576 | vcpu->hv_clock_tsc_khz = tsc_khz; | ||
| 577 | } | ||
| 578 | |||
| 526 | /* Keep irq disabled to prevent changes to the clock */ | 579 | /* Keep irq disabled to prevent changes to the clock */ |
| 527 | local_irq_save(flags); | 580 | local_irq_save(flags); |
| 528 | kvm_get_msr(v, MSR_IA32_TIME_STAMP_COUNTER, | 581 | kvm_get_msr(v, MSR_IA32_TIME_STAMP_COUNTER, |
| @@ -537,14 +590,14 @@ static void kvm_write_guest_time(struct kvm_vcpu *v) | |||
| 537 | /* | 590 | /* |
| 538 | * The interface expects us to write an even number signaling that the | 591 | * The interface expects us to write an even number signaling that the |
| 539 | * update is finished. Since the guest won't see the intermediate | 592 | * update is finished. Since the guest won't see the intermediate |
| 540 | * state, we just write "2" at the end | 593 | * state, we just increase by 2 at the end. |
| 541 | */ | 594 | */ |
| 542 | vcpu->hv_clock.version = 2; | 595 | vcpu->hv_clock.version += 2; |
| 543 | 596 | ||
| 544 | shared_kaddr = kmap_atomic(vcpu->time_page, KM_USER0); | 597 | shared_kaddr = kmap_atomic(vcpu->time_page, KM_USER0); |
| 545 | 598 | ||
| 546 | memcpy(shared_kaddr + vcpu->time_offset, &vcpu->hv_clock, | 599 | memcpy(shared_kaddr + vcpu->time_offset, &vcpu->hv_clock, |
| 547 | sizeof(vcpu->hv_clock)); | 600 | sizeof(vcpu->hv_clock)); |
| 548 | 601 | ||
| 549 | kunmap_atomic(shared_kaddr, KM_USER0); | 602 | kunmap_atomic(shared_kaddr, KM_USER0); |
| 550 | 603 | ||
| @@ -599,10 +652,6 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data) | |||
| 599 | /* ...but clean it before doing the actual write */ | 652 | /* ...but clean it before doing the actual write */ |
| 600 | vcpu->arch.time_offset = data & ~(PAGE_MASK | 1); | 653 | vcpu->arch.time_offset = data & ~(PAGE_MASK | 1); |
| 601 | 654 | ||
| 602 | vcpu->arch.hv_clock.tsc_to_system_mul = | ||
| 603 | clocksource_khz2mult(tsc_khz, 22); | ||
| 604 | vcpu->arch.hv_clock.tsc_shift = 22; | ||
| 605 | |||
| 606 | down_read(¤t->mm->mmap_sem); | 655 | down_read(¤t->mm->mmap_sem); |
| 607 | vcpu->arch.time_page = | 656 | vcpu->arch.time_page = |
| 608 | gfn_to_page(vcpu->kvm, data >> PAGE_SHIFT); | 657 | gfn_to_page(vcpu->kvm, data >> PAGE_SHIFT); |
| @@ -2759,6 +2808,8 @@ again: | |||
| 2759 | if (vcpu->requests) { | 2808 | if (vcpu->requests) { |
| 2760 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) | 2809 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) |
| 2761 | __kvm_migrate_timers(vcpu); | 2810 | __kvm_migrate_timers(vcpu); |
| 2811 | if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests)) | ||
| 2812 | kvm_x86_ops->tlb_flush(vcpu); | ||
| 2762 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, | 2813 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, |
| 2763 | &vcpu->requests)) { | 2814 | &vcpu->requests)) { |
| 2764 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; | 2815 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; |
| @@ -2772,6 +2823,7 @@ again: | |||
| 2772 | } | 2823 | } |
| 2773 | } | 2824 | } |
| 2774 | 2825 | ||
| 2826 | clear_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests); | ||
| 2775 | kvm_inject_pending_timer_irqs(vcpu); | 2827 | kvm_inject_pending_timer_irqs(vcpu); |
| 2776 | 2828 | ||
| 2777 | preempt_disable(); | 2829 | preempt_disable(); |
| @@ -2781,21 +2833,13 @@ again: | |||
| 2781 | 2833 | ||
| 2782 | local_irq_disable(); | 2834 | local_irq_disable(); |
| 2783 | 2835 | ||
| 2784 | if (need_resched()) { | 2836 | if (vcpu->requests || need_resched()) { |
| 2785 | local_irq_enable(); | 2837 | local_irq_enable(); |
| 2786 | preempt_enable(); | 2838 | preempt_enable(); |
| 2787 | r = 1; | 2839 | r = 1; |
| 2788 | goto out; | 2840 | goto out; |
| 2789 | } | 2841 | } |
| 2790 | 2842 | ||
| 2791 | if (vcpu->requests) | ||
| 2792 | if (test_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests)) { | ||
| 2793 | local_irq_enable(); | ||
| 2794 | preempt_enable(); | ||
| 2795 | r = 1; | ||
| 2796 | goto out; | ||
| 2797 | } | ||
| 2798 | |||
| 2799 | if (signal_pending(current)) { | 2843 | if (signal_pending(current)) { |
| 2800 | local_irq_enable(); | 2844 | local_irq_enable(); |
| 2801 | preempt_enable(); | 2845 | preempt_enable(); |
| @@ -2825,9 +2869,6 @@ again: | |||
| 2825 | 2869 | ||
| 2826 | kvm_guest_enter(); | 2870 | kvm_guest_enter(); |
| 2827 | 2871 | ||
| 2828 | if (vcpu->requests) | ||
| 2829 | if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests)) | ||
| 2830 | kvm_x86_ops->tlb_flush(vcpu); | ||
| 2831 | 2872 | ||
| 2832 | KVMTRACE_0D(VMENTRY, vcpu, entryexit); | 2873 | KVMTRACE_0D(VMENTRY, vcpu, entryexit); |
| 2833 | kvm_x86_ops->run(vcpu, kvm_run); | 2874 | kvm_x86_ops->run(vcpu, kvm_run); |
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index 70bebd310408..ee1c3f635157 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S | |||
| @@ -217,19 +217,19 @@ ENTRY(copy_user_generic_unrolled) | |||
| 217 | /* table sorted by exception address */ | 217 | /* table sorted by exception address */ |
| 218 | .section __ex_table,"a" | 218 | .section __ex_table,"a" |
| 219 | .align 8 | 219 | .align 8 |
| 220 | .quad .Ls1,.Ls1e | 220 | .quad .Ls1,.Ls1e /* Ls1-Ls4 have copied zero bytes */ |
| 221 | .quad .Ls2,.Ls2e | 221 | .quad .Ls2,.Ls1e |
| 222 | .quad .Ls3,.Ls3e | 222 | .quad .Ls3,.Ls1e |
| 223 | .quad .Ls4,.Ls4e | 223 | .quad .Ls4,.Ls1e |
| 224 | .quad .Ld1,.Ls1e | 224 | .quad .Ld1,.Ls1e /* Ld1-Ld4 have copied 0-24 bytes */ |
| 225 | .quad .Ld2,.Ls2e | 225 | .quad .Ld2,.Ls2e |
| 226 | .quad .Ld3,.Ls3e | 226 | .quad .Ld3,.Ls3e |
| 227 | .quad .Ld4,.Ls4e | 227 | .quad .Ld4,.Ls4e |
| 228 | .quad .Ls5,.Ls5e | 228 | .quad .Ls5,.Ls5e /* Ls5-Ls8 have copied 32 bytes */ |
| 229 | .quad .Ls6,.Ls6e | 229 | .quad .Ls6,.Ls5e |
| 230 | .quad .Ls7,.Ls7e | 230 | .quad .Ls7,.Ls5e |
| 231 | .quad .Ls8,.Ls8e | 231 | .quad .Ls8,.Ls5e |
| 232 | .quad .Ld5,.Ls5e | 232 | .quad .Ld5,.Ls5e /* Ld5-Ld8 have copied 32-56 bytes */ |
| 233 | .quad .Ld6,.Ls6e | 233 | .quad .Ld6,.Ls6e |
| 234 | .quad .Ld7,.Ls7e | 234 | .quad .Ld7,.Ls7e |
| 235 | .quad .Ld8,.Ls8e | 235 | .quad .Ld8,.Ls8e |
| @@ -244,11 +244,8 @@ ENTRY(copy_user_generic_unrolled) | |||
| 244 | .quad .Le5,.Le_zero | 244 | .quad .Le5,.Le_zero |
| 245 | .previous | 245 | .previous |
| 246 | 246 | ||
| 247 | /* compute 64-offset for main loop. 8 bytes accuracy with error on the | ||
| 248 | pessimistic side. this is gross. it would be better to fix the | ||
| 249 | interface. */ | ||
| 250 | /* eax: zero, ebx: 64 */ | 247 | /* eax: zero, ebx: 64 */ |
| 251 | .Ls1e: addl $8,%eax | 248 | .Ls1e: addl $8,%eax /* eax is bytes left uncopied within the loop (Ls1e: 64 .. Ls8e: 8) */ |
| 252 | .Ls2e: addl $8,%eax | 249 | .Ls2e: addl $8,%eax |
| 253 | .Ls3e: addl $8,%eax | 250 | .Ls3e: addl $8,%eax |
| 254 | .Ls4e: addl $8,%eax | 251 | .Ls4e: addl $8,%eax |
diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S index 5196762b3b0e..9d3d1ab83763 100644 --- a/arch/x86/lib/copy_user_nocache_64.S +++ b/arch/x86/lib/copy_user_nocache_64.S | |||
| @@ -145,19 +145,19 @@ ENTRY(__copy_user_nocache) | |||
| 145 | /* table sorted by exception address */ | 145 | /* table sorted by exception address */ |
| 146 | .section __ex_table,"a" | 146 | .section __ex_table,"a" |
| 147 | .align 8 | 147 | .align 8 |
| 148 | .quad .Ls1,.Ls1e | 148 | .quad .Ls1,.Ls1e /* .Ls[1-4] - 0 bytes copied */ |
| 149 | .quad .Ls2,.Ls2e | 149 | .quad .Ls2,.Ls1e |
| 150 | .quad .Ls3,.Ls3e | 150 | .quad .Ls3,.Ls1e |
| 151 | .quad .Ls4,.Ls4e | 151 | .quad .Ls4,.Ls1e |
| 152 | .quad .Ld1,.Ls1e | 152 | .quad .Ld1,.Ls1e /* .Ld[1-4] - 0..24 bytes coped */ |
| 153 | .quad .Ld2,.Ls2e | 153 | .quad .Ld2,.Ls2e |
| 154 | .quad .Ld3,.Ls3e | 154 | .quad .Ld3,.Ls3e |
| 155 | .quad .Ld4,.Ls4e | 155 | .quad .Ld4,.Ls4e |
| 156 | .quad .Ls5,.Ls5e | 156 | .quad .Ls5,.Ls5e /* .Ls[5-8] - 32 bytes copied */ |
| 157 | .quad .Ls6,.Ls6e | 157 | .quad .Ls6,.Ls5e |
| 158 | .quad .Ls7,.Ls7e | 158 | .quad .Ls7,.Ls5e |
| 159 | .quad .Ls8,.Ls8e | 159 | .quad .Ls8,.Ls5e |
| 160 | .quad .Ld5,.Ls5e | 160 | .quad .Ld5,.Ls5e /* .Ld[5-8] - 32..56 bytes copied */ |
| 161 | .quad .Ld6,.Ls6e | 161 | .quad .Ld6,.Ls6e |
| 162 | .quad .Ld7,.Ls7e | 162 | .quad .Ld7,.Ls7e |
| 163 | .quad .Ld8,.Ls8e | 163 | .quad .Ld8,.Ls8e |
| @@ -172,11 +172,8 @@ ENTRY(__copy_user_nocache) | |||
| 172 | .quad .Le5,.Le_zero | 172 | .quad .Le5,.Le_zero |
| 173 | .previous | 173 | .previous |
| 174 | 174 | ||
| 175 | /* compute 64-offset for main loop. 8 bytes accuracy with error on the | ||
| 176 | pessimistic side. this is gross. it would be better to fix the | ||
| 177 | interface. */ | ||
| 178 | /* eax: zero, ebx: 64 */ | 175 | /* eax: zero, ebx: 64 */ |
| 179 | .Ls1e: addl $8,%eax | 176 | .Ls1e: addl $8,%eax /* eax: bytes left uncopied: Ls1e: 64 .. Ls8e: 8 */ |
| 180 | .Ls2e: addl $8,%eax | 177 | .Ls2e: addl $8,%eax |
| 181 | .Ls3e: addl $8,%eax | 178 | .Ls3e: addl $8,%eax |
| 182 | .Ls4e: addl $8,%eax | 179 | .Ls4e: addl $8,%eax |
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 2e641be2737e..6c388e593bc8 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig | |||
| @@ -5,8 +5,9 @@ | |||
| 5 | config XEN | 5 | config XEN |
| 6 | bool "Xen guest support" | 6 | bool "Xen guest support" |
| 7 | select PARAVIRT | 7 | select PARAVIRT |
| 8 | select PARAVIRT_CLOCK | ||
| 8 | depends on X86_32 | 9 | depends on X86_32 |
| 9 | depends on X86_CMPXCHG && X86_TSC && !(X86_VISWS || X86_VOYAGER) | 10 | depends on X86_CMPXCHG && X86_TSC && X86_PAE && !(X86_VISWS || X86_VOYAGER) |
| 10 | help | 11 | help |
| 11 | This is the Linux Xen port. Enabling this will allow the | 12 | This is the Linux Xen port. Enabling this will allow the |
| 12 | kernel to boot in a paravirtualized environment under the | 13 | kernel to boot in a paravirtualized environment under the |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index c8a56e457d61..f09c1c69c37a 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
| @@ -785,38 +785,35 @@ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) | |||
| 785 | static __init void xen_pagetable_setup_start(pgd_t *base) | 785 | static __init void xen_pagetable_setup_start(pgd_t *base) |
| 786 | { | 786 | { |
| 787 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; | 787 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; |
| 788 | int i; | ||
| 788 | 789 | ||
| 789 | /* special set_pte for pagetable initialization */ | 790 | /* special set_pte for pagetable initialization */ |
| 790 | pv_mmu_ops.set_pte = xen_set_pte_init; | 791 | pv_mmu_ops.set_pte = xen_set_pte_init; |
| 791 | 792 | ||
| 792 | init_mm.pgd = base; | 793 | init_mm.pgd = base; |
| 793 | /* | 794 | /* |
| 794 | * copy top-level of Xen-supplied pagetable into place. For | 795 | * copy top-level of Xen-supplied pagetable into place. This |
| 795 | * !PAE we can use this as-is, but for PAE it is a stand-in | 796 | * is a stand-in while we copy the pmd pages. |
| 796 | * while we copy the pmd pages. | ||
| 797 | */ | 797 | */ |
| 798 | memcpy(base, xen_pgd, PTRS_PER_PGD * sizeof(pgd_t)); | 798 | memcpy(base, xen_pgd, PTRS_PER_PGD * sizeof(pgd_t)); |
| 799 | 799 | ||
| 800 | if (PTRS_PER_PMD > 1) { | 800 | /* |
| 801 | int i; | 801 | * For PAE, need to allocate new pmds, rather than |
| 802 | /* | 802 | * share Xen's, since Xen doesn't like pmd's being |
| 803 | * For PAE, need to allocate new pmds, rather than | 803 | * shared between address spaces. |
| 804 | * share Xen's, since Xen doesn't like pmd's being | 804 | */ |
| 805 | * shared between address spaces. | 805 | for (i = 0; i < PTRS_PER_PGD; i++) { |
| 806 | */ | 806 | if (pgd_val_ma(xen_pgd[i]) & _PAGE_PRESENT) { |
| 807 | for (i = 0; i < PTRS_PER_PGD; i++) { | 807 | pmd_t *pmd = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); |
| 808 | if (pgd_val_ma(xen_pgd[i]) & _PAGE_PRESENT) { | ||
| 809 | pmd_t *pmd = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); | ||
| 810 | 808 | ||
| 811 | memcpy(pmd, (void *)pgd_page_vaddr(xen_pgd[i]), | 809 | memcpy(pmd, (void *)pgd_page_vaddr(xen_pgd[i]), |
| 812 | PAGE_SIZE); | 810 | PAGE_SIZE); |
| 813 | 811 | ||
| 814 | make_lowmem_page_readonly(pmd); | 812 | make_lowmem_page_readonly(pmd); |
| 815 | 813 | ||
| 816 | set_pgd(&base[i], __pgd(1 + __pa(pmd))); | 814 | set_pgd(&base[i], __pgd(1 + __pa(pmd))); |
| 817 | } else | 815 | } else |
| 818 | pgd_clear(&base[i]); | 816 | pgd_clear(&base[i]); |
| 819 | } | ||
| 820 | } | 817 | } |
| 821 | 818 | ||
| 822 | /* make sure zero_page is mapped RO so we can use it in pagetables */ | 819 | /* make sure zero_page is mapped RO so we can use it in pagetables */ |
| @@ -873,17 +870,7 @@ static __init void xen_pagetable_setup_done(pgd_t *base) | |||
| 873 | 870 | ||
| 874 | /* Actually pin the pagetable down, but we can't set PG_pinned | 871 | /* Actually pin the pagetable down, but we can't set PG_pinned |
| 875 | yet because the page structures don't exist yet. */ | 872 | yet because the page structures don't exist yet. */ |
| 876 | { | 873 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); |
| 877 | unsigned level; | ||
| 878 | |||
| 879 | #ifdef CONFIG_X86_PAE | ||
| 880 | level = MMUEXT_PIN_L3_TABLE; | ||
| 881 | #else | ||
| 882 | level = MMUEXT_PIN_L2_TABLE; | ||
| 883 | #endif | ||
| 884 | |||
| 885 | pin_pagetable_pfn(level, PFN_DOWN(__pa(base))); | ||
| 886 | } | ||
| 887 | } | 874 | } |
| 888 | 875 | ||
| 889 | /* This is called once we have the cpu_possible_map */ | 876 | /* This is called once we have the cpu_possible_map */ |
| @@ -1093,7 +1080,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
| 1093 | .make_pte = xen_make_pte, | 1080 | .make_pte = xen_make_pte, |
| 1094 | .make_pgd = xen_make_pgd, | 1081 | .make_pgd = xen_make_pgd, |
| 1095 | 1082 | ||
| 1096 | #ifdef CONFIG_X86_PAE | ||
| 1097 | .set_pte_atomic = xen_set_pte_atomic, | 1083 | .set_pte_atomic = xen_set_pte_atomic, |
| 1098 | .set_pte_present = xen_set_pte_at, | 1084 | .set_pte_present = xen_set_pte_at, |
| 1099 | .set_pud = xen_set_pud, | 1085 | .set_pud = xen_set_pud, |
| @@ -1102,7 +1088,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
| 1102 | 1088 | ||
| 1103 | .make_pmd = xen_make_pmd, | 1089 | .make_pmd = xen_make_pmd, |
| 1104 | .pmd_val = xen_pmd_val, | 1090 | .pmd_val = xen_pmd_val, |
| 1105 | #endif /* PAE */ | ||
| 1106 | 1091 | ||
| 1107 | .activate_mm = xen_activate_mm, | 1092 | .activate_mm = xen_activate_mm, |
| 1108 | .dup_mmap = xen_dup_mmap, | 1093 | .dup_mmap = xen_dup_mmap, |
| @@ -1228,6 +1213,11 @@ asmlinkage void __init xen_start_kernel(void) | |||
| 1228 | if (xen_feature(XENFEAT_supervisor_mode_kernel)) | 1213 | if (xen_feature(XENFEAT_supervisor_mode_kernel)) |
| 1229 | pv_info.kernel_rpl = 0; | 1214 | pv_info.kernel_rpl = 0; |
| 1230 | 1215 | ||
| 1216 | /* Prevent unwanted bits from being set in PTEs. */ | ||
| 1217 | __supported_pte_mask &= ~_PAGE_GLOBAL; | ||
| 1218 | if (!is_initial_xendomain()) | ||
| 1219 | __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD); | ||
| 1220 | |||
| 1231 | /* set the limit of our address space */ | 1221 | /* set the limit of our address space */ |
| 1232 | xen_reserve_top(); | 1222 | xen_reserve_top(); |
| 1233 | 1223 | ||
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 3525ef523a74..df40bf74ea75 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -179,50 +179,56 @@ out: | |||
| 179 | preempt_enable(); | 179 | preempt_enable(); |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | pteval_t xen_pte_val(pte_t pte) | 182 | /* Assume pteval_t is equivalent to all the other *val_t types. */ |
| 183 | static pteval_t pte_mfn_to_pfn(pteval_t val) | ||
| 184 | { | ||
| 185 | if (val & _PAGE_PRESENT) { | ||
| 186 | unsigned long mfn = (val & PTE_MASK) >> PAGE_SHIFT; | ||
| 187 | pteval_t flags = val & ~PTE_MASK; | ||
| 188 | val = (mfn_to_pfn(mfn) << PAGE_SHIFT) | flags; | ||
| 189 | } | ||
| 190 | |||
| 191 | return val; | ||
| 192 | } | ||
| 193 | |||
| 194 | static pteval_t pte_pfn_to_mfn(pteval_t val) | ||
| 183 | { | 195 | { |
| 184 | pteval_t ret = pte.pte; | 196 | if (val & _PAGE_PRESENT) { |
| 197 | unsigned long pfn = (val & PTE_MASK) >> PAGE_SHIFT; | ||
| 198 | pteval_t flags = val & ~PTE_MASK; | ||
| 199 | val = (pfn_to_mfn(pfn) << PAGE_SHIFT) | flags; | ||
| 200 | } | ||
| 185 | 201 | ||
| 186 | if (ret & _PAGE_PRESENT) | 202 | return val; |
| 187 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | 203 | } |
| 188 | 204 | ||
| 189 | return ret; | 205 | pteval_t xen_pte_val(pte_t pte) |
| 206 | { | ||
| 207 | return pte_mfn_to_pfn(pte.pte); | ||
| 190 | } | 208 | } |
| 191 | 209 | ||
| 192 | pgdval_t xen_pgd_val(pgd_t pgd) | 210 | pgdval_t xen_pgd_val(pgd_t pgd) |
| 193 | { | 211 | { |
| 194 | pgdval_t ret = pgd.pgd; | 212 | return pte_mfn_to_pfn(pgd.pgd); |
| 195 | if (ret & _PAGE_PRESENT) | ||
| 196 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | ||
| 197 | return ret; | ||
| 198 | } | 213 | } |
| 199 | 214 | ||
| 200 | pte_t xen_make_pte(pteval_t pte) | 215 | pte_t xen_make_pte(pteval_t pte) |
| 201 | { | 216 | { |
| 202 | if (pte & _PAGE_PRESENT) { | 217 | pte = pte_pfn_to_mfn(pte); |
| 203 | pte = phys_to_machine(XPADDR(pte)).maddr; | 218 | return native_make_pte(pte); |
| 204 | pte &= ~(_PAGE_PCD | _PAGE_PWT); | ||
| 205 | } | ||
| 206 | |||
| 207 | return (pte_t){ .pte = pte }; | ||
| 208 | } | 219 | } |
| 209 | 220 | ||
| 210 | pgd_t xen_make_pgd(pgdval_t pgd) | 221 | pgd_t xen_make_pgd(pgdval_t pgd) |
| 211 | { | 222 | { |
| 212 | if (pgd & _PAGE_PRESENT) | 223 | pgd = pte_pfn_to_mfn(pgd); |
| 213 | pgd = phys_to_machine(XPADDR(pgd)).maddr; | 224 | return native_make_pgd(pgd); |
| 214 | |||
| 215 | return (pgd_t){ pgd }; | ||
| 216 | } | 225 | } |
| 217 | 226 | ||
| 218 | pmdval_t xen_pmd_val(pmd_t pmd) | 227 | pmdval_t xen_pmd_val(pmd_t pmd) |
| 219 | { | 228 | { |
| 220 | pmdval_t ret = native_pmd_val(pmd); | 229 | return pte_mfn_to_pfn(pmd.pmd); |
| 221 | if (ret & _PAGE_PRESENT) | ||
| 222 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | ||
| 223 | return ret; | ||
| 224 | } | 230 | } |
| 225 | #ifdef CONFIG_X86_PAE | 231 | |
| 226 | void xen_set_pud(pud_t *ptr, pud_t val) | 232 | void xen_set_pud(pud_t *ptr, pud_t val) |
| 227 | { | 233 | { |
| 228 | struct multicall_space mcs; | 234 | struct multicall_space mcs; |
| @@ -267,17 +273,9 @@ void xen_pmd_clear(pmd_t *pmdp) | |||
| 267 | 273 | ||
| 268 | pmd_t xen_make_pmd(pmdval_t pmd) | 274 | pmd_t xen_make_pmd(pmdval_t pmd) |
| 269 | { | 275 | { |
| 270 | if (pmd & _PAGE_PRESENT) | 276 | pmd = pte_pfn_to_mfn(pmd); |
| 271 | pmd = phys_to_machine(XPADDR(pmd)).maddr; | ||
| 272 | |||
| 273 | return native_make_pmd(pmd); | 277 | return native_make_pmd(pmd); |
| 274 | } | 278 | } |
| 275 | #else /* !PAE */ | ||
| 276 | void xen_set_pte(pte_t *ptep, pte_t pte) | ||
| 277 | { | ||
| 278 | *ptep = pte; | ||
| 279 | } | ||
| 280 | #endif /* CONFIG_X86_PAE */ | ||
| 281 | 279 | ||
| 282 | /* | 280 | /* |
| 283 | (Yet another) pagetable walker. This one is intended for pinning a | 281 | (Yet another) pagetable walker. This one is intended for pinning a |
| @@ -430,8 +428,6 @@ static int pin_page(struct page *page, enum pt_level level) | |||
| 430 | read-only, and can be pinned. */ | 428 | read-only, and can be pinned. */ |
| 431 | void xen_pgd_pin(pgd_t *pgd) | 429 | void xen_pgd_pin(pgd_t *pgd) |
| 432 | { | 430 | { |
| 433 | unsigned level; | ||
| 434 | |||
| 435 | xen_mc_batch(); | 431 | xen_mc_batch(); |
| 436 | 432 | ||
| 437 | if (pgd_walk(pgd, pin_page, TASK_SIZE)) { | 433 | if (pgd_walk(pgd, pin_page, TASK_SIZE)) { |
| @@ -441,14 +437,7 @@ void xen_pgd_pin(pgd_t *pgd) | |||
| 441 | xen_mc_batch(); | 437 | xen_mc_batch(); |
| 442 | } | 438 | } |
| 443 | 439 | ||
| 444 | #ifdef CONFIG_X86_PAE | 440 | xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd))); |
| 445 | level = MMUEXT_PIN_L3_TABLE; | ||
| 446 | #else | ||
| 447 | level = MMUEXT_PIN_L2_TABLE; | ||
| 448 | #endif | ||
| 449 | |||
| 450 | xen_do_pin(level, PFN_DOWN(__pa(pgd))); | ||
| 451 | |||
| 452 | xen_mc_issue(0); | 441 | xen_mc_issue(0); |
| 453 | } | 442 | } |
| 454 | 443 | ||
diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index b5e189b1519d..5fe961caffd4 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h | |||
| @@ -37,14 +37,13 @@ void xen_exit_mmap(struct mm_struct *mm); | |||
| 37 | void xen_pgd_pin(pgd_t *pgd); | 37 | void xen_pgd_pin(pgd_t *pgd); |
| 38 | //void xen_pgd_unpin(pgd_t *pgd); | 38 | //void xen_pgd_unpin(pgd_t *pgd); |
| 39 | 39 | ||
| 40 | #ifdef CONFIG_X86_PAE | 40 | pteval_t xen_pte_val(pte_t); |
| 41 | unsigned long long xen_pte_val(pte_t); | 41 | pmdval_t xen_pmd_val(pmd_t); |
| 42 | unsigned long long xen_pmd_val(pmd_t); | 42 | pgdval_t xen_pgd_val(pgd_t); |
| 43 | unsigned long long xen_pgd_val(pgd_t); | ||
| 44 | 43 | ||
| 45 | pte_t xen_make_pte(unsigned long long); | 44 | pte_t xen_make_pte(pteval_t); |
| 46 | pmd_t xen_make_pmd(unsigned long long); | 45 | pmd_t xen_make_pmd(pmdval_t); |
| 47 | pgd_t xen_make_pgd(unsigned long long); | 46 | pgd_t xen_make_pgd(pgdval_t); |
| 48 | 47 | ||
| 49 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, | 48 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, |
| 50 | pte_t *ptep, pte_t pteval); | 49 | pte_t *ptep, pte_t pteval); |
| @@ -53,15 +52,4 @@ void xen_set_pud(pud_t *ptr, pud_t val); | |||
| 53 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); | 52 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); |
| 54 | void xen_pmd_clear(pmd_t *pmdp); | 53 | void xen_pmd_clear(pmd_t *pmdp); |
| 55 | 54 | ||
| 56 | |||
| 57 | #else | ||
| 58 | unsigned long xen_pte_val(pte_t); | ||
| 59 | unsigned long xen_pmd_val(pmd_t); | ||
| 60 | unsigned long xen_pgd_val(pgd_t); | ||
| 61 | |||
| 62 | pte_t xen_make_pte(unsigned long); | ||
| 63 | pmd_t xen_make_pmd(unsigned long); | ||
| 64 | pgd_t xen_make_pgd(unsigned long); | ||
| 65 | #endif | ||
| 66 | |||
| 67 | #endif /* _XEN_MMU_H */ | 55 | #endif /* _XEN_MMU_H */ |
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 52b2e3856980..41e217503c96 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
| 15 | #include <linux/math64.h> | 15 | #include <linux/math64.h> |
| 16 | 16 | ||
| 17 | #include <asm/pvclock.h> | ||
| 17 | #include <asm/xen/hypervisor.h> | 18 | #include <asm/xen/hypervisor.h> |
| 18 | #include <asm/xen/hypercall.h> | 19 | #include <asm/xen/hypercall.h> |
| 19 | 20 | ||
| @@ -31,17 +32,6 @@ | |||
| 31 | 32 | ||
| 32 | static cycle_t xen_clocksource_read(void); | 33 | static cycle_t xen_clocksource_read(void); |
| 33 | 34 | ||
| 34 | /* These are perodically updated in shared_info, and then copied here. */ | ||
| 35 | struct shadow_time_info { | ||
| 36 | u64 tsc_timestamp; /* TSC at last update of time vals. */ | ||
| 37 | u64 system_timestamp; /* Time, in nanosecs, since boot. */ | ||
| 38 | u32 tsc_to_nsec_mul; | ||
| 39 | int tsc_shift; | ||
| 40 | u32 version; | ||
| 41 | }; | ||
| 42 | |||
| 43 | static DEFINE_PER_CPU(struct shadow_time_info, shadow_time); | ||
| 44 | |||
| 45 | /* runstate info updated by Xen */ | 35 | /* runstate info updated by Xen */ |
| 46 | static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate); | 36 | static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate); |
| 47 | 37 | ||
| @@ -211,7 +201,7 @@ unsigned long long xen_sched_clock(void) | |||
| 211 | unsigned long xen_cpu_khz(void) | 201 | unsigned long xen_cpu_khz(void) |
| 212 | { | 202 | { |
| 213 | u64 xen_khz = 1000000ULL << 32; | 203 | u64 xen_khz = 1000000ULL << 32; |
| 214 | const struct vcpu_time_info *info = | 204 | const struct pvclock_vcpu_time_info *info = |
| 215 | &HYPERVISOR_shared_info->vcpu_info[0].time; | 205 | &HYPERVISOR_shared_info->vcpu_info[0].time; |
| 216 | 206 | ||
| 217 | do_div(xen_khz, info->tsc_to_system_mul); | 207 | do_div(xen_khz, info->tsc_to_system_mul); |
| @@ -223,121 +213,26 @@ unsigned long xen_cpu_khz(void) | |||
| 223 | return xen_khz; | 213 | return xen_khz; |
| 224 | } | 214 | } |
| 225 | 215 | ||
| 226 | /* | ||
| 227 | * Reads a consistent set of time-base values from Xen, into a shadow data | ||
| 228 | * area. | ||
| 229 | */ | ||
| 230 | static unsigned get_time_values_from_xen(void) | ||
| 231 | { | ||
| 232 | struct vcpu_time_info *src; | ||
| 233 | struct shadow_time_info *dst; | ||
| 234 | |||
| 235 | /* src is shared memory with the hypervisor, so we need to | ||
| 236 | make sure we get a consistent snapshot, even in the face of | ||
| 237 | being preempted. */ | ||
| 238 | src = &__get_cpu_var(xen_vcpu)->time; | ||
| 239 | dst = &__get_cpu_var(shadow_time); | ||
| 240 | |||
| 241 | do { | ||
| 242 | dst->version = src->version; | ||
| 243 | rmb(); /* fetch version before data */ | ||
| 244 | dst->tsc_timestamp = src->tsc_timestamp; | ||
| 245 | dst->system_timestamp = src->system_time; | ||
| 246 | dst->tsc_to_nsec_mul = src->tsc_to_system_mul; | ||
| 247 | dst->tsc_shift = src->tsc_shift; | ||
| 248 | rmb(); /* test version after fetching data */ | ||
| 249 | } while ((src->version & 1) | (dst->version ^ src->version)); | ||
| 250 | |||
| 251 | return dst->version; | ||
| 252 | } | ||
| 253 | |||
| 254 | /* | ||
| 255 | * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, | ||
| 256 | * yielding a 64-bit result. | ||
| 257 | */ | ||
| 258 | static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift) | ||
| 259 | { | ||
| 260 | u64 product; | ||
| 261 | #ifdef __i386__ | ||
| 262 | u32 tmp1, tmp2; | ||
| 263 | #endif | ||
| 264 | |||
| 265 | if (shift < 0) | ||
| 266 | delta >>= -shift; | ||
| 267 | else | ||
| 268 | delta <<= shift; | ||
| 269 | |||
| 270 | #ifdef __i386__ | ||
| 271 | __asm__ ( | ||
| 272 | "mul %5 ; " | ||
| 273 | "mov %4,%%eax ; " | ||
| 274 | "mov %%edx,%4 ; " | ||
| 275 | "mul %5 ; " | ||
| 276 | "xor %5,%5 ; " | ||
| 277 | "add %4,%%eax ; " | ||
| 278 | "adc %5,%%edx ; " | ||
| 279 | : "=A" (product), "=r" (tmp1), "=r" (tmp2) | ||
| 280 | : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); | ||
| 281 | #elif __x86_64__ | ||
| 282 | __asm__ ( | ||
| 283 | "mul %%rdx ; shrd $32,%%rdx,%%rax" | ||
| 284 | : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); | ||
| 285 | #else | ||
| 286 | #error implement me! | ||
| 287 | #endif | ||
| 288 | |||
| 289 | return product; | ||
| 290 | } | ||
| 291 | |||
| 292 | static u64 get_nsec_offset(struct shadow_time_info *shadow) | ||
| 293 | { | ||
| 294 | u64 now, delta; | ||
| 295 | now = native_read_tsc(); | ||
| 296 | delta = now - shadow->tsc_timestamp; | ||
| 297 | return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift); | ||
| 298 | } | ||
| 299 | |||
| 300 | static cycle_t xen_clocksource_read(void) | 216 | static cycle_t xen_clocksource_read(void) |
| 301 | { | 217 | { |
| 302 | struct shadow_time_info *shadow = &get_cpu_var(shadow_time); | 218 | struct pvclock_vcpu_time_info *src; |
| 303 | cycle_t ret; | 219 | cycle_t ret; |
| 304 | unsigned version; | ||
| 305 | |||
| 306 | do { | ||
| 307 | version = get_time_values_from_xen(); | ||
| 308 | barrier(); | ||
| 309 | ret = shadow->system_timestamp + get_nsec_offset(shadow); | ||
| 310 | barrier(); | ||
| 311 | } while (version != __get_cpu_var(xen_vcpu)->time.version); | ||
| 312 | |||
| 313 | put_cpu_var(shadow_time); | ||
| 314 | 220 | ||
| 221 | src = &get_cpu_var(xen_vcpu)->time; | ||
| 222 | ret = pvclock_clocksource_read(src); | ||
| 223 | put_cpu_var(xen_vcpu); | ||
| 315 | return ret; | 224 | return ret; |
| 316 | } | 225 | } |
| 317 | 226 | ||
| 318 | static void xen_read_wallclock(struct timespec *ts) | 227 | static void xen_read_wallclock(struct timespec *ts) |
| 319 | { | 228 | { |
| 320 | const struct shared_info *s = HYPERVISOR_shared_info; | 229 | struct shared_info *s = HYPERVISOR_shared_info; |
| 321 | u32 version; | 230 | struct pvclock_wall_clock *wall_clock = &(s->wc); |
| 322 | u64 delta; | 231 | struct pvclock_vcpu_time_info *vcpu_time; |
| 323 | struct timespec now; | ||
| 324 | |||
| 325 | /* get wallclock at system boot */ | ||
| 326 | do { | ||
| 327 | version = s->wc_version; | ||
| 328 | rmb(); /* fetch version before time */ | ||
| 329 | now.tv_sec = s->wc_sec; | ||
| 330 | now.tv_nsec = s->wc_nsec; | ||
| 331 | rmb(); /* fetch time before checking version */ | ||
| 332 | } while ((s->wc_version & 1) | (version ^ s->wc_version)); | ||
| 333 | 232 | ||
| 334 | delta = xen_clocksource_read(); /* time since system boot */ | 233 | vcpu_time = &get_cpu_var(xen_vcpu)->time; |
| 335 | delta += now.tv_sec * (u64)NSEC_PER_SEC + now.tv_nsec; | 234 | pvclock_read_wallclock(wall_clock, vcpu_time, ts); |
| 336 | 235 | put_cpu_var(xen_vcpu); | |
| 337 | now.tv_nsec = do_div(delta, NSEC_PER_SEC); | ||
| 338 | now.tv_sec = delta; | ||
| 339 | |||
| 340 | set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); | ||
| 341 | } | 236 | } |
| 342 | 237 | ||
| 343 | unsigned long xen_get_wallclock(void) | 238 | unsigned long xen_get_wallclock(void) |
| @@ -345,7 +240,6 @@ unsigned long xen_get_wallclock(void) | |||
| 345 | struct timespec ts; | 240 | struct timespec ts; |
| 346 | 241 | ||
| 347 | xen_read_wallclock(&ts); | 242 | xen_read_wallclock(&ts); |
| 348 | |||
| 349 | return ts.tv_sec; | 243 | return ts.tv_sec; |
| 350 | } | 244 | } |
| 351 | 245 | ||
| @@ -569,8 +463,6 @@ __init void xen_time_init(void) | |||
| 569 | { | 463 | { |
| 570 | int cpu = smp_processor_id(); | 464 | int cpu = smp_processor_id(); |
| 571 | 465 | ||
| 572 | get_time_values_from_xen(); | ||
| 573 | |||
| 574 | clocksource_register(&xen_clocksource); | 466 | clocksource_register(&xen_clocksource); |
| 575 | 467 | ||
| 576 | if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) { | 468 | if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) { |
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 288d587ce73c..6ec3b4f7719b 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S | |||
| @@ -17,7 +17,7 @@ ENTRY(startup_xen) | |||
| 17 | 17 | ||
| 18 | __FINIT | 18 | __FINIT |
| 19 | 19 | ||
| 20 | .pushsection .bss.page_aligned | 20 | .pushsection .text |
| 21 | .align PAGE_SIZE_asm | 21 | .align PAGE_SIZE_asm |
| 22 | ENTRY(hypercall_page) | 22 | ENTRY(hypercall_page) |
| 23 | .skip 0x1000 | 23 | .skip 0x1000 |
| @@ -30,11 +30,7 @@ ENTRY(hypercall_page) | |||
| 30 | ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long startup_xen) | 30 | ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long startup_xen) |
| 31 | ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long hypercall_page) | 31 | ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long hypercall_page) |
| 32 | ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") | 32 | ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") |
| 33 | #ifdef CONFIG_X86_PAE | ||
| 34 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") | 33 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") |
| 35 | #else | ||
| 36 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "no") | ||
| 37 | #endif | ||
| 38 | ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") | 34 | ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") |
| 39 | 35 | ||
| 40 | #endif /*CONFIG_XEN */ | 36 | #endif /*CONFIG_XEN */ |
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 5b73f6a2cd86..831883b7d6c9 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
| @@ -233,6 +233,9 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) | |||
| 233 | 233 | ||
| 234 | device = ac->device; | 234 | device = ac->device; |
| 235 | switch (event) { | 235 | switch (event) { |
| 236 | default: | ||
| 237 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
| 238 | "Unsupported event [0x%x]\n", event)); | ||
| 236 | case ACPI_AC_NOTIFY_STATUS: | 239 | case ACPI_AC_NOTIFY_STATUS: |
| 237 | case ACPI_NOTIFY_BUS_CHECK: | 240 | case ACPI_NOTIFY_BUS_CHECK: |
| 238 | case ACPI_NOTIFY_DEVICE_CHECK: | 241 | case ACPI_NOTIFY_DEVICE_CHECK: |
| @@ -244,11 +247,6 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) | |||
| 244 | #ifdef CONFIG_ACPI_SYSFS_POWER | 247 | #ifdef CONFIG_ACPI_SYSFS_POWER |
| 245 | kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE); | 248 | kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE); |
| 246 | #endif | 249 | #endif |
| 247 | break; | ||
| 248 | default: | ||
| 249 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
| 250 | "Unsupported event [0x%x]\n", event)); | ||
| 251 | break; | ||
| 252 | } | 250 | } |
| 253 | 251 | ||
| 254 | return; | 252 | return; |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 5e5dda3a3027..d089c4519d45 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -1713,7 +1713,8 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video, | |||
| 1713 | 1713 | ||
| 1714 | status = acpi_video_bus_get_one_device(dev, video); | 1714 | status = acpi_video_bus_get_one_device(dev, video); |
| 1715 | if (ACPI_FAILURE(status)) { | 1715 | if (ACPI_FAILURE(status)) { |
| 1716 | ACPI_EXCEPTION((AE_INFO, status, "Cant attach device")); | 1716 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, |
| 1717 | "Cant attach device")); | ||
| 1717 | continue; | 1718 | continue; |
| 1718 | } | 1719 | } |
| 1719 | } | 1720 | } |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 9bf2986a2788..ae8494944c45 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -651,9 +651,17 @@ config PATA_WINBOND_VLB | |||
| 651 | Support for the Winbond W83759A controller on Vesa Local Bus | 651 | Support for the Winbond W83759A controller on Vesa Local Bus |
| 652 | systems. | 652 | systems. |
| 653 | 653 | ||
| 654 | config HAVE_PATA_PLATFORM | ||
| 655 | bool | ||
| 656 | help | ||
| 657 | This is an internal configuration node for any machine that | ||
| 658 | uses pata-platform driver to enable the relevant driver in the | ||
| 659 | configuration structure without having to submit endless patches | ||
| 660 | to update the PATA_PLATFORM entry. | ||
| 661 | |||
| 654 | config PATA_PLATFORM | 662 | config PATA_PLATFORM |
| 655 | tristate "Generic platform device PATA support" | 663 | tristate "Generic platform device PATA support" |
| 656 | depends on EMBEDDED || ARCH_RPC || PPC | 664 | depends on EMBEDDED || ARCH_RPC || PPC || HAVE_PATA_PLATFORM |
| 657 | help | 665 | help |
| 658 | This option enables support for generic directly connected ATA | 666 | This option enables support for generic directly connected ATA |
| 659 | devices commonly found on embedded systems. | 667 | devices commonly found on embedded systems. |
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 966ab401e523..6a4a2a25d97a 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -90,6 +90,7 @@ enum { | |||
| 90 | board_ahci_mv = 4, | 90 | board_ahci_mv = 4, |
| 91 | board_ahci_sb700 = 5, | 91 | board_ahci_sb700 = 5, |
| 92 | board_ahci_mcp65 = 6, | 92 | board_ahci_mcp65 = 6, |
| 93 | board_ahci_nopmp = 7, | ||
| 93 | 94 | ||
| 94 | /* global controller registers */ | 95 | /* global controller registers */ |
| 95 | HOST_CAP = 0x00, /* host capabilities */ | 96 | HOST_CAP = 0x00, /* host capabilities */ |
| @@ -401,6 +402,14 @@ static const struct ata_port_info ahci_port_info[] = { | |||
| 401 | .udma_mask = ATA_UDMA6, | 402 | .udma_mask = ATA_UDMA6, |
| 402 | .port_ops = &ahci_ops, | 403 | .port_ops = &ahci_ops, |
| 403 | }, | 404 | }, |
| 405 | /* board_ahci_nopmp */ | ||
| 406 | { | ||
| 407 | AHCI_HFLAGS (AHCI_HFLAG_NO_PMP), | ||
| 408 | .flags = AHCI_FLAG_COMMON, | ||
| 409 | .pio_mask = 0x1f, /* pio0-4 */ | ||
| 410 | .udma_mask = ATA_UDMA6, | ||
| 411 | .port_ops = &ahci_ops, | ||
| 412 | }, | ||
| 404 | }; | 413 | }; |
| 405 | 414 | ||
| 406 | static const struct pci_device_id ahci_pci_tbl[] = { | 415 | static const struct pci_device_id ahci_pci_tbl[] = { |
| @@ -525,9 +534,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { | |||
| 525 | { PCI_VDEVICE(NVIDIA, 0x0bc7), board_ahci }, /* MCP7B */ | 534 | { PCI_VDEVICE(NVIDIA, 0x0bc7), board_ahci }, /* MCP7B */ |
| 526 | 535 | ||
| 527 | /* SiS */ | 536 | /* SiS */ |
| 528 | { PCI_VDEVICE(SI, 0x1184), board_ahci }, /* SiS 966 */ | 537 | { PCI_VDEVICE(SI, 0x1184), board_ahci_nopmp }, /* SiS 966 */ |
| 529 | { PCI_VDEVICE(SI, 0x1185), board_ahci }, /* SiS 966 */ | 538 | { PCI_VDEVICE(SI, 0x1185), board_ahci_nopmp }, /* SiS 968 */ |
| 530 | { PCI_VDEVICE(SI, 0x0186), board_ahci }, /* SiS 968 */ | 539 | { PCI_VDEVICE(SI, 0x0186), board_ahci_nopmp }, /* SiS 968 */ |
| 531 | 540 | ||
| 532 | /* Marvell */ | 541 | /* Marvell */ |
| 533 | { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv }, /* 6145 */ | 542 | { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv }, /* 6145 */ |
| @@ -653,6 +662,14 @@ static void ahci_save_initial_config(struct pci_dev *pdev, | |||
| 653 | cap &= ~HOST_CAP_PMP; | 662 | cap &= ~HOST_CAP_PMP; |
| 654 | } | 663 | } |
| 655 | 664 | ||
| 665 | if (pdev->vendor == PCI_VENDOR_ID_JMICRON && pdev->device == 0x2361 && | ||
| 666 | port_map != 1) { | ||
| 667 | dev_printk(KERN_INFO, &pdev->dev, | ||
| 668 | "JMB361 has only one port, port_map 0x%x -> 0x%x\n", | ||
| 669 | port_map, 1); | ||
| 670 | port_map = 1; | ||
| 671 | } | ||
| 672 | |||
| 656 | /* | 673 | /* |
| 657 | * Temporary Marvell 6145 hack: PATA port presence | 674 | * Temporary Marvell 6145 hack: PATA port presence |
| 658 | * is asserted through the standard AHCI port | 675 | * is asserted through the standard AHCI port |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 81b7ae376951..a90ae03f56b2 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -1043,6 +1043,13 @@ static int piix_broken_suspend(void) | |||
| 1043 | }, | 1043 | }, |
| 1044 | }, | 1044 | }, |
| 1045 | { | 1045 | { |
| 1046 | .ident = "TECRA M4", | ||
| 1047 | .matches = { | ||
| 1048 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | ||
| 1049 | DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M4"), | ||
| 1050 | }, | ||
| 1051 | }, | ||
| 1052 | { | ||
| 1046 | .ident = "TECRA M5", | 1053 | .ident = "TECRA M5", |
| 1047 | .matches = { | 1054 | .matches = { |
| 1048 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | 1055 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index cc816ca623d3..303fc0d2b978 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -4297,7 +4297,7 @@ void ata_sg_clean(struct ata_queued_cmd *qc) | |||
| 4297 | } | 4297 | } |
| 4298 | 4298 | ||
| 4299 | /** | 4299 | /** |
| 4300 | * ata_check_atapi_dma - Check whether ATAPI DMA can be supported | 4300 | * atapi_check_dma - Check whether ATAPI DMA can be supported |
| 4301 | * @qc: Metadata associated with taskfile to check | 4301 | * @qc: Metadata associated with taskfile to check |
| 4302 | * | 4302 | * |
| 4303 | * Allow low-level driver to filter ATA PACKET commands, returning | 4303 | * Allow low-level driver to filter ATA PACKET commands, returning |
| @@ -4310,7 +4310,7 @@ void ata_sg_clean(struct ata_queued_cmd *qc) | |||
| 4310 | * RETURNS: 0 when ATAPI DMA can be used | 4310 | * RETURNS: 0 when ATAPI DMA can be used |
| 4311 | * nonzero otherwise | 4311 | * nonzero otherwise |
| 4312 | */ | 4312 | */ |
| 4313 | int ata_check_atapi_dma(struct ata_queued_cmd *qc) | 4313 | int atapi_check_dma(struct ata_queued_cmd *qc) |
| 4314 | { | 4314 | { |
| 4315 | struct ata_port *ap = qc->ap; | 4315 | struct ata_port *ap = qc->ap; |
| 4316 | 4316 | ||
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 2e6e1622dc6d..57a43649a461 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
| @@ -2343,8 +2343,8 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc) | |||
| 2343 | { | 2343 | { |
| 2344 | struct scsi_cmnd *scmd = qc->scsicmd; | 2344 | struct scsi_cmnd *scmd = qc->scsicmd; |
| 2345 | struct ata_device *dev = qc->dev; | 2345 | struct ata_device *dev = qc->dev; |
| 2346 | int using_pio = (dev->flags & ATA_DFLAG_PIO); | ||
| 2347 | int nodata = (scmd->sc_data_direction == DMA_NONE); | 2346 | int nodata = (scmd->sc_data_direction == DMA_NONE); |
| 2347 | int using_pio = !nodata && (dev->flags & ATA_DFLAG_PIO); | ||
| 2348 | unsigned int nbytes; | 2348 | unsigned int nbytes; |
| 2349 | 2349 | ||
| 2350 | memset(qc->cdb, 0, dev->cdb_len); | 2350 | memset(qc->cdb, 0, dev->cdb_len); |
| @@ -2362,7 +2362,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc) | |||
| 2362 | ata_qc_set_pc_nbytes(qc); | 2362 | ata_qc_set_pc_nbytes(qc); |
| 2363 | 2363 | ||
| 2364 | /* check whether ATAPI DMA is safe */ | 2364 | /* check whether ATAPI DMA is safe */ |
| 2365 | if (!using_pio && ata_check_atapi_dma(qc)) | 2365 | if (!nodata && !using_pio && atapi_check_dma(qc)) |
| 2366 | using_pio = 1; | 2366 | using_pio = 1; |
| 2367 | 2367 | ||
| 2368 | /* Some controller variants snoop this value for Packet | 2368 | /* Some controller variants snoop this value for Packet |
| @@ -2402,13 +2402,11 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc) | |||
| 2402 | qc->tf.lbam = (nbytes & 0xFF); | 2402 | qc->tf.lbam = (nbytes & 0xFF); |
| 2403 | qc->tf.lbah = (nbytes >> 8); | 2403 | qc->tf.lbah = (nbytes >> 8); |
| 2404 | 2404 | ||
| 2405 | if (using_pio || nodata) { | 2405 | if (nodata) |
| 2406 | /* no data, or PIO data xfer */ | 2406 | qc->tf.protocol = ATAPI_PROT_NODATA; |
| 2407 | if (nodata) | 2407 | else if (using_pio) |
| 2408 | qc->tf.protocol = ATAPI_PROT_NODATA; | 2408 | qc->tf.protocol = ATAPI_PROT_PIO; |
| 2409 | else | 2409 | else { |
| 2410 | qc->tf.protocol = ATAPI_PROT_PIO; | ||
| 2411 | } else { | ||
| 2412 | /* DMA data xfer */ | 2410 | /* DMA data xfer */ |
| 2413 | qc->tf.protocol = ATAPI_PROT_DMA; | 2411 | qc->tf.protocol = ATAPI_PROT_DMA; |
| 2414 | qc->tf.feature |= ATAPI_PKT_DMA; | 2412 | qc->tf.feature |= ATAPI_PKT_DMA; |
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 4514283937ea..1cf803adbc95 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
| @@ -106,7 +106,7 @@ extern void ata_sg_clean(struct ata_queued_cmd *qc); | |||
| 106 | extern void ata_qc_free(struct ata_queued_cmd *qc); | 106 | extern void ata_qc_free(struct ata_queued_cmd *qc); |
| 107 | extern void ata_qc_issue(struct ata_queued_cmd *qc); | 107 | extern void ata_qc_issue(struct ata_queued_cmd *qc); |
| 108 | extern void __ata_qc_complete(struct ata_queued_cmd *qc); | 108 | extern void __ata_qc_complete(struct ata_queued_cmd *qc); |
| 109 | extern int ata_check_atapi_dma(struct ata_queued_cmd *qc); | 109 | extern int atapi_check_dma(struct ata_queued_cmd *qc); |
| 110 | extern void swap_buf_le16(u16 *buf, unsigned int buf_words); | 110 | extern void swap_buf_le16(u16 *buf, unsigned int buf_words); |
| 111 | extern void ata_dev_init(struct ata_device *dev); | 111 | extern void ata_dev_init(struct ata_device *dev); |
| 112 | extern void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp); | 112 | extern void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp); |
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 3d39f9dfec5a..41b4361bbf6e 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
| @@ -414,6 +414,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { | |||
| 414 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), | 414 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), |
| 415 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), | 415 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), |
| 416 | PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), | 416 | PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), |
| 417 | PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF300", 0x7ed2ad87, 0x7e9e78ee), | ||
| 417 | PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), | 418 | PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), |
| 418 | PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), | 419 | PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), |
| 419 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), | 420 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), |
| @@ -424,6 +425,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { | |||
| 424 | PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), | 425 | PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), |
| 425 | PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), | 426 | PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), |
| 426 | PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), | 427 | PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), |
| 428 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF45", 0x709b1bf1, 0xf68b6f32), | ||
| 427 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1), | 429 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1), |
| 428 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2), | 430 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2), |
| 429 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), | 431 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 60391e9a84db..28092bc50146 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -1322,6 +1322,9 @@ static int mv_port_start(struct ata_port *ap) | |||
| 1322 | goto out_port_free_dma_mem; | 1322 | goto out_port_free_dma_mem; |
| 1323 | memset(pp->crpb, 0, MV_CRPB_Q_SZ); | 1323 | memset(pp->crpb, 0, MV_CRPB_Q_SZ); |
| 1324 | 1324 | ||
| 1325 | /* 6041/6081 Rev. "C0" (and newer) are okay with async notify */ | ||
| 1326 | if (hpriv->hp_flags & MV_HP_ERRATA_60X1C0) | ||
| 1327 | ap->flags |= ATA_FLAG_AN; | ||
| 1325 | /* | 1328 | /* |
| 1326 | * For GEN_I, there's no NCQ, so we only allocate a single sg_tbl. | 1329 | * For GEN_I, there's no NCQ, so we only allocate a single sg_tbl. |
| 1327 | * For later hardware, we need one unique sg_tbl per NCQ tag. | 1330 | * For later hardware, we need one unique sg_tbl per NCQ tag. |
| @@ -1592,6 +1595,24 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc) | |||
| 1592 | 1595 | ||
| 1593 | if ((qc->tf.protocol != ATA_PROT_DMA) && | 1596 | if ((qc->tf.protocol != ATA_PROT_DMA) && |
| 1594 | (qc->tf.protocol != ATA_PROT_NCQ)) { | 1597 | (qc->tf.protocol != ATA_PROT_NCQ)) { |
| 1598 | static int limit_warnings = 10; | ||
| 1599 | /* | ||
| 1600 | * Errata SATA#16, SATA#24: warn if multiple DRQs expected. | ||
| 1601 | * | ||
| 1602 | * Someday, we might implement special polling workarounds | ||
| 1603 | * for these, but it all seems rather unnecessary since we | ||
| 1604 | * normally use only DMA for commands which transfer more | ||
| 1605 | * than a single block of data. | ||
| 1606 | * | ||
| 1607 | * Much of the time, this could just work regardless. | ||
| 1608 | * So for now, just log the incident, and allow the attempt. | ||
| 1609 | */ | ||
| 1610 | if (limit_warnings && (qc->nbytes / qc->sect_size) > 1) { | ||
| 1611 | --limit_warnings; | ||
| 1612 | ata_link_printk(qc->dev->link, KERN_WARNING, DRV_NAME | ||
| 1613 | ": attempting PIO w/multiple DRQ: " | ||
| 1614 | "this may fail due to h/w errata\n"); | ||
| 1615 | } | ||
| 1595 | /* | 1616 | /* |
| 1596 | * We're about to send a non-EDMA capable command to the | 1617 | * We're about to send a non-EDMA capable command to the |
| 1597 | * port. Turn off EDMA so there won't be problems accessing | 1618 | * port. Turn off EDMA so there won't be problems accessing |
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index ffc4a5a41946..ea495b21f916 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c | |||
| @@ -1542,7 +1542,8 @@ he_start(struct atm_dev *dev) | |||
| 1542 | /* initialize framer */ | 1542 | /* initialize framer */ |
| 1543 | 1543 | ||
| 1544 | #ifdef CONFIG_ATM_HE_USE_SUNI | 1544 | #ifdef CONFIG_ATM_HE_USE_SUNI |
| 1545 | suni_init(he_dev->atm_dev); | 1545 | if (he_isMM(he_dev)) |
| 1546 | suni_init(he_dev->atm_dev); | ||
| 1546 | if (he_dev->atm_dev->phy && he_dev->atm_dev->phy->start) | 1547 | if (he_dev->atm_dev->phy && he_dev->atm_dev->phy->start) |
| 1547 | he_dev->atm_dev->phy->start(he_dev->atm_dev); | 1548 | he_dev->atm_dev->phy->start(he_dev->atm_dev); |
| 1548 | #endif /* CONFIG_ATM_HE_USE_SUNI */ | 1549 | #endif /* CONFIG_ATM_HE_USE_SUNI */ |
| @@ -1554,6 +1555,7 @@ he_start(struct atm_dev *dev) | |||
| 1554 | val = he_phy_get(he_dev->atm_dev, SUNI_TPOP_APM); | 1555 | val = he_phy_get(he_dev->atm_dev, SUNI_TPOP_APM); |
| 1555 | val = (val & ~SUNI_TPOP_APM_S) | (SUNI_TPOP_S_SDH << SUNI_TPOP_APM_S_SHIFT); | 1556 | val = (val & ~SUNI_TPOP_APM_S) | (SUNI_TPOP_S_SDH << SUNI_TPOP_APM_S_SHIFT); |
| 1556 | he_phy_put(he_dev->atm_dev, val, SUNI_TPOP_APM); | 1557 | he_phy_put(he_dev->atm_dev, val, SUNI_TPOP_APM); |
| 1558 | he_phy_put(he_dev->atm_dev, SUNI_TACP_IUCHP_CLP, SUNI_TACP_IUCHP); | ||
| 1557 | } | 1559 | } |
| 1558 | 1560 | ||
| 1559 | /* 5.1.12 enable transmit and receive */ | 1561 | /* 5.1.12 enable transmit and receive */ |
| @@ -2844,10 +2846,15 @@ he_ioctl(struct atm_dev *atm_dev, unsigned int cmd, void __user *arg) | |||
| 2844 | if (copy_from_user(®, arg, | 2846 | if (copy_from_user(®, arg, |
| 2845 | sizeof(struct he_ioctl_reg))) | 2847 | sizeof(struct he_ioctl_reg))) |
| 2846 | return -EFAULT; | 2848 | return -EFAULT; |
| 2847 | 2849 | ||
| 2848 | spin_lock_irqsave(&he_dev->global_lock, flags); | 2850 | spin_lock_irqsave(&he_dev->global_lock, flags); |
| 2849 | switch (reg.type) { | 2851 | switch (reg.type) { |
| 2850 | case HE_REGTYPE_PCI: | 2852 | case HE_REGTYPE_PCI: |
| 2853 | if (reg.addr < 0 || reg.addr >= HE_REGMAP_SIZE) { | ||
| 2854 | err = -EINVAL; | ||
| 2855 | break; | ||
| 2856 | } | ||
| 2857 | |||
| 2851 | reg.val = he_readl(he_dev, reg.addr); | 2858 | reg.val = he_readl(he_dev, reg.addr); |
| 2852 | break; | 2859 | break; |
| 2853 | case HE_REGTYPE_RCM: | 2860 | case HE_REGTYPE_RCM: |
diff --git a/drivers/atm/he.h b/drivers/atm/he.h index fe6cd15a78a4..b87d6ccabac1 100644 --- a/drivers/atm/he.h +++ b/drivers/atm/he.h | |||
| @@ -267,13 +267,7 @@ struct he_dev { | |||
| 267 | 267 | ||
| 268 | char prod_id[30]; | 268 | char prod_id[30]; |
| 269 | char mac_addr[6]; | 269 | char mac_addr[6]; |
| 270 | int media; /* | 270 | int media; |
| 271 | * 0x26 = HE155 MM | ||
| 272 | * 0x27 = HE622 MM | ||
| 273 | * 0x46 = HE155 SM | ||
| 274 | * 0x47 = HE622 SM | ||
| 275 | */ | ||
| 276 | |||
| 277 | 271 | ||
| 278 | unsigned int vcibits, vpibits; | 272 | unsigned int vcibits, vpibits; |
| 279 | unsigned int cells_per_row; | 273 | unsigned int cells_per_row; |
| @@ -392,6 +386,7 @@ struct he_vcc | |||
| 392 | #define HE_DEV(dev) ((struct he_dev *) (dev)->dev_data) | 386 | #define HE_DEV(dev) ((struct he_dev *) (dev)->dev_data) |
| 393 | 387 | ||
| 394 | #define he_is622(dev) ((dev)->media & 0x1) | 388 | #define he_is622(dev) ((dev)->media & 0x1) |
| 389 | #define he_isMM(dev) ((dev)->media & 0x20) | ||
| 395 | 390 | ||
| 396 | #define HE_REGMAP_SIZE 0x100000 | 391 | #define HE_REGMAP_SIZE 0x100000 |
| 397 | 392 | ||
| @@ -876,8 +871,8 @@ struct he_vcc | |||
| 876 | #define M_SN 0x3a /* integer */ | 871 | #define M_SN 0x3a /* integer */ |
| 877 | #define MEDIA 0x3e /* integer */ | 872 | #define MEDIA 0x3e /* integer */ |
| 878 | #define HE155MM 0x26 | 873 | #define HE155MM 0x26 |
| 879 | #define HE155SM 0x27 | 874 | #define HE622MM 0x27 |
| 880 | #define HE622MM 0x46 | 875 | #define HE155SM 0x46 |
| 881 | #define HE622SM 0x47 | 876 | #define HE622SM 0x47 |
| 882 | #define MAC_ADDR 0x42 /* char[] */ | 877 | #define MAC_ADDR 0x42 /* char[] */ |
| 883 | 878 | ||
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 5c28ca7380ff..139fce6968a6 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
| @@ -2562,17 +2562,11 @@ static int __devinit ia_start(struct atm_dev *dev) | |||
| 2562 | error = suni_init(dev); | 2562 | error = suni_init(dev); |
| 2563 | if (error) | 2563 | if (error) |
| 2564 | goto err_free_rx; | 2564 | goto err_free_rx; |
| 2565 | /* | 2565 | if (dev->phy->start) { |
| 2566 | * Enable interrupt on loss of signal | 2566 | error = dev->phy->start(dev); |
| 2567 | * SUNI_RSOP_CIE - 0x10 | 2567 | if (error) |
| 2568 | * SUNI_RSOP_CIE_LOSE - 0x04 | 2568 | goto err_free_rx; |
| 2569 | */ | 2569 | } |
| 2570 | ia_phy_put(dev, ia_phy_get(dev, 0x10) | 0x04, 0x10); | ||
| 2571 | #ifndef MODULE | ||
| 2572 | error = dev->phy->start(dev); | ||
| 2573 | if (error) | ||
| 2574 | goto err_free_rx; | ||
| 2575 | #endif | ||
| 2576 | /* Get iadev->carrier_detect status */ | 2570 | /* Get iadev->carrier_detect status */ |
| 2577 | IaFrontEndIntr(iadev); | 2571 | IaFrontEndIntr(iadev); |
| 2578 | } | 2572 | } |
| @@ -3198,6 +3192,8 @@ static int __devinit ia_init_one(struct pci_dev *pdev, | |||
| 3198 | IF_INIT(printk("dev_id = 0x%x iadev->LineRate = %d \n", (u32)dev, | 3192 | IF_INIT(printk("dev_id = 0x%x iadev->LineRate = %d \n", (u32)dev, |
| 3199 | iadev->LineRate);) | 3193 | iadev->LineRate);) |
| 3200 | 3194 | ||
| 3195 | pci_set_drvdata(pdev, dev); | ||
| 3196 | |||
| 3201 | ia_dev[iadev_count] = iadev; | 3197 | ia_dev[iadev_count] = iadev; |
| 3202 | _ia_dev[iadev_count] = dev; | 3198 | _ia_dev[iadev_count] = dev; |
| 3203 | iadev_count++; | 3199 | iadev_count++; |
| @@ -3219,8 +3215,6 @@ static int __devinit ia_init_one(struct pci_dev *pdev, | |||
| 3219 | iadev->next_board = ia_boards; | 3215 | iadev->next_board = ia_boards; |
| 3220 | ia_boards = dev; | 3216 | ia_boards = dev; |
| 3221 | 3217 | ||
| 3222 | pci_set_drvdata(pdev, dev); | ||
| 3223 | |||
| 3224 | return 0; | 3218 | return 0; |
| 3225 | 3219 | ||
| 3226 | err_out_deregister_dev: | 3220 | err_out_deregister_dev: |
| @@ -3238,9 +3232,14 @@ static void __devexit ia_remove_one(struct pci_dev *pdev) | |||
| 3238 | struct atm_dev *dev = pci_get_drvdata(pdev); | 3232 | struct atm_dev *dev = pci_get_drvdata(pdev); |
| 3239 | IADEV *iadev = INPH_IA_DEV(dev); | 3233 | IADEV *iadev = INPH_IA_DEV(dev); |
| 3240 | 3234 | ||
| 3241 | ia_phy_put(dev, ia_phy_get(dev,0x10) & ~(0x4), 0x10); | 3235 | /* Disable phy interrupts */ |
| 3236 | ia_phy_put(dev, ia_phy_get(dev, SUNI_RSOP_CIE) & ~(SUNI_RSOP_CIE_LOSE), | ||
| 3237 | SUNI_RSOP_CIE); | ||
| 3242 | udelay(1); | 3238 | udelay(1); |
| 3243 | 3239 | ||
| 3240 | if (dev->phy && dev->phy->stop) | ||
| 3241 | dev->phy->stop(dev); | ||
| 3242 | |||
| 3244 | /* De-register device */ | 3243 | /* De-register device */ |
| 3245 | free_irq(iadev->irq, dev); | 3244 | free_irq(iadev->irq, dev); |
| 3246 | iadev_count--; | 3245 | iadev_count--; |
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index 99e6a406efb4..81e14bea54bd 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h | |||
| @@ -99,8 +99,8 @@ struct agp_bridge_driver { | |||
| 99 | const void *aperture_sizes; | 99 | const void *aperture_sizes; |
| 100 | int num_aperture_sizes; | 100 | int num_aperture_sizes; |
| 101 | enum aper_size_type size_type; | 101 | enum aper_size_type size_type; |
| 102 | int cant_use_aperture; | 102 | bool cant_use_aperture; |
| 103 | int needs_scratch_page; | 103 | bool needs_scratch_page; |
| 104 | const struct gatt_mask *masks; | 104 | const struct gatt_mask *masks; |
| 105 | int (*fetch_size)(void); | 105 | int (*fetch_size)(void); |
| 106 | int (*configure)(void); | 106 | int (*configure)(void); |
| @@ -278,7 +278,7 @@ void agp_generic_destroy_page(void *addr, int flags); | |||
| 278 | void agp_free_key(int key); | 278 | void agp_free_key(int key); |
| 279 | int agp_num_entries(void); | 279 | int agp_num_entries(void); |
| 280 | u32 agp_collect_device_status(struct agp_bridge_data *bridge, u32 mode, u32 command); | 280 | u32 agp_collect_device_status(struct agp_bridge_data *bridge, u32 mode, u32 command); |
| 281 | void agp_device_command(u32 command, int agp_v3); | 281 | void agp_device_command(u32 command, bool agp_v3); |
| 282 | int agp_3_5_enable(struct agp_bridge_data *bridge); | 282 | int agp_3_5_enable(struct agp_bridge_data *bridge); |
| 283 | void global_cache_flush(void); | 283 | void global_cache_flush(void); |
| 284 | void get_agp_version(struct agp_bridge_data *bridge); | 284 | void get_agp_version(struct agp_bridge_data *bridge); |
diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c index e77c17838c8a..5da89f6c6c25 100644 --- a/drivers/char/agp/alpha-agp.c +++ b/drivers/char/agp/alpha-agp.c | |||
| @@ -80,7 +80,7 @@ static void alpha_core_agp_enable(struct agp_bridge_data *bridge, u32 mode) | |||
| 80 | agp->mode.bits.enable = 1; | 80 | agp->mode.bits.enable = 1; |
| 81 | agp->ops->configure(agp); | 81 | agp->ops->configure(agp); |
| 82 | 82 | ||
| 83 | agp_device_command(agp->mode.lw, 0); | 83 | agp_device_command(agp->mode.lw, false); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, | 86 | static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, |
| @@ -126,7 +126,7 @@ struct agp_bridge_driver alpha_core_agp_driver = { | |||
| 126 | .aperture_sizes = alpha_core_agp_sizes, | 126 | .aperture_sizes = alpha_core_agp_sizes, |
| 127 | .num_aperture_sizes = 1, | 127 | .num_aperture_sizes = 1, |
| 128 | .size_type = FIXED_APER_SIZE, | 128 | .size_type = FIXED_APER_SIZE, |
| 129 | .cant_use_aperture = 1, | 129 | .cant_use_aperture = true, |
| 130 | .masks = NULL, | 130 | .masks = NULL, |
| 131 | 131 | ||
| 132 | .fetch_size = alpha_core_agp_fetch_size, | 132 | .fetch_size = alpha_core_agp_fetch_size, |
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index 96bdb9296b07..39a0718bc616 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c | |||
| @@ -314,9 +314,9 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type) | |||
| 314 | j++; | 314 | j++; |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | if (mem->is_flushed == FALSE) { | 317 | if (!mem->is_flushed) { |
| 318 | global_cache_flush(); | 318 | global_cache_flush(); |
| 319 | mem->is_flushed = TRUE; | 319 | mem->is_flushed = true; |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { | 322 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { |
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index f5af65ac8c78..481ffe87c716 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
| @@ -71,9 +71,9 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type) | |||
| 71 | j++; | 71 | j++; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | if (mem->is_flushed == FALSE) { | 74 | if (!mem->is_flushed) { |
| 75 | global_cache_flush(); | 75 | global_cache_flush(); |
| 76 | mem->is_flushed = TRUE; | 76 | mem->is_flushed = true; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { | 79 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { |
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c index 07b4d8ff56e5..3a4566c0d84f 100644 --- a/drivers/char/agp/ati-agp.c +++ b/drivers/char/agp/ati-agp.c | |||
| @@ -287,10 +287,10 @@ static int ati_insert_memory(struct agp_memory * mem, | |||
| 287 | j++; | 287 | j++; |
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | if (mem->is_flushed == FALSE) { | 290 | if (!mem->is_flushed) { |
| 291 | /*CACHE_FLUSH(); */ | 291 | /*CACHE_FLUSH(); */ |
| 292 | global_cache_flush(); | 292 | global_cache_flush(); |
| 293 | mem->is_flushed = TRUE; | 293 | mem->is_flushed = true; |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { | 296 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { |
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index b1bdd015165c..1ec87104e68c 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c | |||
| @@ -188,10 +188,10 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
| 188 | 188 | ||
| 189 | err_out: | 189 | err_out: |
| 190 | if (bridge->driver->needs_scratch_page) { | 190 | if (bridge->driver->needs_scratch_page) { |
| 191 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), | 191 | void *va = gart_to_virt(bridge->scratch_page_real); |
| 192 | AGP_PAGE_DESTROY_UNMAP); | 192 | |
| 193 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), | 193 | bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP); |
| 194 | AGP_PAGE_DESTROY_FREE); | 194 | bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE); |
| 195 | } | 195 | } |
| 196 | if (got_gatt) | 196 | if (got_gatt) |
| 197 | bridge->driver->free_gatt_table(bridge); | 197 | bridge->driver->free_gatt_table(bridge); |
| @@ -215,10 +215,10 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge) | |||
| 215 | 215 | ||
| 216 | if (bridge->driver->agp_destroy_page && | 216 | if (bridge->driver->agp_destroy_page && |
| 217 | bridge->driver->needs_scratch_page) { | 217 | bridge->driver->needs_scratch_page) { |
| 218 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), | 218 | void *va = gart_to_virt(bridge->scratch_page_real); |
| 219 | AGP_PAGE_DESTROY_UNMAP); | 219 | |
| 220 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), | 220 | bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP); |
| 221 | AGP_PAGE_DESTROY_FREE); | 221 | bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE); |
| 222 | } | 222 | } |
| 223 | } | 223 | } |
| 224 | 224 | ||
diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c index 39275794fe63..58c57cb2518c 100644 --- a/drivers/char/agp/compat_ioctl.c +++ b/drivers/char/agp/compat_ioctl.c | |||
| @@ -214,7 +214,7 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 214 | ret_val = -EINVAL; | 214 | ret_val = -EINVAL; |
| 215 | goto ioctl_out; | 215 | goto ioctl_out; |
| 216 | } | 216 | } |
| 217 | if ((agp_fe.backend_acquired != TRUE) && | 217 | if ((agp_fe.backend_acquired != true) && |
| 218 | (cmd != AGPIOC_ACQUIRE32)) { | 218 | (cmd != AGPIOC_ACQUIRE32)) { |
| 219 | ret_val = -EBUSY; | 219 | ret_val = -EBUSY; |
| 220 | goto ioctl_out; | 220 | goto ioctl_out; |
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c index cac0009cebc1..8ca6f262ef85 100644 --- a/drivers/char/agp/efficeon-agp.c +++ b/drivers/char/agp/efficeon-agp.c | |||
| @@ -249,9 +249,9 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t | |||
| 249 | if (type != 0 || mem->type != 0) | 249 | if (type != 0 || mem->type != 0) |
| 250 | return -EINVAL; | 250 | return -EINVAL; |
| 251 | 251 | ||
| 252 | if (mem->is_flushed == FALSE) { | 252 | if (!mem->is_flushed) { |
| 253 | global_cache_flush(); | 253 | global_cache_flush(); |
| 254 | mem->is_flushed = TRUE; | 254 | mem->is_flushed = true; |
| 255 | } | 255 | } |
| 256 | 256 | ||
| 257 | last_page = NULL; | 257 | last_page = NULL; |
| @@ -329,7 +329,7 @@ static const struct agp_bridge_driver efficeon_driver = { | |||
| 329 | .free_gatt_table = efficeon_free_gatt_table, | 329 | .free_gatt_table = efficeon_free_gatt_table, |
| 330 | .insert_memory = efficeon_insert_memory, | 330 | .insert_memory = efficeon_insert_memory, |
| 331 | .remove_memory = efficeon_remove_memory, | 331 | .remove_memory = efficeon_remove_memory, |
| 332 | .cant_use_aperture = 0, // 1 might be faster? | 332 | .cant_use_aperture = false, // true might be faster? |
| 333 | 333 | ||
| 334 | // Generic | 334 | // Generic |
| 335 | .alloc_by_type = agp_generic_alloc_by_type, | 335 | .alloc_by_type = agp_generic_alloc_by_type, |
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c index 857b26227d87..e6cb1ab03e06 100644 --- a/drivers/char/agp/frontend.c +++ b/drivers/char/agp/frontend.c | |||
| @@ -395,7 +395,7 @@ static int agp_remove_controller(struct agp_controller *controller) | |||
| 395 | 395 | ||
| 396 | if (agp_fe.current_controller == controller) { | 396 | if (agp_fe.current_controller == controller) { |
| 397 | agp_fe.current_controller = NULL; | 397 | agp_fe.current_controller = NULL; |
| 398 | agp_fe.backend_acquired = FALSE; | 398 | agp_fe.backend_acquired = false; |
| 399 | agp_backend_release(agp_bridge); | 399 | agp_backend_release(agp_bridge); |
| 400 | } | 400 | } |
| 401 | kfree(controller); | 401 | kfree(controller); |
| @@ -443,7 +443,7 @@ static void agp_controller_release_current(struct agp_controller *controller, | |||
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | agp_fe.current_controller = NULL; | 445 | agp_fe.current_controller = NULL; |
| 446 | agp_fe.used_by_controller = FALSE; | 446 | agp_fe.used_by_controller = false; |
| 447 | agp_backend_release(agp_bridge); | 447 | agp_backend_release(agp_bridge); |
| 448 | } | 448 | } |
| 449 | 449 | ||
| @@ -573,7 +573,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma) | |||
| 573 | 573 | ||
| 574 | mutex_lock(&(agp_fe.agp_mutex)); | 574 | mutex_lock(&(agp_fe.agp_mutex)); |
| 575 | 575 | ||
| 576 | if (agp_fe.backend_acquired != TRUE) | 576 | if (agp_fe.backend_acquired != true) |
| 577 | goto out_eperm; | 577 | goto out_eperm; |
| 578 | 578 | ||
| 579 | if (!(test_bit(AGP_FF_IS_VALID, &priv->access_flags))) | 579 | if (!(test_bit(AGP_FF_IS_VALID, &priv->access_flags))) |
| @@ -768,7 +768,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv) | |||
| 768 | 768 | ||
| 769 | atomic_inc(&agp_bridge->agp_in_use); | 769 | atomic_inc(&agp_bridge->agp_in_use); |
| 770 | 770 | ||
| 771 | agp_fe.backend_acquired = TRUE; | 771 | agp_fe.backend_acquired = true; |
| 772 | 772 | ||
| 773 | controller = agp_find_controller_by_pid(priv->my_pid); | 773 | controller = agp_find_controller_by_pid(priv->my_pid); |
| 774 | 774 | ||
| @@ -778,7 +778,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv) | |||
| 778 | controller = agp_create_controller(priv->my_pid); | 778 | controller = agp_create_controller(priv->my_pid); |
| 779 | 779 | ||
| 780 | if (controller == NULL) { | 780 | if (controller == NULL) { |
| 781 | agp_fe.backend_acquired = FALSE; | 781 | agp_fe.backend_acquired = false; |
| 782 | agp_backend_release(agp_bridge); | 782 | agp_backend_release(agp_bridge); |
| 783 | return -ENOMEM; | 783 | return -ENOMEM; |
| 784 | } | 784 | } |
| @@ -981,7 +981,7 @@ static long agp_ioctl(struct file *file, | |||
| 981 | ret_val = -EINVAL; | 981 | ret_val = -EINVAL; |
| 982 | goto ioctl_out; | 982 | goto ioctl_out; |
| 983 | } | 983 | } |
| 984 | if ((agp_fe.backend_acquired != TRUE) && | 984 | if ((agp_fe.backend_acquired != true) && |
| 985 | (cmd != AGPIOC_ACQUIRE)) { | 985 | (cmd != AGPIOC_ACQUIRE)) { |
| 986 | ret_val = -EBUSY; | 986 | ret_val = -EBUSY; |
| 987 | goto ioctl_out; | 987 | goto ioctl_out; |
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 7fc0c99a3a58..564daaa6c7d0 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
| @@ -96,13 +96,13 @@ EXPORT_SYMBOL(agp_flush_chipset); | |||
| 96 | void agp_alloc_page_array(size_t size, struct agp_memory *mem) | 96 | void agp_alloc_page_array(size_t size, struct agp_memory *mem) |
| 97 | { | 97 | { |
| 98 | mem->memory = NULL; | 98 | mem->memory = NULL; |
| 99 | mem->vmalloc_flag = 0; | 99 | mem->vmalloc_flag = false; |
| 100 | 100 | ||
| 101 | if (size <= 2*PAGE_SIZE) | 101 | if (size <= 2*PAGE_SIZE) |
| 102 | mem->memory = kmalloc(size, GFP_KERNEL | __GFP_NORETRY); | 102 | mem->memory = kmalloc(size, GFP_KERNEL | __GFP_NORETRY); |
| 103 | if (mem->memory == NULL) { | 103 | if (mem->memory == NULL) { |
| 104 | mem->memory = vmalloc(size); | 104 | mem->memory = vmalloc(size); |
| 105 | mem->vmalloc_flag = 1; | 105 | mem->vmalloc_flag = true; |
| 106 | } | 106 | } |
| 107 | } | 107 | } |
| 108 | EXPORT_SYMBOL(agp_alloc_page_array); | 108 | EXPORT_SYMBOL(agp_alloc_page_array); |
| @@ -188,7 +188,7 @@ void agp_free_memory(struct agp_memory *curr) | |||
| 188 | if (curr == NULL) | 188 | if (curr == NULL) |
| 189 | return; | 189 | return; |
| 190 | 190 | ||
| 191 | if (curr->is_bound == TRUE) | 191 | if (curr->is_bound) |
| 192 | agp_unbind_memory(curr); | 192 | agp_unbind_memory(curr); |
| 193 | 193 | ||
| 194 | if (curr->type >= AGP_USER_TYPES) { | 194 | if (curr->type >= AGP_USER_TYPES) { |
| @@ -202,10 +202,13 @@ void agp_free_memory(struct agp_memory *curr) | |||
| 202 | } | 202 | } |
| 203 | if (curr->page_count != 0) { | 203 | if (curr->page_count != 0) { |
| 204 | for (i = 0; i < curr->page_count; i++) { | 204 | for (i = 0; i < curr->page_count; i++) { |
| 205 | curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_UNMAP); | 205 | curr->memory[i] = (unsigned long)gart_to_virt(curr->memory[i]); |
| 206 | curr->bridge->driver->agp_destroy_page((void *)curr->memory[i], | ||
| 207 | AGP_PAGE_DESTROY_UNMAP); | ||
| 206 | } | 208 | } |
| 207 | for (i = 0; i < curr->page_count; i++) { | 209 | for (i = 0; i < curr->page_count; i++) { |
| 208 | curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_FREE); | 210 | curr->bridge->driver->agp_destroy_page((void *)curr->memory[i], |
| 211 | AGP_PAGE_DESTROY_FREE); | ||
| 209 | } | 212 | } |
| 210 | } | 213 | } |
| 211 | agp_free_key(curr->key); | 214 | agp_free_key(curr->key); |
| @@ -411,20 +414,20 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start) | |||
| 411 | if (curr == NULL) | 414 | if (curr == NULL) |
| 412 | return -EINVAL; | 415 | return -EINVAL; |
| 413 | 416 | ||
| 414 | if (curr->is_bound == TRUE) { | 417 | if (curr->is_bound) { |
| 415 | printk(KERN_INFO PFX "memory %p is already bound!\n", curr); | 418 | printk(KERN_INFO PFX "memory %p is already bound!\n", curr); |
| 416 | return -EINVAL; | 419 | return -EINVAL; |
| 417 | } | 420 | } |
| 418 | if (curr->is_flushed == FALSE) { | 421 | if (!curr->is_flushed) { |
| 419 | curr->bridge->driver->cache_flush(); | 422 | curr->bridge->driver->cache_flush(); |
| 420 | curr->is_flushed = TRUE; | 423 | curr->is_flushed = true; |
| 421 | } | 424 | } |
| 422 | ret_val = curr->bridge->driver->insert_memory(curr, pg_start, curr->type); | 425 | ret_val = curr->bridge->driver->insert_memory(curr, pg_start, curr->type); |
| 423 | 426 | ||
| 424 | if (ret_val != 0) | 427 | if (ret_val != 0) |
| 425 | return ret_val; | 428 | return ret_val; |
| 426 | 429 | ||
| 427 | curr->is_bound = TRUE; | 430 | curr->is_bound = true; |
| 428 | curr->pg_start = pg_start; | 431 | curr->pg_start = pg_start; |
| 429 | return 0; | 432 | return 0; |
| 430 | } | 433 | } |
| @@ -446,7 +449,7 @@ int agp_unbind_memory(struct agp_memory *curr) | |||
| 446 | if (curr == NULL) | 449 | if (curr == NULL) |
| 447 | return -EINVAL; | 450 | return -EINVAL; |
| 448 | 451 | ||
| 449 | if (curr->is_bound != TRUE) { | 452 | if (!curr->is_bound) { |
| 450 | printk(KERN_INFO PFX "memory %p was not bound!\n", curr); | 453 | printk(KERN_INFO PFX "memory %p was not bound!\n", curr); |
| 451 | return -EINVAL; | 454 | return -EINVAL; |
| 452 | } | 455 | } |
| @@ -456,7 +459,7 @@ int agp_unbind_memory(struct agp_memory *curr) | |||
| 456 | if (ret_val != 0) | 459 | if (ret_val != 0) |
| 457 | return ret_val; | 460 | return ret_val; |
| 458 | 461 | ||
| 459 | curr->is_bound = FALSE; | 462 | curr->is_bound = false; |
| 460 | curr->pg_start = 0; | 463 | curr->pg_start = 0; |
| 461 | return 0; | 464 | return 0; |
| 462 | } | 465 | } |
| @@ -754,7 +757,7 @@ u32 agp_collect_device_status(struct agp_bridge_data *bridge, u32 requested_mode | |||
| 754 | EXPORT_SYMBOL(agp_collect_device_status); | 757 | EXPORT_SYMBOL(agp_collect_device_status); |
| 755 | 758 | ||
| 756 | 759 | ||
| 757 | void agp_device_command(u32 bridge_agpstat, int agp_v3) | 760 | void agp_device_command(u32 bridge_agpstat, bool agp_v3) |
| 758 | { | 761 | { |
| 759 | struct pci_dev *device = NULL; | 762 | struct pci_dev *device = NULL; |
| 760 | int mode; | 763 | int mode; |
| @@ -818,7 +821,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode) | |||
| 818 | /* If we have 3.5, we can do the isoch stuff. */ | 821 | /* If we have 3.5, we can do the isoch stuff. */ |
| 819 | if (bridge->minor_version >= 5) | 822 | if (bridge->minor_version >= 5) |
| 820 | agp_3_5_enable(bridge); | 823 | agp_3_5_enable(bridge); |
| 821 | agp_device_command(bridge_agpstat, TRUE); | 824 | agp_device_command(bridge_agpstat, true); |
| 822 | return; | 825 | return; |
| 823 | } else { | 826 | } else { |
| 824 | /* Disable calibration cycle in RX91<1> when not in AGP3.0 mode of operation.*/ | 827 | /* Disable calibration cycle in RX91<1> when not in AGP3.0 mode of operation.*/ |
| @@ -835,7 +838,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode) | |||
| 835 | } | 838 | } |
| 836 | 839 | ||
| 837 | /* AGP v<3 */ | 840 | /* AGP v<3 */ |
| 838 | agp_device_command(bridge_agpstat, FALSE); | 841 | agp_device_command(bridge_agpstat, false); |
| 839 | } | 842 | } |
| 840 | EXPORT_SYMBOL(agp_generic_enable); | 843 | EXPORT_SYMBOL(agp_generic_enable); |
| 841 | 844 | ||
| @@ -1083,9 +1086,9 @@ int agp_generic_insert_memory(struct agp_memory * mem, off_t pg_start, int type) | |||
| 1083 | j++; | 1086 | j++; |
| 1084 | } | 1087 | } |
| 1085 | 1088 | ||
| 1086 | if (mem->is_flushed == FALSE) { | 1089 | if (!mem->is_flushed) { |
| 1087 | bridge->driver->cache_flush(); | 1090 | bridge->driver->cache_flush(); |
| 1088 | mem->is_flushed = TRUE; | 1091 | mem->is_flushed = true; |
| 1089 | } | 1092 | } |
| 1090 | 1093 | ||
| 1091 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { | 1094 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { |
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index cbb0444467ba..80d7317f85c9 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c | |||
| @@ -353,9 +353,9 @@ hp_zx1_insert_memory (struct agp_memory *mem, off_t pg_start, int type) | |||
| 353 | j++; | 353 | j++; |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | if (mem->is_flushed == FALSE) { | 356 | if (!mem->is_flushed) { |
| 357 | global_cache_flush(); | 357 | global_cache_flush(); |
| 358 | mem->is_flushed = TRUE; | 358 | mem->is_flushed = true; |
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | for (i = 0, j = io_pg_start; i < mem->page_count; i++) { | 361 | for (i = 0, j = io_pg_start; i < mem->page_count; i++) { |
| @@ -437,7 +437,7 @@ const struct agp_bridge_driver hp_zx1_driver = { | |||
| 437 | .agp_alloc_page = agp_generic_alloc_page, | 437 | .agp_alloc_page = agp_generic_alloc_page, |
| 438 | .agp_destroy_page = agp_generic_destroy_page, | 438 | .agp_destroy_page = agp_generic_destroy_page, |
| 439 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 439 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
| 440 | .cant_use_aperture = 1, | 440 | .cant_use_aperture = true, |
| 441 | }; | 441 | }; |
| 442 | 442 | ||
| 443 | static int __init | 443 | static int __init |
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index 76f581c85a7d..e587eebebc67 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c | |||
| @@ -580,7 +580,7 @@ const struct agp_bridge_driver intel_i460_driver = { | |||
| 580 | .alloc_by_type = agp_generic_alloc_by_type, | 580 | .alloc_by_type = agp_generic_alloc_by_type, |
| 581 | .free_by_type = agp_generic_free_by_type, | 581 | .free_by_type = agp_generic_free_by_type, |
| 582 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 582 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
| 583 | .cant_use_aperture = 1, | 583 | .cant_use_aperture = true, |
| 584 | }; | 584 | }; |
| 585 | 585 | ||
| 586 | static int __devinit agp_intel_i460_probe(struct pci_dev *pdev, | 586 | static int __devinit agp_intel_i460_probe(struct pci_dev *pdev, |
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index eeea50a1d22a..df702642ab8f 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
| @@ -34,6 +34,12 @@ | |||
| 34 | #define PCI_DEVICE_ID_INTEL_Q33_IG 0x29D2 | 34 | #define PCI_DEVICE_ID_INTEL_Q33_IG 0x29D2 |
| 35 | #define PCI_DEVICE_ID_INTEL_IGD_HB 0x2A40 | 35 | #define PCI_DEVICE_ID_INTEL_IGD_HB 0x2A40 |
| 36 | #define PCI_DEVICE_ID_INTEL_IGD_IG 0x2A42 | 36 | #define PCI_DEVICE_ID_INTEL_IGD_IG 0x2A42 |
| 37 | #define PCI_DEVICE_ID_INTEL_IGD_E_HB 0x2E00 | ||
| 38 | #define PCI_DEVICE_ID_INTEL_IGD_E_IG 0x2E02 | ||
| 39 | #define PCI_DEVICE_ID_INTEL_Q45_HB 0x2E10 | ||
| 40 | #define PCI_DEVICE_ID_INTEL_Q45_IG 0x2E12 | ||
| 41 | #define PCI_DEVICE_ID_INTEL_G45_HB 0x2E20 | ||
| 42 | #define PCI_DEVICE_ID_INTEL_G45_IG 0x2E22 | ||
| 37 | 43 | ||
| 38 | /* cover 915 and 945 variants */ | 44 | /* cover 915 and 945 variants */ |
| 39 | #define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \ | 45 | #define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \ |
| @@ -55,6 +61,10 @@ | |||
| 55 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \ | 61 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \ |
| 56 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q33_HB) | 62 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q33_HB) |
| 57 | 63 | ||
| 64 | #define IS_G4X (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_E_HB || \ | ||
| 65 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \ | ||
| 66 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB) | ||
| 67 | |||
| 58 | extern int agp_memory_reserved; | 68 | extern int agp_memory_reserved; |
| 59 | 69 | ||
| 60 | 70 | ||
| @@ -80,8 +90,13 @@ extern int agp_memory_reserved; | |||
| 80 | #define I915_PTEADDR 0x1C | 90 | #define I915_PTEADDR 0x1C |
| 81 | #define I915_GMCH_GMS_STOLEN_48M (0x6 << 4) | 91 | #define I915_GMCH_GMS_STOLEN_48M (0x6 << 4) |
| 82 | #define I915_GMCH_GMS_STOLEN_64M (0x7 << 4) | 92 | #define I915_GMCH_GMS_STOLEN_64M (0x7 << 4) |
| 83 | #define G33_GMCH_GMS_STOLEN_128M (0x8 << 4) | 93 | #define G33_GMCH_GMS_STOLEN_128M (0x8 << 4) |
| 84 | #define G33_GMCH_GMS_STOLEN_256M (0x9 << 4) | 94 | #define G33_GMCH_GMS_STOLEN_256M (0x9 << 4) |
| 95 | #define INTEL_GMCH_GMS_STOLEN_96M (0xa << 4) | ||
| 96 | #define INTEL_GMCH_GMS_STOLEN_160M (0xb << 4) | ||
| 97 | #define INTEL_GMCH_GMS_STOLEN_224M (0xc << 4) | ||
| 98 | #define INTEL_GMCH_GMS_STOLEN_352M (0xd << 4) | ||
| 99 | |||
| 85 | #define I915_IFPADDR 0x60 | 100 | #define I915_IFPADDR 0x60 |
| 86 | 101 | ||
| 87 | /* Intel 965G registers */ | 102 | /* Intel 965G registers */ |
| @@ -325,7 +340,7 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start, | |||
| 325 | out: | 340 | out: |
| 326 | ret = 0; | 341 | ret = 0; |
| 327 | out_err: | 342 | out_err: |
| 328 | mem->is_flushed = 1; | 343 | mem->is_flushed = true; |
| 329 | return ret; | 344 | return ret; |
| 330 | } | 345 | } |
| 331 | 346 | ||
| @@ -418,9 +433,11 @@ static void intel_i810_free_by_type(struct agp_memory *curr) | |||
| 418 | if (curr->page_count == 4) | 433 | if (curr->page_count == 4) |
| 419 | i8xx_destroy_pages(gart_to_virt(curr->memory[0])); | 434 | i8xx_destroy_pages(gart_to_virt(curr->memory[0])); |
| 420 | else { | 435 | else { |
| 421 | agp_bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[0]), | 436 | void *va = gart_to_virt(curr->memory[0]); |
| 437 | |||
| 438 | agp_bridge->driver->agp_destroy_page(va, | ||
| 422 | AGP_PAGE_DESTROY_UNMAP); | 439 | AGP_PAGE_DESTROY_UNMAP); |
| 423 | agp_bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[0]), | 440 | agp_bridge->driver->agp_destroy_page(va, |
| 424 | AGP_PAGE_DESTROY_FREE); | 441 | AGP_PAGE_DESTROY_FREE); |
| 425 | } | 442 | } |
| 426 | agp_free_page_array(curr); | 443 | agp_free_page_array(curr); |
| @@ -504,6 +521,10 @@ static void intel_i830_init_gtt_entries(void) | |||
| 504 | size = 512; | 521 | size = 512; |
| 505 | } | 522 | } |
| 506 | size += 4; | 523 | size += 4; |
| 524 | } else if (IS_G4X) { | ||
| 525 | /* On 4 series hardware, GTT stolen is separate from graphics | ||
| 526 | * stolen, ignore it in stolen gtt entries counting */ | ||
| 527 | size = 0; | ||
| 507 | } else { | 528 | } else { |
| 508 | /* On previous hardware, the GTT size was just what was | 529 | /* On previous hardware, the GTT size was just what was |
| 509 | * required to map the aperture. | 530 | * required to map the aperture. |
| @@ -552,30 +573,54 @@ static void intel_i830_init_gtt_entries(void) | |||
| 552 | break; | 573 | break; |
| 553 | case I915_GMCH_GMS_STOLEN_48M: | 574 | case I915_GMCH_GMS_STOLEN_48M: |
| 554 | /* Check it's really I915G */ | 575 | /* Check it's really I915G */ |
| 555 | if (IS_I915 || IS_I965 || IS_G33) | 576 | if (IS_I915 || IS_I965 || IS_G33 || IS_G4X) |
| 556 | gtt_entries = MB(48) - KB(size); | 577 | gtt_entries = MB(48) - KB(size); |
| 557 | else | 578 | else |
| 558 | gtt_entries = 0; | 579 | gtt_entries = 0; |
| 559 | break; | 580 | break; |
| 560 | case I915_GMCH_GMS_STOLEN_64M: | 581 | case I915_GMCH_GMS_STOLEN_64M: |
| 561 | /* Check it's really I915G */ | 582 | /* Check it's really I915G */ |
| 562 | if (IS_I915 || IS_I965 || IS_G33) | 583 | if (IS_I915 || IS_I965 || IS_G33 || IS_G4X) |
| 563 | gtt_entries = MB(64) - KB(size); | 584 | gtt_entries = MB(64) - KB(size); |
| 564 | else | 585 | else |
| 565 | gtt_entries = 0; | 586 | gtt_entries = 0; |
| 566 | break; | 587 | break; |
| 567 | case G33_GMCH_GMS_STOLEN_128M: | 588 | case G33_GMCH_GMS_STOLEN_128M: |
| 568 | if (IS_G33) | 589 | if (IS_G33 || IS_I965 || IS_G4X) |
| 569 | gtt_entries = MB(128) - KB(size); | 590 | gtt_entries = MB(128) - KB(size); |
| 570 | else | 591 | else |
| 571 | gtt_entries = 0; | 592 | gtt_entries = 0; |
| 572 | break; | 593 | break; |
| 573 | case G33_GMCH_GMS_STOLEN_256M: | 594 | case G33_GMCH_GMS_STOLEN_256M: |
| 574 | if (IS_G33) | 595 | if (IS_G33 || IS_I965 || IS_G4X) |
| 575 | gtt_entries = MB(256) - KB(size); | 596 | gtt_entries = MB(256) - KB(size); |
| 576 | else | 597 | else |
| 577 | gtt_entries = 0; | 598 | gtt_entries = 0; |
| 578 | break; | 599 | break; |
| 600 | case INTEL_GMCH_GMS_STOLEN_96M: | ||
| 601 | if (IS_I965 || IS_G4X) | ||
| 602 | gtt_entries = MB(96) - KB(size); | ||
| 603 | else | ||
| 604 | gtt_entries = 0; | ||
| 605 | break; | ||
| 606 | case INTEL_GMCH_GMS_STOLEN_160M: | ||
| 607 | if (IS_I965 || IS_G4X) | ||
| 608 | gtt_entries = MB(160) - KB(size); | ||
| 609 | else | ||
| 610 | gtt_entries = 0; | ||
| 611 | break; | ||
| 612 | case INTEL_GMCH_GMS_STOLEN_224M: | ||
| 613 | if (IS_I965 || IS_G4X) | ||
| 614 | gtt_entries = MB(224) - KB(size); | ||
| 615 | else | ||
| 616 | gtt_entries = 0; | ||
| 617 | break; | ||
| 618 | case INTEL_GMCH_GMS_STOLEN_352M: | ||
| 619 | if (IS_I965 || IS_G4X) | ||
| 620 | gtt_entries = MB(352) - KB(size); | ||
| 621 | else | ||
| 622 | gtt_entries = 0; | ||
| 623 | break; | ||
| 579 | default: | 624 | default: |
| 580 | gtt_entries = 0; | 625 | gtt_entries = 0; |
| 581 | break; | 626 | break; |
| @@ -793,7 +838,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start, | |||
| 793 | out: | 838 | out: |
| 794 | ret = 0; | 839 | ret = 0; |
| 795 | out_err: | 840 | out_err: |
| 796 | mem->is_flushed = 1; | 841 | mem->is_flushed = true; |
| 797 | return ret; | 842 | return ret; |
| 798 | } | 843 | } |
| 799 | 844 | ||
| @@ -903,7 +948,7 @@ static void intel_i9xx_setup_flush(void) | |||
| 903 | intel_private.ifp_resource.flags = IORESOURCE_MEM; | 948 | intel_private.ifp_resource.flags = IORESOURCE_MEM; |
| 904 | 949 | ||
| 905 | /* Setup chipset flush for 915 */ | 950 | /* Setup chipset flush for 915 */ |
| 906 | if (IS_I965 || IS_G33) { | 951 | if (IS_I965 || IS_G33 || IS_G4X) { |
| 907 | intel_i965_g33_setup_chipset_flush(); | 952 | intel_i965_g33_setup_chipset_flush(); |
| 908 | } else { | 953 | } else { |
| 909 | intel_i915_setup_chipset_flush(); | 954 | intel_i915_setup_chipset_flush(); |
| @@ -1020,7 +1065,7 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start, | |||
| 1020 | out: | 1065 | out: |
| 1021 | ret = 0; | 1066 | ret = 0; |
| 1022 | out_err: | 1067 | out_err: |
| 1023 | mem->is_flushed = 1; | 1068 | mem->is_flushed = true; |
| 1024 | return ret; | 1069 | return ret; |
| 1025 | } | 1070 | } |
| 1026 | 1071 | ||
| @@ -1134,53 +1179,64 @@ static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge, | |||
| 1134 | return addr | bridge->driver->masks[type].mask; | 1179 | return addr | bridge->driver->masks[type].mask; |
| 1135 | } | 1180 | } |
| 1136 | 1181 | ||
| 1182 | static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) | ||
| 1183 | { | ||
| 1184 | switch (agp_bridge->dev->device) { | ||
| 1185 | case PCI_DEVICE_ID_INTEL_IGD_HB: | ||
| 1186 | case PCI_DEVICE_ID_INTEL_IGD_E_HB: | ||
| 1187 | case PCI_DEVICE_ID_INTEL_Q45_HB: | ||
| 1188 | case PCI_DEVICE_ID_INTEL_G45_HB: | ||
| 1189 | *gtt_offset = *gtt_size = MB(2); | ||
| 1190 | break; | ||
| 1191 | default: | ||
| 1192 | *gtt_offset = *gtt_size = KB(512); | ||
| 1193 | } | ||
| 1194 | } | ||
| 1195 | |||
| 1137 | /* The intel i965 automatically initializes the agp aperture during POST. | 1196 | /* The intel i965 automatically initializes the agp aperture during POST. |
| 1138 | * Use the memory already set aside for in the GTT. | 1197 | * Use the memory already set aside for in the GTT. |
| 1139 | */ | 1198 | */ |
| 1140 | static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge) | 1199 | static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge) |
| 1141 | { | 1200 | { |
| 1142 | int page_order; | 1201 | int page_order; |
| 1143 | struct aper_size_info_fixed *size; | 1202 | struct aper_size_info_fixed *size; |
| 1144 | int num_entries; | 1203 | int num_entries; |
| 1145 | u32 temp; | 1204 | u32 temp; |
| 1146 | int gtt_offset, gtt_size; | 1205 | int gtt_offset, gtt_size; |
| 1147 | 1206 | ||
| 1148 | size = agp_bridge->current_size; | 1207 | size = agp_bridge->current_size; |
| 1149 | page_order = size->page_order; | 1208 | page_order = size->page_order; |
| 1150 | num_entries = size->num_entries; | 1209 | num_entries = size->num_entries; |
| 1151 | agp_bridge->gatt_table_real = NULL; | 1210 | agp_bridge->gatt_table_real = NULL; |
| 1152 | 1211 | ||
| 1153 | pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); | 1212 | pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); |
| 1154 | 1213 | ||
| 1155 | temp &= 0xfff00000; | 1214 | temp &= 0xfff00000; |
| 1156 | 1215 | ||
| 1157 | if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_HB) | 1216 | intel_i965_get_gtt_range(>t_offset, >t_size); |
| 1158 | gtt_offset = gtt_size = MB(2); | ||
| 1159 | else | ||
| 1160 | gtt_offset = gtt_size = KB(512); | ||
| 1161 | 1217 | ||
| 1162 | intel_private.gtt = ioremap((temp + gtt_offset) , gtt_size); | 1218 | intel_private.gtt = ioremap((temp + gtt_offset) , gtt_size); |
| 1163 | 1219 | ||
| 1164 | if (!intel_private.gtt) | 1220 | if (!intel_private.gtt) |
| 1165 | return -ENOMEM; | 1221 | return -ENOMEM; |
| 1166 | 1222 | ||
| 1167 | intel_private.registers = ioremap(temp, 128 * 4096); | 1223 | intel_private.registers = ioremap(temp, 128 * 4096); |
| 1168 | if (!intel_private.registers) { | 1224 | if (!intel_private.registers) { |
| 1169 | iounmap(intel_private.gtt); | 1225 | iounmap(intel_private.gtt); |
| 1170 | return -ENOMEM; | 1226 | return -ENOMEM; |
| 1171 | } | 1227 | } |
| 1172 | 1228 | ||
| 1173 | temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000; | 1229 | temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000; |
| 1174 | global_cache_flush(); /* FIXME: ? */ | 1230 | global_cache_flush(); /* FIXME: ? */ |
| 1175 | 1231 | ||
| 1176 | /* we have to call this as early as possible after the MMIO base address is known */ | 1232 | /* we have to call this as early as possible after the MMIO base address is known */ |
| 1177 | intel_i830_init_gtt_entries(); | 1233 | intel_i830_init_gtt_entries(); |
| 1178 | 1234 | ||
| 1179 | agp_bridge->gatt_table = NULL; | 1235 | agp_bridge->gatt_table = NULL; |
| 1180 | 1236 | ||
| 1181 | agp_bridge->gatt_bus_addr = temp; | 1237 | agp_bridge->gatt_bus_addr = temp; |
| 1182 | 1238 | ||
| 1183 | return 0; | 1239 | return 0; |
| 1184 | } | 1240 | } |
| 1185 | 1241 | ||
| 1186 | 1242 | ||
| @@ -1656,7 +1712,7 @@ static const struct agp_bridge_driver intel_810_driver = { | |||
| 1656 | .aperture_sizes = intel_i810_sizes, | 1712 | .aperture_sizes = intel_i810_sizes, |
| 1657 | .size_type = FIXED_APER_SIZE, | 1713 | .size_type = FIXED_APER_SIZE, |
| 1658 | .num_aperture_sizes = 2, | 1714 | .num_aperture_sizes = 2, |
| 1659 | .needs_scratch_page = TRUE, | 1715 | .needs_scratch_page = true, |
| 1660 | .configure = intel_i810_configure, | 1716 | .configure = intel_i810_configure, |
| 1661 | .fetch_size = intel_i810_fetch_size, | 1717 | .fetch_size = intel_i810_fetch_size, |
| 1662 | .cleanup = intel_i810_cleanup, | 1718 | .cleanup = intel_i810_cleanup, |
| @@ -1697,7 +1753,7 @@ static const struct agp_bridge_driver intel_815_driver = { | |||
| 1697 | .free_by_type = agp_generic_free_by_type, | 1753 | .free_by_type = agp_generic_free_by_type, |
| 1698 | .agp_alloc_page = agp_generic_alloc_page, | 1754 | .agp_alloc_page = agp_generic_alloc_page, |
| 1699 | .agp_destroy_page = agp_generic_destroy_page, | 1755 | .agp_destroy_page = agp_generic_destroy_page, |
| 1700 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 1756 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
| 1701 | }; | 1757 | }; |
| 1702 | 1758 | ||
| 1703 | static const struct agp_bridge_driver intel_830_driver = { | 1759 | static const struct agp_bridge_driver intel_830_driver = { |
| @@ -1705,7 +1761,7 @@ static const struct agp_bridge_driver intel_830_driver = { | |||
| 1705 | .aperture_sizes = intel_i830_sizes, | 1761 | .aperture_sizes = intel_i830_sizes, |
| 1706 | .size_type = FIXED_APER_SIZE, | 1762 | .size_type = FIXED_APER_SIZE, |
| 1707 | .num_aperture_sizes = 4, | 1763 | .num_aperture_sizes = 4, |
| 1708 | .needs_scratch_page = TRUE, | 1764 | .needs_scratch_page = true, |
| 1709 | .configure = intel_i830_configure, | 1765 | .configure = intel_i830_configure, |
| 1710 | .fetch_size = intel_i830_fetch_size, | 1766 | .fetch_size = intel_i830_fetch_size, |
| 1711 | .cleanup = intel_i830_cleanup, | 1767 | .cleanup = intel_i830_cleanup, |
| @@ -1876,7 +1932,7 @@ static const struct agp_bridge_driver intel_915_driver = { | |||
| 1876 | .aperture_sizes = intel_i830_sizes, | 1932 | .aperture_sizes = intel_i830_sizes, |
| 1877 | .size_type = FIXED_APER_SIZE, | 1933 | .size_type = FIXED_APER_SIZE, |
| 1878 | .num_aperture_sizes = 4, | 1934 | .num_aperture_sizes = 4, |
| 1879 | .needs_scratch_page = TRUE, | 1935 | .needs_scratch_page = true, |
| 1880 | .configure = intel_i915_configure, | 1936 | .configure = intel_i915_configure, |
| 1881 | .fetch_size = intel_i9xx_fetch_size, | 1937 | .fetch_size = intel_i9xx_fetch_size, |
| 1882 | .cleanup = intel_i915_cleanup, | 1938 | .cleanup = intel_i915_cleanup, |
| @@ -1898,28 +1954,28 @@ static const struct agp_bridge_driver intel_915_driver = { | |||
| 1898 | }; | 1954 | }; |
| 1899 | 1955 | ||
| 1900 | static const struct agp_bridge_driver intel_i965_driver = { | 1956 | static const struct agp_bridge_driver intel_i965_driver = { |
| 1901 | .owner = THIS_MODULE, | 1957 | .owner = THIS_MODULE, |
| 1902 | .aperture_sizes = intel_i830_sizes, | 1958 | .aperture_sizes = intel_i830_sizes, |
| 1903 | .size_type = FIXED_APER_SIZE, | 1959 | .size_type = FIXED_APER_SIZE, |
| 1904 | .num_aperture_sizes = 4, | 1960 | .num_aperture_sizes = 4, |
| 1905 | .needs_scratch_page = TRUE, | 1961 | .needs_scratch_page = true, |
| 1906 | .configure = intel_i915_configure, | 1962 | .configure = intel_i915_configure, |
| 1907 | .fetch_size = intel_i9xx_fetch_size, | 1963 | .fetch_size = intel_i9xx_fetch_size, |
| 1908 | .cleanup = intel_i915_cleanup, | 1964 | .cleanup = intel_i915_cleanup, |
| 1909 | .tlb_flush = intel_i810_tlbflush, | 1965 | .tlb_flush = intel_i810_tlbflush, |
| 1910 | .mask_memory = intel_i965_mask_memory, | 1966 | .mask_memory = intel_i965_mask_memory, |
| 1911 | .masks = intel_i810_masks, | 1967 | .masks = intel_i810_masks, |
| 1912 | .agp_enable = intel_i810_agp_enable, | 1968 | .agp_enable = intel_i810_agp_enable, |
| 1913 | .cache_flush = global_cache_flush, | 1969 | .cache_flush = global_cache_flush, |
| 1914 | .create_gatt_table = intel_i965_create_gatt_table, | 1970 | .create_gatt_table = intel_i965_create_gatt_table, |
| 1915 | .free_gatt_table = intel_i830_free_gatt_table, | 1971 | .free_gatt_table = intel_i830_free_gatt_table, |
| 1916 | .insert_memory = intel_i915_insert_entries, | 1972 | .insert_memory = intel_i915_insert_entries, |
| 1917 | .remove_memory = intel_i915_remove_entries, | 1973 | .remove_memory = intel_i915_remove_entries, |
| 1918 | .alloc_by_type = intel_i830_alloc_by_type, | 1974 | .alloc_by_type = intel_i830_alloc_by_type, |
| 1919 | .free_by_type = intel_i810_free_by_type, | 1975 | .free_by_type = intel_i810_free_by_type, |
| 1920 | .agp_alloc_page = agp_generic_alloc_page, | 1976 | .agp_alloc_page = agp_generic_alloc_page, |
| 1921 | .agp_destroy_page = agp_generic_destroy_page, | 1977 | .agp_destroy_page = agp_generic_destroy_page, |
| 1922 | .agp_type_to_mask_type = intel_i830_type_to_mask_type, | 1978 | .agp_type_to_mask_type = intel_i830_type_to_mask_type, |
| 1923 | .chipset_flush = intel_i915_chipset_flush, | 1979 | .chipset_flush = intel_i915_chipset_flush, |
| 1924 | }; | 1980 | }; |
| 1925 | 1981 | ||
| @@ -1948,28 +2004,28 @@ static const struct agp_bridge_driver intel_7505_driver = { | |||
| 1948 | }; | 2004 | }; |
| 1949 | 2005 | ||
| 1950 | static const struct agp_bridge_driver intel_g33_driver = { | 2006 | static const struct agp_bridge_driver intel_g33_driver = { |
| 1951 | .owner = THIS_MODULE, | 2007 | .owner = THIS_MODULE, |
| 1952 | .aperture_sizes = intel_i830_sizes, | 2008 | .aperture_sizes = intel_i830_sizes, |
| 1953 | .size_type = FIXED_APER_SIZE, | 2009 | .size_type = FIXED_APER_SIZE, |
| 1954 | .num_aperture_sizes = 4, | 2010 | .num_aperture_sizes = 4, |
| 1955 | .needs_scratch_page = TRUE, | 2011 | .needs_scratch_page = true, |
| 1956 | .configure = intel_i915_configure, | 2012 | .configure = intel_i915_configure, |
| 1957 | .fetch_size = intel_i9xx_fetch_size, | 2013 | .fetch_size = intel_i9xx_fetch_size, |
| 1958 | .cleanup = intel_i915_cleanup, | 2014 | .cleanup = intel_i915_cleanup, |
| 1959 | .tlb_flush = intel_i810_tlbflush, | 2015 | .tlb_flush = intel_i810_tlbflush, |
| 1960 | .mask_memory = intel_i965_mask_memory, | 2016 | .mask_memory = intel_i965_mask_memory, |
| 1961 | .masks = intel_i810_masks, | 2017 | .masks = intel_i810_masks, |
| 1962 | .agp_enable = intel_i810_agp_enable, | 2018 | .agp_enable = intel_i810_agp_enable, |
| 1963 | .cache_flush = global_cache_flush, | 2019 | .cache_flush = global_cache_flush, |
| 1964 | .create_gatt_table = intel_i915_create_gatt_table, | 2020 | .create_gatt_table = intel_i915_create_gatt_table, |
| 1965 | .free_gatt_table = intel_i830_free_gatt_table, | 2021 | .free_gatt_table = intel_i830_free_gatt_table, |
| 1966 | .insert_memory = intel_i915_insert_entries, | 2022 | .insert_memory = intel_i915_insert_entries, |
| 1967 | .remove_memory = intel_i915_remove_entries, | 2023 | .remove_memory = intel_i915_remove_entries, |
| 1968 | .alloc_by_type = intel_i830_alloc_by_type, | 2024 | .alloc_by_type = intel_i830_alloc_by_type, |
| 1969 | .free_by_type = intel_i810_free_by_type, | 2025 | .free_by_type = intel_i810_free_by_type, |
| 1970 | .agp_alloc_page = agp_generic_alloc_page, | 2026 | .agp_alloc_page = agp_generic_alloc_page, |
| 1971 | .agp_destroy_page = agp_generic_destroy_page, | 2027 | .agp_destroy_page = agp_generic_destroy_page, |
| 1972 | .agp_type_to_mask_type = intel_i830_type_to_mask_type, | 2028 | .agp_type_to_mask_type = intel_i830_type_to_mask_type, |
| 1973 | .chipset_flush = intel_i915_chipset_flush, | 2029 | .chipset_flush = intel_i915_chipset_flush, |
| 1974 | }; | 2030 | }; |
| 1975 | 2031 | ||
| @@ -2063,6 +2119,12 @@ static const struct intel_driver_description { | |||
| 2063 | NULL, &intel_g33_driver }, | 2119 | NULL, &intel_g33_driver }, |
| 2064 | { PCI_DEVICE_ID_INTEL_IGD_HB, PCI_DEVICE_ID_INTEL_IGD_IG, 0, | 2120 | { PCI_DEVICE_ID_INTEL_IGD_HB, PCI_DEVICE_ID_INTEL_IGD_IG, 0, |
| 2065 | "Intel Integrated Graphics Device", NULL, &intel_i965_driver }, | 2121 | "Intel Integrated Graphics Device", NULL, &intel_i965_driver }, |
| 2122 | { PCI_DEVICE_ID_INTEL_IGD_E_HB, PCI_DEVICE_ID_INTEL_IGD_E_IG, 0, | ||
| 2123 | "Intel Integrated Graphics Device", NULL, &intel_i965_driver }, | ||
| 2124 | { PCI_DEVICE_ID_INTEL_Q45_HB, PCI_DEVICE_ID_INTEL_Q45_IG, 0, | ||
| 2125 | "Q45/Q43", NULL, &intel_i965_driver }, | ||
| 2126 | { PCI_DEVICE_ID_INTEL_G45_HB, PCI_DEVICE_ID_INTEL_G45_IG, 0, | ||
| 2127 | "G45/G43", NULL, &intel_i965_driver }, | ||
| 2066 | { 0, 0, 0, NULL, NULL, NULL } | 2128 | { 0, 0, 0, NULL, NULL, NULL } |
| 2067 | }; | 2129 | }; |
| 2068 | 2130 | ||
| @@ -2254,6 +2316,9 @@ static struct pci_device_id agp_intel_pci_table[] = { | |||
| 2254 | ID(PCI_DEVICE_ID_INTEL_Q35_HB), | 2316 | ID(PCI_DEVICE_ID_INTEL_Q35_HB), |
| 2255 | ID(PCI_DEVICE_ID_INTEL_Q33_HB), | 2317 | ID(PCI_DEVICE_ID_INTEL_Q33_HB), |
| 2256 | ID(PCI_DEVICE_ID_INTEL_IGD_HB), | 2318 | ID(PCI_DEVICE_ID_INTEL_IGD_HB), |
| 2319 | ID(PCI_DEVICE_ID_INTEL_IGD_E_HB), | ||
| 2320 | ID(PCI_DEVICE_ID_INTEL_Q45_HB), | ||
| 2321 | ID(PCI_DEVICE_ID_INTEL_G45_HB), | ||
| 2257 | { } | 2322 | { } |
| 2258 | }; | 2323 | }; |
| 2259 | 2324 | ||
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c index 225ed2a53d45..eaceb61ba2dc 100644 --- a/drivers/char/agp/nvidia-agp.c +++ b/drivers/char/agp/nvidia-agp.c | |||
| @@ -214,9 +214,9 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type | |||
| 214 | return -EBUSY; | 214 | return -EBUSY; |
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | if (mem->is_flushed == FALSE) { | 217 | if (!mem->is_flushed) { |
| 218 | global_cache_flush(); | 218 | global_cache_flush(); |
| 219 | mem->is_flushed = TRUE; | 219 | mem->is_flushed = true; |
| 220 | } | 220 | } |
| 221 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { | 221 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { |
| 222 | writel(agp_bridge->driver->mask_memory(agp_bridge, | 222 | writel(agp_bridge->driver->mask_memory(agp_bridge, |
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c index 2939e3570f9d..8c42dcc5958c 100644 --- a/drivers/char/agp/parisc-agp.c +++ b/drivers/char/agp/parisc-agp.c | |||
| @@ -141,9 +141,9 @@ parisc_agp_insert_memory(struct agp_memory *mem, off_t pg_start, int type) | |||
| 141 | j++; | 141 | j++; |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | if (mem->is_flushed == FALSE) { | 144 | if (!mem->is_flushed) { |
| 145 | global_cache_flush(); | 145 | global_cache_flush(); |
| 146 | mem->is_flushed = TRUE; | 146 | mem->is_flushed = true; |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | for (i = 0, j = io_pg_start; i < mem->page_count; i++) { | 149 | for (i = 0, j = io_pg_start; i < mem->page_count; i++) { |
| @@ -226,7 +226,7 @@ static const struct agp_bridge_driver parisc_agp_driver = { | |||
| 226 | .agp_alloc_page = agp_generic_alloc_page, | 226 | .agp_alloc_page = agp_generic_alloc_page, |
| 227 | .agp_destroy_page = agp_generic_destroy_page, | 227 | .agp_destroy_page = agp_generic_destroy_page, |
| 228 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 228 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
| 229 | .cant_use_aperture = 1, | 229 | .cant_use_aperture = true, |
| 230 | }; | 230 | }; |
| 231 | 231 | ||
| 232 | static int __init | 232 | static int __init |
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c index 98cf8abb3e57..b972d83bb1b2 100644 --- a/drivers/char/agp/sgi-agp.c +++ b/drivers/char/agp/sgi-agp.c | |||
| @@ -182,9 +182,9 @@ static int sgi_tioca_insert_memory(struct agp_memory *mem, off_t pg_start, | |||
| 182 | j++; | 182 | j++; |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | if (mem->is_flushed == FALSE) { | 185 | if (!mem->is_flushed) { |
| 186 | bridge->driver->cache_flush(); | 186 | bridge->driver->cache_flush(); |
| 187 | mem->is_flushed = TRUE; | 187 | mem->is_flushed = true; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { | 190 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { |
| @@ -264,8 +264,8 @@ const struct agp_bridge_driver sgi_tioca_driver = { | |||
| 264 | .agp_alloc_page = sgi_tioca_alloc_page, | 264 | .agp_alloc_page = sgi_tioca_alloc_page, |
| 265 | .agp_destroy_page = agp_generic_destroy_page, | 265 | .agp_destroy_page = agp_generic_destroy_page, |
| 266 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 266 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
| 267 | .cant_use_aperture = 1, | 267 | .cant_use_aperture = true, |
| 268 | .needs_scratch_page = 0, | 268 | .needs_scratch_page = false, |
| 269 | .num_aperture_sizes = 1, | 269 | .num_aperture_sizes = 1, |
| 270 | }; | 270 | }; |
| 271 | 271 | ||
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c index e08934e58f32..0e054c134490 100644 --- a/drivers/char/agp/sworks-agp.c +++ b/drivers/char/agp/sworks-agp.c | |||
| @@ -339,9 +339,9 @@ static int serverworks_insert_memory(struct agp_memory *mem, | |||
| 339 | j++; | 339 | j++; |
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | if (mem->is_flushed == FALSE) { | 342 | if (!mem->is_flushed) { |
| 343 | global_cache_flush(); | 343 | global_cache_flush(); |
| 344 | mem->is_flushed = TRUE; | 344 | mem->is_flushed = true; |
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { | 347 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { |
| @@ -412,7 +412,7 @@ static void serverworks_agp_enable(struct agp_bridge_data *bridge, u32 mode) | |||
| 412 | bridge->capndx + PCI_AGP_COMMAND, | 412 | bridge->capndx + PCI_AGP_COMMAND, |
| 413 | command); | 413 | command); |
| 414 | 414 | ||
| 415 | agp_device_command(command, 0); | 415 | agp_device_command(command, false); |
| 416 | } | 416 | } |
| 417 | 417 | ||
| 418 | static const struct agp_bridge_driver sworks_driver = { | 418 | static const struct agp_bridge_driver sworks_driver = { |
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 42c0a600b1ac..d2fa3cfca02a 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
| @@ -281,10 +281,10 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode) | |||
| 281 | 281 | ||
| 282 | if (uninorth_rev >= 0x30) { | 282 | if (uninorth_rev >= 0x30) { |
| 283 | /* This is an AGP V3 */ | 283 | /* This is an AGP V3 */ |
| 284 | agp_device_command(command, (status & AGPSTAT_MODE_3_0)); | 284 | agp_device_command(command, (status & AGPSTAT_MODE_3_0) != 0); |
| 285 | } else { | 285 | } else { |
| 286 | /* AGP V2 */ | 286 | /* AGP V2 */ |
| 287 | agp_device_command(command, 0); | 287 | agp_device_command(command, false); |
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | uninorth_tlbflush(NULL); | 290 | uninorth_tlbflush(NULL); |
| @@ -511,7 +511,7 @@ const struct agp_bridge_driver uninorth_agp_driver = { | |||
| 511 | .agp_alloc_page = agp_generic_alloc_page, | 511 | .agp_alloc_page = agp_generic_alloc_page, |
| 512 | .agp_destroy_page = agp_generic_destroy_page, | 512 | .agp_destroy_page = agp_generic_destroy_page, |
| 513 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 513 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
| 514 | .cant_use_aperture = 1, | 514 | .cant_use_aperture = true, |
| 515 | }; | 515 | }; |
| 516 | 516 | ||
| 517 | const struct agp_bridge_driver u3_agp_driver = { | 517 | const struct agp_bridge_driver u3_agp_driver = { |
| @@ -536,8 +536,8 @@ const struct agp_bridge_driver u3_agp_driver = { | |||
| 536 | .agp_alloc_page = agp_generic_alloc_page, | 536 | .agp_alloc_page = agp_generic_alloc_page, |
| 537 | .agp_destroy_page = agp_generic_destroy_page, | 537 | .agp_destroy_page = agp_generic_destroy_page, |
| 538 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 538 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
| 539 | .cant_use_aperture = 1, | 539 | .cant_use_aperture = true, |
| 540 | .needs_scratch_page = 1, | 540 | .needs_scratch_page = true, |
| 541 | }; | 541 | }; |
| 542 | 542 | ||
| 543 | static struct agp_device_ids uninorth_agp_device_ids[] __devinitdata = { | 543 | static struct agp_device_ids uninorth_agp_device_ids[] __devinitdata = { |
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c index 0ecc54d327bc..7b36476dff41 100644 --- a/drivers/char/agp/via-agp.c +++ b/drivers/char/agp/via-agp.c | |||
| @@ -389,11 +389,20 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata = | |||
| 389 | .device_id = PCI_DEVICE_ID_VIA_VT3324, | 389 | .device_id = PCI_DEVICE_ID_VIA_VT3324, |
| 390 | .chipset_name = "CX700", | 390 | .chipset_name = "CX700", |
| 391 | }, | 391 | }, |
| 392 | /* VT3336 */ | 392 | /* VT3336 - this is a chipset for AMD Athlon/K8 CPU. Due to K8's unique |
| 393 | * architecture, the AGP resource and behavior are different from | ||
| 394 | * the traditional AGP which resides only in chipset. AGP is used | ||
| 395 | * by 3D driver which wasn't available for the VT3336 and VT3364 | ||
| 396 | * generation until now. Unfortunately, by testing, VT3364 works | ||
| 397 | * but VT3336 doesn't. - explaination from via, just leave this as | ||
| 398 | * as a placeholder to avoid future patches adding it back in. | ||
| 399 | */ | ||
| 400 | #if 0 | ||
| 393 | { | 401 | { |
| 394 | .device_id = PCI_DEVICE_ID_VIA_VT3336, | 402 | .device_id = PCI_DEVICE_ID_VIA_VT3336, |
| 395 | .chipset_name = "VT3336", | 403 | .chipset_name = "VT3336", |
| 396 | }, | 404 | }, |
| 405 | #endif | ||
| 397 | /* P4M890 */ | 406 | /* P4M890 */ |
| 398 | { | 407 | { |
| 399 | .device_id = PCI_DEVICE_ID_VIA_P4M890, | 408 | .device_id = PCI_DEVICE_ID_VIA_P4M890, |
| @@ -546,8 +555,8 @@ static const struct pci_device_id agp_via_pci_table[] = { | |||
| 546 | ID(PCI_DEVICE_ID_VIA_3296_0), | 555 | ID(PCI_DEVICE_ID_VIA_3296_0), |
| 547 | ID(PCI_DEVICE_ID_VIA_P4M800CE), | 556 | ID(PCI_DEVICE_ID_VIA_P4M800CE), |
| 548 | ID(PCI_DEVICE_ID_VIA_VT3324), | 557 | ID(PCI_DEVICE_ID_VIA_VT3324), |
| 549 | ID(PCI_DEVICE_ID_VIA_VT3336), | ||
| 550 | ID(PCI_DEVICE_ID_VIA_P4M890), | 558 | ID(PCI_DEVICE_ID_VIA_P4M890), |
| 559 | ID(PCI_DEVICE_ID_VIA_VT3364), | ||
| 551 | { } | 560 | { } |
| 552 | }; | 561 | }; |
| 553 | 562 | ||
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c index b710426bab3e..c533d0c9ec61 100644 --- a/drivers/char/drm/ati_pcigart.c +++ b/drivers/char/drm/ati_pcigart.c | |||
| @@ -76,7 +76,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info | |||
| 76 | for (i = 0; i < pages; i++) { | 76 | for (i = 0; i < pages; i++) { |
| 77 | if (!entry->busaddr[i]) | 77 | if (!entry->busaddr[i]) |
| 78 | break; | 78 | break; |
| 79 | pci_unmap_single(dev->pdev, entry->busaddr[i], | 79 | pci_unmap_page(dev->pdev, entry->busaddr[i], |
| 80 | PAGE_SIZE, PCI_DMA_TODEVICE); | 80 | PAGE_SIZE, PCI_DMA_TODEVICE); |
| 81 | } | 81 | } |
| 82 | 82 | ||
| @@ -137,10 +137,8 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga | |||
| 137 | 137 | ||
| 138 | for (i = 0; i < pages; i++) { | 138 | for (i = 0; i < pages; i++) { |
| 139 | /* we need to support large memory configurations */ | 139 | /* we need to support large memory configurations */ |
| 140 | entry->busaddr[i] = pci_map_single(dev->pdev, | 140 | entry->busaddr[i] = pci_map_page(dev->pdev, entry->pagelist[i], |
| 141 | page_address(entry-> | 141 | 0, PAGE_SIZE, PCI_DMA_TODEVICE); |
| 142 | pagelist[i]), | ||
| 143 | PAGE_SIZE, PCI_DMA_TODEVICE); | ||
| 144 | if (entry->busaddr[i] == 0) { | 142 | if (entry->busaddr[i] == 0) { |
| 145 | DRM_ERROR("unable to map PCIGART pages!\n"); | 143 | DRM_ERROR("unable to map PCIGART pages!\n"); |
| 146 | drm_ati_pcigart_cleanup(dev, gart_info); | 144 | drm_ati_pcigart_cleanup(dev, gart_info); |
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 3a05c6d5ebe1..38d3c6b8276a 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h | |||
| @@ -628,7 +628,7 @@ struct drm_set_version { | |||
| 628 | #define DRM_IOCTL_AGP_BIND DRM_IOW( 0x36, struct drm_agp_binding) | 628 | #define DRM_IOCTL_AGP_BIND DRM_IOW( 0x36, struct drm_agp_binding) |
| 629 | #define DRM_IOCTL_AGP_UNBIND DRM_IOW( 0x37, struct drm_agp_binding) | 629 | #define DRM_IOCTL_AGP_UNBIND DRM_IOW( 0x37, struct drm_agp_binding) |
| 630 | 630 | ||
| 631 | #define DRM_IOCTL_SG_ALLOC DRM_IOW( 0x38, struct drm_scatter_gather) | 631 | #define DRM_IOCTL_SG_ALLOC DRM_IOWR(0x38, struct drm_scatter_gather) |
| 632 | #define DRM_IOCTL_SG_FREE DRM_IOW( 0x39, struct drm_scatter_gather) | 632 | #define DRM_IOCTL_SG_FREE DRM_IOW( 0x39, struct drm_scatter_gather) |
| 633 | 633 | ||
| 634 | #define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) | 634 | #define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) |
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c index fc54140551a7..564138714bb5 100644 --- a/drivers/char/drm/drm_drv.c +++ b/drivers/char/drm/drm_drv.c | |||
| @@ -470,17 +470,18 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
| 470 | if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END) && | 470 | if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END) && |
| 471 | (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) | 471 | (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) |
| 472 | ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE]; | 472 | ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE]; |
| 473 | else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) | 473 | else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) { |
| 474 | ioctl = &drm_ioctls[nr]; | 474 | ioctl = &drm_ioctls[nr]; |
| 475 | else | 475 | cmd = ioctl->cmd; |
| 476 | } else | ||
| 476 | goto err_i1; | 477 | goto err_i1; |
| 477 | 478 | ||
| 479 | /* Do not trust userspace, use our own definition */ | ||
| 478 | func = ioctl->func; | 480 | func = ioctl->func; |
| 479 | /* is there a local override? */ | 481 | /* is there a local override? */ |
| 480 | if ((nr == DRM_IOCTL_NR(DRM_IOCTL_DMA)) && dev->driver->dma_ioctl) | 482 | if ((nr == DRM_IOCTL_NR(DRM_IOCTL_DMA)) && dev->driver->dma_ioctl) |
| 481 | func = dev->driver->dma_ioctl; | 483 | func = dev->driver->dma_ioctl; |
| 482 | 484 | ||
| 483 | |||
| 484 | if (!func) { | 485 | if (!func) { |
| 485 | DRM_DEBUG("no function\n"); | 486 | DRM_DEBUG("no function\n"); |
| 486 | retcode = -EINVAL; | 487 | retcode = -EINVAL; |
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h index a6a499f97e22..135bd19499fc 100644 --- a/drivers/char/drm/drm_pciids.h +++ b/drivers/char/drm/drm_pciids.h | |||
| @@ -103,20 +103,18 @@ | |||
| 103 | {0x1002, 0x5653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 103 | {0x1002, 0x5653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
| 104 | {0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP}, \ | 104 | {0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP}, \ |
| 105 | {0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \ | 105 | {0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \ |
| 106 | {0x1002, 0x5954, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ | 106 | {0x1002, 0x5954, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ |
| 107 | {0x1002, 0x5955, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ | 107 | {0x1002, 0x5955, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ |
| 108 | {0x1002, 0x5974, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ | 108 | {0x1002, 0x5974, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ |
| 109 | {0x1002, 0x5975, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ | 109 | {0x1002, 0x5975, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ |
| 110 | {0x1002, 0x5960, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ | 110 | {0x1002, 0x5960, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ |
| 111 | {0x1002, 0x5961, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ | 111 | {0x1002, 0x5961, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ |
| 112 | {0x1002, 0x5962, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ | 112 | {0x1002, 0x5962, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ |
| 113 | {0x1002, 0x5964, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ | 113 | {0x1002, 0x5964, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ |
| 114 | {0x1002, 0x5965, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ | 114 | {0x1002, 0x5965, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ |
| 115 | {0x1002, 0x5969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \ | 115 | {0x1002, 0x5969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \ |
| 116 | {0x1002, 0x5a41, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ | 116 | {0x1002, 0x5a61, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ |
| 117 | {0x1002, 0x5a42, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ | 117 | {0x1002, 0x5a62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ |
| 118 | {0x1002, 0x5a61, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ | ||
| 119 | {0x1002, 0x5a62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \ | ||
| 120 | {0x1002, 0x5b60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \ | 118 | {0x1002, 0x5b60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \ |
| 121 | {0x1002, 0x5b62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \ | 119 | {0x1002, 0x5b62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \ |
| 122 | {0x1002, 0x5b63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \ | 120 | {0x1002, 0x5b63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \ |
| @@ -411,4 +409,7 @@ | |||
| 411 | {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ | 409 | {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
| 412 | {0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ | 410 | {0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
| 413 | {0x8086, 0x2a42, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ | 411 | {0x8086, 0x2a42, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
| 412 | {0x8086, 0x2e02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ | ||
| 413 | {0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ | ||
| 414 | {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ | ||
| 414 | {0, 0, 0} | 415 | {0, 0, 0} |
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c index e8f3d682e3b1..93aed1c38bd2 100644 --- a/drivers/char/drm/i915_drv.c +++ b/drivers/char/drm/i915_drv.c | |||
| @@ -389,6 +389,7 @@ static int i915_resume(struct drm_device *dev) | |||
| 389 | pci_restore_state(dev->pdev); | 389 | pci_restore_state(dev->pdev); |
| 390 | if (pci_enable_device(dev->pdev)) | 390 | if (pci_enable_device(dev->pdev)) |
| 391 | return -1; | 391 | return -1; |
| 392 | pci_set_master(dev->pdev); | ||
| 392 | 393 | ||
| 393 | pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB); | 394 | pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB); |
| 394 | 395 | ||
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h index 1b20f7c0639c..d7326d92a237 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/char/drm/i915_drv.h | |||
| @@ -1112,12 +1112,19 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
| 1112 | (dev)->pci_device == 0x29A2 || \ | 1112 | (dev)->pci_device == 0x29A2 || \ |
| 1113 | (dev)->pci_device == 0x2A02 || \ | 1113 | (dev)->pci_device == 0x2A02 || \ |
| 1114 | (dev)->pci_device == 0x2A12 || \ | 1114 | (dev)->pci_device == 0x2A12 || \ |
| 1115 | (dev)->pci_device == 0x2A42) | 1115 | (dev)->pci_device == 0x2A42 || \ |
| 1116 | (dev)->pci_device == 0x2E02 || \ | ||
| 1117 | (dev)->pci_device == 0x2E12 || \ | ||
| 1118 | (dev)->pci_device == 0x2E22) | ||
| 1116 | 1119 | ||
| 1117 | #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02) | 1120 | #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02) |
| 1118 | 1121 | ||
| 1119 | #define IS_IGD_GM(dev) ((dev)->pci_device == 0x2A42) | 1122 | #define IS_IGD_GM(dev) ((dev)->pci_device == 0x2A42) |
| 1120 | 1123 | ||
| 1124 | #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \ | ||
| 1125 | (dev)->pci_device == 0x2E12 || \ | ||
| 1126 | (dev)->pci_device == 0x2E22) | ||
| 1127 | |||
| 1121 | #define IS_G33(dev) ((dev)->pci_device == 0x29C2 || \ | 1128 | #define IS_G33(dev) ((dev)->pci_device == 0x29C2 || \ |
| 1122 | (dev)->pci_device == 0x29B2 || \ | 1129 | (dev)->pci_device == 0x29B2 || \ |
| 1123 | (dev)->pci_device == 0x29D2) | 1130 | (dev)->pci_device == 0x29D2) |
| @@ -1128,7 +1135,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
| 1128 | #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \ | 1135 | #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \ |
| 1129 | IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev)) | 1136 | IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev)) |
| 1130 | 1137 | ||
| 1131 | #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev)) | 1138 | #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev) || IS_G4X(dev)) |
| 1132 | 1139 | ||
| 1133 | #define PRIMARY_RINGBUFFER_SIZE (128*1024) | 1140 | #define PRIMARY_RINGBUFFER_SIZE (128*1024) |
| 1134 | 1141 | ||
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c index f535812e4057..702df45320f7 100644 --- a/drivers/char/drm/r300_cmdbuf.c +++ b/drivers/char/drm/r300_cmdbuf.c | |||
| @@ -189,18 +189,12 @@ void r300_init_reg_flags(struct drm_device *dev) | |||
| 189 | ADD_RANGE(R300_RE_CULL_CNTL, 1); | 189 | ADD_RANGE(R300_RE_CULL_CNTL, 1); |
| 190 | ADD_RANGE(0x42C0, 2); | 190 | ADD_RANGE(0x42C0, 2); |
| 191 | ADD_RANGE(R300_RS_CNTL_0, 2); | 191 | ADD_RANGE(R300_RS_CNTL_0, 2); |
| 192 | ADD_RANGE(R300_RS_INTERP_0, 8); | 192 | |
| 193 | ADD_RANGE(R300_RS_ROUTE_0, 8); | 193 | ADD_RANGE(R300_SC_HYPERZ, 2); |
| 194 | ADD_RANGE(0x43A4, 2); | ||
| 195 | ADD_RANGE(0x43E8, 1); | 194 | ADD_RANGE(0x43E8, 1); |
| 196 | ADD_RANGE(R300_PFS_CNTL_0, 3); | 195 | |
| 197 | ADD_RANGE(R300_PFS_NODE_0, 4); | ||
| 198 | ADD_RANGE(R300_PFS_TEXI_0, 64); | ||
| 199 | ADD_RANGE(0x46A4, 5); | 196 | ADD_RANGE(0x46A4, 5); |
| 200 | ADD_RANGE(R300_PFS_INSTR0_0, 64); | 197 | |
| 201 | ADD_RANGE(R300_PFS_INSTR1_0, 64); | ||
| 202 | ADD_RANGE(R300_PFS_INSTR2_0, 64); | ||
| 203 | ADD_RANGE(R300_PFS_INSTR3_0, 64); | ||
| 204 | ADD_RANGE(R300_RE_FOG_STATE, 1); | 198 | ADD_RANGE(R300_RE_FOG_STATE, 1); |
| 205 | ADD_RANGE(R300_FOG_COLOR_R, 3); | 199 | ADD_RANGE(R300_FOG_COLOR_R, 3); |
| 206 | ADD_RANGE(R300_PP_ALPHA_TEST, 2); | 200 | ADD_RANGE(R300_PP_ALPHA_TEST, 2); |
| @@ -215,14 +209,12 @@ void r300_init_reg_flags(struct drm_device *dev) | |||
| 215 | ADD_RANGE(0x4E50, 9); | 209 | ADD_RANGE(0x4E50, 9); |
| 216 | ADD_RANGE(0x4E88, 1); | 210 | ADD_RANGE(0x4E88, 1); |
| 217 | ADD_RANGE(0x4EA0, 2); | 211 | ADD_RANGE(0x4EA0, 2); |
| 218 | ADD_RANGE(R300_RB3D_ZSTENCIL_CNTL_0, 3); | 212 | ADD_RANGE(R300_ZB_CNTL, 3); |
| 219 | ADD_RANGE(R300_RB3D_ZSTENCIL_FORMAT, 4); | 213 | ADD_RANGE(R300_ZB_FORMAT, 4); |
| 220 | ADD_RANGE_MARK(R300_RB3D_DEPTHOFFSET, 1, MARK_CHECK_OFFSET); /* check offset */ | 214 | ADD_RANGE_MARK(R300_ZB_DEPTHOFFSET, 1, MARK_CHECK_OFFSET); /* check offset */ |
| 221 | ADD_RANGE(R300_RB3D_DEPTHPITCH, 1); | 215 | ADD_RANGE(R300_ZB_DEPTHPITCH, 1); |
| 222 | ADD_RANGE(0x4F28, 1); | 216 | ADD_RANGE(R300_ZB_DEPTHCLEARVALUE, 1); |
| 223 | ADD_RANGE(0x4F30, 2); | 217 | ADD_RANGE(R300_ZB_ZMASK_OFFSET, 13); |
| 224 | ADD_RANGE(0x4F44, 1); | ||
| 225 | ADD_RANGE(0x4F54, 1); | ||
| 226 | 218 | ||
| 227 | ADD_RANGE(R300_TX_FILTER_0, 16); | 219 | ADD_RANGE(R300_TX_FILTER_0, 16); |
| 228 | ADD_RANGE(R300_TX_FILTER1_0, 16); | 220 | ADD_RANGE(R300_TX_FILTER1_0, 16); |
| @@ -235,13 +227,32 @@ void r300_init_reg_flags(struct drm_device *dev) | |||
| 235 | ADD_RANGE(R300_TX_BORDER_COLOR_0, 16); | 227 | ADD_RANGE(R300_TX_BORDER_COLOR_0, 16); |
| 236 | 228 | ||
| 237 | /* Sporadic registers used as primitives are emitted */ | 229 | /* Sporadic registers used as primitives are emitted */ |
| 238 | ADD_RANGE(R300_RB3D_ZCACHE_CTLSTAT, 1); | 230 | ADD_RANGE(R300_ZB_ZCACHE_CTLSTAT, 1); |
| 239 | ADD_RANGE(R300_RB3D_DSTCACHE_CTLSTAT, 1); | 231 | ADD_RANGE(R300_RB3D_DSTCACHE_CTLSTAT, 1); |
| 240 | ADD_RANGE(R300_VAP_INPUT_ROUTE_0_0, 8); | 232 | ADD_RANGE(R300_VAP_INPUT_ROUTE_0_0, 8); |
| 241 | ADD_RANGE(R300_VAP_INPUT_ROUTE_1_0, 8); | 233 | ADD_RANGE(R300_VAP_INPUT_ROUTE_1_0, 8); |
| 242 | 234 | ||
| 243 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { | 235 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { |
| 244 | ADD_RANGE(0x4074, 16); | 236 | ADD_RANGE(R500_VAP_INDEX_OFFSET, 1); |
| 237 | ADD_RANGE(R500_US_CONFIG, 2); | ||
| 238 | ADD_RANGE(R500_US_CODE_ADDR, 3); | ||
| 239 | ADD_RANGE(R500_US_FC_CTRL, 1); | ||
| 240 | ADD_RANGE(R500_RS_IP_0, 16); | ||
| 241 | ADD_RANGE(R500_RS_INST_0, 16); | ||
| 242 | ADD_RANGE(R500_RB3D_COLOR_CLEAR_VALUE_AR, 2); | ||
| 243 | ADD_RANGE(R500_RB3D_CONSTANT_COLOR_AR, 2); | ||
| 244 | ADD_RANGE(R500_ZB_FIFO_SIZE, 2); | ||
| 245 | } else { | ||
| 246 | ADD_RANGE(R300_PFS_CNTL_0, 3); | ||
| 247 | ADD_RANGE(R300_PFS_NODE_0, 4); | ||
| 248 | ADD_RANGE(R300_PFS_TEXI_0, 64); | ||
| 249 | ADD_RANGE(R300_PFS_INSTR0_0, 64); | ||
| 250 | ADD_RANGE(R300_PFS_INSTR1_0, 64); | ||
| 251 | ADD_RANGE(R300_PFS_INSTR2_0, 64); | ||
| 252 | ADD_RANGE(R300_PFS_INSTR3_0, 64); | ||
| 253 | ADD_RANGE(R300_RS_INTERP_0, 8); | ||
| 254 | ADD_RANGE(R300_RS_ROUTE_0, 8); | ||
| 255 | |||
| 245 | } | 256 | } |
| 246 | } | 257 | } |
| 247 | 258 | ||
| @@ -707,8 +718,9 @@ static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv) | |||
| 707 | BEGIN_RING(6); | 718 | BEGIN_RING(6); |
| 708 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | 719 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); |
| 709 | OUT_RING(R300_RB3D_DSTCACHE_UNKNOWN_0A); | 720 | OUT_RING(R300_RB3D_DSTCACHE_UNKNOWN_0A); |
| 710 | OUT_RING(CP_PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0)); | 721 | OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0)); |
| 711 | OUT_RING(R300_RB3D_ZCACHE_UNKNOWN_03); | 722 | OUT_RING(R300_ZB_ZCACHE_CTLSTAT_ZC_FLUSH_FLUSH_AND_FREE| |
| 723 | R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE); | ||
| 712 | OUT_RING(CP_PACKET3(RADEON_CP_NOP, 0)); | 724 | OUT_RING(CP_PACKET3(RADEON_CP_NOP, 0)); |
| 713 | OUT_RING(0x0); | 725 | OUT_RING(0x0); |
| 714 | ADVANCE_RING(); | 726 | ADVANCE_RING(); |
| @@ -829,6 +841,54 @@ static int r300_scratch(drm_radeon_private_t *dev_priv, | |||
| 829 | } | 841 | } |
| 830 | 842 | ||
| 831 | /** | 843 | /** |
| 844 | * Uploads user-supplied vertex program instructions or parameters onto | ||
| 845 | * the graphics card. | ||
| 846 | * Called by r300_do_cp_cmdbuf. | ||
| 847 | */ | ||
| 848 | static inline int r300_emit_r500fp(drm_radeon_private_t *dev_priv, | ||
| 849 | drm_radeon_kcmd_buffer_t *cmdbuf, | ||
| 850 | drm_r300_cmd_header_t header) | ||
| 851 | { | ||
| 852 | int sz; | ||
| 853 | int addr; | ||
| 854 | int type; | ||
| 855 | int clamp; | ||
| 856 | int stride; | ||
| 857 | RING_LOCALS; | ||
| 858 | |||
| 859 | sz = header.r500fp.count; | ||
| 860 | /* address is 9 bits 0 - 8, bit 1 of flags is part of address */ | ||
| 861 | addr = ((header.r500fp.adrhi_flags & 1) << 8) | header.r500fp.adrlo; | ||
| 862 | |||
| 863 | type = !!(header.r500fp.adrhi_flags & R500FP_CONSTANT_TYPE); | ||
| 864 | clamp = !!(header.r500fp.adrhi_flags & R500FP_CONSTANT_CLAMP); | ||
| 865 | |||
| 866 | addr |= (type << 16); | ||
| 867 | addr |= (clamp << 17); | ||
| 868 | |||
| 869 | stride = type ? 4 : 6; | ||
| 870 | |||
| 871 | DRM_DEBUG("r500fp %d %d type: %d\n", sz, addr, type); | ||
| 872 | if (!sz) | ||
| 873 | return 0; | ||
| 874 | if (sz * stride * 4 > cmdbuf->bufsz) | ||
| 875 | return -EINVAL; | ||
| 876 | |||
| 877 | BEGIN_RING(3 + sz * stride); | ||
| 878 | OUT_RING_REG(R500_GA_US_VECTOR_INDEX, addr); | ||
| 879 | OUT_RING(CP_PACKET0_TABLE(R500_GA_US_VECTOR_DATA, sz * stride - 1)); | ||
| 880 | OUT_RING_TABLE((int *)cmdbuf->buf, sz * stride); | ||
| 881 | |||
| 882 | ADVANCE_RING(); | ||
| 883 | |||
| 884 | cmdbuf->buf += sz * stride * 4; | ||
| 885 | cmdbuf->bufsz -= sz * stride * 4; | ||
| 886 | |||
| 887 | return 0; | ||
| 888 | } | ||
| 889 | |||
| 890 | |||
| 891 | /** | ||
| 832 | * Parses and validates a user-supplied command buffer and emits appropriate | 892 | * Parses and validates a user-supplied command buffer and emits appropriate |
| 833 | * commands on the DMA ring buffer. | 893 | * commands on the DMA ring buffer. |
| 834 | * Called by the ioctl handler function radeon_cp_cmdbuf. | 894 | * Called by the ioctl handler function radeon_cp_cmdbuf. |
| @@ -963,6 +1023,19 @@ int r300_do_cp_cmdbuf(struct drm_device *dev, | |||
| 963 | } | 1023 | } |
| 964 | break; | 1024 | break; |
| 965 | 1025 | ||
| 1026 | case R300_CMD_R500FP: | ||
| 1027 | if ((dev_priv->flags & RADEON_FAMILY_MASK) < CHIP_RV515) { | ||
| 1028 | DRM_ERROR("Calling r500 command on r300 card\n"); | ||
| 1029 | ret = -EINVAL; | ||
| 1030 | goto cleanup; | ||
| 1031 | } | ||
| 1032 | DRM_DEBUG("R300_CMD_R500FP\n"); | ||
| 1033 | ret = r300_emit_r500fp(dev_priv, cmdbuf, header); | ||
| 1034 | if (ret) { | ||
| 1035 | DRM_ERROR("r300_emit_r500fp failed\n"); | ||
| 1036 | goto cleanup; | ||
| 1037 | } | ||
| 1038 | break; | ||
| 966 | default: | 1039 | default: |
| 967 | DRM_ERROR("bad cmd_type %i at %p\n", | 1040 | DRM_ERROR("bad cmd_type %i at %p\n", |
| 968 | header.header.cmd_type, | 1041 | header.header.cmd_type, |
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h index 8f664af9c4a4..a6802f26afc4 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/char/drm/r300_reg.h | |||
| @@ -702,6 +702,27 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
| 702 | # define R300_RS_ROUTE_1_UNKNOWN11 (1 << 11) | 702 | # define R300_RS_ROUTE_1_UNKNOWN11 (1 << 11) |
| 703 | /* END: Rasterization / Interpolators - many guesses */ | 703 | /* END: Rasterization / Interpolators - many guesses */ |
| 704 | 704 | ||
| 705 | /* Hierarchical Z Enable */ | ||
| 706 | #define R300_SC_HYPERZ 0x43a4 | ||
| 707 | # define R300_SC_HYPERZ_DISABLE (0 << 0) | ||
| 708 | # define R300_SC_HYPERZ_ENABLE (1 << 0) | ||
| 709 | # define R300_SC_HYPERZ_MIN (0 << 1) | ||
| 710 | # define R300_SC_HYPERZ_MAX (1 << 1) | ||
| 711 | # define R300_SC_HYPERZ_ADJ_256 (0 << 2) | ||
| 712 | # define R300_SC_HYPERZ_ADJ_128 (1 << 2) | ||
| 713 | # define R300_SC_HYPERZ_ADJ_64 (2 << 2) | ||
| 714 | # define R300_SC_HYPERZ_ADJ_32 (3 << 2) | ||
| 715 | # define R300_SC_HYPERZ_ADJ_16 (4 << 2) | ||
| 716 | # define R300_SC_HYPERZ_ADJ_8 (5 << 2) | ||
| 717 | # define R300_SC_HYPERZ_ADJ_4 (6 << 2) | ||
| 718 | # define R300_SC_HYPERZ_ADJ_2 (7 << 2) | ||
| 719 | # define R300_SC_HYPERZ_HZ_Z0MIN_NO (0 << 5) | ||
| 720 | # define R300_SC_HYPERZ_HZ_Z0MIN (1 << 5) | ||
| 721 | # define R300_SC_HYPERZ_HZ_Z0MAX_NO (0 << 6) | ||
| 722 | # define R300_SC_HYPERZ_HZ_Z0MAX (1 << 6) | ||
| 723 | |||
| 724 | #define R300_SC_EDGERULE 0x43a8 | ||
| 725 | |||
| 705 | /* BEGIN: Scissors and cliprects */ | 726 | /* BEGIN: Scissors and cliprects */ |
| 706 | 727 | ||
| 707 | /* There are four clipping rectangles. Their corner coordinates are inclusive. | 728 | /* There are four clipping rectangles. Their corner coordinates are inclusive. |
| @@ -1346,7 +1367,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
| 1346 | /* Guess by Vladimir. | 1367 | /* Guess by Vladimir. |
| 1347 | * Set to 0A before 3D operations, set to 02 afterwards. | 1368 | * Set to 0A before 3D operations, set to 02 afterwards. |
| 1348 | */ | 1369 | */ |
| 1349 | #define R300_RB3D_DSTCACHE_CTLSTAT 0x4E4C | 1370 | /*#define R300_RB3D_DSTCACHE_CTLSTAT 0x4E4C*/ |
| 1350 | # define R300_RB3D_DSTCACHE_UNKNOWN_02 0x00000002 | 1371 | # define R300_RB3D_DSTCACHE_UNKNOWN_02 0x00000002 |
| 1351 | # define R300_RB3D_DSTCACHE_UNKNOWN_0A 0x0000000A | 1372 | # define R300_RB3D_DSTCACHE_UNKNOWN_0A 0x0000000A |
| 1352 | 1373 | ||
| @@ -1355,19 +1376,14 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
| 1355 | * for this. | 1376 | * for this. |
| 1356 | * Bit (1<<8) is the "test" bit. so plain write is 6 - vd | 1377 | * Bit (1<<8) is the "test" bit. so plain write is 6 - vd |
| 1357 | */ | 1378 | */ |
| 1358 | #define R300_RB3D_ZSTENCIL_CNTL_0 0x4F00 | 1379 | #define R300_ZB_CNTL 0x4F00 |
| 1359 | # define R300_RB3D_Z_DISABLED_1 0x00000010 | 1380 | # define R300_STENCIL_ENABLE (1 << 0) |
| 1360 | # define R300_RB3D_Z_DISABLED_2 0x00000014 | 1381 | # define R300_Z_ENABLE (1 << 1) |
| 1361 | # define R300_RB3D_Z_TEST 0x00000012 | 1382 | # define R300_Z_WRITE_ENABLE (1 << 2) |
| 1362 | # define R300_RB3D_Z_TEST_AND_WRITE 0x00000016 | 1383 | # define R300_Z_SIGNED_COMPARE (1 << 3) |
| 1363 | # define R300_RB3D_Z_WRITE_ONLY 0x00000006 | 1384 | # define R300_STENCIL_FRONT_BACK (1 << 4) |
| 1364 | 1385 | ||
| 1365 | # define R300_RB3D_Z_TEST 0x00000012 | 1386 | #define R300_ZB_ZSTENCILCNTL 0x4f04 |
| 1366 | # define R300_RB3D_Z_TEST_AND_WRITE 0x00000016 | ||
| 1367 | # define R300_RB3D_Z_WRITE_ONLY 0x00000006 | ||
| 1368 | # define R300_RB3D_STENCIL_ENABLE 0x00000001 | ||
| 1369 | |||
| 1370 | #define R300_RB3D_ZSTENCIL_CNTL_1 0x4F04 | ||
| 1371 | /* functions */ | 1387 | /* functions */ |
| 1372 | # define R300_ZS_NEVER 0 | 1388 | # define R300_ZS_NEVER 0 |
| 1373 | # define R300_ZS_LESS 1 | 1389 | # define R300_ZS_LESS 1 |
| @@ -1387,52 +1403,166 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
| 1387 | # define R300_ZS_INVERT 5 | 1403 | # define R300_ZS_INVERT 5 |
| 1388 | # define R300_ZS_INCR_WRAP 6 | 1404 | # define R300_ZS_INCR_WRAP 6 |
| 1389 | # define R300_ZS_DECR_WRAP 7 | 1405 | # define R300_ZS_DECR_WRAP 7 |
| 1406 | # define R300_Z_FUNC_SHIFT 0 | ||
| 1390 | /* front and back refer to operations done for front | 1407 | /* front and back refer to operations done for front |
| 1391 | and back faces, i.e. separate stencil function support */ | 1408 | and back faces, i.e. separate stencil function support */ |
| 1392 | # define R300_RB3D_ZS1_DEPTH_FUNC_SHIFT 0 | 1409 | # define R300_S_FRONT_FUNC_SHIFT 3 |
| 1393 | # define R300_RB3D_ZS1_FRONT_FUNC_SHIFT 3 | 1410 | # define R300_S_FRONT_SFAIL_OP_SHIFT 6 |
| 1394 | # define R300_RB3D_ZS1_FRONT_FAIL_OP_SHIFT 6 | 1411 | # define R300_S_FRONT_ZPASS_OP_SHIFT 9 |
| 1395 | # define R300_RB3D_ZS1_FRONT_ZPASS_OP_SHIFT 9 | 1412 | # define R300_S_FRONT_ZFAIL_OP_SHIFT 12 |
| 1396 | # define R300_RB3D_ZS1_FRONT_ZFAIL_OP_SHIFT 12 | 1413 | # define R300_S_BACK_FUNC_SHIFT 15 |
| 1397 | # define R300_RB3D_ZS1_BACK_FUNC_SHIFT 15 | 1414 | # define R300_S_BACK_SFAIL_OP_SHIFT 18 |
| 1398 | # define R300_RB3D_ZS1_BACK_FAIL_OP_SHIFT 18 | 1415 | # define R300_S_BACK_ZPASS_OP_SHIFT 21 |
| 1399 | # define R300_RB3D_ZS1_BACK_ZPASS_OP_SHIFT 21 | 1416 | # define R300_S_BACK_ZFAIL_OP_SHIFT 24 |
| 1400 | # define R300_RB3D_ZS1_BACK_ZFAIL_OP_SHIFT 24 | 1417 | |
| 1401 | 1418 | #define R300_ZB_STENCILREFMASK 0x4f08 | |
| 1402 | #define R300_RB3D_ZSTENCIL_CNTL_2 0x4F08 | 1419 | # define R300_STENCILREF_SHIFT 0 |
| 1403 | # define R300_RB3D_ZS2_STENCIL_REF_SHIFT 0 | 1420 | # define R300_STENCILREF_MASK 0x000000ff |
| 1404 | # define R300_RB3D_ZS2_STENCIL_MASK 0xFF | 1421 | # define R300_STENCILMASK_SHIFT 8 |
| 1405 | # define R300_RB3D_ZS2_STENCIL_MASK_SHIFT 8 | 1422 | # define R300_STENCILMASK_MASK 0x0000ff00 |
| 1406 | # define R300_RB3D_ZS2_STENCIL_WRITE_MASK_SHIFT 16 | 1423 | # define R300_STENCILWRITEMASK_SHIFT 16 |
| 1424 | # define R300_STENCILWRITEMASK_MASK 0x00ff0000 | ||
| 1407 | 1425 | ||
| 1408 | /* gap */ | 1426 | /* gap */ |
| 1409 | 1427 | ||
| 1410 | #define R300_RB3D_ZSTENCIL_FORMAT 0x4F10 | 1428 | #define R300_ZB_FORMAT 0x4f10 |
| 1411 | # define R300_DEPTH_FORMAT_16BIT_INT_Z (0 << 0) | 1429 | # define R300_DEPTHFORMAT_16BIT_INT_Z (0 << 0) |
| 1412 | # define R300_DEPTH_FORMAT_24BIT_INT_Z (2 << 0) | 1430 | # define R300_DEPTHFORMAT_16BIT_13E3 (1 << 0) |
| 1413 | /* 16 bit format or some aditional bit ? */ | 1431 | # define R300_DEPTHFORMAT_24BIT_INT_Z_8BIT_STENCIL (2 << 0) |
| 1414 | # define R300_DEPTH_FORMAT_UNK32 (32 << 0) | 1432 | /* reserved up to (15 << 0) */ |
| 1433 | # define R300_INVERT_13E3_LEADING_ONES (0 << 4) | ||
| 1434 | # define R300_INVERT_13E3_LEADING_ZEROS (1 << 4) | ||
| 1415 | 1435 | ||
| 1416 | #define R300_RB3D_EARLY_Z 0x4F14 | 1436 | #define R300_ZB_ZTOP 0x4F14 |
| 1417 | # define R300_EARLY_Z_DISABLE (0 << 0) | 1437 | # define R300_ZTOP_DISABLE (0 << 0) |
| 1418 | # define R300_EARLY_Z_ENABLE (1 << 0) | 1438 | # define R300_ZTOP_ENABLE (1 << 0) |
| 1419 | 1439 | ||
| 1420 | /* gap */ | 1440 | /* gap */ |
| 1421 | 1441 | ||
| 1422 | #define R300_RB3D_ZCACHE_CTLSTAT 0x4F18 /* GUESS */ | 1442 | #define R300_ZB_ZCACHE_CTLSTAT 0x4f18 |
| 1423 | # define R300_RB3D_ZCACHE_UNKNOWN_01 0x1 | 1443 | # define R300_ZB_ZCACHE_CTLSTAT_ZC_FLUSH_NO_EFFECT (0 << 0) |
| 1424 | # define R300_RB3D_ZCACHE_UNKNOWN_03 0x3 | 1444 | # define R300_ZB_ZCACHE_CTLSTAT_ZC_FLUSH_FLUSH_AND_FREE (1 << 0) |
| 1445 | # define R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_NO_EFFECT (0 << 1) | ||
| 1446 | # define R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE (1 << 1) | ||
| 1447 | # define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_IDLE (0 << 31) | ||
| 1448 | # define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_BUSY (1 << 31) | ||
| 1449 | |||
| 1450 | #define R300_ZB_BW_CNTL 0x4f1c | ||
| 1451 | # define R300_HIZ_DISABLE (0 << 0) | ||
| 1452 | # define R300_HIZ_ENABLE (1 << 0) | ||
| 1453 | # define R300_HIZ_MIN (0 << 1) | ||
| 1454 | # define R300_HIZ_MAX (1 << 1) | ||
| 1455 | # define R300_FAST_FILL_DISABLE (0 << 2) | ||
| 1456 | # define R300_FAST_FILL_ENABLE (1 << 2) | ||
| 1457 | # define R300_RD_COMP_DISABLE (0 << 3) | ||
| 1458 | # define R300_RD_COMP_ENABLE (1 << 3) | ||
| 1459 | # define R300_WR_COMP_DISABLE (0 << 4) | ||
| 1460 | # define R300_WR_COMP_ENABLE (1 << 4) | ||
| 1461 | # define R300_ZB_CB_CLEAR_RMW (0 << 5) | ||
| 1462 | # define R300_ZB_CB_CLEAR_CACHE_LINEAR (1 << 5) | ||
| 1463 | # define R300_FORCE_COMPRESSED_STENCIL_VALUE_DISABLE (0 << 6) | ||
| 1464 | # define R300_FORCE_COMPRESSED_STENCIL_VALUE_ENABLE (1 << 6) | ||
| 1465 | |||
| 1466 | # define R500_ZEQUAL_OPTIMIZE_ENABLE (0 << 7) | ||
| 1467 | # define R500_ZEQUAL_OPTIMIZE_DISABLE (1 << 7) | ||
| 1468 | # define R500_SEQUAL_OPTIMIZE_ENABLE (0 << 8) | ||
| 1469 | # define R500_SEQUAL_OPTIMIZE_DISABLE (1 << 8) | ||
| 1470 | |||
| 1471 | # define R500_BMASK_ENABLE (0 << 10) | ||
| 1472 | # define R500_BMASK_DISABLE (1 << 10) | ||
| 1473 | # define R500_HIZ_EQUAL_REJECT_DISABLE (0 << 11) | ||
| 1474 | # define R500_HIZ_EQUAL_REJECT_ENABLE (1 << 11) | ||
| 1475 | # define R500_HIZ_FP_EXP_BITS_DISABLE (0 << 12) | ||
| 1476 | # define R500_HIZ_FP_EXP_BITS_1 (1 << 12) | ||
| 1477 | # define R500_HIZ_FP_EXP_BITS_2 (2 << 12) | ||
| 1478 | # define R500_HIZ_FP_EXP_BITS_3 (3 << 12) | ||
| 1479 | # define R500_HIZ_FP_EXP_BITS_4 (4 << 12) | ||
| 1480 | # define R500_HIZ_FP_EXP_BITS_5 (5 << 12) | ||
| 1481 | # define R500_HIZ_FP_INVERT_LEADING_ONES (0 << 15) | ||
| 1482 | # define R500_HIZ_FP_INVERT_LEADING_ZEROS (1 << 15) | ||
| 1483 | # define R500_TILE_OVERWRITE_RECOMPRESSION_ENABLE (0 << 16) | ||
| 1484 | # define R500_TILE_OVERWRITE_RECOMPRESSION_DISABLE (1 << 16) | ||
| 1485 | # define R500_CONTIGUOUS_6XAA_SAMPLES_ENABLE (0 << 17) | ||
| 1486 | # define R500_CONTIGUOUS_6XAA_SAMPLES_DISABLE (1 << 17) | ||
| 1487 | # define R500_PEQ_PACKING_DISABLE (0 << 18) | ||
| 1488 | # define R500_PEQ_PACKING_ENABLE (1 << 18) | ||
| 1489 | # define R500_COVERED_PTR_MASKING_DISABLE (0 << 18) | ||
| 1490 | # define R500_COVERED_PTR_MASKING_ENABLE (1 << 18) | ||
| 1491 | |||
| 1425 | 1492 | ||
| 1426 | /* gap */ | 1493 | /* gap */ |
| 1427 | 1494 | ||
| 1428 | #define R300_RB3D_DEPTHOFFSET 0x4F20 | 1495 | /* Z Buffer Address Offset. |
| 1429 | #define R300_RB3D_DEPTHPITCH 0x4F24 | 1496 | * Bits 31 to 5 are used for aligned Z buffer address offset for macro tiles. |
| 1430 | # define R300_DEPTHPITCH_MASK 0x00001FF8 /* GUESS */ | 1497 | */ |
| 1431 | # define R300_DEPTH_TILE_ENABLE (1 << 16) /* GUESS */ | 1498 | #define R300_ZB_DEPTHOFFSET 0x4f20 |
| 1432 | # define R300_DEPTH_MICROTILE_ENABLE (1 << 17) /* GUESS */ | 1499 | |
| 1433 | # define R300_DEPTH_ENDIAN_NO_SWAP (0 << 18) /* GUESS */ | 1500 | /* Z Buffer Pitch and Endian Control */ |
| 1434 | # define R300_DEPTH_ENDIAN_WORD_SWAP (1 << 18) /* GUESS */ | 1501 | #define R300_ZB_DEPTHPITCH 0x4f24 |
| 1435 | # define R300_DEPTH_ENDIAN_DWORD_SWAP (2 << 18) /* GUESS */ | 1502 | # define R300_DEPTHPITCH_MASK 0x00003FFC |
| 1503 | # define R300_DEPTHMACROTILE_DISABLE (0 << 16) | ||
| 1504 | # define R300_DEPTHMACROTILE_ENABLE (1 << 16) | ||
| 1505 | # define R300_DEPTHMICROTILE_LINEAR (0 << 17) | ||
| 1506 | # define R300_DEPTHMICROTILE_TILED (1 << 17) | ||
| 1507 | # define R300_DEPTHMICROTILE_TILED_SQUARE (2 << 17) | ||
| 1508 | # define R300_DEPTHENDIAN_NO_SWAP (0 << 18) | ||
| 1509 | # define R300_DEPTHENDIAN_WORD_SWAP (1 << 18) | ||
| 1510 | # define R300_DEPTHENDIAN_DWORD_SWAP (2 << 18) | ||
| 1511 | # define R300_DEPTHENDIAN_HALF_DWORD_SWAP (3 << 18) | ||
| 1512 | |||
| 1513 | /* Z Buffer Clear Value */ | ||
| 1514 | #define R300_ZB_DEPTHCLEARVALUE 0x4f28 | ||
| 1515 | |||
| 1516 | #define R300_ZB_ZMASK_OFFSET 0x4f30 | ||
| 1517 | #define R300_ZB_ZMASK_PITCH 0x4f34 | ||
| 1518 | #define R300_ZB_ZMASK_WRINDEX 0x4f38 | ||
| 1519 | #define R300_ZB_ZMASK_DWORD 0x4f3c | ||
| 1520 | #define R300_ZB_ZMASK_RDINDEX 0x4f40 | ||
| 1521 | |||
| 1522 | /* Hierarchical Z Memory Offset */ | ||
| 1523 | #define R300_ZB_HIZ_OFFSET 0x4f44 | ||
| 1524 | |||
| 1525 | /* Hierarchical Z Write Index */ | ||
| 1526 | #define R300_ZB_HIZ_WRINDEX 0x4f48 | ||
| 1527 | |||
| 1528 | /* Hierarchical Z Data */ | ||
| 1529 | #define R300_ZB_HIZ_DWORD 0x4f4c | ||
| 1530 | |||
| 1531 | /* Hierarchical Z Read Index */ | ||
| 1532 | #define R300_ZB_HIZ_RDINDEX 0x4f50 | ||
| 1533 | |||
| 1534 | /* Hierarchical Z Pitch */ | ||
| 1535 | #define R300_ZB_HIZ_PITCH 0x4f54 | ||
| 1536 | |||
| 1537 | /* Z Buffer Z Pass Counter Data */ | ||
| 1538 | #define R300_ZB_ZPASS_DATA 0x4f58 | ||
| 1539 | |||
| 1540 | /* Z Buffer Z Pass Counter Address */ | ||
| 1541 | #define R300_ZB_ZPASS_ADDR 0x4f5c | ||
| 1542 | |||
| 1543 | /* Depth buffer X and Y coordinate offset */ | ||
| 1544 | #define R300_ZB_DEPTHXY_OFFSET 0x4f60 | ||
| 1545 | # define R300_DEPTHX_OFFSET_SHIFT 1 | ||
| 1546 | # define R300_DEPTHX_OFFSET_MASK 0x000007FE | ||
| 1547 | # define R300_DEPTHY_OFFSET_SHIFT 17 | ||
| 1548 | # define R300_DEPTHY_OFFSET_MASK 0x07FE0000 | ||
| 1549 | |||
| 1550 | /* Sets the fifo sizes */ | ||
| 1551 | #define R500_ZB_FIFO_SIZE 0x4fd0 | ||
| 1552 | # define R500_OP_FIFO_SIZE_FULL (0 << 0) | ||
| 1553 | # define R500_OP_FIFO_SIZE_HALF (1 << 0) | ||
| 1554 | # define R500_OP_FIFO_SIZE_QUATER (2 << 0) | ||
| 1555 | # define R500_OP_FIFO_SIZE_EIGTHS (4 << 0) | ||
| 1556 | |||
| 1557 | /* Stencil Reference Value and Mask for backfacing quads */ | ||
| 1558 | /* R300_ZB_STENCILREFMASK handles front face */ | ||
| 1559 | #define R500_ZB_STENCILREFMASK_BF 0x4fd4 | ||
| 1560 | # define R500_STENCILREF_SHIFT 0 | ||
| 1561 | # define R500_STENCILREF_MASK 0x000000ff | ||
| 1562 | # define R500_STENCILMASK_SHIFT 8 | ||
| 1563 | # define R500_STENCILMASK_MASK 0x0000ff00 | ||
| 1564 | # define R500_STENCILWRITEMASK_SHIFT 16 | ||
| 1565 | # define R500_STENCILWRITEMASK_MASK 0x00ff0000 | ||
| 1436 | 1566 | ||
| 1437 | /* BEGIN: Vertex program instruction set */ | 1567 | /* BEGIN: Vertex program instruction set */ |
| 1438 | 1568 | ||
| @@ -1623,4 +1753,20 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
| 1623 | */ | 1753 | */ |
| 1624 | #define R300_CP_CMD_BITBLT_MULTI 0xC0009B00 | 1754 | #define R300_CP_CMD_BITBLT_MULTI 0xC0009B00 |
| 1625 | 1755 | ||
| 1756 | #define R500_VAP_INDEX_OFFSET 0x208c | ||
| 1757 | |||
| 1758 | #define R500_GA_US_VECTOR_INDEX 0x4250 | ||
| 1759 | #define R500_GA_US_VECTOR_DATA 0x4254 | ||
| 1760 | |||
| 1761 | #define R500_RS_IP_0 0x4074 | ||
| 1762 | #define R500_RS_INST_0 0x4320 | ||
| 1763 | |||
| 1764 | #define R500_US_CONFIG 0x4600 | ||
| 1765 | |||
| 1766 | #define R500_US_FC_CTRL 0x4624 | ||
| 1767 | #define R500_US_CODE_ADDR 0x4630 | ||
| 1768 | |||
| 1769 | #define R500_RB3D_COLOR_CLEAR_VALUE_AR 0x46c0 | ||
| 1770 | #define R500_RB3D_CONSTANT_COLOR_AR 0x4ef8 | ||
| 1771 | |||
| 1626 | #endif /* _R300_REG_H */ | 1772 | #endif /* _R300_REG_H */ |
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index f6f6c92bf771..e53158f0ecb5 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | /* | 2 | /* |
| 3 | * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. | 3 | * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. |
| 4 | * Copyright 2000 VA Linux Systems, Inc., Fremont, California. | 4 | * Copyright 2000 VA Linux Systems, Inc., Fremont, California. |
| 5 | * Copyright 2007 Advanced Micro Devices, Inc. | ||
| 5 | * All Rights Reserved. | 6 | * All Rights Reserved. |
| 6 | * | 7 | * |
| 7 | * Permission is hereby granted, free of charge, to any person obtaining a | 8 | * Permission is hereby granted, free of charge, to any person obtaining a |
| @@ -34,789 +35,13 @@ | |||
| 34 | #include "radeon_drv.h" | 35 | #include "radeon_drv.h" |
| 35 | #include "r300_reg.h" | 36 | #include "r300_reg.h" |
| 36 | 37 | ||
| 38 | #include "radeon_microcode.h" | ||
| 39 | |||
| 37 | #define RADEON_FIFO_DEBUG 0 | 40 | #define RADEON_FIFO_DEBUG 0 |
| 38 | 41 | ||
| 39 | static int radeon_do_cleanup_cp(struct drm_device * dev); | 42 | static int radeon_do_cleanup_cp(struct drm_device * dev); |
| 40 | 43 | ||
| 41 | /* CP microcode (from ATI) */ | 44 | static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) |
| 42 | static const u32 R200_cp_microcode[][2] = { | ||
| 43 | {0x21007000, 0000000000}, | ||
| 44 | {0x20007000, 0000000000}, | ||
| 45 | {0x000000ab, 0x00000004}, | ||
| 46 | {0x000000af, 0x00000004}, | ||
| 47 | {0x66544a49, 0000000000}, | ||
| 48 | {0x49494174, 0000000000}, | ||
| 49 | {0x54517d83, 0000000000}, | ||
| 50 | {0x498d8b64, 0000000000}, | ||
| 51 | {0x49494949, 0000000000}, | ||
| 52 | {0x49da493c, 0000000000}, | ||
| 53 | {0x49989898, 0000000000}, | ||
| 54 | {0xd34949d5, 0000000000}, | ||
| 55 | {0x9dc90e11, 0000000000}, | ||
| 56 | {0xce9b9b9b, 0000000000}, | ||
| 57 | {0x000f0000, 0x00000016}, | ||
| 58 | {0x352e232c, 0000000000}, | ||
| 59 | {0x00000013, 0x00000004}, | ||
| 60 | {0x000f0000, 0x00000016}, | ||
| 61 | {0x352e272c, 0000000000}, | ||
| 62 | {0x000f0001, 0x00000016}, | ||
| 63 | {0x3239362f, 0000000000}, | ||
| 64 | {0x000077ef, 0x00000002}, | ||
| 65 | {0x00061000, 0x00000002}, | ||
| 66 | {0x00000020, 0x0000001a}, | ||
| 67 | {0x00004000, 0x0000001e}, | ||
| 68 | {0x00061000, 0x00000002}, | ||
| 69 | {0x00000020, 0x0000001a}, | ||
| 70 | {0x00004000, 0x0000001e}, | ||
| 71 | {0x00061000, 0x00000002}, | ||
| 72 | {0x00000020, 0x0000001a}, | ||
| 73 | {0x00004000, 0x0000001e}, | ||
| 74 | {0x00000016, 0x00000004}, | ||
| 75 | {0x0003802a, 0x00000002}, | ||
| 76 | {0x040067e0, 0x00000002}, | ||
| 77 | {0x00000016, 0x00000004}, | ||
| 78 | {0x000077e0, 0x00000002}, | ||
| 79 | {0x00065000, 0x00000002}, | ||
| 80 | {0x000037e1, 0x00000002}, | ||
| 81 | {0x040067e1, 0x00000006}, | ||
| 82 | {0x000077e0, 0x00000002}, | ||
| 83 | {0x000077e1, 0x00000002}, | ||
| 84 | {0x000077e1, 0x00000006}, | ||
| 85 | {0xffffffff, 0000000000}, | ||
| 86 | {0x10000000, 0000000000}, | ||
| 87 | {0x0003802a, 0x00000002}, | ||
| 88 | {0x040067e0, 0x00000006}, | ||
| 89 | {0x00007675, 0x00000002}, | ||
| 90 | {0x00007676, 0x00000002}, | ||
| 91 | {0x00007677, 0x00000002}, | ||
| 92 | {0x00007678, 0x00000006}, | ||
| 93 | {0x0003802b, 0x00000002}, | ||
| 94 | {0x04002676, 0x00000002}, | ||
| 95 | {0x00007677, 0x00000002}, | ||
| 96 | {0x00007678, 0x00000006}, | ||
| 97 | {0x0000002e, 0x00000018}, | ||
| 98 | {0x0000002e, 0x00000018}, | ||
| 99 | {0000000000, 0x00000006}, | ||
| 100 | {0x0000002f, 0x00000018}, | ||
| 101 | {0x0000002f, 0x00000018}, | ||
| 102 | {0000000000, 0x00000006}, | ||
| 103 | {0x01605000, 0x00000002}, | ||
| 104 | {0x00065000, 0x00000002}, | ||
| 105 | {0x00098000, 0x00000002}, | ||
| 106 | {0x00061000, 0x00000002}, | ||
| 107 | {0x64c0603d, 0x00000004}, | ||
| 108 | {0x00080000, 0x00000016}, | ||
| 109 | {0000000000, 0000000000}, | ||
| 110 | {0x0400251d, 0x00000002}, | ||
| 111 | {0x00007580, 0x00000002}, | ||
| 112 | {0x00067581, 0x00000002}, | ||
| 113 | {0x04002580, 0x00000002}, | ||
| 114 | {0x00067581, 0x00000002}, | ||
| 115 | {0x00000046, 0x00000004}, | ||
| 116 | {0x00005000, 0000000000}, | ||
| 117 | {0x00061000, 0x00000002}, | ||
| 118 | {0x0000750e, 0x00000002}, | ||
| 119 | {0x00019000, 0x00000002}, | ||
| 120 | {0x00011055, 0x00000014}, | ||
| 121 | {0x00000055, 0x00000012}, | ||
| 122 | {0x0400250f, 0x00000002}, | ||
| 123 | {0x0000504a, 0x00000004}, | ||
| 124 | {0x00007565, 0x00000002}, | ||
| 125 | {0x00007566, 0x00000002}, | ||
| 126 | {0x00000051, 0x00000004}, | ||
| 127 | {0x01e655b4, 0x00000002}, | ||
| 128 | {0x4401b0dc, 0x00000002}, | ||
| 129 | {0x01c110dc, 0x00000002}, | ||
| 130 | {0x2666705d, 0x00000018}, | ||
| 131 | {0x040c2565, 0x00000002}, | ||
| 132 | {0x0000005d, 0x00000018}, | ||
| 133 | {0x04002564, 0x00000002}, | ||
| 134 | {0x00007566, 0x00000002}, | ||
| 135 | {0x00000054, 0x00000004}, | ||
| 136 | {0x00401060, 0x00000008}, | ||
| 137 | {0x00101000, 0x00000002}, | ||
| 138 | {0x000d80ff, 0x00000002}, | ||
| 139 | {0x00800063, 0x00000008}, | ||
| 140 | {0x000f9000, 0x00000002}, | ||
| 141 | {0x000e00ff, 0x00000002}, | ||
| 142 | {0000000000, 0x00000006}, | ||
| 143 | {0x00000080, 0x00000018}, | ||
| 144 | {0x00000054, 0x00000004}, | ||
| 145 | {0x00007576, 0x00000002}, | ||
| 146 | {0x00065000, 0x00000002}, | ||
| 147 | {0x00009000, 0x00000002}, | ||
| 148 | {0x00041000, 0x00000002}, | ||
| 149 | {0x0c00350e, 0x00000002}, | ||
| 150 | {0x00049000, 0x00000002}, | ||
| 151 | {0x00051000, 0x00000002}, | ||
| 152 | {0x01e785f8, 0x00000002}, | ||
| 153 | {0x00200000, 0x00000002}, | ||
| 154 | {0x00600073, 0x0000000c}, | ||
| 155 | {0x00007563, 0x00000002}, | ||
| 156 | {0x006075f0, 0x00000021}, | ||
| 157 | {0x20007068, 0x00000004}, | ||
| 158 | {0x00005068, 0x00000004}, | ||
| 159 | {0x00007576, 0x00000002}, | ||
| 160 | {0x00007577, 0x00000002}, | ||
| 161 | {0x0000750e, 0x00000002}, | ||
| 162 | {0x0000750f, 0x00000002}, | ||
| 163 | {0x00a05000, 0x00000002}, | ||
| 164 | {0x00600076, 0x0000000c}, | ||
| 165 | {0x006075f0, 0x00000021}, | ||
| 166 | {0x000075f8, 0x00000002}, | ||
| 167 | {0x00000076, 0x00000004}, | ||
| 168 | {0x000a750e, 0x00000002}, | ||
| 169 | {0x0020750f, 0x00000002}, | ||
| 170 | {0x00600079, 0x00000004}, | ||
| 171 | {0x00007570, 0x00000002}, | ||
| 172 | {0x00007571, 0x00000002}, | ||
| 173 | {0x00007572, 0x00000006}, | ||
| 174 | {0x00005000, 0x00000002}, | ||
| 175 | {0x00a05000, 0x00000002}, | ||
| 176 | {0x00007568, 0x00000002}, | ||
| 177 | {0x00061000, 0x00000002}, | ||
| 178 | {0x00000084, 0x0000000c}, | ||
| 179 | {0x00058000, 0x00000002}, | ||
| 180 | {0x0c607562, 0x00000002}, | ||
| 181 | {0x00000086, 0x00000004}, | ||
| 182 | {0x00600085, 0x00000004}, | ||
| 183 | {0x400070dd, 0000000000}, | ||
| 184 | {0x000380dd, 0x00000002}, | ||
| 185 | {0x00000093, 0x0000001c}, | ||
| 186 | {0x00065095, 0x00000018}, | ||
| 187 | {0x040025bb, 0x00000002}, | ||
| 188 | {0x00061096, 0x00000018}, | ||
| 189 | {0x040075bc, 0000000000}, | ||
| 190 | {0x000075bb, 0x00000002}, | ||
| 191 | {0x000075bc, 0000000000}, | ||
| 192 | {0x00090000, 0x00000006}, | ||
| 193 | {0x00090000, 0x00000002}, | ||
| 194 | {0x000d8002, 0x00000006}, | ||
| 195 | {0x00005000, 0x00000002}, | ||
| 196 | {0x00007821, 0x00000002}, | ||
| 197 | {0x00007800, 0000000000}, | ||
| 198 | {0x00007821, 0x00000002}, | ||
| 199 | {0x00007800, 0000000000}, | ||
| 200 | {0x01665000, 0x00000002}, | ||
| 201 | {0x000a0000, 0x00000002}, | ||
| 202 | {0x000671cc, 0x00000002}, | ||
| 203 | {0x0286f1cd, 0x00000002}, | ||
| 204 | {0x000000a3, 0x00000010}, | ||
| 205 | {0x21007000, 0000000000}, | ||
| 206 | {0x000000aa, 0x0000001c}, | ||
| 207 | {0x00065000, 0x00000002}, | ||
| 208 | {0x000a0000, 0x00000002}, | ||
| 209 | {0x00061000, 0x00000002}, | ||
| 210 | {0x000b0000, 0x00000002}, | ||
| 211 | {0x38067000, 0x00000002}, | ||
| 212 | {0x000a00a6, 0x00000004}, | ||
| 213 | {0x20007000, 0000000000}, | ||
| 214 | {0x01200000, 0x00000002}, | ||
| 215 | {0x20077000, 0x00000002}, | ||
| 216 | {0x01200000, 0x00000002}, | ||
| 217 | {0x20007000, 0000000000}, | ||
| 218 | {0x00061000, 0x00000002}, | ||
| 219 | {0x0120751b, 0x00000002}, | ||
| 220 | {0x8040750a, 0x00000002}, | ||
| 221 | {0x8040750b, 0x00000002}, | ||
| 222 | {0x00110000, 0x00000002}, | ||
| 223 | {0x000380dd, 0x00000002}, | ||
| 224 | {0x000000bd, 0x0000001c}, | ||
| 225 | {0x00061096, 0x00000018}, | ||
| 226 | {0x844075bd, 0x00000002}, | ||
| 227 | {0x00061095, 0x00000018}, | ||
| 228 | {0x840075bb, 0x00000002}, | ||
| 229 | {0x00061096, 0x00000018}, | ||
| 230 | {0x844075bc, 0x00000002}, | ||
| 231 | {0x000000c0, 0x00000004}, | ||
| 232 | {0x804075bd, 0x00000002}, | ||
| 233 | {0x800075bb, 0x00000002}, | ||
| 234 | {0x804075bc, 0x00000002}, | ||
| 235 | {0x00108000, 0x00000002}, | ||
| 236 | {0x01400000, 0x00000002}, | ||
| 237 | {0x006000c4, 0x0000000c}, | ||
| 238 | {0x20c07000, 0x00000020}, | ||
| 239 | {0x000000c6, 0x00000012}, | ||
| 240 | {0x00800000, 0x00000006}, | ||
| 241 | {0x0080751d, 0x00000006}, | ||
| 242 | {0x000025bb, 0x00000002}, | ||
| 243 | {0x000040c0, 0x00000004}, | ||
| 244 | {0x0000775c, 0x00000002}, | ||
| 245 | {0x00a05000, 0x00000002}, | ||
| 246 | {0x00661000, 0x00000002}, | ||
| 247 | {0x0460275d, 0x00000020}, | ||
| 248 | {0x00004000, 0000000000}, | ||
| 249 | {0x00007999, 0x00000002}, | ||
| 250 | {0x00a05000, 0x00000002}, | ||
| 251 | {0x00661000, 0x00000002}, | ||
| 252 | {0x0460299b, 0x00000020}, | ||
| 253 | {0x00004000, 0000000000}, | ||
| 254 | {0x01e00830, 0x00000002}, | ||
| 255 | {0x21007000, 0000000000}, | ||
| 256 | {0x00005000, 0x00000002}, | ||
| 257 | {0x00038042, 0x00000002}, | ||
| 258 | {0x040025e0, 0x00000002}, | ||
| 259 | {0x000075e1, 0000000000}, | ||
| 260 | {0x00000001, 0000000000}, | ||
| 261 | {0x000380d9, 0x00000002}, | ||
| 262 | {0x04007394, 0000000000}, | ||
| 263 | {0000000000, 0000000000}, | ||
| 264 | {0000000000, 0000000000}, | ||
| 265 | {0000000000, 0000000000}, | ||
| 266 | {0000000000, 0000000000}, | ||
| 267 | {0000000000, 0000000000}, | ||
| 268 | {0000000000, 0000000000}, | ||
| 269 | {0000000000, 0000000000}, | ||
| 270 | {0000000000, 0000000000}, | ||
| 271 | {0000000000, 0000000000}, | ||
| 272 | {0000000000, 0000000000}, | ||
| 273 | {0000000000, 0000000000}, | ||
| 274 | {0000000000, 0000000000}, | ||
| 275 | {0000000000, 0000000000}, | ||
| 276 | {0000000000, 0000000000}, | ||
| 277 | {0000000000, 0000000000}, | ||
| 278 | {0000000000, 0000000000}, | ||
| 279 | {0000000000, 0000000000}, | ||
| 280 | {0000000000, 0000000000}, | ||
| 281 | {0000000000, 0000000000}, | ||
| 282 | {0000000000, 0000000000}, | ||
| 283 | {0000000000, 0000000000}, | ||
| 284 | {0000000000, 0000000000}, | ||
| 285 | {0000000000, 0000000000}, | ||
| 286 | {0000000000, 0000000000}, | ||
| 287 | {0000000000, 0000000000}, | ||
| 288 | {0000000000, 0000000000}, | ||
| 289 | {0000000000, 0000000000}, | ||
| 290 | {0000000000, 0000000000}, | ||
| 291 | {0000000000, 0000000000}, | ||
| 292 | {0000000000, 0000000000}, | ||
| 293 | {0000000000, 0000000000}, | ||
| 294 | {0000000000, 0000000000}, | ||
| 295 | {0000000000, 0000000000}, | ||
| 296 | {0000000000, 0000000000}, | ||
| 297 | {0000000000, 0000000000}, | ||
| 298 | {0000000000, 0000000000}, | ||
| 299 | }; | ||
| 300 | |||
| 301 | static const u32 radeon_cp_microcode[][2] = { | ||
| 302 | {0x21007000, 0000000000}, | ||
| 303 | {0x20007000, 0000000000}, | ||
| 304 | {0x000000b4, 0x00000004}, | ||
| 305 | {0x000000b8, 0x00000004}, | ||
| 306 | {0x6f5b4d4c, 0000000000}, | ||
| 307 | {0x4c4c427f, 0000000000}, | ||
| 308 | {0x5b568a92, 0000000000}, | ||
| 309 | {0x4ca09c6d, 0000000000}, | ||
| 310 | {0xad4c4c4c, 0000000000}, | ||
| 311 | {0x4ce1af3d, 0000000000}, | ||
| 312 | {0xd8afafaf, 0000000000}, | ||
| 313 | {0xd64c4cdc, 0000000000}, | ||
| 314 | {0x4cd10d10, 0000000000}, | ||
| 315 | {0x000f0000, 0x00000016}, | ||
| 316 | {0x362f242d, 0000000000}, | ||
| 317 | {0x00000012, 0x00000004}, | ||
| 318 | {0x000f0000, 0x00000016}, | ||
| 319 | {0x362f282d, 0000000000}, | ||
| 320 | {0x000380e7, 0x00000002}, | ||
| 321 | {0x04002c97, 0x00000002}, | ||
| 322 | {0x000f0001, 0x00000016}, | ||
| 323 | {0x333a3730, 0000000000}, | ||
| 324 | {0x000077ef, 0x00000002}, | ||
| 325 | {0x00061000, 0x00000002}, | ||
| 326 | {0x00000021, 0x0000001a}, | ||
| 327 | {0x00004000, 0x0000001e}, | ||
| 328 | {0x00061000, 0x00000002}, | ||
| 329 | {0x00000021, 0x0000001a}, | ||
| 330 | {0x00004000, 0x0000001e}, | ||
| 331 | {0x00061000, 0x00000002}, | ||
| 332 | {0x00000021, 0x0000001a}, | ||
| 333 | {0x00004000, 0x0000001e}, | ||
| 334 | {0x00000017, 0x00000004}, | ||
| 335 | {0x0003802b, 0x00000002}, | ||
| 336 | {0x040067e0, 0x00000002}, | ||
| 337 | {0x00000017, 0x00000004}, | ||
| 338 | {0x000077e0, 0x00000002}, | ||
| 339 | {0x00065000, 0x00000002}, | ||
| 340 | {0x000037e1, 0x00000002}, | ||
| 341 | {0x040067e1, 0x00000006}, | ||
| 342 | {0x000077e0, 0x00000002}, | ||
| 343 | {0x000077e1, 0x00000002}, | ||
| 344 | {0x000077e1, 0x00000006}, | ||
| 345 | {0xffffffff, 0000000000}, | ||
| 346 | {0x10000000, 0000000000}, | ||
| 347 | {0x0003802b, 0x00000002}, | ||
| 348 | {0x040067e0, 0x00000006}, | ||
| 349 | {0x00007675, 0x00000002}, | ||
| 350 | {0x00007676, 0x00000002}, | ||
| 351 | {0x00007677, 0x00000002}, | ||
| 352 | {0x00007678, 0x00000006}, | ||
| 353 | {0x0003802c, 0x00000002}, | ||
| 354 | {0x04002676, 0x00000002}, | ||
| 355 | {0x00007677, 0x00000002}, | ||
| 356 | {0x00007678, 0x00000006}, | ||
| 357 | {0x0000002f, 0x00000018}, | ||
| 358 | {0x0000002f, 0x00000018}, | ||
| 359 | {0000000000, 0x00000006}, | ||
| 360 | {0x00000030, 0x00000018}, | ||
| 361 | {0x00000030, 0x00000018}, | ||
| 362 | {0000000000, 0x00000006}, | ||
| 363 | {0x01605000, 0x00000002}, | ||
| 364 | {0x00065000, 0x00000002}, | ||
| 365 | {0x00098000, 0x00000002}, | ||
| 366 | {0x00061000, 0x00000002}, | ||
| 367 | {0x64c0603e, 0x00000004}, | ||
| 368 | {0x000380e6, 0x00000002}, | ||
| 369 | {0x040025c5, 0x00000002}, | ||
| 370 | {0x00080000, 0x00000016}, | ||
| 371 | {0000000000, 0000000000}, | ||
| 372 | {0x0400251d, 0x00000002}, | ||
| 373 | {0x00007580, 0x00000002}, | ||
| 374 | {0x00067581, 0x00000002}, | ||
| 375 | {0x04002580, 0x00000002}, | ||
| 376 | {0x00067581, 0x00000002}, | ||
| 377 | {0x00000049, 0x00000004}, | ||
| 378 | {0x00005000, 0000000000}, | ||
| 379 | {0x000380e6, 0x00000002}, | ||
| 380 | {0x040025c5, 0x00000002}, | ||
| 381 | {0x00061000, 0x00000002}, | ||
| 382 | {0x0000750e, 0x00000002}, | ||
| 383 | {0x00019000, 0x00000002}, | ||
| 384 | {0x00011055, 0x00000014}, | ||
| 385 | {0x00000055, 0x00000012}, | ||
| 386 | {0x0400250f, 0x00000002}, | ||
| 387 | {0x0000504f, 0x00000004}, | ||
| 388 | {0x000380e6, 0x00000002}, | ||
| 389 | {0x040025c5, 0x00000002}, | ||
| 390 | {0x00007565, 0x00000002}, | ||
| 391 | {0x00007566, 0x00000002}, | ||
| 392 | {0x00000058, 0x00000004}, | ||
| 393 | {0x000380e6, 0x00000002}, | ||
| 394 | {0x040025c5, 0x00000002}, | ||
| 395 | {0x01e655b4, 0x00000002}, | ||
| 396 | {0x4401b0e4, 0x00000002}, | ||
| 397 | {0x01c110e4, 0x00000002}, | ||
| 398 | {0x26667066, 0x00000018}, | ||
| 399 | {0x040c2565, 0x00000002}, | ||
| 400 | {0x00000066, 0x00000018}, | ||
| 401 | {0x04002564, 0x00000002}, | ||
| 402 | {0x00007566, 0x00000002}, | ||
| 403 | {0x0000005d, 0x00000004}, | ||
| 404 | {0x00401069, 0x00000008}, | ||
| 405 | {0x00101000, 0x00000002}, | ||
| 406 | {0x000d80ff, 0x00000002}, | ||
| 407 | {0x0080006c, 0x00000008}, | ||
| 408 | {0x000f9000, 0x00000002}, | ||
| 409 | {0x000e00ff, 0x00000002}, | ||
| 410 | {0000000000, 0x00000006}, | ||
| 411 | {0x0000008f, 0x00000018}, | ||
| 412 | {0x0000005b, 0x00000004}, | ||
| 413 | {0x000380e6, 0x00000002}, | ||
| 414 | {0x040025c5, 0x00000002}, | ||
| 415 | {0x00007576, 0x00000002}, | ||
| 416 | {0x00065000, 0x00000002}, | ||
| 417 | {0x00009000, 0x00000002}, | ||
| 418 | {0x00041000, 0x00000002}, | ||
| 419 | {0x0c00350e, 0x00000002}, | ||
| 420 | {0x00049000, 0x00000002}, | ||
| 421 | {0x00051000, 0x00000002}, | ||
| 422 | {0x01e785f8, 0x00000002}, | ||
| 423 | {0x00200000, 0x00000002}, | ||
| 424 | {0x0060007e, 0x0000000c}, | ||
| 425 | {0x00007563, 0x00000002}, | ||
| 426 | {0x006075f0, 0x00000021}, | ||
| 427 | {0x20007073, 0x00000004}, | ||
| 428 | {0x00005073, 0x00000004}, | ||
| 429 | {0x000380e6, 0x00000002}, | ||
| 430 | {0x040025c5, 0x00000002}, | ||
| 431 | {0x00007576, 0x00000002}, | ||
| 432 | {0x00007577, 0x00000002}, | ||
| 433 | {0x0000750e, 0x00000002}, | ||
| 434 | {0x0000750f, 0x00000002}, | ||
| 435 | {0x00a05000, 0x00000002}, | ||
| 436 | {0x00600083, 0x0000000c}, | ||
| 437 | {0x006075f0, 0x00000021}, | ||
| 438 | {0x000075f8, 0x00000002}, | ||
| 439 | {0x00000083, 0x00000004}, | ||
| 440 | {0x000a750e, 0x00000002}, | ||
| 441 | {0x000380e6, 0x00000002}, | ||
| 442 | {0x040025c5, 0x00000002}, | ||
| 443 | {0x0020750f, 0x00000002}, | ||
| 444 | {0x00600086, 0x00000004}, | ||
| 445 | {0x00007570, 0x00000002}, | ||
| 446 | {0x00007571, 0x00000002}, | ||
| 447 | {0x00007572, 0x00000006}, | ||
| 448 | {0x000380e6, 0x00000002}, | ||
| 449 | {0x040025c5, 0x00000002}, | ||
| 450 | {0x00005000, 0x00000002}, | ||
| 451 | {0x00a05000, 0x00000002}, | ||
| 452 | {0x00007568, 0x00000002}, | ||
| 453 | {0x00061000, 0x00000002}, | ||
| 454 | {0x00000095, 0x0000000c}, | ||
| 455 | {0x00058000, 0x00000002}, | ||
| 456 | {0x0c607562, 0x00000002}, | ||
| 457 | {0x00000097, 0x00000004}, | ||
| 458 | {0x000380e6, 0x00000002}, | ||
| 459 | {0x040025c5, 0x00000002}, | ||
| 460 | {0x00600096, 0x00000004}, | ||
| 461 | {0x400070e5, 0000000000}, | ||
| 462 | {0x000380e6, 0x00000002}, | ||
| 463 | {0x040025c5, 0x00000002}, | ||
| 464 | {0x000380e5, 0x00000002}, | ||
| 465 | {0x000000a8, 0x0000001c}, | ||
| 466 | {0x000650aa, 0x00000018}, | ||
| 467 | {0x040025bb, 0x00000002}, | ||
| 468 | {0x000610ab, 0x00000018}, | ||
| 469 | {0x040075bc, 0000000000}, | ||
| 470 | {0x000075bb, 0x00000002}, | ||
| 471 | {0x000075bc, 0000000000}, | ||
| 472 | {0x00090000, 0x00000006}, | ||
| 473 | {0x00090000, 0x00000002}, | ||
| 474 | {0x000d8002, 0x00000006}, | ||
| 475 | {0x00007832, 0x00000002}, | ||
| 476 | {0x00005000, 0x00000002}, | ||
| 477 | {0x000380e7, 0x00000002}, | ||
| 478 | {0x04002c97, 0x00000002}, | ||
| 479 | {0x00007820, 0x00000002}, | ||
| 480 | {0x00007821, 0x00000002}, | ||
| 481 | {0x00007800, 0000000000}, | ||
| 482 | {0x01200000, 0x00000002}, | ||
| 483 | {0x20077000, 0x00000002}, | ||
| 484 | {0x01200000, 0x00000002}, | ||
| 485 | {0x20007000, 0x00000002}, | ||
| 486 | {0x00061000, 0x00000002}, | ||
| 487 | {0x0120751b, 0x00000002}, | ||
| 488 | {0x8040750a, 0x00000002}, | ||
| 489 | {0x8040750b, 0x00000002}, | ||
| 490 | {0x00110000, 0x00000002}, | ||
| 491 | {0x000380e5, 0x00000002}, | ||
| 492 | {0x000000c6, 0x0000001c}, | ||
| 493 | {0x000610ab, 0x00000018}, | ||
| 494 | {0x844075bd, 0x00000002}, | ||
| 495 | {0x000610aa, 0x00000018}, | ||
| 496 | {0x840075bb, 0x00000002}, | ||
| 497 | {0x000610ab, 0x00000018}, | ||
| 498 | {0x844075bc, 0x00000002}, | ||
| 499 | {0x000000c9, 0x00000004}, | ||
| 500 | {0x804075bd, 0x00000002}, | ||
| 501 | {0x800075bb, 0x00000002}, | ||
| 502 | {0x804075bc, 0x00000002}, | ||
| 503 | {0x00108000, 0x00000002}, | ||
| 504 | {0x01400000, 0x00000002}, | ||
| 505 | {0x006000cd, 0x0000000c}, | ||
| 506 | {0x20c07000, 0x00000020}, | ||
| 507 | {0x000000cf, 0x00000012}, | ||
| 508 | {0x00800000, 0x00000006}, | ||
| 509 | {0x0080751d, 0x00000006}, | ||
| 510 | {0000000000, 0000000000}, | ||
| 511 | {0x0000775c, 0x00000002}, | ||
| 512 | {0x00a05000, 0x00000002}, | ||
| 513 | {0x00661000, 0x00000002}, | ||
| 514 | {0x0460275d, 0x00000020}, | ||
| 515 | {0x00004000, 0000000000}, | ||
| 516 | {0x01e00830, 0x00000002}, | ||
| 517 | {0x21007000, 0000000000}, | ||
| 518 | {0x6464614d, 0000000000}, | ||
| 519 | {0x69687420, 0000000000}, | ||
| 520 | {0x00000073, 0000000000}, | ||
| 521 | {0000000000, 0000000000}, | ||
| 522 | {0x00005000, 0x00000002}, | ||
| 523 | {0x000380d0, 0x00000002}, | ||
| 524 | {0x040025e0, 0x00000002}, | ||
| 525 | {0x000075e1, 0000000000}, | ||
| 526 | {0x00000001, 0000000000}, | ||
| 527 | {0x000380e0, 0x00000002}, | ||
| 528 | {0x04002394, 0x00000002}, | ||
| 529 | {0x00005000, 0000000000}, | ||
| 530 | {0000000000, 0000000000}, | ||
| 531 | {0000000000, 0000000000}, | ||
| 532 | {0x00000008, 0000000000}, | ||
| 533 | {0x00000004, 0000000000}, | ||
| 534 | {0000000000, 0000000000}, | ||
| 535 | {0000000000, 0000000000}, | ||
| 536 | {0000000000, 0000000000}, | ||
| 537 | {0000000000, 0000000000}, | ||
| 538 | {0000000000, 0000000000}, | ||
| 539 | {0000000000, 0000000000}, | ||
| 540 | {0000000000, 0000000000}, | ||
| 541 | {0000000000, 0000000000}, | ||
| 542 | {0000000000, 0000000000}, | ||
| 543 | {0000000000, 0000000000}, | ||
| 544 | {0000000000, 0000000000}, | ||
| 545 | {0000000000, 0000000000}, | ||
| 546 | {0000000000, 0000000000}, | ||
| 547 | {0000000000, 0000000000}, | ||
| 548 | {0000000000, 0000000000}, | ||
| 549 | {0000000000, 0000000000}, | ||
| 550 | {0000000000, 0000000000}, | ||
| 551 | {0000000000, 0000000000}, | ||
| 552 | {0000000000, 0000000000}, | ||
| 553 | {0000000000, 0000000000}, | ||
| 554 | {0000000000, 0000000000}, | ||
| 555 | {0000000000, 0000000000}, | ||
| 556 | {0000000000, 0000000000}, | ||
| 557 | {0000000000, 0000000000}, | ||
| 558 | }; | ||
| 559 | |||
| 560 | static const u32 R300_cp_microcode[][2] = { | ||
| 561 | {0x4200e000, 0000000000}, | ||
| 562 | {0x4000e000, 0000000000}, | ||
| 563 | {0x000000af, 0x00000008}, | ||
| 564 | {0x000000b3, 0x00000008}, | ||
| 565 | {0x6c5a504f, 0000000000}, | ||
| 566 | {0x4f4f497a, 0000000000}, | ||
| 567 | {0x5a578288, 0000000000}, | ||
| 568 | {0x4f91906a, 0000000000}, | ||
| 569 | {0x4f4f4f4f, 0000000000}, | ||
| 570 | {0x4fe24f44, 0000000000}, | ||
| 571 | {0x4f9c9c9c, 0000000000}, | ||
| 572 | {0xdc4f4fde, 0000000000}, | ||
| 573 | {0xa1cd4f4f, 0000000000}, | ||
| 574 | {0xd29d9d9d, 0000000000}, | ||
| 575 | {0x4f0f9fd7, 0000000000}, | ||
| 576 | {0x000ca000, 0x00000004}, | ||
| 577 | {0x000d0012, 0x00000038}, | ||
| 578 | {0x0000e8b4, 0x00000004}, | ||
| 579 | {0x000d0014, 0x00000038}, | ||
| 580 | {0x0000e8b6, 0x00000004}, | ||
| 581 | {0x000d0016, 0x00000038}, | ||
| 582 | {0x0000e854, 0x00000004}, | ||
| 583 | {0x000d0018, 0x00000038}, | ||
| 584 | {0x0000e855, 0x00000004}, | ||
| 585 | {0x000d001a, 0x00000038}, | ||
| 586 | {0x0000e856, 0x00000004}, | ||
| 587 | {0x000d001c, 0x00000038}, | ||
| 588 | {0x0000e857, 0x00000004}, | ||
| 589 | {0x000d001e, 0x00000038}, | ||
| 590 | {0x0000e824, 0x00000004}, | ||
| 591 | {0x000d0020, 0x00000038}, | ||
| 592 | {0x0000e825, 0x00000004}, | ||
| 593 | {0x000d0022, 0x00000038}, | ||
| 594 | {0x0000e830, 0x00000004}, | ||
| 595 | {0x000d0024, 0x00000038}, | ||
| 596 | {0x0000f0c0, 0x00000004}, | ||
| 597 | {0x000d0026, 0x00000038}, | ||
| 598 | {0x0000f0c1, 0x00000004}, | ||
| 599 | {0x000d0028, 0x00000038}, | ||
| 600 | {0x0000f041, 0x00000004}, | ||
| 601 | {0x000d002a, 0x00000038}, | ||
| 602 | {0x0000f184, 0x00000004}, | ||
| 603 | {0x000d002c, 0x00000038}, | ||
| 604 | {0x0000f185, 0x00000004}, | ||
| 605 | {0x000d002e, 0x00000038}, | ||
| 606 | {0x0000f186, 0x00000004}, | ||
| 607 | {0x000d0030, 0x00000038}, | ||
| 608 | {0x0000f187, 0x00000004}, | ||
| 609 | {0x000d0032, 0x00000038}, | ||
| 610 | {0x0000f180, 0x00000004}, | ||
| 611 | {0x000d0034, 0x00000038}, | ||
| 612 | {0x0000f393, 0x00000004}, | ||
| 613 | {0x000d0036, 0x00000038}, | ||
| 614 | {0x0000f38a, 0x00000004}, | ||
| 615 | {0x000d0038, 0x00000038}, | ||
| 616 | {0x0000f38e, 0x00000004}, | ||
| 617 | {0x0000e821, 0x00000004}, | ||
| 618 | {0x0140a000, 0x00000004}, | ||
| 619 | {0x00000043, 0x00000018}, | ||
| 620 | {0x00cce800, 0x00000004}, | ||
| 621 | {0x001b0001, 0x00000004}, | ||
| 622 | {0x08004800, 0x00000004}, | ||
| 623 | {0x001b0001, 0x00000004}, | ||
| 624 | {0x08004800, 0x00000004}, | ||
| 625 | {0x001b0001, 0x00000004}, | ||
| 626 | {0x08004800, 0x00000004}, | ||
| 627 | {0x0000003a, 0x00000008}, | ||
| 628 | {0x0000a000, 0000000000}, | ||
| 629 | {0x02c0a000, 0x00000004}, | ||
| 630 | {0x000ca000, 0x00000004}, | ||
| 631 | {0x00130000, 0x00000004}, | ||
| 632 | {0x000c2000, 0x00000004}, | ||
| 633 | {0xc980c045, 0x00000008}, | ||
| 634 | {0x2000451d, 0x00000004}, | ||
| 635 | {0x0000e580, 0x00000004}, | ||
| 636 | {0x000ce581, 0x00000004}, | ||
| 637 | {0x08004580, 0x00000004}, | ||
| 638 | {0x000ce581, 0x00000004}, | ||
| 639 | {0x0000004c, 0x00000008}, | ||
| 640 | {0x0000a000, 0000000000}, | ||
| 641 | {0x000c2000, 0x00000004}, | ||
| 642 | {0x0000e50e, 0x00000004}, | ||
| 643 | {0x00032000, 0x00000004}, | ||
| 644 | {0x00022056, 0x00000028}, | ||
| 645 | {0x00000056, 0x00000024}, | ||
| 646 | {0x0800450f, 0x00000004}, | ||
| 647 | {0x0000a050, 0x00000008}, | ||
| 648 | {0x0000e565, 0x00000004}, | ||
| 649 | {0x0000e566, 0x00000004}, | ||
| 650 | {0x00000057, 0x00000008}, | ||
| 651 | {0x03cca5b4, 0x00000004}, | ||
| 652 | {0x05432000, 0x00000004}, | ||
| 653 | {0x00022000, 0x00000004}, | ||
| 654 | {0x4ccce063, 0x00000030}, | ||
| 655 | {0x08274565, 0x00000004}, | ||
| 656 | {0x00000063, 0x00000030}, | ||
| 657 | {0x08004564, 0x00000004}, | ||
| 658 | {0x0000e566, 0x00000004}, | ||
| 659 | {0x0000005a, 0x00000008}, | ||
| 660 | {0x00802066, 0x00000010}, | ||
| 661 | {0x00202000, 0x00000004}, | ||
| 662 | {0x001b00ff, 0x00000004}, | ||
| 663 | {0x01000069, 0x00000010}, | ||
| 664 | {0x001f2000, 0x00000004}, | ||
| 665 | {0x001c00ff, 0x00000004}, | ||
| 666 | {0000000000, 0x0000000c}, | ||
| 667 | {0x00000085, 0x00000030}, | ||
| 668 | {0x0000005a, 0x00000008}, | ||
| 669 | {0x0000e576, 0x00000004}, | ||
| 670 | {0x000ca000, 0x00000004}, | ||
| 671 | {0x00012000, 0x00000004}, | ||
| 672 | {0x00082000, 0x00000004}, | ||
| 673 | {0x1800650e, 0x00000004}, | ||
| 674 | {0x00092000, 0x00000004}, | ||
| 675 | {0x000a2000, 0x00000004}, | ||
| 676 | {0x000f0000, 0x00000004}, | ||
| 677 | {0x00400000, 0x00000004}, | ||
| 678 | {0x00000079, 0x00000018}, | ||
| 679 | {0x0000e563, 0x00000004}, | ||
| 680 | {0x00c0e5f9, 0x000000c2}, | ||
| 681 | {0x0000006e, 0x00000008}, | ||
| 682 | {0x0000a06e, 0x00000008}, | ||
| 683 | {0x0000e576, 0x00000004}, | ||
| 684 | {0x0000e577, 0x00000004}, | ||
| 685 | {0x0000e50e, 0x00000004}, | ||
| 686 | {0x0000e50f, 0x00000004}, | ||
| 687 | {0x0140a000, 0x00000004}, | ||
| 688 | {0x0000007c, 0x00000018}, | ||
| 689 | {0x00c0e5f9, 0x000000c2}, | ||
| 690 | {0x0000007c, 0x00000008}, | ||
| 691 | {0x0014e50e, 0x00000004}, | ||
| 692 | {0x0040e50f, 0x00000004}, | ||
| 693 | {0x00c0007f, 0x00000008}, | ||
| 694 | {0x0000e570, 0x00000004}, | ||
| 695 | {0x0000e571, 0x00000004}, | ||
| 696 | {0x0000e572, 0x0000000c}, | ||
| 697 | {0x0000a000, 0x00000004}, | ||
| 698 | {0x0140a000, 0x00000004}, | ||
| 699 | {0x0000e568, 0x00000004}, | ||
| 700 | {0x000c2000, 0x00000004}, | ||
| 701 | {0x00000089, 0x00000018}, | ||
| 702 | {0x000b0000, 0x00000004}, | ||
| 703 | {0x18c0e562, 0x00000004}, | ||
| 704 | {0x0000008b, 0x00000008}, | ||
| 705 | {0x00c0008a, 0x00000008}, | ||
| 706 | {0x000700e4, 0x00000004}, | ||
| 707 | {0x00000097, 0x00000038}, | ||
| 708 | {0x000ca099, 0x00000030}, | ||
| 709 | {0x080045bb, 0x00000004}, | ||
| 710 | {0x000c209a, 0x00000030}, | ||
| 711 | {0x0800e5bc, 0000000000}, | ||
| 712 | {0x0000e5bb, 0x00000004}, | ||
| 713 | {0x0000e5bc, 0000000000}, | ||
| 714 | {0x00120000, 0x0000000c}, | ||
| 715 | {0x00120000, 0x00000004}, | ||
| 716 | {0x001b0002, 0x0000000c}, | ||
| 717 | {0x0000a000, 0x00000004}, | ||
| 718 | {0x0000e821, 0x00000004}, | ||
| 719 | {0x0000e800, 0000000000}, | ||
| 720 | {0x0000e821, 0x00000004}, | ||
| 721 | {0x0000e82e, 0000000000}, | ||
| 722 | {0x02cca000, 0x00000004}, | ||
| 723 | {0x00140000, 0x00000004}, | ||
| 724 | {0x000ce1cc, 0x00000004}, | ||
| 725 | {0x050de1cd, 0x00000004}, | ||
| 726 | {0x000000a7, 0x00000020}, | ||
| 727 | {0x4200e000, 0000000000}, | ||
| 728 | {0x000000ae, 0x00000038}, | ||
| 729 | {0x000ca000, 0x00000004}, | ||
| 730 | {0x00140000, 0x00000004}, | ||
| 731 | {0x000c2000, 0x00000004}, | ||
| 732 | {0x00160000, 0x00000004}, | ||
| 733 | {0x700ce000, 0x00000004}, | ||
| 734 | {0x001400aa, 0x00000008}, | ||
| 735 | {0x4000e000, 0000000000}, | ||
| 736 | {0x02400000, 0x00000004}, | ||
| 737 | {0x400ee000, 0x00000004}, | ||
| 738 | {0x02400000, 0x00000004}, | ||
| 739 | {0x4000e000, 0000000000}, | ||
| 740 | {0x000c2000, 0x00000004}, | ||
| 741 | {0x0240e51b, 0x00000004}, | ||
| 742 | {0x0080e50a, 0x00000005}, | ||
| 743 | {0x0080e50b, 0x00000005}, | ||
| 744 | {0x00220000, 0x00000004}, | ||
| 745 | {0x000700e4, 0x00000004}, | ||
| 746 | {0x000000c1, 0x00000038}, | ||
| 747 | {0x000c209a, 0x00000030}, | ||
| 748 | {0x0880e5bd, 0x00000005}, | ||
| 749 | {0x000c2099, 0x00000030}, | ||
| 750 | {0x0800e5bb, 0x00000005}, | ||
| 751 | {0x000c209a, 0x00000030}, | ||
| 752 | {0x0880e5bc, 0x00000005}, | ||
| 753 | {0x000000c4, 0x00000008}, | ||
| 754 | {0x0080e5bd, 0x00000005}, | ||
| 755 | {0x0000e5bb, 0x00000005}, | ||
| 756 | {0x0080e5bc, 0x00000005}, | ||
| 757 | {0x00210000, 0x00000004}, | ||
| 758 | {0x02800000, 0x00000004}, | ||
| 759 | {0x00c000c8, 0x00000018}, | ||
| 760 | {0x4180e000, 0x00000040}, | ||
| 761 | {0x000000ca, 0x00000024}, | ||
| 762 | {0x01000000, 0x0000000c}, | ||
| 763 | {0x0100e51d, 0x0000000c}, | ||
| 764 | {0x000045bb, 0x00000004}, | ||
| 765 | {0x000080c4, 0x00000008}, | ||
| 766 | {0x0000f3ce, 0x00000004}, | ||
| 767 | {0x0140a000, 0x00000004}, | ||
| 768 | {0x00cc2000, 0x00000004}, | ||
| 769 | {0x08c053cf, 0x00000040}, | ||
| 770 | {0x00008000, 0000000000}, | ||
| 771 | {0x0000f3d2, 0x00000004}, | ||
| 772 | {0x0140a000, 0x00000004}, | ||
| 773 | {0x00cc2000, 0x00000004}, | ||
| 774 | {0x08c053d3, 0x00000040}, | ||
| 775 | {0x00008000, 0000000000}, | ||
| 776 | {0x0000f39d, 0x00000004}, | ||
| 777 | {0x0140a000, 0x00000004}, | ||
| 778 | {0x00cc2000, 0x00000004}, | ||
| 779 | {0x08c0539e, 0x00000040}, | ||
| 780 | {0x00008000, 0000000000}, | ||
| 781 | {0x03c00830, 0x00000004}, | ||
| 782 | {0x4200e000, 0000000000}, | ||
| 783 | {0x0000a000, 0x00000004}, | ||
| 784 | {0x200045e0, 0x00000004}, | ||
| 785 | {0x0000e5e1, 0000000000}, | ||
| 786 | {0x00000001, 0000000000}, | ||
| 787 | {0x000700e1, 0x00000004}, | ||
| 788 | {0x0800e394, 0000000000}, | ||
| 789 | {0000000000, 0000000000}, | ||
| 790 | {0000000000, 0000000000}, | ||
| 791 | {0000000000, 0000000000}, | ||
| 792 | {0000000000, 0000000000}, | ||
| 793 | {0000000000, 0000000000}, | ||
| 794 | {0000000000, 0000000000}, | ||
| 795 | {0000000000, 0000000000}, | ||
| 796 | {0000000000, 0000000000}, | ||
| 797 | {0000000000, 0000000000}, | ||
| 798 | {0000000000, 0000000000}, | ||
| 799 | {0000000000, 0000000000}, | ||
| 800 | {0000000000, 0000000000}, | ||
| 801 | {0000000000, 0000000000}, | ||
| 802 | {0000000000, 0000000000}, | ||
| 803 | {0000000000, 0000000000}, | ||
| 804 | {0000000000, 0000000000}, | ||
| 805 | {0000000000, 0000000000}, | ||
| 806 | {0000000000, 0000000000}, | ||
| 807 | {0000000000, 0000000000}, | ||
| 808 | {0000000000, 0000000000}, | ||
| 809 | {0000000000, 0000000000}, | ||
| 810 | {0000000000, 0000000000}, | ||
| 811 | {0000000000, 0000000000}, | ||
| 812 | {0000000000, 0000000000}, | ||
| 813 | {0000000000, 0000000000}, | ||
| 814 | {0000000000, 0000000000}, | ||
| 815 | {0000000000, 0000000000}, | ||
| 816 | {0000000000, 0000000000}, | ||
| 817 | }; | ||
| 818 | |||
| 819 | static u32 RADEON_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) | ||
| 820 | { | 45 | { |
| 821 | u32 ret; | 46 | u32 ret; |
| 822 | RADEON_WRITE(R520_MC_IND_INDEX, 0x7f0000 | (addr & 0xff)); | 47 | RADEON_WRITE(R520_MC_IND_INDEX, 0x7f0000 | (addr & 0xff)); |
| @@ -825,21 +50,41 @@ static u32 RADEON_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) | |||
| 825 | return ret; | 50 | return ret; |
| 826 | } | 51 | } |
| 827 | 52 | ||
| 53 | static u32 RS480_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) | ||
| 54 | { | ||
| 55 | u32 ret; | ||
| 56 | RADEON_WRITE(RS480_NB_MC_INDEX, addr & 0xff); | ||
| 57 | ret = RADEON_READ(RS480_NB_MC_DATA); | ||
| 58 | RADEON_WRITE(RS480_NB_MC_INDEX, 0xff); | ||
| 59 | return ret; | ||
| 60 | } | ||
| 61 | |||
| 828 | static u32 RS690_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) | 62 | static u32 RS690_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) |
| 829 | { | 63 | { |
| 64 | u32 ret; | ||
| 830 | RADEON_WRITE(RS690_MC_INDEX, (addr & RS690_MC_INDEX_MASK)); | 65 | RADEON_WRITE(RS690_MC_INDEX, (addr & RS690_MC_INDEX_MASK)); |
| 831 | return RADEON_READ(RS690_MC_DATA); | 66 | ret = RADEON_READ(RS690_MC_DATA); |
| 67 | RADEON_WRITE(RS690_MC_INDEX, RS690_MC_INDEX_MASK); | ||
| 68 | return ret; | ||
| 69 | } | ||
| 70 | |||
| 71 | static u32 IGP_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) | ||
| 72 | { | ||
| 73 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) | ||
| 74 | return RS690_READ_MCIND(dev_priv, addr); | ||
| 75 | else | ||
| 76 | return RS480_READ_MCIND(dev_priv, addr); | ||
| 832 | } | 77 | } |
| 833 | 78 | ||
| 834 | u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv) | 79 | u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv) |
| 835 | { | 80 | { |
| 836 | 81 | ||
| 837 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) | 82 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) |
| 838 | return RADEON_READ_MCIND(dev_priv, RV515_MC_FB_LOCATION); | 83 | return R500_READ_MCIND(dev_priv, RV515_MC_FB_LOCATION); |
| 839 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) | 84 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) |
| 840 | return RS690_READ_MCIND(dev_priv, RS690_MC_FB_LOCATION); | 85 | return RS690_READ_MCIND(dev_priv, RS690_MC_FB_LOCATION); |
| 841 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515) | 86 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515) |
| 842 | return RADEON_READ_MCIND(dev_priv, R520_MC_FB_LOCATION); | 87 | return R500_READ_MCIND(dev_priv, R520_MC_FB_LOCATION); |
| 843 | else | 88 | else |
| 844 | return RADEON_READ(RADEON_MC_FB_LOCATION); | 89 | return RADEON_READ(RADEON_MC_FB_LOCATION); |
| 845 | } | 90 | } |
| @@ -847,11 +92,11 @@ u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv) | |||
| 847 | static void radeon_write_fb_location(drm_radeon_private_t *dev_priv, u32 fb_loc) | 92 | static void radeon_write_fb_location(drm_radeon_private_t *dev_priv, u32 fb_loc) |
| 848 | { | 93 | { |
| 849 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) | 94 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) |
| 850 | RADEON_WRITE_MCIND(RV515_MC_FB_LOCATION, fb_loc); | 95 | R500_WRITE_MCIND(RV515_MC_FB_LOCATION, fb_loc); |
| 851 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) | 96 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) |
| 852 | RS690_WRITE_MCIND(RS690_MC_FB_LOCATION, fb_loc); | 97 | RS690_WRITE_MCIND(RS690_MC_FB_LOCATION, fb_loc); |
| 853 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515) | 98 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515) |
| 854 | RADEON_WRITE_MCIND(R520_MC_FB_LOCATION, fb_loc); | 99 | R500_WRITE_MCIND(R520_MC_FB_LOCATION, fb_loc); |
| 855 | else | 100 | else |
| 856 | RADEON_WRITE(RADEON_MC_FB_LOCATION, fb_loc); | 101 | RADEON_WRITE(RADEON_MC_FB_LOCATION, fb_loc); |
| 857 | } | 102 | } |
| @@ -859,15 +104,39 @@ static void radeon_write_fb_location(drm_radeon_private_t *dev_priv, u32 fb_loc) | |||
| 859 | static void radeon_write_agp_location(drm_radeon_private_t *dev_priv, u32 agp_loc) | 104 | static void radeon_write_agp_location(drm_radeon_private_t *dev_priv, u32 agp_loc) |
| 860 | { | 105 | { |
| 861 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) | 106 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) |
| 862 | RADEON_WRITE_MCIND(RV515_MC_AGP_LOCATION, agp_loc); | 107 | R500_WRITE_MCIND(RV515_MC_AGP_LOCATION, agp_loc); |
| 863 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) | 108 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) |
| 864 | RS690_WRITE_MCIND(RS690_MC_AGP_LOCATION, agp_loc); | 109 | RS690_WRITE_MCIND(RS690_MC_AGP_LOCATION, agp_loc); |
| 865 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515) | 110 | else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515) |
| 866 | RADEON_WRITE_MCIND(R520_MC_AGP_LOCATION, agp_loc); | 111 | R500_WRITE_MCIND(R520_MC_AGP_LOCATION, agp_loc); |
| 867 | else | 112 | else |
| 868 | RADEON_WRITE(RADEON_MC_AGP_LOCATION, agp_loc); | 113 | RADEON_WRITE(RADEON_MC_AGP_LOCATION, agp_loc); |
| 869 | } | 114 | } |
| 870 | 115 | ||
| 116 | static void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base) | ||
| 117 | { | ||
| 118 | u32 agp_base_hi = upper_32_bits(agp_base); | ||
| 119 | u32 agp_base_lo = agp_base & 0xffffffff; | ||
| 120 | |||
| 121 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) { | ||
| 122 | R500_WRITE_MCIND(RV515_MC_AGP_BASE, agp_base_lo); | ||
| 123 | R500_WRITE_MCIND(RV515_MC_AGP_BASE_2, agp_base_hi); | ||
| 124 | } else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) { | ||
| 125 | RS690_WRITE_MCIND(RS690_MC_AGP_BASE, agp_base_lo); | ||
| 126 | RS690_WRITE_MCIND(RS690_MC_AGP_BASE_2, agp_base_hi); | ||
| 127 | } else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515) { | ||
| 128 | R500_WRITE_MCIND(R520_MC_AGP_BASE, agp_base_lo); | ||
| 129 | R500_WRITE_MCIND(R520_MC_AGP_BASE_2, agp_base_hi); | ||
| 130 | } else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS480) { | ||
| 131 | RADEON_WRITE(RADEON_AGP_BASE, agp_base_lo); | ||
| 132 | RADEON_WRITE(RS480_AGP_BASE_2, 0); | ||
| 133 | } else { | ||
| 134 | RADEON_WRITE(RADEON_AGP_BASE, agp_base_lo); | ||
| 135 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R200) | ||
| 136 | RADEON_WRITE(RADEON_AGP_BASE_2, agp_base_hi); | ||
| 137 | } | ||
| 138 | } | ||
| 139 | |||
| 871 | static int RADEON_READ_PLL(struct drm_device * dev, int addr) | 140 | static int RADEON_READ_PLL(struct drm_device * dev, int addr) |
| 872 | { | 141 | { |
| 873 | drm_radeon_private_t *dev_priv = dev->dev_private; | 142 | drm_radeon_private_t *dev_priv = dev->dev_private; |
| @@ -882,15 +151,6 @@ static u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr) | |||
| 882 | return RADEON_READ(RADEON_PCIE_DATA); | 151 | return RADEON_READ(RADEON_PCIE_DATA); |
| 883 | } | 152 | } |
| 884 | 153 | ||
| 885 | static u32 RADEON_READ_IGPGART(drm_radeon_private_t *dev_priv, int addr) | ||
| 886 | { | ||
| 887 | u32 ret; | ||
| 888 | RADEON_WRITE(RADEON_IGPGART_INDEX, addr & 0x7f); | ||
| 889 | ret = RADEON_READ(RADEON_IGPGART_DATA); | ||
| 890 | RADEON_WRITE(RADEON_IGPGART_INDEX, 0x7f); | ||
| 891 | return ret; | ||
| 892 | } | ||
| 893 | |||
| 894 | #if RADEON_FIFO_DEBUG | 154 | #if RADEON_FIFO_DEBUG |
| 895 | static void radeon_status(drm_radeon_private_t * dev_priv) | 155 | static void radeon_status(drm_radeon_private_t * dev_priv) |
| 896 | { | 156 | { |
| @@ -925,16 +185,36 @@ static int radeon_do_pixcache_flush(drm_radeon_private_t * dev_priv) | |||
| 925 | 185 | ||
| 926 | dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE; | 186 | dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE; |
| 927 | 187 | ||
| 928 | tmp = RADEON_READ(RADEON_RB3D_DSTCACHE_CTLSTAT); | 188 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { |
| 929 | tmp |= RADEON_RB3D_DC_FLUSH_ALL; | 189 | tmp = RADEON_READ(RADEON_RB3D_DSTCACHE_CTLSTAT); |
| 930 | RADEON_WRITE(RADEON_RB3D_DSTCACHE_CTLSTAT, tmp); | 190 | tmp |= RADEON_RB3D_DC_FLUSH_ALL; |
| 191 | RADEON_WRITE(RADEON_RB3D_DSTCACHE_CTLSTAT, tmp); | ||
| 931 | 192 | ||
| 932 | for (i = 0; i < dev_priv->usec_timeout; i++) { | 193 | for (i = 0; i < dev_priv->usec_timeout; i++) { |
| 933 | if (!(RADEON_READ(RADEON_RB3D_DSTCACHE_CTLSTAT) | 194 | if (!(RADEON_READ(RADEON_RB3D_DSTCACHE_CTLSTAT) |
| 934 | & RADEON_RB3D_DC_BUSY)) { | 195 | & RADEON_RB3D_DC_BUSY)) { |
| 935 | return 0; | 196 | return 0; |
| 197 | } | ||
| 198 | DRM_UDELAY(1); | ||
| 199 | } | ||
| 200 | } else { | ||
| 201 | /* 3D */ | ||
| 202 | tmp = RADEON_READ(R300_RB3D_DSTCACHE_CTLSTAT); | ||
| 203 | tmp |= RADEON_RB3D_DC_FLUSH_ALL; | ||
| 204 | RADEON_WRITE(R300_RB3D_DSTCACHE_CTLSTAT, tmp); | ||
| 205 | |||
| 206 | /* 2D */ | ||
| 207 | tmp = RADEON_READ(R300_DSTCACHE_CTLSTAT); | ||
| 208 | tmp |= RADEON_RB3D_DC_FLUSH_ALL; | ||
| 209 | RADEON_WRITE(R300_DSTCACHE_CTLSTAT, tmp); | ||
| 210 | |||
| 211 | for (i = 0; i < dev_priv->usec_timeout; i++) { | ||
| 212 | if (!(RADEON_READ(R300_DSTCACHE_CTLSTAT) | ||
| 213 | & RADEON_RB3D_DC_BUSY)) { | ||
| 214 | return 0; | ||
| 215 | } | ||
| 216 | DRM_UDELAY(1); | ||
| 936 | } | 217 | } |
| 937 | DRM_UDELAY(1); | ||
| 938 | } | 218 | } |
| 939 | 219 | ||
| 940 | #if RADEON_FIFO_DEBUG | 220 | #if RADEON_FIFO_DEBUG |
| @@ -991,6 +271,50 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv) | |||
| 991 | return -EBUSY; | 271 | return -EBUSY; |
| 992 | } | 272 | } |
| 993 | 273 | ||
| 274 | static void radeon_init_pipes(drm_radeon_private_t *dev_priv) | ||
| 275 | { | ||
| 276 | uint32_t gb_tile_config, gb_pipe_sel = 0; | ||
| 277 | |||
| 278 | /* RS4xx/RS6xx/R4xx/R5xx */ | ||
| 279 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R420) { | ||
| 280 | gb_pipe_sel = RADEON_READ(R400_GB_PIPE_SELECT); | ||
| 281 | dev_priv->num_gb_pipes = ((gb_pipe_sel >> 12) & 0x3) + 1; | ||
| 282 | } else { | ||
| 283 | /* R3xx */ | ||
| 284 | if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R300) || | ||
| 285 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R350)) { | ||
| 286 | dev_priv->num_gb_pipes = 2; | ||
| 287 | } else { | ||
| 288 | /* R3Vxx */ | ||
| 289 | dev_priv->num_gb_pipes = 1; | ||
| 290 | } | ||
| 291 | } | ||
| 292 | DRM_INFO("Num pipes: %d\n", dev_priv->num_gb_pipes); | ||
| 293 | |||
| 294 | gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 /*| R300_SUBPIXEL_1_16*/); | ||
| 295 | |||
| 296 | switch (dev_priv->num_gb_pipes) { | ||
| 297 | case 2: gb_tile_config |= R300_PIPE_COUNT_R300; break; | ||
| 298 | case 3: gb_tile_config |= R300_PIPE_COUNT_R420_3P; break; | ||
| 299 | case 4: gb_tile_config |= R300_PIPE_COUNT_R420; break; | ||
| 300 | default: | ||
| 301 | case 1: gb_tile_config |= R300_PIPE_COUNT_RV350; break; | ||
| 302 | } | ||
| 303 | |||
| 304 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { | ||
| 305 | RADEON_WRITE_PLL(R500_DYN_SCLK_PWMEM_PIPE, (1 | ((gb_pipe_sel >> 8) & 0xf) << 4)); | ||
| 306 | RADEON_WRITE(R500_SU_REG_DEST, ((1 << dev_priv->num_gb_pipes) - 1)); | ||
| 307 | } | ||
| 308 | RADEON_WRITE(R300_GB_TILE_CONFIG, gb_tile_config); | ||
| 309 | radeon_do_wait_for_idle(dev_priv); | ||
| 310 | RADEON_WRITE(R300_DST_PIPE_CONFIG, RADEON_READ(R300_DST_PIPE_CONFIG) | R300_PIPE_AUTO_CONFIG); | ||
| 311 | RADEON_WRITE(R300_RB2D_DSTCACHE_MODE, (RADEON_READ(R300_RB2D_DSTCACHE_MODE) | | ||
| 312 | R300_DC_AUTOFLUSH_ENABLE | | ||
| 313 | R300_DC_DC_DISABLE_IGNORE_PE)); | ||
| 314 | |||
| 315 | |||
| 316 | } | ||
| 317 | |||
| 994 | /* ================================================================ | 318 | /* ================================================================ |
| 995 | * CP control, initialization | 319 | * CP control, initialization |
| 996 | */ | 320 | */ |
| @@ -1004,8 +328,22 @@ static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv) | |||
| 1004 | radeon_do_wait_for_idle(dev_priv); | 328 | radeon_do_wait_for_idle(dev_priv); |
| 1005 | 329 | ||
| 1006 | RADEON_WRITE(RADEON_CP_ME_RAM_ADDR, 0); | 330 | RADEON_WRITE(RADEON_CP_ME_RAM_ADDR, 0); |
| 1007 | 331 | if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R100) || | |
| 1008 | if (dev_priv->microcode_version == UCODE_R200) { | 332 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV100) || |
| 333 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV200) || | ||
| 334 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS100) || | ||
| 335 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS200)) { | ||
| 336 | DRM_INFO("Loading R100 Microcode\n"); | ||
| 337 | for (i = 0; i < 256; i++) { | ||
| 338 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, | ||
| 339 | R100_cp_microcode[i][1]); | ||
| 340 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, | ||
| 341 | R100_cp_microcode[i][0]); | ||
| 342 | } | ||
| 343 | } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R200) || | ||
| 344 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV250) || | ||
| 345 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV280) || | ||
| 346 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS300)) { | ||
| 1009 | DRM_INFO("Loading R200 Microcode\n"); | 347 | DRM_INFO("Loading R200 Microcode\n"); |
| 1010 | for (i = 0; i < 256; i++) { | 348 | for (i = 0; i < 256; i++) { |
| 1011 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, | 349 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, |
| @@ -1013,7 +351,11 @@ static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv) | |||
| 1013 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, | 351 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, |
| 1014 | R200_cp_microcode[i][0]); | 352 | R200_cp_microcode[i][0]); |
| 1015 | } | 353 | } |
| 1016 | } else if (dev_priv->microcode_version == UCODE_R300) { | 354 | } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R300) || |
| 355 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R350) || | ||
| 356 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV350) || | ||
| 357 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV380) || | ||
| 358 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS480)) { | ||
| 1017 | DRM_INFO("Loading R300 Microcode\n"); | 359 | DRM_INFO("Loading R300 Microcode\n"); |
| 1018 | for (i = 0; i < 256; i++) { | 360 | for (i = 0; i < 256; i++) { |
| 1019 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, | 361 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, |
| @@ -1021,12 +363,35 @@ static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv) | |||
| 1021 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, | 363 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, |
| 1022 | R300_cp_microcode[i][0]); | 364 | R300_cp_microcode[i][0]); |
| 1023 | } | 365 | } |
| 1024 | } else { | 366 | } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R420) || |
| 367 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV410)) { | ||
| 368 | DRM_INFO("Loading R400 Microcode\n"); | ||
| 1025 | for (i = 0; i < 256; i++) { | 369 | for (i = 0; i < 256; i++) { |
| 1026 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, | 370 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, |
| 1027 | radeon_cp_microcode[i][1]); | 371 | R420_cp_microcode[i][1]); |
| 1028 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, | 372 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, |
| 1029 | radeon_cp_microcode[i][0]); | 373 | R420_cp_microcode[i][0]); |
| 374 | } | ||
| 375 | } else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) { | ||
| 376 | DRM_INFO("Loading RS690 Microcode\n"); | ||
| 377 | for (i = 0; i < 256; i++) { | ||
| 378 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, | ||
| 379 | RS690_cp_microcode[i][1]); | ||
| 380 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, | ||
| 381 | RS690_cp_microcode[i][0]); | ||
| 382 | } | ||
| 383 | } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515) || | ||
| 384 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R520) || | ||
| 385 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV530) || | ||
| 386 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R580) || | ||
| 387 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV560) || | ||
| 388 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV570)) { | ||
| 389 | DRM_INFO("Loading R500 Microcode\n"); | ||
| 390 | for (i = 0; i < 256; i++) { | ||
| 391 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAH, | ||
| 392 | R520_cp_microcode[i][1]); | ||
| 393 | RADEON_WRITE(RADEON_CP_ME_RAM_DATAL, | ||
| 394 | R520_cp_microcode[i][0]); | ||
| 1030 | } | 395 | } |
| 1031 | } | 396 | } |
| 1032 | } | 397 | } |
| @@ -1121,12 +486,13 @@ static void radeon_do_cp_stop(drm_radeon_private_t * dev_priv) | |||
| 1121 | static int radeon_do_engine_reset(struct drm_device * dev) | 486 | static int radeon_do_engine_reset(struct drm_device * dev) |
| 1122 | { | 487 | { |
| 1123 | drm_radeon_private_t *dev_priv = dev->dev_private; | 488 | drm_radeon_private_t *dev_priv = dev->dev_private; |
| 1124 | u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset; | 489 | u32 clock_cntl_index = 0, mclk_cntl = 0, rbbm_soft_reset; |
| 1125 | DRM_DEBUG("\n"); | 490 | DRM_DEBUG("\n"); |
| 1126 | 491 | ||
| 1127 | radeon_do_pixcache_flush(dev_priv); | 492 | radeon_do_pixcache_flush(dev_priv); |
| 1128 | 493 | ||
| 1129 | if ((dev_priv->flags & RADEON_FAMILY_MASK) < CHIP_RV515) { | 494 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV410) { |
| 495 | /* may need something similar for newer chips */ | ||
| 1130 | clock_cntl_index = RADEON_READ(RADEON_CLOCK_CNTL_INDEX); | 496 | clock_cntl_index = RADEON_READ(RADEON_CLOCK_CNTL_INDEX); |
| 1131 | mclk_cntl = RADEON_READ_PLL(dev, RADEON_MCLK_CNTL); | 497 | mclk_cntl = RADEON_READ_PLL(dev, RADEON_MCLK_CNTL); |
| 1132 | 498 | ||
| @@ -1137,33 +503,39 @@ static int radeon_do_engine_reset(struct drm_device * dev) | |||
| 1137 | RADEON_FORCEON_YCLKB | | 503 | RADEON_FORCEON_YCLKB | |
| 1138 | RADEON_FORCEON_MC | | 504 | RADEON_FORCEON_MC | |
| 1139 | RADEON_FORCEON_AIC)); | 505 | RADEON_FORCEON_AIC)); |
| 506 | } | ||
| 1140 | 507 | ||
| 1141 | rbbm_soft_reset = RADEON_READ(RADEON_RBBM_SOFT_RESET); | 508 | rbbm_soft_reset = RADEON_READ(RADEON_RBBM_SOFT_RESET); |
| 1142 | 509 | ||
| 1143 | RADEON_WRITE(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset | | 510 | RADEON_WRITE(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset | |
| 1144 | RADEON_SOFT_RESET_CP | | 511 | RADEON_SOFT_RESET_CP | |
| 1145 | RADEON_SOFT_RESET_HI | | 512 | RADEON_SOFT_RESET_HI | |
| 1146 | RADEON_SOFT_RESET_SE | | 513 | RADEON_SOFT_RESET_SE | |
| 1147 | RADEON_SOFT_RESET_RE | | 514 | RADEON_SOFT_RESET_RE | |
| 1148 | RADEON_SOFT_RESET_PP | | 515 | RADEON_SOFT_RESET_PP | |
| 1149 | RADEON_SOFT_RESET_E2 | | 516 | RADEON_SOFT_RESET_E2 | |
| 1150 | RADEON_SOFT_RESET_RB)); | 517 | RADEON_SOFT_RESET_RB)); |
| 1151 | RADEON_READ(RADEON_RBBM_SOFT_RESET); | 518 | RADEON_READ(RADEON_RBBM_SOFT_RESET); |
| 1152 | RADEON_WRITE(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset & | 519 | RADEON_WRITE(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset & |
| 1153 | ~(RADEON_SOFT_RESET_CP | | 520 | ~(RADEON_SOFT_RESET_CP | |
| 1154 | RADEON_SOFT_RESET_HI | | 521 | RADEON_SOFT_RESET_HI | |
| 1155 | RADEON_SOFT_RESET_SE | | 522 | RADEON_SOFT_RESET_SE | |
| 1156 | RADEON_SOFT_RESET_RE | | 523 | RADEON_SOFT_RESET_RE | |
| 1157 | RADEON_SOFT_RESET_PP | | 524 | RADEON_SOFT_RESET_PP | |
| 1158 | RADEON_SOFT_RESET_E2 | | 525 | RADEON_SOFT_RESET_E2 | |
| 1159 | RADEON_SOFT_RESET_RB))); | 526 | RADEON_SOFT_RESET_RB))); |
| 1160 | RADEON_READ(RADEON_RBBM_SOFT_RESET); | 527 | RADEON_READ(RADEON_RBBM_SOFT_RESET); |
| 1161 | 528 | ||
| 529 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV410) { | ||
| 1162 | RADEON_WRITE_PLL(RADEON_MCLK_CNTL, mclk_cntl); | 530 | RADEON_WRITE_PLL(RADEON_MCLK_CNTL, mclk_cntl); |
| 1163 | RADEON_WRITE(RADEON_CLOCK_CNTL_INDEX, clock_cntl_index); | 531 | RADEON_WRITE(RADEON_CLOCK_CNTL_INDEX, clock_cntl_index); |
| 1164 | RADEON_WRITE(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset); | 532 | RADEON_WRITE(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset); |
| 1165 | } | 533 | } |
| 1166 | 534 | ||
| 535 | /* setup the raster pipes */ | ||
| 536 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R300) | ||
| 537 | radeon_init_pipes(dev_priv); | ||
| 538 | |||
| 1167 | /* Reset the CP ring */ | 539 | /* Reset the CP ring */ |
| 1168 | radeon_do_cp_reset(dev_priv); | 540 | radeon_do_cp_reset(dev_priv); |
| 1169 | 541 | ||
| @@ -1194,7 +566,8 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev, | |||
| 1194 | 566 | ||
| 1195 | #if __OS_HAS_AGP | 567 | #if __OS_HAS_AGP |
| 1196 | if (dev_priv->flags & RADEON_IS_AGP) { | 568 | if (dev_priv->flags & RADEON_IS_AGP) { |
| 1197 | RADEON_WRITE(RADEON_AGP_BASE, (unsigned int)dev->agp->base); | 569 | radeon_write_agp_base(dev_priv, dev->agp->base); |
| 570 | |||
| 1198 | radeon_write_agp_location(dev_priv, | 571 | radeon_write_agp_location(dev_priv, |
| 1199 | (((dev_priv->gart_vm_start - 1 + | 572 | (((dev_priv->gart_vm_start - 1 + |
| 1200 | dev_priv->gart_size) & 0xffff0000) | | 573 | dev_priv->gart_size) & 0xffff0000) | |
| @@ -1339,102 +712,70 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv) | |||
| 1339 | /* Enable or disable IGP GART on the chip */ | 712 | /* Enable or disable IGP GART on the chip */ |
| 1340 | static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on) | 713 | static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on) |
| 1341 | { | 714 | { |
| 1342 | u32 temp, tmp; | ||
| 1343 | |||
| 1344 | tmp = RADEON_READ(RADEON_AIC_CNTL); | ||
| 1345 | if (on) { | ||
| 1346 | DRM_DEBUG("programming igpgart %08X %08lX %08X\n", | ||
| 1347 | dev_priv->gart_vm_start, | ||
| 1348 | (long)dev_priv->gart_info.bus_addr, | ||
| 1349 | dev_priv->gart_size); | ||
| 1350 | |||
| 1351 | RADEON_WRITE_IGPGART(RADEON_IGPGART_UNK_18, 0x1000); | ||
| 1352 | RADEON_WRITE_IGPGART(RADEON_IGPGART_ENABLE, 0x1); | ||
| 1353 | RADEON_WRITE_IGPGART(RADEON_IGPGART_CTRL, 0x42040800); | ||
| 1354 | RADEON_WRITE_IGPGART(RADEON_IGPGART_BASE_ADDR, | ||
| 1355 | dev_priv->gart_info.bus_addr); | ||
| 1356 | |||
| 1357 | temp = RADEON_READ_IGPGART(dev_priv, RADEON_IGPGART_UNK_39); | ||
| 1358 | RADEON_WRITE_IGPGART(RADEON_IGPGART_UNK_39, temp); | ||
| 1359 | |||
| 1360 | RADEON_WRITE(RADEON_AGP_BASE, (unsigned int)dev_priv->gart_vm_start); | ||
| 1361 | dev_priv->gart_size = 32*1024*1024; | ||
| 1362 | radeon_write_agp_location(dev_priv, | ||
| 1363 | (((dev_priv->gart_vm_start - 1 + | ||
| 1364 | dev_priv->gart_size) & 0xffff0000) | | ||
| 1365 | (dev_priv->gart_vm_start >> 16))); | ||
| 1366 | |||
| 1367 | temp = RADEON_READ_IGPGART(dev_priv, RADEON_IGPGART_ENABLE); | ||
| 1368 | RADEON_WRITE_IGPGART(RADEON_IGPGART_ENABLE, temp); | ||
| 1369 | |||
| 1370 | RADEON_READ_IGPGART(dev_priv, RADEON_IGPGART_FLUSH); | ||
| 1371 | RADEON_WRITE_IGPGART(RADEON_IGPGART_FLUSH, 0x1); | ||
| 1372 | RADEON_READ_IGPGART(dev_priv, RADEON_IGPGART_FLUSH); | ||
| 1373 | RADEON_WRITE_IGPGART(RADEON_IGPGART_FLUSH, 0x0); | ||
| 1374 | } | ||
| 1375 | } | ||
| 1376 | |||
| 1377 | /* Enable or disable RS690 GART on the chip */ | ||
| 1378 | static void radeon_set_rs690gart(drm_radeon_private_t *dev_priv, int on) | ||
| 1379 | { | ||
| 1380 | u32 temp; | 715 | u32 temp; |
| 1381 | 716 | ||
| 1382 | if (on) { | 717 | if (on) { |
| 1383 | DRM_DEBUG("programming rs690 gart %08X %08lX %08X\n", | 718 | DRM_DEBUG("programming igp gart %08X %08lX %08X\n", |
| 1384 | dev_priv->gart_vm_start, | 719 | dev_priv->gart_vm_start, |
| 1385 | (long)dev_priv->gart_info.bus_addr, | 720 | (long)dev_priv->gart_info.bus_addr, |
| 1386 | dev_priv->gart_size); | 721 | dev_priv->gart_size); |
| 1387 | 722 | ||
| 1388 | temp = RS690_READ_MCIND(dev_priv, RS690_MC_MISC_CNTL); | 723 | temp = IGP_READ_MCIND(dev_priv, RS480_MC_MISC_CNTL); |
| 1389 | RS690_WRITE_MCIND(RS690_MC_MISC_CNTL, 0x5000); | 724 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) |
| 725 | IGP_WRITE_MCIND(RS480_MC_MISC_CNTL, (RS480_GART_INDEX_REG_EN | | ||
| 726 | RS690_BLOCK_GFX_D3_EN)); | ||
| 727 | else | ||
| 728 | IGP_WRITE_MCIND(RS480_MC_MISC_CNTL, RS480_GART_INDEX_REG_EN); | ||
| 1390 | 729 | ||
| 1391 | RS690_WRITE_MCIND(RS690_MC_AGP_SIZE, | 730 | IGP_WRITE_MCIND(RS480_AGP_ADDRESS_SPACE_SIZE, (RS480_GART_EN | |
| 1392 | RS690_MC_GART_EN | RS690_MC_AGP_SIZE_32MB); | 731 | RS480_VA_SIZE_32MB)); |
| 1393 | 732 | ||
| 1394 | temp = RS690_READ_MCIND(dev_priv, RS690_MC_GART_FEATURE_ID); | 733 | temp = IGP_READ_MCIND(dev_priv, RS480_GART_FEATURE_ID); |
| 1395 | RS690_WRITE_MCIND(RS690_MC_GART_FEATURE_ID, 0x42040800); | 734 | IGP_WRITE_MCIND(RS480_GART_FEATURE_ID, (RS480_HANG_EN | |
| 735 | RS480_TLB_ENABLE | | ||
| 736 | RS480_GTW_LAC_EN | | ||
| 737 | RS480_1LEVEL_GART)); | ||
| 1396 | 738 | ||
| 1397 | RS690_WRITE_MCIND(RS690_MC_GART_BASE, | 739 | temp = dev_priv->gart_info.bus_addr & 0xfffff000; |
| 1398 | dev_priv->gart_info.bus_addr); | 740 | temp |= (upper_32_bits(dev_priv->gart_info.bus_addr) & 0xff) << 4; |
| 741 | IGP_WRITE_MCIND(RS480_GART_BASE, temp); | ||
| 1399 | 742 | ||
| 1400 | temp = RS690_READ_MCIND(dev_priv, RS690_MC_AGP_MODE_CONTROL); | 743 | temp = IGP_READ_MCIND(dev_priv, RS480_AGP_MODE_CNTL); |
| 1401 | RS690_WRITE_MCIND(RS690_MC_AGP_MODE_CONTROL, 0x01400000); | 744 | IGP_WRITE_MCIND(RS480_AGP_MODE_CNTL, ((1 << RS480_REQ_TYPE_SNOOP_SHIFT) | |
| 745 | RS480_REQ_TYPE_SNOOP_DIS)); | ||
| 1402 | 746 | ||
| 1403 | RS690_WRITE_MCIND(RS690_MC_AGP_BASE, | 747 | radeon_write_agp_base(dev_priv, dev_priv->gart_vm_start); |
| 1404 | (unsigned int)dev_priv->gart_vm_start); | ||
| 1405 | 748 | ||
| 1406 | dev_priv->gart_size = 32*1024*1024; | 749 | dev_priv->gart_size = 32*1024*1024; |
| 1407 | temp = (((dev_priv->gart_vm_start - 1 + dev_priv->gart_size) & | 750 | temp = (((dev_priv->gart_vm_start - 1 + dev_priv->gart_size) & |
| 1408 | 0xffff0000) | (dev_priv->gart_vm_start >> 16)); | 751 | 0xffff0000) | (dev_priv->gart_vm_start >> 16)); |
| 1409 | 752 | ||
| 1410 | RS690_WRITE_MCIND(RS690_MC_AGP_LOCATION, temp); | 753 | radeon_write_agp_location(dev_priv, temp); |
| 1411 | 754 | ||
| 1412 | temp = RS690_READ_MCIND(dev_priv, RS690_MC_AGP_SIZE); | 755 | temp = IGP_READ_MCIND(dev_priv, RS480_AGP_ADDRESS_SPACE_SIZE); |
| 1413 | RS690_WRITE_MCIND(RS690_MC_AGP_SIZE, | 756 | IGP_WRITE_MCIND(RS480_AGP_ADDRESS_SPACE_SIZE, (RS480_GART_EN | |
| 1414 | RS690_MC_GART_EN | RS690_MC_AGP_SIZE_32MB); | 757 | RS480_VA_SIZE_32MB)); |
| 1415 | 758 | ||
| 1416 | do { | 759 | do { |
| 1417 | temp = RS690_READ_MCIND(dev_priv, RS690_MC_GART_CACHE_CNTL); | 760 | temp = IGP_READ_MCIND(dev_priv, RS480_GART_CACHE_CNTRL); |
| 1418 | if ((temp & RS690_MC_GART_CLEAR_STATUS) == | 761 | if ((temp & RS480_GART_CACHE_INVALIDATE) == 0) |
| 1419 | RS690_MC_GART_CLEAR_DONE) | ||
| 1420 | break; | 762 | break; |
| 1421 | DRM_UDELAY(1); | 763 | DRM_UDELAY(1); |
| 1422 | } while (1); | 764 | } while (1); |
| 1423 | 765 | ||
| 1424 | RS690_WRITE_MCIND(RS690_MC_GART_CACHE_CNTL, | 766 | IGP_WRITE_MCIND(RS480_GART_CACHE_CNTRL, |
| 1425 | RS690_MC_GART_CC_CLEAR); | 767 | RS480_GART_CACHE_INVALIDATE); |
| 768 | |||
| 1426 | do { | 769 | do { |
| 1427 | temp = RS690_READ_MCIND(dev_priv, RS690_MC_GART_CACHE_CNTL); | 770 | temp = IGP_READ_MCIND(dev_priv, RS480_GART_CACHE_CNTRL); |
| 1428 | if ((temp & RS690_MC_GART_CLEAR_STATUS) == | 771 | if ((temp & RS480_GART_CACHE_INVALIDATE) == 0) |
| 1429 | RS690_MC_GART_CLEAR_DONE) | ||
| 1430 | break; | 772 | break; |
| 1431 | DRM_UDELAY(1); | 773 | DRM_UDELAY(1); |
| 1432 | } while (1); | 774 | } while (1); |
| 1433 | 775 | ||
| 1434 | RS690_WRITE_MCIND(RS690_MC_GART_CACHE_CNTL, | 776 | IGP_WRITE_MCIND(RS480_GART_CACHE_CNTRL, 0); |
| 1435 | RS690_MC_GART_CC_NO_CHANGE); | ||
| 1436 | } else { | 777 | } else { |
| 1437 | RS690_WRITE_MCIND(RS690_MC_AGP_SIZE, RS690_MC_GART_DIS); | 778 | IGP_WRITE_MCIND(RS480_AGP_ADDRESS_SPACE_SIZE, 0); |
| 1438 | } | 779 | } |
| 1439 | } | 780 | } |
| 1440 | 781 | ||
| @@ -1472,12 +813,8 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on) | |||
| 1472 | { | 813 | { |
| 1473 | u32 tmp; | 814 | u32 tmp; |
| 1474 | 815 | ||
| 1475 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) { | 816 | if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) || |
| 1476 | radeon_set_rs690gart(dev_priv, on); | 817 | (dev_priv->flags & RADEON_IS_IGPGART)) { |
| 1477 | return; | ||
| 1478 | } | ||
| 1479 | |||
| 1480 | if (dev_priv->flags & RADEON_IS_IGPGART) { | ||
| 1481 | radeon_set_igpgart(dev_priv, on); | 818 | radeon_set_igpgart(dev_priv, on); |
| 1482 | return; | 819 | return; |
| 1483 | } | 820 | } |
| @@ -1951,6 +1288,7 @@ static int radeon_do_resume_cp(struct drm_device * dev) | |||
| 1951 | radeon_cp_init_ring_buffer(dev, dev_priv); | 1288 | radeon_cp_init_ring_buffer(dev, dev_priv); |
| 1952 | 1289 | ||
| 1953 | radeon_do_engine_reset(dev); | 1290 | radeon_do_engine_reset(dev); |
| 1291 | radeon_enable_interrupt(dev); | ||
| 1954 | 1292 | ||
| 1955 | DRM_DEBUG("radeon_do_resume_cp() complete\n"); | 1293 | DRM_DEBUG("radeon_do_resume_cp() complete\n"); |
| 1956 | 1294 | ||
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h index aab82e121e07..73ff51f12311 100644 --- a/drivers/char/drm/radeon_drm.h +++ b/drivers/char/drm/radeon_drm.h | |||
| @@ -240,6 +240,7 @@ typedef union { | |||
| 240 | # define R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN 0x8 | 240 | # define R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN 0x8 |
| 241 | 241 | ||
| 242 | #define R300_CMD_SCRATCH 8 | 242 | #define R300_CMD_SCRATCH 8 |
| 243 | #define R300_CMD_R500FP 9 | ||
| 243 | 244 | ||
| 244 | typedef union { | 245 | typedef union { |
| 245 | unsigned int u; | 246 | unsigned int u; |
| @@ -268,6 +269,9 @@ typedef union { | |||
| 268 | struct { | 269 | struct { |
| 269 | unsigned char cmd_type, reg, n_bufs, flags; | 270 | unsigned char cmd_type, reg, n_bufs, flags; |
| 270 | } scratch; | 271 | } scratch; |
| 272 | struct { | ||
| 273 | unsigned char cmd_type, count, adrlo, adrhi_flags; | ||
| 274 | } r500fp; | ||
| 271 | } drm_r300_cmd_header_t; | 275 | } drm_r300_cmd_header_t; |
| 272 | 276 | ||
| 273 | #define RADEON_FRONT 0x1 | 277 | #define RADEON_FRONT 0x1 |
| @@ -278,6 +282,9 @@ typedef union { | |||
| 278 | #define RADEON_USE_HIERZ 0x40000000 | 282 | #define RADEON_USE_HIERZ 0x40000000 |
| 279 | #define RADEON_USE_COMP_ZBUF 0x20000000 | 283 | #define RADEON_USE_COMP_ZBUF 0x20000000 |
| 280 | 284 | ||
| 285 | #define R500FP_CONSTANT_TYPE (1 << 1) | ||
| 286 | #define R500FP_CONSTANT_CLAMP (1 << 2) | ||
| 287 | |||
| 281 | /* Primitive types | 288 | /* Primitive types |
| 282 | */ | 289 | */ |
| 283 | #define RADEON_POINTS 0x1 | 290 | #define RADEON_POINTS 0x1 |
| @@ -669,6 +676,7 @@ typedef struct drm_radeon_indirect { | |||
| 669 | #define RADEON_PARAM_CARD_TYPE 12 | 676 | #define RADEON_PARAM_CARD_TYPE 12 |
| 670 | #define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */ | 677 | #define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */ |
| 671 | #define RADEON_PARAM_FB_LOCATION 14 /* FB location */ | 678 | #define RADEON_PARAM_FB_LOCATION 14 /* FB location */ |
| 679 | #define RADEON_PARAM_NUM_GB_PIPES 15 /* num GB pipes */ | ||
| 672 | 680 | ||
| 673 | typedef struct drm_radeon_getparam { | 681 | typedef struct drm_radeon_getparam { |
| 674 | int param; | 682 | int param; |
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 173ae620223a..3f0eca957aa7 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | #define DRIVER_NAME "radeon" | 39 | #define DRIVER_NAME "radeon" |
| 40 | #define DRIVER_DESC "ATI Radeon" | 40 | #define DRIVER_DESC "ATI Radeon" |
| 41 | #define DRIVER_DATE "20060524" | 41 | #define DRIVER_DATE "20080528" |
| 42 | 42 | ||
| 43 | /* Interface history: | 43 | /* Interface history: |
| 44 | * | 44 | * |
| @@ -98,9 +98,10 @@ | |||
| 98 | * 1.26- Add support for variable size PCI(E) gart aperture | 98 | * 1.26- Add support for variable size PCI(E) gart aperture |
| 99 | * 1.27- Add support for IGP GART | 99 | * 1.27- Add support for IGP GART |
| 100 | * 1.28- Add support for VBL on CRTC2 | 100 | * 1.28- Add support for VBL on CRTC2 |
| 101 | * 1.29- R500 3D cmd buffer support | ||
| 101 | */ | 102 | */ |
| 102 | #define DRIVER_MAJOR 1 | 103 | #define DRIVER_MAJOR 1 |
| 103 | #define DRIVER_MINOR 28 | 104 | #define DRIVER_MINOR 29 |
| 104 | #define DRIVER_PATCHLEVEL 0 | 105 | #define DRIVER_PATCHLEVEL 0 |
| 105 | 106 | ||
| 106 | /* | 107 | /* |
| @@ -122,7 +123,7 @@ enum radeon_family { | |||
| 122 | CHIP_RV380, | 123 | CHIP_RV380, |
| 123 | CHIP_R420, | 124 | CHIP_R420, |
| 124 | CHIP_RV410, | 125 | CHIP_RV410, |
| 125 | CHIP_RS400, | 126 | CHIP_RS480, |
| 126 | CHIP_RS690, | 127 | CHIP_RS690, |
| 127 | CHIP_RV515, | 128 | CHIP_RV515, |
| 128 | CHIP_R520, | 129 | CHIP_R520, |
| @@ -294,6 +295,7 @@ typedef struct drm_radeon_private { | |||
| 294 | int vblank_crtc; | 295 | int vblank_crtc; |
| 295 | uint32_t irq_enable_reg; | 296 | uint32_t irq_enable_reg; |
| 296 | int irq_enabled; | 297 | int irq_enabled; |
| 298 | uint32_t r500_disp_irq_reg; | ||
| 297 | 299 | ||
| 298 | struct radeon_surface surfaces[RADEON_MAX_SURFACES]; | 300 | struct radeon_surface surfaces[RADEON_MAX_SURFACES]; |
| 299 | struct radeon_virt_surface virt_surfaces[2 * RADEON_MAX_SURFACES]; | 301 | struct radeon_virt_surface virt_surfaces[2 * RADEON_MAX_SURFACES]; |
| @@ -307,6 +309,8 @@ typedef struct drm_radeon_private { | |||
| 307 | /* starting from here on, data is preserved accross an open */ | 309 | /* starting from here on, data is preserved accross an open */ |
| 308 | uint32_t flags; /* see radeon_chip_flags */ | 310 | uint32_t flags; /* see radeon_chip_flags */ |
| 309 | unsigned long fb_aper_offset; | 311 | unsigned long fb_aper_offset; |
| 312 | |||
| 313 | int num_gb_pipes; | ||
| 310 | } drm_radeon_private_t; | 314 | } drm_radeon_private_t; |
| 311 | 315 | ||
| 312 | typedef struct drm_radeon_buf_priv { | 316 | typedef struct drm_radeon_buf_priv { |
| @@ -382,6 +386,7 @@ extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS); | |||
| 382 | extern void radeon_driver_irq_preinstall(struct drm_device * dev); | 386 | extern void radeon_driver_irq_preinstall(struct drm_device * dev); |
| 383 | extern void radeon_driver_irq_postinstall(struct drm_device * dev); | 387 | extern void radeon_driver_irq_postinstall(struct drm_device * dev); |
| 384 | extern void radeon_driver_irq_uninstall(struct drm_device * dev); | 388 | extern void radeon_driver_irq_uninstall(struct drm_device * dev); |
| 389 | extern void radeon_enable_interrupt(struct drm_device *dev); | ||
| 385 | extern int radeon_vblank_crtc_get(struct drm_device *dev); | 390 | extern int radeon_vblank_crtc_get(struct drm_device *dev); |
| 386 | extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value); | 391 | extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value); |
| 387 | 392 | ||
| @@ -444,13 +449,13 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 444 | #define RADEON_PCIE_DATA 0x0034 | 449 | #define RADEON_PCIE_DATA 0x0034 |
| 445 | #define RADEON_PCIE_TX_GART_CNTL 0x10 | 450 | #define RADEON_PCIE_TX_GART_CNTL 0x10 |
| 446 | # define RADEON_PCIE_TX_GART_EN (1 << 0) | 451 | # define RADEON_PCIE_TX_GART_EN (1 << 0) |
| 447 | # define RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_PASS_THRU (0<<1) | 452 | # define RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_PASS_THRU (0 << 1) |
| 448 | # define RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_CLAMP_LO (1<<1) | 453 | # define RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_CLAMP_LO (1 << 1) |
| 449 | # define RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD (3<<1) | 454 | # define RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD (3 << 1) |
| 450 | # define RADEON_PCIE_TX_GART_MODE_32_128_CACHE (0<<3) | 455 | # define RADEON_PCIE_TX_GART_MODE_32_128_CACHE (0 << 3) |
| 451 | # define RADEON_PCIE_TX_GART_MODE_8_4_128_CACHE (1<<3) | 456 | # define RADEON_PCIE_TX_GART_MODE_8_4_128_CACHE (1 << 3) |
| 452 | # define RADEON_PCIE_TX_GART_CHK_RW_VALID_EN (1<<5) | 457 | # define RADEON_PCIE_TX_GART_CHK_RW_VALID_EN (1 << 5) |
| 453 | # define RADEON_PCIE_TX_GART_INVALIDATE_TLB (1<<8) | 458 | # define RADEON_PCIE_TX_GART_INVALIDATE_TLB (1 << 8) |
| 454 | #define RADEON_PCIE_TX_DISCARD_RD_ADDR_LO 0x11 | 459 | #define RADEON_PCIE_TX_DISCARD_RD_ADDR_LO 0x11 |
| 455 | #define RADEON_PCIE_TX_DISCARD_RD_ADDR_HI 0x12 | 460 | #define RADEON_PCIE_TX_DISCARD_RD_ADDR_HI 0x12 |
| 456 | #define RADEON_PCIE_TX_GART_BASE 0x13 | 461 | #define RADEON_PCIE_TX_GART_BASE 0x13 |
| @@ -459,14 +464,9 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 459 | #define RADEON_PCIE_TX_GART_END_LO 0x16 | 464 | #define RADEON_PCIE_TX_GART_END_LO 0x16 |
| 460 | #define RADEON_PCIE_TX_GART_END_HI 0x17 | 465 | #define RADEON_PCIE_TX_GART_END_HI 0x17 |
| 461 | 466 | ||
| 462 | #define RADEON_IGPGART_INDEX 0x168 | 467 | #define RS480_NB_MC_INDEX 0x168 |
| 463 | #define RADEON_IGPGART_DATA 0x16c | 468 | # define RS480_NB_MC_IND_WR_EN (1 << 8) |
| 464 | #define RADEON_IGPGART_UNK_18 0x18 | 469 | #define RS480_NB_MC_DATA 0x16c |
| 465 | #define RADEON_IGPGART_CTRL 0x2b | ||
| 466 | #define RADEON_IGPGART_BASE_ADDR 0x2c | ||
| 467 | #define RADEON_IGPGART_FLUSH 0x2e | ||
| 468 | #define RADEON_IGPGART_ENABLE 0x38 | ||
| 469 | #define RADEON_IGPGART_UNK_39 0x39 | ||
| 470 | 470 | ||
| 471 | #define RS690_MC_INDEX 0x78 | 471 | #define RS690_MC_INDEX 0x78 |
| 472 | # define RS690_MC_INDEX_MASK 0x1ff | 472 | # define RS690_MC_INDEX_MASK 0x1ff |
| @@ -474,45 +474,91 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 474 | # define RS690_MC_INDEX_WR_ACK 0x7f | 474 | # define RS690_MC_INDEX_WR_ACK 0x7f |
| 475 | #define RS690_MC_DATA 0x7c | 475 | #define RS690_MC_DATA 0x7c |
| 476 | 476 | ||
| 477 | #define RS690_MC_MISC_CNTL 0x18 | 477 | /* MC indirect registers */ |
| 478 | #define RS690_MC_GART_FEATURE_ID 0x2b | 478 | #define RS480_MC_MISC_CNTL 0x18 |
| 479 | #define RS690_MC_GART_BASE 0x2c | 479 | # define RS480_DISABLE_GTW (1 << 1) |
| 480 | #define RS690_MC_GART_CACHE_CNTL 0x2e | 480 | /* switch between MCIND GART and MM GART registers. 0 = mmgart, 1 = mcind gart */ |
| 481 | # define RS690_MC_GART_CC_NO_CHANGE 0x0 | 481 | # define RS480_GART_INDEX_REG_EN (1 << 12) |
| 482 | # define RS690_MC_GART_CC_CLEAR 0x1 | 482 | # define RS690_BLOCK_GFX_D3_EN (1 << 14) |
| 483 | # define RS690_MC_GART_CLEAR_STATUS (1 << 1) | 483 | #define RS480_K8_FB_LOCATION 0x1e |
| 484 | # define RS690_MC_GART_CLEAR_DONE (0 << 1) | 484 | #define RS480_GART_FEATURE_ID 0x2b |
| 485 | # define RS690_MC_GART_CLEAR_PENDING (1 << 1) | 485 | # define RS480_HANG_EN (1 << 11) |
| 486 | #define RS690_MC_AGP_SIZE 0x38 | 486 | # define RS480_TLB_ENABLE (1 << 18) |
| 487 | # define RS690_MC_GART_DIS 0x0 | 487 | # define RS480_P2P_ENABLE (1 << 19) |
| 488 | # define RS690_MC_GART_EN 0x1 | 488 | # define RS480_GTW_LAC_EN (1 << 25) |
| 489 | # define RS690_MC_AGP_SIZE_32MB (0 << 1) | 489 | # define RS480_2LEVEL_GART (0 << 30) |
| 490 | # define RS690_MC_AGP_SIZE_64MB (1 << 1) | 490 | # define RS480_1LEVEL_GART (1 << 30) |
| 491 | # define RS690_MC_AGP_SIZE_128MB (2 << 1) | 491 | # define RS480_PDC_EN (1 << 31) |
| 492 | # define RS690_MC_AGP_SIZE_256MB (3 << 1) | 492 | #define RS480_GART_BASE 0x2c |
| 493 | # define RS690_MC_AGP_SIZE_512MB (4 << 1) | 493 | #define RS480_GART_CACHE_CNTRL 0x2e |
| 494 | # define RS690_MC_AGP_SIZE_1GB (5 << 1) | 494 | # define RS480_GART_CACHE_INVALIDATE (1 << 0) /* wait for it to clear */ |
| 495 | # define RS690_MC_AGP_SIZE_2GB (6 << 1) | 495 | #define RS480_AGP_ADDRESS_SPACE_SIZE 0x38 |
| 496 | #define RS690_MC_AGP_MODE_CONTROL 0x39 | 496 | # define RS480_GART_EN (1 << 0) |
| 497 | # define RS480_VA_SIZE_32MB (0 << 1) | ||
| 498 | # define RS480_VA_SIZE_64MB (1 << 1) | ||
| 499 | # define RS480_VA_SIZE_128MB (2 << 1) | ||
| 500 | # define RS480_VA_SIZE_256MB (3 << 1) | ||
| 501 | # define RS480_VA_SIZE_512MB (4 << 1) | ||
| 502 | # define RS480_VA_SIZE_1GB (5 << 1) | ||
| 503 | # define RS480_VA_SIZE_2GB (6 << 1) | ||
| 504 | #define RS480_AGP_MODE_CNTL 0x39 | ||
| 505 | # define RS480_POST_GART_Q_SIZE (1 << 18) | ||
| 506 | # define RS480_NONGART_SNOOP (1 << 19) | ||
| 507 | # define RS480_AGP_RD_BUF_SIZE (1 << 20) | ||
| 508 | # define RS480_REQ_TYPE_SNOOP_SHIFT 22 | ||
| 509 | # define RS480_REQ_TYPE_SNOOP_MASK 0x3 | ||
| 510 | # define RS480_REQ_TYPE_SNOOP_DIS (1 << 24) | ||
| 511 | #define RS480_MC_MISC_UMA_CNTL 0x5f | ||
| 512 | #define RS480_MC_MCLK_CNTL 0x7a | ||
| 513 | #define RS480_MC_UMA_DUALCH_CNTL 0x86 | ||
| 514 | |||
| 497 | #define RS690_MC_FB_LOCATION 0x100 | 515 | #define RS690_MC_FB_LOCATION 0x100 |
| 498 | #define RS690_MC_AGP_LOCATION 0x101 | 516 | #define RS690_MC_AGP_LOCATION 0x101 |
| 499 | #define RS690_MC_AGP_BASE 0x102 | 517 | #define RS690_MC_AGP_BASE 0x102 |
| 518 | #define RS690_MC_AGP_BASE_2 0x103 | ||
| 500 | 519 | ||
| 501 | #define R520_MC_IND_INDEX 0x70 | 520 | #define R520_MC_IND_INDEX 0x70 |
| 502 | #define R520_MC_IND_WR_EN (1<<24) | 521 | #define R520_MC_IND_WR_EN (1 << 24) |
| 503 | #define R520_MC_IND_DATA 0x74 | 522 | #define R520_MC_IND_DATA 0x74 |
| 504 | 523 | ||
| 505 | #define RV515_MC_FB_LOCATION 0x01 | 524 | #define RV515_MC_FB_LOCATION 0x01 |
| 506 | #define RV515_MC_AGP_LOCATION 0x02 | 525 | #define RV515_MC_AGP_LOCATION 0x02 |
| 526 | #define RV515_MC_AGP_BASE 0x03 | ||
| 527 | #define RV515_MC_AGP_BASE_2 0x04 | ||
| 507 | 528 | ||
| 508 | #define R520_MC_FB_LOCATION 0x04 | 529 | #define R520_MC_FB_LOCATION 0x04 |
| 509 | #define R520_MC_AGP_LOCATION 0x05 | 530 | #define R520_MC_AGP_LOCATION 0x05 |
| 531 | #define R520_MC_AGP_BASE 0x06 | ||
| 532 | #define R520_MC_AGP_BASE_2 0x07 | ||
| 510 | 533 | ||
| 511 | #define RADEON_MPP_TB_CONFIG 0x01c0 | 534 | #define RADEON_MPP_TB_CONFIG 0x01c0 |
| 512 | #define RADEON_MEM_CNTL 0x0140 | 535 | #define RADEON_MEM_CNTL 0x0140 |
| 513 | #define RADEON_MEM_SDRAM_MODE_REG 0x0158 | 536 | #define RADEON_MEM_SDRAM_MODE_REG 0x0158 |
| 537 | #define RADEON_AGP_BASE_2 0x015c /* r200+ only */ | ||
| 538 | #define RS480_AGP_BASE_2 0x0164 | ||
| 514 | #define RADEON_AGP_BASE 0x0170 | 539 | #define RADEON_AGP_BASE 0x0170 |
| 515 | 540 | ||
| 541 | /* pipe config regs */ | ||
| 542 | #define R400_GB_PIPE_SELECT 0x402c | ||
| 543 | #define R500_DYN_SCLK_PWMEM_PIPE 0x000d /* PLL */ | ||
| 544 | #define R500_SU_REG_DEST 0x42c8 | ||
| 545 | #define R300_GB_TILE_CONFIG 0x4018 | ||
| 546 | # define R300_ENABLE_TILING (1 << 0) | ||
| 547 | # define R300_PIPE_COUNT_RV350 (0 << 1) | ||
| 548 | # define R300_PIPE_COUNT_R300 (3 << 1) | ||
| 549 | # define R300_PIPE_COUNT_R420_3P (6 << 1) | ||
| 550 | # define R300_PIPE_COUNT_R420 (7 << 1) | ||
| 551 | # define R300_TILE_SIZE_8 (0 << 4) | ||
| 552 | # define R300_TILE_SIZE_16 (1 << 4) | ||
| 553 | # define R300_TILE_SIZE_32 (2 << 4) | ||
| 554 | # define R300_SUBPIXEL_1_12 (0 << 16) | ||
| 555 | # define R300_SUBPIXEL_1_16 (1 << 16) | ||
| 556 | #define R300_DST_PIPE_CONFIG 0x170c | ||
| 557 | # define R300_PIPE_AUTO_CONFIG (1 << 31) | ||
| 558 | #define R300_RB2D_DSTCACHE_MODE 0x3428 | ||
| 559 | # define R300_DC_AUTOFLUSH_ENABLE (1 << 8) | ||
| 560 | # define R300_DC_DC_DISABLE_IGNORE_PE (1 << 17) | ||
| 561 | |||
| 516 | #define RADEON_RB3D_COLOROFFSET 0x1c40 | 562 | #define RADEON_RB3D_COLOROFFSET 0x1c40 |
| 517 | #define RADEON_RB3D_COLORPITCH 0x1c48 | 563 | #define RADEON_RB3D_COLORPITCH 0x1c48 |
| 518 | 564 | ||
| @@ -616,11 +662,12 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 616 | #define RADEON_PP_TXFILTER_1 0x1c6c | 662 | #define RADEON_PP_TXFILTER_1 0x1c6c |
| 617 | #define RADEON_PP_TXFILTER_2 0x1c84 | 663 | #define RADEON_PP_TXFILTER_2 0x1c84 |
| 618 | 664 | ||
| 619 | #define RADEON_RB2D_DSTCACHE_CTLSTAT 0x342c | 665 | #define R300_RB2D_DSTCACHE_CTLSTAT 0x342c /* use R300_DSTCACHE_CTLSTAT */ |
| 620 | # define RADEON_RB2D_DC_FLUSH (3 << 0) | 666 | #define R300_DSTCACHE_CTLSTAT 0x1714 |
| 621 | # define RADEON_RB2D_DC_FREE (3 << 2) | 667 | # define R300_RB2D_DC_FLUSH (3 << 0) |
| 622 | # define RADEON_RB2D_DC_FLUSH_ALL 0xf | 668 | # define R300_RB2D_DC_FREE (3 << 2) |
| 623 | # define RADEON_RB2D_DC_BUSY (1 << 31) | 669 | # define R300_RB2D_DC_FLUSH_ALL 0xf |
| 670 | # define R300_RB2D_DC_BUSY (1 << 31) | ||
| 624 | #define RADEON_RB3D_CNTL 0x1c3c | 671 | #define RADEON_RB3D_CNTL 0x1c3c |
| 625 | # define RADEON_ALPHA_BLEND_ENABLE (1 << 0) | 672 | # define RADEON_ALPHA_BLEND_ENABLE (1 << 0) |
| 626 | # define RADEON_PLANE_MASK_ENABLE (1 << 1) | 673 | # define RADEON_PLANE_MASK_ENABLE (1 << 1) |
| @@ -643,11 +690,18 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 643 | # define RADEON_RB3D_ZC_FREE (1 << 2) | 690 | # define RADEON_RB3D_ZC_FREE (1 << 2) |
| 644 | # define RADEON_RB3D_ZC_FLUSH_ALL 0x5 | 691 | # define RADEON_RB3D_ZC_FLUSH_ALL 0x5 |
| 645 | # define RADEON_RB3D_ZC_BUSY (1 << 31) | 692 | # define RADEON_RB3D_ZC_BUSY (1 << 31) |
| 693 | #define R300_ZB_ZCACHE_CTLSTAT 0x4f18 | ||
| 694 | # define R300_ZC_FLUSH (1 << 0) | ||
| 695 | # define R300_ZC_FREE (1 << 1) | ||
| 696 | # define R300_ZC_FLUSH_ALL 0x3 | ||
| 697 | # define R300_ZC_BUSY (1 << 31) | ||
| 646 | #define RADEON_RB3D_DSTCACHE_CTLSTAT 0x325c | 698 | #define RADEON_RB3D_DSTCACHE_CTLSTAT 0x325c |
| 647 | # define RADEON_RB3D_DC_FLUSH (3 << 0) | 699 | # define RADEON_RB3D_DC_FLUSH (3 << 0) |
| 648 | # define RADEON_RB3D_DC_FREE (3 << 2) | 700 | # define RADEON_RB3D_DC_FREE (3 << 2) |
| 649 | # define RADEON_RB3D_DC_FLUSH_ALL 0xf | 701 | # define RADEON_RB3D_DC_FLUSH_ALL 0xf |
| 650 | # define RADEON_RB3D_DC_BUSY (1 << 31) | 702 | # define RADEON_RB3D_DC_BUSY (1 << 31) |
| 703 | #define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c | ||
| 704 | # define R300_RB3D_DC_FINISH (1 << 4) | ||
| 651 | #define RADEON_RB3D_ZSTENCILCNTL 0x1c2c | 705 | #define RADEON_RB3D_ZSTENCILCNTL 0x1c2c |
| 652 | # define RADEON_Z_TEST_MASK (7 << 4) | 706 | # define RADEON_Z_TEST_MASK (7 << 4) |
| 653 | # define RADEON_Z_TEST_ALWAYS (7 << 4) | 707 | # define RADEON_Z_TEST_ALWAYS (7 << 4) |
| @@ -1057,6 +1111,31 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 1057 | 1111 | ||
| 1058 | #define R200_VAP_PVS_CNTL_1 0x22D0 | 1112 | #define R200_VAP_PVS_CNTL_1 0x22D0 |
| 1059 | 1113 | ||
| 1114 | #define R500_D1CRTC_STATUS 0x609c | ||
| 1115 | #define R500_D2CRTC_STATUS 0x689c | ||
| 1116 | #define R500_CRTC_V_BLANK (1<<0) | ||
| 1117 | |||
| 1118 | #define R500_D1CRTC_FRAME_COUNT 0x60a4 | ||
| 1119 | #define R500_D2CRTC_FRAME_COUNT 0x68a4 | ||
| 1120 | |||
| 1121 | #define R500_D1MODE_V_COUNTER 0x6530 | ||
| 1122 | #define R500_D2MODE_V_COUNTER 0x6d30 | ||
| 1123 | |||
| 1124 | #define R500_D1MODE_VBLANK_STATUS 0x6534 | ||
| 1125 | #define R500_D2MODE_VBLANK_STATUS 0x6d34 | ||
| 1126 | #define R500_VBLANK_OCCURED (1<<0) | ||
| 1127 | #define R500_VBLANK_ACK (1<<4) | ||
| 1128 | #define R500_VBLANK_STAT (1<<12) | ||
| 1129 | #define R500_VBLANK_INT (1<<16) | ||
| 1130 | |||
| 1131 | #define R500_DxMODE_INT_MASK 0x6540 | ||
| 1132 | #define R500_D1MODE_INT_MASK (1<<0) | ||
| 1133 | #define R500_D2MODE_INT_MASK (1<<8) | ||
| 1134 | |||
| 1135 | #define R500_DISP_INTERRUPT_STATUS 0x7edc | ||
| 1136 | #define R500_D1_VBLANK_INTERRUPT (1 << 4) | ||
| 1137 | #define R500_D2_VBLANK_INTERRUPT (1 << 5) | ||
| 1138 | |||
| 1060 | /* Constants */ | 1139 | /* Constants */ |
| 1061 | #define RADEON_MAX_USEC_TIMEOUT 100000 /* 100 ms */ | 1140 | #define RADEON_MAX_USEC_TIMEOUT 100000 /* 100 ms */ |
| 1062 | 1141 | ||
| @@ -1078,42 +1157,50 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
| 1078 | #define RADEON_READ8(reg) DRM_READ8( dev_priv->mmio, (reg) ) | 1157 | #define RADEON_READ8(reg) DRM_READ8( dev_priv->mmio, (reg) ) |
| 1079 | #define RADEON_WRITE8(reg,val) DRM_WRITE8( dev_priv->mmio, (reg), (val) ) | 1158 | #define RADEON_WRITE8(reg,val) DRM_WRITE8( dev_priv->mmio, (reg), (val) ) |
| 1080 | 1159 | ||
| 1081 | #define RADEON_WRITE_PLL( addr, val ) \ | 1160 | #define RADEON_WRITE_PLL(addr, val) \ |
| 1082 | do { \ | 1161 | do { \ |
| 1083 | RADEON_WRITE8( RADEON_CLOCK_CNTL_INDEX, \ | 1162 | RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, \ |
| 1084 | ((addr) & 0x1f) | RADEON_PLL_WR_EN ); \ | 1163 | ((addr) & 0x1f) | RADEON_PLL_WR_EN ); \ |
| 1085 | RADEON_WRITE( RADEON_CLOCK_CNTL_DATA, (val) ); \ | 1164 | RADEON_WRITE(RADEON_CLOCK_CNTL_DATA, (val)); \ |
| 1086 | } while (0) | 1165 | } while (0) |
| 1087 | 1166 | ||
| 1088 | #define RADEON_WRITE_IGPGART( addr, val ) \ | 1167 | #define RADEON_WRITE_PCIE(addr, val) \ |
| 1089 | do { \ | 1168 | do { \ |
| 1090 | RADEON_WRITE( RADEON_IGPGART_INDEX, \ | 1169 | RADEON_WRITE8(RADEON_PCIE_INDEX, \ |
| 1091 | ((addr) & 0x7f) | (1 << 8)); \ | 1170 | ((addr) & 0xff)); \ |
| 1092 | RADEON_WRITE( RADEON_IGPGART_DATA, (val) ); \ | 1171 | RADEON_WRITE(RADEON_PCIE_DATA, (val)); \ |
| 1093 | RADEON_WRITE( RADEON_IGPGART_INDEX, 0x7f ); \ | ||
| 1094 | } while (0) | 1172 | } while (0) |
| 1095 | 1173 | ||
| 1096 | #define RADEON_WRITE_PCIE( addr, val ) \ | 1174 | #define R500_WRITE_MCIND(addr, val) \ |
| 1097 | do { \ | 1175 | do { \ |
| 1098 | RADEON_WRITE8( RADEON_PCIE_INDEX, \ | 1176 | RADEON_WRITE(R520_MC_IND_INDEX, 0xff0000 | ((addr) & 0xff)); \ |
| 1099 | ((addr) & 0xff)); \ | 1177 | RADEON_WRITE(R520_MC_IND_DATA, (val)); \ |
| 1100 | RADEON_WRITE( RADEON_PCIE_DATA, (val) ); \ | 1178 | RADEON_WRITE(R520_MC_IND_INDEX, 0); \ |
| 1101 | } while (0) | 1179 | } while (0) |
| 1102 | 1180 | ||
| 1103 | #define RADEON_WRITE_MCIND( addr, val ) \ | 1181 | #define RS480_WRITE_MCIND(addr, val) \ |
| 1104 | do { \ | 1182 | do { \ |
| 1105 | RADEON_WRITE(R520_MC_IND_INDEX, 0xff0000 | ((addr) & 0xff)); \ | 1183 | RADEON_WRITE(RS480_NB_MC_INDEX, \ |
| 1106 | RADEON_WRITE(R520_MC_IND_DATA, (val)); \ | 1184 | ((addr) & 0xff) | RS480_NB_MC_IND_WR_EN); \ |
| 1107 | RADEON_WRITE(R520_MC_IND_INDEX, 0); \ | 1185 | RADEON_WRITE(RS480_NB_MC_DATA, (val)); \ |
| 1108 | } while (0) | 1186 | RADEON_WRITE(RS480_NB_MC_INDEX, 0xff); \ |
| 1187 | } while (0) | ||
| 1109 | 1188 | ||
| 1110 | #define RS690_WRITE_MCIND( addr, val ) \ | 1189 | #define RS690_WRITE_MCIND(addr, val) \ |
| 1111 | do { \ | 1190 | do { \ |
| 1112 | RADEON_WRITE(RS690_MC_INDEX, RS690_MC_INDEX_WR_EN | ((addr) & RS690_MC_INDEX_MASK)); \ | 1191 | RADEON_WRITE(RS690_MC_INDEX, RS690_MC_INDEX_WR_EN | ((addr) & RS690_MC_INDEX_MASK)); \ |
| 1113 | RADEON_WRITE(RS690_MC_DATA, val); \ | 1192 | RADEON_WRITE(RS690_MC_DATA, val); \ |
| 1114 | RADEON_WRITE(RS690_MC_INDEX, RS690_MC_INDEX_WR_ACK); \ | 1193 | RADEON_WRITE(RS690_MC_INDEX, RS690_MC_INDEX_WR_ACK); \ |
| 1115 | } while (0) | 1194 | } while (0) |
| 1116 | 1195 | ||
| 1196 | #define IGP_WRITE_MCIND(addr, val) \ | ||
| 1197 | do { \ | ||
| 1198 | if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) \ | ||
| 1199 | RS690_WRITE_MCIND(addr, val); \ | ||
| 1200 | else \ | ||
| 1201 | RS480_WRITE_MCIND(addr, val); \ | ||
| 1202 | } while (0) | ||
| 1203 | |||
| 1117 | #define CP_PACKET0( reg, n ) \ | 1204 | #define CP_PACKET0( reg, n ) \ |
| 1118 | (RADEON_CP_PACKET0 | ((n) << 16) | ((reg) >> 2)) | 1205 | (RADEON_CP_PACKET0 | ((n) << 16) | ((reg) >> 2)) |
| 1119 | #define CP_PACKET0_TABLE( reg, n ) \ | 1206 | #define CP_PACKET0_TABLE( reg, n ) \ |
| @@ -1154,23 +1241,43 @@ do { \ | |||
| 1154 | } while (0) | 1241 | } while (0) |
| 1155 | 1242 | ||
| 1156 | #define RADEON_FLUSH_CACHE() do { \ | 1243 | #define RADEON_FLUSH_CACHE() do { \ |
| 1157 | OUT_RING( CP_PACKET0( RADEON_RB3D_DSTCACHE_CTLSTAT, 0 ) ); \ | 1244 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ |
| 1158 | OUT_RING( RADEON_RB3D_DC_FLUSH ); \ | 1245 | OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0)); \ |
| 1246 | OUT_RING(RADEON_RB3D_DC_FLUSH); \ | ||
| 1247 | } else { \ | ||
| 1248 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | ||
| 1249 | OUT_RING(RADEON_RB3D_DC_FLUSH); \ | ||
| 1250 | } \ | ||
| 1159 | } while (0) | 1251 | } while (0) |
| 1160 | 1252 | ||
| 1161 | #define RADEON_PURGE_CACHE() do { \ | 1253 | #define RADEON_PURGE_CACHE() do { \ |
| 1162 | OUT_RING( CP_PACKET0( RADEON_RB3D_DSTCACHE_CTLSTAT, 0 ) ); \ | 1254 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ |
| 1163 | OUT_RING( RADEON_RB3D_DC_FLUSH_ALL ); \ | 1255 | OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0)); \ |
| 1256 | OUT_RING(RADEON_RB3D_DC_FLUSH_ALL); \ | ||
| 1257 | } else { \ | ||
| 1258 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | ||
| 1259 | OUT_RING(RADEON_RB3D_DC_FLUSH_ALL); \ | ||
| 1260 | } \ | ||
| 1164 | } while (0) | 1261 | } while (0) |
| 1165 | 1262 | ||
| 1166 | #define RADEON_FLUSH_ZCACHE() do { \ | 1263 | #define RADEON_FLUSH_ZCACHE() do { \ |
| 1167 | OUT_RING( CP_PACKET0( RADEON_RB3D_ZCACHE_CTLSTAT, 0 ) ); \ | 1264 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ |
| 1168 | OUT_RING( RADEON_RB3D_ZC_FLUSH ); \ | 1265 | OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0)); \ |
| 1266 | OUT_RING(RADEON_RB3D_ZC_FLUSH); \ | ||
| 1267 | } else { \ | ||
| 1268 | OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0)); \ | ||
| 1269 | OUT_RING(R300_ZC_FLUSH); \ | ||
| 1270 | } \ | ||
| 1169 | } while (0) | 1271 | } while (0) |
| 1170 | 1272 | ||
| 1171 | #define RADEON_PURGE_ZCACHE() do { \ | 1273 | #define RADEON_PURGE_ZCACHE() do { \ |
| 1172 | OUT_RING( CP_PACKET0( RADEON_RB3D_ZCACHE_CTLSTAT, 0 ) ); \ | 1274 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ |
| 1173 | OUT_RING( RADEON_RB3D_ZC_FLUSH_ALL ); \ | 1275 | OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0)); \ |
| 1276 | OUT_RING(RADEON_RB3D_ZC_FLUSH_ALL); \ | ||
| 1277 | } else { \ | ||
| 1278 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | ||
| 1279 | OUT_RING(R300_ZC_FLUSH_ALL); \ | ||
| 1280 | } \ | ||
| 1174 | } while (0) | 1281 | } while (0) |
| 1175 | 1282 | ||
| 1176 | /* ================================================================ | 1283 | /* ================================================================ |
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c index 009af3814b6f..ee40d197deb7 100644 --- a/drivers/char/drm/radeon_irq.c +++ b/drivers/char/drm/radeon_irq.c | |||
| @@ -234,7 +234,7 @@ int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_pr | |||
| 234 | return radeon_wait_irq(dev, irqwait->irq_seq); | 234 | return radeon_wait_irq(dev, irqwait->irq_seq); |
| 235 | } | 235 | } |
| 236 | 236 | ||
| 237 | static void radeon_enable_interrupt(struct drm_device *dev) | 237 | void radeon_enable_interrupt(struct drm_device *dev) |
| 238 | { | 238 | { |
| 239 | drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; | 239 | drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; |
| 240 | 240 | ||
diff --git a/drivers/char/drm/radeon_microcode.h b/drivers/char/drm/radeon_microcode.h new file mode 100644 index 000000000000..a348c9e7db1c --- /dev/null +++ b/drivers/char/drm/radeon_microcode.h | |||
| @@ -0,0 +1,1844 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2007 Advanced Micro Devices, Inc. | ||
| 3 | * All Rights Reserved. | ||
| 4 | * | ||
| 5 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
| 6 | * copy of this software and associated documentation files (the "Software"), | ||
| 7 | * to deal in the Software without restriction, including without limitation | ||
| 8 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| 9 | * and/or sell copies of the Software, and to permit persons to whom the | ||
| 10 | * Software is furnished to do so, subject to the following conditions: | ||
| 11 | * | ||
| 12 | * The above copyright notice and this permission notice (including the next | ||
| 13 | * paragraph) shall be included in all copies or substantial portions of the | ||
| 14 | * Software. | ||
| 15 | * | ||
| 16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| 18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
| 19 | * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE | ||
| 20 | * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| 21 | * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| 22 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 23 | * | ||
| 24 | */ | ||
| 25 | |||
| 26 | #ifndef RADEON_MICROCODE_H | ||
| 27 | #define RADEON_MICROCODE_H | ||
| 28 | |||
| 29 | /* production radeon ucode r1xx-r6xx */ | ||
| 30 | static const u32 R100_cp_microcode[][2] = { | ||
| 31 | { 0x21007000, 0000000000 }, | ||
| 32 | { 0x20007000, 0000000000 }, | ||
| 33 | { 0x000000b4, 0x00000004 }, | ||
| 34 | { 0x000000b8, 0x00000004 }, | ||
| 35 | { 0x6f5b4d4c, 0000000000 }, | ||
| 36 | { 0x4c4c427f, 0000000000 }, | ||
| 37 | { 0x5b568a92, 0000000000 }, | ||
| 38 | { 0x4ca09c6d, 0000000000 }, | ||
| 39 | { 0xad4c4c4c, 0000000000 }, | ||
| 40 | { 0x4ce1af3d, 0000000000 }, | ||
| 41 | { 0xd8afafaf, 0000000000 }, | ||
| 42 | { 0xd64c4cdc, 0000000000 }, | ||
| 43 | { 0x4cd10d10, 0000000000 }, | ||
| 44 | { 0x000f0000, 0x00000016 }, | ||
| 45 | { 0x362f242d, 0000000000 }, | ||
| 46 | { 0x00000012, 0x00000004 }, | ||
| 47 | { 0x000f0000, 0x00000016 }, | ||
| 48 | { 0x362f282d, 0000000000 }, | ||
| 49 | { 0x000380e7, 0x00000002 }, | ||
| 50 | { 0x04002c97, 0x00000002 }, | ||
| 51 | { 0x000f0001, 0x00000016 }, | ||
| 52 | { 0x333a3730, 0000000000 }, | ||
| 53 | { 0x000077ef, 0x00000002 }, | ||
| 54 | { 0x00061000, 0x00000002 }, | ||
| 55 | { 0x00000021, 0x0000001a }, | ||
| 56 | { 0x00004000, 0x0000001e }, | ||
| 57 | { 0x00061000, 0x00000002 }, | ||
| 58 | { 0x00000021, 0x0000001a }, | ||
| 59 | { 0x00004000, 0x0000001e }, | ||
| 60 | { 0x00061000, 0x00000002 }, | ||
| 61 | { 0x00000021, 0x0000001a }, | ||
| 62 | { 0x00004000, 0x0000001e }, | ||
| 63 | { 0x00000017, 0x00000004 }, | ||
| 64 | { 0x0003802b, 0x00000002 }, | ||
| 65 | { 0x040067e0, 0x00000002 }, | ||
| 66 | { 0x00000017, 0x00000004 }, | ||
| 67 | { 0x000077e0, 0x00000002 }, | ||
| 68 | { 0x00065000, 0x00000002 }, | ||
| 69 | { 0x000037e1, 0x00000002 }, | ||
| 70 | { 0x040067e1, 0x00000006 }, | ||
| 71 | { 0x000077e0, 0x00000002 }, | ||
| 72 | { 0x000077e1, 0x00000002 }, | ||
| 73 | { 0x000077e1, 0x00000006 }, | ||
| 74 | { 0xffffffff, 0000000000 }, | ||
| 75 | { 0x10000000, 0000000000 }, | ||
| 76 | { 0x0003802b, 0x00000002 }, | ||
| 77 | { 0x040067e0, 0x00000006 }, | ||
| 78 | { 0x00007675, 0x00000002 }, | ||
| 79 | { 0x00007676, 0x00000002 }, | ||
| 80 | { 0x00007677, 0x00000002 }, | ||
| 81 | { 0x00007678, 0x00000006 }, | ||
| 82 | { 0x0003802c, 0x00000002 }, | ||
| 83 | { 0x04002676, 0x00000002 }, | ||
| 84 | { 0x00007677, 0x00000002 }, | ||
| 85 | { 0x00007678, 0x00000006 }, | ||
| 86 | { 0x0000002f, 0x00000018 }, | ||
| 87 | { 0x0000002f, 0x00000018 }, | ||
| 88 | { 0000000000, 0x00000006 }, | ||
| 89 | { 0x00000030, 0x00000018 }, | ||
| 90 | { 0x00000030, 0x00000018 }, | ||
| 91 | { 0000000000, 0x00000006 }, | ||
| 92 | { 0x01605000, 0x00000002 }, | ||
| 93 | { 0x00065000, 0x00000002 }, | ||
| 94 | { 0x00098000, 0x00000002 }, | ||
| 95 | { 0x00061000, 0x00000002 }, | ||
| 96 | { 0x64c0603e, 0x00000004 }, | ||
| 97 | { 0x000380e6, 0x00000002 }, | ||
| 98 | { 0x040025c5, 0x00000002 }, | ||
| 99 | { 0x00080000, 0x00000016 }, | ||
| 100 | { 0000000000, 0000000000 }, | ||
| 101 | { 0x0400251d, 0x00000002 }, | ||
| 102 | { 0x00007580, 0x00000002 }, | ||
| 103 | { 0x00067581, 0x00000002 }, | ||
| 104 | { 0x04002580, 0x00000002 }, | ||
| 105 | { 0x00067581, 0x00000002 }, | ||
| 106 | { 0x00000049, 0x00000004 }, | ||
| 107 | { 0x00005000, 0000000000 }, | ||
| 108 | { 0x000380e6, 0x00000002 }, | ||
| 109 | { 0x040025c5, 0x00000002 }, | ||
| 110 | { 0x00061000, 0x00000002 }, | ||
| 111 | { 0x0000750e, 0x00000002 }, | ||
| 112 | { 0x00019000, 0x00000002 }, | ||
| 113 | { 0x00011055, 0x00000014 }, | ||
| 114 | { 0x00000055, 0x00000012 }, | ||
| 115 | { 0x0400250f, 0x00000002 }, | ||
| 116 | { 0x0000504f, 0x00000004 }, | ||
| 117 | { 0x000380e6, 0x00000002 }, | ||
| 118 | { 0x040025c5, 0x00000002 }, | ||
| 119 | { 0x00007565, 0x00000002 }, | ||
| 120 | { 0x00007566, 0x00000002 }, | ||
| 121 | { 0x00000058, 0x00000004 }, | ||
| 122 | { 0x000380e6, 0x00000002 }, | ||
| 123 | { 0x040025c5, 0x00000002 }, | ||
| 124 | { 0x01e655b4, 0x00000002 }, | ||
| 125 | { 0x4401b0e4, 0x00000002 }, | ||
| 126 | { 0x01c110e4, 0x00000002 }, | ||
| 127 | { 0x26667066, 0x00000018 }, | ||
| 128 | { 0x040c2565, 0x00000002 }, | ||
| 129 | { 0x00000066, 0x00000018 }, | ||
| 130 | { 0x04002564, 0x00000002 }, | ||
| 131 | { 0x00007566, 0x00000002 }, | ||
| 132 | { 0x0000005d, 0x00000004 }, | ||
| 133 | { 0x00401069, 0x00000008 }, | ||
| 134 | { 0x00101000, 0x00000002 }, | ||
| 135 | { 0x000d80ff, 0x00000002 }, | ||
| 136 | { 0x0080006c, 0x00000008 }, | ||
| 137 | { 0x000f9000, 0x00000002 }, | ||
| 138 | { 0x000e00ff, 0x00000002 }, | ||
| 139 | { 0000000000, 0x00000006 }, | ||
| 140 | { 0x0000008f, 0x00000018 }, | ||
| 141 | { 0x0000005b, 0x00000004 }, | ||
| 142 | { 0x000380e6, 0x00000002 }, | ||
| 143 | { 0x040025c5, 0x00000002 }, | ||
| 144 | { 0x00007576, 0x00000002 }, | ||
| 145 | { 0x00065000, 0x00000002 }, | ||
| 146 | { 0x00009000, 0x00000002 }, | ||
| 147 | { 0x00041000, 0x00000002 }, | ||
| 148 | { 0x0c00350e, 0x00000002 }, | ||
| 149 | { 0x00049000, 0x00000002 }, | ||
| 150 | { 0x00051000, 0x00000002 }, | ||
| 151 | { 0x01e785f8, 0x00000002 }, | ||
| 152 | { 0x00200000, 0x00000002 }, | ||
| 153 | { 0x0060007e, 0x0000000c }, | ||
| 154 | { 0x00007563, 0x00000002 }, | ||
| 155 | { 0x006075f0, 0x00000021 }, | ||
| 156 | { 0x20007073, 0x00000004 }, | ||
| 157 | { 0x00005073, 0x00000004 }, | ||
| 158 | { 0x000380e6, 0x00000002 }, | ||
| 159 | { 0x040025c5, 0x00000002 }, | ||
| 160 | { 0x00007576, 0x00000002 }, | ||
| 161 | { 0x00007577, 0x00000002 }, | ||
| 162 | { 0x0000750e, 0x00000002 }, | ||
| 163 | { 0x0000750f, 0x00000002 }, | ||
| 164 | { 0x00a05000, 0x00000002 }, | ||
| 165 | { 0x00600083, 0x0000000c }, | ||
| 166 | { 0x006075f0, 0x00000021 }, | ||
| 167 | { 0x000075f8, 0x00000002 }, | ||
| 168 | { 0x00000083, 0x00000004 }, | ||
| 169 | { 0x000a750e, 0x00000002 }, | ||
| 170 | { 0x000380e6, 0x00000002 }, | ||
| 171 | { 0x040025c5, 0x00000002 }, | ||
| 172 | { 0x0020750f, 0x00000002 }, | ||
| 173 | { 0x00600086, 0x00000004 }, | ||
| 174 | { 0x00007570, 0x00000002 }, | ||
| 175 | { 0x00007571, 0x00000002 }, | ||
| 176 | { 0x00007572, 0x00000006 }, | ||
| 177 | { 0x000380e6, 0x00000002 }, | ||
| 178 | { 0x040025c5, 0x00000002 }, | ||
| 179 | { 0x00005000, 0x00000002 }, | ||
| 180 | { 0x00a05000, 0x00000002 }, | ||
| 181 | { 0x00007568, 0x00000002 }, | ||
| 182 | { 0x00061000, 0x00000002 }, | ||
| 183 | { 0x00000095, 0x0000000c }, | ||
| 184 | { 0x00058000, 0x00000002 }, | ||
| 185 | { 0x0c607562, 0x00000002 }, | ||
| 186 | { 0x00000097, 0x00000004 }, | ||
| 187 | { 0x000380e6, 0x00000002 }, | ||
| 188 | { 0x040025c5, 0x00000002 }, | ||
| 189 | { 0x00600096, 0x00000004 }, | ||
| 190 | { 0x400070e5, 0000000000 }, | ||
| 191 | { 0x000380e6, 0x00000002 }, | ||
| 192 | { 0x040025c5, 0x00000002 }, | ||
| 193 | { 0x000380e5, 0x00000002 }, | ||
| 194 | { 0x000000a8, 0x0000001c }, | ||
| 195 | { 0x000650aa, 0x00000018 }, | ||
| 196 | { 0x040025bb, 0x00000002 }, | ||
| 197 | { 0x000610ab, 0x00000018 }, | ||
| 198 | { 0x040075bc, 0000000000 }, | ||
| 199 | { 0x000075bb, 0x00000002 }, | ||
| 200 | { 0x000075bc, 0000000000 }, | ||
| 201 | { 0x00090000, 0x00000006 }, | ||
| 202 | { 0x00090000, 0x00000002 }, | ||
| 203 | { 0x000d8002, 0x00000006 }, | ||
| 204 | { 0x00007832, 0x00000002 }, | ||
| 205 | { 0x00005000, 0x00000002 }, | ||
| 206 | { 0x000380e7, 0x00000002 }, | ||
| 207 | { 0x04002c97, 0x00000002 }, | ||
| 208 | { 0x00007820, 0x00000002 }, | ||
| 209 | { 0x00007821, 0x00000002 }, | ||
| 210 | { 0x00007800, 0000000000 }, | ||
| 211 | { 0x01200000, 0x00000002 }, | ||
| 212 | { 0x20077000, 0x00000002 }, | ||
| 213 | { 0x01200000, 0x00000002 }, | ||
| 214 | { 0x20007000, 0x00000002 }, | ||
| 215 | { 0x00061000, 0x00000002 }, | ||
| 216 | { 0x0120751b, 0x00000002 }, | ||
| 217 | { 0x8040750a, 0x00000002 }, | ||
| 218 | { 0x8040750b, 0x00000002 }, | ||
| 219 | { 0x00110000, 0x00000002 }, | ||
| 220 | { 0x000380e5, 0x00000002 }, | ||
| 221 | { 0x000000c6, 0x0000001c }, | ||
| 222 | { 0x000610ab, 0x00000018 }, | ||
| 223 | { 0x844075bd, 0x00000002 }, | ||
| 224 | { 0x000610aa, 0x00000018 }, | ||
| 225 | { 0x840075bb, 0x00000002 }, | ||
| 226 | { 0x000610ab, 0x00000018 }, | ||
| 227 | { 0x844075bc, 0x00000002 }, | ||
| 228 | { 0x000000c9, 0x00000004 }, | ||
| 229 | { 0x804075bd, 0x00000002 }, | ||
| 230 | { 0x800075bb, 0x00000002 }, | ||
| 231 | { 0x804075bc, 0x00000002 }, | ||
| 232 | { 0x00108000, 0x00000002 }, | ||
| 233 | { 0x01400000, 0x00000002 }, | ||
| 234 | { 0x006000cd, 0x0000000c }, | ||
| 235 | { 0x20c07000, 0x00000020 }, | ||
| 236 | { 0x000000cf, 0x00000012 }, | ||
| 237 | { 0x00800000, 0x00000006 }, | ||
| 238 | { 0x0080751d, 0x00000006 }, | ||
| 239 | { 0000000000, 0000000000 }, | ||
| 240 | { 0x0000775c, 0x00000002 }, | ||
| 241 | { 0x00a05000, 0x00000002 }, | ||
| 242 | { 0x00661000, 0x00000002 }, | ||
| 243 | { 0x0460275d, 0x00000020 }, | ||
| 244 | { 0x00004000, 0000000000 }, | ||
| 245 | { 0x01e00830, 0x00000002 }, | ||
| 246 | { 0x21007000, 0000000000 }, | ||
| 247 | { 0x6464614d, 0000000000 }, | ||
| 248 | { 0x69687420, 0000000000 }, | ||
| 249 | { 0x00000073, 0000000000 }, | ||
| 250 | { 0000000000, 0000000000 }, | ||
| 251 | { 0x00005000, 0x00000002 }, | ||
| 252 | { 0x000380d0, 0x00000002 }, | ||
| 253 | { 0x040025e0, 0x00000002 }, | ||
| 254 | { 0x000075e1, 0000000000 }, | ||
| 255 | { 0x00000001, 0000000000 }, | ||
| 256 | { 0x000380e0, 0x00000002 }, | ||
| 257 | { 0x04002394, 0x00000002 }, | ||
| 258 | { 0x00005000, 0000000000 }, | ||
| 259 | { 0000000000, 0000000000 }, | ||
| 260 | { 0000000000, 0000000000 }, | ||
| 261 | { 0x00000008, 0000000000 }, | ||
| 262 | { 0x00000004, 0000000000 }, | ||
| 263 | { 0000000000, 0000000000 }, | ||
| 264 | { 0000000000, 0000000000 }, | ||
| 265 | { 0000000000, 0000000000 }, | ||
| 266 | { 0000000000, 0000000000 }, | ||
| 267 | { 0000000000, 0000000000 }, | ||
| 268 | { 0000000000, 0000000000 }, | ||
| 269 | { 0000000000, 0000000000 }, | ||
| 270 | { 0000000000, 0000000000 }, | ||
| 271 | { 0000000000, 0000000000 }, | ||
| 272 | { 0000000000, 0000000000 }, | ||
| 273 | { 0000000000, 0000000000 }, | ||
| 274 | { 0000000000, 0000000000 }, | ||
| 275 | { 0000000000, 0000000000 }, | ||
| 276 | { 0000000000, 0000000000 }, | ||
| 277 | { 0000000000, 0000000000 }, | ||
| 278 | { 0000000000, 0000000000 }, | ||
| 279 | { 0000000000, 0000000000 }, | ||
| 280 | { 0000000000, 0000000000 }, | ||
| 281 | { 0000000000, 0000000000 }, | ||
| 282 | { 0000000000, 0000000000 }, | ||
| 283 | { 0000000000, 0000000000 }, | ||
| 284 | { 0000000000, 0000000000 }, | ||
| 285 | { 0000000000, 0000000000 }, | ||
| 286 | { 0000000000, 0000000000 }, | ||
| 287 | }; | ||
| 288 | |||
| 289 | static const u32 R200_cp_microcode[][2] = { | ||
| 290 | { 0x21007000, 0000000000 }, | ||
| 291 | { 0x20007000, 0000000000 }, | ||
| 292 | { 0x000000bf, 0x00000004 }, | ||
| 293 | { 0x000000c3, 0x00000004 }, | ||
| 294 | { 0x7a685e5d, 0000000000 }, | ||
| 295 | { 0x5d5d5588, 0000000000 }, | ||
| 296 | { 0x68659197, 0000000000 }, | ||
| 297 | { 0x5da19f78, 0000000000 }, | ||
| 298 | { 0x5d5d5d5d, 0000000000 }, | ||
| 299 | { 0x5dee5d50, 0000000000 }, | ||
| 300 | { 0xf2acacac, 0000000000 }, | ||
| 301 | { 0xe75df9e9, 0000000000 }, | ||
| 302 | { 0xb1dd0e11, 0000000000 }, | ||
| 303 | { 0xe2afafaf, 0000000000 }, | ||
| 304 | { 0x000f0000, 0x00000016 }, | ||
| 305 | { 0x452f232d, 0000000000 }, | ||
| 306 | { 0x00000013, 0x00000004 }, | ||
| 307 | { 0x000f0000, 0x00000016 }, | ||
| 308 | { 0x452f272d, 0000000000 }, | ||
| 309 | { 0x000f0001, 0x00000016 }, | ||
| 310 | { 0x3e4d4a37, 0000000000 }, | ||
| 311 | { 0x000077ef, 0x00000002 }, | ||
| 312 | { 0x00061000, 0x00000002 }, | ||
| 313 | { 0x00000020, 0x0000001a }, | ||
| 314 | { 0x00004000, 0x0000001e }, | ||
| 315 | { 0x00061000, 0x00000002 }, | ||
| 316 | { 0x00000020, 0x0000001a }, | ||
| 317 | { 0x00004000, 0x0000001e }, | ||
| 318 | { 0x00061000, 0x00000002 }, | ||
| 319 | { 0x00000020, 0x0000001a }, | ||
| 320 | { 0x00004000, 0x0000001e }, | ||
| 321 | { 0x00000016, 0x00000004 }, | ||
| 322 | { 0x0003802a, 0x00000002 }, | ||
| 323 | { 0x040067e0, 0x00000002 }, | ||
| 324 | { 0x00000016, 0x00000004 }, | ||
| 325 | { 0x000077e0, 0x00000002 }, | ||
| 326 | { 0x00065000, 0x00000002 }, | ||
| 327 | { 0x000037e1, 0x00000002 }, | ||
| 328 | { 0x040067e1, 0x00000006 }, | ||
| 329 | { 0x000077e0, 0x00000002 }, | ||
| 330 | { 0x000077e1, 0x00000002 }, | ||
| 331 | { 0x000077e1, 0x00000006 }, | ||
| 332 | { 0xffffffff, 0000000000 }, | ||
| 333 | { 0x10000000, 0000000000 }, | ||
| 334 | { 0x07f007f0, 0000000000 }, | ||
| 335 | { 0x0003802a, 0x00000002 }, | ||
| 336 | { 0x040067e0, 0x00000006 }, | ||
| 337 | { 0x0003802c, 0x00000002 }, | ||
| 338 | { 0x04002741, 0x00000002 }, | ||
| 339 | { 0x04002741, 0x00000002 }, | ||
| 340 | { 0x04002743, 0x00000002 }, | ||
| 341 | { 0x00007675, 0x00000002 }, | ||
| 342 | { 0x00007676, 0x00000002 }, | ||
| 343 | { 0x00007677, 0x00000002 }, | ||
| 344 | { 0x00007678, 0x00000006 }, | ||
| 345 | { 0x0003802c, 0x00000002 }, | ||
| 346 | { 0x04002741, 0x00000002 }, | ||
| 347 | { 0x04002741, 0x00000002 }, | ||
| 348 | { 0x04002743, 0x00000002 }, | ||
| 349 | { 0x00007676, 0x00000002 }, | ||
| 350 | { 0x00007677, 0x00000002 }, | ||
| 351 | { 0x00007678, 0x00000006 }, | ||
| 352 | { 0x0003802b, 0x00000002 }, | ||
| 353 | { 0x04002676, 0x00000002 }, | ||
| 354 | { 0x00007677, 0x00000002 }, | ||
| 355 | { 0x0003802c, 0x00000002 }, | ||
| 356 | { 0x04002741, 0x00000002 }, | ||
| 357 | { 0x04002743, 0x00000002 }, | ||
| 358 | { 0x00007678, 0x00000006 }, | ||
| 359 | { 0x0003802c, 0x00000002 }, | ||
| 360 | { 0x04002741, 0x00000002 }, | ||
| 361 | { 0x04002741, 0x00000002 }, | ||
| 362 | { 0x04002743, 0x00000002 }, | ||
| 363 | { 0x00007678, 0x00000006 }, | ||
| 364 | { 0x0000002f, 0x00000018 }, | ||
| 365 | { 0x0000002f, 0x00000018 }, | ||
| 366 | { 0000000000, 0x00000006 }, | ||
| 367 | { 0x00000037, 0x00000018 }, | ||
| 368 | { 0x00000037, 0x00000018 }, | ||
| 369 | { 0000000000, 0x00000006 }, | ||
| 370 | { 0x01605000, 0x00000002 }, | ||
| 371 | { 0x00065000, 0x00000002 }, | ||
| 372 | { 0x00098000, 0x00000002 }, | ||
| 373 | { 0x00061000, 0x00000002 }, | ||
| 374 | { 0x64c06051, 0x00000004 }, | ||
| 375 | { 0x00080000, 0x00000016 }, | ||
| 376 | { 0000000000, 0000000000 }, | ||
| 377 | { 0x0400251d, 0x00000002 }, | ||
| 378 | { 0x00007580, 0x00000002 }, | ||
| 379 | { 0x00067581, 0x00000002 }, | ||
| 380 | { 0x04002580, 0x00000002 }, | ||
| 381 | { 0x00067581, 0x00000002 }, | ||
| 382 | { 0x0000005a, 0x00000004 }, | ||
| 383 | { 0x00005000, 0000000000 }, | ||
| 384 | { 0x00061000, 0x00000002 }, | ||
| 385 | { 0x0000750e, 0x00000002 }, | ||
| 386 | { 0x00019000, 0x00000002 }, | ||
| 387 | { 0x00011064, 0x00000014 }, | ||
| 388 | { 0x00000064, 0x00000012 }, | ||
| 389 | { 0x0400250f, 0x00000002 }, | ||
| 390 | { 0x0000505e, 0x00000004 }, | ||
| 391 | { 0x00007565, 0x00000002 }, | ||
| 392 | { 0x00007566, 0x00000002 }, | ||
| 393 | { 0x00000065, 0x00000004 }, | ||
| 394 | { 0x01e655b4, 0x00000002 }, | ||
| 395 | { 0x4401b0f0, 0x00000002 }, | ||
| 396 | { 0x01c110f0, 0x00000002 }, | ||
| 397 | { 0x26667071, 0x00000018 }, | ||
| 398 | { 0x040c2565, 0x00000002 }, | ||
| 399 | { 0x00000071, 0x00000018 }, | ||
| 400 | { 0x04002564, 0x00000002 }, | ||
| 401 | { 0x00007566, 0x00000002 }, | ||
| 402 | { 0x00000068, 0x00000004 }, | ||
| 403 | { 0x00401074, 0x00000008 }, | ||
| 404 | { 0x00101000, 0x00000002 }, | ||
| 405 | { 0x000d80ff, 0x00000002 }, | ||
| 406 | { 0x00800077, 0x00000008 }, | ||
| 407 | { 0x000f9000, 0x00000002 }, | ||
| 408 | { 0x000e00ff, 0x00000002 }, | ||
| 409 | { 0000000000, 0x00000006 }, | ||
| 410 | { 0x00000094, 0x00000018 }, | ||
| 411 | { 0x00000068, 0x00000004 }, | ||
| 412 | { 0x00007576, 0x00000002 }, | ||
| 413 | { 0x00065000, 0x00000002 }, | ||
| 414 | { 0x00009000, 0x00000002 }, | ||
| 415 | { 0x00041000, 0x00000002 }, | ||
| 416 | { 0x0c00350e, 0x00000002 }, | ||
| 417 | { 0x00049000, 0x00000002 }, | ||
| 418 | { 0x00051000, 0x00000002 }, | ||
| 419 | { 0x01e785f8, 0x00000002 }, | ||
| 420 | { 0x00200000, 0x00000002 }, | ||
| 421 | { 0x00600087, 0x0000000c }, | ||
| 422 | { 0x00007563, 0x00000002 }, | ||
| 423 | { 0x006075f0, 0x00000021 }, | ||
| 424 | { 0x2000707c, 0x00000004 }, | ||
| 425 | { 0x0000507c, 0x00000004 }, | ||
| 426 | { 0x00007576, 0x00000002 }, | ||
| 427 | { 0x00007577, 0x00000002 }, | ||
| 428 | { 0x0000750e, 0x00000002 }, | ||
| 429 | { 0x0000750f, 0x00000002 }, | ||
| 430 | { 0x00a05000, 0x00000002 }, | ||
| 431 | { 0x0060008a, 0x0000000c }, | ||
| 432 | { 0x006075f0, 0x00000021 }, | ||
| 433 | { 0x000075f8, 0x00000002 }, | ||
| 434 | { 0x0000008a, 0x00000004 }, | ||
| 435 | { 0x000a750e, 0x00000002 }, | ||
| 436 | { 0x0020750f, 0x00000002 }, | ||
| 437 | { 0x0060008d, 0x00000004 }, | ||
| 438 | { 0x00007570, 0x00000002 }, | ||
| 439 | { 0x00007571, 0x00000002 }, | ||
| 440 | { 0x00007572, 0x00000006 }, | ||
| 441 | { 0x00005000, 0x00000002 }, | ||
| 442 | { 0x00a05000, 0x00000002 }, | ||
| 443 | { 0x00007568, 0x00000002 }, | ||
| 444 | { 0x00061000, 0x00000002 }, | ||
| 445 | { 0x00000098, 0x0000000c }, | ||
| 446 | { 0x00058000, 0x00000002 }, | ||
| 447 | { 0x0c607562, 0x00000002 }, | ||
| 448 | { 0x0000009a, 0x00000004 }, | ||
| 449 | { 0x00600099, 0x00000004 }, | ||
| 450 | { 0x400070f1, 0000000000 }, | ||
| 451 | { 0x000380f1, 0x00000002 }, | ||
| 452 | { 0x000000a7, 0x0000001c }, | ||
| 453 | { 0x000650a9, 0x00000018 }, | ||
| 454 | { 0x040025bb, 0x00000002 }, | ||
| 455 | { 0x000610aa, 0x00000018 }, | ||
| 456 | { 0x040075bc, 0000000000 }, | ||
| 457 | { 0x000075bb, 0x00000002 }, | ||
| 458 | { 0x000075bc, 0000000000 }, | ||
| 459 | { 0x00090000, 0x00000006 }, | ||
| 460 | { 0x00090000, 0x00000002 }, | ||
| 461 | { 0x000d8002, 0x00000006 }, | ||
| 462 | { 0x00005000, 0x00000002 }, | ||
| 463 | { 0x00007821, 0x00000002 }, | ||
| 464 | { 0x00007800, 0000000000 }, | ||
| 465 | { 0x00007821, 0x00000002 }, | ||
| 466 | { 0x00007800, 0000000000 }, | ||
| 467 | { 0x01665000, 0x00000002 }, | ||
| 468 | { 0x000a0000, 0x00000002 }, | ||
| 469 | { 0x000671cc, 0x00000002 }, | ||
| 470 | { 0x0286f1cd, 0x00000002 }, | ||
| 471 | { 0x000000b7, 0x00000010 }, | ||
| 472 | { 0x21007000, 0000000000 }, | ||
| 473 | { 0x000000be, 0x0000001c }, | ||
| 474 | { 0x00065000, 0x00000002 }, | ||
| 475 | { 0x000a0000, 0x00000002 }, | ||
| 476 | { 0x00061000, 0x00000002 }, | ||
| 477 | { 0x000b0000, 0x00000002 }, | ||
| 478 | { 0x38067000, 0x00000002 }, | ||
| 479 | { 0x000a00ba, 0x00000004 }, | ||
| 480 | { 0x20007000, 0000000000 }, | ||
| 481 | { 0x01200000, 0x00000002 }, | ||
| 482 | { 0x20077000, 0x00000002 }, | ||
| 483 | { 0x01200000, 0x00000002 }, | ||
| 484 | { 0x20007000, 0000000000 }, | ||
| 485 | { 0x00061000, 0x00000002 }, | ||
| 486 | { 0x0120751b, 0x00000002 }, | ||
| 487 | { 0x8040750a, 0x00000002 }, | ||
| 488 | { 0x8040750b, 0x00000002 }, | ||
| 489 | { 0x00110000, 0x00000002 }, | ||
| 490 | { 0x000380f1, 0x00000002 }, | ||
| 491 | { 0x000000d1, 0x0000001c }, | ||
| 492 | { 0x000610aa, 0x00000018 }, | ||
| 493 | { 0x844075bd, 0x00000002 }, | ||
| 494 | { 0x000610a9, 0x00000018 }, | ||
| 495 | { 0x840075bb, 0x00000002 }, | ||
| 496 | { 0x000610aa, 0x00000018 }, | ||
| 497 | { 0x844075bc, 0x00000002 }, | ||
| 498 | { 0x000000d4, 0x00000004 }, | ||
| 499 | { 0x804075bd, 0x00000002 }, | ||
| 500 | { 0x800075bb, 0x00000002 }, | ||
| 501 | { 0x804075bc, 0x00000002 }, | ||
| 502 | { 0x00108000, 0x00000002 }, | ||
| 503 | { 0x01400000, 0x00000002 }, | ||
| 504 | { 0x006000d8, 0x0000000c }, | ||
| 505 | { 0x20c07000, 0x00000020 }, | ||
| 506 | { 0x000000da, 0x00000012 }, | ||
| 507 | { 0x00800000, 0x00000006 }, | ||
| 508 | { 0x0080751d, 0x00000006 }, | ||
| 509 | { 0x000025bb, 0x00000002 }, | ||
| 510 | { 0x000040d4, 0x00000004 }, | ||
| 511 | { 0x0000775c, 0x00000002 }, | ||
| 512 | { 0x00a05000, 0x00000002 }, | ||
| 513 | { 0x00661000, 0x00000002 }, | ||
| 514 | { 0x0460275d, 0x00000020 }, | ||
| 515 | { 0x00004000, 0000000000 }, | ||
| 516 | { 0x00007999, 0x00000002 }, | ||
| 517 | { 0x00a05000, 0x00000002 }, | ||
| 518 | { 0x00661000, 0x00000002 }, | ||
| 519 | { 0x0460299b, 0x00000020 }, | ||
| 520 | { 0x00004000, 0000000000 }, | ||
| 521 | { 0x01e00830, 0x00000002 }, | ||
| 522 | { 0x21007000, 0000000000 }, | ||
| 523 | { 0x00005000, 0x00000002 }, | ||
| 524 | { 0x00038056, 0x00000002 }, | ||
| 525 | { 0x040025e0, 0x00000002 }, | ||
| 526 | { 0x000075e1, 0000000000 }, | ||
| 527 | { 0x00000001, 0000000000 }, | ||
| 528 | { 0x000380ed, 0x00000002 }, | ||
| 529 | { 0x04007394, 0000000000 }, | ||
| 530 | { 0000000000, 0000000000 }, | ||
| 531 | { 0000000000, 0000000000 }, | ||
| 532 | { 0x000078c4, 0x00000002 }, | ||
| 533 | { 0x000078c5, 0x00000002 }, | ||
| 534 | { 0x000078c6, 0x00000002 }, | ||
| 535 | { 0x00007924, 0x00000002 }, | ||
| 536 | { 0x00007925, 0x00000002 }, | ||
| 537 | { 0x00007926, 0x00000002 }, | ||
| 538 | { 0x000000f2, 0x00000004 }, | ||
| 539 | { 0x00007924, 0x00000002 }, | ||
| 540 | { 0x00007925, 0x00000002 }, | ||
| 541 | { 0x00007926, 0x00000002 }, | ||
| 542 | { 0x000000f9, 0x00000004 }, | ||
| 543 | { 0000000000, 0000000000 }, | ||
| 544 | { 0000000000, 0000000000 }, | ||
| 545 | { 0000000000, 0000000000 }, | ||
| 546 | }; | ||
| 547 | |||
| 548 | static const u32 R300_cp_microcode[][2] = { | ||
| 549 | { 0x4200e000, 0000000000 }, | ||
| 550 | { 0x4000e000, 0000000000 }, | ||
| 551 | { 0x000000ae, 0x00000008 }, | ||
| 552 | { 0x000000b2, 0x00000008 }, | ||
| 553 | { 0x67554b4a, 0000000000 }, | ||
| 554 | { 0x4a4a4475, 0000000000 }, | ||
| 555 | { 0x55527d83, 0000000000 }, | ||
| 556 | { 0x4a8c8b65, 0000000000 }, | ||
| 557 | { 0x4aef4af6, 0000000000 }, | ||
| 558 | { 0x4ae14a4a, 0000000000 }, | ||
| 559 | { 0xe4979797, 0000000000 }, | ||
| 560 | { 0xdb4aebdd, 0000000000 }, | ||
| 561 | { 0x9ccc4a4a, 0000000000 }, | ||
| 562 | { 0xd1989898, 0000000000 }, | ||
| 563 | { 0x4a0f9ad6, 0000000000 }, | ||
| 564 | { 0x000ca000, 0x00000004 }, | ||
| 565 | { 0x000d0012, 0x00000038 }, | ||
| 566 | { 0x0000e8b4, 0x00000004 }, | ||
| 567 | { 0x000d0014, 0x00000038 }, | ||
| 568 | { 0x0000e8b6, 0x00000004 }, | ||
| 569 | { 0x000d0016, 0x00000038 }, | ||
| 570 | { 0x0000e854, 0x00000004 }, | ||
| 571 | { 0x000d0018, 0x00000038 }, | ||
| 572 | { 0x0000e855, 0x00000004 }, | ||
| 573 | { 0x000d001a, 0x00000038 }, | ||
| 574 | { 0x0000e856, 0x00000004 }, | ||
| 575 | { 0x000d001c, 0x00000038 }, | ||
| 576 | { 0x0000e857, 0x00000004 }, | ||
| 577 | { 0x000d001e, 0x00000038 }, | ||
| 578 | { 0x0000e824, 0x00000004 }, | ||
| 579 | { 0x000d0020, 0x00000038 }, | ||
| 580 | { 0x0000e825, 0x00000004 }, | ||
| 581 | { 0x000d0022, 0x00000038 }, | ||
| 582 | { 0x0000e830, 0x00000004 }, | ||
| 583 | { 0x000d0024, 0x00000038 }, | ||
| 584 | { 0x0000f0c0, 0x00000004 }, | ||
| 585 | { 0x000d0026, 0x00000038 }, | ||
| 586 | { 0x0000f0c1, 0x00000004 }, | ||
| 587 | { 0x000d0028, 0x00000038 }, | ||
| 588 | { 0x0000f041, 0x00000004 }, | ||
| 589 | { 0x000d002a, 0x00000038 }, | ||
| 590 | { 0x0000f184, 0x00000004 }, | ||
| 591 | { 0x000d002c, 0x00000038 }, | ||
| 592 | { 0x0000f185, 0x00000004 }, | ||
| 593 | { 0x000d002e, 0x00000038 }, | ||
| 594 | { 0x0000f186, 0x00000004 }, | ||
| 595 | { 0x000d0030, 0x00000038 }, | ||
| 596 | { 0x0000f187, 0x00000004 }, | ||
| 597 | { 0x000d0032, 0x00000038 }, | ||
| 598 | { 0x0000f180, 0x00000004 }, | ||
| 599 | { 0x000d0034, 0x00000038 }, | ||
| 600 | { 0x0000f393, 0x00000004 }, | ||
| 601 | { 0x000d0036, 0x00000038 }, | ||
| 602 | { 0x0000f38a, 0x00000004 }, | ||
| 603 | { 0x000d0038, 0x00000038 }, | ||
| 604 | { 0x0000f38e, 0x00000004 }, | ||
| 605 | { 0x0000e821, 0x00000004 }, | ||
| 606 | { 0x0140a000, 0x00000004 }, | ||
| 607 | { 0x00000043, 0x00000018 }, | ||
| 608 | { 0x00cce800, 0x00000004 }, | ||
| 609 | { 0x001b0001, 0x00000004 }, | ||
| 610 | { 0x08004800, 0x00000004 }, | ||
| 611 | { 0x001b0001, 0x00000004 }, | ||
| 612 | { 0x08004800, 0x00000004 }, | ||
| 613 | { 0x001b0001, 0x00000004 }, | ||
| 614 | { 0x08004800, 0x00000004 }, | ||
| 615 | { 0x0000003a, 0x00000008 }, | ||
| 616 | { 0x0000a000, 0000000000 }, | ||
| 617 | { 0x2000451d, 0x00000004 }, | ||
| 618 | { 0x0000e580, 0x00000004 }, | ||
| 619 | { 0x000ce581, 0x00000004 }, | ||
| 620 | { 0x08004580, 0x00000004 }, | ||
| 621 | { 0x000ce581, 0x00000004 }, | ||
| 622 | { 0x00000047, 0x00000008 }, | ||
| 623 | { 0x0000a000, 0000000000 }, | ||
| 624 | { 0x000c2000, 0x00000004 }, | ||
| 625 | { 0x0000e50e, 0x00000004 }, | ||
| 626 | { 0x00032000, 0x00000004 }, | ||
| 627 | { 0x00022051, 0x00000028 }, | ||
| 628 | { 0x00000051, 0x00000024 }, | ||
| 629 | { 0x0800450f, 0x00000004 }, | ||
| 630 | { 0x0000a04b, 0x00000008 }, | ||
| 631 | { 0x0000e565, 0x00000004 }, | ||
| 632 | { 0x0000e566, 0x00000004 }, | ||
| 633 | { 0x00000052, 0x00000008 }, | ||
| 634 | { 0x03cca5b4, 0x00000004 }, | ||
| 635 | { 0x05432000, 0x00000004 }, | ||
| 636 | { 0x00022000, 0x00000004 }, | ||
| 637 | { 0x4ccce05e, 0x00000030 }, | ||
| 638 | { 0x08274565, 0x00000004 }, | ||
| 639 | { 0x0000005e, 0x00000030 }, | ||
| 640 | { 0x08004564, 0x00000004 }, | ||
| 641 | { 0x0000e566, 0x00000004 }, | ||
| 642 | { 0x00000055, 0x00000008 }, | ||
| 643 | { 0x00802061, 0x00000010 }, | ||
| 644 | { 0x00202000, 0x00000004 }, | ||
| 645 | { 0x001b00ff, 0x00000004 }, | ||
| 646 | { 0x01000064, 0x00000010 }, | ||
| 647 | { 0x001f2000, 0x00000004 }, | ||
| 648 | { 0x001c00ff, 0x00000004 }, | ||
| 649 | { 0000000000, 0x0000000c }, | ||
| 650 | { 0x00000080, 0x00000030 }, | ||
| 651 | { 0x00000055, 0x00000008 }, | ||
| 652 | { 0x0000e576, 0x00000004 }, | ||
| 653 | { 0x000ca000, 0x00000004 }, | ||
| 654 | { 0x00012000, 0x00000004 }, | ||
| 655 | { 0x00082000, 0x00000004 }, | ||
| 656 | { 0x1800650e, 0x00000004 }, | ||
| 657 | { 0x00092000, 0x00000004 }, | ||
| 658 | { 0x000a2000, 0x00000004 }, | ||
| 659 | { 0x000f0000, 0x00000004 }, | ||
| 660 | { 0x00400000, 0x00000004 }, | ||
| 661 | { 0x00000074, 0x00000018 }, | ||
| 662 | { 0x0000e563, 0x00000004 }, | ||
| 663 | { 0x00c0e5f9, 0x000000c2 }, | ||
| 664 | { 0x00000069, 0x00000008 }, | ||
| 665 | { 0x0000a069, 0x00000008 }, | ||
| 666 | { 0x0000e576, 0x00000004 }, | ||
| 667 | { 0x0000e577, 0x00000004 }, | ||
| 668 | { 0x0000e50e, 0x00000004 }, | ||
| 669 | { 0x0000e50f, 0x00000004 }, | ||
| 670 | { 0x0140a000, 0x00000004 }, | ||
| 671 | { 0x00000077, 0x00000018 }, | ||
| 672 | { 0x00c0e5f9, 0x000000c2 }, | ||
| 673 | { 0x00000077, 0x00000008 }, | ||
| 674 | { 0x0014e50e, 0x00000004 }, | ||
| 675 | { 0x0040e50f, 0x00000004 }, | ||
| 676 | { 0x00c0007a, 0x00000008 }, | ||
| 677 | { 0x0000e570, 0x00000004 }, | ||
| 678 | { 0x0000e571, 0x00000004 }, | ||
| 679 | { 0x0000e572, 0x0000000c }, | ||
| 680 | { 0x0000a000, 0x00000004 }, | ||
| 681 | { 0x0140a000, 0x00000004 }, | ||
| 682 | { 0x0000e568, 0x00000004 }, | ||
| 683 | { 0x000c2000, 0x00000004 }, | ||
| 684 | { 0x00000084, 0x00000018 }, | ||
| 685 | { 0x000b0000, 0x00000004 }, | ||
| 686 | { 0x18c0e562, 0x00000004 }, | ||
| 687 | { 0x00000086, 0x00000008 }, | ||
| 688 | { 0x00c00085, 0x00000008 }, | ||
| 689 | { 0x000700e3, 0x00000004 }, | ||
| 690 | { 0x00000092, 0x00000038 }, | ||
| 691 | { 0x000ca094, 0x00000030 }, | ||
| 692 | { 0x080045bb, 0x00000004 }, | ||
| 693 | { 0x000c2095, 0x00000030 }, | ||
| 694 | { 0x0800e5bc, 0000000000 }, | ||
| 695 | { 0x0000e5bb, 0x00000004 }, | ||
| 696 | { 0x0000e5bc, 0000000000 }, | ||
| 697 | { 0x00120000, 0x0000000c }, | ||
| 698 | { 0x00120000, 0x00000004 }, | ||
| 699 | { 0x001b0002, 0x0000000c }, | ||
| 700 | { 0x0000a000, 0x00000004 }, | ||
| 701 | { 0x0000e821, 0x00000004 }, | ||
| 702 | { 0x0000e800, 0000000000 }, | ||
| 703 | { 0x0000e821, 0x00000004 }, | ||
| 704 | { 0x0000e82e, 0000000000 }, | ||
| 705 | { 0x02cca000, 0x00000004 }, | ||
| 706 | { 0x00140000, 0x00000004 }, | ||
| 707 | { 0x000ce1cc, 0x00000004 }, | ||
| 708 | { 0x050de1cd, 0x00000004 }, | ||
| 709 | { 0x00400000, 0x00000004 }, | ||
| 710 | { 0x000000a4, 0x00000018 }, | ||
| 711 | { 0x00c0a000, 0x00000004 }, | ||
| 712 | { 0x000000a1, 0x00000008 }, | ||
| 713 | { 0x000000a6, 0x00000020 }, | ||
| 714 | { 0x4200e000, 0000000000 }, | ||
| 715 | { 0x000000ad, 0x00000038 }, | ||
| 716 | { 0x000ca000, 0x00000004 }, | ||
| 717 | { 0x00140000, 0x00000004 }, | ||
| 718 | { 0x000c2000, 0x00000004 }, | ||
| 719 | { 0x00160000, 0x00000004 }, | ||
| 720 | { 0x700ce000, 0x00000004 }, | ||
| 721 | { 0x001400a9, 0x00000008 }, | ||
| 722 | { 0x4000e000, 0000000000 }, | ||
| 723 | { 0x02400000, 0x00000004 }, | ||
| 724 | { 0x400ee000, 0x00000004 }, | ||
| 725 | { 0x02400000, 0x00000004 }, | ||
| 726 | { 0x4000e000, 0000000000 }, | ||
| 727 | { 0x000c2000, 0x00000004 }, | ||
| 728 | { 0x0240e51b, 0x00000004 }, | ||
| 729 | { 0x0080e50a, 0x00000005 }, | ||
| 730 | { 0x0080e50b, 0x00000005 }, | ||
| 731 | { 0x00220000, 0x00000004 }, | ||
| 732 | { 0x000700e3, 0x00000004 }, | ||
| 733 | { 0x000000c0, 0x00000038 }, | ||
| 734 | { 0x000c2095, 0x00000030 }, | ||
| 735 | { 0x0880e5bd, 0x00000005 }, | ||
| 736 | { 0x000c2094, 0x00000030 }, | ||
| 737 | { 0x0800e5bb, 0x00000005 }, | ||
| 738 | { 0x000c2095, 0x00000030 }, | ||
| 739 | { 0x0880e5bc, 0x00000005 }, | ||
| 740 | { 0x000000c3, 0x00000008 }, | ||
| 741 | { 0x0080e5bd, 0x00000005 }, | ||
| 742 | { 0x0000e5bb, 0x00000005 }, | ||
| 743 | { 0x0080e5bc, 0x00000005 }, | ||
| 744 | { 0x00210000, 0x00000004 }, | ||
| 745 | { 0x02800000, 0x00000004 }, | ||
| 746 | { 0x00c000c7, 0x00000018 }, | ||
| 747 | { 0x4180e000, 0x00000040 }, | ||
| 748 | { 0x000000c9, 0x00000024 }, | ||
| 749 | { 0x01000000, 0x0000000c }, | ||
| 750 | { 0x0100e51d, 0x0000000c }, | ||
| 751 | { 0x000045bb, 0x00000004 }, | ||
| 752 | { 0x000080c3, 0x00000008 }, | ||
| 753 | { 0x0000f3ce, 0x00000004 }, | ||
| 754 | { 0x0140a000, 0x00000004 }, | ||
| 755 | { 0x00cc2000, 0x00000004 }, | ||
| 756 | { 0x08c053cf, 0x00000040 }, | ||
| 757 | { 0x00008000, 0000000000 }, | ||
| 758 | { 0x0000f3d2, 0x00000004 }, | ||
| 759 | { 0x0140a000, 0x00000004 }, | ||
| 760 | { 0x00cc2000, 0x00000004 }, | ||
| 761 | { 0x08c053d3, 0x00000040 }, | ||
| 762 | { 0x00008000, 0000000000 }, | ||
| 763 | { 0x0000f39d, 0x00000004 }, | ||
| 764 | { 0x0140a000, 0x00000004 }, | ||
| 765 | { 0x00cc2000, 0x00000004 }, | ||
| 766 | { 0x08c0539e, 0x00000040 }, | ||
| 767 | { 0x00008000, 0000000000 }, | ||
| 768 | { 0x03c00830, 0x00000004 }, | ||
| 769 | { 0x4200e000, 0000000000 }, | ||
| 770 | { 0x0000a000, 0x00000004 }, | ||
| 771 | { 0x200045e0, 0x00000004 }, | ||
| 772 | { 0x0000e5e1, 0000000000 }, | ||
| 773 | { 0x00000001, 0000000000 }, | ||
| 774 | { 0x000700e0, 0x00000004 }, | ||
| 775 | { 0x0800e394, 0000000000 }, | ||
| 776 | { 0000000000, 0000000000 }, | ||
| 777 | { 0x0000e8c4, 0x00000004 }, | ||
| 778 | { 0x0000e8c5, 0x00000004 }, | ||
| 779 | { 0x0000e8c6, 0x00000004 }, | ||
| 780 | { 0x0000e928, 0x00000004 }, | ||
| 781 | { 0x0000e929, 0x00000004 }, | ||
| 782 | { 0x0000e92a, 0x00000004 }, | ||
| 783 | { 0x000000e4, 0x00000008 }, | ||
| 784 | { 0x0000e928, 0x00000004 }, | ||
| 785 | { 0x0000e929, 0x00000004 }, | ||
| 786 | { 0x0000e92a, 0x00000004 }, | ||
| 787 | { 0x000000eb, 0x00000008 }, | ||
| 788 | { 0x02c02000, 0x00000004 }, | ||
| 789 | { 0x00060000, 0x00000004 }, | ||
| 790 | { 0x000000f3, 0x00000034 }, | ||
| 791 | { 0x000000f0, 0x00000008 }, | ||
| 792 | { 0x00008000, 0x00000004 }, | ||
| 793 | { 0xc000e000, 0000000000 }, | ||
| 794 | { 0000000000, 0000000000 }, | ||
| 795 | { 0x000c2000, 0x00000004 }, | ||
| 796 | { 0x001d0018, 0x00000004 }, | ||
| 797 | { 0x001a0001, 0x00000004 }, | ||
| 798 | { 0x000000fb, 0x00000034 }, | ||
| 799 | { 0x0000004a, 0x00000008 }, | ||
| 800 | { 0x0500a04a, 0x00000008 }, | ||
| 801 | { 0000000000, 0000000000 }, | ||
| 802 | { 0000000000, 0000000000 }, | ||
| 803 | { 0000000000, 0000000000 }, | ||
| 804 | { 0000000000, 0000000000 }, | ||
| 805 | }; | ||
| 806 | |||
| 807 | static const u32 R420_cp_microcode[][2] = { | ||
| 808 | { 0x4200e000, 0000000000 }, | ||
| 809 | { 0x4000e000, 0000000000 }, | ||
| 810 | { 0x00000099, 0x00000008 }, | ||
| 811 | { 0x0000009d, 0x00000008 }, | ||
| 812 | { 0x4a554b4a, 0000000000 }, | ||
| 813 | { 0x4a4a4467, 0000000000 }, | ||
| 814 | { 0x55526f75, 0000000000 }, | ||
| 815 | { 0x4a7e7d65, 0000000000 }, | ||
| 816 | { 0xd9d3dff6, 0000000000 }, | ||
| 817 | { 0x4ac54a4a, 0000000000 }, | ||
| 818 | { 0xc8828282, 0000000000 }, | ||
| 819 | { 0xbf4acfc1, 0000000000 }, | ||
| 820 | { 0x87b04a4a, 0000000000 }, | ||
| 821 | { 0xb5838383, 0000000000 }, | ||
| 822 | { 0x4a0f85ba, 0000000000 }, | ||
| 823 | { 0x000ca000, 0x00000004 }, | ||
| 824 | { 0x000d0012, 0x00000038 }, | ||
| 825 | { 0x0000e8b4, 0x00000004 }, | ||
| 826 | { 0x000d0014, 0x00000038 }, | ||
| 827 | { 0x0000e8b6, 0x00000004 }, | ||
| 828 | { 0x000d0016, 0x00000038 }, | ||
| 829 | { 0x0000e854, 0x00000004 }, | ||
| 830 | { 0x000d0018, 0x00000038 }, | ||
| 831 | { 0x0000e855, 0x00000004 }, | ||
| 832 | { 0x000d001a, 0x00000038 }, | ||
| 833 | { 0x0000e856, 0x00000004 }, | ||
| 834 | { 0x000d001c, 0x00000038 }, | ||
| 835 | { 0x0000e857, 0x00000004 }, | ||
| 836 | { 0x000d001e, 0x00000038 }, | ||
| 837 | { 0x0000e824, 0x00000004 }, | ||
| 838 | { 0x000d0020, 0x00000038 }, | ||
| 839 | { 0x0000e825, 0x00000004 }, | ||
| 840 | { 0x000d0022, 0x00000038 }, | ||
| 841 | { 0x0000e830, 0x00000004 }, | ||
| 842 | { 0x000d0024, 0x00000038 }, | ||
| 843 | { 0x0000f0c0, 0x00000004 }, | ||
| 844 | { 0x000d0026, 0x00000038 }, | ||
| 845 | { 0x0000f0c1, 0x00000004 }, | ||
| 846 | { 0x000d0028, 0x00000038 }, | ||
| 847 | { 0x0000f041, 0x00000004 }, | ||
| 848 | { 0x000d002a, 0x00000038 }, | ||
| 849 | { 0x0000f184, 0x00000004 }, | ||
| 850 | { 0x000d002c, 0x00000038 }, | ||
| 851 | { 0x0000f185, 0x00000004 }, | ||
| 852 | { 0x000d002e, 0x00000038 }, | ||
| 853 | { 0x0000f186, 0x00000004 }, | ||
| 854 | { 0x000d0030, 0x00000038 }, | ||
| 855 | { 0x0000f187, 0x00000004 }, | ||
| 856 | { 0x000d0032, 0x00000038 }, | ||
| 857 | { 0x0000f180, 0x00000004 }, | ||
| 858 | { 0x000d0034, 0x00000038 }, | ||
| 859 | { 0x0000f393, 0x00000004 }, | ||
| 860 | { 0x000d0036, 0x00000038 }, | ||
| 861 | { 0x0000f38a, 0x00000004 }, | ||
| 862 | { 0x000d0038, 0x00000038 }, | ||
| 863 | { 0x0000f38e, 0x00000004 }, | ||
| 864 | { 0x0000e821, 0x00000004 }, | ||
| 865 | { 0x0140a000, 0x00000004 }, | ||
| 866 | { 0x00000043, 0x00000018 }, | ||
| 867 | { 0x00cce800, 0x00000004 }, | ||
| 868 | { 0x001b0001, 0x00000004 }, | ||
| 869 | { 0x08004800, 0x00000004 }, | ||
| 870 | { 0x001b0001, 0x00000004 }, | ||
| 871 | { 0x08004800, 0x00000004 }, | ||
| 872 | { 0x001b0001, 0x00000004 }, | ||
| 873 | { 0x08004800, 0x00000004 }, | ||
| 874 | { 0x0000003a, 0x00000008 }, | ||
| 875 | { 0x0000a000, 0000000000 }, | ||
| 876 | { 0x2000451d, 0x00000004 }, | ||
| 877 | { 0x0000e580, 0x00000004 }, | ||
| 878 | { 0x000ce581, 0x00000004 }, | ||
| 879 | { 0x08004580, 0x00000004 }, | ||
| 880 | { 0x000ce581, 0x00000004 }, | ||
| 881 | { 0x00000047, 0x00000008 }, | ||
| 882 | { 0x0000a000, 0000000000 }, | ||
| 883 | { 0x000c2000, 0x00000004 }, | ||
| 884 | { 0x0000e50e, 0x00000004 }, | ||
| 885 | { 0x00032000, 0x00000004 }, | ||
| 886 | { 0x00022051, 0x00000028 }, | ||
| 887 | { 0x00000051, 0x00000024 }, | ||
| 888 | { 0x0800450f, 0x00000004 }, | ||
| 889 | { 0x0000a04b, 0x00000008 }, | ||
| 890 | { 0x0000e565, 0x00000004 }, | ||
| 891 | { 0x0000e566, 0x00000004 }, | ||
| 892 | { 0x00000052, 0x00000008 }, | ||
| 893 | { 0x03cca5b4, 0x00000004 }, | ||
| 894 | { 0x05432000, 0x00000004 }, | ||
| 895 | { 0x00022000, 0x00000004 }, | ||
| 896 | { 0x4ccce05e, 0x00000030 }, | ||
| 897 | { 0x08274565, 0x00000004 }, | ||
| 898 | { 0x0000005e, 0x00000030 }, | ||
| 899 | { 0x08004564, 0x00000004 }, | ||
| 900 | { 0x0000e566, 0x00000004 }, | ||
| 901 | { 0x00000055, 0x00000008 }, | ||
| 902 | { 0x00802061, 0x00000010 }, | ||
| 903 | { 0x00202000, 0x00000004 }, | ||
| 904 | { 0x001b00ff, 0x00000004 }, | ||
| 905 | { 0x01000064, 0x00000010 }, | ||
| 906 | { 0x001f2000, 0x00000004 }, | ||
| 907 | { 0x001c00ff, 0x00000004 }, | ||
| 908 | { 0000000000, 0x0000000c }, | ||
| 909 | { 0x00000072, 0x00000030 }, | ||
| 910 | { 0x00000055, 0x00000008 }, | ||
| 911 | { 0x0000e576, 0x00000004 }, | ||
| 912 | { 0x0000e577, 0x00000004 }, | ||
| 913 | { 0x0000e50e, 0x00000004 }, | ||
| 914 | { 0x0000e50f, 0x00000004 }, | ||
| 915 | { 0x0140a000, 0x00000004 }, | ||
| 916 | { 0x00000069, 0x00000018 }, | ||
| 917 | { 0x00c0e5f9, 0x000000c2 }, | ||
| 918 | { 0x00000069, 0x00000008 }, | ||
| 919 | { 0x0014e50e, 0x00000004 }, | ||
| 920 | { 0x0040e50f, 0x00000004 }, | ||
| 921 | { 0x00c0006c, 0x00000008 }, | ||
| 922 | { 0x0000e570, 0x00000004 }, | ||
| 923 | { 0x0000e571, 0x00000004 }, | ||
| 924 | { 0x0000e572, 0x0000000c }, | ||
| 925 | { 0x0000a000, 0x00000004 }, | ||
| 926 | { 0x0140a000, 0x00000004 }, | ||
| 927 | { 0x0000e568, 0x00000004 }, | ||
| 928 | { 0x000c2000, 0x00000004 }, | ||
| 929 | { 0x00000076, 0x00000018 }, | ||
| 930 | { 0x000b0000, 0x00000004 }, | ||
| 931 | { 0x18c0e562, 0x00000004 }, | ||
| 932 | { 0x00000078, 0x00000008 }, | ||
| 933 | { 0x00c00077, 0x00000008 }, | ||
| 934 | { 0x000700c7, 0x00000004 }, | ||
| 935 | { 0x00000080, 0x00000038 }, | ||
| 936 | { 0x0000e5bb, 0x00000004 }, | ||
| 937 | { 0x0000e5bc, 0000000000 }, | ||
| 938 | { 0x0000a000, 0x00000004 }, | ||
| 939 | { 0x0000e821, 0x00000004 }, | ||
| 940 | { 0x0000e800, 0000000000 }, | ||
| 941 | { 0x0000e821, 0x00000004 }, | ||
| 942 | { 0x0000e82e, 0000000000 }, | ||
| 943 | { 0x02cca000, 0x00000004 }, | ||
| 944 | { 0x00140000, 0x00000004 }, | ||
| 945 | { 0x000ce1cc, 0x00000004 }, | ||
| 946 | { 0x050de1cd, 0x00000004 }, | ||
| 947 | { 0x00400000, 0x00000004 }, | ||
| 948 | { 0x0000008f, 0x00000018 }, | ||
| 949 | { 0x00c0a000, 0x00000004 }, | ||
| 950 | { 0x0000008c, 0x00000008 }, | ||
| 951 | { 0x00000091, 0x00000020 }, | ||
| 952 | { 0x4200e000, 0000000000 }, | ||
| 953 | { 0x00000098, 0x00000038 }, | ||
| 954 | { 0x000ca000, 0x00000004 }, | ||
| 955 | { 0x00140000, 0x00000004 }, | ||
| 956 | { 0x000c2000, 0x00000004 }, | ||
| 957 | { 0x00160000, 0x00000004 }, | ||
| 958 | { 0x700ce000, 0x00000004 }, | ||
| 959 | { 0x00140094, 0x00000008 }, | ||
| 960 | { 0x4000e000, 0000000000 }, | ||
| 961 | { 0x02400000, 0x00000004 }, | ||
| 962 | { 0x400ee000, 0x00000004 }, | ||
| 963 | { 0x02400000, 0x00000004 }, | ||
| 964 | { 0x4000e000, 0000000000 }, | ||
| 965 | { 0x000c2000, 0x00000004 }, | ||
| 966 | { 0x0240e51b, 0x00000004 }, | ||
| 967 | { 0x0080e50a, 0x00000005 }, | ||
| 968 | { 0x0080e50b, 0x00000005 }, | ||
| 969 | { 0x00220000, 0x00000004 }, | ||
| 970 | { 0x000700c7, 0x00000004 }, | ||
| 971 | { 0x000000a4, 0x00000038 }, | ||
| 972 | { 0x0080e5bd, 0x00000005 }, | ||
| 973 | { 0x0000e5bb, 0x00000005 }, | ||
| 974 | { 0x0080e5bc, 0x00000005 }, | ||
| 975 | { 0x00210000, 0x00000004 }, | ||
| 976 | { 0x02800000, 0x00000004 }, | ||
| 977 | { 0x00c000ab, 0x00000018 }, | ||
| 978 | { 0x4180e000, 0x00000040 }, | ||
| 979 | { 0x000000ad, 0x00000024 }, | ||
| 980 | { 0x01000000, 0x0000000c }, | ||
| 981 | { 0x0100e51d, 0x0000000c }, | ||
| 982 | { 0x000045bb, 0x00000004 }, | ||
| 983 | { 0x000080a7, 0x00000008 }, | ||
| 984 | { 0x0000f3ce, 0x00000004 }, | ||
| 985 | { 0x0140a000, 0x00000004 }, | ||
| 986 | { 0x00cc2000, 0x00000004 }, | ||
| 987 | { 0x08c053cf, 0x00000040 }, | ||
| 988 | { 0x00008000, 0000000000 }, | ||
| 989 | { 0x0000f3d2, 0x00000004 }, | ||
| 990 | { 0x0140a000, 0x00000004 }, | ||
| 991 | { 0x00cc2000, 0x00000004 }, | ||
| 992 | { 0x08c053d3, 0x00000040 }, | ||
| 993 | { 0x00008000, 0000000000 }, | ||
| 994 | { 0x0000f39d, 0x00000004 }, | ||
| 995 | { 0x0140a000, 0x00000004 }, | ||
| 996 | { 0x00cc2000, 0x00000004 }, | ||
| 997 | { 0x08c0539e, 0x00000040 }, | ||
| 998 | { 0x00008000, 0000000000 }, | ||
| 999 | { 0x03c00830, 0x00000004 }, | ||
| 1000 | { 0x4200e000, 0000000000 }, | ||
| 1001 | { 0x0000a000, 0x00000004 }, | ||
| 1002 | { 0x200045e0, 0x00000004 }, | ||
| 1003 | { 0x0000e5e1, 0000000000 }, | ||
| 1004 | { 0x00000001, 0000000000 }, | ||
| 1005 | { 0x000700c4, 0x00000004 }, | ||
| 1006 | { 0x0800e394, 0000000000 }, | ||
| 1007 | { 0000000000, 0000000000 }, | ||
| 1008 | { 0x0000e8c4, 0x00000004 }, | ||
| 1009 | { 0x0000e8c5, 0x00000004 }, | ||
| 1010 | { 0x0000e8c6, 0x00000004 }, | ||
| 1011 | { 0x0000e928, 0x00000004 }, | ||
| 1012 | { 0x0000e929, 0x00000004 }, | ||
| 1013 | { 0x0000e92a, 0x00000004 }, | ||
| 1014 | { 0x000000c8, 0x00000008 }, | ||
| 1015 | { 0x0000e928, 0x00000004 }, | ||
| 1016 | { 0x0000e929, 0x00000004 }, | ||
| 1017 | { 0x0000e92a, 0x00000004 }, | ||
| 1018 | { 0x000000cf, 0x00000008 }, | ||
| 1019 | { 0x02c02000, 0x00000004 }, | ||
| 1020 | { 0x00060000, 0x00000004 }, | ||
| 1021 | { 0x000000d7, 0x00000034 }, | ||
| 1022 | { 0x000000d4, 0x00000008 }, | ||
| 1023 | { 0x00008000, 0x00000004 }, | ||
| 1024 | { 0xc000e000, 0000000000 }, | ||
| 1025 | { 0x0000e1cc, 0x00000004 }, | ||
| 1026 | { 0x0500e1cd, 0x00000004 }, | ||
| 1027 | { 0x000ca000, 0x00000004 }, | ||
| 1028 | { 0x000000de, 0x00000034 }, | ||
| 1029 | { 0x000000da, 0x00000008 }, | ||
| 1030 | { 0x0000a000, 0000000000 }, | ||
| 1031 | { 0x0019e1cc, 0x00000004 }, | ||
| 1032 | { 0x001b0001, 0x00000004 }, | ||
| 1033 | { 0x0500a000, 0x00000004 }, | ||
| 1034 | { 0x080041cd, 0x00000004 }, | ||
| 1035 | { 0x000ca000, 0x00000004 }, | ||
| 1036 | { 0x000000fb, 0x00000034 }, | ||
| 1037 | { 0x0000004a, 0x00000008 }, | ||
| 1038 | { 0000000000, 0000000000 }, | ||
| 1039 | { 0000000000, 0000000000 }, | ||
| 1040 | { 0000000000, 0000000000 }, | ||
| 1041 | { 0000000000, 0000000000 }, | ||
| 1042 | { 0000000000, 0000000000 }, | ||
| 1043 | { 0000000000, 0000000000 }, | ||
| 1044 | { 0000000000, 0000000000 }, | ||
| 1045 | { 0000000000, 0000000000 }, | ||
| 1046 | { 0000000000, 0000000000 }, | ||
| 1047 | { 0000000000, 0000000000 }, | ||
| 1048 | { 0000000000, 0000000000 }, | ||
| 1049 | { 0000000000, 0000000000 }, | ||
| 1050 | { 0000000000, 0000000000 }, | ||
| 1051 | { 0000000000, 0000000000 }, | ||
| 1052 | { 0000000000, 0000000000 }, | ||
| 1053 | { 0000000000, 0000000000 }, | ||
| 1054 | { 0x000c2000, 0x00000004 }, | ||
| 1055 | { 0x001d0018, 0x00000004 }, | ||
| 1056 | { 0x001a0001, 0x00000004 }, | ||
| 1057 | { 0x000000fb, 0x00000034 }, | ||
| 1058 | { 0x0000004a, 0x00000008 }, | ||
| 1059 | { 0x0500a04a, 0x00000008 }, | ||
| 1060 | { 0000000000, 0000000000 }, | ||
| 1061 | { 0000000000, 0000000000 }, | ||
| 1062 | { 0000000000, 0000000000 }, | ||
| 1063 | { 0000000000, 0000000000 }, | ||
| 1064 | }; | ||
| 1065 | |||
| 1066 | static const u32 RS600_cp_microcode[][2] = { | ||
| 1067 | { 0x4200e000, 0000000000 }, | ||
| 1068 | { 0x4000e000, 0000000000 }, | ||
| 1069 | { 0x000000a0, 0x00000008 }, | ||
| 1070 | { 0x000000a4, 0x00000008 }, | ||
| 1071 | { 0x4a554b4a, 0000000000 }, | ||
| 1072 | { 0x4a4a4467, 0000000000 }, | ||
| 1073 | { 0x55526f75, 0000000000 }, | ||
| 1074 | { 0x4a7e7d65, 0000000000 }, | ||
| 1075 | { 0x4ae74af6, 0000000000 }, | ||
| 1076 | { 0x4ad34a4a, 0000000000 }, | ||
| 1077 | { 0xd6898989, 0000000000 }, | ||
| 1078 | { 0xcd4addcf, 0000000000 }, | ||
| 1079 | { 0x8ebe4ae2, 0000000000 }, | ||
| 1080 | { 0xc38a8a8a, 0000000000 }, | ||
| 1081 | { 0x4a0f8cc8, 0000000000 }, | ||
| 1082 | { 0x000ca000, 0x00000004 }, | ||
| 1083 | { 0x000d0012, 0x00000038 }, | ||
| 1084 | { 0x0000e8b4, 0x00000004 }, | ||
| 1085 | { 0x000d0014, 0x00000038 }, | ||
| 1086 | { 0x0000e8b6, 0x00000004 }, | ||
| 1087 | { 0x000d0016, 0x00000038 }, | ||
| 1088 | { 0x0000e854, 0x00000004 }, | ||
| 1089 | { 0x000d0018, 0x00000038 }, | ||
| 1090 | { 0x0000e855, 0x00000004 }, | ||
| 1091 | { 0x000d001a, 0x00000038 }, | ||
| 1092 | { 0x0000e856, 0x00000004 }, | ||
| 1093 | { 0x000d001c, 0x00000038 }, | ||
| 1094 | { 0x0000e857, 0x00000004 }, | ||
| 1095 | { 0x000d001e, 0x00000038 }, | ||
| 1096 | { 0x0000e824, 0x00000004 }, | ||
| 1097 | { 0x000d0020, 0x00000038 }, | ||
| 1098 | { 0x0000e825, 0x00000004 }, | ||
| 1099 | { 0x000d0022, 0x00000038 }, | ||
| 1100 | { 0x0000e830, 0x00000004 }, | ||
| 1101 | { 0x000d0024, 0x00000038 }, | ||
| 1102 | { 0x0000f0c0, 0x00000004 }, | ||
| 1103 | { 0x000d0026, 0x00000038 }, | ||
| 1104 | { 0x0000f0c1, 0x00000004 }, | ||
| 1105 | { 0x000d0028, 0x00000038 }, | ||
| 1106 | { 0x0000f041, 0x00000004 }, | ||
| 1107 | { 0x000d002a, 0x00000038 }, | ||
| 1108 | { 0x0000f184, 0x00000004 }, | ||
| 1109 | { 0x000d002c, 0x00000038 }, | ||
| 1110 | { 0x0000f185, 0x00000004 }, | ||
| 1111 | { 0x000d002e, 0x00000038 }, | ||
| 1112 | { 0x0000f186, 0x00000004 }, | ||
| 1113 | { 0x000d0030, 0x00000038 }, | ||
| 1114 | { 0x0000f187, 0x00000004 }, | ||
| 1115 | { 0x000d0032, 0x00000038 }, | ||
| 1116 | { 0x0000f180, 0x00000004 }, | ||
| 1117 | { 0x000d0034, 0x00000038 }, | ||
| 1118 | { 0x0000f393, 0x00000004 }, | ||
| 1119 | { 0x000d0036, 0x00000038 }, | ||
| 1120 | { 0x0000f38a, 0x00000004 }, | ||
| 1121 | { 0x000d0038, 0x00000038 }, | ||
| 1122 | { 0x0000f38e, 0x00000004 }, | ||
| 1123 | { 0x0000e821, 0x00000004 }, | ||
| 1124 | { 0x0140a000, 0x00000004 }, | ||
| 1125 | { 0x00000043, 0x00000018 }, | ||
| 1126 | { 0x00cce800, 0x00000004 }, | ||
| 1127 | { 0x001b0001, 0x00000004 }, | ||
| 1128 | { 0x08004800, 0x00000004 }, | ||
| 1129 | { 0x001b0001, 0x00000004 }, | ||
| 1130 | { 0x08004800, 0x00000004 }, | ||
| 1131 | { 0x001b0001, 0x00000004 }, | ||
| 1132 | { 0x08004800, 0x00000004 }, | ||
| 1133 | { 0x0000003a, 0x00000008 }, | ||
| 1134 | { 0x0000a000, 0000000000 }, | ||
| 1135 | { 0x2000451d, 0x00000004 }, | ||
| 1136 | { 0x0000e580, 0x00000004 }, | ||
| 1137 | { 0x000ce581, 0x00000004 }, | ||
| 1138 | { 0x08004580, 0x00000004 }, | ||
| 1139 | { 0x000ce581, 0x00000004 }, | ||
| 1140 | { 0x00000047, 0x00000008 }, | ||
| 1141 | { 0x0000a000, 0000000000 }, | ||
| 1142 | { 0x000c2000, 0x00000004 }, | ||
| 1143 | { 0x0000e50e, 0x00000004 }, | ||
| 1144 | { 0x00032000, 0x00000004 }, | ||
| 1145 | { 0x00022051, 0x00000028 }, | ||
| 1146 | { 0x00000051, 0x00000024 }, | ||
| 1147 | { 0x0800450f, 0x00000004 }, | ||
| 1148 | { 0x0000a04b, 0x00000008 }, | ||
| 1149 | { 0x0000e565, 0x00000004 }, | ||
| 1150 | { 0x0000e566, 0x00000004 }, | ||
| 1151 | { 0x00000052, 0x00000008 }, | ||
| 1152 | { 0x03cca5b4, 0x00000004 }, | ||
| 1153 | { 0x05432000, 0x00000004 }, | ||
| 1154 | { 0x00022000, 0x00000004 }, | ||
| 1155 | { 0x4ccce05e, 0x00000030 }, | ||
| 1156 | { 0x08274565, 0x00000004 }, | ||
| 1157 | { 0x0000005e, 0x00000030 }, | ||
| 1158 | { 0x08004564, 0x00000004 }, | ||
| 1159 | { 0x0000e566, 0x00000004 }, | ||
| 1160 | { 0x00000055, 0x00000008 }, | ||
| 1161 | { 0x00802061, 0x00000010 }, | ||
| 1162 | { 0x00202000, 0x00000004 }, | ||
| 1163 | { 0x001b00ff, 0x00000004 }, | ||
| 1164 | { 0x01000064, 0x00000010 }, | ||
| 1165 | { 0x001f2000, 0x00000004 }, | ||
| 1166 | { 0x001c00ff, 0x00000004 }, | ||
| 1167 | { 0000000000, 0x0000000c }, | ||
| 1168 | { 0x00000072, 0x00000030 }, | ||
| 1169 | { 0x00000055, 0x00000008 }, | ||
| 1170 | { 0x0000e576, 0x00000004 }, | ||
| 1171 | { 0x0000e577, 0x00000004 }, | ||
| 1172 | { 0x0000e50e, 0x00000004 }, | ||
| 1173 | { 0x0000e50f, 0x00000004 }, | ||
| 1174 | { 0x0140a000, 0x00000004 }, | ||
| 1175 | { 0x00000069, 0x00000018 }, | ||
| 1176 | { 0x00c0e5f9, 0x000000c2 }, | ||
| 1177 | { 0x00000069, 0x00000008 }, | ||
| 1178 | { 0x0014e50e, 0x00000004 }, | ||
| 1179 | { 0x0040e50f, 0x00000004 }, | ||
| 1180 | { 0x00c0006c, 0x00000008 }, | ||
| 1181 | { 0x0000e570, 0x00000004 }, | ||
| 1182 | { 0x0000e571, 0x00000004 }, | ||
| 1183 | { 0x0000e572, 0x0000000c }, | ||
| 1184 | { 0x0000a000, 0x00000004 }, | ||
| 1185 | { 0x0140a000, 0x00000004 }, | ||
| 1186 | { 0x0000e568, 0x00000004 }, | ||
| 1187 | { 0x000c2000, 0x00000004 }, | ||
| 1188 | { 0x00000076, 0x00000018 }, | ||
| 1189 | { 0x000b0000, 0x00000004 }, | ||
| 1190 | { 0x18c0e562, 0x00000004 }, | ||
| 1191 | { 0x00000078, 0x00000008 }, | ||
| 1192 | { 0x00c00077, 0x00000008 }, | ||
| 1193 | { 0x000700d5, 0x00000004 }, | ||
| 1194 | { 0x00000084, 0x00000038 }, | ||
| 1195 | { 0x000ca086, 0x00000030 }, | ||
| 1196 | { 0x080045bb, 0x00000004 }, | ||
| 1197 | { 0x000c2087, 0x00000030 }, | ||
| 1198 | { 0x0800e5bc, 0000000000 }, | ||
| 1199 | { 0x0000e5bb, 0x00000004 }, | ||
| 1200 | { 0x0000e5bc, 0000000000 }, | ||
| 1201 | { 0x00120000, 0x0000000c }, | ||
| 1202 | { 0x00120000, 0x00000004 }, | ||
| 1203 | { 0x001b0002, 0x0000000c }, | ||
| 1204 | { 0x0000a000, 0x00000004 }, | ||
| 1205 | { 0x0000e821, 0x00000004 }, | ||
| 1206 | { 0x0000e800, 0000000000 }, | ||
| 1207 | { 0x0000e821, 0x00000004 }, | ||
| 1208 | { 0x0000e82e, 0000000000 }, | ||
| 1209 | { 0x02cca000, 0x00000004 }, | ||
| 1210 | { 0x00140000, 0x00000004 }, | ||
| 1211 | { 0x000ce1cc, 0x00000004 }, | ||
| 1212 | { 0x050de1cd, 0x00000004 }, | ||
| 1213 | { 0x00400000, 0x00000004 }, | ||
| 1214 | { 0x00000096, 0x00000018 }, | ||
| 1215 | { 0x00c0a000, 0x00000004 }, | ||
| 1216 | { 0x00000093, 0x00000008 }, | ||
| 1217 | { 0x00000098, 0x00000020 }, | ||
| 1218 | { 0x4200e000, 0000000000 }, | ||
| 1219 | { 0x0000009f, 0x00000038 }, | ||
| 1220 | { 0x000ca000, 0x00000004 }, | ||
| 1221 | { 0x00140000, 0x00000004 }, | ||
| 1222 | { 0x000c2000, 0x00000004 }, | ||
| 1223 | { 0x00160000, 0x00000004 }, | ||
| 1224 | { 0x700ce000, 0x00000004 }, | ||
| 1225 | { 0x0014009b, 0x00000008 }, | ||
| 1226 | { 0x4000e000, 0000000000 }, | ||
| 1227 | { 0x02400000, 0x00000004 }, | ||
| 1228 | { 0x400ee000, 0x00000004 }, | ||
| 1229 | { 0x02400000, 0x00000004 }, | ||
| 1230 | { 0x4000e000, 0000000000 }, | ||
| 1231 | { 0x000c2000, 0x00000004 }, | ||
| 1232 | { 0x0240e51b, 0x00000004 }, | ||
| 1233 | { 0x0080e50a, 0x00000005 }, | ||
| 1234 | { 0x0080e50b, 0x00000005 }, | ||
| 1235 | { 0x00220000, 0x00000004 }, | ||
| 1236 | { 0x000700d5, 0x00000004 }, | ||
| 1237 | { 0x000000b2, 0x00000038 }, | ||
| 1238 | { 0x000c2087, 0x00000030 }, | ||
| 1239 | { 0x0880e5bd, 0x00000005 }, | ||
| 1240 | { 0x000c2086, 0x00000030 }, | ||
| 1241 | { 0x0800e5bb, 0x00000005 }, | ||
| 1242 | { 0x000c2087, 0x00000030 }, | ||
| 1243 | { 0x0880e5bc, 0x00000005 }, | ||
| 1244 | { 0x000000b5, 0x00000008 }, | ||
| 1245 | { 0x0080e5bd, 0x00000005 }, | ||
| 1246 | { 0x0000e5bb, 0x00000005 }, | ||
| 1247 | { 0x0080e5bc, 0x00000005 }, | ||
| 1248 | { 0x00210000, 0x00000004 }, | ||
| 1249 | { 0x02800000, 0x00000004 }, | ||
| 1250 | { 0x00c000b9, 0x00000018 }, | ||
| 1251 | { 0x4180e000, 0x00000040 }, | ||
| 1252 | { 0x000000bb, 0x00000024 }, | ||
| 1253 | { 0x01000000, 0x0000000c }, | ||
| 1254 | { 0x0100e51d, 0x0000000c }, | ||
| 1255 | { 0x000045bb, 0x00000004 }, | ||
| 1256 | { 0x000080b5, 0x00000008 }, | ||
| 1257 | { 0x0000f3ce, 0x00000004 }, | ||
| 1258 | { 0x0140a000, 0x00000004 }, | ||
| 1259 | { 0x00cc2000, 0x00000004 }, | ||
| 1260 | { 0x08c053cf, 0x00000040 }, | ||
| 1261 | { 0x00008000, 0000000000 }, | ||
| 1262 | { 0x0000f3d2, 0x00000004 }, | ||
| 1263 | { 0x0140a000, 0x00000004 }, | ||
| 1264 | { 0x00cc2000, 0x00000004 }, | ||
| 1265 | { 0x08c053d3, 0x00000040 }, | ||
| 1266 | { 0x00008000, 0000000000 }, | ||
| 1267 | { 0x0000f39d, 0x00000004 }, | ||
| 1268 | { 0x0140a000, 0x00000004 }, | ||
| 1269 | { 0x00cc2000, 0x00000004 }, | ||
| 1270 | { 0x08c0539e, 0x00000040 }, | ||
| 1271 | { 0x00008000, 0000000000 }, | ||
| 1272 | { 0x03c00830, 0x00000004 }, | ||
| 1273 | { 0x4200e000, 0000000000 }, | ||
| 1274 | { 0x0000a000, 0x00000004 }, | ||
| 1275 | { 0x200045e0, 0x00000004 }, | ||
| 1276 | { 0x0000e5e1, 0000000000 }, | ||
| 1277 | { 0x00000001, 0000000000 }, | ||
| 1278 | { 0x000700d2, 0x00000004 }, | ||
| 1279 | { 0x0800e394, 0000000000 }, | ||
| 1280 | { 0000000000, 0000000000 }, | ||
| 1281 | { 0x0000e8c4, 0x00000004 }, | ||
| 1282 | { 0x0000e8c5, 0x00000004 }, | ||
| 1283 | { 0x0000e8c6, 0x00000004 }, | ||
| 1284 | { 0x0000e928, 0x00000004 }, | ||
| 1285 | { 0x0000e929, 0x00000004 }, | ||
| 1286 | { 0x0000e92a, 0x00000004 }, | ||
| 1287 | { 0x000000d6, 0x00000008 }, | ||
| 1288 | { 0x0000e928, 0x00000004 }, | ||
| 1289 | { 0x0000e929, 0x00000004 }, | ||
| 1290 | { 0x0000e92a, 0x00000004 }, | ||
| 1291 | { 0x000000dd, 0x00000008 }, | ||
| 1292 | { 0x00e00116, 0000000000 }, | ||
| 1293 | { 0x000700e1, 0x00000004 }, | ||
| 1294 | { 0x0800401c, 0x00000004 }, | ||
| 1295 | { 0x200050e7, 0x00000004 }, | ||
| 1296 | { 0x0000e01d, 0x00000004 }, | ||
| 1297 | { 0x000000e4, 0x00000008 }, | ||
| 1298 | { 0x02c02000, 0x00000004 }, | ||
| 1299 | { 0x00060000, 0x00000004 }, | ||
| 1300 | { 0x000000eb, 0x00000034 }, | ||
| 1301 | { 0x000000e8, 0x00000008 }, | ||
| 1302 | { 0x00008000, 0x00000004 }, | ||
| 1303 | { 0xc000e000, 0000000000 }, | ||
| 1304 | { 0000000000, 0000000000 }, | ||
| 1305 | { 0000000000, 0000000000 }, | ||
| 1306 | { 0000000000, 0000000000 }, | ||
| 1307 | { 0000000000, 0000000000 }, | ||
| 1308 | { 0000000000, 0000000000 }, | ||
| 1309 | { 0000000000, 0000000000 }, | ||
| 1310 | { 0000000000, 0000000000 }, | ||
| 1311 | { 0000000000, 0000000000 }, | ||
| 1312 | { 0000000000, 0000000000 }, | ||
| 1313 | { 0x000c2000, 0x00000004 }, | ||
| 1314 | { 0x001d0018, 0x00000004 }, | ||
| 1315 | { 0x001a0001, 0x00000004 }, | ||
| 1316 | { 0x000000fb, 0x00000034 }, | ||
| 1317 | { 0x0000004a, 0x00000008 }, | ||
| 1318 | { 0x0500a04a, 0x00000008 }, | ||
| 1319 | { 0000000000, 0000000000 }, | ||
| 1320 | { 0000000000, 0000000000 }, | ||
| 1321 | { 0000000000, 0000000000 }, | ||
| 1322 | { 0000000000, 0000000000 }, | ||
| 1323 | }; | ||
| 1324 | |||
| 1325 | static const u32 RS690_cp_microcode[][2] = { | ||
| 1326 | { 0x000000dd, 0x00000008 }, | ||
| 1327 | { 0x000000df, 0x00000008 }, | ||
| 1328 | { 0x000000a0, 0x00000008 }, | ||
| 1329 | { 0x000000a4, 0x00000008 }, | ||
| 1330 | { 0x4a554b4a, 0000000000 }, | ||
| 1331 | { 0x4a4a4467, 0000000000 }, | ||
| 1332 | { 0x55526f75, 0000000000 }, | ||
| 1333 | { 0x4a7e7d65, 0000000000 }, | ||
| 1334 | { 0x4ad74af6, 0000000000 }, | ||
| 1335 | { 0x4ac94a4a, 0000000000 }, | ||
| 1336 | { 0xcc898989, 0000000000 }, | ||
| 1337 | { 0xc34ad3c5, 0000000000 }, | ||
| 1338 | { 0x8e4a4a4a, 0000000000 }, | ||
| 1339 | { 0x4a8a8a8a, 0000000000 }, | ||
| 1340 | { 0x4a0f8c4a, 0000000000 }, | ||
| 1341 | { 0x000ca000, 0x00000004 }, | ||
| 1342 | { 0x000d0012, 0x00000038 }, | ||
| 1343 | { 0x0000e8b4, 0x00000004 }, | ||
| 1344 | { 0x000d0014, 0x00000038 }, | ||
| 1345 | { 0x0000e8b6, 0x00000004 }, | ||
| 1346 | { 0x000d0016, 0x00000038 }, | ||
| 1347 | { 0x0000e854, 0x00000004 }, | ||
| 1348 | { 0x000d0018, 0x00000038 }, | ||
| 1349 | { 0x0000e855, 0x00000004 }, | ||
| 1350 | { 0x000d001a, 0x00000038 }, | ||
| 1351 | { 0x0000e856, 0x00000004 }, | ||
| 1352 | { 0x000d001c, 0x00000038 }, | ||
| 1353 | { 0x0000e857, 0x00000004 }, | ||
| 1354 | { 0x000d001e, 0x00000038 }, | ||
| 1355 | { 0x0000e824, 0x00000004 }, | ||
| 1356 | { 0x000d0020, 0x00000038 }, | ||
| 1357 | { 0x0000e825, 0x00000004 }, | ||
| 1358 | { 0x000d0022, 0x00000038 }, | ||
| 1359 | { 0x0000e830, 0x00000004 }, | ||
| 1360 | { 0x000d0024, 0x00000038 }, | ||
| 1361 | { 0x0000f0c0, 0x00000004 }, | ||
| 1362 | { 0x000d0026, 0x00000038 }, | ||
| 1363 | { 0x0000f0c1, 0x00000004 }, | ||
| 1364 | { 0x000d0028, 0x00000038 }, | ||
| 1365 | { 0x0000f041, 0x00000004 }, | ||
| 1366 | { 0x000d002a, 0x00000038 }, | ||
| 1367 | { 0x0000f184, 0x00000004 }, | ||
| 1368 | { 0x000d002c, 0x00000038 }, | ||
| 1369 | { 0x0000f185, 0x00000004 }, | ||
| 1370 | { 0x000d002e, 0x00000038 }, | ||
| 1371 | { 0x0000f186, 0x00000004 }, | ||
| 1372 | { 0x000d0030, 0x00000038 }, | ||
| 1373 | { 0x0000f187, 0x00000004 }, | ||
| 1374 | { 0x000d0032, 0x00000038 }, | ||
| 1375 | { 0x0000f180, 0x00000004 }, | ||
| 1376 | { 0x000d0034, 0x00000038 }, | ||
| 1377 | { 0x0000f393, 0x00000004 }, | ||
| 1378 | { 0x000d0036, 0x00000038 }, | ||
| 1379 | { 0x0000f38a, 0x00000004 }, | ||
| 1380 | { 0x000d0038, 0x00000038 }, | ||
| 1381 | { 0x0000f38e, 0x00000004 }, | ||
| 1382 | { 0x0000e821, 0x00000004 }, | ||
| 1383 | { 0x0140a000, 0x00000004 }, | ||
| 1384 | { 0x00000043, 0x00000018 }, | ||
| 1385 | { 0x00cce800, 0x00000004 }, | ||
| 1386 | { 0x001b0001, 0x00000004 }, | ||
| 1387 | { 0x08004800, 0x00000004 }, | ||
| 1388 | { 0x001b0001, 0x00000004 }, | ||
| 1389 | { 0x08004800, 0x00000004 }, | ||
| 1390 | { 0x001b0001, 0x00000004 }, | ||
| 1391 | { 0x08004800, 0x00000004 }, | ||
| 1392 | { 0x0000003a, 0x00000008 }, | ||
| 1393 | { 0x0000a000, 0000000000 }, | ||
| 1394 | { 0x2000451d, 0x00000004 }, | ||
| 1395 | { 0x0000e580, 0x00000004 }, | ||
| 1396 | { 0x000ce581, 0x00000004 }, | ||
| 1397 | { 0x08004580, 0x00000004 }, | ||
| 1398 | { 0x000ce581, 0x00000004 }, | ||
| 1399 | { 0x00000047, 0x00000008 }, | ||
| 1400 | { 0x0000a000, 0000000000 }, | ||
| 1401 | { 0x000c2000, 0x00000004 }, | ||
| 1402 | { 0x0000e50e, 0x00000004 }, | ||
| 1403 | { 0x00032000, 0x00000004 }, | ||
| 1404 | { 0x00022051, 0x00000028 }, | ||
| 1405 | { 0x00000051, 0x00000024 }, | ||
| 1406 | { 0x0800450f, 0x00000004 }, | ||
| 1407 | { 0x0000a04b, 0x00000008 }, | ||
| 1408 | { 0x0000e565, 0x00000004 }, | ||
| 1409 | { 0x0000e566, 0x00000004 }, | ||
| 1410 | { 0x00000052, 0x00000008 }, | ||
| 1411 | { 0x03cca5b4, 0x00000004 }, | ||
| 1412 | { 0x05432000, 0x00000004 }, | ||
| 1413 | { 0x00022000, 0x00000004 }, | ||
| 1414 | { 0x4ccce05e, 0x00000030 }, | ||
| 1415 | { 0x08274565, 0x00000004 }, | ||
| 1416 | { 0x0000005e, 0x00000030 }, | ||
| 1417 | { 0x08004564, 0x00000004 }, | ||
| 1418 | { 0x0000e566, 0x00000004 }, | ||
| 1419 | { 0x00000055, 0x00000008 }, | ||
| 1420 | { 0x00802061, 0x00000010 }, | ||
| 1421 | { 0x00202000, 0x00000004 }, | ||
| 1422 | { 0x001b00ff, 0x00000004 }, | ||
| 1423 | { 0x01000064, 0x00000010 }, | ||
| 1424 | { 0x001f2000, 0x00000004 }, | ||
| 1425 | { 0x001c00ff, 0x00000004 }, | ||
| 1426 | { 0000000000, 0x0000000c }, | ||
| 1427 | { 0x00000072, 0x00000030 }, | ||
| 1428 | { 0x00000055, 0x00000008 }, | ||
| 1429 | { 0x0000e576, 0x00000004 }, | ||
| 1430 | { 0x0000e577, 0x00000004 }, | ||
| 1431 | { 0x0000e50e, 0x00000004 }, | ||
| 1432 | { 0x0000e50f, 0x00000004 }, | ||
| 1433 | { 0x0140a000, 0x00000004 }, | ||
| 1434 | { 0x00000069, 0x00000018 }, | ||
| 1435 | { 0x00c0e5f9, 0x000000c2 }, | ||
| 1436 | { 0x00000069, 0x00000008 }, | ||
| 1437 | { 0x0014e50e, 0x00000004 }, | ||
| 1438 | { 0x0040e50f, 0x00000004 }, | ||
| 1439 | { 0x00c0006c, 0x00000008 }, | ||
| 1440 | { 0x0000e570, 0x00000004 }, | ||
| 1441 | { 0x0000e571, 0x00000004 }, | ||
| 1442 | { 0x0000e572, 0x0000000c }, | ||
| 1443 | { 0x0000a000, 0x00000004 }, | ||
| 1444 | { 0x0140a000, 0x00000004 }, | ||
| 1445 | { 0x0000e568, 0x00000004 }, | ||
| 1446 | { 0x000c2000, 0x00000004 }, | ||
| 1447 | { 0x00000076, 0x00000018 }, | ||
| 1448 | { 0x000b0000, 0x00000004 }, | ||
| 1449 | { 0x18c0e562, 0x00000004 }, | ||
| 1450 | { 0x00000078, 0x00000008 }, | ||
| 1451 | { 0x00c00077, 0x00000008 }, | ||
| 1452 | { 0x000700cb, 0x00000004 }, | ||
| 1453 | { 0x00000084, 0x00000038 }, | ||
| 1454 | { 0x000ca086, 0x00000030 }, | ||
| 1455 | { 0x080045bb, 0x00000004 }, | ||
| 1456 | { 0x000c2087, 0x00000030 }, | ||
| 1457 | { 0x0800e5bc, 0000000000 }, | ||
| 1458 | { 0x0000e5bb, 0x00000004 }, | ||
| 1459 | { 0x0000e5bc, 0000000000 }, | ||
| 1460 | { 0x00120000, 0x0000000c }, | ||
| 1461 | { 0x00120000, 0x00000004 }, | ||
| 1462 | { 0x001b0002, 0x0000000c }, | ||
| 1463 | { 0x0000a000, 0x00000004 }, | ||
| 1464 | { 0x0000e821, 0x00000004 }, | ||
| 1465 | { 0x0000e800, 0000000000 }, | ||
| 1466 | { 0x0000e821, 0x00000004 }, | ||
| 1467 | { 0x0000e82e, 0000000000 }, | ||
| 1468 | { 0x02cca000, 0x00000004 }, | ||
| 1469 | { 0x00140000, 0x00000004 }, | ||
| 1470 | { 0x000ce1cc, 0x00000004 }, | ||
| 1471 | { 0x050de1cd, 0x00000004 }, | ||
| 1472 | { 0x00400000, 0x00000004 }, | ||
| 1473 | { 0x00000096, 0x00000018 }, | ||
| 1474 | { 0x00c0a000, 0x00000004 }, | ||
| 1475 | { 0x00000093, 0x00000008 }, | ||
| 1476 | { 0x00000098, 0x00000020 }, | ||
| 1477 | { 0x4200e000, 0000000000 }, | ||
| 1478 | { 0x0000009f, 0x00000038 }, | ||
| 1479 | { 0x000ca000, 0x00000004 }, | ||
| 1480 | { 0x00140000, 0x00000004 }, | ||
| 1481 | { 0x000c2000, 0x00000004 }, | ||
| 1482 | { 0x00160000, 0x00000004 }, | ||
| 1483 | { 0x700ce000, 0x00000004 }, | ||
| 1484 | { 0x0014009b, 0x00000008 }, | ||
| 1485 | { 0x4000e000, 0000000000 }, | ||
| 1486 | { 0x02400000, 0x00000004 }, | ||
| 1487 | { 0x400ee000, 0x00000004 }, | ||
| 1488 | { 0x02400000, 0x00000004 }, | ||
| 1489 | { 0x4000e000, 0000000000 }, | ||
| 1490 | { 0x00100000, 0x0000002c }, | ||
| 1491 | { 0x00004000, 0000000000 }, | ||
| 1492 | { 0x080045c8, 0x00000004 }, | ||
| 1493 | { 0x00240005, 0x00000004 }, | ||
| 1494 | { 0x08004d0b, 0x00000004 }, | ||
| 1495 | { 0x000c2000, 0x00000004 }, | ||
| 1496 | { 0x0240e51b, 0x00000004 }, | ||
| 1497 | { 0x0080e50a, 0x00000005 }, | ||
| 1498 | { 0x0080e50b, 0x00000005 }, | ||
| 1499 | { 0x00220000, 0x00000004 }, | ||
| 1500 | { 0x000700cb, 0x00000004 }, | ||
| 1501 | { 0x000000b7, 0x00000038 }, | ||
| 1502 | { 0x000c2087, 0x00000030 }, | ||
| 1503 | { 0x0880e5bd, 0x00000005 }, | ||
| 1504 | { 0x000c2086, 0x00000030 }, | ||
| 1505 | { 0x0800e5bb, 0x00000005 }, | ||
| 1506 | { 0x000c2087, 0x00000030 }, | ||
| 1507 | { 0x0880e5bc, 0x00000005 }, | ||
| 1508 | { 0x000000ba, 0x00000008 }, | ||
| 1509 | { 0x0080e5bd, 0x00000005 }, | ||
| 1510 | { 0x0000e5bb, 0x00000005 }, | ||
| 1511 | { 0x0080e5bc, 0x00000005 }, | ||
| 1512 | { 0x00210000, 0x00000004 }, | ||
| 1513 | { 0x02800000, 0x00000004 }, | ||
| 1514 | { 0x00c000be, 0x00000018 }, | ||
| 1515 | { 0x4180e000, 0x00000040 }, | ||
| 1516 | { 0x000000c0, 0x00000024 }, | ||
| 1517 | { 0x01000000, 0x0000000c }, | ||
| 1518 | { 0x0100e51d, 0x0000000c }, | ||
| 1519 | { 0x000045bb, 0x00000004 }, | ||
| 1520 | { 0x000080ba, 0x00000008 }, | ||
| 1521 | { 0x03c00830, 0x00000004 }, | ||
| 1522 | { 0x4200e000, 0000000000 }, | ||
| 1523 | { 0x0000a000, 0x00000004 }, | ||
| 1524 | { 0x200045e0, 0x00000004 }, | ||
| 1525 | { 0x0000e5e1, 0000000000 }, | ||
| 1526 | { 0x00000001, 0000000000 }, | ||
| 1527 | { 0x000700c8, 0x00000004 }, | ||
| 1528 | { 0x0800e394, 0000000000 }, | ||
| 1529 | { 0000000000, 0000000000 }, | ||
| 1530 | { 0x0000e8c4, 0x00000004 }, | ||
| 1531 | { 0x0000e8c5, 0x00000004 }, | ||
| 1532 | { 0x0000e8c6, 0x00000004 }, | ||
| 1533 | { 0x0000e928, 0x00000004 }, | ||
| 1534 | { 0x0000e929, 0x00000004 }, | ||
| 1535 | { 0x0000e92a, 0x00000004 }, | ||
| 1536 | { 0x000000cc, 0x00000008 }, | ||
| 1537 | { 0x0000e928, 0x00000004 }, | ||
| 1538 | { 0x0000e929, 0x00000004 }, | ||
| 1539 | { 0x0000e92a, 0x00000004 }, | ||
| 1540 | { 0x000000d3, 0x00000008 }, | ||
| 1541 | { 0x02c02000, 0x00000004 }, | ||
| 1542 | { 0x00060000, 0x00000004 }, | ||
| 1543 | { 0x000000db, 0x00000034 }, | ||
| 1544 | { 0x000000d8, 0x00000008 }, | ||
| 1545 | { 0x00008000, 0x00000004 }, | ||
| 1546 | { 0xc000e000, 0000000000 }, | ||
| 1547 | { 0x000000e1, 0x00000030 }, | ||
| 1548 | { 0x4200e000, 0000000000 }, | ||
| 1549 | { 0x000000e1, 0x00000030 }, | ||
| 1550 | { 0x4000e000, 0000000000 }, | ||
| 1551 | { 0x0025001b, 0x00000004 }, | ||
| 1552 | { 0x00230000, 0x00000004 }, | ||
| 1553 | { 0x00250005, 0x00000004 }, | ||
| 1554 | { 0x000000e6, 0x00000034 }, | ||
| 1555 | { 0000000000, 0x0000000c }, | ||
| 1556 | { 0x00244000, 0x00000004 }, | ||
| 1557 | { 0x080045c8, 0x00000004 }, | ||
| 1558 | { 0x00240005, 0x00000004 }, | ||
| 1559 | { 0x08004d0b, 0x0000000c }, | ||
| 1560 | { 0000000000, 0000000000 }, | ||
| 1561 | { 0000000000, 0000000000 }, | ||
| 1562 | { 0000000000, 0000000000 }, | ||
| 1563 | { 0000000000, 0000000000 }, | ||
| 1564 | { 0000000000, 0000000000 }, | ||
| 1565 | { 0000000000, 0000000000 }, | ||
| 1566 | { 0000000000, 0000000000 }, | ||
| 1567 | { 0000000000, 0000000000 }, | ||
| 1568 | { 0000000000, 0000000000 }, | ||
| 1569 | { 0000000000, 0000000000 }, | ||
| 1570 | { 0000000000, 0000000000 }, | ||
| 1571 | { 0000000000, 0000000000 }, | ||
| 1572 | { 0x000c2000, 0x00000004 }, | ||
| 1573 | { 0x001d0018, 0x00000004 }, | ||
| 1574 | { 0x001a0001, 0x00000004 }, | ||
| 1575 | { 0x000000fb, 0x00000034 }, | ||
| 1576 | { 0x0000004a, 0x00000008 }, | ||
| 1577 | { 0x0500a04a, 0x00000008 }, | ||
| 1578 | { 0000000000, 0000000000 }, | ||
| 1579 | { 0000000000, 0000000000 }, | ||
| 1580 | { 0000000000, 0000000000 }, | ||
| 1581 | { 0000000000, 0000000000 }, | ||
| 1582 | }; | ||
| 1583 | |||
| 1584 | static const u32 R520_cp_microcode[][2] = { | ||
| 1585 | { 0x4200e000, 0000000000 }, | ||
| 1586 | { 0x4000e000, 0000000000 }, | ||
| 1587 | { 0x00000099, 0x00000008 }, | ||
| 1588 | { 0x0000009d, 0x00000008 }, | ||
| 1589 | { 0x4a554b4a, 0000000000 }, | ||
| 1590 | { 0x4a4a4467, 0000000000 }, | ||
| 1591 | { 0x55526f75, 0000000000 }, | ||
| 1592 | { 0x4a7e7d65, 0000000000 }, | ||
| 1593 | { 0xe0dae6f6, 0000000000 }, | ||
| 1594 | { 0x4ac54a4a, 0000000000 }, | ||
| 1595 | { 0xc8828282, 0000000000 }, | ||
| 1596 | { 0xbf4acfc1, 0000000000 }, | ||
| 1597 | { 0x87b04ad5, 0000000000 }, | ||
| 1598 | { 0xb5838383, 0000000000 }, | ||
| 1599 | { 0x4a0f85ba, 0000000000 }, | ||
| 1600 | { 0x000ca000, 0x00000004 }, | ||
| 1601 | { 0x000d0012, 0x00000038 }, | ||
| 1602 | { 0x0000e8b4, 0x00000004 }, | ||
| 1603 | { 0x000d0014, 0x00000038 }, | ||
| 1604 | { 0x0000e8b6, 0x00000004 }, | ||
| 1605 | { 0x000d0016, 0x00000038 }, | ||
| 1606 | { 0x0000e854, 0x00000004 }, | ||
| 1607 | { 0x000d0018, 0x00000038 }, | ||
| 1608 | { 0x0000e855, 0x00000004 }, | ||
| 1609 | { 0x000d001a, 0x00000038 }, | ||
| 1610 | { 0x0000e856, 0x00000004 }, | ||
| 1611 | { 0x000d001c, 0x00000038 }, | ||
| 1612 | { 0x0000e857, 0x00000004 }, | ||
| 1613 | { 0x000d001e, 0x00000038 }, | ||
| 1614 | { 0x0000e824, 0x00000004 }, | ||
| 1615 | { 0x000d0020, 0x00000038 }, | ||
| 1616 | { 0x0000e825, 0x00000004 }, | ||
| 1617 | { 0x000d0022, 0x00000038 }, | ||
| 1618 | { 0x0000e830, 0x00000004 }, | ||
| 1619 | { 0x000d0024, 0x00000038 }, | ||
| 1620 | { 0x0000f0c0, 0x00000004 }, | ||
| 1621 | { 0x000d0026, 0x00000038 }, | ||
| 1622 | { 0x0000f0c1, 0x00000004 }, | ||
| 1623 | { 0x000d0028, 0x00000038 }, | ||
| 1624 | { 0x0000e000, 0x00000004 }, | ||
| 1625 | { 0x000d002a, 0x00000038 }, | ||
| 1626 | { 0x0000e000, 0x00000004 }, | ||
| 1627 | { 0x000d002c, 0x00000038 }, | ||
| 1628 | { 0x0000e000, 0x00000004 }, | ||
| 1629 | { 0x000d002e, 0x00000038 }, | ||
| 1630 | { 0x0000e000, 0x00000004 }, | ||
| 1631 | { 0x000d0030, 0x00000038 }, | ||
| 1632 | { 0x0000e000, 0x00000004 }, | ||
| 1633 | { 0x000d0032, 0x00000038 }, | ||
| 1634 | { 0x0000f180, 0x00000004 }, | ||
| 1635 | { 0x000d0034, 0x00000038 }, | ||
| 1636 | { 0x0000f393, 0x00000004 }, | ||
| 1637 | { 0x000d0036, 0x00000038 }, | ||
| 1638 | { 0x0000f38a, 0x00000004 }, | ||
| 1639 | { 0x000d0038, 0x00000038 }, | ||
| 1640 | { 0x0000f38e, 0x00000004 }, | ||
| 1641 | { 0x0000e821, 0x00000004 }, | ||
| 1642 | { 0x0140a000, 0x00000004 }, | ||
| 1643 | { 0x00000043, 0x00000018 }, | ||
| 1644 | { 0x00cce800, 0x00000004 }, | ||
| 1645 | { 0x001b0001, 0x00000004 }, | ||
| 1646 | { 0x08004800, 0x00000004 }, | ||
| 1647 | { 0x001b0001, 0x00000004 }, | ||
| 1648 | { 0x08004800, 0x00000004 }, | ||
| 1649 | { 0x001b0001, 0x00000004 }, | ||
| 1650 | { 0x08004800, 0x00000004 }, | ||
| 1651 | { 0x0000003a, 0x00000008 }, | ||
| 1652 | { 0x0000a000, 0000000000 }, | ||
| 1653 | { 0x2000451d, 0x00000004 }, | ||
| 1654 | { 0x0000e580, 0x00000004 }, | ||
| 1655 | { 0x000ce581, 0x00000004 }, | ||
| 1656 | { 0x08004580, 0x00000004 }, | ||
| 1657 | { 0x000ce581, 0x00000004 }, | ||
| 1658 | { 0x00000047, 0x00000008 }, | ||
| 1659 | { 0x0000a000, 0000000000 }, | ||
| 1660 | { 0x000c2000, 0x00000004 }, | ||
| 1661 | { 0x0000e50e, 0x00000004 }, | ||
| 1662 | { 0x00032000, 0x00000004 }, | ||
| 1663 | { 0x00022051, 0x00000028 }, | ||
| 1664 | { 0x00000051, 0x00000024 }, | ||
| 1665 | { 0x0800450f, 0x00000004 }, | ||
| 1666 | { 0x0000a04b, 0x00000008 }, | ||
| 1667 | { 0x0000e565, 0x00000004 }, | ||
| 1668 | { 0x0000e566, 0x00000004 }, | ||
| 1669 | { 0x00000052, 0x00000008 }, | ||
| 1670 | { 0x03cca5b4, 0x00000004 }, | ||
| 1671 | { 0x05432000, 0x00000004 }, | ||
| 1672 | { 0x00022000, 0x00000004 }, | ||
| 1673 | { 0x4ccce05e, 0x00000030 }, | ||
| 1674 | { 0x08274565, 0x00000004 }, | ||
| 1675 | { 0x0000005e, 0x00000030 }, | ||
| 1676 | { 0x08004564, 0x00000004 }, | ||
| 1677 | { 0x0000e566, 0x00000004 }, | ||
| 1678 | { 0x00000055, 0x00000008 }, | ||
| 1679 | { 0x00802061, 0x00000010 }, | ||
| 1680 | { 0x00202000, 0x00000004 }, | ||
| 1681 | { 0x001b00ff, 0x00000004 }, | ||
| 1682 | { 0x01000064, 0x00000010 }, | ||
| 1683 | { 0x001f2000, 0x00000004 }, | ||
| 1684 | { 0x001c00ff, 0x00000004 }, | ||
| 1685 | { 0000000000, 0x0000000c }, | ||
| 1686 | { 0x00000072, 0x00000030 }, | ||
| 1687 | { 0x00000055, 0x00000008 }, | ||
| 1688 | { 0x0000e576, 0x00000004 }, | ||
| 1689 | { 0x0000e577, 0x00000004 }, | ||
| 1690 | { 0x0000e50e, 0x00000004 }, | ||
| 1691 | { 0x0000e50f, 0x00000004 }, | ||
| 1692 | { 0x0140a000, 0x00000004 }, | ||
| 1693 | { 0x00000069, 0x00000018 }, | ||
| 1694 | { 0x00c0e5f9, 0x000000c2 }, | ||
| 1695 | { 0x00000069, 0x00000008 }, | ||
| 1696 | { 0x0014e50e, 0x00000004 }, | ||
| 1697 | { 0x0040e50f, 0x00000004 }, | ||
| 1698 | { 0x00c0006c, 0x00000008 }, | ||
| 1699 | { 0x0000e570, 0x00000004 }, | ||
| 1700 | { 0x0000e571, 0x00000004 }, | ||
| 1701 | { 0x0000e572, 0x0000000c }, | ||
| 1702 | { 0x0000a000, 0x00000004 }, | ||
| 1703 | { 0x0140a000, 0x00000004 }, | ||
| 1704 | { 0x0000e568, 0x00000004 }, | ||
| 1705 | { 0x000c2000, 0x00000004 }, | ||
| 1706 | { 0x00000076, 0x00000018 }, | ||
| 1707 | { 0x000b0000, 0x00000004 }, | ||
| 1708 | { 0x18c0e562, 0x00000004 }, | ||
| 1709 | { 0x00000078, 0x00000008 }, | ||
| 1710 | { 0x00c00077, 0x00000008 }, | ||
| 1711 | { 0x000700c7, 0x00000004 }, | ||
| 1712 | { 0x00000080, 0x00000038 }, | ||
| 1713 | { 0x0000e5bb, 0x00000004 }, | ||
| 1714 | { 0x0000e5bc, 0000000000 }, | ||
| 1715 | { 0x0000a000, 0x00000004 }, | ||
| 1716 | { 0x0000e821, 0x00000004 }, | ||
| 1717 | { 0x0000e800, 0000000000 }, | ||
| 1718 | { 0x0000e821, 0x00000004 }, | ||
| 1719 | { 0x0000e82e, 0000000000 }, | ||
| 1720 | { 0x02cca000, 0x00000004 }, | ||
| 1721 | { 0x00140000, 0x00000004 }, | ||
| 1722 | { 0x000ce1cc, 0x00000004 }, | ||
| 1723 | { 0x050de1cd, 0x00000004 }, | ||
| 1724 | { 0x00400000, 0x00000004 }, | ||
| 1725 | { 0x0000008f, 0x00000018 }, | ||
| 1726 | { 0x00c0a000, 0x00000004 }, | ||
| 1727 | { 0x0000008c, 0x00000008 }, | ||
| 1728 | { 0x00000091, 0x00000020 }, | ||
| 1729 | { 0x4200e000, 0000000000 }, | ||
| 1730 | { 0x00000098, 0x00000038 }, | ||
| 1731 | { 0x000ca000, 0x00000004 }, | ||
| 1732 | { 0x00140000, 0x00000004 }, | ||
| 1733 | { 0x000c2000, 0x00000004 }, | ||
| 1734 | { 0x00160000, 0x00000004 }, | ||
| 1735 | { 0x700ce000, 0x00000004 }, | ||
| 1736 | { 0x00140094, 0x00000008 }, | ||
| 1737 | { 0x4000e000, 0000000000 }, | ||
| 1738 | { 0x02400000, 0x00000004 }, | ||
| 1739 | { 0x400ee000, 0x00000004 }, | ||
| 1740 | { 0x02400000, 0x00000004 }, | ||
| 1741 | { 0x4000e000, 0000000000 }, | ||
| 1742 | { 0x000c2000, 0x00000004 }, | ||
| 1743 | { 0x0240e51b, 0x00000004 }, | ||
| 1744 | { 0x0080e50a, 0x00000005 }, | ||
| 1745 | { 0x0080e50b, 0x00000005 }, | ||
| 1746 | { 0x00220000, 0x00000004 }, | ||
| 1747 | { 0x000700c7, 0x00000004 }, | ||
| 1748 | { 0x000000a4, 0x00000038 }, | ||
| 1749 | { 0x0080e5bd, 0x00000005 }, | ||
| 1750 | { 0x0000e5bb, 0x00000005 }, | ||
| 1751 | { 0x0080e5bc, 0x00000005 }, | ||
| 1752 | { 0x00210000, 0x00000004 }, | ||
| 1753 | { 0x02800000, 0x00000004 }, | ||
| 1754 | { 0x00c000ab, 0x00000018 }, | ||
| 1755 | { 0x4180e000, 0x00000040 }, | ||
| 1756 | { 0x000000ad, 0x00000024 }, | ||
| 1757 | { 0x01000000, 0x0000000c }, | ||
| 1758 | { 0x0100e51d, 0x0000000c }, | ||
| 1759 | { 0x000045bb, 0x00000004 }, | ||
| 1760 | { 0x000080a7, 0x00000008 }, | ||
| 1761 | { 0x0000f3ce, 0x00000004 }, | ||
| 1762 | { 0x0140a000, 0x00000004 }, | ||
| 1763 | { 0x00cc2000, 0x00000004 }, | ||
| 1764 | { 0x08c053cf, 0x00000040 }, | ||
| 1765 | { 0x00008000, 0000000000 }, | ||
| 1766 | { 0x0000f3d2, 0x00000004 }, | ||
| 1767 | { 0x0140a000, 0x00000004 }, | ||
| 1768 | { 0x00cc2000, 0x00000004 }, | ||
| 1769 | { 0x08c053d3, 0x00000040 }, | ||
| 1770 | { 0x00008000, 0000000000 }, | ||
| 1771 | { 0x0000f39d, 0x00000004 }, | ||
| 1772 | { 0x0140a000, 0x00000004 }, | ||
| 1773 | { 0x00cc2000, 0x00000004 }, | ||
| 1774 | { 0x08c0539e, 0x00000040 }, | ||
| 1775 | { 0x00008000, 0000000000 }, | ||
| 1776 | { 0x03c00830, 0x00000004 }, | ||
| 1777 | { 0x4200e000, 0000000000 }, | ||
| 1778 | { 0x0000a000, 0x00000004 }, | ||
| 1779 | { 0x200045e0, 0x00000004 }, | ||
| 1780 | { 0x0000e5e1, 0000000000 }, | ||
| 1781 | { 0x00000001, 0000000000 }, | ||
| 1782 | { 0x000700c4, 0x00000004 }, | ||
| 1783 | { 0x0800e394, 0000000000 }, | ||
| 1784 | { 0000000000, 0000000000 }, | ||
| 1785 | { 0x0000e8c4, 0x00000004 }, | ||
| 1786 | { 0x0000e8c5, 0x00000004 }, | ||
| 1787 | { 0x0000e8c6, 0x00000004 }, | ||
| 1788 | { 0x0000e928, 0x00000004 }, | ||
| 1789 | { 0x0000e929, 0x00000004 }, | ||
| 1790 | { 0x0000e92a, 0x00000004 }, | ||
| 1791 | { 0x000000c8, 0x00000008 }, | ||
| 1792 | { 0x0000e928, 0x00000004 }, | ||
| 1793 | { 0x0000e929, 0x00000004 }, | ||
| 1794 | { 0x0000e92a, 0x00000004 }, | ||
| 1795 | { 0x000000cf, 0x00000008 }, | ||
| 1796 | { 0xdeadbeef, 0000000000 }, | ||
| 1797 | { 0x00000116, 0000000000 }, | ||
| 1798 | { 0x000700d3, 0x00000004 }, | ||
| 1799 | { 0x080050e7, 0x00000004 }, | ||
| 1800 | { 0x000700d4, 0x00000004 }, | ||
| 1801 | { 0x0800401c, 0x00000004 }, | ||
| 1802 | { 0x0000e01d, 0000000000 }, | ||
| 1803 | { 0x02c02000, 0x00000004 }, | ||
| 1804 | { 0x00060000, 0x00000004 }, | ||
| 1805 | { 0x000000de, 0x00000034 }, | ||
| 1806 | { 0x000000db, 0x00000008 }, | ||
| 1807 | { 0x00008000, 0x00000004 }, | ||
| 1808 | { 0xc000e000, 0000000000 }, | ||
| 1809 | { 0x0000e1cc, 0x00000004 }, | ||
| 1810 | { 0x0500e1cd, 0x00000004 }, | ||
| 1811 | { 0x000ca000, 0x00000004 }, | ||
| 1812 | { 0x000000e5, 0x00000034 }, | ||
| 1813 | { 0x000000e1, 0x00000008 }, | ||
| 1814 | { 0x0000a000, 0000000000 }, | ||
| 1815 | { 0x0019e1cc, 0x00000004 }, | ||
| 1816 | { 0x001b0001, 0x00000004 }, | ||
| 1817 | { 0x0500a000, 0x00000004 }, | ||
| 1818 | { 0x080041cd, 0x00000004 }, | ||
| 1819 | { 0x000ca000, 0x00000004 }, | ||
| 1820 | { 0x000000fb, 0x00000034 }, | ||
| 1821 | { 0x0000004a, 0x00000008 }, | ||
| 1822 | { 0000000000, 0000000000 }, | ||
| 1823 | { 0000000000, 0000000000 }, | ||
| 1824 | { 0000000000, 0000000000 }, | ||
| 1825 | { 0000000000, 0000000000 }, | ||
| 1826 | { 0000000000, 0000000000 }, | ||
| 1827 | { 0000000000, 0000000000 }, | ||
| 1828 | { 0000000000, 0000000000 }, | ||
| 1829 | { 0000000000, 0000000000 }, | ||
| 1830 | { 0000000000, 0000000000 }, | ||
| 1831 | { 0x000c2000, 0x00000004 }, | ||
| 1832 | { 0x001d0018, 0x00000004 }, | ||
| 1833 | { 0x001a0001, 0x00000004 }, | ||
| 1834 | { 0x000000fb, 0x00000034 }, | ||
| 1835 | { 0x0000004a, 0x00000008 }, | ||
| 1836 | { 0x0500a04a, 0x00000008 }, | ||
| 1837 | { 0000000000, 0000000000 }, | ||
| 1838 | { 0000000000, 0000000000 }, | ||
| 1839 | { 0000000000, 0000000000 }, | ||
| 1840 | { 0000000000, 0000000000 }, | ||
| 1841 | }; | ||
| 1842 | |||
| 1843 | |||
| 1844 | #endif | ||
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index 6f75512f591e..11c146b49211 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c | |||
| @@ -1662,7 +1662,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev, | |||
| 1662 | u32 height; | 1662 | u32 height; |
| 1663 | int i; | 1663 | int i; |
| 1664 | u32 texpitch, microtile; | 1664 | u32 texpitch, microtile; |
| 1665 | u32 offset; | 1665 | u32 offset, byte_offset; |
| 1666 | RING_LOCALS; | 1666 | RING_LOCALS; |
| 1667 | 1667 | ||
| 1668 | if (radeon_check_and_fixup_offset(dev_priv, file_priv, &tex->offset)) { | 1668 | if (radeon_check_and_fixup_offset(dev_priv, file_priv, &tex->offset)) { |
| @@ -1727,6 +1727,13 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev, | |||
| 1727 | } else | 1727 | } else |
| 1728 | microtile = 0; | 1728 | microtile = 0; |
| 1729 | 1729 | ||
| 1730 | /* this might fail for zero-sized uploads - are those illegal? */ | ||
| 1731 | if (!radeon_check_offset(dev_priv, tex->offset + image->height * | ||
| 1732 | blit_width - 1)) { | ||
| 1733 | DRM_ERROR("Invalid final destination offset\n"); | ||
| 1734 | return -EINVAL; | ||
| 1735 | } | ||
| 1736 | |||
| 1730 | DRM_DEBUG("tex=%dx%d blit=%d\n", tex_width, tex->height, blit_width); | 1737 | DRM_DEBUG("tex=%dx%d blit=%d\n", tex_width, tex->height, blit_width); |
| 1731 | 1738 | ||
| 1732 | do { | 1739 | do { |
| @@ -1840,6 +1847,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev, | |||
| 1840 | } | 1847 | } |
| 1841 | 1848 | ||
| 1842 | #undef RADEON_COPY_MT | 1849 | #undef RADEON_COPY_MT |
| 1850 | byte_offset = (image->y & ~2047) * blit_width; | ||
| 1843 | buf->file_priv = file_priv; | 1851 | buf->file_priv = file_priv; |
| 1844 | buf->used = size; | 1852 | buf->used = size; |
| 1845 | offset = dev_priv->gart_buffers_offset + buf->offset; | 1853 | offset = dev_priv->gart_buffers_offset + buf->offset; |
| @@ -1854,9 +1862,9 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev, | |||
| 1854 | RADEON_DP_SRC_SOURCE_MEMORY | | 1862 | RADEON_DP_SRC_SOURCE_MEMORY | |
| 1855 | RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS); | 1863 | RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS); |
| 1856 | OUT_RING((spitch << 22) | (offset >> 10)); | 1864 | OUT_RING((spitch << 22) | (offset >> 10)); |
| 1857 | OUT_RING((texpitch << 22) | (tex->offset >> 10)); | 1865 | OUT_RING((texpitch << 22) | ((tex->offset >> 10) + (byte_offset >> 10))); |
| 1858 | OUT_RING(0); | 1866 | OUT_RING(0); |
| 1859 | OUT_RING((image->x << 16) | image->y); | 1867 | OUT_RING((image->x << 16) | (image->y % 2048)); |
| 1860 | OUT_RING((image->width << 16) | height); | 1868 | OUT_RING((image->width << 16) | height); |
| 1861 | RADEON_WAIT_UNTIL_2D_IDLE(); | 1869 | RADEON_WAIT_UNTIL_2D_IDLE(); |
| 1862 | ADVANCE_RING(); | 1870 | ADVANCE_RING(); |
| @@ -3037,6 +3045,9 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil | |||
| 3037 | case RADEON_PARAM_FB_LOCATION: | 3045 | case RADEON_PARAM_FB_LOCATION: |
| 3038 | value = radeon_read_fb_location(dev_priv); | 3046 | value = radeon_read_fb_location(dev_priv); |
| 3039 | break; | 3047 | break; |
| 3048 | case RADEON_PARAM_NUM_GB_PIPES: | ||
| 3049 | value = dev_priv->num_gb_pipes; | ||
| 3050 | break; | ||
| 3040 | default: | 3051 | default: |
| 3041 | DRM_DEBUG("Invalid parameter %d\n", param->param); | 3052 | DRM_DEBUG("Invalid parameter %d\n", param->param); |
| 3042 | return -EINVAL; | 3053 | return -EINVAL; |
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index b1a757a5ee27..8f81139d6194 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
| @@ -981,16 +981,9 @@ EXPORT_SYMBOL_GPL(tty_perform_flush); | |||
| 981 | int n_tty_ioctl(struct tty_struct *tty, struct file *file, | 981 | int n_tty_ioctl(struct tty_struct *tty, struct file *file, |
| 982 | unsigned int cmd, unsigned long arg) | 982 | unsigned int cmd, unsigned long arg) |
| 983 | { | 983 | { |
| 984 | struct tty_struct *real_tty; | ||
| 985 | unsigned long flags; | 984 | unsigned long flags; |
| 986 | int retval; | 985 | int retval; |
| 987 | 986 | ||
| 988 | if (tty->driver->type == TTY_DRIVER_TYPE_PTY && | ||
| 989 | tty->driver->subtype == PTY_TYPE_MASTER) | ||
| 990 | real_tty = tty->link; | ||
| 991 | else | ||
| 992 | real_tty = tty; | ||
| 993 | |||
| 994 | switch (cmd) { | 987 | switch (cmd) { |
| 995 | case TCXONC: | 988 | case TCXONC: |
| 996 | retval = tty_check_change(tty); | 989 | retval = tty_check_change(tty); |
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index fb4d391810b6..76f26710fc16 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig | |||
| @@ -1,28 +1,26 @@ | |||
| 1 | comment "An alternative FireWire stack is available with EXPERIMENTAL=y" | 1 | comment "A new alternative FireWire stack is available with EXPERIMENTAL=y" |
| 2 | depends on EXPERIMENTAL=n | 2 | depends on EXPERIMENTAL=n |
| 3 | 3 | ||
| 4 | comment "Enable only one of the two stacks, unless you know what you are doing" | ||
| 5 | depends on EXPERIMENTAL | ||
| 6 | |||
| 4 | config FIREWIRE | 7 | config FIREWIRE |
| 5 | tristate "IEEE 1394 (FireWire) support - alternative stack, EXPERIMENTAL" | 8 | tristate "New FireWire stack, EXPERIMENTAL" |
| 6 | depends on EXPERIMENTAL | 9 | depends on EXPERIMENTAL |
| 7 | select CRC_ITU_T | 10 | select CRC_ITU_T |
| 8 | help | 11 | help |
| 9 | This is the "Juju" FireWire stack, a new alternative implementation | 12 | This is the "Juju" FireWire stack, a new alternative implementation |
| 10 | designed for robustness and simplicity. You can build either this | 13 | designed for robustness and simplicity. You can build either this |
| 11 | stack, or the classic stack (the ieee1394 driver, ohci1394 etc.) | 14 | stack, or the old stack (the ieee1394 driver, ohci1394 etc.) or both. |
| 12 | or both. Please read http://wiki.linux1394.org/JujuMigration before | 15 | Please read http://wiki.linux1394.org/JujuMigration before you |
| 13 | you enable the new stack. | 16 | enable the new stack. |
| 14 | 17 | ||
| 15 | To compile this driver as a module, say M here: the module will be | 18 | To compile this driver as a module, say M here: the module will be |
| 16 | called firewire-core. It functionally replaces ieee1394, raw1394, | 19 | called firewire-core. It functionally replaces ieee1394, raw1394, |
| 17 | and video1394. | 20 | and video1394. |
| 18 | 21 | ||
| 19 | NOTE: | ||
| 20 | |||
| 21 | You should only build ONE of the stacks, unless you REALLY know what | ||
| 22 | you are doing. | ||
| 23 | |||
| 24 | config FIREWIRE_OHCI | 22 | config FIREWIRE_OHCI |
| 25 | tristate "Support for OHCI FireWire host controllers" | 23 | tristate "OHCI-1394 controllers" |
| 26 | depends on PCI && FIREWIRE | 24 | depends on PCI && FIREWIRE |
| 27 | help | 25 | help |
| 28 | Enable this driver if you have a FireWire controller based | 26 | Enable this driver if you have a FireWire controller based |
| @@ -33,12 +31,12 @@ config FIREWIRE_OHCI | |||
| 33 | called firewire-ohci. It replaces ohci1394 of the classic IEEE 1394 | 31 | called firewire-ohci. It replaces ohci1394 of the classic IEEE 1394 |
| 34 | stack. | 32 | stack. |
| 35 | 33 | ||
| 36 | NOTE: | 34 | NOTE: |
| 37 | 35 | ||
| 38 | You should only build ohci1394 or firewire-ohci, but not both. | 36 | You should only build either firewire-ohci or the old ohci1394 driver, |
| 39 | If you nevertheless want to install both, you should configure them | 37 | but not both. If you nevertheless want to install both, you should |
| 40 | only as modules and blacklist the driver(s) which you don't want to | 38 | configure them only as modules and blacklist the driver(s) which you |
| 41 | have auto-loaded. Add either | 39 | don't want to have auto-loaded. Add either |
| 42 | 40 | ||
| 43 | blacklist firewire-ohci | 41 | blacklist firewire-ohci |
| 44 | or | 42 | or |
| @@ -60,7 +58,7 @@ config FIREWIRE_OHCI_DEBUG | |||
| 60 | default y | 58 | default y |
| 61 | 59 | ||
| 62 | config FIREWIRE_SBP2 | 60 | config FIREWIRE_SBP2 |
| 63 | tristate "Support for storage devices (SBP-2 protocol driver)" | 61 | tristate "Storage devices (SBP-2 protocol)" |
| 64 | depends on FIREWIRE && SCSI | 62 | depends on FIREWIRE && SCSI |
| 65 | help | 63 | help |
| 66 | This option enables you to use SBP-2 devices connected to a | 64 | This option enables you to use SBP-2 devices connected to a |
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c index dda14015e873..c639915fc3cb 100644 --- a/drivers/firewire/fw-cdev.c +++ b/drivers/firewire/fw-cdev.c | |||
| @@ -205,6 +205,7 @@ fw_device_op_read(struct file *file, | |||
| 205 | return dequeue_event(client, buffer, count); | 205 | return dequeue_event(client, buffer, count); |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | /* caller must hold card->lock so that node pointers can be dereferenced here */ | ||
| 208 | static void | 209 | static void |
| 209 | fill_bus_reset_event(struct fw_cdev_event_bus_reset *event, | 210 | fill_bus_reset_event(struct fw_cdev_event_bus_reset *event, |
| 210 | struct client *client) | 211 | struct client *client) |
| @@ -214,7 +215,6 @@ fill_bus_reset_event(struct fw_cdev_event_bus_reset *event, | |||
| 214 | event->closure = client->bus_reset_closure; | 215 | event->closure = client->bus_reset_closure; |
| 215 | event->type = FW_CDEV_EVENT_BUS_RESET; | 216 | event->type = FW_CDEV_EVENT_BUS_RESET; |
| 216 | event->generation = client->device->generation; | 217 | event->generation = client->device->generation; |
| 217 | smp_rmb(); /* node_id must not be older than generation */ | ||
| 218 | event->node_id = client->device->node_id; | 218 | event->node_id = client->device->node_id; |
| 219 | event->local_node_id = card->local_node->node_id; | 219 | event->local_node_id = card->local_node->node_id; |
| 220 | event->bm_node_id = 0; /* FIXME: We don't track the BM. */ | 220 | event->bm_node_id = 0; /* FIXME: We don't track the BM. */ |
| @@ -274,6 +274,7 @@ static int ioctl_get_info(struct client *client, void *buffer) | |||
| 274 | { | 274 | { |
| 275 | struct fw_cdev_get_info *get_info = buffer; | 275 | struct fw_cdev_get_info *get_info = buffer; |
| 276 | struct fw_cdev_event_bus_reset bus_reset; | 276 | struct fw_cdev_event_bus_reset bus_reset; |
| 277 | struct fw_card *card = client->device->card; | ||
| 277 | unsigned long ret = 0; | 278 | unsigned long ret = 0; |
| 278 | 279 | ||
| 279 | client->version = get_info->version; | 280 | client->version = get_info->version; |
| @@ -299,13 +300,17 @@ static int ioctl_get_info(struct client *client, void *buffer) | |||
| 299 | client->bus_reset_closure = get_info->bus_reset_closure; | 300 | client->bus_reset_closure = get_info->bus_reset_closure; |
| 300 | if (get_info->bus_reset != 0) { | 301 | if (get_info->bus_reset != 0) { |
| 301 | void __user *uptr = u64_to_uptr(get_info->bus_reset); | 302 | void __user *uptr = u64_to_uptr(get_info->bus_reset); |
| 303 | unsigned long flags; | ||
| 302 | 304 | ||
| 305 | spin_lock_irqsave(&card->lock, flags); | ||
| 303 | fill_bus_reset_event(&bus_reset, client); | 306 | fill_bus_reset_event(&bus_reset, client); |
| 307 | spin_unlock_irqrestore(&card->lock, flags); | ||
| 308 | |||
| 304 | if (copy_to_user(uptr, &bus_reset, sizeof(bus_reset))) | 309 | if (copy_to_user(uptr, &bus_reset, sizeof(bus_reset))) |
| 305 | return -EFAULT; | 310 | return -EFAULT; |
| 306 | } | 311 | } |
| 307 | 312 | ||
| 308 | get_info->card = client->device->card->index; | 313 | get_info->card = card->index; |
| 309 | 314 | ||
| 310 | return 0; | 315 | return 0; |
| 311 | } | 316 | } |
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 4f02c55f13e1..0b66306af479 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
| @@ -265,27 +265,25 @@ static void log_irqs(u32 evt) | |||
| 265 | !(evt & OHCI1394_busReset)) | 265 | !(evt & OHCI1394_busReset)) |
| 266 | return; | 266 | return; |
| 267 | 267 | ||
| 268 | printk(KERN_DEBUG KBUILD_MODNAME ": IRQ " | 268 | fw_notify("IRQ %08x%s%s%s%s%s%s%s%s%s%s%s%s%s\n", evt, |
| 269 | "%08x%s%s%s%s%s%s%s%s%s%s%s%s%s\n", | 269 | evt & OHCI1394_selfIDComplete ? " selfID" : "", |
| 270 | evt, | 270 | evt & OHCI1394_RQPkt ? " AR_req" : "", |
| 271 | evt & OHCI1394_selfIDComplete ? " selfID" : "", | 271 | evt & OHCI1394_RSPkt ? " AR_resp" : "", |
| 272 | evt & OHCI1394_RQPkt ? " AR_req" : "", | 272 | evt & OHCI1394_reqTxComplete ? " AT_req" : "", |
| 273 | evt & OHCI1394_RSPkt ? " AR_resp" : "", | 273 | evt & OHCI1394_respTxComplete ? " AT_resp" : "", |
| 274 | evt & OHCI1394_reqTxComplete ? " AT_req" : "", | 274 | evt & OHCI1394_isochRx ? " IR" : "", |
| 275 | evt & OHCI1394_respTxComplete ? " AT_resp" : "", | 275 | evt & OHCI1394_isochTx ? " IT" : "", |
| 276 | evt & OHCI1394_isochRx ? " IR" : "", | 276 | evt & OHCI1394_postedWriteErr ? " postedWriteErr" : "", |
| 277 | evt & OHCI1394_isochTx ? " IT" : "", | 277 | evt & OHCI1394_cycleTooLong ? " cycleTooLong" : "", |
| 278 | evt & OHCI1394_postedWriteErr ? " postedWriteErr" : "", | 278 | evt & OHCI1394_cycle64Seconds ? " cycle64Seconds" : "", |
| 279 | evt & OHCI1394_cycleTooLong ? " cycleTooLong" : "", | 279 | evt & OHCI1394_regAccessFail ? " regAccessFail" : "", |
| 280 | evt & OHCI1394_cycle64Seconds ? " cycle64Seconds" : "", | 280 | evt & OHCI1394_busReset ? " busReset" : "", |
| 281 | evt & OHCI1394_regAccessFail ? " regAccessFail" : "", | 281 | evt & ~(OHCI1394_selfIDComplete | OHCI1394_RQPkt | |
| 282 | evt & OHCI1394_busReset ? " busReset" : "", | 282 | OHCI1394_RSPkt | OHCI1394_reqTxComplete | |
| 283 | evt & ~(OHCI1394_selfIDComplete | OHCI1394_RQPkt | | 283 | OHCI1394_respTxComplete | OHCI1394_isochRx | |
| 284 | OHCI1394_RSPkt | OHCI1394_reqTxComplete | | 284 | OHCI1394_isochTx | OHCI1394_postedWriteErr | |
| 285 | OHCI1394_respTxComplete | OHCI1394_isochRx | | 285 | OHCI1394_cycleTooLong | OHCI1394_cycle64Seconds | |
| 286 | OHCI1394_isochTx | OHCI1394_postedWriteErr | | 286 | OHCI1394_regAccessFail | OHCI1394_busReset) |
| 287 | OHCI1394_cycleTooLong | OHCI1394_cycle64Seconds | | ||
| 288 | OHCI1394_regAccessFail | OHCI1394_busReset) | ||
| 289 | ? " ?" : ""); | 287 | ? " ?" : ""); |
| 290 | } | 288 | } |
| 291 | 289 | ||
| @@ -308,23 +306,22 @@ static void log_selfids(int node_id, int generation, int self_id_count, u32 *s) | |||
| 308 | if (likely(!(param_debug & OHCI_PARAM_DEBUG_SELFIDS))) | 306 | if (likely(!(param_debug & OHCI_PARAM_DEBUG_SELFIDS))) |
| 309 | return; | 307 | return; |
| 310 | 308 | ||
| 311 | printk(KERN_DEBUG KBUILD_MODNAME ": %d selfIDs, generation %d, " | 309 | fw_notify("%d selfIDs, generation %d, local node ID %04x\n", |
| 312 | "local node ID %04x\n", self_id_count, generation, node_id); | 310 | self_id_count, generation, node_id); |
| 313 | 311 | ||
| 314 | for (; self_id_count--; ++s) | 312 | for (; self_id_count--; ++s) |
| 315 | if ((*s & 1 << 23) == 0) | 313 | if ((*s & 1 << 23) == 0) |
| 316 | printk(KERN_DEBUG "selfID 0: %08x, phy %d [%c%c%c] " | 314 | fw_notify("selfID 0: %08x, phy %d [%c%c%c] " |
| 317 | "%s gc=%d %s %s%s%s\n", | 315 | "%s gc=%d %s %s%s%s\n", |
| 318 | *s, *s >> 24 & 63, _p(s, 6), _p(s, 4), _p(s, 2), | 316 | *s, *s >> 24 & 63, _p(s, 6), _p(s, 4), _p(s, 2), |
| 319 | speed[*s >> 14 & 3], *s >> 16 & 63, | 317 | speed[*s >> 14 & 3], *s >> 16 & 63, |
| 320 | power[*s >> 8 & 7], *s >> 22 & 1 ? "L" : "", | 318 | power[*s >> 8 & 7], *s >> 22 & 1 ? "L" : "", |
| 321 | *s >> 11 & 1 ? "c" : "", *s & 2 ? "i" : ""); | 319 | *s >> 11 & 1 ? "c" : "", *s & 2 ? "i" : ""); |
| 322 | else | 320 | else |
| 323 | printk(KERN_DEBUG "selfID n: %08x, phy %d " | 321 | fw_notify("selfID n: %08x, phy %d [%c%c%c%c%c%c%c%c]\n", |
| 324 | "[%c%c%c%c%c%c%c%c]\n", | 322 | *s, *s >> 24 & 63, |
| 325 | *s, *s >> 24 & 63, | 323 | _p(s, 16), _p(s, 14), _p(s, 12), _p(s, 10), |
| 326 | _p(s, 16), _p(s, 14), _p(s, 12), _p(s, 10), | 324 | _p(s, 8), _p(s, 6), _p(s, 4), _p(s, 2)); |
| 327 | _p(s, 8), _p(s, 6), _p(s, 4), _p(s, 2)); | ||
| 328 | } | 325 | } |
| 329 | 326 | ||
| 330 | static const char *evts[] = { | 327 | static const char *evts[] = { |
| @@ -373,15 +370,14 @@ static void log_ar_at_event(char dir, int speed, u32 *header, int evt) | |||
| 373 | evt = 0x1f; | 370 | evt = 0x1f; |
| 374 | 371 | ||
| 375 | if (evt == OHCI1394_evt_bus_reset) { | 372 | if (evt == OHCI1394_evt_bus_reset) { |
| 376 | printk(KERN_DEBUG "A%c evt_bus_reset, generation %d\n", | 373 | fw_notify("A%c evt_bus_reset, generation %d\n", |
| 377 | dir, (header[2] >> 16) & 0xff); | 374 | dir, (header[2] >> 16) & 0xff); |
| 378 | return; | 375 | return; |
| 379 | } | 376 | } |
| 380 | 377 | ||
| 381 | if (header[0] == ~header[1]) { | 378 | if (header[0] == ~header[1]) { |
| 382 | printk(KERN_DEBUG "A%c %s, %s, %08x\n", | 379 | fw_notify("A%c %s, %s, %08x\n", |
| 383 | dir, evts[evt], phys[header[0] >> 30 & 0x3], | 380 | dir, evts[evt], phys[header[0] >> 30 & 0x3], header[0]); |
| 384 | header[0]); | ||
| 385 | return; | 381 | return; |
| 386 | } | 382 | } |
| 387 | 383 | ||
| @@ -400,24 +396,23 @@ static void log_ar_at_event(char dir, int speed, u32 *header, int evt) | |||
| 400 | 396 | ||
| 401 | switch (tcode) { | 397 | switch (tcode) { |
| 402 | case 0xe: case 0xa: | 398 | case 0xe: case 0xa: |
| 403 | printk(KERN_DEBUG "A%c %s, %s\n", | 399 | fw_notify("A%c %s, %s\n", dir, evts[evt], tcodes[tcode]); |
| 404 | dir, evts[evt], tcodes[tcode]); | ||
| 405 | break; | 400 | break; |
| 406 | case 0x0: case 0x1: case 0x4: case 0x5: case 0x9: | 401 | case 0x0: case 0x1: case 0x4: case 0x5: case 0x9: |
| 407 | printk(KERN_DEBUG "A%c spd %x tl %02x, " | 402 | fw_notify("A%c spd %x tl %02x, " |
| 408 | "%04x -> %04x, %s, " | 403 | "%04x -> %04x, %s, " |
| 409 | "%s, %04x%08x%s\n", | 404 | "%s, %04x%08x%s\n", |
| 410 | dir, speed, header[0] >> 10 & 0x3f, | 405 | dir, speed, header[0] >> 10 & 0x3f, |
| 411 | header[1] >> 16, header[0] >> 16, evts[evt], | 406 | header[1] >> 16, header[0] >> 16, evts[evt], |
| 412 | tcodes[tcode], header[1] & 0xffff, header[2], specific); | 407 | tcodes[tcode], header[1] & 0xffff, header[2], specific); |
| 413 | break; | 408 | break; |
| 414 | default: | 409 | default: |
| 415 | printk(KERN_DEBUG "A%c spd %x tl %02x, " | 410 | fw_notify("A%c spd %x tl %02x, " |
| 416 | "%04x -> %04x, %s, " | 411 | "%04x -> %04x, %s, " |
| 417 | "%s%s\n", | 412 | "%s%s\n", |
| 418 | dir, speed, header[0] >> 10 & 0x3f, | 413 | dir, speed, header[0] >> 10 & 0x3f, |
| 419 | header[1] >> 16, header[0] >> 16, evts[evt], | 414 | header[1] >> 16, header[0] >> 16, evts[evt], |
| 420 | tcodes[tcode], specific); | 415 | tcodes[tcode], specific); |
| 421 | } | 416 | } |
| 422 | } | 417 | } |
| 423 | 418 | ||
| @@ -548,6 +543,11 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) | |||
| 548 | p.header_length = 12; | 543 | p.header_length = 12; |
| 549 | p.payload_length = 0; | 544 | p.payload_length = 0; |
| 550 | break; | 545 | break; |
| 546 | |||
| 547 | default: | ||
| 548 | /* FIXME: Stop context, discard everything, and restart? */ | ||
| 549 | p.header_length = 0; | ||
| 550 | p.payload_length = 0; | ||
| 551 | } | 551 | } |
| 552 | 552 | ||
| 553 | p.payload = (void *) buffer + p.header_length; | 553 | p.payload = (void *) buffer + p.header_length; |
| @@ -1468,6 +1468,9 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length) | |||
| 1468 | reg_write(ohci, OHCI1394_HCControlClear, | 1468 | reg_write(ohci, OHCI1394_HCControlClear, |
| 1469 | OHCI1394_HCControl_noByteSwapData); | 1469 | OHCI1394_HCControl_noByteSwapData); |
| 1470 | 1470 | ||
| 1471 | reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->self_id_bus); | ||
| 1472 | reg_write(ohci, OHCI1394_LinkControlClear, | ||
| 1473 | OHCI1394_LinkControl_rcvPhyPkt); | ||
| 1471 | reg_write(ohci, OHCI1394_LinkControlSet, | 1474 | reg_write(ohci, OHCI1394_LinkControlSet, |
| 1472 | OHCI1394_LinkControl_rcvSelfID | | 1475 | OHCI1394_LinkControl_rcvSelfID | |
| 1473 | OHCI1394_LinkControl_cycleTimerEnable | | 1476 | OHCI1394_LinkControl_cycleTimerEnable | |
| @@ -1481,7 +1484,6 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length) | |||
| 1481 | ar_context_run(&ohci->ar_request_ctx); | 1484 | ar_context_run(&ohci->ar_request_ctx); |
| 1482 | ar_context_run(&ohci->ar_response_ctx); | 1485 | ar_context_run(&ohci->ar_response_ctx); |
| 1483 | 1486 | ||
| 1484 | reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->self_id_bus); | ||
| 1485 | reg_write(ohci, OHCI1394_PhyUpperBound, 0x00010000); | 1487 | reg_write(ohci, OHCI1394_PhyUpperBound, 0x00010000); |
| 1486 | reg_write(ohci, OHCI1394_IntEventClear, ~0); | 1488 | reg_write(ohci, OHCI1394_IntEventClear, ~0); |
| 1487 | reg_write(ohci, OHCI1394_IntMaskClear, ~0); | 1489 | reg_write(ohci, OHCI1394_IntMaskClear, ~0); |
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index ccf0e4cf108f..03ae8a77c479 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/completion.h> | 21 | #include <linux/completion.h> |
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/kref.h> | ||
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 24 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 25 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| @@ -297,37 +298,55 @@ EXPORT_SYMBOL(fw_send_request); | |||
| 297 | struct fw_phy_packet { | 298 | struct fw_phy_packet { |
| 298 | struct fw_packet packet; | 299 | struct fw_packet packet; |
| 299 | struct completion done; | 300 | struct completion done; |
| 301 | struct kref kref; | ||
| 300 | }; | 302 | }; |
| 301 | 303 | ||
| 302 | static void | 304 | static void phy_packet_release(struct kref *kref) |
| 303 | transmit_phy_packet_callback(struct fw_packet *packet, | 305 | { |
| 304 | struct fw_card *card, int status) | 306 | struct fw_phy_packet *p = |
| 307 | container_of(kref, struct fw_phy_packet, kref); | ||
| 308 | kfree(p); | ||
| 309 | } | ||
| 310 | |||
| 311 | static void transmit_phy_packet_callback(struct fw_packet *packet, | ||
| 312 | struct fw_card *card, int status) | ||
| 305 | { | 313 | { |
| 306 | struct fw_phy_packet *p = | 314 | struct fw_phy_packet *p = |
| 307 | container_of(packet, struct fw_phy_packet, packet); | 315 | container_of(packet, struct fw_phy_packet, packet); |
| 308 | 316 | ||
| 309 | complete(&p->done); | 317 | complete(&p->done); |
| 318 | kref_put(&p->kref, phy_packet_release); | ||
| 310 | } | 319 | } |
| 311 | 320 | ||
| 312 | void fw_send_phy_config(struct fw_card *card, | 321 | void fw_send_phy_config(struct fw_card *card, |
| 313 | int node_id, int generation, int gap_count) | 322 | int node_id, int generation, int gap_count) |
| 314 | { | 323 | { |
| 315 | struct fw_phy_packet p; | 324 | struct fw_phy_packet *p; |
| 325 | long timeout = DIV_ROUND_UP(HZ, 10); | ||
| 316 | u32 data = PHY_IDENTIFIER(PHY_PACKET_CONFIG) | | 326 | u32 data = PHY_IDENTIFIER(PHY_PACKET_CONFIG) | |
| 317 | PHY_CONFIG_ROOT_ID(node_id) | | 327 | PHY_CONFIG_ROOT_ID(node_id) | |
| 318 | PHY_CONFIG_GAP_COUNT(gap_count); | 328 | PHY_CONFIG_GAP_COUNT(gap_count); |
| 319 | 329 | ||
| 320 | p.packet.header[0] = data; | 330 | p = kmalloc(sizeof(*p), GFP_KERNEL); |
| 321 | p.packet.header[1] = ~data; | 331 | if (p == NULL) |
| 322 | p.packet.header_length = 8; | 332 | return; |
| 323 | p.packet.payload_length = 0; | 333 | |
| 324 | p.packet.speed = SCODE_100; | 334 | p->packet.header[0] = data; |
| 325 | p.packet.generation = generation; | 335 | p->packet.header[1] = ~data; |
| 326 | p.packet.callback = transmit_phy_packet_callback; | 336 | p->packet.header_length = 8; |
| 327 | init_completion(&p.done); | 337 | p->packet.payload_length = 0; |
| 328 | 338 | p->packet.speed = SCODE_100; | |
| 329 | card->driver->send_request(card, &p.packet); | 339 | p->packet.generation = generation; |
| 330 | wait_for_completion(&p.done); | 340 | p->packet.callback = transmit_phy_packet_callback; |
| 341 | init_completion(&p->done); | ||
| 342 | kref_set(&p->kref, 2); | ||
| 343 | |||
| 344 | card->driver->send_request(card, &p->packet); | ||
| 345 | timeout = wait_for_completion_timeout(&p->done, timeout); | ||
| 346 | kref_put(&p->kref, phy_packet_release); | ||
| 347 | |||
| 348 | /* will leak p if the callback is never executed */ | ||
| 349 | WARN_ON(timeout == 0); | ||
| 331 | } | 350 | } |
| 332 | 351 | ||
| 333 | void fw_flush_transactions(struct fw_card *card) | 352 | void fw_flush_transactions(struct fw_card *card) |
| @@ -572,7 +591,8 @@ allocate_request(struct fw_packet *p) | |||
| 572 | break; | 591 | break; |
| 573 | 592 | ||
| 574 | default: | 593 | default: |
| 575 | BUG(); | 594 | fw_error("ERROR - corrupt request received - %08x %08x %08x\n", |
| 595 | p->header[0], p->header[1], p->header[2]); | ||
| 576 | return NULL; | 596 | return NULL; |
| 577 | } | 597 | } |
| 578 | 598 | ||
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c index ed33fddc4dee..f00f497b9ca9 100644 --- a/drivers/hwmon/abituguru3.c +++ b/drivers/hwmon/abituguru3.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/hwmon.h> | 31 | #include <linux/hwmon.h> |
| 32 | #include <linux/hwmon-sysfs.h> | 32 | #include <linux/hwmon-sysfs.h> |
| 33 | #include <linux/dmi.h> | ||
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 34 | 35 | ||
| 35 | /* uGuru3 bank addresses */ | 36 | /* uGuru3 bank addresses */ |
| @@ -323,7 +324,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 323 | { "AUX1 Fan", 36, 2, 60, 1, 0 }, | 324 | { "AUX1 Fan", 36, 2, 60, 1, 0 }, |
| 324 | { NULL, 0, 0, 0, 0, 0 } } | 325 | { NULL, 0, 0, 0, 0, 0 } } |
| 325 | }, | 326 | }, |
| 326 | { 0x0013, "unknown", { | 327 | { 0x0013, "Abit AW8D", { |
| 327 | { "CPU Core", 0, 0, 10, 1, 0 }, | 328 | { "CPU Core", 0, 0, 10, 1, 0 }, |
| 328 | { "DDR", 1, 0, 10, 1, 0 }, | 329 | { "DDR", 1, 0, 10, 1, 0 }, |
| 329 | { "DDR VTT", 2, 0, 10, 1, 0 }, | 330 | { "DDR VTT", 2, 0, 10, 1, 0 }, |
| @@ -349,6 +350,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { | |||
| 349 | { "AUX2 Fan", 36, 2, 60, 1, 0 }, | 350 | { "AUX2 Fan", 36, 2, 60, 1, 0 }, |
| 350 | { "AUX3 Fan", 37, 2, 60, 1, 0 }, | 351 | { "AUX3 Fan", 37, 2, 60, 1, 0 }, |
| 351 | { "AUX4 Fan", 38, 2, 60, 1, 0 }, | 352 | { "AUX4 Fan", 38, 2, 60, 1, 0 }, |
| 353 | { "AUX5 Fan", 39, 2, 60, 1, 0 }, | ||
| 352 | { NULL, 0, 0, 0, 0, 0 } } | 354 | { NULL, 0, 0, 0, 0, 0 } } |
| 353 | }, | 355 | }, |
| 354 | { 0x0014, "Abit AB9 Pro", { | 356 | { 0x0014, "Abit AB9 Pro", { |
| @@ -1111,11 +1113,12 @@ static int __init abituguru3_detect(void) | |||
| 1111 | { | 1113 | { |
| 1112 | /* See if there is an uguru3 there. An idle uGuru3 will hold 0x00 or | 1114 | /* See if there is an uguru3 there. An idle uGuru3 will hold 0x00 or |
| 1113 | 0x08 at DATA and 0xAC at CMD. Sometimes the uGuru3 will hold 0x05 | 1115 | 0x08 at DATA and 0xAC at CMD. Sometimes the uGuru3 will hold 0x05 |
| 1114 | at CMD instead, why is unknown. So we test for 0x05 too. */ | 1116 | or 0x55 at CMD instead, why is unknown. */ |
| 1115 | u8 data_val = inb_p(ABIT_UGURU3_BASE + ABIT_UGURU3_DATA); | 1117 | u8 data_val = inb_p(ABIT_UGURU3_BASE + ABIT_UGURU3_DATA); |
| 1116 | u8 cmd_val = inb_p(ABIT_UGURU3_BASE + ABIT_UGURU3_CMD); | 1118 | u8 cmd_val = inb_p(ABIT_UGURU3_BASE + ABIT_UGURU3_CMD); |
| 1117 | if (((data_val == 0x00) || (data_val == 0x08)) && | 1119 | if (((data_val == 0x00) || (data_val == 0x08)) && |
| 1118 | ((cmd_val == 0xAC) || (cmd_val == 0x05))) | 1120 | ((cmd_val == 0xAC) || (cmd_val == 0x05) || |
| 1121 | (cmd_val == 0x55))) | ||
| 1119 | return ABIT_UGURU3_BASE; | 1122 | return ABIT_UGURU3_BASE; |
| 1120 | 1123 | ||
| 1121 | ABIT_UGURU3_DEBUG("no Abit uGuru3 found, data = 0x%02X, cmd = " | 1124 | ABIT_UGURU3_DEBUG("no Abit uGuru3 found, data = 0x%02X, cmd = " |
| @@ -1138,6 +1141,15 @@ static int __init abituguru3_init(void) | |||
| 1138 | int address, err; | 1141 | int address, err; |
| 1139 | struct resource res = { .flags = IORESOURCE_IO }; | 1142 | struct resource res = { .flags = IORESOURCE_IO }; |
| 1140 | 1143 | ||
| 1144 | #ifdef CONFIG_DMI | ||
| 1145 | const char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR); | ||
| 1146 | |||
| 1147 | /* safety check, refuse to load on non Abit motherboards */ | ||
| 1148 | if (!force && (!board_vendor || | ||
| 1149 | strcmp(board_vendor, "http://www.abit.com.tw/"))) | ||
| 1150 | return -ENODEV; | ||
| 1151 | #endif | ||
| 1152 | |||
| 1141 | address = abituguru3_detect(); | 1153 | address = abituguru3_detect(); |
| 1142 | if (address < 0) | 1154 | if (address < 0) |
| 1143 | return address; | 1155 | return address; |
diff --git a/drivers/hwmon/adt7473.c b/drivers/hwmon/adt7473.c index c1009d6f9796..93dbf5e7ff8a 100644 --- a/drivers/hwmon/adt7473.c +++ b/drivers/hwmon/adt7473.c | |||
| @@ -309,6 +309,9 @@ no_sensor_update: | |||
| 309 | ADT7473_REG_PWM_BHVR(i)); | 309 | ADT7473_REG_PWM_BHVR(i)); |
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | i = i2c_smbus_read_byte_data(client, ADT7473_REG_CFG4); | ||
| 313 | data->max_duty_at_overheat = !!(i & ADT7473_CFG4_MAX_DUTY_AT_OVT); | ||
| 314 | |||
| 312 | data->limits_last_updated = local_jiffies; | 315 | data->limits_last_updated = local_jiffies; |
| 313 | data->limits_valid = 1; | 316 | data->limits_valid = 1; |
| 314 | 317 | ||
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index fa7696905154..de698dc73020 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c | |||
| @@ -251,10 +251,13 @@ static int lm75_detach_client(struct i2c_client *client) | |||
| 251 | the SMBus standard. */ | 251 | the SMBus standard. */ |
| 252 | static int lm75_read_value(struct i2c_client *client, u8 reg) | 252 | static int lm75_read_value(struct i2c_client *client, u8 reg) |
| 253 | { | 253 | { |
| 254 | int value; | ||
| 255 | |||
| 254 | if (reg == LM75_REG_CONF) | 256 | if (reg == LM75_REG_CONF) |
| 255 | return i2c_smbus_read_byte_data(client, reg); | 257 | return i2c_smbus_read_byte_data(client, reg); |
| 256 | else | 258 | |
| 257 | return swab16(i2c_smbus_read_word_data(client, reg)); | 259 | value = i2c_smbus_read_word_data(client, reg); |
| 260 | return (value < 0) ? value : swab16(value); | ||
| 258 | } | 261 | } |
| 259 | 262 | ||
| 260 | static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value) | 263 | static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value) |
| @@ -287,9 +290,16 @@ static struct lm75_data *lm75_update_device(struct device *dev) | |||
| 287 | int i; | 290 | int i; |
| 288 | dev_dbg(&client->dev, "Starting lm75 update\n"); | 291 | dev_dbg(&client->dev, "Starting lm75 update\n"); |
| 289 | 292 | ||
| 290 | for (i = 0; i < ARRAY_SIZE(data->temp); i++) | 293 | for (i = 0; i < ARRAY_SIZE(data->temp); i++) { |
| 291 | data->temp[i] = lm75_read_value(client, | 294 | int status; |
| 292 | LM75_REG_TEMP[i]); | 295 | |
| 296 | status = lm75_read_value(client, LM75_REG_TEMP[i]); | ||
| 297 | if (status < 0) | ||
| 298 | dev_dbg(&client->dev, "reg %d, err %d\n", | ||
| 299 | LM75_REG_TEMP[i], status); | ||
| 300 | else | ||
| 301 | data->temp[i] = status; | ||
| 302 | } | ||
| 293 | data->last_updated = jiffies; | 303 | data->last_updated = jiffies; |
| 294 | data->valid = 1; | 304 | data->valid = 1; |
| 295 | } | 305 | } |
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c index 182fe6a5605f..ee5eca1c1921 100644 --- a/drivers/hwmon/lm85.c +++ b/drivers/hwmon/lm85.c | |||
| @@ -192,23 +192,20 @@ static int RANGE_TO_REG( int range ) | |||
| 192 | { | 192 | { |
| 193 | int i; | 193 | int i; |
| 194 | 194 | ||
| 195 | if ( range < lm85_range_map[0] ) { | 195 | if (range >= lm85_range_map[15]) |
| 196 | return 0 ; | ||
| 197 | } else if ( range > lm85_range_map[15] ) { | ||
| 198 | return 15 ; | 196 | return 15 ; |
| 199 | } else { /* find closest match */ | 197 | |
| 200 | for ( i = 14 ; i >= 0 ; --i ) { | 198 | /* Find the closest match */ |
| 201 | if ( range > lm85_range_map[i] ) { /* range bracketed */ | 199 | for (i = 14; i >= 0; --i) { |
| 202 | if ((lm85_range_map[i+1] - range) < | 200 | if (range >= lm85_range_map[i]) { |
| 203 | (range - lm85_range_map[i])) { | 201 | if ((lm85_range_map[i + 1] - range) < |
| 204 | i++; | 202 | (range - lm85_range_map[i])) |
| 205 | break; | 203 | return i + 1; |
| 206 | } | 204 | return i; |
| 207 | break; | ||
| 208 | } | ||
| 209 | } | 205 | } |
| 210 | } | 206 | } |
| 211 | return( i & 0x0f ); | 207 | |
| 208 | return 0; | ||
| 212 | } | 209 | } |
| 213 | #define RANGE_FROM_REG(val) (lm85_range_map[(val)&0x0f]) | 210 | #define RANGE_FROM_REG(val) (lm85_range_map[(val)&0x0f]) |
| 214 | 211 | ||
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 1607536ff5fb..8e07de23d220 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -823,13 +823,6 @@ config BLK_DEV_IDE_RAPIDE | |||
| 823 | Say Y here if you want to support the Yellowstone RapIDE controller | 823 | Say Y here if you want to support the Yellowstone RapIDE controller |
| 824 | manufactured for use with Acorn computers. | 824 | manufactured for use with Acorn computers. |
| 825 | 825 | ||
| 826 | config BLK_DEV_IDE_BAST | ||
| 827 | tristate "Simtec BAST / Thorcom VR1000 IDE support" | ||
| 828 | depends on ARM && (ARCH_BAST || MACH_VR1000) | ||
| 829 | help | ||
| 830 | Say Y here if you want to support the onboard IDE channels on the | ||
| 831 | Simtec BAST or the Thorcom VR1000 | ||
| 832 | |||
| 833 | config IDE_H8300 | 826 | config IDE_H8300 |
| 834 | tristate "H8300 IDE support" | 827 | tristate "H8300 IDE support" |
| 835 | depends on H8300 | 828 | depends on H8300 |
diff --git a/drivers/ide/arm/Makefile b/drivers/ide/arm/Makefile index 936e7b0237f5..5bc26053afa6 100644 --- a/drivers/ide/arm/Makefile +++ b/drivers/ide/arm/Makefile | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o | 2 | obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o |
| 3 | obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o | 3 | obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o |
| 4 | obj-$(CONFIG_BLK_DEV_IDE_BAST) += bast-ide.o | ||
| 5 | obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o | 4 | obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o |
| 6 | 5 | ||
| 7 | ifeq ($(CONFIG_IDE_ARM), m) | 6 | ifeq ($(CONFIG_IDE_ARM), m) |
diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c deleted file mode 100644 index 8e8c28104b45..000000000000 --- a/drivers/ide/arm/bast-ide.c +++ /dev/null | |||
| @@ -1,90 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2003-2004 Simtec Electronics | ||
| 3 | * Ben Dooks <ben@simtec.co.uk> | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/module.h> | ||
| 12 | #include <linux/errno.h> | ||
| 13 | #include <linux/ide.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | |||
| 16 | #include <asm/mach-types.h> | ||
| 17 | |||
| 18 | #include <asm/io.h> | ||
| 19 | #include <asm/irq.h> | ||
| 20 | #include <asm/arch/map.h> | ||
| 21 | #include <asm/arch/bast-map.h> | ||
| 22 | #include <asm/arch/bast-irq.h> | ||
| 23 | |||
| 24 | #define DRV_NAME "bast-ide" | ||
| 25 | |||
| 26 | static int __init bastide_register(unsigned int base, unsigned int aux, int irq) | ||
| 27 | { | ||
| 28 | ide_hwif_t *hwif; | ||
| 29 | hw_regs_t hw; | ||
| 30 | int i; | ||
| 31 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
| 32 | |||
| 33 | memset(&hw, 0, sizeof(hw)); | ||
| 34 | |||
| 35 | base += BAST_IDE_CS; | ||
| 36 | aux += BAST_IDE_CS; | ||
| 37 | |||
| 38 | for (i = 0; i <= 7; i++) { | ||
| 39 | hw.io_ports_array[i] = (unsigned long)base; | ||
| 40 | base += 0x20; | ||
| 41 | } | ||
| 42 | |||
| 43 | hw.io_ports.ctl_addr = aux + (6 * 0x20); | ||
| 44 | hw.irq = irq; | ||
| 45 | hw.chipset = ide_generic; | ||
| 46 | |||
| 47 | hwif = ide_find_port(); | ||
| 48 | if (hwif == NULL) | ||
| 49 | goto out; | ||
| 50 | |||
| 51 | i = hwif->index; | ||
| 52 | |||
| 53 | ide_init_port_data(hwif, i); | ||
| 54 | ide_init_port_hw(hwif, &hw); | ||
| 55 | hwif->port_ops = NULL; | ||
| 56 | |||
| 57 | idx[0] = i; | ||
| 58 | |||
| 59 | ide_device_add(idx, NULL); | ||
| 60 | out: | ||
| 61 | return 0; | ||
| 62 | } | ||
| 63 | |||
| 64 | static int __init bastide_init(void) | ||
| 65 | { | ||
| 66 | unsigned long base = BAST_VA_IDEPRI + BAST_IDE_CS; | ||
| 67 | |||
| 68 | /* we can treat the VR1000 and the BAST the same */ | ||
| 69 | |||
| 70 | if (!(machine_is_bast() || machine_is_vr1000())) | ||
| 71 | return 0; | ||
| 72 | |||
| 73 | printk("BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n"); | ||
| 74 | |||
| 75 | if (!request_mem_region(base, 0x400000, DRV_NAME)) { | ||
| 76 | printk(KERN_ERR "%s: resources busy\n", DRV_NAME); | ||
| 77 | return -EBUSY; | ||
| 78 | } | ||
| 79 | |||
| 80 | bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0); | ||
| 81 | bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1); | ||
| 82 | |||
| 83 | return 0; | ||
| 84 | } | ||
| 85 | |||
| 86 | module_init(bastide_init); | ||
| 87 | |||
| 88 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); | ||
| 89 | MODULE_LICENSE("GPL"); | ||
| 90 | MODULE_DESCRIPTION("Simtec BAST / Thorcom VR1000 IDE driver"); | ||
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c index d024ac8fad14..cc24803fadff 100644 --- a/drivers/ide/arm/palm_bk3710.c +++ b/drivers/ide/arm/palm_bk3710.c | |||
| @@ -353,8 +353,8 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) | |||
| 353 | struct clk *clkp; | 353 | struct clk *clkp; |
| 354 | struct resource *mem, *irq; | 354 | struct resource *mem, *irq; |
| 355 | ide_hwif_t *hwif; | 355 | ide_hwif_t *hwif; |
| 356 | void __iomem *base; | 356 | unsigned long base; |
| 357 | int pribase, i; | 357 | int i; |
| 358 | hw_regs_t hw; | 358 | hw_regs_t hw; |
| 359 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | 359 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; |
| 360 | 360 | ||
| @@ -374,22 +374,27 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) | |||
| 374 | printk(KERN_ERR "failed to get memory region resource\n"); | 374 | printk(KERN_ERR "failed to get memory region resource\n"); |
| 375 | return -ENODEV; | 375 | return -ENODEV; |
| 376 | } | 376 | } |
| 377 | |||
| 377 | irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); | 378 | irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); |
| 378 | if (irq == NULL) { | 379 | if (irq == NULL) { |
| 379 | printk(KERN_ERR "failed to get IRQ resource\n"); | 380 | printk(KERN_ERR "failed to get IRQ resource\n"); |
| 380 | return -ENODEV; | 381 | return -ENODEV; |
| 381 | } | 382 | } |
| 382 | 383 | ||
| 383 | base = (void *)mem->start; | 384 | if (request_mem_region(mem->start, mem->end - mem->start + 1, |
| 385 | "palm_bk3710") == NULL) { | ||
| 386 | printk(KERN_ERR "failed to request memory region\n"); | ||
| 387 | return -EBUSY; | ||
| 388 | } | ||
| 389 | |||
| 390 | base = IO_ADDRESS(mem->start); | ||
| 384 | 391 | ||
| 385 | /* Configure the Palm Chip controller */ | 392 | /* Configure the Palm Chip controller */ |
| 386 | palm_bk3710_chipinit(base); | 393 | palm_bk3710_chipinit((void __iomem *)base); |
| 387 | 394 | ||
| 388 | pribase = mem->start + IDE_PALM_ATA_PRI_REG_OFFSET; | ||
| 389 | for (i = 0; i < IDE_NR_PORTS - 2; i++) | 395 | for (i = 0; i < IDE_NR_PORTS - 2; i++) |
| 390 | hw.io_ports_array[i] = pribase + i; | 396 | hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i; |
| 391 | hw.io_ports.ctl_addr = mem->start + | 397 | hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET; |
| 392 | IDE_PALM_ATA_PRI_CTL_OFFSET; | ||
| 393 | hw.irq = irq->start; | 398 | hw.irq = irq->start; |
| 394 | hw.chipset = ide_palm3710; | 399 | hw.chipset = ide_palm3710; |
| 395 | 400 | ||
| @@ -434,4 +439,3 @@ static int __init palm_bk3710_init(void) | |||
| 434 | 439 | ||
| 435 | module_init(palm_bk3710_init); | 440 | module_init(palm_bk3710_init); |
| 436 | MODULE_LICENSE("GPL"); | 441 | MODULE_LICENSE("GPL"); |
| 437 | |||
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 0c908ca3ff79..ab545ffa1549 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
| @@ -225,10 +225,10 @@ static u8 wait_drive_not_busy(ide_drive_t *drive) | |||
| 225 | u8 stat; | 225 | u8 stat; |
| 226 | 226 | ||
| 227 | /* | 227 | /* |
| 228 | * Last sector was transfered, wait until drive is ready. | 228 | * Last sector was transfered, wait until device is ready. This can |
| 229 | * This can take up to 10 usec, but we will wait max 1 ms. | 229 | * take up to 6 ms on some ATAPI devices, so we will wait max 10 ms. |
| 230 | */ | 230 | */ |
| 231 | for (retries = 0; retries < 100; retries++) { | 231 | for (retries = 0; retries < 1000; retries++) { |
| 232 | stat = ide_read_status(drive); | 232 | stat = ide_read_status(drive); |
| 233 | 233 | ||
| 234 | if (stat & BUSY_STAT) | 234 | if (stat & BUSY_STAT) |
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index f633b6b3c7f3..3381424d70a1 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
| @@ -410,6 +410,7 @@ static struct pcmcia_device_id ide_ids[] = { | |||
| 410 | PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001), /* Mitsubishi CFA */ | 410 | PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001), /* Mitsubishi CFA */ |
| 411 | PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704), | 411 | PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704), |
| 412 | PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401), /* SanDisk CFA */ | 412 | PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401), /* SanDisk CFA */ |
| 413 | PCMCIA_DEVICE_MANF_CARD(0x004f, 0x0000), /* Kingston */ | ||
| 413 | PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000), /* Toshiba */ | 414 | PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000), /* Toshiba */ |
| 414 | PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d), | 415 | PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d), |
| 415 | PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000), /* Samsung */ | 416 | PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000), /* Samsung */ |
| @@ -439,6 +440,7 @@ static struct pcmcia_device_id ide_ids[] = { | |||
| 439 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), | 440 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), |
| 440 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), | 441 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), |
| 441 | PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), | 442 | PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), |
| 443 | PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF300", 0x7ed2ad87, 0x7e9e78ee), | ||
| 442 | PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), | 444 | PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), |
| 443 | PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), | 445 | PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), |
| 444 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), | 446 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), |
| @@ -449,6 +451,7 @@ static struct pcmcia_device_id ide_ids[] = { | |||
| 449 | PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), | 451 | PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), |
| 450 | PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), | 452 | PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), |
| 451 | PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), | 453 | PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), |
| 454 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF45", 0x709b1bf1, 0xf68b6f32), | ||
| 452 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1), | 455 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1), |
| 453 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2), | 456 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2), |
| 454 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), | 457 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), |
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index 545663ef820b..95f45f9b8e5e 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig | |||
| @@ -4,7 +4,7 @@ menu "IEEE 1394 (FireWire) support" | |||
| 4 | source "drivers/firewire/Kconfig" | 4 | source "drivers/firewire/Kconfig" |
| 5 | 5 | ||
| 6 | config IEEE1394 | 6 | config IEEE1394 |
| 7 | tristate "IEEE 1394 (FireWire) support" | 7 | tristate "Stable FireWire stack" |
| 8 | depends on PCI || BROKEN | 8 | depends on PCI || BROKEN |
| 9 | help | 9 | help |
| 10 | IEEE 1394 describes a high performance serial bus, which is also | 10 | IEEE 1394 describes a high performance serial bus, which is also |
| @@ -19,30 +19,45 @@ config IEEE1394 | |||
| 19 | To compile this driver as a module, say M here: the | 19 | To compile this driver as a module, say M here: the |
| 20 | module will be called ieee1394. | 20 | module will be called ieee1394. |
| 21 | 21 | ||
| 22 | comment "Subsystem Options" | 22 | config IEEE1394_OHCI1394 |
| 23 | depends on IEEE1394 | 23 | tristate "OHCI-1394 controllers" |
| 24 | 24 | depends on PCI && IEEE1394 | |
| 25 | config IEEE1394_VERBOSEDEBUG | ||
| 26 | bool "Excessive debugging output" | ||
| 27 | depends on IEEE1394 | ||
| 28 | help | 25 | help |
| 29 | If you say Y here, you will get very verbose debugging logs from | 26 | Enable this driver if you have an IEEE 1394 controller based on the |
| 30 | the subsystem which includes a dump of the header of every sent | 27 | OHCI-1394 specification. The current driver is only tested with OHCI |
| 31 | and received packet. This can amount to a high amount of data | 28 | chipsets made by Texas Instruments and NEC. Most third-party vendors |
| 32 | collected in a very short time which is usually also saved to | 29 | use one of these chipsets. It should work with any OHCI-1394 |
| 33 | disk by the system logging daemons. | 30 | compliant card, however. |
| 34 | 31 | ||
| 35 | Say Y if you really want or need the debugging output, everyone | 32 | To compile this driver as a module, say M here: the |
| 36 | else says N. | 33 | module will be called ohci1394. |
| 37 | 34 | ||
| 38 | comment "Controllers" | 35 | NOTE: |
| 39 | depends on IEEE1394 | ||
| 40 | 36 | ||
| 41 | comment "Texas Instruments PCILynx requires I2C" | 37 | You should only build either ohci1394 or the new firewire-ohci driver, |
| 38 | but not both. If you nevertheless want to install both, you should | ||
| 39 | configure them only as modules and blacklist the driver(s) which you | ||
| 40 | don't want to have auto-loaded. Add either | ||
| 41 | |||
| 42 | blacklist firewire-ohci | ||
| 43 | or | ||
| 44 | blacklist ohci1394 | ||
| 45 | blacklist video1394 | ||
| 46 | blacklist dv1394 | ||
| 47 | |||
| 48 | to /etc/modprobe.conf or /etc/modprobe.d/* and update modprobe.conf | ||
| 49 | depending on your distribution. The latter two modules should be | ||
| 50 | blacklisted together with ohci1394 because they depend on ohci1394. | ||
| 51 | |||
| 52 | If you have an old modprobe which doesn't implement the blacklist | ||
| 53 | directive, use "install modulename /bin/true" for the modules to be | ||
| 54 | blacklisted. | ||
| 55 | |||
| 56 | comment "PCILynx controller requires I2C" | ||
| 42 | depends on IEEE1394 && I2C=n | 57 | depends on IEEE1394 && I2C=n |
| 43 | 58 | ||
| 44 | config IEEE1394_PCILYNX | 59 | config IEEE1394_PCILYNX |
| 45 | tristate "Texas Instruments PCILynx support" | 60 | tristate "PCILynx controller" |
| 46 | depends on PCI && IEEE1394 && I2C | 61 | depends on PCI && IEEE1394 && I2C |
| 47 | select I2C_ALGOBIT | 62 | select I2C_ALGOBIT |
| 48 | help | 63 | help |
| @@ -57,35 +72,11 @@ config IEEE1394_PCILYNX | |||
| 57 | PowerMacs G3 B&W contain the PCILynx controller. Therefore | 72 | PowerMacs G3 B&W contain the PCILynx controller. Therefore |
| 58 | almost everybody can say N here. | 73 | almost everybody can say N here. |
| 59 | 74 | ||
| 60 | config IEEE1394_OHCI1394 | ||
| 61 | tristate "OHCI-1394 support" | ||
| 62 | depends on PCI && IEEE1394 | ||
| 63 | help | ||
| 64 | Enable this driver if you have an IEEE 1394 controller based on the | ||
| 65 | OHCI-1394 specification. The current driver is only tested with OHCI | ||
| 66 | chipsets made by Texas Instruments and NEC. Most third-party vendors | ||
| 67 | use one of these chipsets. It should work with any OHCI-1394 | ||
| 68 | compliant card, however. | ||
| 69 | |||
| 70 | To compile this driver as a module, say M here: the | ||
| 71 | module will be called ohci1394. | ||
| 72 | |||
| 73 | comment "Protocols" | ||
| 74 | depends on IEEE1394 | ||
| 75 | |||
| 76 | config IEEE1394_VIDEO1394 | ||
| 77 | tristate "OHCI-1394 Video support" | ||
| 78 | depends on IEEE1394 && IEEE1394_OHCI1394 | ||
| 79 | help | ||
| 80 | This option enables video device usage for OHCI-1394 cards. Enable | ||
| 81 | this option only if you have an IEEE 1394 video device connected to | ||
| 82 | an OHCI-1394 card. | ||
| 83 | |||
| 84 | comment "SBP-2 support (for storage devices) requires SCSI" | 75 | comment "SBP-2 support (for storage devices) requires SCSI" |
| 85 | depends on IEEE1394 && SCSI=n | 76 | depends on IEEE1394 && SCSI=n |
| 86 | 77 | ||
| 87 | config IEEE1394_SBP2 | 78 | config IEEE1394_SBP2 |
| 88 | tristate "SBP-2 support (Harddisks etc.)" | 79 | tristate "Storage devices (SBP-2 protocol)" |
| 89 | depends on IEEE1394 && SCSI | 80 | depends on IEEE1394 && SCSI |
| 90 | help | 81 | help |
| 91 | This option enables you to use SBP-2 devices connected to an IEEE | 82 | This option enables you to use SBP-2 devices connected to an IEEE |
| @@ -127,24 +118,47 @@ config IEEE1394_ETH1394 | |||
| 127 | 118 | ||
| 128 | The module is called eth1394 although it does not emulate Ethernet. | 119 | The module is called eth1394 although it does not emulate Ethernet. |
| 129 | 120 | ||
| 121 | config IEEE1394_RAWIO | ||
| 122 | tristate "raw1394 userspace interface" | ||
| 123 | depends on IEEE1394 | ||
| 124 | help | ||
| 125 | This option adds support for the raw1394 device file which enables | ||
| 126 | direct communication of user programs with IEEE 1394 devices | ||
| 127 | (isochronous and asynchronous). Almost all application programs | ||
| 128 | which access FireWire require this option. | ||
| 129 | |||
| 130 | To compile this driver as a module, say M here: the module will be | ||
| 131 | called raw1394. | ||
| 132 | |||
| 133 | config IEEE1394_VIDEO1394 | ||
| 134 | tristate "video1394 userspace interface" | ||
| 135 | depends on IEEE1394 && IEEE1394_OHCI1394 | ||
| 136 | help | ||
| 137 | This option adds support for the video1394 device files which enable | ||
| 138 | isochronous communication of user programs with IEEE 1394 devices, | ||
| 139 | especially video capture or export. This interface is used by all | ||
| 140 | libdc1394 based programs and by several other programs, in addition to | ||
| 141 | the raw1394 interface. It is generally not required for DV capture. | ||
| 142 | |||
| 143 | To compile this driver as a module, say M here: the module will be | ||
| 144 | called video1394. | ||
| 145 | |||
| 130 | config IEEE1394_DV1394 | 146 | config IEEE1394_DV1394 |
| 131 | tristate "OHCI-DV I/O support (deprecated)" | 147 | tristate "dv1394 userspace interface (deprecated)" |
| 132 | depends on IEEE1394 && IEEE1394_OHCI1394 | 148 | depends on IEEE1394 && IEEE1394_OHCI1394 |
| 133 | help | 149 | help |
| 134 | The dv1394 driver is unsupported and may be removed from Linux in a | 150 | The dv1394 driver is unsupported and may be removed from Linux in a |
| 135 | future release. Its functionality is now provided by raw1394 together | 151 | future release. Its functionality is now provided by raw1394 together |
| 136 | with libraries such as libiec61883. | 152 | with libraries such as libiec61883. |
| 137 | 153 | ||
| 138 | config IEEE1394_RAWIO | 154 | config IEEE1394_VERBOSEDEBUG |
| 139 | tristate "Raw IEEE1394 I/O support" | 155 | bool "Excessive debugging output" |
| 140 | depends on IEEE1394 | 156 | depends on IEEE1394 |
| 141 | help | 157 | help |
| 142 | This option adds support for the raw1394 device file which enables | 158 | If you say Y here, you will get very verbose debugging logs from the |
| 143 | direct communication of user programs with the IEEE 1394 bus and thus | 159 | ieee1394 drivers, including sent and received packet headers. This |
| 144 | with the attached peripherals. Almost all application programs which | 160 | will quickly result in large amounts of data sent to the system log. |
| 145 | access FireWire require this option. | ||
| 146 | 161 | ||
| 147 | To compile this driver as a module, say M here: the module will be | 162 | Say Y if you really need the debugging output. Everyone else says N. |
| 148 | called raw1394. | ||
| 149 | 163 | ||
| 150 | endmenu | 164 | endmenu |
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index f806da184b51..caed42bf7ef5 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c | |||
| @@ -423,7 +423,7 @@ static void ib_uverbs_async_handler(struct ib_uverbs_file *file, | |||
| 423 | unsigned long flags; | 423 | unsigned long flags; |
| 424 | 424 | ||
| 425 | spin_lock_irqsave(&file->async_file->lock, flags); | 425 | spin_lock_irqsave(&file->async_file->lock, flags); |
| 426 | if (!file->async_file->is_closed) { | 426 | if (file->async_file->is_closed) { |
| 427 | spin_unlock_irqrestore(&file->async_file->lock, flags); | 427 | spin_unlock_irqrestore(&file->async_file->lock, flags); |
| 428 | return; | 428 | return; |
| 429 | } | 429 | } |
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c index b224079d4e1f..d5862e5d99a0 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c | |||
| @@ -109,7 +109,11 @@ static int mthca_alloc_icm_pages(struct scatterlist *mem, int order, gfp_t gfp_m | |||
| 109 | { | 109 | { |
| 110 | struct page *page; | 110 | struct page *page; |
| 111 | 111 | ||
| 112 | page = alloc_pages(gfp_mask, order); | 112 | /* |
| 113 | * Use __GFP_ZERO because buggy firmware assumes ICM pages are | ||
| 114 | * cleared, and subtle failures are seen if they aren't. | ||
| 115 | */ | ||
| 116 | page = alloc_pages(gfp_mask | __GFP_ZERO, order); | ||
| 113 | if (!page) | 117 | if (!page) |
| 114 | return -ENOMEM; | 118 | return -ENOMEM; |
| 115 | 119 | ||
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 99b3c4ae86eb..d617da9bd351 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c | |||
| @@ -2456,10 +2456,8 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, | |||
| 2456 | if ((page_count!=0)&&(page_count<<12)-(region->offset&(4096-1))>=region->length) | 2456 | if ((page_count!=0)&&(page_count<<12)-(region->offset&(4096-1))>=region->length) |
| 2457 | goto enough_pages; | 2457 | goto enough_pages; |
| 2458 | if ((page_count&0x01FF) == 0) { | 2458 | if ((page_count&0x01FF) == 0) { |
| 2459 | if (page_count>(1024*512)) { | 2459 | if (page_count >= 1024 * 512) { |
| 2460 | ib_umem_release(region); | 2460 | ib_umem_release(region); |
| 2461 | pci_free_consistent(nesdev->pcidev, 4096, vpbl.pbl_vbase, | ||
| 2462 | vpbl.pbl_pbase); | ||
| 2463 | nes_free_resource(nesadapter, | 2461 | nes_free_resource(nesadapter, |
| 2464 | nesadapter->allocated_mrs, stag_index); | 2462 | nesadapter->allocated_mrs, stag_index); |
| 2465 | kfree(nesmr); | 2463 | kfree(nesmr); |
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 3ad8bd9f7543..432699d61c58 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
| @@ -15,7 +15,6 @@ if INPUT_MISC | |||
| 15 | config INPUT_PCSPKR | 15 | config INPUT_PCSPKR |
| 16 | tristate "PC Speaker support" | 16 | tristate "PC Speaker support" |
| 17 | depends on PCSPKR_PLATFORM | 17 | depends on PCSPKR_PLATFORM |
| 18 | depends on SND_PCSP=n | ||
| 19 | help | 18 | help |
| 20 | Say Y here if you want the standard PC Speaker to be used for | 19 | Say Y here if you want the standard PC Speaker to be used for |
| 21 | bells and whistles. | 20 | bells and whistles. |
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c index 8dd3942f3022..ce6fdec19e14 100644 --- a/drivers/input/mouse/appletouch.c +++ b/drivers/input/mouse/appletouch.c | |||
| @@ -589,6 +589,21 @@ static void atp_close(struct input_dev *input) | |||
| 589 | dev->open = 0; | 589 | dev->open = 0; |
| 590 | } | 590 | } |
| 591 | 591 | ||
| 592 | static int atp_handle_geyser(struct atp *dev) | ||
| 593 | { | ||
| 594 | struct usb_device *udev = dev->udev; | ||
| 595 | |||
| 596 | if (!atp_is_fountain(dev)) { | ||
| 597 | /* switch to raw sensor mode */ | ||
| 598 | if (atp_geyser_init(udev)) | ||
| 599 | return -EIO; | ||
| 600 | |||
| 601 | printk(KERN_INFO "appletouch: Geyser mode initialized.\n"); | ||
| 602 | } | ||
| 603 | |||
| 604 | return 0; | ||
| 605 | } | ||
| 606 | |||
| 592 | static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id) | 607 | static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id) |
| 593 | { | 608 | { |
| 594 | struct atp *dev; | 609 | struct atp *dev; |
| @@ -633,14 +648,6 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id | |||
| 633 | else | 648 | else |
| 634 | dev->datalen = 81; | 649 | dev->datalen = 81; |
| 635 | 650 | ||
| 636 | if (!atp_is_fountain(dev)) { | ||
| 637 | /* switch to raw sensor mode */ | ||
| 638 | if (atp_geyser_init(udev)) | ||
| 639 | goto err_free_devs; | ||
| 640 | |||
| 641 | printk(KERN_INFO "appletouch: Geyser mode initialized.\n"); | ||
| 642 | } | ||
| 643 | |||
| 644 | dev->urb = usb_alloc_urb(0, GFP_KERNEL); | 651 | dev->urb = usb_alloc_urb(0, GFP_KERNEL); |
| 645 | if (!dev->urb) | 652 | if (!dev->urb) |
| 646 | goto err_free_devs; | 653 | goto err_free_devs; |
| @@ -654,6 +661,10 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id | |||
| 654 | usb_rcvintpipe(udev, int_in_endpointAddr), | 661 | usb_rcvintpipe(udev, int_in_endpointAddr), |
| 655 | dev->data, dev->datalen, atp_complete, dev, 1); | 662 | dev->data, dev->datalen, atp_complete, dev, 1); |
| 656 | 663 | ||
| 664 | error = atp_handle_geyser(dev); | ||
| 665 | if (error) | ||
| 666 | goto err_free_buffer; | ||
| 667 | |||
| 657 | usb_make_path(udev, dev->phys, sizeof(dev->phys)); | 668 | usb_make_path(udev, dev->phys, sizeof(dev->phys)); |
| 658 | strlcat(dev->phys, "/input0", sizeof(dev->phys)); | 669 | strlcat(dev->phys, "/input0", sizeof(dev->phys)); |
| 659 | 670 | ||
| @@ -744,6 +755,20 @@ static void atp_disconnect(struct usb_interface *iface) | |||
| 744 | printk(KERN_INFO "input: appletouch disconnected\n"); | 755 | printk(KERN_INFO "input: appletouch disconnected\n"); |
| 745 | } | 756 | } |
| 746 | 757 | ||
| 758 | static int atp_recover(struct atp *dev) | ||
| 759 | { | ||
| 760 | int error; | ||
| 761 | |||
| 762 | error = atp_handle_geyser(dev); | ||
| 763 | if (error) | ||
| 764 | return error; | ||
| 765 | |||
| 766 | if (dev->open && usb_submit_urb(dev->urb, GFP_ATOMIC)) | ||
| 767 | return -EIO; | ||
| 768 | |||
| 769 | return 0; | ||
| 770 | } | ||
| 771 | |||
| 747 | static int atp_suspend(struct usb_interface *iface, pm_message_t message) | 772 | static int atp_suspend(struct usb_interface *iface, pm_message_t message) |
| 748 | { | 773 | { |
| 749 | struct atp *dev = usb_get_intfdata(iface); | 774 | struct atp *dev = usb_get_intfdata(iface); |
| @@ -764,12 +789,20 @@ static int atp_resume(struct usb_interface *iface) | |||
| 764 | return 0; | 789 | return 0; |
| 765 | } | 790 | } |
| 766 | 791 | ||
| 792 | static int atp_reset_resume(struct usb_interface *iface) | ||
| 793 | { | ||
| 794 | struct atp *dev = usb_get_intfdata(iface); | ||
| 795 | |||
| 796 | return atp_recover(dev); | ||
| 797 | } | ||
| 798 | |||
| 767 | static struct usb_driver atp_driver = { | 799 | static struct usb_driver atp_driver = { |
| 768 | .name = "appletouch", | 800 | .name = "appletouch", |
| 769 | .probe = atp_probe, | 801 | .probe = atp_probe, |
| 770 | .disconnect = atp_disconnect, | 802 | .disconnect = atp_disconnect, |
| 771 | .suspend = atp_suspend, | 803 | .suspend = atp_suspend, |
| 772 | .resume = atp_resume, | 804 | .resume = atp_resume, |
| 805 | .reset_resume = atp_reset_resume, | ||
| 773 | .id_table = atp_table, | 806 | .id_table = atp_table, |
| 774 | }; | 807 | }; |
| 775 | 808 | ||
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 9aafa96cb746..78eb7841174c 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
| @@ -193,6 +193,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { | |||
| 193 | }, | 193 | }, |
| 194 | }, | 194 | }, |
| 195 | { | 195 | { |
| 196 | .ident = "Fujitsu-Siemens Amilo Pro 2030", | ||
| 197 | .matches = { | ||
| 198 | DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), | ||
| 199 | DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"), | ||
| 200 | }, | ||
| 201 | }, | ||
| 202 | { | ||
| 196 | /* | 203 | /* |
| 197 | * No data is coming from the touchscreen unless KBC | 204 | * No data is coming from the touchscreen unless KBC |
| 198 | * is in legacy mode. | 205 | * is in legacy mode. |
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 592ff55b62d0..170f71ee5772 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
| @@ -952,8 +952,12 @@ static int i8042_resume(struct platform_device *dev) | |||
| 952 | i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS; | 952 | i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS; |
| 953 | i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT); | 953 | i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT); |
| 954 | if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { | 954 | if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { |
| 955 | printk(KERN_ERR "i8042: Can't write CTR to resume\n"); | 955 | printk(KERN_WARNING "i8042: Can't write CTR to resume, retrying...\n"); |
| 956 | return -EIO; | 956 | msleep(50); |
| 957 | if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { | ||
| 958 | printk(KERN_ERR "i8042: CTR write retry failed\n"); | ||
| 959 | return -EIO; | ||
| 960 | } | ||
| 957 | } | 961 | } |
| 958 | 962 | ||
| 959 | 963 | ||
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index 5126d5d9ea0e..2e554a4ab337 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c | |||
| @@ -176,7 +176,7 @@ void lguest_arch_run_guest(struct lg_cpu *cpu) | |||
| 176 | * we set it now, so we can trap and pass that trap to the Guest if it | 176 | * we set it now, so we can trap and pass that trap to the Guest if it |
| 177 | * uses the FPU. */ | 177 | * uses the FPU. */ |
| 178 | if (cpu->ts) | 178 | if (cpu->ts) |
| 179 | lguest_set_ts(); | 179 | unlazy_fpu(current); |
| 180 | 180 | ||
| 181 | /* SYSENTER is an optimized way of doing system calls. We can't allow | 181 | /* SYSENTER is an optimized way of doing system calls. We can't allow |
| 182 | * it because it always jumps to privilege level 0. A normal Guest | 182 | * it because it always jumps to privilege level 0. A normal Guest |
| @@ -196,6 +196,10 @@ void lguest_arch_run_guest(struct lg_cpu *cpu) | |||
| 196 | * trap made the switcher code come back, and an error code which some | 196 | * trap made the switcher code come back, and an error code which some |
| 197 | * traps set. */ | 197 | * traps set. */ |
| 198 | 198 | ||
| 199 | /* Restore SYSENTER if it's supposed to be on. */ | ||
| 200 | if (boot_cpu_has(X86_FEATURE_SEP)) | ||
| 201 | wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); | ||
| 202 | |||
| 199 | /* If the Guest page faulted, then the cr2 register will tell us the | 203 | /* If the Guest page faulted, then the cr2 register will tell us the |
| 200 | * bad virtual address. We have to grab this now, because once we | 204 | * bad virtual address. We have to grab this now, because once we |
| 201 | * re-enable interrupts an interrupt could fault and thus overwrite | 205 | * re-enable interrupts an interrupt could fault and thus overwrite |
| @@ -203,13 +207,12 @@ void lguest_arch_run_guest(struct lg_cpu *cpu) | |||
| 203 | if (cpu->regs->trapnum == 14) | 207 | if (cpu->regs->trapnum == 14) |
| 204 | cpu->arch.last_pagefault = read_cr2(); | 208 | cpu->arch.last_pagefault = read_cr2(); |
| 205 | /* Similarly, if we took a trap because the Guest used the FPU, | 209 | /* Similarly, if we took a trap because the Guest used the FPU, |
| 206 | * we have to restore the FPU it expects to see. */ | 210 | * we have to restore the FPU it expects to see. |
| 211 | * math_state_restore() may sleep and we may even move off to | ||
| 212 | * a different CPU. So all the critical stuff should be done | ||
| 213 | * before this. */ | ||
| 207 | else if (cpu->regs->trapnum == 7) | 214 | else if (cpu->regs->trapnum == 7) |
| 208 | math_state_restore(); | 215 | math_state_restore(); |
| 209 | |||
| 210 | /* Restore SYSENTER if it's supposed to be on. */ | ||
| 211 | if (boot_cpu_has(X86_FEATURE_SEP)) | ||
| 212 | wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); | ||
| 213 | } | 216 | } |
| 214 | 217 | ||
| 215 | /*H:130 Now we've examined the hypercall code; our Guest can make requests. | 218 | /*H:130 Now we've examined the hypercall code; our Guest can make requests. |
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index c34bdf852e32..818aba368541 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
| @@ -84,7 +84,7 @@ struct media_bay_info { | |||
| 84 | int cd_irq; | 84 | int cd_irq; |
| 85 | int cd_retry; | 85 | int cd_retry; |
| 86 | #endif | 86 | #endif |
| 87 | #if defined(CONFIG_BLK_DEV_IDE_PMAC) || defined(CONFIG_MAC_FLOPPY) | 87 | #if defined(CONFIG_BLK_DEV_IDE_PMAC) |
| 88 | int cd_index; | 88 | int cd_index; |
| 89 | #endif | 89 | #endif |
| 90 | }; | 90 | }; |
| @@ -417,6 +417,7 @@ static void poll_media_bay(struct media_bay_info* bay) | |||
| 417 | } | 417 | } |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | #ifdef CONFIG_BLK_DEV_IDE_PMAC | ||
| 420 | int check_media_bay(struct device_node *which_bay, int what) | 421 | int check_media_bay(struct device_node *which_bay, int what) |
| 421 | { | 422 | { |
| 422 | int i; | 423 | int i; |
| @@ -432,7 +433,6 @@ int check_media_bay(struct device_node *which_bay, int what) | |||
| 432 | } | 433 | } |
| 433 | EXPORT_SYMBOL(check_media_bay); | 434 | EXPORT_SYMBOL(check_media_bay); |
| 434 | 435 | ||
| 435 | #ifdef CONFIG_BLK_DEV_IDE_PMAC | ||
| 436 | int check_media_bay_by_base(unsigned long base, int what) | 436 | int check_media_bay_by_base(unsigned long base, int what) |
| 437 | { | 437 | { |
| 438 | int i; | 438 | int i; |
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 77ad192962c5..d86d57af282a 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
| @@ -483,12 +483,15 @@ int __init smu_init (void) | |||
| 483 | 483 | ||
| 484 | if (smu_cmdbuf_abs == 0) { | 484 | if (smu_cmdbuf_abs == 0) { |
| 485 | printk(KERN_ERR "SMU: Command buffer not allocated !\n"); | 485 | printk(KERN_ERR "SMU: Command buffer not allocated !\n"); |
| 486 | of_node_put(np); | ||
| 486 | return -EINVAL; | 487 | return -EINVAL; |
| 487 | } | 488 | } |
| 488 | 489 | ||
| 489 | smu = alloc_bootmem(sizeof(struct smu_device)); | 490 | smu = alloc_bootmem(sizeof(struct smu_device)); |
| 490 | if (smu == NULL) | 491 | if (smu == NULL) { |
| 492 | of_node_put(np); | ||
| 491 | return -ENOMEM; | 493 | return -ENOMEM; |
| 494 | } | ||
| 492 | memset(smu, 0, sizeof(*smu)); | 495 | memset(smu, 0, sizeof(*smu)); |
| 493 | 496 | ||
| 494 | spin_lock_init(&smu->lock); | 497 | spin_lock_init(&smu->lock); |
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index 54f4942a2968..5366dc93fb38 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
| @@ -562,18 +562,24 @@ thermostat_init(void) | |||
| 562 | therm_type = ADT7460; | 562 | therm_type = ADT7460; |
| 563 | else if (of_device_is_compatible(np, "adt7467")) | 563 | else if (of_device_is_compatible(np, "adt7467")) |
| 564 | therm_type = ADT7467; | 564 | therm_type = ADT7467; |
| 565 | else | 565 | else { |
| 566 | of_node_put(np); | ||
| 566 | return -ENODEV; | 567 | return -ENODEV; |
| 568 | } | ||
| 567 | 569 | ||
| 568 | prop = of_get_property(np, "hwsensor-params-version", NULL); | 570 | prop = of_get_property(np, "hwsensor-params-version", NULL); |
| 569 | printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, | 571 | printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, |
| 570 | (*prop == 1)?"":"un"); | 572 | (*prop == 1)?"":"un"); |
| 571 | if (*prop != 1) | 573 | if (*prop != 1) { |
| 574 | of_node_put(np); | ||
| 572 | return -ENODEV; | 575 | return -ENODEV; |
| 576 | } | ||
| 573 | 577 | ||
| 574 | prop = of_get_property(np, "reg", NULL); | 578 | prop = of_get_property(np, "reg", NULL); |
| 575 | if (!prop) | 579 | if (!prop) { |
| 580 | of_node_put(np); | ||
| 576 | return -ENODEV; | 581 | return -ENODEV; |
| 582 | } | ||
| 577 | 583 | ||
| 578 | /* look for bus either by path or using "reg" */ | 584 | /* look for bus either by path or using "reg" */ |
| 579 | if (strstr(np->full_name, "/i2c-bus@") != NULL) { | 585 | if (strstr(np->full_name, "/i2c-bus@") != NULL) { |
| @@ -610,6 +616,7 @@ thermostat_init(void) | |||
| 610 | 616 | ||
| 611 | if (of_dev == NULL) { | 617 | if (of_dev == NULL) { |
| 612 | printk(KERN_ERR "Can't register temperatures device !\n"); | 618 | printk(KERN_ERR "Can't register temperatures device !\n"); |
| 619 | of_node_put(np); | ||
| 613 | return -ENODEV; | 620 | return -ENODEV; |
| 614 | } | 621 | } |
| 615 | 622 | ||
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 99e0b4cdc56f..3c798ae5c343 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
| @@ -471,7 +471,6 @@ static int atl1_get_permanent_address(struct atl1_hw *hw) | |||
| 471 | memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN); | 471 | memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN); |
| 472 | return 0; | 472 | return 0; |
| 473 | } | 473 | } |
| 474 | return 1; | ||
| 475 | } | 474 | } |
| 476 | 475 | ||
| 477 | /* see if SPI FLAGS exist ? */ | 476 | /* see if SPI FLAGS exist ? */ |
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 46a90e9ec563..c05cb159c772 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c | |||
| @@ -400,26 +400,31 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data) | |||
| 400 | mutex_unlock(&priv->lock); | 400 | mutex_unlock(&priv->lock); |
| 401 | } | 401 | } |
| 402 | 402 | ||
| 403 | /* | 403 | static unsigned long msec20_to_jiffies; |
| 404 | * Wait until the PHY operation is complete. | 404 | |
| 405 | */ | 405 | static int poll_ready(struct enc28j60_net *priv, u8 reg, u8 mask, u8 val) |
| 406 | static int wait_phy_ready(struct enc28j60_net *priv) | ||
| 407 | { | 406 | { |
| 408 | unsigned long timeout = jiffies + 20 * HZ / 1000; | 407 | unsigned long timeout = jiffies + msec20_to_jiffies; |
| 409 | int ret = 1; | ||
| 410 | 408 | ||
| 411 | /* 20 msec timeout read */ | 409 | /* 20 msec timeout read */ |
| 412 | while (nolock_regb_read(priv, MISTAT) & MISTAT_BUSY) { | 410 | while ((nolock_regb_read(priv, reg) & mask) != val) { |
| 413 | if (time_after(jiffies, timeout)) { | 411 | if (time_after(jiffies, timeout)) { |
| 414 | if (netif_msg_drv(priv)) | 412 | if (netif_msg_drv(priv)) |
| 415 | printk(KERN_DEBUG DRV_NAME | 413 | dev_dbg(&priv->spi->dev, |
| 416 | ": PHY ready timeout!\n"); | 414 | "reg %02x ready timeout!\n", reg); |
| 417 | ret = 0; | 415 | return -ETIMEDOUT; |
| 418 | break; | ||
| 419 | } | 416 | } |
| 420 | cpu_relax(); | 417 | cpu_relax(); |
| 421 | } | 418 | } |
| 422 | return ret; | 419 | return 0; |
| 420 | } | ||
| 421 | |||
| 422 | /* | ||
| 423 | * Wait until the PHY operation is complete. | ||
| 424 | */ | ||
| 425 | static int wait_phy_ready(struct enc28j60_net *priv) | ||
| 426 | { | ||
| 427 | return poll_ready(priv, MISTAT, MISTAT_BUSY, 0) ? 0 : 1; | ||
| 423 | } | 428 | } |
| 424 | 429 | ||
| 425 | /* | 430 | /* |
| @@ -594,6 +599,32 @@ static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end) | |||
| 594 | nolock_regw_write(priv, ETXNDL, end); | 599 | nolock_regw_write(priv, ETXNDL, end); |
| 595 | } | 600 | } |
| 596 | 601 | ||
| 602 | /* | ||
| 603 | * Low power mode shrinks power consumption about 100x, so we'd like | ||
| 604 | * the chip to be in that mode whenever it's inactive. (However, we | ||
| 605 | * can't stay in lowpower mode during suspend with WOL active.) | ||
| 606 | */ | ||
| 607 | static void enc28j60_lowpower(struct enc28j60_net *priv, bool is_low) | ||
| 608 | { | ||
| 609 | if (netif_msg_drv(priv)) | ||
| 610 | dev_dbg(&priv->spi->dev, "%s power...\n", | ||
| 611 | is_low ? "low" : "high"); | ||
| 612 | |||
| 613 | mutex_lock(&priv->lock); | ||
| 614 | if (is_low) { | ||
| 615 | nolock_reg_bfclr(priv, ECON1, ECON1_RXEN); | ||
| 616 | poll_ready(priv, ESTAT, ESTAT_RXBUSY, 0); | ||
| 617 | poll_ready(priv, ECON1, ECON1_TXRTS, 0); | ||
| 618 | /* ECON2_VRPS was set during initialization */ | ||
| 619 | nolock_reg_bfset(priv, ECON2, ECON2_PWRSV); | ||
| 620 | } else { | ||
| 621 | nolock_reg_bfclr(priv, ECON2, ECON2_PWRSV); | ||
| 622 | poll_ready(priv, ESTAT, ESTAT_CLKRDY, ESTAT_CLKRDY); | ||
| 623 | /* caller sets ECON1_RXEN */ | ||
| 624 | } | ||
| 625 | mutex_unlock(&priv->lock); | ||
| 626 | } | ||
| 627 | |||
| 597 | static int enc28j60_hw_init(struct enc28j60_net *priv) | 628 | static int enc28j60_hw_init(struct enc28j60_net *priv) |
| 598 | { | 629 | { |
| 599 | u8 reg; | 630 | u8 reg; |
| @@ -612,8 +643,8 @@ static int enc28j60_hw_init(struct enc28j60_net *priv) | |||
| 612 | priv->tx_retry_count = 0; | 643 | priv->tx_retry_count = 0; |
| 613 | priv->max_pk_counter = 0; | 644 | priv->max_pk_counter = 0; |
| 614 | priv->rxfilter = RXFILTER_NORMAL; | 645 | priv->rxfilter = RXFILTER_NORMAL; |
| 615 | /* enable address auto increment */ | 646 | /* enable address auto increment and voltage regulator powersave */ |
| 616 | nolock_regb_write(priv, ECON2, ECON2_AUTOINC); | 647 | nolock_regb_write(priv, ECON2, ECON2_AUTOINC | ECON2_VRPS); |
| 617 | 648 | ||
| 618 | nolock_rxfifo_init(priv, RXSTART_INIT, RXEND_INIT); | 649 | nolock_rxfifo_init(priv, RXSTART_INIT, RXEND_INIT); |
| 619 | nolock_txfifo_init(priv, TXSTART_INIT, TXEND_INIT); | 650 | nolock_txfifo_init(priv, TXSTART_INIT, TXEND_INIT); |
| @@ -690,7 +721,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv) | |||
| 690 | 721 | ||
| 691 | static void enc28j60_hw_enable(struct enc28j60_net *priv) | 722 | static void enc28j60_hw_enable(struct enc28j60_net *priv) |
| 692 | { | 723 | { |
| 693 | /* enable interrutps */ | 724 | /* enable interrupts */ |
| 694 | if (netif_msg_hw(priv)) | 725 | if (netif_msg_hw(priv)) |
| 695 | printk(KERN_DEBUG DRV_NAME ": %s() enabling interrupts.\n", | 726 | printk(KERN_DEBUG DRV_NAME ": %s() enabling interrupts.\n", |
| 696 | __FUNCTION__); | 727 | __FUNCTION__); |
| @@ -726,15 +757,12 @@ enc28j60_setlink(struct net_device *ndev, u8 autoneg, u16 speed, u8 duplex) | |||
| 726 | int ret = 0; | 757 | int ret = 0; |
| 727 | 758 | ||
| 728 | if (!priv->hw_enable) { | 759 | if (!priv->hw_enable) { |
| 729 | if (autoneg == AUTONEG_DISABLE && speed == SPEED_10) { | 760 | /* link is in low power mode now; duplex setting |
| 761 | * will take effect on next enc28j60_hw_init(). | ||
| 762 | */ | ||
| 763 | if (autoneg == AUTONEG_DISABLE && speed == SPEED_10) | ||
| 730 | priv->full_duplex = (duplex == DUPLEX_FULL); | 764 | priv->full_duplex = (duplex == DUPLEX_FULL); |
| 731 | if (!enc28j60_hw_init(priv)) { | 765 | else { |
| 732 | if (netif_msg_drv(priv)) | ||
| 733 | dev_err(&ndev->dev, | ||
| 734 | "hw_reset() failed\n"); | ||
| 735 | ret = -EINVAL; | ||
| 736 | } | ||
| 737 | } else { | ||
| 738 | if (netif_msg_link(priv)) | 766 | if (netif_msg_link(priv)) |
| 739 | dev_warn(&ndev->dev, | 767 | dev_warn(&ndev->dev, |
| 740 | "unsupported link setting\n"); | 768 | "unsupported link setting\n"); |
| @@ -1307,7 +1335,8 @@ static int enc28j60_net_open(struct net_device *dev) | |||
| 1307 | } | 1335 | } |
| 1308 | return -EADDRNOTAVAIL; | 1336 | return -EADDRNOTAVAIL; |
| 1309 | } | 1337 | } |
| 1310 | /* Reset the hardware here */ | 1338 | /* Reset the hardware here (and take it out of low power mode) */ |
| 1339 | enc28j60_lowpower(priv, false); | ||
| 1311 | enc28j60_hw_disable(priv); | 1340 | enc28j60_hw_disable(priv); |
| 1312 | if (!enc28j60_hw_init(priv)) { | 1341 | if (!enc28j60_hw_init(priv)) { |
| 1313 | if (netif_msg_ifup(priv)) | 1342 | if (netif_msg_ifup(priv)) |
| @@ -1337,6 +1366,7 @@ static int enc28j60_net_close(struct net_device *dev) | |||
| 1337 | printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__); | 1366 | printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__); |
| 1338 | 1367 | ||
| 1339 | enc28j60_hw_disable(priv); | 1368 | enc28j60_hw_disable(priv); |
| 1369 | enc28j60_lowpower(priv, true); | ||
| 1340 | netif_stop_queue(dev); | 1370 | netif_stop_queue(dev); |
| 1341 | 1371 | ||
| 1342 | return 0; | 1372 | return 0; |
| @@ -1537,6 +1567,8 @@ static int __devinit enc28j60_probe(struct spi_device *spi) | |||
| 1537 | dev->watchdog_timeo = TX_TIMEOUT; | 1567 | dev->watchdog_timeo = TX_TIMEOUT; |
| 1538 | SET_ETHTOOL_OPS(dev, &enc28j60_ethtool_ops); | 1568 | SET_ETHTOOL_OPS(dev, &enc28j60_ethtool_ops); |
| 1539 | 1569 | ||
| 1570 | enc28j60_lowpower(priv, true); | ||
| 1571 | |||
| 1540 | ret = register_netdev(dev); | 1572 | ret = register_netdev(dev); |
| 1541 | if (ret) { | 1573 | if (ret) { |
| 1542 | if (netif_msg_probe(priv)) | 1574 | if (netif_msg_probe(priv)) |
| @@ -1556,7 +1588,7 @@ error_alloc: | |||
| 1556 | return ret; | 1588 | return ret; |
| 1557 | } | 1589 | } |
| 1558 | 1590 | ||
| 1559 | static int enc28j60_remove(struct spi_device *spi) | 1591 | static int __devexit enc28j60_remove(struct spi_device *spi) |
| 1560 | { | 1592 | { |
| 1561 | struct enc28j60_net *priv = dev_get_drvdata(&spi->dev); | 1593 | struct enc28j60_net *priv = dev_get_drvdata(&spi->dev); |
| 1562 | 1594 | ||
| @@ -1573,15 +1605,16 @@ static int enc28j60_remove(struct spi_device *spi) | |||
| 1573 | static struct spi_driver enc28j60_driver = { | 1605 | static struct spi_driver enc28j60_driver = { |
| 1574 | .driver = { | 1606 | .driver = { |
| 1575 | .name = DRV_NAME, | 1607 | .name = DRV_NAME, |
| 1576 | .bus = &spi_bus_type, | ||
| 1577 | .owner = THIS_MODULE, | 1608 | .owner = THIS_MODULE, |
| 1578 | }, | 1609 | }, |
| 1579 | .probe = enc28j60_probe, | 1610 | .probe = enc28j60_probe, |
| 1580 | .remove = __devexit_p(enc28j60_remove), | 1611 | .remove = __devexit_p(enc28j60_remove), |
| 1581 | }; | 1612 | }; |
| 1582 | 1613 | ||
| 1583 | static int __init enc28j60_init(void) | 1614 | static int __init enc28j60_init(void) |
| 1584 | { | 1615 | { |
| 1616 | msec20_to_jiffies = msecs_to_jiffies(20); | ||
| 1617 | |||
| 1585 | return spi_register_driver(&enc28j60_driver); | 1618 | return spi_register_driver(&enc28j60_driver); |
| 1586 | } | 1619 | } |
| 1587 | 1620 | ||
diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ibm_newemac/Kconfig index 0d3e7380bad0..70a3272ee998 100644 --- a/drivers/net/ibm_newemac/Kconfig +++ b/drivers/net/ibm_newemac/Kconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | config IBM_NEW_EMAC | 1 | config IBM_NEW_EMAC |
| 2 | tristate "IBM EMAC Ethernet support" | 2 | tristate "IBM EMAC Ethernet support" |
| 3 | depends on PPC_DCR && PPC_MERGE | 3 | depends on PPC_DCR && PPC_MERGE |
| 4 | select CRC32 | ||
| 4 | help | 5 | help |
| 5 | This driver supports the IBM EMAC family of Ethernet controllers | 6 | This driver supports the IBM EMAC family of Ethernet controllers |
| 6 | typically found on 4xx embedded PowerPC chips, but also on the | 7 | typically found on 4xx embedded PowerPC chips, but also on the |
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index 8cb29f5b1038..da4c4fb97064 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
| @@ -776,7 +776,6 @@ struct netxen_hardware_context { | |||
| 776 | 776 | ||
| 777 | u8 revision_id; | 777 | u8 revision_id; |
| 778 | u16 board_type; | 778 | u16 board_type; |
| 779 | u16 max_ports; | ||
| 780 | struct netxen_board_info boardcfg; | 779 | struct netxen_board_info boardcfg; |
| 781 | u32 xg_linkup; | 780 | u32 xg_linkup; |
| 782 | u32 qg_linksup; | 781 | u32 qg_linksup; |
| @@ -863,6 +862,7 @@ struct netxen_adapter { | |||
| 863 | unsigned char mac_addr[ETH_ALEN]; | 862 | unsigned char mac_addr[ETH_ALEN]; |
| 864 | int mtu; | 863 | int mtu; |
| 865 | int portnum; | 864 | int portnum; |
| 865 | u8 physical_port; | ||
| 866 | 866 | ||
| 867 | struct work_struct watchdog_task; | 867 | struct work_struct watchdog_task; |
| 868 | struct timer_list watchdog_timer; | 868 | struct timer_list watchdog_timer; |
| @@ -1034,7 +1034,6 @@ int netxen_rom_se(struct netxen_adapter *adapter, int addr); | |||
| 1034 | 1034 | ||
| 1035 | /* Functions from netxen_nic_isr.c */ | 1035 | /* Functions from netxen_nic_isr.c */ |
| 1036 | void netxen_initialize_adapter_sw(struct netxen_adapter *adapter); | 1036 | void netxen_initialize_adapter_sw(struct netxen_adapter *adapter); |
| 1037 | void netxen_initialize_adapter_hw(struct netxen_adapter *adapter); | ||
| 1038 | void *netxen_alloc(struct pci_dev *pdev, size_t sz, dma_addr_t * ptr, | 1037 | void *netxen_alloc(struct pci_dev *pdev, size_t sz, dma_addr_t * ptr, |
| 1039 | struct pci_dev **used_dev); | 1038 | struct pci_dev **used_dev); |
| 1040 | void netxen_initialize_adapter_ops(struct netxen_adapter *adapter); | 1039 | void netxen_initialize_adapter_ops(struct netxen_adapter *adapter); |
| @@ -1077,20 +1076,6 @@ static const struct netxen_brdinfo netxen_boards[] = { | |||
| 1077 | 1076 | ||
| 1078 | #define NUM_SUPPORTED_BOARDS ARRAY_SIZE(netxen_boards) | 1077 | #define NUM_SUPPORTED_BOARDS ARRAY_SIZE(netxen_boards) |
| 1079 | 1078 | ||
| 1080 | static inline void get_brd_port_by_type(u32 type, int *ports) | ||
| 1081 | { | ||
| 1082 | int i, found = 0; | ||
| 1083 | for (i = 0; i < NUM_SUPPORTED_BOARDS; ++i) { | ||
| 1084 | if (netxen_boards[i].brdtype == type) { | ||
| 1085 | *ports = netxen_boards[i].ports; | ||
| 1086 | found = 1; | ||
| 1087 | break; | ||
| 1088 | } | ||
| 1089 | } | ||
| 1090 | if (!found) | ||
| 1091 | *ports = 0; | ||
| 1092 | } | ||
| 1093 | |||
| 1094 | static inline void get_brd_name_by_type(u32 type, char *name) | 1079 | static inline void get_brd_name_by_type(u32 type, char *name) |
| 1095 | { | 1080 | { |
| 1096 | int i, found = 0; | 1081 | int i, found = 0; |
| @@ -1169,5 +1154,4 @@ extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, | |||
| 1169 | 1154 | ||
| 1170 | extern struct ethtool_ops netxen_nic_ethtool_ops; | 1155 | extern struct ethtool_ops netxen_nic_ethtool_ops; |
| 1171 | 1156 | ||
| 1172 | extern int physical_port[]; /* physical port # from virtual port.*/ | ||
| 1173 | #endif /* __NETXEN_NIC_H_ */ | 1157 | #endif /* __NETXEN_NIC_H_ */ |
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c index 6e98d830eefb..723487bf200c 100644 --- a/drivers/net/netxen/netxen_nic_ethtool.c +++ b/drivers/net/netxen/netxen_nic_ethtool.c | |||
| @@ -369,7 +369,7 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) | |||
| 369 | for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) { | 369 | for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) { |
| 370 | /* GB: port specific registers */ | 370 | /* GB: port specific registers */ |
| 371 | if (mode == 0 && i >= 19) | 371 | if (mode == 0 && i >= 19) |
| 372 | window = physical_port[adapter->portnum] * | 372 | window = adapter->physical_port * |
| 373 | NETXEN_NIC_PORT_WINDOW; | 373 | NETXEN_NIC_PORT_WINDOW; |
| 374 | 374 | ||
| 375 | NETXEN_NIC_LOCKED_READ_REG(niu_registers[mode]. | 375 | NETXEN_NIC_LOCKED_READ_REG(niu_registers[mode]. |
| @@ -527,7 +527,7 @@ netxen_nic_get_pauseparam(struct net_device *dev, | |||
| 527 | { | 527 | { |
| 528 | struct netxen_adapter *adapter = netdev_priv(dev); | 528 | struct netxen_adapter *adapter = netdev_priv(dev); |
| 529 | __u32 val; | 529 | __u32 val; |
| 530 | int port = physical_port[adapter->portnum]; | 530 | int port = adapter->physical_port; |
| 531 | 531 | ||
| 532 | if (adapter->ahw.board_type == NETXEN_NIC_GBE) { | 532 | if (adapter->ahw.board_type == NETXEN_NIC_GBE) { |
| 533 | if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS)) | 533 | if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS)) |
| @@ -573,7 +573,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, | |||
| 573 | { | 573 | { |
| 574 | struct netxen_adapter *adapter = netdev_priv(dev); | 574 | struct netxen_adapter *adapter = netdev_priv(dev); |
| 575 | __u32 val; | 575 | __u32 val; |
| 576 | int port = physical_port[adapter->portnum]; | 576 | int port = adapter->physical_port; |
| 577 | /* read mode */ | 577 | /* read mode */ |
| 578 | if (adapter->ahw.board_type == NETXEN_NIC_GBE) { | 578 | if (adapter->ahw.board_type == NETXEN_NIC_GBE) { |
| 579 | if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS)) | 579 | if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS)) |
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index af7356468251..c43d06b8de9b 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
| @@ -396,11 +396,8 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) | |||
| 396 | } | 396 | } |
| 397 | adapter->intr_scheme = readl( | 397 | adapter->intr_scheme = readl( |
| 398 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_FW)); | 398 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_FW)); |
| 399 | printk(KERN_NOTICE "%s: FW capabilities:0x%x\n", netxen_nic_driver_name, | ||
| 400 | adapter->intr_scheme); | ||
| 401 | adapter->msi_mode = readl( | 399 | adapter->msi_mode = readl( |
| 402 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_FW)); | 400 | NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_FW)); |
| 403 | DPRINTK(INFO, "Receive Peg ready too. starting stuff\n"); | ||
| 404 | 401 | ||
| 405 | addr = netxen_alloc(adapter->ahw.pdev, | 402 | addr = netxen_alloc(adapter->ahw.pdev, |
| 406 | sizeof(struct netxen_ring_ctx) + | 403 | sizeof(struct netxen_ring_ctx) + |
| @@ -408,8 +405,6 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) | |||
| 408 | (dma_addr_t *) & adapter->ctx_desc_phys_addr, | 405 | (dma_addr_t *) & adapter->ctx_desc_phys_addr, |
| 409 | &adapter->ctx_desc_pdev); | 406 | &adapter->ctx_desc_pdev); |
| 410 | 407 | ||
| 411 | printk(KERN_INFO "ctx_desc_phys_addr: 0x%llx\n", | ||
| 412 | (unsigned long long) adapter->ctx_desc_phys_addr); | ||
| 413 | if (addr == NULL) { | 408 | if (addr == NULL) { |
| 414 | DPRINTK(ERR, "bad return from pci_alloc_consistent\n"); | 409 | DPRINTK(ERR, "bad return from pci_alloc_consistent\n"); |
| 415 | err = -ENOMEM; | 410 | err = -ENOMEM; |
| @@ -429,8 +424,6 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) | |||
| 429 | adapter->max_tx_desc_count, | 424 | adapter->max_tx_desc_count, |
| 430 | (dma_addr_t *) & hw->cmd_desc_phys_addr, | 425 | (dma_addr_t *) & hw->cmd_desc_phys_addr, |
| 431 | &adapter->ahw.cmd_desc_pdev); | 426 | &adapter->ahw.cmd_desc_pdev); |
| 432 | printk(KERN_INFO "cmd_desc_phys_addr: 0x%llx\n", | ||
| 433 | (unsigned long long) hw->cmd_desc_phys_addr); | ||
| 434 | 427 | ||
| 435 | if (addr == NULL) { | 428 | if (addr == NULL) { |
| 436 | DPRINTK(ERR, "bad return from pci_alloc_consistent\n"); | 429 | DPRINTK(ERR, "bad return from pci_alloc_consistent\n"); |
| @@ -1032,15 +1025,15 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter) | |||
| 1032 | int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu) | 1025 | int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu) |
| 1033 | { | 1026 | { |
| 1034 | netxen_nic_write_w0(adapter, | 1027 | netxen_nic_write_w0(adapter, |
| 1035 | NETXEN_NIU_GB_MAX_FRAME_SIZE( | 1028 | NETXEN_NIU_GB_MAX_FRAME_SIZE(adapter->physical_port), |
| 1036 | physical_port[adapter->portnum]), new_mtu); | 1029 | new_mtu); |
| 1037 | return 0; | 1030 | return 0; |
| 1038 | } | 1031 | } |
| 1039 | 1032 | ||
| 1040 | int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu) | 1033 | int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu) |
| 1041 | { | 1034 | { |
| 1042 | new_mtu += NETXEN_NIU_HDRSIZE + NETXEN_NIU_TLRSIZE; | 1035 | new_mtu += NETXEN_NIU_HDRSIZE + NETXEN_NIU_TLRSIZE; |
| 1043 | if (physical_port[adapter->portnum] == 0) | 1036 | if (adapter->physical_port == 0) |
| 1044 | netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, | 1037 | netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, |
| 1045 | new_mtu); | 1038 | new_mtu); |
| 1046 | else | 1039 | else |
| @@ -1051,7 +1044,7 @@ int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu) | |||
| 1051 | 1044 | ||
| 1052 | void netxen_nic_init_niu_gb(struct netxen_adapter *adapter) | 1045 | void netxen_nic_init_niu_gb(struct netxen_adapter *adapter) |
| 1053 | { | 1046 | { |
| 1054 | netxen_niu_gbe_init_port(adapter, physical_port[adapter->portnum]); | 1047 | netxen_niu_gbe_init_port(adapter, adapter->physical_port); |
| 1055 | } | 1048 | } |
| 1056 | 1049 | ||
| 1057 | void | 1050 | void |
| @@ -1127,7 +1120,6 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter) | |||
| 1127 | 1120 | ||
| 1128 | void netxen_nic_flash_print(struct netxen_adapter *adapter) | 1121 | void netxen_nic_flash_print(struct netxen_adapter *adapter) |
| 1129 | { | 1122 | { |
| 1130 | int valid = 1; | ||
| 1131 | u32 fw_major = 0; | 1123 | u32 fw_major = 0; |
| 1132 | u32 fw_minor = 0; | 1124 | u32 fw_minor = 0; |
| 1133 | u32 fw_build = 0; | 1125 | u32 fw_build = 0; |
| @@ -1137,70 +1129,62 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter) | |||
| 1137 | __le32 *ptr32; | 1129 | __le32 *ptr32; |
| 1138 | 1130 | ||
| 1139 | struct netxen_board_info *board_info = &(adapter->ahw.boardcfg); | 1131 | struct netxen_board_info *board_info = &(adapter->ahw.boardcfg); |
| 1140 | if (board_info->magic != NETXEN_BDINFO_MAGIC) { | 1132 | |
| 1141 | printk | 1133 | adapter->driver_mismatch = 0; |
| 1142 | ("NetXen Unknown board config, Read 0x%x expected as 0x%x\n", | 1134 | |
| 1143 | board_info->magic, NETXEN_BDINFO_MAGIC); | 1135 | ptr32 = (u32 *)&serial_num; |
| 1144 | valid = 0; | 1136 | addr = NETXEN_USER_START + |
| 1145 | } | 1137 | offsetof(struct netxen_new_user_info, serial_num); |
| 1146 | if (board_info->header_version != NETXEN_BDINFO_VERSION) { | 1138 | for (i = 0; i < 8; i++) { |
| 1147 | printk("NetXen Unknown board config version." | 1139 | if (netxen_rom_fast_read(adapter, addr, ptr32) == -1) { |
| 1148 | " Read %x, expected %x\n", | 1140 | printk("%s: ERROR reading %s board userarea.\n", |
| 1149 | board_info->header_version, NETXEN_BDINFO_VERSION); | 1141 | netxen_nic_driver_name, |
| 1150 | valid = 0; | 1142 | netxen_nic_driver_name); |
| 1151 | } | 1143 | adapter->driver_mismatch = 1; |
| 1152 | if (valid) { | 1144 | return; |
| 1153 | ptr32 = (u32 *)&serial_num; | ||
| 1154 | addr = NETXEN_USER_START + | ||
| 1155 | offsetof(struct netxen_new_user_info, serial_num); | ||
| 1156 | for (i = 0; i < 8; i++) { | ||
| 1157 | if (netxen_rom_fast_read(adapter, addr, ptr32) == -1) { | ||
| 1158 | printk("%s: ERROR reading %s board userarea.\n", | ||
| 1159 | netxen_nic_driver_name, | ||
| 1160 | netxen_nic_driver_name); | ||
| 1161 | return; | ||
| 1162 | } | ||
| 1163 | ptr32++; | ||
| 1164 | addr += sizeof(u32); | ||
| 1165 | } | 1145 | } |
| 1146 | ptr32++; | ||
| 1147 | addr += sizeof(u32); | ||
| 1148 | } | ||
| 1149 | |||
| 1150 | fw_major = readl(NETXEN_CRB_NORMALIZE(adapter, | ||
| 1151 | NETXEN_FW_VERSION_MAJOR)); | ||
| 1152 | fw_minor = readl(NETXEN_CRB_NORMALIZE(adapter, | ||
| 1153 | NETXEN_FW_VERSION_MINOR)); | ||
| 1154 | fw_build = | ||
| 1155 | readl(NETXEN_CRB_NORMALIZE(adapter, NETXEN_FW_VERSION_SUB)); | ||
| 1166 | 1156 | ||
| 1157 | if (adapter->portnum == 0) { | ||
| 1167 | get_brd_name_by_type(board_info->board_type, brd_name); | 1158 | get_brd_name_by_type(board_info->board_type, brd_name); |
| 1168 | 1159 | ||
| 1169 | printk("NetXen %s Board S/N %s Chip id 0x%x\n", | 1160 | printk("NetXen %s Board S/N %s Chip id 0x%x\n", |
| 1170 | brd_name, serial_num, board_info->chip_id); | 1161 | brd_name, serial_num, board_info->chip_id); |
| 1171 | 1162 | printk("NetXen Firmware version %d.%d.%d\n", fw_major, | |
| 1172 | printk("NetXen %s Board #%d, Chip id 0x%x\n", | 1163 | fw_minor, fw_build); |
| 1173 | board_info->board_type == 0x0b ? "XGB" : "GBE", | ||
| 1174 | board_info->board_num, board_info->chip_id); | ||
| 1175 | fw_major = readl(NETXEN_CRB_NORMALIZE(adapter, | ||
| 1176 | NETXEN_FW_VERSION_MAJOR)); | ||
| 1177 | fw_minor = readl(NETXEN_CRB_NORMALIZE(adapter, | ||
| 1178 | NETXEN_FW_VERSION_MINOR)); | ||
| 1179 | fw_build = | ||
| 1180 | readl(NETXEN_CRB_NORMALIZE(adapter, NETXEN_FW_VERSION_SUB)); | ||
| 1181 | |||
| 1182 | printk("NetXen Firmware version %d.%d.%d\n", fw_major, fw_minor, | ||
| 1183 | fw_build); | ||
| 1184 | } | 1164 | } |
| 1165 | |||
| 1185 | if (fw_major != _NETXEN_NIC_LINUX_MAJOR) { | 1166 | if (fw_major != _NETXEN_NIC_LINUX_MAJOR) { |
| 1186 | printk(KERN_ERR "The mismatch in driver version and firmware " | ||
| 1187 | "version major number\n" | ||
| 1188 | "Driver version major number = %d \t" | ||
| 1189 | "Firmware version major number = %d \n", | ||
| 1190 | _NETXEN_NIC_LINUX_MAJOR, fw_major); | ||
| 1191 | adapter->driver_mismatch = 1; | 1167 | adapter->driver_mismatch = 1; |
| 1192 | } | 1168 | } |
| 1193 | if (fw_minor != _NETXEN_NIC_LINUX_MINOR && | 1169 | if (fw_minor != _NETXEN_NIC_LINUX_MINOR && |
| 1194 | fw_minor != (_NETXEN_NIC_LINUX_MINOR + 1)) { | 1170 | fw_minor != (_NETXEN_NIC_LINUX_MINOR + 1)) { |
| 1195 | printk(KERN_ERR "The mismatch in driver version and firmware " | ||
| 1196 | "version minor number\n" | ||
| 1197 | "Driver version minor number = %d \t" | ||
| 1198 | "Firmware version minor number = %d \n", | ||
| 1199 | _NETXEN_NIC_LINUX_MINOR, fw_minor); | ||
| 1200 | adapter->driver_mismatch = 1; | 1171 | adapter->driver_mismatch = 1; |
| 1201 | } | 1172 | } |
| 1202 | if (adapter->driver_mismatch) | 1173 | if (adapter->driver_mismatch) { |
| 1203 | printk(KERN_INFO "Use the driver with version no %d.%d.xxx\n", | 1174 | printk(KERN_ERR "%s: driver and firmware version mismatch\n", |
| 1204 | fw_major, fw_minor); | 1175 | adapter->netdev->name); |
| 1176 | return; | ||
| 1177 | } | ||
| 1178 | |||
| 1179 | switch (adapter->ahw.board_type) { | ||
| 1180 | case NETXEN_NIC_GBE: | ||
| 1181 | dev_info(&adapter->pdev->dev, "%s: GbE port initialized\n", | ||
| 1182 | adapter->netdev->name); | ||
| 1183 | break; | ||
| 1184 | case NETXEN_NIC_XGBE: | ||
| 1185 | dev_info(&adapter->pdev->dev, "%s: XGbE port initialized\n", | ||
| 1186 | adapter->netdev->name); | ||
| 1187 | break; | ||
| 1188 | } | ||
| 1205 | } | 1189 | } |
| 1206 | 1190 | ||
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 45fa33e0cb90..70d1b22ced22 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
| @@ -203,21 +203,6 @@ void netxen_initialize_adapter_sw(struct netxen_adapter *adapter) | |||
| 203 | } | 203 | } |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | void netxen_initialize_adapter_hw(struct netxen_adapter *adapter) | ||
| 207 | { | ||
| 208 | int ports = 0; | ||
| 209 | struct netxen_board_info *board_info = &(adapter->ahw.boardcfg); | ||
| 210 | |||
| 211 | if (netxen_nic_get_board_info(adapter) != 0) | ||
| 212 | printk("%s: Error getting board config info.\n", | ||
| 213 | netxen_nic_driver_name); | ||
| 214 | get_brd_port_by_type(board_info->board_type, &ports); | ||
| 215 | if (ports == 0) | ||
| 216 | printk(KERN_ERR "%s: Unknown board type\n", | ||
| 217 | netxen_nic_driver_name); | ||
| 218 | adapter->ahw.max_ports = ports; | ||
| 219 | } | ||
| 220 | |||
| 221 | void netxen_initialize_adapter_ops(struct netxen_adapter *adapter) | 206 | void netxen_initialize_adapter_ops(struct netxen_adapter *adapter) |
| 222 | { | 207 | { |
| 223 | switch (adapter->ahw.board_type) { | 208 | switch (adapter->ahw.board_type) { |
| @@ -765,18 +750,13 @@ int netxen_flash_unlock(struct netxen_adapter *adapter) | |||
| 765 | 750 | ||
| 766 | int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) | 751 | int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) |
| 767 | { | 752 | { |
| 768 | int addr, val, status; | 753 | int addr, val; |
| 769 | int n, i; | 754 | int n, i; |
| 770 | int init_delay = 0; | 755 | int init_delay = 0; |
| 771 | struct crb_addr_pair *buf; | 756 | struct crb_addr_pair *buf; |
| 772 | u32 off; | 757 | u32 off; |
| 773 | 758 | ||
| 774 | /* resetall */ | 759 | /* resetall */ |
| 775 | status = netxen_nic_get_board_info(adapter); | ||
| 776 | if (status) | ||
| 777 | printk("%s: netxen_pinit_from_rom: Error getting board info\n", | ||
| 778 | netxen_nic_driver_name); | ||
| 779 | |||
| 780 | netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_GLB_SW_RESET, | 760 | netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_GLB_SW_RESET, |
| 781 | NETXEN_ROMBUS_RESET); | 761 | NETXEN_ROMBUS_RESET); |
| 782 | 762 | ||
| @@ -860,10 +840,10 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) | |||
| 860 | netxen_nic_pci_change_crbwindow(adapter, 1); | 840 | netxen_nic_pci_change_crbwindow(adapter, 1); |
| 861 | } | 841 | } |
| 862 | if (init_delay == 1) { | 842 | if (init_delay == 1) { |
| 863 | msleep(2000); | 843 | msleep(1000); |
| 864 | init_delay = 0; | 844 | init_delay = 0; |
| 865 | } | 845 | } |
| 866 | msleep(20); | 846 | msleep(1); |
| 867 | } | 847 | } |
| 868 | kfree(buf); | 848 | kfree(buf); |
| 869 | 849 | ||
| @@ -938,12 +918,28 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter) | |||
| 938 | 918 | ||
| 939 | void netxen_free_adapter_offload(struct netxen_adapter *adapter) | 919 | void netxen_free_adapter_offload(struct netxen_adapter *adapter) |
| 940 | { | 920 | { |
| 921 | int i; | ||
| 922 | |||
| 941 | if (adapter->dummy_dma.addr) { | 923 | if (adapter->dummy_dma.addr) { |
| 942 | pci_free_consistent(adapter->ahw.pdev, | 924 | i = 100; |
| 925 | do { | ||
| 926 | if (dma_watchdog_shutdown_request(adapter) == 1) | ||
| 927 | break; | ||
| 928 | msleep(50); | ||
| 929 | if (dma_watchdog_shutdown_poll_result(adapter) == 1) | ||
| 930 | break; | ||
| 931 | } while (--i); | ||
| 932 | |||
| 933 | if (i) { | ||
| 934 | pci_free_consistent(adapter->ahw.pdev, | ||
| 943 | NETXEN_HOST_DUMMY_DMA_SIZE, | 935 | NETXEN_HOST_DUMMY_DMA_SIZE, |
| 944 | adapter->dummy_dma.addr, | 936 | adapter->dummy_dma.addr, |
| 945 | adapter->dummy_dma.phys_addr); | 937 | adapter->dummy_dma.phys_addr); |
| 946 | adapter->dummy_dma.addr = NULL; | 938 | adapter->dummy_dma.addr = NULL; |
| 939 | } else { | ||
| 940 | printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n", | ||
| 941 | adapter->netdev->name); | ||
| 942 | } | ||
| 947 | } | 943 | } |
| 948 | } | 944 | } |
| 949 | 945 | ||
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c index f487615f4063..96cec41f9019 100644 --- a/drivers/net/netxen/netxen_nic_isr.c +++ b/drivers/net/netxen/netxen_nic_isr.c | |||
| @@ -145,7 +145,7 @@ static void netxen_nic_isr_other(struct netxen_adapter *adapter) | |||
| 145 | 145 | ||
| 146 | /* verify the offset */ | 146 | /* verify the offset */ |
| 147 | val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); | 147 | val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); |
| 148 | val = val >> physical_port[adapter->portnum]; | 148 | val = val >> adapter->physical_port; |
| 149 | if (val == adapter->ahw.qg_linksup) | 149 | if (val == adapter->ahw.qg_linksup) |
| 150 | return; | 150 | return; |
| 151 | 151 | ||
| @@ -199,7 +199,7 @@ void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter) | |||
| 199 | 199 | ||
| 200 | /* WINDOW = 1 */ | 200 | /* WINDOW = 1 */ |
| 201 | val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); | 201 | val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); |
| 202 | val >>= (physical_port[adapter->portnum] * 8); | 202 | val >>= (adapter->physical_port * 8); |
| 203 | val &= 0xff; | 203 | val &= 0xff; |
| 204 | 204 | ||
| 205 | if (adapter->ahw.xg_linkup == 1 && val != XG_LINK_UP) { | 205 | if (adapter->ahw.xg_linkup == 1 && val != XG_LINK_UP) { |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 7144c255ce54..6797ed069f1f 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -70,17 +70,15 @@ static void netxen_nic_poll_controller(struct net_device *netdev); | |||
| 70 | static irqreturn_t netxen_intr(int irq, void *data); | 70 | static irqreturn_t netxen_intr(int irq, void *data); |
| 71 | static irqreturn_t netxen_msi_intr(int irq, void *data); | 71 | static irqreturn_t netxen_msi_intr(int irq, void *data); |
| 72 | 72 | ||
| 73 | int physical_port[] = {0, 1, 2, 3}; | ||
| 74 | |||
| 75 | /* PCI Device ID Table */ | 73 | /* PCI Device ID Table */ |
| 76 | static struct pci_device_id netxen_pci_tbl[] __devinitdata = { | 74 | static struct pci_device_id netxen_pci_tbl[] __devinitdata = { |
| 77 | {PCI_DEVICE(0x4040, 0x0001)}, | 75 | {PCI_DEVICE(0x4040, 0x0001), PCI_DEVICE_CLASS(0x020000, ~0)}, |
| 78 | {PCI_DEVICE(0x4040, 0x0002)}, | 76 | {PCI_DEVICE(0x4040, 0x0002), PCI_DEVICE_CLASS(0x020000, ~0)}, |
| 79 | {PCI_DEVICE(0x4040, 0x0003)}, | 77 | {PCI_DEVICE(0x4040, 0x0003), PCI_DEVICE_CLASS(0x020000, ~0)}, |
| 80 | {PCI_DEVICE(0x4040, 0x0004)}, | 78 | {PCI_DEVICE(0x4040, 0x0004), PCI_DEVICE_CLASS(0x020000, ~0)}, |
| 81 | {PCI_DEVICE(0x4040, 0x0005)}, | 79 | {PCI_DEVICE(0x4040, 0x0005), PCI_DEVICE_CLASS(0x020000, ~0)}, |
| 82 | {PCI_DEVICE(0x4040, 0x0024)}, | 80 | {PCI_DEVICE(0x4040, 0x0024), PCI_DEVICE_CLASS(0x020000, ~0)}, |
| 83 | {PCI_DEVICE(0x4040, 0x0025)}, | 81 | {PCI_DEVICE(0x4040, 0x0025), PCI_DEVICE_CLASS(0x020000, ~0)}, |
| 84 | {0,} | 82 | {0,} |
| 85 | }; | 83 | }; |
| 86 | 84 | ||
| @@ -288,10 +286,11 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 288 | int pci_func_id = PCI_FUNC(pdev->devfn); | 286 | int pci_func_id = PCI_FUNC(pdev->devfn); |
| 289 | DECLARE_MAC_BUF(mac); | 287 | DECLARE_MAC_BUF(mac); |
| 290 | 288 | ||
| 291 | printk(KERN_INFO "%s \n", netxen_nic_driver_string); | 289 | if (pci_func_id == 0) |
| 290 | printk(KERN_INFO "%s \n", netxen_nic_driver_string); | ||
| 292 | 291 | ||
| 293 | if (pdev->class != 0x020000) { | 292 | if (pdev->class != 0x020000) { |
| 294 | printk(KERN_ERR"NetXen function %d, class %x will not " | 293 | printk(KERN_DEBUG "NetXen function %d, class %x will not " |
| 295 | "be enabled.\n",pci_func_id, pdev->class); | 294 | "be enabled.\n",pci_func_id, pdev->class); |
| 296 | return -ENODEV; | 295 | return -ENODEV; |
| 297 | } | 296 | } |
| @@ -450,8 +449,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 450 | */ | 449 | */ |
| 451 | adapter->curr_window = 255; | 450 | adapter->curr_window = 255; |
| 452 | 451 | ||
| 453 | /* initialize the adapter */ | 452 | if (netxen_nic_get_board_info(adapter) != 0) { |
| 454 | netxen_initialize_adapter_hw(adapter); | 453 | printk("%s: Error getting board config info.\n", |
| 454 | netxen_nic_driver_name); | ||
| 455 | err = -EIO; | ||
| 456 | goto err_out_iounmap; | ||
| 457 | } | ||
| 455 | 458 | ||
| 456 | /* | 459 | /* |
| 457 | * Adapter in our case is quad port so initialize it before | 460 | * Adapter in our case is quad port so initialize it before |
| @@ -530,17 +533,15 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 530 | netxen_initialize_adapter_sw(adapter); /* initialize the buffers in adapter */ | 533 | netxen_initialize_adapter_sw(adapter); /* initialize the buffers in adapter */ |
| 531 | 534 | ||
| 532 | /* Mezz cards have PCI function 0,2,3 enabled */ | 535 | /* Mezz cards have PCI function 0,2,3 enabled */ |
| 533 | if ((adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) | 536 | switch (adapter->ahw.boardcfg.board_type) { |
| 534 | && (pci_func_id >= 2)) | 537 | case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ: |
| 538 | case NETXEN_BRDTYPE_P2_SB31_10G_HMEZ: | ||
| 539 | if (pci_func_id >= 2) | ||
| 535 | adapter->portnum = pci_func_id - 2; | 540 | adapter->portnum = pci_func_id - 2; |
| 536 | 541 | break; | |
| 537 | #ifdef CONFIG_IA64 | 542 | default: |
| 538 | if(adapter->portnum == 0) { | 543 | break; |
| 539 | netxen_pinit_from_rom(adapter, 0); | ||
| 540 | udelay(500); | ||
| 541 | netxen_load_firmware(adapter); | ||
| 542 | } | 544 | } |
| 543 | #endif | ||
| 544 | 545 | ||
| 545 | init_timer(&adapter->watchdog_timer); | 546 | init_timer(&adapter->watchdog_timer); |
| 546 | adapter->ahw.xg_linkup = 0; | 547 | adapter->ahw.xg_linkup = 0; |
| @@ -613,11 +614,18 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 613 | err = -ENODEV; | 614 | err = -ENODEV; |
| 614 | goto err_out_free_dev; | 615 | goto err_out_free_dev; |
| 615 | } | 616 | } |
| 617 | } else { | ||
| 618 | writel(0, NETXEN_CRB_NORMALIZE(adapter, | ||
| 619 | CRB_CMDPEG_STATE)); | ||
| 620 | netxen_pinit_from_rom(adapter, 0); | ||
| 621 | msleep(1); | ||
| 622 | netxen_load_firmware(adapter); | ||
| 623 | netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE); | ||
| 616 | } | 624 | } |
| 617 | 625 | ||
| 618 | /* clear the register for future unloads/loads */ | 626 | /* clear the register for future unloads/loads */ |
| 619 | writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_CAM_RAM(0x1fc))); | 627 | writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_CAM_RAM(0x1fc))); |
| 620 | printk(KERN_INFO "State: 0x%0x\n", | 628 | dev_info(&pdev->dev, "cmdpeg state: 0x%0x\n", |
| 621 | readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE))); | 629 | readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE))); |
| 622 | 630 | ||
| 623 | /* | 631 | /* |
| @@ -639,9 +647,10 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 639 | /* | 647 | /* |
| 640 | * See if the firmware gave us a virtual-physical port mapping. | 648 | * See if the firmware gave us a virtual-physical port mapping. |
| 641 | */ | 649 | */ |
| 650 | adapter->physical_port = adapter->portnum; | ||
| 642 | i = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_V2P(adapter->portnum))); | 651 | i = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_V2P(adapter->portnum))); |
| 643 | if (i != 0x55555555) | 652 | if (i != 0x55555555) |
| 644 | physical_port[adapter->portnum] = i; | 653 | adapter->physical_port = i; |
| 645 | 654 | ||
| 646 | netif_carrier_off(netdev); | 655 | netif_carrier_off(netdev); |
| 647 | netif_stop_queue(netdev); | 656 | netif_stop_queue(netdev); |
| @@ -654,22 +663,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 654 | goto err_out_free_dev; | 663 | goto err_out_free_dev; |
| 655 | } | 664 | } |
| 656 | 665 | ||
| 666 | netxen_nic_flash_print(adapter); | ||
| 657 | pci_set_drvdata(pdev, adapter); | 667 | pci_set_drvdata(pdev, adapter); |
| 658 | 668 | ||
| 659 | switch (adapter->ahw.board_type) { | ||
| 660 | case NETXEN_NIC_GBE: | ||
| 661 | printk(KERN_INFO "%s: QUAD GbE board initialized\n", | ||
| 662 | netxen_nic_driver_name); | ||
| 663 | break; | ||
| 664 | |||
| 665 | case NETXEN_NIC_XGBE: | ||
| 666 | printk(KERN_INFO "%s: XGbE board initialized\n", | ||
| 667 | netxen_nic_driver_name); | ||
| 668 | break; | ||
| 669 | } | ||
| 670 | |||
| 671 | adapter->driver_mismatch = 0; | ||
| 672 | |||
| 673 | return 0; | 669 | return 0; |
| 674 | 670 | ||
| 675 | err_out_free_dev: | 671 | err_out_free_dev: |
| @@ -760,55 +756,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) | |||
| 760 | 756 | ||
| 761 | vfree(adapter->cmd_buf_arr); | 757 | vfree(adapter->cmd_buf_arr); |
| 762 | 758 | ||
| 763 | if (adapter->portnum == 0) { | 759 | if (adapter->portnum == 0) |
| 764 | if (init_firmware_done) { | 760 | netxen_free_adapter_offload(adapter); |
| 765 | i = 100; | ||
| 766 | do { | ||
| 767 | if (dma_watchdog_shutdown_request(adapter) == 1) | ||
| 768 | break; | ||
| 769 | msleep(100); | ||
| 770 | if (dma_watchdog_shutdown_poll_result(adapter) == 1) | ||
| 771 | break; | ||
| 772 | } while (--i); | ||
| 773 | |||
| 774 | if (i == 0) | ||
| 775 | printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n", | ||
| 776 | netdev->name); | ||
| 777 | |||
| 778 | /* clear the register for future unloads/loads */ | ||
| 779 | writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_CAM_RAM(0x1fc))); | ||
| 780 | printk(KERN_INFO "State: 0x%0x\n", | ||
| 781 | readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE))); | ||
| 782 | |||
| 783 | /* leave the hw in the same state as reboot */ | ||
| 784 | writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)); | ||
| 785 | netxen_pinit_from_rom(adapter, 0); | ||
| 786 | msleep(1); | ||
| 787 | netxen_load_firmware(adapter); | ||
| 788 | netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE); | ||
| 789 | } | ||
| 790 | |||
| 791 | /* clear the register for future unloads/loads */ | ||
| 792 | writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_CAM_RAM(0x1fc))); | ||
| 793 | printk(KERN_INFO "State: 0x%0x\n", | ||
| 794 | readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE))); | ||
| 795 | |||
| 796 | i = 100; | ||
| 797 | do { | ||
| 798 | if (dma_watchdog_shutdown_request(adapter) == 1) | ||
| 799 | break; | ||
| 800 | msleep(100); | ||
| 801 | if (dma_watchdog_shutdown_poll_result(adapter) == 1) | ||
| 802 | break; | ||
| 803 | } while (--i); | ||
| 804 | |||
| 805 | if (i) { | ||
| 806 | netxen_free_adapter_offload(adapter); | ||
| 807 | } else { | ||
| 808 | printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n", | ||
| 809 | netdev->name); | ||
| 810 | } | ||
| 811 | } | ||
| 812 | 761 | ||
| 813 | if (adapter->irq) | 762 | if (adapter->irq) |
| 814 | free_irq(adapter->irq, adapter); | 763 | free_irq(adapter->irq, adapter); |
| @@ -840,13 +789,15 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 840 | irq_handler_t handler; | 789 | irq_handler_t handler; |
| 841 | unsigned long flags = IRQF_SAMPLE_RANDOM; | 790 | unsigned long flags = IRQF_SAMPLE_RANDOM; |
| 842 | 791 | ||
| 792 | if (adapter->driver_mismatch) | ||
| 793 | return -EIO; | ||
| 794 | |||
| 843 | if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC) { | 795 | if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC) { |
| 844 | err = netxen_init_firmware(adapter); | 796 | err = netxen_init_firmware(adapter); |
| 845 | if (err != 0) { | 797 | if (err != 0) { |
| 846 | printk(KERN_ERR "Failed to init firmware\n"); | 798 | printk(KERN_ERR "Failed to init firmware\n"); |
| 847 | return -EIO; | 799 | return -EIO; |
| 848 | } | 800 | } |
| 849 | netxen_nic_flash_print(adapter); | ||
| 850 | 801 | ||
| 851 | /* setup all the resources for the Phantom... */ | 802 | /* setup all the resources for the Phantom... */ |
| 852 | /* this include the descriptors for rcv, tx, and status */ | 803 | /* this include the descriptors for rcv, tx, and status */ |
| @@ -895,14 +846,12 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 895 | if (adapter->set_mtu) | 846 | if (adapter->set_mtu) |
| 896 | adapter->set_mtu(adapter, netdev->mtu); | 847 | adapter->set_mtu(adapter, netdev->mtu); |
| 897 | 848 | ||
| 898 | if (!adapter->driver_mismatch) | 849 | mod_timer(&adapter->watchdog_timer, jiffies); |
| 899 | mod_timer(&adapter->watchdog_timer, jiffies); | ||
| 900 | 850 | ||
| 901 | napi_enable(&adapter->napi); | 851 | napi_enable(&adapter->napi); |
| 902 | netxen_nic_enable_int(adapter); | 852 | netxen_nic_enable_int(adapter); |
| 903 | 853 | ||
| 904 | if (!adapter->driver_mismatch) | 854 | netif_start_queue(netdev); |
| 905 | netif_start_queue(netdev); | ||
| 906 | 855 | ||
| 907 | return 0; | 856 | return 0; |
| 908 | } | 857 | } |
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c index 1c852a76c80d..a3bc7cc67a6f 100644 --- a/drivers/net/netxen/netxen_nic_niu.c +++ b/drivers/net/netxen/netxen_nic_niu.c | |||
| @@ -94,7 +94,7 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg, | |||
| 94 | long timeout = 0; | 94 | long timeout = 0; |
| 95 | long result = 0; | 95 | long result = 0; |
| 96 | long restore = 0; | 96 | long restore = 0; |
| 97 | long phy = physical_port[adapter->portnum]; | 97 | long phy = adapter->physical_port; |
| 98 | __u32 address; | 98 | __u32 address; |
| 99 | __u32 command; | 99 | __u32 command; |
| 100 | __u32 status; | 100 | __u32 status; |
| @@ -190,7 +190,7 @@ int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long reg, | |||
| 190 | long timeout = 0; | 190 | long timeout = 0; |
| 191 | long result = 0; | 191 | long result = 0; |
| 192 | long restore = 0; | 192 | long restore = 0; |
| 193 | long phy = physical_port[adapter->portnum]; | 193 | long phy = adapter->physical_port; |
| 194 | __u32 address; | 194 | __u32 address; |
| 195 | __u32 command; | 195 | __u32 command; |
| 196 | __u32 status; | 196 | __u32 status; |
| @@ -456,7 +456,7 @@ int netxen_niu_gbe_init_port(struct netxen_adapter *adapter, int port) | |||
| 456 | 456 | ||
| 457 | int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port) | 457 | int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port) |
| 458 | { | 458 | { |
| 459 | u32 portnum = physical_port[adapter->portnum]; | 459 | u32 portnum = adapter->physical_port; |
| 460 | 460 | ||
| 461 | netxen_crb_writelit_adapter(adapter, | 461 | netxen_crb_writelit_adapter(adapter, |
| 462 | NETXEN_NIU_XGE_CONFIG_1+(0x10000*portnum), 0x1447); | 462 | NETXEN_NIU_XGE_CONFIG_1+(0x10000*portnum), 0x1447); |
| @@ -573,7 +573,7 @@ static int netxen_niu_macaddr_get(struct netxen_adapter *adapter, | |||
| 573 | { | 573 | { |
| 574 | u32 stationhigh; | 574 | u32 stationhigh; |
| 575 | u32 stationlow; | 575 | u32 stationlow; |
| 576 | int phy = physical_port[adapter->portnum]; | 576 | int phy = adapter->physical_port; |
| 577 | u8 val[8]; | 577 | u8 val[8]; |
| 578 | 578 | ||
| 579 | if (addr == NULL) | 579 | if (addr == NULL) |
| @@ -604,7 +604,7 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter, | |||
| 604 | { | 604 | { |
| 605 | u8 temp[4]; | 605 | u8 temp[4]; |
| 606 | u32 val; | 606 | u32 val; |
| 607 | int phy = physical_port[adapter->portnum]; | 607 | int phy = adapter->physical_port; |
| 608 | unsigned char mac_addr[6]; | 608 | unsigned char mac_addr[6]; |
| 609 | int i; | 609 | int i; |
| 610 | DECLARE_MAC_BUF(mac); | 610 | DECLARE_MAC_BUF(mac); |
| @@ -724,7 +724,7 @@ int netxen_niu_enable_gbe_port(struct netxen_adapter *adapter, | |||
| 724 | int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter) | 724 | int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter) |
| 725 | { | 725 | { |
| 726 | __u32 mac_cfg0; | 726 | __u32 mac_cfg0; |
| 727 | u32 port = physical_port[adapter->portnum]; | 727 | u32 port = adapter->physical_port; |
| 728 | 728 | ||
| 729 | if (port > NETXEN_NIU_MAX_GBE_PORTS) | 729 | if (port > NETXEN_NIU_MAX_GBE_PORTS) |
| 730 | return -EINVAL; | 730 | return -EINVAL; |
| @@ -740,7 +740,7 @@ int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter) | |||
| 740 | int netxen_niu_disable_xg_port(struct netxen_adapter *adapter) | 740 | int netxen_niu_disable_xg_port(struct netxen_adapter *adapter) |
| 741 | { | 741 | { |
| 742 | __u32 mac_cfg; | 742 | __u32 mac_cfg; |
| 743 | u32 port = physical_port[adapter->portnum]; | 743 | u32 port = adapter->physical_port; |
| 744 | 744 | ||
| 745 | if (port > NETXEN_NIU_MAX_XG_PORTS) | 745 | if (port > NETXEN_NIU_MAX_XG_PORTS) |
| 746 | return -EINVAL; | 746 | return -EINVAL; |
| @@ -757,7 +757,7 @@ int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, | |||
| 757 | netxen_niu_prom_mode_t mode) | 757 | netxen_niu_prom_mode_t mode) |
| 758 | { | 758 | { |
| 759 | __u32 reg; | 759 | __u32 reg; |
| 760 | u32 port = physical_port[adapter->portnum]; | 760 | u32 port = adapter->physical_port; |
| 761 | 761 | ||
| 762 | if (port > NETXEN_NIU_MAX_GBE_PORTS) | 762 | if (port > NETXEN_NIU_MAX_GBE_PORTS) |
| 763 | return -EINVAL; | 763 | return -EINVAL; |
| @@ -814,7 +814,7 @@ int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, | |||
| 814 | int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter, | 814 | int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter, |
| 815 | netxen_ethernet_macaddr_t addr) | 815 | netxen_ethernet_macaddr_t addr) |
| 816 | { | 816 | { |
| 817 | int phy = physical_port[adapter->portnum]; | 817 | int phy = adapter->physical_port; |
| 818 | u8 temp[4]; | 818 | u8 temp[4]; |
| 819 | u32 val; | 819 | u32 val; |
| 820 | 820 | ||
| @@ -867,7 +867,7 @@ int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter, | |||
| 867 | int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter, | 867 | int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter, |
| 868 | netxen_ethernet_macaddr_t * addr) | 868 | netxen_ethernet_macaddr_t * addr) |
| 869 | { | 869 | { |
| 870 | int phy = physical_port[adapter->portnum]; | 870 | int phy = adapter->physical_port; |
| 871 | u32 stationhigh; | 871 | u32 stationhigh; |
| 872 | u32 stationlow; | 872 | u32 stationlow; |
| 873 | u8 val[8]; | 873 | u8 val[8]; |
| @@ -896,7 +896,7 @@ int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter, | |||
| 896 | netxen_niu_prom_mode_t mode) | 896 | netxen_niu_prom_mode_t mode) |
| 897 | { | 897 | { |
| 898 | __u32 reg; | 898 | __u32 reg; |
| 899 | u32 port = physical_port[adapter->portnum]; | 899 | u32 port = adapter->physical_port; |
| 900 | 900 | ||
| 901 | if (port > NETXEN_NIU_MAX_XG_PORTS) | 901 | if (port > NETXEN_NIU_MAX_XG_PORTS) |
| 902 | return -EINVAL; | 902 | return -EINVAL; |
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index bafb69b6f7cb..fc6f4b8c64b3 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
| @@ -942,7 +942,7 @@ static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 942 | m->msg_namelen = 0; | 942 | m->msg_namelen = 0; |
| 943 | 943 | ||
| 944 | if (skb) { | 944 | if (skb) { |
| 945 | total_len = min(total_len, skb->len); | 945 | total_len = min_t(size_t, total_len, skb->len); |
| 946 | error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len); | 946 | error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len); |
| 947 | if (error == 0) | 947 | if (error == 0) |
| 948 | error = total_len; | 948 | error = total_len; |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 62436b3a18c6..c8a5ef2d75f4 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -118,6 +118,7 @@ static const struct pci_device_id sky2_id_table[] = { | |||
| 118 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4352) }, /* 88E8038 */ | 118 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4352) }, /* 88E8038 */ |
| 119 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4353) }, /* 88E8039 */ | 119 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4353) }, /* 88E8039 */ |
| 120 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4354) }, /* 88E8040 */ | 120 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4354) }, /* 88E8040 */ |
| 121 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4355) }, /* 88E8040T */ | ||
| 121 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4356) }, /* 88EC033 */ | 122 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4356) }, /* 88EC033 */ |
| 122 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4357) }, /* 88E8042 */ | 123 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4357) }, /* 88E8042 */ |
| 123 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x435A) }, /* 88E8048 */ | 124 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x435A) }, /* 88E8048 */ |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 0ce07a339c7e..7ab94c825b57 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -313,6 +313,21 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv, | |||
| 313 | 313 | ||
| 314 | switch (tun->flags & TUN_TYPE_MASK) { | 314 | switch (tun->flags & TUN_TYPE_MASK) { |
| 315 | case TUN_TUN_DEV: | 315 | case TUN_TUN_DEV: |
| 316 | if (tun->flags & TUN_NO_PI) { | ||
| 317 | switch (skb->data[0] & 0xf0) { | ||
| 318 | case 0x40: | ||
| 319 | pi.proto = htons(ETH_P_IP); | ||
| 320 | break; | ||
| 321 | case 0x60: | ||
| 322 | pi.proto = htons(ETH_P_IPV6); | ||
| 323 | break; | ||
| 324 | default: | ||
| 325 | tun->dev->stats.rx_dropped++; | ||
| 326 | kfree_skb(skb); | ||
| 327 | return -EINVAL; | ||
| 328 | } | ||
| 329 | } | ||
| 330 | |||
| 316 | skb_reset_mac_header(skb); | 331 | skb_reset_mac_header(skb); |
| 317 | skb->protocol = pi.proto; | 332 | skb->protocol = pi.proto; |
| 318 | skb->dev = tun->dev; | 333 | skb->dev = tun->dev; |
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index dfa4bdd5597c..d3db298c05fc 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h | |||
| @@ -630,7 +630,6 @@ struct b43_pio { | |||
| 630 | 630 | ||
| 631 | /* Context information for a noise calculation (Link Quality). */ | 631 | /* Context information for a noise calculation (Link Quality). */ |
| 632 | struct b43_noise_calculation { | 632 | struct b43_noise_calculation { |
| 633 | u8 channel_at_start; | ||
| 634 | bool calculation_running; | 633 | bool calculation_running; |
| 635 | u8 nr_samples; | 634 | u8 nr_samples; |
| 636 | s8 samples[8][4]; | 635 | s8 samples[8][4]; |
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 6dcbb3c87e72..e23f2f172bd7 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
| @@ -795,24 +795,49 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, | |||
| 795 | { | 795 | { |
| 796 | struct b43_dmaring *ring; | 796 | struct b43_dmaring *ring; |
| 797 | int err; | 797 | int err; |
| 798 | int nr_slots; | ||
| 799 | dma_addr_t dma_test; | 798 | dma_addr_t dma_test; |
| 800 | 799 | ||
| 801 | ring = kzalloc(sizeof(*ring), GFP_KERNEL); | 800 | ring = kzalloc(sizeof(*ring), GFP_KERNEL); |
| 802 | if (!ring) | 801 | if (!ring) |
| 803 | goto out; | 802 | goto out; |
| 804 | ring->type = type; | ||
| 805 | 803 | ||
| 806 | nr_slots = B43_RXRING_SLOTS; | 804 | ring->nr_slots = B43_RXRING_SLOTS; |
| 807 | if (for_tx) | 805 | if (for_tx) |
| 808 | nr_slots = B43_TXRING_SLOTS; | 806 | ring->nr_slots = B43_TXRING_SLOTS; |
| 809 | 807 | ||
| 810 | ring->meta = kcalloc(nr_slots, sizeof(struct b43_dmadesc_meta), | 808 | ring->meta = kcalloc(ring->nr_slots, sizeof(struct b43_dmadesc_meta), |
| 811 | GFP_KERNEL); | 809 | GFP_KERNEL); |
| 812 | if (!ring->meta) | 810 | if (!ring->meta) |
| 813 | goto err_kfree_ring; | 811 | goto err_kfree_ring; |
| 812 | |||
| 813 | ring->type = type; | ||
| 814 | ring->dev = dev; | ||
| 815 | ring->mmio_base = b43_dmacontroller_base(type, controller_index); | ||
| 816 | ring->index = controller_index; | ||
| 817 | if (type == B43_DMA_64BIT) | ||
| 818 | ring->ops = &dma64_ops; | ||
| 819 | else | ||
| 820 | ring->ops = &dma32_ops; | ||
| 814 | if (for_tx) { | 821 | if (for_tx) { |
| 815 | ring->txhdr_cache = kcalloc(nr_slots, | 822 | ring->tx = 1; |
| 823 | ring->current_slot = -1; | ||
| 824 | } else { | ||
| 825 | if (ring->index == 0) { | ||
| 826 | ring->rx_buffersize = B43_DMA0_RX_BUFFERSIZE; | ||
| 827 | ring->frameoffset = B43_DMA0_RX_FRAMEOFFSET; | ||
| 828 | } else if (ring->index == 3) { | ||
| 829 | ring->rx_buffersize = B43_DMA3_RX_BUFFERSIZE; | ||
| 830 | ring->frameoffset = B43_DMA3_RX_FRAMEOFFSET; | ||
| 831 | } else | ||
| 832 | B43_WARN_ON(1); | ||
| 833 | } | ||
| 834 | spin_lock_init(&ring->lock); | ||
| 835 | #ifdef CONFIG_B43_DEBUG | ||
| 836 | ring->last_injected_overflow = jiffies; | ||
| 837 | #endif | ||
| 838 | |||
| 839 | if (for_tx) { | ||
| 840 | ring->txhdr_cache = kcalloc(ring->nr_slots, | ||
| 816 | b43_txhdr_size(dev), | 841 | b43_txhdr_size(dev), |
| 817 | GFP_KERNEL); | 842 | GFP_KERNEL); |
| 818 | if (!ring->txhdr_cache) | 843 | if (!ring->txhdr_cache) |
| @@ -828,7 +853,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, | |||
| 828 | b43_txhdr_size(dev), 1)) { | 853 | b43_txhdr_size(dev), 1)) { |
| 829 | /* ugh realloc */ | 854 | /* ugh realloc */ |
| 830 | kfree(ring->txhdr_cache); | 855 | kfree(ring->txhdr_cache); |
| 831 | ring->txhdr_cache = kcalloc(nr_slots, | 856 | ring->txhdr_cache = kcalloc(ring->nr_slots, |
| 832 | b43_txhdr_size(dev), | 857 | b43_txhdr_size(dev), |
| 833 | GFP_KERNEL | GFP_DMA); | 858 | GFP_KERNEL | GFP_DMA); |
| 834 | if (!ring->txhdr_cache) | 859 | if (!ring->txhdr_cache) |
| @@ -853,32 +878,6 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, | |||
| 853 | DMA_TO_DEVICE); | 878 | DMA_TO_DEVICE); |
| 854 | } | 879 | } |
| 855 | 880 | ||
| 856 | ring->dev = dev; | ||
| 857 | ring->nr_slots = nr_slots; | ||
| 858 | ring->mmio_base = b43_dmacontroller_base(type, controller_index); | ||
| 859 | ring->index = controller_index; | ||
| 860 | if (type == B43_DMA_64BIT) | ||
| 861 | ring->ops = &dma64_ops; | ||
| 862 | else | ||
| 863 | ring->ops = &dma32_ops; | ||
| 864 | if (for_tx) { | ||
| 865 | ring->tx = 1; | ||
| 866 | ring->current_slot = -1; | ||
| 867 | } else { | ||
| 868 | if (ring->index == 0) { | ||
| 869 | ring->rx_buffersize = B43_DMA0_RX_BUFFERSIZE; | ||
| 870 | ring->frameoffset = B43_DMA0_RX_FRAMEOFFSET; | ||
| 871 | } else if (ring->index == 3) { | ||
| 872 | ring->rx_buffersize = B43_DMA3_RX_BUFFERSIZE; | ||
| 873 | ring->frameoffset = B43_DMA3_RX_FRAMEOFFSET; | ||
| 874 | } else | ||
| 875 | B43_WARN_ON(1); | ||
| 876 | } | ||
| 877 | spin_lock_init(&ring->lock); | ||
| 878 | #ifdef CONFIG_B43_DEBUG | ||
| 879 | ring->last_injected_overflow = jiffies; | ||
| 880 | #endif | ||
| 881 | |||
| 882 | err = alloc_ringmemory(ring); | 881 | err = alloc_ringmemory(ring); |
| 883 | if (err) | 882 | if (err) |
| 884 | goto err_kfree_txhdr_cache; | 883 | goto err_kfree_txhdr_cache; |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 6c3d9ea0a9f8..fa4b0d8b74a2 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
| @@ -1145,7 +1145,6 @@ static void b43_generate_noise_sample(struct b43_wldev *dev) | |||
| 1145 | b43_jssi_write(dev, 0x7F7F7F7F); | 1145 | b43_jssi_write(dev, 0x7F7F7F7F); |
| 1146 | b43_write32(dev, B43_MMIO_MACCMD, | 1146 | b43_write32(dev, B43_MMIO_MACCMD, |
| 1147 | b43_read32(dev, B43_MMIO_MACCMD) | B43_MACCMD_BGNOISE); | 1147 | b43_read32(dev, B43_MMIO_MACCMD) | B43_MACCMD_BGNOISE); |
| 1148 | B43_WARN_ON(dev->noisecalc.channel_at_start != dev->phy.channel); | ||
| 1149 | } | 1148 | } |
| 1150 | 1149 | ||
| 1151 | static void b43_calculate_link_quality(struct b43_wldev *dev) | 1150 | static void b43_calculate_link_quality(struct b43_wldev *dev) |
| @@ -1154,7 +1153,6 @@ static void b43_calculate_link_quality(struct b43_wldev *dev) | |||
| 1154 | 1153 | ||
| 1155 | if (dev->noisecalc.calculation_running) | 1154 | if (dev->noisecalc.calculation_running) |
| 1156 | return; | 1155 | return; |
| 1157 | dev->noisecalc.channel_at_start = dev->phy.channel; | ||
| 1158 | dev->noisecalc.calculation_running = 1; | 1156 | dev->noisecalc.calculation_running = 1; |
| 1159 | dev->noisecalc.nr_samples = 0; | 1157 | dev->noisecalc.nr_samples = 0; |
| 1160 | 1158 | ||
| @@ -1171,9 +1169,16 @@ static void handle_irq_noise(struct b43_wldev *dev) | |||
| 1171 | 1169 | ||
| 1172 | /* Bottom half of Link Quality calculation. */ | 1170 | /* Bottom half of Link Quality calculation. */ |
| 1173 | 1171 | ||
| 1172 | /* Possible race condition: It might be possible that the user | ||
| 1173 | * changed to a different channel in the meantime since we | ||
| 1174 | * started the calculation. We ignore that fact, since it's | ||
| 1175 | * not really that much of a problem. The background noise is | ||
| 1176 | * an estimation only anyway. Slightly wrong results will get damped | ||
| 1177 | * by the averaging of the 8 sample rounds. Additionally the | ||
| 1178 | * value is shortlived. So it will be replaced by the next noise | ||
| 1179 | * calculation round soon. */ | ||
| 1180 | |||
| 1174 | B43_WARN_ON(!dev->noisecalc.calculation_running); | 1181 | B43_WARN_ON(!dev->noisecalc.calculation_running); |
| 1175 | if (dev->noisecalc.channel_at_start != phy->channel) | ||
| 1176 | goto drop_calculation; | ||
| 1177 | *((__le32 *)noise) = cpu_to_le32(b43_jssi_read(dev)); | 1182 | *((__le32 *)noise) = cpu_to_le32(b43_jssi_read(dev)); |
| 1178 | if (noise[0] == 0x7F || noise[1] == 0x7F || | 1183 | if (noise[0] == 0x7F || noise[1] == 0x7F || |
| 1179 | noise[2] == 0x7F || noise[3] == 0x7F) | 1184 | noise[2] == 0x7F || noise[3] == 0x7F) |
| @@ -1214,11 +1219,10 @@ static void handle_irq_noise(struct b43_wldev *dev) | |||
| 1214 | average -= 48; | 1219 | average -= 48; |
| 1215 | 1220 | ||
| 1216 | dev->stats.link_noise = average; | 1221 | dev->stats.link_noise = average; |
| 1217 | drop_calculation: | ||
| 1218 | dev->noisecalc.calculation_running = 0; | 1222 | dev->noisecalc.calculation_running = 0; |
| 1219 | return; | 1223 | return; |
| 1220 | } | 1224 | } |
| 1221 | generate_new: | 1225 | generate_new: |
| 1222 | b43_generate_noise_sample(dev); | 1226 | b43_generate_noise_sample(dev); |
| 1223 | } | 1227 | } |
| 1224 | 1228 | ||
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig index ab1029e79884..2d611876bbe0 100644 --- a/drivers/net/wireless/rt2x00/Kconfig +++ b/drivers/net/wireless/rt2x00/Kconfig | |||
| @@ -32,12 +32,13 @@ config RT2X00_LIB_FIRMWARE | |||
| 32 | config RT2X00_LIB_RFKILL | 32 | config RT2X00_LIB_RFKILL |
| 33 | boolean | 33 | boolean |
| 34 | depends on RT2X00_LIB | 34 | depends on RT2X00_LIB |
| 35 | depends on INPUT | ||
| 35 | select RFKILL | 36 | select RFKILL |
| 36 | select INPUT_POLLDEV | 37 | select INPUT_POLLDEV |
| 37 | 38 | ||
| 38 | config RT2X00_LIB_LEDS | 39 | config RT2X00_LIB_LEDS |
| 39 | boolean | 40 | boolean |
| 40 | depends on RT2X00_LIB | 41 | depends on RT2X00_LIB && NEW_LEDS |
| 41 | 42 | ||
| 42 | config RT2400PCI | 43 | config RT2400PCI |
| 43 | tristate "Ralink rt2400 pci/pcmcia support" | 44 | tristate "Ralink rt2400 pci/pcmcia support" |
| @@ -51,7 +52,7 @@ config RT2400PCI | |||
| 51 | 52 | ||
| 52 | config RT2400PCI_RFKILL | 53 | config RT2400PCI_RFKILL |
| 53 | bool "RT2400 rfkill support" | 54 | bool "RT2400 rfkill support" |
| 54 | depends on RT2400PCI | 55 | depends on RT2400PCI && INPUT |
| 55 | select RT2X00_LIB_RFKILL | 56 | select RT2X00_LIB_RFKILL |
| 56 | ---help--- | 57 | ---help--- |
| 57 | This adds support for integrated rt2400 devices that feature a | 58 | This adds support for integrated rt2400 devices that feature a |
| @@ -60,7 +61,7 @@ config RT2400PCI_RFKILL | |||
| 60 | 61 | ||
| 61 | config RT2400PCI_LEDS | 62 | config RT2400PCI_LEDS |
| 62 | bool "RT2400 leds support" | 63 | bool "RT2400 leds support" |
| 63 | depends on RT2400PCI | 64 | depends on RT2400PCI && NEW_LEDS |
| 64 | select LEDS_CLASS | 65 | select LEDS_CLASS |
| 65 | select RT2X00_LIB_LEDS | 66 | select RT2X00_LIB_LEDS |
| 66 | ---help--- | 67 | ---help--- |
| @@ -78,7 +79,7 @@ config RT2500PCI | |||
| 78 | 79 | ||
| 79 | config RT2500PCI_RFKILL | 80 | config RT2500PCI_RFKILL |
| 80 | bool "RT2500 rfkill support" | 81 | bool "RT2500 rfkill support" |
| 81 | depends on RT2500PCI | 82 | depends on RT2500PCI && INPUT |
| 82 | select RT2X00_LIB_RFKILL | 83 | select RT2X00_LIB_RFKILL |
| 83 | ---help--- | 84 | ---help--- |
| 84 | This adds support for integrated rt2500 devices that feature a | 85 | This adds support for integrated rt2500 devices that feature a |
| @@ -87,7 +88,7 @@ config RT2500PCI_RFKILL | |||
| 87 | 88 | ||
| 88 | config RT2500PCI_LEDS | 89 | config RT2500PCI_LEDS |
| 89 | bool "RT2500 leds support" | 90 | bool "RT2500 leds support" |
| 90 | depends on RT2500PCI | 91 | depends on RT2500PCI && NEW_LEDS |
| 91 | select LEDS_CLASS | 92 | select LEDS_CLASS |
| 92 | select RT2X00_LIB_LEDS | 93 | select RT2X00_LIB_LEDS |
| 93 | ---help--- | 94 | ---help--- |
| @@ -107,7 +108,7 @@ config RT61PCI | |||
| 107 | 108 | ||
| 108 | config RT61PCI_RFKILL | 109 | config RT61PCI_RFKILL |
| 109 | bool "RT61 rfkill support" | 110 | bool "RT61 rfkill support" |
| 110 | depends on RT61PCI | 111 | depends on RT61PCI && INPUT |
| 111 | select RT2X00_LIB_RFKILL | 112 | select RT2X00_LIB_RFKILL |
| 112 | ---help--- | 113 | ---help--- |
| 113 | This adds support for integrated rt61 devices that feature a | 114 | This adds support for integrated rt61 devices that feature a |
| @@ -116,7 +117,7 @@ config RT61PCI_RFKILL | |||
| 116 | 117 | ||
| 117 | config RT61PCI_LEDS | 118 | config RT61PCI_LEDS |
| 118 | bool "RT61 leds support" | 119 | bool "RT61 leds support" |
| 119 | depends on RT61PCI | 120 | depends on RT61PCI && NEW_LEDS |
| 120 | select LEDS_CLASS | 121 | select LEDS_CLASS |
| 121 | select RT2X00_LIB_LEDS | 122 | select RT2X00_LIB_LEDS |
| 122 | ---help--- | 123 | ---help--- |
| @@ -133,7 +134,7 @@ config RT2500USB | |||
| 133 | 134 | ||
| 134 | config RT2500USB_LEDS | 135 | config RT2500USB_LEDS |
| 135 | bool "RT2500 leds support" | 136 | bool "RT2500 leds support" |
| 136 | depends on RT2500USB | 137 | depends on RT2500USB && NEW_LEDS |
| 137 | select LEDS_CLASS | 138 | select LEDS_CLASS |
| 138 | select RT2X00_LIB_LEDS | 139 | select RT2X00_LIB_LEDS |
| 139 | ---help--- | 140 | ---help--- |
| @@ -152,7 +153,7 @@ config RT73USB | |||
| 152 | 153 | ||
| 153 | config RT73USB_LEDS | 154 | config RT73USB_LEDS |
| 154 | bool "RT73 leds support" | 155 | bool "RT73 leds support" |
| 155 | depends on RT73USB | 156 | depends on RT73USB && NEW_LEDS |
| 156 | select LEDS_CLASS | 157 | select LEDS_CLASS |
| 157 | select RT2X00_LIB_LEDS | 158 | select RT2X00_LIB_LEDS |
| 158 | ---help--- | 159 | ---help--- |
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 971af2546b59..60893de3bf8f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
| @@ -412,8 +412,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) | |||
| 412 | if (pci_set_mwi(pci_dev)) | 412 | if (pci_set_mwi(pci_dev)) |
| 413 | ERROR_PROBE("MWI not available.\n"); | 413 | ERROR_PROBE("MWI not available.\n"); |
| 414 | 414 | ||
| 415 | if (pci_set_dma_mask(pci_dev, DMA_64BIT_MASK) && | 415 | if (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { |
| 416 | pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { | ||
| 417 | ERROR_PROBE("PCI DMA not supported.\n"); | 416 | ERROR_PROBE("PCI DMA not supported.\n"); |
| 418 | retval = -EIO; | 417 | retval = -EIO; |
| 419 | goto exit_disable_device; | 418 | goto exit_disable_device; |
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 5a331674dcb2..e5ceae805b57 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c | |||
| @@ -362,6 +362,12 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev) | |||
| 362 | } | 362 | } |
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | /* | ||
| 366 | * Kill guardian urb (if required by driver). | ||
| 367 | */ | ||
| 368 | if (!test_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags)) | ||
| 369 | return; | ||
| 370 | |||
| 365 | for (i = 0; i < rt2x00dev->bcn->limit; i++) { | 371 | for (i = 0; i < rt2x00dev->bcn->limit; i++) { |
| 366 | priv_bcn = rt2x00dev->bcn->entries[i].priv_data; | 372 | priv_bcn = rt2x00dev->bcn->entries[i].priv_data; |
| 367 | usb_kill_urb(priv_bcn->urb); | 373 | usb_kill_urb(priv_bcn->urb); |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index da19a3a91f4d..fff8386e816b 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -2131,6 +2131,7 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
| 2131 | /* D-Link */ | 2131 | /* D-Link */ |
| 2132 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, | 2132 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2133 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, | 2133 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2134 | { USB_DEVICE(0x07d1, 0x3c06), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
| 2134 | { USB_DEVICE(0x07d1, 0x3c07), USB_DEVICE_DATA(&rt73usb_ops) }, | 2135 | { USB_DEVICE(0x07d1, 0x3c07), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2135 | /* Gemtek */ | 2136 | /* Gemtek */ |
| 2136 | { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) }, | 2137 | { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) }, |
diff --git a/drivers/scsi/dpt/dptsig.h b/drivers/scsi/dpt/dptsig.h index 72c8992fdf21..a6644b332b53 100644 --- a/drivers/scsi/dpt/dptsig.h +++ b/drivers/scsi/dpt/dptsig.h | |||
| @@ -85,7 +85,7 @@ typedef unsigned int sigINT; | |||
| 85 | /* ------------------------------------------------------------------ */ | 85 | /* ------------------------------------------------------------------ */ |
| 86 | /* What type of processor the file is meant to run on. */ | 86 | /* What type of processor the file is meant to run on. */ |
| 87 | /* This will let us know whether to read sigWORDs as high/low or low/high. */ | 87 | /* This will let us know whether to read sigWORDs as high/low or low/high. */ |
| 88 | #define PROC_INTEL 0x00 /* Intel 80x86 */ | 88 | #define PROC_INTEL 0x00 /* Intel 80x86/ia64 */ |
| 89 | #define PROC_MOTOROLA 0x01 /* Motorola 68K */ | 89 | #define PROC_MOTOROLA 0x01 /* Motorola 68K */ |
| 90 | #define PROC_MIPS4000 0x02 /* MIPS RISC 4000 */ | 90 | #define PROC_MIPS4000 0x02 /* MIPS RISC 4000 */ |
| 91 | #define PROC_ALPHA 0x03 /* DEC Alpha */ | 91 | #define PROC_ALPHA 0x03 /* DEC Alpha */ |
| @@ -104,6 +104,7 @@ typedef unsigned int sigINT; | |||
| 104 | #define PROC_486 0x08 /* Intel 80486 */ | 104 | #define PROC_486 0x08 /* Intel 80486 */ |
| 105 | #define PROC_PENTIUM 0x10 /* Intel 586 aka P5 aka Pentium */ | 105 | #define PROC_PENTIUM 0x10 /* Intel 586 aka P5 aka Pentium */ |
| 106 | #define PROC_SEXIUM 0x20 /* Intel 686 aka P6 aka Pentium Pro or MMX */ | 106 | #define PROC_SEXIUM 0x20 /* Intel 686 aka P6 aka Pentium Pro or MMX */ |
| 107 | #define PROC_IA64 0x40 /* Intel IA64 processor */ | ||
| 107 | 108 | ||
| 108 | /* PROC_i960: */ | 109 | /* PROC_i960: */ |
| 109 | #define PROC_960RX 0x01 /* Intel 80960RC/RD */ | 110 | #define PROC_960RX 0x01 /* Intel 80960RC/RD */ |
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 3690360d7a79..c6457bfc8a49 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
| @@ -456,6 +456,10 @@ static int __scsi_host_match(struct device *dev, void *data) | |||
| 456 | * | 456 | * |
| 457 | * Return value: | 457 | * Return value: |
| 458 | * A pointer to located Scsi_Host or NULL. | 458 | * A pointer to located Scsi_Host or NULL. |
| 459 | * | ||
| 460 | * The caller must do a scsi_host_put() to drop the reference | ||
| 461 | * that scsi_host_get() took. The put_device() below dropped | ||
| 462 | * the reference from class_find_device(). | ||
| 459 | **/ | 463 | **/ |
| 460 | struct Scsi_Host *scsi_host_lookup(unsigned short hostnum) | 464 | struct Scsi_Host *scsi_host_lookup(unsigned short hostnum) |
| 461 | { | 465 | { |
| @@ -463,9 +467,10 @@ struct Scsi_Host *scsi_host_lookup(unsigned short hostnum) | |||
| 463 | struct Scsi_Host *shost = ERR_PTR(-ENXIO); | 467 | struct Scsi_Host *shost = ERR_PTR(-ENXIO); |
| 464 | 468 | ||
| 465 | cdev = class_find_device(&shost_class, &hostnum, __scsi_host_match); | 469 | cdev = class_find_device(&shost_class, &hostnum, __scsi_host_match); |
| 466 | if (cdev) | 470 | if (cdev) { |
| 467 | shost = scsi_host_get(class_to_shost(cdev)); | 471 | shost = scsi_host_get(class_to_shost(cdev)); |
| 468 | 472 | put_device(cdev); | |
| 473 | } | ||
| 469 | return shost; | 474 | return shost; |
| 470 | } | 475 | } |
| 471 | EXPORT_SYMBOL(scsi_host_lookup); | 476 | EXPORT_SYMBOL(scsi_host_lookup); |
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 7ee86d4a7618..c82df8bd4d89 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -178,6 +178,9 @@ int sr_test_unit_ready(struct scsi_device *sdev, struct scsi_sense_hdr *sshdr) | |||
| 178 | the_result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, | 178 | the_result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, |
| 179 | 0, sshdr, SR_TIMEOUT, | 179 | 0, sshdr, SR_TIMEOUT, |
| 180 | retries--); | 180 | retries--); |
| 181 | if (scsi_sense_valid(sshdr) && | ||
| 182 | sshdr->sense_key == UNIT_ATTENTION) | ||
| 183 | sdev->changed = 1; | ||
| 181 | 184 | ||
| 182 | } while (retries > 0 && | 185 | } while (retries > 0 && |
| 183 | (!scsi_status_is_good(the_result) || | 186 | (!scsi_status_is_good(the_result) || |
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index f20952c43cb8..fd9bb777df28 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #define DMA_RX_YCOUNT (PAGE_SIZE / DMA_RX_XCOUNT) | 49 | #define DMA_RX_YCOUNT (PAGE_SIZE / DMA_RX_XCOUNT) |
| 50 | 50 | ||
| 51 | #define DMA_RX_FLUSH_JIFFIES (HZ / 50) | 51 | #define DMA_RX_FLUSH_JIFFIES (HZ / 50) |
| 52 | #define CTS_CHECK_JIFFIES (HZ / 50) | ||
| 52 | 53 | ||
| 53 | #ifdef CONFIG_SERIAL_BFIN_DMA | 54 | #ifdef CONFIG_SERIAL_BFIN_DMA |
| 54 | static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart); | 55 | static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart); |
| @@ -290,11 +291,6 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart) | |||
| 290 | { | 291 | { |
| 291 | struct circ_buf *xmit = &uart->port.info->xmit; | 292 | struct circ_buf *xmit = &uart->port.info->xmit; |
| 292 | 293 | ||
| 293 | if (uart->port.x_char) { | ||
| 294 | UART_PUT_CHAR(uart, uart->port.x_char); | ||
| 295 | uart->port.icount.tx++; | ||
| 296 | uart->port.x_char = 0; | ||
| 297 | } | ||
| 298 | /* | 294 | /* |
| 299 | * Check the modem control lines before | 295 | * Check the modem control lines before |
| 300 | * transmitting anything. | 296 | * transmitting anything. |
| @@ -306,6 +302,12 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart) | |||
| 306 | return; | 302 | return; |
| 307 | } | 303 | } |
| 308 | 304 | ||
| 305 | if (uart->port.x_char) { | ||
| 306 | UART_PUT_CHAR(uart, uart->port.x_char); | ||
| 307 | uart->port.icount.tx++; | ||
| 308 | uart->port.x_char = 0; | ||
| 309 | } | ||
| 310 | |||
| 309 | while ((UART_GET_LSR(uart) & THRE) && xmit->tail != xmit->head) { | 311 | while ((UART_GET_LSR(uart) & THRE) && xmit->tail != xmit->head) { |
| 310 | UART_PUT_CHAR(uart, xmit->buf[xmit->tail]); | 312 | UART_PUT_CHAR(uart, xmit->buf[xmit->tail]); |
| 311 | xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); | 313 | xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); |
| @@ -345,15 +347,6 @@ static irqreturn_t bfin_serial_tx_int(int irq, void *dev_id) | |||
| 345 | } | 347 | } |
| 346 | #endif | 348 | #endif |
| 347 | 349 | ||
| 348 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS | ||
| 349 | static void bfin_serial_do_work(struct work_struct *work) | ||
| 350 | { | ||
| 351 | struct bfin_serial_port *uart = container_of(work, struct bfin_serial_port, cts_workqueue); | ||
| 352 | |||
| 353 | bfin_serial_mctrl_check(uart); | ||
| 354 | } | ||
| 355 | #endif | ||
| 356 | |||
| 357 | #ifdef CONFIG_SERIAL_BFIN_DMA | 350 | #ifdef CONFIG_SERIAL_BFIN_DMA |
| 358 | static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart) | 351 | static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart) |
| 359 | { | 352 | { |
| @@ -361,6 +354,12 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart) | |||
| 361 | 354 | ||
| 362 | uart->tx_done = 0; | 355 | uart->tx_done = 0; |
| 363 | 356 | ||
| 357 | /* | ||
| 358 | * Check the modem control lines before | ||
| 359 | * transmitting anything. | ||
| 360 | */ | ||
| 361 | bfin_serial_mctrl_check(uart); | ||
| 362 | |||
| 364 | if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) { | 363 | if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) { |
| 365 | uart->tx_count = 0; | 364 | uart->tx_count = 0; |
| 366 | uart->tx_done = 1; | 365 | uart->tx_done = 1; |
| @@ -373,12 +372,6 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart) | |||
| 373 | uart->port.x_char = 0; | 372 | uart->port.x_char = 0; |
| 374 | } | 373 | } |
| 375 | 374 | ||
| 376 | /* | ||
| 377 | * Check the modem control lines before | ||
| 378 | * transmitting anything. | ||
| 379 | */ | ||
| 380 | bfin_serial_mctrl_check(uart); | ||
| 381 | |||
| 382 | uart->tx_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE); | 375 | uart->tx_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE); |
| 383 | if (uart->tx_count > (UART_XMIT_SIZE - xmit->tail)) | 376 | if (uart->tx_count > (UART_XMIT_SIZE - xmit->tail)) |
| 384 | uart->tx_count = UART_XMIT_SIZE - xmit->tail; | 377 | uart->tx_count = UART_XMIT_SIZE - xmit->tail; |
| @@ -565,7 +558,10 @@ static void bfin_serial_mctrl_check(struct bfin_serial_port *uart) | |||
| 565 | uart_handle_cts_change(&uart->port, status & TIOCM_CTS); | 558 | uart_handle_cts_change(&uart->port, status & TIOCM_CTS); |
| 566 | if (!(status & TIOCM_CTS)) { | 559 | if (!(status & TIOCM_CTS)) { |
| 567 | tty->hw_stopped = 1; | 560 | tty->hw_stopped = 1; |
| 568 | schedule_work(&uart->cts_workqueue); | 561 | uart->cts_timer.data = (unsigned long)(uart); |
| 562 | uart->cts_timer.function = (void *)bfin_serial_mctrl_check; | ||
| 563 | uart->cts_timer.expires = jiffies + CTS_CHECK_JIFFIES; | ||
| 564 | add_timer(&(uart->cts_timer)); | ||
| 569 | } else { | 565 | } else { |
| 570 | tty->hw_stopped = 0; | 566 | tty->hw_stopped = 0; |
| 571 | } | 567 | } |
| @@ -885,7 +881,7 @@ static void __init bfin_serial_init_ports(void) | |||
| 885 | init_timer(&(bfin_serial_ports[i].rx_dma_timer)); | 881 | init_timer(&(bfin_serial_ports[i].rx_dma_timer)); |
| 886 | #endif | 882 | #endif |
| 887 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS | 883 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS |
| 888 | INIT_WORK(&bfin_serial_ports[i].cts_workqueue, bfin_serial_do_work); | 884 | init_timer(&(bfin_serial_ports[i].cts_timer)); |
| 889 | bfin_serial_ports[i].cts_pin = | 885 | bfin_serial_ports[i].cts_pin = |
| 890 | bfin_serial_resource[i].uart_cts_pin; | 886 | bfin_serial_resource[i].uart_cts_pin; |
| 891 | bfin_serial_ports[i].rts_pin = | 887 | bfin_serial_ports[i].rts_pin = |
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 7cf8851286b5..d184f2aea78d 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
| @@ -1168,15 +1168,21 @@ EXPORT_SYMBOL(ssb_dma_translation); | |||
| 1168 | int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask) | 1168 | int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask) |
| 1169 | { | 1169 | { |
| 1170 | struct device *dma_dev = ssb_dev->dma_dev; | 1170 | struct device *dma_dev = ssb_dev->dma_dev; |
| 1171 | int err = 0; | ||
| 1171 | 1172 | ||
| 1172 | #ifdef CONFIG_SSB_PCIHOST | 1173 | #ifdef CONFIG_SSB_PCIHOST |
| 1173 | if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) | 1174 | if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) { |
| 1174 | return dma_set_mask(dma_dev, mask); | 1175 | err = pci_set_dma_mask(ssb_dev->bus->host_pci, mask); |
| 1176 | if (err) | ||
| 1177 | return err; | ||
| 1178 | err = pci_set_consistent_dma_mask(ssb_dev->bus->host_pci, mask); | ||
| 1179 | return err; | ||
| 1180 | } | ||
| 1175 | #endif | 1181 | #endif |
| 1176 | dma_dev->coherent_dma_mask = mask; | 1182 | dma_dev->coherent_dma_mask = mask; |
| 1177 | dma_dev->dma_mask = &dma_dev->coherent_dma_mask; | 1183 | dma_dev->dma_mask = &dma_dev->coherent_dma_mask; |
| 1178 | 1184 | ||
| 1179 | return 0; | 1185 | return err; |
| 1180 | } | 1186 | } |
| 1181 | EXPORT_SYMBOL(ssb_dma_set_mask); | 1187 | EXPORT_SYMBOL(ssb_dma_set_mask); |
| 1182 | 1188 | ||
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 3da1ab4b389d..c070b34b669d 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c | |||
| @@ -47,6 +47,9 @@ static const struct usb_device_id usb_quirk_list[] = { | |||
| 47 | /* Edirol SD-20 */ | 47 | /* Edirol SD-20 */ |
| 48 | { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME }, | 48 | { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME }, |
| 49 | 49 | ||
| 50 | /* appletouch */ | ||
| 51 | { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME }, | ||
| 52 | |||
| 50 | /* Avision AV600U */ | 53 | /* Avision AV600U */ |
| 51 | { USB_DEVICE(0x0638, 0x0a13), .driver_info = | 54 | { USB_DEVICE(0x0638, 0x0a13), .driver_info = |
| 52 | USB_QUIRK_STRING_FETCH_255 }, | 55 | USB_QUIRK_STRING_FETCH_255 }, |
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 6a63535fc04d..eaa3f2a79ff5 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
| @@ -140,49 +140,53 @@ static struct pci_device_id hpwdt_devices[] = { | |||
| 140 | }; | 140 | }; |
| 141 | MODULE_DEVICE_TABLE(pci, hpwdt_devices); | 141 | MODULE_DEVICE_TABLE(pci, hpwdt_devices); |
| 142 | 142 | ||
| 143 | extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, unsigned long *pRomEntry); | ||
| 144 | |||
| 143 | #ifndef CONFIG_X86_64 | 145 | #ifndef CONFIG_X86_64 |
| 144 | /* --32 Bit Bios------------------------------------------------------------ */ | 146 | /* --32 Bit Bios------------------------------------------------------------ */ |
| 145 | 147 | ||
| 146 | #define HPWDT_ARCH 32 | 148 | #define HPWDT_ARCH 32 |
| 147 | 149 | ||
| 148 | static void asminline_call(struct cmn_registers *pi86Regs, | 150 | asm(".text \n\t" |
| 149 | unsigned long *pRomEntry) | 151 | ".align 4 \n" |
| 150 | { | 152 | "asminline_call: \n\t" |
| 151 | asm("pushl %ebp \n\t" | 153 | "pushl %ebp \n\t" |
| 152 | "movl %esp, %ebp \n\t" | 154 | "movl %esp, %ebp \n\t" |
| 153 | "pusha \n\t" | 155 | "pusha \n\t" |
| 154 | "pushf \n\t" | 156 | "pushf \n\t" |
| 155 | "push %es \n\t" | 157 | "push %es \n\t" |
| 156 | "push %ds \n\t" | 158 | "push %ds \n\t" |
| 157 | "pop %es \n\t" | 159 | "pop %es \n\t" |
| 158 | "movl 8(%ebp),%eax \n\t" | 160 | "movl 8(%ebp),%eax \n\t" |
| 159 | "movl 4(%eax),%ebx \n\t" | 161 | "movl 4(%eax),%ebx \n\t" |
| 160 | "movl 8(%eax),%ecx \n\t" | 162 | "movl 8(%eax),%ecx \n\t" |
| 161 | "movl 12(%eax),%edx \n\t" | 163 | "movl 12(%eax),%edx \n\t" |
| 162 | "movl 16(%eax),%esi \n\t" | 164 | "movl 16(%eax),%esi \n\t" |
| 163 | "movl 20(%eax),%edi \n\t" | 165 | "movl 20(%eax),%edi \n\t" |
| 164 | "movl (%eax),%eax \n\t" | 166 | "movl (%eax),%eax \n\t" |
| 165 | "push %cs \n\t" | 167 | "push %cs \n\t" |
| 166 | "call *12(%ebp) \n\t" | 168 | "call *12(%ebp) \n\t" |
| 167 | "pushf \n\t" | 169 | "pushf \n\t" |
| 168 | "pushl %eax \n\t" | 170 | "pushl %eax \n\t" |
| 169 | "movl 8(%ebp),%eax \n\t" | 171 | "movl 8(%ebp),%eax \n\t" |
| 170 | "movl %ebx,4(%eax) \n\t" | 172 | "movl %ebx,4(%eax) \n\t" |
| 171 | "movl %ecx,8(%eax) \n\t" | 173 | "movl %ecx,8(%eax) \n\t" |
| 172 | "movl %edx,12(%eax) \n\t" | 174 | "movl %edx,12(%eax) \n\t" |
| 173 | "movl %esi,16(%eax) \n\t" | 175 | "movl %esi,16(%eax) \n\t" |
| 174 | "movl %edi,20(%eax) \n\t" | 176 | "movl %edi,20(%eax) \n\t" |
| 175 | "movw %ds,24(%eax) \n\t" | 177 | "movw %ds,24(%eax) \n\t" |
| 176 | "movw %es,26(%eax) \n\t" | 178 | "movw %es,26(%eax) \n\t" |
| 177 | "popl %ebx \n\t" | 179 | "popl %ebx \n\t" |
| 178 | "movl %ebx,(%eax) \n\t" | 180 | "movl %ebx,(%eax) \n\t" |
| 179 | "popl %ebx \n\t" | 181 | "popl %ebx \n\t" |
| 180 | "movl %ebx,28(%eax) \n\t" | 182 | "movl %ebx,28(%eax) \n\t" |
| 181 | "pop %es \n\t" | 183 | "pop %es \n\t" |
| 182 | "popf \n\t" | 184 | "popf \n\t" |
| 183 | "popa \n\t" | 185 | "popa \n\t" |
| 184 | "leave \n\t" "ret"); | 186 | "leave \n\t" |
| 185 | } | 187 | "ret \n\t" |
| 188 | ".previous"); | ||
| 189 | |||
| 186 | 190 | ||
| 187 | /* | 191 | /* |
| 188 | * cru_detect | 192 | * cru_detect |
| @@ -333,43 +337,44 @@ static int __devinit detect_cru_service(void) | |||
| 333 | 337 | ||
| 334 | #define HPWDT_ARCH 64 | 338 | #define HPWDT_ARCH 64 |
| 335 | 339 | ||
| 336 | static void asminline_call(struct cmn_registers *pi86Regs, | 340 | asm(".text \n\t" |
| 337 | unsigned long *pRomEntry) | 341 | ".align 4 \n" |
| 338 | { | 342 | "asminline_call: \n\t" |
| 339 | asm("pushq %rbp \n\t" | 343 | "pushq %rbp \n\t" |
| 340 | "movq %rsp, %rbp \n\t" | 344 | "movq %rsp, %rbp \n\t" |
| 341 | "pushq %rax \n\t" | 345 | "pushq %rax \n\t" |
| 342 | "pushq %rbx \n\t" | 346 | "pushq %rbx \n\t" |
| 343 | "pushq %rdx \n\t" | 347 | "pushq %rdx \n\t" |
| 344 | "pushq %r12 \n\t" | 348 | "pushq %r12 \n\t" |
| 345 | "pushq %r9 \n\t" | 349 | "pushq %r9 \n\t" |
| 346 | "movq %rsi, %r12 \n\t" | 350 | "movq %rsi, %r12 \n\t" |
| 347 | "movq %rdi, %r9 \n\t" | 351 | "movq %rdi, %r9 \n\t" |
| 348 | "movl 4(%r9),%ebx \n\t" | 352 | "movl 4(%r9),%ebx \n\t" |
| 349 | "movl 8(%r9),%ecx \n\t" | 353 | "movl 8(%r9),%ecx \n\t" |
| 350 | "movl 12(%r9),%edx \n\t" | 354 | "movl 12(%r9),%edx \n\t" |
| 351 | "movl 16(%r9),%esi \n\t" | 355 | "movl 16(%r9),%esi \n\t" |
| 352 | "movl 20(%r9),%edi \n\t" | 356 | "movl 20(%r9),%edi \n\t" |
| 353 | "movl (%r9),%eax \n\t" | 357 | "movl (%r9),%eax \n\t" |
| 354 | "call *%r12 \n\t" | 358 | "call *%r12 \n\t" |
| 355 | "pushfq \n\t" | 359 | "pushfq \n\t" |
| 356 | "popq %r12 \n\t" | 360 | "popq %r12 \n\t" |
| 357 | "popfq \n\t" | 361 | "popfq \n\t" |
| 358 | "movl %eax, (%r9) \n\t" | 362 | "movl %eax, (%r9) \n\t" |
| 359 | "movl %ebx, 4(%r9) \n\t" | 363 | "movl %ebx, 4(%r9) \n\t" |
| 360 | "movl %ecx, 8(%r9) \n\t" | 364 | "movl %ecx, 8(%r9) \n\t" |
| 361 | "movl %edx, 12(%r9) \n\t" | 365 | "movl %edx, 12(%r9) \n\t" |
| 362 | "movl %esi, 16(%r9) \n\t" | 366 | "movl %esi, 16(%r9) \n\t" |
| 363 | "movl %edi, 20(%r9) \n\t" | 367 | "movl %edi, 20(%r9) \n\t" |
| 364 | "movq %r12, %rax \n\t" | 368 | "movq %r12, %rax \n\t" |
| 365 | "movl %eax, 28(%r9) \n\t" | 369 | "movl %eax, 28(%r9) \n\t" |
| 366 | "popq %r9 \n\t" | 370 | "popq %r9 \n\t" |
| 367 | "popq %r12 \n\t" | 371 | "popq %r12 \n\t" |
| 368 | "popq %rdx \n\t" | 372 | "popq %rdx \n\t" |
| 369 | "popq %rbx \n\t" | 373 | "popq %rbx \n\t" |
| 370 | "popq %rax \n\t" | 374 | "popq %rax \n\t" |
| 371 | "leave \n\t" "ret"); | 375 | "leave \n\t" |
| 372 | } | 376 | "ret \n\t" |
| 377 | ".previous"); | ||
| 373 | 378 | ||
| 374 | /* | 379 | /* |
| 375 | * dmi_find_cru | 380 | * dmi_find_cru |
| @@ -418,20 +423,23 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, | |||
| 418 | static unsigned long rom_pl; | 423 | static unsigned long rom_pl; |
| 419 | static int die_nmi_called; | 424 | static int die_nmi_called; |
| 420 | 425 | ||
| 421 | if (ulReason == DIE_NMI || ulReason == DIE_NMI_IPI) { | 426 | if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) |
| 422 | spin_lock_irqsave(&rom_lock, rom_pl); | 427 | return NOTIFY_OK; |
| 423 | if (!die_nmi_called) | 428 | |
| 424 | asminline_call(&cmn_regs, cru_rom_addr); | 429 | spin_lock_irqsave(&rom_lock, rom_pl); |
| 425 | die_nmi_called = 1; | 430 | if (!die_nmi_called) |
| 426 | spin_unlock_irqrestore(&rom_lock, rom_pl); | 431 | asminline_call(&cmn_regs, cru_rom_addr); |
| 427 | if (cmn_regs.u1.ral != 0) { | 432 | die_nmi_called = 1; |
| 428 | panic("An NMI occurred, please see the Integrated " | 433 | spin_unlock_irqrestore(&rom_lock, rom_pl); |
| 429 | "Management Log for details.\n"); | 434 | if (cmn_regs.u1.ral == 0) { |
| 430 | } | 435 | printk(KERN_WARNING "hpwdt: An NMI occurred, " |
| 436 | "but unable to determine source.\n"); | ||
| 437 | } else { | ||
| 438 | panic("An NMI occurred, please see the Integrated " | ||
| 439 | "Management Log for details.\n"); | ||
| 431 | } | 440 | } |
| 432 | 441 | ||
| 433 | die_nmi_called = 0; | 442 | return NOTIFY_STOP; |
| 434 | return NOTIFY_DONE; | ||
| 435 | } | 443 | } |
| 436 | 444 | ||
| 437 | /* | 445 | /* |
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 4f0f22b020ea..76e5b7386af9 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
| @@ -529,7 +529,7 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) | |||
| 529 | 529 | ||
| 530 | #ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */ | 530 | #ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */ |
| 531 | /* Clear master flag /before/ clearing selector flag. */ | 531 | /* Clear master flag /before/ clearing selector flag. */ |
| 532 | rmb(); | 532 | wmb(); |
| 533 | #endif | 533 | #endif |
| 534 | pending_words = xchg(&vcpu_info->evtchn_pending_sel, 0); | 534 | pending_words = xchg(&vcpu_info->evtchn_pending_sel, 0); |
| 535 | while (pending_words != 0) { | 535 | while (pending_words != 0) { |
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 0fa95b198e6e..d48ff5f370f4 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/time.h> | 16 | #include <linux/time.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/mman.h> | 18 | #include <linux/mman.h> |
| 19 | #include <linux/a.out.h> | ||
| 20 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 21 | #include <linux/signal.h> | 20 | #include <linux/signal.h> |
| 22 | #include <linux/binfmts.h> | 21 | #include <linux/binfmts.h> |
| @@ -548,7 +547,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 548 | struct { | 547 | struct { |
| 549 | struct elfhdr elf_ex; | 548 | struct elfhdr elf_ex; |
| 550 | struct elfhdr interp_elf_ex; | 549 | struct elfhdr interp_elf_ex; |
| 551 | struct exec interp_ex; | ||
| 552 | } *loc; | 550 | } *loc; |
| 553 | 551 | ||
| 554 | loc = kmalloc(sizeof(*loc), GFP_KERNEL); | 552 | loc = kmalloc(sizeof(*loc), GFP_KERNEL); |
| @@ -680,7 +678,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 680 | } | 678 | } |
| 681 | 679 | ||
| 682 | /* Get the exec headers */ | 680 | /* Get the exec headers */ |
| 683 | loc->interp_ex = *((struct exec *)bprm->buf); | ||
| 684 | loc->interp_elf_ex = *((struct elfhdr *)bprm->buf); | 681 | loc->interp_elf_ex = *((struct elfhdr *)bprm->buf); |
| 685 | break; | 682 | break; |
| 686 | } | 683 | } |
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/file.h> | 26 | #include <linux/file.h> |
| 27 | #include <linux/fdtable.h> | 27 | #include <linux/fdtable.h> |
| 28 | #include <linux/mman.h> | 28 | #include <linux/mman.h> |
| 29 | #include <linux/a.out.h> | ||
| 30 | #include <linux/stat.h> | 29 | #include <linux/stat.h> |
| 31 | #include <linux/fcntl.h> | 30 | #include <linux/fcntl.h> |
| 32 | #include <linux/smp_lock.h> | 31 | #include <linux/smp_lock.h> |
| @@ -61,6 +60,11 @@ | |||
| 61 | #include <linux/kmod.h> | 60 | #include <linux/kmod.h> |
| 62 | #endif | 61 | #endif |
| 63 | 62 | ||
| 63 | #ifdef __alpha__ | ||
| 64 | /* for /sbin/loader handling in search_binary_handler() */ | ||
| 65 | #include <linux/a.out.h> | ||
| 66 | #endif | ||
| 67 | |||
| 64 | int core_uses_pid; | 68 | int core_uses_pid; |
| 65 | char core_pattern[CORENAME_MAX_SIZE] = "core"; | 69 | char core_pattern[CORENAME_MAX_SIZE] = "core"; |
| 66 | int suid_dumpable = 0; | 70 | int suid_dumpable = 0; |
| @@ -1155,7 +1159,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | |||
| 1155 | { | 1159 | { |
| 1156 | int try,retval; | 1160 | int try,retval; |
| 1157 | struct linux_binfmt *fmt; | 1161 | struct linux_binfmt *fmt; |
| 1158 | #if defined(__alpha__) && defined(CONFIG_ARCH_SUPPORTS_AOUT) | 1162 | #ifdef __alpha__ |
| 1159 | /* handle /sbin/loader.. */ | 1163 | /* handle /sbin/loader.. */ |
| 1160 | { | 1164 | { |
| 1161 | struct exec * eh = (struct exec *) bprm->buf; | 1165 | struct exec * eh = (struct exec *) bprm->buf; |
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 9ecb92f68543..9ff7b1c04239 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c | |||
| @@ -855,7 +855,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) | |||
| 855 | */ | 855 | */ |
| 856 | 856 | ||
| 857 | /* Update group descriptor block for new group */ | 857 | /* Update group descriptor block for new group */ |
| 858 | gdp = (struct ext4_group_desc *)primary->b_data + gdb_off; | 858 | gdp = (struct ext4_group_desc *)((char *)primary->b_data + |
| 859 | gdb_off * EXT4_DESC_SIZE(sb)); | ||
| 859 | 860 | ||
| 860 | ext4_block_bitmap_set(sb, gdp, input->block_bitmap); /* LV FIXME */ | 861 | ext4_block_bitmap_set(sb, gdp, input->block_bitmap); /* LV FIXME */ |
| 861 | ext4_inode_bitmap_set(sb, gdp, input->inode_bitmap); /* LV FIXME */ | 862 | ext4_inode_bitmap_set(sb, gdp, input->inode_bitmap); /* LV FIXME */ |
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 43e99513334a..3141690558c8 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
| @@ -591,7 +591,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) | |||
| 591 | fc->bdi.ra_pages = min(fc->bdi.ra_pages, ra_pages); | 591 | fc->bdi.ra_pages = min(fc->bdi.ra_pages, ra_pages); |
| 592 | fc->minor = arg->minor; | 592 | fc->minor = arg->minor; |
| 593 | fc->max_write = arg->minor < 5 ? 4096 : arg->max_write; | 593 | fc->max_write = arg->minor < 5 ? 4096 : arg->max_write; |
| 594 | fc->max_write = min_t(unsigned, 4096, fc->max_write); | 594 | fc->max_write = max_t(unsigned, 4096, fc->max_write); |
| 595 | fc->conn_init = 1; | 595 | fc->conn_init = 1; |
| 596 | } | 596 | } |
| 597 | fuse_put_request(fc, req); | 597 | fuse_put_request(fc, req); |
| @@ -667,7 +667,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) | |||
| 667 | fc->flags = d.flags; | 667 | fc->flags = d.flags; |
| 668 | fc->user_id = d.user_id; | 668 | fc->user_id = d.user_id; |
| 669 | fc->group_id = d.group_id; | 669 | fc->group_id = d.group_id; |
| 670 | fc->max_read = min_t(unsigned, 4096, d.max_read); | 670 | fc->max_read = max_t(unsigned, 4096, d.max_read); |
| 671 | 671 | ||
| 672 | /* Used by get_root_inode() */ | 672 | /* Used by get_root_inode() */ |
| 673 | sb->s_fs_info = fc; | 673 | sb->s_fs_info = fc; |
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index c19184f2e70e..bec76b1c2bb0 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c | |||
| @@ -246,15 +246,11 @@ static void find_metapath(const struct gfs2_sbd *sdp, u64 block, | |||
| 246 | 246 | ||
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | static inline unsigned int zero_metapath_length(const struct metapath *mp, | 249 | static inline unsigned int metapath_branch_start(const struct metapath *mp) |
| 250 | unsigned height) | ||
| 251 | { | 250 | { |
| 252 | unsigned int i; | 251 | if (mp->mp_list[0] == 0) |
| 253 | for (i = 0; i < height - 1; i++) { | 252 | return 2; |
| 254 | if (mp->mp_list[i] != 0) | 253 | return 1; |
| 255 | return i; | ||
| 256 | } | ||
| 257 | return height; | ||
| 258 | } | 254 | } |
| 259 | 255 | ||
| 260 | /** | 256 | /** |
| @@ -436,7 +432,7 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock, | |||
| 436 | struct gfs2_sbd *sdp = GFS2_SB(inode); | 432 | struct gfs2_sbd *sdp = GFS2_SB(inode); |
| 437 | struct buffer_head *dibh = mp->mp_bh[0]; | 433 | struct buffer_head *dibh = mp->mp_bh[0]; |
| 438 | u64 bn, dblock = 0; | 434 | u64 bn, dblock = 0; |
| 439 | unsigned n, i, blks, alloced = 0, iblks = 0, zmpl = 0; | 435 | unsigned n, i, blks, alloced = 0, iblks = 0, branch_start = 0; |
| 440 | unsigned dblks = 0; | 436 | unsigned dblks = 0; |
| 441 | unsigned ptrs_per_blk; | 437 | unsigned ptrs_per_blk; |
| 442 | const unsigned end_of_metadata = height - 1; | 438 | const unsigned end_of_metadata = height - 1; |
| @@ -471,9 +467,8 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock, | |||
| 471 | /* Building up tree height */ | 467 | /* Building up tree height */ |
| 472 | state = ALLOC_GROW_HEIGHT; | 468 | state = ALLOC_GROW_HEIGHT; |
| 473 | iblks = height - ip->i_height; | 469 | iblks = height - ip->i_height; |
| 474 | zmpl = zero_metapath_length(mp, height); | 470 | branch_start = metapath_branch_start(mp); |
| 475 | iblks -= zmpl; | 471 | iblks += (height - branch_start); |
| 476 | iblks += height; | ||
| 477 | } | 472 | } |
| 478 | } | 473 | } |
| 479 | 474 | ||
| @@ -509,13 +504,13 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock, | |||
| 509 | sizeof(struct gfs2_meta_header)); | 504 | sizeof(struct gfs2_meta_header)); |
| 510 | *ptr = zero_bn; | 505 | *ptr = zero_bn; |
| 511 | state = ALLOC_GROW_DEPTH; | 506 | state = ALLOC_GROW_DEPTH; |
| 512 | for(i = zmpl; i < height; i++) { | 507 | for(i = branch_start; i < height; i++) { |
| 513 | if (mp->mp_bh[i] == NULL) | 508 | if (mp->mp_bh[i] == NULL) |
| 514 | break; | 509 | break; |
| 515 | brelse(mp->mp_bh[i]); | 510 | brelse(mp->mp_bh[i]); |
| 516 | mp->mp_bh[i] = NULL; | 511 | mp->mp_bh[i] = NULL; |
| 517 | } | 512 | } |
| 518 | i = zmpl; | 513 | i = branch_start; |
| 519 | } | 514 | } |
| 520 | if (n == 0) | 515 | if (n == 0) |
| 521 | break; | 516 | break; |
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 6387523a3153..3401628d742b 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
| @@ -195,7 +195,7 @@ ulong_aligned: | |||
| 195 | depending on architecture. I've experimented with several ways | 195 | depending on architecture. I've experimented with several ways |
| 196 | of writing this section such as using an else before the goto | 196 | of writing this section such as using an else before the goto |
| 197 | but this one seems to be the fastest. */ | 197 | but this one seems to be the fastest. */ |
| 198 | while ((unsigned char *)plong < end - 1) { | 198 | while ((unsigned char *)plong < end - sizeof(unsigned long)) { |
| 199 | prefetch(plong + 1); | 199 | prefetch(plong + 1); |
| 200 | if (((*plong) & LBITMASK) != lskipval) | 200 | if (((*plong) & LBITMASK) != lskipval) |
| 201 | break; | 201 | break; |
diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c index 49c7cd0502cc..779d2eb649c5 100644 --- a/fs/nfs/mount_clnt.c +++ b/fs/nfs/mount_clnt.c | |||
| @@ -130,10 +130,11 @@ static int xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p, | |||
| 130 | struct mnt_fhstatus *res) | 130 | struct mnt_fhstatus *res) |
| 131 | { | 131 | { |
| 132 | struct nfs_fh *fh = res->fh; | 132 | struct nfs_fh *fh = res->fh; |
| 133 | unsigned size; | ||
| 133 | 134 | ||
| 134 | if ((res->status = ntohl(*p++)) == 0) { | 135 | if ((res->status = ntohl(*p++)) == 0) { |
| 135 | int size = ntohl(*p++); | 136 | size = ntohl(*p++); |
| 136 | if (size <= NFS3_FHSIZE) { | 137 | if (size <= NFS3_FHSIZE && size != 0) { |
| 137 | fh->size = size; | 138 | fh->size = size; |
| 138 | memcpy(fh->data, p, size); | 139 | memcpy(fh->data, p, size); |
| 139 | } else | 140 | } else |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 2a4a024a4e7b..614efeed5437 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -1216,8 +1216,6 @@ static int nfs_validate_mount_data(void *options, | |||
| 1216 | { | 1216 | { |
| 1217 | struct nfs_mount_data *data = (struct nfs_mount_data *)options; | 1217 | struct nfs_mount_data *data = (struct nfs_mount_data *)options; |
| 1218 | 1218 | ||
| 1219 | memset(args, 0, sizeof(*args)); | ||
| 1220 | |||
| 1221 | if (data == NULL) | 1219 | if (data == NULL) |
| 1222 | goto out_no_data; | 1220 | goto out_no_data; |
| 1223 | 1221 | ||
| @@ -1251,13 +1249,13 @@ static int nfs_validate_mount_data(void *options, | |||
| 1251 | case 5: | 1249 | case 5: |
| 1252 | memset(data->context, 0, sizeof(data->context)); | 1250 | memset(data->context, 0, sizeof(data->context)); |
| 1253 | case 6: | 1251 | case 6: |
| 1254 | if (data->flags & NFS_MOUNT_VER3) | 1252 | if (data->flags & NFS_MOUNT_VER3) { |
| 1253 | if (data->root.size > NFS3_FHSIZE || data->root.size == 0) | ||
| 1254 | goto out_invalid_fh; | ||
| 1255 | mntfh->size = data->root.size; | 1255 | mntfh->size = data->root.size; |
| 1256 | else | 1256 | } else |
| 1257 | mntfh->size = NFS2_FHSIZE; | 1257 | mntfh->size = NFS2_FHSIZE; |
| 1258 | 1258 | ||
| 1259 | if (mntfh->size > sizeof(mntfh->data)) | ||
| 1260 | goto out_invalid_fh; | ||
| 1261 | 1259 | ||
| 1262 | memcpy(mntfh->data, data->root.data, mntfh->size); | 1260 | memcpy(mntfh->data, data->root.data, mntfh->size); |
| 1263 | if (mntfh->size < sizeof(mntfh->data)) | 1261 | if (mntfh->size < sizeof(mntfh->data)) |
| @@ -1585,24 +1583,29 @@ static int nfs_get_sb(struct file_system_type *fs_type, | |||
| 1585 | { | 1583 | { |
| 1586 | struct nfs_server *server = NULL; | 1584 | struct nfs_server *server = NULL; |
| 1587 | struct super_block *s; | 1585 | struct super_block *s; |
| 1588 | struct nfs_fh mntfh; | 1586 | struct nfs_parsed_mount_data *data; |
| 1589 | struct nfs_parsed_mount_data data; | 1587 | struct nfs_fh *mntfh; |
| 1590 | struct dentry *mntroot; | 1588 | struct dentry *mntroot; |
| 1591 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; | 1589 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; |
| 1592 | struct nfs_sb_mountdata sb_mntdata = { | 1590 | struct nfs_sb_mountdata sb_mntdata = { |
| 1593 | .mntflags = flags, | 1591 | .mntflags = flags, |
| 1594 | }; | 1592 | }; |
| 1595 | int error; | 1593 | int error = -ENOMEM; |
| 1594 | |||
| 1595 | data = kzalloc(sizeof(*data), GFP_KERNEL); | ||
| 1596 | mntfh = kzalloc(sizeof(*mntfh), GFP_KERNEL); | ||
| 1597 | if (data == NULL || mntfh == NULL) | ||
| 1598 | goto out_free_fh; | ||
| 1596 | 1599 | ||
| 1597 | security_init_mnt_opts(&data.lsm_opts); | 1600 | security_init_mnt_opts(&data->lsm_opts); |
| 1598 | 1601 | ||
| 1599 | /* Validate the mount data */ | 1602 | /* Validate the mount data */ |
| 1600 | error = nfs_validate_mount_data(raw_data, &data, &mntfh, dev_name); | 1603 | error = nfs_validate_mount_data(raw_data, data, mntfh, dev_name); |
| 1601 | if (error < 0) | 1604 | if (error < 0) |
| 1602 | goto out; | 1605 | goto out; |
| 1603 | 1606 | ||
| 1604 | /* Get a volume representation */ | 1607 | /* Get a volume representation */ |
| 1605 | server = nfs_create_server(&data, &mntfh); | 1608 | server = nfs_create_server(data, mntfh); |
| 1606 | if (IS_ERR(server)) { | 1609 | if (IS_ERR(server)) { |
| 1607 | error = PTR_ERR(server); | 1610 | error = PTR_ERR(server); |
| 1608 | goto out; | 1611 | goto out; |
| @@ -1630,16 +1633,16 @@ static int nfs_get_sb(struct file_system_type *fs_type, | |||
| 1630 | 1633 | ||
| 1631 | if (!s->s_root) { | 1634 | if (!s->s_root) { |
| 1632 | /* initial superblock/root creation */ | 1635 | /* initial superblock/root creation */ |
| 1633 | nfs_fill_super(s, &data); | 1636 | nfs_fill_super(s, data); |
| 1634 | } | 1637 | } |
| 1635 | 1638 | ||
| 1636 | mntroot = nfs_get_root(s, &mntfh); | 1639 | mntroot = nfs_get_root(s, mntfh); |
| 1637 | if (IS_ERR(mntroot)) { | 1640 | if (IS_ERR(mntroot)) { |
| 1638 | error = PTR_ERR(mntroot); | 1641 | error = PTR_ERR(mntroot); |
| 1639 | goto error_splat_super; | 1642 | goto error_splat_super; |
| 1640 | } | 1643 | } |
| 1641 | 1644 | ||
| 1642 | error = security_sb_set_mnt_opts(s, &data.lsm_opts); | 1645 | error = security_sb_set_mnt_opts(s, &data->lsm_opts); |
| 1643 | if (error) | 1646 | if (error) |
| 1644 | goto error_splat_root; | 1647 | goto error_splat_root; |
| 1645 | 1648 | ||
| @@ -1649,9 +1652,12 @@ static int nfs_get_sb(struct file_system_type *fs_type, | |||
| 1649 | error = 0; | 1652 | error = 0; |
| 1650 | 1653 | ||
| 1651 | out: | 1654 | out: |
| 1652 | kfree(data.nfs_server.hostname); | 1655 | kfree(data->nfs_server.hostname); |
| 1653 | kfree(data.mount_server.hostname); | 1656 | kfree(data->mount_server.hostname); |
| 1654 | security_free_mnt_opts(&data.lsm_opts); | 1657 | security_free_mnt_opts(&data->lsm_opts); |
| 1658 | out_free_fh: | ||
| 1659 | kfree(mntfh); | ||
| 1660 | kfree(data); | ||
| 1655 | return error; | 1661 | return error; |
| 1656 | 1662 | ||
| 1657 | out_err_nosb: | 1663 | out_err_nosb: |
| @@ -1800,8 +1806,6 @@ static int nfs4_validate_mount_data(void *options, | |||
| 1800 | struct nfs4_mount_data *data = (struct nfs4_mount_data *)options; | 1806 | struct nfs4_mount_data *data = (struct nfs4_mount_data *)options; |
| 1801 | char *c; | 1807 | char *c; |
| 1802 | 1808 | ||
| 1803 | memset(args, 0, sizeof(*args)); | ||
| 1804 | |||
| 1805 | if (data == NULL) | 1809 | if (data == NULL) |
| 1806 | goto out_no_data; | 1810 | goto out_no_data; |
| 1807 | 1811 | ||
| @@ -1959,26 +1963,31 @@ out_no_client_address: | |||
| 1959 | static int nfs4_get_sb(struct file_system_type *fs_type, | 1963 | static int nfs4_get_sb(struct file_system_type *fs_type, |
| 1960 | int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt) | 1964 | int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt) |
| 1961 | { | 1965 | { |
| 1962 | struct nfs_parsed_mount_data data; | 1966 | struct nfs_parsed_mount_data *data; |
| 1963 | struct super_block *s; | 1967 | struct super_block *s; |
| 1964 | struct nfs_server *server; | 1968 | struct nfs_server *server; |
| 1965 | struct nfs_fh mntfh; | 1969 | struct nfs_fh *mntfh; |
| 1966 | struct dentry *mntroot; | 1970 | struct dentry *mntroot; |
| 1967 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; | 1971 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; |
| 1968 | struct nfs_sb_mountdata sb_mntdata = { | 1972 | struct nfs_sb_mountdata sb_mntdata = { |
| 1969 | .mntflags = flags, | 1973 | .mntflags = flags, |
| 1970 | }; | 1974 | }; |
| 1971 | int error; | 1975 | int error = -ENOMEM; |
| 1972 | 1976 | ||
| 1973 | security_init_mnt_opts(&data.lsm_opts); | 1977 | data = kzalloc(sizeof(*data), GFP_KERNEL); |
| 1978 | mntfh = kzalloc(sizeof(*mntfh), GFP_KERNEL); | ||
| 1979 | if (data == NULL || mntfh == NULL) | ||
| 1980 | goto out_free_fh; | ||
| 1981 | |||
| 1982 | security_init_mnt_opts(&data->lsm_opts); | ||
| 1974 | 1983 | ||
| 1975 | /* Validate the mount data */ | 1984 | /* Validate the mount data */ |
| 1976 | error = nfs4_validate_mount_data(raw_data, &data, dev_name); | 1985 | error = nfs4_validate_mount_data(raw_data, data, dev_name); |
| 1977 | if (error < 0) | 1986 | if (error < 0) |
| 1978 | goto out; | 1987 | goto out; |
| 1979 | 1988 | ||
| 1980 | /* Get a volume representation */ | 1989 | /* Get a volume representation */ |
| 1981 | server = nfs4_create_server(&data, &mntfh); | 1990 | server = nfs4_create_server(data, mntfh); |
| 1982 | if (IS_ERR(server)) { | 1991 | if (IS_ERR(server)) { |
| 1983 | error = PTR_ERR(server); | 1992 | error = PTR_ERR(server); |
| 1984 | goto out; | 1993 | goto out; |
| @@ -2009,13 +2018,13 @@ static int nfs4_get_sb(struct file_system_type *fs_type, | |||
| 2009 | nfs4_fill_super(s); | 2018 | nfs4_fill_super(s); |
| 2010 | } | 2019 | } |
| 2011 | 2020 | ||
| 2012 | mntroot = nfs4_get_root(s, &mntfh); | 2021 | mntroot = nfs4_get_root(s, mntfh); |
| 2013 | if (IS_ERR(mntroot)) { | 2022 | if (IS_ERR(mntroot)) { |
| 2014 | error = PTR_ERR(mntroot); | 2023 | error = PTR_ERR(mntroot); |
| 2015 | goto error_splat_super; | 2024 | goto error_splat_super; |
| 2016 | } | 2025 | } |
| 2017 | 2026 | ||
| 2018 | error = security_sb_set_mnt_opts(s, &data.lsm_opts); | 2027 | error = security_sb_set_mnt_opts(s, &data->lsm_opts); |
| 2019 | if (error) | 2028 | if (error) |
| 2020 | goto error_splat_root; | 2029 | goto error_splat_root; |
| 2021 | 2030 | ||
| @@ -2025,10 +2034,13 @@ static int nfs4_get_sb(struct file_system_type *fs_type, | |||
| 2025 | error = 0; | 2034 | error = 0; |
| 2026 | 2035 | ||
| 2027 | out: | 2036 | out: |
| 2028 | kfree(data.client_address); | 2037 | kfree(data->client_address); |
| 2029 | kfree(data.nfs_server.export_path); | 2038 | kfree(data->nfs_server.export_path); |
| 2030 | kfree(data.nfs_server.hostname); | 2039 | kfree(data->nfs_server.hostname); |
| 2031 | security_free_mnt_opts(&data.lsm_opts); | 2040 | security_free_mnt_opts(&data->lsm_opts); |
| 2041 | out_free_fh: | ||
| 2042 | kfree(mntfh); | ||
| 2043 | kfree(data); | ||
| 2032 | return error; | 2044 | return error; |
| 2033 | 2045 | ||
| 2034 | out_free: | 2046 | out_free: |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 6d8ace3e3259..f333848fd3be 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
| @@ -739,12 +739,13 @@ int nfs_updatepage(struct file *file, struct page *page, | |||
| 739 | } | 739 | } |
| 740 | 740 | ||
| 741 | status = nfs_writepage_setup(ctx, page, offset, count); | 741 | status = nfs_writepage_setup(ctx, page, offset, count); |
| 742 | __set_page_dirty_nobuffers(page); | 742 | if (status < 0) |
| 743 | nfs_set_pageerror(page); | ||
| 744 | else | ||
| 745 | __set_page_dirty_nobuffers(page); | ||
| 743 | 746 | ||
| 744 | dprintk("NFS: nfs_updatepage returns %d (isize %Ld)\n", | 747 | dprintk("NFS: nfs_updatepage returns %d (isize %Ld)\n", |
| 745 | status, (long long)i_size_read(inode)); | 748 | status, (long long)i_size_read(inode)); |
| 746 | if (status < 0) | ||
| 747 | nfs_set_pageerror(page); | ||
| 748 | return status; | 749 | return status; |
| 749 | } | 750 | } |
| 750 | 751 | ||
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c index cf9401e8cd0b..cfdb08b484ed 100644 --- a/fs/ocfs2/cluster/nodemanager.c +++ b/fs/ocfs2/cluster/nodemanager.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/sysctl.h> | ||
| 25 | #include <linux/configfs.h> | 24 | #include <linux/configfs.h> |
| 26 | 25 | ||
| 27 | #include "tcp.h" | 26 | #include "tcp.h" |
| @@ -36,65 +35,6 @@ | |||
| 36 | * cluster references throughout where nodes are looked up */ | 35 | * cluster references throughout where nodes are looked up */ |
| 37 | struct o2nm_cluster *o2nm_single_cluster = NULL; | 36 | struct o2nm_cluster *o2nm_single_cluster = NULL; |
| 38 | 37 | ||
| 39 | #define OCFS2_MAX_HB_CTL_PATH 256 | ||
| 40 | static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl"; | ||
| 41 | |||
| 42 | static ctl_table ocfs2_nm_table[] = { | ||
| 43 | { | ||
| 44 | .ctl_name = 1, | ||
| 45 | .procname = "hb_ctl_path", | ||
| 46 | .data = ocfs2_hb_ctl_path, | ||
| 47 | .maxlen = OCFS2_MAX_HB_CTL_PATH, | ||
| 48 | .mode = 0644, | ||
| 49 | .proc_handler = &proc_dostring, | ||
| 50 | .strategy = &sysctl_string, | ||
| 51 | }, | ||
| 52 | { .ctl_name = 0 } | ||
| 53 | }; | ||
| 54 | |||
| 55 | static ctl_table ocfs2_mod_table[] = { | ||
| 56 | { | ||
| 57 | .ctl_name = FS_OCFS2_NM, | ||
| 58 | .procname = "nm", | ||
| 59 | .data = NULL, | ||
| 60 | .maxlen = 0, | ||
| 61 | .mode = 0555, | ||
| 62 | .child = ocfs2_nm_table | ||
| 63 | }, | ||
| 64 | { .ctl_name = 0} | ||
| 65 | }; | ||
| 66 | |||
| 67 | static ctl_table ocfs2_kern_table[] = { | ||
| 68 | { | ||
| 69 | .ctl_name = FS_OCFS2, | ||
| 70 | .procname = "ocfs2", | ||
| 71 | .data = NULL, | ||
| 72 | .maxlen = 0, | ||
| 73 | .mode = 0555, | ||
| 74 | .child = ocfs2_mod_table | ||
| 75 | }, | ||
| 76 | { .ctl_name = 0} | ||
| 77 | }; | ||
| 78 | |||
| 79 | static ctl_table ocfs2_root_table[] = { | ||
| 80 | { | ||
| 81 | .ctl_name = CTL_FS, | ||
| 82 | .procname = "fs", | ||
| 83 | .data = NULL, | ||
| 84 | .maxlen = 0, | ||
| 85 | .mode = 0555, | ||
| 86 | .child = ocfs2_kern_table | ||
| 87 | }, | ||
| 88 | { .ctl_name = 0 } | ||
| 89 | }; | ||
| 90 | |||
| 91 | static struct ctl_table_header *ocfs2_table_header = NULL; | ||
| 92 | |||
| 93 | const char *o2nm_get_hb_ctl_path(void) | ||
| 94 | { | ||
| 95 | return ocfs2_hb_ctl_path; | ||
| 96 | } | ||
| 97 | EXPORT_SYMBOL_GPL(o2nm_get_hb_ctl_path); | ||
| 98 | 38 | ||
| 99 | struct o2nm_node *o2nm_get_node_by_num(u8 node_num) | 39 | struct o2nm_node *o2nm_get_node_by_num(u8 node_num) |
| 100 | { | 40 | { |
| @@ -941,9 +881,6 @@ void o2nm_undepend_this_node(void) | |||
| 941 | 881 | ||
| 942 | static void __exit exit_o2nm(void) | 882 | static void __exit exit_o2nm(void) |
| 943 | { | 883 | { |
| 944 | if (ocfs2_table_header) | ||
| 945 | unregister_sysctl_table(ocfs2_table_header); | ||
| 946 | |||
| 947 | /* XXX sync with hb callbacks and shut down hb? */ | 884 | /* XXX sync with hb callbacks and shut down hb? */ |
| 948 | o2net_unregister_hb_callbacks(); | 885 | o2net_unregister_hb_callbacks(); |
| 949 | configfs_unregister_subsystem(&o2nm_cluster_group.cs_subsys); | 886 | configfs_unregister_subsystem(&o2nm_cluster_group.cs_subsys); |
| @@ -964,16 +901,9 @@ static int __init init_o2nm(void) | |||
| 964 | if (ret) | 901 | if (ret) |
| 965 | goto out; | 902 | goto out; |
| 966 | 903 | ||
| 967 | ocfs2_table_header = register_sysctl_table(ocfs2_root_table); | ||
| 968 | if (!ocfs2_table_header) { | ||
| 969 | printk(KERN_ERR "nodemanager: unable to register sysctl\n"); | ||
| 970 | ret = -ENOMEM; /* or something. */ | ||
| 971 | goto out_o2net; | ||
| 972 | } | ||
| 973 | |||
| 974 | ret = o2net_register_hb_callbacks(); | 904 | ret = o2net_register_hb_callbacks(); |
| 975 | if (ret) | 905 | if (ret) |
| 976 | goto out_sysctl; | 906 | goto out_o2net; |
| 977 | 907 | ||
| 978 | config_group_init(&o2nm_cluster_group.cs_subsys.su_group); | 908 | config_group_init(&o2nm_cluster_group.cs_subsys.su_group); |
| 979 | mutex_init(&o2nm_cluster_group.cs_subsys.su_mutex); | 909 | mutex_init(&o2nm_cluster_group.cs_subsys.su_mutex); |
| @@ -990,8 +920,6 @@ static int __init init_o2nm(void) | |||
| 990 | configfs_unregister_subsystem(&o2nm_cluster_group.cs_subsys); | 920 | configfs_unregister_subsystem(&o2nm_cluster_group.cs_subsys); |
| 991 | out_callbacks: | 921 | out_callbacks: |
| 992 | o2net_unregister_hb_callbacks(); | 922 | o2net_unregister_hb_callbacks(); |
| 993 | out_sysctl: | ||
| 994 | unregister_sysctl_table(ocfs2_table_header); | ||
| 995 | out_o2net: | 923 | out_o2net: |
| 996 | o2net_exit(); | 924 | o2net_exit(); |
| 997 | out: | 925 | out: |
diff --git a/fs/ocfs2/cluster/nodemanager.h b/fs/ocfs2/cluster/nodemanager.h index 7c860361b8dd..c992ea0da4ad 100644 --- a/fs/ocfs2/cluster/nodemanager.h +++ b/fs/ocfs2/cluster/nodemanager.h | |||
| @@ -33,10 +33,6 @@ | |||
| 33 | #include <linux/configfs.h> | 33 | #include <linux/configfs.h> |
| 34 | #include <linux/rbtree.h> | 34 | #include <linux/rbtree.h> |
| 35 | 35 | ||
| 36 | #define FS_OCFS2_NM 1 | ||
| 37 | |||
| 38 | const char *o2nm_get_hb_ctl_path(void); | ||
| 39 | |||
| 40 | struct o2nm_node { | 36 | struct o2nm_node { |
| 41 | spinlock_t nd_lock; | 37 | spinlock_t nd_lock; |
| 42 | struct config_item nd_item; | 38 | struct config_item nd_item; |
diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c index bbd1667aa7d3..fcd120f1493a 100644 --- a/fs/ocfs2/stack_o2cb.c +++ b/fs/ocfs2/stack_o2cb.c | |||
| @@ -317,8 +317,7 @@ out: | |||
| 317 | return rc; | 317 | return rc; |
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn, | 320 | static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn) |
| 321 | int hangup_pending) | ||
| 322 | { | 321 | { |
| 323 | struct dlm_ctxt *dlm = conn->cc_lockspace; | 322 | struct dlm_ctxt *dlm = conn->cc_lockspace; |
| 324 | struct o2dlm_private *priv = conn->cc_private; | 323 | struct o2dlm_private *priv = conn->cc_private; |
| @@ -333,43 +332,6 @@ static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn, | |||
| 333 | return 0; | 332 | return 0; |
| 334 | } | 333 | } |
| 335 | 334 | ||
| 336 | static void o2hb_stop(const char *group) | ||
| 337 | { | ||
| 338 | int ret; | ||
| 339 | char *argv[5], *envp[3]; | ||
| 340 | |||
| 341 | argv[0] = (char *)o2nm_get_hb_ctl_path(); | ||
| 342 | argv[1] = "-K"; | ||
| 343 | argv[2] = "-u"; | ||
| 344 | argv[3] = (char *)group; | ||
| 345 | argv[4] = NULL; | ||
| 346 | |||
| 347 | mlog(0, "Run: %s %s %s %s\n", argv[0], argv[1], argv[2], argv[3]); | ||
| 348 | |||
| 349 | /* minimal command environment taken from cpu_run_sbin_hotplug */ | ||
| 350 | envp[0] = "HOME=/"; | ||
| 351 | envp[1] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin"; | ||
| 352 | envp[2] = NULL; | ||
| 353 | |||
| 354 | ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC); | ||
| 355 | if (ret < 0) | ||
| 356 | mlog_errno(ret); | ||
| 357 | } | ||
| 358 | |||
| 359 | /* | ||
| 360 | * Hangup is a hack for tools compatibility. Older ocfs2-tools software | ||
| 361 | * expects the filesystem to call "ocfs2_hb_ctl" during unmount. This | ||
| 362 | * happens regardless of whether the DLM got started, so we can't do it | ||
| 363 | * in ocfs2_cluster_disconnect(). We bring the o2hb_stop() function into | ||
| 364 | * the glue and provide a "hangup" API for super.c to call. | ||
| 365 | * | ||
| 366 | * Other stacks will eventually provide a NULL ->hangup() pointer. | ||
| 367 | */ | ||
| 368 | static void o2cb_cluster_hangup(const char *group, int grouplen) | ||
| 369 | { | ||
| 370 | o2hb_stop(group); | ||
| 371 | } | ||
| 372 | |||
| 373 | static int o2cb_cluster_this_node(unsigned int *node) | 335 | static int o2cb_cluster_this_node(unsigned int *node) |
| 374 | { | 336 | { |
| 375 | int node_num; | 337 | int node_num; |
| @@ -388,7 +350,6 @@ static int o2cb_cluster_this_node(unsigned int *node) | |||
| 388 | static struct ocfs2_stack_operations o2cb_stack_ops = { | 350 | static struct ocfs2_stack_operations o2cb_stack_ops = { |
| 389 | .connect = o2cb_cluster_connect, | 351 | .connect = o2cb_cluster_connect, |
| 390 | .disconnect = o2cb_cluster_disconnect, | 352 | .disconnect = o2cb_cluster_disconnect, |
| 391 | .hangup = o2cb_cluster_hangup, | ||
| 392 | .this_node = o2cb_cluster_this_node, | 353 | .this_node = o2cb_cluster_this_node, |
| 393 | .dlm_lock = o2cb_dlm_lock, | 354 | .dlm_lock = o2cb_dlm_lock, |
| 394 | .dlm_unlock = o2cb_dlm_unlock, | 355 | .dlm_unlock = o2cb_dlm_unlock, |
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index 6b97d11f6bf8..c021280dd462 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c | |||
| @@ -816,8 +816,7 @@ out: | |||
| 816 | return rc; | 816 | return rc; |
| 817 | } | 817 | } |
| 818 | 818 | ||
| 819 | static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn, | 819 | static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn) |
| 820 | int hangup_pending) | ||
| 821 | { | 820 | { |
| 822 | dlm_release_lockspace(conn->cc_lockspace, 2); | 821 | dlm_release_lockspace(conn->cc_lockspace, 2); |
| 823 | conn->cc_lockspace = NULL; | 822 | conn->cc_lockspace = NULL; |
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index 119f60cea9cc..10e149ae5e3a 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/fs.h> | 26 | #include <linux/fs.h> |
| 27 | #include <linux/kobject.h> | 27 | #include <linux/kobject.h> |
| 28 | #include <linux/sysfs.h> | 28 | #include <linux/sysfs.h> |
| 29 | #include <linux/sysctl.h> | ||
| 29 | 30 | ||
| 30 | #include "ocfs2_fs.h" | 31 | #include "ocfs2_fs.h" |
| 31 | 32 | ||
| @@ -33,11 +34,13 @@ | |||
| 33 | 34 | ||
| 34 | #define OCFS2_STACK_PLUGIN_O2CB "o2cb" | 35 | #define OCFS2_STACK_PLUGIN_O2CB "o2cb" |
| 35 | #define OCFS2_STACK_PLUGIN_USER "user" | 36 | #define OCFS2_STACK_PLUGIN_USER "user" |
| 37 | #define OCFS2_MAX_HB_CTL_PATH 256 | ||
| 36 | 38 | ||
| 37 | static struct ocfs2_locking_protocol *lproto; | 39 | static struct ocfs2_locking_protocol *lproto; |
| 38 | static DEFINE_SPINLOCK(ocfs2_stack_lock); | 40 | static DEFINE_SPINLOCK(ocfs2_stack_lock); |
| 39 | static LIST_HEAD(ocfs2_stack_list); | 41 | static LIST_HEAD(ocfs2_stack_list); |
| 40 | static char cluster_stack_name[OCFS2_STACK_LABEL_LEN + 1]; | 42 | static char cluster_stack_name[OCFS2_STACK_LABEL_LEN + 1]; |
| 43 | static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl"; | ||
| 41 | 44 | ||
| 42 | /* | 45 | /* |
| 43 | * The stack currently in use. If not null, active_stack->sp_count > 0, | 46 | * The stack currently in use. If not null, active_stack->sp_count > 0, |
| @@ -349,7 +352,7 @@ int ocfs2_cluster_disconnect(struct ocfs2_cluster_connection *conn, | |||
| 349 | 352 | ||
| 350 | BUG_ON(conn == NULL); | 353 | BUG_ON(conn == NULL); |
| 351 | 354 | ||
| 352 | ret = active_stack->sp_ops->disconnect(conn, hangup_pending); | 355 | ret = active_stack->sp_ops->disconnect(conn); |
| 353 | 356 | ||
| 354 | /* XXX Should we free it anyway? */ | 357 | /* XXX Should we free it anyway? */ |
| 355 | if (!ret) { | 358 | if (!ret) { |
| @@ -362,13 +365,48 @@ int ocfs2_cluster_disconnect(struct ocfs2_cluster_connection *conn, | |||
| 362 | } | 365 | } |
| 363 | EXPORT_SYMBOL_GPL(ocfs2_cluster_disconnect); | 366 | EXPORT_SYMBOL_GPL(ocfs2_cluster_disconnect); |
| 364 | 367 | ||
| 368 | /* | ||
| 369 | * Leave the group for this filesystem. This is executed by a userspace | ||
| 370 | * program (stored in ocfs2_hb_ctl_path). | ||
| 371 | */ | ||
| 372 | static void ocfs2_leave_group(const char *group) | ||
| 373 | { | ||
| 374 | int ret; | ||
| 375 | char *argv[5], *envp[3]; | ||
| 376 | |||
| 377 | argv[0] = ocfs2_hb_ctl_path; | ||
| 378 | argv[1] = "-K"; | ||
| 379 | argv[2] = "-u"; | ||
| 380 | argv[3] = (char *)group; | ||
| 381 | argv[4] = NULL; | ||
| 382 | |||
| 383 | /* minimal command environment taken from cpu_run_sbin_hotplug */ | ||
| 384 | envp[0] = "HOME=/"; | ||
| 385 | envp[1] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin"; | ||
| 386 | envp[2] = NULL; | ||
| 387 | |||
| 388 | ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC); | ||
| 389 | if (ret < 0) { | ||
| 390 | printk(KERN_ERR | ||
| 391 | "ocfs2: Error %d running user helper " | ||
| 392 | "\"%s %s %s %s\"\n", | ||
| 393 | ret, argv[0], argv[1], argv[2], argv[3]); | ||
| 394 | } | ||
| 395 | } | ||
| 396 | |||
| 397 | /* | ||
| 398 | * Hangup is a required post-umount. ocfs2-tools software expects the | ||
| 399 | * filesystem to call "ocfs2_hb_ctl" during unmount. This happens | ||
| 400 | * regardless of whether the DLM got started, so we can't do it | ||
| 401 | * in ocfs2_cluster_disconnect(). The ocfs2_leave_group() function does | ||
| 402 | * the actual work. | ||
| 403 | */ | ||
| 365 | void ocfs2_cluster_hangup(const char *group, int grouplen) | 404 | void ocfs2_cluster_hangup(const char *group, int grouplen) |
| 366 | { | 405 | { |
| 367 | BUG_ON(group == NULL); | 406 | BUG_ON(group == NULL); |
| 368 | BUG_ON(group[grouplen] != '\0'); | 407 | BUG_ON(group[grouplen] != '\0'); |
| 369 | 408 | ||
| 370 | if (active_stack->sp_ops->hangup) | 409 | ocfs2_leave_group(group); |
| 371 | active_stack->sp_ops->hangup(group, grouplen); | ||
| 372 | 410 | ||
| 373 | /* cluster_disconnect() was called with hangup_pending==1 */ | 411 | /* cluster_disconnect() was called with hangup_pending==1 */ |
| 374 | ocfs2_stack_driver_put(); | 412 | ocfs2_stack_driver_put(); |
| @@ -548,10 +586,83 @@ error: | |||
| 548 | return ret; | 586 | return ret; |
| 549 | } | 587 | } |
| 550 | 588 | ||
| 589 | /* | ||
| 590 | * Sysctl bits | ||
| 591 | * | ||
| 592 | * The sysctl lives at /proc/sys/fs/ocfs2/nm/hb_ctl_path. The 'nm' doesn't | ||
| 593 | * make as much sense in a multiple cluster stack world, but it's safer | ||
| 594 | * and easier to preserve the name. | ||
| 595 | */ | ||
| 596 | |||
| 597 | #define FS_OCFS2_NM 1 | ||
| 598 | |||
| 599 | static ctl_table ocfs2_nm_table[] = { | ||
| 600 | { | ||
| 601 | .ctl_name = 1, | ||
| 602 | .procname = "hb_ctl_path", | ||
| 603 | .data = ocfs2_hb_ctl_path, | ||
| 604 | .maxlen = OCFS2_MAX_HB_CTL_PATH, | ||
| 605 | .mode = 0644, | ||
| 606 | .proc_handler = &proc_dostring, | ||
| 607 | .strategy = &sysctl_string, | ||
| 608 | }, | ||
| 609 | { .ctl_name = 0 } | ||
| 610 | }; | ||
| 611 | |||
| 612 | static ctl_table ocfs2_mod_table[] = { | ||
| 613 | { | ||
| 614 | .ctl_name = FS_OCFS2_NM, | ||
| 615 | .procname = "nm", | ||
| 616 | .data = NULL, | ||
| 617 | .maxlen = 0, | ||
| 618 | .mode = 0555, | ||
| 619 | .child = ocfs2_nm_table | ||
| 620 | }, | ||
| 621 | { .ctl_name = 0} | ||
| 622 | }; | ||
| 623 | |||
| 624 | static ctl_table ocfs2_kern_table[] = { | ||
| 625 | { | ||
| 626 | .ctl_name = FS_OCFS2, | ||
| 627 | .procname = "ocfs2", | ||
| 628 | .data = NULL, | ||
| 629 | .maxlen = 0, | ||
| 630 | .mode = 0555, | ||
| 631 | .child = ocfs2_mod_table | ||
| 632 | }, | ||
| 633 | { .ctl_name = 0} | ||
| 634 | }; | ||
| 635 | |||
| 636 | static ctl_table ocfs2_root_table[] = { | ||
| 637 | { | ||
| 638 | .ctl_name = CTL_FS, | ||
| 639 | .procname = "fs", | ||
| 640 | .data = NULL, | ||
| 641 | .maxlen = 0, | ||
| 642 | .mode = 0555, | ||
| 643 | .child = ocfs2_kern_table | ||
| 644 | }, | ||
| 645 | { .ctl_name = 0 } | ||
| 646 | }; | ||
| 647 | |||
| 648 | static struct ctl_table_header *ocfs2_table_header = NULL; | ||
| 649 | |||
| 650 | |||
| 651 | /* | ||
| 652 | * Initialization | ||
| 653 | */ | ||
| 654 | |||
| 551 | static int __init ocfs2_stack_glue_init(void) | 655 | static int __init ocfs2_stack_glue_init(void) |
| 552 | { | 656 | { |
| 553 | strcpy(cluster_stack_name, OCFS2_STACK_PLUGIN_O2CB); | 657 | strcpy(cluster_stack_name, OCFS2_STACK_PLUGIN_O2CB); |
| 554 | 658 | ||
| 659 | ocfs2_table_header = register_sysctl_table(ocfs2_root_table); | ||
| 660 | if (!ocfs2_table_header) { | ||
| 661 | printk(KERN_ERR | ||
| 662 | "ocfs2 stack glue: unable to register sysctl\n"); | ||
| 663 | return -ENOMEM; /* or something. */ | ||
| 664 | } | ||
| 665 | |||
| 555 | return ocfs2_sysfs_init(); | 666 | return ocfs2_sysfs_init(); |
| 556 | } | 667 | } |
| 557 | 668 | ||
| @@ -559,6 +670,8 @@ static void __exit ocfs2_stack_glue_exit(void) | |||
| 559 | { | 670 | { |
| 560 | lproto = NULL; | 671 | lproto = NULL; |
| 561 | ocfs2_sysfs_exit(); | 672 | ocfs2_sysfs_exit(); |
| 673 | if (ocfs2_table_header) | ||
| 674 | unregister_sysctl_table(ocfs2_table_header); | ||
| 562 | } | 675 | } |
| 563 | 676 | ||
| 564 | MODULE_AUTHOR("Oracle"); | 677 | MODULE_AUTHOR("Oracle"); |
diff --git a/fs/ocfs2/stackglue.h b/fs/ocfs2/stackglue.h index 005e4f170e0f..db56281dd1be 100644 --- a/fs/ocfs2/stackglue.h +++ b/fs/ocfs2/stackglue.h | |||
| @@ -134,22 +134,10 @@ struct ocfs2_stack_operations { | |||
| 134 | * be freed. Thus, a stack must not return from ->disconnect() | 134 | * be freed. Thus, a stack must not return from ->disconnect() |
| 135 | * until it will no longer reference the conn pointer. | 135 | * until it will no longer reference the conn pointer. |
| 136 | * | 136 | * |
| 137 | * If hangup_pending is zero, ocfs2_cluster_disconnect() will also | 137 | * Once this call returns, the stack glue will be dropping this |
| 138 | * be dropping the reference on the module. | 138 | * connection's reference on the module. |
| 139 | */ | 139 | */ |
| 140 | int (*disconnect)(struct ocfs2_cluster_connection *conn, | 140 | int (*disconnect)(struct ocfs2_cluster_connection *conn); |
| 141 | int hangup_pending); | ||
| 142 | |||
| 143 | /* | ||
| 144 | * ocfs2_cluster_hangup() exists for compatibility with older | ||
| 145 | * ocfs2 tools. Only the classic stack really needs it. As such | ||
| 146 | * ->hangup() is not required of all stacks. See the comment by | ||
| 147 | * ocfs2_cluster_hangup() for more details. | ||
| 148 | * | ||
| 149 | * Note that ocfs2_cluster_hangup() can only be called if | ||
| 150 | * hangup_pending was passed to ocfs2_cluster_disconnect(). | ||
| 151 | */ | ||
| 152 | void (*hangup)(const char *group, int grouplen); | ||
| 153 | 141 | ||
| 154 | /* | 142 | /* |
| 155 | * ->this_node() returns the cluster's unique identifier for the | 143 | * ->this_node() returns the cluster's unique identifier for the |
| @@ -258,4 +246,5 @@ void ocfs2_stack_glue_set_locking_protocol(struct ocfs2_locking_protocol *proto) | |||
| 258 | /* Used by stack plugins */ | 246 | /* Used by stack plugins */ |
| 259 | int ocfs2_stack_glue_register(struct ocfs2_stack_plugin *plugin); | 247 | int ocfs2_stack_glue_register(struct ocfs2_stack_plugin *plugin); |
| 260 | void ocfs2_stack_glue_unregister(struct ocfs2_stack_plugin *plugin); | 248 | void ocfs2_stack_glue_unregister(struct ocfs2_stack_plugin *plugin); |
| 249 | |||
| 261 | #endif /* STACKGLUE_H */ | 250 | #endif /* STACKGLUE_H */ |
diff --git a/fs/select.c b/fs/select.c index 8dda969614a9..da0e88201c3a 100644 --- a/fs/select.c +++ b/fs/select.c | |||
| @@ -249,7 +249,6 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout) | |||
| 249 | retval++; | 249 | retval++; |
| 250 | } | 250 | } |
| 251 | } | 251 | } |
| 252 | cond_resched(); | ||
| 253 | } | 252 | } |
| 254 | if (res_in) | 253 | if (res_in) |
| 255 | *rinp = res_in; | 254 | *rinp = res_in; |
| @@ -257,6 +256,7 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout) | |||
| 257 | *routp = res_out; | 256 | *routp = res_out; |
| 258 | if (res_ex) | 257 | if (res_ex) |
| 259 | *rexp = res_ex; | 258 | *rexp = res_ex; |
| 259 | cond_resched(); | ||
| 260 | } | 260 | } |
| 261 | wait = NULL; | 261 | wait = NULL; |
| 262 | if (retval || !*timeout || signal_pending(current)) | 262 | if (retval || !*timeout || signal_pending(current)) |
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 8fa9c2d70911..8ec865de5f13 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #define UDF_PREALLOCATE | 16 | #define UDF_PREALLOCATE |
| 17 | #define UDF_DEFAULT_PREALLOC_BLOCKS 8 | 17 | #define UDF_DEFAULT_PREALLOC_BLOCKS 8 |
| 18 | 18 | ||
| 19 | #define UDFFS_DEBUG | 19 | #undef UDFFS_DEBUG |
| 20 | 20 | ||
| 21 | #ifdef UDFFS_DEBUG | 21 | #ifdef UDFFS_DEBUG |
| 22 | #define udf_debug(f, a...) \ | 22 | #define udf_debug(f, a...) \ |
diff --git a/include/asm-alpha/core_mcpcia.h b/include/asm-alpha/core_mcpcia.h index 525b4f6a7ace..acf55b483472 100644 --- a/include/asm-alpha/core_mcpcia.h +++ b/include/asm-alpha/core_mcpcia.h | |||
| @@ -261,7 +261,7 @@ struct el_MCPCIA_uncorrected_frame_mcheck { | |||
| 261 | } | 261 | } |
| 262 | #endif | 262 | #endif |
| 263 | 263 | ||
| 264 | static inline int __mcpcia_is_mmio(unsigned long addr) | 264 | extern inline int __mcpcia_is_mmio(unsigned long addr) |
| 265 | { | 265 | { |
| 266 | return (addr & 0x80000000UL) == 0; | 266 | return (addr & 0x80000000UL) == 0; |
| 267 | } | 267 | } |
diff --git a/include/asm-alpha/core_t2.h b/include/asm-alpha/core_t2.h index 90e6b5d6c214..46bfff58f670 100644 --- a/include/asm-alpha/core_t2.h +++ b/include/asm-alpha/core_t2.h | |||
| @@ -356,13 +356,13 @@ struct el_t2_frame_corrected { | |||
| 356 | #define vip volatile int * | 356 | #define vip volatile int * |
| 357 | #define vuip volatile unsigned int * | 357 | #define vuip volatile unsigned int * |
| 358 | 358 | ||
| 359 | static inline u8 t2_inb(unsigned long addr) | 359 | extern inline u8 t2_inb(unsigned long addr) |
| 360 | { | 360 | { |
| 361 | long result = *(vip) ((addr << 5) + T2_IO + 0x00); | 361 | long result = *(vip) ((addr << 5) + T2_IO + 0x00); |
| 362 | return __kernel_extbl(result, addr & 3); | 362 | return __kernel_extbl(result, addr & 3); |
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | static inline void t2_outb(u8 b, unsigned long addr) | 365 | extern inline void t2_outb(u8 b, unsigned long addr) |
| 366 | { | 366 | { |
| 367 | unsigned long w; | 367 | unsigned long w; |
| 368 | 368 | ||
| @@ -371,13 +371,13 @@ static inline void t2_outb(u8 b, unsigned long addr) | |||
| 371 | mb(); | 371 | mb(); |
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | static inline u16 t2_inw(unsigned long addr) | 374 | extern inline u16 t2_inw(unsigned long addr) |
| 375 | { | 375 | { |
| 376 | long result = *(vip) ((addr << 5) + T2_IO + 0x08); | 376 | long result = *(vip) ((addr << 5) + T2_IO + 0x08); |
| 377 | return __kernel_extwl(result, addr & 3); | 377 | return __kernel_extwl(result, addr & 3); |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | static inline void t2_outw(u16 b, unsigned long addr) | 380 | extern inline void t2_outw(u16 b, unsigned long addr) |
| 381 | { | 381 | { |
| 382 | unsigned long w; | 382 | unsigned long w; |
| 383 | 383 | ||
| @@ -386,12 +386,12 @@ static inline void t2_outw(u16 b, unsigned long addr) | |||
| 386 | mb(); | 386 | mb(); |
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | static inline u32 t2_inl(unsigned long addr) | 389 | extern inline u32 t2_inl(unsigned long addr) |
| 390 | { | 390 | { |
| 391 | return *(vuip) ((addr << 5) + T2_IO + 0x18); | 391 | return *(vuip) ((addr << 5) + T2_IO + 0x18); |
| 392 | } | 392 | } |
| 393 | 393 | ||
| 394 | static inline void t2_outl(u32 b, unsigned long addr) | 394 | extern inline void t2_outl(u32 b, unsigned long addr) |
| 395 | { | 395 | { |
| 396 | *(vuip) ((addr << 5) + T2_IO + 0x18) = b; | 396 | *(vuip) ((addr << 5) + T2_IO + 0x18) = b; |
| 397 | mb(); | 397 | mb(); |
| @@ -435,7 +435,7 @@ static inline void t2_outl(u32 b, unsigned long addr) | |||
| 435 | set_hae(msb); \ | 435 | set_hae(msb); \ |
| 436 | } | 436 | } |
| 437 | 437 | ||
| 438 | static DEFINE_SPINLOCK(t2_hae_lock); | 438 | extern spinlock_t t2_hae_lock; |
| 439 | 439 | ||
| 440 | /* | 440 | /* |
| 441 | * NOTE: take T2_DENSE_MEM off in each readX/writeX routine, since | 441 | * NOTE: take T2_DENSE_MEM off in each readX/writeX routine, since |
diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h index 38f18cf18c9d..e971ab000f95 100644 --- a/include/asm-alpha/io.h +++ b/include/asm-alpha/io.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | * register not being up-to-date with respect to the hardware | 35 | * register not being up-to-date with respect to the hardware |
| 36 | * value. | 36 | * value. |
| 37 | */ | 37 | */ |
| 38 | static inline void __set_hae(unsigned long new_hae) | 38 | extern inline void __set_hae(unsigned long new_hae) |
| 39 | { | 39 | { |
| 40 | unsigned long flags; | 40 | unsigned long flags; |
| 41 | local_irq_save(flags); | 41 | local_irq_save(flags); |
| @@ -49,7 +49,7 @@ static inline void __set_hae(unsigned long new_hae) | |||
| 49 | local_irq_restore(flags); | 49 | local_irq_restore(flags); |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | static inline void set_hae(unsigned long new_hae) | 52 | extern inline void set_hae(unsigned long new_hae) |
| 53 | { | 53 | { |
| 54 | if (new_hae != alpha_mv.hae_cache) | 54 | if (new_hae != alpha_mv.hae_cache) |
| 55 | __set_hae(new_hae); | 55 | __set_hae(new_hae); |
| @@ -176,7 +176,7 @@ REMAP2(u64, writeq, volatile) | |||
| 176 | #undef REMAP1 | 176 | #undef REMAP1 |
| 177 | #undef REMAP2 | 177 | #undef REMAP2 |
| 178 | 178 | ||
| 179 | static inline void __iomem *generic_ioportmap(unsigned long a) | 179 | extern inline void __iomem *generic_ioportmap(unsigned long a) |
| 180 | { | 180 | { |
| 181 | return alpha_mv.mv_ioportmap(a); | 181 | return alpha_mv.mv_ioportmap(a); |
| 182 | } | 182 | } |
diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h index 6a5be1f7debf..86c08a02d239 100644 --- a/include/asm-alpha/mmu_context.h +++ b/include/asm-alpha/mmu_context.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #endif | 23 | #endif |
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | extern inline unsigned long | 26 | static inline unsigned long |
| 27 | __reload_thread(struct pcb_struct *pcb) | 27 | __reload_thread(struct pcb_struct *pcb) |
| 28 | { | 28 | { |
| 29 | register unsigned long a0 __asm__("$16"); | 29 | register unsigned long a0 __asm__("$16"); |
| @@ -114,7 +114,7 @@ extern unsigned long last_asn; | |||
| 114 | #define __MMU_EXTERN_INLINE | 114 | #define __MMU_EXTERN_INLINE |
| 115 | #endif | 115 | #endif |
| 116 | 116 | ||
| 117 | static inline unsigned long | 117 | extern inline unsigned long |
| 118 | __get_new_mm_context(struct mm_struct *mm, long cpu) | 118 | __get_new_mm_context(struct mm_struct *mm, long cpu) |
| 119 | { | 119 | { |
| 120 | unsigned long asn = cpu_last_asn(cpu); | 120 | unsigned long asn = cpu_last_asn(cpu); |
| @@ -226,7 +226,7 @@ ev4_activate_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm) | |||
| 226 | # endif | 226 | # endif |
| 227 | #endif | 227 | #endif |
| 228 | 228 | ||
| 229 | extern inline int | 229 | static inline int |
| 230 | init_new_context(struct task_struct *tsk, struct mm_struct *mm) | 230 | init_new_context(struct task_struct *tsk, struct mm_struct *mm) |
| 231 | { | 231 | { |
| 232 | int i; | 232 | int i; |
diff --git a/include/asm-alpha/percpu.h b/include/asm-alpha/percpu.h index 48348fe34c19..3495e8e00d70 100644 --- a/include/asm-alpha/percpu.h +++ b/include/asm-alpha/percpu.h | |||
| @@ -1,6 +1,78 @@ | |||
| 1 | #ifndef __ALPHA_PERCPU_H | 1 | #ifndef __ALPHA_PERCPU_H |
| 2 | #define __ALPHA_PERCPU_H | 2 | #define __ALPHA_PERCPU_H |
| 3 | #include <linux/compiler.h> | ||
| 4 | #include <linux/threads.h> | ||
| 3 | 5 | ||
| 4 | #include <asm-generic/percpu.h> | 6 | /* |
| 7 | * Determine the real variable name from the name visible in the | ||
| 8 | * kernel sources. | ||
| 9 | */ | ||
| 10 | #define per_cpu_var(var) per_cpu__##var | ||
| 11 | |||
| 12 | #ifdef CONFIG_SMP | ||
| 13 | |||
| 14 | /* | ||
| 15 | * per_cpu_offset() is the offset that has to be added to a | ||
| 16 | * percpu variable to get to the instance for a certain processor. | ||
| 17 | */ | ||
| 18 | extern unsigned long __per_cpu_offset[NR_CPUS]; | ||
| 19 | |||
| 20 | #define per_cpu_offset(x) (__per_cpu_offset[x]) | ||
| 21 | |||
| 22 | #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) | ||
| 23 | #ifdef CONFIG_DEBUG_PREEMPT | ||
| 24 | #define my_cpu_offset per_cpu_offset(smp_processor_id()) | ||
| 25 | #else | ||
| 26 | #define my_cpu_offset __my_cpu_offset | ||
| 27 | #endif | ||
| 28 | |||
| 29 | #ifndef MODULE | ||
| 30 | #define SHIFT_PERCPU_PTR(var, offset) RELOC_HIDE(&per_cpu_var(var), (offset)) | ||
| 31 | #define PER_CPU_ATTRIBUTES | ||
| 32 | #else | ||
| 33 | /* | ||
| 34 | * To calculate addresses of locally defined variables, GCC uses 32-bit | ||
| 35 | * displacement from the GP. Which doesn't work for per cpu variables in | ||
| 36 | * modules, as an offset to the kernel per cpu area is way above 4G. | ||
| 37 | * | ||
| 38 | * This forces allocation of a GOT entry for per cpu variable using | ||
| 39 | * ldq instruction with a 'literal' relocation. | ||
| 40 | */ | ||
| 41 | #define SHIFT_PERCPU_PTR(var, offset) ({ \ | ||
| 42 | extern int simple_identifier_##var(void); \ | ||
| 43 | unsigned long __ptr, tmp_gp; \ | ||
| 44 | asm ( "br %1, 1f \n\ | ||
| 45 | 1: ldgp %1, 0(%1) \n\ | ||
| 46 | ldq %0, per_cpu__" #var"(%1)\t!literal" \ | ||
| 47 | : "=&r"(__ptr), "=&r"(tmp_gp)); \ | ||
| 48 | (typeof(&per_cpu_var(var)))(__ptr + (offset)); }) | ||
| 49 | |||
| 50 | #define PER_CPU_ATTRIBUTES __used | ||
| 51 | |||
| 52 | #endif /* MODULE */ | ||
| 53 | |||
| 54 | /* | ||
| 55 | * A percpu variable may point to a discarded regions. The following are | ||
| 56 | * established ways to produce a usable pointer from the percpu variable | ||
| 57 | * offset. | ||
| 58 | */ | ||
| 59 | #define per_cpu(var, cpu) \ | ||
| 60 | (*SHIFT_PERCPU_PTR(var, per_cpu_offset(cpu))) | ||
| 61 | #define __get_cpu_var(var) \ | ||
| 62 | (*SHIFT_PERCPU_PTR(var, my_cpu_offset)) | ||
| 63 | #define __raw_get_cpu_var(var) \ | ||
| 64 | (*SHIFT_PERCPU_PTR(var, __my_cpu_offset)) | ||
| 65 | |||
| 66 | #else /* ! SMP */ | ||
| 67 | |||
| 68 | #define per_cpu(var, cpu) (*((void)(cpu), &per_cpu_var(var))) | ||
| 69 | #define __get_cpu_var(var) per_cpu_var(var) | ||
| 70 | #define __raw_get_cpu_var(var) per_cpu_var(var) | ||
| 71 | |||
| 72 | #define PER_CPU_ATTRIBUTES | ||
| 73 | |||
| 74 | #endif /* SMP */ | ||
| 75 | |||
| 76 | #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name) | ||
| 5 | 77 | ||
| 6 | #endif /* __ALPHA_PERCPU_H */ | 78 | #endif /* __ALPHA_PERCPU_H */ |
diff --git a/include/asm-alpha/system.h b/include/asm-alpha/system.h index ed221d6408fc..afe20fa58c99 100644 --- a/include/asm-alpha/system.h +++ b/include/asm-alpha/system.h | |||
| @@ -184,7 +184,7 @@ enum amask_enum { | |||
| 184 | __amask; }) | 184 | __amask; }) |
| 185 | 185 | ||
| 186 | #define __CALL_PAL_R0(NAME, TYPE) \ | 186 | #define __CALL_PAL_R0(NAME, TYPE) \ |
| 187 | static inline TYPE NAME(void) \ | 187 | extern inline TYPE NAME(void) \ |
| 188 | { \ | 188 | { \ |
| 189 | register TYPE __r0 __asm__("$0"); \ | 189 | register TYPE __r0 __asm__("$0"); \ |
| 190 | __asm__ __volatile__( \ | 190 | __asm__ __volatile__( \ |
| @@ -196,7 +196,7 @@ static inline TYPE NAME(void) \ | |||
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | #define __CALL_PAL_W1(NAME, TYPE0) \ | 198 | #define __CALL_PAL_W1(NAME, TYPE0) \ |
| 199 | static inline void NAME(TYPE0 arg0) \ | 199 | extern inline void NAME(TYPE0 arg0) \ |
| 200 | { \ | 200 | { \ |
| 201 | register TYPE0 __r16 __asm__("$16") = arg0; \ | 201 | register TYPE0 __r16 __asm__("$16") = arg0; \ |
| 202 | __asm__ __volatile__( \ | 202 | __asm__ __volatile__( \ |
| @@ -207,7 +207,7 @@ static inline void NAME(TYPE0 arg0) \ | |||
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | #define __CALL_PAL_W2(NAME, TYPE0, TYPE1) \ | 209 | #define __CALL_PAL_W2(NAME, TYPE0, TYPE1) \ |
| 210 | static inline void NAME(TYPE0 arg0, TYPE1 arg1) \ | 210 | extern inline void NAME(TYPE0 arg0, TYPE1 arg1) \ |
| 211 | { \ | 211 | { \ |
| 212 | register TYPE0 __r16 __asm__("$16") = arg0; \ | 212 | register TYPE0 __r16 __asm__("$16") = arg0; \ |
| 213 | register TYPE1 __r17 __asm__("$17") = arg1; \ | 213 | register TYPE1 __r17 __asm__("$17") = arg1; \ |
| @@ -219,7 +219,7 @@ static inline void NAME(TYPE0 arg0, TYPE1 arg1) \ | |||
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | #define __CALL_PAL_RW1(NAME, RTYPE, TYPE0) \ | 221 | #define __CALL_PAL_RW1(NAME, RTYPE, TYPE0) \ |
| 222 | static inline RTYPE NAME(TYPE0 arg0) \ | 222 | extern inline RTYPE NAME(TYPE0 arg0) \ |
| 223 | { \ | 223 | { \ |
| 224 | register RTYPE __r0 __asm__("$0"); \ | 224 | register RTYPE __r0 __asm__("$0"); \ |
| 225 | register TYPE0 __r16 __asm__("$16") = arg0; \ | 225 | register TYPE0 __r16 __asm__("$16") = arg0; \ |
| @@ -232,7 +232,7 @@ static inline RTYPE NAME(TYPE0 arg0) \ | |||
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | #define __CALL_PAL_RW2(NAME, RTYPE, TYPE0, TYPE1) \ | 234 | #define __CALL_PAL_RW2(NAME, RTYPE, TYPE0, TYPE1) \ |
| 235 | static inline RTYPE NAME(TYPE0 arg0, TYPE1 arg1) \ | 235 | extern inline RTYPE NAME(TYPE0 arg0, TYPE1 arg1) \ |
| 236 | { \ | 236 | { \ |
| 237 | register RTYPE __r0 __asm__("$0"); \ | 237 | register RTYPE __r0 __asm__("$0"); \ |
| 238 | register TYPE0 __r16 __asm__("$16") = arg0; \ | 238 | register TYPE0 __r16 __asm__("$16") = arg0; \ |
diff --git a/include/asm-alpha/vga.h b/include/asm-alpha/vga.h index e8df1e7aae6b..c00106bac521 100644 --- a/include/asm-alpha/vga.h +++ b/include/asm-alpha/vga.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #define VT_BUF_HAVE_MEMSETW | 13 | #define VT_BUF_HAVE_MEMSETW |
| 14 | #define VT_BUF_HAVE_MEMCPYW | 14 | #define VT_BUF_HAVE_MEMCPYW |
| 15 | 15 | ||
| 16 | extern inline void scr_writew(u16 val, volatile u16 *addr) | 16 | static inline void scr_writew(u16 val, volatile u16 *addr) |
| 17 | { | 17 | { |
| 18 | if (__is_ioaddr(addr)) | 18 | if (__is_ioaddr(addr)) |
| 19 | __raw_writew(val, (volatile u16 __iomem *) addr); | 19 | __raw_writew(val, (volatile u16 __iomem *) addr); |
| @@ -21,7 +21,7 @@ extern inline void scr_writew(u16 val, volatile u16 *addr) | |||
| 21 | *addr = val; | 21 | *addr = val; |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | extern inline u16 scr_readw(volatile const u16 *addr) | 24 | static inline u16 scr_readw(volatile const u16 *addr) |
| 25 | { | 25 | { |
| 26 | if (__is_ioaddr(addr)) | 26 | if (__is_ioaddr(addr)) |
| 27 | return __raw_readw((volatile const u16 __iomem *) addr); | 27 | return __raw_readw((volatile const u16 __iomem *) addr); |
| @@ -29,7 +29,7 @@ extern inline u16 scr_readw(volatile const u16 *addr) | |||
| 29 | return *addr; | 29 | return *addr; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | extern inline void scr_memsetw(u16 *s, u16 c, unsigned int count) | 32 | static inline void scr_memsetw(u16 *s, u16 c, unsigned int count) |
| 33 | { | 33 | { |
| 34 | if (__is_ioaddr(s)) | 34 | if (__is_ioaddr(s)) |
| 35 | memsetw_io((u16 __iomem *) s, c, count); | 35 | memsetw_io((u16 __iomem *) s, c, count); |
diff --git a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h index 96bd09e31e36..2526b6ed6faa 100644 --- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | |||
| @@ -96,7 +96,7 @@ struct bfin_serial_port { | |||
| 96 | struct work_struct tx_dma_workqueue; | 96 | struct work_struct tx_dma_workqueue; |
| 97 | #endif | 97 | #endif |
| 98 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS | 98 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS |
| 99 | struct work_struct cts_workqueue; | 99 | struct timer_list cts_timer; |
| 100 | int cts_pin; | 100 | int cts_pin; |
| 101 | int rts_pin; | 101 | int rts_pin; |
| 102 | #endif | 102 | #endif |
diff --git a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h index e924569ad1d8..ebf592b59aab 100644 --- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | |||
| @@ -88,7 +88,7 @@ struct bfin_serial_port { | |||
| 88 | # endif | 88 | # endif |
| 89 | #endif | 89 | #endif |
| 90 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS | 90 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS |
| 91 | struct work_struct cts_workqueue; | 91 | struct timer_list cts_timer; |
| 92 | int cts_pin; | 92 | int cts_pin; |
| 93 | int rts_pin; | 93 | int rts_pin; |
| 94 | #endif | 94 | #endif |
diff --git a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h index 41d7b6490bb1..1bf56ffa22f9 100644 --- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | |||
| @@ -96,7 +96,7 @@ struct bfin_serial_port { | |||
| 96 | struct work_struct tx_dma_workqueue; | 96 | struct work_struct tx_dma_workqueue; |
| 97 | #endif | 97 | #endif |
| 98 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS | 98 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS |
| 99 | struct work_struct cts_workqueue; | 99 | struct timer_list cts_timer; |
| 100 | int cts_pin; | 100 | int cts_pin; |
| 101 | int rts_pin; | 101 | int rts_pin; |
| 102 | #endif | 102 | #endif |
diff --git a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h index 59b4ad4e5b4a..5e29446a8e03 100644 --- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | |||
| @@ -99,7 +99,7 @@ struct bfin_serial_port { | |||
| 99 | struct work_struct tx_dma_workqueue; | 99 | struct work_struct tx_dma_workqueue; |
| 100 | #endif | 100 | #endif |
| 101 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS | 101 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS |
| 102 | struct work_struct cts_workqueue; | 102 | struct timer_list cts_timer; |
| 103 | int cts_pin; | 103 | int cts_pin; |
| 104 | int rts_pin; | 104 | int rts_pin; |
| 105 | #endif | 105 | #endif |
| @@ -187,7 +187,7 @@ static void bfin_serial_hw_init(struct bfin_serial_port *uart) | |||
| 187 | 187 | ||
| 188 | #ifdef CONFIG_BFIN_UART1_CTSRTS | 188 | #ifdef CONFIG_BFIN_UART1_CTSRTS |
| 189 | peripheral_request(P_UART1_RTS, DRIVER_NAME); | 189 | peripheral_request(P_UART1_RTS, DRIVER_NAME); |
| 190 | peripheral_request(P_UART1_CTS DRIVER_NAME); | 190 | peripheral_request(P_UART1_CTS, DRIVER_NAME); |
| 191 | #endif | 191 | #endif |
| 192 | #endif | 192 | #endif |
| 193 | 193 | ||
| @@ -202,7 +202,7 @@ static void bfin_serial_hw_init(struct bfin_serial_port *uart) | |||
| 202 | 202 | ||
| 203 | #ifdef CONFIG_BFIN_UART3_CTSRTS | 203 | #ifdef CONFIG_BFIN_UART3_CTSRTS |
| 204 | peripheral_request(P_UART3_RTS, DRIVER_NAME); | 204 | peripheral_request(P_UART3_RTS, DRIVER_NAME); |
| 205 | peripheral_request(P_UART3_CTS DRIVER_NAME); | 205 | peripheral_request(P_UART3_CTS, DRIVER_NAME); |
| 206 | #endif | 206 | #endif |
| 207 | #endif | 207 | #endif |
| 208 | SSYNC(); | 208 | SSYNC(); |
diff --git a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h index 30d90b580f18..8aa02780e642 100644 --- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | |||
| @@ -88,7 +88,7 @@ struct bfin_serial_port { | |||
| 88 | # endif | 88 | # endif |
| 89 | #endif | 89 | #endif |
| 90 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS | 90 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS |
| 91 | struct work_struct cts_workqueue; | 91 | struct timer_list cts_timer; |
| 92 | int cts_pin; | 92 | int cts_pin; |
| 93 | int rts_pin; | 93 | int rts_pin; |
| 94 | #endif | 94 | #endif |
diff --git a/include/asm-ia64/sn/simulator.h b/include/asm-ia64/sn/simulator.h index c3fd3eb25768..c2611f6cfe33 100644 --- a/include/asm-ia64/sn/simulator.h +++ b/include/asm-ia64/sn/simulator.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #ifndef _ASM_IA64_SN_SIMULATOR_H | 8 | #ifndef _ASM_IA64_SN_SIMULATOR_H |
| 9 | #define _ASM_IA64_SN_SIMULATOR_H | 9 | #define _ASM_IA64_SN_SIMULATOR_H |
| 10 | 10 | ||
| 11 | 11 | #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2) || defined(CONFIG_IA64_SGI_UV) | |
| 12 | #define SNMAGIC 0xaeeeeeee8badbeefL | 12 | #define SNMAGIC 0xaeeeeeee8badbeefL |
| 13 | #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) | 13 | #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) |
| 14 | 14 | ||
| @@ -16,5 +16,10 @@ | |||
| 16 | #define IS_RUNNING_ON_SIMULATOR() (sn_prom_type) | 16 | #define IS_RUNNING_ON_SIMULATOR() (sn_prom_type) |
| 17 | #define IS_RUNNING_ON_FAKE_PROM() (sn_prom_type == 2) | 17 | #define IS_RUNNING_ON_FAKE_PROM() (sn_prom_type == 2) |
| 18 | extern int sn_prom_type; /* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */ | 18 | extern int sn_prom_type; /* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */ |
| 19 | #else | ||
| 20 | #define IS_MEDUSA() 0 | ||
| 21 | #define SIMULATOR_SLEEP() | ||
| 22 | #define IS_RUNNING_ON_SIMULATOR() 0 | ||
| 23 | #endif | ||
| 19 | 24 | ||
| 20 | #endif /* _ASM_IA64_SN_SIMULATOR_H */ | 25 | #endif /* _ASM_IA64_SN_SIMULATOR_H */ |
diff --git a/include/asm-mips/cpu-info.h b/include/asm-mips/cpu-info.h index 0c5a358863f3..2de73dbb2e9e 100644 --- a/include/asm-mips/cpu-info.h +++ b/include/asm-mips/cpu-info.h | |||
| @@ -56,7 +56,7 @@ struct cpuinfo_mips { | |||
| 56 | struct cache_desc tcache; /* Tertiary/split secondary cache */ | 56 | struct cache_desc tcache; /* Tertiary/split secondary cache */ |
| 57 | int srsets; /* Shadow register sets */ | 57 | int srsets; /* Shadow register sets */ |
| 58 | int core; /* physical core number */ | 58 | int core; /* physical core number */ |
| 59 | #if defined(CONFIG_MIPS_MT_SMTC) | 59 | #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC) |
| 60 | /* | 60 | /* |
| 61 | * In the MIPS MT "SMTC" model, each TC is considered | 61 | * In the MIPS MT "SMTC" model, each TC is considered |
| 62 | * to be a "CPU" for the purposes of scheduling, but | 62 | * to be a "CPU" for the purposes of scheduling, but |
| @@ -64,7 +64,7 @@ struct cpuinfo_mips { | |||
| 64 | * to all TCs within the same VPE. | 64 | * to all TCs within the same VPE. |
| 65 | */ | 65 | */ |
| 66 | int vpe_id; /* Virtual Processor number */ | 66 | int vpe_id; /* Virtual Processor number */ |
| 67 | #endif /* CONFIG_MIPS_MT */ | 67 | #endif |
| 68 | #ifdef CONFIG_MIPS_MT_SMTC | 68 | #ifdef CONFIG_MIPS_MT_SMTC |
| 69 | int tc_id; /* Thread Context number */ | 69 | int tc_id; /* Thread Context number */ |
| 70 | #endif | 70 | #endif |
diff --git a/include/asm-mips/gic.h b/include/asm-mips/gic.h index 3a492f225f00..954807d9d66a 100644 --- a/include/asm-mips/gic.h +++ b/include/asm-mips/gic.h | |||
| @@ -24,8 +24,8 @@ | |||
| 24 | 24 | ||
| 25 | #define MSK(n) ((1 << (n)) - 1) | 25 | #define MSK(n) ((1 << (n)) - 1) |
| 26 | #define REG32(addr) (*(volatile unsigned int *) (addr)) | 26 | #define REG32(addr) (*(volatile unsigned int *) (addr)) |
| 27 | #define REG(base, offs) REG32((unsigned int)(base) + offs##_##OFS) | 27 | #define REG(base, offs) REG32((unsigned long)(base) + offs##_##OFS) |
| 28 | #define REGP(base, phys) REG32((unsigned int)(base) + (phys)) | 28 | #define REGP(base, phys) REG32((unsigned long)(base) + (phys)) |
| 29 | 29 | ||
| 30 | /* Accessors */ | 30 | /* Accessors */ |
| 31 | #define GIC_REG(segment, offset) \ | 31 | #define GIC_REG(segment, offset) \ |
diff --git a/include/asm-mips/lasat/serial.h b/include/asm-mips/lasat/serial.h index bafe68b10614..1c37d70579b8 100644 --- a/include/asm-mips/lasat/serial.h +++ b/include/asm-mips/lasat/serial.h | |||
| @@ -4,10 +4,10 @@ | |||
| 4 | #define LASAT_BASE_BAUD_100 (7372800 / 16) | 4 | #define LASAT_BASE_BAUD_100 (7372800 / 16) |
| 5 | #define LASAT_UART_REGS_BASE_100 0x1c8b0000 | 5 | #define LASAT_UART_REGS_BASE_100 0x1c8b0000 |
| 6 | #define LASAT_UART_REGS_SHIFT_100 2 | 6 | #define LASAT_UART_REGS_SHIFT_100 2 |
| 7 | #define LASATINT_UART_100 8 | 7 | #define LASATINT_UART_100 16 |
| 8 | 8 | ||
| 9 | /* * LASAT 200 boards serial configuration */ | 9 | /* * LASAT 200 boards serial configuration */ |
| 10 | #define LASAT_BASE_BAUD_200 (100000000 / 16 / 12) | 10 | #define LASAT_BASE_BAUD_200 (100000000 / 16 / 12) |
| 11 | #define LASAT_UART_REGS_BASE_200 (Vrc5074_PHYS_BASE + 0x0300) | 11 | #define LASAT_UART_REGS_BASE_200 (Vrc5074_PHYS_BASE + 0x0300) |
| 12 | #define LASAT_UART_REGS_SHIFT_200 3 | 12 | #define LASAT_UART_REGS_SHIFT_200 3 |
| 13 | #define LASATINT_UART_200 13 | 13 | #define LASATINT_UART_200 21 |
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index 1b5064dac007..0d302bad4492 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
| @@ -615,6 +615,7 @@ enum soc_au1500_ints { | |||
| 615 | AU1000_RTC_MATCH1_INT, | 615 | AU1000_RTC_MATCH1_INT, |
| 616 | AU1000_RTC_MATCH2_INT, | 616 | AU1000_RTC_MATCH2_INT, |
| 617 | AU1500_PCI_ERR_INT, | 617 | AU1500_PCI_ERR_INT, |
| 618 | AU1500_RESERVED_INT, | ||
| 618 | AU1000_USB_DEV_REQ_INT, | 619 | AU1000_USB_DEV_REQ_INT, |
| 619 | AU1000_USB_DEV_SUS_INT, | 620 | AU1000_USB_DEV_SUS_INT, |
| 620 | AU1000_USB_HOST_INT, | 621 | AU1000_USB_HOST_INT, |
diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 60e2f9338fcd..51b34a48c84a 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h | |||
| @@ -134,6 +134,4 @@ | |||
| 134 | 134 | ||
| 135 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) | 135 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) |
| 136 | 136 | ||
| 137 | #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT>>_CACHE_SHIFT) | ||
| 138 | |||
| 139 | #endif /* _ASM_PGTABLE_BITS_H */ | 137 | #endif /* _ASM_PGTABLE_BITS_H */ |
diff --git a/include/asm-powerpc/mediabay.h b/include/asm-powerpc/mediabay.h index df111c362a7f..b2efb3325808 100644 --- a/include/asm-powerpc/mediabay.h +++ b/include/asm-powerpc/mediabay.h | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | #define MB_POWER 6 /* media bay contains a Power device (???) */ | 17 | #define MB_POWER 6 /* media bay contains a Power device (???) */ |
| 18 | #define MB_NO 7 /* media bay contains nothing */ | 18 | #define MB_NO 7 /* media bay contains nothing */ |
| 19 | 19 | ||
| 20 | int check_media_bay(struct device_node *which_bay, int what); | ||
| 21 | |||
| 22 | /* Number of bays in the machine or 0 */ | 20 | /* Number of bays in the machine or 0 */ |
| 23 | extern int media_bay_count; | 21 | extern int media_bay_count; |
| 24 | 22 | ||
| @@ -29,6 +27,16 @@ int check_media_bay_by_base(unsigned long base, int what); | |||
| 29 | /* called by IDE PMAC host driver to register IDE controller for media bay */ | 27 | /* called by IDE PMAC host driver to register IDE controller for media bay */ |
| 30 | int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base, | 28 | int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base, |
| 31 | int irq, ide_hwif_t *hwif); | 29 | int irq, ide_hwif_t *hwif); |
| 30 | |||
| 31 | int check_media_bay(struct device_node *which_bay, int what); | ||
| 32 | |||
| 33 | #else | ||
| 34 | |||
| 35 | static inline int check_media_bay(struct device_node *which_bay, int what) | ||
| 36 | { | ||
| 37 | return -ENODEV; | ||
| 38 | } | ||
| 39 | |||
| 32 | #endif | 40 | #endif |
| 33 | 41 | ||
| 34 | #endif /* __KERNEL__ */ | 42 | #endif /* __KERNEL__ */ |
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index 6abead6e681a..99348c1f4cab 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h | |||
| @@ -131,7 +131,6 @@ struct spu { | |||
| 131 | u64 flags; | 131 | u64 flags; |
| 132 | u64 class_0_pending; | 132 | u64 class_0_pending; |
| 133 | u64 class_0_dar; | 133 | u64 class_0_dar; |
| 134 | u64 class_0_dsisr; | ||
| 135 | u64 class_1_dar; | 134 | u64 class_1_dar; |
| 136 | u64 class_1_dsisr; | 135 | u64 class_1_dsisr; |
| 137 | size_t ls_size; | 136 | size_t ls_size; |
diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h index 129ec148d451..a40fd491250c 100644 --- a/include/asm-powerpc/spu_csa.h +++ b/include/asm-powerpc/spu_csa.h | |||
| @@ -254,7 +254,7 @@ struct spu_state { | |||
| 254 | u64 spu_chnldata_RW[32]; | 254 | u64 spu_chnldata_RW[32]; |
| 255 | u32 spu_mailbox_data[4]; | 255 | u32 spu_mailbox_data[4]; |
| 256 | u32 pu_mailbox_data[1]; | 256 | u32 pu_mailbox_data[1]; |
| 257 | u64 class_0_dar, class_0_dsisr, class_0_pending; | 257 | u64 class_0_dar, class_0_pending; |
| 258 | u64 class_1_dar, class_1_dsisr; | 258 | u64 class_1_dar, class_1_dsisr; |
| 259 | unsigned long suspend_time; | 259 | unsigned long suspend_time; |
| 260 | spinlock_t register_lock; | 260 | spinlock_t register_lock; |
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h index 2b6559a6d113..5235f875b932 100644 --- a/include/asm-powerpc/system.h +++ b/include/asm-powerpc/system.h | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | * SMP since it is only used to order updates to system memory. | 34 | * SMP since it is only used to order updates to system memory. |
| 35 | */ | 35 | */ |
| 36 | #define mb() __asm__ __volatile__ ("sync" : : : "memory") | 36 | #define mb() __asm__ __volatile__ ("sync" : : : "memory") |
| 37 | #define rmb() __asm__ __volatile__ (__stringify(LWSYNC) : : : "memory") | 37 | #define rmb() __asm__ __volatile__ ("sync" : : : "memory") |
| 38 | #define wmb() __asm__ __volatile__ ("sync" : : : "memory") | 38 | #define wmb() __asm__ __volatile__ ("sync" : : : "memory") |
| 39 | #define read_barrier_depends() do { } while(0) | 39 | #define read_barrier_depends() do { } while(0) |
| 40 | 40 | ||
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h index 6e6458853a36..bb06027fc83e 100644 --- a/include/asm-x86/geode.h +++ b/include/asm-x86/geode.h | |||
| @@ -112,8 +112,8 @@ extern int geode_get_dev_base(unsigned int dev); | |||
| 112 | #define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */ | 112 | #define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */ |
| 113 | #define VSA_VR_SIGNATURE 0x0003 | 113 | #define VSA_VR_SIGNATURE 0x0003 |
| 114 | #define VSA_VR_MEM_SIZE 0x0200 | 114 | #define VSA_VR_MEM_SIZE 0x0200 |
| 115 | #define VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ | 115 | #define AMD_VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ |
| 116 | 116 | #define GSW_VSA_SIG 0x534d /* General Software signature */ | |
| 117 | /* GPIO */ | 117 | /* GPIO */ |
| 118 | 118 | ||
| 119 | #define GPIO_OUTPUT_VAL 0x00 | 119 | #define GPIO_OUTPUT_VAL 0x00 |
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 1d8cd01fa514..844f2a89afbc 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/kvm_para.h> | 18 | #include <linux/kvm_para.h> |
| 19 | #include <linux/kvm_types.h> | 19 | #include <linux/kvm_types.h> |
| 20 | 20 | ||
| 21 | #include <asm/pvclock-abi.h> | ||
| 21 | #include <asm/desc.h> | 22 | #include <asm/desc.h> |
| 22 | 23 | ||
| 23 | #define KVM_MAX_VCPUS 16 | 24 | #define KVM_MAX_VCPUS 16 |
| @@ -282,7 +283,8 @@ struct kvm_vcpu_arch { | |||
| 282 | struct x86_emulate_ctxt emulate_ctxt; | 283 | struct x86_emulate_ctxt emulate_ctxt; |
| 283 | 284 | ||
| 284 | gpa_t time; | 285 | gpa_t time; |
| 285 | struct kvm_vcpu_time_info hv_clock; | 286 | struct pvclock_vcpu_time_info hv_clock; |
| 287 | unsigned int hv_clock_tsc_khz; | ||
| 286 | unsigned int time_offset; | 288 | unsigned int time_offset; |
| 287 | struct page *time_page; | 289 | struct page *time_page; |
| 288 | }; | 290 | }; |
diff --git a/include/asm-x86/kvm_para.h b/include/asm-x86/kvm_para.h index 509845942070..bfd9900742bf 100644 --- a/include/asm-x86/kvm_para.h +++ b/include/asm-x86/kvm_para.h | |||
| @@ -48,24 +48,6 @@ struct kvm_mmu_op_release_pt { | |||
| 48 | #ifdef __KERNEL__ | 48 | #ifdef __KERNEL__ |
| 49 | #include <asm/processor.h> | 49 | #include <asm/processor.h> |
| 50 | 50 | ||
| 51 | /* xen binary-compatible interface. See xen headers for details */ | ||
| 52 | struct kvm_vcpu_time_info { | ||
| 53 | uint32_t version; | ||
| 54 | uint32_t pad0; | ||
| 55 | uint64_t tsc_timestamp; | ||
| 56 | uint64_t system_time; | ||
| 57 | uint32_t tsc_to_system_mul; | ||
| 58 | int8_t tsc_shift; | ||
| 59 | int8_t pad[3]; | ||
| 60 | } __attribute__((__packed__)); /* 32 bytes */ | ||
| 61 | |||
| 62 | struct kvm_wall_clock { | ||
| 63 | uint32_t wc_version; | ||
| 64 | uint32_t wc_sec; | ||
| 65 | uint32_t wc_nsec; | ||
| 66 | } __attribute__((__packed__)); | ||
| 67 | |||
| 68 | |||
| 69 | extern void kvmclock_init(void); | 51 | extern void kvmclock_init(void); |
| 70 | 52 | ||
| 71 | 53 | ||
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index 424e82f8ae27..ccf0ba3c3aba 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h | |||
| @@ -14,7 +14,8 @@ | |||
| 14 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) | 14 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) |
| 15 | 15 | ||
| 16 | #ifdef CONFIG_X86_PAE | 16 | #ifdef CONFIG_X86_PAE |
| 17 | #define __PHYSICAL_MASK_SHIFT 36 | 17 | /* 44=32+12, the limit we can fit into an unsigned long pfn */ |
| 18 | #define __PHYSICAL_MASK_SHIFT 44 | ||
| 18 | #define __VIRTUAL_MASK_SHIFT 32 | 19 | #define __VIRTUAL_MASK_SHIFT 32 |
| 19 | #define PAGETABLE_LEVELS 3 | 20 | #define PAGETABLE_LEVELS 3 |
| 20 | 21 | ||
diff --git a/include/asm-x86/pvclock-abi.h b/include/asm-x86/pvclock-abi.h new file mode 100644 index 000000000000..6857f840b243 --- /dev/null +++ b/include/asm-x86/pvclock-abi.h | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | #ifndef _ASM_X86_PVCLOCK_ABI_H_ | ||
| 2 | #define _ASM_X86_PVCLOCK_ABI_H_ | ||
| 3 | #ifndef __ASSEMBLY__ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * These structs MUST NOT be changed. | ||
| 7 | * They are the ABI between hypervisor and guest OS. | ||
| 8 | * Both Xen and KVM are using this. | ||
| 9 | * | ||
| 10 | * pvclock_vcpu_time_info holds the system time and the tsc timestamp | ||
| 11 | * of the last update. So the guest can use the tsc delta to get a | ||
| 12 | * more precise system time. There is one per virtual cpu. | ||
| 13 | * | ||
| 14 | * pvclock_wall_clock references the point in time when the system | ||
| 15 | * time was zero (usually boot time), thus the guest calculates the | ||
| 16 | * current wall clock by adding the system time. | ||
| 17 | * | ||
| 18 | * Protocol for the "version" fields is: hypervisor raises it (making | ||
| 19 | * it uneven) before it starts updating the fields and raises it again | ||
| 20 | * (making it even) when it is done. Thus the guest can make sure the | ||
| 21 | * time values it got are consistent by checking the version before | ||
| 22 | * and after reading them. | ||
| 23 | */ | ||
| 24 | |||
| 25 | struct pvclock_vcpu_time_info { | ||
| 26 | u32 version; | ||
| 27 | u32 pad0; | ||
| 28 | u64 tsc_timestamp; | ||
| 29 | u64 system_time; | ||
| 30 | u32 tsc_to_system_mul; | ||
| 31 | s8 tsc_shift; | ||
| 32 | u8 pad[3]; | ||
| 33 | } __attribute__((__packed__)); /* 32 bytes */ | ||
| 34 | |||
| 35 | struct pvclock_wall_clock { | ||
| 36 | u32 version; | ||
| 37 | u32 sec; | ||
| 38 | u32 nsec; | ||
| 39 | } __attribute__((__packed__)); | ||
| 40 | |||
| 41 | #endif /* __ASSEMBLY__ */ | ||
| 42 | #endif /* _ASM_X86_PVCLOCK_ABI_H_ */ | ||
diff --git a/include/asm-x86/pvclock.h b/include/asm-x86/pvclock.h new file mode 100644 index 000000000000..85b1bba8e0a3 --- /dev/null +++ b/include/asm-x86/pvclock.h | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | #ifndef _ASM_X86_PVCLOCK_H_ | ||
| 2 | #define _ASM_X86_PVCLOCK_H_ | ||
| 3 | |||
| 4 | #include <linux/clocksource.h> | ||
| 5 | #include <asm/pvclock-abi.h> | ||
| 6 | |||
| 7 | /* some helper functions for xen and kvm pv clock sources */ | ||
| 8 | cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src); | ||
| 9 | void pvclock_read_wallclock(struct pvclock_wall_clock *wall, | ||
| 10 | struct pvclock_vcpu_time_info *vcpu, | ||
| 11 | struct timespec *ts); | ||
| 12 | |||
| 13 | #endif /* _ASM_X86_PVCLOCK_H_ */ | ||
diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h index baf3a4dce28c..e11f24038b1d 100644 --- a/include/asm-x86/xen/page.h +++ b/include/asm-x86/xen/page.h | |||
| @@ -150,13 +150,9 @@ static inline pte_t __pte_ma(pteval_t x) | |||
| 150 | return (pte_t) { .pte = x }; | 150 | return (pte_t) { .pte = x }; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | #ifdef CONFIG_X86_PAE | ||
| 154 | #define pmd_val_ma(v) ((v).pmd) | 153 | #define pmd_val_ma(v) ((v).pmd) |
| 155 | #define pud_val_ma(v) ((v).pgd.pgd) | 154 | #define pud_val_ma(v) ((v).pgd.pgd) |
| 156 | #define __pmd_ma(x) ((pmd_t) { (x) } ) | 155 | #define __pmd_ma(x) ((pmd_t) { (x) } ) |
| 157 | #else /* !X86_PAE */ | ||
| 158 | #define pmd_val_ma(v) ((v).pud.pgd.pgd) | ||
| 159 | #endif /* CONFIG_X86_PAE */ | ||
| 160 | 156 | ||
| 161 | #define pgd_val_ma(x) ((x).pgd) | 157 | #define pgd_val_ma(x) ((x).pgd) |
| 162 | 158 | ||
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 93b98856007a..b6fbb2573e88 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -166,6 +166,9 @@ unifdef-y += acct.h | |||
| 166 | unifdef-y += adb.h | 166 | unifdef-y += adb.h |
| 167 | unifdef-y += adfs_fs.h | 167 | unifdef-y += adfs_fs.h |
| 168 | unifdef-y += agpgart.h | 168 | unifdef-y += agpgart.h |
| 169 | ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) | ||
| 170 | unifdef-y += a.out.h | ||
| 171 | endif | ||
| 169 | unifdef-y += apm_bios.h | 172 | unifdef-y += apm_bios.h |
| 170 | unifdef-y += atalk.h | 173 | unifdef-y += atalk.h |
| 171 | unifdef-y += atmdev.h | 174 | unifdef-y += atmdev.h |
diff --git a/include/linux/a.out.h b/include/linux/a.out.h index 208f4e8ed304..e86dfca44589 100644 --- a/include/linux/a.out.h +++ b/include/linux/a.out.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef __A_OUT_GNU_H__ | 1 | #ifndef __A_OUT_GNU_H__ |
| 2 | #define __A_OUT_GNU_H__ | 2 | #define __A_OUT_GNU_H__ |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_ARCH_SUPPORTS_AOUT | ||
| 5 | |||
| 6 | #define __GNU_EXEC_MACROS__ | 4 | #define __GNU_EXEC_MACROS__ |
| 7 | 5 | ||
| 8 | #ifndef __STRUCT_EXEC_OVERRIDE__ | 6 | #ifndef __STRUCT_EXEC_OVERRIDE__ |
| @@ -277,10 +275,4 @@ struct relocation_info | |||
| 277 | #endif /* no N_RELOCATION_INFO_DECLARED. */ | 275 | #endif /* no N_RELOCATION_INFO_DECLARED. */ |
| 278 | 276 | ||
| 279 | #endif /*__ASSEMBLY__ */ | 277 | #endif /*__ASSEMBLY__ */ |
| 280 | #else /* CONFIG_ARCH_SUPPORTS_AOUT */ | ||
| 281 | #ifndef __ASSEMBLY__ | ||
| 282 | struct exec { | ||
| 283 | }; | ||
| 284 | #endif | ||
| 285 | #endif /* CONFIG_ARCH_SUPPORTS_AOUT */ | ||
| 286 | #endif /* __A_OUT_GNU_H__ */ | 278 | #endif /* __A_OUT_GNU_H__ */ |
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index 661d90d6cf7c..972b12bcfb36 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h | |||
| @@ -30,14 +30,6 @@ | |||
| 30 | #ifndef _AGP_BACKEND_H | 30 | #ifndef _AGP_BACKEND_H |
| 31 | #define _AGP_BACKEND_H 1 | 31 | #define _AGP_BACKEND_H 1 |
| 32 | 32 | ||
| 33 | #ifndef TRUE | ||
| 34 | #define TRUE 1 | ||
| 35 | #endif | ||
| 36 | |||
| 37 | #ifndef FALSE | ||
| 38 | #define FALSE 0 | ||
| 39 | #endif | ||
| 40 | |||
| 41 | enum chipset_type { | 33 | enum chipset_type { |
| 42 | NOT_SUPPORTED, | 34 | NOT_SUPPORTED, |
| 43 | SUPPORTED, | 35 | SUPPORTED, |
| @@ -57,7 +49,7 @@ struct agp_kern_info { | |||
| 57 | size_t aper_size; | 49 | size_t aper_size; |
| 58 | int max_memory; /* In pages */ | 50 | int max_memory; /* In pages */ |
| 59 | int current_memory; | 51 | int current_memory; |
| 60 | int cant_use_aperture; | 52 | bool cant_use_aperture; |
| 61 | unsigned long page_mask; | 53 | unsigned long page_mask; |
| 62 | struct vm_operations_struct *vm_ops; | 54 | struct vm_operations_struct *vm_ops; |
| 63 | }; | 55 | }; |
| @@ -83,9 +75,9 @@ struct agp_memory { | |||
| 83 | off_t pg_start; | 75 | off_t pg_start; |
| 84 | u32 type; | 76 | u32 type; |
| 85 | u32 physical; | 77 | u32 physical; |
| 86 | u8 is_bound; | 78 | bool is_bound; |
| 87 | u8 is_flushed; | 79 | bool is_flushed; |
| 88 | u8 vmalloc_flag; | 80 | bool vmalloc_flag; |
| 89 | }; | 81 | }; |
| 90 | 82 | ||
| 91 | #define AGP_NORMAL_MEMORY 0 | 83 | #define AGP_NORMAL_MEMORY 0 |
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index 62aef589eb94..c8fdb6e658e1 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h | |||
| @@ -206,8 +206,8 @@ struct agp_front_data { | |||
| 206 | struct agp_controller *current_controller; | 206 | struct agp_controller *current_controller; |
| 207 | struct agp_controller *controllers; | 207 | struct agp_controller *controllers; |
| 208 | struct agp_file_private *file_priv_list; | 208 | struct agp_file_private *file_priv_list; |
| 209 | u8 used_by_controller; | 209 | bool used_by_controller; |
| 210 | u8 backend_acquired; | 210 | bool backend_acquired; |
| 211 | }; | 211 | }; |
| 212 | 212 | ||
| 213 | #endif /* __KERNEL__ */ | 213 | #endif /* __KERNEL__ */ |
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 6a5dbdc8a7dc..686895bacd9d 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -94,7 +94,7 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat, | |||
| 94 | unsigned long freepfn, | 94 | unsigned long freepfn, |
| 95 | unsigned long startpfn, | 95 | unsigned long startpfn, |
| 96 | unsigned long endpfn); | 96 | unsigned long endpfn); |
| 97 | extern void reserve_bootmem_node(pg_data_t *pgdat, | 97 | extern int reserve_bootmem_node(pg_data_t *pgdat, |
| 98 | unsigned long physaddr, | 98 | unsigned long physaddr, |
| 99 | unsigned long size, | 99 | unsigned long size, |
| 100 | int flags); | 100 | int flags); |
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h index f1fbe9c930d7..d4efe4014705 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h | |||
| @@ -41,7 +41,7 @@ struct ip_tunnel_prl { | |||
| 41 | __u16 __reserved; | 41 | __u16 __reserved; |
| 42 | __u32 datalen; | 42 | __u32 datalen; |
| 43 | __u32 __reserved2; | 43 | __u32 __reserved2; |
| 44 | void __user *data; | 44 | /* data follows */ |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | /* PRL flags */ | 47 | /* PRL flags */ |
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 092b1b25291d..de9d1df4bba2 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #define KVM_REQ_REPORT_TPR_ACCESS 2 | 33 | #define KVM_REQ_REPORT_TPR_ACCESS 2 |
| 34 | #define KVM_REQ_MMU_RELOAD 3 | 34 | #define KVM_REQ_MMU_RELOAD 3 |
| 35 | #define KVM_REQ_TRIPLE_FAULT 4 | 35 | #define KVM_REQ_TRIPLE_FAULT 4 |
| 36 | #define KVM_REQ_PENDING_TIMER 5 | ||
| 36 | 37 | ||
| 37 | struct kvm_vcpu; | 38 | struct kvm_vcpu; |
| 38 | extern struct kmem_cache *kvm_vcpu_cache; | 39 | extern struct kmem_cache *kvm_vcpu_cache; |
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index 59f1c0bd8f9c..d2a003586761 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h | |||
| @@ -27,8 +27,7 @@ | |||
| 27 | * This routine is called by the kernel to write a series of | 27 | * This routine is called by the kernel to write a series of |
| 28 | * characters to the tty device. The characters may come from | 28 | * characters to the tty device. The characters may come from |
| 29 | * user space or kernel space. This routine will return the | 29 | * user space or kernel space. This routine will return the |
| 30 | * number of characters actually accepted for writing. This | 30 | * number of characters actually accepted for writing. |
| 31 | * routine is mandatory. | ||
| 32 | * | 31 | * |
| 33 | * Optional: Required for writable devices. | 32 | * Optional: Required for writable devices. |
| 34 | * | 33 | * |
| @@ -134,7 +133,7 @@ | |||
| 134 | * This routine notifies the tty driver that it should hangup the | 133 | * This routine notifies the tty driver that it should hangup the |
| 135 | * tty device. | 134 | * tty device. |
| 136 | * | 135 | * |
| 137 | * Required: | 136 | * Optional: |
| 138 | * | 137 | * |
| 139 | * void (*break_ctl)(struct tty_stuct *tty, int state); | 138 | * void (*break_ctl)(struct tty_stuct *tty, int state); |
| 140 | * | 139 | * |
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index e0a612bc9c4e..f422f7218e1c 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -367,6 +367,12 @@ static inline int ipv6_addr_any(const struct in6_addr *a) | |||
| 367 | a->s6_addr32[2] | a->s6_addr32[3] ) == 0); | 367 | a->s6_addr32[2] | a->s6_addr32[3] ) == 0); |
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | static inline int ipv6_addr_loopback(const struct in6_addr *a) | ||
| 371 | { | ||
| 372 | return ((a->s6_addr32[0] | a->s6_addr32[1] | | ||
| 373 | a->s6_addr32[2] | (a->s6_addr32[3] ^ htonl(1))) == 0); | ||
| 374 | } | ||
| 375 | |||
| 370 | static inline int ipv6_addr_v4mapped(const struct in6_addr *a) | 376 | static inline int ipv6_addr_v4mapped(const struct in6_addr *a) |
| 371 | { | 377 | { |
| 372 | return ((a->s6_addr32[0] | a->s6_addr32[1] | | 378 | return ((a->s6_addr32[0] | a->s6_addr32[1] | |
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index aa540e6be502..d9dd0f707296 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
| @@ -95,6 +95,11 @@ extern struct list_head net_namespace_list; | |||
| 95 | #ifdef CONFIG_NET_NS | 95 | #ifdef CONFIG_NET_NS |
| 96 | extern void __put_net(struct net *net); | 96 | extern void __put_net(struct net *net); |
| 97 | 97 | ||
| 98 | static inline int net_alive(struct net *net) | ||
| 99 | { | ||
| 100 | return net && atomic_read(&net->count); | ||
| 101 | } | ||
| 102 | |||
| 98 | static inline struct net *get_net(struct net *net) | 103 | static inline struct net *get_net(struct net *net) |
| 99 | { | 104 | { |
| 100 | atomic_inc(&net->count); | 105 | atomic_inc(&net->count); |
| @@ -125,6 +130,12 @@ int net_eq(const struct net *net1, const struct net *net2) | |||
| 125 | return net1 == net2; | 130 | return net1 == net2; |
| 126 | } | 131 | } |
| 127 | #else | 132 | #else |
| 133 | |||
| 134 | static inline int net_alive(struct net *net) | ||
| 135 | { | ||
| 136 | return 1; | ||
| 137 | } | ||
| 138 | |||
| 128 | static inline struct net *get_net(struct net *net) | 139 | static inline struct net *get_net(struct net *net) |
| 129 | { | 140 | { |
| 130 | return net; | 141 | return net; |
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h index f736e842977f..f80c0ed6d870 100644 --- a/include/net/netfilter/nf_conntrack_extend.h +++ b/include/net/netfilter/nf_conntrack_extend.h | |||
| @@ -15,6 +15,7 @@ enum nf_ct_ext_id | |||
| 15 | 15 | ||
| 16 | /* Extensions: optional stuff which isn't permanently in struct. */ | 16 | /* Extensions: optional stuff which isn't permanently in struct. */ |
| 17 | struct nf_ct_ext { | 17 | struct nf_ct_ext { |
| 18 | struct rcu_head rcu; | ||
| 18 | u8 offset[NF_CT_EXT_NUM]; | 19 | u8 offset[NF_CT_EXT_NUM]; |
| 19 | u8 len; | 20 | u8 len; |
| 20 | char data[0]; | 21 | char data[0]; |
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index 9b018da48cf3..819a0331cda9 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define __XEN_PUBLIC_XEN_H__ | 10 | #define __XEN_PUBLIC_XEN_H__ |
| 11 | 11 | ||
| 12 | #include <asm/xen/interface.h> | 12 | #include <asm/xen/interface.h> |
| 13 | #include <asm/pvclock-abi.h> | ||
| 13 | 14 | ||
| 14 | /* | 15 | /* |
| 15 | * XEN "SYSTEM CALLS" (a.k.a. HYPERCALLS). | 16 | * XEN "SYSTEM CALLS" (a.k.a. HYPERCALLS). |
| @@ -336,7 +337,7 @@ struct vcpu_info { | |||
| 336 | uint8_t evtchn_upcall_mask; | 337 | uint8_t evtchn_upcall_mask; |
| 337 | unsigned long evtchn_pending_sel; | 338 | unsigned long evtchn_pending_sel; |
| 338 | struct arch_vcpu_info arch; | 339 | struct arch_vcpu_info arch; |
| 339 | struct vcpu_time_info time; | 340 | struct pvclock_vcpu_time_info time; |
| 340 | }; /* 64 bytes (x86) */ | 341 | }; /* 64 bytes (x86) */ |
| 341 | 342 | ||
| 342 | /* | 343 | /* |
| @@ -384,9 +385,7 @@ struct shared_info { | |||
| 384 | * Wallclock time: updated only by control software. Guests should base | 385 | * Wallclock time: updated only by control software. Guests should base |
| 385 | * their gettimeofday() syscall on this wallclock-base value. | 386 | * their gettimeofday() syscall on this wallclock-base value. |
| 386 | */ | 387 | */ |
| 387 | uint32_t wc_version; /* Version counter: see vcpu_time_info_t. */ | 388 | struct pvclock_wall_clock wc; |
| 388 | uint32_t wc_sec; /* Secs 00:00:00 UTC, Jan 1, 1970. */ | ||
| 389 | uint32_t wc_nsec; /* Nsecs 00:00:00 UTC, Jan 1, 1970. */ | ||
| 390 | 389 | ||
| 391 | struct arch_shared_info arch; | 390 | struct arch_shared_info arch; |
| 392 | 391 | ||
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 039baa4cd90c..9fceb97e989c 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
| @@ -1037,8 +1037,8 @@ int current_cpuset_is_being_rebound(void) | |||
| 1037 | 1037 | ||
| 1038 | static int update_relax_domain_level(struct cpuset *cs, s64 val) | 1038 | static int update_relax_domain_level(struct cpuset *cs, s64 val) |
| 1039 | { | 1039 | { |
| 1040 | if ((int)val < 0) | 1040 | if (val < -1 || val >= SD_LV_MAX) |
| 1041 | val = -1; | 1041 | return -EINVAL; |
| 1042 | 1042 | ||
| 1043 | if (val != cs->relax_domain_level) { | 1043 | if (val != cs->relax_domain_level) { |
| 1044 | cs->relax_domain_level = val; | 1044 | cs->relax_domain_level = val; |
| @@ -1890,6 +1890,12 @@ static void common_cpu_mem_hotplug_unplug(void) | |||
| 1890 | top_cpuset.mems_allowed = node_states[N_HIGH_MEMORY]; | 1890 | top_cpuset.mems_allowed = node_states[N_HIGH_MEMORY]; |
| 1891 | scan_for_empty_cpusets(&top_cpuset); | 1891 | scan_for_empty_cpusets(&top_cpuset); |
| 1892 | 1892 | ||
| 1893 | /* | ||
| 1894 | * Scheduler destroys domains on hotplug events. | ||
| 1895 | * Rebuild them based on the current settings. | ||
| 1896 | */ | ||
| 1897 | rebuild_sched_domains(); | ||
| 1898 | |||
| 1893 | cgroup_unlock(); | 1899 | cgroup_unlock(); |
| 1894 | } | 1900 | } |
| 1895 | 1901 | ||
diff --git a/kernel/futex.c b/kernel/futex.c index 449def8074fe..7d1136e97c14 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -1096,21 +1096,64 @@ static void unqueue_me_pi(struct futex_q *q) | |||
| 1096 | * private futexes. | 1096 | * private futexes. |
| 1097 | */ | 1097 | */ |
| 1098 | static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q, | 1098 | static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q, |
| 1099 | struct task_struct *newowner) | 1099 | struct task_struct *newowner, |
| 1100 | struct rw_semaphore *fshared) | ||
| 1100 | { | 1101 | { |
| 1101 | u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS; | 1102 | u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS; |
| 1102 | struct futex_pi_state *pi_state = q->pi_state; | 1103 | struct futex_pi_state *pi_state = q->pi_state; |
| 1104 | struct task_struct *oldowner = pi_state->owner; | ||
| 1103 | u32 uval, curval, newval; | 1105 | u32 uval, curval, newval; |
| 1104 | int ret; | 1106 | int ret, attempt = 0; |
| 1105 | 1107 | ||
| 1106 | /* Owner died? */ | 1108 | /* Owner died? */ |
| 1109 | if (!pi_state->owner) | ||
| 1110 | newtid |= FUTEX_OWNER_DIED; | ||
| 1111 | |||
| 1112 | /* | ||
| 1113 | * We are here either because we stole the rtmutex from the | ||
| 1114 | * pending owner or we are the pending owner which failed to | ||
| 1115 | * get the rtmutex. We have to replace the pending owner TID | ||
| 1116 | * in the user space variable. This must be atomic as we have | ||
| 1117 | * to preserve the owner died bit here. | ||
| 1118 | * | ||
| 1119 | * Note: We write the user space value _before_ changing the | ||
| 1120 | * pi_state because we can fault here. Imagine swapped out | ||
| 1121 | * pages or a fork, which was running right before we acquired | ||
| 1122 | * mmap_sem, that marked all the anonymous memory readonly for | ||
| 1123 | * cow. | ||
| 1124 | * | ||
| 1125 | * Modifying pi_state _before_ the user space value would | ||
| 1126 | * leave the pi_state in an inconsistent state when we fault | ||
| 1127 | * here, because we need to drop the hash bucket lock to | ||
| 1128 | * handle the fault. This might be observed in the PID check | ||
| 1129 | * in lookup_pi_state. | ||
| 1130 | */ | ||
| 1131 | retry: | ||
| 1132 | if (get_futex_value_locked(&uval, uaddr)) | ||
| 1133 | goto handle_fault; | ||
| 1134 | |||
| 1135 | while (1) { | ||
| 1136 | newval = (uval & FUTEX_OWNER_DIED) | newtid; | ||
| 1137 | |||
| 1138 | curval = cmpxchg_futex_value_locked(uaddr, uval, newval); | ||
| 1139 | |||
| 1140 | if (curval == -EFAULT) | ||
| 1141 | goto handle_fault; | ||
| 1142 | if (curval == uval) | ||
| 1143 | break; | ||
| 1144 | uval = curval; | ||
| 1145 | } | ||
| 1146 | |||
| 1147 | /* | ||
| 1148 | * We fixed up user space. Now we need to fix the pi_state | ||
| 1149 | * itself. | ||
| 1150 | */ | ||
| 1107 | if (pi_state->owner != NULL) { | 1151 | if (pi_state->owner != NULL) { |
| 1108 | spin_lock_irq(&pi_state->owner->pi_lock); | 1152 | spin_lock_irq(&pi_state->owner->pi_lock); |
| 1109 | WARN_ON(list_empty(&pi_state->list)); | 1153 | WARN_ON(list_empty(&pi_state->list)); |
| 1110 | list_del_init(&pi_state->list); | 1154 | list_del_init(&pi_state->list); |
| 1111 | spin_unlock_irq(&pi_state->owner->pi_lock); | 1155 | spin_unlock_irq(&pi_state->owner->pi_lock); |
| 1112 | } else | 1156 | } |
| 1113 | newtid |= FUTEX_OWNER_DIED; | ||
| 1114 | 1157 | ||
| 1115 | pi_state->owner = newowner; | 1158 | pi_state->owner = newowner; |
| 1116 | 1159 | ||
| @@ -1118,26 +1161,35 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q, | |||
| 1118 | WARN_ON(!list_empty(&pi_state->list)); | 1161 | WARN_ON(!list_empty(&pi_state->list)); |
| 1119 | list_add(&pi_state->list, &newowner->pi_state_list); | 1162 | list_add(&pi_state->list, &newowner->pi_state_list); |
| 1120 | spin_unlock_irq(&newowner->pi_lock); | 1163 | spin_unlock_irq(&newowner->pi_lock); |
| 1164 | return 0; | ||
| 1121 | 1165 | ||
| 1122 | /* | 1166 | /* |
| 1123 | * We own it, so we have to replace the pending owner | 1167 | * To handle the page fault we need to drop the hash bucket |
| 1124 | * TID. This must be atomic as we have preserve the | 1168 | * lock here. That gives the other task (either the pending |
| 1125 | * owner died bit here. | 1169 | * owner itself or the task which stole the rtmutex) the |
| 1170 | * chance to try the fixup of the pi_state. So once we are | ||
| 1171 | * back from handling the fault we need to check the pi_state | ||
| 1172 | * after reacquiring the hash bucket lock and before trying to | ||
| 1173 | * do another fixup. When the fixup has been done already we | ||
| 1174 | * simply return. | ||
| 1126 | */ | 1175 | */ |
| 1127 | ret = get_futex_value_locked(&uval, uaddr); | 1176 | handle_fault: |
| 1177 | spin_unlock(q->lock_ptr); | ||
| 1128 | 1178 | ||
| 1129 | while (!ret) { | 1179 | ret = futex_handle_fault((unsigned long)uaddr, fshared, attempt++); |
| 1130 | newval = (uval & FUTEX_OWNER_DIED) | newtid; | ||
| 1131 | 1180 | ||
| 1132 | curval = cmpxchg_futex_value_locked(uaddr, uval, newval); | 1181 | spin_lock(q->lock_ptr); |
| 1133 | 1182 | ||
| 1134 | if (curval == -EFAULT) | 1183 | /* |
| 1135 | ret = -EFAULT; | 1184 | * Check if someone else fixed it for us: |
| 1136 | if (curval == uval) | 1185 | */ |
| 1137 | break; | 1186 | if (pi_state->owner != oldowner) |
| 1138 | uval = curval; | 1187 | return 0; |
| 1139 | } | 1188 | |
| 1140 | return ret; | 1189 | if (ret) |
| 1190 | return ret; | ||
| 1191 | |||
| 1192 | goto retry; | ||
| 1141 | } | 1193 | } |
| 1142 | 1194 | ||
| 1143 | /* | 1195 | /* |
| @@ -1507,7 +1559,7 @@ static int futex_lock_pi(u32 __user *uaddr, struct rw_semaphore *fshared, | |||
| 1507 | * that case: | 1559 | * that case: |
| 1508 | */ | 1560 | */ |
| 1509 | if (q.pi_state->owner != curr) | 1561 | if (q.pi_state->owner != curr) |
| 1510 | ret = fixup_pi_state_owner(uaddr, &q, curr); | 1562 | ret = fixup_pi_state_owner(uaddr, &q, curr, fshared); |
| 1511 | } else { | 1563 | } else { |
| 1512 | /* | 1564 | /* |
| 1513 | * Catch the rare case, where the lock was released | 1565 | * Catch the rare case, where the lock was released |
| @@ -1539,7 +1591,8 @@ static int futex_lock_pi(u32 __user *uaddr, struct rw_semaphore *fshared, | |||
| 1539 | int res; | 1591 | int res; |
| 1540 | 1592 | ||
| 1541 | owner = rt_mutex_owner(&q.pi_state->pi_mutex); | 1593 | owner = rt_mutex_owner(&q.pi_state->pi_mutex); |
| 1542 | res = fixup_pi_state_owner(uaddr, &q, owner); | 1594 | res = fixup_pi_state_owner(uaddr, &q, owner, |
| 1595 | fshared); | ||
| 1543 | 1596 | ||
| 1544 | /* propagate -EFAULT, if the fixup failed */ | 1597 | /* propagate -EFAULT, if the fixup failed */ |
| 1545 | if (res) | 1598 | if (res) |
diff --git a/kernel/kgdb.c b/kernel/kgdb.c index 79e3c90113c2..3ec23c3ec97f 100644 --- a/kernel/kgdb.c +++ b/kernel/kgdb.c | |||
| @@ -1499,7 +1499,8 @@ int kgdb_nmicallback(int cpu, void *regs) | |||
| 1499 | return 1; | 1499 | return 1; |
| 1500 | } | 1500 | } |
| 1501 | 1501 | ||
| 1502 | void kgdb_console_write(struct console *co, const char *s, unsigned count) | 1502 | static void kgdb_console_write(struct console *co, const char *s, |
| 1503 | unsigned count) | ||
| 1503 | { | 1504 | { |
| 1504 | unsigned long flags; | 1505 | unsigned long flags; |
| 1505 | 1506 | ||
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c index e1cdf196a515..5e02b7740702 100644 --- a/kernel/rcupreempt.c +++ b/kernel/rcupreempt.c | |||
| @@ -217,8 +217,6 @@ long rcu_batches_completed(void) | |||
| 217 | } | 217 | } |
| 218 | EXPORT_SYMBOL_GPL(rcu_batches_completed); | 218 | EXPORT_SYMBOL_GPL(rcu_batches_completed); |
| 219 | 219 | ||
| 220 | EXPORT_SYMBOL_GPL(rcu_batches_completed_bh); | ||
| 221 | |||
| 222 | void __rcu_read_lock(void) | 220 | void __rcu_read_lock(void) |
| 223 | { | 221 | { |
| 224 | int idx; | 222 | int idx; |
diff --git a/kernel/sched.c b/kernel/sched.c index eaf6751e7612..3aaa5c8cb421 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -1127,6 +1127,7 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer) | |||
| 1127 | return HRTIMER_NORESTART; | 1127 | return HRTIMER_NORESTART; |
| 1128 | } | 1128 | } |
| 1129 | 1129 | ||
| 1130 | #ifdef CONFIG_SMP | ||
| 1130 | static void hotplug_hrtick_disable(int cpu) | 1131 | static void hotplug_hrtick_disable(int cpu) |
| 1131 | { | 1132 | { |
| 1132 | struct rq *rq = cpu_rq(cpu); | 1133 | struct rq *rq = cpu_rq(cpu); |
| @@ -1182,6 +1183,7 @@ static void init_hrtick(void) | |||
| 1182 | { | 1183 | { |
| 1183 | hotcpu_notifier(hotplug_hrtick, 0); | 1184 | hotcpu_notifier(hotplug_hrtick, 0); |
| 1184 | } | 1185 | } |
| 1186 | #endif /* CONFIG_SMP */ | ||
| 1185 | 1187 | ||
| 1186 | static void init_rq_hrtick(struct rq *rq) | 1188 | static void init_rq_hrtick(struct rq *rq) |
| 1187 | { | 1189 | { |
| @@ -4396,22 +4398,20 @@ do_wait_for_common(struct completion *x, long timeout, int state) | |||
| 4396 | signal_pending(current)) || | 4398 | signal_pending(current)) || |
| 4397 | (state == TASK_KILLABLE && | 4399 | (state == TASK_KILLABLE && |
| 4398 | fatal_signal_pending(current))) { | 4400 | fatal_signal_pending(current))) { |
| 4399 | __remove_wait_queue(&x->wait, &wait); | 4401 | timeout = -ERESTARTSYS; |
| 4400 | return -ERESTARTSYS; | 4402 | break; |
| 4401 | } | 4403 | } |
| 4402 | __set_current_state(state); | 4404 | __set_current_state(state); |
| 4403 | spin_unlock_irq(&x->wait.lock); | 4405 | spin_unlock_irq(&x->wait.lock); |
| 4404 | timeout = schedule_timeout(timeout); | 4406 | timeout = schedule_timeout(timeout); |
| 4405 | spin_lock_irq(&x->wait.lock); | 4407 | spin_lock_irq(&x->wait.lock); |
| 4406 | if (!timeout) { | 4408 | } while (!x->done && timeout); |
| 4407 | __remove_wait_queue(&x->wait, &wait); | ||
| 4408 | return timeout; | ||
| 4409 | } | ||
| 4410 | } while (!x->done); | ||
| 4411 | __remove_wait_queue(&x->wait, &wait); | 4409 | __remove_wait_queue(&x->wait, &wait); |
| 4410 | if (!x->done) | ||
| 4411 | return timeout; | ||
| 4412 | } | 4412 | } |
| 4413 | x->done--; | 4413 | x->done--; |
| 4414 | return timeout; | 4414 | return timeout ?: 1; |
| 4415 | } | 4415 | } |
| 4416 | 4416 | ||
| 4417 | static long __sched | 4417 | static long __sched |
| @@ -6877,7 +6877,12 @@ static int default_relax_domain_level = -1; | |||
| 6877 | 6877 | ||
| 6878 | static int __init setup_relax_domain_level(char *str) | 6878 | static int __init setup_relax_domain_level(char *str) |
| 6879 | { | 6879 | { |
| 6880 | default_relax_domain_level = simple_strtoul(str, NULL, 0); | 6880 | unsigned long val; |
| 6881 | |||
| 6882 | val = simple_strtoul(str, NULL, 0); | ||
| 6883 | if (val < SD_LV_MAX) | ||
| 6884 | default_relax_domain_level = val; | ||
| 6885 | |||
| 6881 | return 1; | 6886 | return 1; |
| 6882 | } | 6887 | } |
| 6883 | __setup("relax_domain_level=", setup_relax_domain_level); | 6888 | __setup("relax_domain_level=", setup_relax_domain_level); |
| @@ -7236,6 +7241,18 @@ void __attribute__((weak)) arch_update_cpu_topology(void) | |||
| 7236 | } | 7241 | } |
| 7237 | 7242 | ||
| 7238 | /* | 7243 | /* |
| 7244 | * Free current domain masks. | ||
| 7245 | * Called after all cpus are attached to NULL domain. | ||
| 7246 | */ | ||
| 7247 | static void free_sched_domains(void) | ||
| 7248 | { | ||
| 7249 | ndoms_cur = 0; | ||
| 7250 | if (doms_cur != &fallback_doms) | ||
| 7251 | kfree(doms_cur); | ||
| 7252 | doms_cur = &fallback_doms; | ||
| 7253 | } | ||
| 7254 | |||
| 7255 | /* | ||
| 7239 | * Set up scheduler domains and groups. Callers must hold the hotplug lock. | 7256 | * Set up scheduler domains and groups. Callers must hold the hotplug lock. |
| 7240 | * For now this just excludes isolated cpus, but could be used to | 7257 | * For now this just excludes isolated cpus, but could be used to |
| 7241 | * exclude other special cases in the future. | 7258 | * exclude other special cases in the future. |
| @@ -7382,6 +7399,7 @@ int arch_reinit_sched_domains(void) | |||
| 7382 | get_online_cpus(); | 7399 | get_online_cpus(); |
| 7383 | mutex_lock(&sched_domains_mutex); | 7400 | mutex_lock(&sched_domains_mutex); |
| 7384 | detach_destroy_domains(&cpu_online_map); | 7401 | detach_destroy_domains(&cpu_online_map); |
| 7402 | free_sched_domains(); | ||
| 7385 | err = arch_init_sched_domains(&cpu_online_map); | 7403 | err = arch_init_sched_domains(&cpu_online_map); |
| 7386 | mutex_unlock(&sched_domains_mutex); | 7404 | mutex_unlock(&sched_domains_mutex); |
| 7387 | put_online_cpus(); | 7405 | put_online_cpus(); |
| @@ -7467,6 +7485,7 @@ static int update_sched_domains(struct notifier_block *nfb, | |||
| 7467 | case CPU_DOWN_PREPARE: | 7485 | case CPU_DOWN_PREPARE: |
| 7468 | case CPU_DOWN_PREPARE_FROZEN: | 7486 | case CPU_DOWN_PREPARE_FROZEN: |
| 7469 | detach_destroy_domains(&cpu_online_map); | 7487 | detach_destroy_domains(&cpu_online_map); |
| 7488 | free_sched_domains(); | ||
| 7470 | return NOTIFY_OK; | 7489 | return NOTIFY_OK; |
| 7471 | 7490 | ||
| 7472 | case CPU_UP_CANCELED: | 7491 | case CPU_UP_CANCELED: |
| @@ -7485,8 +7504,16 @@ static int update_sched_domains(struct notifier_block *nfb, | |||
| 7485 | return NOTIFY_DONE; | 7504 | return NOTIFY_DONE; |
| 7486 | } | 7505 | } |
| 7487 | 7506 | ||
| 7507 | #ifndef CONFIG_CPUSETS | ||
| 7508 | /* | ||
| 7509 | * Create default domain partitioning if cpusets are disabled. | ||
| 7510 | * Otherwise we let cpusets rebuild the domains based on the | ||
| 7511 | * current setup. | ||
| 7512 | */ | ||
| 7513 | |||
| 7488 | /* The hotplug lock is already held by cpu_up/cpu_down */ | 7514 | /* The hotplug lock is already held by cpu_up/cpu_down */ |
| 7489 | arch_init_sched_domains(&cpu_online_map); | 7515 | arch_init_sched_domains(&cpu_online_map); |
| 7516 | #endif | ||
| 7490 | 7517 | ||
| 7491 | return NOTIFY_OK; | 7518 | return NOTIFY_OK; |
| 7492 | } | 7519 | } |
| @@ -7626,7 +7653,6 @@ static void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq, | |||
| 7626 | else | 7653 | else |
| 7627 | rt_se->rt_rq = parent->my_q; | 7654 | rt_se->rt_rq = parent->my_q; |
| 7628 | 7655 | ||
| 7629 | rt_se->rt_rq = &rq->rt; | ||
| 7630 | rt_se->my_q = rt_rq; | 7656 | rt_se->my_q = rt_rq; |
| 7631 | rt_se->parent = parent; | 7657 | rt_se->parent = parent; |
| 7632 | INIT_LIST_HEAD(&rt_se->run_list); | 7658 | INIT_LIST_HEAD(&rt_se->run_list); |
| @@ -8348,7 +8374,7 @@ static unsigned long to_ratio(u64 period, u64 runtime) | |||
| 8348 | #ifdef CONFIG_CGROUP_SCHED | 8374 | #ifdef CONFIG_CGROUP_SCHED |
| 8349 | static int __rt_schedulable(struct task_group *tg, u64 period, u64 runtime) | 8375 | static int __rt_schedulable(struct task_group *tg, u64 period, u64 runtime) |
| 8350 | { | 8376 | { |
| 8351 | struct task_group *tgi, *parent = tg->parent; | 8377 | struct task_group *tgi, *parent = tg ? tg->parent : NULL; |
| 8352 | unsigned long total = 0; | 8378 | unsigned long total = 0; |
| 8353 | 8379 | ||
| 8354 | if (!parent) { | 8380 | if (!parent) { |
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 3432d573205d..0f3c19197fa4 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -250,7 +250,8 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) | |||
| 250 | if (rt_rq->rt_time || rt_rq->rt_nr_running) | 250 | if (rt_rq->rt_time || rt_rq->rt_nr_running) |
| 251 | idle = 0; | 251 | idle = 0; |
| 252 | spin_unlock(&rt_rq->rt_runtime_lock); | 252 | spin_unlock(&rt_rq->rt_runtime_lock); |
| 253 | } | 253 | } else if (rt_rq->rt_nr_running) |
| 254 | idle = 0; | ||
| 254 | 255 | ||
| 255 | if (enqueue) | 256 | if (enqueue) |
| 256 | sched_rt_rq_enqueue(rt_rq); | 257 | sched_rt_rq_enqueue(rt_rq); |
| @@ -449,13 +450,19 @@ void dec_rt_tasks(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) | |||
| 449 | #endif | 450 | #endif |
| 450 | } | 451 | } |
| 451 | 452 | ||
| 452 | static void enqueue_rt_entity(struct sched_rt_entity *rt_se) | 453 | static void __enqueue_rt_entity(struct sched_rt_entity *rt_se) |
| 453 | { | 454 | { |
| 454 | struct rt_rq *rt_rq = rt_rq_of_se(rt_se); | 455 | struct rt_rq *rt_rq = rt_rq_of_se(rt_se); |
| 455 | struct rt_prio_array *array = &rt_rq->active; | 456 | struct rt_prio_array *array = &rt_rq->active; |
| 456 | struct rt_rq *group_rq = group_rt_rq(rt_se); | 457 | struct rt_rq *group_rq = group_rt_rq(rt_se); |
| 457 | 458 | ||
| 458 | if (group_rq && rt_rq_throttled(group_rq)) | 459 | /* |
| 460 | * Don't enqueue the group if its throttled, or when empty. | ||
| 461 | * The latter is a consequence of the former when a child group | ||
| 462 | * get throttled and the current group doesn't have any other | ||
| 463 | * active members. | ||
| 464 | */ | ||
| 465 | if (group_rq && (rt_rq_throttled(group_rq) || !group_rq->rt_nr_running)) | ||
| 459 | return; | 466 | return; |
| 460 | 467 | ||
| 461 | list_add_tail(&rt_se->run_list, array->queue + rt_se_prio(rt_se)); | 468 | list_add_tail(&rt_se->run_list, array->queue + rt_se_prio(rt_se)); |
| @@ -464,7 +471,7 @@ static void enqueue_rt_entity(struct sched_rt_entity *rt_se) | |||
| 464 | inc_rt_tasks(rt_se, rt_rq); | 471 | inc_rt_tasks(rt_se, rt_rq); |
| 465 | } | 472 | } |
| 466 | 473 | ||
| 467 | static void dequeue_rt_entity(struct sched_rt_entity *rt_se) | 474 | static void __dequeue_rt_entity(struct sched_rt_entity *rt_se) |
| 468 | { | 475 | { |
| 469 | struct rt_rq *rt_rq = rt_rq_of_se(rt_se); | 476 | struct rt_rq *rt_rq = rt_rq_of_se(rt_se); |
| 470 | struct rt_prio_array *array = &rt_rq->active; | 477 | struct rt_prio_array *array = &rt_rq->active; |
| @@ -480,11 +487,10 @@ static void dequeue_rt_entity(struct sched_rt_entity *rt_se) | |||
| 480 | * Because the prio of an upper entry depends on the lower | 487 | * Because the prio of an upper entry depends on the lower |
| 481 | * entries, we must remove entries top - down. | 488 | * entries, we must remove entries top - down. |
| 482 | */ | 489 | */ |
| 483 | static void dequeue_rt_stack(struct task_struct *p) | 490 | static void dequeue_rt_stack(struct sched_rt_entity *rt_se) |
| 484 | { | 491 | { |
| 485 | struct sched_rt_entity *rt_se, *back = NULL; | 492 | struct sched_rt_entity *back = NULL; |
| 486 | 493 | ||
| 487 | rt_se = &p->rt; | ||
| 488 | for_each_sched_rt_entity(rt_se) { | 494 | for_each_sched_rt_entity(rt_se) { |
| 489 | rt_se->back = back; | 495 | rt_se->back = back; |
| 490 | back = rt_se; | 496 | back = rt_se; |
| @@ -492,7 +498,26 @@ static void dequeue_rt_stack(struct task_struct *p) | |||
| 492 | 498 | ||
| 493 | for (rt_se = back; rt_se; rt_se = rt_se->back) { | 499 | for (rt_se = back; rt_se; rt_se = rt_se->back) { |
| 494 | if (on_rt_rq(rt_se)) | 500 | if (on_rt_rq(rt_se)) |
| 495 | dequeue_rt_entity(rt_se); | 501 | __dequeue_rt_entity(rt_se); |
| 502 | } | ||
| 503 | } | ||
| 504 | |||
| 505 | static void enqueue_rt_entity(struct sched_rt_entity *rt_se) | ||
| 506 | { | ||
| 507 | dequeue_rt_stack(rt_se); | ||
| 508 | for_each_sched_rt_entity(rt_se) | ||
| 509 | __enqueue_rt_entity(rt_se); | ||
| 510 | } | ||
| 511 | |||
| 512 | static void dequeue_rt_entity(struct sched_rt_entity *rt_se) | ||
| 513 | { | ||
| 514 | dequeue_rt_stack(rt_se); | ||
| 515 | |||
| 516 | for_each_sched_rt_entity(rt_se) { | ||
| 517 | struct rt_rq *rt_rq = group_rt_rq(rt_se); | ||
| 518 | |||
| 519 | if (rt_rq && rt_rq->rt_nr_running) | ||
| 520 | __enqueue_rt_entity(rt_se); | ||
| 496 | } | 521 | } |
| 497 | } | 522 | } |
| 498 | 523 | ||
| @@ -506,32 +531,15 @@ static void enqueue_task_rt(struct rq *rq, struct task_struct *p, int wakeup) | |||
| 506 | if (wakeup) | 531 | if (wakeup) |
| 507 | rt_se->timeout = 0; | 532 | rt_se->timeout = 0; |
| 508 | 533 | ||
| 509 | dequeue_rt_stack(p); | 534 | enqueue_rt_entity(rt_se); |
| 510 | |||
| 511 | /* | ||
| 512 | * enqueue everybody, bottom - up. | ||
| 513 | */ | ||
| 514 | for_each_sched_rt_entity(rt_se) | ||
| 515 | enqueue_rt_entity(rt_se); | ||
| 516 | } | 535 | } |
| 517 | 536 | ||
| 518 | static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int sleep) | 537 | static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int sleep) |
| 519 | { | 538 | { |
| 520 | struct sched_rt_entity *rt_se = &p->rt; | 539 | struct sched_rt_entity *rt_se = &p->rt; |
| 521 | struct rt_rq *rt_rq; | ||
| 522 | 540 | ||
| 523 | update_curr_rt(rq); | 541 | update_curr_rt(rq); |
| 524 | 542 | dequeue_rt_entity(rt_se); | |
| 525 | dequeue_rt_stack(p); | ||
| 526 | |||
| 527 | /* | ||
| 528 | * re-enqueue all non-empty rt_rq entities. | ||
| 529 | */ | ||
| 530 | for_each_sched_rt_entity(rt_se) { | ||
| 531 | rt_rq = group_rt_rq(rt_se); | ||
| 532 | if (rt_rq && rt_rq->rt_nr_running) | ||
| 533 | enqueue_rt_entity(rt_se); | ||
| 534 | } | ||
| 535 | } | 543 | } |
| 536 | 544 | ||
| 537 | /* | 545 | /* |
| @@ -542,8 +550,10 @@ static | |||
| 542 | void requeue_rt_entity(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se) | 550 | void requeue_rt_entity(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se) |
| 543 | { | 551 | { |
| 544 | struct rt_prio_array *array = &rt_rq->active; | 552 | struct rt_prio_array *array = &rt_rq->active; |
| 553 | struct list_head *queue = array->queue + rt_se_prio(rt_se); | ||
| 545 | 554 | ||
| 546 | list_move_tail(&rt_se->run_list, array->queue + rt_se_prio(rt_se)); | 555 | if (on_rt_rq(rt_se)) |
| 556 | list_move_tail(&rt_se->run_list, queue); | ||
| 547 | } | 557 | } |
| 548 | 558 | ||
| 549 | static void requeue_task_rt(struct rq *rq, struct task_struct *p) | 559 | static void requeue_task_rt(struct rq *rq, struct task_struct *p) |
diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h index a38878e0e49d..80179ef7450e 100644 --- a/kernel/sched_stats.h +++ b/kernel/sched_stats.h | |||
| @@ -198,6 +198,9 @@ static inline void sched_info_queued(struct task_struct *t) | |||
| 198 | /* | 198 | /* |
| 199 | * Called when a process ceases being the active-running process, either | 199 | * Called when a process ceases being the active-running process, either |
| 200 | * voluntarily or involuntarily. Now we can calculate how long we ran. | 200 | * voluntarily or involuntarily. Now we can calculate how long we ran. |
| 201 | * Also, if the process is still in the TASK_RUNNING state, call | ||
| 202 | * sched_info_queued() to mark that it has now again started waiting on | ||
| 203 | * the runqueue. | ||
| 201 | */ | 204 | */ |
| 202 | static inline void sched_info_depart(struct task_struct *t) | 205 | static inline void sched_info_depart(struct task_struct *t) |
| 203 | { | 206 | { |
| @@ -206,6 +209,9 @@ static inline void sched_info_depart(struct task_struct *t) | |||
| 206 | 209 | ||
| 207 | t->sched_info.cpu_time += delta; | 210 | t->sched_info.cpu_time += delta; |
| 208 | rq_sched_info_depart(task_rq(t), delta); | 211 | rq_sched_info_depart(task_rq(t), delta); |
| 212 | |||
| 213 | if (t->state == TASK_RUNNING) | ||
| 214 | sched_info_queued(t); | ||
| 209 | } | 215 | } |
| 210 | 216 | ||
| 211 | /* | 217 | /* |
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 01b6522fd92b..c828c2339cc9 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
| @@ -49,12 +49,17 @@ static unsigned long get_timestamp(int this_cpu) | |||
| 49 | return cpu_clock(this_cpu) >> 30LL; /* 2^30 ~= 10^9 */ | 49 | return cpu_clock(this_cpu) >> 30LL; /* 2^30 ~= 10^9 */ |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | void touch_softlockup_watchdog(void) | 52 | static void __touch_softlockup_watchdog(void) |
| 53 | { | 53 | { |
| 54 | int this_cpu = raw_smp_processor_id(); | 54 | int this_cpu = raw_smp_processor_id(); |
| 55 | 55 | ||
| 56 | __raw_get_cpu_var(touch_timestamp) = get_timestamp(this_cpu); | 56 | __raw_get_cpu_var(touch_timestamp) = get_timestamp(this_cpu); |
| 57 | } | 57 | } |
| 58 | |||
| 59 | void touch_softlockup_watchdog(void) | ||
| 60 | { | ||
| 61 | __raw_get_cpu_var(touch_timestamp) = 0; | ||
| 62 | } | ||
| 58 | EXPORT_SYMBOL(touch_softlockup_watchdog); | 63 | EXPORT_SYMBOL(touch_softlockup_watchdog); |
| 59 | 64 | ||
| 60 | void touch_all_softlockup_watchdogs(void) | 65 | void touch_all_softlockup_watchdogs(void) |
| @@ -80,7 +85,7 @@ void softlockup_tick(void) | |||
| 80 | unsigned long now; | 85 | unsigned long now; |
| 81 | 86 | ||
| 82 | if (touch_timestamp == 0) { | 87 | if (touch_timestamp == 0) { |
| 83 | touch_softlockup_watchdog(); | 88 | __touch_softlockup_watchdog(); |
| 84 | return; | 89 | return; |
| 85 | } | 90 | } |
| 86 | 91 | ||
| @@ -95,7 +100,7 @@ void softlockup_tick(void) | |||
| 95 | 100 | ||
| 96 | /* do not print during early bootup: */ | 101 | /* do not print during early bootup: */ |
| 97 | if (unlikely(system_state != SYSTEM_RUNNING)) { | 102 | if (unlikely(system_state != SYSTEM_RUNNING)) { |
| 98 | touch_softlockup_watchdog(); | 103 | __touch_softlockup_watchdog(); |
| 99 | return; | 104 | return; |
| 100 | } | 105 | } |
| 101 | 106 | ||
| @@ -214,7 +219,7 @@ static int watchdog(void *__bind_cpu) | |||
| 214 | sched_setscheduler(current, SCHED_FIFO, ¶m); | 219 | sched_setscheduler(current, SCHED_FIFO, ¶m); |
| 215 | 220 | ||
| 216 | /* initialize timestamp */ | 221 | /* initialize timestamp */ |
| 217 | touch_softlockup_watchdog(); | 222 | __touch_softlockup_watchdog(); |
| 218 | 223 | ||
| 219 | set_current_state(TASK_INTERRUPTIBLE); | 224 | set_current_state(TASK_INTERRUPTIBLE); |
| 220 | /* | 225 | /* |
| @@ -223,7 +228,7 @@ static int watchdog(void *__bind_cpu) | |||
| 223 | * debug-printout triggers in softlockup_tick(). | 228 | * debug-printout triggers in softlockup_tick(). |
| 224 | */ | 229 | */ |
| 225 | while (!kthread_should_stop()) { | 230 | while (!kthread_should_stop()) { |
| 226 | touch_softlockup_watchdog(); | 231 | __touch_softlockup_watchdog(); |
| 227 | schedule(); | 232 | schedule(); |
| 228 | 233 | ||
| 229 | if (kthread_should_stop()) | 234 | if (kthread_should_stop()) |
diff --git a/mm/bootmem.c b/mm/bootmem.c index e8fb927392b9..8d9f60e06f62 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
| @@ -442,15 +442,17 @@ unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn, | |||
| 442 | return init_bootmem_core(pgdat, freepfn, startpfn, endpfn); | 442 | return init_bootmem_core(pgdat, freepfn, startpfn, endpfn); |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, | 445 | int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, |
| 446 | unsigned long size, int flags) | 446 | unsigned long size, int flags) |
| 447 | { | 447 | { |
| 448 | int ret; | 448 | int ret; |
| 449 | 449 | ||
| 450 | ret = can_reserve_bootmem_core(pgdat->bdata, physaddr, size, flags); | 450 | ret = can_reserve_bootmem_core(pgdat->bdata, physaddr, size, flags); |
| 451 | if (ret < 0) | 451 | if (ret < 0) |
| 452 | return; | 452 | return -ENOMEM; |
| 453 | reserve_bootmem_core(pgdat->bdata, physaddr, size, flags); | 453 | reserve_bootmem_core(pgdat->bdata, physaddr, size, flags); |
| 454 | |||
| 455 | return 0; | ||
| 454 | } | 456 | } |
| 455 | 457 | ||
| 456 | void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, | 458 | void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, |
diff --git a/mm/memory.c b/mm/memory.c index 19e0ae9beecb..d14b251a25a6 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -999,17 +999,15 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address, | |||
| 999 | goto no_page_table; | 999 | goto no_page_table; |
| 1000 | 1000 | ||
| 1001 | ptep = pte_offset_map_lock(mm, pmd, address, &ptl); | 1001 | ptep = pte_offset_map_lock(mm, pmd, address, &ptl); |
| 1002 | if (!ptep) | ||
| 1003 | goto out; | ||
| 1004 | 1002 | ||
| 1005 | pte = *ptep; | 1003 | pte = *ptep; |
| 1006 | if (!pte_present(pte)) | 1004 | if (!pte_present(pte)) |
| 1007 | goto unlock; | 1005 | goto no_page; |
| 1008 | if ((flags & FOLL_WRITE) && !pte_write(pte)) | 1006 | if ((flags & FOLL_WRITE) && !pte_write(pte)) |
| 1009 | goto unlock; | 1007 | goto unlock; |
| 1010 | page = vm_normal_page(vma, address, pte); | 1008 | page = vm_normal_page(vma, address, pte); |
| 1011 | if (unlikely(!page)) | 1009 | if (unlikely(!page)) |
| 1012 | goto unlock; | 1010 | goto bad_page; |
| 1013 | 1011 | ||
| 1014 | if (flags & FOLL_GET) | 1012 | if (flags & FOLL_GET) |
| 1015 | get_page(page); | 1013 | get_page(page); |
| @@ -1024,6 +1022,15 @@ unlock: | |||
| 1024 | out: | 1022 | out: |
| 1025 | return page; | 1023 | return page; |
| 1026 | 1024 | ||
| 1025 | bad_page: | ||
| 1026 | pte_unmap_unlock(ptep, ptl); | ||
| 1027 | return ERR_PTR(-EFAULT); | ||
| 1028 | |||
| 1029 | no_page: | ||
| 1030 | pte_unmap_unlock(ptep, ptl); | ||
| 1031 | if (!pte_none(pte)) | ||
| 1032 | return page; | ||
| 1033 | /* Fall through to ZERO_PAGE handling */ | ||
| 1027 | no_page_table: | 1034 | no_page_table: |
| 1028 | /* | 1035 | /* |
| 1029 | * When core dumping an enormous anonymous area that nobody | 1036 | * When core dumping an enormous anonymous area that nobody |
| @@ -1038,6 +1045,26 @@ no_page_table: | |||
| 1038 | return page; | 1045 | return page; |
| 1039 | } | 1046 | } |
| 1040 | 1047 | ||
| 1048 | /* Can we do the FOLL_ANON optimization? */ | ||
| 1049 | static inline int use_zero_page(struct vm_area_struct *vma) | ||
| 1050 | { | ||
| 1051 | /* | ||
| 1052 | * We don't want to optimize FOLL_ANON for make_pages_present() | ||
| 1053 | * when it tries to page in a VM_LOCKED region. As to VM_SHARED, | ||
| 1054 | * we want to get the page from the page tables to make sure | ||
| 1055 | * that we serialize and update with any other user of that | ||
| 1056 | * mapping. | ||
| 1057 | */ | ||
| 1058 | if (vma->vm_flags & (VM_LOCKED | VM_SHARED)) | ||
| 1059 | return 0; | ||
| 1060 | /* | ||
| 1061 | * And if we have a fault or a nopfn routine, it's not an | ||
| 1062 | * anonymous region. | ||
| 1063 | */ | ||
| 1064 | return !vma->vm_ops || | ||
| 1065 | (!vma->vm_ops->fault && !vma->vm_ops->nopfn); | ||
| 1066 | } | ||
| 1067 | |||
| 1041 | int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | 1068 | int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, |
| 1042 | unsigned long start, int len, int write, int force, | 1069 | unsigned long start, int len, int write, int force, |
| 1043 | struct page **pages, struct vm_area_struct **vmas) | 1070 | struct page **pages, struct vm_area_struct **vmas) |
| @@ -1112,8 +1139,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | |||
| 1112 | foll_flags = FOLL_TOUCH; | 1139 | foll_flags = FOLL_TOUCH; |
| 1113 | if (pages) | 1140 | if (pages) |
| 1114 | foll_flags |= FOLL_GET; | 1141 | foll_flags |= FOLL_GET; |
| 1115 | if (!write && !(vma->vm_flags & VM_LOCKED) && | 1142 | if (!write && use_zero_page(vma)) |
| 1116 | (!vma->vm_ops || !vma->vm_ops->fault)) | ||
| 1117 | foll_flags |= FOLL_ANON; | 1143 | foll_flags |= FOLL_ANON; |
| 1118 | 1144 | ||
| 1119 | do { | 1145 | do { |
| @@ -1159,6 +1185,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | |||
| 1159 | 1185 | ||
| 1160 | cond_resched(); | 1186 | cond_resched(); |
| 1161 | } | 1187 | } |
| 1188 | if (IS_ERR(page)) | ||
| 1189 | return i ? i : PTR_ERR(page); | ||
| 1162 | if (pages) { | 1190 | if (pages) { |
| 1163 | pages[i] = page; | 1191 | pages[i] = page; |
| 1164 | 1192 | ||
| @@ -1757,7 +1785,6 @@ gotten: | |||
| 1757 | page_table = pte_offset_map_lock(mm, pmd, address, &ptl); | 1785 | page_table = pte_offset_map_lock(mm, pmd, address, &ptl); |
| 1758 | if (likely(pte_same(*page_table, orig_pte))) { | 1786 | if (likely(pte_same(*page_table, orig_pte))) { |
| 1759 | if (old_page) { | 1787 | if (old_page) { |
| 1760 | page_remove_rmap(old_page, vma); | ||
| 1761 | if (!PageAnon(old_page)) { | 1788 | if (!PageAnon(old_page)) { |
| 1762 | dec_mm_counter(mm, file_rss); | 1789 | dec_mm_counter(mm, file_rss); |
| 1763 | inc_mm_counter(mm, anon_rss); | 1790 | inc_mm_counter(mm, anon_rss); |
| @@ -1779,6 +1806,32 @@ gotten: | |||
| 1779 | lru_cache_add_active(new_page); | 1806 | lru_cache_add_active(new_page); |
| 1780 | page_add_new_anon_rmap(new_page, vma, address); | 1807 | page_add_new_anon_rmap(new_page, vma, address); |
| 1781 | 1808 | ||
| 1809 | if (old_page) { | ||
| 1810 | /* | ||
| 1811 | * Only after switching the pte to the new page may | ||
| 1812 | * we remove the mapcount here. Otherwise another | ||
| 1813 | * process may come and find the rmap count decremented | ||
| 1814 | * before the pte is switched to the new page, and | ||
| 1815 | * "reuse" the old page writing into it while our pte | ||
| 1816 | * here still points into it and can be read by other | ||
| 1817 | * threads. | ||
| 1818 | * | ||
| 1819 | * The critical issue is to order this | ||
| 1820 | * page_remove_rmap with the ptp_clear_flush above. | ||
| 1821 | * Those stores are ordered by (if nothing else,) | ||
| 1822 | * the barrier present in the atomic_add_negative | ||
| 1823 | * in page_remove_rmap. | ||
| 1824 | * | ||
| 1825 | * Then the TLB flush in ptep_clear_flush ensures that | ||
| 1826 | * no process can access the old page before the | ||
| 1827 | * decremented mapcount is visible. And the old page | ||
| 1828 | * cannot be reused until after the decremented | ||
| 1829 | * mapcount is visible. So transitively, TLBs to | ||
| 1830 | * old page will be flushed before it can be reused. | ||
| 1831 | */ | ||
| 1832 | page_remove_rmap(old_page, vma); | ||
| 1833 | } | ||
| 1834 | |||
| 1782 | /* Free the old page.. */ | 1835 | /* Free the old page.. */ |
| 1783 | new_page = old_page; | 1836 | new_page = old_page; |
| 1784 | ret |= VM_FAULT_WRITE; | 1837 | ret |= VM_FAULT_WRITE; |
diff --git a/mm/migrate.c b/mm/migrate.c index 449d77d409f5..112bcaeaa104 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -865,6 +865,11 @@ static int do_move_pages(struct mm_struct *mm, struct page_to_node *pm, | |||
| 865 | goto set_status; | 865 | goto set_status; |
| 866 | 866 | ||
| 867 | page = follow_page(vma, pp->addr, FOLL_GET); | 867 | page = follow_page(vma, pp->addr, FOLL_GET); |
| 868 | |||
| 869 | err = PTR_ERR(page); | ||
| 870 | if (IS_ERR(page)) | ||
| 871 | goto set_status; | ||
| 872 | |||
| 868 | err = -ENOENT; | 873 | err = -ENOENT; |
| 869 | if (!page) | 874 | if (!page) |
| 870 | goto set_status; | 875 | goto set_status; |
| @@ -928,6 +933,11 @@ static int do_pages_stat(struct mm_struct *mm, struct page_to_node *pm) | |||
| 928 | goto set_status; | 933 | goto set_status; |
| 929 | 934 | ||
| 930 | page = follow_page(vma, pm->addr, 0); | 935 | page = follow_page(vma, pm->addr, 0); |
| 936 | |||
| 937 | err = PTR_ERR(page); | ||
| 938 | if (IS_ERR(page)) | ||
| 939 | goto set_status; | ||
| 940 | |||
| 931 | err = -ENOENT; | 941 | err = -ENOENT; |
| 932 | /* Use PageReserved to check for zero page */ | 942 | /* Use PageReserved to check for zero page */ |
| 933 | if (!page || PageReserved(page)) | 943 | if (!page || PageReserved(page)) |
| @@ -3263,9 +3263,12 @@ retry: | |||
| 3263 | 3263 | ||
| 3264 | if (cpuset_zone_allowed_hardwall(zone, flags) && | 3264 | if (cpuset_zone_allowed_hardwall(zone, flags) && |
| 3265 | cache->nodelists[nid] && | 3265 | cache->nodelists[nid] && |
| 3266 | cache->nodelists[nid]->free_objects) | 3266 | cache->nodelists[nid]->free_objects) { |
| 3267 | obj = ____cache_alloc_node(cache, | 3267 | obj = ____cache_alloc_node(cache, |
| 3268 | flags | GFP_THISNODE, nid); | 3268 | flags | GFP_THISNODE, nid); |
| 3269 | if (obj) | ||
| 3270 | break; | ||
| 3271 | } | ||
| 3269 | } | 3272 | } |
| 3270 | 3273 | ||
| 3271 | if (!obj) { | 3274 | if (!obj) { |
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 9d52ebfc1962..05fafdc2eea3 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
| @@ -188,10 +188,13 @@ static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev, | |||
| 188 | return 0; | 188 | return 0; |
| 189 | } | 189 | } |
| 190 | } | 190 | } |
| 191 | } else { | 191 | } else { /* e_vc */ |
| 192 | skb_push(skb, 2); | 192 | if (brdev->payload == p_bridged) { |
| 193 | if (brdev->payload == p_bridged) | 193 | skb_push(skb, 2); |
| 194 | memset(skb->data, 0, 2); | 194 | memset(skb->data, 0, 2); |
| 195 | } else { /* p_routed */ | ||
| 196 | skb_pull(skb, ETH_HLEN); | ||
| 197 | } | ||
| 195 | } | 198 | } |
| 196 | skb_debug(skb); | 199 | skb_debug(skb); |
| 197 | 200 | ||
| @@ -377,11 +380,8 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) | |||
| 377 | (skb->data + 6, ethertype_ipv4, | 380 | (skb->data + 6, ethertype_ipv4, |
| 378 | sizeof(ethertype_ipv4)) == 0) | 381 | sizeof(ethertype_ipv4)) == 0) |
| 379 | skb->protocol = __constant_htons(ETH_P_IP); | 382 | skb->protocol = __constant_htons(ETH_P_IP); |
| 380 | else { | 383 | else |
| 381 | brdev->stats.rx_errors++; | 384 | goto error; |
| 382 | dev_kfree_skb(skb); | ||
| 383 | return; | ||
| 384 | } | ||
| 385 | skb_pull(skb, sizeof(llc_oui_ipv4)); | 385 | skb_pull(skb, sizeof(llc_oui_ipv4)); |
| 386 | skb_reset_network_header(skb); | 386 | skb_reset_network_header(skb); |
| 387 | skb->pkt_type = PACKET_HOST; | 387 | skb->pkt_type = PACKET_HOST; |
| @@ -394,44 +394,56 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) | |||
| 394 | (memcmp(skb->data, llc_oui_pid_pad, 7) == 0)) { | 394 | (memcmp(skb->data, llc_oui_pid_pad, 7) == 0)) { |
| 395 | skb_pull(skb, sizeof(llc_oui_pid_pad)); | 395 | skb_pull(skb, sizeof(llc_oui_pid_pad)); |
| 396 | skb->protocol = eth_type_trans(skb, net_dev); | 396 | skb->protocol = eth_type_trans(skb, net_dev); |
| 397 | } else { | 397 | } else |
| 398 | brdev->stats.rx_errors++; | 398 | goto error; |
| 399 | dev_kfree_skb(skb); | ||
| 400 | return; | ||
| 401 | } | ||
| 402 | 399 | ||
| 403 | } else { | 400 | } else { /* e_vc */ |
| 404 | /* first 2 chars should be 0 */ | 401 | if (brdev->payload == p_routed) { |
| 405 | if (*((u16 *) (skb->data)) != 0) { | 402 | struct iphdr *iph; |
| 406 | brdev->stats.rx_errors++; | 403 | |
| 407 | dev_kfree_skb(skb); | 404 | skb_reset_network_header(skb); |
| 408 | return; | 405 | iph = ip_hdr(skb); |
| 406 | if (iph->version == 4) | ||
| 407 | skb->protocol = __constant_htons(ETH_P_IP); | ||
| 408 | else if (iph->version == 6) | ||
| 409 | skb->protocol = __constant_htons(ETH_P_IPV6); | ||
| 410 | else | ||
| 411 | goto error; | ||
| 412 | skb->pkt_type = PACKET_HOST; | ||
| 413 | } else { /* p_bridged */ | ||
| 414 | /* first 2 chars should be 0 */ | ||
| 415 | if (*((u16 *) (skb->data)) != 0) | ||
| 416 | goto error; | ||
| 417 | skb_pull(skb, BR2684_PAD_LEN); | ||
| 418 | skb->protocol = eth_type_trans(skb, net_dev); | ||
| 409 | } | 419 | } |
| 410 | skb_pull(skb, BR2684_PAD_LEN + ETH_HLEN); /* pad, dstmac, srcmac, ethtype */ | ||
| 411 | skb->protocol = eth_type_trans(skb, net_dev); | ||
| 412 | } | 420 | } |
| 413 | 421 | ||
| 414 | #ifdef CONFIG_ATM_BR2684_IPFILTER | 422 | #ifdef CONFIG_ATM_BR2684_IPFILTER |
| 415 | if (unlikely(packet_fails_filter(skb->protocol, brvcc, skb))) { | 423 | if (unlikely(packet_fails_filter(skb->protocol, brvcc, skb))) |
| 416 | brdev->stats.rx_dropped++; | 424 | goto dropped; |
| 417 | dev_kfree_skb(skb); | ||
| 418 | return; | ||
| 419 | } | ||
| 420 | #endif /* CONFIG_ATM_BR2684_IPFILTER */ | 425 | #endif /* CONFIG_ATM_BR2684_IPFILTER */ |
| 421 | skb->dev = net_dev; | 426 | skb->dev = net_dev; |
| 422 | ATM_SKB(skb)->vcc = atmvcc; /* needed ? */ | 427 | ATM_SKB(skb)->vcc = atmvcc; /* needed ? */ |
| 423 | pr_debug("received packet's protocol: %x\n", ntohs(skb->protocol)); | 428 | pr_debug("received packet's protocol: %x\n", ntohs(skb->protocol)); |
| 424 | skb_debug(skb); | 429 | skb_debug(skb); |
| 425 | if (unlikely(!(net_dev->flags & IFF_UP))) { | 430 | /* sigh, interface is down? */ |
| 426 | /* sigh, interface is down */ | 431 | if (unlikely(!(net_dev->flags & IFF_UP))) |
| 427 | brdev->stats.rx_dropped++; | 432 | goto dropped; |
| 428 | dev_kfree_skb(skb); | ||
| 429 | return; | ||
| 430 | } | ||
| 431 | brdev->stats.rx_packets++; | 433 | brdev->stats.rx_packets++; |
| 432 | brdev->stats.rx_bytes += skb->len; | 434 | brdev->stats.rx_bytes += skb->len; |
| 433 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); | 435 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); |
| 434 | netif_rx(skb); | 436 | netif_rx(skb); |
| 437 | return; | ||
| 438 | |||
| 439 | dropped: | ||
| 440 | brdev->stats.rx_dropped++; | ||
| 441 | goto free_skb; | ||
| 442 | error: | ||
| 443 | brdev->stats.rx_errors++; | ||
| 444 | free_skb: | ||
| 445 | dev_kfree_skb(skb); | ||
| 446 | return; | ||
| 435 | } | 447 | } |
| 436 | 448 | ||
| 437 | /* | 449 | /* |
| @@ -518,9 +530,9 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) | |||
| 518 | struct sk_buff *next = skb->next; | 530 | struct sk_buff *next = skb->next; |
| 519 | 531 | ||
| 520 | skb->next = skb->prev = NULL; | 532 | skb->next = skb->prev = NULL; |
| 533 | br2684_push(atmvcc, skb); | ||
| 521 | BRPRIV(skb->dev)->stats.rx_bytes -= skb->len; | 534 | BRPRIV(skb->dev)->stats.rx_bytes -= skb->len; |
| 522 | BRPRIV(skb->dev)->stats.rx_packets--; | 535 | BRPRIV(skb->dev)->stats.rx_packets--; |
| 523 | br2684_push(atmvcc, skb); | ||
| 524 | 536 | ||
| 525 | skb = next; | 537 | skb = next; |
| 526 | } | 538 | } |
diff --git a/net/core/dev.c b/net/core/dev.c index 582963077877..c421a1f8f0b9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -119,6 +119,7 @@ | |||
| 119 | #include <linux/err.h> | 119 | #include <linux/err.h> |
| 120 | #include <linux/ctype.h> | 120 | #include <linux/ctype.h> |
| 121 | #include <linux/if_arp.h> | 121 | #include <linux/if_arp.h> |
| 122 | #include <linux/if_vlan.h> | ||
| 122 | 123 | ||
| 123 | #include "net-sysfs.h" | 124 | #include "net-sysfs.h" |
| 124 | 125 | ||
| @@ -1362,6 +1363,29 @@ void netif_device_attach(struct net_device *dev) | |||
| 1362 | } | 1363 | } |
| 1363 | EXPORT_SYMBOL(netif_device_attach); | 1364 | EXPORT_SYMBOL(netif_device_attach); |
| 1364 | 1365 | ||
| 1366 | static bool can_checksum_protocol(unsigned long features, __be16 protocol) | ||
| 1367 | { | ||
| 1368 | return ((features & NETIF_F_GEN_CSUM) || | ||
| 1369 | ((features & NETIF_F_IP_CSUM) && | ||
| 1370 | protocol == htons(ETH_P_IP)) || | ||
| 1371 | ((features & NETIF_F_IPV6_CSUM) && | ||
| 1372 | protocol == htons(ETH_P_IPV6))); | ||
| 1373 | } | ||
| 1374 | |||
| 1375 | static bool dev_can_checksum(struct net_device *dev, struct sk_buff *skb) | ||
| 1376 | { | ||
| 1377 | if (can_checksum_protocol(dev->features, skb->protocol)) | ||
| 1378 | return true; | ||
| 1379 | |||
| 1380 | if (skb->protocol == htons(ETH_P_8021Q)) { | ||
| 1381 | struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data; | ||
| 1382 | if (can_checksum_protocol(dev->features & dev->vlan_features, | ||
| 1383 | veh->h_vlan_encapsulated_proto)) | ||
| 1384 | return true; | ||
| 1385 | } | ||
| 1386 | |||
| 1387 | return false; | ||
| 1388 | } | ||
| 1365 | 1389 | ||
| 1366 | /* | 1390 | /* |
| 1367 | * Invalidate hardware checksum when packet is to be mangled, and | 1391 | * Invalidate hardware checksum when packet is to be mangled, and |
| @@ -1640,14 +1664,8 @@ int dev_queue_xmit(struct sk_buff *skb) | |||
| 1640 | if (skb->ip_summed == CHECKSUM_PARTIAL) { | 1664 | if (skb->ip_summed == CHECKSUM_PARTIAL) { |
| 1641 | skb_set_transport_header(skb, skb->csum_start - | 1665 | skb_set_transport_header(skb, skb->csum_start - |
| 1642 | skb_headroom(skb)); | 1666 | skb_headroom(skb)); |
| 1643 | 1667 | if (!dev_can_checksum(dev, skb) && skb_checksum_help(skb)) | |
| 1644 | if (!(dev->features & NETIF_F_GEN_CSUM) && | 1668 | goto out_kfree_skb; |
| 1645 | !((dev->features & NETIF_F_IP_CSUM) && | ||
| 1646 | skb->protocol == htons(ETH_P_IP)) && | ||
| 1647 | !((dev->features & NETIF_F_IPV6_CSUM) && | ||
| 1648 | skb->protocol == htons(ETH_P_IPV6))) | ||
| 1649 | if (skb_checksum_help(skb)) | ||
| 1650 | goto out_kfree_skb; | ||
| 1651 | } | 1669 | } |
| 1652 | 1670 | ||
| 1653 | gso: | 1671 | gso: |
| @@ -2059,6 +2077,10 @@ int netif_receive_skb(struct sk_buff *skb) | |||
| 2059 | 2077 | ||
| 2060 | rcu_read_lock(); | 2078 | rcu_read_lock(); |
| 2061 | 2079 | ||
| 2080 | /* Don't receive packets in an exiting network namespace */ | ||
| 2081 | if (!net_alive(dev_net(skb->dev))) | ||
| 2082 | goto out; | ||
| 2083 | |||
| 2062 | #ifdef CONFIG_NET_CLS_ACT | 2084 | #ifdef CONFIG_NET_CLS_ACT |
| 2063 | if (skb->tc_verd & TC_NCLS) { | 2085 | if (skb->tc_verd & TC_NCLS) { |
| 2064 | skb->tc_verd = CLR_TC_NCLS(skb->tc_verd); | 2086 | skb->tc_verd = CLR_TC_NCLS(skb->tc_verd); |
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 72b4c184dd84..7c52fe277b62 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c | |||
| @@ -140,6 +140,9 @@ static void cleanup_net(struct work_struct *work) | |||
| 140 | struct pernet_operations *ops; | 140 | struct pernet_operations *ops; |
| 141 | struct net *net; | 141 | struct net *net; |
| 142 | 142 | ||
| 143 | /* Be very certain incoming network packets will not find us */ | ||
| 144 | rcu_barrier(); | ||
| 145 | |||
| 143 | net = container_of(work, struct net, work); | 146 | net = container_of(work, struct net, work); |
| 144 | 147 | ||
| 145 | mutex_lock(&net_mutex); | 148 | mutex_lock(&net_mutex); |
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 045e799d3e1d..ec834480abe7 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
| @@ -466,9 +466,9 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, | |||
| 466 | reqp=&lopt->syn_table[i]; | 466 | reqp=&lopt->syn_table[i]; |
| 467 | while ((req = *reqp) != NULL) { | 467 | while ((req = *reqp) != NULL) { |
| 468 | if (time_after_eq(now, req->expires)) { | 468 | if (time_after_eq(now, req->expires)) { |
| 469 | if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh)) && | 469 | if ((req->retrans < thresh || |
| 470 | (inet_rsk(req)->acked || | 470 | (inet_rsk(req)->acked && req->retrans < max_retries)) |
| 471 | !req->rsk_ops->rtx_syn_ack(parent, req))) { | 471 | && !req->rsk_ops->rtx_syn_ack(parent, req)) { |
| 472 | unsigned long timeo; | 472 | unsigned long timeo; |
| 473 | 473 | ||
| 474 | if (req->retrans++ == 0) | 474 | if (req->retrans++ == 0) |
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index 04578593e100..d2a887fc8d9b 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c | |||
| @@ -556,7 +556,6 @@ static void nf_nat_cleanup_conntrack(struct nf_conn *ct) | |||
| 556 | 556 | ||
| 557 | spin_lock_bh(&nf_nat_lock); | 557 | spin_lock_bh(&nf_nat_lock); |
| 558 | hlist_del_rcu(&nat->bysource); | 558 | hlist_del_rcu(&nat->bysource); |
| 559 | nat->ct = NULL; | ||
| 560 | spin_unlock_bh(&nf_nat_lock); | 559 | spin_unlock_bh(&nf_nat_lock); |
| 561 | } | 560 | } |
| 562 | 561 | ||
| @@ -570,8 +569,8 @@ static void nf_nat_move_storage(void *new, void *old) | |||
| 570 | return; | 569 | return; |
| 571 | 570 | ||
| 572 | spin_lock_bh(&nf_nat_lock); | 571 | spin_lock_bh(&nf_nat_lock); |
| 573 | hlist_replace_rcu(&old_nat->bysource, &new_nat->bysource); | ||
| 574 | new_nat->ct = ct; | 572 | new_nat->ct = ct; |
| 573 | hlist_replace_rcu(&old_nat->bysource, &new_nat->bysource); | ||
| 575 | spin_unlock_bh(&nf_nat_lock); | 574 | spin_unlock_bh(&nf_nat_lock); |
| 576 | } | 575 | } |
| 577 | 576 | ||
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index e7e091d365ff..37a1ecd9d600 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -934,7 +934,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) | |||
| 934 | srcp = inet->num; | 934 | srcp = inet->num; |
| 935 | 935 | ||
| 936 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" | 936 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" |
| 937 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d", | 937 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d\n", |
| 938 | i, src, srcp, dest, destp, sp->sk_state, | 938 | i, src, srcp, dest, destp, sp->sk_state, |
| 939 | atomic_read(&sp->sk_wmem_alloc), | 939 | atomic_read(&sp->sk_wmem_alloc), |
| 940 | atomic_read(&sp->sk_rmem_alloc), | 940 | atomic_read(&sp->sk_rmem_alloc), |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 97a230026e13..12695be2c255 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -85,10 +85,6 @@ | |||
| 85 | int sysctl_tcp_tw_reuse __read_mostly; | 85 | int sysctl_tcp_tw_reuse __read_mostly; |
| 86 | int sysctl_tcp_low_latency __read_mostly; | 86 | int sysctl_tcp_low_latency __read_mostly; |
| 87 | 87 | ||
| 88 | /* Check TCP sequence numbers in ICMP packets. */ | ||
| 89 | #define ICMP_MIN_LENGTH 8 | ||
| 90 | |||
| 91 | void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb); | ||
| 92 | 88 | ||
| 93 | #ifdef CONFIG_TCP_MD5SIG | 89 | #ifdef CONFIG_TCP_MD5SIG |
| 94 | static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, | 90 | static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, |
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index 584e6d74e3a9..7135279f3f84 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c | |||
| @@ -52,7 +52,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 52 | IP_ECN_clear(top_iph); | 52 | IP_ECN_clear(top_iph); |
| 53 | 53 | ||
| 54 | top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ? | 54 | top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ? |
| 55 | 0 : XFRM_MODE_SKB_CB(skb)->frag_off; | 55 | 0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF)); |
| 56 | ip_select_ident(top_iph, dst->child, NULL); | 56 | ip_select_ident(top_iph, dst->child, NULL); |
| 57 | 57 | ||
| 58 | top_iph->ttl = dst_metric(dst->child, RTAX_HOPLIMIT); | 58 | top_iph->ttl = dst_metric(dst->child, RTAX_HOPLIMIT); |
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 4e5c8615832c..17eb48b8e329 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c | |||
| @@ -102,6 +102,15 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt | |||
| 102 | if (hdr->version != 6) | 102 | if (hdr->version != 6) |
| 103 | goto err; | 103 | goto err; |
| 104 | 104 | ||
| 105 | /* | ||
| 106 | * RFC4291 2.5.3 | ||
| 107 | * A packet received on an interface with a destination address | ||
| 108 | * of loopback must be dropped. | ||
| 109 | */ | ||
| 110 | if (!(dev->flags & IFF_LOOPBACK) && | ||
| 111 | ipv6_addr_loopback(&hdr->daddr)) | ||
| 112 | goto err; | ||
| 113 | |||
| 105 | skb->transport_header = skb->network_header + sizeof(*hdr); | 114 | skb->transport_header = skb->network_header + sizeof(*hdr); |
| 106 | IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr); | 115 | IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr); |
| 107 | 116 | ||
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index c042ce19bd14..86e28a75267f 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -345,18 +345,21 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, | |||
| 345 | case IPV6_DSTOPTS: | 345 | case IPV6_DSTOPTS: |
| 346 | { | 346 | { |
| 347 | struct ipv6_txoptions *opt; | 347 | struct ipv6_txoptions *opt; |
| 348 | |||
| 349 | /* remove any sticky options header with a zero option | ||
| 350 | * length, per RFC3542. | ||
| 351 | */ | ||
| 348 | if (optlen == 0) | 352 | if (optlen == 0) |
| 349 | optval = NULL; | 353 | optval = NULL; |
| 354 | else if (optlen < sizeof(struct ipv6_opt_hdr) || | ||
| 355 | optlen & 0x7 || optlen > 8 * 255) | ||
| 356 | goto e_inval; | ||
| 350 | 357 | ||
| 351 | /* hop-by-hop / destination options are privileged option */ | 358 | /* hop-by-hop / destination options are privileged option */ |
| 352 | retv = -EPERM; | 359 | retv = -EPERM; |
| 353 | if (optname != IPV6_RTHDR && !capable(CAP_NET_RAW)) | 360 | if (optname != IPV6_RTHDR && !capable(CAP_NET_RAW)) |
| 354 | break; | 361 | break; |
| 355 | 362 | ||
| 356 | if (optlen < sizeof(struct ipv6_opt_hdr) || | ||
| 357 | optlen & 0x7 || optlen > 8 * 255) | ||
| 358 | goto e_inval; | ||
| 359 | |||
| 360 | opt = ipv6_renew_options(sk, np->opt, optname, | 363 | opt = ipv6_renew_options(sk, np->opt, optname, |
| 361 | (struct ipv6_opt_hdr __user *)optval, | 364 | (struct ipv6_opt_hdr __user *)optval, |
| 362 | optlen); | 365 | optlen); |
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 3de6ffdaedf2..32e871a6c25a 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
| @@ -222,15 +222,18 @@ __ipip6_tunnel_locate_prl(struct ip_tunnel *t, __be32 addr) | |||
| 222 | 222 | ||
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | static int ipip6_tunnel_get_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a) | 225 | static int ipip6_tunnel_get_prl(struct ip_tunnel *t, |
| 226 | struct ip_tunnel_prl __user *a) | ||
| 226 | { | 227 | { |
| 227 | struct ip_tunnel_prl *kp; | 228 | struct ip_tunnel_prl kprl, *kp; |
| 228 | struct ip_tunnel_prl_entry *prl; | 229 | struct ip_tunnel_prl_entry *prl; |
| 229 | unsigned int cmax, c = 0, ca, len; | 230 | unsigned int cmax, c = 0, ca, len; |
| 230 | int ret = 0; | 231 | int ret = 0; |
| 231 | 232 | ||
| 232 | cmax = a->datalen / sizeof(*a); | 233 | if (copy_from_user(&kprl, a, sizeof(kprl))) |
| 233 | if (cmax > 1 && a->addr != htonl(INADDR_ANY)) | 234 | return -EFAULT; |
| 235 | cmax = kprl.datalen / sizeof(kprl); | ||
| 236 | if (cmax > 1 && kprl.addr != htonl(INADDR_ANY)) | ||
| 234 | cmax = 1; | 237 | cmax = 1; |
| 235 | 238 | ||
| 236 | /* For simple GET or for root users, | 239 | /* For simple GET or for root users, |
| @@ -261,26 +264,25 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a) | |||
| 261 | for (prl = t->prl; prl; prl = prl->next) { | 264 | for (prl = t->prl; prl; prl = prl->next) { |
| 262 | if (c > cmax) | 265 | if (c > cmax) |
| 263 | break; | 266 | break; |
| 264 | if (a->addr != htonl(INADDR_ANY) && prl->addr != a->addr) | 267 | if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr) |
| 265 | continue; | 268 | continue; |
| 266 | kp[c].addr = prl->addr; | 269 | kp[c].addr = prl->addr; |
| 267 | kp[c].flags = prl->flags; | 270 | kp[c].flags = prl->flags; |
| 268 | c++; | 271 | c++; |
| 269 | if (a->addr != htonl(INADDR_ANY)) | 272 | if (kprl.addr != htonl(INADDR_ANY)) |
| 270 | break; | 273 | break; |
| 271 | } | 274 | } |
| 272 | out: | 275 | out: |
| 273 | read_unlock(&ipip6_lock); | 276 | read_unlock(&ipip6_lock); |
| 274 | 277 | ||
| 275 | len = sizeof(*kp) * c; | 278 | len = sizeof(*kp) * c; |
| 276 | ret = len ? copy_to_user(a->data, kp, len) : 0; | 279 | ret = 0; |
| 280 | if ((len && copy_to_user(a + 1, kp, len)) || put_user(len, &a->datalen)) | ||
| 281 | ret = -EFAULT; | ||
| 277 | 282 | ||
| 278 | kfree(kp); | 283 | kfree(kp); |
| 279 | if (ret) | ||
| 280 | return -EFAULT; | ||
| 281 | 284 | ||
| 282 | a->datalen = len; | 285 | return ret; |
| 283 | return 0; | ||
| 284 | } | 286 | } |
| 285 | 287 | ||
| 286 | static int | 288 | static int |
| @@ -873,11 +875,20 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 873 | break; | 875 | break; |
| 874 | 876 | ||
| 875 | case SIOCGETPRL: | 877 | case SIOCGETPRL: |
| 878 | err = -EINVAL; | ||
| 879 | if (dev == sitn->fb_tunnel_dev) | ||
| 880 | goto done; | ||
| 881 | err = -ENOENT; | ||
| 882 | if (!(t = netdev_priv(dev))) | ||
| 883 | goto done; | ||
| 884 | err = ipip6_tunnel_get_prl(t, ifr->ifr_ifru.ifru_data); | ||
| 885 | break; | ||
| 886 | |||
| 876 | case SIOCADDPRL: | 887 | case SIOCADDPRL: |
| 877 | case SIOCDELPRL: | 888 | case SIOCDELPRL: |
| 878 | case SIOCCHGPRL: | 889 | case SIOCCHGPRL: |
| 879 | err = -EPERM; | 890 | err = -EPERM; |
| 880 | if (cmd != SIOCGETPRL && !capable(CAP_NET_ADMIN)) | 891 | if (!capable(CAP_NET_ADMIN)) |
| 881 | goto done; | 892 | goto done; |
| 882 | err = -EINVAL; | 893 | err = -EINVAL; |
| 883 | if (dev == sitn->fb_tunnel_dev) | 894 | if (dev == sitn->fb_tunnel_dev) |
| @@ -890,12 +901,6 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 890 | goto done; | 901 | goto done; |
| 891 | 902 | ||
| 892 | switch (cmd) { | 903 | switch (cmd) { |
| 893 | case SIOCGETPRL: | ||
| 894 | err = ipip6_tunnel_get_prl(t, &prl); | ||
| 895 | if (!err && copy_to_user(ifr->ifr_ifru.ifru_data, | ||
| 896 | &prl, sizeof(prl))) | ||
| 897 | err = -EFAULT; | ||
| 898 | break; | ||
| 899 | case SIOCDELPRL: | 904 | case SIOCDELPRL: |
| 900 | err = ipip6_tunnel_del_prl(t, &prl); | 905 | err = ipip6_tunnel_del_prl(t, &prl); |
| 901 | break; | 906 | break; |
| @@ -904,8 +909,7 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 904 | err = ipip6_tunnel_add_prl(t, &prl, cmd == SIOCCHGPRL); | 909 | err = ipip6_tunnel_add_prl(t, &prl, cmd == SIOCCHGPRL); |
| 905 | break; | 910 | break; |
| 906 | } | 911 | } |
| 907 | if (cmd != SIOCGETPRL) | 912 | netdev_state_change(dev); |
| 908 | netdev_state_change(dev); | ||
| 909 | break; | 913 | break; |
| 910 | 914 | ||
| 911 | default: | 915 | default: |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 1d7dd54aacef..c80d5899f279 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
| @@ -1132,7 +1132,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb, | |||
| 1132 | ieee80211_tx_handler *handler; | 1132 | ieee80211_tx_handler *handler; |
| 1133 | struct ieee80211_tx_data tx; | 1133 | struct ieee80211_tx_data tx; |
| 1134 | ieee80211_tx_result res = TX_DROP, res_prepare; | 1134 | ieee80211_tx_result res = TX_DROP, res_prepare; |
| 1135 | int ret, i; | 1135 | int ret, i, retries = 0; |
| 1136 | 1136 | ||
| 1137 | WARN_ON(__ieee80211_queue_pending(local, control->queue)); | 1137 | WARN_ON(__ieee80211_queue_pending(local, control->queue)); |
| 1138 | 1138 | ||
| @@ -1216,6 +1216,13 @@ retry: | |||
| 1216 | if (!__ieee80211_queue_stopped(local, control->queue)) { | 1216 | if (!__ieee80211_queue_stopped(local, control->queue)) { |
| 1217 | clear_bit(IEEE80211_LINK_STATE_PENDING, | 1217 | clear_bit(IEEE80211_LINK_STATE_PENDING, |
| 1218 | &local->state[control->queue]); | 1218 | &local->state[control->queue]); |
| 1219 | retries++; | ||
| 1220 | /* | ||
| 1221 | * Driver bug, it's rejecting packets but | ||
| 1222 | * not stopping queues. | ||
| 1223 | */ | ||
| 1224 | if (WARN_ON_ONCE(retries > 5)) | ||
| 1225 | goto drop; | ||
| 1219 | goto retry; | 1226 | goto retry; |
| 1220 | } | 1227 | } |
| 1221 | memcpy(&store->control, control, | 1228 | memcpy(&store->control, control, |
| @@ -1562,13 +1569,13 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
| 1562 | * be cloned. This could happen, e.g., with Linux bridge code passing | 1569 | * be cloned. This could happen, e.g., with Linux bridge code passing |
| 1563 | * us broadcast frames. */ | 1570 | * us broadcast frames. */ |
| 1564 | 1571 | ||
| 1565 | if (head_need > 0 || skb_header_cloned(skb)) { | 1572 | if (head_need > 0 || skb_cloned(skb)) { |
| 1566 | #if 0 | 1573 | #if 0 |
| 1567 | printk(KERN_DEBUG "%s: need to reallocate buffer for %d bytes " | 1574 | printk(KERN_DEBUG "%s: need to reallocate buffer for %d bytes " |
| 1568 | "of headroom\n", dev->name, head_need); | 1575 | "of headroom\n", dev->name, head_need); |
| 1569 | #endif | 1576 | #endif |
| 1570 | 1577 | ||
| 1571 | if (skb_header_cloned(skb)) | 1578 | if (skb_cloned(skb)) |
| 1572 | I802_DEBUG_INC(local->tx_expand_skb_head_cloned); | 1579 | I802_DEBUG_INC(local->tx_expand_skb_head_cloned); |
| 1573 | else | 1580 | else |
| 1574 | I802_DEBUG_INC(local->tx_expand_skb_head); | 1581 | I802_DEBUG_INC(local->tx_expand_skb_head); |
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index a8bb8e31b1ec..6106cb79060c 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
| @@ -496,7 +496,8 @@ static int ieee80211_ioctl_giwap(struct net_device *dev, | |||
| 496 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 496 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
| 497 | if (sdata->vif.type == IEEE80211_IF_TYPE_STA || | 497 | if (sdata->vif.type == IEEE80211_IF_TYPE_STA || |
| 498 | sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { | 498 | sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { |
| 499 | if (sdata->u.sta.state == IEEE80211_ASSOCIATED) { | 499 | if (sdata->u.sta.state == IEEE80211_ASSOCIATED || |
| 500 | sdata->u.sta.state == IEEE80211_IBSS_JOINED) { | ||
| 500 | ap_addr->sa_family = ARPHRD_ETHER; | 501 | ap_addr->sa_family = ARPHRD_ETHER; |
| 501 | memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN); | 502 | memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN); |
| 502 | return 0; | 503 | return 0; |
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index dc1598b86004..635b996c8c35 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
| @@ -673,7 +673,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local, | |||
| 673 | #ifdef CONFIG_MAC80211_HT_DEBUG | 673 | #ifdef CONFIG_MAC80211_HT_DEBUG |
| 674 | if (net_ratelimit()) | 674 | if (net_ratelimit()) |
| 675 | printk(KERN_DEBUG "allocated aggregation queue" | 675 | printk(KERN_DEBUG "allocated aggregation queue" |
| 676 | " %d tid %d addr %s pool=0x%lX", | 676 | " %d tid %d addr %s pool=0x%lX\n", |
| 677 | i, tid, print_mac(mac, sta->addr), | 677 | i, tid, print_mac(mac, sta->addr), |
| 678 | q->qdisc_pool[0]); | 678 | q->qdisc_pool[0]); |
| 679 | #endif /* CONFIG_MAC80211_HT_DEBUG */ | 679 | #endif /* CONFIG_MAC80211_HT_DEBUG */ |
diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c index bcc19fa4ed1e..8a3f8b34e466 100644 --- a/net/netfilter/nf_conntrack_extend.c +++ b/net/netfilter/nf_conntrack_extend.c | |||
| @@ -59,12 +59,19 @@ nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id, gfp_t gfp) | |||
| 59 | if (!*ext) | 59 | if (!*ext) |
| 60 | return NULL; | 60 | return NULL; |
| 61 | 61 | ||
| 62 | INIT_RCU_HEAD(&(*ext)->rcu); | ||
| 62 | (*ext)->offset[id] = off; | 63 | (*ext)->offset[id] = off; |
| 63 | (*ext)->len = len; | 64 | (*ext)->len = len; |
| 64 | 65 | ||
| 65 | return (void *)(*ext) + off; | 66 | return (void *)(*ext) + off; |
| 66 | } | 67 | } |
| 67 | 68 | ||
| 69 | static void __nf_ct_ext_free_rcu(struct rcu_head *head) | ||
| 70 | { | ||
| 71 | struct nf_ct_ext *ext = container_of(head, struct nf_ct_ext, rcu); | ||
| 72 | kfree(ext); | ||
| 73 | } | ||
| 74 | |||
| 68 | void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp) | 75 | void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp) |
| 69 | { | 76 | { |
| 70 | struct nf_ct_ext *new; | 77 | struct nf_ct_ext *new; |
| @@ -106,7 +113,7 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp) | |||
| 106 | (void *)ct->ext + ct->ext->offset[i]); | 113 | (void *)ct->ext + ct->ext->offset[i]); |
| 107 | rcu_read_unlock(); | 114 | rcu_read_unlock(); |
| 108 | } | 115 | } |
| 109 | kfree(ct->ext); | 116 | call_rcu(&ct->ext->rcu, __nf_ct_ext_free_rcu); |
| 110 | ct->ext = new; | 117 | ct->ext = new; |
| 111 | } | 118 | } |
| 112 | 119 | ||
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index 95da1a24aab7..2f83c158934d 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c | |||
| @@ -619,6 +619,7 @@ static const struct nf_conntrack_expect_policy h245_exp_policy = { | |||
| 619 | static struct nf_conntrack_helper nf_conntrack_helper_h245 __read_mostly = { | 619 | static struct nf_conntrack_helper nf_conntrack_helper_h245 __read_mostly = { |
| 620 | .name = "H.245", | 620 | .name = "H.245", |
| 621 | .me = THIS_MODULE, | 621 | .me = THIS_MODULE, |
| 622 | .tuple.src.l3num = AF_UNSPEC, | ||
| 622 | .tuple.dst.protonum = IPPROTO_UDP, | 623 | .tuple.dst.protonum = IPPROTO_UDP, |
| 623 | .help = h245_help, | 624 | .help = h245_help, |
| 624 | .expect_policy = &h245_exp_policy, | 625 | .expect_policy = &h245_exp_policy, |
| @@ -1765,6 +1766,7 @@ static void __exit nf_conntrack_h323_fini(void) | |||
| 1765 | nf_conntrack_helper_unregister(&nf_conntrack_helper_ras[0]); | 1766 | nf_conntrack_helper_unregister(&nf_conntrack_helper_ras[0]); |
| 1766 | nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[1]); | 1767 | nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[1]); |
| 1767 | nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]); | 1768 | nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]); |
| 1769 | nf_conntrack_helper_unregister(&nf_conntrack_helper_h245); | ||
| 1768 | kfree(h323_buffer); | 1770 | kfree(h323_buffer); |
| 1769 | pr_debug("nf_ct_h323: fini\n"); | 1771 | pr_debug("nf_ct_h323: fini\n"); |
| 1770 | } | 1772 | } |
| @@ -1777,28 +1779,34 @@ static int __init nf_conntrack_h323_init(void) | |||
| 1777 | h323_buffer = kmalloc(65536, GFP_KERNEL); | 1779 | h323_buffer = kmalloc(65536, GFP_KERNEL); |
| 1778 | if (!h323_buffer) | 1780 | if (!h323_buffer) |
| 1779 | return -ENOMEM; | 1781 | return -ENOMEM; |
| 1780 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_q931[0]); | 1782 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_h245); |
| 1781 | if (ret < 0) | 1783 | if (ret < 0) |
| 1782 | goto err1; | 1784 | goto err1; |
| 1783 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_q931[1]); | 1785 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_q931[0]); |
| 1784 | if (ret < 0) | 1786 | if (ret < 0) |
| 1785 | goto err2; | 1787 | goto err2; |
| 1786 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_ras[0]); | 1788 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_q931[1]); |
| 1787 | if (ret < 0) | 1789 | if (ret < 0) |
| 1788 | goto err3; | 1790 | goto err3; |
| 1789 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_ras[1]); | 1791 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_ras[0]); |
| 1790 | if (ret < 0) | 1792 | if (ret < 0) |
| 1791 | goto err4; | 1793 | goto err4; |
| 1794 | ret = nf_conntrack_helper_register(&nf_conntrack_helper_ras[1]); | ||
| 1795 | if (ret < 0) | ||
| 1796 | goto err5; | ||
| 1792 | pr_debug("nf_ct_h323: init success\n"); | 1797 | pr_debug("nf_ct_h323: init success\n"); |
| 1793 | return 0; | 1798 | return 0; |
| 1794 | 1799 | ||
| 1795 | err4: | 1800 | err5: |
| 1796 | nf_conntrack_helper_unregister(&nf_conntrack_helper_ras[0]); | 1801 | nf_conntrack_helper_unregister(&nf_conntrack_helper_ras[0]); |
| 1797 | err3: | 1802 | err4: |
| 1798 | nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[1]); | 1803 | nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[1]); |
| 1799 | err2: | 1804 | err3: |
| 1800 | nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]); | 1805 | nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]); |
| 1806 | err2: | ||
| 1807 | nf_conntrack_helper_unregister(&nf_conntrack_helper_h245); | ||
| 1801 | err1: | 1808 | err1: |
| 1809 | kfree(h323_buffer); | ||
| 1802 | return ret; | 1810 | return ret; |
| 1803 | } | 1811 | } |
| 1804 | 1812 | ||
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index f5aa23c3e886..3e1191cecaf0 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c | |||
| @@ -444,8 +444,11 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 444 | if (ops->dumpit == NULL) | 444 | if (ops->dumpit == NULL) |
| 445 | return -EOPNOTSUPP; | 445 | return -EOPNOTSUPP; |
| 446 | 446 | ||
| 447 | return netlink_dump_start(genl_sock, skb, nlh, | 447 | genl_unlock(); |
| 448 | ops->dumpit, ops->done); | 448 | err = netlink_dump_start(genl_sock, skb, nlh, |
| 449 | ops->dumpit, ops->done); | ||
| 450 | genl_lock(); | ||
| 451 | return err; | ||
| 449 | } | 452 | } |
| 450 | 453 | ||
| 451 | if (ops->doit == NULL) | 454 | if (ops->doit == NULL) |
| @@ -603,9 +606,6 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 603 | int chains_to_skip = cb->args[0]; | 606 | int chains_to_skip = cb->args[0]; |
| 604 | int fams_to_skip = cb->args[1]; | 607 | int fams_to_skip = cb->args[1]; |
| 605 | 608 | ||
| 606 | if (chains_to_skip != 0) | ||
| 607 | genl_lock(); | ||
| 608 | |||
| 609 | for (i = 0; i < GENL_FAM_TAB_SIZE; i++) { | 609 | for (i = 0; i < GENL_FAM_TAB_SIZE; i++) { |
| 610 | if (i < chains_to_skip) | 610 | if (i < chains_to_skip) |
| 611 | continue; | 611 | continue; |
| @@ -623,9 +623,6 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 623 | } | 623 | } |
| 624 | 624 | ||
| 625 | errout: | 625 | errout: |
| 626 | if (chains_to_skip != 0) | ||
| 627 | genl_unlock(); | ||
| 628 | |||
| 629 | cb->args[0] = i; | 626 | cb->args[0] = i; |
| 630 | cb->args[1] = n; | 627 | cb->args[1] = n; |
| 631 | 628 | ||
| @@ -770,7 +767,7 @@ static int __init genl_init(void) | |||
| 770 | 767 | ||
| 771 | /* we'll bump the group number right afterwards */ | 768 | /* we'll bump the group number right afterwards */ |
| 772 | genl_sock = netlink_kernel_create(&init_net, NETLINK_GENERIC, 0, | 769 | genl_sock = netlink_kernel_create(&init_net, NETLINK_GENERIC, 0, |
| 773 | genl_rcv, NULL, THIS_MODULE); | 770 | genl_rcv, &genl_mutex, THIS_MODULE); |
| 774 | if (genl_sock == NULL) | 771 | if (genl_sock == NULL) |
| 775 | panic("GENL: Cannot initialize generic netlink\n"); | 772 | panic("GENL: Cannot initialize generic netlink\n"); |
| 776 | 773 | ||
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 5bc1ed490180..6807c97985a5 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | * $Id: sch_htb.c,v 1.25 2003/12/07 11:08:25 devik Exp devik $ | 28 | * $Id: sch_htb.c,v 1.25 2003/12/07 11:08:25 devik Exp devik $ |
| 29 | */ | 29 | */ |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/moduleparam.h> | ||
| 31 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 32 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 33 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| @@ -53,13 +54,17 @@ | |||
| 53 | */ | 54 | */ |
| 54 | 55 | ||
| 55 | #define HTB_HSIZE 16 /* classid hash size */ | 56 | #define HTB_HSIZE 16 /* classid hash size */ |
| 56 | #define HTB_HYSTERESIS 1 /* whether to use mode hysteresis for speedup */ | 57 | static int htb_hysteresis __read_mostly = 0; /* whether to use mode hysteresis for speedup */ |
| 57 | #define HTB_VER 0x30011 /* major must be matched with number suplied by TC as version */ | 58 | #define HTB_VER 0x30011 /* major must be matched with number suplied by TC as version */ |
| 58 | 59 | ||
| 59 | #if HTB_VER >> 16 != TC_HTB_PROTOVER | 60 | #if HTB_VER >> 16 != TC_HTB_PROTOVER |
| 60 | #error "Mismatched sch_htb.c and pkt_sch.h" | 61 | #error "Mismatched sch_htb.c and pkt_sch.h" |
| 61 | #endif | 62 | #endif |
| 62 | 63 | ||
| 64 | /* Module parameter and sysfs export */ | ||
| 65 | module_param (htb_hysteresis, int, 0640); | ||
| 66 | MODULE_PARM_DESC(htb_hysteresis, "Hysteresis mode, less CPU load, less accurate"); | ||
| 67 | |||
| 63 | /* used internaly to keep status of single class */ | 68 | /* used internaly to keep status of single class */ |
| 64 | enum htb_cmode { | 69 | enum htb_cmode { |
| 65 | HTB_CANT_SEND, /* class can't send and can't borrow */ | 70 | HTB_CANT_SEND, /* class can't send and can't borrow */ |
| @@ -462,19 +467,21 @@ static void htb_deactivate_prios(struct htb_sched *q, struct htb_class *cl) | |||
| 462 | htb_remove_class_from_row(q, cl, mask); | 467 | htb_remove_class_from_row(q, cl, mask); |
| 463 | } | 468 | } |
| 464 | 469 | ||
| 465 | #if HTB_HYSTERESIS | ||
| 466 | static inline long htb_lowater(const struct htb_class *cl) | 470 | static inline long htb_lowater(const struct htb_class *cl) |
| 467 | { | 471 | { |
| 468 | return cl->cmode != HTB_CANT_SEND ? -cl->cbuffer : 0; | 472 | if (htb_hysteresis) |
| 473 | return cl->cmode != HTB_CANT_SEND ? -cl->cbuffer : 0; | ||
| 474 | else | ||
| 475 | return 0; | ||
| 469 | } | 476 | } |
| 470 | static inline long htb_hiwater(const struct htb_class *cl) | 477 | static inline long htb_hiwater(const struct htb_class *cl) |
| 471 | { | 478 | { |
| 472 | return cl->cmode == HTB_CAN_SEND ? -cl->buffer : 0; | 479 | if (htb_hysteresis) |
| 480 | return cl->cmode == HTB_CAN_SEND ? -cl->buffer : 0; | ||
| 481 | else | ||
| 482 | return 0; | ||
| 473 | } | 483 | } |
| 474 | #else | 484 | |
| 475 | #define htb_lowater(cl) (0) | ||
| 476 | #define htb_hiwater(cl) (0) | ||
| 477 | #endif | ||
| 478 | 485 | ||
| 479 | /** | 486 | /** |
| 480 | * htb_class_mode - computes and returns current class mode | 487 | * htb_class_mode - computes and returns current class mode |
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 532634861db1..024c3ebd9661 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
| @@ -474,6 +474,15 @@ static void sctp_association_destroy(struct sctp_association *asoc) | |||
| 474 | void sctp_assoc_set_primary(struct sctp_association *asoc, | 474 | void sctp_assoc_set_primary(struct sctp_association *asoc, |
| 475 | struct sctp_transport *transport) | 475 | struct sctp_transport *transport) |
| 476 | { | 476 | { |
| 477 | int changeover = 0; | ||
| 478 | |||
| 479 | /* it's a changeover only if we already have a primary path | ||
| 480 | * that we are changing | ||
| 481 | */ | ||
| 482 | if (asoc->peer.primary_path != NULL && | ||
| 483 | asoc->peer.primary_path != transport) | ||
| 484 | changeover = 1 ; | ||
| 485 | |||
| 477 | asoc->peer.primary_path = transport; | 486 | asoc->peer.primary_path = transport; |
| 478 | 487 | ||
| 479 | /* Set a default msg_name for events. */ | 488 | /* Set a default msg_name for events. */ |
| @@ -499,12 +508,12 @@ void sctp_assoc_set_primary(struct sctp_association *asoc, | |||
| 499 | * double switch to the same destination address. | 508 | * double switch to the same destination address. |
| 500 | */ | 509 | */ |
| 501 | if (transport->cacc.changeover_active) | 510 | if (transport->cacc.changeover_active) |
| 502 | transport->cacc.cycling_changeover = 1; | 511 | transport->cacc.cycling_changeover = changeover; |
| 503 | 512 | ||
| 504 | /* 2) The sender MUST set CHANGEOVER_ACTIVE to indicate that | 513 | /* 2) The sender MUST set CHANGEOVER_ACTIVE to indicate that |
| 505 | * a changeover has occurred. | 514 | * a changeover has occurred. |
| 506 | */ | 515 | */ |
| 507 | transport->cacc.changeover_active = 1; | 516 | transport->cacc.changeover_active = changeover; |
| 508 | 517 | ||
| 509 | /* 3) The sender MUST store the next TSN to be sent in | 518 | /* 3) The sender MUST store the next TSN to be sent in |
| 510 | * next_tsn_at_change. | 519 | * next_tsn_at_change. |
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index b435a193c5df..9258dfe784ae 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
| @@ -108,14 +108,23 @@ static __init int sctp_proc_init(void) | |||
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | if (sctp_snmp_proc_init()) | 110 | if (sctp_snmp_proc_init()) |
| 111 | goto out_nomem; | 111 | goto out_snmp_proc_init; |
| 112 | if (sctp_eps_proc_init()) | 112 | if (sctp_eps_proc_init()) |
| 113 | goto out_nomem; | 113 | goto out_eps_proc_init; |
| 114 | if (sctp_assocs_proc_init()) | 114 | if (sctp_assocs_proc_init()) |
| 115 | goto out_nomem; | 115 | goto out_assocs_proc_init; |
| 116 | 116 | ||
| 117 | return 0; | 117 | return 0; |
| 118 | 118 | ||
| 119 | out_assocs_proc_init: | ||
| 120 | sctp_eps_proc_exit(); | ||
| 121 | out_eps_proc_init: | ||
| 122 | sctp_snmp_proc_exit(); | ||
| 123 | out_snmp_proc_init: | ||
| 124 | if (proc_net_sctp) { | ||
| 125 | proc_net_sctp = NULL; | ||
| 126 | remove_proc_entry("sctp", init_net.proc_net); | ||
| 127 | } | ||
| 119 | out_nomem: | 128 | out_nomem: |
| 120 | return -ENOMEM; | 129 | return -ENOMEM; |
| 121 | } | 130 | } |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index e7e3baf7009e..0dbcde6758ea 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -4401,7 +4401,9 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len, | |||
| 4401 | if (copy_from_user(&getaddrs, optval, len)) | 4401 | if (copy_from_user(&getaddrs, optval, len)) |
| 4402 | return -EFAULT; | 4402 | return -EFAULT; |
| 4403 | 4403 | ||
| 4404 | if (getaddrs.addr_num <= 0) return -EINVAL; | 4404 | if (getaddrs.addr_num <= 0 || |
| 4405 | getaddrs.addr_num >= (INT_MAX / sizeof(union sctp_addr))) | ||
| 4406 | return -EINVAL; | ||
| 4405 | /* | 4407 | /* |
| 4406 | * For UDP-style sockets, id specifies the association to query. | 4408 | * For UDP-style sockets, id specifies the association to query. |
| 4407 | * If the id field is set to the value '0' then the locally bound | 4409 | * If the id field is set to the value '0' then the locally bound |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index e18cd3628db4..657835f227d3 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -169,6 +169,11 @@ static inline int unix_may_send(struct sock *sk, struct sock *osk) | |||
| 169 | return (unix_peer(osk) == NULL || unix_our_peer(sk, osk)); | 169 | return (unix_peer(osk) == NULL || unix_our_peer(sk, osk)); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | static inline int unix_recvq_full(struct sock const *sk) | ||
| 173 | { | ||
| 174 | return skb_queue_len(&sk->sk_receive_queue) > sk->sk_max_ack_backlog; | ||
| 175 | } | ||
| 176 | |||
| 172 | static struct sock *unix_peer_get(struct sock *s) | 177 | static struct sock *unix_peer_get(struct sock *s) |
| 173 | { | 178 | { |
| 174 | struct sock *peer; | 179 | struct sock *peer; |
| @@ -482,6 +487,8 @@ static int unix_socketpair(struct socket *, struct socket *); | |||
| 482 | static int unix_accept(struct socket *, struct socket *, int); | 487 | static int unix_accept(struct socket *, struct socket *, int); |
| 483 | static int unix_getname(struct socket *, struct sockaddr *, int *, int); | 488 | static int unix_getname(struct socket *, struct sockaddr *, int *, int); |
| 484 | static unsigned int unix_poll(struct file *, struct socket *, poll_table *); | 489 | static unsigned int unix_poll(struct file *, struct socket *, poll_table *); |
| 490 | static unsigned int unix_datagram_poll(struct file *, struct socket *, | ||
| 491 | poll_table *); | ||
| 485 | static int unix_ioctl(struct socket *, unsigned int, unsigned long); | 492 | static int unix_ioctl(struct socket *, unsigned int, unsigned long); |
| 486 | static int unix_shutdown(struct socket *, int); | 493 | static int unix_shutdown(struct socket *, int); |
| 487 | static int unix_stream_sendmsg(struct kiocb *, struct socket *, | 494 | static int unix_stream_sendmsg(struct kiocb *, struct socket *, |
| @@ -527,7 +534,7 @@ static const struct proto_ops unix_dgram_ops = { | |||
| 527 | .socketpair = unix_socketpair, | 534 | .socketpair = unix_socketpair, |
| 528 | .accept = sock_no_accept, | 535 | .accept = sock_no_accept, |
| 529 | .getname = unix_getname, | 536 | .getname = unix_getname, |
| 530 | .poll = datagram_poll, | 537 | .poll = unix_datagram_poll, |
| 531 | .ioctl = unix_ioctl, | 538 | .ioctl = unix_ioctl, |
| 532 | .listen = sock_no_listen, | 539 | .listen = sock_no_listen, |
| 533 | .shutdown = unix_shutdown, | 540 | .shutdown = unix_shutdown, |
| @@ -548,7 +555,7 @@ static const struct proto_ops unix_seqpacket_ops = { | |||
| 548 | .socketpair = unix_socketpair, | 555 | .socketpair = unix_socketpair, |
| 549 | .accept = unix_accept, | 556 | .accept = unix_accept, |
| 550 | .getname = unix_getname, | 557 | .getname = unix_getname, |
| 551 | .poll = datagram_poll, | 558 | .poll = unix_datagram_poll, |
| 552 | .ioctl = unix_ioctl, | 559 | .ioctl = unix_ioctl, |
| 553 | .listen = unix_listen, | 560 | .listen = unix_listen, |
| 554 | .shutdown = unix_shutdown, | 561 | .shutdown = unix_shutdown, |
| @@ -983,8 +990,7 @@ static long unix_wait_for_peer(struct sock *other, long timeo) | |||
| 983 | 990 | ||
| 984 | sched = !sock_flag(other, SOCK_DEAD) && | 991 | sched = !sock_flag(other, SOCK_DEAD) && |
| 985 | !(other->sk_shutdown & RCV_SHUTDOWN) && | 992 | !(other->sk_shutdown & RCV_SHUTDOWN) && |
| 986 | (skb_queue_len(&other->sk_receive_queue) > | 993 | unix_recvq_full(other); |
| 987 | other->sk_max_ack_backlog); | ||
| 988 | 994 | ||
| 989 | unix_state_unlock(other); | 995 | unix_state_unlock(other); |
| 990 | 996 | ||
| @@ -1058,8 +1064,7 @@ restart: | |||
| 1058 | if (other->sk_state != TCP_LISTEN) | 1064 | if (other->sk_state != TCP_LISTEN) |
| 1059 | goto out_unlock; | 1065 | goto out_unlock; |
| 1060 | 1066 | ||
| 1061 | if (skb_queue_len(&other->sk_receive_queue) > | 1067 | if (unix_recvq_full(other)) { |
| 1062 | other->sk_max_ack_backlog) { | ||
| 1063 | err = -EAGAIN; | 1068 | err = -EAGAIN; |
| 1064 | if (!timeo) | 1069 | if (!timeo) |
| 1065 | goto out_unlock; | 1070 | goto out_unlock; |
| @@ -1428,9 +1433,7 @@ restart: | |||
| 1428 | goto out_unlock; | 1433 | goto out_unlock; |
| 1429 | } | 1434 | } |
| 1430 | 1435 | ||
| 1431 | if (unix_peer(other) != sk && | 1436 | if (unix_peer(other) != sk && unix_recvq_full(other)) { |
| 1432 | (skb_queue_len(&other->sk_receive_queue) > | ||
| 1433 | other->sk_max_ack_backlog)) { | ||
| 1434 | if (!timeo) { | 1437 | if (!timeo) { |
| 1435 | err = -EAGAIN; | 1438 | err = -EAGAIN; |
| 1436 | goto out_unlock; | 1439 | goto out_unlock; |
| @@ -1991,6 +1994,64 @@ static unsigned int unix_poll(struct file * file, struct socket *sock, poll_tabl | |||
| 1991 | return mask; | 1994 | return mask; |
| 1992 | } | 1995 | } |
| 1993 | 1996 | ||
| 1997 | static unsigned int unix_datagram_poll(struct file *file, struct socket *sock, | ||
| 1998 | poll_table *wait) | ||
| 1999 | { | ||
| 2000 | struct sock *sk = sock->sk, *peer; | ||
| 2001 | unsigned int mask; | ||
| 2002 | |||
| 2003 | poll_wait(file, sk->sk_sleep, wait); | ||
| 2004 | |||
| 2005 | peer = unix_peer_get(sk); | ||
| 2006 | if (peer) { | ||
| 2007 | if (peer != sk) { | ||
| 2008 | /* | ||
| 2009 | * Writability of a connected socket additionally | ||
| 2010 | * depends on the state of the receive queue of the | ||
| 2011 | * peer. | ||
| 2012 | */ | ||
| 2013 | poll_wait(file, &unix_sk(peer)->peer_wait, wait); | ||
| 2014 | } else { | ||
| 2015 | sock_put(peer); | ||
| 2016 | peer = NULL; | ||
| 2017 | } | ||
| 2018 | } | ||
| 2019 | |||
| 2020 | mask = 0; | ||
| 2021 | |||
| 2022 | /* exceptional events? */ | ||
| 2023 | if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) | ||
| 2024 | mask |= POLLERR; | ||
| 2025 | if (sk->sk_shutdown & RCV_SHUTDOWN) | ||
| 2026 | mask |= POLLRDHUP; | ||
| 2027 | if (sk->sk_shutdown == SHUTDOWN_MASK) | ||
| 2028 | mask |= POLLHUP; | ||
| 2029 | |||
| 2030 | /* readable? */ | ||
| 2031 | if (!skb_queue_empty(&sk->sk_receive_queue) || | ||
| 2032 | (sk->sk_shutdown & RCV_SHUTDOWN)) | ||
| 2033 | mask |= POLLIN | POLLRDNORM; | ||
| 2034 | |||
| 2035 | /* Connection-based need to check for termination and startup */ | ||
| 2036 | if (sk->sk_type == SOCK_SEQPACKET) { | ||
| 2037 | if (sk->sk_state == TCP_CLOSE) | ||
| 2038 | mask |= POLLHUP; | ||
| 2039 | /* connection hasn't started yet? */ | ||
| 2040 | if (sk->sk_state == TCP_SYN_SENT) | ||
| 2041 | return mask; | ||
| 2042 | } | ||
| 2043 | |||
| 2044 | /* writable? */ | ||
| 2045 | if (unix_writable(sk) && !(peer && unix_recvq_full(peer))) | ||
| 2046 | mask |= POLLOUT | POLLWRNORM | POLLWRBAND; | ||
| 2047 | else | ||
| 2048 | set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags); | ||
| 2049 | |||
| 2050 | if (peer) | ||
| 2051 | sock_put(peer); | ||
| 2052 | |||
| 2053 | return mask; | ||
| 2054 | } | ||
| 1994 | 2055 | ||
| 1995 | #ifdef CONFIG_PROC_FS | 2056 | #ifdef CONFIG_PROC_FS |
| 1996 | static struct sock *first_unix_socket(int *i) | 2057 | static struct sock *first_unix_socket(int *i) |
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c index 91d14224f6b3..73d4572d136b 100644 --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c | |||
| @@ -925,7 +925,7 @@ static unsigned char als4000_saved_regs[] = { | |||
| 925 | static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs) | 925 | static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs) |
| 926 | { | 926 | { |
| 927 | unsigned char *val = chip->saved_regs; | 927 | unsigned char *val = chip->saved_regs; |
| 928 | snd_assert(num_regs > ARRAY_SIZE(chip->saved_regs), return); | 928 | snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return); |
| 929 | for (; num_regs; num_regs--) | 929 | for (; num_regs; num_regs--) |
| 930 | *val++ = snd_sbmixer_read(chip, *regs++); | 930 | *val++ = snd_sbmixer_read(chip, *regs++); |
| 931 | } | 931 | } |
| @@ -933,7 +933,7 @@ static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs) | |||
| 933 | static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs) | 933 | static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs) |
| 934 | { | 934 | { |
| 935 | unsigned char *val = chip->saved_regs; | 935 | unsigned char *val = chip->saved_regs; |
| 936 | snd_assert(num_regs > ARRAY_SIZE(chip->saved_regs), return); | 936 | snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return); |
| 937 | for (; num_regs; num_regs--) | 937 | for (; num_regs; num_regs--) |
| 938 | snd_sbmixer_write(chip, *regs++, *val++); | 938 | snd_sbmixer_write(chip, *regs++, *val++); |
| 939 | } | 939 | } |
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 56f87cd33c19..3f00ddf450f8 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c | |||
| @@ -316,6 +316,8 @@ static int __devinit snd_aw2_create(struct snd_card *card, | |||
| 316 | return -ENOMEM; | 316 | return -ENOMEM; |
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | /* (2) initialization of the chip hardware */ | ||
| 320 | snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt); | ||
| 319 | 321 | ||
| 320 | if (request_irq(pci->irq, snd_aw2_saa7146_interrupt, | 322 | if (request_irq(pci->irq, snd_aw2_saa7146_interrupt, |
| 321 | IRQF_SHARED, "Audiowerk2", chip)) { | 323 | IRQF_SHARED, "Audiowerk2", chip)) { |
| @@ -329,8 +331,6 @@ static int __devinit snd_aw2_create(struct snd_card *card, | |||
| 329 | } | 331 | } |
| 330 | chip->irq = pci->irq; | 332 | chip->irq = pci->irq; |
| 331 | 333 | ||
| 332 | /* (2) initialization of the chip hardware */ | ||
| 333 | snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt); | ||
| 334 | err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); | 334 | err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); |
| 335 | if (err < 0) { | 335 | if (err < 0) { |
| 336 | free_irq(chip->irq, (void *)chip); | 336 | free_irq(chip->irq, (void *)chip); |
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index cc0cddadd589..6facac5aed90 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c | |||
| @@ -936,11 +936,13 @@ static int add_controls(struct oxygen *chip, | |||
| 936 | 936 | ||
| 937 | for (i = 0; i < count; ++i) { | 937 | for (i = 0; i < count; ++i) { |
| 938 | template = controls[i]; | 938 | template = controls[i]; |
| 939 | err = chip->model->control_filter(&template); | 939 | if (chip->model->control_filter) { |
| 940 | if (err < 0) | 940 | err = chip->model->control_filter(&template); |
| 941 | return err; | 941 | if (err < 0) |
| 942 | if (err == 1) | 942 | return err; |
| 943 | continue; | 943 | if (err == 1) |
| 944 | continue; | ||
| 945 | } | ||
| 944 | if (!strcmp(template.name, "Master Playback Volume") && | 946 | if (!strcmp(template.name, "Master Playback Volume") && |
| 945 | chip->model->dac_tlv) { | 947 | chip->model->dac_tlv) { |
| 946 | template.tlv.p = chip->model->dac_tlv; | 948 | template.tlv.p = chip->model->dac_tlv; |
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 98778cb69c6e..1dcf9f3d1107 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c | |||
| @@ -269,28 +269,9 @@ void kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level) | |||
| 269 | } | 269 | } |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | static int get_eoi_gsi(struct kvm_ioapic *ioapic, int vector) | 272 | static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int gsi) |
| 273 | { | 273 | { |
| 274 | int i; | ||
| 275 | |||
| 276 | for (i = 0; i < IOAPIC_NUM_PINS; i++) | ||
| 277 | if (ioapic->redirtbl[i].fields.vector == vector) | ||
| 278 | return i; | ||
| 279 | return -1; | ||
| 280 | } | ||
| 281 | |||
| 282 | void kvm_ioapic_update_eoi(struct kvm *kvm, int vector) | ||
| 283 | { | ||
| 284 | struct kvm_ioapic *ioapic = kvm->arch.vioapic; | ||
| 285 | union ioapic_redir_entry *ent; | 274 | union ioapic_redir_entry *ent; |
| 286 | int gsi; | ||
| 287 | |||
| 288 | gsi = get_eoi_gsi(ioapic, vector); | ||
| 289 | if (gsi == -1) { | ||
| 290 | printk(KERN_WARNING "Can't find redir item for %d EOI\n", | ||
| 291 | vector); | ||
| 292 | return; | ||
| 293 | } | ||
| 294 | 275 | ||
| 295 | ent = &ioapic->redirtbl[gsi]; | 276 | ent = &ioapic->redirtbl[gsi]; |
| 296 | ASSERT(ent->fields.trig_mode == IOAPIC_LEVEL_TRIG); | 277 | ASSERT(ent->fields.trig_mode == IOAPIC_LEVEL_TRIG); |
| @@ -300,6 +281,16 @@ void kvm_ioapic_update_eoi(struct kvm *kvm, int vector) | |||
| 300 | ioapic_deliver(ioapic, gsi); | 281 | ioapic_deliver(ioapic, gsi); |
| 301 | } | 282 | } |
| 302 | 283 | ||
| 284 | void kvm_ioapic_update_eoi(struct kvm *kvm, int vector) | ||
| 285 | { | ||
| 286 | struct kvm_ioapic *ioapic = kvm->arch.vioapic; | ||
| 287 | int i; | ||
| 288 | |||
| 289 | for (i = 0; i < IOAPIC_NUM_PINS; i++) | ||
| 290 | if (ioapic->redirtbl[i].fields.vector == vector) | ||
| 291 | __kvm_ioapic_update_eoi(ioapic, i); | ||
| 292 | } | ||
| 293 | |||
| 303 | static int ioapic_in_range(struct kvm_io_device *this, gpa_t addr) | 294 | static int ioapic_in_range(struct kvm_io_device *this, gpa_t addr) |
| 304 | { | 295 | { |
| 305 | struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private; | 296 | struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private; |