diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 01:34:26 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 01:34:26 -0500 |
| commit | 27a0464a6cb837d3a90b6e69365dfc01cb0dff2f (patch) | |
| tree | 361f00f4d4ad4c01b6144c52004bee2b948742ad | |
| parent | 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 (diff) | |
| parent | 3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff) | |
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/xfs_rename.c
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
274 files changed, 4383 insertions, 2791 deletions
diff --git a/Documentation/arm/mem_alignment b/Documentation/arm/mem_alignment index d145ccca169a..c7c7a114c78c 100644 --- a/Documentation/arm/mem_alignment +++ b/Documentation/arm/mem_alignment | |||
| @@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user | |||
| 24 | space, and might cause programs to fail unexpectedly. | 24 | space, and might cause programs to fail unexpectedly. |
| 25 | 25 | ||
| 26 | To change the alignment trap behavior, simply echo a number into | 26 | To change the alignment trap behavior, simply echo a number into |
| 27 | /proc/sys/debug/alignment. The number is made up from various bits: | 27 | /proc/cpu/alignment. The number is made up from various bits: |
| 28 | 28 | ||
| 29 | bit behavior when set | 29 | bit behavior when set |
| 30 | --- ----------------- | 30 | --- ----------------- |
diff --git a/Documentation/local_ops.txt b/Documentation/local_ops.txt index f4f8b1c6c8ba..23045b8b50f0 100644 --- a/Documentation/local_ops.txt +++ b/Documentation/local_ops.txt | |||
| @@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data) | |||
| 149 | int cpu; | 149 | int cpu; |
| 150 | 150 | ||
| 151 | /* Increment the counters */ | 151 | /* Increment the counters */ |
| 152 | on_each_cpu(test_each, NULL, 0, 1); | 152 | on_each_cpu(test_each, NULL, 1); |
| 153 | /* Read all the counters */ | 153 | /* Read all the counters */ |
| 154 | printk("Counters read from CPU %d\n", smp_processor_id()); | 154 | printk("Counters read from CPU %d\n", smp_processor_id()); |
| 155 | for_each_online_cpu(cpu) { | 155 | for_each_online_cpu(cpu) { |
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 3cd2ad958176..394d7d378dc7 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -1063,6 +1063,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1063 | 1063 | ||
| 1064 | STAC9227/9228/9229/927x | 1064 | STAC9227/9228/9229/927x |
| 1065 | ref Reference board | 1065 | ref Reference board |
| 1066 | ref-no-jd Reference board without HP/Mic jack detection | ||
| 1066 | 3stack D965 3stack | 1067 | 3stack D965 3stack |
| 1067 | 5stack D965 5stack + SPDIF | 1068 | 5stack D965 5stack + SPDIF |
| 1068 | dell-3stack Dell Dimension E520 | 1069 | dell-3stack Dell Dimension E520 |
| @@ -1076,6 +1077,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1076 | 1077 | ||
| 1077 | STAC92HD73* | 1078 | STAC92HD73* |
| 1078 | ref Reference board | 1079 | ref Reference board |
| 1080 | no-jd BIOS setup but without jack-detection | ||
| 1079 | dell-m6-amic Dell desktops/laptops with analog mics | 1081 | dell-m6-amic Dell desktops/laptops with analog mics |
| 1080 | dell-m6-dmic Dell desktops/laptops with digital mics | 1082 | dell-m6-dmic Dell desktops/laptops with digital mics |
| 1081 | dell-m6 Dell desktops/laptops with both type of mics | 1083 | dell-m6 Dell desktops/laptops with both type of mics |
diff --git a/Documentation/usb/gadget_serial.txt b/Documentation/usb/gadget_serial.txt index 9b22bd14c348..eac7df94d8e3 100644 --- a/Documentation/usb/gadget_serial.txt +++ b/Documentation/usb/gadget_serial.txt | |||
| @@ -114,11 +114,11 @@ modules. | |||
| 114 | Then you must load the gadget serial driver. To load it as an | 114 | Then you must load the gadget serial driver. To load it as an |
| 115 | ACM device (recommended for interoperability), do this: | 115 | ACM device (recommended for interoperability), do this: |
| 116 | 116 | ||
| 117 | modprobe g_serial use_acm=1 | 117 | modprobe g_serial |
| 118 | 118 | ||
| 119 | To load it as a vendor specific bulk in/out device, do this: | 119 | To load it as a vendor specific bulk in/out device, do this: |
| 120 | 120 | ||
| 121 | modprobe g_serial | 121 | modprobe g_serial use_acm=0 |
| 122 | 122 | ||
| 123 | This will also automatically load the underlying gadget peripheral | 123 | This will also automatically load the underlying gadget peripheral |
| 124 | controller driver. This must be done each time you reboot the gadget | 124 | controller driver. This must be done each time you reboot the gadget |
diff --git a/Documentation/usb/proc_usb_info.txt b/Documentation/usb/proc_usb_info.txt index 077e9032d0cd..fafcd4723260 100644 --- a/Documentation/usb/proc_usb_info.txt +++ b/Documentation/usb/proc_usb_info.txt | |||
| @@ -49,8 +49,10 @@ it and 002/048 sometime later. | |||
| 49 | 49 | ||
| 50 | These files can be read as binary data. The binary data consists | 50 | These files can be read as binary data. The binary data consists |
| 51 | of first the device descriptor, then the descriptors for each | 51 | of first the device descriptor, then the descriptors for each |
| 52 | configuration of the device. That information is also shown in | 52 | configuration of the device. Multi-byte fields in the device and |
| 53 | text form by the /proc/bus/usb/devices file, described later. | 53 | configuration descriptors, but not other descriptors, are converted |
| 54 | to host endianness by the kernel. This information is also shown | ||
| 55 | in text form by the /proc/bus/usb/devices file, described later. | ||
| 54 | 56 | ||
| 55 | These files may also be used to write user-level drivers for the USB | 57 | These files may also be used to write user-level drivers for the USB |
| 56 | devices. You would open the /proc/bus/usb/BBB/DDD file read/write, | 58 | devices. You would open the /proc/bus/usb/BBB/DDD file read/write, |
diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt index 2917ce4ffdc4..270481906dc8 100644 --- a/Documentation/usb/usbmon.txt +++ b/Documentation/usb/usbmon.txt | |||
| @@ -34,11 +34,12 @@ if usbmon is built into the kernel. | |||
| 34 | Verify that bus sockets are present. | 34 | Verify that bus sockets are present. |
| 35 | 35 | ||
| 36 | # ls /sys/kernel/debug/usbmon | 36 | # ls /sys/kernel/debug/usbmon |
| 37 | 0s 0t 0u 1s 1t 1u 2s 2t 2u 3s 3t 3u 4s 4t 4u | 37 | 0s 0u 1s 1t 1u 2s 2t 2u 3s 3t 3u 4s 4t 4u |
| 38 | # | 38 | # |
| 39 | 39 | ||
| 40 | Now you can choose to either use the sockets numbered '0' (to capture packets on | 40 | Now you can choose to either use the socket '0u' (to capture packets on all |
| 41 | all buses), and skip to step #3, or find the bus used by your device with step #2. | 41 | buses), and skip to step #3, or find the bus used by your device with step #2. |
| 42 | This allows to filter away annoying devices that talk continuously. | ||
| 42 | 43 | ||
| 43 | 2. Find which bus connects to the desired device | 44 | 2. Find which bus connects to the desired device |
| 44 | 45 | ||
| @@ -99,8 +100,9 @@ on the event type, but there is a set of words, common for all types. | |||
| 99 | 100 | ||
| 100 | Here is the list of words, from left to right: | 101 | Here is the list of words, from left to right: |
| 101 | 102 | ||
| 102 | - URB Tag. This is used to identify URBs is normally a kernel mode address | 103 | - URB Tag. This is used to identify URBs, and is normally an in-kernel address |
| 103 | of the URB structure in hexadecimal. | 104 | of the URB structure in hexadecimal, but can be a sequence number or any |
| 105 | other unique string, within reason. | ||
| 104 | 106 | ||
| 105 | - Timestamp in microseconds, a decimal number. The timestamp's resolution | 107 | - Timestamp in microseconds, a decimal number. The timestamp's resolution |
| 106 | depends on available clock, and so it can be much worse than a microsecond | 108 | depends on available clock, and so it can be much worse than a microsecond |
diff --git a/MAINTAINERS b/MAINTAINERS index 8f2b67ea0549..c42a567e010c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1527,10 +1527,10 @@ W: http://ebtables.sourceforge.net/ | |||
| 1527 | S: Maintained | 1527 | S: Maintained |
| 1528 | 1528 | ||
| 1529 | ECRYPT FILE SYSTEM | 1529 | ECRYPT FILE SYSTEM |
| 1530 | P: Mike Halcrow, Phillip Hellewell | 1530 | P: Tyler Hicks, Dustin Kirkland |
| 1531 | M: mhalcrow@us.ibm.com, phillip@hellewell.homeip.net | 1531 | M: tyhicks@linux.vnet.ibm.com, kirkland@canonical.com |
| 1532 | L: ecryptfs-devel@lists.sourceforge.net | 1532 | L: ecryptfs-devel@lists.launchpad.net |
| 1533 | W: http://ecryptfs.sourceforge.net/ | 1533 | W: https://launchpad.net/ecryptfs |
| 1534 | S: Supported | 1534 | S: Supported |
| 1535 | 1535 | ||
| 1536 | EDAC-CORE | 1536 | EDAC-CORE |
| @@ -2191,9 +2191,9 @@ S: Supported | |||
| 2191 | 2191 | ||
| 2192 | INOTIFY | 2192 | INOTIFY |
| 2193 | P: John McCutchan | 2193 | P: John McCutchan |
| 2194 | M: ttb@tentacle.dhs.org | 2194 | M: john@johnmccutchan.com |
| 2195 | P: Robert Love | 2195 | P: Robert Love |
| 2196 | M: rml@novell.com | 2196 | M: rlove@rlove.org |
| 2197 | L: linux-kernel@vger.kernel.org | 2197 | L: linux-kernel@vger.kernel.org |
| 2198 | S: Maintained | 2198 | S: Maintained |
| 2199 | 2199 | ||
| @@ -3759,6 +3759,15 @@ M: drzeus-sdhci@drzeus.cx | |||
| 3759 | L: sdhci-devel@list.drzeus.cx | 3759 | L: sdhci-devel@list.drzeus.cx |
| 3760 | S: Maintained | 3760 | S: Maintained |
| 3761 | 3761 | ||
| 3762 | SECURITY SUBSYSTEM | ||
| 3763 | F: security/ | ||
| 3764 | P: James Morris | ||
| 3765 | M: jmorris@namei.org | ||
| 3766 | L: linux-kernel@vger.kernel.org | ||
| 3767 | L: linux-security-module@vger.kernel.org (suggested Cc:) | ||
| 3768 | T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git | ||
| 3769 | S: Supported | ||
| 3770 | |||
| 3762 | SECURITY CONTACT | 3771 | SECURITY CONTACT |
| 3763 | P: Security Officers | 3772 | P: Security Officers |
| 3764 | M: security@kernel.org | 3773 | M: security@kernel.org |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 28 | 3 | SUBLEVEL = 28 |
| 4 | EXTRAVERSION = -rc7 | 4 | EXTRAVERSION = -rc9 |
| 5 | NAME = Erotic Pickled Herring | 5 | NAME = Erotic Pickled Herring |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 47ccec95f3e8..ef12794c3c68 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -630,7 +630,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) | |||
| 630 | return -ENOMEM; | 630 | return -ENOMEM; |
| 631 | 631 | ||
| 632 | sachip->clk = clk_get(me, "SA1111_CLK"); | 632 | sachip->clk = clk_get(me, "SA1111_CLK"); |
| 633 | if (!sachip->clk) { | 633 | if (IS_ERR(sachip->clk)) { |
| 634 | ret = PTR_ERR(sachip->clk); | 634 | ret = PTR_ERR(sachip->clk); |
| 635 | goto err_free; | 635 | goto err_free; |
| 636 | } | 636 | } |
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index 9a1db20e032a..63a481fbbed4 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h | |||
| @@ -237,6 +237,7 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); | |||
| 237 | #if __LINUX_ARM_ARCH__ < 5 | 237 | #if __LINUX_ARM_ARCH__ < 5 |
| 238 | 238 | ||
| 239 | #include <asm-generic/bitops/ffz.h> | 239 | #include <asm-generic/bitops/ffz.h> |
| 240 | #include <asm-generic/bitops/__fls.h> | ||
| 240 | #include <asm-generic/bitops/__ffs.h> | 241 | #include <asm-generic/bitops/__ffs.h> |
| 241 | #include <asm-generic/bitops/fls.h> | 242 | #include <asm-generic/bitops/fls.h> |
| 242 | #include <asm-generic/bitops/ffs.h> | 243 | #include <asm-generic/bitops/ffs.h> |
| @@ -277,16 +278,19 @@ static inline int constant_fls(int x) | |||
| 277 | * the clz instruction for much better code efficiency. | 278 | * the clz instruction for much better code efficiency. |
| 278 | */ | 279 | */ |
| 279 | 280 | ||
| 280 | #define __fls(x) \ | ||
| 281 | ( __builtin_constant_p(x) ? constant_fls(x) : \ | ||
| 282 | ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) | ||
| 283 | |||
| 284 | /* Implement fls() in C so that 64-bit args are suitably truncated */ | ||
| 285 | static inline int fls(int x) | 281 | static inline int fls(int x) |
| 286 | { | 282 | { |
| 287 | return __fls(x); | 283 | int ret; |
| 284 | |||
| 285 | if (__builtin_constant_p(x)) | ||
| 286 | return constant_fls(x); | ||
| 287 | |||
| 288 | asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc"); | ||
| 289 | ret = 32 - ret; | ||
| 290 | return ret; | ||
| 288 | } | 291 | } |
| 289 | 292 | ||
| 293 | #define __fls(x) (fls(x) - 1) | ||
| 290 | #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) | 294 | #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) |
| 291 | #define __ffs(x) (ffs(x) - 1) | 295 | #define __ffs(x) (ffs(x) - 1) |
| 292 | #define ffz(x) __ffs( ~(x) ) | 296 | #define ffz(x) __ffs( ~(x) ) |
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 517a4d6ffc74..6ff33790f47b 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <asm/types.h> | 23 | #include <asm/types.h> |
| 24 | 24 | ||
| 25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
| 26 | #define STACK_TOP ((current->personality == PER_LINUX_32BIT) ? \ | 26 | #define STACK_TOP ((current->personality & ADDR_LIMIT_32BIT) ? \ |
| 27 | TASK_SIZE : TASK_SIZE_26) | 27 | TASK_SIZE : TASK_SIZE_26) |
| 28 | #define STACK_TOP_MAX TASK_SIZE | 28 | #define STACK_TOP_MAX TASK_SIZE |
| 29 | #endif | 29 | #endif |
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index c74f766ffc12..23af3c972c9a 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
| @@ -115,6 +115,8 @@ EXPORT_SYMBOL(__strnlen_user); | |||
| 115 | EXPORT_SYMBOL(__strncpy_from_user); | 115 | EXPORT_SYMBOL(__strncpy_from_user); |
| 116 | 116 | ||
| 117 | #ifdef CONFIG_MMU | 117 | #ifdef CONFIG_MMU |
| 118 | EXPORT_SYMBOL(copy_page); | ||
| 119 | |||
| 118 | EXPORT_SYMBOL(__copy_from_user); | 120 | EXPORT_SYMBOL(__copy_from_user); |
| 119 | EXPORT_SYMBOL(__copy_to_user); | 121 | EXPORT_SYMBOL(__copy_to_user); |
| 120 | EXPORT_SYMBOL(__clear_user); | 122 | EXPORT_SYMBOL(__clear_user); |
| @@ -181,8 +183,6 @@ EXPORT_SYMBOL(_find_first_bit_be); | |||
| 181 | EXPORT_SYMBOL(_find_next_bit_be); | 183 | EXPORT_SYMBOL(_find_next_bit_be); |
| 182 | #endif | 184 | #endif |
| 183 | 185 | ||
| 184 | EXPORT_SYMBOL(copy_page); | ||
| 185 | |||
| 186 | #ifdef CONFIG_FUNCTION_TRACER | 186 | #ifdef CONFIG_FUNCTION_TRACER |
| 187 | EXPORT_SYMBOL(mcount); | 187 | EXPORT_SYMBOL(mcount); |
| 188 | #endif | 188 | #endif |
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 57e6874d0b80..79abc4ddc0cf 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/personality.h> | 18 | #include <linux/personality.h> |
| 19 | #include <linux/kallsyms.h> | 19 | #include <linux/kallsyms.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/hardirq.h> | ||
| 21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 22 | #include <linux/uaccess.h> | 23 | #include <linux/uaccess.h> |
| 23 | 24 | ||
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index b3bd8ca85118..4c3e582f3d3c 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c | |||
| @@ -128,7 +128,7 @@ void __init omap1_map_common_io(void) | |||
| 128 | * Common low-level hardware init for omap1. This should only get called from | 128 | * Common low-level hardware init for omap1. This should only get called from |
| 129 | * board specific init. | 129 | * board specific init. |
| 130 | */ | 130 | */ |
| 131 | void __init omap1_init_common_hw() | 131 | void __init omap1_init_common_hw(void) |
| 132 | { | 132 | { |
| 133 | /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort | 133 | /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort |
| 134 | * on a Posted Write in the TIPB Bridge". | 134 | * on a Posted Write in the TIPB Bridge". |
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h index 7b8842cfa5fc..31e6a7b6ad80 100644 --- a/arch/arm/mach-pxa/include/mach/reset.h +++ b/arch/arm/mach-pxa/include/mach/reset.h | |||
| @@ -12,9 +12,8 @@ extern void clear_reset_status(unsigned int mask); | |||
| 12 | 12 | ||
| 13 | /** | 13 | /** |
| 14 | * init_gpio_reset() - register GPIO as reset generator | 14 | * init_gpio_reset() - register GPIO as reset generator |
| 15 | * | 15 | * @gpio: gpio nr |
| 16 | * @gpio - gpio nr | 16 | * @output: set gpio as out/low instead of input during normal work |
| 17 | * @output - set gpio as out/low instead of input during normal work | ||
| 18 | */ | 17 | */ |
| 19 | extern int init_gpio_reset(int gpio, int output); | 18 | extern int init_gpio_reset(int gpio, int output); |
| 20 | 19 | ||
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 133e65d166b3..2d5884ce0435 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
| @@ -70,6 +70,10 @@ static unsigned long ai_dword; | |||
| 70 | static unsigned long ai_multi; | 70 | static unsigned long ai_multi; |
| 71 | static int ai_usermode; | 71 | static int ai_usermode; |
| 72 | 72 | ||
| 73 | #define UM_WARN (1 << 0) | ||
| 74 | #define UM_FIXUP (1 << 1) | ||
| 75 | #define UM_SIGNAL (1 << 2) | ||
| 76 | |||
| 73 | #ifdef CONFIG_PROC_FS | 77 | #ifdef CONFIG_PROC_FS |
| 74 | static const char *usermode_action[] = { | 78 | static const char *usermode_action[] = { |
| 75 | "ignored", | 79 | "ignored", |
| @@ -754,7 +758,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
| 754 | user: | 758 | user: |
| 755 | ai_user += 1; | 759 | ai_user += 1; |
| 756 | 760 | ||
| 757 | if (ai_usermode & 1) | 761 | if (ai_usermode & UM_WARN) |
| 758 | printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx " | 762 | printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx " |
| 759 | "Address=0x%08lx FSR 0x%03x\n", current->comm, | 763 | "Address=0x%08lx FSR 0x%03x\n", current->comm, |
| 760 | task_pid_nr(current), instrptr, | 764 | task_pid_nr(current), instrptr, |
| @@ -762,10 +766,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
| 762 | thumb_mode(regs) ? tinstr : instr, | 766 | thumb_mode(regs) ? tinstr : instr, |
| 763 | addr, fsr); | 767 | addr, fsr); |
| 764 | 768 | ||
| 765 | if (ai_usermode & 2) | 769 | if (ai_usermode & UM_FIXUP) |
| 766 | goto fixup; | 770 | goto fixup; |
| 767 | 771 | ||
| 768 | if (ai_usermode & 4) | 772 | if (ai_usermode & UM_SIGNAL) |
| 769 | force_sig(SIGBUS, current); | 773 | force_sig(SIGBUS, current); |
| 770 | else | 774 | else |
| 771 | set_cr(cr_no_alignment); | 775 | set_cr(cr_no_alignment); |
| @@ -796,6 +800,22 @@ static int __init alignment_init(void) | |||
| 796 | res->write_proc = proc_alignment_write; | 800 | res->write_proc = proc_alignment_write; |
| 797 | #endif | 801 | #endif |
| 798 | 802 | ||
| 803 | /* | ||
| 804 | * ARMv6 and later CPUs can perform unaligned accesses for | ||
| 805 | * most single load and store instructions up to word size. | ||
| 806 | * LDM, STM, LDRD and STRD still need to be handled. | ||
| 807 | * | ||
| 808 | * Ignoring the alignment fault is not an option on these | ||
| 809 | * CPUs since we spin re-faulting the instruction without | ||
| 810 | * making any progress. | ||
| 811 | */ | ||
| 812 | if (cpu_architecture() >= CPU_ARCH_ARMv6 && (cr_alignment & CR_U)) { | ||
| 813 | cr_alignment &= ~CR_A; | ||
| 814 | cr_no_alignment &= ~CR_A; | ||
| 815 | set_cr(cr_alignment); | ||
| 816 | ai_usermode = UM_FIXUP; | ||
| 817 | } | ||
| 818 | |||
| 799 | hook_fault_code(1, do_alignment, SIGILL, "alignment exception"); | 819 | hook_fault_code(1, do_alignment, SIGILL, "alignment exception"); |
| 800 | hook_fault_code(3, do_alignment, SIGILL, "alignment exception"); | 820 | hook_fault_code(3, do_alignment, SIGILL, "alignment exception"); |
| 801 | 821 | ||
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 2df8d9facf57..22c9530e91e2 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/hardirq.h> | ||
| 14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 15 | #include <linux/kprobes.h> | 16 | #include <linux/kprobes.h> |
| 16 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |
diff --git a/arch/arm/plat-omap/include/mach/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h index ec67fb428607..7b74d1255e0b 100644 --- a/arch/arm/plat-omap/include/mach/omapfb.h +++ b/arch/arm/plat-omap/include/mach/omapfb.h | |||
| @@ -353,8 +353,8 @@ struct omapfb_device { | |||
| 353 | u32 pseudo_palette[17]; | 353 | u32 pseudo_palette[17]; |
| 354 | 354 | ||
| 355 | struct lcd_panel *panel; /* LCD panel */ | 355 | struct lcd_panel *panel; /* LCD panel */ |
| 356 | struct lcd_ctrl *ctrl; /* LCD controller */ | 356 | const struct lcd_ctrl *ctrl; /* LCD controller */ |
| 357 | struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ | 357 | const struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ |
| 358 | struct lcd_ctrl_extif *ext_if; /* LCD ctrl external | 358 | struct lcd_ctrl_extif *ext_if; /* LCD ctrl external |
| 359 | interface */ | 359 | interface */ |
| 360 | struct device *dev; | 360 | struct device *dev; |
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 9f9a921829c0..dcd9d16da2e9 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
| @@ -255,7 +255,7 @@ void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl) | |||
| 255 | if (!_omap_sram_reprogram_clock) | 255 | if (!_omap_sram_reprogram_clock) |
| 256 | omap_sram_error(); | 256 | omap_sram_error(); |
| 257 | 257 | ||
| 258 | return _omap_sram_reprogram_clock(dpllctl, ckctl); | 258 | _omap_sram_reprogram_clock(dpllctl, ckctl); |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | int __init omap1_sram_init(void) | 261 | int __init omap1_sram_init(void) |
| @@ -282,8 +282,8 @@ void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, | |||
| 282 | if (!_omap2_sram_ddr_init) | 282 | if (!_omap2_sram_ddr_init) |
| 283 | omap_sram_error(); | 283 | omap_sram_error(); |
| 284 | 284 | ||
| 285 | return _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, | 285 | _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, |
| 286 | base_cs, force_unlock); | 286 | base_cs, force_unlock); |
| 287 | } | 287 | } |
| 288 | 288 | ||
| 289 | static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val, | 289 | static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val, |
| @@ -294,7 +294,7 @@ void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type) | |||
| 294 | if (!_omap2_sram_reprogram_sdrc) | 294 | if (!_omap2_sram_reprogram_sdrc) |
| 295 | omap_sram_error(); | 295 | omap_sram_error(); |
| 296 | 296 | ||
| 297 | return _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); | 297 | _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); | 300 | static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); |
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c index 883902fead89..d41d41d78ad9 100644 --- a/arch/arm/plat-orion/pcie.c +++ b/arch/arm/plat-orion/pcie.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #define PCIE_CONF_REG(r) ((((r) & 0xf00) << 16) | ((r) & 0xfc)) | 35 | #define PCIE_CONF_REG(r) ((((r) & 0xf00) << 16) | ((r) & 0xfc)) |
| 36 | #define PCIE_CONF_BUS(b) (((b) & 0xff) << 16) | 36 | #define PCIE_CONF_BUS(b) (((b) & 0xff) << 16) |
| 37 | #define PCIE_CONF_DEV(d) (((d) & 0x1f) << 11) | 37 | #define PCIE_CONF_DEV(d) (((d) & 0x1f) << 11) |
| 38 | #define PCIE_CONF_FUNC(f) (((f) & 0x3) << 8) | 38 | #define PCIE_CONF_FUNC(f) (((f) & 0x7) << 8) |
| 39 | #define PCIE_CONF_DATA_OFF 0x18fc | 39 | #define PCIE_CONF_DATA_OFF 0x18fc |
| 40 | #define PCIE_MASK_OFF 0x1910 | 40 | #define PCIE_MASK_OFF 0x1910 |
| 41 | #define PCIE_CTRL_OFF 0x1a00 | 41 | #define PCIE_CTRL_OFF 0x1a00 |
diff --git a/arch/avr32/boards/favr-32/flash.c b/arch/avr32/boards/favr-32/flash.c index 5f139b7cb5f7..604bbd5e41d9 100644 --- a/arch/avr32/boards/favr-32/flash.c +++ b/arch/avr32/boards/favr-32/flash.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/mtd/partitions.h> | 13 | #include <linux/mtd/partitions.h> |
| 14 | #include <linux/mtd/physmap.h> | 14 | #include <linux/mtd/physmap.h> |
| 15 | 15 | ||
| 16 | #include <asm/arch/smc.h> | 16 | #include <mach/smc.h> |
| 17 | 17 | ||
| 18 | static struct smc_timing flash_timing __initdata = { | 18 | static struct smc_timing flash_timing __initdata = { |
| 19 | .ncs_read_setup = 0, | 19 | .ncs_read_setup = 0, |
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c index 7538f3d2b9e0..1ee4faf0742d 100644 --- a/arch/avr32/boards/favr-32/setup.c +++ b/arch/avr32/boards/favr-32/setup.c | |||
| @@ -25,10 +25,10 @@ | |||
| 25 | 25 | ||
| 26 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
| 27 | 27 | ||
| 28 | #include <asm/arch/at32ap700x.h> | 28 | #include <mach/at32ap700x.h> |
| 29 | #include <asm/arch/init.h> | 29 | #include <mach/init.h> |
| 30 | #include <asm/arch/board.h> | 30 | #include <mach/board.h> |
| 31 | #include <asm/arch/portmux.h> | 31 | #include <mach/portmux.h> |
| 32 | 32 | ||
| 33 | /* Oscillator frequencies. These are board-specific */ | 33 | /* Oscillator frequencies. These are board-specific */ |
| 34 | unsigned long at32_board_osc_rates[3] = { | 34 | unsigned long at32_board_osc_rates[3] = { |
diff --git a/arch/avr32/boot/images/Makefile b/arch/avr32/boot/images/Makefile index 219720a47bf9..1848bf0d7f62 100644 --- a/arch/avr32/boot/images/Makefile +++ b/arch/avr32/boot/images/Makefile | |||
| @@ -10,7 +10,7 @@ MKIMAGE := $(srctree)/scripts/mkuboot.sh | |||
| 10 | 10 | ||
| 11 | extra-y := vmlinux.bin vmlinux.gz | 11 | extra-y := vmlinux.bin vmlinux.gz |
| 12 | 12 | ||
| 13 | OBJCOPYFLAGS_vmlinux.bin := -O binary | 13 | OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note.gnu.build-id |
| 14 | $(obj)/vmlinux.bin: vmlinux FORCE | 14 | $(obj)/vmlinux.bin: vmlinux FORCE |
| 15 | $(call if_changed,objcopy) | 15 | $(call if_changed,objcopy) |
| 16 | 16 | ||
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig index 8b6e54c9946a..6c45a3b77aa3 100644 --- a/arch/avr32/configs/atstk1006_defconfig +++ b/arch/avr32/configs/atstk1006_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc1 | 3 | # Linux kernel version: 2.6.28-rc8 |
| 4 | # Tue Aug 5 15:40:26 2008 | 4 | # Thu Dec 18 11:22:23 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
| 7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
| @@ -67,6 +67,7 @@ CONFIG_SIGNALFD=y | |||
| 67 | CONFIG_TIMERFD=y | 67 | CONFIG_TIMERFD=y |
| 68 | CONFIG_EVENTFD=y | 68 | CONFIG_EVENTFD=y |
| 69 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
| 70 | CONFIG_AIO=y | ||
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 71 | CONFIG_VM_EVENT_COUNTERS=y |
| 71 | CONFIG_SLUB_DEBUG=y | 72 | CONFIG_SLUB_DEBUG=y |
| 72 | # CONFIG_SLAB is not set | 73 | # CONFIG_SLAB is not set |
| @@ -77,15 +78,8 @@ CONFIG_PROFILING=y | |||
| 77 | CONFIG_OPROFILE=m | 78 | CONFIG_OPROFILE=m |
| 78 | CONFIG_HAVE_OPROFILE=y | 79 | CONFIG_HAVE_OPROFILE=y |
| 79 | CONFIG_KPROBES=y | 80 | CONFIG_KPROBES=y |
| 80 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 81 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 82 | CONFIG_HAVE_KPROBES=y | 81 | CONFIG_HAVE_KPROBES=y |
| 83 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 84 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 85 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 86 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 87 | CONFIG_HAVE_CLK=y | 82 | CONFIG_HAVE_CLK=y |
| 88 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 89 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 83 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 90 | CONFIG_SLABINFO=y | 84 | CONFIG_SLABINFO=y |
| 91 | CONFIG_RT_MUTEXES=y | 85 | CONFIG_RT_MUTEXES=y |
| @@ -118,6 +112,7 @@ CONFIG_DEFAULT_CFQ=y | |||
| 118 | # CONFIG_DEFAULT_NOOP is not set | 112 | # CONFIG_DEFAULT_NOOP is not set |
| 119 | CONFIG_DEFAULT_IOSCHED="cfq" | 113 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 120 | CONFIG_CLASSIC_RCU=y | 114 | CONFIG_CLASSIC_RCU=y |
| 115 | CONFIG_FREEZER=y | ||
| 121 | 116 | ||
| 122 | # | 117 | # |
| 123 | # System Type and features | 118 | # System Type and features |
| @@ -134,6 +129,8 @@ CONFIG_CPU_AT32AP700X=y | |||
| 134 | CONFIG_CPU_AT32AP7000=y | 129 | CONFIG_CPU_AT32AP7000=y |
| 135 | CONFIG_BOARD_ATSTK1000=y | 130 | CONFIG_BOARD_ATSTK1000=y |
| 136 | # CONFIG_BOARD_ATNGW100 is not set | 131 | # CONFIG_BOARD_ATNGW100 is not set |
| 132 | # CONFIG_BOARD_FAVR_32 is not set | ||
| 133 | # CONFIG_BOARD_MIMC200 is not set | ||
| 137 | # CONFIG_BOARD_ATSTK1002 is not set | 134 | # CONFIG_BOARD_ATSTK1002 is not set |
| 138 | # CONFIG_BOARD_ATSTK1003 is not set | 135 | # CONFIG_BOARD_ATSTK1003 is not set |
| 139 | # CONFIG_BOARD_ATSTK1004 is not set | 136 | # CONFIG_BOARD_ATSTK1004 is not set |
| @@ -171,14 +168,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 171 | # CONFIG_SPARSEMEM_MANUAL is not set | 168 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 172 | CONFIG_FLATMEM=y | 169 | CONFIG_FLATMEM=y |
| 173 | CONFIG_FLAT_NODE_MEM_MAP=y | 170 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 174 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 175 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 176 | CONFIG_PAGEFLAGS_EXTENDED=y | 171 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 177 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 178 | # CONFIG_RESOURCES_64BIT is not set | 173 | # CONFIG_RESOURCES_64BIT is not set |
| 174 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 179 | CONFIG_ZONE_DMA_FLAG=0 | 175 | CONFIG_ZONE_DMA_FLAG=0 |
| 180 | CONFIG_NR_QUICK=2 | 176 | CONFIG_NR_QUICK=2 |
| 181 | CONFIG_VIRT_TO_BUS=y | 177 | CONFIG_VIRT_TO_BUS=y |
| 178 | CONFIG_UNEVICTABLE_LRU=y | ||
| 182 | # CONFIG_OWNERSHIP_TRACE is not set | 179 | # CONFIG_OWNERSHIP_TRACE is not set |
| 183 | CONFIG_NMI_DEBUGGING=y | 180 | CONFIG_NMI_DEBUGGING=y |
| 184 | # CONFIG_HZ_100 is not set | 181 | # CONFIG_HZ_100 is not set |
| @@ -186,7 +183,7 @@ CONFIG_HZ_250=y | |||
| 186 | # CONFIG_HZ_300 is not set | 183 | # CONFIG_HZ_300 is not set |
| 187 | # CONFIG_HZ_1000 is not set | 184 | # CONFIG_HZ_1000 is not set |
| 188 | CONFIG_HZ=250 | 185 | CONFIG_HZ=250 |
| 189 | # CONFIG_SCHED_HRTICK is not set | 186 | CONFIG_SCHED_HRTICK=y |
| 190 | CONFIG_CMDLINE="" | 187 | CONFIG_CMDLINE="" |
| 191 | 188 | ||
| 192 | # | 189 | # |
| @@ -228,6 +225,8 @@ CONFIG_CPU_FREQ_AT32AP=y | |||
| 228 | # Executable file formats | 225 | # Executable file formats |
| 229 | # | 226 | # |
| 230 | CONFIG_BINFMT_ELF=y | 227 | CONFIG_BINFMT_ELF=y |
| 228 | CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y | ||
| 229 | # CONFIG_HAVE_AOUT is not set | ||
| 231 | # CONFIG_BINFMT_MISC is not set | 230 | # CONFIG_BINFMT_MISC is not set |
| 232 | CONFIG_NET=y | 231 | CONFIG_NET=y |
| 233 | 232 | ||
| @@ -299,6 +298,7 @@ CONFIG_IPV6_TUNNEL=m | |||
| 299 | # CONFIG_ATM is not set | 298 | # CONFIG_ATM is not set |
| 300 | CONFIG_STP=m | 299 | CONFIG_STP=m |
| 301 | CONFIG_BRIDGE=m | 300 | CONFIG_BRIDGE=m |
| 301 | # CONFIG_NET_DSA is not set | ||
| 302 | # CONFIG_VLAN_8021Q is not set | 302 | # CONFIG_VLAN_8021Q is not set |
| 303 | # CONFIG_DECNET is not set | 303 | # CONFIG_DECNET is not set |
| 304 | CONFIG_LLC=m | 304 | CONFIG_LLC=m |
| @@ -321,14 +321,8 @@ CONFIG_LLC=m | |||
| 321 | # CONFIG_IRDA is not set | 321 | # CONFIG_IRDA is not set |
| 322 | # CONFIG_BT is not set | 322 | # CONFIG_BT is not set |
| 323 | # CONFIG_AF_RXRPC is not set | 323 | # CONFIG_AF_RXRPC is not set |
| 324 | 324 | # CONFIG_PHONET is not set | |
| 325 | # | 325 | # CONFIG_WIRELESS is not set |
| 326 | # Wireless | ||
| 327 | # | ||
| 328 | # CONFIG_CFG80211 is not set | ||
| 329 | # CONFIG_WIRELESS_EXT is not set | ||
| 330 | # CONFIG_MAC80211 is not set | ||
| 331 | # CONFIG_IEEE80211 is not set | ||
| 332 | # CONFIG_RFKILL is not set | 326 | # CONFIG_RFKILL is not set |
| 333 | # CONFIG_NET_9P is not set | 327 | # CONFIG_NET_9P is not set |
| 334 | 328 | ||
| @@ -359,6 +353,7 @@ CONFIG_MTD_CMDLINE_PARTS=y | |||
| 359 | # User Modules And Translation Layers | 353 | # User Modules And Translation Layers |
| 360 | # | 354 | # |
| 361 | CONFIG_MTD_CHAR=y | 355 | CONFIG_MTD_CHAR=y |
| 356 | CONFIG_HAVE_MTD_OTP=y | ||
| 362 | CONFIG_MTD_BLKDEVS=y | 357 | CONFIG_MTD_BLKDEVS=y |
| 363 | CONFIG_MTD_BLOCK=y | 358 | CONFIG_MTD_BLOCK=y |
| 364 | # CONFIG_FTL is not set | 359 | # CONFIG_FTL is not set |
| @@ -407,6 +402,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 407 | # Self-contained MTD device drivers | 402 | # Self-contained MTD device drivers |
| 408 | # | 403 | # |
| 409 | CONFIG_MTD_DATAFLASH=m | 404 | CONFIG_MTD_DATAFLASH=m |
| 405 | # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set | ||
| 406 | CONFIG_MTD_DATAFLASH_OTP=y | ||
| 410 | CONFIG_MTD_M25P80=m | 407 | CONFIG_MTD_M25P80=m |
| 411 | CONFIG_M25PXX_USE_FAST_READ=y | 408 | CONFIG_M25PXX_USE_FAST_READ=y |
| 412 | # CONFIG_MTD_SLRAM is not set | 409 | # CONFIG_MTD_SLRAM is not set |
| @@ -464,9 +461,10 @@ CONFIG_ATMEL_TCLIB=y | |||
| 464 | CONFIG_ATMEL_TCB_CLKSRC=y | 461 | CONFIG_ATMEL_TCB_CLKSRC=y |
| 465 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | 462 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 |
| 466 | # CONFIG_EEPROM_93CX6 is not set | 463 | # CONFIG_EEPROM_93CX6 is not set |
| 464 | # CONFIG_ICS932S401 is not set | ||
| 467 | CONFIG_ATMEL_SSC=m | 465 | CONFIG_ATMEL_SSC=m |
| 468 | # CONFIG_ENCLOSURE_SERVICES is not set | 466 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 469 | # CONFIG_HAVE_IDE is not set | 467 | # CONFIG_C2PORT is not set |
| 470 | 468 | ||
| 471 | # | 469 | # |
| 472 | # SCSI device support | 470 | # SCSI device support |
| @@ -548,6 +546,9 @@ CONFIG_MACB=y | |||
| 548 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 546 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 549 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 547 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 550 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 548 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 549 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 550 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 551 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 551 | # CONFIG_B44 is not set | 552 | # CONFIG_B44 is not set |
| 552 | # CONFIG_NETDEV_1000 is not set | 553 | # CONFIG_NETDEV_1000 is not set |
| 553 | # CONFIG_NETDEV_10000 is not set | 554 | # CONFIG_NETDEV_10000 is not set |
| @@ -653,6 +654,7 @@ CONFIG_UNIX98_PTYS=y | |||
| 653 | CONFIG_I2C=m | 654 | CONFIG_I2C=m |
| 654 | CONFIG_I2C_BOARDINFO=y | 655 | CONFIG_I2C_BOARDINFO=y |
| 655 | CONFIG_I2C_CHARDEV=m | 656 | CONFIG_I2C_CHARDEV=m |
| 657 | CONFIG_I2C_HELPER_AUTO=y | ||
| 656 | CONFIG_I2C_ALGOBIT=m | 658 | CONFIG_I2C_ALGOBIT=m |
| 657 | 659 | ||
| 658 | # | 660 | # |
| @@ -717,6 +719,10 @@ CONFIG_GPIOLIB=y | |||
| 717 | CONFIG_GPIO_SYSFS=y | 719 | CONFIG_GPIO_SYSFS=y |
| 718 | 720 | ||
| 719 | # | 721 | # |
| 722 | # Memory mapped GPIO expanders: | ||
| 723 | # | ||
| 724 | |||
| 725 | # | ||
| 720 | # I2C GPIO expanders: | 726 | # I2C GPIO expanders: |
| 721 | # | 727 | # |
| 722 | # CONFIG_GPIO_MAX732X is not set | 728 | # CONFIG_GPIO_MAX732X is not set |
| @@ -745,11 +751,11 @@ CONFIG_WATCHDOG=y | |||
| 745 | # | 751 | # |
| 746 | # CONFIG_SOFT_WATCHDOG is not set | 752 | # CONFIG_SOFT_WATCHDOG is not set |
| 747 | CONFIG_AT32AP700X_WDT=y | 753 | CONFIG_AT32AP700X_WDT=y |
| 754 | CONFIG_SSB_POSSIBLE=y | ||
| 748 | 755 | ||
| 749 | # | 756 | # |
| 750 | # Sonics Silicon Backplane | 757 | # Sonics Silicon Backplane |
| 751 | # | 758 | # |
| 752 | CONFIG_SSB_POSSIBLE=y | ||
| 753 | # CONFIG_SSB is not set | 759 | # CONFIG_SSB is not set |
| 754 | 760 | ||
| 755 | # | 761 | # |
| @@ -758,6 +764,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 758 | # CONFIG_MFD_CORE is not set | 764 | # CONFIG_MFD_CORE is not set |
| 759 | # CONFIG_MFD_SM501 is not set | 765 | # CONFIG_MFD_SM501 is not set |
| 760 | # CONFIG_HTC_PASIC3 is not set | 766 | # CONFIG_HTC_PASIC3 is not set |
| 767 | # CONFIG_MFD_TMIO is not set | ||
| 768 | # CONFIG_MFD_WM8400 is not set | ||
| 769 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 770 | # CONFIG_REGULATOR is not set | ||
| 761 | 771 | ||
| 762 | # | 772 | # |
| 763 | # Multimedia devices | 773 | # Multimedia devices |
| @@ -783,6 +793,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 783 | CONFIG_FB=y | 793 | CONFIG_FB=y |
| 784 | # CONFIG_FIRMWARE_EDID is not set | 794 | # CONFIG_FIRMWARE_EDID is not set |
| 785 | # CONFIG_FB_DDC is not set | 795 | # CONFIG_FB_DDC is not set |
| 796 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 786 | CONFIG_FB_CFB_FILLRECT=y | 797 | CONFIG_FB_CFB_FILLRECT=y |
| 787 | CONFIG_FB_CFB_COPYAREA=y | 798 | CONFIG_FB_CFB_COPYAREA=y |
| 788 | CONFIG_FB_CFB_IMAGEBLIT=y | 799 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -804,10 +815,13 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 804 | # CONFIG_FB_S1D13XXX is not set | 815 | # CONFIG_FB_S1D13XXX is not set |
| 805 | CONFIG_FB_ATMEL=y | 816 | CONFIG_FB_ATMEL=y |
| 806 | # CONFIG_FB_VIRTUAL is not set | 817 | # CONFIG_FB_VIRTUAL is not set |
| 818 | # CONFIG_FB_METRONOME is not set | ||
| 819 | # CONFIG_FB_MB862XX is not set | ||
| 807 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 820 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 808 | CONFIG_LCD_CLASS_DEVICE=y | 821 | CONFIG_LCD_CLASS_DEVICE=y |
| 809 | CONFIG_LCD_LTV350QV=y | 822 | CONFIG_LCD_LTV350QV=y |
| 810 | # CONFIG_LCD_ILI9320 is not set | 823 | # CONFIG_LCD_ILI9320 is not set |
| 824 | # CONFIG_LCD_TDO24M is not set | ||
| 811 | # CONFIG_LCD_VGG2432A4 is not set | 825 | # CONFIG_LCD_VGG2432A4 is not set |
| 812 | # CONFIG_LCD_PLATFORM is not set | 826 | # CONFIG_LCD_PLATFORM is not set |
| 813 | # CONFIG_BACKLIGHT_CLASS_DEVICE is not set | 827 | # CONFIG_BACKLIGHT_CLASS_DEVICE is not set |
| @@ -818,6 +832,7 @@ CONFIG_LCD_LTV350QV=y | |||
| 818 | # CONFIG_DISPLAY_SUPPORT is not set | 832 | # CONFIG_DISPLAY_SUPPORT is not set |
| 819 | # CONFIG_LOGO is not set | 833 | # CONFIG_LOGO is not set |
| 820 | CONFIG_SOUND=m | 834 | CONFIG_SOUND=m |
| 835 | CONFIG_SOUND_OSS_CORE=y | ||
| 821 | CONFIG_SND=m | 836 | CONFIG_SND=m |
| 822 | CONFIG_SND_TIMER=m | 837 | CONFIG_SND_TIMER=m |
| 823 | CONFIG_SND_PCM=m | 838 | CONFIG_SND_PCM=m |
| @@ -848,28 +863,32 @@ CONFIG_USB_SUPPORT=y | |||
| 848 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 863 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 849 | # CONFIG_USB_OTG_WHITELIST is not set | 864 | # CONFIG_USB_OTG_WHITELIST is not set |
| 850 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 865 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 866 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 867 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 851 | 868 | ||
| 852 | # | 869 | # |
| 853 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 870 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 854 | # | 871 | # |
| 855 | CONFIG_USB_GADGET=y | 872 | CONFIG_USB_GADGET=y |
| 856 | # CONFIG_USB_GADGET_DEBUG is not set | 873 | # CONFIG_USB_GADGET_DEBUG is not set |
| 857 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 874 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| 858 | # CONFIG_USB_GADGET_DEBUG_FS is not set | 875 | # CONFIG_USB_GADGET_DEBUG_FS is not set |
| 876 | CONFIG_USB_GADGET_VBUS_DRAW=2 | ||
| 859 | CONFIG_USB_GADGET_SELECTED=y | 877 | CONFIG_USB_GADGET_SELECTED=y |
| 860 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 878 | # CONFIG_USB_GADGET_AT91 is not set |
| 861 | CONFIG_USB_GADGET_ATMEL_USBA=y | 879 | CONFIG_USB_GADGET_ATMEL_USBA=y |
| 862 | CONFIG_USB_ATMEL_USBA=y | 880 | CONFIG_USB_ATMEL_USBA=y |
| 863 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 881 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
| 864 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 865 | # CONFIG_USB_GADGET_PXA25X is not set | ||
| 866 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 867 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 868 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 869 | # CONFIG_USB_GADGET_LH7A40X is not set | 882 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 870 | # CONFIG_USB_GADGET_OMAP is not set | 883 | # CONFIG_USB_GADGET_OMAP is not set |
| 884 | # CONFIG_USB_GADGET_PXA25X is not set | ||
| 885 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 871 | # CONFIG_USB_GADGET_S3C2410 is not set | 886 | # CONFIG_USB_GADGET_S3C2410 is not set |
| 872 | # CONFIG_USB_GADGET_AT91 is not set | 887 | # CONFIG_USB_GADGET_M66592 is not set |
| 888 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 889 | # CONFIG_USB_GADGET_FSL_QE is not set | ||
| 890 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 891 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 873 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 892 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
| 874 | CONFIG_USB_GADGET_DUALSPEED=y | 893 | CONFIG_USB_GADGET_DUALSPEED=y |
| 875 | CONFIG_USB_ZERO=m | 894 | CONFIG_USB_ZERO=m |
| @@ -887,7 +906,7 @@ CONFIG_MMC=y | |||
| 887 | # CONFIG_MMC_UNSAFE_RESUME is not set | 906 | # CONFIG_MMC_UNSAFE_RESUME is not set |
| 888 | 907 | ||
| 889 | # | 908 | # |
| 890 | # MMC/SD Card Drivers | 909 | # MMC/SD/SDIO Card Drivers |
| 891 | # | 910 | # |
| 892 | CONFIG_MMC_BLOCK=y | 911 | CONFIG_MMC_BLOCK=y |
| 893 | CONFIG_MMC_BLOCK_BOUNCE=y | 912 | CONFIG_MMC_BLOCK_BOUNCE=y |
| @@ -895,10 +914,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
| 895 | # CONFIG_MMC_TEST is not set | 914 | # CONFIG_MMC_TEST is not set |
| 896 | 915 | ||
| 897 | # | 916 | # |
| 898 | # MMC/SD Host Controller Drivers | 917 | # MMC/SD/SDIO Host Controller Drivers |
| 899 | # | 918 | # |
| 900 | # CONFIG_MMC_SDHCI is not set | 919 | # CONFIG_MMC_SDHCI is not set |
| 901 | CONFIG_MMC_ATMELMCI=y | 920 | CONFIG_MMC_ATMELMCI=y |
| 921 | # CONFIG_MMC_ATMELMCI_DMA is not set | ||
| 902 | CONFIG_MMC_SPI=m | 922 | CONFIG_MMC_SPI=m |
| 903 | # CONFIG_MEMSTICK is not set | 923 | # CONFIG_MEMSTICK is not set |
| 904 | CONFIG_NEW_LEDS=y | 924 | CONFIG_NEW_LEDS=y |
| @@ -918,6 +938,7 @@ CONFIG_LEDS_GPIO=m | |||
| 918 | CONFIG_LEDS_TRIGGERS=y | 938 | CONFIG_LEDS_TRIGGERS=y |
| 919 | CONFIG_LEDS_TRIGGER_TIMER=m | 939 | CONFIG_LEDS_TRIGGER_TIMER=m |
| 920 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 940 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
| 941 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
| 921 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | 942 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m |
| 922 | # CONFIG_ACCESSIBILITY is not set | 943 | # CONFIG_ACCESSIBILITY is not set |
| 923 | CONFIG_RTC_LIB=y | 944 | CONFIG_RTC_LIB=y |
| @@ -950,25 +971,31 @@ CONFIG_RTC_INTF_DEV=y | |||
| 950 | # CONFIG_RTC_DRV_M41T80 is not set | 971 | # CONFIG_RTC_DRV_M41T80 is not set |
| 951 | # CONFIG_RTC_DRV_S35390A is not set | 972 | # CONFIG_RTC_DRV_S35390A is not set |
| 952 | # CONFIG_RTC_DRV_FM3130 is not set | 973 | # CONFIG_RTC_DRV_FM3130 is not set |
| 974 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 953 | 975 | ||
| 954 | # | 976 | # |
| 955 | # SPI RTC drivers | 977 | # SPI RTC drivers |
| 956 | # | 978 | # |
| 957 | # CONFIG_RTC_DRV_M41T94 is not set | 979 | # CONFIG_RTC_DRV_M41T94 is not set |
| 958 | # CONFIG_RTC_DRV_DS1305 is not set | 980 | # CONFIG_RTC_DRV_DS1305 is not set |
| 981 | # CONFIG_RTC_DRV_DS1390 is not set | ||
| 959 | # CONFIG_RTC_DRV_MAX6902 is not set | 982 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 960 | # CONFIG_RTC_DRV_R9701 is not set | 983 | # CONFIG_RTC_DRV_R9701 is not set |
| 961 | # CONFIG_RTC_DRV_RS5C348 is not set | 984 | # CONFIG_RTC_DRV_RS5C348 is not set |
| 985 | # CONFIG_RTC_DRV_DS3234 is not set | ||
| 962 | 986 | ||
| 963 | # | 987 | # |
| 964 | # Platform RTC drivers | 988 | # Platform RTC drivers |
| 965 | # | 989 | # |
| 990 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 966 | # CONFIG_RTC_DRV_DS1511 is not set | 991 | # CONFIG_RTC_DRV_DS1511 is not set |
| 967 | # CONFIG_RTC_DRV_DS1553 is not set | 992 | # CONFIG_RTC_DRV_DS1553 is not set |
| 968 | # CONFIG_RTC_DRV_DS1742 is not set | 993 | # CONFIG_RTC_DRV_DS1742 is not set |
| 969 | # CONFIG_RTC_DRV_STK17TA8 is not set | 994 | # CONFIG_RTC_DRV_STK17TA8 is not set |
| 970 | # CONFIG_RTC_DRV_M48T86 is not set | 995 | # CONFIG_RTC_DRV_M48T86 is not set |
| 996 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 971 | # CONFIG_RTC_DRV_M48T59 is not set | 997 | # CONFIG_RTC_DRV_M48T59 is not set |
| 998 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 972 | # CONFIG_RTC_DRV_V3020 is not set | 999 | # CONFIG_RTC_DRV_V3020 is not set |
| 973 | 1000 | ||
| 974 | # | 1001 | # |
| @@ -989,6 +1016,8 @@ CONFIG_DMA_ENGINE=y | |||
| 989 | # CONFIG_NET_DMA is not set | 1016 | # CONFIG_NET_DMA is not set |
| 990 | CONFIG_DMATEST=m | 1017 | CONFIG_DMATEST=m |
| 991 | # CONFIG_UIO is not set | 1018 | # CONFIG_UIO is not set |
| 1019 | # CONFIG_STAGING is not set | ||
| 1020 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 992 | 1021 | ||
| 993 | # | 1022 | # |
| 994 | # File systems | 1023 | # File systems |
| @@ -998,12 +1027,17 @@ CONFIG_EXT2_FS=m | |||
| 998 | # CONFIG_EXT2_FS_XIP is not set | 1027 | # CONFIG_EXT2_FS_XIP is not set |
| 999 | CONFIG_EXT3_FS=m | 1028 | CONFIG_EXT3_FS=m |
| 1000 | # CONFIG_EXT3_FS_XATTR is not set | 1029 | # CONFIG_EXT3_FS_XATTR is not set |
| 1001 | # CONFIG_EXT4DEV_FS is not set | 1030 | CONFIG_EXT4_FS=m |
| 1031 | CONFIG_EXT4DEV_COMPAT=y | ||
| 1032 | # CONFIG_EXT4_FS_XATTR is not set | ||
| 1002 | CONFIG_JBD=m | 1033 | CONFIG_JBD=m |
| 1003 | # CONFIG_JBD_DEBUG is not set | 1034 | # CONFIG_JBD_DEBUG is not set |
| 1035 | CONFIG_JBD2=m | ||
| 1036 | # CONFIG_JBD2_DEBUG is not set | ||
| 1004 | # CONFIG_REISERFS_FS is not set | 1037 | # CONFIG_REISERFS_FS is not set |
| 1005 | # CONFIG_JFS_FS is not set | 1038 | # CONFIG_JFS_FS is not set |
| 1006 | # CONFIG_FS_POSIX_ACL is not set | 1039 | # CONFIG_FS_POSIX_ACL is not set |
| 1040 | CONFIG_FILE_LOCKING=y | ||
| 1007 | # CONFIG_XFS_FS is not set | 1041 | # CONFIG_XFS_FS is not set |
| 1008 | # CONFIG_OCFS2_FS is not set | 1042 | # CONFIG_OCFS2_FS is not set |
| 1009 | # CONFIG_DNOTIFY is not set | 1043 | # CONFIG_DNOTIFY is not set |
| @@ -1036,6 +1070,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1036 | CONFIG_PROC_FS=y | 1070 | CONFIG_PROC_FS=y |
| 1037 | CONFIG_PROC_KCORE=y | 1071 | CONFIG_PROC_KCORE=y |
| 1038 | CONFIG_PROC_SYSCTL=y | 1072 | CONFIG_PROC_SYSCTL=y |
| 1073 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1039 | CONFIG_SYSFS=y | 1074 | CONFIG_SYSFS=y |
| 1040 | CONFIG_TMPFS=y | 1075 | CONFIG_TMPFS=y |
| 1041 | # CONFIG_TMPFS_POSIX_ACL is not set | 1076 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -1054,7 +1089,8 @@ CONFIG_TMPFS=y | |||
| 1054 | # CONFIG_EFS_FS is not set | 1089 | # CONFIG_EFS_FS is not set |
| 1055 | CONFIG_JFFS2_FS=y | 1090 | CONFIG_JFFS2_FS=y |
| 1056 | CONFIG_JFFS2_FS_DEBUG=0 | 1091 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1057 | # CONFIG_JFFS2_FS_WRITEBUFFER is not set | 1092 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1093 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1058 | # CONFIG_JFFS2_SUMMARY is not set | 1094 | # CONFIG_JFFS2_SUMMARY is not set |
| 1059 | # CONFIG_JFFS2_FS_XATTR is not set | 1095 | # CONFIG_JFFS2_FS_XATTR is not set |
| 1060 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1096 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
| @@ -1088,6 +1124,7 @@ CONFIG_LOCKD=y | |||
| 1088 | CONFIG_LOCKD_V4=y | 1124 | CONFIG_LOCKD_V4=y |
| 1089 | CONFIG_NFS_COMMON=y | 1125 | CONFIG_NFS_COMMON=y |
| 1090 | CONFIG_SUNRPC=y | 1126 | CONFIG_SUNRPC=y |
| 1127 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1091 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1128 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1092 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1129 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1093 | # CONFIG_SMB_FS is not set | 1130 | # CONFIG_SMB_FS is not set |
| @@ -1185,10 +1222,21 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1185 | CONFIG_FRAME_POINTER=y | 1222 | CONFIG_FRAME_POINTER=y |
| 1186 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1223 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1187 | # CONFIG_RCU_TORTURE_TEST is not set | 1224 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1225 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1188 | # CONFIG_KPROBES_SANITY_TEST is not set | 1226 | # CONFIG_KPROBES_SANITY_TEST is not set |
| 1189 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1227 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1228 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1190 | # CONFIG_LKDTM is not set | 1229 | # CONFIG_LKDTM is not set |
| 1191 | # CONFIG_FAULT_INJECTION is not set | 1230 | # CONFIG_FAULT_INJECTION is not set |
| 1231 | |||
| 1232 | # | ||
| 1233 | # Tracers | ||
| 1234 | # | ||
| 1235 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1236 | # CONFIG_SCHED_TRACER is not set | ||
| 1237 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1238 | # CONFIG_BOOT_TRACER is not set | ||
| 1239 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1192 | # CONFIG_SAMPLES is not set | 1240 | # CONFIG_SAMPLES is not set |
| 1193 | 1241 | ||
| 1194 | # | 1242 | # |
| @@ -1196,17 +1244,26 @@ CONFIG_FRAME_POINTER=y | |||
| 1196 | # | 1244 | # |
| 1197 | # CONFIG_KEYS is not set | 1245 | # CONFIG_KEYS is not set |
| 1198 | # CONFIG_SECURITY is not set | 1246 | # CONFIG_SECURITY is not set |
| 1247 | # CONFIG_SECURITYFS is not set | ||
| 1199 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1248 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1200 | CONFIG_CRYPTO=y | 1249 | CONFIG_CRYPTO=y |
| 1201 | 1250 | ||
| 1202 | # | 1251 | # |
| 1203 | # Crypto core or helper | 1252 | # Crypto core or helper |
| 1204 | # | 1253 | # |
| 1254 | CONFIG_CRYPTO_FIPS=y | ||
| 1205 | CONFIG_CRYPTO_ALGAPI=y | 1255 | CONFIG_CRYPTO_ALGAPI=y |
| 1256 | CONFIG_CRYPTO_ALGAPI2=y | ||
| 1206 | CONFIG_CRYPTO_AEAD=m | 1257 | CONFIG_CRYPTO_AEAD=m |
| 1258 | CONFIG_CRYPTO_AEAD2=y | ||
| 1207 | CONFIG_CRYPTO_BLKCIPHER=m | 1259 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1260 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1208 | CONFIG_CRYPTO_HASH=m | 1261 | CONFIG_CRYPTO_HASH=m |
| 1262 | CONFIG_CRYPTO_HASH2=y | ||
| 1263 | CONFIG_CRYPTO_RNG=m | ||
| 1264 | CONFIG_CRYPTO_RNG2=y | ||
| 1209 | CONFIG_CRYPTO_MANAGER=m | 1265 | CONFIG_CRYPTO_MANAGER=m |
| 1266 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1210 | # CONFIG_CRYPTO_GF128MUL is not set | 1267 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1211 | # CONFIG_CRYPTO_NULL is not set | 1268 | # CONFIG_CRYPTO_NULL is not set |
| 1212 | # CONFIG_CRYPTO_CRYPTD is not set | 1269 | # CONFIG_CRYPTO_CRYPTD is not set |
| @@ -1257,7 +1314,7 @@ CONFIG_CRYPTO_SHA1=m | |||
| 1257 | # | 1314 | # |
| 1258 | # Ciphers | 1315 | # Ciphers |
| 1259 | # | 1316 | # |
| 1260 | # CONFIG_CRYPTO_AES is not set | 1317 | CONFIG_CRYPTO_AES=m |
| 1261 | # CONFIG_CRYPTO_ANUBIS is not set | 1318 | # CONFIG_CRYPTO_ANUBIS is not set |
| 1262 | # CONFIG_CRYPTO_ARC4 is not set | 1319 | # CONFIG_CRYPTO_ARC4 is not set |
| 1263 | # CONFIG_CRYPTO_BLOWFISH is not set | 1320 | # CONFIG_CRYPTO_BLOWFISH is not set |
| @@ -1278,14 +1335,17 @@ CONFIG_CRYPTO_DES=m | |||
| 1278 | # | 1335 | # |
| 1279 | CONFIG_CRYPTO_DEFLATE=y | 1336 | CONFIG_CRYPTO_DEFLATE=y |
| 1280 | CONFIG_CRYPTO_LZO=y | 1337 | CONFIG_CRYPTO_LZO=y |
| 1338 | |||
| 1339 | # | ||
| 1340 | # Random Number Generation | ||
| 1341 | # | ||
| 1342 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
| 1281 | # CONFIG_CRYPTO_HW is not set | 1343 | # CONFIG_CRYPTO_HW is not set |
| 1282 | 1344 | ||
| 1283 | # | 1345 | # |
| 1284 | # Library routines | 1346 | # Library routines |
| 1285 | # | 1347 | # |
| 1286 | CONFIG_BITREVERSE=y | 1348 | CONFIG_BITREVERSE=y |
| 1287 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1288 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1289 | CONFIG_CRC_CCITT=m | 1349 | CONFIG_CRC_CCITT=m |
| 1290 | CONFIG_CRC16=y | 1350 | CONFIG_CRC16=y |
| 1291 | CONFIG_CRC_T10DIF=m | 1351 | CONFIG_CRC_T10DIF=m |
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 0c6e02f80a31..066252eebf61 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c | |||
| @@ -967,28 +967,28 @@ static inline void configure_usart0_pins(void) | |||
| 967 | { | 967 | { |
| 968 | u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */ | 968 | u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */ |
| 969 | 969 | ||
| 970 | select_peripheral(PIOA, pin_mask, PERIPH_B, 0); | 970 | select_peripheral(PIOA, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); |
| 971 | } | 971 | } |
| 972 | 972 | ||
| 973 | static inline void configure_usart1_pins(void) | 973 | static inline void configure_usart1_pins(void) |
| 974 | { | 974 | { |
| 975 | u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */ | 975 | u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */ |
| 976 | 976 | ||
| 977 | select_peripheral(PIOA, pin_mask, PERIPH_A, 0); | 977 | select_peripheral(PIOA, pin_mask, PERIPH_A, AT32_GPIOF_PULLUP); |
| 978 | } | 978 | } |
| 979 | 979 | ||
| 980 | static inline void configure_usart2_pins(void) | 980 | static inline void configure_usart2_pins(void) |
| 981 | { | 981 | { |
| 982 | u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */ | 982 | u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */ |
| 983 | 983 | ||
| 984 | select_peripheral(PIOB, pin_mask, PERIPH_B, 0); | 984 | select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); |
| 985 | } | 985 | } |
| 986 | 986 | ||
| 987 | static inline void configure_usart3_pins(void) | 987 | static inline void configure_usart3_pins(void) |
| 988 | { | 988 | { |
| 989 | u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */ | 989 | u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */ |
| 990 | 990 | ||
| 991 | select_peripheral(PIOB, pin_mask, PERIPH_B, 0); | 991 | select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); |
| 992 | } | 992 | } |
| 993 | 993 | ||
| 994 | static struct platform_device *__initdata at32_usarts[4]; | 994 | static struct platform_device *__initdata at32_usarts[4]; |
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index e05f9e1d3faa..27eb67604c53 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc1 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Mon Aug 4 15:38:01 2008 | 4 | # Mon Dec 8 08:12:07 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 7 | 7 | ||
| @@ -26,6 +26,7 @@ CONFIG_LOG_BUF_SHIFT=20 | |||
| 26 | CONFIG_CGROUPS=y | 26 | CONFIG_CGROUPS=y |
| 27 | # CONFIG_CGROUP_DEBUG is not set | 27 | # CONFIG_CGROUP_DEBUG is not set |
| 28 | # CONFIG_CGROUP_NS is not set | 28 | # CONFIG_CGROUP_NS is not set |
| 29 | # CONFIG_CGROUP_FREEZER is not set | ||
| 29 | # CONFIG_CGROUP_DEVICE is not set | 30 | # CONFIG_CGROUP_DEVICE is not set |
| 30 | CONFIG_CPUSETS=y | 31 | CONFIG_CPUSETS=y |
| 31 | # CONFIG_GROUP_SCHED is not set | 32 | # CONFIG_GROUP_SCHED is not set |
| @@ -46,7 +47,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 46 | CONFIG_SYSCTL=y | 47 | CONFIG_SYSCTL=y |
| 47 | # CONFIG_EMBEDDED is not set | 48 | # CONFIG_EMBEDDED is not set |
| 48 | CONFIG_SYSCTL_SYSCALL=y | 49 | CONFIG_SYSCTL_SYSCALL=y |
| 49 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 50 | CONFIG_KALLSYMS=y | 50 | CONFIG_KALLSYMS=y |
| 51 | CONFIG_KALLSYMS_ALL=y | 51 | CONFIG_KALLSYMS_ALL=y |
| 52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -63,7 +63,9 @@ CONFIG_SIGNALFD=y | |||
| 63 | CONFIG_TIMERFD=y | 63 | CONFIG_TIMERFD=y |
| 64 | CONFIG_EVENTFD=y | 64 | CONFIG_EVENTFD=y |
| 65 | CONFIG_SHMEM=y | 65 | CONFIG_SHMEM=y |
| 66 | CONFIG_AIO=y | ||
| 66 | CONFIG_VM_EVENT_COUNTERS=y | 67 | CONFIG_VM_EVENT_COUNTERS=y |
| 68 | CONFIG_PCI_QUIRKS=y | ||
| 67 | CONFIG_SLUB_DEBUG=y | 69 | CONFIG_SLUB_DEBUG=y |
| 68 | # CONFIG_SLAB is not set | 70 | # CONFIG_SLAB is not set |
| 69 | CONFIG_SLUB=y | 71 | CONFIG_SLUB=y |
| @@ -72,15 +74,11 @@ CONFIG_SLUB=y | |||
| 72 | # CONFIG_MARKERS is not set | 74 | # CONFIG_MARKERS is not set |
| 73 | CONFIG_HAVE_OPROFILE=y | 75 | CONFIG_HAVE_OPROFILE=y |
| 74 | # CONFIG_KPROBES is not set | 76 | # CONFIG_KPROBES is not set |
| 75 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 76 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 77 | CONFIG_HAVE_KPROBES=y | 77 | CONFIG_HAVE_KPROBES=y |
| 78 | CONFIG_HAVE_KRETPROBES=y | 78 | CONFIG_HAVE_KRETPROBES=y |
| 79 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | 79 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 80 | CONFIG_HAVE_DMA_ATTRS=y | 80 | CONFIG_HAVE_DMA_ATTRS=y |
| 81 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 81 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
| 82 | # CONFIG_HAVE_CLK is not set | ||
| 83 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 84 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 82 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 85 | CONFIG_SLABINFO=y | 83 | CONFIG_SLABINFO=y |
| 86 | CONFIG_RT_MUTEXES=y | 84 | CONFIG_RT_MUTEXES=y |
| @@ -113,6 +111,7 @@ CONFIG_DEFAULT_AS=y | |||
| 113 | # CONFIG_DEFAULT_NOOP is not set | 111 | # CONFIG_DEFAULT_NOOP is not set |
| 114 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 112 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 115 | CONFIG_CLASSIC_RCU=y | 113 | CONFIG_CLASSIC_RCU=y |
| 114 | # CONFIG_FREEZER is not set | ||
| 116 | 115 | ||
| 117 | # | 116 | # |
| 118 | # Processor type and features | 117 | # Processor type and features |
| @@ -125,8 +124,6 @@ CONFIG_MMU=y | |||
| 125 | CONFIG_SWIOTLB=y | 124 | CONFIG_SWIOTLB=y |
| 126 | CONFIG_IOMMU_HELPER=y | 125 | CONFIG_IOMMU_HELPER=y |
| 127 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 126 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 128 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 129 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 130 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 127 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 131 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 128 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 132 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 129 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| @@ -139,13 +136,16 @@ CONFIG_GENERIC_IOMAP=y | |||
| 139 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 136 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 140 | CONFIG_IA64_UNCACHED_ALLOCATOR=y | 137 | CONFIG_IA64_UNCACHED_ALLOCATOR=y |
| 141 | CONFIG_AUDIT_ARCH=y | 138 | CONFIG_AUDIT_ARCH=y |
| 139 | # CONFIG_PARAVIRT_GUEST is not set | ||
| 142 | CONFIG_IA64_GENERIC=y | 140 | CONFIG_IA64_GENERIC=y |
| 143 | # CONFIG_IA64_DIG is not set | 141 | # CONFIG_IA64_DIG is not set |
| 142 | # CONFIG_IA64_DIG_VTD is not set | ||
| 144 | # CONFIG_IA64_HP_ZX1 is not set | 143 | # CONFIG_IA64_HP_ZX1 is not set |
| 145 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set | 144 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set |
| 146 | # CONFIG_IA64_SGI_SN2 is not set | 145 | # CONFIG_IA64_SGI_SN2 is not set |
| 147 | # CONFIG_IA64_SGI_UV is not set | 146 | # CONFIG_IA64_SGI_UV is not set |
| 148 | # CONFIG_IA64_HP_SIM is not set | 147 | # CONFIG_IA64_HP_SIM is not set |
| 148 | # CONFIG_IA64_XEN_GUEST is not set | ||
| 149 | # CONFIG_ITANIUM is not set | 149 | # CONFIG_ITANIUM is not set |
| 150 | CONFIG_MCKINLEY=y | 150 | CONFIG_MCKINLEY=y |
| 151 | # CONFIG_IA64_PAGE_SIZE_4KB is not set | 151 | # CONFIG_IA64_PAGE_SIZE_4KB is not set |
| @@ -182,16 +182,17 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
| 182 | CONFIG_DISCONTIGMEM=y | 182 | CONFIG_DISCONTIGMEM=y |
| 183 | CONFIG_FLAT_NODE_MEM_MAP=y | 183 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 184 | CONFIG_NEED_MULTIPLE_NODES=y | 184 | CONFIG_NEED_MULTIPLE_NODES=y |
| 185 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 186 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 185 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 187 | CONFIG_PAGEFLAGS_EXTENDED=y | 186 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 188 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 187 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 189 | CONFIG_MIGRATION=y | 188 | CONFIG_MIGRATION=y |
| 190 | CONFIG_RESOURCES_64BIT=y | 189 | CONFIG_RESOURCES_64BIT=y |
| 190 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 191 | CONFIG_ZONE_DMA_FLAG=1 | 191 | CONFIG_ZONE_DMA_FLAG=1 |
| 192 | CONFIG_BOUNCE=y | 192 | CONFIG_BOUNCE=y |
| 193 | CONFIG_NR_QUICK=1 | 193 | CONFIG_NR_QUICK=1 |
| 194 | CONFIG_VIRT_TO_BUS=y | 194 | CONFIG_VIRT_TO_BUS=y |
| 195 | CONFIG_UNEVICTABLE_LRU=y | ||
| 195 | CONFIG_MMU_NOTIFIER=y | 196 | CONFIG_MMU_NOTIFIER=y |
| 196 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 197 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 197 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 198 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
| @@ -231,12 +232,12 @@ CONFIG_EFI_VARS=y | |||
| 231 | CONFIG_EFI_PCDP=y | 232 | CONFIG_EFI_PCDP=y |
| 232 | CONFIG_DMIID=y | 233 | CONFIG_DMIID=y |
| 233 | CONFIG_BINFMT_ELF=y | 234 | CONFIG_BINFMT_ELF=y |
| 235 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 236 | # CONFIG_HAVE_AOUT is not set | ||
| 234 | CONFIG_BINFMT_MISC=m | 237 | CONFIG_BINFMT_MISC=m |
| 235 | 238 | ||
| 236 | # CONFIG_DMAR is not set | ||
| 237 | |||
| 238 | # | 239 | # |
| 239 | # Power management and ACPI | 240 | # Power management and ACPI options |
| 240 | # | 241 | # |
| 241 | CONFIG_PM=y | 242 | CONFIG_PM=y |
| 242 | # CONFIG_PM_DEBUG is not set | 243 | # CONFIG_PM_DEBUG is not set |
| @@ -248,7 +249,6 @@ CONFIG_ACPI_PROC_EVENT=y | |||
| 248 | CONFIG_ACPI_BUTTON=m | 249 | CONFIG_ACPI_BUTTON=m |
| 249 | CONFIG_ACPI_FAN=m | 250 | CONFIG_ACPI_FAN=m |
| 250 | CONFIG_ACPI_DOCK=y | 251 | CONFIG_ACPI_DOCK=y |
| 251 | # CONFIG_ACPI_BAY is not set | ||
| 252 | CONFIG_ACPI_PROCESSOR=m | 252 | CONFIG_ACPI_PROCESSOR=m |
| 253 | CONFIG_ACPI_HOTPLUG_CPU=y | 253 | CONFIG_ACPI_HOTPLUG_CPU=y |
| 254 | CONFIG_ACPI_THERMAL=m | 254 | CONFIG_ACPI_THERMAL=m |
| @@ -256,9 +256,7 @@ CONFIG_ACPI_NUMA=y | |||
| 256 | # CONFIG_ACPI_CUSTOM_DSDT is not set | 256 | # CONFIG_ACPI_CUSTOM_DSDT is not set |
| 257 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 257 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 258 | # CONFIG_ACPI_DEBUG is not set | 258 | # CONFIG_ACPI_DEBUG is not set |
| 259 | CONFIG_ACPI_EC=y | ||
| 260 | # CONFIG_ACPI_PCI_SLOT is not set | 259 | # CONFIG_ACPI_PCI_SLOT is not set |
| 261 | CONFIG_ACPI_POWER=y | ||
| 262 | CONFIG_ACPI_SYSTEM=y | 260 | CONFIG_ACPI_SYSTEM=y |
| 263 | CONFIG_ACPI_CONTAINER=m | 261 | CONFIG_ACPI_CONTAINER=m |
| 264 | 262 | ||
| @@ -275,7 +273,7 @@ CONFIG_PCI_DOMAINS=y | |||
| 275 | CONFIG_PCI_SYSCALL=y | 273 | CONFIG_PCI_SYSCALL=y |
| 276 | # CONFIG_PCIEPORTBUS is not set | 274 | # CONFIG_PCIEPORTBUS is not set |
| 277 | CONFIG_ARCH_SUPPORTS_MSI=y | 275 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 278 | # CONFIG_PCI_MSI is not set | 276 | CONFIG_PCI_MSI=y |
| 279 | CONFIG_PCI_LEGACY=y | 277 | CONFIG_PCI_LEGACY=y |
| 280 | # CONFIG_PCI_DEBUG is not set | 278 | # CONFIG_PCI_DEBUG is not set |
| 281 | CONFIG_HOTPLUG_PCI=m | 279 | CONFIG_HOTPLUG_PCI=m |
| @@ -286,6 +284,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m | |||
| 286 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 284 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
| 287 | # CONFIG_HOTPLUG_PCI_SGI is not set | 285 | # CONFIG_HOTPLUG_PCI_SGI is not set |
| 288 | # CONFIG_PCCARD is not set | 286 | # CONFIG_PCCARD is not set |
| 287 | CONFIG_DMAR=y | ||
| 289 | CONFIG_NET=y | 288 | CONFIG_NET=y |
| 290 | 289 | ||
| 291 | # | 290 | # |
| @@ -333,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 333 | # CONFIG_TIPC is not set | 332 | # CONFIG_TIPC is not set |
| 334 | # CONFIG_ATM is not set | 333 | # CONFIG_ATM is not set |
| 335 | # CONFIG_BRIDGE is not set | 334 | # CONFIG_BRIDGE is not set |
| 335 | # CONFIG_NET_DSA is not set | ||
| 336 | # CONFIG_VLAN_8021Q is not set | 336 | # CONFIG_VLAN_8021Q is not set |
| 337 | # CONFIG_DECNET is not set | 337 | # CONFIG_DECNET is not set |
| 338 | # CONFIG_LLC2 is not set | 338 | # CONFIG_LLC2 is not set |
| @@ -353,11 +353,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 353 | # CONFIG_IRDA is not set | 353 | # CONFIG_IRDA is not set |
| 354 | # CONFIG_BT is not set | 354 | # CONFIG_BT is not set |
| 355 | # CONFIG_AF_RXRPC is not set | 355 | # CONFIG_AF_RXRPC is not set |
| 356 | 356 | # CONFIG_PHONET is not set | |
| 357 | # | 357 | CONFIG_WIRELESS=y |
| 358 | # Wireless | ||
| 359 | # | ||
| 360 | # CONFIG_CFG80211 is not set | 358 | # CONFIG_CFG80211 is not set |
| 359 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 361 | # CONFIG_WIRELESS_EXT is not set | 360 | # CONFIG_WIRELESS_EXT is not set |
| 362 | # CONFIG_MAC80211 is not set | 361 | # CONFIG_MAC80211 is not set |
| 363 | # CONFIG_IEEE80211 is not set | 362 | # CONFIG_IEEE80211 is not set |
| @@ -385,7 +384,7 @@ CONFIG_PROC_EVENTS=y | |||
| 385 | # CONFIG_MTD is not set | 384 | # CONFIG_MTD is not set |
| 386 | # CONFIG_PARPORT is not set | 385 | # CONFIG_PARPORT is not set |
| 387 | CONFIG_PNP=y | 386 | CONFIG_PNP=y |
| 388 | # CONFIG_PNP_DEBUG is not set | 387 | # CONFIG_PNP_DEBUG_MESSAGES is not set |
| 389 | 388 | ||
| 390 | # | 389 | # |
| 391 | # Protocols | 390 | # Protocols |
| @@ -419,10 +418,9 @@ CONFIG_SGI_XP=m | |||
| 419 | # CONFIG_HP_ILO is not set | 418 | # CONFIG_HP_ILO is not set |
| 420 | CONFIG_SGI_GRU=m | 419 | CONFIG_SGI_GRU=m |
| 421 | # CONFIG_SGI_GRU_DEBUG is not set | 420 | # CONFIG_SGI_GRU_DEBUG is not set |
| 421 | # CONFIG_C2PORT is not set | ||
| 422 | CONFIG_HAVE_IDE=y | 422 | CONFIG_HAVE_IDE=y |
| 423 | CONFIG_IDE=y | 423 | CONFIG_IDE=y |
| 424 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 425 | CONFIG_BLK_DEV_IDE=y | ||
| 426 | 424 | ||
| 427 | # | 425 | # |
| 428 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 426 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| @@ -430,12 +428,12 @@ CONFIG_BLK_DEV_IDE=y | |||
| 430 | CONFIG_IDE_TIMINGS=y | 428 | CONFIG_IDE_TIMINGS=y |
| 431 | CONFIG_IDE_ATAPI=y | 429 | CONFIG_IDE_ATAPI=y |
| 432 | # CONFIG_BLK_DEV_IDE_SATA is not set | 430 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 433 | CONFIG_BLK_DEV_IDEDISK=y | 431 | CONFIG_IDE_GD=y |
| 434 | # CONFIG_IDEDISK_MULTI_MODE is not set | 432 | CONFIG_IDE_GD_ATA=y |
| 433 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 435 | CONFIG_BLK_DEV_IDECD=y | 434 | CONFIG_BLK_DEV_IDECD=y |
| 436 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 435 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 437 | # CONFIG_BLK_DEV_IDETAPE is not set | 436 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 438 | CONFIG_BLK_DEV_IDEFLOPPY=y | ||
| 439 | CONFIG_BLK_DEV_IDESCSI=m | 437 | CONFIG_BLK_DEV_IDESCSI=m |
| 440 | # CONFIG_BLK_DEV_IDEACPI is not set | 438 | # CONFIG_BLK_DEV_IDEACPI is not set |
| 441 | # CONFIG_IDE_TASK_IOCTL is not set | 439 | # CONFIG_IDE_TASK_IOCTL is not set |
| @@ -705,6 +703,9 @@ CONFIG_TULIP=m | |||
| 705 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 703 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 706 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 704 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 707 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 705 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 706 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 707 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 708 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 708 | CONFIG_NET_PCI=y | 709 | CONFIG_NET_PCI=y |
| 709 | # CONFIG_PCNET32 is not set | 710 | # CONFIG_PCNET32 is not set |
| 710 | # CONFIG_AMD8111_ETH is not set | 711 | # CONFIG_AMD8111_ETH is not set |
| @@ -725,11 +726,11 @@ CONFIG_E100=m | |||
| 725 | # CONFIG_TLAN is not set | 726 | # CONFIG_TLAN is not set |
| 726 | # CONFIG_VIA_RHINE is not set | 727 | # CONFIG_VIA_RHINE is not set |
| 727 | # CONFIG_SC92031 is not set | 728 | # CONFIG_SC92031 is not set |
| 729 | # CONFIG_ATL2 is not set | ||
| 728 | CONFIG_NETDEV_1000=y | 730 | CONFIG_NETDEV_1000=y |
| 729 | # CONFIG_ACENIC is not set | 731 | # CONFIG_ACENIC is not set |
| 730 | # CONFIG_DL2K is not set | 732 | # CONFIG_DL2K is not set |
| 731 | CONFIG_E1000=y | 733 | CONFIG_E1000=y |
| 732 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 733 | # CONFIG_E1000E is not set | 734 | # CONFIG_E1000E is not set |
| 734 | # CONFIG_IP1000 is not set | 735 | # CONFIG_IP1000 is not set |
| 735 | CONFIG_IGB=y | 736 | CONFIG_IGB=y |
| @@ -747,18 +748,22 @@ CONFIG_TIGON3=y | |||
| 747 | # CONFIG_QLA3XXX is not set | 748 | # CONFIG_QLA3XXX is not set |
| 748 | # CONFIG_ATL1 is not set | 749 | # CONFIG_ATL1 is not set |
| 749 | # CONFIG_ATL1E is not set | 750 | # CONFIG_ATL1E is not set |
| 751 | # CONFIG_JME is not set | ||
| 750 | CONFIG_NETDEV_10000=y | 752 | CONFIG_NETDEV_10000=y |
| 751 | # CONFIG_CHELSIO_T1 is not set | 753 | # CONFIG_CHELSIO_T1 is not set |
| 752 | # CONFIG_CHELSIO_T3 is not set | 754 | # CONFIG_CHELSIO_T3 is not set |
| 755 | # CONFIG_ENIC is not set | ||
| 753 | # CONFIG_IXGBE is not set | 756 | # CONFIG_IXGBE is not set |
| 754 | # CONFIG_IXGB is not set | 757 | # CONFIG_IXGB is not set |
| 755 | # CONFIG_S2IO is not set | 758 | # CONFIG_S2IO is not set |
| 756 | # CONFIG_MYRI10GE is not set | 759 | # CONFIG_MYRI10GE is not set |
| 757 | # CONFIG_NETXEN_NIC is not set | 760 | # CONFIG_NETXEN_NIC is not set |
| 758 | # CONFIG_NIU is not set | 761 | # CONFIG_NIU is not set |
| 762 | # CONFIG_MLX4_EN is not set | ||
| 759 | # CONFIG_MLX4_CORE is not set | 763 | # CONFIG_MLX4_CORE is not set |
| 760 | # CONFIG_TEHUTI is not set | 764 | # CONFIG_TEHUTI is not set |
| 761 | # CONFIG_BNX2X is not set | 765 | # CONFIG_BNX2X is not set |
| 766 | # CONFIG_QLGE is not set | ||
| 762 | # CONFIG_SFC is not set | 767 | # CONFIG_SFC is not set |
| 763 | # CONFIG_TR is not set | 768 | # CONFIG_TR is not set |
| 764 | 769 | ||
| @@ -826,9 +831,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 826 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 831 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 827 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 832 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 828 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 833 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 834 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 829 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 835 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 830 | # CONFIG_MOUSE_SERIAL is not set | 836 | # CONFIG_MOUSE_SERIAL is not set |
| 831 | # CONFIG_MOUSE_APPLETOUCH is not set | 837 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 838 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 832 | # CONFIG_MOUSE_VSXXXAA is not set | 839 | # CONFIG_MOUSE_VSXXXAA is not set |
| 833 | # CONFIG_INPUT_JOYSTICK is not set | 840 | # CONFIG_INPUT_JOYSTICK is not set |
| 834 | # CONFIG_INPUT_TABLET is not set | 841 | # CONFIG_INPUT_TABLET is not set |
| @@ -942,15 +949,16 @@ CONFIG_HWMON=y | |||
| 942 | # CONFIG_SENSORS_VT8231 is not set | 949 | # CONFIG_SENSORS_VT8231 is not set |
| 943 | # CONFIG_SENSORS_W83627HF is not set | 950 | # CONFIG_SENSORS_W83627HF is not set |
| 944 | # CONFIG_SENSORS_W83627EHF is not set | 951 | # CONFIG_SENSORS_W83627EHF is not set |
| 952 | # CONFIG_SENSORS_LIS3LV02D is not set | ||
| 945 | # CONFIG_HWMON_DEBUG_CHIP is not set | 953 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 946 | CONFIG_THERMAL=m | 954 | CONFIG_THERMAL=m |
| 947 | # CONFIG_THERMAL_HWMON is not set | 955 | # CONFIG_THERMAL_HWMON is not set |
| 948 | # CONFIG_WATCHDOG is not set | 956 | # CONFIG_WATCHDOG is not set |
| 957 | CONFIG_SSB_POSSIBLE=y | ||
| 949 | 958 | ||
| 950 | # | 959 | # |
| 951 | # Sonics Silicon Backplane | 960 | # Sonics Silicon Backplane |
| 952 | # | 961 | # |
| 953 | CONFIG_SSB_POSSIBLE=y | ||
| 954 | # CONFIG_SSB is not set | 962 | # CONFIG_SSB is not set |
| 955 | 963 | ||
| 956 | # | 964 | # |
| @@ -959,6 +967,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 959 | # CONFIG_MFD_CORE is not set | 967 | # CONFIG_MFD_CORE is not set |
| 960 | # CONFIG_MFD_SM501 is not set | 968 | # CONFIG_MFD_SM501 is not set |
| 961 | # CONFIG_HTC_PASIC3 is not set | 969 | # CONFIG_HTC_PASIC3 is not set |
| 970 | # CONFIG_MFD_TMIO is not set | ||
| 971 | # CONFIG_REGULATOR is not set | ||
| 962 | 972 | ||
| 963 | # | 973 | # |
| 964 | # Multimedia devices | 974 | # Multimedia devices |
| @@ -1009,6 +1019,7 @@ CONFIG_VGA_CONSOLE=y | |||
| 1009 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1019 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 1010 | CONFIG_DUMMY_CONSOLE=y | 1020 | CONFIG_DUMMY_CONSOLE=y |
| 1011 | CONFIG_SOUND=m | 1021 | CONFIG_SOUND=m |
| 1022 | CONFIG_SOUND_OSS_CORE=y | ||
| 1012 | CONFIG_SND=m | 1023 | CONFIG_SND=m |
| 1013 | CONFIG_SND_TIMER=m | 1024 | CONFIG_SND_TIMER=m |
| 1014 | CONFIG_SND_PCM=m | 1025 | CONFIG_SND_PCM=m |
| @@ -1113,8 +1124,7 @@ CONFIG_HID=y | |||
| 1113 | # USB Input Devices | 1124 | # USB Input Devices |
| 1114 | # | 1125 | # |
| 1115 | CONFIG_USB_HID=m | 1126 | CONFIG_USB_HID=m |
| 1116 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1127 | # CONFIG_HID_PID is not set |
| 1117 | # CONFIG_HID_FF is not set | ||
| 1118 | # CONFIG_USB_HIDDEV is not set | 1128 | # CONFIG_USB_HIDDEV is not set |
| 1119 | 1129 | ||
| 1120 | # | 1130 | # |
| @@ -1122,6 +1132,34 @@ CONFIG_USB_HID=m | |||
| 1122 | # | 1132 | # |
| 1123 | # CONFIG_USB_KBD is not set | 1133 | # CONFIG_USB_KBD is not set |
| 1124 | # CONFIG_USB_MOUSE is not set | 1134 | # CONFIG_USB_MOUSE is not set |
| 1135 | |||
| 1136 | # | ||
| 1137 | # Special HID drivers | ||
| 1138 | # | ||
| 1139 | CONFIG_HID_COMPAT=y | ||
| 1140 | CONFIG_HID_A4TECH=m | ||
| 1141 | CONFIG_HID_APPLE=m | ||
| 1142 | CONFIG_HID_BELKIN=m | ||
| 1143 | CONFIG_HID_BRIGHT=m | ||
| 1144 | CONFIG_HID_CHERRY=m | ||
| 1145 | CONFIG_HID_CHICONY=m | ||
| 1146 | CONFIG_HID_CYPRESS=m | ||
| 1147 | CONFIG_HID_DELL=m | ||
| 1148 | CONFIG_HID_EZKEY=m | ||
| 1149 | CONFIG_HID_GYRATION=m | ||
| 1150 | CONFIG_HID_LOGITECH=m | ||
| 1151 | # CONFIG_LOGITECH_FF is not set | ||
| 1152 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1153 | CONFIG_HID_MICROSOFT=m | ||
| 1154 | CONFIG_HID_MONTEREY=m | ||
| 1155 | CONFIG_HID_PANTHERLORD=m | ||
| 1156 | # CONFIG_PANTHERLORD_FF is not set | ||
| 1157 | CONFIG_HID_PETALYNX=m | ||
| 1158 | CONFIG_HID_SAMSUNG=m | ||
| 1159 | CONFIG_HID_SONY=m | ||
| 1160 | CONFIG_HID_SUNPLUS=m | ||
| 1161 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 1162 | # CONFIG_ZEROPLUS_FF is not set | ||
| 1125 | CONFIG_USB_SUPPORT=y | 1163 | CONFIG_USB_SUPPORT=y |
| 1126 | CONFIG_USB_ARCH_HAS_HCD=y | 1164 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1127 | CONFIG_USB_ARCH_HAS_OHCI=y | 1165 | CONFIG_USB_ARCH_HAS_OHCI=y |
| @@ -1138,6 +1176,9 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1138 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1176 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1139 | # CONFIG_USB_SUSPEND is not set | 1177 | # CONFIG_USB_SUSPEND is not set |
| 1140 | # CONFIG_USB_OTG is not set | 1178 | # CONFIG_USB_OTG is not set |
| 1179 | CONFIG_USB_MON=y | ||
| 1180 | # CONFIG_USB_WUSB is not set | ||
| 1181 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 1141 | 1182 | ||
| 1142 | # | 1183 | # |
| 1143 | # USB Host Controller Drivers | 1184 | # USB Host Controller Drivers |
| @@ -1155,6 +1196,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1155 | CONFIG_USB_UHCI_HCD=m | 1196 | CONFIG_USB_UHCI_HCD=m |
| 1156 | # CONFIG_USB_SL811_HCD is not set | 1197 | # CONFIG_USB_SL811_HCD is not set |
| 1157 | # CONFIG_USB_R8A66597_HCD is not set | 1198 | # CONFIG_USB_R8A66597_HCD is not set |
| 1199 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1200 | # CONFIG_USB_HWA_HCD is not set | ||
| 1201 | |||
| 1202 | # | ||
| 1203 | # Enable Host or Gadget support to see Inventra options | ||
| 1204 | # | ||
| 1158 | 1205 | ||
| 1159 | # | 1206 | # |
| 1160 | # USB Device Class drivers | 1207 | # USB Device Class drivers |
| @@ -1162,13 +1209,14 @@ CONFIG_USB_UHCI_HCD=m | |||
| 1162 | # CONFIG_USB_ACM is not set | 1209 | # CONFIG_USB_ACM is not set |
| 1163 | # CONFIG_USB_PRINTER is not set | 1210 | # CONFIG_USB_PRINTER is not set |
| 1164 | # CONFIG_USB_WDM is not set | 1211 | # CONFIG_USB_WDM is not set |
| 1212 | # CONFIG_USB_TMC is not set | ||
| 1165 | 1213 | ||
| 1166 | # | 1214 | # |
| 1167 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1215 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 1168 | # | 1216 | # |
| 1169 | 1217 | ||
| 1170 | # | 1218 | # |
| 1171 | # may also be needed; see USB_STORAGE Help for more information | 1219 | # see USB_STORAGE Help for more information |
| 1172 | # | 1220 | # |
| 1173 | CONFIG_USB_STORAGE=m | 1221 | CONFIG_USB_STORAGE=m |
| 1174 | # CONFIG_USB_STORAGE_DEBUG is not set | 1222 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1191,7 +1239,6 @@ CONFIG_USB_STORAGE=m | |||
| 1191 | # | 1239 | # |
| 1192 | # CONFIG_USB_MDC800 is not set | 1240 | # CONFIG_USB_MDC800 is not set |
| 1193 | # CONFIG_USB_MICROTEK is not set | 1241 | # CONFIG_USB_MICROTEK is not set |
| 1194 | CONFIG_USB_MON=y | ||
| 1195 | 1242 | ||
| 1196 | # | 1243 | # |
| 1197 | # USB port drivers | 1244 | # USB port drivers |
| @@ -1204,7 +1251,7 @@ CONFIG_USB_MON=y | |||
| 1204 | # CONFIG_USB_EMI62 is not set | 1251 | # CONFIG_USB_EMI62 is not set |
| 1205 | # CONFIG_USB_EMI26 is not set | 1252 | # CONFIG_USB_EMI26 is not set |
| 1206 | # CONFIG_USB_ADUTUX is not set | 1253 | # CONFIG_USB_ADUTUX is not set |
| 1207 | # CONFIG_USB_AUERSWALD is not set | 1254 | # CONFIG_USB_SEVSEG is not set |
| 1208 | # CONFIG_USB_RIO500 is not set | 1255 | # CONFIG_USB_RIO500 is not set |
| 1209 | # CONFIG_USB_LEGOTOWER is not set | 1256 | # CONFIG_USB_LEGOTOWER is not set |
| 1210 | # CONFIG_USB_LCD is not set | 1257 | # CONFIG_USB_LCD is not set |
| @@ -1222,7 +1269,9 @@ CONFIG_USB_MON=y | |||
| 1222 | # CONFIG_USB_IOWARRIOR is not set | 1269 | # CONFIG_USB_IOWARRIOR is not set |
| 1223 | # CONFIG_USB_TEST is not set | 1270 | # CONFIG_USB_TEST is not set |
| 1224 | # CONFIG_USB_ISIGHTFW is not set | 1271 | # CONFIG_USB_ISIGHTFW is not set |
| 1272 | # CONFIG_USB_VST is not set | ||
| 1225 | # CONFIG_USB_GADGET is not set | 1273 | # CONFIG_USB_GADGET is not set |
| 1274 | # CONFIG_UWB is not set | ||
| 1226 | # CONFIG_MMC is not set | 1275 | # CONFIG_MMC is not set |
| 1227 | # CONFIG_MEMSTICK is not set | 1276 | # CONFIG_MEMSTICK is not set |
| 1228 | # CONFIG_NEW_LEDS is not set | 1277 | # CONFIG_NEW_LEDS is not set |
| @@ -1246,6 +1295,15 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
| 1246 | # CONFIG_RTC_CLASS is not set | 1295 | # CONFIG_RTC_CLASS is not set |
| 1247 | # CONFIG_DMADEVICES is not set | 1296 | # CONFIG_DMADEVICES is not set |
| 1248 | # CONFIG_UIO is not set | 1297 | # CONFIG_UIO is not set |
| 1298 | # CONFIG_STAGING is not set | ||
| 1299 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1300 | |||
| 1301 | # | ||
| 1302 | # HP Simulator drivers | ||
| 1303 | # | ||
| 1304 | # CONFIG_HP_SIMETH is not set | ||
| 1305 | # CONFIG_HP_SIMSERIAL is not set | ||
| 1306 | # CONFIG_HP_SIMSCSI is not set | ||
| 1249 | CONFIG_MSPEC=m | 1307 | CONFIG_MSPEC=m |
| 1250 | 1308 | ||
| 1251 | # | 1309 | # |
| @@ -1260,7 +1318,7 @@ CONFIG_EXT3_FS=y | |||
| 1260 | CONFIG_EXT3_FS_XATTR=y | 1318 | CONFIG_EXT3_FS_XATTR=y |
| 1261 | CONFIG_EXT3_FS_POSIX_ACL=y | 1319 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1262 | CONFIG_EXT3_FS_SECURITY=y | 1320 | CONFIG_EXT3_FS_SECURITY=y |
| 1263 | # CONFIG_EXT4DEV_FS is not set | 1321 | # CONFIG_EXT4_FS is not set |
| 1264 | CONFIG_JBD=y | 1322 | CONFIG_JBD=y |
| 1265 | CONFIG_FS_MBCACHE=y | 1323 | CONFIG_FS_MBCACHE=y |
| 1266 | CONFIG_REISERFS_FS=y | 1324 | CONFIG_REISERFS_FS=y |
| @@ -1271,6 +1329,7 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
| 1271 | CONFIG_REISERFS_FS_SECURITY=y | 1329 | CONFIG_REISERFS_FS_SECURITY=y |
| 1272 | # CONFIG_JFS_FS is not set | 1330 | # CONFIG_JFS_FS is not set |
| 1273 | CONFIG_FS_POSIX_ACL=y | 1331 | CONFIG_FS_POSIX_ACL=y |
| 1332 | CONFIG_FILE_LOCKING=y | ||
| 1274 | CONFIG_XFS_FS=y | 1333 | CONFIG_XFS_FS=y |
| 1275 | # CONFIG_XFS_QUOTA is not set | 1334 | # CONFIG_XFS_QUOTA is not set |
| 1276 | # CONFIG_XFS_POSIX_ACL is not set | 1335 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -1282,8 +1341,8 @@ CONFIG_DNOTIFY=y | |||
| 1282 | CONFIG_INOTIFY=y | 1341 | CONFIG_INOTIFY=y |
| 1283 | CONFIG_INOTIFY_USER=y | 1342 | CONFIG_INOTIFY_USER=y |
| 1284 | # CONFIG_QUOTA is not set | 1343 | # CONFIG_QUOTA is not set |
| 1285 | CONFIG_AUTOFS_FS=y | 1344 | CONFIG_AUTOFS_FS=m |
| 1286 | CONFIG_AUTOFS4_FS=y | 1345 | CONFIG_AUTOFS4_FS=m |
| 1287 | # CONFIG_FUSE_FS is not set | 1346 | # CONFIG_FUSE_FS is not set |
| 1288 | 1347 | ||
| 1289 | # | 1348 | # |
| @@ -1314,6 +1373,7 @@ CONFIG_PROC_FS=y | |||
| 1314 | CONFIG_PROC_KCORE=y | 1373 | CONFIG_PROC_KCORE=y |
| 1315 | CONFIG_PROC_VMCORE=y | 1374 | CONFIG_PROC_VMCORE=y |
| 1316 | CONFIG_PROC_SYSCTL=y | 1375 | CONFIG_PROC_SYSCTL=y |
| 1376 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1317 | CONFIG_SYSFS=y | 1377 | CONFIG_SYSFS=y |
| 1318 | CONFIG_TMPFS=y | 1378 | CONFIG_TMPFS=y |
| 1319 | # CONFIG_TMPFS_POSIX_ACL is not set | 1379 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -1356,6 +1416,7 @@ CONFIG_NFS_COMMON=y | |||
| 1356 | CONFIG_SUNRPC=m | 1416 | CONFIG_SUNRPC=m |
| 1357 | CONFIG_SUNRPC_GSS=m | 1417 | CONFIG_SUNRPC_GSS=m |
| 1358 | CONFIG_SUNRPC_XPRT_RDMA=m | 1418 | CONFIG_SUNRPC_XPRT_RDMA=m |
| 1419 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1359 | CONFIG_RPCSEC_GSS_KRB5=m | 1420 | CONFIG_RPCSEC_GSS_KRB5=m |
| 1360 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1421 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1361 | CONFIG_SMB_FS=m | 1422 | CONFIG_SMB_FS=m |
| @@ -1433,38 +1494,6 @@ CONFIG_NLS_KOI8_R=m | |||
| 1433 | CONFIG_NLS_KOI8_U=m | 1494 | CONFIG_NLS_KOI8_U=m |
| 1434 | CONFIG_NLS_UTF8=m | 1495 | CONFIG_NLS_UTF8=m |
| 1435 | # CONFIG_DLM is not set | 1496 | # CONFIG_DLM is not set |
| 1436 | CONFIG_HAVE_KVM=y | ||
| 1437 | CONFIG_VIRTUALIZATION=y | ||
| 1438 | # CONFIG_KVM is not set | ||
| 1439 | |||
| 1440 | # | ||
| 1441 | # Library routines | ||
| 1442 | # | ||
| 1443 | CONFIG_BITREVERSE=y | ||
| 1444 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1445 | # CONFIG_CRC_CCITT is not set | ||
| 1446 | # CONFIG_CRC16 is not set | ||
| 1447 | CONFIG_CRC_T10DIF=y | ||
| 1448 | CONFIG_CRC_ITU_T=m | ||
| 1449 | CONFIG_CRC32=y | ||
| 1450 | # CONFIG_CRC7 is not set | ||
| 1451 | # CONFIG_LIBCRC32C is not set | ||
| 1452 | CONFIG_GENERIC_ALLOCATOR=y | ||
| 1453 | CONFIG_PLIST=y | ||
| 1454 | CONFIG_HAS_IOMEM=y | ||
| 1455 | CONFIG_HAS_IOPORT=y | ||
| 1456 | CONFIG_HAS_DMA=y | ||
| 1457 | CONFIG_GENERIC_HARDIRQS=y | ||
| 1458 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 1459 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 1460 | CONFIG_IRQ_PER_CPU=y | ||
| 1461 | |||
| 1462 | # | ||
| 1463 | # HP Simulator drivers | ||
| 1464 | # | ||
| 1465 | # CONFIG_HP_SIMETH is not set | ||
| 1466 | # CONFIG_HP_SIMSERIAL is not set | ||
| 1467 | # CONFIG_HP_SIMSCSI is not set | ||
| 1468 | 1497 | ||
| 1469 | # | 1498 | # |
| 1470 | # Kernel hacking | 1499 | # Kernel hacking |
| @@ -1503,8 +1532,19 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 1503 | # CONFIG_DEBUG_SG is not set | 1532 | # CONFIG_DEBUG_SG is not set |
| 1504 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1533 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1505 | # CONFIG_RCU_TORTURE_TEST is not set | 1534 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1535 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1506 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1536 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1537 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1507 | # CONFIG_FAULT_INJECTION is not set | 1538 | # CONFIG_FAULT_INJECTION is not set |
| 1539 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1540 | |||
| 1541 | # | ||
| 1542 | # Tracers | ||
| 1543 | # | ||
| 1544 | # CONFIG_SCHED_TRACER is not set | ||
| 1545 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1546 | # CONFIG_BOOT_TRACER is not set | ||
| 1547 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1508 | # CONFIG_SAMPLES is not set | 1548 | # CONFIG_SAMPLES is not set |
| 1509 | CONFIG_IA64_GRANULE_16MB=y | 1549 | CONFIG_IA64_GRANULE_16MB=y |
| 1510 | # CONFIG_IA64_GRANULE_64MB is not set | 1550 | # CONFIG_IA64_GRANULE_64MB is not set |
| @@ -1519,14 +1559,19 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 1519 | # | 1559 | # |
| 1520 | # CONFIG_KEYS is not set | 1560 | # CONFIG_KEYS is not set |
| 1521 | # CONFIG_SECURITY is not set | 1561 | # CONFIG_SECURITY is not set |
| 1562 | # CONFIG_SECURITYFS is not set | ||
| 1522 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1563 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1523 | CONFIG_CRYPTO=y | 1564 | CONFIG_CRYPTO=y |
| 1524 | 1565 | ||
| 1525 | # | 1566 | # |
| 1526 | # Crypto core or helper | 1567 | # Crypto core or helper |
| 1527 | # | 1568 | # |
| 1569 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1528 | CONFIG_CRYPTO_ALGAPI=y | 1570 | CONFIG_CRYPTO_ALGAPI=y |
| 1571 | CONFIG_CRYPTO_AEAD=m | ||
| 1529 | CONFIG_CRYPTO_BLKCIPHER=m | 1572 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1573 | CONFIG_CRYPTO_HASH=m | ||
| 1574 | CONFIG_CRYPTO_RNG=m | ||
| 1530 | CONFIG_CRYPTO_MANAGER=m | 1575 | CONFIG_CRYPTO_MANAGER=m |
| 1531 | # CONFIG_CRYPTO_GF128MUL is not set | 1576 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1532 | # CONFIG_CRYPTO_NULL is not set | 1577 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1599,5 +1644,36 @@ CONFIG_CRYPTO_DES=m | |||
| 1599 | # | 1644 | # |
| 1600 | # CONFIG_CRYPTO_DEFLATE is not set | 1645 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1601 | # CONFIG_CRYPTO_LZO is not set | 1646 | # CONFIG_CRYPTO_LZO is not set |
| 1647 | |||
| 1648 | # | ||
| 1649 | # Random Number Generation | ||
| 1650 | # | ||
| 1651 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1602 | CONFIG_CRYPTO_HW=y | 1652 | CONFIG_CRYPTO_HW=y |
| 1603 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1653 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1654 | CONFIG_HAVE_KVM=y | ||
| 1655 | CONFIG_VIRTUALIZATION=y | ||
| 1656 | # CONFIG_KVM is not set | ||
| 1657 | # CONFIG_VIRTIO_PCI is not set | ||
| 1658 | # CONFIG_VIRTIO_BALLOON is not set | ||
| 1659 | |||
| 1660 | # | ||
| 1661 | # Library routines | ||
| 1662 | # | ||
| 1663 | CONFIG_BITREVERSE=y | ||
| 1664 | # CONFIG_CRC_CCITT is not set | ||
| 1665 | # CONFIG_CRC16 is not set | ||
| 1666 | CONFIG_CRC_T10DIF=y | ||
| 1667 | CONFIG_CRC_ITU_T=m | ||
| 1668 | CONFIG_CRC32=y | ||
| 1669 | # CONFIG_CRC7 is not set | ||
| 1670 | # CONFIG_LIBCRC32C is not set | ||
| 1671 | CONFIG_GENERIC_ALLOCATOR=y | ||
| 1672 | CONFIG_PLIST=y | ||
| 1673 | CONFIG_HAS_IOMEM=y | ||
| 1674 | CONFIG_HAS_IOPORT=y | ||
| 1675 | CONFIG_HAS_DMA=y | ||
| 1676 | CONFIG_GENERIC_HARDIRQS=y | ||
| 1677 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 1678 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 1679 | CONFIG_IRQ_PER_CPU=y | ||
diff --git a/arch/ia64/hp/sim/Kconfig b/arch/ia64/hp/sim/Kconfig index f92306bbedb8..8d513a8c5266 100644 --- a/arch/ia64/hp/sim/Kconfig +++ b/arch/ia64/hp/sim/Kconfig | |||
| @@ -4,6 +4,7 @@ menu "HP Simulator drivers" | |||
| 4 | 4 | ||
| 5 | config HP_SIMETH | 5 | config HP_SIMETH |
| 6 | bool "Simulated Ethernet " | 6 | bool "Simulated Ethernet " |
| 7 | depends on NET | ||
| 7 | 8 | ||
| 8 | config HP_SIMSERIAL | 9 | config HP_SIMSERIAL |
| 9 | bool "Simulated serial driver support" | 10 | bool "Simulated serial driver support" |
diff --git a/arch/ia64/include/asm/paravirt_privop.h b/arch/ia64/include/asm/paravirt_privop.h index 0b597424fcfc..33c8e55f5775 100644 --- a/arch/ia64/include/asm/paravirt_privop.h +++ b/arch/ia64/include/asm/paravirt_privop.h | |||
| @@ -83,7 +83,6 @@ extern unsigned long ia64_native_getreg_func(int regnum); | |||
| 83 | #define paravirt_getreg(reg) \ | 83 | #define paravirt_getreg(reg) \ |
| 84 | ({ \ | 84 | ({ \ |
| 85 | unsigned long res; \ | 85 | unsigned long res; \ |
| 86 | BUILD_BUG_ON(!__builtin_constant_p(reg)); \ | ||
| 87 | if ((reg) == _IA64_REG_IP) \ | 86 | if ((reg) == _IA64_REG_IP) \ |
| 88 | res = ia64_native_getreg(_IA64_REG_IP); \ | 87 | res = ia64_native_getreg(_IA64_REG_IP); \ |
| 89 | else \ | 88 | else \ |
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 26228e2d01ae..c75b914f2d6b 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
| @@ -53,10 +53,12 @@ int __ref arch_register_cpu(int num) | |||
| 53 | } | 53 | } |
| 54 | EXPORT_SYMBOL(arch_register_cpu); | 54 | EXPORT_SYMBOL(arch_register_cpu); |
| 55 | 55 | ||
| 56 | void arch_unregister_cpu(int num) | 56 | void __ref arch_unregister_cpu(int num) |
| 57 | { | 57 | { |
| 58 | unregister_cpu(&sysfs_cpus[num].cpu); | 58 | unregister_cpu(&sysfs_cpus[num].cpu); |
| 59 | #ifdef CONFIG_ACPI | ||
| 59 | unmap_cpu_from_node(num, cpu_to_node(num)); | 60 | unmap_cpu_from_node(num, cpu_to_node(num)); |
| 61 | #endif | ||
| 60 | } | 62 | } |
| 61 | EXPORT_SYMBOL(arch_unregister_cpu); | 63 | EXPORT_SYMBOL(arch_unregister_cpu); |
| 62 | #else | 64 | #else |
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 96c31b4180c3..0c66dbdd1d72 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * License. See the file "COPYING" in the main directory of this archive | 5 | * License. See the file "COPYING" in the main directory of this archive |
| 6 | * for more details. | 6 | * for more details. |
| 7 | * | 7 | * |
| 8 | * Copyright (c) 2000-2007 Silicon Graphics, Inc. All Rights Reserved. | 8 | * Copyright (c) 2000-2008 Silicon Graphics, Inc. All Rights Reserved. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| @@ -375,6 +375,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
| 375 | int cpu = nasid_slice_to_cpuid(nasid, slice); | 375 | int cpu = nasid_slice_to_cpuid(nasid, slice); |
| 376 | #ifdef CONFIG_SMP | 376 | #ifdef CONFIG_SMP |
| 377 | int cpuphys; | 377 | int cpuphys; |
| 378 | irq_desc_t *desc; | ||
| 378 | #endif | 379 | #endif |
| 379 | 380 | ||
| 380 | pci_dev_get(pci_dev); | 381 | pci_dev_get(pci_dev); |
| @@ -391,6 +392,12 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
| 391 | #ifdef CONFIG_SMP | 392 | #ifdef CONFIG_SMP |
| 392 | cpuphys = cpu_physical_id(cpu); | 393 | cpuphys = cpu_physical_id(cpu); |
| 393 | set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); | 394 | set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); |
| 395 | desc = irq_to_desc(sn_irq_info->irq_irq); | ||
| 396 | /* | ||
| 397 | * Affinity was set by the PROM, prevent it from | ||
| 398 | * being reset by the request_irq() path. | ||
| 399 | */ | ||
| 400 | desc->status |= IRQ_AFFINITY_SET; | ||
| 394 | #endif | 401 | #endif |
| 395 | } | 402 | } |
| 396 | 403 | ||
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index bb1d24929640..02c5b8a9fb60 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
| @@ -200,7 +200,7 @@ static int __cpuinitdata shub_1_1_found; | |||
| 200 | * Set flag for enabling shub specific wars | 200 | * Set flag for enabling shub specific wars |
| 201 | */ | 201 | */ |
| 202 | 202 | ||
| 203 | static inline int __init is_shub_1_1(int nasid) | 203 | static inline int __cpuinit is_shub_1_1(int nasid) |
| 204 | { | 204 | { |
| 205 | unsigned long id; | 205 | unsigned long id; |
| 206 | int rev; | 206 | int rev; |
| @@ -212,7 +212,7 @@ static inline int __init is_shub_1_1(int nasid) | |||
| 212 | return rev <= 2; | 212 | return rev <= 2; |
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | static void __init sn_check_for_wars(void) | 215 | static void __cpuinit sn_check_for_wars(void) |
| 216 | { | 216 | { |
| 217 | int cnode; | 217 | int cnode; |
| 218 | 218 | ||
| @@ -512,7 +512,6 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
| 512 | for_each_online_node(cnode) { | 512 | for_each_online_node(cnode) { |
| 513 | nodepdaindr[cnode] = | 513 | nodepdaindr[cnode] = |
| 514 | alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); | 514 | alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); |
| 515 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | ||
| 516 | memset(nodepdaindr[cnode]->phys_cpuid, -1, | 515 | memset(nodepdaindr[cnode]->phys_cpuid, -1, |
| 517 | sizeof(nodepdaindr[cnode]->phys_cpuid)); | 516 | sizeof(nodepdaindr[cnode]->phys_cpuid)); |
| 518 | spin_lock_init(&nodepdaindr[cnode]->ptc_lock); | 517 | spin_lock_init(&nodepdaindr[cnode]->ptc_lock); |
| @@ -521,11 +520,9 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
| 521 | /* | 520 | /* |
| 522 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. | 521 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. |
| 523 | */ | 522 | */ |
| 524 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) { | 523 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) |
| 525 | nodepdaindr[cnode] = | 524 | nodepdaindr[cnode] = |
| 526 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); | 525 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); |
| 527 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | ||
| 528 | } | ||
| 529 | 526 | ||
| 530 | /* | 527 | /* |
| 531 | * Now copy the array of nodepda pointers to each nodepda. | 528 | * Now copy the array of nodepda pointers to each nodepda. |
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 765c8e287d2b..364ca8938807 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug | |||
| @@ -48,7 +48,7 @@ config RUNTIME_DEBUG | |||
| 48 | help | 48 | help |
| 49 | If you say Y here, some debugging macros will do run-time checking. | 49 | If you say Y here, some debugging macros will do run-time checking. |
| 50 | If you say N here, those macros will mostly turn to no-ops. See | 50 | If you say N here, those macros will mostly turn to no-ops. See |
| 51 | include/asm-mips/debug.h for debuging macros. | 51 | arch/mips/include/asm/debug.h for debugging macros. |
| 52 | If unsure, say N. | 52 | If unsure, say N. |
| 53 | 53 | ||
| 54 | endmenu | 54 | endmenu |
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig index 620980081a30..b6698a232ae9 100644 --- a/arch/mips/configs/fulong_defconfig +++ b/arch/mips/configs/fulong_defconfig | |||
| @@ -1,63 +1,78 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc4 | 3 | # Linux kernel version: 2.6.28-rc6 |
| 4 | # Mon Jun 11 00:23:51 2007 | 4 | # Fri Nov 28 17:53:48 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_LEMOTE_FULONG=y | ||
| 12 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 13 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 14 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 15 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 16 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 18 | CONFIG_LEMOTE_FULONG=y | ||
| 17 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
| 18 | # CONFIG_WR_PPMC is not set | ||
| 19 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
| 21 | # CONFIG_MACH_EMMA is not set | ||
| 22 | # CONFIG_MACH_VR41XX is not set | ||
| 23 | # CONFIG_NXP_STB220 is not set | ||
| 24 | # CONFIG_NXP_STB225 is not set | ||
| 20 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 21 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 22 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
| 23 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 24 | # CONFIG_MARKEINS is not set | ||
| 25 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 26 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 27 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 28 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 29 | # CONFIG_SIBYTE_SWARM is not set | ||
| 30 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 31 | # CONFIG_SIBYTE_RHONE is not set | ||
| 32 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 33 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 34 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 34 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 35 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
| 36 | # CONFIG_SIBYTE_RHONE is not set | ||
| 37 | # CONFIG_SIBYTE_SWARM is not set | ||
| 38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 36 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 37 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
| 38 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
| 39 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
| 45 | # CONFIG_WR_PPMC is not set | ||
| 40 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 41 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 42 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 44 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
| 45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 46 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
| 55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 47 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 48 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 57 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 58 | CONFIG_CEVT_R4K=y | ||
| 59 | CONFIG_CSRC_R4K=y | ||
| 49 | CONFIG_DMA_NONCOHERENT=y | 60 | CONFIG_DMA_NONCOHERENT=y |
| 50 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 61 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 51 | CONFIG_EARLY_PRINTK=y | 62 | CONFIG_EARLY_PRINTK=y |
| 52 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 63 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | ||
| 53 | CONFIG_I8259=y | 65 | CONFIG_I8259=y |
| 54 | # CONFIG_NO_IOPORT is not set | 66 | # CONFIG_NO_IOPORT is not set |
| 67 | CONFIG_GENERIC_ISA_DMA=y | ||
| 68 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y | ||
| 55 | # CONFIG_CPU_BIG_ENDIAN is not set | 69 | # CONFIG_CPU_BIG_ENDIAN is not set |
| 56 | CONFIG_CPU_LITTLE_ENDIAN=y | 70 | CONFIG_CPU_LITTLE_ENDIAN=y |
| 57 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 71 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 58 | CONFIG_IRQ_CPU=y | 72 | CONFIG_IRQ_CPU=y |
| 59 | CONFIG_BOOT_ELF32=y | 73 | CONFIG_BOOT_ELF32=y |
| 60 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 74 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| 75 | CONFIG_HAVE_STD_PC_SERIAL_PORT=y | ||
| 61 | 76 | ||
| 62 | # | 77 | # |
| 63 | # CPU selection | 78 | # CPU selection |
| @@ -75,6 +90,7 @@ CONFIG_CPU_LOONGSON2=y | |||
| 75 | # CONFIG_CPU_TX49XX is not set | 90 | # CONFIG_CPU_TX49XX is not set |
| 76 | # CONFIG_CPU_R5000 is not set | 91 | # CONFIG_CPU_R5000 is not set |
| 77 | # CONFIG_CPU_R5432 is not set | 92 | # CONFIG_CPU_R5432 is not set |
| 93 | # CONFIG_CPU_R5500 is not set | ||
| 78 | # CONFIG_CPU_R6000 is not set | 94 | # CONFIG_CPU_R6000 is not set |
| 79 | # CONFIG_CPU_NEVADA is not set | 95 | # CONFIG_CPU_NEVADA is not set |
| 80 | # CONFIG_CPU_R8000 is not set | 96 | # CONFIG_CPU_R8000 is not set |
| @@ -101,7 +117,6 @@ CONFIG_BOARD_SCACHE=y | |||
| 101 | CONFIG_MIPS_MT_DISABLED=y | 117 | CONFIG_MIPS_MT_DISABLED=y |
| 102 | # CONFIG_MIPS_MT_SMP is not set | 118 | # CONFIG_MIPS_MT_SMP is not set |
| 103 | # CONFIG_MIPS_MT_SMTC is not set | 119 | # CONFIG_MIPS_MT_SMTC is not set |
| 104 | # CONFIG_MIPS_VPE_LOADER is not set | ||
| 105 | CONFIG_CPU_HAS_WB=y | 120 | CONFIG_CPU_HAS_WB=y |
| 106 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 107 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -109,6 +124,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
| 109 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 124 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 110 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | 125 | CONFIG_SYS_SUPPORTS_HIGHMEM=y |
| 111 | CONFIG_ARCH_FLATMEM_ENABLE=y | 126 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 127 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 112 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 128 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 113 | CONFIG_SELECT_MEMORY_MODEL=y | 129 | CONFIG_SELECT_MEMORY_MODEL=y |
| 114 | CONFIG_FLATMEM_MANUAL=y | 130 | CONFIG_FLATMEM_MANUAL=y |
| @@ -117,9 +133,17 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 117 | CONFIG_FLATMEM=y | 133 | CONFIG_FLATMEM=y |
| 118 | CONFIG_FLAT_NODE_MEM_MAP=y | 134 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 119 | CONFIG_SPARSEMEM_STATIC=y | 135 | CONFIG_SPARSEMEM_STATIC=y |
| 136 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 120 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 137 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 121 | CONFIG_RESOURCES_64BIT=y | 138 | CONFIG_RESOURCES_64BIT=y |
| 139 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 122 | CONFIG_ZONE_DMA_FLAG=0 | 140 | CONFIG_ZONE_DMA_FLAG=0 |
| 141 | CONFIG_VIRT_TO_BUS=y | ||
| 142 | CONFIG_UNEVICTABLE_LRU=y | ||
| 143 | CONFIG_TICK_ONESHOT=y | ||
| 144 | CONFIG_NO_HZ=y | ||
| 145 | CONFIG_HIGH_RES_TIMERS=y | ||
| 146 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 123 | # CONFIG_HZ_48 is not set | 147 | # CONFIG_HZ_48 is not set |
| 124 | # CONFIG_HZ_100 is not set | 148 | # CONFIG_HZ_100 is not set |
| 125 | # CONFIG_HZ_128 is not set | 149 | # CONFIG_HZ_128 is not set |
| @@ -133,37 +157,40 @@ CONFIG_HZ=250 | |||
| 133 | CONFIG_PREEMPT_VOLUNTARY=y | 157 | CONFIG_PREEMPT_VOLUNTARY=y |
| 134 | # CONFIG_PREEMPT is not set | 158 | # CONFIG_PREEMPT is not set |
| 135 | # CONFIG_KEXEC is not set | 159 | # CONFIG_KEXEC is not set |
| 160 | CONFIG_SECCOMP=y | ||
| 136 | CONFIG_LOCKDEP_SUPPORT=y | 161 | CONFIG_LOCKDEP_SUPPORT=y |
| 137 | CONFIG_STACKTRACE_SUPPORT=y | 162 | CONFIG_STACKTRACE_SUPPORT=y |
| 138 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 163 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 139 | 164 | ||
| 140 | # | 165 | # |
| 141 | # Code maturity level options | 166 | # General setup |
| 142 | # | 167 | # |
| 143 | CONFIG_EXPERIMENTAL=y | 168 | CONFIG_EXPERIMENTAL=y |
| 144 | CONFIG_BROKEN_ON_SMP=y | 169 | CONFIG_BROKEN_ON_SMP=y |
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 170 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="lm32" | 171 | CONFIG_LOCALVERSION="lm32" |
| 151 | # CONFIG_LOCALVERSION_AUTO is not set | 172 | # CONFIG_LOCALVERSION_AUTO is not set |
| 152 | CONFIG_SWAP=y | 173 | CONFIG_SWAP=y |
| 153 | CONFIG_SYSVIPC=y | 174 | CONFIG_SYSVIPC=y |
| 154 | # CONFIG_IPC_NS is not set | ||
| 155 | CONFIG_SYSVIPC_SYSCTL=y | 175 | CONFIG_SYSVIPC_SYSCTL=y |
| 156 | CONFIG_POSIX_MQUEUE=y | 176 | CONFIG_POSIX_MQUEUE=y |
| 157 | CONFIG_BSD_PROCESS_ACCT=y | 177 | CONFIG_BSD_PROCESS_ACCT=y |
| 158 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 178 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 159 | # CONFIG_TASKSTATS is not set | 179 | # CONFIG_TASKSTATS is not set |
| 160 | # CONFIG_UTS_NS is not set | ||
| 161 | # CONFIG_AUDIT is not set | 180 | # CONFIG_AUDIT is not set |
| 162 | CONFIG_IKCONFIG=y | 181 | CONFIG_IKCONFIG=y |
| 163 | CONFIG_IKCONFIG_PROC=y | 182 | CONFIG_IKCONFIG_PROC=y |
| 164 | CONFIG_LOG_BUF_SHIFT=14 | 183 | CONFIG_LOG_BUF_SHIFT=14 |
| 184 | # CONFIG_CGROUPS is not set | ||
| 185 | # CONFIG_GROUP_SCHED is not set | ||
| 165 | CONFIG_SYSFS_DEPRECATED=y | 186 | CONFIG_SYSFS_DEPRECATED=y |
| 187 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 166 | # CONFIG_RELAY is not set | 188 | # CONFIG_RELAY is not set |
| 189 | CONFIG_NAMESPACES=y | ||
| 190 | # CONFIG_UTS_NS is not set | ||
| 191 | # CONFIG_IPC_NS is not set | ||
| 192 | CONFIG_USER_NS=y | ||
| 193 | CONFIG_PID_NS=y | ||
| 167 | # CONFIG_BLK_DEV_INITRD is not set | 194 | # CONFIG_BLK_DEV_INITRD is not set |
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 195 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 169 | CONFIG_SYSCTL=y | 196 | CONFIG_SYSCTL=y |
| @@ -175,6 +202,8 @@ CONFIG_HOTPLUG=y | |||
| 175 | CONFIG_PRINTK=y | 202 | CONFIG_PRINTK=y |
| 176 | CONFIG_BUG=y | 203 | CONFIG_BUG=y |
| 177 | CONFIG_ELF_CORE=y | 204 | CONFIG_ELF_CORE=y |
| 205 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 206 | # CONFIG_COMPAT_BRK is not set | ||
| 178 | CONFIG_BASE_FULL=y | 207 | CONFIG_BASE_FULL=y |
| 179 | CONFIG_FUTEX=y | 208 | CONFIG_FUTEX=y |
| 180 | CONFIG_ANON_INODES=y | 209 | CONFIG_ANON_INODES=y |
| @@ -183,29 +212,33 @@ CONFIG_SIGNALFD=y | |||
| 183 | CONFIG_TIMERFD=y | 212 | CONFIG_TIMERFD=y |
| 184 | CONFIG_EVENTFD=y | 213 | CONFIG_EVENTFD=y |
| 185 | CONFIG_SHMEM=y | 214 | CONFIG_SHMEM=y |
| 215 | CONFIG_AIO=y | ||
| 186 | CONFIG_VM_EVENT_COUNTERS=y | 216 | CONFIG_VM_EVENT_COUNTERS=y |
| 217 | CONFIG_PCI_QUIRKS=y | ||
| 187 | CONFIG_SLAB=y | 218 | CONFIG_SLAB=y |
| 188 | # CONFIG_SLUB is not set | 219 | # CONFIG_SLUB is not set |
| 189 | # CONFIG_SLOB is not set | 220 | # CONFIG_SLOB is not set |
| 221 | CONFIG_PROFILING=y | ||
| 222 | # CONFIG_MARKERS is not set | ||
| 223 | CONFIG_OPROFILE=m | ||
| 224 | CONFIG_HAVE_OPROFILE=y | ||
| 225 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 226 | CONFIG_SLABINFO=y | ||
| 190 | CONFIG_RT_MUTEXES=y | 227 | CONFIG_RT_MUTEXES=y |
| 191 | # CONFIG_TINY_SHMEM is not set | 228 | # CONFIG_TINY_SHMEM is not set |
| 192 | CONFIG_BASE_SMALL=0 | 229 | CONFIG_BASE_SMALL=0 |
| 193 | |||
| 194 | # | ||
| 195 | # Loadable module support | ||
| 196 | # | ||
| 197 | CONFIG_MODULES=y | 230 | CONFIG_MODULES=y |
| 231 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 198 | CONFIG_MODULE_UNLOAD=y | 232 | CONFIG_MODULE_UNLOAD=y |
| 199 | CONFIG_MODULE_FORCE_UNLOAD=y | 233 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 200 | # CONFIG_MODVERSIONS is not set | 234 | # CONFIG_MODVERSIONS is not set |
| 201 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 235 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 202 | CONFIG_KMOD=y | 236 | CONFIG_KMOD=y |
| 203 | |||
| 204 | # | ||
| 205 | # Block layer | ||
| 206 | # | ||
| 207 | CONFIG_BLOCK=y | 237 | CONFIG_BLOCK=y |
| 208 | # CONFIG_BLK_DEV_IO_TRACE is not set | 238 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 239 | CONFIG_BLK_DEV_BSG=y | ||
| 240 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 241 | CONFIG_BLOCK_COMPAT=y | ||
| 209 | 242 | ||
| 210 | # | 243 | # |
| 211 | # IO Schedulers | 244 | # IO Schedulers |
| @@ -219,19 +252,19 @@ CONFIG_IOSCHED_CFQ=y | |||
| 219 | CONFIG_DEFAULT_CFQ=y | 252 | CONFIG_DEFAULT_CFQ=y |
| 220 | # CONFIG_DEFAULT_NOOP is not set | 253 | # CONFIG_DEFAULT_NOOP is not set |
| 221 | CONFIG_DEFAULT_IOSCHED="cfq" | 254 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 255 | CONFIG_CLASSIC_RCU=y | ||
| 256 | CONFIG_FREEZER=y | ||
| 222 | 257 | ||
| 223 | # | 258 | # |
| 224 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 259 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 225 | # | 260 | # |
| 226 | CONFIG_HW_HAS_PCI=y | 261 | CONFIG_HW_HAS_PCI=y |
| 227 | CONFIG_PCI=y | 262 | CONFIG_PCI=y |
| 263 | CONFIG_PCI_DOMAINS=y | ||
| 228 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 264 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 265 | CONFIG_PCI_LEGACY=y | ||
| 229 | CONFIG_ISA=y | 266 | CONFIG_ISA=y |
| 230 | CONFIG_MMU=y | 267 | CONFIG_MMU=y |
| 231 | |||
| 232 | # | ||
| 233 | # PCCARD (PCMCIA/CardBus) support | ||
| 234 | # | ||
| 235 | # CONFIG_PCCARD is not set | 268 | # CONFIG_PCCARD is not set |
| 236 | # CONFIG_HOTPLUG_PCI is not set | 269 | # CONFIG_HOTPLUG_PCI is not set |
| 237 | 270 | ||
| @@ -239,8 +272,9 @@ CONFIG_MMU=y | |||
| 239 | # Executable file formats | 272 | # Executable file formats |
| 240 | # | 273 | # |
| 241 | CONFIG_BINFMT_ELF=y | 274 | CONFIG_BINFMT_ELF=y |
| 275 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 276 | # CONFIG_HAVE_AOUT is not set | ||
| 242 | CONFIG_BINFMT_MISC=y | 277 | CONFIG_BINFMT_MISC=y |
| 243 | # CONFIG_BUILD_ELF64 is not set | ||
| 244 | CONFIG_MIPS32_COMPAT=y | 278 | CONFIG_MIPS32_COMPAT=y |
| 245 | CONFIG_COMPAT=y | 279 | CONFIG_COMPAT=y |
| 246 | CONFIG_SYSVIPC_COMPAT=y | 280 | CONFIG_SYSVIPC_COMPAT=y |
| @@ -251,14 +285,12 @@ CONFIG_BINFMT_ELF32=y | |||
| 251 | # | 285 | # |
| 252 | # Power management options | 286 | # Power management options |
| 253 | # | 287 | # |
| 288 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 254 | CONFIG_PM=y | 289 | CONFIG_PM=y |
| 255 | # CONFIG_PM_LEGACY is not set | ||
| 256 | # CONFIG_PM_DEBUG is not set | 290 | # CONFIG_PM_DEBUG is not set |
| 257 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 291 | CONFIG_PM_SLEEP=y |
| 258 | 292 | CONFIG_SUSPEND=y | |
| 259 | # | 293 | CONFIG_SUSPEND_FREEZER=y |
| 260 | # Networking | ||
| 261 | # | ||
| 262 | CONFIG_NET=y | 294 | CONFIG_NET=y |
| 263 | 295 | ||
| 264 | # | 296 | # |
| @@ -271,6 +303,7 @@ CONFIG_XFRM=y | |||
| 271 | # CONFIG_XFRM_USER is not set | 303 | # CONFIG_XFRM_USER is not set |
| 272 | # CONFIG_XFRM_SUB_POLICY is not set | 304 | # CONFIG_XFRM_SUB_POLICY is not set |
| 273 | # CONFIG_XFRM_MIGRATE is not set | 305 | # CONFIG_XFRM_MIGRATE is not set |
| 306 | # CONFIG_XFRM_STATISTICS is not set | ||
| 274 | # CONFIG_NET_KEY is not set | 307 | # CONFIG_NET_KEY is not set |
| 275 | CONFIG_INET=y | 308 | CONFIG_INET=y |
| 276 | CONFIG_IP_MULTICAST=y | 309 | CONFIG_IP_MULTICAST=y |
| @@ -294,18 +327,17 @@ CONFIG_INET_TUNNEL=m | |||
| 294 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 327 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 295 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 328 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 296 | CONFIG_INET_XFRM_MODE_BEET=y | 329 | CONFIG_INET_XFRM_MODE_BEET=y |
| 330 | # CONFIG_INET_LRO is not set | ||
| 297 | # CONFIG_INET_DIAG is not set | 331 | # CONFIG_INET_DIAG is not set |
| 298 | # CONFIG_TCP_CONG_ADVANCED is not set | 332 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 299 | CONFIG_TCP_CONG_CUBIC=y | 333 | CONFIG_TCP_CONG_CUBIC=y |
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 334 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 335 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IP_VS is not set | ||
| 303 | # CONFIG_IPV6 is not set | 336 | # CONFIG_IPV6 is not set |
| 304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 305 | # CONFIG_INET6_TUNNEL is not set | ||
| 306 | # CONFIG_NETWORK_SECMARK is not set | 337 | # CONFIG_NETWORK_SECMARK is not set |
| 307 | CONFIG_NETFILTER=y | 338 | CONFIG_NETFILTER=y |
| 308 | # CONFIG_NETFILTER_DEBUG is not set | 339 | # CONFIG_NETFILTER_DEBUG is not set |
| 340 | CONFIG_NETFILTER_ADVANCED=y | ||
| 309 | 341 | ||
| 310 | # | 342 | # |
| 311 | # Core Netfilter Configuration | 343 | # Core Netfilter Configuration |
| @@ -313,53 +345,59 @@ CONFIG_NETFILTER=y | |||
| 313 | CONFIG_NETFILTER_NETLINK=m | 345 | CONFIG_NETFILTER_NETLINK=m |
| 314 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 346 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 315 | CONFIG_NETFILTER_NETLINK_LOG=m | 347 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 316 | # CONFIG_NF_CONNTRACK_ENABLED is not set | ||
| 317 | # CONFIG_NF_CONNTRACK is not set | 348 | # CONFIG_NF_CONNTRACK is not set |
| 318 | CONFIG_NETFILTER_XTABLES=m | 349 | CONFIG_NETFILTER_XTABLES=m |
| 319 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 350 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 320 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 351 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 321 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 352 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 322 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 323 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | 353 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
| 354 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 355 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
| 356 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
| 324 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | 357 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set |
| 358 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
| 325 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 359 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 326 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 360 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 327 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 361 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
| 328 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 362 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 363 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
| 364 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
| 329 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 365 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 330 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 366 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 331 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 367 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 332 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 368 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 333 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
| 334 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 369 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 370 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
| 371 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
| 335 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 372 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 336 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 373 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 374 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
| 337 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 375 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 376 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 377 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 338 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 378 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 339 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 379 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| 340 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 380 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 341 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 381 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 342 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 382 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 383 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
| 384 | # CONFIG_IP_VS is not set | ||
| 343 | 385 | ||
| 344 | # | 386 | # |
| 345 | # IP: Netfilter Configuration | 387 | # IP: Netfilter Configuration |
| 346 | # | 388 | # |
| 389 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
| 347 | CONFIG_IP_NF_QUEUE=m | 390 | CONFIG_IP_NF_QUEUE=m |
| 348 | CONFIG_IP_NF_IPTABLES=m | 391 | CONFIG_IP_NF_IPTABLES=m |
| 349 | CONFIG_IP_NF_MATCH_IPRANGE=m | 392 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 350 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 351 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 352 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 353 | CONFIG_IP_NF_MATCH_AH=m | 393 | CONFIG_IP_NF_MATCH_AH=m |
| 394 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 354 | CONFIG_IP_NF_MATCH_TTL=m | 395 | CONFIG_IP_NF_MATCH_TTL=m |
| 355 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 356 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 357 | CONFIG_IP_NF_FILTER=m | 396 | CONFIG_IP_NF_FILTER=m |
| 358 | CONFIG_IP_NF_TARGET_REJECT=m | 397 | CONFIG_IP_NF_TARGET_REJECT=m |
| 359 | CONFIG_IP_NF_TARGET_LOG=m | 398 | CONFIG_IP_NF_TARGET_LOG=m |
| 360 | CONFIG_IP_NF_TARGET_ULOG=m | 399 | CONFIG_IP_NF_TARGET_ULOG=m |
| 361 | CONFIG_IP_NF_MANGLE=m | 400 | CONFIG_IP_NF_MANGLE=m |
| 362 | CONFIG_IP_NF_TARGET_TOS=m | ||
| 363 | CONFIG_IP_NF_TARGET_ECN=m | 401 | CONFIG_IP_NF_TARGET_ECN=m |
| 364 | CONFIG_IP_NF_TARGET_TTL=m | 402 | CONFIG_IP_NF_TARGET_TTL=m |
| 365 | CONFIG_IP_NF_RAW=m | 403 | CONFIG_IP_NF_RAW=m |
| @@ -371,6 +409,7 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 371 | # CONFIG_TIPC is not set | 409 | # CONFIG_TIPC is not set |
| 372 | # CONFIG_ATM is not set | 410 | # CONFIG_ATM is not set |
| 373 | # CONFIG_BRIDGE is not set | 411 | # CONFIG_BRIDGE is not set |
| 412 | # CONFIG_NET_DSA is not set | ||
| 374 | # CONFIG_VLAN_8021Q is not set | 413 | # CONFIG_VLAN_8021Q is not set |
| 375 | # CONFIG_DECNET is not set | 414 | # CONFIG_DECNET is not set |
| 376 | # CONFIG_LLC2 is not set | 415 | # CONFIG_LLC2 is not set |
| @@ -380,10 +419,6 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 380 | # CONFIG_LAPB is not set | 419 | # CONFIG_LAPB is not set |
| 381 | # CONFIG_ECONET is not set | 420 | # CONFIG_ECONET is not set |
| 382 | # CONFIG_WAN_ROUTER is not set | 421 | # CONFIG_WAN_ROUTER is not set |
| 383 | |||
| 384 | # | ||
| 385 | # QoS and/or fair queueing | ||
| 386 | # | ||
| 387 | # CONFIG_NET_SCHED is not set | 422 | # CONFIG_NET_SCHED is not set |
| 388 | CONFIG_NET_CLS_ROUTE=y | 423 | CONFIG_NET_CLS_ROUTE=y |
| 389 | 424 | ||
| @@ -392,23 +427,25 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 392 | # | 427 | # |
| 393 | # CONFIG_NET_PKTGEN is not set | 428 | # CONFIG_NET_PKTGEN is not set |
| 394 | # CONFIG_HAMRADIO is not set | 429 | # CONFIG_HAMRADIO is not set |
| 430 | # CONFIG_CAN is not set | ||
| 395 | # CONFIG_IRDA is not set | 431 | # CONFIG_IRDA is not set |
| 396 | # CONFIG_BT is not set | 432 | # CONFIG_BT is not set |
| 397 | # CONFIG_AF_RXRPC is not set | 433 | # CONFIG_AF_RXRPC is not set |
| 398 | 434 | CONFIG_PHONET=m | |
| 399 | # | 435 | CONFIG_WIRELESS=y |
| 400 | # Wireless | ||
| 401 | # | ||
| 402 | # CONFIG_CFG80211 is not set | 436 | # CONFIG_CFG80211 is not set |
| 437 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 403 | CONFIG_WIRELESS_EXT=y | 438 | CONFIG_WIRELESS_EXT=y |
| 439 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 404 | # CONFIG_MAC80211 is not set | 440 | # CONFIG_MAC80211 is not set |
| 405 | CONFIG_IEEE80211=m | 441 | CONFIG_IEEE80211=m |
| 406 | # CONFIG_IEEE80211_DEBUG is not set | 442 | # CONFIG_IEEE80211_DEBUG is not set |
| 407 | CONFIG_IEEE80211_CRYPT_WEP=m | 443 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 408 | # CONFIG_IEEE80211_CRYPT_CCMP is not set | 444 | # CONFIG_IEEE80211_CRYPT_CCMP is not set |
| 409 | # CONFIG_IEEE80211_CRYPT_TKIP is not set | 445 | # CONFIG_IEEE80211_CRYPT_TKIP is not set |
| 410 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
| 411 | # CONFIG_RFKILL is not set | 446 | # CONFIG_RFKILL is not set |
| 447 | CONFIG_NET_9P=m | ||
| 448 | # CONFIG_NET_9P_DEBUG is not set | ||
| 412 | 449 | ||
| 413 | # | 450 | # |
| 414 | # Device Drivers | 451 | # Device Drivers |
| @@ -417,14 +454,13 @@ CONFIG_IEEE80211_CRYPT_WEP=m | |||
| 417 | # | 454 | # |
| 418 | # Generic Driver Options | 455 | # Generic Driver Options |
| 419 | # | 456 | # |
| 457 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 420 | CONFIG_STANDALONE=y | 458 | CONFIG_STANDALONE=y |
| 421 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 459 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 422 | CONFIG_FW_LOADER=m | 460 | CONFIG_FW_LOADER=m |
| 461 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 462 | CONFIG_EXTRA_FIRMWARE="" | ||
| 423 | # CONFIG_SYS_HYPERVISOR is not set | 463 | # CONFIG_SYS_HYPERVISOR is not set |
| 424 | |||
| 425 | # | ||
| 426 | # Connector - unified userspace <-> kernelspace linker | ||
| 427 | # | ||
| 428 | # CONFIG_CONNECTOR is not set | 464 | # CONFIG_CONNECTOR is not set |
| 429 | CONFIG_MTD=m | 465 | CONFIG_MTD=m |
| 430 | # CONFIG_MTD_DEBUG is not set | 466 | # CONFIG_MTD_DEBUG is not set |
| @@ -443,6 +479,7 @@ CONFIG_MTD_BLOCK=m | |||
| 443 | # CONFIG_INFTL is not set | 479 | # CONFIG_INFTL is not set |
| 444 | # CONFIG_RFD_FTL is not set | 480 | # CONFIG_RFD_FTL is not set |
| 445 | # CONFIG_SSFDC is not set | 481 | # CONFIG_SSFDC is not set |
| 482 | # CONFIG_MTD_OOPS is not set | ||
| 446 | 483 | ||
| 447 | # | 484 | # |
| 448 | # RAM/ROM/Flash chip drivers | 485 | # RAM/ROM/Flash chip drivers |
| @@ -482,6 +519,7 @@ CONFIG_MTD_PHYSMAP=m | |||
| 482 | CONFIG_MTD_PHYSMAP_START=0x1fc00000 | 519 | CONFIG_MTD_PHYSMAP_START=0x1fc00000 |
| 483 | CONFIG_MTD_PHYSMAP_LEN=0x80000 | 520 | CONFIG_MTD_PHYSMAP_LEN=0x80000 |
| 484 | CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | 521 | CONFIG_MTD_PHYSMAP_BANKWIDTH=1 |
| 522 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 485 | # CONFIG_MTD_PLATRAM is not set | 523 | # CONFIG_MTD_PLATRAM is not set |
| 486 | 524 | ||
| 487 | # | 525 | # |
| @@ -506,21 +544,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 506 | # UBI - Unsorted block images | 544 | # UBI - Unsorted block images |
| 507 | # | 545 | # |
| 508 | # CONFIG_MTD_UBI is not set | 546 | # CONFIG_MTD_UBI is not set |
| 509 | |||
| 510 | # | ||
| 511 | # Parallel port support | ||
| 512 | # | ||
| 513 | # CONFIG_PARPORT is not set | 547 | # CONFIG_PARPORT is not set |
| 514 | |||
| 515 | # | ||
| 516 | # Plug and Play support | ||
| 517 | # | ||
| 518 | # CONFIG_PNP is not set | 548 | # CONFIG_PNP is not set |
| 519 | # CONFIG_PNPACPI is not set | 549 | CONFIG_BLK_DEV=y |
| 520 | |||
| 521 | # | ||
| 522 | # Block devices | ||
| 523 | # | ||
| 524 | # CONFIG_BLK_CPQ_DA is not set | 550 | # CONFIG_BLK_CPQ_DA is not set |
| 525 | # CONFIG_BLK_CPQ_CISS_DA is not set | 551 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 526 | # CONFIG_BLK_DEV_DAC960 is not set | 552 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -534,32 +560,28 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
| 534 | CONFIG_BLK_DEV_RAM=m | 560 | CONFIG_BLK_DEV_RAM=m |
| 535 | CONFIG_BLK_DEV_RAM_COUNT=16 | 561 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 536 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 562 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 537 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 563 | # CONFIG_BLK_DEV_XIP is not set |
| 538 | CONFIG_CDROM_PKTCDVD=m | 564 | CONFIG_CDROM_PKTCDVD=m |
| 539 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 565 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 540 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 566 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 541 | CONFIG_ATA_OVER_ETH=m | 567 | CONFIG_ATA_OVER_ETH=m |
| 542 | 568 | # CONFIG_BLK_DEV_HD is not set | |
| 543 | # | 569 | # CONFIG_MISC_DEVICES is not set |
| 544 | # Misc devices | 570 | CONFIG_HAVE_IDE=y |
| 545 | # | ||
| 546 | # CONFIG_PHANTOM is not set | ||
| 547 | # CONFIG_SGI_IOC4 is not set | ||
| 548 | # CONFIG_TIFM_CORE is not set | ||
| 549 | # CONFIG_BLINK is not set | ||
| 550 | CONFIG_IDE=y | 571 | CONFIG_IDE=y |
| 551 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 552 | CONFIG_BLK_DEV_IDE=y | ||
| 553 | 572 | ||
| 554 | # | 573 | # |
| 555 | # Please see Documentation/ide.txt for help/info on IDE drives | 574 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 556 | # | 575 | # |
| 576 | CONFIG_IDE_TIMINGS=y | ||
| 577 | CONFIG_IDE_ATAPI=y | ||
| 557 | # CONFIG_BLK_DEV_IDE_SATA is not set | 578 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 558 | CONFIG_BLK_DEV_IDEDISK=y | 579 | CONFIG_IDE_GD=y |
| 559 | CONFIG_IDEDISK_MULTI_MODE=y | 580 | CONFIG_IDE_GD_ATA=y |
| 581 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 560 | CONFIG_BLK_DEV_IDECD=y | 582 | CONFIG_BLK_DEV_IDECD=y |
| 583 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 561 | # CONFIG_BLK_DEV_IDETAPE is not set | 584 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 562 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 563 | CONFIG_BLK_DEV_IDESCSI=y | 585 | CONFIG_BLK_DEV_IDESCSI=y |
| 564 | CONFIG_IDE_TASK_IOCTL=y | 586 | CONFIG_IDE_TASK_IOCTL=y |
| 565 | CONFIG_IDE_PROC_FS=y | 587 | CONFIG_IDE_PROC_FS=y |
| @@ -568,24 +590,25 @@ CONFIG_IDE_PROC_FS=y | |||
| 568 | # IDE chipset support/bugfixes | 590 | # IDE chipset support/bugfixes |
| 569 | # | 591 | # |
| 570 | CONFIG_IDE_GENERIC=y | 592 | CONFIG_IDE_GENERIC=y |
| 593 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
| 594 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
| 595 | |||
| 596 | # | ||
| 597 | # PCI IDE chipsets support | ||
| 598 | # | ||
| 571 | CONFIG_BLK_DEV_IDEPCI=y | 599 | CONFIG_BLK_DEV_IDEPCI=y |
| 572 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
| 573 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 600 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
| 574 | # CONFIG_BLK_DEV_OFFBOARD is not set | 601 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 575 | CONFIG_BLK_DEV_GENERIC=y | 602 | CONFIG_BLK_DEV_GENERIC=y |
| 576 | # CONFIG_BLK_DEV_OPTI621 is not set | 603 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 577 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 604 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 578 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 579 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 580 | # CONFIG_BLK_DEV_AEC62XX is not set | 605 | # CONFIG_BLK_DEV_AEC62XX is not set |
| 581 | # CONFIG_BLK_DEV_ALI15X3 is not set | 606 | # CONFIG_BLK_DEV_ALI15X3 is not set |
| 582 | # CONFIG_BLK_DEV_AMD74XX is not set | 607 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 583 | # CONFIG_BLK_DEV_CMD64X is not set | 608 | # CONFIG_BLK_DEV_CMD64X is not set |
| 584 | # CONFIG_BLK_DEV_TRIFLEX is not set | 609 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 585 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 586 | # CONFIG_BLK_DEV_CS5520 is not set | 610 | # CONFIG_BLK_DEV_CS5520 is not set |
| 587 | # CONFIG_BLK_DEV_CS5530 is not set | 611 | # CONFIG_BLK_DEV_CS5530 is not set |
| 588 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 589 | # CONFIG_BLK_DEV_HPT366 is not set | 612 | # CONFIG_BLK_DEV_HPT366 is not set |
| 590 | # CONFIG_BLK_DEV_JMICRON is not set | 613 | # CONFIG_BLK_DEV_JMICRON is not set |
| 591 | # CONFIG_BLK_DEV_SC1200 is not set | 614 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -601,17 +624,28 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 601 | # CONFIG_BLK_DEV_TRM290 is not set | 624 | # CONFIG_BLK_DEV_TRM290 is not set |
| 602 | CONFIG_BLK_DEV_VIA82CXXX=y | 625 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 603 | # CONFIG_BLK_DEV_TC86C001 is not set | 626 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 604 | # CONFIG_IDE_ARM is not set | 627 | |
| 605 | # CONFIG_IDE_CHIPSETS is not set | 628 | # |
| 629 | # Other IDE chipsets support | ||
| 630 | # | ||
| 631 | |||
| 632 | # | ||
| 633 | # Note: most of these also require special kernel boot parameters | ||
| 634 | # | ||
| 635 | # CONFIG_BLK_DEV_4DRIVES is not set | ||
| 636 | # CONFIG_BLK_DEV_ALI14XX is not set | ||
| 637 | # CONFIG_BLK_DEV_DTC2278 is not set | ||
| 638 | # CONFIG_BLK_DEV_HT6560B is not set | ||
| 639 | # CONFIG_BLK_DEV_QD65XX is not set | ||
| 640 | # CONFIG_BLK_DEV_UMC8672 is not set | ||
| 606 | CONFIG_BLK_DEV_IDEDMA=y | 641 | CONFIG_BLK_DEV_IDEDMA=y |
| 607 | # CONFIG_IDEDMA_IVB is not set | ||
| 608 | # CONFIG_BLK_DEV_HD is not set | ||
| 609 | 642 | ||
| 610 | # | 643 | # |
| 611 | # SCSI device support | 644 | # SCSI device support |
| 612 | # | 645 | # |
| 613 | # CONFIG_RAID_ATTRS is not set | 646 | # CONFIG_RAID_ATTRS is not set |
| 614 | CONFIG_SCSI=y | 647 | CONFIG_SCSI=y |
| 648 | CONFIG_SCSI_DMA=y | ||
| 615 | # CONFIG_SCSI_TGT is not set | 649 | # CONFIG_SCSI_TGT is not set |
| 616 | # CONFIG_SCSI_NETLINK is not set | 650 | # CONFIG_SCSI_NETLINK is not set |
| 617 | CONFIG_SCSI_PROC_FS=y | 651 | CONFIG_SCSI_PROC_FS=y |
| @@ -644,88 +678,30 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 644 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 678 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 645 | # CONFIG_SCSI_SAS_ATTRS is not set | 679 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 646 | # CONFIG_SCSI_SAS_LIBSAS is not set | 680 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 647 | 681 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 648 | # | 682 | # CONFIG_SCSI_LOWLEVEL is not set |
| 649 | # SCSI low-level drivers | 683 | # CONFIG_SCSI_DH is not set |
| 650 | # | ||
| 651 | # CONFIG_ISCSI_TCP is not set | ||
| 652 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 653 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 654 | # CONFIG_SCSI_ACARD is not set | ||
| 655 | # CONFIG_SCSI_AACRAID is not set | ||
| 656 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 657 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 658 | # CONFIG_SCSI_AIC79XX is not set | ||
| 659 | # CONFIG_SCSI_AIC94XX is not set | ||
| 660 | # CONFIG_SCSI_IN2000 is not set | ||
| 661 | # CONFIG_SCSI_ARCMSR is not set | ||
| 662 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 663 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 664 | # CONFIG_MEGARAID_SAS is not set | ||
| 665 | # CONFIG_SCSI_HPTIOP is not set | ||
| 666 | # CONFIG_SCSI_DMX3191D is not set | ||
| 667 | # CONFIG_SCSI_DTC3280 is not set | ||
| 668 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 669 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | ||
| 670 | # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set | ||
| 671 | # CONFIG_SCSI_IPS is not set | ||
| 672 | # CONFIG_SCSI_INITIO is not set | ||
| 673 | # CONFIG_SCSI_INIA100 is not set | ||
| 674 | # CONFIG_SCSI_NCR53C406A is not set | ||
| 675 | # CONFIG_SCSI_STEX is not set | ||
| 676 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 677 | # CONFIG_SCSI_PAS16 is not set | ||
| 678 | # CONFIG_SCSI_PSI240I is not set | ||
| 679 | # CONFIG_SCSI_QLOGIC_FAS is not set | ||
| 680 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 681 | # CONFIG_SCSI_QLA_FC is not set | ||
| 682 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 683 | # CONFIG_SCSI_LPFC is not set | ||
| 684 | # CONFIG_SCSI_SYM53C416 is not set | ||
| 685 | # CONFIG_SCSI_DC395x is not set | ||
| 686 | # CONFIG_SCSI_DC390T is not set | ||
| 687 | # CONFIG_SCSI_T128 is not set | ||
| 688 | # CONFIG_SCSI_DEBUG is not set | ||
| 689 | # CONFIG_SCSI_SRP is not set | ||
| 690 | # CONFIG_ATA is not set | 684 | # CONFIG_ATA is not set |
| 691 | |||
| 692 | # | ||
| 693 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
| 694 | # | ||
| 695 | # CONFIG_CD_NO_IDESCSI is not set | ||
| 696 | |||
| 697 | # | ||
| 698 | # Multi-device support (RAID and LVM) | ||
| 699 | # | ||
| 700 | # CONFIG_MD is not set | 685 | # CONFIG_MD is not set |
| 701 | |||
| 702 | # | ||
| 703 | # Fusion MPT device support | ||
| 704 | # | ||
| 705 | # CONFIG_FUSION is not set | 686 | # CONFIG_FUSION is not set |
| 706 | # CONFIG_FUSION_SPI is not set | ||
| 707 | # CONFIG_FUSION_FC is not set | ||
| 708 | # CONFIG_FUSION_SAS is not set | ||
| 709 | 687 | ||
| 710 | # | 688 | # |
| 711 | # IEEE 1394 (FireWire) support | 689 | # IEEE 1394 (FireWire) support |
| 712 | # | 690 | # |
| 713 | # CONFIG_FIREWIRE is not set | ||
| 714 | # CONFIG_IEEE1394 is not set | ||
| 715 | 691 | ||
| 716 | # | 692 | # |
| 717 | # I2O device support | 693 | # Enable only one of the two stacks, unless you know what you are doing |
| 718 | # | 694 | # |
| 695 | # CONFIG_FIREWIRE is not set | ||
| 696 | # CONFIG_IEEE1394 is not set | ||
| 719 | # CONFIG_I2O is not set | 697 | # CONFIG_I2O is not set |
| 720 | |||
| 721 | # | ||
| 722 | # Network device support | ||
| 723 | # | ||
| 724 | CONFIG_NETDEVICES=y | 698 | CONFIG_NETDEVICES=y |
| 725 | # CONFIG_DUMMY is not set | 699 | # CONFIG_DUMMY is not set |
| 726 | # CONFIG_BONDING is not set | 700 | # CONFIG_BONDING is not set |
| 701 | CONFIG_MACVLAN=m | ||
| 727 | # CONFIG_EQUALIZER is not set | 702 | # CONFIG_EQUALIZER is not set |
| 728 | # CONFIG_TUN is not set | 703 | # CONFIG_TUN is not set |
| 704 | CONFIG_VETH=m | ||
| 729 | # CONFIG_ARCNET is not set | 705 | # CONFIG_ARCNET is not set |
| 730 | CONFIG_PHYLIB=m | 706 | CONFIG_PHYLIB=m |
| 731 | 707 | ||
| @@ -740,29 +716,32 @@ CONFIG_CICADA_PHY=m | |||
| 740 | # CONFIG_VITESSE_PHY is not set | 716 | # CONFIG_VITESSE_PHY is not set |
| 741 | # CONFIG_SMSC_PHY is not set | 717 | # CONFIG_SMSC_PHY is not set |
| 742 | # CONFIG_BROADCOM_PHY is not set | 718 | # CONFIG_BROADCOM_PHY is not set |
| 743 | # CONFIG_FIXED_PHY is not set | 719 | # CONFIG_ICPLUS_PHY is not set |
| 744 | 720 | # CONFIG_REALTEK_PHY is not set | |
| 745 | # | 721 | # CONFIG_MDIO_BITBANG is not set |
| 746 | # Ethernet (10 or 100Mbit) | ||
| 747 | # | ||
| 748 | CONFIG_NET_ETHERNET=y | 722 | CONFIG_NET_ETHERNET=y |
| 749 | CONFIG_MII=y | 723 | CONFIG_MII=y |
| 724 | # CONFIG_AX88796 is not set | ||
| 750 | # CONFIG_HAPPYMEAL is not set | 725 | # CONFIG_HAPPYMEAL is not set |
| 751 | # CONFIG_SUNGEM is not set | 726 | # CONFIG_SUNGEM is not set |
| 752 | # CONFIG_CASSINI is not set | 727 | # CONFIG_CASSINI is not set |
| 753 | # CONFIG_NET_VENDOR_3COM is not set | 728 | # CONFIG_NET_VENDOR_3COM is not set |
| 754 | # CONFIG_NET_VENDOR_SMC is not set | 729 | # CONFIG_NET_VENDOR_SMC is not set |
| 730 | # CONFIG_SMC91X is not set | ||
| 755 | # CONFIG_DM9000 is not set | 731 | # CONFIG_DM9000 is not set |
| 756 | # CONFIG_NET_VENDOR_RACAL is not set | 732 | # CONFIG_NET_VENDOR_RACAL is not set |
| 757 | |||
| 758 | # | ||
| 759 | # Tulip family network device support | ||
| 760 | # | ||
| 761 | # CONFIG_NET_TULIP is not set | 733 | # CONFIG_NET_TULIP is not set |
| 762 | # CONFIG_AT1700 is not set | 734 | # CONFIG_AT1700 is not set |
| 763 | # CONFIG_DEPCA is not set | 735 | # CONFIG_DEPCA is not set |
| 764 | # CONFIG_HP100 is not set | 736 | # CONFIG_HP100 is not set |
| 765 | # CONFIG_NET_ISA is not set | 737 | # CONFIG_NET_ISA is not set |
| 738 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 739 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 740 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 741 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 742 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 743 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 744 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 766 | CONFIG_NET_PCI=y | 745 | CONFIG_NET_PCI=y |
| 767 | # CONFIG_PCNET32 is not set | 746 | # CONFIG_PCNET32 is not set |
| 768 | # CONFIG_AMD8111_ETH is not set | 747 | # CONFIG_AMD8111_ETH is not set |
| @@ -773,7 +752,6 @@ CONFIG_NET_PCI=y | |||
| 773 | # CONFIG_FORCEDETH is not set | 752 | # CONFIG_FORCEDETH is not set |
| 774 | # CONFIG_CS89x0 is not set | 753 | # CONFIG_CS89x0 is not set |
| 775 | # CONFIG_TC35815 is not set | 754 | # CONFIG_TC35815 is not set |
| 776 | # CONFIG_DGRS is not set | ||
| 777 | # CONFIG_EEPRO100 is not set | 755 | # CONFIG_EEPRO100 is not set |
| 778 | # CONFIG_E100 is not set | 756 | # CONFIG_E100 is not set |
| 779 | # CONFIG_FEALNX is not set | 757 | # CONFIG_FEALNX is not set |
| @@ -785,15 +763,21 @@ CONFIG_8139TOO=y | |||
| 785 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 763 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 786 | # CONFIG_8139TOO_8129 is not set | 764 | # CONFIG_8139TOO_8129 is not set |
| 787 | # CONFIG_8139_OLD_RX_RESET is not set | 765 | # CONFIG_8139_OLD_RX_RESET is not set |
| 766 | # CONFIG_R6040 is not set | ||
| 788 | # CONFIG_SIS900 is not set | 767 | # CONFIG_SIS900 is not set |
| 789 | # CONFIG_EPIC100 is not set | 768 | # CONFIG_EPIC100 is not set |
| 790 | # CONFIG_SUNDANCE is not set | 769 | # CONFIG_SUNDANCE is not set |
| 770 | # CONFIG_TLAN is not set | ||
| 791 | # CONFIG_VIA_RHINE is not set | 771 | # CONFIG_VIA_RHINE is not set |
| 792 | # CONFIG_SC92031 is not set | 772 | # CONFIG_SC92031 is not set |
| 773 | # CONFIG_ATL2 is not set | ||
| 793 | CONFIG_NETDEV_1000=y | 774 | CONFIG_NETDEV_1000=y |
| 794 | # CONFIG_ACENIC is not set | 775 | # CONFIG_ACENIC is not set |
| 795 | # CONFIG_DL2K is not set | 776 | # CONFIG_DL2K is not set |
| 796 | # CONFIG_E1000 is not set | 777 | # CONFIG_E1000 is not set |
| 778 | # CONFIG_E1000E is not set | ||
| 779 | # CONFIG_IP1000 is not set | ||
| 780 | # CONFIG_IGB is not set | ||
| 797 | # CONFIG_NS83820 is not set | 781 | # CONFIG_NS83820 is not set |
| 798 | # CONFIG_HAMACHI is not set | 782 | # CONFIG_HAMACHI is not set |
| 799 | # CONFIG_YELLOWFIN is not set | 783 | # CONFIG_YELLOWFIN is not set |
| @@ -801,20 +785,29 @@ CONFIG_NETDEV_1000=y | |||
| 801 | # CONFIG_SIS190 is not set | 785 | # CONFIG_SIS190 is not set |
| 802 | # CONFIG_SKGE is not set | 786 | # CONFIG_SKGE is not set |
| 803 | # CONFIG_SKY2 is not set | 787 | # CONFIG_SKY2 is not set |
| 804 | # CONFIG_SK98LIN is not set | ||
| 805 | # CONFIG_VIA_VELOCITY is not set | 788 | # CONFIG_VIA_VELOCITY is not set |
| 806 | # CONFIG_TIGON3 is not set | 789 | # CONFIG_TIGON3 is not set |
| 807 | # CONFIG_BNX2 is not set | 790 | # CONFIG_BNX2 is not set |
| 808 | # CONFIG_QLA3XXX is not set | 791 | # CONFIG_QLA3XXX is not set |
| 809 | # CONFIG_ATL1 is not set | 792 | # CONFIG_ATL1 is not set |
| 793 | # CONFIG_ATL1E is not set | ||
| 794 | # CONFIG_JME is not set | ||
| 810 | CONFIG_NETDEV_10000=y | 795 | CONFIG_NETDEV_10000=y |
| 811 | # CONFIG_CHELSIO_T1 is not set | 796 | # CONFIG_CHELSIO_T1 is not set |
| 812 | # CONFIG_CHELSIO_T3 is not set | 797 | # CONFIG_CHELSIO_T3 is not set |
| 798 | # CONFIG_ENIC is not set | ||
| 799 | # CONFIG_IXGBE is not set | ||
| 813 | # CONFIG_IXGB is not set | 800 | # CONFIG_IXGB is not set |
| 814 | # CONFIG_S2IO is not set | 801 | # CONFIG_S2IO is not set |
| 815 | # CONFIG_MYRI10GE is not set | 802 | # CONFIG_MYRI10GE is not set |
| 816 | # CONFIG_NETXEN_NIC is not set | 803 | # CONFIG_NETXEN_NIC is not set |
| 804 | # CONFIG_NIU is not set | ||
| 805 | # CONFIG_MLX4_EN is not set | ||
| 817 | # CONFIG_MLX4_CORE is not set | 806 | # CONFIG_MLX4_CORE is not set |
| 807 | # CONFIG_TEHUTI is not set | ||
| 808 | # CONFIG_BNX2X is not set | ||
| 809 | # CONFIG_QLGE is not set | ||
| 810 | # CONFIG_SFC is not set | ||
| 818 | # CONFIG_TR is not set | 811 | # CONFIG_TR is not set |
| 819 | 812 | ||
| 820 | # | 813 | # |
| @@ -822,6 +815,7 @@ CONFIG_NETDEV_10000=y | |||
| 822 | # | 815 | # |
| 823 | # CONFIG_WLAN_PRE80211 is not set | 816 | # CONFIG_WLAN_PRE80211 is not set |
| 824 | # CONFIG_WLAN_80211 is not set | 817 | # CONFIG_WLAN_80211 is not set |
| 818 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 825 | 819 | ||
| 826 | # | 820 | # |
| 827 | # USB Network Adapters | 821 | # USB Network Adapters |
| @@ -830,7 +824,6 @@ CONFIG_NETDEV_10000=y | |||
| 830 | # CONFIG_USB_KAWETH is not set | 824 | # CONFIG_USB_KAWETH is not set |
| 831 | # CONFIG_USB_PEGASUS is not set | 825 | # CONFIG_USB_PEGASUS is not set |
| 832 | # CONFIG_USB_RTL8150 is not set | 826 | # CONFIG_USB_RTL8150 is not set |
| 833 | # CONFIG_USB_USBNET_MII is not set | ||
| 834 | # CONFIG_USB_USBNET is not set | 827 | # CONFIG_USB_USBNET is not set |
| 835 | # CONFIG_WAN is not set | 828 | # CONFIG_WAN is not set |
| 836 | # CONFIG_FDDI is not set | 829 | # CONFIG_FDDI is not set |
| @@ -844,25 +837,17 @@ CONFIG_PPP_DEFLATE=m | |||
| 844 | CONFIG_PPP_BSDCOMP=m | 837 | CONFIG_PPP_BSDCOMP=m |
| 845 | CONFIG_PPP_MPPE=m | 838 | CONFIG_PPP_MPPE=m |
| 846 | CONFIG_PPPOE=m | 839 | CONFIG_PPPOE=m |
| 840 | CONFIG_PPPOL2TP=m | ||
| 847 | CONFIG_SLIP=m | 841 | CONFIG_SLIP=m |
| 848 | CONFIG_SLIP_COMPRESSED=y | 842 | CONFIG_SLIP_COMPRESSED=y |
| 849 | CONFIG_SLHC=m | 843 | CONFIG_SLHC=m |
| 850 | CONFIG_SLIP_SMART=y | 844 | CONFIG_SLIP_SMART=y |
| 851 | CONFIG_SLIP_MODE_SLIP6=y | 845 | CONFIG_SLIP_MODE_SLIP6=y |
| 852 | CONFIG_NET_FC=y | 846 | CONFIG_NET_FC=y |
| 853 | # CONFIG_SHAPER is not set | ||
| 854 | # CONFIG_NETCONSOLE is not set | 847 | # CONFIG_NETCONSOLE is not set |
| 855 | # CONFIG_NETPOLL is not set | 848 | # CONFIG_NETPOLL is not set |
| 856 | # CONFIG_NET_POLL_CONTROLLER is not set | 849 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 857 | |||
| 858 | # | ||
| 859 | # ISDN subsystem | ||
| 860 | # | ||
| 861 | # CONFIG_ISDN is not set | 850 | # CONFIG_ISDN is not set |
| 862 | |||
| 863 | # | ||
| 864 | # Telephony Support | ||
| 865 | # | ||
| 866 | # CONFIG_PHONE is not set | 851 | # CONFIG_PHONE is not set |
| 867 | 852 | ||
| 868 | # | 853 | # |
| @@ -870,6 +855,7 @@ CONFIG_NET_FC=y | |||
| 870 | # | 855 | # |
| 871 | CONFIG_INPUT=y | 856 | CONFIG_INPUT=y |
| 872 | CONFIG_INPUT_FF_MEMLESS=y | 857 | CONFIG_INPUT_FF_MEMLESS=y |
| 858 | # CONFIG_INPUT_POLLDEV is not set | ||
| 873 | 859 | ||
| 874 | # | 860 | # |
| 875 | # Userland interfaces | 861 | # Userland interfaces |
| @@ -879,7 +865,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 879 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 865 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 880 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 866 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 881 | # CONFIG_INPUT_JOYDEV is not set | 867 | # CONFIG_INPUT_JOYDEV is not set |
| 882 | # CONFIG_INPUT_TSDEV is not set | ||
| 883 | # CONFIG_INPUT_EVDEV is not set | 868 | # CONFIG_INPUT_EVDEV is not set |
| 884 | # CONFIG_INPUT_EVBUG is not set | 869 | # CONFIG_INPUT_EVBUG is not set |
| 885 | 870 | ||
| @@ -900,9 +885,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 900 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 885 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 901 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 886 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 902 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 887 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 888 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 903 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 889 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 904 | CONFIG_MOUSE_SERIAL=y | 890 | CONFIG_MOUSE_SERIAL=y |
| 905 | # CONFIG_MOUSE_APPLETOUCH is not set | 891 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 892 | # CONFIG_MOUSE_BCM5974 is not set | ||
| 906 | # CONFIG_MOUSE_INPORT is not set | 893 | # CONFIG_MOUSE_INPORT is not set |
| 907 | # CONFIG_MOUSE_LOGIBM is not set | 894 | # CONFIG_MOUSE_LOGIBM is not set |
| 908 | # CONFIG_MOUSE_PC110PAD is not set | 895 | # CONFIG_MOUSE_PC110PAD is not set |
| @@ -927,10 +914,13 @@ CONFIG_SERIO_LIBPS2=y | |||
| 927 | # Character devices | 914 | # Character devices |
| 928 | # | 915 | # |
| 929 | CONFIG_VT=y | 916 | CONFIG_VT=y |
| 917 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 930 | CONFIG_VT_CONSOLE=y | 918 | CONFIG_VT_CONSOLE=y |
| 931 | CONFIG_HW_CONSOLE=y | 919 | CONFIG_HW_CONSOLE=y |
| 932 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 920 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 921 | CONFIG_DEVKMEM=y | ||
| 933 | # CONFIG_SERIAL_NONSTANDARD is not set | 922 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 923 | # CONFIG_NOZOMI is not set | ||
| 934 | 924 | ||
| 935 | # | 925 | # |
| 936 | # Serial drivers | 926 | # Serial drivers |
| @@ -951,105 +941,152 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 951 | CONFIG_UNIX98_PTYS=y | 941 | CONFIG_UNIX98_PTYS=y |
| 952 | CONFIG_LEGACY_PTYS=y | 942 | CONFIG_LEGACY_PTYS=y |
| 953 | CONFIG_LEGACY_PTY_COUNT=256 | 943 | CONFIG_LEGACY_PTY_COUNT=256 |
| 954 | |||
| 955 | # | ||
| 956 | # IPMI | ||
| 957 | # | ||
| 958 | # CONFIG_IPMI_HANDLER is not set | 944 | # CONFIG_IPMI_HANDLER is not set |
| 959 | # CONFIG_WATCHDOG is not set | ||
| 960 | CONFIG_HW_RANDOM=y | 945 | CONFIG_HW_RANDOM=y |
| 961 | CONFIG_RTC=y | ||
| 962 | # CONFIG_DTLK is not set | 946 | # CONFIG_DTLK is not set |
| 963 | # CONFIG_R3964 is not set | 947 | # CONFIG_R3964 is not set |
| 964 | # CONFIG_APPLICOM is not set | 948 | # CONFIG_APPLICOM is not set |
| 965 | # CONFIG_DRM is not set | ||
| 966 | # CONFIG_RAW_DRIVER is not set | 949 | # CONFIG_RAW_DRIVER is not set |
| 967 | |||
| 968 | # | ||
| 969 | # TPM devices | ||
| 970 | # | ||
| 971 | # CONFIG_TCG_TPM is not set | 950 | # CONFIG_TCG_TPM is not set |
| 972 | CONFIG_DEVPORT=y | 951 | CONFIG_DEVPORT=y |
| 973 | CONFIG_I2C=m | 952 | CONFIG_I2C=m |
| 974 | CONFIG_I2C_BOARDINFO=y | 953 | CONFIG_I2C_BOARDINFO=y |
| 975 | CONFIG_I2C_CHARDEV=m | 954 | CONFIG_I2C_CHARDEV=m |
| 955 | CONFIG_I2C_HELPER_AUTO=y | ||
| 976 | 956 | ||
| 977 | # | 957 | # |
| 978 | # I2C Algorithms | 958 | # I2C Hardware Bus support |
| 979 | # | 959 | # |
| 980 | # CONFIG_I2C_ALGOBIT is not set | ||
| 981 | # CONFIG_I2C_ALGOPCF is not set | ||
| 982 | # CONFIG_I2C_ALGOPCA is not set | ||
| 983 | 960 | ||
| 984 | # | 961 | # |
| 985 | # I2C Hardware Bus support | 962 | # PC SMBus host controller drivers |
| 986 | # | 963 | # |
| 987 | # CONFIG_I2C_ALI1535 is not set | 964 | # CONFIG_I2C_ALI1535 is not set |
| 988 | # CONFIG_I2C_ALI1563 is not set | 965 | # CONFIG_I2C_ALI1563 is not set |
| 989 | # CONFIG_I2C_ALI15X3 is not set | 966 | # CONFIG_I2C_ALI15X3 is not set |
| 990 | # CONFIG_I2C_AMD756 is not set | 967 | # CONFIG_I2C_AMD756 is not set |
| 991 | # CONFIG_I2C_AMD8111 is not set | 968 | # CONFIG_I2C_AMD8111 is not set |
| 992 | # CONFIG_I2C_ELEKTOR is not set | ||
| 993 | # CONFIG_I2C_I801 is not set | 969 | # CONFIG_I2C_I801 is not set |
| 994 | # CONFIG_I2C_I810 is not set | 970 | # CONFIG_I2C_ISCH is not set |
| 995 | # CONFIG_I2C_PIIX4 is not set | 971 | # CONFIG_I2C_PIIX4 is not set |
| 996 | # CONFIG_I2C_NFORCE2 is not set | 972 | # CONFIG_I2C_NFORCE2 is not set |
| 997 | # CONFIG_I2C_OCORES is not set | ||
| 998 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 999 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1000 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1001 | # CONFIG_I2C_SIMTEC is not set | ||
| 1002 | # CONFIG_I2C_SIS5595 is not set | 973 | # CONFIG_I2C_SIS5595 is not set |
| 1003 | # CONFIG_I2C_SIS630 is not set | 974 | # CONFIG_I2C_SIS630 is not set |
| 1004 | # CONFIG_I2C_SIS96X is not set | 975 | # CONFIG_I2C_SIS96X is not set |
| 1005 | # CONFIG_I2C_STUB is not set | ||
| 1006 | # CONFIG_I2C_TINY_USB is not set | ||
| 1007 | # CONFIG_I2C_VIA is not set | 976 | # CONFIG_I2C_VIA is not set |
| 1008 | CONFIG_I2C_VIAPRO=m | 977 | CONFIG_I2C_VIAPRO=m |
| 978 | |||
| 979 | # | ||
| 980 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 981 | # | ||
| 982 | # CONFIG_I2C_OCORES is not set | ||
| 983 | # CONFIG_I2C_SIMTEC is not set | ||
| 984 | |||
| 985 | # | ||
| 986 | # External I2C/SMBus adapter drivers | ||
| 987 | # | ||
| 988 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 989 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 990 | # CONFIG_I2C_TINY_USB is not set | ||
| 991 | |||
| 992 | # | ||
| 993 | # Graphics adapter I2C/DDC channel drivers | ||
| 994 | # | ||
| 1009 | # CONFIG_I2C_VOODOO3 is not set | 995 | # CONFIG_I2C_VOODOO3 is not set |
| 996 | |||
| 997 | # | ||
| 998 | # Other I2C/SMBus bus drivers | ||
| 999 | # | ||
| 1000 | # CONFIG_I2C_ELEKTOR is not set | ||
| 1010 | # CONFIG_I2C_PCA_ISA is not set | 1001 | # CONFIG_I2C_PCA_ISA is not set |
| 1002 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1003 | # CONFIG_I2C_STUB is not set | ||
| 1011 | 1004 | ||
| 1012 | # | 1005 | # |
| 1013 | # Miscellaneous I2C Chip support | 1006 | # Miscellaneous I2C Chip support |
| 1014 | # | 1007 | # |
| 1015 | # CONFIG_SENSORS_DS1337 is not set | 1008 | # CONFIG_DS1682 is not set |
| 1016 | # CONFIG_SENSORS_DS1374 is not set | 1009 | # CONFIG_AT24 is not set |
| 1017 | # CONFIG_SENSORS_EEPROM is not set | 1010 | # CONFIG_SENSORS_EEPROM is not set |
| 1018 | # CONFIG_SENSORS_PCF8574 is not set | 1011 | # CONFIG_SENSORS_PCF8574 is not set |
| 1012 | # CONFIG_PCF8575 is not set | ||
| 1019 | # CONFIG_SENSORS_PCA9539 is not set | 1013 | # CONFIG_SENSORS_PCA9539 is not set |
| 1020 | # CONFIG_SENSORS_PCF8591 is not set | 1014 | # CONFIG_SENSORS_PCF8591 is not set |
| 1021 | # CONFIG_SENSORS_MAX6875 is not set | 1015 | # CONFIG_SENSORS_MAX6875 is not set |
| 1016 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1022 | # CONFIG_I2C_DEBUG_CORE is not set | 1017 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1023 | # CONFIG_I2C_DEBUG_ALGO is not set | 1018 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1024 | # CONFIG_I2C_DEBUG_BUS is not set | 1019 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1025 | # CONFIG_I2C_DEBUG_CHIP is not set | 1020 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1026 | |||
| 1027 | # | ||
| 1028 | # SPI support | ||
| 1029 | # | ||
| 1030 | # CONFIG_SPI is not set | 1021 | # CONFIG_SPI is not set |
| 1031 | # CONFIG_SPI_MASTER is not set | 1022 | # CONFIG_W1 is not set |
| 1023 | # CONFIG_POWER_SUPPLY is not set | ||
| 1024 | # CONFIG_HWMON is not set | ||
| 1025 | # CONFIG_THERMAL is not set | ||
| 1026 | # CONFIG_THERMAL_HWMON is not set | ||
| 1027 | # CONFIG_WATCHDOG is not set | ||
| 1028 | CONFIG_SSB_POSSIBLE=y | ||
| 1032 | 1029 | ||
| 1033 | # | 1030 | # |
| 1034 | # Dallas's 1-wire bus | 1031 | # Sonics Silicon Backplane |
| 1035 | # | 1032 | # |
| 1036 | # CONFIG_W1 is not set | 1033 | # CONFIG_SSB is not set |
| 1037 | # CONFIG_HWMON is not set | ||
| 1038 | 1034 | ||
| 1039 | # | 1035 | # |
| 1040 | # Multifunction device drivers | 1036 | # Multifunction device drivers |
| 1041 | # | 1037 | # |
| 1038 | # CONFIG_MFD_CORE is not set | ||
| 1042 | # CONFIG_MFD_SM501 is not set | 1039 | # CONFIG_MFD_SM501 is not set |
| 1040 | # CONFIG_HTC_PASIC3 is not set | ||
| 1041 | # CONFIG_MFD_TMIO is not set | ||
| 1042 | # CONFIG_MFD_WM8400 is not set | ||
| 1043 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 1044 | # CONFIG_REGULATOR is not set | ||
| 1043 | 1045 | ||
| 1044 | # | 1046 | # |
| 1045 | # Multimedia devices | 1047 | # Multimedia devices |
| 1046 | # | 1048 | # |
| 1049 | |||
| 1050 | # | ||
| 1051 | # Multimedia core support | ||
| 1052 | # | ||
| 1047 | CONFIG_VIDEO_DEV=m | 1053 | CONFIG_VIDEO_DEV=m |
| 1048 | CONFIG_VIDEO_V4L1=y | 1054 | CONFIG_VIDEO_V4L2_COMMON=m |
| 1055 | CONFIG_VIDEO_ALLOW_V4L1=y | ||
| 1049 | CONFIG_VIDEO_V4L1_COMPAT=y | 1056 | CONFIG_VIDEO_V4L1_COMPAT=y |
| 1050 | CONFIG_VIDEO_V4L2=y | 1057 | # CONFIG_DVB_CORE is not set |
| 1058 | CONFIG_VIDEO_MEDIA=m | ||
| 1059 | |||
| 1060 | # | ||
| 1061 | # Multimedia drivers | ||
| 1062 | # | ||
| 1063 | CONFIG_MEDIA_ATTACH=y | ||
| 1064 | CONFIG_MEDIA_TUNER=m | ||
| 1065 | CONFIG_MEDIA_TUNER_CUSTOMIZE=y | ||
| 1066 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 1067 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 1068 | CONFIG_MEDIA_TUNER_TDA827X=m | ||
| 1069 | CONFIG_MEDIA_TUNER_TDA18271=m | ||
| 1070 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 1071 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 1072 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 1073 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 1074 | CONFIG_MEDIA_TUNER_MT2060=m | ||
| 1075 | CONFIG_MEDIA_TUNER_MT2266=m | ||
| 1076 | CONFIG_MEDIA_TUNER_MT2131=m | ||
| 1077 | CONFIG_MEDIA_TUNER_QT1010=m | ||
| 1078 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 1079 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 1080 | CONFIG_MEDIA_TUNER_MXL5005S=m | ||
| 1081 | CONFIG_MEDIA_TUNER_MXL5007T=m | ||
| 1082 | CONFIG_VIDEO_V4L2=m | ||
| 1083 | CONFIG_VIDEO_V4L1=m | ||
| 1084 | CONFIG_VIDEOBUF_GEN=m | ||
| 1085 | CONFIG_VIDEOBUF_VMALLOC=m | ||
| 1086 | CONFIG_VIDEOBUF_DMA_CONTIG=m | ||
| 1051 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | 1087 | CONFIG_VIDEO_CAPTURE_DRIVERS=y |
| 1052 | # CONFIG_VIDEO_ADV_DEBUG is not set | 1088 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 1089 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
| 1053 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 1090 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
| 1054 | # CONFIG_VIDEO_VIVI is not set | 1091 | # CONFIG_VIDEO_VIVI is not set |
| 1055 | # CONFIG_VIDEO_BT848 is not set | 1092 | # CONFIG_VIDEO_BT848 is not set |
| @@ -1058,17 +1095,46 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | |||
| 1058 | # CONFIG_VIDEO_CPIA2 is not set | 1095 | # CONFIG_VIDEO_CPIA2 is not set |
| 1059 | # CONFIG_VIDEO_SAA5246A is not set | 1096 | # CONFIG_VIDEO_SAA5246A is not set |
| 1060 | # CONFIG_VIDEO_SAA5249 is not set | 1097 | # CONFIG_VIDEO_SAA5249 is not set |
| 1061 | # CONFIG_TUNER_3036 is not set | ||
| 1062 | # CONFIG_VIDEO_STRADIS is not set | 1098 | # CONFIG_VIDEO_STRADIS is not set |
| 1063 | # CONFIG_VIDEO_SAA7134 is not set | 1099 | # CONFIG_VIDEO_SAA7134 is not set |
| 1064 | # CONFIG_VIDEO_MXB is not set | 1100 | # CONFIG_VIDEO_MXB is not set |
| 1065 | # CONFIG_VIDEO_DPC is not set | ||
| 1066 | # CONFIG_VIDEO_HEXIUM_ORION is not set | 1101 | # CONFIG_VIDEO_HEXIUM_ORION is not set |
| 1067 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set | 1102 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set |
| 1068 | # CONFIG_VIDEO_CX88 is not set | 1103 | # CONFIG_VIDEO_CX88 is not set |
| 1069 | # CONFIG_VIDEO_IVTV is not set | 1104 | # CONFIG_VIDEO_IVTV is not set |
| 1070 | # CONFIG_VIDEO_CAFE_CCIC is not set | 1105 | # CONFIG_VIDEO_CAFE_CCIC is not set |
| 1106 | CONFIG_SOC_CAMERA=m | ||
| 1107 | CONFIG_SOC_CAMERA_MT9M001=m | ||
| 1108 | CONFIG_SOC_CAMERA_MT9M111=m | ||
| 1109 | CONFIG_SOC_CAMERA_MT9V022=m | ||
| 1110 | CONFIG_SOC_CAMERA_PLATFORM=m | ||
| 1111 | CONFIG_VIDEO_SH_MOBILE_CEU=m | ||
| 1071 | CONFIG_V4L_USB_DRIVERS=y | 1112 | CONFIG_V4L_USB_DRIVERS=y |
| 1113 | CONFIG_USB_VIDEO_CLASS=m | ||
| 1114 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | ||
| 1115 | CONFIG_USB_GSPCA=m | ||
| 1116 | CONFIG_USB_M5602=m | ||
| 1117 | CONFIG_USB_GSPCA_CONEX=m | ||
| 1118 | CONFIG_USB_GSPCA_ETOMS=m | ||
| 1119 | CONFIG_USB_GSPCA_FINEPIX=m | ||
| 1120 | CONFIG_USB_GSPCA_MARS=m | ||
| 1121 | CONFIG_USB_GSPCA_OV519=m | ||
| 1122 | CONFIG_USB_GSPCA_PAC207=m | ||
| 1123 | CONFIG_USB_GSPCA_PAC7311=m | ||
| 1124 | CONFIG_USB_GSPCA_SONIXB=m | ||
| 1125 | CONFIG_USB_GSPCA_SONIXJ=m | ||
| 1126 | CONFIG_USB_GSPCA_SPCA500=m | ||
| 1127 | CONFIG_USB_GSPCA_SPCA501=m | ||
| 1128 | CONFIG_USB_GSPCA_SPCA505=m | ||
| 1129 | CONFIG_USB_GSPCA_SPCA506=m | ||
| 1130 | CONFIG_USB_GSPCA_SPCA508=m | ||
| 1131 | CONFIG_USB_GSPCA_SPCA561=m | ||
| 1132 | CONFIG_USB_GSPCA_STK014=m | ||
| 1133 | CONFIG_USB_GSPCA_SUNPLUS=m | ||
| 1134 | CONFIG_USB_GSPCA_T613=m | ||
| 1135 | CONFIG_USB_GSPCA_TV8532=m | ||
| 1136 | CONFIG_USB_GSPCA_VC032X=m | ||
| 1137 | CONFIG_USB_GSPCA_ZC3XX=m | ||
| 1072 | # CONFIG_VIDEO_PVRUSB2 is not set | 1138 | # CONFIG_VIDEO_PVRUSB2 is not set |
| 1073 | # CONFIG_VIDEO_EM28XX is not set | 1139 | # CONFIG_VIDEO_EM28XX is not set |
| 1074 | # CONFIG_VIDEO_USBVISION is not set | 1140 | # CONFIG_VIDEO_USBVISION is not set |
| @@ -1079,7 +1145,6 @@ CONFIG_USB_KONICAWC=m | |||
| 1079 | CONFIG_USB_QUICKCAM_MESSENGER=m | 1145 | CONFIG_USB_QUICKCAM_MESSENGER=m |
| 1080 | CONFIG_USB_ET61X251=m | 1146 | CONFIG_USB_ET61X251=m |
| 1081 | # CONFIG_VIDEO_OVCAMCHIP is not set | 1147 | # CONFIG_VIDEO_OVCAMCHIP is not set |
| 1082 | # CONFIG_USB_W9968CF is not set | ||
| 1083 | CONFIG_USB_OV511=m | 1148 | CONFIG_USB_OV511=m |
| 1084 | CONFIG_USB_SE401=m | 1149 | CONFIG_USB_SE401=m |
| 1085 | CONFIG_USB_SN9C102=m | 1150 | CONFIG_USB_SN9C102=m |
| @@ -1088,6 +1153,8 @@ CONFIG_USB_ZC0301=m | |||
| 1088 | CONFIG_USB_PWC=m | 1153 | CONFIG_USB_PWC=m |
| 1089 | # CONFIG_USB_PWC_DEBUG is not set | 1154 | # CONFIG_USB_PWC_DEBUG is not set |
| 1090 | # CONFIG_USB_ZR364XX is not set | 1155 | # CONFIG_USB_ZR364XX is not set |
| 1156 | CONFIG_USB_STKWEBCAM=m | ||
| 1157 | CONFIG_USB_S2255=m | ||
| 1091 | CONFIG_RADIO_ADAPTERS=y | 1158 | CONFIG_RADIO_ADAPTERS=y |
| 1092 | # CONFIG_RADIO_CADET is not set | 1159 | # CONFIG_RADIO_CADET is not set |
| 1093 | # CONFIG_RADIO_RTRACK is not set | 1160 | # CONFIG_RADIO_RTRACK is not set |
| @@ -1104,33 +1171,30 @@ CONFIG_RADIO_ADAPTERS=y | |||
| 1104 | # CONFIG_RADIO_TYPHOON is not set | 1171 | # CONFIG_RADIO_TYPHOON is not set |
| 1105 | # CONFIG_RADIO_ZOLTRIX is not set | 1172 | # CONFIG_RADIO_ZOLTRIX is not set |
| 1106 | # CONFIG_USB_DSBR is not set | 1173 | # CONFIG_USB_DSBR is not set |
| 1107 | # CONFIG_DVB_CORE is not set | 1174 | CONFIG_USB_SI470X=m |
| 1175 | CONFIG_USB_MR800=m | ||
| 1108 | CONFIG_DAB=y | 1176 | CONFIG_DAB=y |
| 1109 | # CONFIG_USB_DABUSB is not set | 1177 | # CONFIG_USB_DABUSB is not set |
| 1110 | 1178 | ||
| 1111 | # | 1179 | # |
| 1112 | # Graphics support | 1180 | # Graphics support |
| 1113 | # | 1181 | # |
| 1114 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1182 | # CONFIG_DRM is not set |
| 1115 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1116 | CONFIG_LCD_CLASS_DEVICE=m | ||
| 1117 | |||
| 1118 | # | ||
| 1119 | # Display device support | ||
| 1120 | # | ||
| 1121 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 1122 | # CONFIG_VGASTATE is not set | 1183 | # CONFIG_VGASTATE is not set |
| 1184 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 1123 | CONFIG_FB=y | 1185 | CONFIG_FB=y |
| 1124 | # CONFIG_FIRMWARE_EDID is not set | 1186 | # CONFIG_FIRMWARE_EDID is not set |
| 1125 | # CONFIG_FB_DDC is not set | 1187 | # CONFIG_FB_DDC is not set |
| 1188 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 1126 | CONFIG_FB_CFB_FILLRECT=y | 1189 | CONFIG_FB_CFB_FILLRECT=y |
| 1127 | CONFIG_FB_CFB_COPYAREA=y | 1190 | CONFIG_FB_CFB_COPYAREA=y |
| 1128 | CONFIG_FB_CFB_IMAGEBLIT=y | 1191 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 1192 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 1129 | # CONFIG_FB_SYS_FILLRECT is not set | 1193 | # CONFIG_FB_SYS_FILLRECT is not set |
| 1130 | # CONFIG_FB_SYS_COPYAREA is not set | 1194 | # CONFIG_FB_SYS_COPYAREA is not set |
| 1131 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1195 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1196 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1132 | # CONFIG_FB_SYS_FOPS is not set | 1197 | # CONFIG_FB_SYS_FOPS is not set |
| 1133 | CONFIG_FB_DEFERRED_IO=y | ||
| 1134 | # CONFIG_FB_SVGALIB is not set | 1198 | # CONFIG_FB_SVGALIB is not set |
| 1135 | # CONFIG_FB_MACMODES is not set | 1199 | # CONFIG_FB_MACMODES is not set |
| 1136 | CONFIG_FB_BACKLIGHT=y | 1200 | CONFIG_FB_BACKLIGHT=y |
| @@ -1158,16 +1222,30 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1158 | # CONFIG_FB_S3 is not set | 1222 | # CONFIG_FB_S3 is not set |
| 1159 | # CONFIG_FB_SAVAGE is not set | 1223 | # CONFIG_FB_SAVAGE is not set |
| 1160 | # CONFIG_FB_SIS is not set | 1224 | # CONFIG_FB_SIS is not set |
| 1225 | # CONFIG_FB_VIA is not set | ||
| 1161 | # CONFIG_FB_NEOMAGIC is not set | 1226 | # CONFIG_FB_NEOMAGIC is not set |
| 1162 | # CONFIG_FB_KYRO is not set | 1227 | # CONFIG_FB_KYRO is not set |
| 1163 | # CONFIG_FB_3DFX is not set | 1228 | # CONFIG_FB_3DFX is not set |
| 1164 | # CONFIG_FB_VOODOO1 is not set | 1229 | # CONFIG_FB_VOODOO1 is not set |
| 1165 | # CONFIG_FB_SMIVGX is not set | ||
| 1166 | # CONFIG_FB_VT8623 is not set | 1230 | # CONFIG_FB_VT8623 is not set |
| 1167 | # CONFIG_FB_TRIDENT is not set | 1231 | # CONFIG_FB_TRIDENT is not set |
| 1168 | # CONFIG_FB_ARK is not set | 1232 | # CONFIG_FB_ARK is not set |
| 1169 | # CONFIG_FB_PM3 is not set | 1233 | # CONFIG_FB_PM3 is not set |
| 1234 | # CONFIG_FB_CARMINE is not set | ||
| 1170 | # CONFIG_FB_VIRTUAL is not set | 1235 | # CONFIG_FB_VIRTUAL is not set |
| 1236 | # CONFIG_FB_METRONOME is not set | ||
| 1237 | # CONFIG_FB_MB862XX is not set | ||
| 1238 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 1239 | CONFIG_LCD_CLASS_DEVICE=m | ||
| 1240 | # CONFIG_LCD_ILI9320 is not set | ||
| 1241 | # CONFIG_LCD_PLATFORM is not set | ||
| 1242 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1243 | # CONFIG_BACKLIGHT_CORGI is not set | ||
| 1244 | |||
| 1245 | # | ||
| 1246 | # Display device support | ||
| 1247 | # | ||
| 1248 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 1171 | 1249 | ||
| 1172 | # | 1250 | # |
| 1173 | # Console display driver support | 1251 | # Console display driver support |
| @@ -1176,20 +1254,14 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1176 | # CONFIG_MDA_CONSOLE is not set | 1254 | # CONFIG_MDA_CONSOLE is not set |
| 1177 | CONFIG_DUMMY_CONSOLE=y | 1255 | CONFIG_DUMMY_CONSOLE=y |
| 1178 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1256 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 1257 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1179 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1258 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1180 | # CONFIG_FONTS is not set | 1259 | # CONFIG_FONTS is not set |
| 1181 | CONFIG_FONT_8x8=y | 1260 | CONFIG_FONT_8x8=y |
| 1182 | CONFIG_FONT_8x16=y | 1261 | CONFIG_FONT_8x16=y |
| 1183 | # CONFIG_LOGO is not set | 1262 | # CONFIG_LOGO is not set |
| 1184 | |||
| 1185 | # | ||
| 1186 | # Sound | ||
| 1187 | # | ||
| 1188 | CONFIG_SOUND=y | 1263 | CONFIG_SOUND=y |
| 1189 | 1264 | CONFIG_SOUND_OSS_CORE=y | |
| 1190 | # | ||
| 1191 | # Advanced Linux Sound Architecture | ||
| 1192 | # | ||
| 1193 | CONFIG_SND=m | 1265 | CONFIG_SND=m |
| 1194 | CONFIG_SND_TIMER=m | 1266 | CONFIG_SND_TIMER=m |
| 1195 | CONFIG_SND_PCM=m | 1267 | CONFIG_SND_PCM=m |
| @@ -1201,28 +1273,22 @@ CONFIG_SND_MIXER_OSS=m | |||
| 1201 | CONFIG_SND_PCM_OSS=m | 1273 | CONFIG_SND_PCM_OSS=m |
| 1202 | CONFIG_SND_PCM_OSS_PLUGINS=y | 1274 | CONFIG_SND_PCM_OSS_PLUGINS=y |
| 1203 | CONFIG_SND_SEQUENCER_OSS=y | 1275 | CONFIG_SND_SEQUENCER_OSS=y |
| 1204 | CONFIG_SND_RTCTIMER=m | ||
| 1205 | CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y | ||
| 1206 | # CONFIG_SND_DYNAMIC_MINORS is not set | 1276 | # CONFIG_SND_DYNAMIC_MINORS is not set |
| 1207 | CONFIG_SND_SUPPORT_OLD_API=y | 1277 | CONFIG_SND_SUPPORT_OLD_API=y |
| 1208 | CONFIG_SND_VERBOSE_PROCFS=y | 1278 | CONFIG_SND_VERBOSE_PROCFS=y |
| 1209 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1279 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1210 | # CONFIG_SND_DEBUG is not set | 1280 | # CONFIG_SND_DEBUG is not set |
| 1211 | 1281 | CONFIG_SND_VMASTER=y | |
| 1212 | # | ||
| 1213 | # Generic devices | ||
| 1214 | # | ||
| 1215 | CONFIG_SND_MPU401_UART=m | 1282 | CONFIG_SND_MPU401_UART=m |
| 1216 | CONFIG_SND_AC97_CODEC=m | 1283 | CONFIG_SND_AC97_CODEC=m |
| 1284 | CONFIG_SND_DRIVERS=y | ||
| 1217 | # CONFIG_SND_DUMMY is not set | 1285 | # CONFIG_SND_DUMMY is not set |
| 1218 | # CONFIG_SND_VIRMIDI is not set | 1286 | # CONFIG_SND_VIRMIDI is not set |
| 1219 | # CONFIG_SND_MTPAV is not set | 1287 | # CONFIG_SND_MTPAV is not set |
| 1220 | # CONFIG_SND_SERIAL_U16550 is not set | 1288 | # CONFIG_SND_SERIAL_U16550 is not set |
| 1221 | # CONFIG_SND_MPU401 is not set | 1289 | # CONFIG_SND_MPU401 is not set |
| 1222 | 1290 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
| 1223 | # | 1291 | CONFIG_SND_PCI=y |
| 1224 | # PCI devices | ||
| 1225 | # | ||
| 1226 | # CONFIG_SND_AD1889 is not set | 1292 | # CONFIG_SND_AD1889 is not set |
| 1227 | # CONFIG_SND_ALS300 is not set | 1293 | # CONFIG_SND_ALS300 is not set |
| 1228 | # CONFIG_SND_ALI5451 is not set | 1294 | # CONFIG_SND_ALI5451 is not set |
| @@ -1231,10 +1297,12 @@ CONFIG_SND_AC97_CODEC=m | |||
| 1231 | # CONFIG_SND_AU8810 is not set | 1297 | # CONFIG_SND_AU8810 is not set |
| 1232 | # CONFIG_SND_AU8820 is not set | 1298 | # CONFIG_SND_AU8820 is not set |
| 1233 | # CONFIG_SND_AU8830 is not set | 1299 | # CONFIG_SND_AU8830 is not set |
| 1300 | # CONFIG_SND_AW2 is not set | ||
| 1234 | # CONFIG_SND_AZT3328 is not set | 1301 | # CONFIG_SND_AZT3328 is not set |
| 1235 | # CONFIG_SND_BT87X is not set | 1302 | # CONFIG_SND_BT87X is not set |
| 1236 | # CONFIG_SND_CA0106 is not set | 1303 | # CONFIG_SND_CA0106 is not set |
| 1237 | # CONFIG_SND_CMIPCI is not set | 1304 | # CONFIG_SND_CMIPCI is not set |
| 1305 | # CONFIG_SND_OXYGEN is not set | ||
| 1238 | # CONFIG_SND_CS4281 is not set | 1306 | # CONFIG_SND_CS4281 is not set |
| 1239 | # CONFIG_SND_CS46XX is not set | 1307 | # CONFIG_SND_CS46XX is not set |
| 1240 | # CONFIG_SND_DARLA20 is not set | 1308 | # CONFIG_SND_DARLA20 is not set |
| @@ -1259,6 +1327,7 @@ CONFIG_SND_AC97_CODEC=m | |||
| 1259 | # CONFIG_SND_HDA_INTEL is not set | 1327 | # CONFIG_SND_HDA_INTEL is not set |
| 1260 | # CONFIG_SND_HDSP is not set | 1328 | # CONFIG_SND_HDSP is not set |
| 1261 | # CONFIG_SND_HDSPM is not set | 1329 | # CONFIG_SND_HDSPM is not set |
| 1330 | # CONFIG_SND_HIFIER is not set | ||
| 1262 | # CONFIG_SND_ICE1712 is not set | 1331 | # CONFIG_SND_ICE1712 is not set |
| 1263 | # CONFIG_SND_ICE1724 is not set | 1332 | # CONFIG_SND_ICE1724 is not set |
| 1264 | # CONFIG_SND_INTEL8X0 is not set | 1333 | # CONFIG_SND_INTEL8X0 is not set |
| @@ -1276,43 +1345,26 @@ CONFIG_SND_AC97_CODEC=m | |||
| 1276 | # CONFIG_SND_TRIDENT is not set | 1345 | # CONFIG_SND_TRIDENT is not set |
| 1277 | CONFIG_SND_VIA82XX=m | 1346 | CONFIG_SND_VIA82XX=m |
| 1278 | # CONFIG_SND_VIA82XX_MODEM is not set | 1347 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 1348 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1279 | # CONFIG_SND_VX222 is not set | 1349 | # CONFIG_SND_VX222 is not set |
| 1280 | # CONFIG_SND_YMFPCI is not set | 1350 | # CONFIG_SND_YMFPCI is not set |
| 1281 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1351 | CONFIG_SND_MIPS=y |
| 1282 | 1352 | CONFIG_SND_USB=y | |
| 1283 | # | ||
| 1284 | # ALSA MIPS devices | ||
| 1285 | # | ||
| 1286 | |||
| 1287 | # | ||
| 1288 | # USB devices | ||
| 1289 | # | ||
| 1290 | # CONFIG_SND_USB_AUDIO is not set | 1353 | # CONFIG_SND_USB_AUDIO is not set |
| 1291 | # CONFIG_SND_USB_CAIAQ is not set | 1354 | # CONFIG_SND_USB_CAIAQ is not set |
| 1292 | |||
| 1293 | # | ||
| 1294 | # System on Chip audio support | ||
| 1295 | # | ||
| 1296 | # CONFIG_SND_SOC is not set | 1355 | # CONFIG_SND_SOC is not set |
| 1297 | |||
| 1298 | # | ||
| 1299 | # Open Sound System | ||
| 1300 | # | ||
| 1301 | # CONFIG_SOUND_PRIME is not set | 1356 | # CONFIG_SOUND_PRIME is not set |
| 1302 | CONFIG_AC97_BUS=m | 1357 | CONFIG_AC97_BUS=m |
| 1303 | 1358 | CONFIG_HID_SUPPORT=y | |
| 1304 | # | ||
| 1305 | # HID Devices | ||
| 1306 | # | ||
| 1307 | CONFIG_HID=y | 1359 | CONFIG_HID=y |
| 1308 | # CONFIG_HID_DEBUG is not set | 1360 | # CONFIG_HID_DEBUG is not set |
| 1361 | CONFIG_HIDRAW=y | ||
| 1309 | 1362 | ||
| 1310 | # | 1363 | # |
| 1311 | # USB Input Devices | 1364 | # USB Input Devices |
| 1312 | # | 1365 | # |
| 1313 | CONFIG_USB_HID=m | 1366 | CONFIG_USB_HID=m |
| 1314 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1367 | CONFIG_HID_PID=y |
| 1315 | # CONFIG_HID_FF is not set | ||
| 1316 | CONFIG_USB_HIDDEV=y | 1368 | CONFIG_USB_HIDDEV=y |
| 1317 | 1369 | ||
| 1318 | # | 1370 | # |
| @@ -1322,13 +1374,39 @@ CONFIG_USB_HIDDEV=y | |||
| 1322 | # CONFIG_USB_MOUSE is not set | 1374 | # CONFIG_USB_MOUSE is not set |
| 1323 | 1375 | ||
| 1324 | # | 1376 | # |
| 1325 | # USB support | 1377 | # Special HID drivers |
| 1326 | # | 1378 | # |
| 1379 | CONFIG_HID_COMPAT=y | ||
| 1380 | CONFIG_HID_A4TECH=m | ||
| 1381 | CONFIG_HID_APPLE=m | ||
| 1382 | CONFIG_HID_BELKIN=m | ||
| 1383 | CONFIG_HID_BRIGHT=m | ||
| 1384 | CONFIG_HID_CHERRY=m | ||
| 1385 | CONFIG_HID_CHICONY=m | ||
| 1386 | CONFIG_HID_CYPRESS=m | ||
| 1387 | CONFIG_HID_DELL=m | ||
| 1388 | CONFIG_HID_EZKEY=m | ||
| 1389 | CONFIG_HID_GYRATION=m | ||
| 1390 | CONFIG_HID_LOGITECH=m | ||
| 1391 | CONFIG_LOGITECH_FF=y | ||
| 1392 | CONFIG_LOGIRUMBLEPAD2_FF=y | ||
| 1393 | CONFIG_HID_MICROSOFT=m | ||
| 1394 | CONFIG_HID_MONTEREY=m | ||
| 1395 | CONFIG_HID_PANTHERLORD=m | ||
| 1396 | # CONFIG_PANTHERLORD_FF is not set | ||
| 1397 | CONFIG_HID_PETALYNX=m | ||
| 1398 | CONFIG_HID_SAMSUNG=m | ||
| 1399 | CONFIG_HID_SONY=m | ||
| 1400 | CONFIG_HID_SUNPLUS=m | ||
| 1401 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 1402 | CONFIG_ZEROPLUS_FF=m | ||
| 1403 | CONFIG_USB_SUPPORT=y | ||
| 1327 | CONFIG_USB_ARCH_HAS_HCD=y | 1404 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1328 | CONFIG_USB_ARCH_HAS_OHCI=y | 1405 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1329 | CONFIG_USB_ARCH_HAS_EHCI=y | 1406 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1330 | CONFIG_USB=y | 1407 | CONFIG_USB=y |
| 1331 | # CONFIG_USB_DEBUG is not set | 1408 | # CONFIG_USB_DEBUG is not set |
| 1409 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
| 1332 | 1410 | ||
| 1333 | # | 1411 | # |
| 1334 | # Miscellaneous USB options | 1412 | # Miscellaneous USB options |
| @@ -1338,35 +1416,46 @@ CONFIG_USB_DEVICEFS=y | |||
| 1338 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1416 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1339 | # CONFIG_USB_SUSPEND is not set | 1417 | # CONFIG_USB_SUSPEND is not set |
| 1340 | # CONFIG_USB_OTG is not set | 1418 | # CONFIG_USB_OTG is not set |
| 1419 | CONFIG_USB_OTG_WHITELIST=y | ||
| 1420 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1421 | # CONFIG_USB_MON is not set | ||
| 1422 | # CONFIG_USB_WUSB is not set | ||
| 1423 | CONFIG_USB_WUSB_CBAF=m | ||
| 1424 | # CONFIG_USB_WUSB_CBAF_DEBUG is not set | ||
| 1341 | 1425 | ||
| 1342 | # | 1426 | # |
| 1343 | # USB Host Controller Drivers | 1427 | # USB Host Controller Drivers |
| 1344 | # | 1428 | # |
| 1429 | CONFIG_USB_C67X00_HCD=m | ||
| 1345 | CONFIG_USB_EHCI_HCD=y | 1430 | CONFIG_USB_EHCI_HCD=y |
| 1346 | CONFIG_USB_EHCI_SPLIT_ISO=y | ||
| 1347 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1431 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1348 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1432 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
| 1349 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1350 | # CONFIG_USB_ISP116X_HCD is not set | 1433 | # CONFIG_USB_ISP116X_HCD is not set |
| 1434 | CONFIG_USB_ISP1760_HCD=m | ||
| 1351 | CONFIG_USB_OHCI_HCD=y | 1435 | CONFIG_USB_OHCI_HCD=y |
| 1352 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1436 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 1353 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1437 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| 1354 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1438 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1355 | CONFIG_USB_UHCI_HCD=m | 1439 | CONFIG_USB_UHCI_HCD=m |
| 1356 | # CONFIG_USB_SL811_HCD is not set | 1440 | # CONFIG_USB_SL811_HCD is not set |
| 1441 | CONFIG_USB_R8A66597_HCD=m | ||
| 1442 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1443 | # CONFIG_USB_HWA_HCD is not set | ||
| 1357 | 1444 | ||
| 1358 | # | 1445 | # |
| 1359 | # USB Device Class drivers | 1446 | # USB Device Class drivers |
| 1360 | # | 1447 | # |
| 1361 | CONFIG_USB_ACM=y | 1448 | CONFIG_USB_ACM=y |
| 1362 | CONFIG_USB_PRINTER=y | 1449 | CONFIG_USB_PRINTER=y |
| 1450 | CONFIG_USB_WDM=m | ||
| 1451 | CONFIG_USB_TMC=m | ||
| 1363 | 1452 | ||
| 1364 | # | 1453 | # |
| 1365 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1454 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 1366 | # | 1455 | # |
| 1367 | 1456 | ||
| 1368 | # | 1457 | # |
| 1369 | # may also be needed; see USB_STORAGE Help for more information | 1458 | # see USB_STORAGE Help for more information |
| 1370 | # | 1459 | # |
| 1371 | CONFIG_USB_STORAGE=y | 1460 | CONFIG_USB_STORAGE=y |
| 1372 | # CONFIG_USB_STORAGE_DEBUG is not set | 1461 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1379,7 +1468,9 @@ CONFIG_USB_STORAGE=y | |||
| 1379 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1468 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1380 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1469 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1381 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1470 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1471 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
| 1382 | # CONFIG_USB_STORAGE_KARMA is not set | 1472 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1473 | CONFIG_USB_STORAGE_CYPRESS_ATACB=y | ||
| 1383 | CONFIG_USB_LIBUSUAL=y | 1474 | CONFIG_USB_LIBUSUAL=y |
| 1384 | 1475 | ||
| 1385 | # | 1476 | # |
| @@ -1387,15 +1478,10 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1387 | # | 1478 | # |
| 1388 | # CONFIG_USB_MDC800 is not set | 1479 | # CONFIG_USB_MDC800 is not set |
| 1389 | # CONFIG_USB_MICROTEK is not set | 1480 | # CONFIG_USB_MICROTEK is not set |
| 1390 | # CONFIG_USB_MON is not set | ||
| 1391 | 1481 | ||
| 1392 | # | 1482 | # |
| 1393 | # USB port drivers | 1483 | # USB port drivers |
| 1394 | # | 1484 | # |
| 1395 | |||
| 1396 | # | ||
| 1397 | # USB Serial Converter support | ||
| 1398 | # | ||
| 1399 | # CONFIG_USB_SERIAL is not set | 1485 | # CONFIG_USB_SERIAL is not set |
| 1400 | 1486 | ||
| 1401 | # | 1487 | # |
| @@ -1404,7 +1490,7 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1404 | # CONFIG_USB_EMI62 is not set | 1490 | # CONFIG_USB_EMI62 is not set |
| 1405 | # CONFIG_USB_EMI26 is not set | 1491 | # CONFIG_USB_EMI26 is not set |
| 1406 | # CONFIG_USB_ADUTUX is not set | 1492 | # CONFIG_USB_ADUTUX is not set |
| 1407 | # CONFIG_USB_AUERSWALD is not set | 1493 | CONFIG_USB_SEVSEG=m |
| 1408 | # CONFIG_USB_RIO500 is not set | 1494 | # CONFIG_USB_RIO500 is not set |
| 1409 | # CONFIG_USB_LEGOTOWER is not set | 1495 | # CONFIG_USB_LEGOTOWER is not set |
| 1410 | # CONFIG_USB_LCD is not set | 1496 | # CONFIG_USB_LCD is not set |
| @@ -1421,56 +1507,75 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1421 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1507 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1422 | # CONFIG_USB_IOWARRIOR is not set | 1508 | # CONFIG_USB_IOWARRIOR is not set |
| 1423 | # CONFIG_USB_TEST is not set | 1509 | # CONFIG_USB_TEST is not set |
| 1424 | 1510 | CONFIG_USB_ISIGHTFW=m | |
| 1425 | # | 1511 | CONFIG_USB_VST=m |
| 1426 | # USB DSL modem support | ||
| 1427 | # | ||
| 1428 | |||
| 1429 | # | ||
| 1430 | # USB Gadget Support | ||
| 1431 | # | ||
| 1432 | # CONFIG_USB_GADGET is not set | 1512 | # CONFIG_USB_GADGET is not set |
| 1513 | # CONFIG_UWB is not set | ||
| 1433 | # CONFIG_MMC is not set | 1514 | # CONFIG_MMC is not set |
| 1434 | 1515 | # CONFIG_MEMSTICK is not set | |
| 1435 | # | ||
| 1436 | # LED devices | ||
| 1437 | # | ||
| 1438 | # CONFIG_NEW_LEDS is not set | 1516 | # CONFIG_NEW_LEDS is not set |
| 1439 | 1517 | # CONFIG_ACCESSIBILITY is not set | |
| 1440 | # | ||
| 1441 | # LED drivers | ||
| 1442 | # | ||
| 1443 | |||
| 1444 | # | ||
| 1445 | # LED Triggers | ||
| 1446 | # | ||
| 1447 | |||
| 1448 | # | ||
| 1449 | # InfiniBand support | ||
| 1450 | # | ||
| 1451 | # CONFIG_INFINIBAND is not set | 1518 | # CONFIG_INFINIBAND is not set |
| 1519 | CONFIG_RTC_LIB=y | ||
| 1520 | CONFIG_RTC_CLASS=m | ||
| 1452 | 1521 | ||
| 1453 | # | 1522 | # |
| 1454 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1523 | # RTC interfaces |
| 1455 | # | 1524 | # |
| 1525 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1526 | CONFIG_RTC_INTF_PROC=y | ||
| 1527 | CONFIG_RTC_INTF_DEV=y | ||
| 1528 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | ||
| 1529 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1456 | 1530 | ||
| 1457 | # | 1531 | # |
| 1458 | # Real Time Clock | 1532 | # I2C RTC drivers |
| 1459 | # | 1533 | # |
| 1460 | # CONFIG_RTC_CLASS is not set | 1534 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1535 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1536 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1537 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1538 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1539 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1540 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1541 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1542 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1543 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1544 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1545 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1546 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 1461 | 1547 | ||
| 1462 | # | 1548 | # |
| 1463 | # DMA Engine support | 1549 | # SPI RTC drivers |
| 1464 | # | 1550 | # |
| 1465 | # CONFIG_DMA_ENGINE is not set | ||
| 1466 | 1551 | ||
| 1467 | # | 1552 | # |
| 1468 | # DMA Clients | 1553 | # Platform RTC drivers |
| 1469 | # | 1554 | # |
| 1555 | CONFIG_RTC_DRV_CMOS=m | ||
| 1556 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1557 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1558 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1559 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1560 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1561 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1562 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1563 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1564 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1565 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1470 | 1566 | ||
| 1471 | # | 1567 | # |
| 1472 | # DMA Devices | 1568 | # on-CPU RTC drivers |
| 1473 | # | 1569 | # |
| 1570 | # CONFIG_DMADEVICES is not set | ||
| 1571 | CONFIG_UIO=m | ||
| 1572 | CONFIG_UIO_CIF=m | ||
| 1573 | # CONFIG_UIO_PDRV is not set | ||
| 1574 | # CONFIG_UIO_PDRV_GENIRQ is not set | ||
| 1575 | # CONFIG_UIO_SMX is not set | ||
| 1576 | # CONFIG_UIO_SERCOS3 is not set | ||
| 1577 | # CONFIG_STAGING is not set | ||
| 1578 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1474 | 1579 | ||
| 1475 | # | 1580 | # |
| 1476 | # File systems | 1581 | # File systems |
| @@ -1478,27 +1583,31 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1478 | CONFIG_EXT2_FS=y | 1583 | CONFIG_EXT2_FS=y |
| 1479 | # CONFIG_EXT2_FS_XATTR is not set | 1584 | # CONFIG_EXT2_FS_XATTR is not set |
| 1480 | CONFIG_EXT2_FS_XIP=y | 1585 | CONFIG_EXT2_FS_XIP=y |
| 1481 | CONFIG_FS_XIP=y | ||
| 1482 | CONFIG_EXT3_FS=y | 1586 | CONFIG_EXT3_FS=y |
| 1483 | # CONFIG_EXT3_FS_XATTR is not set | 1587 | # CONFIG_EXT3_FS_XATTR is not set |
| 1484 | # CONFIG_EXT4DEV_FS is not set | 1588 | CONFIG_EXT4_FS=m |
| 1589 | CONFIG_EXT4DEV_COMPAT=y | ||
| 1590 | CONFIG_EXT4_FS_XATTR=y | ||
| 1591 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
| 1592 | CONFIG_EXT4_FS_SECURITY=y | ||
| 1593 | CONFIG_FS_XIP=y | ||
| 1485 | CONFIG_JBD=y | 1594 | CONFIG_JBD=y |
| 1486 | # CONFIG_JBD_DEBUG is not set | 1595 | CONFIG_JBD2=m |
| 1596 | CONFIG_FS_MBCACHE=m | ||
| 1487 | CONFIG_REISERFS_FS=m | 1597 | CONFIG_REISERFS_FS=m |
| 1488 | # CONFIG_REISERFS_CHECK is not set | 1598 | # CONFIG_REISERFS_CHECK is not set |
| 1489 | # CONFIG_REISERFS_PROC_INFO is not set | 1599 | # CONFIG_REISERFS_PROC_INFO is not set |
| 1490 | # CONFIG_REISERFS_FS_XATTR is not set | 1600 | # CONFIG_REISERFS_FS_XATTR is not set |
| 1491 | # CONFIG_JFS_FS is not set | 1601 | # CONFIG_JFS_FS is not set |
| 1492 | CONFIG_FS_POSIX_ACL=y | 1602 | CONFIG_FS_POSIX_ACL=y |
| 1603 | CONFIG_FILE_LOCKING=y | ||
| 1493 | # CONFIG_XFS_FS is not set | 1604 | # CONFIG_XFS_FS is not set |
| 1494 | # CONFIG_GFS2_FS is not set | 1605 | # CONFIG_GFS2_FS is not set |
| 1495 | # CONFIG_OCFS2_FS is not set | 1606 | # CONFIG_OCFS2_FS is not set |
| 1496 | # CONFIG_MINIX_FS is not set | 1607 | CONFIG_DNOTIFY=y |
| 1497 | # CONFIG_ROMFS_FS is not set | ||
| 1498 | CONFIG_INOTIFY=y | 1608 | CONFIG_INOTIFY=y |
| 1499 | CONFIG_INOTIFY_USER=y | 1609 | CONFIG_INOTIFY_USER=y |
| 1500 | # CONFIG_QUOTA is not set | 1610 | # CONFIG_QUOTA is not set |
| 1501 | CONFIG_DNOTIFY=y | ||
| 1502 | CONFIG_AUTOFS_FS=y | 1611 | CONFIG_AUTOFS_FS=y |
| 1503 | CONFIG_AUTOFS4_FS=y | 1612 | CONFIG_AUTOFS4_FS=y |
| 1504 | CONFIG_FUSE_FS=y | 1613 | CONFIG_FUSE_FS=y |
| @@ -1530,11 +1639,11 @@ CONFIG_NTFS_RW=y | |||
| 1530 | CONFIG_PROC_FS=y | 1639 | CONFIG_PROC_FS=y |
| 1531 | CONFIG_PROC_KCORE=y | 1640 | CONFIG_PROC_KCORE=y |
| 1532 | CONFIG_PROC_SYSCTL=y | 1641 | CONFIG_PROC_SYSCTL=y |
| 1642 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1533 | CONFIG_SYSFS=y | 1643 | CONFIG_SYSFS=y |
| 1534 | CONFIG_TMPFS=y | 1644 | CONFIG_TMPFS=y |
| 1535 | # CONFIG_TMPFS_POSIX_ACL is not set | 1645 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1536 | # CONFIG_HUGETLB_PAGE is not set | 1646 | # CONFIG_HUGETLB_PAGE is not set |
| 1537 | CONFIG_RAMFS=y | ||
| 1538 | # CONFIG_CONFIGFS_FS is not set | 1647 | # CONFIG_CONFIGFS_FS is not set |
| 1539 | 1648 | ||
| 1540 | # | 1649 | # |
| @@ -1550,25 +1659,23 @@ CONFIG_RAMFS=y | |||
| 1550 | # CONFIG_JFFS2_FS is not set | 1659 | # CONFIG_JFFS2_FS is not set |
| 1551 | # CONFIG_CRAMFS is not set | 1660 | # CONFIG_CRAMFS is not set |
| 1552 | # CONFIG_VXFS_FS is not set | 1661 | # CONFIG_VXFS_FS is not set |
| 1662 | # CONFIG_MINIX_FS is not set | ||
| 1663 | CONFIG_OMFS_FS=m | ||
| 1553 | # CONFIG_HPFS_FS is not set | 1664 | # CONFIG_HPFS_FS is not set |
| 1554 | # CONFIG_QNX4FS_FS is not set | 1665 | # CONFIG_QNX4FS_FS is not set |
| 1666 | # CONFIG_ROMFS_FS is not set | ||
| 1555 | # CONFIG_SYSV_FS is not set | 1667 | # CONFIG_SYSV_FS is not set |
| 1556 | # CONFIG_UFS_FS is not set | 1668 | # CONFIG_UFS_FS is not set |
| 1557 | 1669 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1558 | # | ||
| 1559 | # Network File Systems | ||
| 1560 | # | ||
| 1561 | CONFIG_NFS_FS=m | 1670 | CONFIG_NFS_FS=m |
| 1562 | CONFIG_NFS_V3=y | 1671 | CONFIG_NFS_V3=y |
| 1563 | CONFIG_NFS_V3_ACL=y | 1672 | CONFIG_NFS_V3_ACL=y |
| 1564 | CONFIG_NFS_V4=y | 1673 | CONFIG_NFS_V4=y |
| 1565 | CONFIG_NFS_DIRECTIO=y | ||
| 1566 | CONFIG_NFSD=m | 1674 | CONFIG_NFSD=m |
| 1567 | CONFIG_NFSD_V2_ACL=y | 1675 | CONFIG_NFSD_V2_ACL=y |
| 1568 | CONFIG_NFSD_V3=y | 1676 | CONFIG_NFSD_V3=y |
| 1569 | CONFIG_NFSD_V3_ACL=y | 1677 | CONFIG_NFSD_V3_ACL=y |
| 1570 | CONFIG_NFSD_V4=y | 1678 | CONFIG_NFSD_V4=y |
| 1571 | CONFIG_NFSD_TCP=y | ||
| 1572 | CONFIG_LOCKD=m | 1679 | CONFIG_LOCKD=m |
| 1573 | CONFIG_LOCKD_V4=y | 1680 | CONFIG_LOCKD_V4=y |
| 1574 | CONFIG_EXPORTFS=m | 1681 | CONFIG_EXPORTFS=m |
| @@ -1576,7 +1683,7 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
| 1576 | CONFIG_NFS_COMMON=y | 1683 | CONFIG_NFS_COMMON=y |
| 1577 | CONFIG_SUNRPC=m | 1684 | CONFIG_SUNRPC=m |
| 1578 | CONFIG_SUNRPC_GSS=m | 1685 | CONFIG_SUNRPC_GSS=m |
| 1579 | # CONFIG_SUNRPC_BIND34 is not set | 1686 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 1580 | CONFIG_RPCSEC_GSS_KRB5=m | 1687 | CONFIG_RPCSEC_GSS_KRB5=m |
| 1581 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1688 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1582 | CONFIG_SMB_FS=m | 1689 | CONFIG_SMB_FS=m |
| @@ -1616,10 +1723,6 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1616 | # CONFIG_KARMA_PARTITION is not set | 1723 | # CONFIG_KARMA_PARTITION is not set |
| 1617 | # CONFIG_EFI_PARTITION is not set | 1724 | # CONFIG_EFI_PARTITION is not set |
| 1618 | # CONFIG_SYSV68_PARTITION is not set | 1725 | # CONFIG_SYSV68_PARTITION is not set |
| 1619 | |||
| 1620 | # | ||
| 1621 | # Native Language Support | ||
| 1622 | # | ||
| 1623 | CONFIG_NLS=y | 1726 | CONFIG_NLS=y |
| 1624 | CONFIG_NLS_DEFAULT="utf8" | 1727 | CONFIG_NLS_DEFAULT="utf8" |
| 1625 | # CONFIG_NLS_CODEPAGE_437 is not set | 1728 | # CONFIG_NLS_CODEPAGE_437 is not set |
| @@ -1660,30 +1763,31 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1660 | # CONFIG_NLS_KOI8_R is not set | 1763 | # CONFIG_NLS_KOI8_R is not set |
| 1661 | # CONFIG_NLS_KOI8_U is not set | 1764 | # CONFIG_NLS_KOI8_U is not set |
| 1662 | CONFIG_NLS_UTF8=y | 1765 | CONFIG_NLS_UTF8=y |
| 1663 | |||
| 1664 | # | ||
| 1665 | # Distributed Lock Manager | ||
| 1666 | # | ||
| 1667 | # CONFIG_DLM is not set | 1766 | # CONFIG_DLM is not set |
| 1668 | 1767 | ||
| 1669 | # | 1768 | # |
| 1670 | # Profiling support | ||
| 1671 | # | ||
| 1672 | CONFIG_PROFILING=y | ||
| 1673 | CONFIG_OPROFILE=m | ||
| 1674 | |||
| 1675 | # | ||
| 1676 | # Kernel hacking | 1769 | # Kernel hacking |
| 1677 | # | 1770 | # |
| 1678 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1771 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1679 | # CONFIG_PRINTK_TIME is not set | 1772 | # CONFIG_PRINTK_TIME is not set |
| 1773 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1680 | # CONFIG_ENABLE_MUST_CHECK is not set | 1774 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 1775 | CONFIG_FRAME_WARN=2048 | ||
| 1681 | # CONFIG_MAGIC_SYSRQ is not set | 1776 | # CONFIG_MAGIC_SYSRQ is not set |
| 1682 | # CONFIG_UNUSED_SYMBOLS is not set | 1777 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1683 | # CONFIG_DEBUG_FS is not set | 1778 | # CONFIG_DEBUG_FS is not set |
| 1684 | # CONFIG_HEADERS_CHECK is not set | 1779 | # CONFIG_HEADERS_CHECK is not set |
| 1685 | # CONFIG_DEBUG_KERNEL is not set | 1780 | # CONFIG_DEBUG_KERNEL is not set |
| 1686 | CONFIG_CROSSCOMPILE=y | 1781 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1782 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1783 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1784 | |||
| 1785 | # | ||
| 1786 | # Tracers | ||
| 1787 | # | ||
| 1788 | CONFIG_DYNAMIC_PRINTK_DEBUG=y | ||
| 1789 | # CONFIG_SAMPLES is not set | ||
| 1790 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1687 | CONFIG_CMDLINE="" | 1791 | CONFIG_CMDLINE="" |
| 1688 | 1792 | ||
| 1689 | # | 1793 | # |
| @@ -1691,64 +1795,113 @@ CONFIG_CMDLINE="" | |||
| 1691 | # | 1795 | # |
| 1692 | # CONFIG_KEYS is not set | 1796 | # CONFIG_KEYS is not set |
| 1693 | # CONFIG_SECURITY is not set | 1797 | # CONFIG_SECURITY is not set |
| 1798 | # CONFIG_SECURITYFS is not set | ||
| 1799 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
| 1800 | CONFIG_CRYPTO=y | ||
| 1694 | 1801 | ||
| 1695 | # | 1802 | # |
| 1696 | # Cryptographic options | 1803 | # Crypto core or helper |
| 1697 | # | 1804 | # |
| 1698 | CONFIG_CRYPTO=y | 1805 | CONFIG_CRYPTO_FIPS=y |
| 1699 | CONFIG_CRYPTO_ALGAPI=y | 1806 | CONFIG_CRYPTO_ALGAPI=y |
| 1700 | CONFIG_CRYPTO_BLKCIPHER=m | 1807 | CONFIG_CRYPTO_AEAD=y |
| 1808 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1701 | CONFIG_CRYPTO_HASH=y | 1809 | CONFIG_CRYPTO_HASH=y |
| 1810 | CONFIG_CRYPTO_RNG=y | ||
| 1702 | CONFIG_CRYPTO_MANAGER=y | 1811 | CONFIG_CRYPTO_MANAGER=y |
| 1812 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1813 | # CONFIG_CRYPTO_NULL is not set | ||
| 1814 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1815 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1816 | # CONFIG_CRYPTO_TEST is not set | ||
| 1817 | |||
| 1818 | # | ||
| 1819 | # Authenticated Encryption with Associated Data | ||
| 1820 | # | ||
| 1821 | CONFIG_CRYPTO_CCM=m | ||
| 1822 | CONFIG_CRYPTO_GCM=m | ||
| 1823 | CONFIG_CRYPTO_SEQIV=m | ||
| 1824 | |||
| 1825 | # | ||
| 1826 | # Block modes | ||
| 1827 | # | ||
| 1828 | CONFIG_CRYPTO_CBC=m | ||
| 1829 | CONFIG_CRYPTO_CTR=m | ||
| 1830 | CONFIG_CRYPTO_CTS=m | ||
| 1831 | CONFIG_CRYPTO_ECB=m | ||
| 1832 | # CONFIG_CRYPTO_LRW is not set | ||
| 1833 | CONFIG_CRYPTO_PCBC=m | ||
| 1834 | CONFIG_CRYPTO_XTS=m | ||
| 1835 | |||
| 1836 | # | ||
| 1837 | # Hash modes | ||
| 1838 | # | ||
| 1703 | CONFIG_CRYPTO_HMAC=y | 1839 | CONFIG_CRYPTO_HMAC=y |
| 1704 | # CONFIG_CRYPTO_XCBC is not set | 1840 | # CONFIG_CRYPTO_XCBC is not set |
| 1705 | # CONFIG_CRYPTO_NULL is not set | 1841 | |
| 1842 | # | ||
| 1843 | # Digest | ||
| 1844 | # | ||
| 1845 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1706 | # CONFIG_CRYPTO_MD4 is not set | 1846 | # CONFIG_CRYPTO_MD4 is not set |
| 1707 | CONFIG_CRYPTO_MD5=m | 1847 | CONFIG_CRYPTO_MD5=m |
| 1848 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1849 | CONFIG_CRYPTO_RMD128=m | ||
| 1850 | CONFIG_CRYPTO_RMD160=m | ||
| 1851 | CONFIG_CRYPTO_RMD256=m | ||
| 1852 | CONFIG_CRYPTO_RMD320=m | ||
| 1708 | CONFIG_CRYPTO_SHA1=m | 1853 | CONFIG_CRYPTO_SHA1=m |
| 1709 | # CONFIG_CRYPTO_SHA256 is not set | 1854 | # CONFIG_CRYPTO_SHA256 is not set |
| 1710 | # CONFIG_CRYPTO_SHA512 is not set | 1855 | # CONFIG_CRYPTO_SHA512 is not set |
| 1711 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1712 | # CONFIG_CRYPTO_TGR192 is not set | 1856 | # CONFIG_CRYPTO_TGR192 is not set |
| 1713 | # CONFIG_CRYPTO_GF128MUL is not set | 1857 | # CONFIG_CRYPTO_WP512 is not set |
| 1714 | CONFIG_CRYPTO_ECB=m | 1858 | |
| 1715 | CONFIG_CRYPTO_CBC=m | 1859 | # |
| 1716 | CONFIG_CRYPTO_PCBC=m | 1860 | # Ciphers |
| 1717 | # CONFIG_CRYPTO_LRW is not set | 1861 | # |
| 1718 | # CONFIG_CRYPTO_CRYPTD is not set | 1862 | CONFIG_CRYPTO_AES=m |
| 1719 | CONFIG_CRYPTO_DES=m | 1863 | # CONFIG_CRYPTO_ANUBIS is not set |
| 1720 | # CONFIG_CRYPTO_FCRYPT is not set | 1864 | CONFIG_CRYPTO_ARC4=m |
| 1721 | # CONFIG_CRYPTO_BLOWFISH is not set | 1865 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 1722 | # CONFIG_CRYPTO_TWOFISH is not set | 1866 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1723 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1724 | # CONFIG_CRYPTO_AES is not set | ||
| 1725 | # CONFIG_CRYPTO_CAST5 is not set | 1867 | # CONFIG_CRYPTO_CAST5 is not set |
| 1726 | # CONFIG_CRYPTO_CAST6 is not set | 1868 | # CONFIG_CRYPTO_CAST6 is not set |
| 1727 | # CONFIG_CRYPTO_TEA is not set | 1869 | CONFIG_CRYPTO_DES=m |
| 1728 | CONFIG_CRYPTO_ARC4=m | 1870 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1729 | # CONFIG_CRYPTO_KHAZAD is not set | 1871 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1730 | # CONFIG_CRYPTO_ANUBIS is not set | 1872 | CONFIG_CRYPTO_SALSA20=m |
| 1873 | CONFIG_CRYPTO_SEED=m | ||
| 1874 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1875 | # CONFIG_CRYPTO_TEA is not set | ||
| 1876 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1877 | |||
| 1878 | # | ||
| 1879 | # Compression | ||
| 1880 | # | ||
| 1731 | CONFIG_CRYPTO_DEFLATE=m | 1881 | CONFIG_CRYPTO_DEFLATE=m |
| 1732 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1882 | CONFIG_CRYPTO_LZO=m |
| 1733 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1734 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1735 | # CONFIG_CRYPTO_TEST is not set | ||
| 1736 | 1883 | ||
| 1737 | # | 1884 | # |
| 1738 | # Hardware crypto devices | 1885 | # Random Number Generation |
| 1739 | # | 1886 | # |
| 1887 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
| 1888 | # CONFIG_CRYPTO_HW is not set | ||
| 1740 | 1889 | ||
| 1741 | # | 1890 | # |
| 1742 | # Library routines | 1891 | # Library routines |
| 1743 | # | 1892 | # |
| 1744 | CONFIG_BITREVERSE=y | 1893 | CONFIG_BITREVERSE=y |
| 1745 | CONFIG_CRC_CCITT=y | 1894 | CONFIG_CRC_CCITT=y |
| 1746 | # CONFIG_CRC16 is not set | 1895 | CONFIG_CRC16=m |
| 1747 | # CONFIG_CRC_ITU_T is not set | 1896 | # CONFIG_CRC_T10DIF is not set |
| 1897 | CONFIG_CRC_ITU_T=m | ||
| 1748 | CONFIG_CRC32=y | 1898 | CONFIG_CRC32=y |
| 1899 | CONFIG_CRC7=m | ||
| 1749 | # CONFIG_LIBCRC32C is not set | 1900 | # CONFIG_LIBCRC32C is not set |
| 1750 | CONFIG_ZLIB_INFLATE=m | 1901 | CONFIG_ZLIB_INFLATE=m |
| 1751 | CONFIG_ZLIB_DEFLATE=m | 1902 | CONFIG_ZLIB_DEFLATE=m |
| 1903 | CONFIG_LZO_COMPRESS=m | ||
| 1904 | CONFIG_LZO_DECOMPRESS=m | ||
| 1752 | CONFIG_TEXTSEARCH=y | 1905 | CONFIG_TEXTSEARCH=y |
| 1753 | CONFIG_TEXTSEARCH_KMP=m | 1906 | CONFIG_TEXTSEARCH_KMP=m |
| 1754 | CONFIG_TEXTSEARCH_BM=m | 1907 | CONFIG_TEXTSEARCH_BM=m |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index f719bf5e01aa..115822876417 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
| @@ -1,30 +1,34 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.28-rc6 |
| 4 | # Tue Aug 7 12:39:49 2007 | 4 | # Fri Nov 28 15:41:33 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_ZONE_DMA=y | ||
| 12 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 13 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 14 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 15 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 16 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 17 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
| 19 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
| 20 | # CONFIG_MARKEINS is not set | 21 | # CONFIG_MACH_EMMA is not set |
| 21 | # CONFIG_MACH_VR41XX is not set | 22 | # CONFIG_MACH_VR41XX is not set |
| 23 | # CONFIG_NXP_STB220 is not set | ||
| 24 | # CONFIG_NXP_STB225 is not set | ||
| 22 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 23 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 24 | # CONFIG_PMC_MSP is not set | 27 | # CONFIG_PMC_MSP is not set |
| 25 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 26 | CONFIG_SGI_IP22=y | 29 | CONFIG_SGI_IP22=y |
| 27 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 28 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 29 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 30 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -35,34 +39,49 @@ CONFIG_SGI_IP22=y | |||
| 35 | # CONFIG_SIBYTE_SENTOSA is not set | 39 | # CONFIG_SIBYTE_SENTOSA is not set |
| 36 | # CONFIG_SIBYTE_BIGSUR is not set | 40 | # CONFIG_SIBYTE_BIGSUR is not set |
| 37 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 38 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
| 39 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
| 40 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
| 41 | # CONFIG_WR_PPMC is not set | 45 | # CONFIG_WR_PPMC is not set |
| 42 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 43 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 44 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 46 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
| 47 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 48 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
| 55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 49 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 50 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 57 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 51 | CONFIG_ARC=y | 58 | CONFIG_ARC=y |
| 59 | CONFIG_CEVT_R4K=y | ||
| 60 | CONFIG_CSRC_R4K=y | ||
| 52 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
| 53 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 54 | CONFIG_EARLY_PRINTK=y | 63 | CONFIG_EARLY_PRINTK=y |
| 55 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 64 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
| 65 | # CONFIG_HOTPLUG_CPU is not set | ||
| 66 | CONFIG_I8259=y | ||
| 56 | # CONFIG_NO_IOPORT is not set | 67 | # CONFIG_NO_IOPORT is not set |
| 68 | CONFIG_GENERIC_ISA_DMA=y | ||
| 57 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y | 69 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y |
| 58 | CONFIG_CPU_BIG_ENDIAN=y | 70 | CONFIG_CPU_BIG_ENDIAN=y |
| 59 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 71 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 60 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 72 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 61 | CONFIG_IRQ_CPU=y | 73 | CONFIG_IRQ_CPU=y |
| 62 | CONFIG_SWAP_IO_SPACE=y | 74 | CONFIG_SWAP_IO_SPACE=y |
| 75 | CONFIG_SGI_HAS_INDYDOG=y | ||
| 76 | CONFIG_SGI_HAS_HAL2=y | ||
| 77 | CONFIG_SGI_HAS_SEEQ=y | ||
| 78 | CONFIG_SGI_HAS_WD93=y | ||
| 79 | CONFIG_SGI_HAS_ZILOG=y | ||
| 80 | CONFIG_SGI_HAS_I8042=y | ||
| 81 | CONFIG_DEFAULT_SGI_PARTITION=y | ||
| 63 | CONFIG_ARC32=y | 82 | CONFIG_ARC32=y |
| 64 | CONFIG_BOOT_ELF32=y | 83 | CONFIG_BOOT_ELF32=y |
| 65 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 84 | CONFIG_MIPS_L1_CACHE_SHIFT=7 |
| 66 | CONFIG_ARC_CONSOLE=y | 85 | CONFIG_ARC_CONSOLE=y |
| 67 | CONFIG_ARC_PROMLIB=y | 86 | CONFIG_ARC_PROMLIB=y |
| 68 | 87 | ||
| @@ -82,6 +101,7 @@ CONFIG_ARC_PROMLIB=y | |||
| 82 | # CONFIG_CPU_TX49XX is not set | 101 | # CONFIG_CPU_TX49XX is not set |
| 83 | CONFIG_CPU_R5000=y | 102 | CONFIG_CPU_R5000=y |
| 84 | # CONFIG_CPU_R5432 is not set | 103 | # CONFIG_CPU_R5432 is not set |
| 104 | # CONFIG_CPU_R5500 is not set | ||
| 85 | # CONFIG_CPU_R6000 is not set | 105 | # CONFIG_CPU_R6000 is not set |
| 86 | # CONFIG_CPU_NEVADA is not set | 106 | # CONFIG_CPU_NEVADA is not set |
| 87 | # CONFIG_CPU_R8000 is not set | 107 | # CONFIG_CPU_R8000 is not set |
| @@ -115,18 +135,24 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 115 | CONFIG_GENERIC_HARDIRQS=y | 135 | CONFIG_GENERIC_HARDIRQS=y |
| 116 | CONFIG_GENERIC_IRQ_PROBE=y | 136 | CONFIG_GENERIC_IRQ_PROBE=y |
| 117 | CONFIG_ARCH_FLATMEM_ENABLE=y | 137 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 138 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 118 | CONFIG_SELECT_MEMORY_MODEL=y | 139 | CONFIG_SELECT_MEMORY_MODEL=y |
| 119 | CONFIG_FLATMEM_MANUAL=y | 140 | CONFIG_FLATMEM_MANUAL=y |
| 120 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 141 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 121 | # CONFIG_SPARSEMEM_MANUAL is not set | 142 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 122 | CONFIG_FLATMEM=y | 143 | CONFIG_FLATMEM=y |
| 123 | CONFIG_FLAT_NODE_MEM_MAP=y | 144 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 124 | # CONFIG_SPARSEMEM_STATIC is not set | 145 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 125 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 146 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 126 | # CONFIG_RESOURCES_64BIT is not set | 147 | # CONFIG_RESOURCES_64BIT is not set |
| 127 | CONFIG_ZONE_DMA_FLAG=1 | 148 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 128 | CONFIG_BOUNCE=y | 149 | CONFIG_ZONE_DMA_FLAG=0 |
| 129 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
| 151 | CONFIG_UNEVICTABLE_LRU=y | ||
| 152 | CONFIG_TICK_ONESHOT=y | ||
| 153 | CONFIG_NO_HZ=y | ||
| 154 | CONFIG_HIGH_RES_TIMERS=y | ||
| 155 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 130 | # CONFIG_HZ_48 is not set | 156 | # CONFIG_HZ_48 is not set |
| 131 | # CONFIG_HZ_100 is not set | 157 | # CONFIG_HZ_100 is not set |
| 132 | # CONFIG_HZ_128 is not set | 158 | # CONFIG_HZ_128 is not set |
| @@ -159,13 +185,20 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 159 | # CONFIG_POSIX_MQUEUE is not set | 185 | # CONFIG_POSIX_MQUEUE is not set |
| 160 | # CONFIG_BSD_PROCESS_ACCT is not set | 186 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 161 | # CONFIG_TASKSTATS is not set | 187 | # CONFIG_TASKSTATS is not set |
| 162 | # CONFIG_USER_NS is not set | ||
| 163 | # CONFIG_AUDIT is not set | 188 | # CONFIG_AUDIT is not set |
| 164 | CONFIG_IKCONFIG=y | 189 | CONFIG_IKCONFIG=y |
| 165 | CONFIG_IKCONFIG_PROC=y | 190 | CONFIG_IKCONFIG_PROC=y |
| 166 | CONFIG_LOG_BUF_SHIFT=14 | 191 | CONFIG_LOG_BUF_SHIFT=14 |
| 192 | # CONFIG_CGROUPS is not set | ||
| 193 | # CONFIG_GROUP_SCHED is not set | ||
| 167 | CONFIG_SYSFS_DEPRECATED=y | 194 | CONFIG_SYSFS_DEPRECATED=y |
| 195 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 168 | CONFIG_RELAY=y | 196 | CONFIG_RELAY=y |
| 197 | CONFIG_NAMESPACES=y | ||
| 198 | CONFIG_UTS_NS=y | ||
| 199 | CONFIG_IPC_NS=y | ||
| 200 | CONFIG_USER_NS=y | ||
| 201 | CONFIG_PID_NS=y | ||
| 169 | # CONFIG_BLK_DEV_INITRD is not set | 202 | # CONFIG_BLK_DEV_INITRD is not set |
| 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 203 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 171 | CONFIG_SYSCTL=y | 204 | CONFIG_SYSCTL=y |
| @@ -177,6 +210,8 @@ CONFIG_KALLSYMS=y | |||
| 177 | CONFIG_PRINTK=y | 210 | CONFIG_PRINTK=y |
| 178 | CONFIG_BUG=y | 211 | CONFIG_BUG=y |
| 179 | CONFIG_ELF_CORE=y | 212 | CONFIG_ELF_CORE=y |
| 213 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 214 | # CONFIG_COMPAT_BRK is not set | ||
| 180 | CONFIG_BASE_FULL=y | 215 | CONFIG_BASE_FULL=y |
| 181 | CONFIG_FUTEX=y | 216 | CONFIG_FUTEX=y |
| 182 | CONFIG_ANON_INODES=y | 217 | CONFIG_ANON_INODES=y |
| @@ -185,14 +220,21 @@ CONFIG_SIGNALFD=y | |||
| 185 | CONFIG_TIMERFD=y | 220 | CONFIG_TIMERFD=y |
| 186 | CONFIG_EVENTFD=y | 221 | CONFIG_EVENTFD=y |
| 187 | CONFIG_SHMEM=y | 222 | CONFIG_SHMEM=y |
| 223 | CONFIG_AIO=y | ||
| 188 | CONFIG_VM_EVENT_COUNTERS=y | 224 | CONFIG_VM_EVENT_COUNTERS=y |
| 189 | CONFIG_SLAB=y | 225 | CONFIG_SLAB=y |
| 190 | # CONFIG_SLUB is not set | 226 | # CONFIG_SLUB is not set |
| 191 | # CONFIG_SLOB is not set | 227 | # CONFIG_SLOB is not set |
| 228 | # CONFIG_PROFILING is not set | ||
| 229 | # CONFIG_MARKERS is not set | ||
| 230 | CONFIG_HAVE_OPROFILE=y | ||
| 231 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 232 | CONFIG_SLABINFO=y | ||
| 192 | CONFIG_RT_MUTEXES=y | 233 | CONFIG_RT_MUTEXES=y |
| 193 | # CONFIG_TINY_SHMEM is not set | 234 | # CONFIG_TINY_SHMEM is not set |
| 194 | CONFIG_BASE_SMALL=0 | 235 | CONFIG_BASE_SMALL=0 |
| 195 | CONFIG_MODULES=y | 236 | CONFIG_MODULES=y |
| 237 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 196 | CONFIG_MODULE_UNLOAD=y | 238 | CONFIG_MODULE_UNLOAD=y |
| 197 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 239 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 198 | CONFIG_MODVERSIONS=y | 240 | CONFIG_MODVERSIONS=y |
| @@ -203,6 +245,7 @@ CONFIG_BLOCK=y | |||
| 203 | # CONFIG_BLK_DEV_IO_TRACE is not set | 245 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 204 | # CONFIG_LSF is not set | 246 | # CONFIG_LSF is not set |
| 205 | # CONFIG_BLK_DEV_BSG is not set | 247 | # CONFIG_BLK_DEV_BSG is not set |
| 248 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 206 | 249 | ||
| 207 | # | 250 | # |
| 208 | # IO Schedulers | 251 | # IO Schedulers |
| @@ -216,6 +259,8 @@ CONFIG_DEFAULT_AS=y | |||
| 216 | # CONFIG_DEFAULT_CFQ is not set | 259 | # CONFIG_DEFAULT_CFQ is not set |
| 217 | # CONFIG_DEFAULT_NOOP is not set | 260 | # CONFIG_DEFAULT_NOOP is not set |
| 218 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 261 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 262 | CONFIG_CLASSIC_RCU=y | ||
| 263 | # CONFIG_FREEZER is not set | ||
| 219 | 264 | ||
| 220 | # | 265 | # |
| 221 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 266 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| @@ -224,29 +269,24 @@ CONFIG_HW_HAS_EISA=y | |||
| 224 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 269 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 225 | # CONFIG_EISA is not set | 270 | # CONFIG_EISA is not set |
| 226 | CONFIG_MMU=y | 271 | CONFIG_MMU=y |
| 227 | 272 | CONFIG_I8253=y | |
| 228 | # | ||
| 229 | # PCCARD (PCMCIA/CardBus) support | ||
| 230 | # | ||
| 231 | 273 | ||
| 232 | # | 274 | # |
| 233 | # Executable file formats | 275 | # Executable file formats |
| 234 | # | 276 | # |
| 235 | CONFIG_BINFMT_ELF=y | 277 | CONFIG_BINFMT_ELF=y |
| 278 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 279 | # CONFIG_HAVE_AOUT is not set | ||
| 236 | CONFIG_BINFMT_MISC=m | 280 | CONFIG_BINFMT_MISC=m |
| 237 | CONFIG_TRAD_SIGNALS=y | 281 | CONFIG_TRAD_SIGNALS=y |
| 238 | 282 | ||
| 239 | # | 283 | # |
| 240 | # Power management options | 284 | # Power management options |
| 241 | # | 285 | # |
| 286 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 242 | CONFIG_PM=y | 287 | CONFIG_PM=y |
| 243 | # CONFIG_PM_LEGACY is not set | ||
| 244 | # CONFIG_PM_DEBUG is not set | 288 | # CONFIG_PM_DEBUG is not set |
| 245 | # CONFIG_SUSPEND is not set | 289 | # CONFIG_SUSPEND is not set |
| 246 | |||
| 247 | # | ||
| 248 | # Networking | ||
| 249 | # | ||
| 250 | CONFIG_NET=y | 290 | CONFIG_NET=y |
| 251 | 291 | ||
| 252 | # | 292 | # |
| @@ -259,6 +299,8 @@ CONFIG_XFRM=y | |||
| 259 | CONFIG_XFRM_USER=m | 299 | CONFIG_XFRM_USER=m |
| 260 | # CONFIG_XFRM_SUB_POLICY is not set | 300 | # CONFIG_XFRM_SUB_POLICY is not set |
| 261 | CONFIG_XFRM_MIGRATE=y | 301 | CONFIG_XFRM_MIGRATE=y |
| 302 | # CONFIG_XFRM_STATISTICS is not set | ||
| 303 | CONFIG_XFRM_IPCOMP=m | ||
| 262 | CONFIG_NET_KEY=y | 304 | CONFIG_NET_KEY=y |
| 263 | CONFIG_NET_KEY_MIGRATE=y | 305 | CONFIG_NET_KEY_MIGRATE=y |
| 264 | CONFIG_INET=y | 306 | CONFIG_INET=y |
| @@ -282,42 +324,13 @@ CONFIG_INET_TUNNEL=m | |||
| 282 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 324 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 283 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 325 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 284 | CONFIG_INET_XFRM_MODE_BEET=m | 326 | CONFIG_INET_XFRM_MODE_BEET=m |
| 327 | # CONFIG_INET_LRO is not set | ||
| 285 | CONFIG_INET_DIAG=y | 328 | CONFIG_INET_DIAG=y |
| 286 | CONFIG_INET_TCP_DIAG=y | 329 | CONFIG_INET_TCP_DIAG=y |
| 287 | # CONFIG_TCP_CONG_ADVANCED is not set | 330 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 288 | CONFIG_TCP_CONG_CUBIC=y | 331 | CONFIG_TCP_CONG_CUBIC=y |
| 289 | CONFIG_DEFAULT_TCP_CONG="cubic" | 332 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 290 | CONFIG_TCP_MD5SIG=y | 333 | CONFIG_TCP_MD5SIG=y |
| 291 | CONFIG_IP_VS=m | ||
| 292 | # CONFIG_IP_VS_DEBUG is not set | ||
| 293 | CONFIG_IP_VS_TAB_BITS=12 | ||
| 294 | |||
| 295 | # | ||
| 296 | # IPVS transport protocol load balancing support | ||
| 297 | # | ||
| 298 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 299 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 300 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 301 | CONFIG_IP_VS_PROTO_AH=y | ||
| 302 | |||
| 303 | # | ||
| 304 | # IPVS scheduler | ||
| 305 | # | ||
| 306 | CONFIG_IP_VS_RR=m | ||
| 307 | CONFIG_IP_VS_WRR=m | ||
| 308 | CONFIG_IP_VS_LC=m | ||
| 309 | CONFIG_IP_VS_WLC=m | ||
| 310 | CONFIG_IP_VS_LBLC=m | ||
| 311 | CONFIG_IP_VS_LBLCR=m | ||
| 312 | CONFIG_IP_VS_DH=m | ||
| 313 | CONFIG_IP_VS_SH=m | ||
| 314 | CONFIG_IP_VS_SED=m | ||
| 315 | CONFIG_IP_VS_NQ=m | ||
| 316 | |||
| 317 | # | ||
| 318 | # IPVS application helper | ||
| 319 | # | ||
| 320 | CONFIG_IP_VS_FTP=m | ||
| 321 | CONFIG_IPV6=m | 334 | CONFIG_IPV6=m |
| 322 | CONFIG_IPV6_PRIVACY=y | 335 | CONFIG_IPV6_PRIVACY=y |
| 323 | CONFIG_IPV6_ROUTER_PREF=y | 336 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -334,12 +347,16 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
| 334 | CONFIG_INET6_XFRM_MODE_BEET=m | 347 | CONFIG_INET6_XFRM_MODE_BEET=m |
| 335 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 348 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m |
| 336 | CONFIG_IPV6_SIT=m | 349 | CONFIG_IPV6_SIT=m |
| 350 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 337 | CONFIG_IPV6_TUNNEL=m | 351 | CONFIG_IPV6_TUNNEL=m |
| 338 | CONFIG_IPV6_MULTIPLE_TABLES=y | 352 | CONFIG_IPV6_MULTIPLE_TABLES=y |
| 339 | CONFIG_IPV6_SUBTREES=y | 353 | CONFIG_IPV6_SUBTREES=y |
| 354 | CONFIG_IPV6_MROUTE=y | ||
| 355 | CONFIG_IPV6_PIMSM_V2=y | ||
| 340 | CONFIG_NETWORK_SECMARK=y | 356 | CONFIG_NETWORK_SECMARK=y |
| 341 | CONFIG_NETFILTER=y | 357 | CONFIG_NETFILTER=y |
| 342 | # CONFIG_NETFILTER_DEBUG is not set | 358 | # CONFIG_NETFILTER_DEBUG is not set |
| 359 | CONFIG_NETFILTER_ADVANCED=y | ||
| 343 | 360 | ||
| 344 | # | 361 | # |
| 345 | # Core Netfilter Configuration | 362 | # Core Netfilter Configuration |
| @@ -347,12 +364,12 @@ CONFIG_NETFILTER=y | |||
| 347 | CONFIG_NETFILTER_NETLINK=m | 364 | CONFIG_NETFILTER_NETLINK=m |
| 348 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 365 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 349 | CONFIG_NETFILTER_NETLINK_LOG=m | 366 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 350 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 351 | CONFIG_NF_CONNTRACK=m | 367 | CONFIG_NF_CONNTRACK=m |
| 352 | CONFIG_NF_CT_ACCT=y | 368 | CONFIG_NF_CT_ACCT=y |
| 353 | CONFIG_NF_CONNTRACK_MARK=y | 369 | CONFIG_NF_CONNTRACK_MARK=y |
| 354 | CONFIG_NF_CONNTRACK_SECMARK=y | 370 | CONFIG_NF_CONNTRACK_SECMARK=y |
| 355 | CONFIG_NF_CONNTRACK_EVENTS=y | 371 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 372 | CONFIG_NF_CT_PROTO_DCCP=m | ||
| 356 | CONFIG_NF_CT_PROTO_GRE=m | 373 | CONFIG_NF_CT_PROTO_GRE=m |
| 357 | CONFIG_NF_CT_PROTO_SCTP=m | 374 | CONFIG_NF_CT_PROTO_SCTP=m |
| 358 | CONFIG_NF_CT_PROTO_UDPLITE=m | 375 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| @@ -366,18 +383,22 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 366 | CONFIG_NF_CONNTRACK_SIP=m | 383 | CONFIG_NF_CONNTRACK_SIP=m |
| 367 | CONFIG_NF_CONNTRACK_TFTP=m | 384 | CONFIG_NF_CONNTRACK_TFTP=m |
| 368 | CONFIG_NF_CT_NETLINK=m | 385 | CONFIG_NF_CT_NETLINK=m |
| 386 | CONFIG_NETFILTER_TPROXY=m | ||
| 369 | CONFIG_NETFILTER_XTABLES=m | 387 | CONFIG_NETFILTER_XTABLES=m |
| 370 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 388 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 371 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 389 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 390 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
| 372 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 391 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 373 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 392 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 374 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 375 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 393 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 394 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 376 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 395 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 396 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
| 397 | CONFIG_NETFILTER_XT_TARGET_TPROXY=m | ||
| 377 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 398 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 378 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 399 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
| 379 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
| 380 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 400 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 401 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
| 381 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 402 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 382 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 403 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 383 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 404 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -386,39 +407,75 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 386 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 407 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 387 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 408 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 388 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 409 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 410 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 389 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 411 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 412 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
| 390 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 413 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 391 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 414 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 392 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 415 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 393 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 416 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 394 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 395 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 417 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 418 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
| 419 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 396 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 420 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 397 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 421 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 422 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
| 398 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 423 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 424 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 425 | CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y | ||
| 399 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 426 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 427 | CONFIG_NETFILTER_XT_MATCH_SOCKET=m | ||
| 400 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 428 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 401 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 429 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| 402 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 430 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 403 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 431 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 432 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
| 404 | CONFIG_NETFILTER_XT_MATCH_U32=m | 433 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 405 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 434 | CONFIG_IP_VS=m |
| 435 | CONFIG_IP_VS_IPV6=y | ||
| 436 | # CONFIG_IP_VS_DEBUG is not set | ||
| 437 | CONFIG_IP_VS_TAB_BITS=12 | ||
| 438 | |||
| 439 | # | ||
| 440 | # IPVS transport protocol load balancing support | ||
| 441 | # | ||
| 442 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 443 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 444 | CONFIG_IP_VS_PROTO_AH_ESP=y | ||
| 445 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 446 | CONFIG_IP_VS_PROTO_AH=y | ||
| 447 | |||
| 448 | # | ||
| 449 | # IPVS scheduler | ||
| 450 | # | ||
| 451 | CONFIG_IP_VS_RR=m | ||
| 452 | CONFIG_IP_VS_WRR=m | ||
| 453 | CONFIG_IP_VS_LC=m | ||
| 454 | CONFIG_IP_VS_WLC=m | ||
| 455 | CONFIG_IP_VS_LBLC=m | ||
| 456 | CONFIG_IP_VS_LBLCR=m | ||
| 457 | CONFIG_IP_VS_DH=m | ||
| 458 | CONFIG_IP_VS_SH=m | ||
| 459 | CONFIG_IP_VS_SED=m | ||
| 460 | CONFIG_IP_VS_NQ=m | ||
| 461 | |||
| 462 | # | ||
| 463 | # IPVS application helper | ||
| 464 | # | ||
| 465 | CONFIG_IP_VS_FTP=m | ||
| 406 | 466 | ||
| 407 | # | 467 | # |
| 408 | # IP: Netfilter Configuration | 468 | # IP: Netfilter Configuration |
| 409 | # | 469 | # |
| 470 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 410 | CONFIG_NF_CONNTRACK_IPV4=m | 471 | CONFIG_NF_CONNTRACK_IPV4=m |
| 411 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 472 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 412 | CONFIG_IP_NF_QUEUE=m | 473 | CONFIG_IP_NF_QUEUE=m |
| 413 | CONFIG_IP_NF_IPTABLES=m | 474 | CONFIG_IP_NF_IPTABLES=m |
| 414 | CONFIG_IP_NF_MATCH_IPRANGE=m | 475 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 415 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 416 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 417 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 418 | CONFIG_IP_NF_MATCH_AH=m | 476 | CONFIG_IP_NF_MATCH_AH=m |
| 477 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 419 | CONFIG_IP_NF_MATCH_TTL=m | 478 | CONFIG_IP_NF_MATCH_TTL=m |
| 420 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 421 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 422 | CONFIG_IP_NF_FILTER=m | 479 | CONFIG_IP_NF_FILTER=m |
| 423 | CONFIG_IP_NF_TARGET_REJECT=m | 480 | CONFIG_IP_NF_TARGET_REJECT=m |
| 424 | CONFIG_IP_NF_TARGET_LOG=m | 481 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -426,11 +483,13 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 426 | CONFIG_NF_NAT=m | 483 | CONFIG_NF_NAT=m |
| 427 | CONFIG_NF_NAT_NEEDED=y | 484 | CONFIG_NF_NAT_NEEDED=y |
| 428 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 485 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 429 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 430 | CONFIG_IP_NF_TARGET_NETMAP=m | 486 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 431 | CONFIG_IP_NF_TARGET_SAME=m | 487 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 432 | CONFIG_NF_NAT_SNMP_BASIC=m | 488 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 489 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
| 433 | CONFIG_NF_NAT_PROTO_GRE=m | 490 | CONFIG_NF_NAT_PROTO_GRE=m |
| 491 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
| 492 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
| 434 | CONFIG_NF_NAT_FTP=m | 493 | CONFIG_NF_NAT_FTP=m |
| 435 | CONFIG_NF_NAT_IRC=m | 494 | CONFIG_NF_NAT_IRC=m |
| 436 | CONFIG_NF_NAT_TFTP=m | 495 | CONFIG_NF_NAT_TFTP=m |
| @@ -439,32 +498,30 @@ CONFIG_NF_NAT_PPTP=m | |||
| 439 | CONFIG_NF_NAT_H323=m | 498 | CONFIG_NF_NAT_H323=m |
| 440 | CONFIG_NF_NAT_SIP=m | 499 | CONFIG_NF_NAT_SIP=m |
| 441 | CONFIG_IP_NF_MANGLE=m | 500 | CONFIG_IP_NF_MANGLE=m |
| 442 | CONFIG_IP_NF_TARGET_TOS=m | 501 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 443 | CONFIG_IP_NF_TARGET_ECN=m | 502 | CONFIG_IP_NF_TARGET_ECN=m |
| 444 | CONFIG_IP_NF_TARGET_TTL=m | 503 | CONFIG_IP_NF_TARGET_TTL=m |
| 445 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 446 | CONFIG_IP_NF_RAW=m | 504 | CONFIG_IP_NF_RAW=m |
| 447 | CONFIG_IP_NF_ARPTABLES=m | 505 | CONFIG_IP_NF_ARPTABLES=m |
| 448 | CONFIG_IP_NF_ARPFILTER=m | 506 | CONFIG_IP_NF_ARPFILTER=m |
| 449 | CONFIG_IP_NF_ARP_MANGLE=m | 507 | CONFIG_IP_NF_ARP_MANGLE=m |
| 450 | 508 | ||
| 451 | # | 509 | # |
| 452 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 510 | # IPv6: Netfilter Configuration |
| 453 | # | 511 | # |
| 454 | CONFIG_NF_CONNTRACK_IPV6=m | 512 | CONFIG_NF_CONNTRACK_IPV6=m |
| 455 | CONFIG_IP6_NF_QUEUE=m | 513 | CONFIG_IP6_NF_QUEUE=m |
| 456 | CONFIG_IP6_NF_IPTABLES=m | 514 | CONFIG_IP6_NF_IPTABLES=m |
| 457 | CONFIG_IP6_NF_MATCH_RT=m | 515 | CONFIG_IP6_NF_MATCH_AH=m |
| 458 | CONFIG_IP6_NF_MATCH_OPTS=m | 516 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 459 | CONFIG_IP6_NF_MATCH_FRAG=m | 517 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 518 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 460 | CONFIG_IP6_NF_MATCH_HL=m | 519 | CONFIG_IP6_NF_MATCH_HL=m |
| 461 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
| 462 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 520 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 463 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 464 | CONFIG_IP6_NF_MATCH_MH=m | 521 | CONFIG_IP6_NF_MATCH_MH=m |
| 465 | CONFIG_IP6_NF_MATCH_EUI64=m | 522 | CONFIG_IP6_NF_MATCH_RT=m |
| 466 | CONFIG_IP6_NF_FILTER=m | ||
| 467 | CONFIG_IP6_NF_TARGET_LOG=m | 523 | CONFIG_IP6_NF_TARGET_LOG=m |
| 524 | CONFIG_IP6_NF_FILTER=m | ||
| 468 | CONFIG_IP6_NF_TARGET_REJECT=m | 525 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 469 | CONFIG_IP6_NF_MANGLE=m | 526 | CONFIG_IP6_NF_MANGLE=m |
| 470 | CONFIG_IP6_NF_TARGET_HL=m | 527 | CONFIG_IP6_NF_TARGET_HL=m |
| @@ -479,6 +536,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 479 | # CONFIG_TIPC is not set | 536 | # CONFIG_TIPC is not set |
| 480 | # CONFIG_ATM is not set | 537 | # CONFIG_ATM is not set |
| 481 | # CONFIG_BRIDGE is not set | 538 | # CONFIG_BRIDGE is not set |
| 539 | # CONFIG_NET_DSA is not set | ||
| 482 | # CONFIG_VLAN_8021Q is not set | 540 | # CONFIG_VLAN_8021Q is not set |
| 483 | # CONFIG_DECNET is not set | 541 | # CONFIG_DECNET is not set |
| 484 | # CONFIG_LLC2 is not set | 542 | # CONFIG_LLC2 is not set |
| @@ -488,12 +546,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 488 | # CONFIG_LAPB is not set | 546 | # CONFIG_LAPB is not set |
| 489 | # CONFIG_ECONET is not set | 547 | # CONFIG_ECONET is not set |
| 490 | # CONFIG_WAN_ROUTER is not set | 548 | # CONFIG_WAN_ROUTER is not set |
| 491 | |||
| 492 | # | ||
| 493 | # QoS and/or fair queueing | ||
| 494 | # | ||
| 495 | CONFIG_NET_SCHED=y | 549 | CONFIG_NET_SCHED=y |
| 496 | CONFIG_NET_SCH_FIFO=y | ||
| 497 | 550 | ||
| 498 | # | 551 | # |
| 499 | # Queueing/Scheduling | 552 | # Queueing/Scheduling |
| @@ -502,7 +555,7 @@ CONFIG_NET_SCH_CBQ=m | |||
| 502 | CONFIG_NET_SCH_HTB=m | 555 | CONFIG_NET_SCH_HTB=m |
| 503 | CONFIG_NET_SCH_HFSC=m | 556 | CONFIG_NET_SCH_HFSC=m |
| 504 | CONFIG_NET_SCH_PRIO=m | 557 | CONFIG_NET_SCH_PRIO=m |
| 505 | CONFIG_NET_SCH_RR=m | 558 | # CONFIG_NET_SCH_MULTIQ is not set |
| 506 | CONFIG_NET_SCH_RED=m | 559 | CONFIG_NET_SCH_RED=m |
| 507 | CONFIG_NET_SCH_SFQ=m | 560 | CONFIG_NET_SCH_SFQ=m |
| 508 | CONFIG_NET_SCH_TEQL=m | 561 | CONFIG_NET_SCH_TEQL=m |
| @@ -526,6 +579,7 @@ CONFIG_NET_CLS_U32=m | |||
| 526 | # CONFIG_CLS_U32_MARK is not set | 579 | # CONFIG_CLS_U32_MARK is not set |
| 527 | CONFIG_NET_CLS_RSVP=m | 580 | CONFIG_NET_CLS_RSVP=m |
| 528 | CONFIG_NET_CLS_RSVP6=m | 581 | CONFIG_NET_CLS_RSVP6=m |
| 582 | CONFIG_NET_CLS_FLOW=m | ||
| 529 | # CONFIG_NET_EMATCH is not set | 583 | # CONFIG_NET_EMATCH is not set |
| 530 | CONFIG_NET_CLS_ACT=y | 584 | CONFIG_NET_CLS_ACT=y |
| 531 | CONFIG_NET_ACT_POLICE=y | 585 | CONFIG_NET_ACT_POLICE=y |
| @@ -533,35 +587,28 @@ CONFIG_NET_ACT_GACT=m | |||
| 533 | CONFIG_GACT_PROB=y | 587 | CONFIG_GACT_PROB=y |
| 534 | CONFIG_NET_ACT_MIRRED=m | 588 | CONFIG_NET_ACT_MIRRED=m |
| 535 | CONFIG_NET_ACT_IPT=m | 589 | CONFIG_NET_ACT_IPT=m |
| 590 | CONFIG_NET_ACT_NAT=m | ||
| 536 | CONFIG_NET_ACT_PEDIT=m | 591 | CONFIG_NET_ACT_PEDIT=m |
| 537 | CONFIG_NET_ACT_SIMP=m | 592 | CONFIG_NET_ACT_SIMP=m |
| 538 | CONFIG_NET_CLS_POLICE=y | 593 | CONFIG_NET_ACT_SKBEDIT=m |
| 539 | # CONFIG_NET_CLS_IND is not set | 594 | # CONFIG_NET_CLS_IND is not set |
| 595 | CONFIG_NET_SCH_FIFO=y | ||
| 540 | 596 | ||
| 541 | # | 597 | # |
| 542 | # Network testing | 598 | # Network testing |
| 543 | # | 599 | # |
| 544 | # CONFIG_NET_PKTGEN is not set | 600 | # CONFIG_NET_PKTGEN is not set |
| 545 | # CONFIG_HAMRADIO is not set | 601 | # CONFIG_HAMRADIO is not set |
| 602 | # CONFIG_CAN is not set | ||
| 546 | # CONFIG_IRDA is not set | 603 | # CONFIG_IRDA is not set |
| 547 | # CONFIG_BT is not set | 604 | # CONFIG_BT is not set |
| 548 | # CONFIG_AF_RXRPC is not set | 605 | # CONFIG_AF_RXRPC is not set |
| 606 | CONFIG_PHONET=m | ||
| 549 | CONFIG_FIB_RULES=y | 607 | CONFIG_FIB_RULES=y |
| 550 | 608 | # CONFIG_WIRELESS is not set | |
| 551 | # | ||
| 552 | # Wireless | ||
| 553 | # | ||
| 554 | CONFIG_CFG80211=m | ||
| 555 | CONFIG_WIRELESS_EXT=y | 609 | CONFIG_WIRELESS_EXT=y |
| 556 | CONFIG_MAC80211=m | ||
| 557 | # CONFIG_MAC80211_DEBUG is not set | ||
| 558 | CONFIG_IEEE80211=m | 610 | CONFIG_IEEE80211=m |
| 559 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 560 | CONFIG_IEEE80211_CRYPT_WEP=m | 611 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 561 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 562 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
| 563 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 564 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 565 | CONFIG_RFKILL=m | 612 | CONFIG_RFKILL=m |
| 566 | CONFIG_RFKILL_INPUT=m | 613 | CONFIG_RFKILL_INPUT=m |
| 567 | # CONFIG_NET_9P is not set | 614 | # CONFIG_NET_9P is not set |
| @@ -588,7 +635,9 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 588 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 635 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 589 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 636 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 590 | CONFIG_ATA_OVER_ETH=m | 637 | CONFIG_ATA_OVER_ETH=m |
| 638 | # CONFIG_BLK_DEV_HD is not set | ||
| 591 | # CONFIG_MISC_DEVICES is not set | 639 | # CONFIG_MISC_DEVICES is not set |
| 640 | CONFIG_HAVE_IDE=y | ||
| 592 | # CONFIG_IDE is not set | 641 | # CONFIG_IDE is not set |
| 593 | 642 | ||
| 594 | # | 643 | # |
| @@ -628,20 +677,22 @@ CONFIG_SCSI_SPI_ATTRS=m | |||
| 628 | # CONFIG_SCSI_FC_ATTRS is not set | 677 | # CONFIG_SCSI_FC_ATTRS is not set |
| 629 | CONFIG_SCSI_ISCSI_ATTRS=m | 678 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 630 | # CONFIG_SCSI_SAS_LIBSAS is not set | 679 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 680 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 631 | CONFIG_SCSI_LOWLEVEL=y | 681 | CONFIG_SCSI_LOWLEVEL=y |
| 632 | CONFIG_ISCSI_TCP=m | 682 | CONFIG_ISCSI_TCP=m |
| 633 | CONFIG_SGIWD93_SCSI=y | 683 | CONFIG_SGIWD93_SCSI=y |
| 634 | # CONFIG_SCSI_DEBUG is not set | 684 | # CONFIG_SCSI_DEBUG is not set |
| 685 | # CONFIG_SCSI_DH is not set | ||
| 635 | # CONFIG_ATA is not set | 686 | # CONFIG_ATA is not set |
| 636 | # CONFIG_MD is not set | 687 | # CONFIG_MD is not set |
| 637 | CONFIG_NETDEVICES=y | 688 | CONFIG_NETDEVICES=y |
| 638 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 639 | # CONFIG_IFB is not set | 689 | # CONFIG_IFB is not set |
| 640 | CONFIG_DUMMY=m | 690 | CONFIG_DUMMY=m |
| 641 | CONFIG_BONDING=m | 691 | CONFIG_BONDING=m |
| 642 | CONFIG_MACVLAN=m | 692 | CONFIG_MACVLAN=m |
| 643 | CONFIG_EQUALIZER=m | 693 | CONFIG_EQUALIZER=m |
| 644 | CONFIG_TUN=m | 694 | CONFIG_TUN=m |
| 695 | CONFIG_VETH=m | ||
| 645 | CONFIG_PHYLIB=m | 696 | CONFIG_PHYLIB=m |
| 646 | 697 | ||
| 647 | # | 698 | # |
| @@ -656,11 +707,21 @@ CONFIG_CICADA_PHY=m | |||
| 656 | # CONFIG_SMSC_PHY is not set | 707 | # CONFIG_SMSC_PHY is not set |
| 657 | # CONFIG_BROADCOM_PHY is not set | 708 | # CONFIG_BROADCOM_PHY is not set |
| 658 | # CONFIG_ICPLUS_PHY is not set | 709 | # CONFIG_ICPLUS_PHY is not set |
| 659 | # CONFIG_FIXED_PHY is not set | 710 | CONFIG_REALTEK_PHY=m |
| 711 | CONFIG_MDIO_BITBANG=m | ||
| 660 | CONFIG_NET_ETHERNET=y | 712 | CONFIG_NET_ETHERNET=y |
| 661 | # CONFIG_MII is not set | 713 | CONFIG_MII=m |
| 662 | # CONFIG_AX88796 is not set | 714 | # CONFIG_AX88796 is not set |
| 715 | CONFIG_SMC91X=m | ||
| 663 | # CONFIG_DM9000 is not set | 716 | # CONFIG_DM9000 is not set |
| 717 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 718 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 719 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 720 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 721 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 722 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 723 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 724 | # CONFIG_B44 is not set | ||
| 664 | CONFIG_SGISEEQ=y | 725 | CONFIG_SGISEEQ=y |
| 665 | # CONFIG_NETDEV_1000 is not set | 726 | # CONFIG_NETDEV_1000 is not set |
| 666 | # CONFIG_NETDEV_10000 is not set | 727 | # CONFIG_NETDEV_10000 is not set |
| @@ -672,12 +733,12 @@ CONFIG_WLAN_PRE80211=y | |||
| 672 | CONFIG_STRIP=m | 733 | CONFIG_STRIP=m |
| 673 | CONFIG_WLAN_80211=y | 734 | CONFIG_WLAN_80211=y |
| 674 | # CONFIG_LIBERTAS is not set | 735 | # CONFIG_LIBERTAS is not set |
| 736 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 675 | CONFIG_HOSTAP=m | 737 | CONFIG_HOSTAP=m |
| 676 | # CONFIG_HOSTAP_FIRMWARE is not set | 738 | # CONFIG_HOSTAP_FIRMWARE is not set |
| 677 | # CONFIG_WAN is not set | 739 | # CONFIG_WAN is not set |
| 678 | # CONFIG_PPP is not set | 740 | # CONFIG_PPP is not set |
| 679 | # CONFIG_SLIP is not set | 741 | # CONFIG_SLIP is not set |
| 680 | # CONFIG_SHAPER is not set | ||
| 681 | # CONFIG_NETCONSOLE is not set | 742 | # CONFIG_NETCONSOLE is not set |
| 682 | # CONFIG_NETPOLL is not set | 743 | # CONFIG_NETPOLL is not set |
| 683 | # CONFIG_NET_POLL_CONTROLLER is not set | 744 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -699,7 +760,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 699 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 760 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 700 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 761 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 701 | # CONFIG_INPUT_JOYDEV is not set | 762 | # CONFIG_INPUT_JOYDEV is not set |
| 702 | # CONFIG_INPUT_TSDEV is not set | ||
| 703 | # CONFIG_INPUT_EVDEV is not set | 763 | # CONFIG_INPUT_EVDEV is not set |
| 704 | # CONFIG_INPUT_EVBUG is not set | 764 | # CONFIG_INPUT_EVBUG is not set |
| 705 | 765 | ||
| @@ -720,6 +780,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 720 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set | 780 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set |
| 721 | # CONFIG_MOUSE_PS2_LIFEBOOK is not set | 781 | # CONFIG_MOUSE_PS2_LIFEBOOK is not set |
| 722 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 782 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 783 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 723 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 784 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 724 | CONFIG_MOUSE_SERIAL=m | 785 | CONFIG_MOUSE_SERIAL=m |
| 725 | # CONFIG_MOUSE_VSXXXAA is not set | 786 | # CONFIG_MOUSE_VSXXXAA is not set |
| @@ -742,9 +803,11 @@ CONFIG_SERIO_RAW=m | |||
| 742 | # Character devices | 803 | # Character devices |
| 743 | # | 804 | # |
| 744 | CONFIG_VT=y | 805 | CONFIG_VT=y |
| 806 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 745 | CONFIG_VT_CONSOLE=y | 807 | CONFIG_VT_CONSOLE=y |
| 746 | CONFIG_HW_CONSOLE=y | 808 | CONFIG_HW_CONSOLE=y |
| 747 | CONFIG_VT_HW_CONSOLE_BINDING=y | 809 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 810 | CONFIG_DEVKMEM=y | ||
| 748 | # CONFIG_SERIAL_NONSTANDARD is not set | 811 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 749 | 812 | ||
| 750 | # | 813 | # |
| @@ -761,6 +824,17 @@ CONFIG_UNIX98_PTYS=y | |||
| 761 | CONFIG_LEGACY_PTYS=y | 824 | CONFIG_LEGACY_PTYS=y |
| 762 | CONFIG_LEGACY_PTY_COUNT=256 | 825 | CONFIG_LEGACY_PTY_COUNT=256 |
| 763 | # CONFIG_IPMI_HANDLER is not set | 826 | # CONFIG_IPMI_HANDLER is not set |
| 827 | # CONFIG_HW_RANDOM is not set | ||
| 828 | # CONFIG_R3964 is not set | ||
| 829 | CONFIG_RAW_DRIVER=m | ||
| 830 | CONFIG_MAX_RAW_DEVS=256 | ||
| 831 | # CONFIG_TCG_TPM is not set | ||
| 832 | # CONFIG_I2C is not set | ||
| 833 | # CONFIG_SPI is not set | ||
| 834 | # CONFIG_W1 is not set | ||
| 835 | # CONFIG_POWER_SUPPLY is not set | ||
| 836 | # CONFIG_HWMON is not set | ||
| 837 | CONFIG_THERMAL=m | ||
| 764 | CONFIG_WATCHDOG=y | 838 | CONFIG_WATCHDOG=y |
| 765 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 839 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 766 | 840 | ||
| @@ -769,47 +843,50 @@ CONFIG_WATCHDOG=y | |||
| 769 | # | 843 | # |
| 770 | # CONFIG_SOFT_WATCHDOG is not set | 844 | # CONFIG_SOFT_WATCHDOG is not set |
| 771 | CONFIG_INDYDOG=m | 845 | CONFIG_INDYDOG=m |
| 772 | # CONFIG_HW_RANDOM is not set | 846 | CONFIG_SSB_POSSIBLE=y |
| 773 | # CONFIG_RTC is not set | ||
| 774 | # CONFIG_R3964 is not set | ||
| 775 | CONFIG_RAW_DRIVER=m | ||
| 776 | CONFIG_MAX_RAW_DEVS=256 | ||
| 777 | # CONFIG_TCG_TPM is not set | ||
| 778 | # CONFIG_I2C is not set | ||
| 779 | 847 | ||
| 780 | # | 848 | # |
| 781 | # SPI support | 849 | # Sonics Silicon Backplane |
| 782 | # | 850 | # |
| 783 | # CONFIG_SPI is not set | 851 | # CONFIG_SSB is not set |
| 784 | # CONFIG_SPI_MASTER is not set | ||
| 785 | # CONFIG_W1 is not set | ||
| 786 | # CONFIG_POWER_SUPPLY is not set | ||
| 787 | # CONFIG_HWMON is not set | ||
| 788 | 852 | ||
| 789 | # | 853 | # |
| 790 | # Multifunction device drivers | 854 | # Multifunction device drivers |
| 791 | # | 855 | # |
| 856 | # CONFIG_MFD_CORE is not set | ||
| 792 | # CONFIG_MFD_SM501 is not set | 857 | # CONFIG_MFD_SM501 is not set |
| 858 | # CONFIG_HTC_PASIC3 is not set | ||
| 859 | # CONFIG_MFD_TMIO is not set | ||
| 860 | # CONFIG_REGULATOR is not set | ||
| 793 | 861 | ||
| 794 | # | 862 | # |
| 795 | # Multimedia devices | 863 | # Multimedia devices |
| 796 | # | 864 | # |
| 865 | |||
| 866 | # | ||
| 867 | # Multimedia core support | ||
| 868 | # | ||
| 797 | # CONFIG_VIDEO_DEV is not set | 869 | # CONFIG_VIDEO_DEV is not set |
| 798 | # CONFIG_DVB_CORE is not set | 870 | # CONFIG_DVB_CORE is not set |
| 871 | # CONFIG_VIDEO_MEDIA is not set | ||
| 872 | |||
| 873 | # | ||
| 874 | # Multimedia drivers | ||
| 875 | # | ||
| 799 | # CONFIG_DAB is not set | 876 | # CONFIG_DAB is not set |
| 800 | 877 | ||
| 801 | # | 878 | # |
| 802 | # Graphics support | 879 | # Graphics support |
| 803 | # | 880 | # |
| 881 | # CONFIG_VGASTATE is not set | ||
| 882 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 883 | # CONFIG_FB is not set | ||
| 804 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 884 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 805 | 885 | ||
| 806 | # | 886 | # |
| 807 | # Display device support | 887 | # Display device support |
| 808 | # | 888 | # |
| 809 | # CONFIG_DISPLAY_SUPPORT is not set | 889 | # CONFIG_DISPLAY_SUPPORT is not set |
| 810 | # CONFIG_VGASTATE is not set | ||
| 811 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 812 | # CONFIG_FB is not set | ||
| 813 | 890 | ||
| 814 | # | 891 | # |
| 815 | # Console display driver support | 892 | # Console display driver support |
| @@ -823,48 +900,77 @@ CONFIG_LOGO=y | |||
| 823 | # CONFIG_LOGO_LINUX_VGA16 is not set | 900 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 824 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 901 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
| 825 | CONFIG_LOGO_SGI_CLUT224=y | 902 | CONFIG_LOGO_SGI_CLUT224=y |
| 826 | |||
| 827 | # | ||
| 828 | # Sound | ||
| 829 | # | ||
| 830 | # CONFIG_SOUND is not set | 903 | # CONFIG_SOUND is not set |
| 831 | CONFIG_HID_SUPPORT=y | 904 | CONFIG_HID_SUPPORT=y |
| 832 | CONFIG_HID=y | 905 | CONFIG_HID=y |
| 833 | # CONFIG_HID_DEBUG is not set | 906 | # CONFIG_HID_DEBUG is not set |
| 907 | CONFIG_HIDRAW=y | ||
| 908 | CONFIG_HID_PID=y | ||
| 909 | |||
| 910 | # | ||
| 911 | # Special HID drivers | ||
| 912 | # | ||
| 913 | CONFIG_HID_COMPAT=y | ||
| 834 | CONFIG_USB_SUPPORT=y | 914 | CONFIG_USB_SUPPORT=y |
| 835 | # CONFIG_USB_ARCH_HAS_HCD is not set | 915 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 836 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 916 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 837 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 917 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 918 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 838 | 920 | ||
| 839 | # | 921 | # |
| 840 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 922 | # Enable Host or Gadget support to see Inventra options |
| 841 | # | 923 | # |
| 842 | 924 | ||
| 843 | # | 925 | # |
| 844 | # USB Gadget Support | 926 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 845 | # | 927 | # |
| 846 | # CONFIG_USB_GADGET is not set | 928 | # CONFIG_USB_GADGET is not set |
| 847 | # CONFIG_MMC is not set | 929 | # CONFIG_MMC is not set |
| 930 | # CONFIG_MEMSTICK is not set | ||
| 848 | # CONFIG_NEW_LEDS is not set | 931 | # CONFIG_NEW_LEDS is not set |
| 849 | # CONFIG_RTC_CLASS is not set | 932 | # CONFIG_ACCESSIBILITY is not set |
| 933 | CONFIG_RTC_LIB=y | ||
| 934 | CONFIG_RTC_CLASS=y | ||
| 935 | CONFIG_RTC_HCTOSYS=y | ||
| 936 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 937 | # CONFIG_RTC_DEBUG is not set | ||
| 850 | 938 | ||
| 851 | # | 939 | # |
| 852 | # DMA Engine support | 940 | # RTC interfaces |
| 853 | # | 941 | # |
| 854 | # CONFIG_DMA_ENGINE is not set | 942 | CONFIG_RTC_INTF_SYSFS=y |
| 943 | CONFIG_RTC_INTF_PROC=y | ||
| 944 | CONFIG_RTC_INTF_DEV=y | ||
| 945 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | ||
| 946 | # CONFIG_RTC_DRV_TEST is not set | ||
| 855 | 947 | ||
| 856 | # | 948 | # |
| 857 | # DMA Clients | 949 | # SPI RTC drivers |
| 858 | # | 950 | # |
| 859 | 951 | ||
| 860 | # | 952 | # |
| 861 | # DMA Devices | 953 | # Platform RTC drivers |
| 862 | # | 954 | # |
| 955 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 956 | CONFIG_RTC_DRV_DS1286=y | ||
| 957 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 958 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 959 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 960 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 961 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 962 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 963 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 964 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 965 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 863 | 966 | ||
| 864 | # | 967 | # |
| 865 | # Userspace I/O | 968 | # on-CPU RTC drivers |
| 866 | # | 969 | # |
| 970 | # CONFIG_DMADEVICES is not set | ||
| 867 | # CONFIG_UIO is not set | 971 | # CONFIG_UIO is not set |
| 972 | # CONFIG_STAGING is not set | ||
| 973 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 868 | 974 | ||
| 869 | # | 975 | # |
| 870 | # File systems | 976 | # File systems |
| @@ -876,29 +982,33 @@ CONFIG_EXT3_FS=y | |||
| 876 | CONFIG_EXT3_FS_XATTR=y | 982 | CONFIG_EXT3_FS_XATTR=y |
| 877 | CONFIG_EXT3_FS_POSIX_ACL=y | 983 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 878 | CONFIG_EXT3_FS_SECURITY=y | 984 | CONFIG_EXT3_FS_SECURITY=y |
| 879 | # CONFIG_EXT4DEV_FS is not set | 985 | CONFIG_EXT4_FS=m |
| 986 | CONFIG_EXT4DEV_COMPAT=y | ||
| 987 | CONFIG_EXT4_FS_XATTR=y | ||
| 988 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
| 989 | CONFIG_EXT4_FS_SECURITY=y | ||
| 880 | CONFIG_JBD=y | 990 | CONFIG_JBD=y |
| 881 | # CONFIG_JBD_DEBUG is not set | 991 | CONFIG_JBD2=m |
| 882 | CONFIG_FS_MBCACHE=y | 992 | CONFIG_FS_MBCACHE=y |
| 883 | # CONFIG_REISERFS_FS is not set | 993 | # CONFIG_REISERFS_FS is not set |
| 884 | # CONFIG_JFS_FS is not set | 994 | # CONFIG_JFS_FS is not set |
| 885 | CONFIG_FS_POSIX_ACL=y | 995 | CONFIG_FS_POSIX_ACL=y |
| 996 | CONFIG_FILE_LOCKING=y | ||
| 886 | CONFIG_XFS_FS=m | 997 | CONFIG_XFS_FS=m |
| 887 | CONFIG_XFS_QUOTA=y | 998 | CONFIG_XFS_QUOTA=y |
| 888 | CONFIG_XFS_SECURITY=y | ||
| 889 | # CONFIG_XFS_POSIX_ACL is not set | 999 | # CONFIG_XFS_POSIX_ACL is not set |
| 890 | # CONFIG_XFS_RT is not set | 1000 | # CONFIG_XFS_RT is not set |
| 891 | # CONFIG_GFS2_FS is not set | 1001 | # CONFIG_XFS_DEBUG is not set |
| 892 | # CONFIG_OCFS2_FS is not set | 1002 | # CONFIG_OCFS2_FS is not set |
| 893 | CONFIG_MINIX_FS=m | 1003 | CONFIG_DNOTIFY=y |
| 894 | # CONFIG_ROMFS_FS is not set | ||
| 895 | CONFIG_INOTIFY=y | 1004 | CONFIG_INOTIFY=y |
| 896 | CONFIG_INOTIFY_USER=y | 1005 | CONFIG_INOTIFY_USER=y |
| 897 | CONFIG_QUOTA=y | 1006 | CONFIG_QUOTA=y |
| 1007 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
| 1008 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
| 898 | # CONFIG_QFMT_V1 is not set | 1009 | # CONFIG_QFMT_V1 is not set |
| 899 | CONFIG_QFMT_V2=m | 1010 | CONFIG_QFMT_V2=m |
| 900 | CONFIG_QUOTACTL=y | 1011 | CONFIG_QUOTACTL=y |
| 901 | CONFIG_DNOTIFY=y | ||
| 902 | CONFIG_AUTOFS_FS=m | 1012 | CONFIG_AUTOFS_FS=m |
| 903 | CONFIG_AUTOFS4_FS=m | 1013 | CONFIG_AUTOFS4_FS=m |
| 904 | CONFIG_FUSE_FS=m | 1014 | CONFIG_FUSE_FS=m |
| @@ -929,11 +1039,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 929 | CONFIG_PROC_FS=y | 1039 | CONFIG_PROC_FS=y |
| 930 | CONFIG_PROC_KCORE=y | 1040 | CONFIG_PROC_KCORE=y |
| 931 | CONFIG_PROC_SYSCTL=y | 1041 | CONFIG_PROC_SYSCTL=y |
| 1042 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 932 | CONFIG_SYSFS=y | 1043 | CONFIG_SYSFS=y |
| 933 | CONFIG_TMPFS=y | 1044 | CONFIG_TMPFS=y |
| 934 | CONFIG_TMPFS_POSIX_ACL=y | 1045 | CONFIG_TMPFS_POSIX_ACL=y |
| 935 | # CONFIG_HUGETLB_PAGE is not set | 1046 | # CONFIG_HUGETLB_PAGE is not set |
| 936 | CONFIG_RAMFS=y | ||
| 937 | CONFIG_CONFIGFS_FS=m | 1047 | CONFIG_CONFIGFS_FS=m |
| 938 | 1048 | ||
| 939 | # | 1049 | # |
| @@ -949,27 +1059,25 @@ CONFIG_CONFIGFS_FS=m | |||
| 949 | CONFIG_EFS_FS=m | 1059 | CONFIG_EFS_FS=m |
| 950 | # CONFIG_CRAMFS is not set | 1060 | # CONFIG_CRAMFS is not set |
| 951 | # CONFIG_VXFS_FS is not set | 1061 | # CONFIG_VXFS_FS is not set |
| 1062 | CONFIG_MINIX_FS=m | ||
| 1063 | CONFIG_OMFS_FS=m | ||
| 952 | # CONFIG_HPFS_FS is not set | 1064 | # CONFIG_HPFS_FS is not set |
| 953 | # CONFIG_QNX4FS_FS is not set | 1065 | # CONFIG_QNX4FS_FS is not set |
| 1066 | # CONFIG_ROMFS_FS is not set | ||
| 954 | # CONFIG_SYSV_FS is not set | 1067 | # CONFIG_SYSV_FS is not set |
| 955 | CONFIG_UFS_FS=m | 1068 | CONFIG_UFS_FS=m |
| 956 | # CONFIG_UFS_FS_WRITE is not set | 1069 | # CONFIG_UFS_FS_WRITE is not set |
| 957 | # CONFIG_UFS_DEBUG is not set | 1070 | # CONFIG_UFS_DEBUG is not set |
| 958 | 1071 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 959 | # | ||
| 960 | # Network File Systems | ||
| 961 | # | ||
| 962 | CONFIG_NFS_FS=m | 1072 | CONFIG_NFS_FS=m |
| 963 | CONFIG_NFS_V3=y | 1073 | CONFIG_NFS_V3=y |
| 964 | CONFIG_NFS_V3_ACL=y | 1074 | CONFIG_NFS_V3_ACL=y |
| 965 | # CONFIG_NFS_V4 is not set | 1075 | # CONFIG_NFS_V4 is not set |
| 966 | # CONFIG_NFS_DIRECTIO is not set | ||
| 967 | CONFIG_NFSD=m | 1076 | CONFIG_NFSD=m |
| 968 | CONFIG_NFSD_V2_ACL=y | 1077 | CONFIG_NFSD_V2_ACL=y |
| 969 | CONFIG_NFSD_V3=y | 1078 | CONFIG_NFSD_V3=y |
| 970 | CONFIG_NFSD_V3_ACL=y | 1079 | CONFIG_NFSD_V3_ACL=y |
| 971 | # CONFIG_NFSD_V4 is not set | 1080 | # CONFIG_NFSD_V4 is not set |
| 972 | CONFIG_NFSD_TCP=y | ||
| 973 | CONFIG_LOCKD=m | 1081 | CONFIG_LOCKD=m |
| 974 | CONFIG_LOCKD_V4=y | 1082 | CONFIG_LOCKD_V4=y |
| 975 | CONFIG_EXPORTFS=m | 1083 | CONFIG_EXPORTFS=m |
| @@ -977,7 +1085,7 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
| 977 | CONFIG_NFS_COMMON=y | 1085 | CONFIG_NFS_COMMON=y |
| 978 | CONFIG_SUNRPC=m | 1086 | CONFIG_SUNRPC=m |
| 979 | CONFIG_SUNRPC_GSS=m | 1087 | CONFIG_SUNRPC_GSS=m |
| 980 | # CONFIG_SUNRPC_BIND34 is not set | 1088 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 981 | CONFIG_RPCSEC_GSS_KRB5=m | 1089 | CONFIG_RPCSEC_GSS_KRB5=m |
| 982 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1090 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 983 | CONFIG_SMB_FS=m | 1091 | CONFIG_SMB_FS=m |
| @@ -986,12 +1094,12 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 986 | CONFIG_CIFS=m | 1094 | CONFIG_CIFS=m |
| 987 | # CONFIG_CIFS_STATS is not set | 1095 | # CONFIG_CIFS_STATS is not set |
| 988 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1096 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| 1097 | CONFIG_CIFS_UPCALL=y | ||
| 989 | # CONFIG_CIFS_XATTR is not set | 1098 | # CONFIG_CIFS_XATTR is not set |
| 990 | # CONFIG_CIFS_DEBUG2 is not set | 1099 | # CONFIG_CIFS_DEBUG2 is not set |
| 991 | # CONFIG_CIFS_EXPERIMENTAL is not set | 1100 | # CONFIG_CIFS_EXPERIMENTAL is not set |
| 992 | # CONFIG_NCP_FS is not set | 1101 | # CONFIG_NCP_FS is not set |
| 993 | CONFIG_CODA_FS=m | 1102 | CONFIG_CODA_FS=m |
| 994 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 995 | # CONFIG_AFS_FS is not set | 1103 | # CONFIG_AFS_FS is not set |
| 996 | 1104 | ||
| 997 | # | 1105 | # |
| @@ -1015,10 +1123,6 @@ CONFIG_SGI_PARTITION=y | |||
| 1015 | # CONFIG_KARMA_PARTITION is not set | 1123 | # CONFIG_KARMA_PARTITION is not set |
| 1016 | # CONFIG_EFI_PARTITION is not set | 1124 | # CONFIG_EFI_PARTITION is not set |
| 1017 | # CONFIG_SYSV68_PARTITION is not set | 1125 | # CONFIG_SYSV68_PARTITION is not set |
| 1018 | |||
| 1019 | # | ||
| 1020 | # Native Language Support | ||
| 1021 | # | ||
| 1022 | CONFIG_NLS=m | 1126 | CONFIG_NLS=m |
| 1023 | CONFIG_NLS_DEFAULT="iso8859-1" | 1127 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1024 | CONFIG_NLS_CODEPAGE_437=m | 1128 | CONFIG_NLS_CODEPAGE_437=m |
| @@ -1059,30 +1163,32 @@ CONFIG_NLS_ISO8859_15=m | |||
| 1059 | CONFIG_NLS_KOI8_R=m | 1163 | CONFIG_NLS_KOI8_R=m |
| 1060 | CONFIG_NLS_KOI8_U=m | 1164 | CONFIG_NLS_KOI8_U=m |
| 1061 | CONFIG_NLS_UTF8=m | 1165 | CONFIG_NLS_UTF8=m |
| 1062 | |||
| 1063 | # | ||
| 1064 | # Distributed Lock Manager | ||
| 1065 | # | ||
| 1066 | CONFIG_DLM=m | 1166 | CONFIG_DLM=m |
| 1067 | # CONFIG_DLM_DEBUG is not set | 1167 | # CONFIG_DLM_DEBUG is not set |
| 1068 | 1168 | ||
| 1069 | # | 1169 | # |
| 1070 | # Profiling support | ||
| 1071 | # | ||
| 1072 | # CONFIG_PROFILING is not set | ||
| 1073 | |||
| 1074 | # | ||
| 1075 | # Kernel hacking | 1170 | # Kernel hacking |
| 1076 | # | 1171 | # |
| 1077 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1172 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1078 | # CONFIG_PRINTK_TIME is not set | 1173 | # CONFIG_PRINTK_TIME is not set |
| 1174 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1079 | CONFIG_ENABLE_MUST_CHECK=y | 1175 | CONFIG_ENABLE_MUST_CHECK=y |
| 1176 | CONFIG_FRAME_WARN=1024 | ||
| 1080 | # CONFIG_MAGIC_SYSRQ is not set | 1177 | # CONFIG_MAGIC_SYSRQ is not set |
| 1081 | # CONFIG_UNUSED_SYMBOLS is not set | 1178 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1082 | # CONFIG_DEBUG_FS is not set | 1179 | # CONFIG_DEBUG_FS is not set |
| 1083 | # CONFIG_HEADERS_CHECK is not set | 1180 | # CONFIG_HEADERS_CHECK is not set |
| 1084 | # CONFIG_DEBUG_KERNEL is not set | 1181 | # CONFIG_DEBUG_KERNEL is not set |
| 1085 | CONFIG_CROSSCOMPILE=y | 1182 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1183 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1184 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 1185 | |||
| 1186 | # | ||
| 1187 | # Tracers | ||
| 1188 | # | ||
| 1189 | CONFIG_DYNAMIC_PRINTK_DEBUG=y | ||
| 1190 | # CONFIG_SAMPLES is not set | ||
| 1191 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1086 | CONFIG_CMDLINE="" | 1192 | CONFIG_CMDLINE="" |
| 1087 | 1193 | ||
| 1088 | # | 1194 | # |
| @@ -1091,46 +1197,97 @@ CONFIG_CMDLINE="" | |||
| 1091 | CONFIG_KEYS=y | 1197 | CONFIG_KEYS=y |
| 1092 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1198 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1093 | # CONFIG_SECURITY is not set | 1199 | # CONFIG_SECURITY is not set |
| 1200 | # CONFIG_SECURITYFS is not set | ||
| 1201 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
| 1094 | CONFIG_CRYPTO=y | 1202 | CONFIG_CRYPTO=y |
| 1203 | |||
| 1204 | # | ||
| 1205 | # Crypto core or helper | ||
| 1206 | # | ||
| 1207 | CONFIG_CRYPTO_FIPS=y | ||
| 1095 | CONFIG_CRYPTO_ALGAPI=y | 1208 | CONFIG_CRYPTO_ALGAPI=y |
| 1096 | CONFIG_CRYPTO_ABLKCIPHER=m | 1209 | CONFIG_CRYPTO_AEAD=y |
| 1097 | CONFIG_CRYPTO_BLKCIPHER=m | 1210 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1098 | CONFIG_CRYPTO_HASH=y | 1211 | CONFIG_CRYPTO_HASH=y |
| 1212 | CONFIG_CRYPTO_RNG=y | ||
| 1099 | CONFIG_CRYPTO_MANAGER=y | 1213 | CONFIG_CRYPTO_MANAGER=y |
| 1214 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1215 | CONFIG_CRYPTO_NULL=m | ||
| 1216 | CONFIG_CRYPTO_CRYPTD=m | ||
| 1217 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1218 | # CONFIG_CRYPTO_TEST is not set | ||
| 1219 | |||
| 1220 | # | ||
| 1221 | # Authenticated Encryption with Associated Data | ||
| 1222 | # | ||
| 1223 | CONFIG_CRYPTO_CCM=m | ||
| 1224 | CONFIG_CRYPTO_GCM=m | ||
| 1225 | CONFIG_CRYPTO_SEQIV=m | ||
| 1226 | |||
| 1227 | # | ||
| 1228 | # Block modes | ||
| 1229 | # | ||
| 1230 | CONFIG_CRYPTO_CBC=m | ||
| 1231 | CONFIG_CRYPTO_CTR=m | ||
| 1232 | CONFIG_CRYPTO_CTS=m | ||
| 1233 | CONFIG_CRYPTO_ECB=m | ||
| 1234 | CONFIG_CRYPTO_LRW=m | ||
| 1235 | CONFIG_CRYPTO_PCBC=m | ||
| 1236 | CONFIG_CRYPTO_XTS=m | ||
| 1237 | |||
| 1238 | # | ||
| 1239 | # Hash modes | ||
| 1240 | # | ||
| 1100 | CONFIG_CRYPTO_HMAC=y | 1241 | CONFIG_CRYPTO_HMAC=y |
| 1101 | CONFIG_CRYPTO_XCBC=m | 1242 | CONFIG_CRYPTO_XCBC=m |
| 1102 | CONFIG_CRYPTO_NULL=m | 1243 | |
| 1244 | # | ||
| 1245 | # Digest | ||
| 1246 | # | ||
| 1247 | CONFIG_CRYPTO_CRC32C=m | ||
| 1103 | CONFIG_CRYPTO_MD4=m | 1248 | CONFIG_CRYPTO_MD4=m |
| 1104 | CONFIG_CRYPTO_MD5=y | 1249 | CONFIG_CRYPTO_MD5=y |
| 1250 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1251 | CONFIG_CRYPTO_RMD128=m | ||
| 1252 | CONFIG_CRYPTO_RMD160=m | ||
| 1253 | CONFIG_CRYPTO_RMD256=m | ||
| 1254 | CONFIG_CRYPTO_RMD320=m | ||
| 1105 | CONFIG_CRYPTO_SHA1=m | 1255 | CONFIG_CRYPTO_SHA1=m |
| 1106 | CONFIG_CRYPTO_SHA256=m | 1256 | CONFIG_CRYPTO_SHA256=m |
| 1107 | CONFIG_CRYPTO_SHA512=m | 1257 | CONFIG_CRYPTO_SHA512=m |
| 1108 | CONFIG_CRYPTO_WP512=m | ||
| 1109 | CONFIG_CRYPTO_TGR192=m | 1258 | CONFIG_CRYPTO_TGR192=m |
| 1110 | CONFIG_CRYPTO_GF128MUL=m | 1259 | CONFIG_CRYPTO_WP512=m |
| 1111 | CONFIG_CRYPTO_ECB=m | 1260 | |
| 1112 | CONFIG_CRYPTO_CBC=m | 1261 | # |
| 1113 | CONFIG_CRYPTO_PCBC=m | 1262 | # Ciphers |
| 1114 | CONFIG_CRYPTO_LRW=m | 1263 | # |
| 1115 | CONFIG_CRYPTO_CRYPTD=m | ||
| 1116 | CONFIG_CRYPTO_DES=m | ||
| 1117 | CONFIG_CRYPTO_FCRYPT=m | ||
| 1118 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1119 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1120 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1121 | CONFIG_CRYPTO_SERPENT=m | ||
| 1122 | CONFIG_CRYPTO_AES=m | 1264 | CONFIG_CRYPTO_AES=m |
| 1265 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1266 | CONFIG_CRYPTO_ARC4=m | ||
| 1267 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1268 | CONFIG_CRYPTO_CAMELLIA=m | ||
| 1123 | CONFIG_CRYPTO_CAST5=m | 1269 | CONFIG_CRYPTO_CAST5=m |
| 1124 | CONFIG_CRYPTO_CAST6=m | 1270 | CONFIG_CRYPTO_CAST6=m |
| 1125 | CONFIG_CRYPTO_TEA=m | 1271 | CONFIG_CRYPTO_DES=m |
| 1126 | CONFIG_CRYPTO_ARC4=m | 1272 | CONFIG_CRYPTO_FCRYPT=m |
| 1127 | CONFIG_CRYPTO_KHAZAD=m | 1273 | CONFIG_CRYPTO_KHAZAD=m |
| 1128 | CONFIG_CRYPTO_ANUBIS=m | 1274 | CONFIG_CRYPTO_SALSA20=m |
| 1275 | CONFIG_CRYPTO_SEED=m | ||
| 1276 | CONFIG_CRYPTO_SERPENT=m | ||
| 1277 | CONFIG_CRYPTO_TEA=m | ||
| 1278 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1279 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1280 | |||
| 1281 | # | ||
| 1282 | # Compression | ||
| 1283 | # | ||
| 1129 | CONFIG_CRYPTO_DEFLATE=m | 1284 | CONFIG_CRYPTO_DEFLATE=m |
| 1130 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1285 | CONFIG_CRYPTO_LZO=m |
| 1131 | CONFIG_CRYPTO_CRC32C=m | 1286 | |
| 1132 | CONFIG_CRYPTO_CAMELLIA=m | 1287 | # |
| 1133 | # CONFIG_CRYPTO_TEST is not set | 1288 | # Random Number Generation |
| 1289 | # | ||
| 1290 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
| 1134 | # CONFIG_CRYPTO_HW is not set | 1291 | # CONFIG_CRYPTO_HW is not set |
| 1135 | 1292 | ||
| 1136 | # | 1293 | # |
| @@ -1139,12 +1296,15 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
| 1139 | CONFIG_BITREVERSE=m | 1296 | CONFIG_BITREVERSE=m |
| 1140 | # CONFIG_CRC_CCITT is not set | 1297 | # CONFIG_CRC_CCITT is not set |
| 1141 | CONFIG_CRC16=m | 1298 | CONFIG_CRC16=m |
| 1142 | # CONFIG_CRC_ITU_T is not set | 1299 | CONFIG_CRC_T10DIF=m |
| 1300 | CONFIG_CRC_ITU_T=m | ||
| 1143 | CONFIG_CRC32=m | 1301 | CONFIG_CRC32=m |
| 1144 | # CONFIG_CRC7 is not set | 1302 | # CONFIG_CRC7 is not set |
| 1145 | CONFIG_LIBCRC32C=m | 1303 | CONFIG_LIBCRC32C=m |
| 1146 | CONFIG_ZLIB_INFLATE=m | 1304 | CONFIG_ZLIB_INFLATE=m |
| 1147 | CONFIG_ZLIB_DEFLATE=m | 1305 | CONFIG_ZLIB_DEFLATE=m |
| 1306 | CONFIG_LZO_COMPRESS=m | ||
| 1307 | CONFIG_LZO_DECOMPRESS=m | ||
| 1148 | CONFIG_TEXTSEARCH=y | 1308 | CONFIG_TEXTSEARCH=y |
| 1149 | CONFIG_TEXTSEARCH_KMP=m | 1309 | CONFIG_TEXTSEARCH_KMP=m |
| 1150 | CONFIG_TEXTSEARCH_BM=m | 1310 | CONFIG_TEXTSEARCH_BM=m |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index fe4699df9626..de4c7a0a96dd 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
| @@ -1,71 +1,71 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Tue Feb 20 21:47:33 2007 | 4 | # Wed Dec 10 14:39:08 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_MIPS_MTX1 is not set | ||
| 13 | # CONFIG_MIPS_BOSPORUS is not set | ||
| 14 | # CONFIG_MIPS_PB1000 is not set | ||
| 15 | # CONFIG_MIPS_PB1100 is not set | ||
| 16 | # CONFIG_MIPS_PB1500 is not set | ||
| 17 | # CONFIG_MIPS_PB1550 is not set | ||
| 18 | # CONFIG_MIPS_PB1200 is not set | ||
| 19 | # CONFIG_MIPS_DB1000 is not set | ||
| 20 | # CONFIG_MIPS_DB1100 is not set | ||
| 21 | # CONFIG_MIPS_DB1500 is not set | ||
| 22 | # CONFIG_MIPS_DB1550 is not set | ||
| 23 | # CONFIG_MIPS_DB1200 is not set | ||
| 24 | # CONFIG_MIPS_MIRAGE is not set | ||
| 25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 18 | # CONFIG_LEMOTE_FULONG is not set | ||
| 29 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
| 30 | # CONFIG_WR_PPMC is not set | ||
| 31 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
| 32 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MACH_EMMA is not set |
| 33 | # CONFIG_MIPS_XXS1500 is not set | 22 | # CONFIG_MACH_VR41XX is not set |
| 23 | # CONFIG_NXP_STB220 is not set | ||
| 24 | # CONFIG_NXP_STB225 is not set | ||
| 34 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 35 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 36 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
| 37 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 38 | # CONFIG_MARKEINS is not set | ||
| 39 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 40 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 41 | CONFIG_SGI_IP32=y | 32 | CONFIG_SGI_IP32=y |
| 42 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 43 | # CONFIG_SIBYTE_SWARM is not set | ||
| 44 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 45 | # CONFIG_SIBYTE_RHONE is not set | ||
| 46 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 47 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 48 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 34 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 49 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
| 36 | # CONFIG_SIBYTE_RHONE is not set | ||
| 37 | # CONFIG_SIBYTE_SWARM is not set | ||
| 38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 50 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 51 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_MACH_TX39XX is not set |
| 52 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_MACH_TX49XX is not set |
| 53 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_MIKROTIK_RB532 is not set |
| 45 | # CONFIG_WR_PPMC is not set | ||
| 54 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 56 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 49 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 57 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 50 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 58 | CONFIG_GENERIC_HWEIGHT=y | 51 | CONFIG_GENERIC_HWEIGHT=y |
| 59 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 52 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 53 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 60 | CONFIG_GENERIC_TIME=y | 54 | CONFIG_GENERIC_TIME=y |
| 55 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 61 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 56 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 62 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 57 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 63 | CONFIG_ARC=y | 58 | CONFIG_ARC=y |
| 59 | CONFIG_CEVT_R4K=y | ||
| 60 | CONFIG_CSRC_R4K=y | ||
| 64 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
| 65 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 63 | # CONFIG_HOTPLUG_CPU is not set | ||
| 64 | # CONFIG_NO_IOPORT is not set | ||
| 66 | CONFIG_CPU_BIG_ENDIAN=y | 65 | CONFIG_CPU_BIG_ENDIAN=y |
| 67 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 66 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 68 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 67 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 68 | CONFIG_IRQ_CPU=y | ||
| 69 | CONFIG_ARC32=y | 69 | CONFIG_ARC32=y |
| 70 | CONFIG_BOOT_ELF32=y | 70 | CONFIG_BOOT_ELF32=y |
| 71 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 71 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| @@ -75,6 +75,7 @@ CONFIG_ARC_PROMLIB=y | |||
| 75 | # | 75 | # |
| 76 | # CPU selection | 76 | # CPU selection |
| 77 | # | 77 | # |
| 78 | # CONFIG_CPU_LOONGSON2 is not set | ||
| 78 | # CONFIG_CPU_MIPS32_R1 is not set | 79 | # CONFIG_CPU_MIPS32_R1 is not set |
| 79 | # CONFIG_CPU_MIPS32_R2 is not set | 80 | # CONFIG_CPU_MIPS32_R2 is not set |
| 80 | # CONFIG_CPU_MIPS64_R1 is not set | 81 | # CONFIG_CPU_MIPS64_R1 is not set |
| @@ -87,6 +88,7 @@ CONFIG_ARC_PROMLIB=y | |||
| 87 | # CONFIG_CPU_TX49XX is not set | 88 | # CONFIG_CPU_TX49XX is not set |
| 88 | CONFIG_CPU_R5000=y | 89 | CONFIG_CPU_R5000=y |
| 89 | # CONFIG_CPU_R5432 is not set | 90 | # CONFIG_CPU_R5432 is not set |
| 91 | # CONFIG_CPU_R5500 is not set | ||
| 90 | # CONFIG_CPU_R6000 is not set | 92 | # CONFIG_CPU_R6000 is not set |
| 91 | # CONFIG_CPU_NEVADA is not set | 93 | # CONFIG_CPU_NEVADA is not set |
| 92 | # CONFIG_CPU_R8000 is not set | 94 | # CONFIG_CPU_R8000 is not set |
| @@ -116,65 +118,73 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
| 116 | CONFIG_MIPS_MT_DISABLED=y | 118 | CONFIG_MIPS_MT_DISABLED=y |
| 117 | # CONFIG_MIPS_MT_SMP is not set | 119 | # CONFIG_MIPS_MT_SMP is not set |
| 118 | # CONFIG_MIPS_MT_SMTC is not set | 120 | # CONFIG_MIPS_MT_SMTC is not set |
| 119 | # CONFIG_MIPS_VPE_LOADER is not set | ||
| 120 | CONFIG_CPU_HAS_LLSC=y | 121 | CONFIG_CPU_HAS_LLSC=y |
| 121 | CONFIG_CPU_HAS_SYNC=y | 122 | CONFIG_CPU_HAS_SYNC=y |
| 122 | CONFIG_GENERIC_HARDIRQS=y | 123 | CONFIG_GENERIC_HARDIRQS=y |
| 123 | CONFIG_GENERIC_IRQ_PROBE=y | 124 | CONFIG_GENERIC_IRQ_PROBE=y |
| 124 | CONFIG_ARCH_FLATMEM_ENABLE=y | 125 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 126 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 125 | CONFIG_SELECT_MEMORY_MODEL=y | 127 | CONFIG_SELECT_MEMORY_MODEL=y |
| 126 | CONFIG_FLATMEM_MANUAL=y | 128 | CONFIG_FLATMEM_MANUAL=y |
| 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 129 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 128 | # CONFIG_SPARSEMEM_MANUAL is not set | 130 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 129 | CONFIG_FLATMEM=y | 131 | CONFIG_FLATMEM=y |
| 130 | CONFIG_FLAT_NODE_MEM_MAP=y | 132 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 131 | # CONFIG_SPARSEMEM_STATIC is not set | 133 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 132 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 133 | CONFIG_RESOURCES_64BIT=y | 135 | CONFIG_RESOURCES_64BIT=y |
| 134 | CONFIG_ZONE_DMA_FLAG=1 | 136 | CONFIG_PHYS_ADDR_T_64BIT=y |
| 137 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 138 | CONFIG_VIRT_TO_BUS=y | ||
| 139 | CONFIG_UNEVICTABLE_LRU=y | ||
| 140 | # CONFIG_NO_HZ is not set | ||
| 141 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 142 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 135 | # CONFIG_HZ_48 is not set | 143 | # CONFIG_HZ_48 is not set |
| 136 | # CONFIG_HZ_100 is not set | 144 | # CONFIG_HZ_100 is not set |
| 137 | # CONFIG_HZ_128 is not set | 145 | # CONFIG_HZ_128 is not set |
| 138 | # CONFIG_HZ_250 is not set | 146 | CONFIG_HZ_250=y |
| 139 | # CONFIG_HZ_256 is not set | 147 | # CONFIG_HZ_256 is not set |
| 140 | CONFIG_HZ_1000=y | 148 | # CONFIG_HZ_1000 is not set |
| 141 | # CONFIG_HZ_1024 is not set | 149 | # CONFIG_HZ_1024 is not set |
| 142 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 150 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
| 143 | CONFIG_HZ=1000 | 151 | CONFIG_HZ=250 |
| 144 | # CONFIG_PREEMPT_NONE is not set | 152 | CONFIG_PREEMPT_NONE=y |
| 145 | CONFIG_PREEMPT_VOLUNTARY=y | 153 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 146 | # CONFIG_PREEMPT is not set | 154 | # CONFIG_PREEMPT is not set |
| 147 | # CONFIG_KEXEC is not set | 155 | # CONFIG_KEXEC is not set |
| 156 | # CONFIG_SECCOMP is not set | ||
| 148 | CONFIG_LOCKDEP_SUPPORT=y | 157 | CONFIG_LOCKDEP_SUPPORT=y |
| 149 | CONFIG_STACKTRACE_SUPPORT=y | 158 | CONFIG_STACKTRACE_SUPPORT=y |
| 150 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 159 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 151 | 160 | ||
| 152 | # | 161 | # |
| 153 | # Code maturity level options | 162 | # General setup |
| 154 | # | 163 | # |
| 155 | CONFIG_EXPERIMENTAL=y | 164 | CONFIG_EXPERIMENTAL=y |
| 156 | CONFIG_BROKEN_ON_SMP=y | 165 | CONFIG_BROKEN_ON_SMP=y |
| 157 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 166 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 158 | |||
| 159 | # | ||
| 160 | # General setup | ||
| 161 | # | ||
| 162 | CONFIG_LOCALVERSION="" | 167 | CONFIG_LOCALVERSION="" |
| 163 | CONFIG_LOCALVERSION_AUTO=y | 168 | CONFIG_LOCALVERSION_AUTO=y |
| 164 | CONFIG_SWAP=y | 169 | CONFIG_SWAP=y |
| 165 | CONFIG_SYSVIPC=y | 170 | CONFIG_SYSVIPC=y |
| 166 | # CONFIG_IPC_NS is not set | ||
| 167 | CONFIG_SYSVIPC_SYSCTL=y | 171 | CONFIG_SYSVIPC_SYSCTL=y |
| 168 | # CONFIG_POSIX_MQUEUE is not set | 172 | CONFIG_POSIX_MQUEUE=y |
| 169 | CONFIG_BSD_PROCESS_ACCT=y | 173 | CONFIG_BSD_PROCESS_ACCT=y |
| 170 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 174 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 171 | # CONFIG_TASKSTATS is not set | 175 | # CONFIG_TASKSTATS is not set |
| 172 | # CONFIG_UTS_NS is not set | 176 | CONFIG_AUDIT=y |
| 173 | # CONFIG_AUDIT is not set | 177 | CONFIG_IKCONFIG=y |
| 174 | # CONFIG_IKCONFIG is not set | 178 | CONFIG_IKCONFIG_PROC=y |
| 179 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 180 | # CONFIG_CGROUPS is not set | ||
| 181 | # CONFIG_GROUP_SCHED is not set | ||
| 175 | CONFIG_SYSFS_DEPRECATED=y | 182 | CONFIG_SYSFS_DEPRECATED=y |
| 183 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 176 | CONFIG_RELAY=y | 184 | CONFIG_RELAY=y |
| 177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 185 | # CONFIG_NAMESPACES is not set |
| 186 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 187 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 178 | CONFIG_SYSCTL=y | 188 | CONFIG_SYSCTL=y |
| 179 | CONFIG_EMBEDDED=y | 189 | CONFIG_EMBEDDED=y |
| 180 | CONFIG_SYSCTL_SYSCALL=y | 190 | CONFIG_SYSCTL_SYSCALL=y |
| @@ -184,27 +194,43 @@ CONFIG_HOTPLUG=y | |||
| 184 | CONFIG_PRINTK=y | 194 | CONFIG_PRINTK=y |
| 185 | CONFIG_BUG=y | 195 | CONFIG_BUG=y |
| 186 | CONFIG_ELF_CORE=y | 196 | CONFIG_ELF_CORE=y |
| 197 | CONFIG_PCSPKR_PLATFORM=y | ||
| 198 | CONFIG_COMPAT_BRK=y | ||
| 187 | CONFIG_BASE_FULL=y | 199 | CONFIG_BASE_FULL=y |
| 188 | CONFIG_FUTEX=y | 200 | CONFIG_FUTEX=y |
| 201 | CONFIG_ANON_INODES=y | ||
| 189 | CONFIG_EPOLL=y | 202 | CONFIG_EPOLL=y |
| 203 | CONFIG_SIGNALFD=y | ||
| 204 | CONFIG_TIMERFD=y | ||
| 205 | CONFIG_EVENTFD=y | ||
| 190 | CONFIG_SHMEM=y | 206 | CONFIG_SHMEM=y |
| 191 | CONFIG_SLAB=y | 207 | CONFIG_AIO=y |
| 192 | CONFIG_VM_EVENT_COUNTERS=y | 208 | CONFIG_VM_EVENT_COUNTERS=y |
| 209 | CONFIG_PCI_QUIRKS=y | ||
| 210 | CONFIG_SLAB=y | ||
| 211 | # CONFIG_SLUB is not set | ||
| 212 | # CONFIG_SLOB is not set | ||
| 213 | CONFIG_PROFILING=y | ||
| 214 | # CONFIG_MARKERS is not set | ||
| 215 | CONFIG_OPROFILE=m | ||
| 216 | CONFIG_HAVE_OPROFILE=y | ||
| 217 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 218 | CONFIG_SLABINFO=y | ||
| 193 | CONFIG_RT_MUTEXES=y | 219 | CONFIG_RT_MUTEXES=y |
| 194 | # CONFIG_TINY_SHMEM is not set | 220 | # CONFIG_TINY_SHMEM is not set |
| 195 | CONFIG_BASE_SMALL=0 | 221 | CONFIG_BASE_SMALL=0 |
| 196 | # CONFIG_SLOB is not set | 222 | CONFIG_MODULES=y |
| 197 | 223 | # CONFIG_MODULE_FORCE_LOAD is not set | |
| 198 | # | 224 | CONFIG_MODULE_UNLOAD=y |
| 199 | # Loadable module support | 225 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 200 | # | 226 | # CONFIG_MODVERSIONS is not set |
| 201 | # CONFIG_MODULES is not set | 227 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 202 | 228 | CONFIG_KMOD=y | |
| 203 | # | ||
| 204 | # Block layer | ||
| 205 | # | ||
| 206 | CONFIG_BLOCK=y | 229 | CONFIG_BLOCK=y |
| 207 | # CONFIG_BLK_DEV_IO_TRACE is not set | 230 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 231 | # CONFIG_BLK_DEV_BSG is not set | ||
| 232 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 233 | CONFIG_BLOCK_COMPAT=y | ||
| 208 | 234 | ||
| 209 | # | 235 | # |
| 210 | # IO Schedulers | 236 | # IO Schedulers |
| @@ -213,59 +239,50 @@ CONFIG_IOSCHED_NOOP=y | |||
| 213 | CONFIG_IOSCHED_AS=y | 239 | CONFIG_IOSCHED_AS=y |
| 214 | CONFIG_IOSCHED_DEADLINE=y | 240 | CONFIG_IOSCHED_DEADLINE=y |
| 215 | CONFIG_IOSCHED_CFQ=y | 241 | CONFIG_IOSCHED_CFQ=y |
| 216 | CONFIG_DEFAULT_AS=y | 242 | # CONFIG_DEFAULT_AS is not set |
| 217 | # CONFIG_DEFAULT_DEADLINE is not set | 243 | # CONFIG_DEFAULT_DEADLINE is not set |
| 218 | # CONFIG_DEFAULT_CFQ is not set | 244 | CONFIG_DEFAULT_CFQ=y |
| 219 | # CONFIG_DEFAULT_NOOP is not set | 245 | # CONFIG_DEFAULT_NOOP is not set |
| 220 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 246 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 247 | CONFIG_CLASSIC_RCU=y | ||
| 248 | # CONFIG_FREEZER is not set | ||
| 221 | 249 | ||
| 222 | # | 250 | # |
| 223 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 251 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 224 | # | 252 | # |
| 225 | CONFIG_HW_HAS_PCI=y | 253 | CONFIG_HW_HAS_PCI=y |
| 226 | CONFIG_PCI=y | 254 | CONFIG_PCI=y |
| 255 | CONFIG_PCI_DOMAINS=y | ||
| 256 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 257 | # CONFIG_PCI_LEGACY is not set | ||
| 227 | CONFIG_MMU=y | 258 | CONFIG_MMU=y |
| 228 | |||
| 229 | # | ||
| 230 | # PCCARD (PCMCIA/CardBus) support | ||
| 231 | # | ||
| 232 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
| 233 | |||
| 234 | # | ||
| 235 | # PCI Hotplug Support | ||
| 236 | # | ||
| 237 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
| 238 | 261 | ||
| 239 | # | 262 | # |
| 240 | # Executable file formats | 263 | # Executable file formats |
| 241 | # | 264 | # |
| 242 | CONFIG_BINFMT_ELF=y | 265 | CONFIG_BINFMT_ELF=y |
| 266 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 267 | # CONFIG_HAVE_AOUT is not set | ||
| 243 | CONFIG_BINFMT_MISC=y | 268 | CONFIG_BINFMT_MISC=y |
| 244 | # CONFIG_BUILD_ELF64 is not set | ||
| 245 | CONFIG_MIPS32_COMPAT=y | 269 | CONFIG_MIPS32_COMPAT=y |
| 246 | CONFIG_COMPAT=y | 270 | CONFIG_COMPAT=y |
| 247 | CONFIG_SYSVIPC_COMPAT=y | 271 | CONFIG_SYSVIPC_COMPAT=y |
| 248 | CONFIG_MIPS32_O32=y | 272 | CONFIG_MIPS32_O32=y |
| 249 | # CONFIG_MIPS32_N32 is not set | 273 | CONFIG_MIPS32_N32=y |
| 250 | CONFIG_BINFMT_ELF32=y | 274 | CONFIG_BINFMT_ELF32=y |
| 251 | 275 | ||
| 252 | # | 276 | # |
| 253 | # Power management options | 277 | # Power management options |
| 254 | # | 278 | # |
| 255 | CONFIG_PM=y | 279 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 256 | # CONFIG_PM_LEGACY is not set | 280 | # CONFIG_PM is not set |
| 257 | # CONFIG_PM_DEBUG is not set | ||
| 258 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
| 259 | |||
| 260 | # | ||
| 261 | # Networking | ||
| 262 | # | ||
| 263 | CONFIG_NET=y | 281 | CONFIG_NET=y |
| 264 | 282 | ||
| 265 | # | 283 | # |
| 266 | # Networking options | 284 | # Networking options |
| 267 | # | 285 | # |
| 268 | # CONFIG_NETDEBUG is not set | ||
| 269 | CONFIG_PACKET=y | 286 | CONFIG_PACKET=y |
| 270 | CONFIG_PACKET_MMAP=y | 287 | CONFIG_PACKET_MMAP=y |
| 271 | CONFIG_UNIX=y | 288 | CONFIG_UNIX=y |
| @@ -273,56 +290,83 @@ CONFIG_XFRM=y | |||
| 273 | CONFIG_XFRM_USER=y | 290 | CONFIG_XFRM_USER=y |
| 274 | # CONFIG_XFRM_SUB_POLICY is not set | 291 | # CONFIG_XFRM_SUB_POLICY is not set |
| 275 | CONFIG_XFRM_MIGRATE=y | 292 | CONFIG_XFRM_MIGRATE=y |
| 293 | # CONFIG_XFRM_STATISTICS is not set | ||
| 294 | CONFIG_XFRM_IPCOMP=m | ||
| 276 | CONFIG_NET_KEY=y | 295 | CONFIG_NET_KEY=y |
| 277 | CONFIG_NET_KEY_MIGRATE=y | 296 | CONFIG_NET_KEY_MIGRATE=y |
| 278 | CONFIG_INET=y | 297 | CONFIG_INET=y |
| 279 | # CONFIG_IP_MULTICAST is not set | 298 | CONFIG_IP_MULTICAST=y |
| 280 | # CONFIG_IP_ADVANCED_ROUTER is not set | 299 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 281 | CONFIG_IP_FIB_HASH=y | 300 | CONFIG_IP_FIB_HASH=y |
| 282 | CONFIG_IP_PNP=y | 301 | CONFIG_IP_PNP=y |
| 283 | # CONFIG_IP_PNP_DHCP is not set | 302 | CONFIG_IP_PNP_DHCP=y |
| 284 | CONFIG_IP_PNP_BOOTP=y | 303 | CONFIG_IP_PNP_BOOTP=y |
| 285 | # CONFIG_IP_PNP_RARP is not set | 304 | # CONFIG_IP_PNP_RARP is not set |
| 286 | # CONFIG_NET_IPIP is not set | 305 | CONFIG_NET_IPIP=m |
| 287 | # CONFIG_NET_IPGRE is not set | 306 | CONFIG_NET_IPGRE=m |
| 307 | # CONFIG_NET_IPGRE_BROADCAST is not set | ||
| 308 | # CONFIG_IP_MROUTE is not set | ||
| 288 | # CONFIG_ARPD is not set | 309 | # CONFIG_ARPD is not set |
| 289 | # CONFIG_SYN_COOKIES is not set | 310 | # CONFIG_SYN_COOKIES is not set |
| 290 | # CONFIG_INET_AH is not set | 311 | CONFIG_INET_AH=m |
| 291 | # CONFIG_INET_ESP is not set | 312 | CONFIG_INET_ESP=m |
| 292 | # CONFIG_INET_IPCOMP is not set | 313 | CONFIG_INET_IPCOMP=m |
| 293 | # CONFIG_INET_XFRM_TUNNEL is not set | 314 | CONFIG_INET_XFRM_TUNNEL=m |
| 294 | # CONFIG_INET_TUNNEL is not set | 315 | CONFIG_INET_TUNNEL=m |
| 295 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 316 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 296 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 317 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 297 | CONFIG_INET_XFRM_MODE_BEET=y | 318 | CONFIG_INET_XFRM_MODE_BEET=y |
| 319 | # CONFIG_INET_LRO is not set | ||
| 298 | CONFIG_INET_DIAG=y | 320 | CONFIG_INET_DIAG=y |
| 299 | CONFIG_INET_TCP_DIAG=y | 321 | CONFIG_INET_TCP_DIAG=y |
| 300 | # CONFIG_TCP_CONG_ADVANCED is not set | 322 | CONFIG_TCP_CONG_ADVANCED=y |
| 323 | CONFIG_TCP_CONG_BIC=m | ||
| 301 | CONFIG_TCP_CONG_CUBIC=y | 324 | CONFIG_TCP_CONG_CUBIC=y |
| 325 | CONFIG_TCP_CONG_WESTWOOD=m | ||
| 326 | CONFIG_TCP_CONG_HTCP=m | ||
| 327 | # CONFIG_TCP_CONG_HSTCP is not set | ||
| 328 | # CONFIG_TCP_CONG_HYBLA is not set | ||
| 329 | # CONFIG_TCP_CONG_VEGAS is not set | ||
| 330 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
| 331 | # CONFIG_TCP_CONG_LP is not set | ||
| 332 | # CONFIG_TCP_CONG_VENO is not set | ||
| 333 | # CONFIG_TCP_CONG_YEAH is not set | ||
| 334 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
| 335 | # CONFIG_DEFAULT_BIC is not set | ||
| 336 | CONFIG_DEFAULT_CUBIC=y | ||
| 337 | # CONFIG_DEFAULT_HTCP is not set | ||
| 338 | # CONFIG_DEFAULT_VEGAS is not set | ||
| 339 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
| 340 | # CONFIG_DEFAULT_RENO is not set | ||
| 302 | CONFIG_DEFAULT_TCP_CONG="cubic" | 341 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 303 | CONFIG_TCP_MD5SIG=y | 342 | CONFIG_TCP_MD5SIG=y |
| 304 | # CONFIG_IPV6 is not set | 343 | CONFIG_IPV6=m |
| 305 | # CONFIG_INET6_XFRM_TUNNEL is not set | 344 | # CONFIG_IPV6_PRIVACY is not set |
| 306 | # CONFIG_INET6_TUNNEL is not set | 345 | # CONFIG_IPV6_ROUTER_PREF is not set |
| 346 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 347 | CONFIG_INET6_AH=m | ||
| 348 | CONFIG_INET6_ESP=m | ||
| 349 | CONFIG_INET6_IPCOMP=m | ||
| 350 | # CONFIG_IPV6_MIP6 is not set | ||
| 351 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 352 | CONFIG_INET6_TUNNEL=m | ||
| 353 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
| 354 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
| 355 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
| 356 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 357 | CONFIG_IPV6_SIT=m | ||
| 358 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 359 | CONFIG_IPV6_TUNNEL=m | ||
| 360 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 361 | # CONFIG_IPV6_MROUTE is not set | ||
| 307 | CONFIG_NETWORK_SECMARK=y | 362 | CONFIG_NETWORK_SECMARK=y |
| 308 | # CONFIG_NETFILTER is not set | 363 | # CONFIG_NETFILTER is not set |
| 309 | |||
| 310 | # | ||
| 311 | # DCCP Configuration (EXPERIMENTAL) | ||
| 312 | # | ||
| 313 | # CONFIG_IP_DCCP is not set | 364 | # CONFIG_IP_DCCP is not set |
| 314 | |||
| 315 | # | ||
| 316 | # SCTP Configuration (EXPERIMENTAL) | ||
| 317 | # | ||
| 318 | # CONFIG_IP_SCTP is not set | 365 | # CONFIG_IP_SCTP is not set |
| 319 | |||
| 320 | # | ||
| 321 | # TIPC Configuration (EXPERIMENTAL) | ||
| 322 | # | ||
| 323 | # CONFIG_TIPC is not set | 366 | # CONFIG_TIPC is not set |
| 324 | # CONFIG_ATM is not set | 367 | # CONFIG_ATM is not set |
| 325 | # CONFIG_BRIDGE is not set | 368 | # CONFIG_BRIDGE is not set |
| 369 | # CONFIG_NET_DSA is not set | ||
| 326 | # CONFIG_VLAN_8021Q is not set | 370 | # CONFIG_VLAN_8021Q is not set |
| 327 | # CONFIG_DECNET is not set | 371 | # CONFIG_DECNET is not set |
| 328 | # CONFIG_LLC2 is not set | 372 | # CONFIG_LLC2 is not set |
| @@ -332,10 +376,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 332 | # CONFIG_LAPB is not set | 376 | # CONFIG_LAPB is not set |
| 333 | # CONFIG_ECONET is not set | 377 | # CONFIG_ECONET is not set |
| 334 | # CONFIG_WAN_ROUTER is not set | 378 | # CONFIG_WAN_ROUTER is not set |
| 335 | |||
| 336 | # | ||
| 337 | # QoS and/or fair queueing | ||
| 338 | # | ||
| 339 | # CONFIG_NET_SCHED is not set | 379 | # CONFIG_NET_SCHED is not set |
| 340 | 380 | ||
| 341 | # | 381 | # |
| @@ -343,15 +383,14 @@ CONFIG_NETWORK_SECMARK=y | |||
| 343 | # | 383 | # |
| 344 | # CONFIG_NET_PKTGEN is not set | 384 | # CONFIG_NET_PKTGEN is not set |
| 345 | # CONFIG_HAMRADIO is not set | 385 | # CONFIG_HAMRADIO is not set |
| 386 | # CONFIG_CAN is not set | ||
| 346 | # CONFIG_IRDA is not set | 387 | # CONFIG_IRDA is not set |
| 347 | # CONFIG_BT is not set | 388 | # CONFIG_BT is not set |
| 348 | CONFIG_IEEE80211=y | 389 | # CONFIG_AF_RXRPC is not set |
| 349 | # CONFIG_IEEE80211_DEBUG is not set | 390 | # CONFIG_PHONET is not set |
| 350 | CONFIG_IEEE80211_CRYPT_WEP=y | 391 | # CONFIG_WIRELESS is not set |
| 351 | CONFIG_IEEE80211_CRYPT_CCMP=y | 392 | # CONFIG_RFKILL is not set |
| 352 | CONFIG_IEEE80211_SOFTMAC=y | 393 | # CONFIG_NET_9P is not set |
| 353 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 354 | CONFIG_WIRELESS_EXT=y | ||
| 355 | 394 | ||
| 356 | # | 395 | # |
| 357 | # Device Drivers | 396 | # Device Drivers |
| @@ -360,60 +399,40 @@ CONFIG_WIRELESS_EXT=y | |||
| 360 | # | 399 | # |
| 361 | # Generic Driver Options | 400 | # Generic Driver Options |
| 362 | # | 401 | # |
| 402 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 363 | CONFIG_STANDALONE=y | 403 | CONFIG_STANDALONE=y |
| 364 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 365 | CONFIG_FW_LOADER=y | 405 | CONFIG_FW_LOADER=y |
| 406 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 407 | CONFIG_EXTRA_FIRMWARE="" | ||
| 366 | # CONFIG_SYS_HYPERVISOR is not set | 408 | # CONFIG_SYS_HYPERVISOR is not set |
| 367 | |||
| 368 | # | ||
| 369 | # Connector - unified userspace <-> kernelspace linker | ||
| 370 | # | ||
| 371 | CONFIG_CONNECTOR=y | 409 | CONFIG_CONNECTOR=y |
| 372 | CONFIG_PROC_EVENTS=y | 410 | CONFIG_PROC_EVENTS=y |
| 373 | |||
| 374 | # | ||
| 375 | # Memory Technology Devices (MTD) | ||
| 376 | # | ||
| 377 | # CONFIG_MTD is not set | 411 | # CONFIG_MTD is not set |
| 378 | |||
| 379 | # | ||
| 380 | # Parallel port support | ||
| 381 | # | ||
| 382 | # CONFIG_PARPORT is not set | 412 | # CONFIG_PARPORT is not set |
| 383 | 413 | CONFIG_BLK_DEV=y | |
| 384 | # | ||
| 385 | # Plug and Play support | ||
| 386 | # | ||
| 387 | # CONFIG_PNPACPI is not set | ||
| 388 | |||
| 389 | # | ||
| 390 | # Block devices | ||
| 391 | # | ||
| 392 | # CONFIG_BLK_CPQ_DA is not set | 414 | # CONFIG_BLK_CPQ_DA is not set |
| 393 | # CONFIG_BLK_CPQ_CISS_DA is not set | 415 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 394 | # CONFIG_BLK_DEV_DAC960 is not set | 416 | # CONFIG_BLK_DEV_DAC960 is not set |
| 395 | # CONFIG_BLK_DEV_UMEM is not set | 417 | # CONFIG_BLK_DEV_UMEM is not set |
| 396 | # CONFIG_BLK_DEV_COW_COMMON is not set | 418 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 397 | CONFIG_BLK_DEV_LOOP=y | 419 | CONFIG_BLK_DEV_LOOP=m |
| 398 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 420 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 399 | # CONFIG_BLK_DEV_NBD is not set | 421 | CONFIG_BLK_DEV_NBD=m |
| 400 | # CONFIG_BLK_DEV_SX8 is not set | 422 | # CONFIG_BLK_DEV_SX8 is not set |
| 401 | # CONFIG_BLK_DEV_RAM is not set | 423 | # CONFIG_BLK_DEV_RAM is not set |
| 402 | # CONFIG_BLK_DEV_INITRD is not set | 424 | # CONFIG_CDROM_PKTCDVD is not set |
| 403 | CONFIG_CDROM_PKTCDVD=y | 425 | # CONFIG_ATA_OVER_ETH is not set |
| 404 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 426 | # CONFIG_BLK_DEV_HD is not set |
| 405 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 427 | CONFIG_MISC_DEVICES=y |
| 406 | CONFIG_ATA_OVER_ETH=y | 428 | # CONFIG_PHANTOM is not set |
| 407 | 429 | # CONFIG_EEPROM_93CX6 is not set | |
| 408 | # | ||
| 409 | # Misc devices | ||
| 410 | # | ||
| 411 | CONFIG_SGI_IOC4=y | 430 | CONFIG_SGI_IOC4=y |
| 412 | # CONFIG_TIFM_CORE is not set | 431 | # CONFIG_TIFM_CORE is not set |
| 413 | 432 | # CONFIG_ENCLOSURE_SERVICES is not set | |
| 414 | # | 433 | # CONFIG_HP_ILO is not set |
| 415 | # ATA/ATAPI/MFM/RLL support | 434 | # CONFIG_C2PORT is not set |
| 416 | # | 435 | CONFIG_HAVE_IDE=y |
| 417 | # CONFIG_IDE is not set | 436 | # CONFIG_IDE is not set |
| 418 | 437 | ||
| 419 | # | 438 | # |
| @@ -421,19 +440,20 @@ CONFIG_SGI_IOC4=y | |||
| 421 | # | 440 | # |
| 422 | CONFIG_RAID_ATTRS=y | 441 | CONFIG_RAID_ATTRS=y |
| 423 | CONFIG_SCSI=y | 442 | CONFIG_SCSI=y |
| 443 | CONFIG_SCSI_DMA=y | ||
| 424 | CONFIG_SCSI_TGT=y | 444 | CONFIG_SCSI_TGT=y |
| 425 | CONFIG_SCSI_NETLINK=y | 445 | # CONFIG_SCSI_NETLINK is not set |
| 426 | CONFIG_SCSI_PROC_FS=y | 446 | CONFIG_SCSI_PROC_FS=y |
| 427 | 447 | ||
| 428 | # | 448 | # |
| 429 | # SCSI support type (disk, tape, CD-ROM) | 449 | # SCSI support type (disk, tape, CD-ROM) |
| 430 | # | 450 | # |
| 431 | CONFIG_BLK_DEV_SD=y | 451 | CONFIG_BLK_DEV_SD=y |
| 432 | CONFIG_CHR_DEV_ST=y | 452 | # CONFIG_CHR_DEV_ST is not set |
| 433 | CONFIG_CHR_DEV_OSST=y | 453 | # CONFIG_CHR_DEV_OSST is not set |
| 434 | CONFIG_BLK_DEV_SR=y | 454 | CONFIG_BLK_DEV_SR=y |
| 435 | CONFIG_BLK_DEV_SR_VENDOR=y | 455 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 436 | CONFIG_CHR_DEV_SG=y | 456 | CONFIG_CHR_DEV_SG=m |
| 437 | # CONFIG_CHR_DEV_SCH is not set | 457 | # CONFIG_CHR_DEV_SCH is not set |
| 438 | 458 | ||
| 439 | # | 459 | # |
| @@ -443,35 +463,36 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 443 | CONFIG_SCSI_CONSTANTS=y | 463 | CONFIG_SCSI_CONSTANTS=y |
| 444 | CONFIG_SCSI_LOGGING=y | 464 | CONFIG_SCSI_LOGGING=y |
| 445 | CONFIG_SCSI_SCAN_ASYNC=y | 465 | CONFIG_SCSI_SCAN_ASYNC=y |
| 466 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 446 | 467 | ||
| 447 | # | 468 | # |
| 448 | # SCSI Transports | 469 | # SCSI Transports |
| 449 | # | 470 | # |
| 450 | CONFIG_SCSI_SPI_ATTRS=y | 471 | CONFIG_SCSI_SPI_ATTRS=y |
| 451 | CONFIG_SCSI_FC_ATTRS=y | 472 | # CONFIG_SCSI_FC_ATTRS is not set |
| 452 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 473 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 453 | CONFIG_SCSI_SAS_ATTRS=y | 474 | CONFIG_SCSI_SAS_ATTRS=y |
| 454 | CONFIG_SCSI_SAS_LIBSAS=y | 475 | CONFIG_SCSI_SAS_LIBSAS=y |
| 476 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
| 455 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 477 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
| 456 | 478 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 457 | # | 479 | CONFIG_SCSI_LOWLEVEL=y |
| 458 | # SCSI low-level drivers | ||
| 459 | # | ||
| 460 | # CONFIG_ISCSI_TCP is not set | 480 | # CONFIG_ISCSI_TCP is not set |
| 461 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 481 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 462 | # CONFIG_SCSI_3W_9XXX is not set | 482 | # CONFIG_SCSI_3W_9XXX is not set |
| 463 | # CONFIG_SCSI_ACARD is not set | 483 | # CONFIG_SCSI_ACARD is not set |
| 464 | # CONFIG_SCSI_AACRAID is not set | 484 | # CONFIG_SCSI_AACRAID is not set |
| 465 | CONFIG_SCSI_AIC7XXX=y | 485 | CONFIG_SCSI_AIC7XXX=y |
| 466 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=8 | 486 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 |
| 467 | CONFIG_AIC7XXX_RESET_DELAY_MS=15000 | 487 | CONFIG_AIC7XXX_RESET_DELAY_MS=15000 |
| 468 | CONFIG_AIC7XXX_DEBUG_ENABLE=y | 488 | CONFIG_AIC7XXX_DEBUG_ENABLE=y |
| 469 | CONFIG_AIC7XXX_DEBUG_MASK=0 | 489 | CONFIG_AIC7XXX_DEBUG_MASK=0 |
| 470 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | 490 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y |
| 471 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 491 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 472 | # CONFIG_SCSI_AIC79XX is not set | 492 | # CONFIG_SCSI_AIC79XX is not set |
| 473 | CONFIG_SCSI_AIC94XX=y | 493 | # CONFIG_SCSI_AIC94XX is not set |
| 474 | # CONFIG_AIC94XX_DEBUG is not set | 494 | # CONFIG_SCSI_DPT_I2O is not set |
| 495 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 475 | # CONFIG_SCSI_ARCMSR is not set | 496 | # CONFIG_SCSI_ARCMSR is not set |
| 476 | # CONFIG_MEGARAID_NEWGEN is not set | 497 | # CONFIG_MEGARAID_NEWGEN is not set |
| 477 | # CONFIG_MEGARAID_LEGACY is not set | 498 | # CONFIG_MEGARAID_LEGACY is not set |
| @@ -482,6 +503,7 @@ CONFIG_SCSI_AIC94XX=y | |||
| 482 | # CONFIG_SCSI_IPS is not set | 503 | # CONFIG_SCSI_IPS is not set |
| 483 | # CONFIG_SCSI_INITIO is not set | 504 | # CONFIG_SCSI_INITIO is not set |
| 484 | # CONFIG_SCSI_INIA100 is not set | 505 | # CONFIG_SCSI_INIA100 is not set |
| 506 | # CONFIG_SCSI_MVSAS is not set | ||
| 485 | # CONFIG_SCSI_STEX is not set | 507 | # CONFIG_SCSI_STEX is not set |
| 486 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 508 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 487 | # CONFIG_SCSI_QLOGIC_1280 is not set | 509 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| @@ -492,147 +514,81 @@ CONFIG_SCSI_AIC94XX=y | |||
| 492 | # CONFIG_SCSI_DC390T is not set | 514 | # CONFIG_SCSI_DC390T is not set |
| 493 | # CONFIG_SCSI_DEBUG is not set | 515 | # CONFIG_SCSI_DEBUG is not set |
| 494 | # CONFIG_SCSI_SRP is not set | 516 | # CONFIG_SCSI_SRP is not set |
| 495 | 517 | # CONFIG_SCSI_DH is not set | |
| 496 | # | ||
| 497 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 498 | # | ||
| 499 | # CONFIG_ATA is not set | 518 | # CONFIG_ATA is not set |
| 500 | |||
| 501 | # | ||
| 502 | # Multi-device support (RAID and LVM) | ||
| 503 | # | ||
| 504 | # CONFIG_MD is not set | 519 | # CONFIG_MD is not set |
| 505 | |||
| 506 | # | ||
| 507 | # Fusion MPT device support | ||
| 508 | # | ||
| 509 | # CONFIG_FUSION is not set | 520 | # CONFIG_FUSION is not set |
| 510 | # CONFIG_FUSION_SPI is not set | ||
| 511 | # CONFIG_FUSION_FC is not set | ||
| 512 | # CONFIG_FUSION_SAS is not set | ||
| 513 | 521 | ||
| 514 | # | 522 | # |
| 515 | # IEEE 1394 (FireWire) support | 523 | # IEEE 1394 (FireWire) support |
| 516 | # | 524 | # |
| 517 | # CONFIG_IEEE1394 is not set | ||
| 518 | 525 | ||
| 519 | # | 526 | # |
| 520 | # I2O device support | 527 | # Enable only one of the two stacks, unless you know what you are doing |
| 521 | # | 528 | # |
| 529 | # CONFIG_FIREWIRE is not set | ||
| 530 | # CONFIG_IEEE1394 is not set | ||
| 522 | # CONFIG_I2O is not set | 531 | # CONFIG_I2O is not set |
| 523 | |||
| 524 | # | ||
| 525 | # Network device support | ||
| 526 | # | ||
| 527 | CONFIG_NETDEVICES=y | 532 | CONFIG_NETDEVICES=y |
| 528 | # CONFIG_DUMMY is not set | 533 | CONFIG_DUMMY=m |
| 529 | # CONFIG_BONDING is not set | 534 | CONFIG_BONDING=m |
| 535 | # CONFIG_MACVLAN is not set | ||
| 530 | # CONFIG_EQUALIZER is not set | 536 | # CONFIG_EQUALIZER is not set |
| 531 | # CONFIG_TUN is not set | 537 | # CONFIG_TUN is not set |
| 532 | 538 | # CONFIG_VETH is not set | |
| 533 | # | ||
| 534 | # ARCnet devices | ||
| 535 | # | ||
| 536 | # CONFIG_ARCNET is not set | 539 | # CONFIG_ARCNET is not set |
| 537 | 540 | # CONFIG_PHYLIB is not set | |
| 538 | # | ||
| 539 | # PHY device support | ||
| 540 | # | ||
| 541 | CONFIG_PHYLIB=y | ||
| 542 | |||
| 543 | # | ||
| 544 | # MII PHY device drivers | ||
| 545 | # | ||
| 546 | CONFIG_MARVELL_PHY=y | ||
| 547 | CONFIG_DAVICOM_PHY=y | ||
| 548 | CONFIG_QSEMI_PHY=y | ||
| 549 | CONFIG_LXT_PHY=y | ||
| 550 | CONFIG_CICADA_PHY=y | ||
| 551 | CONFIG_VITESSE_PHY=y | ||
| 552 | CONFIG_SMSC_PHY=y | ||
| 553 | # CONFIG_BROADCOM_PHY is not set | ||
| 554 | # CONFIG_FIXED_PHY is not set | ||
| 555 | |||
| 556 | # | ||
| 557 | # Ethernet (10 or 100Mbit) | ||
| 558 | # | ||
| 559 | CONFIG_NET_ETHERNET=y | 541 | CONFIG_NET_ETHERNET=y |
| 560 | # CONFIG_MII is not set | 542 | CONFIG_MII=y |
| 543 | # CONFIG_AX88796 is not set | ||
| 561 | CONFIG_SGI_O2MACE_ETH=y | 544 | CONFIG_SGI_O2MACE_ETH=y |
| 562 | # CONFIG_HAPPYMEAL is not set | 545 | # CONFIG_HAPPYMEAL is not set |
| 563 | # CONFIG_SUNGEM is not set | 546 | # CONFIG_SUNGEM is not set |
| 564 | # CONFIG_CASSINI is not set | 547 | # CONFIG_CASSINI is not set |
| 565 | # CONFIG_NET_VENDOR_3COM is not set | 548 | # CONFIG_NET_VENDOR_3COM is not set |
| 549 | # CONFIG_SMC91X is not set | ||
| 566 | # CONFIG_DM9000 is not set | 550 | # CONFIG_DM9000 is not set |
| 567 | 551 | CONFIG_NET_TULIP=y | |
| 568 | # | 552 | CONFIG_DE2104X=m |
| 569 | # Tulip family network device support | 553 | CONFIG_TULIP=m |
| 570 | # | 554 | # CONFIG_TULIP_MWI is not set |
| 571 | # CONFIG_NET_TULIP is not set | 555 | CONFIG_TULIP_MMIO=y |
| 556 | # CONFIG_TULIP_NAPI is not set | ||
| 557 | # CONFIG_DE4X5 is not set | ||
| 558 | # CONFIG_WINBOND_840 is not set | ||
| 559 | # CONFIG_DM9102 is not set | ||
| 560 | # CONFIG_ULI526X is not set | ||
| 572 | # CONFIG_HP100 is not set | 561 | # CONFIG_HP100 is not set |
| 562 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 563 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 564 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 565 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 566 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 567 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 568 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 573 | # CONFIG_NET_PCI is not set | 569 | # CONFIG_NET_PCI is not set |
| 574 | 570 | # CONFIG_B44 is not set | |
| 575 | # | 571 | # CONFIG_ATL2 is not set |
| 576 | # Ethernet (1000 Mbit) | 572 | # CONFIG_NETDEV_1000 is not set |
| 577 | # | 573 | # CONFIG_NETDEV_10000 is not set |
| 578 | # CONFIG_ACENIC is not set | ||
| 579 | # CONFIG_DL2K is not set | ||
| 580 | # CONFIG_E1000 is not set | ||
| 581 | # CONFIG_NS83820 is not set | ||
| 582 | # CONFIG_HAMACHI is not set | ||
| 583 | # CONFIG_YELLOWFIN is not set | ||
| 584 | # CONFIG_R8169 is not set | ||
| 585 | # CONFIG_SIS190 is not set | ||
| 586 | # CONFIG_SKGE is not set | ||
| 587 | # CONFIG_SKY2 is not set | ||
| 588 | # CONFIG_SK98LIN is not set | ||
| 589 | # CONFIG_TIGON3 is not set | ||
| 590 | # CONFIG_BNX2 is not set | ||
| 591 | CONFIG_QLA3XXX=y | ||
| 592 | # CONFIG_ATL1 is not set | ||
| 593 | |||
| 594 | # | ||
| 595 | # Ethernet (10000 Mbit) | ||
| 596 | # | ||
| 597 | # CONFIG_CHELSIO_T1 is not set | ||
| 598 | CONFIG_CHELSIO_T3=y | ||
| 599 | # CONFIG_IXGB is not set | ||
| 600 | # CONFIG_S2IO is not set | ||
| 601 | # CONFIG_MYRI10GE is not set | ||
| 602 | CONFIG_NETXEN_NIC=y | ||
| 603 | |||
| 604 | # | ||
| 605 | # Token Ring devices | ||
| 606 | # | ||
| 607 | # CONFIG_TR is not set | 574 | # CONFIG_TR is not set |
| 608 | 575 | ||
| 609 | # | 576 | # |
| 610 | # Wireless LAN (non-hamradio) | 577 | # Wireless LAN |
| 611 | # | ||
| 612 | # CONFIG_NET_RADIO is not set | ||
| 613 | |||
| 614 | # | ||
| 615 | # Wan interfaces | ||
| 616 | # | 578 | # |
| 579 | # CONFIG_WLAN_PRE80211 is not set | ||
| 580 | # CONFIG_WLAN_80211 is not set | ||
| 581 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 617 | # CONFIG_WAN is not set | 582 | # CONFIG_WAN is not set |
| 618 | # CONFIG_FDDI is not set | 583 | # CONFIG_FDDI is not set |
| 619 | # CONFIG_HIPPI is not set | 584 | # CONFIG_HIPPI is not set |
| 620 | # CONFIG_PPP is not set | 585 | # CONFIG_PPP is not set |
| 621 | # CONFIG_SLIP is not set | 586 | # CONFIG_SLIP is not set |
| 622 | # CONFIG_NET_FC is not set | 587 | # CONFIG_NET_FC is not set |
| 623 | # CONFIG_SHAPER is not set | ||
| 624 | # CONFIG_NETCONSOLE is not set | 588 | # CONFIG_NETCONSOLE is not set |
| 625 | # CONFIG_NETPOLL is not set | 589 | # CONFIG_NETPOLL is not set |
| 626 | # CONFIG_NET_POLL_CONTROLLER is not set | 590 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 627 | |||
| 628 | # | ||
| 629 | # ISDN subsystem | ||
| 630 | # | ||
| 631 | # CONFIG_ISDN is not set | 591 | # CONFIG_ISDN is not set |
| 632 | |||
| 633 | # | ||
| 634 | # Telephony Support | ||
| 635 | # | ||
| 636 | # CONFIG_PHONE is not set | 592 | # CONFIG_PHONE is not set |
| 637 | 593 | ||
| 638 | # | 594 | # |
| @@ -640,6 +596,7 @@ CONFIG_NETXEN_NIC=y | |||
| 640 | # | 596 | # |
| 641 | CONFIG_INPUT=y | 597 | CONFIG_INPUT=y |
| 642 | # CONFIG_INPUT_FF_MEMLESS is not set | 598 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 599 | # CONFIG_INPUT_POLLDEV is not set | ||
| 643 | 600 | ||
| 644 | # | 601 | # |
| 645 | # Userland interfaces | 602 | # Userland interfaces |
| @@ -649,16 +606,32 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 649 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 606 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 650 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 607 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 651 | # CONFIG_INPUT_JOYDEV is not set | 608 | # CONFIG_INPUT_JOYDEV is not set |
| 652 | # CONFIG_INPUT_TSDEV is not set | 609 | CONFIG_INPUT_EVDEV=m |
| 653 | # CONFIG_INPUT_EVDEV is not set | ||
| 654 | # CONFIG_INPUT_EVBUG is not set | 610 | # CONFIG_INPUT_EVBUG is not set |
| 655 | 611 | ||
| 656 | # | 612 | # |
| 657 | # Input Device Drivers | 613 | # Input Device Drivers |
| 658 | # | 614 | # |
| 659 | # CONFIG_INPUT_KEYBOARD is not set | 615 | CONFIG_INPUT_KEYBOARD=y |
| 660 | # CONFIG_INPUT_MOUSE is not set | 616 | CONFIG_KEYBOARD_ATKBD=y |
| 617 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 618 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 619 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 620 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 621 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 622 | CONFIG_INPUT_MOUSE=y | ||
| 623 | CONFIG_MOUSE_PS2=y | ||
| 624 | CONFIG_MOUSE_PS2_ALPS=y | ||
| 625 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
| 626 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
| 627 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 628 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
| 629 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 630 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
| 631 | # CONFIG_MOUSE_SERIAL is not set | ||
| 632 | # CONFIG_MOUSE_VSXXXAA is not set | ||
| 661 | # CONFIG_INPUT_JOYSTICK is not set | 633 | # CONFIG_INPUT_JOYSTICK is not set |
| 634 | # CONFIG_INPUT_TABLET is not set | ||
| 662 | # CONFIG_INPUT_TOUCHSCREEN is not set | 635 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 663 | # CONFIG_INPUT_MISC is not set | 636 | # CONFIG_INPUT_MISC is not set |
| 664 | 637 | ||
| @@ -669,8 +642,8 @@ CONFIG_SERIO=y | |||
| 669 | # CONFIG_SERIO_I8042 is not set | 642 | # CONFIG_SERIO_I8042 is not set |
| 670 | CONFIG_SERIO_SERPORT=y | 643 | CONFIG_SERIO_SERPORT=y |
| 671 | # CONFIG_SERIO_PCIPS2 is not set | 644 | # CONFIG_SERIO_PCIPS2 is not set |
| 672 | # CONFIG_SERIO_MACEPS2 is not set | 645 | CONFIG_SERIO_MACEPS2=y |
| 673 | # CONFIG_SERIO_LIBPS2 is not set | 646 | CONFIG_SERIO_LIBPS2=y |
| 674 | CONFIG_SERIO_RAW=y | 647 | CONFIG_SERIO_RAW=y |
| 675 | # CONFIG_GAMEPORT is not set | 648 | # CONFIG_GAMEPORT is not set |
| 676 | 649 | ||
| @@ -678,10 +651,13 @@ CONFIG_SERIO_RAW=y | |||
| 678 | # Character devices | 651 | # Character devices |
| 679 | # | 652 | # |
| 680 | CONFIG_VT=y | 653 | CONFIG_VT=y |
| 654 | # CONFIG_CONSOLE_TRANSLATIONS is not set | ||
| 681 | CONFIG_VT_CONSOLE=y | 655 | CONFIG_VT_CONSOLE=y |
| 682 | CONFIG_HW_CONSOLE=y | 656 | CONFIG_HW_CONSOLE=y |
| 683 | CONFIG_VT_HW_CONSOLE_BINDING=y | 657 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 658 | CONFIG_DEVKMEM=y | ||
| 684 | # CONFIG_SERIAL_NONSTANDARD is not set | 659 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 660 | # CONFIG_NOZOMI is not set | ||
| 685 | 661 | ||
| 686 | # | 662 | # |
| 687 | # Serial drivers | 663 | # Serial drivers |
| @@ -702,192 +678,304 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 702 | CONFIG_UNIX98_PTYS=y | 678 | CONFIG_UNIX98_PTYS=y |
| 703 | CONFIG_LEGACY_PTYS=y | 679 | CONFIG_LEGACY_PTYS=y |
| 704 | CONFIG_LEGACY_PTY_COUNT=256 | 680 | CONFIG_LEGACY_PTY_COUNT=256 |
| 705 | |||
| 706 | # | ||
| 707 | # IPMI | ||
| 708 | # | ||
| 709 | # CONFIG_IPMI_HANDLER is not set | 681 | # CONFIG_IPMI_HANDLER is not set |
| 710 | 682 | CONFIG_HW_RANDOM=y | |
| 711 | # | ||
| 712 | # Watchdog Cards | ||
| 713 | # | ||
| 714 | # CONFIG_WATCHDOG is not set | ||
| 715 | # CONFIG_HW_RANDOM is not set | ||
| 716 | # CONFIG_RTC is not set | ||
| 717 | # CONFIG_GEN_RTC is not set | ||
| 718 | # CONFIG_DTLK is not set | ||
| 719 | # CONFIG_R3964 is not set | 683 | # CONFIG_R3964 is not set |
| 720 | # CONFIG_APPLICOM is not set | 684 | # CONFIG_APPLICOM is not set |
| 721 | # CONFIG_DRM is not set | ||
| 722 | # CONFIG_RAW_DRIVER is not set | 685 | # CONFIG_RAW_DRIVER is not set |
| 723 | |||
| 724 | # | ||
| 725 | # TPM devices | ||
| 726 | # | ||
| 727 | # CONFIG_TCG_TPM is not set | 686 | # CONFIG_TCG_TPM is not set |
| 687 | CONFIG_DEVPORT=y | ||
| 688 | # CONFIG_I2C is not set | ||
| 689 | # CONFIG_SPI is not set | ||
| 690 | # CONFIG_W1 is not set | ||
| 691 | # CONFIG_POWER_SUPPLY is not set | ||
| 692 | CONFIG_HWMON=y | ||
| 693 | # CONFIG_HWMON_VID is not set | ||
| 694 | # CONFIG_SENSORS_I5K_AMB is not set | ||
| 695 | # CONFIG_SENSORS_F71805F is not set | ||
| 696 | # CONFIG_SENSORS_F71882FG is not set | ||
| 697 | # CONFIG_SENSORS_IT87 is not set | ||
| 698 | # CONFIG_SENSORS_PC87360 is not set | ||
| 699 | # CONFIG_SENSORS_PC87427 is not set | ||
| 700 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 701 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 702 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 703 | # CONFIG_SENSORS_VIA686A is not set | ||
| 704 | # CONFIG_SENSORS_VT1211 is not set | ||
| 705 | # CONFIG_SENSORS_VT8231 is not set | ||
| 706 | # CONFIG_SENSORS_W83627HF is not set | ||
| 707 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 708 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 709 | # CONFIG_THERMAL is not set | ||
| 710 | # CONFIG_THERMAL_HWMON is not set | ||
| 711 | CONFIG_WATCHDOG=y | ||
| 712 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 728 | 713 | ||
| 729 | # | 714 | # |
| 730 | # I2C support | 715 | # Watchdog Device Drivers |
| 731 | # | 716 | # |
| 732 | # CONFIG_I2C is not set | 717 | # CONFIG_SOFT_WATCHDOG is not set |
| 718 | # CONFIG_ALIM7101_WDT is not set | ||
| 733 | 719 | ||
| 734 | # | 720 | # |
| 735 | # SPI support | 721 | # PCI-based Watchdog Cards |
| 736 | # | 722 | # |
| 737 | # CONFIG_SPI is not set | 723 | # CONFIG_PCIPCWATCHDOG is not set |
| 738 | # CONFIG_SPI_MASTER is not set | 724 | # CONFIG_WDTPCI is not set |
| 725 | CONFIG_SSB_POSSIBLE=y | ||
| 739 | 726 | ||
| 740 | # | 727 | # |
| 741 | # Dallas's 1-wire bus | 728 | # Sonics Silicon Backplane |
| 742 | # | 729 | # |
| 743 | # CONFIG_W1 is not set | 730 | # CONFIG_SSB is not set |
| 744 | 731 | ||
| 745 | # | 732 | # |
| 746 | # Hardware Monitoring support | 733 | # Multifunction device drivers |
| 747 | # | 734 | # |
| 748 | # CONFIG_HWMON is not set | 735 | # CONFIG_MFD_CORE is not set |
| 749 | # CONFIG_HWMON_VID is not set | 736 | # CONFIG_MFD_SM501 is not set |
| 737 | # CONFIG_HTC_PASIC3 is not set | ||
| 738 | # CONFIG_MFD_TMIO is not set | ||
| 739 | # CONFIG_REGULATOR is not set | ||
| 750 | 740 | ||
| 751 | # | 741 | # |
| 752 | # Multimedia devices | 742 | # Multimedia devices |
| 753 | # | 743 | # |
| 754 | # CONFIG_VIDEO_DEV is not set | ||
| 755 | 744 | ||
| 756 | # | 745 | # |
| 757 | # Digital Video Broadcasting Devices | 746 | # Multimedia core support |
| 758 | # | 747 | # |
| 759 | # CONFIG_DVB is not set | 748 | CONFIG_VIDEO_DEV=m |
| 749 | CONFIG_VIDEO_V4L2_COMMON=m | ||
| 750 | CONFIG_VIDEO_ALLOW_V4L1=y | ||
| 751 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
| 752 | # CONFIG_DVB_CORE is not set | ||
| 753 | CONFIG_VIDEO_MEDIA=m | ||
| 760 | 754 | ||
| 761 | # | 755 | # |
| 762 | # Graphics support | 756 | # Multimedia drivers |
| 763 | # | 757 | # |
| 764 | # CONFIG_FIRMWARE_EDID is not set | 758 | # CONFIG_MEDIA_ATTACH is not set |
| 765 | # CONFIG_FB is not set | 759 | CONFIG_VIDEO_V4L2=m |
| 760 | CONFIG_VIDEO_V4L1=m | ||
| 761 | CONFIG_VIDEOBUF_GEN=m | ||
| 762 | CONFIG_VIDEOBUF_VMALLOC=m | ||
| 763 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
| 764 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
| 765 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
| 766 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | ||
| 767 | CONFIG_VIDEO_VIVI=m | ||
| 768 | # CONFIG_VIDEO_CPIA is not set | ||
| 769 | # CONFIG_VIDEO_STRADIS is not set | ||
| 770 | # CONFIG_SOC_CAMERA is not set | ||
| 771 | CONFIG_RADIO_ADAPTERS=y | ||
| 772 | # CONFIG_RADIO_GEMTEK_PCI is not set | ||
| 773 | # CONFIG_RADIO_MAXIRADIO is not set | ||
| 774 | # CONFIG_RADIO_MAESTRO is not set | ||
| 775 | CONFIG_DAB=y | ||
| 766 | 776 | ||
| 767 | # | 777 | # |
| 768 | # Console display driver support | 778 | # Graphics support |
| 769 | # | 779 | # |
| 770 | # CONFIG_VGA_CONSOLE is not set | 780 | # CONFIG_DRM is not set |
| 771 | CONFIG_DUMMY_CONSOLE=y | 781 | # CONFIG_VGASTATE is not set |
| 782 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 783 | CONFIG_FB=y | ||
| 784 | CONFIG_FIRMWARE_EDID=y | ||
| 785 | # CONFIG_FB_DDC is not set | ||
| 786 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 787 | CONFIG_FB_CFB_FILLRECT=y | ||
| 788 | CONFIG_FB_CFB_COPYAREA=y | ||
| 789 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 790 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 791 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 792 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 793 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 794 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 795 | # CONFIG_FB_SYS_FOPS is not set | ||
| 796 | # CONFIG_FB_SVGALIB is not set | ||
| 797 | # CONFIG_FB_MACMODES is not set | ||
| 798 | # CONFIG_FB_BACKLIGHT is not set | ||
| 799 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 800 | # CONFIG_FB_TILEBLITTING is not set | ||
| 801 | |||
| 802 | # | ||
| 803 | # Frame buffer hardware drivers | ||
| 804 | # | ||
| 805 | # CONFIG_FB_CIRRUS is not set | ||
| 806 | # CONFIG_FB_PM2 is not set | ||
| 807 | # CONFIG_FB_CYBER2000 is not set | ||
| 808 | # CONFIG_FB_ASILIANT is not set | ||
| 809 | # CONFIG_FB_IMSTT is not set | ||
| 810 | # CONFIG_FB_UVESA is not set | ||
| 811 | CONFIG_FB_GBE=y | ||
| 812 | CONFIG_FB_GBE_MEM=4 | ||
| 813 | # CONFIG_FB_S1D13XXX is not set | ||
| 814 | # CONFIG_FB_NVIDIA is not set | ||
| 815 | # CONFIG_FB_RIVA is not set | ||
| 816 | # CONFIG_FB_MATROX is not set | ||
| 817 | # CONFIG_FB_RADEON is not set | ||
| 818 | # CONFIG_FB_ATY128 is not set | ||
| 819 | # CONFIG_FB_ATY is not set | ||
| 820 | # CONFIG_FB_S3 is not set | ||
| 821 | # CONFIG_FB_SAVAGE is not set | ||
| 822 | # CONFIG_FB_SIS is not set | ||
| 823 | # CONFIG_FB_VIA is not set | ||
| 824 | # CONFIG_FB_NEOMAGIC is not set | ||
| 825 | # CONFIG_FB_KYRO is not set | ||
| 826 | # CONFIG_FB_3DFX is not set | ||
| 827 | # CONFIG_FB_VOODOO1 is not set | ||
| 828 | # CONFIG_FB_VT8623 is not set | ||
| 829 | # CONFIG_FB_TRIDENT is not set | ||
| 830 | # CONFIG_FB_ARK is not set | ||
| 831 | # CONFIG_FB_PM3 is not set | ||
| 832 | # CONFIG_FB_CARMINE is not set | ||
| 833 | # CONFIG_FB_VIRTUAL is not set | ||
| 834 | # CONFIG_FB_METRONOME is not set | ||
| 835 | # CONFIG_FB_MB862XX is not set | ||
| 772 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 836 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 773 | 837 | ||
| 774 | # | 838 | # |
| 775 | # Sound | 839 | # Display device support |
| 776 | # | 840 | # |
| 777 | # CONFIG_SOUND is not set | 841 | # CONFIG_DISPLAY_SUPPORT is not set |
| 778 | 842 | ||
| 779 | # | 843 | # |
| 780 | # HID Devices | 844 | # Console display driver support |
| 781 | # | 845 | # |
| 846 | # CONFIG_VGA_CONSOLE is not set | ||
| 847 | CONFIG_DUMMY_CONSOLE=y | ||
| 848 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 849 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 850 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 851 | CONFIG_FONTS=y | ||
| 852 | CONFIG_FONT_8x8=y | ||
| 853 | CONFIG_FONT_8x16=y | ||
| 854 | # CONFIG_FONT_6x11 is not set | ||
| 855 | # CONFIG_FONT_7x14 is not set | ||
| 856 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 857 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 858 | # CONFIG_FONT_MINI_4x6 is not set | ||
| 859 | # CONFIG_FONT_SUN8x16 is not set | ||
| 860 | # CONFIG_FONT_SUN12x22 is not set | ||
| 861 | # CONFIG_FONT_10x18 is not set | ||
| 862 | CONFIG_LOGO=y | ||
| 863 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 864 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 865 | # CONFIG_LOGO_LINUX_CLUT224 is not set | ||
| 866 | CONFIG_LOGO_SGI_CLUT224=y | ||
| 867 | # CONFIG_SOUND is not set | ||
| 868 | CONFIG_HID_SUPPORT=y | ||
| 782 | CONFIG_HID=y | 869 | CONFIG_HID=y |
| 783 | # CONFIG_HID_DEBUG is not set | 870 | # CONFIG_HID_DEBUG is not set |
| 871 | # CONFIG_HIDRAW is not set | ||
| 872 | # CONFIG_HID_PID is not set | ||
| 784 | 873 | ||
| 785 | # | 874 | # |
| 786 | # USB support | 875 | # Special HID drivers |
| 787 | # | ||
| 788 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 789 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 790 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 791 | # CONFIG_USB is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 795 | # | ||
| 796 | |||
| 797 | # | ||
| 798 | # USB Gadget Support | ||
| 799 | # | ||
| 800 | # CONFIG_USB_GADGET is not set | ||
| 801 | |||
| 802 | # | ||
| 803 | # MMC/SD Card support | ||
| 804 | # | 876 | # |
| 877 | CONFIG_HID_COMPAT=y | ||
| 878 | # CONFIG_USB_SUPPORT is not set | ||
| 879 | # CONFIG_UWB is not set | ||
| 805 | # CONFIG_MMC is not set | 880 | # CONFIG_MMC is not set |
| 806 | 881 | # CONFIG_MEMSTICK is not set | |
| 807 | # | ||
| 808 | # LED devices | ||
| 809 | # | ||
| 810 | # CONFIG_NEW_LEDS is not set | 882 | # CONFIG_NEW_LEDS is not set |
| 811 | 883 | # CONFIG_ACCESSIBILITY is not set | |
| 812 | # | ||
| 813 | # LED drivers | ||
| 814 | # | ||
| 815 | |||
| 816 | # | ||
| 817 | # LED Triggers | ||
| 818 | # | ||
| 819 | |||
| 820 | # | ||
| 821 | # InfiniBand support | ||
| 822 | # | ||
| 823 | # CONFIG_INFINIBAND is not set | 884 | # CONFIG_INFINIBAND is not set |
| 885 | CONFIG_RTC_LIB=y | ||
| 886 | CONFIG_RTC_CLASS=y | ||
| 887 | # CONFIG_RTC_HCTOSYS is not set | ||
| 888 | # CONFIG_RTC_DEBUG is not set | ||
| 824 | 889 | ||
| 825 | # | 890 | # |
| 826 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 891 | # RTC interfaces |
| 827 | # | 892 | # |
| 893 | # CONFIG_RTC_INTF_SYSFS is not set | ||
| 894 | # CONFIG_RTC_INTF_PROC is not set | ||
| 895 | CONFIG_RTC_INTF_DEV=y | ||
| 896 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 897 | # CONFIG_RTC_DRV_TEST is not set | ||
| 828 | 898 | ||
| 829 | # | 899 | # |
| 830 | # Real Time Clock | 900 | # SPI RTC drivers |
| 831 | # | 901 | # |
| 832 | # CONFIG_RTC_CLASS is not set | ||
| 833 | 902 | ||
| 834 | # | 903 | # |
| 835 | # DMA Engine support | 904 | # Platform RTC drivers |
| 836 | # | 905 | # |
| 837 | # CONFIG_DMA_ENGINE is not set | 906 | CONFIG_RTC_DRV_CMOS=y |
| 907 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 908 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 909 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 910 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 911 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 912 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 913 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 914 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 915 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 916 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 838 | 917 | ||
| 839 | # | 918 | # |
| 840 | # DMA Clients | 919 | # on-CPU RTC drivers |
| 841 | # | ||
| 842 | |||
| 843 | # | ||
| 844 | # DMA Devices | ||
| 845 | # | ||
| 846 | |||
| 847 | # | ||
| 848 | # Auxiliary Display support | ||
| 849 | # | ||
| 850 | |||
| 851 | # | ||
| 852 | # Virtualization | ||
| 853 | # | 920 | # |
| 921 | # CONFIG_DMADEVICES is not set | ||
| 922 | # CONFIG_UIO is not set | ||
| 923 | # CONFIG_STAGING is not set | ||
| 924 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 854 | 925 | ||
| 855 | # | 926 | # |
| 856 | # File systems | 927 | # File systems |
| 857 | # | 928 | # |
| 858 | CONFIG_EXT2_FS=y | 929 | CONFIG_EXT2_FS=y |
| 859 | # CONFIG_EXT2_FS_XATTR is not set | 930 | CONFIG_EXT2_FS_XATTR=y |
| 931 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 932 | CONFIG_EXT2_FS_SECURITY=y | ||
| 860 | # CONFIG_EXT2_FS_XIP is not set | 933 | # CONFIG_EXT2_FS_XIP is not set |
| 861 | # CONFIG_EXT3_FS is not set | 934 | CONFIG_EXT3_FS=y |
| 862 | # CONFIG_EXT4DEV_FS is not set | 935 | CONFIG_EXT3_FS_XATTR=y |
| 936 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
| 937 | CONFIG_EXT3_FS_SECURITY=y | ||
| 938 | # CONFIG_EXT4_FS is not set | ||
| 939 | CONFIG_JBD=y | ||
| 940 | CONFIG_FS_MBCACHE=y | ||
| 863 | # CONFIG_REISERFS_FS is not set | 941 | # CONFIG_REISERFS_FS is not set |
| 864 | # CONFIG_JFS_FS is not set | 942 | # CONFIG_JFS_FS is not set |
| 865 | CONFIG_FS_POSIX_ACL=y | 943 | CONFIG_FS_POSIX_ACL=y |
| 944 | CONFIG_FILE_LOCKING=y | ||
| 866 | # CONFIG_XFS_FS is not set | 945 | # CONFIG_XFS_FS is not set |
| 867 | # CONFIG_GFS2_FS is not set | 946 | # CONFIG_GFS2_FS is not set |
| 868 | # CONFIG_OCFS2_FS is not set | 947 | # CONFIG_OCFS2_FS is not set |
| 869 | # CONFIG_MINIX_FS is not set | 948 | CONFIG_DNOTIFY=y |
| 870 | # CONFIG_ROMFS_FS is not set | ||
| 871 | CONFIG_INOTIFY=y | 949 | CONFIG_INOTIFY=y |
| 872 | CONFIG_INOTIFY_USER=y | 950 | CONFIG_INOTIFY_USER=y |
| 873 | # CONFIG_QUOTA is not set | 951 | CONFIG_QUOTA=y |
| 874 | CONFIG_DNOTIFY=y | 952 | # CONFIG_QUOTA_NETLINK_INTERFACE is not set |
| 875 | # CONFIG_AUTOFS_FS is not set | 953 | CONFIG_PRINT_QUOTA_WARNING=y |
| 876 | # CONFIG_AUTOFS4_FS is not set | 954 | CONFIG_QFMT_V1=m |
| 877 | CONFIG_FUSE_FS=y | 955 | CONFIG_QFMT_V2=m |
| 956 | CONFIG_QUOTACTL=y | ||
| 957 | CONFIG_AUTOFS_FS=m | ||
| 958 | CONFIG_AUTOFS4_FS=m | ||
| 959 | CONFIG_FUSE_FS=m | ||
| 878 | CONFIG_GENERIC_ACL=y | 960 | CONFIG_GENERIC_ACL=y |
| 879 | 961 | ||
| 880 | # | 962 | # |
| 881 | # CD-ROM/DVD Filesystems | 963 | # CD-ROM/DVD Filesystems |
| 882 | # | 964 | # |
| 883 | # CONFIG_ISO9660_FS is not set | 965 | CONFIG_ISO9660_FS=m |
| 884 | # CONFIG_UDF_FS is not set | 966 | CONFIG_JOLIET=y |
| 967 | CONFIG_ZISOFS=y | ||
| 968 | CONFIG_UDF_FS=m | ||
| 969 | CONFIG_UDF_NLS=y | ||
| 885 | 970 | ||
| 886 | # | 971 | # |
| 887 | # DOS/FAT/NT Filesystems | 972 | # DOS/FAT/NT Filesystems |
| 888 | # | 973 | # |
| 889 | # CONFIG_MSDOS_FS is not set | 974 | CONFIG_FAT_FS=m |
| 890 | # CONFIG_VFAT_FS is not set | 975 | CONFIG_MSDOS_FS=m |
| 976 | CONFIG_VFAT_FS=m | ||
| 977 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 978 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 891 | # CONFIG_NTFS_FS is not set | 979 | # CONFIG_NTFS_FS is not set |
| 892 | 980 | ||
| 893 | # | 981 | # |
| @@ -896,11 +984,11 @@ CONFIG_GENERIC_ACL=y | |||
| 896 | CONFIG_PROC_FS=y | 984 | CONFIG_PROC_FS=y |
| 897 | CONFIG_PROC_KCORE=y | 985 | CONFIG_PROC_KCORE=y |
| 898 | CONFIG_PROC_SYSCTL=y | 986 | CONFIG_PROC_SYSCTL=y |
| 987 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 899 | CONFIG_SYSFS=y | 988 | CONFIG_SYSFS=y |
| 900 | CONFIG_TMPFS=y | 989 | CONFIG_TMPFS=y |
| 901 | CONFIG_TMPFS_POSIX_ACL=y | 990 | CONFIG_TMPFS_POSIX_ACL=y |
| 902 | # CONFIG_HUGETLB_PAGE is not set | 991 | # CONFIG_HUGETLB_PAGE is not set |
| 903 | CONFIG_RAMFS=y | ||
| 904 | CONFIG_CONFIGFS_FS=y | 992 | CONFIG_CONFIGFS_FS=y |
| 905 | 993 | ||
| 906 | # | 994 | # |
| @@ -916,33 +1004,42 @@ CONFIG_CONFIGFS_FS=y | |||
| 916 | # CONFIG_EFS_FS is not set | 1004 | # CONFIG_EFS_FS is not set |
| 917 | # CONFIG_CRAMFS is not set | 1005 | # CONFIG_CRAMFS is not set |
| 918 | # CONFIG_VXFS_FS is not set | 1006 | # CONFIG_VXFS_FS is not set |
| 1007 | # CONFIG_MINIX_FS is not set | ||
| 1008 | # CONFIG_OMFS_FS is not set | ||
| 919 | # CONFIG_HPFS_FS is not set | 1009 | # CONFIG_HPFS_FS is not set |
| 920 | # CONFIG_QNX4FS_FS is not set | 1010 | # CONFIG_QNX4FS_FS is not set |
| 1011 | # CONFIG_ROMFS_FS is not set | ||
| 921 | # CONFIG_SYSV_FS is not set | 1012 | # CONFIG_SYSV_FS is not set |
| 922 | # CONFIG_UFS_FS is not set | 1013 | # CONFIG_UFS_FS is not set |
| 923 | 1014 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 924 | # | ||
| 925 | # Network File Systems | ||
| 926 | # | ||
| 927 | CONFIG_NFS_FS=y | 1015 | CONFIG_NFS_FS=y |
| 928 | CONFIG_NFS_V3=y | 1016 | CONFIG_NFS_V3=y |
| 929 | # CONFIG_NFS_V3_ACL is not set | 1017 | # CONFIG_NFS_V3_ACL is not set |
| 930 | # CONFIG_NFS_V4 is not set | 1018 | # CONFIG_NFS_V4 is not set |
| 931 | # CONFIG_NFS_DIRECTIO is not set | ||
| 932 | # CONFIG_NFSD is not set | ||
| 933 | CONFIG_ROOT_NFS=y | 1019 | CONFIG_ROOT_NFS=y |
| 1020 | CONFIG_NFSD=m | ||
| 1021 | CONFIG_NFSD_V3=y | ||
| 1022 | # CONFIG_NFSD_V3_ACL is not set | ||
| 1023 | # CONFIG_NFSD_V4 is not set | ||
| 934 | CONFIG_LOCKD=y | 1024 | CONFIG_LOCKD=y |
| 935 | CONFIG_LOCKD_V4=y | 1025 | CONFIG_LOCKD_V4=y |
| 1026 | CONFIG_EXPORTFS=m | ||
| 936 | CONFIG_NFS_COMMON=y | 1027 | CONFIG_NFS_COMMON=y |
| 937 | CONFIG_SUNRPC=y | 1028 | CONFIG_SUNRPC=y |
| 1029 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 938 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1030 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 939 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1031 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 940 | # CONFIG_SMB_FS is not set | 1032 | # CONFIG_SMB_FS is not set |
| 941 | # CONFIG_CIFS is not set | 1033 | CONFIG_CIFS=m |
| 1034 | # CONFIG_CIFS_STATS is not set | ||
| 1035 | # CONFIG_CIFS_WEAK_PW_HASH is not set | ||
| 1036 | # CONFIG_CIFS_UPCALL is not set | ||
| 1037 | # CONFIG_CIFS_XATTR is not set | ||
| 1038 | # CONFIG_CIFS_DEBUG2 is not set | ||
| 1039 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
| 942 | # CONFIG_NCP_FS is not set | 1040 | # CONFIG_NCP_FS is not set |
| 943 | # CONFIG_CODA_FS is not set | 1041 | # CONFIG_CODA_FS is not set |
| 944 | # CONFIG_AFS_FS is not set | 1042 | # CONFIG_AFS_FS is not set |
| 945 | # CONFIG_9P_FS is not set | ||
| 946 | 1043 | ||
| 947 | # | 1044 | # |
| 948 | # Partition Types | 1045 | # Partition Types |
| @@ -953,45 +1050,83 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 953 | # CONFIG_AMIGA_PARTITION is not set | 1050 | # CONFIG_AMIGA_PARTITION is not set |
| 954 | # CONFIG_ATARI_PARTITION is not set | 1051 | # CONFIG_ATARI_PARTITION is not set |
| 955 | # CONFIG_MAC_PARTITION is not set | 1052 | # CONFIG_MAC_PARTITION is not set |
| 956 | # CONFIG_MSDOS_PARTITION is not set | 1053 | CONFIG_MSDOS_PARTITION=y |
| 1054 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1055 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1056 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1057 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 957 | # CONFIG_LDM_PARTITION is not set | 1058 | # CONFIG_LDM_PARTITION is not set |
| 958 | CONFIG_SGI_PARTITION=y | 1059 | CONFIG_SGI_PARTITION=y |
| 959 | # CONFIG_ULTRIX_PARTITION is not set | 1060 | # CONFIG_ULTRIX_PARTITION is not set |
| 960 | # CONFIG_SUN_PARTITION is not set | 1061 | # CONFIG_SUN_PARTITION is not set |
| 961 | # CONFIG_KARMA_PARTITION is not set | 1062 | # CONFIG_KARMA_PARTITION is not set |
| 962 | # CONFIG_EFI_PARTITION is not set | 1063 | # CONFIG_EFI_PARTITION is not set |
| 963 | 1064 | # CONFIG_SYSV68_PARTITION is not set | |
| 964 | # | 1065 | CONFIG_NLS=y |
| 965 | # Native Language Support | 1066 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 966 | # | 1067 | CONFIG_NLS_CODEPAGE_437=m |
| 967 | # CONFIG_NLS is not set | 1068 | CONFIG_NLS_CODEPAGE_737=m |
| 968 | 1069 | CONFIG_NLS_CODEPAGE_775=m | |
| 969 | # | 1070 | CONFIG_NLS_CODEPAGE_850=m |
| 970 | # Distributed Lock Manager | 1071 | CONFIG_NLS_CODEPAGE_852=m |
| 971 | # | 1072 | CONFIG_NLS_CODEPAGE_855=m |
| 972 | CONFIG_DLM=y | 1073 | CONFIG_NLS_CODEPAGE_857=m |
| 973 | CONFIG_DLM_TCP=y | 1074 | CONFIG_NLS_CODEPAGE_860=m |
| 974 | # CONFIG_DLM_SCTP is not set | 1075 | CONFIG_NLS_CODEPAGE_861=m |
| 975 | # CONFIG_DLM_DEBUG is not set | 1076 | CONFIG_NLS_CODEPAGE_862=m |
| 976 | 1077 | CONFIG_NLS_CODEPAGE_863=m | |
| 977 | # | 1078 | CONFIG_NLS_CODEPAGE_864=m |
| 978 | # Profiling support | 1079 | CONFIG_NLS_CODEPAGE_865=m |
| 979 | # | 1080 | CONFIG_NLS_CODEPAGE_866=m |
| 980 | # CONFIG_PROFILING is not set | 1081 | CONFIG_NLS_CODEPAGE_869=m |
| 1082 | CONFIG_NLS_CODEPAGE_936=m | ||
| 1083 | CONFIG_NLS_CODEPAGE_950=m | ||
| 1084 | CONFIG_NLS_CODEPAGE_932=m | ||
| 1085 | CONFIG_NLS_CODEPAGE_949=m | ||
| 1086 | CONFIG_NLS_CODEPAGE_874=m | ||
| 1087 | CONFIG_NLS_ISO8859_8=m | ||
| 1088 | CONFIG_NLS_CODEPAGE_1250=m | ||
| 1089 | CONFIG_NLS_CODEPAGE_1251=m | ||
| 1090 | CONFIG_NLS_ASCII=m | ||
| 1091 | CONFIG_NLS_ISO8859_1=m | ||
| 1092 | CONFIG_NLS_ISO8859_2=m | ||
| 1093 | CONFIG_NLS_ISO8859_3=m | ||
| 1094 | CONFIG_NLS_ISO8859_4=m | ||
| 1095 | CONFIG_NLS_ISO8859_5=m | ||
| 1096 | CONFIG_NLS_ISO8859_6=m | ||
| 1097 | CONFIG_NLS_ISO8859_7=m | ||
| 1098 | CONFIG_NLS_ISO8859_9=m | ||
| 1099 | CONFIG_NLS_ISO8859_13=m | ||
| 1100 | CONFIG_NLS_ISO8859_14=m | ||
| 1101 | CONFIG_NLS_ISO8859_15=m | ||
| 1102 | CONFIG_NLS_KOI8_R=m | ||
| 1103 | CONFIG_NLS_KOI8_U=m | ||
| 1104 | CONFIG_NLS_UTF8=m | ||
| 1105 | # CONFIG_DLM is not set | ||
| 981 | 1106 | ||
| 982 | # | 1107 | # |
| 983 | # Kernel hacking | 1108 | # Kernel hacking |
| 984 | # | 1109 | # |
| 985 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1110 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 986 | # CONFIG_PRINTK_TIME is not set | 1111 | # CONFIG_PRINTK_TIME is not set |
| 1112 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 987 | CONFIG_ENABLE_MUST_CHECK=y | 1113 | CONFIG_ENABLE_MUST_CHECK=y |
| 988 | # CONFIG_MAGIC_SYSRQ is not set | 1114 | CONFIG_FRAME_WARN=2048 |
| 1115 | CONFIG_MAGIC_SYSRQ=y | ||
| 989 | # CONFIG_UNUSED_SYMBOLS is not set | 1116 | # CONFIG_UNUSED_SYMBOLS is not set |
| 990 | # CONFIG_DEBUG_FS is not set | 1117 | # CONFIG_DEBUG_FS is not set |
| 991 | # CONFIG_HEADERS_CHECK is not set | 1118 | # CONFIG_HEADERS_CHECK is not set |
| 992 | # CONFIG_DEBUG_KERNEL is not set | 1119 | # CONFIG_DEBUG_KERNEL is not set |
| 993 | CONFIG_LOG_BUF_SHIFT=14 | 1120 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 994 | CONFIG_CROSSCOMPILE=y | 1121 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1122 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1123 | |||
| 1124 | # | ||
| 1125 | # Tracers | ||
| 1126 | # | ||
| 1127 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1128 | # CONFIG_SAMPLES is not set | ||
| 1129 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 995 | CONFIG_CMDLINE="" | 1130 | CONFIG_CMDLINE="" |
| 996 | 1131 | ||
| 997 | # | 1132 | # |
| @@ -1000,51 +1135,99 @@ CONFIG_CMDLINE="" | |||
| 1000 | CONFIG_KEYS=y | 1135 | CONFIG_KEYS=y |
| 1001 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1136 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1002 | # CONFIG_SECURITY is not set | 1137 | # CONFIG_SECURITY is not set |
| 1138 | # CONFIG_SECURITYFS is not set | ||
| 1139 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1140 | CONFIG_CRYPTO=y | ||
| 1003 | 1141 | ||
| 1004 | # | 1142 | # |
| 1005 | # Cryptographic options | 1143 | # Crypto core or helper |
| 1006 | # | 1144 | # |
| 1007 | CONFIG_CRYPTO=y | 1145 | # CONFIG_CRYPTO_FIPS is not set |
| 1008 | CONFIG_CRYPTO_ALGAPI=y | 1146 | CONFIG_CRYPTO_ALGAPI=y |
| 1147 | CONFIG_CRYPTO_AEAD=y | ||
| 1009 | CONFIG_CRYPTO_BLKCIPHER=y | 1148 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1010 | CONFIG_CRYPTO_HASH=y | 1149 | CONFIG_CRYPTO_HASH=y |
| 1150 | CONFIG_CRYPTO_RNG=y | ||
| 1011 | CONFIG_CRYPTO_MANAGER=y | 1151 | CONFIG_CRYPTO_MANAGER=y |
| 1152 | CONFIG_CRYPTO_GF128MUL=y | ||
| 1153 | CONFIG_CRYPTO_NULL=y | ||
| 1154 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1155 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1156 | # CONFIG_CRYPTO_TEST is not set | ||
| 1157 | |||
| 1158 | # | ||
| 1159 | # Authenticated Encryption with Associated Data | ||
| 1160 | # | ||
| 1161 | # CONFIG_CRYPTO_CCM is not set | ||
| 1162 | # CONFIG_CRYPTO_GCM is not set | ||
| 1163 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1164 | |||
| 1165 | # | ||
| 1166 | # Block modes | ||
| 1167 | # | ||
| 1168 | CONFIG_CRYPTO_CBC=y | ||
| 1169 | # CONFIG_CRYPTO_CTR is not set | ||
| 1170 | # CONFIG_CRYPTO_CTS is not set | ||
| 1171 | CONFIG_CRYPTO_ECB=y | ||
| 1172 | CONFIG_CRYPTO_LRW=y | ||
| 1173 | CONFIG_CRYPTO_PCBC=y | ||
| 1174 | # CONFIG_CRYPTO_XTS is not set | ||
| 1175 | |||
| 1176 | # | ||
| 1177 | # Hash modes | ||
| 1178 | # | ||
| 1012 | CONFIG_CRYPTO_HMAC=y | 1179 | CONFIG_CRYPTO_HMAC=y |
| 1013 | CONFIG_CRYPTO_XCBC=y | 1180 | CONFIG_CRYPTO_XCBC=y |
| 1014 | CONFIG_CRYPTO_NULL=y | 1181 | |
| 1182 | # | ||
| 1183 | # Digest | ||
| 1184 | # | ||
| 1185 | CONFIG_CRYPTO_CRC32C=y | ||
| 1015 | CONFIG_CRYPTO_MD4=y | 1186 | CONFIG_CRYPTO_MD4=y |
| 1016 | CONFIG_CRYPTO_MD5=y | 1187 | CONFIG_CRYPTO_MD5=y |
| 1188 | CONFIG_CRYPTO_MICHAEL_MIC=y | ||
| 1189 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1190 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1191 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1192 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1017 | CONFIG_CRYPTO_SHA1=y | 1193 | CONFIG_CRYPTO_SHA1=y |
| 1018 | CONFIG_CRYPTO_SHA256=y | 1194 | CONFIG_CRYPTO_SHA256=y |
| 1019 | CONFIG_CRYPTO_SHA512=y | 1195 | CONFIG_CRYPTO_SHA512=y |
| 1020 | CONFIG_CRYPTO_WP512=y | ||
| 1021 | CONFIG_CRYPTO_TGR192=y | 1196 | CONFIG_CRYPTO_TGR192=y |
| 1022 | CONFIG_CRYPTO_GF128MUL=y | 1197 | CONFIG_CRYPTO_WP512=y |
| 1023 | CONFIG_CRYPTO_ECB=y | 1198 | |
| 1024 | CONFIG_CRYPTO_CBC=y | 1199 | # |
| 1025 | CONFIG_CRYPTO_PCBC=y | 1200 | # Ciphers |
| 1026 | CONFIG_CRYPTO_LRW=y | 1201 | # |
| 1027 | CONFIG_CRYPTO_DES=y | ||
| 1028 | CONFIG_CRYPTO_FCRYPT=y | ||
| 1029 | CONFIG_CRYPTO_BLOWFISH=y | ||
| 1030 | CONFIG_CRYPTO_TWOFISH=y | ||
| 1031 | CONFIG_CRYPTO_TWOFISH_COMMON=y | ||
| 1032 | CONFIG_CRYPTO_SERPENT=y | ||
| 1033 | CONFIG_CRYPTO_AES=y | 1202 | CONFIG_CRYPTO_AES=y |
| 1203 | CONFIG_CRYPTO_ANUBIS=y | ||
| 1204 | CONFIG_CRYPTO_ARC4=y | ||
| 1205 | CONFIG_CRYPTO_BLOWFISH=y | ||
| 1206 | CONFIG_CRYPTO_CAMELLIA=y | ||
| 1034 | CONFIG_CRYPTO_CAST5=y | 1207 | CONFIG_CRYPTO_CAST5=y |
| 1035 | CONFIG_CRYPTO_CAST6=y | 1208 | CONFIG_CRYPTO_CAST6=y |
| 1036 | CONFIG_CRYPTO_TEA=y | 1209 | CONFIG_CRYPTO_DES=y |
| 1037 | CONFIG_CRYPTO_ARC4=y | 1210 | CONFIG_CRYPTO_FCRYPT=y |
| 1038 | CONFIG_CRYPTO_KHAZAD=y | 1211 | CONFIG_CRYPTO_KHAZAD=y |
| 1039 | CONFIG_CRYPTO_ANUBIS=y | 1212 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1213 | # CONFIG_CRYPTO_SEED is not set | ||
| 1214 | CONFIG_CRYPTO_SERPENT=y | ||
| 1215 | CONFIG_CRYPTO_TEA=y | ||
| 1216 | CONFIG_CRYPTO_TWOFISH=y | ||
| 1217 | CONFIG_CRYPTO_TWOFISH_COMMON=y | ||
| 1218 | |||
| 1219 | # | ||
| 1220 | # Compression | ||
| 1221 | # | ||
| 1040 | CONFIG_CRYPTO_DEFLATE=y | 1222 | CONFIG_CRYPTO_DEFLATE=y |
| 1041 | CONFIG_CRYPTO_MICHAEL_MIC=y | 1223 | # CONFIG_CRYPTO_LZO is not set |
| 1042 | CONFIG_CRYPTO_CRC32C=y | ||
| 1043 | CONFIG_CRYPTO_CAMELLIA=y | ||
| 1044 | 1224 | ||
| 1045 | # | 1225 | # |
| 1046 | # Hardware crypto devices | 1226 | # Random Number Generation |
| 1047 | # | 1227 | # |
| 1228 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1229 | CONFIG_CRYPTO_HW=y | ||
| 1230 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1048 | 1231 | ||
| 1049 | # | 1232 | # |
| 1050 | # Library routines | 1233 | # Library routines |
| @@ -1052,10 +1235,15 @@ CONFIG_CRYPTO_CAMELLIA=y | |||
| 1052 | CONFIG_BITREVERSE=y | 1235 | CONFIG_BITREVERSE=y |
| 1053 | # CONFIG_CRC_CCITT is not set | 1236 | # CONFIG_CRC_CCITT is not set |
| 1054 | CONFIG_CRC16=y | 1237 | CONFIG_CRC16=y |
| 1238 | CONFIG_CRC_T10DIF=y | ||
| 1239 | CONFIG_CRC_ITU_T=m | ||
| 1055 | CONFIG_CRC32=y | 1240 | CONFIG_CRC32=y |
| 1241 | # CONFIG_CRC7 is not set | ||
| 1056 | CONFIG_LIBCRC32C=y | 1242 | CONFIG_LIBCRC32C=y |
| 1243 | CONFIG_AUDIT_GENERIC=y | ||
| 1057 | CONFIG_ZLIB_INFLATE=y | 1244 | CONFIG_ZLIB_INFLATE=y |
| 1058 | CONFIG_ZLIB_DEFLATE=y | 1245 | CONFIG_ZLIB_DEFLATE=y |
| 1059 | CONFIG_PLIST=y | 1246 | CONFIG_PLIST=y |
| 1060 | CONFIG_HAS_IOMEM=y | 1247 | CONFIG_HAS_IOMEM=y |
| 1061 | CONFIG_HAS_IOPORT=y | 1248 | CONFIG_HAS_IOPORT=y |
| 1249 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 74daa0cf87e6..1ecdd3b65dc7 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.28-rc6 |
| 4 | # Tue Aug 7 12:59:29 2007 | 4 | # Mon Dec 1 08:08:19 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -11,20 +11,25 @@ CONFIG_MIPS=y | |||
| 11 | CONFIG_ZONE_DMA=y | 11 | CONFIG_ZONE_DMA=y |
| 12 | # CONFIG_MACH_ALCHEMY is not set | 12 | # CONFIG_MACH_ALCHEMY is not set |
| 13 | # CONFIG_BASLER_EXCITE is not set | 13 | # CONFIG_BASLER_EXCITE is not set |
| 14 | # CONFIG_BCM47XX is not set | ||
| 14 | # CONFIG_MIPS_COBALT is not set | 15 | # CONFIG_MIPS_COBALT is not set |
| 15 | # CONFIG_MACH_DECSTATION is not set | 16 | # CONFIG_MACH_DECSTATION is not set |
| 16 | # CONFIG_MACH_JAZZ is not set | 17 | # CONFIG_MACH_JAZZ is not set |
| 18 | # CONFIG_LASAT is not set | ||
| 17 | # CONFIG_LEMOTE_FULONG is not set | 19 | # CONFIG_LEMOTE_FULONG is not set |
| 18 | CONFIG_MIPS_MALTA=y | 20 | CONFIG_MIPS_MALTA=y |
| 19 | # CONFIG_MIPS_SIM is not set | 21 | # CONFIG_MIPS_SIM is not set |
| 20 | # CONFIG_MARKEINS is not set | 22 | # CONFIG_MACH_EMMA is not set |
| 21 | # CONFIG_MACH_VR41XX is not set | 23 | # CONFIG_MACH_VR41XX is not set |
| 24 | # CONFIG_NXP_STB220 is not set | ||
| 25 | # CONFIG_NXP_STB225 is not set | ||
| 22 | # CONFIG_PNX8550_JBS is not set | 26 | # CONFIG_PNX8550_JBS is not set |
| 23 | # CONFIG_PNX8550_STB810 is not set | 27 | # CONFIG_PNX8550_STB810 is not set |
| 24 | # CONFIG_PMC_MSP is not set | 28 | # CONFIG_PMC_MSP is not set |
| 25 | # CONFIG_PMC_YOSEMITE is not set | 29 | # CONFIG_PMC_YOSEMITE is not set |
| 26 | # CONFIG_SGI_IP22 is not set | 30 | # CONFIG_SGI_IP22 is not set |
| 27 | # CONFIG_SGI_IP27 is not set | 31 | # CONFIG_SGI_IP27 is not set |
| 32 | # CONFIG_SGI_IP28 is not set | ||
| 28 | # CONFIG_SGI_IP32 is not set | 33 | # CONFIG_SGI_IP32 is not set |
| 29 | # CONFIG_SIBYTE_CRHINE is not set | 34 | # CONFIG_SIBYTE_CRHINE is not set |
| 30 | # CONFIG_SIBYTE_CARMEL is not set | 35 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -35,13 +40,14 @@ CONFIG_MIPS_MALTA=y | |||
| 35 | # CONFIG_SIBYTE_SENTOSA is not set | 40 | # CONFIG_SIBYTE_SENTOSA is not set |
| 36 | # CONFIG_SIBYTE_BIGSUR is not set | 41 | # CONFIG_SIBYTE_BIGSUR is not set |
| 37 | # CONFIG_SNI_RM is not set | 42 | # CONFIG_SNI_RM is not set |
| 38 | # CONFIG_TOSHIBA_JMR3927 is not set | 43 | # CONFIG_MACH_TX39XX is not set |
| 39 | # CONFIG_TOSHIBA_RBTX4927 is not set | 44 | # CONFIG_MACH_TX49XX is not set |
| 40 | # CONFIG_TOSHIBA_RBTX4938 is not set | 45 | # CONFIG_MIKROTIK_RB532 is not set |
| 41 | # CONFIG_WR_PPMC is not set | 46 | # CONFIG_WR_PPMC is not set |
| 42 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 47 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 43 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 44 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 49 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 50 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 51 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 46 | CONFIG_GENERIC_HWEIGHT=y | 52 | CONFIG_GENERIC_HWEIGHT=y |
| 47 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 53 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| @@ -51,21 +57,26 @@ CONFIG_GENERIC_CMOS_UPDATE=y | |||
| 51 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 57 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 52 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 58 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 53 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 59 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 60 | CONFIG_BOOT_RAW=y | ||
| 54 | CONFIG_CEVT_R4K=y | 61 | CONFIG_CEVT_R4K=y |
| 62 | CONFIG_CSRC_R4K=y | ||
| 55 | CONFIG_DMA_NONCOHERENT=y | 63 | CONFIG_DMA_NONCOHERENT=y |
| 56 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 64 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 57 | CONFIG_EARLY_PRINTK=y | 65 | CONFIG_EARLY_PRINTK=y |
| 58 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 66 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
| 59 | CONFIG_GENERIC_ISA_DMA=y | 67 | # CONFIG_HOTPLUG_CPU is not set |
| 60 | CONFIG_I8259=y | 68 | CONFIG_I8259=y |
| 61 | CONFIG_MIPS_BONITO64=y | 69 | CONFIG_MIPS_BONITO64=y |
| 62 | CONFIG_MIPS_MSC=y | 70 | CONFIG_MIPS_MSC=y |
| 63 | # CONFIG_NO_IOPORT is not set | 71 | # CONFIG_NO_IOPORT is not set |
| 72 | CONFIG_GENERIC_ISA_DMA=y | ||
| 64 | # CONFIG_CPU_BIG_ENDIAN is not set | 73 | # CONFIG_CPU_BIG_ENDIAN is not set |
| 65 | CONFIG_CPU_LITTLE_ENDIAN=y | 74 | CONFIG_CPU_LITTLE_ENDIAN=y |
| 66 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 75 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 67 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 76 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 68 | CONFIG_IRQ_CPU=y | 77 | CONFIG_IRQ_CPU=y |
| 78 | CONFIG_IRQ_GIC=y | ||
| 79 | CONFIG_MIPS_BOARDS_GEN=y | ||
| 69 | CONFIG_PCI_GT64XXX_PCI0=y | 80 | CONFIG_PCI_GT64XXX_PCI0=y |
| 70 | CONFIG_SWAP_IO_SPACE=y | 81 | CONFIG_SWAP_IO_SPACE=y |
| 71 | CONFIG_BOOT_ELF32=y | 82 | CONFIG_BOOT_ELF32=y |
| @@ -74,10 +85,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 74 | # | 85 | # |
| 75 | # CPU selection | 86 | # CPU selection |
| 76 | # | 87 | # |
| 77 | CONFIG_TICK_ONESHOT=y | ||
| 78 | CONFIG_NO_HZ=y | ||
| 79 | CONFIG_HIGH_RES_TIMERS=y | ||
| 80 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 81 | # CONFIG_CPU_LOONGSON2 is not set | 88 | # CONFIG_CPU_LOONGSON2 is not set |
| 82 | # CONFIG_CPU_MIPS32_R1 is not set | 89 | # CONFIG_CPU_MIPS32_R1 is not set |
| 83 | CONFIG_CPU_MIPS32_R2=y | 90 | CONFIG_CPU_MIPS32_R2=y |
| @@ -91,6 +98,7 @@ CONFIG_CPU_MIPS32_R2=y | |||
| 91 | # CONFIG_CPU_TX49XX is not set | 98 | # CONFIG_CPU_TX49XX is not set |
| 92 | # CONFIG_CPU_R5000 is not set | 99 | # CONFIG_CPU_R5000 is not set |
| 93 | # CONFIG_CPU_R5432 is not set | 100 | # CONFIG_CPU_R5432 is not set |
| 101 | # CONFIG_CPU_R5500 is not set | ||
| 94 | # CONFIG_CPU_R6000 is not set | 102 | # CONFIG_CPU_R6000 is not set |
| 95 | # CONFIG_CPU_NEVADA is not set | 103 | # CONFIG_CPU_NEVADA is not set |
| 96 | # CONFIG_CPU_R8000 is not set | 104 | # CONFIG_CPU_R8000 is not set |
| @@ -108,6 +116,7 @@ CONFIG_CPU_MIPSR2=y | |||
| 108 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 116 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
| 109 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | 117 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y |
| 110 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 118 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
| 119 | CONFIG_HARDWARE_WATCHPOINTS=y | ||
| 111 | 120 | ||
| 112 | # | 121 | # |
| 113 | # Kernel type | 122 | # Kernel type |
| @@ -125,6 +134,8 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
| 125 | CONFIG_MIPS_MT_SMP=y | 134 | CONFIG_MIPS_MT_SMP=y |
| 126 | # CONFIG_MIPS_MT_SMTC is not set | 135 | # CONFIG_MIPS_MT_SMTC is not set |
| 127 | CONFIG_MIPS_MT=y | 136 | CONFIG_MIPS_MT=y |
| 137 | # CONFIG_SCHED_SMT is not set | ||
| 138 | CONFIG_SYS_SUPPORTS_SCHED_SMT=y | ||
| 128 | CONFIG_SYS_SUPPORTS_MULTITHREADING=y | 139 | CONFIG_SYS_SUPPORTS_MULTITHREADING=y |
| 129 | CONFIG_MIPS_MT_FPAFF=y | 140 | CONFIG_MIPS_MT_FPAFF=y |
| 130 | # CONFIG_MIPS_VPE_LOADER is not set | 141 | # CONFIG_MIPS_VPE_LOADER is not set |
| @@ -132,7 +143,6 @@ CONFIG_CPU_HAS_LLSC=y | |||
| 132 | # CONFIG_CPU_HAS_SMARTMIPS is not set | 143 | # CONFIG_CPU_HAS_SMARTMIPS is not set |
| 133 | CONFIG_CPU_MIPSR2_IRQ_VI=y | 144 | CONFIG_CPU_MIPSR2_IRQ_VI=y |
| 134 | CONFIG_CPU_MIPSR2_IRQ_EI=y | 145 | CONFIG_CPU_MIPSR2_IRQ_EI=y |
| 135 | CONFIG_CPU_MIPSR2_SRS=y | ||
| 136 | CONFIG_CPU_HAS_SYNC=y | 146 | CONFIG_CPU_HAS_SYNC=y |
| 137 | CONFIG_GENERIC_HARDIRQS=y | 147 | CONFIG_GENERIC_HARDIRQS=y |
| 138 | CONFIG_GENERIC_IRQ_PROBE=y | 148 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -140,22 +150,30 @@ CONFIG_IRQ_PER_CPU=y | |||
| 140 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 150 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 141 | CONFIG_SYS_SUPPORTS_SMARTMIPS=y | 151 | CONFIG_SYS_SUPPORTS_SMARTMIPS=y |
| 142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 152 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 153 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | 154 | CONFIG_SELECT_MEMORY_MODEL=y |
| 144 | CONFIG_FLATMEM_MANUAL=y | 155 | CONFIG_FLATMEM_MANUAL=y |
| 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 156 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 146 | # CONFIG_SPARSEMEM_MANUAL is not set | 157 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 147 | CONFIG_FLATMEM=y | 158 | CONFIG_FLATMEM=y |
| 148 | CONFIG_FLAT_NODE_MEM_MAP=y | 159 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 149 | # CONFIG_SPARSEMEM_STATIC is not set | 160 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 161 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 151 | # CONFIG_RESOURCES_64BIT is not set | 162 | # CONFIG_RESOURCES_64BIT is not set |
| 163 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 152 | CONFIG_ZONE_DMA_FLAG=1 | 164 | CONFIG_ZONE_DMA_FLAG=1 |
| 153 | CONFIG_BOUNCE=y | 165 | CONFIG_BOUNCE=y |
| 154 | CONFIG_VIRT_TO_BUS=y | 166 | CONFIG_VIRT_TO_BUS=y |
| 167 | CONFIG_UNEVICTABLE_LRU=y | ||
| 155 | CONFIG_SMP=y | 168 | CONFIG_SMP=y |
| 169 | CONFIG_SMP_UP=y | ||
| 156 | CONFIG_SYS_SUPPORTS_SMP=y | 170 | CONFIG_SYS_SUPPORTS_SMP=y |
| 157 | CONFIG_NR_CPUS_DEFAULT_2=y | 171 | CONFIG_NR_CPUS_DEFAULT_2=y |
| 158 | CONFIG_NR_CPUS=2 | 172 | CONFIG_NR_CPUS=2 |
| 173 | CONFIG_TICK_ONESHOT=y | ||
| 174 | CONFIG_NO_HZ=y | ||
| 175 | CONFIG_HIGH_RES_TIMERS=y | ||
| 176 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 159 | # CONFIG_HZ_48 is not set | 177 | # CONFIG_HZ_48 is not set |
| 160 | CONFIG_HZ_100=y | 178 | CONFIG_HZ_100=y |
| 161 | # CONFIG_HZ_128 is not set | 179 | # CONFIG_HZ_128 is not set |
| @@ -168,7 +186,6 @@ CONFIG_HZ=100 | |||
| 168 | CONFIG_PREEMPT_NONE=y | 186 | CONFIG_PREEMPT_NONE=y |
| 169 | # CONFIG_PREEMPT_VOLUNTARY is not set | 187 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 170 | # CONFIG_PREEMPT is not set | 188 | # CONFIG_PREEMPT is not set |
| 171 | CONFIG_PREEMPT_BKL=y | ||
| 172 | # CONFIG_KEXEC is not set | 189 | # CONFIG_KEXEC is not set |
| 173 | CONFIG_SECCOMP=y | 190 | CONFIG_SECCOMP=y |
| 174 | CONFIG_LOCKDEP_SUPPORT=y | 191 | CONFIG_LOCKDEP_SUPPORT=y |
| @@ -189,13 +206,19 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 189 | # CONFIG_POSIX_MQUEUE is not set | 206 | # CONFIG_POSIX_MQUEUE is not set |
| 190 | # CONFIG_BSD_PROCESS_ACCT is not set | 207 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 191 | # CONFIG_TASKSTATS is not set | 208 | # CONFIG_TASKSTATS is not set |
| 192 | # CONFIG_USER_NS is not set | ||
| 193 | # CONFIG_AUDIT is not set | 209 | # CONFIG_AUDIT is not set |
| 194 | # CONFIG_IKCONFIG is not set | 210 | # CONFIG_IKCONFIG is not set |
| 195 | CONFIG_LOG_BUF_SHIFT=15 | 211 | CONFIG_LOG_BUF_SHIFT=15 |
| 196 | # CONFIG_CPUSETS is not set | 212 | # CONFIG_CGROUPS is not set |
| 213 | # CONFIG_GROUP_SCHED is not set | ||
| 197 | CONFIG_SYSFS_DEPRECATED=y | 214 | CONFIG_SYSFS_DEPRECATED=y |
| 215 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 198 | CONFIG_RELAY=y | 216 | CONFIG_RELAY=y |
| 217 | CONFIG_NAMESPACES=y | ||
| 218 | CONFIG_UTS_NS=y | ||
| 219 | CONFIG_IPC_NS=y | ||
| 220 | # CONFIG_USER_NS is not set | ||
| 221 | CONFIG_PID_NS=y | ||
| 199 | # CONFIG_BLK_DEV_INITRD is not set | 222 | # CONFIG_BLK_DEV_INITRD is not set |
| 200 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 223 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 201 | CONFIG_SYSCTL=y | 224 | CONFIG_SYSCTL=y |
| @@ -207,6 +230,8 @@ CONFIG_HOTPLUG=y | |||
| 207 | CONFIG_PRINTK=y | 230 | CONFIG_PRINTK=y |
| 208 | CONFIG_BUG=y | 231 | CONFIG_BUG=y |
| 209 | CONFIG_ELF_CORE=y | 232 | CONFIG_ELF_CORE=y |
| 233 | CONFIG_PCSPKR_PLATFORM=y | ||
| 234 | # CONFIG_COMPAT_BRK is not set | ||
| 210 | CONFIG_BASE_FULL=y | 235 | CONFIG_BASE_FULL=y |
| 211 | CONFIG_FUTEX=y | 236 | CONFIG_FUTEX=y |
| 212 | CONFIG_ANON_INODES=y | 237 | CONFIG_ANON_INODES=y |
| @@ -215,14 +240,23 @@ CONFIG_SIGNALFD=y | |||
| 215 | CONFIG_TIMERFD=y | 240 | CONFIG_TIMERFD=y |
| 216 | CONFIG_EVENTFD=y | 241 | CONFIG_EVENTFD=y |
| 217 | CONFIG_SHMEM=y | 242 | CONFIG_SHMEM=y |
| 243 | CONFIG_AIO=y | ||
| 218 | CONFIG_VM_EVENT_COUNTERS=y | 244 | CONFIG_VM_EVENT_COUNTERS=y |
| 245 | CONFIG_PCI_QUIRKS=y | ||
| 219 | CONFIG_SLAB=y | 246 | CONFIG_SLAB=y |
| 220 | # CONFIG_SLUB is not set | 247 | # CONFIG_SLUB is not set |
| 221 | # CONFIG_SLOB is not set | 248 | # CONFIG_SLOB is not set |
| 249 | # CONFIG_PROFILING is not set | ||
| 250 | # CONFIG_MARKERS is not set | ||
| 251 | CONFIG_HAVE_OPROFILE=y | ||
| 252 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 253 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 254 | CONFIG_SLABINFO=y | ||
| 222 | CONFIG_RT_MUTEXES=y | 255 | CONFIG_RT_MUTEXES=y |
| 223 | # CONFIG_TINY_SHMEM is not set | 256 | # CONFIG_TINY_SHMEM is not set |
| 224 | CONFIG_BASE_SMALL=0 | 257 | CONFIG_BASE_SMALL=0 |
| 225 | CONFIG_MODULES=y | 258 | CONFIG_MODULES=y |
| 259 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 226 | CONFIG_MODULE_UNLOAD=y | 260 | CONFIG_MODULE_UNLOAD=y |
| 227 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 261 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 228 | CONFIG_MODVERSIONS=y | 262 | CONFIG_MODVERSIONS=y |
| @@ -234,6 +268,7 @@ CONFIG_BLOCK=y | |||
| 234 | # CONFIG_BLK_DEV_IO_TRACE is not set | 268 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 235 | # CONFIG_LSF is not set | 269 | # CONFIG_LSF is not set |
| 236 | # CONFIG_BLK_DEV_BSG is not set | 270 | # CONFIG_BLK_DEV_BSG is not set |
| 271 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 237 | 272 | ||
| 238 | # | 273 | # |
| 239 | # IO Schedulers | 274 | # IO Schedulers |
| @@ -247,19 +282,19 @@ CONFIG_DEFAULT_AS=y | |||
| 247 | # CONFIG_DEFAULT_CFQ is not set | 282 | # CONFIG_DEFAULT_CFQ is not set |
| 248 | # CONFIG_DEFAULT_NOOP is not set | 283 | # CONFIG_DEFAULT_NOOP is not set |
| 249 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 284 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 285 | CONFIG_CLASSIC_RCU=y | ||
| 286 | # CONFIG_FREEZER is not set | ||
| 250 | 287 | ||
| 251 | # | 288 | # |
| 252 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 289 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 253 | # | 290 | # |
| 254 | CONFIG_HW_HAS_PCI=y | 291 | CONFIG_HW_HAS_PCI=y |
| 255 | CONFIG_PCI=y | 292 | CONFIG_PCI=y |
| 293 | CONFIG_PCI_DOMAINS=y | ||
| 256 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 294 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 295 | CONFIG_PCI_LEGACY=y | ||
| 257 | CONFIG_MMU=y | 296 | CONFIG_MMU=y |
| 258 | CONFIG_I8253=y | 297 | CONFIG_I8253=y |
| 259 | |||
| 260 | # | ||
| 261 | # PCCARD (PCMCIA/CardBus) support | ||
| 262 | # | ||
| 263 | # CONFIG_PCCARD is not set | 298 | # CONFIG_PCCARD is not set |
| 264 | # CONFIG_HOTPLUG_PCI is not set | 299 | # CONFIG_HOTPLUG_PCI is not set |
| 265 | 300 | ||
| @@ -267,6 +302,8 @@ CONFIG_I8253=y | |||
| 267 | # Executable file formats | 302 | # Executable file formats |
| 268 | # | 303 | # |
| 269 | CONFIG_BINFMT_ELF=y | 304 | CONFIG_BINFMT_ELF=y |
| 305 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 306 | # CONFIG_HAVE_AOUT is not set | ||
| 270 | # CONFIG_BINFMT_MISC is not set | 307 | # CONFIG_BINFMT_MISC is not set |
| 271 | CONFIG_TRAD_SIGNALS=y | 308 | CONFIG_TRAD_SIGNALS=y |
| 272 | 309 | ||
| @@ -274,12 +311,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 274 | # Power management options | 311 | # Power management options |
| 275 | # | 312 | # |
| 276 | CONFIG_PM=y | 313 | CONFIG_PM=y |
| 277 | # CONFIG_PM_LEGACY is not set | ||
| 278 | # CONFIG_PM_DEBUG is not set | 314 | # CONFIG_PM_DEBUG is not set |
| 279 | |||
| 280 | # | ||
| 281 | # Networking | ||
| 282 | # | ||
| 283 | CONFIG_NET=y | 315 | CONFIG_NET=y |
| 284 | 316 | ||
| 285 | # | 317 | # |
| @@ -292,6 +324,8 @@ CONFIG_XFRM=y | |||
| 292 | CONFIG_XFRM_USER=m | 324 | CONFIG_XFRM_USER=m |
| 293 | # CONFIG_XFRM_SUB_POLICY is not set | 325 | # CONFIG_XFRM_SUB_POLICY is not set |
| 294 | CONFIG_XFRM_MIGRATE=y | 326 | CONFIG_XFRM_MIGRATE=y |
| 327 | # CONFIG_XFRM_STATISTICS is not set | ||
| 328 | CONFIG_XFRM_IPCOMP=m | ||
| 295 | CONFIG_NET_KEY=y | 329 | CONFIG_NET_KEY=y |
| 296 | CONFIG_NET_KEY_MIGRATE=y | 330 | CONFIG_NET_KEY_MIGRATE=y |
| 297 | CONFIG_INET=y | 331 | CONFIG_INET=y |
| @@ -323,42 +357,13 @@ CONFIG_INET_TUNNEL=m | |||
| 323 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 357 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 324 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 358 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 325 | CONFIG_INET_XFRM_MODE_BEET=y | 359 | CONFIG_INET_XFRM_MODE_BEET=y |
| 360 | CONFIG_INET_LRO=m | ||
| 326 | CONFIG_INET_DIAG=y | 361 | CONFIG_INET_DIAG=y |
| 327 | CONFIG_INET_TCP_DIAG=y | 362 | CONFIG_INET_TCP_DIAG=y |
| 328 | # CONFIG_TCP_CONG_ADVANCED is not set | 363 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 329 | CONFIG_TCP_CONG_CUBIC=y | 364 | CONFIG_TCP_CONG_CUBIC=y |
| 330 | CONFIG_DEFAULT_TCP_CONG="cubic" | 365 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 331 | CONFIG_TCP_MD5SIG=y | 366 | CONFIG_TCP_MD5SIG=y |
| 332 | CONFIG_IP_VS=m | ||
| 333 | # CONFIG_IP_VS_DEBUG is not set | ||
| 334 | CONFIG_IP_VS_TAB_BITS=12 | ||
| 335 | |||
| 336 | # | ||
| 337 | # IPVS transport protocol load balancing support | ||
| 338 | # | ||
| 339 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 340 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 341 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 342 | CONFIG_IP_VS_PROTO_AH=y | ||
| 343 | |||
| 344 | # | ||
| 345 | # IPVS scheduler | ||
| 346 | # | ||
| 347 | CONFIG_IP_VS_RR=m | ||
| 348 | CONFIG_IP_VS_WRR=m | ||
| 349 | CONFIG_IP_VS_LC=m | ||
| 350 | CONFIG_IP_VS_WLC=m | ||
| 351 | CONFIG_IP_VS_LBLC=m | ||
| 352 | CONFIG_IP_VS_LBLCR=m | ||
| 353 | CONFIG_IP_VS_DH=m | ||
| 354 | CONFIG_IP_VS_SH=m | ||
| 355 | CONFIG_IP_VS_SED=m | ||
| 356 | CONFIG_IP_VS_NQ=m | ||
| 357 | |||
| 358 | # | ||
| 359 | # IPVS application helper | ||
| 360 | # | ||
| 361 | CONFIG_IP_VS_FTP=m | ||
| 362 | CONFIG_IPV6=m | 367 | CONFIG_IPV6=m |
| 363 | CONFIG_IPV6_PRIVACY=y | 368 | CONFIG_IPV6_PRIVACY=y |
| 364 | CONFIG_IPV6_ROUTER_PREF=y | 369 | CONFIG_IPV6_ROUTER_PREF=y |
| @@ -375,11 +380,15 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
| 375 | CONFIG_INET6_XFRM_MODE_BEET=m | 380 | CONFIG_INET6_XFRM_MODE_BEET=m |
| 376 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 381 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 377 | CONFIG_IPV6_SIT=m | 382 | CONFIG_IPV6_SIT=m |
| 383 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 378 | CONFIG_IPV6_TUNNEL=m | 384 | CONFIG_IPV6_TUNNEL=m |
| 379 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 385 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 386 | CONFIG_IPV6_MROUTE=y | ||
| 387 | CONFIG_IPV6_PIMSM_V2=y | ||
| 380 | CONFIG_NETWORK_SECMARK=y | 388 | CONFIG_NETWORK_SECMARK=y |
| 381 | CONFIG_NETFILTER=y | 389 | CONFIG_NETFILTER=y |
| 382 | # CONFIG_NETFILTER_DEBUG is not set | 390 | # CONFIG_NETFILTER_DEBUG is not set |
| 391 | CONFIG_NETFILTER_ADVANCED=y | ||
| 383 | CONFIG_BRIDGE_NETFILTER=y | 392 | CONFIG_BRIDGE_NETFILTER=y |
| 384 | 393 | ||
| 385 | # | 394 | # |
| @@ -388,12 +397,12 @@ CONFIG_BRIDGE_NETFILTER=y | |||
| 388 | CONFIG_NETFILTER_NETLINK=m | 397 | CONFIG_NETFILTER_NETLINK=m |
| 389 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 398 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 390 | CONFIG_NETFILTER_NETLINK_LOG=m | 399 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 391 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 392 | CONFIG_NF_CONNTRACK=m | 400 | CONFIG_NF_CONNTRACK=m |
| 393 | CONFIG_NF_CT_ACCT=y | 401 | CONFIG_NF_CT_ACCT=y |
| 394 | CONFIG_NF_CONNTRACK_MARK=y | 402 | CONFIG_NF_CONNTRACK_MARK=y |
| 395 | CONFIG_NF_CONNTRACK_SECMARK=y | 403 | CONFIG_NF_CONNTRACK_SECMARK=y |
| 396 | CONFIG_NF_CONNTRACK_EVENTS=y | 404 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 405 | CONFIG_NF_CT_PROTO_DCCP=m | ||
| 397 | CONFIG_NF_CT_PROTO_GRE=m | 406 | CONFIG_NF_CT_PROTO_GRE=m |
| 398 | CONFIG_NF_CT_PROTO_SCTP=m | 407 | CONFIG_NF_CT_PROTO_SCTP=m |
| 399 | CONFIG_NF_CT_PROTO_UDPLITE=m | 408 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| @@ -407,18 +416,22 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
| 407 | CONFIG_NF_CONNTRACK_SIP=m | 416 | CONFIG_NF_CONNTRACK_SIP=m |
| 408 | CONFIG_NF_CONNTRACK_TFTP=m | 417 | CONFIG_NF_CONNTRACK_TFTP=m |
| 409 | CONFIG_NF_CT_NETLINK=m | 418 | CONFIG_NF_CT_NETLINK=m |
| 419 | CONFIG_NETFILTER_TPROXY=m | ||
| 410 | CONFIG_NETFILTER_XTABLES=m | 420 | CONFIG_NETFILTER_XTABLES=m |
| 411 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 421 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 412 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 422 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 423 | # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set | ||
| 413 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 424 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 414 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 425 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 415 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 416 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 426 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 427 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 417 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 428 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 429 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
| 430 | CONFIG_NETFILTER_XT_TARGET_TPROXY=m | ||
| 418 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 431 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 419 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 432 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
| 420 | # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set | ||
| 421 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 433 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 434 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
| 422 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 435 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 423 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 436 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 424 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 437 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -427,40 +440,76 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
| 427 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 440 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 428 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 441 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
| 429 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 442 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 443 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 430 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 444 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 445 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
| 431 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 446 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 432 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 447 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 433 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 448 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 434 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 449 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 435 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 436 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 450 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 451 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
| 452 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 437 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | 453 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set |
| 438 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 454 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 439 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 455 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
| 456 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
| 440 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 457 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 458 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
| 459 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
| 441 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 460 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 461 | CONFIG_NETFILTER_XT_MATCH_SOCKET=m | ||
| 442 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 462 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 443 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 463 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| 444 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 464 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 445 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 465 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 466 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
| 446 | CONFIG_NETFILTER_XT_MATCH_U32=m | 467 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 447 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 468 | CONFIG_IP_VS=m |
| 469 | CONFIG_IP_VS_IPV6=y | ||
| 470 | # CONFIG_IP_VS_DEBUG is not set | ||
| 471 | CONFIG_IP_VS_TAB_BITS=12 | ||
| 472 | |||
| 473 | # | ||
| 474 | # IPVS transport protocol load balancing support | ||
| 475 | # | ||
| 476 | CONFIG_IP_VS_PROTO_TCP=y | ||
| 477 | CONFIG_IP_VS_PROTO_UDP=y | ||
| 478 | CONFIG_IP_VS_PROTO_AH_ESP=y | ||
| 479 | CONFIG_IP_VS_PROTO_ESP=y | ||
| 480 | CONFIG_IP_VS_PROTO_AH=y | ||
| 481 | |||
| 482 | # | ||
| 483 | # IPVS scheduler | ||
| 484 | # | ||
| 485 | CONFIG_IP_VS_RR=m | ||
| 486 | CONFIG_IP_VS_WRR=m | ||
| 487 | CONFIG_IP_VS_LC=m | ||
| 488 | CONFIG_IP_VS_WLC=m | ||
| 489 | CONFIG_IP_VS_LBLC=m | ||
| 490 | CONFIG_IP_VS_LBLCR=m | ||
| 491 | CONFIG_IP_VS_DH=m | ||
| 492 | CONFIG_IP_VS_SH=m | ||
| 493 | CONFIG_IP_VS_SED=m | ||
| 494 | CONFIG_IP_VS_NQ=m | ||
| 495 | |||
| 496 | # | ||
| 497 | # IPVS application helper | ||
| 498 | # | ||
| 499 | CONFIG_IP_VS_FTP=m | ||
| 448 | 500 | ||
| 449 | # | 501 | # |
| 450 | # IP: Netfilter Configuration | 502 | # IP: Netfilter Configuration |
| 451 | # | 503 | # |
| 504 | CONFIG_NF_DEFRAG_IPV4=m | ||
| 452 | CONFIG_NF_CONNTRACK_IPV4=m | 505 | CONFIG_NF_CONNTRACK_IPV4=m |
| 453 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 506 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 454 | CONFIG_IP_NF_QUEUE=m | 507 | CONFIG_IP_NF_QUEUE=m |
| 455 | CONFIG_IP_NF_IPTABLES=m | 508 | CONFIG_IP_NF_IPTABLES=m |
| 456 | CONFIG_IP_NF_MATCH_IPRANGE=m | 509 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 457 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 458 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 459 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 460 | CONFIG_IP_NF_MATCH_AH=m | 510 | CONFIG_IP_NF_MATCH_AH=m |
| 511 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 461 | CONFIG_IP_NF_MATCH_TTL=m | 512 | CONFIG_IP_NF_MATCH_TTL=m |
| 462 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 463 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 464 | CONFIG_IP_NF_FILTER=m | 513 | CONFIG_IP_NF_FILTER=m |
| 465 | CONFIG_IP_NF_TARGET_REJECT=m | 514 | CONFIG_IP_NF_TARGET_REJECT=m |
| 466 | CONFIG_IP_NF_TARGET_LOG=m | 515 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -468,11 +517,13 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
| 468 | CONFIG_NF_NAT=m | 517 | CONFIG_NF_NAT=m |
| 469 | CONFIG_NF_NAT_NEEDED=y | 518 | CONFIG_NF_NAT_NEEDED=y |
| 470 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 519 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 471 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 472 | CONFIG_IP_NF_TARGET_NETMAP=m | 520 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 473 | CONFIG_IP_NF_TARGET_SAME=m | 521 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 474 | CONFIG_NF_NAT_SNMP_BASIC=m | 522 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 523 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
| 475 | CONFIG_NF_NAT_PROTO_GRE=m | 524 | CONFIG_NF_NAT_PROTO_GRE=m |
| 525 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
| 526 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
| 476 | CONFIG_NF_NAT_FTP=m | 527 | CONFIG_NF_NAT_FTP=m |
| 477 | CONFIG_NF_NAT_IRC=m | 528 | CONFIG_NF_NAT_IRC=m |
| 478 | CONFIG_NF_NAT_TFTP=m | 529 | CONFIG_NF_NAT_TFTP=m |
| @@ -481,40 +532,34 @@ CONFIG_NF_NAT_PPTP=m | |||
| 481 | CONFIG_NF_NAT_H323=m | 532 | CONFIG_NF_NAT_H323=m |
| 482 | CONFIG_NF_NAT_SIP=m | 533 | CONFIG_NF_NAT_SIP=m |
| 483 | CONFIG_IP_NF_MANGLE=m | 534 | CONFIG_IP_NF_MANGLE=m |
| 484 | CONFIG_IP_NF_TARGET_TOS=m | 535 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 485 | CONFIG_IP_NF_TARGET_ECN=m | 536 | CONFIG_IP_NF_TARGET_ECN=m |
| 486 | CONFIG_IP_NF_TARGET_TTL=m | 537 | CONFIG_IP_NF_TARGET_TTL=m |
| 487 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 488 | CONFIG_IP_NF_RAW=m | 538 | CONFIG_IP_NF_RAW=m |
| 489 | CONFIG_IP_NF_ARPTABLES=m | 539 | CONFIG_IP_NF_ARPTABLES=m |
| 490 | CONFIG_IP_NF_ARPFILTER=m | 540 | CONFIG_IP_NF_ARPFILTER=m |
| 491 | CONFIG_IP_NF_ARP_MANGLE=m | 541 | CONFIG_IP_NF_ARP_MANGLE=m |
| 492 | 542 | ||
| 493 | # | 543 | # |
| 494 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 544 | # IPv6: Netfilter Configuration |
| 495 | # | 545 | # |
| 496 | CONFIG_NF_CONNTRACK_IPV6=m | 546 | CONFIG_NF_CONNTRACK_IPV6=m |
| 497 | CONFIG_IP6_NF_QUEUE=m | 547 | CONFIG_IP6_NF_QUEUE=m |
| 498 | CONFIG_IP6_NF_IPTABLES=m | 548 | CONFIG_IP6_NF_IPTABLES=m |
| 499 | CONFIG_IP6_NF_MATCH_RT=m | 549 | CONFIG_IP6_NF_MATCH_AH=m |
| 500 | CONFIG_IP6_NF_MATCH_OPTS=m | 550 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 501 | CONFIG_IP6_NF_MATCH_FRAG=m | 551 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 552 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 502 | CONFIG_IP6_NF_MATCH_HL=m | 553 | CONFIG_IP6_NF_MATCH_HL=m |
| 503 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
| 504 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 554 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 505 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 506 | CONFIG_IP6_NF_MATCH_MH=m | 555 | CONFIG_IP6_NF_MATCH_MH=m |
| 507 | CONFIG_IP6_NF_MATCH_EUI64=m | 556 | CONFIG_IP6_NF_MATCH_RT=m |
| 508 | CONFIG_IP6_NF_FILTER=m | ||
| 509 | CONFIG_IP6_NF_TARGET_LOG=m | 557 | CONFIG_IP6_NF_TARGET_LOG=m |
| 558 | CONFIG_IP6_NF_FILTER=m | ||
| 510 | CONFIG_IP6_NF_TARGET_REJECT=m | 559 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 511 | CONFIG_IP6_NF_MANGLE=m | 560 | CONFIG_IP6_NF_MANGLE=m |
| 512 | CONFIG_IP6_NF_TARGET_HL=m | 561 | CONFIG_IP6_NF_TARGET_HL=m |
| 513 | CONFIG_IP6_NF_RAW=m | 562 | CONFIG_IP6_NF_RAW=m |
| 514 | |||
| 515 | # | ||
| 516 | # Bridge: Netfilter Configuration | ||
| 517 | # | ||
| 518 | CONFIG_BRIDGE_NF_EBTABLES=m | 563 | CONFIG_BRIDGE_NF_EBTABLES=m |
| 519 | CONFIG_BRIDGE_EBT_BROUTE=m | 564 | CONFIG_BRIDGE_EBT_BROUTE=m |
| 520 | CONFIG_BRIDGE_EBT_T_FILTER=m | 565 | CONFIG_BRIDGE_EBT_T_FILTER=m |
| @@ -523,6 +568,7 @@ CONFIG_BRIDGE_EBT_802_3=m | |||
| 523 | CONFIG_BRIDGE_EBT_AMONG=m | 568 | CONFIG_BRIDGE_EBT_AMONG=m |
| 524 | CONFIG_BRIDGE_EBT_ARP=m | 569 | CONFIG_BRIDGE_EBT_ARP=m |
| 525 | CONFIG_BRIDGE_EBT_IP=m | 570 | CONFIG_BRIDGE_EBT_IP=m |
| 571 | CONFIG_BRIDGE_EBT_IP6=m | ||
| 526 | CONFIG_BRIDGE_EBT_LIMIT=m | 572 | CONFIG_BRIDGE_EBT_LIMIT=m |
| 527 | CONFIG_BRIDGE_EBT_MARK=m | 573 | CONFIG_BRIDGE_EBT_MARK=m |
| 528 | CONFIG_BRIDGE_EBT_PKTTYPE=m | 574 | CONFIG_BRIDGE_EBT_PKTTYPE=m |
| @@ -535,6 +581,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m | |||
| 535 | CONFIG_BRIDGE_EBT_SNAT=m | 581 | CONFIG_BRIDGE_EBT_SNAT=m |
| 536 | CONFIG_BRIDGE_EBT_LOG=m | 582 | CONFIG_BRIDGE_EBT_LOG=m |
| 537 | CONFIG_BRIDGE_EBT_ULOG=m | 583 | CONFIG_BRIDGE_EBT_ULOG=m |
| 584 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
| 538 | # CONFIG_IP_DCCP is not set | 585 | # CONFIG_IP_DCCP is not set |
| 539 | CONFIG_IP_SCTP=m | 586 | CONFIG_IP_SCTP=m |
| 540 | # CONFIG_SCTP_DBG_MSG is not set | 587 | # CONFIG_SCTP_DBG_MSG is not set |
| @@ -544,8 +591,12 @@ CONFIG_IP_SCTP=m | |||
| 544 | CONFIG_SCTP_HMAC_MD5=y | 591 | CONFIG_SCTP_HMAC_MD5=y |
| 545 | # CONFIG_TIPC is not set | 592 | # CONFIG_TIPC is not set |
| 546 | # CONFIG_ATM is not set | 593 | # CONFIG_ATM is not set |
| 594 | CONFIG_STP=m | ||
| 595 | CONFIG_GARP=m | ||
| 547 | CONFIG_BRIDGE=m | 596 | CONFIG_BRIDGE=m |
| 597 | # CONFIG_NET_DSA is not set | ||
| 548 | CONFIG_VLAN_8021Q=m | 598 | CONFIG_VLAN_8021Q=m |
| 599 | CONFIG_VLAN_8021Q_GVRP=y | ||
| 549 | # CONFIG_DECNET is not set | 600 | # CONFIG_DECNET is not set |
| 550 | CONFIG_LLC=m | 601 | CONFIG_LLC=m |
| 551 | # CONFIG_LLC2 is not set | 602 | # CONFIG_LLC2 is not set |
| @@ -559,12 +610,7 @@ CONFIG_IPDDP_DECAP=y | |||
| 559 | # CONFIG_LAPB is not set | 610 | # CONFIG_LAPB is not set |
| 560 | # CONFIG_ECONET is not set | 611 | # CONFIG_ECONET is not set |
| 561 | # CONFIG_WAN_ROUTER is not set | 612 | # CONFIG_WAN_ROUTER is not set |
| 562 | |||
| 563 | # | ||
| 564 | # QoS and/or fair queueing | ||
| 565 | # | ||
| 566 | CONFIG_NET_SCHED=y | 613 | CONFIG_NET_SCHED=y |
| 567 | CONFIG_NET_SCH_FIFO=y | ||
| 568 | 614 | ||
| 569 | # | 615 | # |
| 570 | # Queueing/Scheduling | 616 | # Queueing/Scheduling |
| @@ -573,7 +619,7 @@ CONFIG_NET_SCH_CBQ=m | |||
| 573 | CONFIG_NET_SCH_HTB=m | 619 | CONFIG_NET_SCH_HTB=m |
| 574 | CONFIG_NET_SCH_HFSC=m | 620 | CONFIG_NET_SCH_HFSC=m |
| 575 | CONFIG_NET_SCH_PRIO=m | 621 | CONFIG_NET_SCH_PRIO=m |
| 576 | CONFIG_NET_SCH_RR=m | 622 | # CONFIG_NET_SCH_MULTIQ is not set |
| 577 | CONFIG_NET_SCH_RED=m | 623 | CONFIG_NET_SCH_RED=m |
| 578 | CONFIG_NET_SCH_SFQ=m | 624 | CONFIG_NET_SCH_SFQ=m |
| 579 | CONFIG_NET_SCH_TEQL=m | 625 | CONFIG_NET_SCH_TEQL=m |
| @@ -597,6 +643,7 @@ CONFIG_NET_CLS_U32=m | |||
| 597 | # CONFIG_CLS_U32_MARK is not set | 643 | # CONFIG_CLS_U32_MARK is not set |
| 598 | CONFIG_NET_CLS_RSVP=m | 644 | CONFIG_NET_CLS_RSVP=m |
| 599 | CONFIG_NET_CLS_RSVP6=m | 645 | CONFIG_NET_CLS_RSVP6=m |
| 646 | CONFIG_NET_CLS_FLOW=m | ||
| 600 | # CONFIG_NET_EMATCH is not set | 647 | # CONFIG_NET_EMATCH is not set |
| 601 | CONFIG_NET_CLS_ACT=y | 648 | CONFIG_NET_CLS_ACT=y |
| 602 | CONFIG_NET_ACT_POLICE=y | 649 | CONFIG_NET_ACT_POLICE=y |
| @@ -604,37 +651,51 @@ CONFIG_NET_ACT_GACT=m | |||
| 604 | CONFIG_GACT_PROB=y | 651 | CONFIG_GACT_PROB=y |
| 605 | CONFIG_NET_ACT_MIRRED=m | 652 | CONFIG_NET_ACT_MIRRED=m |
| 606 | CONFIG_NET_ACT_IPT=m | 653 | CONFIG_NET_ACT_IPT=m |
| 654 | CONFIG_NET_ACT_NAT=m | ||
| 607 | CONFIG_NET_ACT_PEDIT=m | 655 | CONFIG_NET_ACT_PEDIT=m |
| 608 | CONFIG_NET_ACT_SIMP=m | 656 | CONFIG_NET_ACT_SIMP=m |
| 609 | CONFIG_NET_CLS_POLICE=y | 657 | CONFIG_NET_ACT_SKBEDIT=m |
| 610 | CONFIG_NET_CLS_IND=y | 658 | CONFIG_NET_CLS_IND=y |
| 659 | CONFIG_NET_SCH_FIFO=y | ||
| 611 | 660 | ||
| 612 | # | 661 | # |
| 613 | # Network testing | 662 | # Network testing |
| 614 | # | 663 | # |
| 615 | # CONFIG_NET_PKTGEN is not set | 664 | # CONFIG_NET_PKTGEN is not set |
| 616 | # CONFIG_HAMRADIO is not set | 665 | # CONFIG_HAMRADIO is not set |
| 666 | # CONFIG_CAN is not set | ||
| 617 | # CONFIG_IRDA is not set | 667 | # CONFIG_IRDA is not set |
| 618 | # CONFIG_BT is not set | 668 | # CONFIG_BT is not set |
| 619 | # CONFIG_AF_RXRPC is not set | 669 | # CONFIG_AF_RXRPC is not set |
| 670 | CONFIG_PHONET=m | ||
| 620 | CONFIG_FIB_RULES=y | 671 | CONFIG_FIB_RULES=y |
| 621 | 672 | CONFIG_WIRELESS=y | |
| 622 | # | ||
| 623 | # Wireless | ||
| 624 | # | ||
| 625 | CONFIG_CFG80211=m | 673 | CONFIG_CFG80211=m |
| 674 | CONFIG_NL80211=y | ||
| 675 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 626 | CONFIG_WIRELESS_EXT=y | 676 | CONFIG_WIRELESS_EXT=y |
| 677 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 627 | CONFIG_MAC80211=m | 678 | CONFIG_MAC80211=m |
| 628 | # CONFIG_MAC80211_DEBUG is not set | 679 | |
| 680 | # | ||
| 681 | # Rate control algorithm selection | ||
| 682 | # | ||
| 683 | CONFIG_MAC80211_RC_PID=y | ||
| 684 | CONFIG_MAC80211_RC_MINSTREL=y | ||
| 685 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 686 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | ||
| 687 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 688 | CONFIG_MAC80211_MESH=y | ||
| 689 | CONFIG_MAC80211_LEDS=y | ||
| 690 | # CONFIG_MAC80211_DEBUG_MENU is not set | ||
| 629 | CONFIG_IEEE80211=m | 691 | CONFIG_IEEE80211=m |
| 630 | # CONFIG_IEEE80211_DEBUG is not set | 692 | # CONFIG_IEEE80211_DEBUG is not set |
| 631 | CONFIG_IEEE80211_CRYPT_WEP=m | 693 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 632 | CONFIG_IEEE80211_CRYPT_CCMP=m | 694 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 633 | CONFIG_IEEE80211_CRYPT_TKIP=m | 695 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 634 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 635 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 636 | CONFIG_RFKILL=m | 696 | CONFIG_RFKILL=m |
| 637 | CONFIG_RFKILL_INPUT=m | 697 | CONFIG_RFKILL_INPUT=m |
| 698 | CONFIG_RFKILL_LEDS=y | ||
| 638 | # CONFIG_NET_9P is not set | 699 | # CONFIG_NET_9P is not set |
| 639 | 700 | ||
| 640 | # | 701 | # |
| @@ -644,9 +705,12 @@ CONFIG_RFKILL_INPUT=m | |||
| 644 | # | 705 | # |
| 645 | # Generic Driver Options | 706 | # Generic Driver Options |
| 646 | # | 707 | # |
| 708 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 647 | CONFIG_STANDALONE=y | 709 | CONFIG_STANDALONE=y |
| 648 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 710 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 649 | CONFIG_FW_LOADER=y | 711 | CONFIG_FW_LOADER=y |
| 712 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 713 | CONFIG_EXTRA_FIRMWARE="" | ||
| 650 | # CONFIG_SYS_HYPERVISOR is not set | 714 | # CONFIG_SYS_HYPERVISOR is not set |
| 651 | CONFIG_CONNECTOR=m | 715 | CONFIG_CONNECTOR=m |
| 652 | CONFIG_MTD=y | 716 | CONFIG_MTD=y |
| @@ -655,6 +719,7 @@ CONFIG_MTD=y | |||
| 655 | CONFIG_MTD_PARTITIONS=y | 719 | CONFIG_MTD_PARTITIONS=y |
| 656 | # CONFIG_MTD_REDBOOT_PARTS is not set | 720 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 657 | # CONFIG_MTD_CMDLINE_PARTS is not set | 721 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 722 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 658 | 723 | ||
| 659 | # | 724 | # |
| 660 | # User Modules And Translation Layers | 725 | # User Modules And Translation Layers |
| @@ -667,6 +732,7 @@ CONFIG_MTD_BLOCK=y | |||
| 667 | # CONFIG_INFTL is not set | 732 | # CONFIG_INFTL is not set |
| 668 | # CONFIG_RFD_FTL is not set | 733 | # CONFIG_RFD_FTL is not set |
| 669 | # CONFIG_SSFDC is not set | 734 | # CONFIG_SSFDC is not set |
| 735 | CONFIG_MTD_OOPS=m | ||
| 670 | 736 | ||
| 671 | # | 737 | # |
| 672 | # RAM/ROM/Flash chip drivers | 738 | # RAM/ROM/Flash chip drivers |
| @@ -701,6 +767,7 @@ CONFIG_MTD_PHYSMAP=y | |||
| 701 | CONFIG_MTD_PHYSMAP_START=0x0 | 767 | CONFIG_MTD_PHYSMAP_START=0x0 |
| 702 | CONFIG_MTD_PHYSMAP_LEN=0x0 | 768 | CONFIG_MTD_PHYSMAP_LEN=0x0 |
| 703 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | 769 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 |
| 770 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 704 | # CONFIG_MTD_PLATRAM is not set | 771 | # CONFIG_MTD_PLATRAM is not set |
| 705 | 772 | ||
| 706 | # | 773 | # |
| @@ -748,25 +815,26 @@ CONFIG_BLK_DEV_NBD=m | |||
| 748 | CONFIG_BLK_DEV_RAM=y | 815 | CONFIG_BLK_DEV_RAM=y |
| 749 | CONFIG_BLK_DEV_RAM_COUNT=16 | 816 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 750 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 817 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 751 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 818 | # CONFIG_BLK_DEV_XIP is not set |
| 752 | CONFIG_CDROM_PKTCDVD=m | 819 | CONFIG_CDROM_PKTCDVD=m |
| 753 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 820 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 754 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 821 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 755 | CONFIG_ATA_OVER_ETH=m | 822 | CONFIG_ATA_OVER_ETH=m |
| 823 | # CONFIG_BLK_DEV_HD is not set | ||
| 756 | # CONFIG_MISC_DEVICES is not set | 824 | # CONFIG_MISC_DEVICES is not set |
| 825 | CONFIG_HAVE_IDE=y | ||
| 757 | CONFIG_IDE=y | 826 | CONFIG_IDE=y |
| 758 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 759 | CONFIG_BLK_DEV_IDE=y | ||
| 760 | 827 | ||
| 761 | # | 828 | # |
| 762 | # Please see Documentation/ide.txt for help/info on IDE drives | 829 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 763 | # | 830 | # |
| 764 | # CONFIG_BLK_DEV_IDE_SATA is not set | 831 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 765 | CONFIG_BLK_DEV_IDEDISK=y | 832 | CONFIG_IDE_GD=y |
| 766 | # CONFIG_IDEDISK_MULTI_MODE is not set | 833 | CONFIG_IDE_GD_ATA=y |
| 834 | # CONFIG_IDE_GD_ATAPI is not set | ||
| 767 | CONFIG_BLK_DEV_IDECD=y | 835 | CONFIG_BLK_DEV_IDECD=y |
| 836 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 768 | # CONFIG_BLK_DEV_IDETAPE is not set | 837 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 769 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 770 | # CONFIG_BLK_DEV_IDESCSI is not set | 838 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 771 | # CONFIG_IDE_TASK_IOCTL is not set | 839 | # CONFIG_IDE_TASK_IOCTL is not set |
| 772 | CONFIG_IDE_PROC_FS=y | 840 | CONFIG_IDE_PROC_FS=y |
| @@ -775,24 +843,25 @@ CONFIG_IDE_PROC_FS=y | |||
| 775 | # IDE chipset support/bugfixes | 843 | # IDE chipset support/bugfixes |
| 776 | # | 844 | # |
| 777 | CONFIG_IDE_GENERIC=y | 845 | CONFIG_IDE_GENERIC=y |
| 846 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
| 847 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
| 848 | |||
| 849 | # | ||
| 850 | # PCI IDE chipsets support | ||
| 851 | # | ||
| 778 | CONFIG_BLK_DEV_IDEPCI=y | 852 | CONFIG_BLK_DEV_IDEPCI=y |
| 779 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
| 780 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 853 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
| 781 | # CONFIG_BLK_DEV_OFFBOARD is not set | 854 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 782 | CONFIG_BLK_DEV_GENERIC=y | 855 | CONFIG_BLK_DEV_GENERIC=y |
| 783 | # CONFIG_BLK_DEV_OPTI621 is not set | 856 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 784 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 857 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 785 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 786 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 787 | # CONFIG_BLK_DEV_AEC62XX is not set | 858 | # CONFIG_BLK_DEV_AEC62XX is not set |
| 788 | # CONFIG_BLK_DEV_ALI15X3 is not set | 859 | # CONFIG_BLK_DEV_ALI15X3 is not set |
| 789 | # CONFIG_BLK_DEV_AMD74XX is not set | 860 | # CONFIG_BLK_DEV_AMD74XX is not set |
| 790 | # CONFIG_BLK_DEV_CMD64X is not set | 861 | # CONFIG_BLK_DEV_CMD64X is not set |
| 791 | # CONFIG_BLK_DEV_TRIFLEX is not set | 862 | # CONFIG_BLK_DEV_TRIFLEX is not set |
| 792 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 793 | # CONFIG_BLK_DEV_CS5520 is not set | 863 | # CONFIG_BLK_DEV_CS5520 is not set |
| 794 | # CONFIG_BLK_DEV_CS5530 is not set | 864 | # CONFIG_BLK_DEV_CS5530 is not set |
| 795 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 796 | # CONFIG_BLK_DEV_HPT366 is not set | 865 | # CONFIG_BLK_DEV_HPT366 is not set |
| 797 | # CONFIG_BLK_DEV_JMICRON is not set | 866 | # CONFIG_BLK_DEV_JMICRON is not set |
| 798 | # CONFIG_BLK_DEV_SC1200 is not set | 867 | # CONFIG_BLK_DEV_SC1200 is not set |
| @@ -808,10 +877,7 @@ CONFIG_BLK_DEV_IT8213=m | |||
| 808 | # CONFIG_BLK_DEV_TRM290 is not set | 877 | # CONFIG_BLK_DEV_TRM290 is not set |
| 809 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 878 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 810 | CONFIG_BLK_DEV_TC86C001=m | 879 | CONFIG_BLK_DEV_TC86C001=m |
| 811 | # CONFIG_IDE_ARM is not set | ||
| 812 | CONFIG_BLK_DEV_IDEDMA=y | 880 | CONFIG_BLK_DEV_IDEDMA=y |
| 813 | # CONFIG_IDEDMA_IVB is not set | ||
| 814 | # CONFIG_BLK_DEV_HD is not set | ||
| 815 | 881 | ||
| 816 | # | 882 | # |
| 817 | # SCSI device support | 883 | # SCSI device support |
| @@ -848,8 +914,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 848 | # | 914 | # |
| 849 | CONFIG_SCSI_SPI_ATTRS=m | 915 | CONFIG_SCSI_SPI_ATTRS=m |
| 850 | CONFIG_SCSI_FC_ATTRS=m | 916 | CONFIG_SCSI_FC_ATTRS=m |
| 917 | # CONFIG_SCSI_FC_TGT_ATTRS is not set | ||
| 851 | CONFIG_SCSI_ISCSI_ATTRS=m | 918 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 852 | # CONFIG_SCSI_SAS_LIBSAS is not set | 919 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 920 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 853 | CONFIG_SCSI_LOWLEVEL=y | 921 | CONFIG_SCSI_LOWLEVEL=y |
| 854 | CONFIG_ISCSI_TCP=m | 922 | CONFIG_ISCSI_TCP=m |
| 855 | CONFIG_BLK_DEV_3W_XXXX_RAID=m | 923 | CONFIG_BLK_DEV_3W_XXXX_RAID=m |
| @@ -866,6 +934,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
| 866 | # CONFIG_SCSI_AIC79XX is not set | 934 | # CONFIG_SCSI_AIC79XX is not set |
| 867 | # CONFIG_SCSI_AIC94XX is not set | 935 | # CONFIG_SCSI_AIC94XX is not set |
| 868 | # CONFIG_SCSI_DPT_I2O is not set | 936 | # CONFIG_SCSI_DPT_I2O is not set |
| 937 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 869 | # CONFIG_SCSI_ARCMSR is not set | 938 | # CONFIG_SCSI_ARCMSR is not set |
| 870 | # CONFIG_MEGARAID_NEWGEN is not set | 939 | # CONFIG_MEGARAID_NEWGEN is not set |
| 871 | # CONFIG_MEGARAID_LEGACY is not set | 940 | # CONFIG_MEGARAID_LEGACY is not set |
| @@ -876,6 +945,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
| 876 | # CONFIG_SCSI_IPS is not set | 945 | # CONFIG_SCSI_IPS is not set |
| 877 | # CONFIG_SCSI_INITIO is not set | 946 | # CONFIG_SCSI_INITIO is not set |
| 878 | # CONFIG_SCSI_INIA100 is not set | 947 | # CONFIG_SCSI_INIA100 is not set |
| 948 | # CONFIG_SCSI_MVSAS is not set | ||
| 879 | # CONFIG_SCSI_STEX is not set | 949 | # CONFIG_SCSI_STEX is not set |
| 880 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 950 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 881 | # CONFIG_SCSI_QLOGIC_1280 is not set | 951 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| @@ -887,6 +957,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
| 887 | # CONFIG_SCSI_NSP32 is not set | 957 | # CONFIG_SCSI_NSP32 is not set |
| 888 | # CONFIG_SCSI_DEBUG is not set | 958 | # CONFIG_SCSI_DEBUG is not set |
| 889 | # CONFIG_SCSI_SRP is not set | 959 | # CONFIG_SCSI_SRP is not set |
| 960 | # CONFIG_SCSI_DH is not set | ||
| 890 | # CONFIG_ATA is not set | 961 | # CONFIG_ATA is not set |
| 891 | CONFIG_MD=y | 962 | CONFIG_MD=y |
| 892 | CONFIG_BLK_DEV_MD=m | 963 | CONFIG_BLK_DEV_MD=m |
| @@ -905,32 +976,28 @@ CONFIG_DM_SNAPSHOT=m | |||
| 905 | CONFIG_DM_MIRROR=m | 976 | CONFIG_DM_MIRROR=m |
| 906 | CONFIG_DM_ZERO=m | 977 | CONFIG_DM_ZERO=m |
| 907 | CONFIG_DM_MULTIPATH=m | 978 | CONFIG_DM_MULTIPATH=m |
| 908 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 909 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 910 | # CONFIG_DM_DELAY is not set | 979 | # CONFIG_DM_DELAY is not set |
| 980 | # CONFIG_DM_UEVENT is not set | ||
| 981 | # CONFIG_FUSION is not set | ||
| 911 | 982 | ||
| 912 | # | 983 | # |
| 913 | # Fusion MPT device support | 984 | # IEEE 1394 (FireWire) support |
| 914 | # | 985 | # |
| 915 | # CONFIG_FUSION is not set | ||
| 916 | # CONFIG_FUSION_SPI is not set | ||
| 917 | # CONFIG_FUSION_FC is not set | ||
| 918 | # CONFIG_FUSION_SAS is not set | ||
| 919 | 986 | ||
| 920 | # | 987 | # |
| 921 | # IEEE 1394 (FireWire) support | 988 | # Enable only one of the two stacks, unless you know what you are doing |
| 922 | # | 989 | # |
| 923 | # CONFIG_FIREWIRE is not set | 990 | # CONFIG_FIREWIRE is not set |
| 924 | # CONFIG_IEEE1394 is not set | 991 | # CONFIG_IEEE1394 is not set |
| 925 | # CONFIG_I2O is not set | 992 | # CONFIG_I2O is not set |
| 926 | CONFIG_NETDEVICES=y | 993 | CONFIG_NETDEVICES=y |
| 927 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
| 928 | CONFIG_IFB=m | 994 | CONFIG_IFB=m |
| 929 | CONFIG_DUMMY=m | 995 | CONFIG_DUMMY=m |
| 930 | CONFIG_BONDING=m | 996 | CONFIG_BONDING=m |
| 931 | CONFIG_MACVLAN=m | 997 | CONFIG_MACVLAN=m |
| 932 | CONFIG_EQUALIZER=m | 998 | CONFIG_EQUALIZER=m |
| 933 | CONFIG_TUN=m | 999 | CONFIG_TUN=m |
| 1000 | CONFIG_VETH=m | ||
| 934 | # CONFIG_ARCNET is not set | 1001 | # CONFIG_ARCNET is not set |
| 935 | CONFIG_PHYLIB=m | 1002 | CONFIG_PHYLIB=m |
| 936 | 1003 | ||
| @@ -946,26 +1013,34 @@ CONFIG_VITESSE_PHY=m | |||
| 946 | CONFIG_SMSC_PHY=m | 1013 | CONFIG_SMSC_PHY=m |
| 947 | CONFIG_BROADCOM_PHY=m | 1014 | CONFIG_BROADCOM_PHY=m |
| 948 | CONFIG_ICPLUS_PHY=m | 1015 | CONFIG_ICPLUS_PHY=m |
| 949 | # CONFIG_FIXED_PHY is not set | 1016 | CONFIG_REALTEK_PHY=m |
| 1017 | CONFIG_MDIO_BITBANG=m | ||
| 950 | CONFIG_NET_ETHERNET=y | 1018 | CONFIG_NET_ETHERNET=y |
| 951 | CONFIG_MII=y | 1019 | CONFIG_MII=y |
| 952 | CONFIG_AX88796=m | 1020 | CONFIG_AX88796=m |
| 1021 | # CONFIG_AX88796_93CX6 is not set | ||
| 953 | # CONFIG_HAPPYMEAL is not set | 1022 | # CONFIG_HAPPYMEAL is not set |
| 954 | # CONFIG_SUNGEM is not set | 1023 | # CONFIG_SUNGEM is not set |
| 955 | # CONFIG_CASSINI is not set | 1024 | # CONFIG_CASSINI is not set |
| 956 | # CONFIG_NET_VENDOR_3COM is not set | 1025 | # CONFIG_NET_VENDOR_3COM is not set |
| 1026 | # CONFIG_SMC91X is not set | ||
| 957 | # CONFIG_DM9000 is not set | 1027 | # CONFIG_DM9000 is not set |
| 958 | # CONFIG_NET_TULIP is not set | 1028 | # CONFIG_NET_TULIP is not set |
| 959 | # CONFIG_HP100 is not set | 1029 | # CONFIG_HP100 is not set |
| 1030 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 1031 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 1032 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 1033 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 1034 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 1035 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 1036 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 960 | CONFIG_NET_PCI=y | 1037 | CONFIG_NET_PCI=y |
| 961 | CONFIG_PCNET32=y | 1038 | CONFIG_PCNET32=y |
| 962 | # CONFIG_PCNET32_NAPI is not set | ||
| 963 | # CONFIG_AMD8111_ETH is not set | 1039 | # CONFIG_AMD8111_ETH is not set |
| 964 | # CONFIG_ADAPTEC_STARFIRE is not set | 1040 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 965 | # CONFIG_B44 is not set | 1041 | # CONFIG_B44 is not set |
| 966 | # CONFIG_FORCEDETH is not set | 1042 | # CONFIG_FORCEDETH is not set |
| 967 | CONFIG_TC35815=m | 1043 | CONFIG_TC35815=m |
| 968 | # CONFIG_DGRS is not set | ||
| 969 | # CONFIG_EEPRO100 is not set | 1044 | # CONFIG_EEPRO100 is not set |
| 970 | # CONFIG_E100 is not set | 1045 | # CONFIG_E100 is not set |
| 971 | # CONFIG_FEALNX is not set | 1046 | # CONFIG_FEALNX is not set |
| @@ -973,16 +1048,21 @@ CONFIG_TC35815=m | |||
| 973 | # CONFIG_NE2K_PCI is not set | 1048 | # CONFIG_NE2K_PCI is not set |
| 974 | # CONFIG_8139CP is not set | 1049 | # CONFIG_8139CP is not set |
| 975 | # CONFIG_8139TOO is not set | 1050 | # CONFIG_8139TOO is not set |
| 1051 | # CONFIG_R6040 is not set | ||
| 976 | # CONFIG_SIS900 is not set | 1052 | # CONFIG_SIS900 is not set |
| 977 | # CONFIG_EPIC100 is not set | 1053 | # CONFIG_EPIC100 is not set |
| 978 | # CONFIG_SUNDANCE is not set | 1054 | # CONFIG_SUNDANCE is not set |
| 979 | # CONFIG_TLAN is not set | 1055 | # CONFIG_TLAN is not set |
| 980 | # CONFIG_VIA_RHINE is not set | 1056 | # CONFIG_VIA_RHINE is not set |
| 981 | # CONFIG_SC92031 is not set | 1057 | # CONFIG_SC92031 is not set |
| 1058 | # CONFIG_ATL2 is not set | ||
| 982 | CONFIG_NETDEV_1000=y | 1059 | CONFIG_NETDEV_1000=y |
| 983 | # CONFIG_ACENIC is not set | 1060 | # CONFIG_ACENIC is not set |
| 984 | # CONFIG_DL2K is not set | 1061 | # CONFIG_DL2K is not set |
| 985 | # CONFIG_E1000 is not set | 1062 | # CONFIG_E1000 is not set |
| 1063 | # CONFIG_E1000E is not set | ||
| 1064 | # CONFIG_IP1000 is not set | ||
| 1065 | # CONFIG_IGB is not set | ||
| 986 | # CONFIG_NS83820 is not set | 1066 | # CONFIG_NS83820 is not set |
| 987 | # CONFIG_HAMACHI is not set | 1067 | # CONFIG_HAMACHI is not set |
| 988 | # CONFIG_YELLOWFIN is not set | 1068 | # CONFIG_YELLOWFIN is not set |
| @@ -995,14 +1075,24 @@ CONFIG_NETDEV_1000=y | |||
| 995 | # CONFIG_BNX2 is not set | 1075 | # CONFIG_BNX2 is not set |
| 996 | # CONFIG_QLA3XXX is not set | 1076 | # CONFIG_QLA3XXX is not set |
| 997 | # CONFIG_ATL1 is not set | 1077 | # CONFIG_ATL1 is not set |
| 1078 | # CONFIG_ATL1E is not set | ||
| 1079 | # CONFIG_JME is not set | ||
| 998 | CONFIG_NETDEV_10000=y | 1080 | CONFIG_NETDEV_10000=y |
| 999 | # CONFIG_CHELSIO_T1 is not set | 1081 | # CONFIG_CHELSIO_T1 is not set |
| 1000 | CONFIG_CHELSIO_T3=m | 1082 | CONFIG_CHELSIO_T3=m |
| 1083 | # CONFIG_ENIC is not set | ||
| 1084 | # CONFIG_IXGBE is not set | ||
| 1001 | # CONFIG_IXGB is not set | 1085 | # CONFIG_IXGB is not set |
| 1002 | # CONFIG_S2IO is not set | 1086 | # CONFIG_S2IO is not set |
| 1003 | # CONFIG_MYRI10GE is not set | 1087 | # CONFIG_MYRI10GE is not set |
| 1004 | CONFIG_NETXEN_NIC=m | 1088 | CONFIG_NETXEN_NIC=m |
| 1089 | # CONFIG_NIU is not set | ||
| 1090 | # CONFIG_MLX4_EN is not set | ||
| 1005 | # CONFIG_MLX4_CORE is not set | 1091 | # CONFIG_MLX4_CORE is not set |
| 1092 | # CONFIG_TEHUTI is not set | ||
| 1093 | # CONFIG_BNX2X is not set | ||
| 1094 | # CONFIG_QLGE is not set | ||
| 1095 | # CONFIG_SFC is not set | ||
| 1006 | # CONFIG_TR is not set | 1096 | # CONFIG_TR is not set |
| 1007 | 1097 | ||
| 1008 | # | 1098 | # |
| @@ -1022,6 +1112,7 @@ CONFIG_IPW2200_QOS=y | |||
| 1022 | # CONFIG_IPW2200_DEBUG is not set | 1112 | # CONFIG_IPW2200_DEBUG is not set |
| 1023 | CONFIG_LIBERTAS=m | 1113 | CONFIG_LIBERTAS=m |
| 1024 | # CONFIG_LIBERTAS_DEBUG is not set | 1114 | # CONFIG_LIBERTAS_DEBUG is not set |
| 1115 | # CONFIG_LIBERTAS_THINFIRM is not set | ||
| 1025 | CONFIG_HERMES=m | 1116 | CONFIG_HERMES=m |
| 1026 | CONFIG_PLX_HERMES=m | 1117 | CONFIG_PLX_HERMES=m |
| 1027 | CONFIG_TMD_HERMES=m | 1118 | CONFIG_TMD_HERMES=m |
| @@ -1030,25 +1121,30 @@ CONFIG_PCI_HERMES=m | |||
| 1030 | CONFIG_ATMEL=m | 1121 | CONFIG_ATMEL=m |
| 1031 | CONFIG_PCI_ATMEL=m | 1122 | CONFIG_PCI_ATMEL=m |
| 1032 | CONFIG_PRISM54=m | 1123 | CONFIG_PRISM54=m |
| 1124 | # CONFIG_RTL8180 is not set | ||
| 1125 | # CONFIG_ADM8211 is not set | ||
| 1126 | # CONFIG_MAC80211_HWSIM is not set | ||
| 1127 | # CONFIG_P54_COMMON is not set | ||
| 1128 | # CONFIG_ATH5K is not set | ||
| 1129 | # CONFIG_ATH9K is not set | ||
| 1130 | # CONFIG_IWLCORE is not set | ||
| 1131 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 1132 | # CONFIG_IWLAGN is not set | ||
| 1133 | # CONFIG_IWL3945 is not set | ||
| 1033 | CONFIG_HOSTAP=m | 1134 | CONFIG_HOSTAP=m |
| 1034 | CONFIG_HOSTAP_FIRMWARE=y | 1135 | CONFIG_HOSTAP_FIRMWARE=y |
| 1035 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y | 1136 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y |
| 1036 | CONFIG_HOSTAP_PLX=m | 1137 | CONFIG_HOSTAP_PLX=m |
| 1037 | CONFIG_HOSTAP_PCI=m | 1138 | CONFIG_HOSTAP_PCI=m |
| 1038 | CONFIG_BCM43XX=m | 1139 | # CONFIG_B43 is not set |
| 1039 | CONFIG_BCM43XX_DEBUG=y | 1140 | # CONFIG_B43LEGACY is not set |
| 1040 | CONFIG_BCM43XX_DMA=y | 1141 | # CONFIG_RT2X00 is not set |
| 1041 | CONFIG_BCM43XX_PIO=y | ||
| 1042 | CONFIG_BCM43XX_DMA_AND_PIO_MODE=y | ||
| 1043 | # CONFIG_BCM43XX_DMA_MODE is not set | ||
| 1044 | # CONFIG_BCM43XX_PIO_MODE is not set | ||
| 1045 | # CONFIG_WAN is not set | 1142 | # CONFIG_WAN is not set |
| 1046 | # CONFIG_FDDI is not set | 1143 | # CONFIG_FDDI is not set |
| 1047 | # CONFIG_HIPPI is not set | 1144 | # CONFIG_HIPPI is not set |
| 1048 | # CONFIG_PPP is not set | 1145 | # CONFIG_PPP is not set |
| 1049 | # CONFIG_SLIP is not set | 1146 | # CONFIG_SLIP is not set |
| 1050 | # CONFIG_NET_FC is not set | 1147 | # CONFIG_NET_FC is not set |
| 1051 | # CONFIG_SHAPER is not set | ||
| 1052 | # CONFIG_NETCONSOLE is not set | 1148 | # CONFIG_NETCONSOLE is not set |
| 1053 | # CONFIG_NETPOLL is not set | 1149 | # CONFIG_NETPOLL is not set |
| 1054 | # CONFIG_NET_POLL_CONTROLLER is not set | 1150 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -1070,7 +1166,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 1070 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1166 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 1071 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1167 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 1072 | # CONFIG_INPUT_JOYDEV is not set | 1168 | # CONFIG_INPUT_JOYDEV is not set |
| 1073 | # CONFIG_INPUT_TSDEV is not set | ||
| 1074 | # CONFIG_INPUT_EVDEV is not set | 1169 | # CONFIG_INPUT_EVDEV is not set |
| 1075 | # CONFIG_INPUT_EVBUG is not set | 1170 | # CONFIG_INPUT_EVBUG is not set |
| 1076 | 1171 | ||
| @@ -1099,10 +1194,13 @@ CONFIG_SERIO_SERPORT=y | |||
| 1099 | # Character devices | 1194 | # Character devices |
| 1100 | # | 1195 | # |
| 1101 | CONFIG_VT=y | 1196 | CONFIG_VT=y |
| 1197 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 1102 | CONFIG_VT_CONSOLE=y | 1198 | CONFIG_VT_CONSOLE=y |
| 1103 | CONFIG_HW_CONSOLE=y | 1199 | CONFIG_HW_CONSOLE=y |
| 1104 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1200 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 1201 | CONFIG_DEVKMEM=y | ||
| 1105 | # CONFIG_SERIAL_NONSTANDARD is not set | 1202 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 1203 | # CONFIG_NOZOMI is not set | ||
| 1106 | 1204 | ||
| 1107 | # | 1205 | # |
| 1108 | # Serial drivers | 1206 | # Serial drivers |
| @@ -1124,101 +1222,165 @@ CONFIG_UNIX98_PTYS=y | |||
| 1124 | CONFIG_LEGACY_PTYS=y | 1222 | CONFIG_LEGACY_PTYS=y |
| 1125 | CONFIG_LEGACY_PTY_COUNT=256 | 1223 | CONFIG_LEGACY_PTY_COUNT=256 |
| 1126 | # CONFIG_IPMI_HANDLER is not set | 1224 | # CONFIG_IPMI_HANDLER is not set |
| 1127 | # CONFIG_WATCHDOG is not set | ||
| 1128 | CONFIG_HW_RANDOM=m | 1225 | CONFIG_HW_RANDOM=m |
| 1129 | CONFIG_RTC=y | ||
| 1130 | # CONFIG_R3964 is not set | 1226 | # CONFIG_R3964 is not set |
| 1131 | # CONFIG_APPLICOM is not set | 1227 | # CONFIG_APPLICOM is not set |
| 1132 | # CONFIG_DRM is not set | ||
| 1133 | # CONFIG_RAW_DRIVER is not set | 1228 | # CONFIG_RAW_DRIVER is not set |
| 1134 | # CONFIG_TCG_TPM is not set | 1229 | # CONFIG_TCG_TPM is not set |
| 1135 | CONFIG_DEVPORT=y | 1230 | CONFIG_DEVPORT=y |
| 1136 | # CONFIG_I2C is not set | 1231 | # CONFIG_I2C is not set |
| 1137 | |||
| 1138 | # | ||
| 1139 | # SPI support | ||
| 1140 | # | ||
| 1141 | # CONFIG_SPI is not set | 1232 | # CONFIG_SPI is not set |
| 1142 | # CONFIG_SPI_MASTER is not set | ||
| 1143 | # CONFIG_W1 is not set | 1233 | # CONFIG_W1 is not set |
| 1144 | # CONFIG_POWER_SUPPLY is not set | 1234 | # CONFIG_POWER_SUPPLY is not set |
| 1145 | # CONFIG_HWMON is not set | 1235 | # CONFIG_HWMON is not set |
| 1236 | # CONFIG_THERMAL is not set | ||
| 1237 | # CONFIG_THERMAL_HWMON is not set | ||
| 1238 | # CONFIG_WATCHDOG is not set | ||
| 1239 | CONFIG_SSB_POSSIBLE=y | ||
| 1240 | |||
| 1241 | # | ||
| 1242 | # Sonics Silicon Backplane | ||
| 1243 | # | ||
| 1244 | # CONFIG_SSB is not set | ||
| 1146 | 1245 | ||
| 1147 | # | 1246 | # |
| 1148 | # Multifunction device drivers | 1247 | # Multifunction device drivers |
| 1149 | # | 1248 | # |
| 1249 | # CONFIG_MFD_CORE is not set | ||
| 1150 | # CONFIG_MFD_SM501 is not set | 1250 | # CONFIG_MFD_SM501 is not set |
| 1251 | # CONFIG_HTC_PASIC3 is not set | ||
| 1252 | # CONFIG_MFD_TMIO is not set | ||
| 1253 | # CONFIG_REGULATOR is not set | ||
| 1151 | 1254 | ||
| 1152 | # | 1255 | # |
| 1153 | # Multimedia devices | 1256 | # Multimedia devices |
| 1154 | # | 1257 | # |
| 1258 | |||
| 1259 | # | ||
| 1260 | # Multimedia core support | ||
| 1261 | # | ||
| 1155 | # CONFIG_VIDEO_DEV is not set | 1262 | # CONFIG_VIDEO_DEV is not set |
| 1156 | # CONFIG_DVB_CORE is not set | 1263 | # CONFIG_DVB_CORE is not set |
| 1264 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1265 | |||
| 1266 | # | ||
| 1267 | # Multimedia drivers | ||
| 1268 | # | ||
| 1157 | # CONFIG_DAB is not set | 1269 | # CONFIG_DAB is not set |
| 1158 | 1270 | ||
| 1159 | # | 1271 | # |
| 1160 | # Graphics support | 1272 | # Graphics support |
| 1161 | # | 1273 | # |
| 1274 | # CONFIG_DRM is not set | ||
| 1275 | # CONFIG_VGASTATE is not set | ||
| 1276 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1277 | # CONFIG_FB is not set | ||
| 1162 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1278 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 1163 | 1279 | ||
| 1164 | # | 1280 | # |
| 1165 | # Display device support | 1281 | # Display device support |
| 1166 | # | 1282 | # |
| 1167 | # CONFIG_DISPLAY_SUPPORT is not set | 1283 | # CONFIG_DISPLAY_SUPPORT is not set |
| 1168 | # CONFIG_VGASTATE is not set | ||
| 1169 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1170 | # CONFIG_FB is not set | ||
| 1171 | 1284 | ||
| 1172 | # | 1285 | # |
| 1173 | # Console display driver support | 1286 | # Console display driver support |
| 1174 | # | 1287 | # |
| 1175 | # CONFIG_VGA_CONSOLE is not set | 1288 | # CONFIG_VGA_CONSOLE is not set |
| 1176 | CONFIG_DUMMY_CONSOLE=y | 1289 | CONFIG_DUMMY_CONSOLE=y |
| 1177 | |||
| 1178 | # | ||
| 1179 | # Sound | ||
| 1180 | # | ||
| 1181 | # CONFIG_SOUND is not set | 1290 | # CONFIG_SOUND is not set |
| 1182 | CONFIG_HID_SUPPORT=y | 1291 | CONFIG_HID_SUPPORT=y |
| 1183 | CONFIG_HID=m | 1292 | CONFIG_HID=m |
| 1184 | # CONFIG_HID_DEBUG is not set | 1293 | # CONFIG_HID_DEBUG is not set |
| 1294 | # CONFIG_HIDRAW is not set | ||
| 1295 | # CONFIG_HID_PID is not set | ||
| 1296 | |||
| 1297 | # | ||
| 1298 | # Special HID drivers | ||
| 1299 | # | ||
| 1300 | CONFIG_HID_COMPAT=y | ||
| 1185 | CONFIG_USB_SUPPORT=y | 1301 | CONFIG_USB_SUPPORT=y |
| 1186 | CONFIG_USB_ARCH_HAS_HCD=y | 1302 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1187 | CONFIG_USB_ARCH_HAS_OHCI=y | 1303 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1188 | CONFIG_USB_ARCH_HAS_EHCI=y | 1304 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1189 | # CONFIG_USB is not set | 1305 | # CONFIG_USB is not set |
| 1306 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1307 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1190 | 1308 | ||
| 1191 | # | 1309 | # |
| 1192 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1310 | # Enable Host or Gadget support to see Inventra options |
| 1193 | # | 1311 | # |
| 1194 | 1312 | ||
| 1195 | # | 1313 | # |
| 1196 | # USB Gadget Support | 1314 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 1197 | # | 1315 | # |
| 1198 | # CONFIG_USB_GADGET is not set | 1316 | # CONFIG_USB_GADGET is not set |
| 1317 | # CONFIG_UWB is not set | ||
| 1199 | # CONFIG_MMC is not set | 1318 | # CONFIG_MMC is not set |
| 1200 | # CONFIG_NEW_LEDS is not set | 1319 | # CONFIG_MEMSTICK is not set |
| 1320 | CONFIG_NEW_LEDS=y | ||
| 1321 | CONFIG_LEDS_CLASS=m | ||
| 1322 | |||
| 1323 | # | ||
| 1324 | # LED drivers | ||
| 1325 | # | ||
| 1326 | |||
| 1327 | # | ||
| 1328 | # LED Triggers | ||
| 1329 | # | ||
| 1330 | CONFIG_LEDS_TRIGGERS=y | ||
| 1331 | CONFIG_LEDS_TRIGGER_TIMER=m | ||
| 1332 | CONFIG_LEDS_TRIGGER_IDE_DISK=y | ||
| 1333 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | ||
| 1334 | CONFIG_LEDS_TRIGGER_BACKLIGHT=m | ||
| 1335 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | ||
| 1336 | # CONFIG_ACCESSIBILITY is not set | ||
| 1201 | # CONFIG_INFINIBAND is not set | 1337 | # CONFIG_INFINIBAND is not set |
| 1202 | # CONFIG_RTC_CLASS is not set | 1338 | CONFIG_RTC_LIB=y |
| 1339 | CONFIG_RTC_CLASS=y | ||
| 1340 | CONFIG_RTC_HCTOSYS=y | ||
| 1341 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1342 | # CONFIG_RTC_DEBUG is not set | ||
| 1203 | 1343 | ||
| 1204 | # | 1344 | # |
| 1205 | # DMA Engine support | 1345 | # RTC interfaces |
| 1206 | # | 1346 | # |
| 1207 | # CONFIG_DMA_ENGINE is not set | 1347 | CONFIG_RTC_INTF_SYSFS=y |
| 1348 | CONFIG_RTC_INTF_PROC=y | ||
| 1349 | CONFIG_RTC_INTF_DEV=y | ||
| 1350 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1351 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1208 | 1352 | ||
| 1209 | # | 1353 | # |
| 1210 | # DMA Clients | 1354 | # SPI RTC drivers |
| 1211 | # | 1355 | # |
| 1212 | 1356 | ||
| 1213 | # | 1357 | # |
| 1214 | # DMA Devices | 1358 | # Platform RTC drivers |
| 1215 | # | 1359 | # |
| 1360 | CONFIG_RTC_DRV_CMOS=y | ||
| 1361 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1362 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1363 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1364 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1365 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1366 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1367 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1368 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1369 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1370 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1216 | 1371 | ||
| 1217 | # | 1372 | # |
| 1218 | # Userspace I/O | 1373 | # on-CPU RTC drivers |
| 1219 | # | 1374 | # |
| 1375 | # CONFIG_DMADEVICES is not set | ||
| 1220 | CONFIG_UIO=m | 1376 | CONFIG_UIO=m |
| 1221 | CONFIG_UIO_CIF=m | 1377 | CONFIG_UIO_CIF=m |
| 1378 | # CONFIG_UIO_PDRV is not set | ||
| 1379 | # CONFIG_UIO_PDRV_GENIRQ is not set | ||
| 1380 | # CONFIG_UIO_SMX is not set | ||
| 1381 | # CONFIG_UIO_SERCOS3 is not set | ||
| 1382 | # CONFIG_STAGING is not set | ||
| 1383 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1222 | 1384 | ||
| 1223 | # | 1385 | # |
| 1224 | # File systems | 1386 | # File systems |
| @@ -1230,9 +1392,8 @@ CONFIG_EXT3_FS=y | |||
| 1230 | CONFIG_EXT3_FS_XATTR=y | 1392 | CONFIG_EXT3_FS_XATTR=y |
| 1231 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1393 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1232 | # CONFIG_EXT3_FS_SECURITY is not set | 1394 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1233 | # CONFIG_EXT4DEV_FS is not set | 1395 | # CONFIG_EXT4_FS is not set |
| 1234 | CONFIG_JBD=y | 1396 | CONFIG_JBD=y |
| 1235 | # CONFIG_JBD_DEBUG is not set | ||
| 1236 | CONFIG_FS_MBCACHE=y | 1397 | CONFIG_FS_MBCACHE=y |
| 1237 | CONFIG_REISERFS_FS=m | 1398 | CONFIG_REISERFS_FS=m |
| 1238 | # CONFIG_REISERFS_CHECK is not set | 1399 | # CONFIG_REISERFS_CHECK is not set |
| @@ -1246,22 +1407,22 @@ CONFIG_JFS_SECURITY=y | |||
| 1246 | # CONFIG_JFS_DEBUG is not set | 1407 | # CONFIG_JFS_DEBUG is not set |
| 1247 | # CONFIG_JFS_STATISTICS is not set | 1408 | # CONFIG_JFS_STATISTICS is not set |
| 1248 | CONFIG_FS_POSIX_ACL=y | 1409 | CONFIG_FS_POSIX_ACL=y |
| 1410 | CONFIG_FILE_LOCKING=y | ||
| 1249 | CONFIG_XFS_FS=m | 1411 | CONFIG_XFS_FS=m |
| 1250 | CONFIG_XFS_QUOTA=y | 1412 | CONFIG_XFS_QUOTA=y |
| 1251 | CONFIG_XFS_SECURITY=y | ||
| 1252 | CONFIG_XFS_POSIX_ACL=y | 1413 | CONFIG_XFS_POSIX_ACL=y |
| 1253 | # CONFIG_XFS_RT is not set | 1414 | # CONFIG_XFS_RT is not set |
| 1254 | # CONFIG_GFS2_FS is not set | 1415 | # CONFIG_XFS_DEBUG is not set |
| 1255 | # CONFIG_OCFS2_FS is not set | 1416 | # CONFIG_OCFS2_FS is not set |
| 1256 | CONFIG_MINIX_FS=m | 1417 | CONFIG_DNOTIFY=y |
| 1257 | CONFIG_ROMFS_FS=m | ||
| 1258 | CONFIG_INOTIFY=y | 1418 | CONFIG_INOTIFY=y |
| 1259 | CONFIG_INOTIFY_USER=y | 1419 | CONFIG_INOTIFY_USER=y |
| 1260 | CONFIG_QUOTA=y | 1420 | CONFIG_QUOTA=y |
| 1421 | # CONFIG_QUOTA_NETLINK_INTERFACE is not set | ||
| 1422 | CONFIG_PRINT_QUOTA_WARNING=y | ||
| 1261 | # CONFIG_QFMT_V1 is not set | 1423 | # CONFIG_QFMT_V1 is not set |
| 1262 | CONFIG_QFMT_V2=y | 1424 | CONFIG_QFMT_V2=y |
| 1263 | CONFIG_QUOTACTL=y | 1425 | CONFIG_QUOTACTL=y |
| 1264 | CONFIG_DNOTIFY=y | ||
| 1265 | CONFIG_AUTOFS_FS=y | 1426 | CONFIG_AUTOFS_FS=y |
| 1266 | # CONFIG_AUTOFS4_FS is not set | 1427 | # CONFIG_AUTOFS4_FS is not set |
| 1267 | CONFIG_FUSE_FS=m | 1428 | CONFIG_FUSE_FS=m |
| @@ -1291,11 +1452,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1291 | CONFIG_PROC_FS=y | 1452 | CONFIG_PROC_FS=y |
| 1292 | CONFIG_PROC_KCORE=y | 1453 | CONFIG_PROC_KCORE=y |
| 1293 | CONFIG_PROC_SYSCTL=y | 1454 | CONFIG_PROC_SYSCTL=y |
| 1455 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1294 | CONFIG_SYSFS=y | 1456 | CONFIG_SYSFS=y |
| 1295 | CONFIG_TMPFS=y | 1457 | CONFIG_TMPFS=y |
| 1296 | # CONFIG_TMPFS_POSIX_ACL is not set | 1458 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1297 | # CONFIG_HUGETLB_PAGE is not set | 1459 | # CONFIG_HUGETLB_PAGE is not set |
| 1298 | CONFIG_RAMFS=y | ||
| 1299 | # CONFIG_CONFIGFS_FS is not set | 1460 | # CONFIG_CONFIGFS_FS is not set |
| 1300 | 1461 | ||
| 1301 | # | 1462 | # |
| @@ -1312,46 +1473,48 @@ CONFIG_EFS_FS=m | |||
| 1312 | CONFIG_JFFS2_FS=m | 1473 | CONFIG_JFFS2_FS=m |
| 1313 | CONFIG_JFFS2_FS_DEBUG=0 | 1474 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1314 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1475 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1476 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1315 | # CONFIG_JFFS2_SUMMARY is not set | 1477 | # CONFIG_JFFS2_SUMMARY is not set |
| 1316 | CONFIG_JFFS2_FS_XATTR=y | 1478 | CONFIG_JFFS2_FS_XATTR=y |
| 1317 | CONFIG_JFFS2_FS_POSIX_ACL=y | 1479 | CONFIG_JFFS2_FS_POSIX_ACL=y |
| 1318 | CONFIG_JFFS2_FS_SECURITY=y | 1480 | CONFIG_JFFS2_FS_SECURITY=y |
| 1319 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | 1481 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y |
| 1320 | CONFIG_JFFS2_ZLIB=y | 1482 | CONFIG_JFFS2_ZLIB=y |
| 1483 | # CONFIG_JFFS2_LZO is not set | ||
| 1321 | CONFIG_JFFS2_RTIME=y | 1484 | CONFIG_JFFS2_RTIME=y |
| 1322 | CONFIG_JFFS2_RUBIN=y | 1485 | CONFIG_JFFS2_RUBIN=y |
| 1323 | # CONFIG_JFFS2_CMODE_NONE is not set | 1486 | # CONFIG_JFFS2_CMODE_NONE is not set |
| 1324 | CONFIG_JFFS2_CMODE_PRIORITY=y | 1487 | CONFIG_JFFS2_CMODE_PRIORITY=y |
| 1325 | # CONFIG_JFFS2_CMODE_SIZE is not set | 1488 | # CONFIG_JFFS2_CMODE_SIZE is not set |
| 1489 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
| 1490 | # CONFIG_UBIFS_FS is not set | ||
| 1326 | CONFIG_CRAMFS=m | 1491 | CONFIG_CRAMFS=m |
| 1327 | CONFIG_VXFS_FS=m | 1492 | CONFIG_VXFS_FS=m |
| 1493 | CONFIG_MINIX_FS=m | ||
| 1494 | # CONFIG_OMFS_FS is not set | ||
| 1328 | # CONFIG_HPFS_FS is not set | 1495 | # CONFIG_HPFS_FS is not set |
| 1329 | # CONFIG_QNX4FS_FS is not set | 1496 | # CONFIG_QNX4FS_FS is not set |
| 1497 | CONFIG_ROMFS_FS=m | ||
| 1330 | CONFIG_SYSV_FS=m | 1498 | CONFIG_SYSV_FS=m |
| 1331 | CONFIG_UFS_FS=m | 1499 | CONFIG_UFS_FS=m |
| 1332 | # CONFIG_UFS_FS_WRITE is not set | 1500 | # CONFIG_UFS_FS_WRITE is not set |
| 1333 | # CONFIG_UFS_DEBUG is not set | 1501 | # CONFIG_UFS_DEBUG is not set |
| 1334 | 1502 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1335 | # | ||
| 1336 | # Network File Systems | ||
| 1337 | # | ||
| 1338 | CONFIG_NFS_FS=y | 1503 | CONFIG_NFS_FS=y |
| 1339 | CONFIG_NFS_V3=y | 1504 | CONFIG_NFS_V3=y |
| 1340 | # CONFIG_NFS_V3_ACL is not set | 1505 | # CONFIG_NFS_V3_ACL is not set |
| 1341 | # CONFIG_NFS_V4 is not set | 1506 | # CONFIG_NFS_V4 is not set |
| 1342 | # CONFIG_NFS_DIRECTIO is not set | 1507 | CONFIG_ROOT_NFS=y |
| 1343 | CONFIG_NFSD=y | 1508 | CONFIG_NFSD=y |
| 1344 | CONFIG_NFSD_V3=y | 1509 | CONFIG_NFSD_V3=y |
| 1345 | # CONFIG_NFSD_V3_ACL is not set | 1510 | # CONFIG_NFSD_V3_ACL is not set |
| 1346 | # CONFIG_NFSD_V4 is not set | 1511 | # CONFIG_NFSD_V4 is not set |
| 1347 | # CONFIG_NFSD_TCP is not set | ||
| 1348 | CONFIG_ROOT_NFS=y | ||
| 1349 | CONFIG_LOCKD=y | 1512 | CONFIG_LOCKD=y |
| 1350 | CONFIG_LOCKD_V4=y | 1513 | CONFIG_LOCKD_V4=y |
| 1351 | CONFIG_EXPORTFS=y | 1514 | CONFIG_EXPORTFS=y |
| 1352 | CONFIG_NFS_COMMON=y | 1515 | CONFIG_NFS_COMMON=y |
| 1353 | CONFIG_SUNRPC=y | 1516 | CONFIG_SUNRPC=y |
| 1354 | # CONFIG_SUNRPC_BIND34 is not set | 1517 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 1355 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1518 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1356 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1519 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1357 | # CONFIG_SMB_FS is not set | 1520 | # CONFIG_SMB_FS is not set |
| @@ -1365,10 +1528,6 @@ CONFIG_SUNRPC=y | |||
| 1365 | # | 1528 | # |
| 1366 | # CONFIG_PARTITION_ADVANCED is not set | 1529 | # CONFIG_PARTITION_ADVANCED is not set |
| 1367 | CONFIG_MSDOS_PARTITION=y | 1530 | CONFIG_MSDOS_PARTITION=y |
| 1368 | |||
| 1369 | # | ||
| 1370 | # Native Language Support | ||
| 1371 | # | ||
| 1372 | CONFIG_NLS=m | 1531 | CONFIG_NLS=m |
| 1373 | CONFIG_NLS_DEFAULT="iso8859-1" | 1532 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1374 | CONFIG_NLS_CODEPAGE_437=m | 1533 | CONFIG_NLS_CODEPAGE_437=m |
| @@ -1409,29 +1568,30 @@ CONFIG_NLS_ISO8859_15=m | |||
| 1409 | CONFIG_NLS_KOI8_R=m | 1568 | CONFIG_NLS_KOI8_R=m |
| 1410 | CONFIG_NLS_KOI8_U=m | 1569 | CONFIG_NLS_KOI8_U=m |
| 1411 | CONFIG_NLS_UTF8=m | 1570 | CONFIG_NLS_UTF8=m |
| 1412 | |||
| 1413 | # | ||
| 1414 | # Distributed Lock Manager | ||
| 1415 | # | ||
| 1416 | # CONFIG_DLM is not set | 1571 | # CONFIG_DLM is not set |
| 1417 | 1572 | ||
| 1418 | # | 1573 | # |
| 1419 | # Profiling support | ||
| 1420 | # | ||
| 1421 | # CONFIG_PROFILING is not set | ||
| 1422 | |||
| 1423 | # | ||
| 1424 | # Kernel hacking | 1574 | # Kernel hacking |
| 1425 | # | 1575 | # |
| 1426 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1576 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1427 | # CONFIG_PRINTK_TIME is not set | 1577 | # CONFIG_PRINTK_TIME is not set |
| 1578 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1428 | CONFIG_ENABLE_MUST_CHECK=y | 1579 | CONFIG_ENABLE_MUST_CHECK=y |
| 1580 | CONFIG_FRAME_WARN=1024 | ||
| 1429 | # CONFIG_MAGIC_SYSRQ is not set | 1581 | # CONFIG_MAGIC_SYSRQ is not set |
| 1430 | # CONFIG_UNUSED_SYMBOLS is not set | 1582 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1431 | # CONFIG_DEBUG_FS is not set | 1583 | # CONFIG_DEBUG_FS is not set |
| 1432 | # CONFIG_HEADERS_CHECK is not set | 1584 | # CONFIG_HEADERS_CHECK is not set |
| 1433 | # CONFIG_DEBUG_KERNEL is not set | 1585 | # CONFIG_DEBUG_KERNEL is not set |
| 1434 | CONFIG_CROSSCOMPILE=y | 1586 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1587 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1588 | |||
| 1589 | # | ||
| 1590 | # Tracers | ||
| 1591 | # | ||
| 1592 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1593 | # CONFIG_SAMPLES is not set | ||
| 1594 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1435 | CONFIG_CMDLINE="" | 1595 | CONFIG_CMDLINE="" |
| 1436 | 1596 | ||
| 1437 | # | 1597 | # |
| @@ -1439,51 +1599,103 @@ CONFIG_CMDLINE="" | |||
| 1439 | # | 1599 | # |
| 1440 | # CONFIG_KEYS is not set | 1600 | # CONFIG_KEYS is not set |
| 1441 | # CONFIG_SECURITY is not set | 1601 | # CONFIG_SECURITY is not set |
| 1602 | # CONFIG_SECURITYFS is not set | ||
| 1603 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1442 | CONFIG_XOR_BLOCKS=m | 1604 | CONFIG_XOR_BLOCKS=m |
| 1443 | CONFIG_ASYNC_CORE=m | 1605 | CONFIG_ASYNC_CORE=m |
| 1444 | CONFIG_ASYNC_MEMCPY=m | 1606 | CONFIG_ASYNC_MEMCPY=m |
| 1445 | CONFIG_ASYNC_XOR=m | 1607 | CONFIG_ASYNC_XOR=m |
| 1446 | CONFIG_CRYPTO=y | 1608 | CONFIG_CRYPTO=y |
| 1609 | |||
| 1610 | # | ||
| 1611 | # Crypto core or helper | ||
| 1612 | # | ||
| 1613 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1447 | CONFIG_CRYPTO_ALGAPI=y | 1614 | CONFIG_CRYPTO_ALGAPI=y |
| 1448 | CONFIG_CRYPTO_ABLKCIPHER=m | 1615 | CONFIG_CRYPTO_AEAD=y |
| 1449 | CONFIG_CRYPTO_BLKCIPHER=m | 1616 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1450 | CONFIG_CRYPTO_HASH=y | 1617 | CONFIG_CRYPTO_HASH=y |
| 1618 | CONFIG_CRYPTO_RNG=y | ||
| 1451 | CONFIG_CRYPTO_MANAGER=y | 1619 | CONFIG_CRYPTO_MANAGER=y |
| 1620 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1621 | CONFIG_CRYPTO_NULL=m | ||
| 1622 | CONFIG_CRYPTO_CRYPTD=m | ||
| 1623 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1624 | # CONFIG_CRYPTO_TEST is not set | ||
| 1625 | |||
| 1626 | # | ||
| 1627 | # Authenticated Encryption with Associated Data | ||
| 1628 | # | ||
| 1629 | # CONFIG_CRYPTO_CCM is not set | ||
| 1630 | # CONFIG_CRYPTO_GCM is not set | ||
| 1631 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1632 | |||
| 1633 | # | ||
| 1634 | # Block modes | ||
| 1635 | # | ||
| 1636 | CONFIG_CRYPTO_CBC=m | ||
| 1637 | # CONFIG_CRYPTO_CTR is not set | ||
| 1638 | # CONFIG_CRYPTO_CTS is not set | ||
| 1639 | CONFIG_CRYPTO_ECB=m | ||
| 1640 | CONFIG_CRYPTO_LRW=m | ||
| 1641 | CONFIG_CRYPTO_PCBC=m | ||
| 1642 | # CONFIG_CRYPTO_XTS is not set | ||
| 1643 | |||
| 1644 | # | ||
| 1645 | # Hash modes | ||
| 1646 | # | ||
| 1452 | CONFIG_CRYPTO_HMAC=y | 1647 | CONFIG_CRYPTO_HMAC=y |
| 1453 | CONFIG_CRYPTO_XCBC=m | 1648 | CONFIG_CRYPTO_XCBC=m |
| 1454 | CONFIG_CRYPTO_NULL=m | 1649 | |
| 1650 | # | ||
| 1651 | # Digest | ||
| 1652 | # | ||
| 1653 | CONFIG_CRYPTO_CRC32C=m | ||
| 1455 | CONFIG_CRYPTO_MD4=m | 1654 | CONFIG_CRYPTO_MD4=m |
| 1456 | CONFIG_CRYPTO_MD5=y | 1655 | CONFIG_CRYPTO_MD5=y |
| 1656 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1657 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1658 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1659 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1660 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1457 | CONFIG_CRYPTO_SHA1=m | 1661 | CONFIG_CRYPTO_SHA1=m |
| 1458 | CONFIG_CRYPTO_SHA256=m | 1662 | CONFIG_CRYPTO_SHA256=m |
| 1459 | CONFIG_CRYPTO_SHA512=m | 1663 | CONFIG_CRYPTO_SHA512=m |
| 1460 | CONFIG_CRYPTO_WP512=m | ||
| 1461 | CONFIG_CRYPTO_TGR192=m | 1664 | CONFIG_CRYPTO_TGR192=m |
| 1462 | CONFIG_CRYPTO_GF128MUL=m | 1665 | CONFIG_CRYPTO_WP512=m |
| 1463 | CONFIG_CRYPTO_ECB=m | 1666 | |
| 1464 | CONFIG_CRYPTO_CBC=m | 1667 | # |
| 1465 | CONFIG_CRYPTO_PCBC=m | 1668 | # Ciphers |
| 1466 | CONFIG_CRYPTO_LRW=m | 1669 | # |
| 1467 | CONFIG_CRYPTO_CRYPTD=m | ||
| 1468 | CONFIG_CRYPTO_DES=m | ||
| 1469 | CONFIG_CRYPTO_FCRYPT=m | ||
| 1470 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1471 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1472 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1473 | CONFIG_CRYPTO_SERPENT=m | ||
| 1474 | CONFIG_CRYPTO_AES=m | 1670 | CONFIG_CRYPTO_AES=m |
| 1671 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1672 | CONFIG_CRYPTO_ARC4=m | ||
| 1673 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1674 | CONFIG_CRYPTO_CAMELLIA=m | ||
| 1475 | CONFIG_CRYPTO_CAST5=m | 1675 | CONFIG_CRYPTO_CAST5=m |
| 1476 | CONFIG_CRYPTO_CAST6=m | 1676 | CONFIG_CRYPTO_CAST6=m |
| 1477 | CONFIG_CRYPTO_TEA=m | 1677 | CONFIG_CRYPTO_DES=m |
| 1478 | CONFIG_CRYPTO_ARC4=m | 1678 | CONFIG_CRYPTO_FCRYPT=m |
| 1479 | CONFIG_CRYPTO_KHAZAD=m | 1679 | CONFIG_CRYPTO_KHAZAD=m |
| 1480 | CONFIG_CRYPTO_ANUBIS=m | 1680 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1681 | # CONFIG_CRYPTO_SEED is not set | ||
| 1682 | CONFIG_CRYPTO_SERPENT=m | ||
| 1683 | CONFIG_CRYPTO_TEA=m | ||
| 1684 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1685 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1686 | |||
| 1687 | # | ||
| 1688 | # Compression | ||
| 1689 | # | ||
| 1481 | CONFIG_CRYPTO_DEFLATE=m | 1690 | CONFIG_CRYPTO_DEFLATE=m |
| 1482 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1691 | # CONFIG_CRYPTO_LZO is not set |
| 1483 | CONFIG_CRYPTO_CRC32C=m | 1692 | |
| 1484 | CONFIG_CRYPTO_CAMELLIA=m | 1693 | # |
| 1485 | # CONFIG_CRYPTO_TEST is not set | 1694 | # Random Number Generation |
| 1695 | # | ||
| 1696 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1486 | CONFIG_CRYPTO_HW=y | 1697 | CONFIG_CRYPTO_HW=y |
| 1698 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1487 | 1699 | ||
| 1488 | # | 1700 | # |
| 1489 | # Library routines | 1701 | # Library routines |
| @@ -1491,7 +1703,8 @@ CONFIG_CRYPTO_HW=y | |||
| 1491 | CONFIG_BITREVERSE=y | 1703 | CONFIG_BITREVERSE=y |
| 1492 | # CONFIG_CRC_CCITT is not set | 1704 | # CONFIG_CRC_CCITT is not set |
| 1493 | CONFIG_CRC16=m | 1705 | CONFIG_CRC16=m |
| 1494 | # CONFIG_CRC_ITU_T is not set | 1706 | # CONFIG_CRC_T10DIF is not set |
| 1707 | CONFIG_CRC_ITU_T=m | ||
| 1495 | CONFIG_CRC32=y | 1708 | CONFIG_CRC32=y |
| 1496 | # CONFIG_CRC7 is not set | 1709 | # CONFIG_CRC7 is not set |
| 1497 | CONFIG_LIBCRC32C=m | 1710 | CONFIG_LIBCRC32C=m |
diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h index 7a881755800f..6c8342ae74db 100644 --- a/arch/mips/include/asm/asmmacro.h +++ b/arch/mips/include/asm/asmmacro.h | |||
| @@ -35,6 +35,16 @@ | |||
| 35 | mtc0 \reg, CP0_TCSTATUS | 35 | mtc0 \reg, CP0_TCSTATUS |
| 36 | _ehb | 36 | _ehb |
| 37 | .endm | 37 | .endm |
| 38 | #elif defined(CONFIG_CPU_MIPSR2) | ||
| 39 | .macro local_irq_enable reg=t0 | ||
| 40 | ei | ||
| 41 | irq_enable_hazard | ||
| 42 | .endm | ||
| 43 | |||
| 44 | .macro local_irq_disable reg=t0 | ||
| 45 | di | ||
| 46 | irq_disable_hazard | ||
| 47 | .endm | ||
| 38 | #else | 48 | #else |
| 39 | .macro local_irq_enable reg=t0 | 49 | .macro local_irq_enable reg=t0 |
| 40 | mfc0 \reg, CP0_STATUS | 50 | mfc0 \reg, CP0_STATUS |
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 5510c53b7feb..053e4634acee 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h | |||
| @@ -79,6 +79,11 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
| 79 | /* We don't do dynamic PCI IRQ allocation */ | 79 | /* We don't do dynamic PCI IRQ allocation */ |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | #define HAVE_PCI_MMAP | ||
| 83 | |||
| 84 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | ||
| 85 | enum pci_mmap_state mmap_state, int write_combine); | ||
| 86 | |||
| 82 | /* | 87 | /* |
| 83 | * Dynamic DMA mapping stuff. | 88 | * Dynamic DMA mapping stuff. |
| 84 | * MIPS has everything mapped statically. | 89 | * MIPS has everything mapped statically. |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 759f68066b5d..d0916a55cd77 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -262,14 +262,11 @@ bad_alignment: | |||
| 262 | LEAF(sys_syscall) | 262 | LEAF(sys_syscall) |
| 263 | subu t0, a0, __NR_O32_Linux # check syscall number | 263 | subu t0, a0, __NR_O32_Linux # check syscall number |
| 264 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 | 264 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 |
| 265 | beqz t0, einval # do not recurse | ||
| 265 | sll t1, t0, 3 | 266 | sll t1, t0, 3 |
| 266 | beqz v0, einval | 267 | beqz v0, einval |
| 267 | |||
| 268 | lw t2, sys_call_table(t1) # syscall routine | 268 | lw t2, sys_call_table(t1) # syscall routine |
| 269 | 269 | ||
| 270 | li v1, 4000 - __NR_O32_Linux # index of sys_syscall | ||
| 271 | beq t0, v1, einval # do not recurse | ||
| 272 | |||
| 273 | /* Some syscalls like execve get their arguments from struct pt_regs | 270 | /* Some syscalls like execve get their arguments from struct pt_regs |
| 274 | and claim zero arguments in the syscall table. Thus we have to | 271 | and claim zero arguments in the syscall table. Thus we have to |
| 275 | assume the worst case and shuffle around all potential arguments. | 272 | assume the worst case and shuffle around all potential arguments. |
| @@ -627,7 +624,7 @@ einval: li v0, -ENOSYS | |||
| 627 | sys sys_pselect6 6 | 624 | sys sys_pselect6 6 |
| 628 | sys sys_ppoll 5 | 625 | sys sys_ppoll 5 |
| 629 | sys sys_unshare 1 | 626 | sys sys_unshare 1 |
| 630 | sys sys_splice 4 | 627 | sys sys_splice 6 |
| 631 | sys sys_sync_file_range 7 /* 4305 */ | 628 | sys sys_sync_file_range 7 /* 4305 */ |
| 632 | sys sys_tee 4 | 629 | sys sys_tee 4 |
| 633 | sys sys_vmsplice 4 | 630 | sys sys_vmsplice 4 |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index e266b3aa6560..30f3b6317a83 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -390,7 +390,7 @@ EXPORT(sysn32_call_table) | |||
| 390 | PTR sys_splice | 390 | PTR sys_splice |
| 391 | PTR sys_sync_file_range | 391 | PTR sys_sync_file_range |
| 392 | PTR sys_tee | 392 | PTR sys_tee |
| 393 | PTR sys_vmsplice /* 6270 */ | 393 | PTR compat_sys_vmsplice /* 6270 */ |
| 394 | PTR sys_move_pages | 394 | PTR sys_move_pages |
| 395 | PTR compat_sys_set_robust_list | 395 | PTR compat_sys_set_robust_list |
| 396 | PTR compat_sys_get_robust_list | 396 | PTR compat_sys_get_robust_list |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 6c7ef8313ebd..fefef4af8595 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -174,14 +174,12 @@ not_o32_scall: | |||
| 174 | END(handle_sys) | 174 | END(handle_sys) |
| 175 | 175 | ||
| 176 | LEAF(sys32_syscall) | 176 | LEAF(sys32_syscall) |
| 177 | sltu v0, a0, __NR_O32_Linux + __NR_O32_Linux_syscalls + 1 | 177 | subu t0, a0, __NR_O32_Linux # check syscall number |
| 178 | sltiu v0, t0, __NR_O32_Linux_syscalls + 1 | ||
| 179 | beqz t0, einval # do not recurse | ||
| 180 | dsll t1, t0, 3 | ||
| 178 | beqz v0, einval | 181 | beqz v0, einval |
| 179 | 182 | ld t2, sys_call_table(t1) # syscall routine | |
| 180 | dsll v0, a0, 3 | ||
| 181 | ld t2, (sys_call_table - (__NR_O32_Linux * 8))(v0) | ||
| 182 | |||
| 183 | li v1, 4000 # indirect syscall number | ||
| 184 | beq a0, v1, einval # do not recurse | ||
| 185 | 183 | ||
| 186 | move a0, a1 # shift argument registers | 184 | move a0, a1 # shift argument registers |
| 187 | move a1, a2 | 185 | move a1, a2 |
| @@ -198,7 +196,7 @@ LEAF(sys32_syscall) | |||
| 198 | jr t2 | 196 | jr t2 |
| 199 | /* Unreached */ | 197 | /* Unreached */ |
| 200 | 198 | ||
| 201 | einval: li v0, -EINVAL | 199 | einval: li v0, -ENOSYS |
| 202 | jr ra | 200 | jr ra |
| 203 | END(sys32_syscall) | 201 | END(sys32_syscall) |
| 204 | 202 | ||
| @@ -512,7 +510,7 @@ sys_call_table: | |||
| 512 | PTR sys_splice | 510 | PTR sys_splice |
| 513 | PTR sys32_sync_file_range /* 4305 */ | 511 | PTR sys32_sync_file_range /* 4305 */ |
| 514 | PTR sys_tee | 512 | PTR sys_tee |
| 515 | PTR sys_vmsplice | 513 | PTR compat_sys_vmsplice |
| 516 | PTR compat_sys_move_pages | 514 | PTR compat_sys_move_pages |
| 517 | PTR compat_sys_set_robust_list | 515 | PTR compat_sys_set_robust_list |
| 518 | PTR compat_sys_get_robust_list /* 4310 */ | 516 | PTR compat_sys_get_robust_list /* 4310 */ |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 972b2d2b8401..a1b3da6bad5c 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
| @@ -1134,7 +1134,7 @@ static int vpe_release(struct inode *inode, struct file *filp) | |||
| 1134 | 1134 | ||
| 1135 | /* It's good to be able to run the SP and if it chokes have a look at | 1135 | /* It's good to be able to run the SP and if it chokes have a look at |
| 1136 | the /dev/rt?. But if we reset the pointer to the shared struct we | 1136 | the /dev/rt?. But if we reset the pointer to the shared struct we |
| 1137 | loose what has happened. So perhaps if garbage is sent to the vpe | 1137 | lose what has happened. So perhaps if garbage is sent to the vpe |
| 1138 | device, use it as a trigger for the reset. Hopefully a nice | 1138 | device, use it as a trigger for the reset. Hopefully a nice |
| 1139 | executable will be along shortly. */ | 1139 | executable will be along shortly. */ |
| 1140 | if (ret < 0) | 1140 | if (ret < 0) |
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index 5b98d0e731c2..e6708b3ad343 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c | |||
| @@ -111,6 +111,7 @@ EXPORT_SYMBOL(dma_alloc_coherent); | |||
| 111 | void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, | 111 | void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, |
| 112 | dma_addr_t dma_handle) | 112 | dma_addr_t dma_handle) |
| 113 | { | 113 | { |
| 114 | plat_unmap_dma_mem(dma_handle); | ||
| 114 | free_pages((unsigned long) vaddr, get_order(size)); | 115 | free_pages((unsigned long) vaddr, get_order(size)); |
| 115 | } | 116 | } |
| 116 | 117 | ||
| @@ -121,6 +122,8 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, | |||
| 121 | { | 122 | { |
| 122 | unsigned long addr = (unsigned long) vaddr; | 123 | unsigned long addr = (unsigned long) vaddr; |
| 123 | 124 | ||
| 125 | plat_unmap_dma_mem(dma_handle); | ||
| 126 | |||
| 124 | if (!plat_device_is_coherent(dev)) | 127 | if (!plat_device_is_coherent(dev)) |
| 125 | addr = CAC_ADDR(addr); | 128 | addr = CAC_ADDR(addr); |
| 126 | 129 | ||
diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile index cef2db8d2225..32e847808df1 100644 --- a/arch/mips/mti-malta/Makefile +++ b/arch/mips/mti-malta/Makefile | |||
| @@ -7,9 +7,8 @@ | |||
| 7 | # | 7 | # |
| 8 | obj-y := malta-amon.o malta-cmdline.o \ | 8 | obj-y := malta-amon.o malta-cmdline.o \ |
| 9 | malta-display.o malta-init.o malta-int.o \ | 9 | malta-display.o malta-init.o malta-int.o \ |
| 10 | malta-memory.o malta-mtd.o \ | 10 | malta-memory.o malta-platform.o \ |
| 11 | malta-platform.o malta-reset.o \ | 11 | malta-reset.o malta-setup.o malta-time.o |
| 12 | malta-setup.o malta-time.o | ||
| 13 | 12 | ||
| 14 | obj-$(CONFIG_EARLY_PRINTK) += malta-console.o | 13 | obj-$(CONFIG_EARLY_PRINTK) += malta-console.o |
| 15 | obj-$(CONFIG_PCI) += malta-pci.o | 14 | obj-$(CONFIG_PCI) += malta-pci.o |
diff --git a/arch/mips/mti-malta/malta-mtd.c b/arch/mips/mti-malta/malta-mtd.c deleted file mode 100644 index 8ad9bdf25dce..000000000000 --- a/arch/mips/mti-malta/malta-mtd.c +++ /dev/null | |||
| @@ -1,63 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 3 | * License. See the file "COPYING" in the main directory of this archive | ||
| 4 | * for more details. | ||
| 5 | * | ||
| 6 | * Copyright (C) 2006 MIPS Technologies, Inc. | ||
| 7 | * written by Ralf Baechle <ralf@linux-mips.org> | ||
| 8 | */ | ||
| 9 | |||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/platform_device.h> | ||
| 12 | #include <linux/mtd/partitions.h> | ||
| 13 | #include <linux/mtd/physmap.h> | ||
| 14 | #include <mtd/mtd-abi.h> | ||
| 15 | |||
| 16 | static struct mtd_partition malta_mtd_partitions[] = { | ||
| 17 | { | ||
| 18 | .name = "YAMON", | ||
| 19 | .offset = 0x0, | ||
| 20 | .size = 0x100000, | ||
| 21 | .mask_flags = MTD_WRITEABLE | ||
| 22 | }, { | ||
| 23 | .name = "User FS", | ||
| 24 | .offset = 0x100000, | ||
| 25 | .size = 0x2e0000 | ||
| 26 | }, { | ||
| 27 | .name = "Board Config", | ||
| 28 | .offset = 0x3e0000, | ||
| 29 | .size = 0x020000, | ||
| 30 | .mask_flags = MTD_WRITEABLE | ||
| 31 | } | ||
| 32 | }; | ||
| 33 | |||
| 34 | static struct physmap_flash_data malta_flash_data = { | ||
| 35 | .width = 4, | ||
| 36 | .nr_parts = ARRAY_SIZE(malta_mtd_partitions), | ||
| 37 | .parts = malta_mtd_partitions | ||
| 38 | }; | ||
| 39 | |||
| 40 | static struct resource malta_flash_resource = { | ||
| 41 | .start = 0x1e000000, | ||
| 42 | .end = 0x1e3fffff, | ||
| 43 | .flags = IORESOURCE_MEM | ||
| 44 | }; | ||
| 45 | |||
| 46 | static struct platform_device malta_flash = { | ||
| 47 | .name = "physmap-flash", | ||
| 48 | .id = 0, | ||
| 49 | .dev = { | ||
| 50 | .platform_data = &malta_flash_data, | ||
| 51 | }, | ||
| 52 | .num_resources = 1, | ||
| 53 | .resource = &malta_flash_resource, | ||
| 54 | }; | ||
| 55 | |||
| 56 | static int __init malta_mtd_init(void) | ||
| 57 | { | ||
| 58 | platform_device_register(&malta_flash); | ||
| 59 | |||
| 60 | return 0; | ||
| 61 | } | ||
| 62 | |||
| 63 | module_init(malta_mtd_init) | ||
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c index 83b9bab3cd3f..72e32a7715be 100644 --- a/arch/mips/mti-malta/malta-platform.c +++ b/arch/mips/mti-malta/malta-platform.c | |||
| @@ -3,10 +3,14 @@ | |||
| 3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
| 4 | * for more details. | 4 | * for more details. |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2007 MIPS Technologies, Inc. | 6 | * Copyright (C) 2006, 07 MIPS Technologies, Inc. |
| 7 | * written by Ralf Baechle (ralf@linux-mips.org) | 7 | * written by Ralf Baechle (ralf@linux-mips.org) |
| 8 | * written by Ralf Baechle <ralf@linux-mips.org> | ||
| 8 | * | 9 | * |
| 9 | * Probe driver for the Malta's UART ports: | 10 | * Copyright (C) 2008 Wind River Systems, Inc. |
| 11 | * updated by Tiejun Chen <tiejun.chen@windriver.com> | ||
| 12 | * | ||
| 13 | * 1. Probe driver for the Malta's UART ports: | ||
| 10 | * | 14 | * |
| 11 | * o 2 ports in the SMC SuperIO | 15 | * o 2 ports in the SMC SuperIO |
| 12 | * o 1 port in the CBUS UART, a discrete 16550 which normally is only used | 16 | * o 1 port in the CBUS UART, a discrete 16550 which normally is only used |
| @@ -14,10 +18,17 @@ | |||
| 14 | * | 18 | * |
| 15 | * We don't use 8250_platform.c on Malta as it would result in the CBUS | 19 | * We don't use 8250_platform.c on Malta as it would result in the CBUS |
| 16 | * UART becoming ttyS0. | 20 | * UART becoming ttyS0. |
| 21 | * | ||
| 22 | * 2. Register RTC-CMOS platform device on Malta. | ||
| 17 | */ | 23 | */ |
| 18 | #include <linux/module.h> | ||
| 19 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 20 | #include <linux/serial_8250.h> | 25 | #include <linux/serial_8250.h> |
| 26 | #include <linux/mc146818rtc.h> | ||
| 27 | #include <linux/module.h> | ||
| 28 | #include <linux/mtd/partitions.h> | ||
| 29 | #include <linux/mtd/physmap.h> | ||
| 30 | #include <linux/platform_device.h> | ||
| 31 | #include <mtd/mtd-abi.h> | ||
| 21 | 32 | ||
| 22 | #define SMC_PORT(base, int) \ | 33 | #define SMC_PORT(base, int) \ |
| 23 | { \ | 34 | { \ |
| @@ -45,21 +56,93 @@ static struct plat_serial8250_port uart8250_data[] = { | |||
| 45 | { }, | 56 | { }, |
| 46 | }; | 57 | }; |
| 47 | 58 | ||
| 48 | static struct platform_device uart8250_device = { | 59 | static struct platform_device malta_uart8250_device = { |
| 49 | .name = "serial8250", | 60 | .name = "serial8250", |
| 50 | .id = PLAT8250_DEV_PLATFORM2, | 61 | .id = PLAT8250_DEV_PLATFORM, |
| 51 | .dev = { | 62 | .dev = { |
| 52 | .platform_data = uart8250_data, | 63 | .platform_data = uart8250_data, |
| 53 | }, | 64 | }, |
| 54 | }; | 65 | }; |
| 55 | 66 | ||
| 56 | static int __init uart8250_init(void) | 67 | struct resource malta_rtc_resources[] = { |
| 68 | { | ||
| 69 | .start = RTC_PORT(0), | ||
| 70 | .end = RTC_PORT(7), | ||
| 71 | .flags = IORESOURCE_IO, | ||
| 72 | }, { | ||
| 73 | .start = RTC_IRQ, | ||
| 74 | .end = RTC_IRQ, | ||
| 75 | .flags = IORESOURCE_IRQ, | ||
| 76 | } | ||
| 77 | }; | ||
| 78 | |||
| 79 | static struct platform_device malta_rtc_device = { | ||
| 80 | .name = "rtc_cmos", | ||
| 81 | .id = -1, | ||
| 82 | .resource = malta_rtc_resources, | ||
| 83 | .num_resources = ARRAY_SIZE(malta_rtc_resources), | ||
| 84 | }; | ||
| 85 | |||
| 86 | static struct mtd_partition malta_mtd_partitions[] = { | ||
| 87 | { | ||
| 88 | .name = "YAMON", | ||
| 89 | .offset = 0x0, | ||
| 90 | .size = 0x100000, | ||
| 91 | .mask_flags = MTD_WRITEABLE | ||
| 92 | }, { | ||
| 93 | .name = "User FS", | ||
| 94 | .offset = 0x100000, | ||
| 95 | .size = 0x2e0000 | ||
| 96 | }, { | ||
| 97 | .name = "Board Config", | ||
| 98 | .offset = 0x3e0000, | ||
| 99 | .size = 0x020000, | ||
| 100 | .mask_flags = MTD_WRITEABLE | ||
| 101 | } | ||
| 102 | }; | ||
| 103 | |||
| 104 | static struct physmap_flash_data malta_flash_data = { | ||
| 105 | .width = 4, | ||
| 106 | .nr_parts = ARRAY_SIZE(malta_mtd_partitions), | ||
| 107 | .parts = malta_mtd_partitions | ||
| 108 | }; | ||
| 109 | |||
| 110 | static struct resource malta_flash_resource = { | ||
| 111 | .start = 0x1e000000, | ||
| 112 | .end = 0x1e3fffff, | ||
| 113 | .flags = IORESOURCE_MEM | ||
| 114 | }; | ||
| 115 | |||
| 116 | static struct platform_device malta_flash_device = { | ||
| 117 | .name = "physmap-flash", | ||
| 118 | .id = 0, | ||
| 119 | .dev = { | ||
| 120 | .platform_data = &malta_flash_data, | ||
| 121 | }, | ||
| 122 | .num_resources = 1, | ||
| 123 | .resource = &malta_flash_resource, | ||
| 124 | }; | ||
| 125 | |||
| 126 | static struct platform_device *malta_devices[] __initdata = { | ||
| 127 | &malta_uart8250_device, | ||
| 128 | &malta_rtc_device, | ||
| 129 | &malta_flash_device, | ||
| 130 | }; | ||
| 131 | |||
| 132 | static int __init malta_add_devices(void) | ||
| 57 | { | 133 | { |
| 58 | return platform_device_register(&uart8250_device); | 134 | int err; |
| 59 | } | ||
| 60 | 135 | ||
| 61 | module_init(uart8250_init); | 136 | err = platform_add_devices(malta_devices, ARRAY_SIZE(malta_devices)); |
| 137 | if (err) | ||
| 138 | return err; | ||
| 139 | |||
| 140 | /* | ||
| 141 | * Set RTC to BCD mode to support current alarm code. | ||
| 142 | */ | ||
| 143 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) & ~RTC_DM_BINARY, RTC_CONTROL); | ||
| 144 | |||
| 145 | return 0; | ||
| 146 | } | ||
| 62 | 147 | ||
| 63 | MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>"); | 148 | device_initcall(malta_add_devices); |
| 64 | MODULE_LICENSE("GPL"); | ||
| 65 | MODULE_DESCRIPTION("8250 UART probe driver for the Malta CBUS UART"); | ||
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index a377e9d2d029..62cae740e250 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
| @@ -354,6 +354,30 @@ EXPORT_SYMBOL(PCIBIOS_MIN_IO); | |||
| 354 | EXPORT_SYMBOL(PCIBIOS_MIN_MEM); | 354 | EXPORT_SYMBOL(PCIBIOS_MIN_MEM); |
| 355 | #endif | 355 | #endif |
| 356 | 356 | ||
| 357 | int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | ||
| 358 | enum pci_mmap_state mmap_state, int write_combine) | ||
| 359 | { | ||
| 360 | unsigned long prot; | ||
| 361 | |||
| 362 | /* | ||
| 363 | * I/O space can be accessed via normal processor loads and stores on | ||
| 364 | * this platform but for now we elect not to do this and portable | ||
| 365 | * drivers should not do this anyway. | ||
| 366 | */ | ||
| 367 | if (mmap_state == pci_mmap_io) | ||
| 368 | return -EINVAL; | ||
| 369 | |||
| 370 | /* | ||
| 371 | * Ignore write-combine; for now only return uncached mappings. | ||
| 372 | */ | ||
| 373 | prot = pgprot_val(vma->vm_page_prot); | ||
| 374 | prot = (prot & ~_CACHE_MASK) | _CACHE_UNCACHED; | ||
| 375 | vma->vm_page_prot = __pgprot(prot); | ||
| 376 | |||
| 377 | return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, | ||
| 378 | vma->vm_end - vma->vm_start, vma->vm_page_prot); | ||
| 379 | } | ||
| 380 | |||
| 357 | char * (*pcibios_plat_setup)(char *str) __devinitdata; | 381 | char * (*pcibios_plat_setup)(char *str) __devinitdata; |
| 358 | 382 | ||
| 359 | char *__devinit pcibios_setup(char *str) | 383 | char *__devinit pcibios_setup(char *str) |
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index b7cbb1487af4..62fba8aa9b6e 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S | |||
| @@ -180,6 +180,7 @@ ENTRY(resume_userspace) | |||
| 180 | 180 | ||
| 181 | #ifdef CONFIG_PREEMPT | 181 | #ifdef CONFIG_PREEMPT |
| 182 | ENTRY(resume_kernel) | 182 | ENTRY(resume_kernel) |
| 183 | __cli | ||
| 183 | mov (TI_preempt_count,a2),d0 # non-zero preempt_count ? | 184 | mov (TI_preempt_count,a2),d0 # non-zero preempt_count ? |
| 184 | cmp 0,d0 | 185 | cmp 0,d0 |
| 185 | bne restore_all | 186 | bne restore_all |
| @@ -190,7 +191,7 @@ need_resched: | |||
| 190 | mov (REG_EPSW,fp),d0 | 191 | mov (REG_EPSW,fp),d0 |
| 191 | and EPSW_IM,d0 | 192 | and EPSW_IM,d0 |
| 192 | cmp EPSW_IM_7,d0 # interrupts off (exception path) ? | 193 | cmp EPSW_IM_7,d0 # interrupts off (exception path) ? |
| 193 | beq restore_all | 194 | bne restore_all |
| 194 | call preempt_schedule_irq[],0 | 195 | call preempt_schedule_irq[],0 |
| 195 | jmp need_resched | 196 | jmp need_resched |
| 196 | #endif | 197 | #endif |
diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c index 9a6d4e8ebe73..11584c51acd9 100644 --- a/arch/mn10300/kernel/gdb-io-serial.c +++ b/arch/mn10300/kernel/gdb-io-serial.c | |||
| @@ -99,6 +99,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock) | |||
| 99 | try_again: | 99 | try_again: |
| 100 | /* pull chars out of the buffer */ | 100 | /* pull chars out of the buffer */ |
| 101 | ix = gdbstub_rx_outp; | 101 | ix = gdbstub_rx_outp; |
| 102 | barrier(); | ||
| 102 | if (ix == gdbstub_rx_inp) { | 103 | if (ix == gdbstub_rx_inp) { |
| 103 | if (nonblock) | 104 | if (nonblock) |
| 104 | return -EAGAIN; | 105 | return -EAGAIN; |
| @@ -110,6 +111,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock) | |||
| 110 | 111 | ||
| 111 | ch = gdbstub_rx_buffer[ix++]; | 112 | ch = gdbstub_rx_buffer[ix++]; |
| 112 | st = gdbstub_rx_buffer[ix++]; | 113 | st = gdbstub_rx_buffer[ix++]; |
| 114 | barrier(); | ||
| 113 | gdbstub_rx_outp = ix & 0x00000fff; | 115 | gdbstub_rx_outp = ix & 0x00000fff; |
| 114 | 116 | ||
| 115 | if (st & UART_LSR_BI) { | 117 | if (st & UART_LSR_BI) { |
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index aa07d0cd1905..59b9c4bf9583 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c | |||
| @@ -566,6 +566,11 @@ static void mn10300_serial_transmit_interrupt(struct mn10300_serial_port *port) | |||
| 566 | { | 566 | { |
| 567 | _enter("%s", port->name); | 567 | _enter("%s", port->name); |
| 568 | 568 | ||
| 569 | if (!port->uart.info || !port->uart.info->port.tty) { | ||
| 570 | mn10300_serial_dis_tx_intr(port); | ||
| 571 | return; | ||
| 572 | } | ||
| 573 | |||
| 569 | if (uart_tx_stopped(&port->uart) || | 574 | if (uart_tx_stopped(&port->uart) || |
| 570 | uart_circ_empty(&port->uart.info->xmit)) | 575 | uart_circ_empty(&port->uart.info->xmit)) |
| 571 | mn10300_serial_dis_tx_intr(port); | 576 | mn10300_serial_dis_tx_intr(port); |
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 017121ce896f..e1d88ab51008 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
| @@ -161,7 +161,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 161 | reserve the page it is occupying. */ | 161 | reserve the page it is occupying. */ |
| 162 | if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS && | 162 | if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS && |
| 163 | CONFIG_INTERRUPT_VECTOR_BASE < memory_end) | 163 | CONFIG_INTERRUPT_VECTOR_BASE < memory_end) |
| 164 | reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, 1, | 164 | reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, PAGE_SIZE, |
| 165 | BOOTMEM_DEFAULT); | 165 | BOOTMEM_DEFAULT); |
| 166 | 166 | ||
| 167 | reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size, | 167 | reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size, |
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index a3e80f444f55..b8259668f7dc 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #define __VMLINUX_LDS__ | 11 | #define __VMLINUX_LDS__ |
| 12 | #include <asm-generic/vmlinux.lds.h> | 12 | #include <asm-generic/vmlinux.lds.h> |
| 13 | #include <asm/thread_info.h> | 13 | #include <asm/thread_info.h> |
| 14 | #include <asm/page.h> | ||
| 14 | 15 | ||
| 15 | OUTPUT_FORMAT("elf32-am33lin", "elf32-am33lin", "elf32-am33lin") | 16 | OUTPUT_FORMAT("elf32-am33lin", "elf32-am33lin", "elf32-am33lin") |
| 16 | OUTPUT_ARCH(mn10300) | 17 | OUTPUT_ARCH(mn10300) |
| @@ -55,13 +56,13 @@ SECTIONS | |||
| 55 | CONSTRUCTORS | 56 | CONSTRUCTORS |
| 56 | } | 57 | } |
| 57 | 58 | ||
| 58 | . = ALIGN(4096); | 59 | . = ALIGN(PAGE_SIZE); |
| 59 | __nosave_begin = .; | 60 | __nosave_begin = .; |
| 60 | .data_nosave : { *(.data.nosave) } | 61 | .data_nosave : { *(.data.nosave) } |
| 61 | . = ALIGN(4096); | 62 | . = ALIGN(PAGE_SIZE); |
| 62 | __nosave_end = .; | 63 | __nosave_end = .; |
| 63 | 64 | ||
| 64 | . = ALIGN(4096); | 65 | . = ALIGN(PAGE_SIZE); |
| 65 | .data.page_aligned : { *(.data.idt) } | 66 | .data.page_aligned : { *(.data.idt) } |
| 66 | 67 | ||
| 67 | . = ALIGN(32); | 68 | . = ALIGN(32); |
| @@ -78,7 +79,7 @@ SECTIONS | |||
| 78 | .data.init_task : { *(.data.init_task) } | 79 | .data.init_task : { *(.data.init_task) } |
| 79 | 80 | ||
| 80 | /* might get freed after init */ | 81 | /* might get freed after init */ |
| 81 | . = ALIGN(4096); | 82 | . = ALIGN(PAGE_SIZE); |
| 82 | .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { | 83 | .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { |
| 83 | __smp_locks = .; | 84 | __smp_locks = .; |
| 84 | *(.smp_locks) | 85 | *(.smp_locks) |
| @@ -86,7 +87,7 @@ SECTIONS | |||
| 86 | } | 87 | } |
| 87 | 88 | ||
| 88 | /* will be freed after init */ | 89 | /* will be freed after init */ |
| 89 | . = ALIGN(4096); /* Init code and data */ | 90 | . = ALIGN(PAGE_SIZE); /* Init code and data */ |
| 90 | __init_begin = .; | 91 | __init_begin = .; |
| 91 | .init.text : { | 92 | .init.text : { |
| 92 | _sinittext = .; | 93 | _sinittext = .; |
| @@ -120,17 +121,14 @@ SECTIONS | |||
| 120 | .exit.data : { *(.exit.data) } | 121 | .exit.data : { *(.exit.data) } |
| 121 | 122 | ||
| 122 | #ifdef CONFIG_BLK_DEV_INITRD | 123 | #ifdef CONFIG_BLK_DEV_INITRD |
| 123 | . = ALIGN(4096); | 124 | . = ALIGN(PAGE_SIZE); |
| 124 | __initramfs_start = .; | 125 | __initramfs_start = .; |
| 125 | .init.ramfs : { *(.init.ramfs) } | 126 | .init.ramfs : { *(.init.ramfs) } |
| 126 | __initramfs_end = .; | 127 | __initramfs_end = .; |
| 127 | #endif | 128 | #endif |
| 128 | 129 | ||
| 129 | . = ALIGN(32); | 130 | PERCPU(32) |
| 130 | __per_cpu_start = .; | 131 | . = ALIGN(PAGE_SIZE); |
| 131 | .data.percpu : { *(.data.percpu) } | ||
| 132 | __per_cpu_end = .; | ||
| 133 | . = ALIGN(4096); | ||
| 134 | __init_end = .; | 132 | __init_end = .; |
| 135 | /* freed after init ends here */ | 133 | /* freed after init ends here */ |
| 136 | 134 | ||
| @@ -145,7 +143,7 @@ SECTIONS | |||
| 145 | _end = . ; | 143 | _end = . ; |
| 146 | 144 | ||
| 147 | /* This is where the kernel creates the early boot page tables */ | 145 | /* This is where the kernel creates the early boot page tables */ |
| 148 | . = ALIGN(4096); | 146 | . = ALIGN(PAGE_SIZE); |
| 149 | pg0 = .; | 147 | pg0 = .; |
| 150 | 148 | ||
| 151 | /* Sections to be discarded */ | 149 | /* Sections to be discarded */ |
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 8fc6d72849ae..3d3daa674299 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -41,6 +41,7 @@ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405 | |||
| 41 | $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 | 41 | $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 |
| 42 | $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 | 42 | $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 |
| 43 | $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 | 43 | $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 |
| 44 | $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 | ||
| 44 | $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 | 45 | $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 |
| 45 | $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 | 46 | $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 |
| 46 | 47 | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index e55ff7c47a36..07a674f5344e 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
| @@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y | |||
| 723 | # CONFIG_BROADCOM_PHY is not set | 723 | # CONFIG_BROADCOM_PHY is not set |
| 724 | # CONFIG_ICPLUS_PHY is not set | 724 | # CONFIG_ICPLUS_PHY is not set |
| 725 | # CONFIG_REALTEK_PHY is not set | 725 | # CONFIG_REALTEK_PHY is not set |
| 726 | # CONFIG_FIXED_PHY is not set | 726 | CONFIG_FIXED_PHY=y |
| 727 | # CONFIG_MDIO_BITBANG is not set | 727 | # CONFIG_MDIO_BITBANG is not set |
| 728 | # CONFIG_NET_ETHERNET is not set | 728 | # CONFIG_NET_ETHERNET is not set |
| 729 | CONFIG_NETDEV_1000=y | 729 | CONFIG_NETDEV_1000=y |
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 15eb30c9b3f9..d582014b0a38 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
| @@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y | |||
| 682 | # CONFIG_BROADCOM_PHY is not set | 682 | # CONFIG_BROADCOM_PHY is not set |
| 683 | CONFIG_ICPLUS_PHY=y | 683 | CONFIG_ICPLUS_PHY=y |
| 684 | # CONFIG_REALTEK_PHY is not set | 684 | # CONFIG_REALTEK_PHY is not set |
| 685 | # CONFIG_FIXED_PHY is not set | 685 | CONFIG_FIXED_PHY=y |
| 686 | # CONFIG_MDIO_BITBANG is not set | 686 | # CONFIG_MDIO_BITBANG is not set |
| 687 | CONFIG_NET_ETHERNET=y | 687 | CONFIG_NET_ETHERNET=y |
| 688 | CONFIG_MII=y | 688 | CONFIG_MII=y |
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S index 31c18b52affb..10b4ab1008af 100644 --- a/arch/powerpc/kernel/cpu_setup_44x.S +++ b/arch/powerpc/kernel/cpu_setup_44x.S | |||
| @@ -40,6 +40,7 @@ _GLOBAL(__setup_cpu_460gt) | |||
| 40 | mtlr r4 | 40 | mtlr r4 |
| 41 | blr | 41 | blr |
| 42 | 42 | ||
| 43 | _GLOBAL(__setup_cpu_440x5) | ||
| 43 | _GLOBAL(__setup_cpu_440gx) | 44 | _GLOBAL(__setup_cpu_440gx) |
| 44 | _GLOBAL(__setup_cpu_440spe) | 45 | _GLOBAL(__setup_cpu_440spe) |
| 45 | b __fixup_440A_mcheck | 46 | b __fixup_440A_mcheck |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index b1eb834bc0fc..7e8719504f39 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -39,6 +39,7 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec); | |||
| 39 | extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); | 39 | extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); |
| 40 | extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); | 40 | extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); |
| 41 | extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); | 41 | extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); |
| 42 | extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec); | ||
| 42 | extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); | 43 | extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); |
| 43 | extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); | 44 | extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); |
| 44 | extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); | 45 | extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); |
| @@ -1500,6 +1501,8 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 1500 | .cpu_user_features = COMMON_USER_BOOKE, | 1501 | .cpu_user_features = COMMON_USER_BOOKE, |
| 1501 | .icache_bsize = 32, | 1502 | .icache_bsize = 32, |
| 1502 | .dcache_bsize = 32, | 1503 | .dcache_bsize = 32, |
| 1504 | .cpu_setup = __setup_cpu_440x5, | ||
| 1505 | .machine_check = machine_check_440A, | ||
| 1503 | .platform = "ppc440", | 1506 | .platform = "ppc440", |
| 1504 | }, | 1507 | }, |
| 1505 | { /* 460EX */ | 1508 | { /* 460EX */ |
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index bdc8b0e860e5..5c33bc14bd9f 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
| @@ -479,17 +479,20 @@ _GLOBAL(_tlbil_pid) | |||
| 479 | * (no broadcast) | 479 | * (no broadcast) |
| 480 | */ | 480 | */ |
| 481 | _GLOBAL(_tlbil_va) | 481 | _GLOBAL(_tlbil_va) |
| 482 | mfmsr r10 | ||
| 483 | wrteei 0 | ||
| 482 | slwi r4,r4,16 | 484 | slwi r4,r4,16 |
| 483 | mtspr SPRN_MAS6,r4 /* assume AS=0 for now */ | 485 | mtspr SPRN_MAS6,r4 /* assume AS=0 for now */ |
| 484 | tlbsx 0,r3 | 486 | tlbsx 0,r3 |
| 485 | mfspr r4,SPRN_MAS1 /* check valid */ | 487 | mfspr r4,SPRN_MAS1 /* check valid */ |
| 486 | andis. r3,r4,MAS1_VALID@h | 488 | andis. r3,r4,MAS1_VALID@h |
| 487 | beqlr | 489 | beq 1f |
| 488 | rlwinm r4,r4,0,1,31 | 490 | rlwinm r4,r4,0,1,31 |
| 489 | mtspr SPRN_MAS1,r4 | 491 | mtspr SPRN_MAS1,r4 |
| 490 | tlbwe | 492 | tlbwe |
| 491 | msync | 493 | msync |
| 492 | isync | 494 | isync |
| 495 | 1: wrtee r10 | ||
| 493 | blr | 496 | blr |
| 494 | #endif /* CONFIG_FSL_BOOKE */ | 497 | #endif /* CONFIG_FSL_BOOKE */ |
| 495 | 498 | ||
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c index 29b2941cada0..45907c1dae66 100644 --- a/arch/powerpc/lib/rheap.c +++ b/arch/powerpc/lib/rheap.c | |||
| @@ -556,6 +556,7 @@ unsigned long rh_alloc_fixed(rh_info_t * info, unsigned long start, int size, co | |||
| 556 | be = blk->start + blk->size; | 556 | be = blk->start + blk->size; |
| 557 | if (s >= bs && e <= be) | 557 | if (s >= bs && e <= be) |
| 558 | break; | 558 | break; |
| 559 | blk = NULL; | ||
| 559 | } | 560 | } |
| 560 | 561 | ||
| 561 | if (blk == NULL) | 562 | if (blk == NULL) |
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 7bbf4e4ed430..f0c3b88d50fa 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
| @@ -507,6 +507,9 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | |||
| 507 | { | 507 | { |
| 508 | struct hstate *hstate = hstate_file(file); | 508 | struct hstate *hstate = hstate_file(file); |
| 509 | int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate)); | 509 | int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate)); |
| 510 | |||
| 511 | if (!mmu_huge_psizes[mmu_psize]) | ||
| 512 | return -EINVAL; | ||
| 510 | return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0); | 513 | return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0); |
| 511 | } | 514 | } |
| 512 | 515 | ||
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index a8397bbad3d4..cf81049e1e51 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
| @@ -901,10 +901,17 @@ static void mark_reserved_regions_for_nid(int nid) | |||
| 901 | if (end_pfn > node_ar.end_pfn) | 901 | if (end_pfn > node_ar.end_pfn) |
| 902 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) | 902 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) |
| 903 | - (start_pfn << PAGE_SHIFT); | 903 | - (start_pfn << PAGE_SHIFT); |
| 904 | dbg("reserve_bootmem %lx %lx nid=%d\n", physbase, | 904 | /* |
| 905 | reserve_size, node_ar.nid); | 905 | * Only worry about *this* node, others may not |
| 906 | reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase, | 906 | * yet have valid NODE_DATA(). |
| 907 | reserve_size, BOOTMEM_DEFAULT); | 907 | */ |
| 908 | if (node_ar.nid == nid) { | ||
| 909 | dbg("reserve_bootmem %lx %lx nid=%d\n", | ||
| 910 | physbase, reserve_size, node_ar.nid); | ||
| 911 | reserve_bootmem_node(NODE_DATA(node_ar.nid), | ||
| 912 | physbase, reserve_size, | ||
| 913 | BOOTMEM_DEFAULT); | ||
| 914 | } | ||
| 908 | /* | 915 | /* |
| 909 | * if reserved region is contained in the active region | 916 | * if reserved region is contained in the active region |
| 910 | * then done. | 917 | * then done. |
| @@ -929,7 +936,6 @@ static void mark_reserved_regions_for_nid(int nid) | |||
| 929 | void __init do_init_bootmem(void) | 936 | void __init do_init_bootmem(void) |
| 930 | { | 937 | { |
| 931 | int nid; | 938 | int nid; |
| 932 | unsigned int i; | ||
| 933 | 939 | ||
| 934 | min_low_pfn = 0; | 940 | min_low_pfn = 0; |
| 935 | max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT; | 941 | max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT; |
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index 442cf36aa172..0ce45c2b42f8 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c | |||
| @@ -413,6 +413,9 @@ static int axon_msi_probe(struct of_device *device, | |||
| 413 | MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE | | 413 | MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE | |
| 414 | MSIC_CTRL_FIFO_SIZE); | 414 | MSIC_CTRL_FIFO_SIZE); |
| 415 | 415 | ||
| 416 | msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG) | ||
| 417 | & MSIC_FIFO_SIZE_MASK; | ||
| 418 | |||
| 416 | device->dev.platform_data = msic; | 419 | device->dev.platform_data = msic; |
| 417 | 420 | ||
| 418 | ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; | 421 | ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 80119b3398e7..5c9cbfc14c4d 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -55,6 +55,8 @@ config GENERIC_HARDIRQS | |||
| 55 | 55 | ||
| 56 | config GENERIC_HARDIRQS_NO__DO_IRQ | 56 | config GENERIC_HARDIRQS_NO__DO_IRQ |
| 57 | def_bool y | 57 | def_bool y |
| 58 | depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \ | ||
| 59 | !SH_7751_SYSTEMH && !HD64461) | ||
| 58 | 60 | ||
| 59 | config GENERIC_IRQ_PROBE | 61 | config GENERIC_IRQ_PROBE |
| 60 | def_bool y | 62 | def_bool y |
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h index 68b98a7e6454..9cf4ae0cd7ba 100644 --- a/arch/sparc/include/asm/bitops_32.h +++ b/arch/sparc/include/asm/bitops_32.h | |||
| @@ -98,6 +98,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) | |||
| 98 | #include <asm-generic/bitops/sched.h> | 98 | #include <asm-generic/bitops/sched.h> |
| 99 | #include <asm-generic/bitops/ffs.h> | 99 | #include <asm-generic/bitops/ffs.h> |
| 100 | #include <asm-generic/bitops/fls.h> | 100 | #include <asm-generic/bitops/fls.h> |
| 101 | #include <asm-generic/bitops/__fls.h> | ||
| 101 | #include <asm-generic/bitops/fls64.h> | 102 | #include <asm-generic/bitops/fls64.h> |
| 102 | #include <asm-generic/bitops/hweight.h> | 103 | #include <asm-generic/bitops/hweight.h> |
| 103 | #include <asm-generic/bitops/lock.h> | 104 | #include <asm-generic/bitops/lock.h> |
diff --git a/arch/sparc/include/asm/ptrace_32.h b/arch/sparc/include/asm/ptrace_32.h index d409c4f21a5c..4cef450167dd 100644 --- a/arch/sparc/include/asm/ptrace_32.h +++ b/arch/sparc/include/asm/ptrace_32.h | |||
| @@ -62,6 +62,8 @@ struct sparc_stackf { | |||
| 62 | 62 | ||
| 63 | #ifdef __KERNEL__ | 63 | #ifdef __KERNEL__ |
| 64 | 64 | ||
| 65 | #include <asm/system.h> | ||
| 66 | |||
| 65 | static inline bool pt_regs_is_syscall(struct pt_regs *regs) | 67 | static inline bool pt_regs_is_syscall(struct pt_regs *regs) |
| 66 | { | 68 | { |
| 67 | return (regs->psr & PSR_SYSCALL); | 69 | return (regs->psr & PSR_SYSCALL); |
| @@ -72,6 +74,14 @@ static inline bool pt_regs_clear_syscall(struct pt_regs *regs) | |||
| 72 | return (regs->psr &= ~PSR_SYSCALL); | 74 | return (regs->psr &= ~PSR_SYSCALL); |
| 73 | } | 75 | } |
| 74 | 76 | ||
| 77 | #define arch_ptrace_stop_needed(exit_code, info) \ | ||
| 78 | ({ flush_user_windows(); \ | ||
| 79 | current_thread_info()->w_saved != 0; \ | ||
| 80 | }) | ||
| 81 | |||
| 82 | #define arch_ptrace_stop(exit_code, info) \ | ||
| 83 | synchronize_user_stack() | ||
| 84 | |||
| 75 | #define user_mode(regs) (!((regs)->psr & PSR_PS)) | 85 | #define user_mode(regs) (!((regs)->psr & PSR_PS)) |
| 76 | #define instruction_pointer(regs) ((regs)->pc) | 86 | #define instruction_pointer(regs) ((regs)->pc) |
| 77 | #define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP]) | 87 | #define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP]) |
diff --git a/arch/sparc/include/asm/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h index 84e969f06afe..cd6fbfc20435 100644 --- a/arch/sparc/include/asm/ptrace_64.h +++ b/arch/sparc/include/asm/ptrace_64.h | |||
| @@ -114,6 +114,7 @@ struct sparc_trapf { | |||
| 114 | #ifdef __KERNEL__ | 114 | #ifdef __KERNEL__ |
| 115 | 115 | ||
| 116 | #include <linux/threads.h> | 116 | #include <linux/threads.h> |
| 117 | #include <asm/system.h> | ||
| 117 | 118 | ||
| 118 | static inline int pt_regs_trap_type(struct pt_regs *regs) | 119 | static inline int pt_regs_trap_type(struct pt_regs *regs) |
| 119 | { | 120 | { |
| @@ -130,6 +131,14 @@ static inline bool pt_regs_clear_syscall(struct pt_regs *regs) | |||
| 130 | return (regs->tstate &= ~TSTATE_SYSCALL); | 131 | return (regs->tstate &= ~TSTATE_SYSCALL); |
| 131 | } | 132 | } |
| 132 | 133 | ||
| 134 | #define arch_ptrace_stop_needed(exit_code, info) \ | ||
| 135 | ({ flush_user_windows(); \ | ||
| 136 | get_thread_wsaved() != 0; \ | ||
| 137 | }) | ||
| 138 | |||
| 139 | #define arch_ptrace_stop(exit_code, info) \ | ||
| 140 | synchronize_user_stack() | ||
| 141 | |||
| 133 | struct global_reg_snapshot { | 142 | struct global_reg_snapshot { |
| 134 | unsigned long tstate; | 143 | unsigned long tstate; |
| 135 | unsigned long tpc; | 144 | unsigned long tpc; |
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index f43adbc773ca..a941c610e7ce 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c | |||
| @@ -1014,7 +1014,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
| 1014 | break; | 1014 | break; |
| 1015 | 1015 | ||
| 1016 | case PTRACE_SETFPREGS64: | 1016 | case PTRACE_SETFPREGS64: |
| 1017 | ret = copy_regset_to_user(child, view, REGSET_FP, | 1017 | ret = copy_regset_from_user(child, view, REGSET_FP, |
| 1018 | 0 * sizeof(u64), | 1018 | 0 * sizeof(u64), |
| 1019 | 33 * sizeof(u64), | 1019 | 33 * sizeof(u64), |
| 1020 | fps); | 1020 | fps); |
diff --git a/arch/sparc64/kernel/visemul.c b/arch/sparc64/kernel/visemul.c index 9e05cb5cb855..b956fd71c131 100644 --- a/arch/sparc64/kernel/visemul.c +++ b/arch/sparc64/kernel/visemul.c | |||
| @@ -131,7 +131,7 @@ | |||
| 131 | #define VIS_OPF_SHIFT 5 | 131 | #define VIS_OPF_SHIFT 5 |
| 132 | #define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT) | 132 | #define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT) |
| 133 | 133 | ||
| 134 | #define RS1(INSN) (((INSN) >> 24) & 0x1f) | 134 | #define RS1(INSN) (((INSN) >> 14) & 0x1f) |
| 135 | #define RS2(INSN) (((INSN) >> 0) & 0x1f) | 135 | #define RS2(INSN) (((INSN) >> 0) & 0x1f) |
| 136 | #define RD(INSN) (((INSN) >> 25) & 0x1f) | 136 | #define RD(INSN) (((INSN) >> 25) & 0x1f) |
| 137 | 137 | ||
| @@ -445,7 +445,7 @@ static void pdist(struct pt_regs *regs, unsigned int insn) | |||
| 445 | unsigned long i; | 445 | unsigned long i; |
| 446 | 446 | ||
| 447 | rs1 = fpd_regval(f, RS1(insn)); | 447 | rs1 = fpd_regval(f, RS1(insn)); |
| 448 | rs2 = fpd_regval(f, RS1(insn)); | 448 | rs2 = fpd_regval(f, RS2(insn)); |
| 449 | rd = fpd_regaddr(f, RD(insn)); | 449 | rd = fpd_regaddr(f, RD(insn)); |
| 450 | 450 | ||
| 451 | rd_val = *rd; | 451 | rd_val = *rd; |
| @@ -807,6 +807,8 @@ int vis_emul(struct pt_regs *regs, unsigned int insn) | |||
| 807 | if (get_user(insn, (u32 __user *) pc)) | 807 | if (get_user(insn, (u32 __user *) pc)) |
| 808 | return -EFAULT; | 808 | return -EFAULT; |
| 809 | 809 | ||
| 810 | save_and_clear_fpu(); | ||
| 811 | |||
| 810 | opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT; | 812 | opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT; |
| 811 | switch (opf) { | 813 | switch (opf) { |
| 812 | default: | 814 | default: |
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 19d579d74d27..8f44ebb0dec8 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
| @@ -16,6 +16,8 @@ | |||
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/syscalls.h> | 17 | #include <linux/syscalls.h> |
| 18 | #include <linux/utsname.h> | 18 | #include <linux/utsname.h> |
| 19 | #include <linux/socket.h> | ||
| 20 | #include <linux/un.h> | ||
| 19 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
| 20 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
| 21 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
| @@ -785,7 +787,7 @@ static int __init mconsole_init(void) | |||
| 785 | /* long to avoid size mismatch warnings from gcc */ | 787 | /* long to avoid size mismatch warnings from gcc */ |
| 786 | long sock; | 788 | long sock; |
| 787 | int err; | 789 | int err; |
| 788 | char file[256]; | 790 | char file[UNIX_PATH_MAX]; |
| 789 | 791 | ||
| 790 | if (umid_file_name("mconsole", file, sizeof(file))) | 792 | if (umid_file_name("mconsole", file, sizeof(file))) |
| 791 | return -1; | 793 | return -1; |
diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h index 1a30c0440c6b..ac302a2fa339 100644 --- a/arch/x86/include/asm/amd_iommu_types.h +++ b/arch/x86/include/asm/amd_iommu_types.h | |||
| @@ -251,13 +251,6 @@ struct amd_iommu { | |||
| 251 | /* Pointer to PCI device of this IOMMU */ | 251 | /* Pointer to PCI device of this IOMMU */ |
| 252 | struct pci_dev *dev; | 252 | struct pci_dev *dev; |
| 253 | 253 | ||
| 254 | /* | ||
| 255 | * Capability pointer. There could be more than one IOMMU per PCI | ||
| 256 | * device function if there are more than one AMD IOMMU capability | ||
| 257 | * pointers. | ||
| 258 | */ | ||
| 259 | u16 cap_ptr; | ||
| 260 | |||
| 261 | /* physical address of MMIO space */ | 254 | /* physical address of MMIO space */ |
| 262 | u64 mmio_phys; | 255 | u64 mmio_phys; |
| 263 | /* virtual address of MMIO space */ | 256 | /* virtual address of MMIO space */ |
| @@ -266,6 +259,13 @@ struct amd_iommu { | |||
| 266 | /* capabilities of that IOMMU read from ACPI */ | 259 | /* capabilities of that IOMMU read from ACPI */ |
| 267 | u32 cap; | 260 | u32 cap; |
| 268 | 261 | ||
| 262 | /* | ||
| 263 | * Capability pointer. There could be more than one IOMMU per PCI | ||
| 264 | * device function if there are more than one AMD IOMMU capability | ||
| 265 | * pointers. | ||
| 266 | */ | ||
| 267 | u16 cap_ptr; | ||
| 268 | |||
| 269 | /* pci domain of this IOMMU */ | 269 | /* pci domain of this IOMMU */ |
| 270 | u16 pci_seg; | 270 | u16 pci_seg; |
| 271 | 271 | ||
| @@ -284,19 +284,19 @@ struct amd_iommu { | |||
| 284 | /* size of command buffer */ | 284 | /* size of command buffer */ |
| 285 | u32 cmd_buf_size; | 285 | u32 cmd_buf_size; |
| 286 | 286 | ||
| 287 | /* event buffer virtual address */ | ||
| 288 | u8 *evt_buf; | ||
| 289 | /* size of event buffer */ | 287 | /* size of event buffer */ |
| 290 | u32 evt_buf_size; | 288 | u32 evt_buf_size; |
| 289 | /* event buffer virtual address */ | ||
| 290 | u8 *evt_buf; | ||
| 291 | /* MSI number for event interrupt */ | 291 | /* MSI number for event interrupt */ |
| 292 | u16 evt_msi_num; | 292 | u16 evt_msi_num; |
| 293 | 293 | ||
| 294 | /* if one, we need to send a completion wait command */ | ||
| 295 | int need_sync; | ||
| 296 | |||
| 297 | /* true if interrupts for this IOMMU are already enabled */ | 294 | /* true if interrupts for this IOMMU are already enabled */ |
| 298 | bool int_enabled; | 295 | bool int_enabled; |
| 299 | 296 | ||
| 297 | /* if one, we need to send a completion wait command */ | ||
| 298 | int need_sync; | ||
| 299 | |||
| 300 | /* default dma_ops domain for that IOMMU */ | 300 | /* default dma_ops domain for that IOMMU */ |
| 301 | struct dma_ops_domain *default_dom; | 301 | struct dma_ops_domain *default_dom; |
| 302 | }; | 302 | }; |
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 7f225a4b2a26..097794ff6b79 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h | |||
| @@ -71,15 +71,13 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev) | |||
| 71 | /* Make sure we keep the same behaviour */ | 71 | /* Make sure we keep the same behaviour */ |
| 72 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | 72 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) |
| 73 | { | 73 | { |
| 74 | #ifdef CONFIG_X86_32 | 74 | #ifdef CONFIG_X86_64 |
| 75 | return 0; | ||
| 76 | #else | ||
| 77 | struct dma_mapping_ops *ops = get_dma_ops(dev); | 75 | struct dma_mapping_ops *ops = get_dma_ops(dev); |
| 78 | if (ops->mapping_error) | 76 | if (ops->mapping_error) |
| 79 | return ops->mapping_error(dev, dma_addr); | 77 | return ops->mapping_error(dev, dma_addr); |
| 80 | 78 | ||
| 81 | return (dma_addr == bad_dma_address); | ||
| 82 | #endif | 79 | #endif |
| 80 | return (dma_addr == bad_dma_address); | ||
| 83 | } | 81 | } |
| 84 | 82 | ||
| 85 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | 83 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) |
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 4850e4b02b61..ff386ff50ed7 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -239,7 +239,7 @@ struct pci_bus; | |||
| 239 | void set_pci_bus_resources_arch_default(struct pci_bus *b); | 239 | void set_pci_bus_resources_arch_default(struct pci_bus *b); |
| 240 | 240 | ||
| 241 | #ifdef CONFIG_SMP | 241 | #ifdef CONFIG_SMP |
| 242 | #define mc_capable() (boot_cpu_data.x86_max_cores > 1) | 242 | #define mc_capable() (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids) |
| 243 | #define smt_capable() (smp_num_siblings > 1) | 243 | #define smt_capable() (smp_num_siblings > 1) |
| 244 | #endif | 244 | #endif |
| 245 | 245 | ||
diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h index b7c0dea119fe..61e08c0a2907 100644 --- a/arch/x86/include/asm/vmi.h +++ b/arch/x86/include/asm/vmi.h | |||
| @@ -223,9 +223,15 @@ struct pci_header { | |||
| 223 | } __attribute__((packed)); | 223 | } __attribute__((packed)); |
| 224 | 224 | ||
| 225 | /* Function prototypes for bootstrapping */ | 225 | /* Function prototypes for bootstrapping */ |
| 226 | #ifdef CONFIG_VMI | ||
| 226 | extern void vmi_init(void); | 227 | extern void vmi_init(void); |
| 228 | extern void vmi_activate(void); | ||
| 227 | extern void vmi_bringup(void); | 229 | extern void vmi_bringup(void); |
| 228 | extern void vmi_apply_boot_page_allocations(void); | 230 | #else |
| 231 | static inline void vmi_init(void) {} | ||
| 232 | static inline void vmi_activate(void) {} | ||
| 233 | static inline void vmi_bringup(void) {} | ||
| 234 | #endif | ||
| 229 | 235 | ||
| 230 | /* State needed to start an application processor in an SMP system. */ | 236 | /* State needed to start an application processor in an SMP system. */ |
| 231 | struct vmi_ap_state { | 237 | struct vmi_ap_state { |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index e4899e0e8787..0a60d60ed036 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
| @@ -187,6 +187,8 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd) | |||
| 187 | 187 | ||
| 188 | spin_lock_irqsave(&iommu->lock, flags); | 188 | spin_lock_irqsave(&iommu->lock, flags); |
| 189 | ret = __iommu_queue_command(iommu, cmd); | 189 | ret = __iommu_queue_command(iommu, cmd); |
| 190 | if (!ret) | ||
| 191 | iommu->need_sync = 1; | ||
| 190 | spin_unlock_irqrestore(&iommu->lock, flags); | 192 | spin_unlock_irqrestore(&iommu->lock, flags); |
| 191 | 193 | ||
| 192 | return ret; | 194 | return ret; |
| @@ -210,10 +212,13 @@ static int iommu_completion_wait(struct amd_iommu *iommu) | |||
| 210 | cmd.data[0] = CMD_COMPL_WAIT_INT_MASK; | 212 | cmd.data[0] = CMD_COMPL_WAIT_INT_MASK; |
| 211 | CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); | 213 | CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); |
| 212 | 214 | ||
| 213 | iommu->need_sync = 0; | ||
| 214 | |||
| 215 | spin_lock_irqsave(&iommu->lock, flags); | 215 | spin_lock_irqsave(&iommu->lock, flags); |
| 216 | 216 | ||
| 217 | if (!iommu->need_sync) | ||
| 218 | goto out; | ||
| 219 | |||
| 220 | iommu->need_sync = 0; | ||
| 221 | |||
| 217 | ret = __iommu_queue_command(iommu, &cmd); | 222 | ret = __iommu_queue_command(iommu, &cmd); |
| 218 | 223 | ||
| 219 | if (ret) | 224 | if (ret) |
| @@ -230,8 +235,9 @@ static int iommu_completion_wait(struct amd_iommu *iommu) | |||
| 230 | status &= ~MMIO_STATUS_COM_WAIT_INT_MASK; | 235 | status &= ~MMIO_STATUS_COM_WAIT_INT_MASK; |
| 231 | writel(status, iommu->mmio_base + MMIO_STATUS_OFFSET); | 236 | writel(status, iommu->mmio_base + MMIO_STATUS_OFFSET); |
| 232 | 237 | ||
| 233 | if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit())) | 238 | if (unlikely(i == EXIT_LOOP_COUNT)) |
| 234 | printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n"); | 239 | panic("AMD IOMMU: Completion wait loop failed\n"); |
| 240 | |||
| 235 | out: | 241 | out: |
| 236 | spin_unlock_irqrestore(&iommu->lock, flags); | 242 | spin_unlock_irqrestore(&iommu->lock, flags); |
| 237 | 243 | ||
| @@ -254,8 +260,6 @@ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid) | |||
| 254 | 260 | ||
| 255 | ret = iommu_queue_command(iommu, &cmd); | 261 | ret = iommu_queue_command(iommu, &cmd); |
| 256 | 262 | ||
| 257 | iommu->need_sync = 1; | ||
| 258 | |||
| 259 | return ret; | 263 | return ret; |
| 260 | } | 264 | } |
| 261 | 265 | ||
| @@ -281,8 +285,6 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu, | |||
| 281 | 285 | ||
| 282 | ret = iommu_queue_command(iommu, &cmd); | 286 | ret = iommu_queue_command(iommu, &cmd); |
| 283 | 287 | ||
| 284 | iommu->need_sync = 1; | ||
| 285 | |||
| 286 | return ret; | 288 | return ret; |
| 287 | } | 289 | } |
| 288 | 290 | ||
| @@ -343,7 +345,7 @@ static int iommu_map(struct protection_domain *dom, | |||
| 343 | u64 __pte, *pte, *page; | 345 | u64 __pte, *pte, *page; |
| 344 | 346 | ||
| 345 | bus_addr = PAGE_ALIGN(bus_addr); | 347 | bus_addr = PAGE_ALIGN(bus_addr); |
| 346 | phys_addr = PAGE_ALIGN(bus_addr); | 348 | phys_addr = PAGE_ALIGN(phys_addr); |
| 347 | 349 | ||
| 348 | /* only support 512GB address spaces for now */ | 350 | /* only support 512GB address spaces for now */ |
| 349 | if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK)) | 351 | if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK)) |
| @@ -599,7 +601,7 @@ static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom) | |||
| 599 | continue; | 601 | continue; |
| 600 | 602 | ||
| 601 | p2 = IOMMU_PTE_PAGE(p1[i]); | 603 | p2 = IOMMU_PTE_PAGE(p1[i]); |
| 602 | for (j = 0; j < 512; ++i) { | 604 | for (j = 0; j < 512; ++j) { |
| 603 | if (!IOMMU_PTE_PRESENT(p2[j])) | 605 | if (!IOMMU_PTE_PRESENT(p2[j])) |
| 604 | continue; | 606 | continue; |
| 605 | p3 = IOMMU_PTE_PAGE(p2[j]); | 607 | p3 = IOMMU_PTE_PAGE(p2[j]); |
| @@ -762,8 +764,6 @@ static void set_device_domain(struct amd_iommu *iommu, | |||
| 762 | write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); | 764 | write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); |
| 763 | 765 | ||
| 764 | iommu_queue_inv_dev_entry(iommu, devid); | 766 | iommu_queue_inv_dev_entry(iommu, devid); |
| 765 | |||
| 766 | iommu->need_sync = 1; | ||
| 767 | } | 767 | } |
| 768 | 768 | ||
| 769 | /***************************************************************************** | 769 | /***************************************************************************** |
| @@ -858,6 +858,9 @@ static int get_device_resources(struct device *dev, | |||
| 858 | print_devid(_bdf, 1); | 858 | print_devid(_bdf, 1); |
| 859 | } | 859 | } |
| 860 | 860 | ||
| 861 | if (domain_for_device(_bdf) == NULL) | ||
| 862 | set_device_domain(*iommu, *domain, _bdf); | ||
| 863 | |||
| 861 | return 1; | 864 | return 1; |
| 862 | } | 865 | } |
| 863 | 866 | ||
| @@ -908,7 +911,7 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu, | |||
| 908 | if (address >= dom->aperture_size) | 911 | if (address >= dom->aperture_size) |
| 909 | return; | 912 | return; |
| 910 | 913 | ||
| 911 | WARN_ON(address & 0xfffULL || address > dom->aperture_size); | 914 | WARN_ON(address & ~PAGE_MASK || address >= dom->aperture_size); |
| 912 | 915 | ||
| 913 | pte = dom->pte_pages[IOMMU_PTE_L1_INDEX(address)]; | 916 | pte = dom->pte_pages[IOMMU_PTE_L1_INDEX(address)]; |
| 914 | pte += IOMMU_PTE_L0_INDEX(address); | 917 | pte += IOMMU_PTE_L0_INDEX(address); |
| @@ -920,8 +923,8 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu, | |||
| 920 | 923 | ||
| 921 | /* | 924 | /* |
| 922 | * This function contains common code for mapping of a physically | 925 | * This function contains common code for mapping of a physically |
| 923 | * contiguous memory region into DMA address space. It is uses by all | 926 | * contiguous memory region into DMA address space. It is used by all |
| 924 | * mapping functions provided by this IOMMU driver. | 927 | * mapping functions provided with this IOMMU driver. |
| 925 | * Must be called with the domain lock held. | 928 | * Must be called with the domain lock held. |
| 926 | */ | 929 | */ |
| 927 | static dma_addr_t __map_single(struct device *dev, | 930 | static dma_addr_t __map_single(struct device *dev, |
| @@ -981,7 +984,8 @@ static void __unmap_single(struct amd_iommu *iommu, | |||
| 981 | dma_addr_t i, start; | 984 | dma_addr_t i, start; |
| 982 | unsigned int pages; | 985 | unsigned int pages; |
| 983 | 986 | ||
| 984 | if ((dma_addr == 0) || (dma_addr + size > dma_dom->aperture_size)) | 987 | if ((dma_addr == bad_dma_address) || |
| 988 | (dma_addr + size > dma_dom->aperture_size)) | ||
| 985 | return; | 989 | return; |
| 986 | 990 | ||
| 987 | pages = iommu_num_pages(dma_addr, size, PAGE_SIZE); | 991 | pages = iommu_num_pages(dma_addr, size, PAGE_SIZE); |
| @@ -1031,8 +1035,7 @@ static dma_addr_t map_single(struct device *dev, phys_addr_t paddr, | |||
| 1031 | if (addr == bad_dma_address) | 1035 | if (addr == bad_dma_address) |
| 1032 | goto out; | 1036 | goto out; |
| 1033 | 1037 | ||
| 1034 | if (unlikely(iommu->need_sync)) | 1038 | iommu_completion_wait(iommu); |
| 1035 | iommu_completion_wait(iommu); | ||
| 1036 | 1039 | ||
| 1037 | out: | 1040 | out: |
| 1038 | spin_unlock_irqrestore(&domain->lock, flags); | 1041 | spin_unlock_irqrestore(&domain->lock, flags); |
| @@ -1060,8 +1063,7 @@ static void unmap_single(struct device *dev, dma_addr_t dma_addr, | |||
| 1060 | 1063 | ||
| 1061 | __unmap_single(iommu, domain->priv, dma_addr, size, dir); | 1064 | __unmap_single(iommu, domain->priv, dma_addr, size, dir); |
| 1062 | 1065 | ||
| 1063 | if (unlikely(iommu->need_sync)) | 1066 | iommu_completion_wait(iommu); |
| 1064 | iommu_completion_wait(iommu); | ||
| 1065 | 1067 | ||
| 1066 | spin_unlock_irqrestore(&domain->lock, flags); | 1068 | spin_unlock_irqrestore(&domain->lock, flags); |
| 1067 | } | 1069 | } |
| @@ -1127,8 +1129,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, | |||
| 1127 | goto unmap; | 1129 | goto unmap; |
| 1128 | } | 1130 | } |
| 1129 | 1131 | ||
| 1130 | if (unlikely(iommu->need_sync)) | 1132 | iommu_completion_wait(iommu); |
| 1131 | iommu_completion_wait(iommu); | ||
| 1132 | 1133 | ||
| 1133 | out: | 1134 | out: |
| 1134 | spin_unlock_irqrestore(&domain->lock, flags); | 1135 | spin_unlock_irqrestore(&domain->lock, flags); |
| @@ -1173,8 +1174,7 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist, | |||
| 1173 | s->dma_address = s->dma_length = 0; | 1174 | s->dma_address = s->dma_length = 0; |
| 1174 | } | 1175 | } |
| 1175 | 1176 | ||
| 1176 | if (unlikely(iommu->need_sync)) | 1177 | iommu_completion_wait(iommu); |
| 1177 | iommu_completion_wait(iommu); | ||
| 1178 | 1178 | ||
| 1179 | spin_unlock_irqrestore(&domain->lock, flags); | 1179 | spin_unlock_irqrestore(&domain->lock, flags); |
| 1180 | } | 1180 | } |
| @@ -1225,8 +1225,7 @@ static void *alloc_coherent(struct device *dev, size_t size, | |||
| 1225 | goto out; | 1225 | goto out; |
| 1226 | } | 1226 | } |
| 1227 | 1227 | ||
| 1228 | if (unlikely(iommu->need_sync)) | 1228 | iommu_completion_wait(iommu); |
| 1229 | iommu_completion_wait(iommu); | ||
| 1230 | 1229 | ||
| 1231 | out: | 1230 | out: |
| 1232 | spin_unlock_irqrestore(&domain->lock, flags); | 1231 | spin_unlock_irqrestore(&domain->lock, flags); |
| @@ -1257,8 +1256,7 @@ static void free_coherent(struct device *dev, size_t size, | |||
| 1257 | 1256 | ||
| 1258 | __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL); | 1257 | __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL); |
| 1259 | 1258 | ||
| 1260 | if (unlikely(iommu->need_sync)) | 1259 | iommu_completion_wait(iommu); |
| 1261 | iommu_completion_wait(iommu); | ||
| 1262 | 1260 | ||
| 1263 | spin_unlock_irqrestore(&domain->lock, flags); | 1261 | spin_unlock_irqrestore(&domain->lock, flags); |
| 1264 | 1262 | ||
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 30ae2701b3df..c6cc22815d35 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
| @@ -427,6 +427,10 @@ static u8 * __init alloc_command_buffer(struct amd_iommu *iommu) | |||
| 427 | memcpy_toio(iommu->mmio_base + MMIO_CMD_BUF_OFFSET, | 427 | memcpy_toio(iommu->mmio_base + MMIO_CMD_BUF_OFFSET, |
| 428 | &entry, sizeof(entry)); | 428 | &entry, sizeof(entry)); |
| 429 | 429 | ||
| 430 | /* set head and tail to zero manually */ | ||
| 431 | writel(0x00, iommu->mmio_base + MMIO_CMD_HEAD_OFFSET); | ||
| 432 | writel(0x00, iommu->mmio_base + MMIO_CMD_TAIL_OFFSET); | ||
| 433 | |||
| 430 | iommu_feature_enable(iommu, CONTROL_CMDBUF_EN); | 434 | iommu_feature_enable(iommu, CONTROL_CMDBUF_EN); |
| 431 | 435 | ||
| 432 | return cmd_buf; | 436 | return cmd_buf; |
| @@ -1074,7 +1078,8 @@ int __init amd_iommu_init(void) | |||
| 1074 | goto free; | 1078 | goto free; |
| 1075 | 1079 | ||
| 1076 | /* IOMMU rlookup table - find the IOMMU for a specific device */ | 1080 | /* IOMMU rlookup table - find the IOMMU for a specific device */ |
| 1077 | amd_iommu_rlookup_table = (void *)__get_free_pages(GFP_KERNEL, | 1081 | amd_iommu_rlookup_table = (void *)__get_free_pages( |
| 1082 | GFP_KERNEL | __GFP_ZERO, | ||
| 1078 | get_order(rlookup_table_size)); | 1083 | get_order(rlookup_table_size)); |
| 1079 | if (amd_iommu_rlookup_table == NULL) | 1084 | if (amd_iommu_rlookup_table == NULL) |
| 1080 | goto free; | 1085 | goto free; |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index 4b031a4ac856..1c838032fd37 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c | |||
| @@ -510,12 +510,9 @@ static void __cpuinit mce_cpu_features(struct cpuinfo_x86 *c) | |||
| 510 | */ | 510 | */ |
| 511 | void __cpuinit mcheck_init(struct cpuinfo_x86 *c) | 511 | void __cpuinit mcheck_init(struct cpuinfo_x86 *c) |
| 512 | { | 512 | { |
| 513 | static cpumask_t mce_cpus = CPU_MASK_NONE; | ||
| 514 | |||
| 515 | mce_cpu_quirks(c); | 513 | mce_cpu_quirks(c); |
| 516 | 514 | ||
| 517 | if (mce_dont_init || | 515 | if (mce_dont_init || |
| 518 | cpu_test_and_set(smp_processor_id(), mce_cpus) || | ||
| 519 | !mce_available(c)) | 516 | !mce_available(c)) |
| 520 | return; | 517 | return; |
| 521 | 518 | ||
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c index 82fb2809ce32..c4b5b24e0217 100644 --- a/arch/x86/kernel/microcode_core.c +++ b/arch/x86/kernel/microcode_core.c | |||
| @@ -272,13 +272,18 @@ static struct attribute_group mc_attr_group = { | |||
| 272 | .name = "microcode", | 272 | .name = "microcode", |
| 273 | }; | 273 | }; |
| 274 | 274 | ||
| 275 | static void microcode_fini_cpu(int cpu) | 275 | static void __microcode_fini_cpu(int cpu) |
| 276 | { | 276 | { |
| 277 | struct ucode_cpu_info *uci = ucode_cpu_info + cpu; | 277 | struct ucode_cpu_info *uci = ucode_cpu_info + cpu; |
| 278 | 278 | ||
| 279 | mutex_lock(µcode_mutex); | ||
| 280 | microcode_ops->microcode_fini_cpu(cpu); | 279 | microcode_ops->microcode_fini_cpu(cpu); |
| 281 | uci->valid = 0; | 280 | uci->valid = 0; |
| 281 | } | ||
| 282 | |||
| 283 | static void microcode_fini_cpu(int cpu) | ||
| 284 | { | ||
| 285 | mutex_lock(µcode_mutex); | ||
| 286 | __microcode_fini_cpu(cpu); | ||
| 282 | mutex_unlock(µcode_mutex); | 287 | mutex_unlock(µcode_mutex); |
| 283 | } | 288 | } |
| 284 | 289 | ||
| @@ -306,12 +311,16 @@ static int microcode_resume_cpu(int cpu) | |||
| 306 | * to this cpu (a bit of paranoia): | 311 | * to this cpu (a bit of paranoia): |
| 307 | */ | 312 | */ |
| 308 | if (microcode_ops->collect_cpu_info(cpu, &nsig)) { | 313 | if (microcode_ops->collect_cpu_info(cpu, &nsig)) { |
| 309 | microcode_fini_cpu(cpu); | 314 | __microcode_fini_cpu(cpu); |
| 315 | printk(KERN_ERR "failed to collect_cpu_info for resuming cpu #%d\n", | ||
| 316 | cpu); | ||
| 310 | return -1; | 317 | return -1; |
| 311 | } | 318 | } |
| 312 | 319 | ||
| 313 | if (memcmp(&nsig, &uci->cpu_sig, sizeof(nsig))) { | 320 | if ((nsig.sig != uci->cpu_sig.sig) || (nsig.pf != uci->cpu_sig.pf)) { |
| 314 | microcode_fini_cpu(cpu); | 321 | __microcode_fini_cpu(cpu); |
| 322 | printk(KERN_ERR "cached ucode doesn't match the resuming cpu #%d\n", | ||
| 323 | cpu); | ||
| 315 | /* Should we look for a new ucode here? */ | 324 | /* Should we look for a new ucode here? */ |
| 316 | return 1; | 325 | return 1; |
| 317 | } | 326 | } |
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c index 622dc4a21784..a8e62792d171 100644 --- a/arch/x86/kernel/microcode_intel.c +++ b/arch/x86/kernel/microcode_intel.c | |||
| @@ -155,6 +155,7 @@ static DEFINE_SPINLOCK(microcode_update_lock); | |||
| 155 | static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) | 155 | static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) |
| 156 | { | 156 | { |
| 157 | struct cpuinfo_x86 *c = &cpu_data(cpu_num); | 157 | struct cpuinfo_x86 *c = &cpu_data(cpu_num); |
| 158 | unsigned long flags; | ||
| 158 | unsigned int val[2]; | 159 | unsigned int val[2]; |
| 159 | 160 | ||
| 160 | memset(csig, 0, sizeof(*csig)); | 161 | memset(csig, 0, sizeof(*csig)); |
| @@ -174,11 +175,16 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) | |||
| 174 | csig->pf = 1 << ((val[1] >> 18) & 7); | 175 | csig->pf = 1 << ((val[1] >> 18) & 7); |
| 175 | } | 176 | } |
| 176 | 177 | ||
| 178 | /* serialize access to the physical write to MSR 0x79 */ | ||
| 179 | spin_lock_irqsave(µcode_update_lock, flags); | ||
| 180 | |||
| 177 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); | 181 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); |
| 178 | /* see notes above for revision 1.07. Apparent chip bug */ | 182 | /* see notes above for revision 1.07. Apparent chip bug */ |
| 179 | sync_core(); | 183 | sync_core(); |
| 180 | /* get the current revision from MSR 0x8B */ | 184 | /* get the current revision from MSR 0x8B */ |
| 181 | rdmsr(MSR_IA32_UCODE_REV, val[0], csig->rev); | 185 | rdmsr(MSR_IA32_UCODE_REV, val[0], csig->rev); |
| 186 | spin_unlock_irqrestore(µcode_update_lock, flags); | ||
| 187 | |||
| 182 | pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n", | 188 | pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n", |
| 183 | csig->sig, csig->pf, csig->rev); | 189 | csig->sig, csig->pf, csig->rev); |
| 184 | 190 | ||
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index f98f4e1dba09..0f4c1fd5a1f4 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
| @@ -604,6 +604,9 @@ static void __init __get_smp_config(unsigned int early) | |||
| 604 | printk(KERN_INFO "Using ACPI for processor (LAPIC) " | 604 | printk(KERN_INFO "Using ACPI for processor (LAPIC) " |
| 605 | "configuration information\n"); | 605 | "configuration information\n"); |
| 606 | 606 | ||
| 607 | if (!mpf) | ||
| 608 | return; | ||
| 609 | |||
| 607 | printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", | 610 | printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", |
| 608 | mpf->mpf_specification); | 611 | mpf->mpf_specification); |
| 609 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) | 612 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) |
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c index 0e9f1982b1dd..95777b0faa73 100644 --- a/arch/x86/kernel/paravirt-spinlocks.c +++ b/arch/x86/kernel/paravirt-spinlocks.c | |||
| @@ -7,7 +7,8 @@ | |||
| 7 | 7 | ||
| 8 | #include <asm/paravirt.h> | 8 | #include <asm/paravirt.h> |
| 9 | 9 | ||
| 10 | static void default_spin_lock_flags(struct raw_spinlock *lock, unsigned long flags) | 10 | static inline void |
| 11 | default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags) | ||
| 11 | { | 12 | { |
| 12 | __raw_spin_lock(lock); | 13 | __raw_spin_lock(lock); |
| 13 | } | 14 | } |
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index a42b02b4df68..a35eaa379ff6 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
| @@ -123,6 +123,8 @@ static void free_iommu(unsigned long offset, int size) | |||
| 123 | 123 | ||
| 124 | spin_lock_irqsave(&iommu_bitmap_lock, flags); | 124 | spin_lock_irqsave(&iommu_bitmap_lock, flags); |
| 125 | iommu_area_free(iommu_gart_bitmap, offset, size); | 125 | iommu_area_free(iommu_gart_bitmap, offset, size); |
| 126 | if (offset >= next_bit) | ||
| 127 | next_bit = offset + size; | ||
| 126 | spin_unlock_irqrestore(&iommu_bitmap_lock, flags); | 128 | spin_unlock_irqrestore(&iommu_bitmap_lock, flags); |
| 127 | } | 129 | } |
| 128 | 130 | ||
| @@ -743,10 +745,8 @@ void __init gart_iommu_init(void) | |||
| 743 | unsigned long scratch; | 745 | unsigned long scratch; |
| 744 | long i; | 746 | long i; |
| 745 | 747 | ||
| 746 | if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) { | 748 | if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) |
| 747 | printk(KERN_INFO "PCI-GART: No AMD GART found.\n"); | ||
| 748 | return; | 749 | return; |
| 749 | } | ||
| 750 | 750 | ||
| 751 | #ifndef CONFIG_AGP_AMD64 | 751 | #ifndef CONFIG_AGP_AMD64 |
| 752 | no_agp = 1; | 752 | no_agp = 1; |
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 9d5674f7b6cc..bdec76e55594 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -794,6 +794,9 @@ void __init setup_arch(char **cmdline_p) | |||
| 794 | printk(KERN_INFO "Command line: %s\n", boot_command_line); | 794 | printk(KERN_INFO "Command line: %s\n", boot_command_line); |
| 795 | #endif | 795 | #endif |
| 796 | 796 | ||
| 797 | /* VMI may relocate the fixmap; do this before touching ioremap area */ | ||
| 798 | vmi_init(); | ||
| 799 | |||
| 797 | early_cpu_init(); | 800 | early_cpu_init(); |
| 798 | early_ioremap_init(); | 801 | early_ioremap_init(); |
| 799 | 802 | ||
| @@ -880,13 +883,8 @@ void __init setup_arch(char **cmdline_p) | |||
| 880 | check_efer(); | 883 | check_efer(); |
| 881 | #endif | 884 | #endif |
| 882 | 885 | ||
| 883 | #if defined(CONFIG_VMI) && defined(CONFIG_X86_32) | 886 | /* Must be before kernel pagetables are setup */ |
| 884 | /* | 887 | vmi_activate(); |
| 885 | * Must be before kernel pagetables are setup | ||
| 886 | * or fixmap area is touched. | ||
| 887 | */ | ||
| 888 | vmi_init(); | ||
| 889 | #endif | ||
| 890 | 888 | ||
| 891 | /* after early param, so could get panic from serial */ | 889 | /* after early param, so could get panic from serial */ |
| 892 | reserve_early_setup_data(); | 890 | reserve_early_setup_data(); |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 7b1093397319..f71f96fc9e62 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -294,9 +294,7 @@ static void __cpuinit start_secondary(void *unused) | |||
| 294 | * fragile that we want to limit the things done here to the | 294 | * fragile that we want to limit the things done here to the |
| 295 | * most necessary things. | 295 | * most necessary things. |
| 296 | */ | 296 | */ |
| 297 | #ifdef CONFIG_VMI | ||
| 298 | vmi_bringup(); | 297 | vmi_bringup(); |
| 299 | #endif | ||
| 300 | cpu_init(); | 298 | cpu_init(); |
| 301 | preempt_disable(); | 299 | preempt_disable(); |
| 302 | smp_callin(); | 300 | smp_callin(); |
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index 8b6c393ab9fd..22fd6577156a 100644 --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c | |||
| @@ -960,8 +960,6 @@ static inline int __init activate_vmi(void) | |||
| 960 | 960 | ||
| 961 | void __init vmi_init(void) | 961 | void __init vmi_init(void) |
| 962 | { | 962 | { |
| 963 | unsigned long flags; | ||
| 964 | |||
| 965 | if (!vmi_rom) | 963 | if (!vmi_rom) |
| 966 | probe_vmi_rom(); | 964 | probe_vmi_rom(); |
| 967 | else | 965 | else |
| @@ -973,13 +971,21 @@ void __init vmi_init(void) | |||
| 973 | 971 | ||
| 974 | reserve_top_address(-vmi_rom->virtual_top); | 972 | reserve_top_address(-vmi_rom->virtual_top); |
| 975 | 973 | ||
| 976 | local_irq_save(flags); | ||
| 977 | activate_vmi(); | ||
| 978 | |||
| 979 | #ifdef CONFIG_X86_IO_APIC | 974 | #ifdef CONFIG_X86_IO_APIC |
| 980 | /* This is virtual hardware; timer routing is wired correctly */ | 975 | /* This is virtual hardware; timer routing is wired correctly */ |
| 981 | no_timer_check = 1; | 976 | no_timer_check = 1; |
| 982 | #endif | 977 | #endif |
| 978 | } | ||
| 979 | |||
| 980 | void vmi_activate(void) | ||
| 981 | { | ||
| 982 | unsigned long flags; | ||
| 983 | |||
| 984 | if (!vmi_rom) | ||
| 985 | return; | ||
| 986 | |||
| 987 | local_irq_save(flags); | ||
| 988 | activate_vmi(); | ||
| 983 | local_irq_restore(flags & X86_EFLAGS_IF); | 989 | local_irq_restore(flags & X86_EFLAGS_IF); |
| 984 | } | 990 | } |
| 985 | 991 | ||
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 022cd41ea9b4..202864ad49a7 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
| @@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type) | |||
| 401 | *cpu_type = "i386/pii"; | 401 | *cpu_type = "i386/pii"; |
| 402 | break; | 402 | break; |
| 403 | case 6 ... 8: | 403 | case 6 ... 8: |
| 404 | case 10 ... 11: | ||
| 404 | *cpu_type = "i386/piii"; | 405 | *cpu_type = "i386/piii"; |
| 405 | break; | 406 | break; |
| 406 | case 9: | 407 | case 9: |
| 408 | case 13: | ||
| 407 | *cpu_type = "i386/p6_mobile"; | 409 | *cpu_type = "i386/p6_mobile"; |
| 408 | break; | 410 | break; |
| 409 | case 10 ... 13: | ||
| 410 | *cpu_type = "i386/p6"; | ||
| 411 | break; | ||
| 412 | case 14: | 411 | case 14: |
| 413 | *cpu_type = "i386/core"; | 412 | *cpu_type = "i386/core"; |
| 414 | break; | 413 | break; |
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 716d26f0e5d4..e9f80c744cf3 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c | |||
| @@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs) | |||
| 156 | unsigned int low, high; | 156 | unsigned int low, high; |
| 157 | int i; | 157 | int i; |
| 158 | 158 | ||
| 159 | if (!reset_value) | ||
| 160 | return; | ||
| 159 | for (i = 0; i < num_counters; ++i) { | 161 | for (i = 0; i < num_counters; ++i) { |
| 160 | if (reset_value[i]) { | 162 | if (reset_value[i]) { |
| 161 | CTRL_READ(low, high, msrs, i); | 163 | CTRL_READ(low, high, msrs, i); |
| @@ -171,6 +173,8 @@ static void ppro_stop(struct op_msrs const * const msrs) | |||
| 171 | unsigned int low, high; | 173 | unsigned int low, high; |
| 172 | int i; | 174 | int i; |
| 173 | 175 | ||
| 176 | if (!reset_value) | ||
| 177 | return; | ||
| 174 | for (i = 0; i < num_counters; ++i) { | 178 | for (i = 0; i < num_counters; ++i) { |
| 175 | if (!reset_value[i]) | 179 | if (!reset_value[i]) |
| 176 | continue; | 180 | continue; |
diff --git a/block/bsg.c b/block/bsg.c index e8bd2475682a..e73e50daf3d0 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
| @@ -202,6 +202,8 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, | |||
| 202 | rq->timeout = q->sg_timeout; | 202 | rq->timeout = q->sg_timeout; |
| 203 | if (!rq->timeout) | 203 | if (!rq->timeout) |
| 204 | rq->timeout = BLK_DEFAULT_SG_TIMEOUT; | 204 | rq->timeout = BLK_DEFAULT_SG_TIMEOUT; |
| 205 | if (rq->timeout < BLK_MIN_SG_TIMEOUT) | ||
| 206 | rq->timeout = BLK_MIN_SG_TIMEOUT; | ||
| 205 | 207 | ||
| 206 | return 0; | 208 | return 0; |
| 207 | } | 209 | } |
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 3d3e7a46f38c..67eb93cff699 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c | |||
| @@ -677,6 +677,29 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, | |||
| 677 | case DVD_WRITE_STRUCT: | 677 | case DVD_WRITE_STRUCT: |
| 678 | case DVD_AUTH: | 678 | case DVD_AUTH: |
| 679 | arg = (unsigned long)compat_ptr(arg); | 679 | arg = (unsigned long)compat_ptr(arg); |
| 680 | /* These intepret arg as an unsigned long, not as a pointer, | ||
| 681 | * so we must not do compat_ptr() conversion. */ | ||
| 682 | case HDIO_SET_MULTCOUNT: | ||
| 683 | case HDIO_SET_UNMASKINTR: | ||
| 684 | case HDIO_SET_KEEPSETTINGS: | ||
| 685 | case HDIO_SET_32BIT: | ||
| 686 | case HDIO_SET_NOWERR: | ||
| 687 | case HDIO_SET_DMA: | ||
| 688 | case HDIO_SET_PIO_MODE: | ||
| 689 | case HDIO_SET_NICE: | ||
| 690 | case HDIO_SET_WCACHE: | ||
| 691 | case HDIO_SET_ACOUSTIC: | ||
| 692 | case HDIO_SET_BUSSTATE: | ||
| 693 | case HDIO_SET_ADDRESS: | ||
| 694 | case CDROMEJECT_SW: | ||
| 695 | case CDROM_SET_OPTIONS: | ||
| 696 | case CDROM_CLEAR_OPTIONS: | ||
| 697 | case CDROM_SELECT_SPEED: | ||
| 698 | case CDROM_SELECT_DISC: | ||
| 699 | case CDROM_MEDIA_CHANGED: | ||
| 700 | case CDROM_DRIVE_STATUS: | ||
| 701 | case CDROM_LOCKDOOR: | ||
| 702 | case CDROM_DEBUG: | ||
| 680 | break; | 703 | break; |
| 681 | default: | 704 | default: |
| 682 | /* unknown ioctl number */ | 705 | /* unknown ioctl number */ |
| @@ -699,8 +722,14 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) | |||
| 699 | struct backing_dev_info *bdi; | 722 | struct backing_dev_info *bdi; |
| 700 | loff_t size; | 723 | loff_t size; |
| 701 | 724 | ||
| 725 | /* | ||
| 726 | * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have | ||
| 727 | * to updated it before every ioctl. | ||
| 728 | */ | ||
| 702 | if (file->f_flags & O_NDELAY) | 729 | if (file->f_flags & O_NDELAY) |
| 703 | mode |= FMODE_NDELAY_NOW; | 730 | mode |= FMODE_NDELAY; |
| 731 | else | ||
| 732 | mode &= ~FMODE_NDELAY; | ||
| 704 | 733 | ||
| 705 | switch (cmd) { | 734 | switch (cmd) { |
| 706 | case HDIO_GETGEO: | 735 | case HDIO_GETGEO: |
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 5963cf91a3a0..d0bb92cbefb9 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
| @@ -208,6 +208,8 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, | |||
| 208 | rq->timeout = q->sg_timeout; | 208 | rq->timeout = q->sg_timeout; |
| 209 | if (!rq->timeout) | 209 | if (!rq->timeout) |
| 210 | rq->timeout = BLK_DEFAULT_SG_TIMEOUT; | 210 | rq->timeout = BLK_DEFAULT_SG_TIMEOUT; |
| 211 | if (rq->timeout < BLK_MIN_SG_TIMEOUT) | ||
| 212 | rq->timeout = BLK_MIN_SG_TIMEOUT; | ||
| 211 | 213 | ||
| 212 | return 0; | 214 | return 0; |
| 213 | } | 215 | } |
diff --git a/crypto/Kconfig b/crypto/Kconfig index 39dbd8e4dde1..dc20a34ba5ef 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -31,35 +31,63 @@ config CRYPTO_FIPS | |||
| 31 | 31 | ||
| 32 | config CRYPTO_ALGAPI | 32 | config CRYPTO_ALGAPI |
| 33 | tristate | 33 | tristate |
| 34 | select CRYPTO_ALGAPI2 | ||
| 34 | help | 35 | help |
| 35 | This option provides the API for cryptographic algorithms. | 36 | This option provides the API for cryptographic algorithms. |
| 36 | 37 | ||
| 38 | config CRYPTO_ALGAPI2 | ||
| 39 | tristate | ||
| 40 | |||
| 37 | config CRYPTO_AEAD | 41 | config CRYPTO_AEAD |
| 38 | tristate | 42 | tristate |
| 43 | select CRYPTO_AEAD2 | ||
| 39 | select CRYPTO_ALGAPI | 44 | select CRYPTO_ALGAPI |
| 40 | 45 | ||
| 46 | config CRYPTO_AEAD2 | ||
| 47 | tristate | ||
| 48 | select CRYPTO_ALGAPI2 | ||
| 49 | |||
| 41 | config CRYPTO_BLKCIPHER | 50 | config CRYPTO_BLKCIPHER |
| 42 | tristate | 51 | tristate |
| 52 | select CRYPTO_BLKCIPHER2 | ||
| 43 | select CRYPTO_ALGAPI | 53 | select CRYPTO_ALGAPI |
| 44 | select CRYPTO_RNG | 54 | |
| 55 | config CRYPTO_BLKCIPHER2 | ||
| 56 | tristate | ||
| 57 | select CRYPTO_ALGAPI2 | ||
| 58 | select CRYPTO_RNG2 | ||
| 45 | 59 | ||
| 46 | config CRYPTO_HASH | 60 | config CRYPTO_HASH |
| 47 | tristate | 61 | tristate |
| 62 | select CRYPTO_HASH2 | ||
| 48 | select CRYPTO_ALGAPI | 63 | select CRYPTO_ALGAPI |
| 49 | 64 | ||
| 65 | config CRYPTO_HASH2 | ||
| 66 | tristate | ||
| 67 | select CRYPTO_ALGAPI2 | ||
| 68 | |||
| 50 | config CRYPTO_RNG | 69 | config CRYPTO_RNG |
| 51 | tristate | 70 | tristate |
| 71 | select CRYPTO_RNG2 | ||
| 52 | select CRYPTO_ALGAPI | 72 | select CRYPTO_ALGAPI |
| 53 | 73 | ||
| 74 | config CRYPTO_RNG2 | ||
| 75 | tristate | ||
| 76 | select CRYPTO_ALGAPI2 | ||
| 77 | |||
| 54 | config CRYPTO_MANAGER | 78 | config CRYPTO_MANAGER |
| 55 | tristate "Cryptographic algorithm manager" | 79 | tristate "Cryptographic algorithm manager" |
| 56 | select CRYPTO_AEAD | 80 | select CRYPTO_MANAGER2 |
| 57 | select CRYPTO_HASH | ||
| 58 | select CRYPTO_BLKCIPHER | ||
| 59 | help | 81 | help |
| 60 | Create default cryptographic template instantiations such as | 82 | Create default cryptographic template instantiations such as |
| 61 | cbc(aes). | 83 | cbc(aes). |
| 62 | 84 | ||
| 85 | config CRYPTO_MANAGER2 | ||
| 86 | def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) | ||
| 87 | select CRYPTO_AEAD2 | ||
| 88 | select CRYPTO_HASH2 | ||
| 89 | select CRYPTO_BLKCIPHER2 | ||
| 90 | |||
| 63 | config CRYPTO_GF128MUL | 91 | config CRYPTO_GF128MUL |
| 64 | tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" | 92 | tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" |
| 65 | depends on EXPERIMENTAL | 93 | depends on EXPERIMENTAL |
diff --git a/crypto/Makefile b/crypto/Makefile index 5862b807334e..cd4a4ed078ff 100644 --- a/crypto/Makefile +++ b/crypto/Makefile | |||
| @@ -9,24 +9,24 @@ obj-$(CONFIG_CRYPTO_FIPS) += fips.o | |||
| 9 | 9 | ||
| 10 | crypto_algapi-$(CONFIG_PROC_FS) += proc.o | 10 | crypto_algapi-$(CONFIG_PROC_FS) += proc.o |
| 11 | crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y) | 11 | crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y) |
| 12 | obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o | 12 | obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o |
| 13 | 13 | ||
| 14 | obj-$(CONFIG_CRYPTO_AEAD) += aead.o | 14 | obj-$(CONFIG_CRYPTO_AEAD2) += aead.o |
| 15 | 15 | ||
| 16 | crypto_blkcipher-objs := ablkcipher.o | 16 | crypto_blkcipher-objs := ablkcipher.o |
| 17 | crypto_blkcipher-objs += blkcipher.o | 17 | crypto_blkcipher-objs += blkcipher.o |
| 18 | obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o | 18 | obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o |
| 19 | obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o | 19 | obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o |
| 20 | obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o | 20 | obj-$(CONFIG_CRYPTO_BLKCIPHER2) += eseqiv.o |
| 21 | obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o | 21 | obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o |
| 22 | 22 | ||
| 23 | crypto_hash-objs := hash.o | 23 | crypto_hash-objs := hash.o |
| 24 | crypto_hash-objs += ahash.o | 24 | crypto_hash-objs += ahash.o |
| 25 | obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o | 25 | obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o |
| 26 | 26 | ||
| 27 | cryptomgr-objs := algboss.o testmgr.o | 27 | cryptomgr-objs := algboss.o testmgr.o |
| 28 | 28 | ||
| 29 | obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o | 29 | obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o |
| 30 | obj-$(CONFIG_CRYPTO_HMAC) += hmac.o | 30 | obj-$(CONFIG_CRYPTO_HMAC) += hmac.o |
| 31 | obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o | 31 | obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o |
| 32 | obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o | 32 | obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o |
| @@ -73,8 +73,8 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o | |||
| 73 | obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o | 73 | obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o |
| 74 | obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o | 74 | obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o |
| 75 | obj-$(CONFIG_CRYPTO_LZO) += lzo.o | 75 | obj-$(CONFIG_CRYPTO_LZO) += lzo.o |
| 76 | obj-$(CONFIG_CRYPTO_RNG) += rng.o | 76 | obj-$(CONFIG_CRYPTO_RNG2) += rng.o |
| 77 | obj-$(CONFIG_CRYPTO_RNG) += krng.o | 77 | obj-$(CONFIG_CRYPTO_RNG2) += krng.o |
| 78 | obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o | 78 | obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o |
| 79 | obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o | 79 | obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o |
| 80 | 80 | ||
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index c029d3eb9ef0..595b78672b36 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c | |||
| @@ -53,10 +53,17 @@ do_async_xor(struct dma_chan *chan, struct page *dest, struct page **src_list, | |||
| 53 | int xor_src_cnt; | 53 | int xor_src_cnt; |
| 54 | dma_addr_t dma_dest; | 54 | dma_addr_t dma_dest; |
| 55 | 55 | ||
| 56 | dma_dest = dma_map_page(dma->dev, dest, offset, len, DMA_FROM_DEVICE); | 56 | /* map the dest bidrectional in case it is re-used as a source */ |
| 57 | for (i = 0; i < src_cnt; i++) | 57 | dma_dest = dma_map_page(dma->dev, dest, offset, len, DMA_BIDIRECTIONAL); |
| 58 | for (i = 0; i < src_cnt; i++) { | ||
| 59 | /* only map the dest once */ | ||
| 60 | if (unlikely(src_list[i] == dest)) { | ||
| 61 | dma_src[i] = dma_dest; | ||
| 62 | continue; | ||
| 63 | } | ||
| 58 | dma_src[i] = dma_map_page(dma->dev, src_list[i], offset, | 64 | dma_src[i] = dma_map_page(dma->dev, src_list[i], offset, |
| 59 | len, DMA_TO_DEVICE); | 65 | len, DMA_TO_DEVICE); |
| 66 | } | ||
| 60 | 67 | ||
| 61 | while (src_cnt) { | 68 | while (src_cnt) { |
| 62 | async_flags = flags; | 69 | async_flags = flags; |
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index a0a178dd189c..1423b0c0cd2e 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -174,15 +174,6 @@ static int acpi_battery_get_property(struct power_supply *psy, | |||
| 174 | break; | 174 | break; |
| 175 | case POWER_SUPPLY_PROP_CURRENT_NOW: | 175 | case POWER_SUPPLY_PROP_CURRENT_NOW: |
| 176 | val->intval = battery->current_now * 1000; | 176 | val->intval = battery->current_now * 1000; |
| 177 | /* if power units are mW, convert to mA by | ||
| 178 | dividing by current voltage (mV/1000) */ | ||
| 179 | if (!battery->power_unit) { | ||
| 180 | if (battery->voltage_now) { | ||
| 181 | val->intval /= battery->voltage_now; | ||
| 182 | val->intval *= 1000; | ||
| 183 | } else | ||
| 184 | val->intval = -1; | ||
| 185 | } | ||
| 186 | break; | 177 | break; |
| 187 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: | 178 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: |
| 188 | case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: | 179 | case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: |
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c index 25f531d892de..40e60fc2e596 100644 --- a/drivers/acpi/toshiba_acpi.c +++ b/drivers/acpi/toshiba_acpi.c | |||
| @@ -824,32 +824,36 @@ static int __init toshiba_acpi_init(void) | |||
| 824 | toshiba_acpi_exit(); | 824 | toshiba_acpi_exit(); |
| 825 | return -ENOMEM; | 825 | return -ENOMEM; |
| 826 | } | 826 | } |
| 827 | } | ||
| 828 | 827 | ||
| 829 | /* Register input device for kill switch */ | 828 | /* Register input device for kill switch */ |
| 830 | toshiba_acpi.poll_dev = input_allocate_polled_device(); | 829 | toshiba_acpi.poll_dev = input_allocate_polled_device(); |
| 831 | if (!toshiba_acpi.poll_dev) { | 830 | if (!toshiba_acpi.poll_dev) { |
| 832 | printk(MY_ERR "unable to allocate kill-switch input device\n"); | 831 | printk(MY_ERR |
| 833 | toshiba_acpi_exit(); | 832 | "unable to allocate kill-switch input device\n"); |
| 834 | return -ENOMEM; | 833 | toshiba_acpi_exit(); |
| 835 | } | 834 | return -ENOMEM; |
| 836 | toshiba_acpi.poll_dev->private = &toshiba_acpi; | 835 | } |
| 837 | toshiba_acpi.poll_dev->poll = bt_poll_rfkill; | 836 | toshiba_acpi.poll_dev->private = &toshiba_acpi; |
| 838 | toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */ | 837 | toshiba_acpi.poll_dev->poll = bt_poll_rfkill; |
| 839 | 838 | toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */ | |
| 840 | toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name; | 839 | |
| 841 | toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST; | 840 | toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name; |
| 842 | toshiba_acpi.poll_dev->input->id.vendor = 0x0930; /* Toshiba USB ID */ | 841 | toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST; |
| 843 | set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit); | 842 | /* Toshiba USB ID */ |
| 844 | set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit); | 843 | toshiba_acpi.poll_dev->input->id.vendor = 0x0930; |
| 845 | input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE); | 844 | set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit); |
| 846 | input_sync(toshiba_acpi.poll_dev->input); | 845 | set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit); |
| 847 | 846 | input_report_switch(toshiba_acpi.poll_dev->input, | |
| 848 | ret = input_register_polled_device(toshiba_acpi.poll_dev); | 847 | SW_RFKILL_ALL, TRUE); |
| 849 | if (ret) { | 848 | input_sync(toshiba_acpi.poll_dev->input); |
| 850 | printk(MY_ERR "unable to register kill-switch input device\n"); | 849 | |
| 851 | toshiba_acpi_exit(); | 850 | ret = input_register_polled_device(toshiba_acpi.poll_dev); |
| 852 | return ret; | 851 | if (ret) { |
| 852 | printk(MY_ERR | ||
| 853 | "unable to register kill-switch input device\n"); | ||
| 854 | toshiba_acpi_exit(); | ||
| 855 | return ret; | ||
| 856 | } | ||
| 853 | } | 857 | } |
| 854 | 858 | ||
| 855 | return 0; | 859 | return 0; |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 78fbec8ceda0..421b7c71e72d 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -153,7 +153,7 @@ config SATA_PROMISE | |||
| 153 | If unsure, say N. | 153 | If unsure, say N. |
| 154 | 154 | ||
| 155 | config SATA_SX4 | 155 | config SATA_SX4 |
| 156 | tristate "Promise SATA SX4 support" | 156 | tristate "Promise SATA SX4 support (Experimental)" |
| 157 | depends on PCI && EXPERIMENTAL | 157 | depends on PCI && EXPERIMENTAL |
| 158 | help | 158 | help |
| 159 | This option enables support for Promise Serial ATA SX4. | 159 | This option enables support for Promise Serial ATA SX4. |
| @@ -219,8 +219,8 @@ config PATA_ACPI | |||
| 219 | otherwise unsupported hardware. | 219 | otherwise unsupported hardware. |
| 220 | 220 | ||
| 221 | config PATA_ALI | 221 | config PATA_ALI |
| 222 | tristate "ALi PATA support (Experimental)" | 222 | tristate "ALi PATA support" |
| 223 | depends on PCI && EXPERIMENTAL | 223 | depends on PCI |
| 224 | help | 224 | help |
| 225 | This option enables support for the ALi ATA interfaces | 225 | This option enables support for the ALi ATA interfaces |
| 226 | found on the many ALi chipsets. | 226 | found on the many ALi chipsets. |
| @@ -263,7 +263,7 @@ config PATA_ATIIXP | |||
| 263 | If unsure, say N. | 263 | If unsure, say N. |
| 264 | 264 | ||
| 265 | config PATA_CMD640_PCI | 265 | config PATA_CMD640_PCI |
| 266 | tristate "CMD640 PCI PATA support (Very Experimental)" | 266 | tristate "CMD640 PCI PATA support (Experimental)" |
| 267 | depends on PCI && EXPERIMENTAL | 267 | depends on PCI && EXPERIMENTAL |
| 268 | help | 268 | help |
| 269 | This option enables support for the CMD640 PCI IDE | 269 | This option enables support for the CMD640 PCI IDE |
| @@ -291,8 +291,8 @@ config PATA_CS5520 | |||
| 291 | If unsure, say N. | 291 | If unsure, say N. |
| 292 | 292 | ||
| 293 | config PATA_CS5530 | 293 | config PATA_CS5530 |
| 294 | tristate "CS5530 PATA support (Experimental)" | 294 | tristate "CS5530 PATA support" |
| 295 | depends on PCI && EXPERIMENTAL | 295 | depends on PCI |
| 296 | help | 296 | help |
| 297 | This option enables support for the Cyrix/NatSemi/AMD CS5530 | 297 | This option enables support for the Cyrix/NatSemi/AMD CS5530 |
| 298 | companion chip used with the MediaGX/Geode processor family. | 298 | companion chip used with the MediaGX/Geode processor family. |
| @@ -309,8 +309,8 @@ config PATA_CS5535 | |||
| 309 | If unsure, say N. | 309 | If unsure, say N. |
| 310 | 310 | ||
| 311 | config PATA_CS5536 | 311 | config PATA_CS5536 |
| 312 | tristate "CS5536 PATA support (Experimental)" | 312 | tristate "CS5536 PATA support" |
| 313 | depends on PCI && X86 && !X86_64 && EXPERIMENTAL | 313 | depends on PCI && X86 && !X86_64 |
| 314 | help | 314 | help |
| 315 | This option enables support for the AMD CS5536 | 315 | This option enables support for the AMD CS5536 |
| 316 | companion chip used with the Geode LX processor family. | 316 | companion chip used with the Geode LX processor family. |
| @@ -363,7 +363,7 @@ config PATA_HPT37X | |||
| 363 | If unsure, say N. | 363 | If unsure, say N. |
| 364 | 364 | ||
| 365 | config PATA_HPT3X2N | 365 | config PATA_HPT3X2N |
| 366 | tristate "HPT 372N/302N PATA support (Very Experimental)" | 366 | tristate "HPT 372N/302N PATA support (Experimental)" |
| 367 | depends on PCI && EXPERIMENTAL | 367 | depends on PCI && EXPERIMENTAL |
| 368 | help | 368 | help |
| 369 | This option enables support for the N variant HPT PATA | 369 | This option enables support for the N variant HPT PATA |
| @@ -389,8 +389,8 @@ config PATA_HPT3X3_DMA | |||
| 389 | problems with DMA on this chipset. | 389 | problems with DMA on this chipset. |
| 390 | 390 | ||
| 391 | config PATA_ISAPNP | 391 | config PATA_ISAPNP |
| 392 | tristate "ISA Plug and Play PATA support (Experimental)" | 392 | tristate "ISA Plug and Play PATA support" |
| 393 | depends on EXPERIMENTAL && ISAPNP | 393 | depends on ISAPNP |
| 394 | help | 394 | help |
| 395 | This option enables support for ISA plug & play ATA | 395 | This option enables support for ISA plug & play ATA |
| 396 | controllers such as those found on old soundcards. | 396 | controllers such as those found on old soundcards. |
| @@ -498,8 +498,8 @@ config PATA_NINJA32 | |||
| 498 | If unsure, say N. | 498 | If unsure, say N. |
| 499 | 499 | ||
| 500 | config PATA_NS87410 | 500 | config PATA_NS87410 |
| 501 | tristate "Nat Semi NS87410 PATA support (Experimental)" | 501 | tristate "Nat Semi NS87410 PATA support" |
| 502 | depends on PCI && EXPERIMENTAL | 502 | depends on PCI |
| 503 | help | 503 | help |
| 504 | This option enables support for the National Semiconductor | 504 | This option enables support for the National Semiconductor |
| 505 | NS87410 PCI-IDE controller. | 505 | NS87410 PCI-IDE controller. |
| @@ -507,8 +507,8 @@ config PATA_NS87410 | |||
| 507 | If unsure, say N. | 507 | If unsure, say N. |
| 508 | 508 | ||
| 509 | config PATA_NS87415 | 509 | config PATA_NS87415 |
| 510 | tristate "Nat Semi NS87415 PATA support (Experimental)" | 510 | tristate "Nat Semi NS87415 PATA support" |
| 511 | depends on PCI && EXPERIMENTAL | 511 | depends on PCI |
| 512 | help | 512 | help |
| 513 | This option enables support for the National Semiconductor | 513 | This option enables support for the National Semiconductor |
| 514 | NS87415 PCI-IDE controller. | 514 | NS87415 PCI-IDE controller. |
| @@ -544,8 +544,8 @@ config PATA_PCMCIA | |||
| 544 | If unsure, say N. | 544 | If unsure, say N. |
| 545 | 545 | ||
| 546 | config PATA_PDC_OLD | 546 | config PATA_PDC_OLD |
| 547 | tristate "Older Promise PATA controller support (Experimental)" | 547 | tristate "Older Promise PATA controller support" |
| 548 | depends on PCI && EXPERIMENTAL | 548 | depends on PCI |
| 549 | help | 549 | help |
| 550 | This option enables support for the Promise 20246, 20262, 20263, | 550 | This option enables support for the Promise 20246, 20262, 20263, |
| 551 | 20265 and 20267 adapters. | 551 | 20265 and 20267 adapters. |
| @@ -559,7 +559,7 @@ config PATA_QDI | |||
| 559 | Support for QDI 6500 and 6580 PATA controllers on VESA local bus. | 559 | Support for QDI 6500 and 6580 PATA controllers on VESA local bus. |
| 560 | 560 | ||
| 561 | config PATA_RADISYS | 561 | config PATA_RADISYS |
| 562 | tristate "RADISYS 82600 PATA support (Very Experimental)" | 562 | tristate "RADISYS 82600 PATA support (Experimental)" |
| 563 | depends on PCI && EXPERIMENTAL | 563 | depends on PCI && EXPERIMENTAL |
| 564 | help | 564 | help |
| 565 | This option enables support for the RADISYS 82600 | 565 | This option enables support for the RADISYS 82600 |
| @@ -586,8 +586,8 @@ config PATA_RZ1000 | |||
| 586 | If unsure, say N. | 586 | If unsure, say N. |
| 587 | 587 | ||
| 588 | config PATA_SC1200 | 588 | config PATA_SC1200 |
| 589 | tristate "SC1200 PATA support (Very Experimental)" | 589 | tristate "SC1200 PATA support" |
| 590 | depends on PCI && EXPERIMENTAL | 590 | depends on PCI |
| 591 | help | 591 | help |
| 592 | This option enables support for the NatSemi/AMD SC1200 SoC | 592 | This option enables support for the NatSemi/AMD SC1200 SoC |
| 593 | companion chip used with the Geode processor family. | 593 | companion chip used with the Geode processor family. |
| @@ -620,8 +620,8 @@ config PATA_SIL680 | |||
| 620 | If unsure, say N. | 620 | If unsure, say N. |
| 621 | 621 | ||
| 622 | config PATA_SIS | 622 | config PATA_SIS |
| 623 | tristate "SiS PATA support (Experimental)" | 623 | tristate "SiS PATA support" |
| 624 | depends on PCI && EXPERIMENTAL | 624 | depends on PCI |
| 625 | help | 625 | help |
| 626 | This option enables support for SiS PATA controllers | 626 | This option enables support for SiS PATA controllers |
| 627 | 627 | ||
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index d6d97d8f3fa4..c11936e13dd3 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -1072,7 +1072,14 @@ static int piix_broken_suspend(void) | |||
| 1072 | * matching is necessary because dmi_system_id.matches is | 1072 | * matching is necessary because dmi_system_id.matches is |
| 1073 | * limited to four entries. | 1073 | * limited to four entries. |
| 1074 | */ | 1074 | */ |
| 1075 | if (!strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") && | 1075 | if (dmi_get_system_info(DMI_SYS_VENDOR) && |
| 1076 | dmi_get_system_info(DMI_PRODUCT_NAME) && | ||
| 1077 | dmi_get_system_info(DMI_PRODUCT_VERSION) && | ||
| 1078 | dmi_get_system_info(DMI_PRODUCT_SERIAL) && | ||
| 1079 | dmi_get_system_info(DMI_BOARD_VENDOR) && | ||
| 1080 | dmi_get_system_info(DMI_BOARD_NAME) && | ||
| 1081 | dmi_get_system_info(DMI_BOARD_VERSION) && | ||
| 1082 | !strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") && | ||
| 1076 | !strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") && | 1083 | !strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") && |
| 1077 | !strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") && | 1084 | !strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") && |
| 1078 | !strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") && | 1085 | !strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") && |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 5e2eb740df46..bc6695e3c848 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -4050,17 +4050,70 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { | |||
| 4050 | { "ST3160023AS", "3.42", ATA_HORKAGE_NONCQ }, | 4050 | { "ST3160023AS", "3.42", ATA_HORKAGE_NONCQ }, |
| 4051 | 4051 | ||
| 4052 | /* Seagate NCQ + FLUSH CACHE firmware bug */ | 4052 | /* Seagate NCQ + FLUSH CACHE firmware bug */ |
| 4053 | { "ST31500341AS", "9JU138", ATA_HORKAGE_NONCQ | | 4053 | { "ST31500341AS", "SD15", ATA_HORKAGE_NONCQ | |
| 4054 | ATA_HORKAGE_FIRMWARE_WARN }, | 4054 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4055 | { "ST31000333AS", "9FZ136", ATA_HORKAGE_NONCQ | | 4055 | { "ST31500341AS", "SD16", ATA_HORKAGE_NONCQ | |
| 4056 | ATA_HORKAGE_FIRMWARE_WARN }, | 4056 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4057 | { "ST3640623AS", "9FZ164", ATA_HORKAGE_NONCQ | | 4057 | { "ST31500341AS", "SD17", ATA_HORKAGE_NONCQ | |
| 4058 | ATA_HORKAGE_FIRMWARE_WARN }, | 4058 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4059 | { "ST3640323AS", "9FZ134", ATA_HORKAGE_NONCQ | | 4059 | { "ST31500341AS", "SD18", ATA_HORKAGE_NONCQ | |
| 4060 | ATA_HORKAGE_FIRMWARE_WARN }, | 4060 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4061 | { "ST3320813AS", "9FZ182", ATA_HORKAGE_NONCQ | | 4061 | { "ST31500341AS", "SD19", ATA_HORKAGE_NONCQ | |
| 4062 | ATA_HORKAGE_FIRMWARE_WARN }, | 4062 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4063 | { "ST3320613AS", "9FZ162", ATA_HORKAGE_NONCQ | | 4063 | |
| 4064 | { "ST31000333AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4065 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4066 | { "ST31000333AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4067 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4068 | { "ST31000333AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4069 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4070 | { "ST31000333AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4071 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4072 | { "ST31000333AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4073 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4074 | |||
| 4075 | { "ST3640623AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4076 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4077 | { "ST3640623AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4078 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4079 | { "ST3640623AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4080 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4081 | { "ST3640623AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4082 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4083 | { "ST3640623AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4084 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4085 | |||
| 4086 | { "ST3640323AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4087 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4088 | { "ST3640323AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4089 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4090 | { "ST3640323AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4091 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4092 | { "ST3640323AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4093 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4094 | { "ST3640323AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4095 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4096 | |||
| 4097 | { "ST3320813AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4098 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4099 | { "ST3320813AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4100 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4101 | { "ST3320813AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4102 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4103 | { "ST3320813AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4104 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4105 | { "ST3320813AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4106 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4107 | |||
| 4108 | { "ST3320613AS", "SD15", ATA_HORKAGE_NONCQ | | ||
| 4109 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4110 | { "ST3320613AS", "SD16", ATA_HORKAGE_NONCQ | | ||
| 4111 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4112 | { "ST3320613AS", "SD17", ATA_HORKAGE_NONCQ | | ||
| 4113 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4114 | { "ST3320613AS", "SD18", ATA_HORKAGE_NONCQ | | ||
| 4115 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4116 | { "ST3320613AS", "SD19", ATA_HORKAGE_NONCQ | | ||
| 4064 | ATA_HORKAGE_FIRMWARE_WARN }, | 4117 | ATA_HORKAGE_FIRMWARE_WARN }, |
| 4065 | 4118 | ||
| 4066 | /* Blacklist entries taken from Silicon Image 3124/3132 | 4119 | /* Blacklist entries taken from Silicon Image 3124/3132 |
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index f2b83eabc7c7..e0c4f05d7d57 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c | |||
| @@ -183,7 +183,9 @@ static unsigned long hpt366_filter(struct ata_device *adev, unsigned long mask) | |||
| 183 | mask &= ~(0xF8 << ATA_SHIFT_UDMA); | 183 | mask &= ~(0xF8 << ATA_SHIFT_UDMA); |
| 184 | if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4)) | 184 | if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4)) |
| 185 | mask &= ~(0xF0 << ATA_SHIFT_UDMA); | 185 | mask &= ~(0xF0 << ATA_SHIFT_UDMA); |
| 186 | } | 186 | } else if (adev->class == ATA_DEV_ATAPI) |
| 187 | mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA); | ||
| 188 | |||
| 187 | return ata_bmdma_mode_filter(adev, mask); | 189 | return ata_bmdma_mode_filter(adev, mask); |
| 188 | } | 190 | } |
| 189 | 191 | ||
| @@ -211,11 +213,15 @@ static u32 hpt36x_find_mode(struct ata_port *ap, int speed) | |||
| 211 | 213 | ||
| 212 | static int hpt36x_cable_detect(struct ata_port *ap) | 214 | static int hpt36x_cable_detect(struct ata_port *ap) |
| 213 | { | 215 | { |
| 214 | u8 ata66; | ||
| 215 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 216 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
| 217 | u8 ata66; | ||
| 216 | 218 | ||
| 219 | /* | ||
| 220 | * Each channel of pata_hpt366 occupies separate PCI function | ||
| 221 | * as the primary channel and bit1 indicates the cable type. | ||
| 222 | */ | ||
| 217 | pci_read_config_byte(pdev, 0x5A, &ata66); | 223 | pci_read_config_byte(pdev, 0x5A, &ata66); |
| 218 | if (ata66 & (1 << ap->port_no)) | 224 | if (ata66 & 2) |
| 219 | return ATA_CBL_PATA40; | 225 | return ATA_CBL_PATA40; |
| 220 | return ATA_CBL_PATA80; | 226 | return ATA_CBL_PATA80; |
| 221 | } | 227 | } |
| @@ -382,10 +388,10 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
| 382 | /* PCI clocking determines the ATA timing values to use */ | 388 | /* PCI clocking determines the ATA timing values to use */ |
| 383 | /* info_hpt366 is safe against re-entry so we can scribble on it */ | 389 | /* info_hpt366 is safe against re-entry so we can scribble on it */ |
| 384 | switch((reg1 & 0x700) >> 8) { | 390 | switch((reg1 & 0x700) >> 8) { |
| 385 | case 5: | 391 | case 9: |
| 386 | hpriv = &hpt366_40; | 392 | hpriv = &hpt366_40; |
| 387 | break; | 393 | break; |
| 388 | case 9: | 394 | case 5: |
| 389 | hpriv = &hpt366_25; | 395 | hpriv = &hpt366_25; |
| 390 | break; | 396 | break; |
| 391 | default: | 397 | default: |
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c index 4e466eae8b46..4dd9a3b031e4 100644 --- a/drivers/ata/pata_ninja32.c +++ b/drivers/ata/pata_ninja32.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #include <linux/libata.h> | 44 | #include <linux/libata.h> |
| 45 | 45 | ||
| 46 | #define DRV_NAME "pata_ninja32" | 46 | #define DRV_NAME "pata_ninja32" |
| 47 | #define DRV_VERSION "0.1.1" | 47 | #define DRV_VERSION "0.1.3" |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | /** | 50 | /** |
| @@ -130,7 +130,8 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
| 130 | return rc; | 130 | return rc; |
| 131 | pci_set_master(dev); | 131 | pci_set_master(dev); |
| 132 | 132 | ||
| 133 | /* Set up the register mappings */ | 133 | /* Set up the register mappings. We use the I/O mapping as only the |
| 134 | older chips also have MMIO on BAR 1 */ | ||
| 134 | base = host->iomap[0]; | 135 | base = host->iomap[0]; |
| 135 | if (!base) | 136 | if (!base) |
| 136 | return -ENOMEM; | 137 | return -ENOMEM; |
| @@ -167,8 +168,12 @@ static int ninja32_reinit_one(struct pci_dev *pdev) | |||
| 167 | #endif | 168 | #endif |
| 168 | 169 | ||
| 169 | static const struct pci_device_id ninja32[] = { | 170 | static const struct pci_device_id ninja32[] = { |
| 171 | { 0x10FC, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | ||
| 172 | { 0x1145, 0x8008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | ||
| 173 | { 0x1145, 0xf008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | ||
| 170 | { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 174 | { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
| 171 | { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 175 | { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
| 176 | { 0x1145, 0xf02C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | ||
| 172 | { }, | 177 | { }, |
| 173 | }; | 178 | }; |
| 174 | 179 | ||
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index d34236611752..e4be55e047f6 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
| @@ -56,7 +56,6 @@ static const struct sis_laptop sis_laptop[] = { | |||
| 56 | { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */ | 56 | { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */ |
| 57 | { 0x5513, 0x1734, 0x105F }, /* FSC Amilo A1630 */ | 57 | { 0x5513, 0x1734, 0x105F }, /* FSC Amilo A1630 */ |
| 58 | { 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */ | 58 | { 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */ |
| 59 | { 0x5513, 0x1039, 0x5513 }, /* Targa Visionary 1000 */ | ||
| 60 | /* end marker */ | 59 | /* end marker */ |
| 61 | { 0, } | 60 | { 0, } |
| 62 | }; | 61 | }; |
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 9364dc554257..9f7c543cc04b 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -1693,6 +1693,11 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time) | |||
| 1693 | for (i = 0; i <= h->highest_lun; i++) { | 1693 | for (i = 0; i <= h->highest_lun; i++) { |
| 1694 | int j; | 1694 | int j; |
| 1695 | drv_found = 0; | 1695 | drv_found = 0; |
| 1696 | |||
| 1697 | /* skip holes in the array from already deleted drives */ | ||
| 1698 | if (h->drv[i].raid_level == -1) | ||
| 1699 | continue; | ||
| 1700 | |||
| 1696 | for (j = 0; j < num_luns; j++) { | 1701 | for (j = 0; j < num_luns; j++) { |
| 1697 | memcpy(&lunid, &ld_buff->LUN[j][0], 4); | 1702 | memcpy(&lunid, &ld_buff->LUN[j][0], 4); |
| 1698 | lunid = le32_to_cpu(lunid); | 1703 | lunid = le32_to_cpu(lunid); |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index f20bf359b84f..dc7a8c352da2 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -302,7 +302,7 @@ static struct kobj_type kobj_pkt_type_wqueue = { | |||
| 302 | static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) | 302 | static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) |
| 303 | { | 303 | { |
| 304 | if (class_pktcdvd) { | 304 | if (class_pktcdvd) { |
| 305 | pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL, | 305 | pd->dev = device_create(class_pktcdvd, NULL, MKDEV(0, 0), NULL, |
| 306 | "%s", pd->name); | 306 | "%s", pd->name); |
| 307 | if (IS_ERR(pd->dev)) | 307 | if (IS_ERR(pd->dev)) |
| 308 | pd->dev = NULL; | 308 | pd->dev = NULL; |
| @@ -2790,7 +2790,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) | |||
| 2790 | return 0; | 2790 | return 0; |
| 2791 | 2791 | ||
| 2792 | out_mem: | 2792 | out_mem: |
| 2793 | blkdev_put(bdev, FMODE_READ|FMODE_WRITE); | 2793 | blkdev_put(bdev, FMODE_READ | FMODE_NDELAY); |
| 2794 | /* This is safe: open() is still holding a reference. */ | 2794 | /* This is safe: open() is still holding a reference. */ |
| 2795 | module_put(THIS_MODULE); | 2795 | module_put(THIS_MODULE); |
| 2796 | return ret; | 2796 | return ret; |
| @@ -2975,7 +2975,7 @@ static int pkt_remove_dev(dev_t pkt_dev) | |||
| 2975 | pkt_debugfs_dev_remove(pd); | 2975 | pkt_debugfs_dev_remove(pd); |
| 2976 | pkt_sysfs_dev_remove(pd); | 2976 | pkt_sysfs_dev_remove(pd); |
| 2977 | 2977 | ||
| 2978 | blkdev_put(pd->bdev, FMODE_READ|FMODE_WRITE); | 2978 | blkdev_put(pd->bdev, FMODE_READ | FMODE_NDELAY); |
| 2979 | 2979 | ||
| 2980 | remove_proc_entry(pd->name, pkt_proc); | 2980 | remove_proc_entry(pd->name, pkt_proc); |
| 2981 | DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name); | 2981 | DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name); |
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index d16b02423d61..7d2e91cccb13 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
| @@ -2081,10 +2081,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2081 | if (!q) | 2081 | if (!q) |
| 2082 | return -ENXIO; | 2082 | return -ENXIO; |
| 2083 | 2083 | ||
| 2084 | rq = blk_get_request(q, READ, GFP_KERNEL); | ||
| 2085 | if (!rq) | ||
| 2086 | return -ENOMEM; | ||
| 2087 | |||
| 2088 | cdi->last_sense = 0; | 2084 | cdi->last_sense = 0; |
| 2089 | 2085 | ||
| 2090 | while (nframes) { | 2086 | while (nframes) { |
| @@ -2096,9 +2092,17 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2096 | 2092 | ||
| 2097 | len = nr * CD_FRAMESIZE_RAW; | 2093 | len = nr * CD_FRAMESIZE_RAW; |
| 2098 | 2094 | ||
| 2095 | rq = blk_get_request(q, READ, GFP_KERNEL); | ||
| 2096 | if (!rq) { | ||
| 2097 | ret = -ENOMEM; | ||
| 2098 | break; | ||
| 2099 | } | ||
| 2100 | |||
| 2099 | ret = blk_rq_map_user(q, rq, NULL, ubuf, len, GFP_KERNEL); | 2101 | ret = blk_rq_map_user(q, rq, NULL, ubuf, len, GFP_KERNEL); |
| 2100 | if (ret) | 2102 | if (ret) { |
| 2103 | blk_put_request(rq); | ||
| 2101 | break; | 2104 | break; |
| 2105 | } | ||
| 2102 | 2106 | ||
| 2103 | rq->cmd[0] = GPCMD_READ_CD; | 2107 | rq->cmd[0] = GPCMD_READ_CD; |
| 2104 | rq->cmd[1] = 1 << 2; | 2108 | rq->cmd[1] = 1 << 2; |
| @@ -2124,6 +2128,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2124 | 2128 | ||
| 2125 | if (blk_rq_unmap_user(bio)) | 2129 | if (blk_rq_unmap_user(bio)) |
| 2126 | ret = -EFAULT; | 2130 | ret = -EFAULT; |
| 2131 | blk_put_request(rq); | ||
| 2127 | 2132 | ||
| 2128 | if (ret) | 2133 | if (ret) |
| 2129 | break; | 2134 | break; |
| @@ -2133,7 +2138,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2133 | ubuf += len; | 2138 | ubuf += len; |
| 2134 | } | 2139 | } |
| 2135 | 2140 | ||
| 2136 | blk_put_request(rq); | ||
| 2137 | return ret; | 2141 | return ret; |
| 2138 | } | 2142 | } |
| 2139 | 2143 | ||
diff --git a/drivers/char/cp437.uni b/drivers/char/cp437.uni index 1f06889a96b9..bc6163484f62 100644 --- a/drivers/char/cp437.uni +++ b/drivers/char/cp437.uni | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 0x0c U+2640 | 27 | 0x0c U+2640 |
| 28 | 0x0d U+266a | 28 | 0x0d U+266a |
| 29 | 0x0e U+266b | 29 | 0x0e U+266b |
| 30 | 0x0f U+263c | 30 | 0x0f U+263c U+00a4 |
| 31 | 0x10 U+25b6 U+25ba | 31 | 0x10 U+25b6 U+25ba |
| 32 | 0x11 U+25c0 U+25c4 | 32 | 0x11 U+25c0 U+25c4 |
| 33 | 0x12 U+2195 | 33 | 0x12 U+2195 |
| @@ -55,7 +55,7 @@ | |||
| 55 | 0x24 U+0024 | 55 | 0x24 U+0024 |
| 56 | 0x25 U+0025 | 56 | 0x25 U+0025 |
| 57 | 0x26 U+0026 | 57 | 0x26 U+0026 |
| 58 | 0x27 U+0027 | 58 | 0x27 U+0027 U+00b4 |
| 59 | 0x28 U+0028 | 59 | 0x28 U+0028 |
| 60 | 0x29 U+0029 | 60 | 0x29 U+0029 |
| 61 | 0x2a U+002a | 61 | 0x2a U+002a |
| @@ -84,7 +84,7 @@ | |||
| 84 | 0x41 U+0041 U+00c0 U+00c1 U+00c2 U+00c3 | 84 | 0x41 U+0041 U+00c0 U+00c1 U+00c2 U+00c3 |
| 85 | 0x42 U+0042 | 85 | 0x42 U+0042 |
| 86 | 0x43 U+0043 U+00a9 | 86 | 0x43 U+0043 U+00a9 |
| 87 | 0x44 U+0044 | 87 | 0x44 U+0044 U+00d0 |
| 88 | 0x45 U+0045 U+00c8 U+00ca U+00cb | 88 | 0x45 U+0045 U+00c8 U+00ca U+00cb |
| 89 | 0x46 U+0046 | 89 | 0x46 U+0046 |
| 90 | 0x47 U+0047 | 90 | 0x47 U+0047 |
| @@ -140,7 +140,7 @@ | |||
| 140 | 0x79 U+0079 U+00fd | 140 | 0x79 U+0079 U+00fd |
| 141 | 0x7a U+007a | 141 | 0x7a U+007a |
| 142 | 0x7b U+007b | 142 | 0x7b U+007b |
| 143 | 0x7c U+007c U+00a5 | 143 | 0x7c U+007c U+00a6 |
| 144 | 0x7d U+007d | 144 | 0x7d U+007d |
| 145 | 0x7e U+007e | 145 | 0x7e U+007e |
| 146 | # | 146 | # |
| @@ -263,10 +263,10 @@ | |||
| 263 | 0xe8 U+03a6 U+00d8 | 263 | 0xe8 U+03a6 U+00d8 |
| 264 | 0xe9 U+0398 | 264 | 0xe9 U+0398 |
| 265 | 0xea U+03a9 U+2126 | 265 | 0xea U+03a9 U+2126 |
| 266 | 0xeb U+03b4 | 266 | 0xeb U+03b4 U+00f0 |
| 267 | 0xec U+221e | 267 | 0xec U+221e |
| 268 | 0xed U+03c6 U+00f8 | 268 | 0xed U+03c6 U+00f8 |
| 269 | 0xee U+03b5 | 269 | 0xee U+03b5 U+2208 |
| 270 | 0xef U+2229 | 270 | 0xef U+2229 |
| 271 | 0xf0 U+2261 | 271 | 0xf0 U+2261 |
| 272 | 0xf1 U+00b1 | 272 | 0xf1 U+00b1 |
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 3b23270eaa65..a8f15e6be594 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c | |||
| @@ -418,7 +418,7 @@ static irqreturn_t cd2401_rxerr_interrupt(int irq, void *dev_id) | |||
| 418 | TTY_OVERRUN); | 418 | TTY_OVERRUN); |
| 419 | /* | 419 | /* |
| 420 | If the flip buffer itself is | 420 | If the flip buffer itself is |
| 421 | overflowing, we still loose | 421 | overflowing, we still lose |
| 422 | the next incoming character. | 422 | the next incoming character. |
| 423 | */ | 423 | */ |
| 424 | if (tty_buffer_request_room(tty, 1) != | 424 | if (tty_buffer_request_room(tty, 1) != |
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index a5af6072e2b3..008176edbd64 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -2274,7 +2274,7 @@ rescan_last_byte: | |||
| 2274 | continue; /* nothing to display */ | 2274 | continue; /* nothing to display */ |
| 2275 | } | 2275 | } |
| 2276 | /* Glyph not found */ | 2276 | /* Glyph not found */ |
| 2277 | if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) { | 2277 | if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) { |
| 2278 | /* In legacy mode use the glyph we get by a 1:1 mapping. | 2278 | /* In legacy mode use the glyph we get by a 1:1 mapping. |
| 2279 | This would make absolutely no sense with Unicode in mind, | 2279 | This would make absolutely no sense with Unicode in mind, |
| 2280 | but do this for ASCII characters since a font may lack | 2280 | but do this for ASCII characters since a font may lack |
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.c b/drivers/char/xilinx_hwicap/buffer_icap.c index aa7f7962a9a0..05d897764f02 100644 --- a/drivers/char/xilinx_hwicap/buffer_icap.c +++ b/drivers/char/xilinx_hwicap/buffer_icap.c | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
| 22 | * FOR A PARTICULAR PURPOSE. | 22 | * FOR A PARTICULAR PURPOSE. |
| 23 | * | 23 | * |
| 24 | * Xilinx products are not intended for use in life support appliances, | ||
| 25 | * devices, or systems. Use in such applications is expressly prohibited. | ||
| 26 | * | ||
| 27 | * (c) Copyright 2003-2008 Xilinx Inc. | 24 | * (c) Copyright 2003-2008 Xilinx Inc. |
| 28 | * All rights reserved. | 25 | * All rights reserved. |
| 29 | * | 26 | * |
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h index 8b0252bf06e2..d4f419ee87ab 100644 --- a/drivers/char/xilinx_hwicap/buffer_icap.h +++ b/drivers/char/xilinx_hwicap/buffer_icap.h | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
| 22 | * FOR A PARTICULAR PURPOSE. | 22 | * FOR A PARTICULAR PURPOSE. |
| 23 | * | 23 | * |
| 24 | * Xilinx products are not intended for use in life support appliances, | ||
| 25 | * devices, or systems. Use in such applications is expressly prohibited. | ||
| 26 | * | ||
| 27 | * (c) Copyright 2003-2008 Xilinx Inc. | 24 | * (c) Copyright 2003-2008 Xilinx Inc. |
| 28 | * All rights reserved. | 25 | * All rights reserved. |
| 29 | * | 26 | * |
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.c b/drivers/char/xilinx_hwicap/fifo_icap.c index 776b50528478..02225eb19cf6 100644 --- a/drivers/char/xilinx_hwicap/fifo_icap.c +++ b/drivers/char/xilinx_hwicap/fifo_icap.c | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
| 22 | * FOR A PARTICULAR PURPOSE. | 22 | * FOR A PARTICULAR PURPOSE. |
| 23 | * | 23 | * |
| 24 | * Xilinx products are not intended for use in life support appliances, | ||
| 25 | * devices, or systems. Use in such applications is expressly prohibited. | ||
| 26 | * | ||
| 27 | * (c) Copyright 2007-2008 Xilinx Inc. | 24 | * (c) Copyright 2007-2008 Xilinx Inc. |
| 28 | * All rights reserved. | 25 | * All rights reserved. |
| 29 | * | 26 | * |
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h index 62bda453c90b..4c9dd9a3b62a 100644 --- a/drivers/char/xilinx_hwicap/fifo_icap.h +++ b/drivers/char/xilinx_hwicap/fifo_icap.h | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
| 22 | * FOR A PARTICULAR PURPOSE. | 22 | * FOR A PARTICULAR PURPOSE. |
| 23 | * | 23 | * |
| 24 | * Xilinx products are not intended for use in life support appliances, | ||
| 25 | * devices, or systems. Use in such applications is expressly prohibited. | ||
| 26 | * | ||
| 27 | * (c) Copyright 2007-2008 Xilinx Inc. | 24 | * (c) Copyright 2007-2008 Xilinx Inc. |
| 28 | * All rights reserved. | 25 | * All rights reserved. |
| 29 | * | 26 | * |
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index d16131949097..f40ab699860f 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
| 22 | * FOR A PARTICULAR PURPOSE. | 22 | * FOR A PARTICULAR PURPOSE. |
| 23 | * | 23 | * |
| 24 | * Xilinx products are not intended for use in life support appliances, | ||
| 25 | * devices, or systems. Use in such applications is expressly prohibited. | ||
| 26 | * | ||
| 27 | * (c) Copyright 2002 Xilinx Inc., Systems Engineering Group | 24 | * (c) Copyright 2002 Xilinx Inc., Systems Engineering Group |
| 28 | * (c) Copyright 2004 Xilinx Inc., Systems Engineering Group | 25 | * (c) Copyright 2004 Xilinx Inc., Systems Engineering Group |
| 29 | * (c) Copyright 2007-2008 Xilinx Inc. | 26 | * (c) Copyright 2007-2008 Xilinx Inc. |
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h index 24d0d9b938fb..8cca11981c5f 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | 21 | * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
| 22 | * FOR A PARTICULAR PURPOSE. | 22 | * FOR A PARTICULAR PURPOSE. |
| 23 | * | 23 | * |
| 24 | * Xilinx products are not intended for use in life support appliances, | ||
| 25 | * devices, or systems. Use in such applications is expressly prohibited. | ||
| 26 | * | ||
| 27 | * (c) Copyright 2003-2007 Xilinx Inc. | 24 | * (c) Copyright 2003-2007 Xilinx Inc. |
| 28 | * All rights reserved. | 25 | * All rights reserved. |
| 29 | * | 26 | * |
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 5317e08221ec..657996517374 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -388,7 +388,10 @@ int dma_async_device_register(struct dma_device *device) | |||
| 388 | 388 | ||
| 389 | init_completion(&device->done); | 389 | init_completion(&device->done); |
| 390 | kref_init(&device->refcount); | 390 | kref_init(&device->refcount); |
| 391 | |||
| 392 | mutex_lock(&dma_list_mutex); | ||
| 391 | device->dev_id = id++; | 393 | device->dev_id = id++; |
| 394 | mutex_unlock(&dma_list_mutex); | ||
| 392 | 395 | ||
| 393 | /* represent channels in sysfs. Probably want devs too */ | 396 | /* represent channels in sysfs. Probably want devs too */ |
| 394 | list_for_each_entry(chan, &device->channels, device_node) { | 397 | list_for_each_entry(chan, &device->channels, device_node) { |
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index ecd743f7cc61..6607fdd00b1c 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c | |||
| @@ -1341,10 +1341,12 @@ static void ioat_dma_start_null_desc(struct ioat_dma_chan *ioat_chan) | |||
| 1341 | */ | 1341 | */ |
| 1342 | #define IOAT_TEST_SIZE 2000 | 1342 | #define IOAT_TEST_SIZE 2000 |
| 1343 | 1343 | ||
| 1344 | DECLARE_COMPLETION(test_completion); | ||
| 1344 | static void ioat_dma_test_callback(void *dma_async_param) | 1345 | static void ioat_dma_test_callback(void *dma_async_param) |
| 1345 | { | 1346 | { |
| 1346 | printk(KERN_ERR "ioatdma: ioat_dma_test_callback(%p)\n", | 1347 | printk(KERN_ERR "ioatdma: ioat_dma_test_callback(%p)\n", |
| 1347 | dma_async_param); | 1348 | dma_async_param); |
| 1349 | complete(&test_completion); | ||
| 1348 | } | 1350 | } |
| 1349 | 1351 | ||
| 1350 | /** | 1352 | /** |
| @@ -1410,7 +1412,8 @@ static int ioat_dma_self_test(struct ioatdma_device *device) | |||
| 1410 | goto free_resources; | 1412 | goto free_resources; |
| 1411 | } | 1413 | } |
| 1412 | device->common.device_issue_pending(dma_chan); | 1414 | device->common.device_issue_pending(dma_chan); |
| 1413 | msleep(1); | 1415 | |
| 1416 | wait_for_completion_timeout(&test_completion, msecs_to_jiffies(3000)); | ||
| 1414 | 1417 | ||
| 1415 | if (device->common.device_is_tx_complete(dma_chan, cookie, NULL, NULL) | 1418 | if (device->common.device_is_tx_complete(dma_chan, cookie, NULL, NULL) |
| 1416 | != DMA_SUCCESS) { | 1419 | != DMA_SUCCESS) { |
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index c7a9306d951d..6be317262200 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
| @@ -85,18 +85,28 @@ iop_adma_run_tx_complete_actions(struct iop_adma_desc_slot *desc, | |||
| 85 | enum dma_ctrl_flags flags = desc->async_tx.flags; | 85 | enum dma_ctrl_flags flags = desc->async_tx.flags; |
| 86 | u32 src_cnt; | 86 | u32 src_cnt; |
| 87 | dma_addr_t addr; | 87 | dma_addr_t addr; |
| 88 | dma_addr_t dest; | ||
| 88 | 89 | ||
| 90 | src_cnt = unmap->unmap_src_cnt; | ||
| 91 | dest = iop_desc_get_dest_addr(unmap, iop_chan); | ||
| 89 | if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP)) { | 92 | if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP)) { |
| 90 | addr = iop_desc_get_dest_addr(unmap, iop_chan); | 93 | enum dma_data_direction dir; |
| 91 | dma_unmap_page(dev, addr, len, DMA_FROM_DEVICE); | 94 | |
| 95 | if (src_cnt > 1) /* is xor? */ | ||
| 96 | dir = DMA_BIDIRECTIONAL; | ||
| 97 | else | ||
| 98 | dir = DMA_FROM_DEVICE; | ||
| 99 | |||
| 100 | dma_unmap_page(dev, dest, len, dir); | ||
| 92 | } | 101 | } |
| 93 | 102 | ||
| 94 | if (!(flags & DMA_COMPL_SKIP_SRC_UNMAP)) { | 103 | if (!(flags & DMA_COMPL_SKIP_SRC_UNMAP)) { |
| 95 | src_cnt = unmap->unmap_src_cnt; | ||
| 96 | while (src_cnt--) { | 104 | while (src_cnt--) { |
| 97 | addr = iop_desc_get_src_addr(unmap, | 105 | addr = iop_desc_get_src_addr(unmap, |
| 98 | iop_chan, | 106 | iop_chan, |
| 99 | src_cnt); | 107 | src_cnt); |
| 108 | if (addr == dest) | ||
| 109 | continue; | ||
| 100 | dma_unmap_page(dev, addr, len, | 110 | dma_unmap_page(dev, addr, len, |
| 101 | DMA_TO_DEVICE); | 111 | DMA_TO_DEVICE); |
| 102 | } | 112 | } |
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 0328da020a10..bcda17426411 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
| @@ -311,17 +311,26 @@ mv_xor_run_tx_complete_actions(struct mv_xor_desc_slot *desc, | |||
| 311 | enum dma_ctrl_flags flags = desc->async_tx.flags; | 311 | enum dma_ctrl_flags flags = desc->async_tx.flags; |
| 312 | u32 src_cnt; | 312 | u32 src_cnt; |
| 313 | dma_addr_t addr; | 313 | dma_addr_t addr; |
| 314 | dma_addr_t dest; | ||
| 314 | 315 | ||
| 316 | src_cnt = unmap->unmap_src_cnt; | ||
| 317 | dest = mv_desc_get_dest_addr(unmap); | ||
| 315 | if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP)) { | 318 | if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP)) { |
| 316 | addr = mv_desc_get_dest_addr(unmap); | 319 | enum dma_data_direction dir; |
| 317 | dma_unmap_page(dev, addr, len, DMA_FROM_DEVICE); | 320 | |
| 321 | if (src_cnt > 1) /* is xor ? */ | ||
| 322 | dir = DMA_BIDIRECTIONAL; | ||
| 323 | else | ||
| 324 | dir = DMA_FROM_DEVICE; | ||
| 325 | dma_unmap_page(dev, dest, len, dir); | ||
| 318 | } | 326 | } |
| 319 | 327 | ||
| 320 | if (!(flags & DMA_COMPL_SKIP_SRC_UNMAP)) { | 328 | if (!(flags & DMA_COMPL_SKIP_SRC_UNMAP)) { |
| 321 | src_cnt = unmap->unmap_src_cnt; | ||
| 322 | while (src_cnt--) { | 329 | while (src_cnt--) { |
| 323 | addr = mv_desc_get_src_addr(unmap, | 330 | addr = mv_desc_get_src_addr(unmap, |
| 324 | src_cnt); | 331 | src_cnt); |
| 332 | if (addr == dest) | ||
| 333 | continue; | ||
| 325 | dma_unmap_page(dev, addr, len, | 334 | dma_unmap_page(dev, addr, len, |
| 326 | DMA_TO_DEVICE); | 335 | DMA_TO_DEVICE); |
| 327 | } | 336 | } |
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 46610b090415..ab9c01e462ef 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
| @@ -974,6 +974,7 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet) | |||
| 974 | packet->ack = RCODE_SEND_ERROR; | 974 | packet->ack = RCODE_SEND_ERROR; |
| 975 | return -1; | 975 | return -1; |
| 976 | } | 976 | } |
| 977 | packet->payload_bus = payload_bus; | ||
| 977 | 978 | ||
| 978 | d[2].req_count = cpu_to_le16(packet->payload_length); | 979 | d[2].req_count = cpu_to_le16(packet->payload_length); |
| 979 | d[2].data_address = cpu_to_le32(payload_bus); | 980 | d[2].data_address = cpu_to_le32(payload_bus); |
| @@ -1025,7 +1026,6 @@ static int handle_at_packet(struct context *context, | |||
| 1025 | struct driver_data *driver_data; | 1026 | struct driver_data *driver_data; |
| 1026 | struct fw_packet *packet; | 1027 | struct fw_packet *packet; |
| 1027 | struct fw_ohci *ohci = context->ohci; | 1028 | struct fw_ohci *ohci = context->ohci; |
| 1028 | dma_addr_t payload_bus; | ||
| 1029 | int evt; | 1029 | int evt; |
| 1030 | 1030 | ||
| 1031 | if (last->transfer_status == 0) | 1031 | if (last->transfer_status == 0) |
| @@ -1038,9 +1038,8 @@ static int handle_at_packet(struct context *context, | |||
| 1038 | /* This packet was cancelled, just continue. */ | 1038 | /* This packet was cancelled, just continue. */ |
| 1039 | return 1; | 1039 | return 1; |
| 1040 | 1040 | ||
| 1041 | payload_bus = le32_to_cpu(last->data_address); | 1041 | if (packet->payload_bus) |
| 1042 | if (payload_bus != 0) | 1042 | dma_unmap_single(ohci->card.device, packet->payload_bus, |
| 1043 | dma_unmap_single(ohci->card.device, payload_bus, | ||
| 1044 | packet->payload_length, DMA_TO_DEVICE); | 1043 | packet->payload_length, DMA_TO_DEVICE); |
| 1045 | 1044 | ||
| 1046 | evt = le16_to_cpu(last->transfer_status) & 0x1f; | 1045 | evt = le16_to_cpu(last->transfer_status) & 0x1f; |
| @@ -1697,6 +1696,10 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet) | |||
| 1697 | if (packet->ack != 0) | 1696 | if (packet->ack != 0) |
| 1698 | goto out; | 1697 | goto out; |
| 1699 | 1698 | ||
| 1699 | if (packet->payload_bus) | ||
| 1700 | dma_unmap_single(ohci->card.device, packet->payload_bus, | ||
| 1701 | packet->payload_length, DMA_TO_DEVICE); | ||
| 1702 | |||
| 1700 | log_ar_at_event('T', packet->speed, packet->header, 0x20); | 1703 | log_ar_at_event('T', packet->speed, packet->header, 0x20); |
| 1701 | driver_data->packet = NULL; | 1704 | driver_data->packet = NULL; |
| 1702 | packet->ack = RCODE_CANCELLED; | 1705 | packet->ack = RCODE_CANCELLED; |
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index 022ac4fabb67..2884f876397b 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c | |||
| @@ -207,6 +207,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel, | |||
| 207 | packet->speed = speed; | 207 | packet->speed = speed; |
| 208 | packet->generation = generation; | 208 | packet->generation = generation; |
| 209 | packet->ack = 0; | 209 | packet->ack = 0; |
| 210 | packet->payload_bus = 0; | ||
| 210 | } | 211 | } |
| 211 | 212 | ||
| 212 | /** | 213 | /** |
| @@ -581,6 +582,8 @@ fw_fill_response(struct fw_packet *response, u32 *request_header, | |||
| 581 | BUG(); | 582 | BUG(); |
| 582 | return; | 583 | return; |
| 583 | } | 584 | } |
| 585 | |||
| 586 | response->payload_bus = 0; | ||
| 584 | } | 587 | } |
| 585 | EXPORT_SYMBOL(fw_fill_response); | 588 | EXPORT_SYMBOL(fw_fill_response); |
| 586 | 589 | ||
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h index aed7dbb17cda..839466f0a795 100644 --- a/drivers/firewire/fw-transaction.h +++ b/drivers/firewire/fw-transaction.h | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
| 28 | #include <linux/spinlock_types.h> | 28 | #include <linux/spinlock_types.h> |
| 29 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
| 30 | #include <linux/types.h> | ||
| 30 | #include <linux/workqueue.h> | 31 | #include <linux/workqueue.h> |
| 31 | 32 | ||
| 32 | #define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4) | 33 | #define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4) |
| @@ -153,6 +154,7 @@ struct fw_packet { | |||
| 153 | size_t header_length; | 154 | size_t header_length; |
| 154 | void *payload; | 155 | void *payload; |
| 155 | size_t payload_length; | 156 | size_t payload_length; |
| 157 | dma_addr_t payload_bus; | ||
| 156 | u32 timestamp; | 158 | u32 timestamp; |
| 157 | 159 | ||
| 158 | /* | 160 | /* |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index ba89b42f790a..afa8a12cd009 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -717,7 +717,7 @@ static int i915_getparam(struct drm_device *dev, void *data, | |||
| 717 | value = dev->pci_device; | 717 | value = dev->pci_device; |
| 718 | break; | 718 | break; |
| 719 | case I915_PARAM_HAS_GEM: | 719 | case I915_PARAM_HAS_GEM: |
| 720 | value = 1; | 720 | value = dev_priv->has_gem; |
| 721 | break; | 721 | break; |
| 722 | default: | 722 | default: |
| 723 | DRM_ERROR("Unknown parameter %d\n", param->param); | 723 | DRM_ERROR("Unknown parameter %d\n", param->param); |
| @@ -830,6 +830,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 830 | 830 | ||
| 831 | dev_priv->regs = ioremap(base, size); | 831 | dev_priv->regs = ioremap(base, size); |
| 832 | 832 | ||
| 833 | #ifdef CONFIG_HIGHMEM64G | ||
| 834 | /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */ | ||
| 835 | dev_priv->has_gem = 0; | ||
| 836 | #else | ||
| 837 | /* enable GEM by default */ | ||
| 838 | dev_priv->has_gem = 1; | ||
| 839 | #endif | ||
| 840 | |||
| 833 | i915_gem_load(dev); | 841 | i915_gem_load(dev); |
| 834 | 842 | ||
| 835 | /* Init HWS */ | 843 | /* Init HWS */ |
| @@ -847,9 +855,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 847 | * and the registers being closely associated. | 855 | * and the registers being closely associated. |
| 848 | * | 856 | * |
| 849 | * According to chipset errata, on the 965GM, MSI interrupts may | 857 | * According to chipset errata, on the 965GM, MSI interrupts may |
| 850 | * be lost or delayed | 858 | * be lost or delayed, but we use them anyways to avoid |
| 859 | * stuck interrupts on some machines. | ||
| 851 | */ | 860 | */ |
| 852 | if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev)) | 861 | if (!IS_I945G(dev) && !IS_I945GM(dev)) |
| 853 | pci_enable_msi(dev->pdev); | 862 | pci_enable_msi(dev->pdev); |
| 854 | 863 | ||
| 855 | intel_opregion_init(dev); | 864 | intel_opregion_init(dev); |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0a4f39b9a0ec..b3cc4731aa7c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -106,6 +106,8 @@ struct intel_opregion { | |||
| 106 | typedef struct drm_i915_private { | 106 | typedef struct drm_i915_private { |
| 107 | struct drm_device *dev; | 107 | struct drm_device *dev; |
| 108 | 108 | ||
| 109 | int has_gem; | ||
| 110 | |||
| 109 | void __iomem *regs; | 111 | void __iomem *regs; |
| 110 | drm_local_map_t *sarea; | 112 | drm_local_map_t *sarea; |
| 111 | 113 | ||
| @@ -244,6 +246,10 @@ typedef struct drm_i915_private { | |||
| 244 | * List of objects currently involved in rendering from the | 246 | * List of objects currently involved in rendering from the |
| 245 | * ringbuffer. | 247 | * ringbuffer. |
| 246 | * | 248 | * |
| 249 | * Includes buffers having the contents of their GPU caches | ||
| 250 | * flushed, not necessarily primitives. last_rendering_seqno | ||
| 251 | * represents when the rendering involved will be completed. | ||
| 252 | * | ||
| 247 | * A reference is held on the buffer while on this list. | 253 | * A reference is held on the buffer while on this list. |
| 248 | */ | 254 | */ |
| 249 | struct list_head active_list; | 255 | struct list_head active_list; |
| @@ -253,6 +259,8 @@ typedef struct drm_i915_private { | |||
| 253 | * still have a write_domain which needs to be flushed before | 259 | * still have a write_domain which needs to be flushed before |
| 254 | * unbinding. | 260 | * unbinding. |
| 255 | * | 261 | * |
| 262 | * last_rendering_seqno is 0 while an object is in this list. | ||
| 263 | * | ||
| 256 | * A reference is held on the buffer while on this list. | 264 | * A reference is held on the buffer while on this list. |
| 257 | */ | 265 | */ |
| 258 | struct list_head flushing_list; | 266 | struct list_head flushing_list; |
| @@ -261,6 +269,8 @@ typedef struct drm_i915_private { | |||
| 261 | * LRU list of objects which are not in the ringbuffer and | 269 | * LRU list of objects which are not in the ringbuffer and |
| 262 | * are ready to unbind, but are still in the GTT. | 270 | * are ready to unbind, but are still in the GTT. |
| 263 | * | 271 | * |
| 272 | * last_rendering_seqno is 0 while an object is in this list. | ||
| 273 | * | ||
| 264 | * A reference is not held on the buffer while on this list, | 274 | * A reference is not held on the buffer while on this list, |
| 265 | * as merely being GTT-bound shouldn't prevent its being | 275 | * as merely being GTT-bound shouldn't prevent its being |
| 266 | * freed, and we'll pull it off the list in the free path. | 276 | * freed, and we'll pull it off the list in the free path. |
| @@ -371,8 +381,8 @@ struct drm_i915_gem_object { | |||
| 371 | uint32_t agp_type; | 381 | uint32_t agp_type; |
| 372 | 382 | ||
| 373 | /** | 383 | /** |
| 374 | * Flagging of which individual pages are valid in GEM_DOMAIN_CPU when | 384 | * If present, while GEM_DOMAIN_CPU is in the read domain this array |
| 375 | * GEM_DOMAIN_CPU is not in the object's read domain. | 385 | * flags which individual pages are valid. |
| 376 | */ | 386 | */ |
| 377 | uint8_t *page_cpu_valid; | 387 | uint8_t *page_cpu_valid; |
| 378 | }; | 388 | }; |
| @@ -394,9 +404,6 @@ struct drm_i915_gem_request { | |||
| 394 | /** Time at which this request was emitted, in jiffies. */ | 404 | /** Time at which this request was emitted, in jiffies. */ |
| 395 | unsigned long emitted_jiffies; | 405 | unsigned long emitted_jiffies; |
| 396 | 406 | ||
| 397 | /** Cache domains that were flushed at the start of the request. */ | ||
| 398 | uint32_t flush_domains; | ||
| 399 | |||
| 400 | struct list_head list; | 407 | struct list_head list; |
| 401 | }; | 408 | }; |
| 402 | 409 | ||
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d58ddef468f8..24fe8c10b4b2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -33,21 +33,21 @@ | |||
| 33 | 33 | ||
| 34 | #define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | 34 | #define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) |
| 35 | 35 | ||
| 36 | static int | 36 | static void |
| 37 | i915_gem_object_set_domain(struct drm_gem_object *obj, | 37 | i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj, |
| 38 | uint32_t read_domains, | 38 | uint32_t read_domains, |
| 39 | uint32_t write_domain); | 39 | uint32_t write_domain); |
| 40 | static int | 40 | static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj); |
| 41 | i915_gem_object_set_domain_range(struct drm_gem_object *obj, | 41 | static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj); |
| 42 | uint64_t offset, | 42 | static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj); |
| 43 | uint64_t size, | 43 | static int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, |
| 44 | uint32_t read_domains, | 44 | int write); |
| 45 | uint32_t write_domain); | 45 | static int i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, |
| 46 | static int | 46 | int write); |
| 47 | i915_gem_set_domain(struct drm_gem_object *obj, | 47 | static int i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, |
| 48 | struct drm_file *file_priv, | 48 | uint64_t offset, |
| 49 | uint32_t read_domains, | 49 | uint64_t size); |
| 50 | uint32_t write_domain); | 50 | static void i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj); |
| 51 | static int i915_gem_object_get_page_list(struct drm_gem_object *obj); | 51 | static int i915_gem_object_get_page_list(struct drm_gem_object *obj); |
| 52 | static void i915_gem_object_free_page_list(struct drm_gem_object *obj); | 52 | static void i915_gem_object_free_page_list(struct drm_gem_object *obj); |
| 53 | static int i915_gem_object_wait_rendering(struct drm_gem_object *obj); | 53 | static int i915_gem_object_wait_rendering(struct drm_gem_object *obj); |
| @@ -162,8 +162,8 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, | |||
| 162 | 162 | ||
| 163 | mutex_lock(&dev->struct_mutex); | 163 | mutex_lock(&dev->struct_mutex); |
| 164 | 164 | ||
| 165 | ret = i915_gem_object_set_domain_range(obj, args->offset, args->size, | 165 | ret = i915_gem_object_set_cpu_read_domain_range(obj, args->offset, |
| 166 | I915_GEM_DOMAIN_CPU, 0); | 166 | args->size); |
| 167 | if (ret != 0) { | 167 | if (ret != 0) { |
| 168 | drm_gem_object_unreference(obj); | 168 | drm_gem_object_unreference(obj); |
| 169 | mutex_unlock(&dev->struct_mutex); | 169 | mutex_unlock(&dev->struct_mutex); |
| @@ -260,8 +260,7 @@ i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj, | |||
| 260 | mutex_unlock(&dev->struct_mutex); | 260 | mutex_unlock(&dev->struct_mutex); |
| 261 | return ret; | 261 | return ret; |
| 262 | } | 262 | } |
| 263 | ret = i915_gem_set_domain(obj, file_priv, | 263 | ret = i915_gem_object_set_to_gtt_domain(obj, 1); |
| 264 | I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); | ||
| 265 | if (ret) | 264 | if (ret) |
| 266 | goto fail; | 265 | goto fail; |
| 267 | 266 | ||
| @@ -320,8 +319,7 @@ i915_gem_shmem_pwrite(struct drm_device *dev, struct drm_gem_object *obj, | |||
| 320 | 319 | ||
| 321 | mutex_lock(&dev->struct_mutex); | 320 | mutex_lock(&dev->struct_mutex); |
| 322 | 321 | ||
| 323 | ret = i915_gem_set_domain(obj, file_priv, | 322 | ret = i915_gem_object_set_to_cpu_domain(obj, 1); |
| 324 | I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); | ||
| 325 | if (ret) { | 323 | if (ret) { |
| 326 | mutex_unlock(&dev->struct_mutex); | 324 | mutex_unlock(&dev->struct_mutex); |
| 327 | return ret; | 325 | return ret; |
| @@ -397,7 +395,8 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, | |||
| 397 | } | 395 | } |
| 398 | 396 | ||
| 399 | /** | 397 | /** |
| 400 | * Called when user space prepares to use an object | 398 | * Called when user space prepares to use an object with the CPU, either |
| 399 | * through the mmap ioctl's mapping or a GTT mapping. | ||
| 401 | */ | 400 | */ |
| 402 | int | 401 | int |
| 403 | i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, | 402 | i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, |
| @@ -405,11 +404,26 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, | |||
| 405 | { | 404 | { |
| 406 | struct drm_i915_gem_set_domain *args = data; | 405 | struct drm_i915_gem_set_domain *args = data; |
| 407 | struct drm_gem_object *obj; | 406 | struct drm_gem_object *obj; |
| 407 | uint32_t read_domains = args->read_domains; | ||
| 408 | uint32_t write_domain = args->write_domain; | ||
| 408 | int ret; | 409 | int ret; |
| 409 | 410 | ||
| 410 | if (!(dev->driver->driver_features & DRIVER_GEM)) | 411 | if (!(dev->driver->driver_features & DRIVER_GEM)) |
| 411 | return -ENODEV; | 412 | return -ENODEV; |
| 412 | 413 | ||
| 414 | /* Only handle setting domains to types used by the CPU. */ | ||
| 415 | if (write_domain & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | ||
| 416 | return -EINVAL; | ||
| 417 | |||
| 418 | if (read_domains & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | ||
| 419 | return -EINVAL; | ||
| 420 | |||
| 421 | /* Having something in the write domain implies it's in the read | ||
| 422 | * domain, and only that read domain. Enforce that in the request. | ||
| 423 | */ | ||
| 424 | if (write_domain != 0 && read_domains != write_domain) | ||
| 425 | return -EINVAL; | ||
| 426 | |||
| 413 | obj = drm_gem_object_lookup(dev, file_priv, args->handle); | 427 | obj = drm_gem_object_lookup(dev, file_priv, args->handle); |
| 414 | if (obj == NULL) | 428 | if (obj == NULL) |
| 415 | return -EBADF; | 429 | return -EBADF; |
| @@ -417,10 +431,21 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, | |||
| 417 | mutex_lock(&dev->struct_mutex); | 431 | mutex_lock(&dev->struct_mutex); |
| 418 | #if WATCH_BUF | 432 | #if WATCH_BUF |
| 419 | DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n", | 433 | DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n", |
| 420 | obj, obj->size, args->read_domains, args->write_domain); | 434 | obj, obj->size, read_domains, write_domain); |
| 421 | #endif | 435 | #endif |
| 422 | ret = i915_gem_set_domain(obj, file_priv, | 436 | if (read_domains & I915_GEM_DOMAIN_GTT) { |
| 423 | args->read_domains, args->write_domain); | 437 | ret = i915_gem_object_set_to_gtt_domain(obj, write_domain != 0); |
| 438 | |||
| 439 | /* Silently promote "you're not bound, there was nothing to do" | ||
| 440 | * to success, since the client was just asking us to | ||
| 441 | * make sure everything was done. | ||
| 442 | */ | ||
| 443 | if (ret == -EINVAL) | ||
| 444 | ret = 0; | ||
| 445 | } else { | ||
| 446 | ret = i915_gem_object_set_to_cpu_domain(obj, write_domain != 0); | ||
| 447 | } | ||
| 448 | |||
| 424 | drm_gem_object_unreference(obj); | 449 | drm_gem_object_unreference(obj); |
| 425 | mutex_unlock(&dev->struct_mutex); | 450 | mutex_unlock(&dev->struct_mutex); |
| 426 | return ret; | 451 | return ret; |
| @@ -455,10 +480,9 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data, | |||
| 455 | obj_priv = obj->driver_private; | 480 | obj_priv = obj->driver_private; |
| 456 | 481 | ||
| 457 | /* Pinned buffers may be scanout, so flush the cache */ | 482 | /* Pinned buffers may be scanout, so flush the cache */ |
| 458 | if ((obj->write_domain & I915_GEM_DOMAIN_CPU) && obj_priv->pin_count) { | 483 | if (obj_priv->pin_count) |
| 459 | i915_gem_clflush_object(obj); | 484 | i915_gem_object_flush_cpu_write_domain(obj); |
| 460 | drm_agp_chipset_flush(dev); | 485 | |
| 461 | } | ||
| 462 | drm_gem_object_unreference(obj); | 486 | drm_gem_object_unreference(obj); |
| 463 | mutex_unlock(&dev->struct_mutex); | 487 | mutex_unlock(&dev->struct_mutex); |
| 464 | return ret; | 488 | return ret; |
| @@ -532,7 +556,7 @@ i915_gem_object_free_page_list(struct drm_gem_object *obj) | |||
| 532 | } | 556 | } |
| 533 | 557 | ||
| 534 | static void | 558 | static void |
| 535 | i915_gem_object_move_to_active(struct drm_gem_object *obj) | 559 | i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno) |
| 536 | { | 560 | { |
| 537 | struct drm_device *dev = obj->dev; | 561 | struct drm_device *dev = obj->dev; |
| 538 | drm_i915_private_t *dev_priv = dev->dev_private; | 562 | drm_i915_private_t *dev_priv = dev->dev_private; |
| @@ -546,8 +570,20 @@ i915_gem_object_move_to_active(struct drm_gem_object *obj) | |||
| 546 | /* Move from whatever list we were on to the tail of execution. */ | 570 | /* Move from whatever list we were on to the tail of execution. */ |
| 547 | list_move_tail(&obj_priv->list, | 571 | list_move_tail(&obj_priv->list, |
| 548 | &dev_priv->mm.active_list); | 572 | &dev_priv->mm.active_list); |
| 573 | obj_priv->last_rendering_seqno = seqno; | ||
| 549 | } | 574 | } |
| 550 | 575 | ||
| 576 | static void | ||
| 577 | i915_gem_object_move_to_flushing(struct drm_gem_object *obj) | ||
| 578 | { | ||
| 579 | struct drm_device *dev = obj->dev; | ||
| 580 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
| 581 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 582 | |||
| 583 | BUG_ON(!obj_priv->active); | ||
| 584 | list_move_tail(&obj_priv->list, &dev_priv->mm.flushing_list); | ||
| 585 | obj_priv->last_rendering_seqno = 0; | ||
| 586 | } | ||
| 551 | 587 | ||
| 552 | static void | 588 | static void |
| 553 | i915_gem_object_move_to_inactive(struct drm_gem_object *obj) | 589 | i915_gem_object_move_to_inactive(struct drm_gem_object *obj) |
| @@ -562,6 +598,7 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj) | |||
| 562 | else | 598 | else |
| 563 | list_move_tail(&obj_priv->list, &dev_priv->mm.inactive_list); | 599 | list_move_tail(&obj_priv->list, &dev_priv->mm.inactive_list); |
| 564 | 600 | ||
| 601 | obj_priv->last_rendering_seqno = 0; | ||
| 565 | if (obj_priv->active) { | 602 | if (obj_priv->active) { |
| 566 | obj_priv->active = 0; | 603 | obj_priv->active = 0; |
| 567 | drm_gem_object_unreference(obj); | 604 | drm_gem_object_unreference(obj); |
| @@ -610,10 +647,28 @@ i915_add_request(struct drm_device *dev, uint32_t flush_domains) | |||
| 610 | 647 | ||
| 611 | request->seqno = seqno; | 648 | request->seqno = seqno; |
| 612 | request->emitted_jiffies = jiffies; | 649 | request->emitted_jiffies = jiffies; |
| 613 | request->flush_domains = flush_domains; | ||
| 614 | was_empty = list_empty(&dev_priv->mm.request_list); | 650 | was_empty = list_empty(&dev_priv->mm.request_list); |
| 615 | list_add_tail(&request->list, &dev_priv->mm.request_list); | 651 | list_add_tail(&request->list, &dev_priv->mm.request_list); |
| 616 | 652 | ||
| 653 | /* Associate any objects on the flushing list matching the write | ||
| 654 | * domain we're flushing with our flush. | ||
| 655 | */ | ||
| 656 | if (flush_domains != 0) { | ||
| 657 | struct drm_i915_gem_object *obj_priv, *next; | ||
| 658 | |||
| 659 | list_for_each_entry_safe(obj_priv, next, | ||
| 660 | &dev_priv->mm.flushing_list, list) { | ||
| 661 | struct drm_gem_object *obj = obj_priv->obj; | ||
| 662 | |||
| 663 | if ((obj->write_domain & flush_domains) == | ||
| 664 | obj->write_domain) { | ||
| 665 | obj->write_domain = 0; | ||
| 666 | i915_gem_object_move_to_active(obj, seqno); | ||
| 667 | } | ||
| 668 | } | ||
| 669 | |||
| 670 | } | ||
| 671 | |||
| 617 | if (was_empty && !dev_priv->mm.suspended) | 672 | if (was_empty && !dev_priv->mm.suspended) |
| 618 | schedule_delayed_work(&dev_priv->mm.retire_work, HZ); | 673 | schedule_delayed_work(&dev_priv->mm.retire_work, HZ); |
| 619 | return seqno; | 674 | return seqno; |
| @@ -676,30 +731,10 @@ i915_gem_retire_request(struct drm_device *dev, | |||
| 676 | __func__, request->seqno, obj); | 731 | __func__, request->seqno, obj); |
| 677 | #endif | 732 | #endif |
| 678 | 733 | ||
| 679 | if (obj->write_domain != 0) { | 734 | if (obj->write_domain != 0) |
| 680 | list_move_tail(&obj_priv->list, | 735 | i915_gem_object_move_to_flushing(obj); |
| 681 | &dev_priv->mm.flushing_list); | 736 | else |
| 682 | } else { | ||
| 683 | i915_gem_object_move_to_inactive(obj); | 737 | i915_gem_object_move_to_inactive(obj); |
| 684 | } | ||
| 685 | } | ||
| 686 | |||
| 687 | if (request->flush_domains != 0) { | ||
| 688 | struct drm_i915_gem_object *obj_priv, *next; | ||
| 689 | |||
| 690 | /* Clear the write domain and activity from any buffers | ||
| 691 | * that are just waiting for a flush matching the one retired. | ||
| 692 | */ | ||
| 693 | list_for_each_entry_safe(obj_priv, next, | ||
| 694 | &dev_priv->mm.flushing_list, list) { | ||
| 695 | struct drm_gem_object *obj = obj_priv->obj; | ||
| 696 | |||
| 697 | if (obj->write_domain & request->flush_domains) { | ||
| 698 | obj->write_domain = 0; | ||
| 699 | i915_gem_object_move_to_inactive(obj); | ||
| 700 | } | ||
| 701 | } | ||
| 702 | |||
| 703 | } | 738 | } |
| 704 | } | 739 | } |
| 705 | 740 | ||
| @@ -892,25 +927,10 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj) | |||
| 892 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | 927 | struct drm_i915_gem_object *obj_priv = obj->driver_private; |
| 893 | int ret; | 928 | int ret; |
| 894 | 929 | ||
| 895 | /* If there are writes queued to the buffer, flush and | 930 | /* This function only exists to support waiting for existing rendering, |
| 896 | * create a new seqno to wait for. | 931 | * not for emitting required flushes. |
| 897 | */ | 932 | */ |
| 898 | if (obj->write_domain & ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT)) { | 933 | BUG_ON((obj->write_domain & I915_GEM_GPU_DOMAINS) != 0); |
| 899 | uint32_t write_domain = obj->write_domain; | ||
| 900 | #if WATCH_BUF | ||
| 901 | DRM_INFO("%s: flushing object %p from write domain %08x\n", | ||
| 902 | __func__, obj, write_domain); | ||
| 903 | #endif | ||
| 904 | i915_gem_flush(dev, 0, write_domain); | ||
| 905 | |||
| 906 | i915_gem_object_move_to_active(obj); | ||
| 907 | obj_priv->last_rendering_seqno = i915_add_request(dev, | ||
| 908 | write_domain); | ||
| 909 | BUG_ON(obj_priv->last_rendering_seqno == 0); | ||
| 910 | #if WATCH_LRU | ||
| 911 | DRM_INFO("%s: flush moves to exec list %p\n", __func__, obj); | ||
| 912 | #endif | ||
| 913 | } | ||
| 914 | 934 | ||
| 915 | /* If there is rendering queued on the buffer being evicted, wait for | 935 | /* If there is rendering queued on the buffer being evicted, wait for |
| 916 | * it. | 936 | * it. |
| @@ -950,24 +970,16 @@ i915_gem_object_unbind(struct drm_gem_object *obj) | |||
| 950 | return -EINVAL; | 970 | return -EINVAL; |
| 951 | } | 971 | } |
| 952 | 972 | ||
| 953 | /* Wait for any rendering to complete | ||
| 954 | */ | ||
| 955 | ret = i915_gem_object_wait_rendering(obj); | ||
| 956 | if (ret) { | ||
| 957 | DRM_ERROR("wait_rendering failed: %d\n", ret); | ||
| 958 | return ret; | ||
| 959 | } | ||
| 960 | |||
| 961 | /* Move the object to the CPU domain to ensure that | 973 | /* Move the object to the CPU domain to ensure that |
| 962 | * any possible CPU writes while it's not in the GTT | 974 | * any possible CPU writes while it's not in the GTT |
| 963 | * are flushed when we go to remap it. This will | 975 | * are flushed when we go to remap it. This will |
| 964 | * also ensure that all pending GPU writes are finished | 976 | * also ensure that all pending GPU writes are finished |
| 965 | * before we unbind. | 977 | * before we unbind. |
| 966 | */ | 978 | */ |
| 967 | ret = i915_gem_object_set_domain(obj, I915_GEM_DOMAIN_CPU, | 979 | ret = i915_gem_object_set_to_cpu_domain(obj, 1); |
| 968 | I915_GEM_DOMAIN_CPU); | ||
| 969 | if (ret) { | 980 | if (ret) { |
| 970 | DRM_ERROR("set_domain failed: %d\n", ret); | 981 | if (ret != -ERESTARTSYS) |
| 982 | DRM_ERROR("set_domain failed: %d\n", ret); | ||
| 971 | return ret; | 983 | return ret; |
| 972 | } | 984 | } |
| 973 | 985 | ||
| @@ -1083,6 +1095,21 @@ i915_gem_evict_something(struct drm_device *dev) | |||
| 1083 | } | 1095 | } |
| 1084 | 1096 | ||
| 1085 | static int | 1097 | static int |
| 1098 | i915_gem_evict_everything(struct drm_device *dev) | ||
| 1099 | { | ||
| 1100 | int ret; | ||
| 1101 | |||
| 1102 | for (;;) { | ||
| 1103 | ret = i915_gem_evict_something(dev); | ||
| 1104 | if (ret != 0) | ||
| 1105 | break; | ||
| 1106 | } | ||
| 1107 | if (ret == -ENOMEM) | ||
| 1108 | return 0; | ||
| 1109 | return ret; | ||
| 1110 | } | ||
| 1111 | |||
| 1112 | static int | ||
| 1086 | i915_gem_object_get_page_list(struct drm_gem_object *obj) | 1113 | i915_gem_object_get_page_list(struct drm_gem_object *obj) |
| 1087 | { | 1114 | { |
| 1088 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | 1115 | struct drm_i915_gem_object *obj_priv = obj->driver_private; |
| @@ -1168,7 +1195,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) | |||
| 1168 | 1195 | ||
| 1169 | ret = i915_gem_evict_something(dev); | 1196 | ret = i915_gem_evict_something(dev); |
| 1170 | if (ret != 0) { | 1197 | if (ret != 0) { |
| 1171 | DRM_ERROR("Failed to evict a buffer %d\n", ret); | 1198 | if (ret != -ERESTARTSYS) |
| 1199 | DRM_ERROR("Failed to evict a buffer %d\n", ret); | ||
| 1172 | return ret; | 1200 | return ret; |
| 1173 | } | 1201 | } |
| 1174 | goto search_free; | 1202 | goto search_free; |
| @@ -1228,6 +1256,143 @@ i915_gem_clflush_object(struct drm_gem_object *obj) | |||
| 1228 | drm_clflush_pages(obj_priv->page_list, obj->size / PAGE_SIZE); | 1256 | drm_clflush_pages(obj_priv->page_list, obj->size / PAGE_SIZE); |
| 1229 | } | 1257 | } |
| 1230 | 1258 | ||
| 1259 | /** Flushes any GPU write domain for the object if it's dirty. */ | ||
| 1260 | static void | ||
| 1261 | i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) | ||
| 1262 | { | ||
| 1263 | struct drm_device *dev = obj->dev; | ||
| 1264 | uint32_t seqno; | ||
| 1265 | |||
| 1266 | if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0) | ||
| 1267 | return; | ||
| 1268 | |||
| 1269 | /* Queue the GPU write cache flushing we need. */ | ||
| 1270 | i915_gem_flush(dev, 0, obj->write_domain); | ||
| 1271 | seqno = i915_add_request(dev, obj->write_domain); | ||
| 1272 | obj->write_domain = 0; | ||
| 1273 | i915_gem_object_move_to_active(obj, seqno); | ||
| 1274 | } | ||
| 1275 | |||
| 1276 | /** Flushes the GTT write domain for the object if it's dirty. */ | ||
| 1277 | static void | ||
| 1278 | i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj) | ||
| 1279 | { | ||
| 1280 | if (obj->write_domain != I915_GEM_DOMAIN_GTT) | ||
| 1281 | return; | ||
| 1282 | |||
| 1283 | /* No actual flushing is required for the GTT write domain. Writes | ||
| 1284 | * to it immediately go to main memory as far as we know, so there's | ||
| 1285 | * no chipset flush. It also doesn't land in render cache. | ||
| 1286 | */ | ||
| 1287 | obj->write_domain = 0; | ||
| 1288 | } | ||
| 1289 | |||
| 1290 | /** Flushes the CPU write domain for the object if it's dirty. */ | ||
| 1291 | static void | ||
| 1292 | i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj) | ||
| 1293 | { | ||
| 1294 | struct drm_device *dev = obj->dev; | ||
| 1295 | |||
| 1296 | if (obj->write_domain != I915_GEM_DOMAIN_CPU) | ||
| 1297 | return; | ||
| 1298 | |||
| 1299 | i915_gem_clflush_object(obj); | ||
| 1300 | drm_agp_chipset_flush(dev); | ||
| 1301 | obj->write_domain = 0; | ||
| 1302 | } | ||
| 1303 | |||
| 1304 | /** | ||
| 1305 | * Moves a single object to the GTT read, and possibly write domain. | ||
| 1306 | * | ||
| 1307 | * This function returns when the move is complete, including waiting on | ||
| 1308 | * flushes to occur. | ||
| 1309 | */ | ||
| 1310 | static int | ||
| 1311 | i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write) | ||
| 1312 | { | ||
| 1313 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 1314 | int ret; | ||
| 1315 | |||
| 1316 | /* Not valid to be called on unbound objects. */ | ||
| 1317 | if (obj_priv->gtt_space == NULL) | ||
| 1318 | return -EINVAL; | ||
| 1319 | |||
| 1320 | i915_gem_object_flush_gpu_write_domain(obj); | ||
| 1321 | /* Wait on any GPU rendering and flushing to occur. */ | ||
| 1322 | ret = i915_gem_object_wait_rendering(obj); | ||
| 1323 | if (ret != 0) | ||
| 1324 | return ret; | ||
| 1325 | |||
| 1326 | /* If we're writing through the GTT domain, then CPU and GPU caches | ||
| 1327 | * will need to be invalidated at next use. | ||
| 1328 | */ | ||
| 1329 | if (write) | ||
| 1330 | obj->read_domains &= I915_GEM_DOMAIN_GTT; | ||
| 1331 | |||
| 1332 | i915_gem_object_flush_cpu_write_domain(obj); | ||
| 1333 | |||
| 1334 | /* It should now be out of any other write domains, and we can update | ||
| 1335 | * the domain values for our changes. | ||
| 1336 | */ | ||
| 1337 | BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0); | ||
| 1338 | obj->read_domains |= I915_GEM_DOMAIN_GTT; | ||
| 1339 | if (write) { | ||
| 1340 | obj->write_domain = I915_GEM_DOMAIN_GTT; | ||
| 1341 | obj_priv->dirty = 1; | ||
| 1342 | } | ||
| 1343 | |||
| 1344 | return 0; | ||
| 1345 | } | ||
| 1346 | |||
| 1347 | /** | ||
| 1348 | * Moves a single object to the CPU read, and possibly write domain. | ||
| 1349 | * | ||
| 1350 | * This function returns when the move is complete, including waiting on | ||
| 1351 | * flushes to occur. | ||
| 1352 | */ | ||
| 1353 | static int | ||
| 1354 | i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write) | ||
| 1355 | { | ||
| 1356 | struct drm_device *dev = obj->dev; | ||
| 1357 | int ret; | ||
| 1358 | |||
| 1359 | i915_gem_object_flush_gpu_write_domain(obj); | ||
| 1360 | /* Wait on any GPU rendering and flushing to occur. */ | ||
| 1361 | ret = i915_gem_object_wait_rendering(obj); | ||
| 1362 | if (ret != 0) | ||
| 1363 | return ret; | ||
| 1364 | |||
| 1365 | i915_gem_object_flush_gtt_write_domain(obj); | ||
| 1366 | |||
| 1367 | /* If we have a partially-valid cache of the object in the CPU, | ||
| 1368 | * finish invalidating it and free the per-page flags. | ||
| 1369 | */ | ||
| 1370 | i915_gem_object_set_to_full_cpu_read_domain(obj); | ||
| 1371 | |||
| 1372 | /* Flush the CPU cache if it's still invalid. */ | ||
| 1373 | if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) { | ||
| 1374 | i915_gem_clflush_object(obj); | ||
| 1375 | drm_agp_chipset_flush(dev); | ||
| 1376 | |||
| 1377 | obj->read_domains |= I915_GEM_DOMAIN_CPU; | ||
| 1378 | } | ||
| 1379 | |||
| 1380 | /* It should now be out of any other write domains, and we can update | ||
| 1381 | * the domain values for our changes. | ||
| 1382 | */ | ||
| 1383 | BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_CPU) != 0); | ||
| 1384 | |||
| 1385 | /* If we're writing through the CPU, then the GPU read domains will | ||
| 1386 | * need to be invalidated at next use. | ||
| 1387 | */ | ||
| 1388 | if (write) { | ||
| 1389 | obj->read_domains &= I915_GEM_DOMAIN_CPU; | ||
| 1390 | obj->write_domain = I915_GEM_DOMAIN_CPU; | ||
| 1391 | } | ||
| 1392 | |||
| 1393 | return 0; | ||
| 1394 | } | ||
| 1395 | |||
| 1231 | /* | 1396 | /* |
| 1232 | * Set the next domain for the specified object. This | 1397 | * Set the next domain for the specified object. This |
| 1233 | * may not actually perform the necessary flushing/invaliding though, | 1398 | * may not actually perform the necessary flushing/invaliding though, |
| @@ -1339,16 +1504,18 @@ i915_gem_clflush_object(struct drm_gem_object *obj) | |||
| 1339 | * MI_FLUSH | 1504 | * MI_FLUSH |
| 1340 | * drm_agp_chipset_flush | 1505 | * drm_agp_chipset_flush |
| 1341 | */ | 1506 | */ |
| 1342 | static int | 1507 | static void |
| 1343 | i915_gem_object_set_domain(struct drm_gem_object *obj, | 1508 | i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj, |
| 1344 | uint32_t read_domains, | 1509 | uint32_t read_domains, |
| 1345 | uint32_t write_domain) | 1510 | uint32_t write_domain) |
| 1346 | { | 1511 | { |
| 1347 | struct drm_device *dev = obj->dev; | 1512 | struct drm_device *dev = obj->dev; |
| 1348 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | 1513 | struct drm_i915_gem_object *obj_priv = obj->driver_private; |
| 1349 | uint32_t invalidate_domains = 0; | 1514 | uint32_t invalidate_domains = 0; |
| 1350 | uint32_t flush_domains = 0; | 1515 | uint32_t flush_domains = 0; |
| 1351 | int ret; | 1516 | |
| 1517 | BUG_ON(read_domains & I915_GEM_DOMAIN_CPU); | ||
| 1518 | BUG_ON(write_domain == I915_GEM_DOMAIN_CPU); | ||
| 1352 | 1519 | ||
| 1353 | #if WATCH_BUF | 1520 | #if WATCH_BUF |
| 1354 | DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n", | 1521 | DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n", |
| @@ -1385,34 +1552,11 @@ i915_gem_object_set_domain(struct drm_gem_object *obj, | |||
| 1385 | DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n", | 1552 | DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n", |
| 1386 | __func__, flush_domains, invalidate_domains); | 1553 | __func__, flush_domains, invalidate_domains); |
| 1387 | #endif | 1554 | #endif |
| 1388 | /* | ||
| 1389 | * If we're invaliding the CPU cache and flushing a GPU cache, | ||
| 1390 | * then pause for rendering so that the GPU caches will be | ||
| 1391 | * flushed before the cpu cache is invalidated | ||
| 1392 | */ | ||
| 1393 | if ((invalidate_domains & I915_GEM_DOMAIN_CPU) && | ||
| 1394 | (flush_domains & ~(I915_GEM_DOMAIN_CPU | | ||
| 1395 | I915_GEM_DOMAIN_GTT))) { | ||
| 1396 | ret = i915_gem_object_wait_rendering(obj); | ||
| 1397 | if (ret) | ||
| 1398 | return ret; | ||
| 1399 | } | ||
| 1400 | i915_gem_clflush_object(obj); | 1555 | i915_gem_clflush_object(obj); |
| 1401 | } | 1556 | } |
| 1402 | 1557 | ||
| 1403 | if ((write_domain | flush_domains) != 0) | 1558 | if ((write_domain | flush_domains) != 0) |
| 1404 | obj->write_domain = write_domain; | 1559 | obj->write_domain = write_domain; |
| 1405 | |||
| 1406 | /* If we're invalidating the CPU domain, clear the per-page CPU | ||
| 1407 | * domain list as well. | ||
| 1408 | */ | ||
| 1409 | if (obj_priv->page_cpu_valid != NULL && | ||
| 1410 | (write_domain != 0 || | ||
| 1411 | read_domains & I915_GEM_DOMAIN_CPU)) { | ||
| 1412 | drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE, | ||
| 1413 | DRM_MEM_DRIVER); | ||
| 1414 | obj_priv->page_cpu_valid = NULL; | ||
| 1415 | } | ||
| 1416 | obj->read_domains = read_domains; | 1560 | obj->read_domains = read_domains; |
| 1417 | 1561 | ||
| 1418 | dev->invalidate_domains |= invalidate_domains; | 1562 | dev->invalidate_domains |= invalidate_domains; |
| @@ -1423,47 +1567,94 @@ i915_gem_object_set_domain(struct drm_gem_object *obj, | |||
| 1423 | obj->read_domains, obj->write_domain, | 1567 | obj->read_domains, obj->write_domain, |
| 1424 | dev->invalidate_domains, dev->flush_domains); | 1568 | dev->invalidate_domains, dev->flush_domains); |
| 1425 | #endif | 1569 | #endif |
| 1426 | return 0; | ||
| 1427 | } | 1570 | } |
| 1428 | 1571 | ||
| 1429 | /** | 1572 | /** |
| 1430 | * Set the read/write domain on a range of the object. | 1573 | * Moves the object from a partially CPU read to a full one. |
| 1431 | * | 1574 | * |
| 1432 | * Currently only implemented for CPU reads, otherwise drops to normal | 1575 | * Note that this only resolves i915_gem_object_set_cpu_read_domain_range(), |
| 1433 | * i915_gem_object_set_domain(). | 1576 | * and doesn't handle transitioning from !(read_domains & I915_GEM_DOMAIN_CPU). |
| 1434 | */ | 1577 | */ |
| 1435 | static int | 1578 | static void |
| 1436 | i915_gem_object_set_domain_range(struct drm_gem_object *obj, | 1579 | i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj) |
| 1437 | uint64_t offset, | ||
| 1438 | uint64_t size, | ||
| 1439 | uint32_t read_domains, | ||
| 1440 | uint32_t write_domain) | ||
| 1441 | { | 1580 | { |
| 1581 | struct drm_device *dev = obj->dev; | ||
| 1442 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | 1582 | struct drm_i915_gem_object *obj_priv = obj->driver_private; |
| 1443 | int ret, i; | ||
| 1444 | 1583 | ||
| 1445 | if (obj->read_domains & I915_GEM_DOMAIN_CPU) | 1584 | if (!obj_priv->page_cpu_valid) |
| 1446 | return 0; | 1585 | return; |
| 1447 | 1586 | ||
| 1448 | if (read_domains != I915_GEM_DOMAIN_CPU || | 1587 | /* If we're partially in the CPU read domain, finish moving it in. |
| 1449 | write_domain != 0) | 1588 | */ |
| 1450 | return i915_gem_object_set_domain(obj, | 1589 | if (obj->read_domains & I915_GEM_DOMAIN_CPU) { |
| 1451 | read_domains, write_domain); | 1590 | int i; |
| 1452 | 1591 | ||
| 1453 | /* Wait on any GPU rendering to the object to be flushed. */ | 1592 | for (i = 0; i <= (obj->size - 1) / PAGE_SIZE; i++) { |
| 1593 | if (obj_priv->page_cpu_valid[i]) | ||
| 1594 | continue; | ||
| 1595 | drm_clflush_pages(obj_priv->page_list + i, 1); | ||
| 1596 | } | ||
| 1597 | drm_agp_chipset_flush(dev); | ||
| 1598 | } | ||
| 1599 | |||
| 1600 | /* Free the page_cpu_valid mappings which are now stale, whether | ||
| 1601 | * or not we've got I915_GEM_DOMAIN_CPU. | ||
| 1602 | */ | ||
| 1603 | drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE, | ||
| 1604 | DRM_MEM_DRIVER); | ||
| 1605 | obj_priv->page_cpu_valid = NULL; | ||
| 1606 | } | ||
| 1607 | |||
| 1608 | /** | ||
| 1609 | * Set the CPU read domain on a range of the object. | ||
| 1610 | * | ||
| 1611 | * The object ends up with I915_GEM_DOMAIN_CPU in its read flags although it's | ||
| 1612 | * not entirely valid. The page_cpu_valid member of the object flags which | ||
| 1613 | * pages have been flushed, and will be respected by | ||
| 1614 | * i915_gem_object_set_to_cpu_domain() if it's called on to get a valid mapping | ||
| 1615 | * of the whole object. | ||
| 1616 | * | ||
| 1617 | * This function returns when the move is complete, including waiting on | ||
| 1618 | * flushes to occur. | ||
| 1619 | */ | ||
| 1620 | static int | ||
| 1621 | i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, | ||
| 1622 | uint64_t offset, uint64_t size) | ||
| 1623 | { | ||
| 1624 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 1625 | int i, ret; | ||
| 1626 | |||
| 1627 | if (offset == 0 && size == obj->size) | ||
| 1628 | return i915_gem_object_set_to_cpu_domain(obj, 0); | ||
| 1629 | |||
| 1630 | i915_gem_object_flush_gpu_write_domain(obj); | ||
| 1631 | /* Wait on any GPU rendering and flushing to occur. */ | ||
| 1454 | ret = i915_gem_object_wait_rendering(obj); | 1632 | ret = i915_gem_object_wait_rendering(obj); |
| 1455 | if (ret) | 1633 | if (ret != 0) |
| 1456 | return ret; | 1634 | return ret; |
| 1635 | i915_gem_object_flush_gtt_write_domain(obj); | ||
| 1457 | 1636 | ||
| 1637 | /* If we're already fully in the CPU read domain, we're done. */ | ||
| 1638 | if (obj_priv->page_cpu_valid == NULL && | ||
| 1639 | (obj->read_domains & I915_GEM_DOMAIN_CPU) != 0) | ||
| 1640 | return 0; | ||
| 1641 | |||
| 1642 | /* Otherwise, create/clear the per-page CPU read domain flag if we're | ||
| 1643 | * newly adding I915_GEM_DOMAIN_CPU | ||
| 1644 | */ | ||
| 1458 | if (obj_priv->page_cpu_valid == NULL) { | 1645 | if (obj_priv->page_cpu_valid == NULL) { |
| 1459 | obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE, | 1646 | obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE, |
| 1460 | DRM_MEM_DRIVER); | 1647 | DRM_MEM_DRIVER); |
| 1461 | } | 1648 | if (obj_priv->page_cpu_valid == NULL) |
| 1649 | return -ENOMEM; | ||
| 1650 | } else if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) | ||
| 1651 | memset(obj_priv->page_cpu_valid, 0, obj->size / PAGE_SIZE); | ||
| 1462 | 1652 | ||
| 1463 | /* Flush the cache on any pages that are still invalid from the CPU's | 1653 | /* Flush the cache on any pages that are still invalid from the CPU's |
| 1464 | * perspective. | 1654 | * perspective. |
| 1465 | */ | 1655 | */ |
| 1466 | for (i = offset / PAGE_SIZE; i <= (offset + size - 1) / PAGE_SIZE; i++) { | 1656 | for (i = offset / PAGE_SIZE; i <= (offset + size - 1) / PAGE_SIZE; |
| 1657 | i++) { | ||
| 1467 | if (obj_priv->page_cpu_valid[i]) | 1658 | if (obj_priv->page_cpu_valid[i]) |
| 1468 | continue; | 1659 | continue; |
| 1469 | 1660 | ||
| @@ -1472,39 +1663,14 @@ i915_gem_object_set_domain_range(struct drm_gem_object *obj, | |||
| 1472 | obj_priv->page_cpu_valid[i] = 1; | 1663 | obj_priv->page_cpu_valid[i] = 1; |
| 1473 | } | 1664 | } |
| 1474 | 1665 | ||
| 1475 | return 0; | 1666 | /* It should now be out of any other write domains, and we can update |
| 1476 | } | 1667 | * the domain values for our changes. |
| 1477 | |||
| 1478 | /** | ||
| 1479 | * Once all of the objects have been set in the proper domain, | ||
| 1480 | * perform the necessary flush and invalidate operations. | ||
| 1481 | * | ||
| 1482 | * Returns the write domains flushed, for use in flush tracking. | ||
| 1483 | */ | ||
| 1484 | static uint32_t | ||
| 1485 | i915_gem_dev_set_domain(struct drm_device *dev) | ||
| 1486 | { | ||
| 1487 | uint32_t flush_domains = dev->flush_domains; | ||
| 1488 | |||
| 1489 | /* | ||
| 1490 | * Now that all the buffers are synced to the proper domains, | ||
| 1491 | * flush and invalidate the collected domains | ||
| 1492 | */ | 1668 | */ |
| 1493 | if (dev->invalidate_domains | dev->flush_domains) { | 1669 | BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_CPU) != 0); |
| 1494 | #if WATCH_EXEC | ||
| 1495 | DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n", | ||
| 1496 | __func__, | ||
| 1497 | dev->invalidate_domains, | ||
| 1498 | dev->flush_domains); | ||
| 1499 | #endif | ||
| 1500 | i915_gem_flush(dev, | ||
| 1501 | dev->invalidate_domains, | ||
| 1502 | dev->flush_domains); | ||
| 1503 | dev->invalidate_domains = 0; | ||
| 1504 | dev->flush_domains = 0; | ||
| 1505 | } | ||
| 1506 | 1670 | ||
| 1507 | return flush_domains; | 1671 | obj->read_domains |= I915_GEM_DOMAIN_CPU; |
| 1672 | |||
| 1673 | return 0; | ||
| 1508 | } | 1674 | } |
| 1509 | 1675 | ||
| 1510 | /** | 1676 | /** |
| @@ -1585,6 +1751,18 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, | |||
| 1585 | return -EINVAL; | 1751 | return -EINVAL; |
| 1586 | } | 1752 | } |
| 1587 | 1753 | ||
| 1754 | if (reloc.write_domain & I915_GEM_DOMAIN_CPU || | ||
| 1755 | reloc.read_domains & I915_GEM_DOMAIN_CPU) { | ||
| 1756 | DRM_ERROR("reloc with read/write CPU domains: " | ||
| 1757 | "obj %p target %d offset %d " | ||
| 1758 | "read %08x write %08x", | ||
| 1759 | obj, reloc.target_handle, | ||
| 1760 | (int) reloc.offset, | ||
| 1761 | reloc.read_domains, | ||
| 1762 | reloc.write_domain); | ||
| 1763 | return -EINVAL; | ||
| 1764 | } | ||
| 1765 | |||
| 1588 | if (reloc.write_domain && target_obj->pending_write_domain && | 1766 | if (reloc.write_domain && target_obj->pending_write_domain && |
| 1589 | reloc.write_domain != target_obj->pending_write_domain) { | 1767 | reloc.write_domain != target_obj->pending_write_domain) { |
| 1590 | DRM_ERROR("Write domain conflict: " | 1768 | DRM_ERROR("Write domain conflict: " |
| @@ -1625,19 +1803,11 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, | |||
| 1625 | continue; | 1803 | continue; |
| 1626 | } | 1804 | } |
| 1627 | 1805 | ||
| 1628 | /* Now that we're going to actually write some data in, | 1806 | ret = i915_gem_object_set_to_gtt_domain(obj, 1); |
| 1629 | * make sure that any rendering using this buffer's contents | 1807 | if (ret != 0) { |
| 1630 | * is completed. | 1808 | drm_gem_object_unreference(target_obj); |
| 1631 | */ | 1809 | i915_gem_object_unpin(obj); |
| 1632 | i915_gem_object_wait_rendering(obj); | 1810 | return -EINVAL; |
| 1633 | |||
| 1634 | /* As we're writing through the gtt, flush | ||
| 1635 | * any CPU writes before we write the relocations | ||
| 1636 | */ | ||
| 1637 | if (obj->write_domain & I915_GEM_DOMAIN_CPU) { | ||
| 1638 | i915_gem_clflush_object(obj); | ||
| 1639 | drm_agp_chipset_flush(dev); | ||
| 1640 | obj->write_domain = 0; | ||
| 1641 | } | 1811 | } |
| 1642 | 1812 | ||
| 1643 | /* Map the page containing the relocation we're going to | 1813 | /* Map the page containing the relocation we're going to |
| @@ -1779,6 +1949,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1779 | int ret, i, pinned = 0; | 1949 | int ret, i, pinned = 0; |
| 1780 | uint64_t exec_offset; | 1950 | uint64_t exec_offset; |
| 1781 | uint32_t seqno, flush_domains; | 1951 | uint32_t seqno, flush_domains; |
| 1952 | int pin_tries; | ||
| 1782 | 1953 | ||
| 1783 | #if WATCH_EXEC | 1954 | #if WATCH_EXEC |
| 1784 | DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n", | 1955 | DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n", |
| @@ -1827,14 +1998,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1827 | return -EBUSY; | 1998 | return -EBUSY; |
| 1828 | } | 1999 | } |
| 1829 | 2000 | ||
| 1830 | /* Zero the gloabl flush/invalidate flags. These | 2001 | /* Look up object handles */ |
| 1831 | * will be modified as each object is bound to the | ||
| 1832 | * gtt | ||
| 1833 | */ | ||
| 1834 | dev->invalidate_domains = 0; | ||
| 1835 | dev->flush_domains = 0; | ||
| 1836 | |||
| 1837 | /* Look up object handles and perform the relocations */ | ||
| 1838 | for (i = 0; i < args->buffer_count; i++) { | 2002 | for (i = 0; i < args->buffer_count; i++) { |
| 1839 | object_list[i] = drm_gem_object_lookup(dev, file_priv, | 2003 | object_list[i] = drm_gem_object_lookup(dev, file_priv, |
| 1840 | exec_list[i].handle); | 2004 | exec_list[i].handle); |
| @@ -1844,17 +2008,39 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1844 | ret = -EBADF; | 2008 | ret = -EBADF; |
| 1845 | goto err; | 2009 | goto err; |
| 1846 | } | 2010 | } |
| 2011 | } | ||
| 1847 | 2012 | ||
| 1848 | object_list[i]->pending_read_domains = 0; | 2013 | /* Pin and relocate */ |
| 1849 | object_list[i]->pending_write_domain = 0; | 2014 | for (pin_tries = 0; ; pin_tries++) { |
| 1850 | ret = i915_gem_object_pin_and_relocate(object_list[i], | 2015 | ret = 0; |
| 1851 | file_priv, | 2016 | for (i = 0; i < args->buffer_count; i++) { |
| 1852 | &exec_list[i]); | 2017 | object_list[i]->pending_read_domains = 0; |
| 1853 | if (ret) { | 2018 | object_list[i]->pending_write_domain = 0; |
| 1854 | DRM_ERROR("object bind and relocate failed %d\n", ret); | 2019 | ret = i915_gem_object_pin_and_relocate(object_list[i], |
| 2020 | file_priv, | ||
| 2021 | &exec_list[i]); | ||
| 2022 | if (ret) | ||
| 2023 | break; | ||
| 2024 | pinned = i + 1; | ||
| 2025 | } | ||
| 2026 | /* success */ | ||
| 2027 | if (ret == 0) | ||
| 2028 | break; | ||
| 2029 | |||
| 2030 | /* error other than GTT full, or we've already tried again */ | ||
| 2031 | if (ret != -ENOMEM || pin_tries >= 1) { | ||
| 2032 | DRM_ERROR("Failed to pin buffers %d\n", ret); | ||
| 1855 | goto err; | 2033 | goto err; |
| 1856 | } | 2034 | } |
| 1857 | pinned = i + 1; | 2035 | |
| 2036 | /* unpin all of our buffers */ | ||
| 2037 | for (i = 0; i < pinned; i++) | ||
| 2038 | i915_gem_object_unpin(object_list[i]); | ||
| 2039 | |||
| 2040 | /* evict everyone we can from the aperture */ | ||
| 2041 | ret = i915_gem_evict_everything(dev); | ||
| 2042 | if (ret) | ||
| 2043 | goto err; | ||
| 1858 | } | 2044 | } |
| 1859 | 2045 | ||
| 1860 | /* Set the pending read domains for the batch buffer to COMMAND */ | 2046 | /* Set the pending read domains for the batch buffer to COMMAND */ |
| @@ -1864,21 +2050,37 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1864 | 2050 | ||
| 1865 | i915_verify_inactive(dev, __FILE__, __LINE__); | 2051 | i915_verify_inactive(dev, __FILE__, __LINE__); |
| 1866 | 2052 | ||
| 2053 | /* Zero the global flush/invalidate flags. These | ||
| 2054 | * will be modified as new domains are computed | ||
| 2055 | * for each object | ||
| 2056 | */ | ||
| 2057 | dev->invalidate_domains = 0; | ||
| 2058 | dev->flush_domains = 0; | ||
| 2059 | |||
| 1867 | for (i = 0; i < args->buffer_count; i++) { | 2060 | for (i = 0; i < args->buffer_count; i++) { |
| 1868 | struct drm_gem_object *obj = object_list[i]; | 2061 | struct drm_gem_object *obj = object_list[i]; |
| 1869 | 2062 | ||
| 1870 | /* make sure all previous memory operations have passed */ | 2063 | /* Compute new gpu domains and update invalidate/flush */ |
| 1871 | ret = i915_gem_object_set_domain(obj, | 2064 | i915_gem_object_set_to_gpu_domain(obj, |
| 1872 | obj->pending_read_domains, | 2065 | obj->pending_read_domains, |
| 1873 | obj->pending_write_domain); | 2066 | obj->pending_write_domain); |
| 1874 | if (ret) | ||
| 1875 | goto err; | ||
| 1876 | } | 2067 | } |
| 1877 | 2068 | ||
| 1878 | i915_verify_inactive(dev, __FILE__, __LINE__); | 2069 | i915_verify_inactive(dev, __FILE__, __LINE__); |
| 1879 | 2070 | ||
| 1880 | /* Flush/invalidate caches and chipset buffer */ | 2071 | if (dev->invalidate_domains | dev->flush_domains) { |
| 1881 | flush_domains = i915_gem_dev_set_domain(dev); | 2072 | #if WATCH_EXEC |
| 2073 | DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n", | ||
| 2074 | __func__, | ||
| 2075 | dev->invalidate_domains, | ||
| 2076 | dev->flush_domains); | ||
| 2077 | #endif | ||
| 2078 | i915_gem_flush(dev, | ||
| 2079 | dev->invalidate_domains, | ||
| 2080 | dev->flush_domains); | ||
| 2081 | if (dev->flush_domains) | ||
| 2082 | (void)i915_add_request(dev, dev->flush_domains); | ||
| 2083 | } | ||
| 1882 | 2084 | ||
| 1883 | i915_verify_inactive(dev, __FILE__, __LINE__); | 2085 | i915_verify_inactive(dev, __FILE__, __LINE__); |
| 1884 | 2086 | ||
| @@ -1898,8 +2100,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1898 | ~0); | 2100 | ~0); |
| 1899 | #endif | 2101 | #endif |
| 1900 | 2102 | ||
| 1901 | (void)i915_add_request(dev, flush_domains); | ||
| 1902 | |||
| 1903 | /* Exec the batchbuffer */ | 2103 | /* Exec the batchbuffer */ |
| 1904 | ret = i915_dispatch_gem_execbuffer(dev, args, exec_offset); | 2104 | ret = i915_dispatch_gem_execbuffer(dev, args, exec_offset); |
| 1905 | if (ret) { | 2105 | if (ret) { |
| @@ -1927,10 +2127,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1927 | i915_file_priv->mm.last_gem_seqno = seqno; | 2127 | i915_file_priv->mm.last_gem_seqno = seqno; |
| 1928 | for (i = 0; i < args->buffer_count; i++) { | 2128 | for (i = 0; i < args->buffer_count; i++) { |
| 1929 | struct drm_gem_object *obj = object_list[i]; | 2129 | struct drm_gem_object *obj = object_list[i]; |
| 1930 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 1931 | 2130 | ||
| 1932 | i915_gem_object_move_to_active(obj); | 2131 | i915_gem_object_move_to_active(obj, seqno); |
| 1933 | obj_priv->last_rendering_seqno = seqno; | ||
| 1934 | #if WATCH_LRU | 2132 | #if WATCH_LRU |
| 1935 | DRM_INFO("%s: move to exec list %p\n", __func__, obj); | 2133 | DRM_INFO("%s: move to exec list %p\n", __func__, obj); |
| 1936 | #endif | 2134 | #endif |
| @@ -2061,11 +2259,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, | |||
| 2061 | /* XXX - flush the CPU caches for pinned objects | 2259 | /* XXX - flush the CPU caches for pinned objects |
| 2062 | * as the X server doesn't manage domains yet | 2260 | * as the X server doesn't manage domains yet |
| 2063 | */ | 2261 | */ |
| 2064 | if (obj->write_domain & I915_GEM_DOMAIN_CPU) { | 2262 | i915_gem_object_flush_cpu_write_domain(obj); |
| 2065 | i915_gem_clflush_object(obj); | ||
| 2066 | drm_agp_chipset_flush(dev); | ||
| 2067 | obj->write_domain = 0; | ||
| 2068 | } | ||
| 2069 | args->offset = obj_priv->gtt_offset; | 2263 | args->offset = obj_priv->gtt_offset; |
| 2070 | drm_gem_object_unreference(obj); | 2264 | drm_gem_object_unreference(obj); |
| 2071 | mutex_unlock(&dev->struct_mutex); | 2265 | mutex_unlock(&dev->struct_mutex); |
| @@ -2115,7 +2309,14 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, | |||
| 2115 | } | 2309 | } |
| 2116 | 2310 | ||
| 2117 | obj_priv = obj->driver_private; | 2311 | obj_priv = obj->driver_private; |
| 2118 | args->busy = obj_priv->active; | 2312 | /* Don't count being on the flushing list against the object being |
| 2313 | * done. Otherwise, a buffer left on the flushing list but not getting | ||
| 2314 | * flushed (because nobody's flushing that domain) won't ever return | ||
| 2315 | * unbusy and get reused by libdrm's bo cache. The other expected | ||
| 2316 | * consumer of this interface, OpenGL's occlusion queries, also specs | ||
| 2317 | * that the objects get unbusy "eventually" without any interference. | ||
| 2318 | */ | ||
| 2319 | args->busy = obj_priv->active && obj_priv->last_rendering_seqno != 0; | ||
| 2119 | 2320 | ||
| 2120 | drm_gem_object_unreference(obj); | 2321 | drm_gem_object_unreference(obj); |
| 2121 | mutex_unlock(&dev->struct_mutex); | 2322 | mutex_unlock(&dev->struct_mutex); |
| @@ -2167,29 +2368,6 @@ void i915_gem_free_object(struct drm_gem_object *obj) | |||
| 2167 | drm_free(obj->driver_private, 1, DRM_MEM_DRIVER); | 2368 | drm_free(obj->driver_private, 1, DRM_MEM_DRIVER); |
| 2168 | } | 2369 | } |
| 2169 | 2370 | ||
| 2170 | static int | ||
| 2171 | i915_gem_set_domain(struct drm_gem_object *obj, | ||
| 2172 | struct drm_file *file_priv, | ||
| 2173 | uint32_t read_domains, | ||
| 2174 | uint32_t write_domain) | ||
| 2175 | { | ||
| 2176 | struct drm_device *dev = obj->dev; | ||
| 2177 | int ret; | ||
| 2178 | uint32_t flush_domains; | ||
| 2179 | |||
| 2180 | BUG_ON(!mutex_is_locked(&dev->struct_mutex)); | ||
| 2181 | |||
| 2182 | ret = i915_gem_object_set_domain(obj, read_domains, write_domain); | ||
| 2183 | if (ret) | ||
| 2184 | return ret; | ||
| 2185 | flush_domains = i915_gem_dev_set_domain(obj->dev); | ||
| 2186 | |||
| 2187 | if (flush_domains & ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT)) | ||
| 2188 | (void) i915_add_request(dev, flush_domains); | ||
| 2189 | |||
| 2190 | return 0; | ||
| 2191 | } | ||
| 2192 | |||
| 2193 | /** Unbinds all objects that are on the given buffer list. */ | 2371 | /** Unbinds all objects that are on the given buffer list. */ |
| 2194 | static int | 2372 | static int |
| 2195 | i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head) | 2373 | i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head) |
diff --git a/drivers/gpu/drm/i915/i915_gem_proc.c b/drivers/gpu/drm/i915/i915_gem_proc.c index 93de15b4c9a7..e8d5abe1250e 100644 --- a/drivers/gpu/drm/i915/i915_gem_proc.c +++ b/drivers/gpu/drm/i915/i915_gem_proc.c | |||
| @@ -166,10 +166,9 @@ static int i915_gem_request_info(char *buf, char **start, off_t offset, | |||
| 166 | list_for_each_entry(gem_request, &dev_priv->mm.request_list, | 166 | list_for_each_entry(gem_request, &dev_priv->mm.request_list, |
| 167 | list) | 167 | list) |
| 168 | { | 168 | { |
| 169 | DRM_PROC_PRINT(" %d @ %d %08x\n", | 169 | DRM_PROC_PRINT(" %d @ %d\n", |
| 170 | gem_request->seqno, | 170 | gem_request->seqno, |
| 171 | (int) (jiffies - gem_request->emitted_jiffies), | 171 | (int) (jiffies - gem_request->emitted_jiffies)); |
| 172 | gem_request->flush_domains); | ||
| 173 | } | 172 | } |
| 174 | if (len > request + offset) | 173 | if (len > request + offset) |
| 175 | return request; | 174 | return request; |
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index e8b85ac4ca04..a8cb69469c64 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c | |||
| @@ -119,9 +119,10 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev) | |||
| 119 | dcc & DCC_CHANNEL_XOR_DISABLE) { | 119 | dcc & DCC_CHANNEL_XOR_DISABLE) { |
| 120 | swizzle_x = I915_BIT_6_SWIZZLE_9_10; | 120 | swizzle_x = I915_BIT_6_SWIZZLE_9_10; |
| 121 | swizzle_y = I915_BIT_6_SWIZZLE_9; | 121 | swizzle_y = I915_BIT_6_SWIZZLE_9; |
| 122 | } else if (IS_I965GM(dev) || IS_GM45(dev)) { | 122 | } else if ((IS_I965GM(dev) || IS_GM45(dev)) && |
| 123 | /* GM965 only does bit 11-based channel | 123 | (dcc & DCC_CHANNEL_XOR_BIT_17) == 0) { |
| 124 | * randomization | 124 | /* GM965/GM45 does either bit 11 or bit 17 |
| 125 | * swizzling. | ||
| 125 | */ | 126 | */ |
| 126 | swizzle_x = I915_BIT_6_SWIZZLE_9_10_11; | 127 | swizzle_x = I915_BIT_6_SWIZZLE_9_10_11; |
| 127 | swizzle_y = I915_BIT_6_SWIZZLE_9_11; | 128 | swizzle_y = I915_BIT_6_SWIZZLE_9_11; |
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 0e476eba36e6..9d24aaeb8a45 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -522,6 +522,7 @@ | |||
| 522 | #define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0) | 522 | #define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0) |
| 523 | #define DCC_ADDRESSING_MODE_MASK (3 << 0) | 523 | #define DCC_ADDRESSING_MODE_MASK (3 << 0) |
| 524 | #define DCC_CHANNEL_XOR_DISABLE (1 << 10) | 524 | #define DCC_CHANNEL_XOR_DISABLE (1 << 10) |
| 525 | #define DCC_CHANNEL_XOR_BIT_17 (1 << 9) | ||
| 525 | 526 | ||
| 526 | /** 965 MCH register controlling DRAM channel configuration */ | 527 | /** 965 MCH register controlling DRAM channel configuration */ |
| 527 | #define C0DRB3 0x10206 | 528 | #define C0DRB3 0x10206 |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 7a183789be97..3bbb871b25d5 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
| @@ -299,7 +299,6 @@ typedef struct drm_radeon_private { | |||
| 299 | atomic_t swi_emitted; | 299 | atomic_t swi_emitted; |
| 300 | int vblank_crtc; | 300 | int vblank_crtc; |
| 301 | uint32_t irq_enable_reg; | 301 | uint32_t irq_enable_reg; |
| 302 | int irq_enabled; | ||
| 303 | uint32_t r500_disp_irq_reg; | 302 | uint32_t r500_disp_irq_reg; |
| 304 | 303 | ||
| 305 | struct radeon_surface surfaces[RADEON_MAX_SURFACES]; | 304 | struct radeon_surface surfaces[RADEON_MAX_SURFACES]; |
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c index 97c0599fdb1e..99be11418ac2 100644 --- a/drivers/gpu/drm/radeon/radeon_irq.c +++ b/drivers/gpu/drm/radeon/radeon_irq.c | |||
| @@ -44,7 +44,8 @@ void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state) | |||
| 44 | else | 44 | else |
| 45 | dev_priv->irq_enable_reg &= ~mask; | 45 | dev_priv->irq_enable_reg &= ~mask; |
| 46 | 46 | ||
| 47 | RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); | 47 | if (!dev->irq_enabled) |
| 48 | RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); | ||
| 48 | } | 49 | } |
| 49 | 50 | ||
| 50 | static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) | 51 | static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) |
| @@ -56,7 +57,8 @@ static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) | |||
| 56 | else | 57 | else |
| 57 | dev_priv->r500_disp_irq_reg &= ~mask; | 58 | dev_priv->r500_disp_irq_reg &= ~mask; |
| 58 | 59 | ||
| 59 | RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); | 60 | if (!dev->irq_enabled) |
| 61 | RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); | ||
| 60 | } | 62 | } |
| 61 | 63 | ||
| 62 | int radeon_enable_vblank(struct drm_device *dev, int crtc) | 64 | int radeon_enable_vblank(struct drm_device *dev, int crtc) |
| @@ -355,8 +357,6 @@ void radeon_driver_irq_uninstall(struct drm_device * dev) | |||
| 355 | if (!dev_priv) | 357 | if (!dev_priv) |
| 356 | return; | 358 | return; |
| 357 | 359 | ||
| 358 | dev_priv->irq_enabled = 0; | ||
| 359 | |||
| 360 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) | 360 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) |
| 361 | RADEON_WRITE(R500_DxMODE_INT_MASK, 0); | 361 | RADEON_WRITE(R500_DxMODE_INT_MASK, 0); |
| 362 | /* Disable *all* interrupts */ | 362 | /* Disable *all* interrupts */ |
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 228f75723063..3fcf78e906db 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c | |||
| @@ -365,6 +365,7 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) | |||
| 365 | pmsg = &msgs[tptr]; | 365 | pmsg = &msgs[tptr]; |
| 366 | if (pmsg->flags & I2C_M_RD) | 366 | if (pmsg->flags & I2C_M_RD) |
| 367 | ret = wait_event_interruptible_timeout(cpm->i2c_wait, | 367 | ret = wait_event_interruptible_timeout(cpm->i2c_wait, |
| 368 | (in_be16(&tbdf[tptr].cbd_sc) & BD_SC_NAK) || | ||
| 368 | !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY), | 369 | !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY), |
| 369 | 1 * HZ); | 370 | 1 * HZ); |
| 370 | else | 371 | else |
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c index f4d22ae9d294..e5a8dae4a289 100644 --- a/drivers/i2c/busses/i2c-highlander.c +++ b/drivers/i2c/busses/i2c-highlander.c | |||
| @@ -92,7 +92,7 @@ static void highlander_i2c_setup(struct highlander_i2c_dev *dev) | |||
| 92 | static void smbus_write_data(u8 *src, u16 *dst, int len) | 92 | static void smbus_write_data(u8 *src, u16 *dst, int len) |
| 93 | { | 93 | { |
| 94 | for (; len > 1; len -= 2) { | 94 | for (; len > 1; len -= 2) { |
| 95 | *dst++ = be16_to_cpup((u16 *)src); | 95 | *dst++ = be16_to_cpup((__be16 *)src); |
| 96 | src += 2; | 96 | src += 2; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| @@ -103,7 +103,7 @@ static void smbus_write_data(u8 *src, u16 *dst, int len) | |||
| 103 | static void smbus_read_data(u16 *src, u8 *dst, int len) | 103 | static void smbus_read_data(u16 *src, u8 *dst, int len) |
| 104 | { | 104 | { |
| 105 | for (; len > 1; len -= 2) { | 105 | for (; len > 1; len -= 2) { |
| 106 | *(u16 *)dst = cpu_to_be16p(src++); | 106 | *(__be16 *)dst = cpu_to_be16p(src++); |
| 107 | dst += 2; | 107 | dst += 2; |
| 108 | } | 108 | } |
| 109 | 109 | ||
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c index dcf2045b5222..0bdb2d7f0570 100644 --- a/drivers/i2c/busses/i2c-pmcmsp.c +++ b/drivers/i2c/busses/i2c-pmcmsp.c | |||
| @@ -486,7 +486,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd( | |||
| 486 | 486 | ||
| 487 | if (cmd->type == MSP_TWI_CMD_WRITE || | 487 | if (cmd->type == MSP_TWI_CMD_WRITE || |
| 488 | cmd->type == MSP_TWI_CMD_WRITE_READ) { | 488 | cmd->type == MSP_TWI_CMD_WRITE_READ) { |
| 489 | __be64 tmp = cpu_to_be64p((u64 *)cmd->write_data); | 489 | u64 tmp = be64_to_cpup((__be64 *)cmd->write_data); |
| 490 | tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8; | 490 | tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8; |
| 491 | dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp); | 491 | dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp); |
| 492 | pmcmsptwi_writel(tmp & 0x00000000ffffffffLL, | 492 | pmcmsptwi_writel(tmp & 0x00000000ffffffffLL, |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 1fac4e233133..b7434d24904e 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -56,6 +56,7 @@ enum s3c24xx_i2c_state { | |||
| 56 | struct s3c24xx_i2c { | 56 | struct s3c24xx_i2c { |
| 57 | spinlock_t lock; | 57 | spinlock_t lock; |
| 58 | wait_queue_head_t wait; | 58 | wait_queue_head_t wait; |
| 59 | unsigned int suspended:1; | ||
| 59 | 60 | ||
| 60 | struct i2c_msg *msg; | 61 | struct i2c_msg *msg; |
| 61 | unsigned int msg_num; | 62 | unsigned int msg_num; |
| @@ -507,7 +508,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int | |||
| 507 | unsigned long timeout; | 508 | unsigned long timeout; |
| 508 | int ret; | 509 | int ret; |
| 509 | 510 | ||
| 510 | if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)) | 511 | if (i2c->suspended) |
| 511 | return -EIO; | 512 | return -EIO; |
| 512 | 513 | ||
| 513 | ret = s3c24xx_i2c_set_master(i2c); | 514 | ret = s3c24xx_i2c_set_master(i2c); |
| @@ -986,17 +987,26 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev) | |||
| 986 | } | 987 | } |
| 987 | 988 | ||
| 988 | #ifdef CONFIG_PM | 989 | #ifdef CONFIG_PM |
| 990 | static int s3c24xx_i2c_suspend_late(struct platform_device *dev, | ||
| 991 | pm_message_t msg) | ||
| 992 | { | ||
| 993 | struct s3c24xx_i2c *i2c = platform_get_drvdata(dev); | ||
| 994 | i2c->suspended = 1; | ||
| 995 | return 0; | ||
| 996 | } | ||
| 997 | |||
| 989 | static int s3c24xx_i2c_resume(struct platform_device *dev) | 998 | static int s3c24xx_i2c_resume(struct platform_device *dev) |
| 990 | { | 999 | { |
| 991 | struct s3c24xx_i2c *i2c = platform_get_drvdata(dev); | 1000 | struct s3c24xx_i2c *i2c = platform_get_drvdata(dev); |
| 992 | 1001 | ||
| 993 | if (i2c != NULL) | 1002 | i2c->suspended = 0; |
| 994 | s3c24xx_i2c_init(i2c); | 1003 | s3c24xx_i2c_init(i2c); |
| 995 | 1004 | ||
| 996 | return 0; | 1005 | return 0; |
| 997 | } | 1006 | } |
| 998 | 1007 | ||
| 999 | #else | 1008 | #else |
| 1009 | #define s3c24xx_i2c_suspend_late NULL | ||
| 1000 | #define s3c24xx_i2c_resume NULL | 1010 | #define s3c24xx_i2c_resume NULL |
| 1001 | #endif | 1011 | #endif |
| 1002 | 1012 | ||
| @@ -1005,6 +1015,7 @@ static int s3c24xx_i2c_resume(struct platform_device *dev) | |||
| 1005 | static struct platform_driver s3c2410_i2c_driver = { | 1015 | static struct platform_driver s3c2410_i2c_driver = { |
| 1006 | .probe = s3c24xx_i2c_probe, | 1016 | .probe = s3c24xx_i2c_probe, |
| 1007 | .remove = s3c24xx_i2c_remove, | 1017 | .remove = s3c24xx_i2c_remove, |
| 1018 | .suspend_late = s3c24xx_i2c_suspend_late, | ||
| 1008 | .resume = s3c24xx_i2c_resume, | 1019 | .resume = s3c24xx_i2c_resume, |
| 1009 | .driver = { | 1020 | .driver = { |
| 1010 | .owner = THIS_MODULE, | 1021 | .owner = THIS_MODULE, |
| @@ -1015,6 +1026,7 @@ static struct platform_driver s3c2410_i2c_driver = { | |||
| 1015 | static struct platform_driver s3c2440_i2c_driver = { | 1026 | static struct platform_driver s3c2440_i2c_driver = { |
| 1016 | .probe = s3c24xx_i2c_probe, | 1027 | .probe = s3c24xx_i2c_probe, |
| 1017 | .remove = s3c24xx_i2c_remove, | 1028 | .remove = s3c24xx_i2c_remove, |
| 1029 | .suspend_late = s3c24xx_i2c_suspend_late, | ||
| 1018 | .resume = s3c24xx_i2c_resume, | 1030 | .resume = s3c24xx_i2c_resume, |
| 1019 | .driver = { | 1031 | .driver = { |
| 1020 | .owner = THIS_MODULE, | 1032 | .owner = THIS_MODULE, |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 6d7401772a8f..e6857e01d1ba 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -669,10 +669,12 @@ config BLK_DEV_CELLEB | |||
| 669 | 669 | ||
| 670 | endif | 670 | endif |
| 671 | 671 | ||
| 672 | # TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF | ||
| 672 | config BLK_DEV_IDE_PMAC | 673 | config BLK_DEV_IDE_PMAC |
| 673 | tristate "PowerMac on-board IDE support" | 674 | tristate "PowerMac on-board IDE support" |
| 674 | depends on PPC_PMAC && IDE=y | 675 | depends on PPC_PMAC && IDE=y |
| 675 | select IDE_TIMINGS | 676 | select IDE_TIMINGS |
| 677 | select BLK_DEV_IDEDMA_PCI | ||
| 676 | help | 678 | help |
| 677 | This driver provides support for the on-board IDE controller on | 679 | This driver provides support for the on-board IDE controller on |
| 678 | most of the recent Apple Power Macintoshes and PowerBooks. | 680 | most of the recent Apple Power Macintoshes and PowerBooks. |
| @@ -689,16 +691,6 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST | |||
| 689 | CD-ROM on hda. This option changes this to more natural hda for | 691 | CD-ROM on hda. This option changes this to more natural hda for |
| 690 | hard disk and hdc for CD-ROM. | 692 | hard disk and hdc for CD-ROM. |
| 691 | 693 | ||
| 692 | config BLK_DEV_IDEDMA_PMAC | ||
| 693 | bool "PowerMac IDE DMA support" | ||
| 694 | depends on BLK_DEV_IDE_PMAC | ||
| 695 | select BLK_DEV_IDEDMA_PCI | ||
| 696 | help | ||
| 697 | This option allows the driver for the on-board IDE controller on | ||
| 698 | Power Macintoshes and PowerBooks to use DMA (direct memory access) | ||
| 699 | to transfer data to and from memory. Saying Y is safe and improves | ||
| 700 | performance. | ||
| 701 | |||
| 702 | config BLK_DEV_IDE_AU1XXX | 694 | config BLK_DEV_IDE_AU1XXX |
| 703 | bool "IDE for AMD Alchemy Au1200" | 695 | bool "IDE for AMD Alchemy Au1200" |
| 704 | depends on SOC_AU1200 | 696 | depends on SOC_AU1200 |
| @@ -912,7 +904,7 @@ config BLK_DEV_UMC8672 | |||
| 912 | endif | 904 | endif |
| 913 | 905 | ||
| 914 | config BLK_DEV_IDEDMA | 906 | config BLK_DEV_IDEDMA |
| 915 | def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \ | 907 | def_bool BLK_DEV_IDEDMA_SFF || \ |
| 916 | BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 908 | BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
| 917 | 909 | ||
| 918 | endif # IDE | 910 | endif # IDE |
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 7d275b2af3eb..cc35d6dbd410 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -208,8 +208,10 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * | |||
| 208 | */ | 208 | */ |
| 209 | if (drive->hwif->dma_ops == NULL) | 209 | if (drive->hwif->dma_ops == NULL) |
| 210 | break; | 210 | break; |
| 211 | if (drive->dev_flags & IDE_DFLAG_USING_DMA) | 211 | /* |
| 212 | ide_set_dma(drive); | 212 | * TODO: respect IDE_DFLAG_USING_DMA |
| 213 | */ | ||
| 214 | ide_set_dma(drive); | ||
| 213 | break; | 215 | break; |
| 214 | } | 216 | } |
| 215 | 217 | ||
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index 2e19d6298536..7c481bb56fab 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
| @@ -66,7 +66,6 @@ typedef struct pmac_ide_hwif { | |||
| 66 | struct macio_dev *mdev; | 66 | struct macio_dev *mdev; |
| 67 | u32 timings[4]; | 67 | u32 timings[4]; |
| 68 | volatile u32 __iomem * *kauai_fcr; | 68 | volatile u32 __iomem * *kauai_fcr; |
| 69 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 70 | /* Those fields are duplicating what is in hwif. We currently | 69 | /* Those fields are duplicating what is in hwif. We currently |
| 71 | * can't use the hwif ones because of some assumptions that are | 70 | * can't use the hwif ones because of some assumptions that are |
| 72 | * beeing done by the generic code about the kind of dma controller | 71 | * beeing done by the generic code about the kind of dma controller |
| @@ -74,8 +73,6 @@ typedef struct pmac_ide_hwif { | |||
| 74 | */ | 73 | */ |
| 75 | volatile struct dbdma_regs __iomem * dma_regs; | 74 | volatile struct dbdma_regs __iomem * dma_regs; |
| 76 | struct dbdma_cmd* dma_table_cpu; | 75 | struct dbdma_cmd* dma_table_cpu; |
| 77 | #endif | ||
| 78 | |||
| 79 | } pmac_ide_hwif_t; | 76 | } pmac_ide_hwif_t; |
| 80 | 77 | ||
| 81 | enum { | 78 | enum { |
| @@ -222,8 +219,6 @@ static const char* model_name[] = { | |||
| 222 | #define KAUAI_FCR_UATA_RESET_N 0x00000002 | 219 | #define KAUAI_FCR_UATA_RESET_N 0x00000002 |
| 223 | #define KAUAI_FCR_UATA_ENABLE 0x00000001 | 220 | #define KAUAI_FCR_UATA_ENABLE 0x00000001 |
| 224 | 221 | ||
| 225 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 226 | |||
| 227 | /* Rounded Multiword DMA timings | 222 | /* Rounded Multiword DMA timings |
| 228 | * | 223 | * |
| 229 | * I gave up finding a generic formula for all controller | 224 | * I gave up finding a generic formula for all controller |
| @@ -413,8 +408,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq); | |||
| 413 | static void pmac_ide_selectproc(ide_drive_t *drive); | 408 | static void pmac_ide_selectproc(ide_drive_t *drive); |
| 414 | static void pmac_ide_kauai_selectproc(ide_drive_t *drive); | 409 | static void pmac_ide_kauai_selectproc(ide_drive_t *drive); |
| 415 | 410 | ||
| 416 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | ||
| 417 | |||
| 418 | #define PMAC_IDE_REG(x) \ | 411 | #define PMAC_IDE_REG(x) \ |
| 419 | ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x))) | 412 | ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x))) |
| 420 | 413 | ||
| @@ -584,8 +577,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
| 584 | pmac_ide_do_update_timings(drive); | 577 | pmac_ide_do_update_timings(drive); |
| 585 | } | 578 | } |
| 586 | 579 | ||
| 587 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 588 | |||
| 589 | /* | 580 | /* |
| 590 | * Calculate KeyLargo ATA/66 UDMA timings | 581 | * Calculate KeyLargo ATA/66 UDMA timings |
| 591 | */ | 582 | */ |
| @@ -786,7 +777,6 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, | |||
| 786 | drive->name, speed & 0xf, *timings); | 777 | drive->name, speed & 0xf, *timings); |
| 787 | #endif | 778 | #endif |
| 788 | } | 779 | } |
| 789 | #endif /* #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC */ | ||
| 790 | 780 | ||
| 791 | static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) | 781 | static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) |
| 792 | { | 782 | { |
| @@ -804,7 +794,6 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
| 804 | tl[0] = *timings; | 794 | tl[0] = *timings; |
| 805 | tl[1] = *timings2; | 795 | tl[1] = *timings2; |
| 806 | 796 | ||
| 807 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 808 | if (speed >= XFER_UDMA_0) { | 797 | if (speed >= XFER_UDMA_0) { |
| 809 | if (pmif->kind == controller_kl_ata4) | 798 | if (pmif->kind == controller_kl_ata4) |
| 810 | ret = set_timings_udma_ata4(&tl[0], speed); | 799 | ret = set_timings_udma_ata4(&tl[0], speed); |
| @@ -817,7 +806,7 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
| 817 | ret = -1; | 806 | ret = -1; |
| 818 | } else | 807 | } else |
| 819 | set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed); | 808 | set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed); |
| 820 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | 809 | |
| 821 | if (ret) | 810 | if (ret) |
| 822 | return; | 811 | return; |
| 823 | 812 | ||
| @@ -1008,9 +997,7 @@ static const struct ide_port_info pmac_port_info = { | |||
| 1008 | .chipset = ide_pmac, | 997 | .chipset = ide_pmac, |
| 1009 | .tp_ops = &pmac_tp_ops, | 998 | .tp_ops = &pmac_tp_ops, |
| 1010 | .port_ops = &pmac_ide_port_ops, | 999 | .port_ops = &pmac_ide_port_ops, |
| 1011 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 1012 | .dma_ops = &pmac_dma_ops, | 1000 | .dma_ops = &pmac_dma_ops, |
| 1013 | #endif | ||
| 1014 | .host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA | | 1001 | .host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA | |
| 1015 | IDE_HFLAG_POST_SET_MODE | | 1002 | IDE_HFLAG_POST_SET_MODE | |
| 1016 | IDE_HFLAG_MMIO | | 1003 | IDE_HFLAG_MMIO | |
| @@ -1182,7 +1169,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) | |||
| 1182 | pmif->regbase = regbase; | 1169 | pmif->regbase = regbase; |
| 1183 | pmif->irq = irq; | 1170 | pmif->irq = irq; |
| 1184 | pmif->kauai_fcr = NULL; | 1171 | pmif->kauai_fcr = NULL; |
| 1185 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | 1172 | |
| 1186 | if (macio_resource_count(mdev) >= 2) { | 1173 | if (macio_resource_count(mdev) >= 2) { |
| 1187 | if (macio_request_resource(mdev, 1, "ide-pmac (dma)")) | 1174 | if (macio_request_resource(mdev, 1, "ide-pmac (dma)")) |
| 1188 | printk(KERN_WARNING "ide-pmac: can't request DMA " | 1175 | printk(KERN_WARNING "ide-pmac: can't request DMA " |
| @@ -1192,7 +1179,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) | |||
| 1192 | pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000); | 1179 | pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000); |
| 1193 | } else | 1180 | } else |
| 1194 | pmif->dma_regs = NULL; | 1181 | pmif->dma_regs = NULL; |
| 1195 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | 1182 | |
| 1196 | dev_set_drvdata(&mdev->ofdev.dev, pmif); | 1183 | dev_set_drvdata(&mdev->ofdev.dev, pmif); |
| 1197 | 1184 | ||
| 1198 | memset(&hw, 0, sizeof(hw)); | 1185 | memset(&hw, 0, sizeof(hw)); |
| @@ -1300,9 +1287,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1300 | 1287 | ||
| 1301 | base = ioremap(rbase, rlen); | 1288 | base = ioremap(rbase, rlen); |
| 1302 | pmif->regbase = (unsigned long) base + 0x2000; | 1289 | pmif->regbase = (unsigned long) base + 0x2000; |
| 1303 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 1304 | pmif->dma_regs = base + 0x1000; | 1290 | pmif->dma_regs = base + 0x1000; |
| 1305 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | ||
| 1306 | pmif->kauai_fcr = base; | 1291 | pmif->kauai_fcr = base; |
| 1307 | pmif->irq = pdev->irq; | 1292 | pmif->irq = pdev->irq; |
| 1308 | 1293 | ||
| @@ -1434,8 +1419,6 @@ out: | |||
| 1434 | return error; | 1419 | return error; |
| 1435 | } | 1420 | } |
| 1436 | 1421 | ||
| 1437 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 1438 | |||
| 1439 | /* | 1422 | /* |
| 1440 | * pmac_ide_build_dmatable builds the DBDMA command list | 1423 | * pmac_ide_build_dmatable builds the DBDMA command list |
| 1441 | * for a transfer and sets the DBDMA channel to point to it. | 1424 | * for a transfer and sets the DBDMA channel to point to it. |
| @@ -1723,13 +1706,6 @@ static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, | |||
| 1723 | 1706 | ||
| 1724 | return 0; | 1707 | return 0; |
| 1725 | } | 1708 | } |
| 1726 | #else | ||
| 1727 | static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, | ||
| 1728 | const struct ide_port_info *d) | ||
| 1729 | { | ||
| 1730 | return -EOPNOTSUPP; | ||
| 1731 | } | ||
| 1732 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | ||
| 1733 | 1709 | ||
| 1734 | module_init(pmac_ide_probe); | 1710 | module_init(pmac_ide_probe); |
| 1735 | 1711 | ||
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c index 7defa0ae2014..a687a7dfea6f 100644 --- a/drivers/ide/sgiioc4.c +++ b/drivers/ide/sgiioc4.c | |||
| @@ -550,7 +550,7 @@ static const struct ide_dma_ops sgiioc4_dma_ops = { | |||
| 550 | .dma_timeout = ide_dma_timeout, | 550 | .dma_timeout = ide_dma_timeout, |
| 551 | }; | 551 | }; |
| 552 | 552 | ||
| 553 | static const struct ide_port_info sgiioc4_port_info __devinitdata = { | 553 | static const struct ide_port_info sgiioc4_port_info __devinitconst = { |
| 554 | .name = DRV_NAME, | 554 | .name = DRV_NAME, |
| 555 | .chipset = ide_pci, | 555 | .chipset = ide_pci, |
| 556 | .init_dma = ide_dma_sgiioc4, | 556 | .init_dma = ide_dma_sgiioc4, |
| @@ -633,7 +633,7 @@ out: | |||
| 633 | return ret; | 633 | return ret; |
| 634 | } | 634 | } |
| 635 | 635 | ||
| 636 | int | 636 | int __devinit |
| 637 | ioc4_ide_attach_one(struct ioc4_driver_data *idd) | 637 | ioc4_ide_attach_one(struct ioc4_driver_data *idd) |
| 638 | { | 638 | { |
| 639 | /* PCI-RT does not bring out IDE connection. | 639 | /* PCI-RT does not bring out IDE connection. |
| @@ -645,7 +645,7 @@ ioc4_ide_attach_one(struct ioc4_driver_data *idd) | |||
| 645 | return pci_init_sgiioc4(idd->idd_pdev); | 645 | return pci_init_sgiioc4(idd->idd_pdev); |
| 646 | } | 646 | } |
| 647 | 647 | ||
| 648 | static struct ioc4_submodule ioc4_ide_submodule = { | 648 | static struct ioc4_submodule __devinitdata ioc4_ide_submodule = { |
| 649 | .is_name = "IOC4_ide", | 649 | .is_name = "IOC4_ide", |
| 650 | .is_owner = THIS_MODULE, | 650 | .is_owner = THIS_MODULE, |
| 651 | .is_probe = ioc4_ide_attach_one, | 651 | .is_probe = ioc4_ide_attach_one, |
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 9e39f73282ee..79ef5fd928ae 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
| @@ -115,8 +115,14 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length, | |||
| 115 | return error; | 115 | return error; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | #define OUI_FREECOM_TECHNOLOGIES_GMBH 0x0001db | ||
| 119 | |||
| 118 | static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci) | 120 | static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci) |
| 119 | { | 121 | { |
| 122 | /* Freecom FireWire Hard Drive firmware bug */ | ||
| 123 | if (be32_to_cpu(bus_info_data[3]) >> 8 == OUI_FREECOM_TECHNOLOGIES_GMBH) | ||
| 124 | return 0; | ||
| 125 | |||
| 120 | return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3; | 126 | return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3; |
| 121 | } | 127 | } |
| 122 | 128 | ||
| @@ -1685,6 +1691,7 @@ static int nodemgr_host_thread(void *data) | |||
| 1685 | g = get_hpsb_generation(host); | 1691 | g = get_hpsb_generation(host); |
| 1686 | for (i = 0; i < 4 ; i++) { | 1692 | for (i = 0; i < 4 ; i++) { |
| 1687 | msleep_interruptible(63); | 1693 | msleep_interruptible(63); |
| 1694 | try_to_freeze(); | ||
| 1688 | if (kthread_should_stop()) | 1695 | if (kthread_should_stop()) |
| 1689 | goto exit; | 1696 | goto exit; |
| 1690 | 1697 | ||
| @@ -1725,6 +1732,7 @@ static int nodemgr_host_thread(void *data) | |||
| 1725 | /* Sleep 3 seconds */ | 1732 | /* Sleep 3 seconds */ |
| 1726 | for (i = 3000/200; i; i--) { | 1733 | for (i = 3000/200; i; i--) { |
| 1727 | msleep_interruptible(200); | 1734 | msleep_interruptible(200); |
| 1735 | try_to_freeze(); | ||
| 1728 | if (kthread_should_stop()) | 1736 | if (kthread_should_stop()) |
| 1729 | goto exit; | 1737 | goto exit; |
| 1730 | 1738 | ||
diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c index 1e288eeb5e2a..6461a32bc838 100644 --- a/drivers/isdn/hardware/avm/b1isa.c +++ b/drivers/isdn/hardware/avm/b1isa.c | |||
| @@ -233,10 +233,8 @@ static void __exit b1isa_exit(void) | |||
| 233 | int i; | 233 | int i; |
| 234 | 234 | ||
| 235 | for (i = 0; i < MAX_CARDS; i++) { | 235 | for (i = 0; i < MAX_CARDS; i++) { |
| 236 | if (!io[i]) | 236 | if (isa_dev[i].resource[0].start) |
| 237 | break; | 237 | b1isa_remove(&isa_dev[i]); |
| 238 | |||
| 239 | b1isa_remove(&isa_dev[i]); | ||
| 240 | } | 238 | } |
| 241 | unregister_capi_driver(&capi_driver_b1isa); | 239 | unregister_capi_driver(&capi_driver_b1isa); |
| 242 | } | 240 | } |
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c index cfa8fa5e44ab..3f2a0a20c19b 100644 --- a/drivers/isdn/hysdn/hysdn_net.c +++ b/drivers/isdn/hysdn/hysdn_net.c | |||
| @@ -83,12 +83,12 @@ net_open(struct net_device *dev) | |||
| 83 | 83 | ||
| 84 | /* Fill in the MAC-level header (if not already set) */ | 84 | /* Fill in the MAC-level header (if not already set) */ |
| 85 | if (!card->mac_addr[0]) { | 85 | if (!card->mac_addr[0]) { |
| 86 | for (i = 0; i < ETH_ALEN - sizeof(unsigned long); i++) | 86 | for (i = 0; i < ETH_ALEN; i++) |
| 87 | dev->dev_addr[i] = 0xfc; | 87 | dev->dev_addr[i] = 0xfc; |
| 88 | if ((in_dev = dev->ip_ptr) != NULL) { | 88 | if ((in_dev = dev->ip_ptr) != NULL) { |
| 89 | struct in_ifaddr *ifa = in_dev->ifa_list; | 89 | struct in_ifaddr *ifa = in_dev->ifa_list; |
| 90 | if (ifa != NULL) | 90 | if (ifa != NULL) |
| 91 | memcpy(dev->dev_addr + (ETH_ALEN - sizeof(unsigned long)), &ifa->ifa_local, sizeof(unsigned long)); | 91 | memcpy(dev->dev_addr + (ETH_ALEN - sizeof(ifa->ifa_local)), &ifa->ifa_local, sizeof(ifa->ifa_local)); |
| 92 | } | 92 | } |
| 93 | } else | 93 | } else |
| 94 | memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN); | 94 | memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN); |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index ac89a5deaca2..ab7c8e4a61f9 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
| @@ -208,16 +208,19 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page) | |||
| 208 | */ | 208 | */ |
| 209 | 209 | ||
| 210 | /* IO operations when bitmap is stored near all superblocks */ | 210 | /* IO operations when bitmap is stored near all superblocks */ |
| 211 | static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long index) | 211 | static struct page *read_sb_page(mddev_t *mddev, long offset, |
| 212 | struct page *page, | ||
| 213 | unsigned long index, int size) | ||
| 212 | { | 214 | { |
| 213 | /* choose a good rdev and read the page from there */ | 215 | /* choose a good rdev and read the page from there */ |
| 214 | 216 | ||
| 215 | mdk_rdev_t *rdev; | 217 | mdk_rdev_t *rdev; |
| 216 | struct list_head *tmp; | 218 | struct list_head *tmp; |
| 217 | struct page *page = alloc_page(GFP_KERNEL); | ||
| 218 | sector_t target; | 219 | sector_t target; |
| 219 | 220 | ||
| 220 | if (!page) | 221 | if (!page) |
| 222 | page = alloc_page(GFP_KERNEL); | ||
| 223 | if (!page) | ||
| 221 | return ERR_PTR(-ENOMEM); | 224 | return ERR_PTR(-ENOMEM); |
| 222 | 225 | ||
| 223 | rdev_for_each(rdev, tmp, mddev) { | 226 | rdev_for_each(rdev, tmp, mddev) { |
| @@ -227,7 +230,9 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde | |||
| 227 | 230 | ||
| 228 | target = rdev->sb_start + offset + index * (PAGE_SIZE/512); | 231 | target = rdev->sb_start + offset + index * (PAGE_SIZE/512); |
| 229 | 232 | ||
| 230 | if (sync_page_io(rdev->bdev, target, PAGE_SIZE, page, READ)) { | 233 | if (sync_page_io(rdev->bdev, target, |
| 234 | roundup(size, bdev_hardsect_size(rdev->bdev)), | ||
| 235 | page, READ)) { | ||
| 231 | page->index = index; | 236 | page->index = index; |
| 232 | attach_page_buffers(page, NULL); /* so that free_buffer will | 237 | attach_page_buffers(page, NULL); /* so that free_buffer will |
| 233 | * quietly no-op */ | 238 | * quietly no-op */ |
| @@ -544,7 +549,9 @@ static int bitmap_read_sb(struct bitmap *bitmap) | |||
| 544 | 549 | ||
| 545 | bitmap->sb_page = read_page(bitmap->file, 0, bitmap, bytes); | 550 | bitmap->sb_page = read_page(bitmap->file, 0, bitmap, bytes); |
| 546 | } else { | 551 | } else { |
| 547 | bitmap->sb_page = read_sb_page(bitmap->mddev, bitmap->offset, 0); | 552 | bitmap->sb_page = read_sb_page(bitmap->mddev, bitmap->offset, |
| 553 | NULL, | ||
| 554 | 0, sizeof(bitmap_super_t)); | ||
| 548 | } | 555 | } |
| 549 | if (IS_ERR(bitmap->sb_page)) { | 556 | if (IS_ERR(bitmap->sb_page)) { |
| 550 | err = PTR_ERR(bitmap->sb_page); | 557 | err = PTR_ERR(bitmap->sb_page); |
| @@ -957,11 +964,16 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) | |||
| 957 | */ | 964 | */ |
| 958 | page = bitmap->sb_page; | 965 | page = bitmap->sb_page; |
| 959 | offset = sizeof(bitmap_super_t); | 966 | offset = sizeof(bitmap_super_t); |
| 967 | read_sb_page(bitmap->mddev, bitmap->offset, | ||
| 968 | page, | ||
| 969 | index, count); | ||
| 960 | } else if (file) { | 970 | } else if (file) { |
| 961 | page = read_page(file, index, bitmap, count); | 971 | page = read_page(file, index, bitmap, count); |
| 962 | offset = 0; | 972 | offset = 0; |
| 963 | } else { | 973 | } else { |
| 964 | page = read_sb_page(bitmap->mddev, bitmap->offset, index); | 974 | page = read_sb_page(bitmap->mddev, bitmap->offset, |
| 975 | NULL, | ||
| 976 | index, count); | ||
| 965 | offset = 0; | 977 | offset = 0; |
| 966 | } | 978 | } |
| 967 | if (IS_ERR(page)) { /* read error */ | 979 | if (IS_ERR(page)) { /* read error */ |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index d62fd4f6b52e..ee090413e598 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -2008,6 +2008,9 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt) | |||
| 2008 | return FAILED; | 2008 | return FAILED; |
| 2009 | } | 2009 | } |
| 2010 | 2010 | ||
| 2011 | /* make sure we have no outstanding commands at this stage */ | ||
| 2012 | mptscsih_flush_running_cmds(hd); | ||
| 2013 | |||
| 2011 | ioc = hd->ioc; | 2014 | ioc = hd->ioc; |
| 2012 | printk(MYIOC_s_INFO_FMT "attempting host reset! (sc=%p)\n", | 2015 | printk(MYIOC_s_INFO_FMT "attempting host reset! (sc=%p)\n", |
| 2013 | ioc->name, SCpnt); | 2016 | ioc->name, SCpnt); |
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 84bdc2ee69e6..a443e136dc41 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
| @@ -354,7 +354,7 @@ static inline void i2o_block_sglist_free(struct i2o_block_request *ireq) | |||
| 354 | * @req: the request to prepare | 354 | * @req: the request to prepare |
| 355 | * | 355 | * |
| 356 | * Allocate the necessary i2o_block_request struct and connect it to | 356 | * Allocate the necessary i2o_block_request struct and connect it to |
| 357 | * the request. This is needed that we not loose the SG list later on. | 357 | * the request. This is needed that we not lose the SG list later on. |
| 358 | * | 358 | * |
| 359 | * Returns BLKPREP_OK on success or BLKPREP_DEFER on failure. | 359 | * Returns BLKPREP_OK on success or BLKPREP_DEFER on failure. |
| 360 | */ | 360 | */ |
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index be2b5926d26c..6e53a30bfd38 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
| @@ -49,7 +49,6 @@ static int i2o_hrt_get(struct i2o_controller *c); | |||
| 49 | /** | 49 | /** |
| 50 | * i2o_msg_get_wait - obtain an I2O message from the IOP | 50 | * i2o_msg_get_wait - obtain an I2O message from the IOP |
| 51 | * @c: I2O controller | 51 | * @c: I2O controller |
| 52 | * @msg: pointer to a I2O message pointer | ||
| 53 | * @wait: how long to wait until timeout | 52 | * @wait: how long to wait until timeout |
| 54 | * | 53 | * |
| 55 | * This function waits up to wait seconds for a message slot to be | 54 | * This function waits up to wait seconds for a message slot to be |
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index 8c389d606c30..3ee698ad8599 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c | |||
| @@ -254,7 +254,11 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr, | |||
| 254 | return 1; | 254 | return 1; |
| 255 | 255 | ||
| 256 | *paddr = pte_pfn(pte) << PAGE_SHIFT; | 256 | *paddr = pte_pfn(pte) << PAGE_SHIFT; |
| 257 | #ifdef CONFIG_HUGETLB_PAGE | ||
| 257 | *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; | 258 | *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; |
| 259 | #else | ||
| 260 | *pageshift = PAGE_SHIFT; | ||
| 261 | #endif | ||
| 258 | return 0; | 262 | return 0; |
| 259 | 263 | ||
| 260 | err: | 264 | err: |
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 76a76751da36..6659b2275c0c 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
| @@ -37,9 +37,9 @@ | |||
| 37 | #define OPCODE_NORM_READ 0x03 /* Read data bytes (low frequency) */ | 37 | #define OPCODE_NORM_READ 0x03 /* Read data bytes (low frequency) */ |
| 38 | #define OPCODE_FAST_READ 0x0b /* Read data bytes (high frequency) */ | 38 | #define OPCODE_FAST_READ 0x0b /* Read data bytes (high frequency) */ |
| 39 | #define OPCODE_PP 0x02 /* Page program (up to 256 bytes) */ | 39 | #define OPCODE_PP 0x02 /* Page program (up to 256 bytes) */ |
| 40 | #define OPCODE_BE_4K 0x20 /* Erase 4KiB block */ | 40 | #define OPCODE_BE_4K 0x20 /* Erase 4KiB block */ |
| 41 | #define OPCODE_BE_32K 0x52 /* Erase 32KiB block */ | 41 | #define OPCODE_BE_32K 0x52 /* Erase 32KiB block */ |
| 42 | #define OPCODE_BE 0xc7 /* Erase whole flash block */ | 42 | #define OPCODE_CHIP_ERASE 0xc7 /* Erase whole flash chip */ |
| 43 | #define OPCODE_SE 0xd8 /* Sector erase (usually 64KiB) */ | 43 | #define OPCODE_SE 0xd8 /* Sector erase (usually 64KiB) */ |
| 44 | #define OPCODE_RDID 0x9f /* Read JEDEC ID */ | 44 | #define OPCODE_RDID 0x9f /* Read JEDEC ID */ |
| 45 | 45 | ||
| @@ -167,7 +167,7 @@ static int wait_till_ready(struct m25p *flash) | |||
| 167 | * | 167 | * |
| 168 | * Returns 0 if successful, non-zero otherwise. | 168 | * Returns 0 if successful, non-zero otherwise. |
| 169 | */ | 169 | */ |
| 170 | static int erase_block(struct m25p *flash) | 170 | static int erase_chip(struct m25p *flash) |
| 171 | { | 171 | { |
| 172 | DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n", | 172 | DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n", |
| 173 | flash->spi->dev.bus_id, __func__, | 173 | flash->spi->dev.bus_id, __func__, |
| @@ -181,7 +181,7 @@ static int erase_block(struct m25p *flash) | |||
| 181 | write_enable(flash); | 181 | write_enable(flash); |
| 182 | 182 | ||
| 183 | /* Set up command buffer. */ | 183 | /* Set up command buffer. */ |
| 184 | flash->command[0] = OPCODE_BE; | 184 | flash->command[0] = OPCODE_CHIP_ERASE; |
| 185 | 185 | ||
| 186 | spi_write(flash->spi, flash->command, 1); | 186 | spi_write(flash->spi, flash->command, 1); |
| 187 | 187 | ||
| @@ -250,15 +250,18 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr) | |||
| 250 | 250 | ||
| 251 | mutex_lock(&flash->lock); | 251 | mutex_lock(&flash->lock); |
| 252 | 252 | ||
| 253 | /* REVISIT in some cases we could speed up erasing large regions | 253 | /* whole-chip erase? */ |
| 254 | * by using OPCODE_SE instead of OPCODE_BE_4K | 254 | if (len == flash->mtd.size && erase_chip(flash)) { |
| 255 | */ | ||
| 256 | |||
| 257 | /* now erase those sectors */ | ||
| 258 | if (len == flash->mtd.size && erase_block(flash)) { | ||
| 259 | instr->state = MTD_ERASE_FAILED; | 255 | instr->state = MTD_ERASE_FAILED; |
| 260 | mutex_unlock(&flash->lock); | 256 | mutex_unlock(&flash->lock); |
| 261 | return -EIO; | 257 | return -EIO; |
| 258 | |||
| 259 | /* REVISIT in some cases we could speed up erasing large regions | ||
| 260 | * by using OPCODE_SE instead of OPCODE_BE_4K. We may have set up | ||
| 261 | * to use "small sector erase", but that's not always optimal. | ||
| 262 | */ | ||
| 263 | |||
| 264 | /* "sector"-at-a-time erase */ | ||
| 262 | } else { | 265 | } else { |
| 263 | while (len) { | 266 | while (len) { |
| 264 | if (erase_sector(flash, addr)) { | 267 | if (erase_sector(flash, addr)) { |
| @@ -574,10 +577,11 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) | |||
| 574 | for (tmp = 0, info = m25p_data; | 577 | for (tmp = 0, info = m25p_data; |
| 575 | tmp < ARRAY_SIZE(m25p_data); | 578 | tmp < ARRAY_SIZE(m25p_data); |
| 576 | tmp++, info++) { | 579 | tmp++, info++) { |
| 577 | if (info->jedec_id == jedec) | 580 | if (info->jedec_id == jedec) { |
| 578 | if (ext_jedec != 0 && info->ext_id != ext_jedec) | 581 | if (info->ext_id != 0 && info->ext_id != ext_jedec) |
| 579 | continue; | 582 | continue; |
| 580 | return info; | 583 | return info; |
| 584 | } | ||
| 581 | } | 585 | } |
| 582 | dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec); | 586 | dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec); |
| 583 | return NULL; | 587 | return NULL; |
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 42d844f8f6bf..dfbf3f270cea 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/mtd/partitions.h> | 19 | #include <linux/mtd/partitions.h> |
| 20 | #include <linux/mtd/physmap.h> | 20 | #include <linux/mtd/physmap.h> |
| 21 | #include <linux/mtd/concat.h> | 21 | #include <linux/mtd/concat.h> |
| 22 | #include <asm/io.h> | 22 | #include <linux/io.h> |
| 23 | 23 | ||
| 24 | #define MAX_RESOURCES 4 | 24 | #define MAX_RESOURCES 4 |
| 25 | 25 | ||
| @@ -27,7 +27,6 @@ struct physmap_flash_info { | |||
| 27 | struct mtd_info *mtd[MAX_RESOURCES]; | 27 | struct mtd_info *mtd[MAX_RESOURCES]; |
| 28 | struct mtd_info *cmtd; | 28 | struct mtd_info *cmtd; |
| 29 | struct map_info map[MAX_RESOURCES]; | 29 | struct map_info map[MAX_RESOURCES]; |
| 30 | struct resource *res; | ||
| 31 | #ifdef CONFIG_MTD_PARTITIONS | 30 | #ifdef CONFIG_MTD_PARTITIONS |
| 32 | int nr_parts; | 31 | int nr_parts; |
| 33 | struct mtd_partition *parts; | 32 | struct mtd_partition *parts; |
| @@ -70,16 +69,7 @@ static int physmap_flash_remove(struct platform_device *dev) | |||
| 70 | #endif | 69 | #endif |
| 71 | map_destroy(info->mtd[i]); | 70 | map_destroy(info->mtd[i]); |
| 72 | } | 71 | } |
| 73 | |||
| 74 | if (info->map[i].virt != NULL) | ||
| 75 | iounmap(info->map[i].virt); | ||
| 76 | } | ||
| 77 | |||
| 78 | if (info->res != NULL) { | ||
| 79 | release_resource(info->res); | ||
| 80 | kfree(info->res); | ||
| 81 | } | 72 | } |
| 82 | |||
| 83 | return 0; | 73 | return 0; |
| 84 | } | 74 | } |
| 85 | 75 | ||
| @@ -101,7 +91,8 @@ static int physmap_flash_probe(struct platform_device *dev) | |||
| 101 | if (physmap_data == NULL) | 91 | if (physmap_data == NULL) |
| 102 | return -ENODEV; | 92 | return -ENODEV; |
| 103 | 93 | ||
| 104 | info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL); | 94 | info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info), |
| 95 | GFP_KERNEL); | ||
| 105 | if (info == NULL) { | 96 | if (info == NULL) { |
| 106 | err = -ENOMEM; | 97 | err = -ENOMEM; |
| 107 | goto err_out; | 98 | goto err_out; |
| @@ -114,10 +105,10 @@ static int physmap_flash_probe(struct platform_device *dev) | |||
| 114 | (unsigned long long)(dev->resource[i].end - dev->resource[i].start + 1), | 105 | (unsigned long long)(dev->resource[i].end - dev->resource[i].start + 1), |
| 115 | (unsigned long long)dev->resource[i].start); | 106 | (unsigned long long)dev->resource[i].start); |
| 116 | 107 | ||
| 117 | info->res = request_mem_region(dev->resource[i].start, | 108 | if (!devm_request_mem_region(&dev->dev, |
| 118 | dev->resource[i].end - dev->resource[i].start + 1, | 109 | dev->resource[i].start, |
| 119 | dev->dev.bus_id); | 110 | dev->resource[i].end - dev->resource[i].start + 1, |
| 120 | if (info->res == NULL) { | 111 | dev->dev.bus_id)) { |
| 121 | dev_err(&dev->dev, "Could not reserve memory region\n"); | 112 | dev_err(&dev->dev, "Could not reserve memory region\n"); |
| 122 | err = -ENOMEM; | 113 | err = -ENOMEM; |
| 123 | goto err_out; | 114 | goto err_out; |
| @@ -129,7 +120,8 @@ static int physmap_flash_probe(struct platform_device *dev) | |||
| 129 | info->map[i].bankwidth = physmap_data->width; | 120 | info->map[i].bankwidth = physmap_data->width; |
| 130 | info->map[i].set_vpp = physmap_data->set_vpp; | 121 | info->map[i].set_vpp = physmap_data->set_vpp; |
| 131 | 122 | ||
| 132 | info->map[i].virt = ioremap(info->map[i].phys, info->map[i].size); | 123 | info->map[i].virt = devm_ioremap(&dev->dev, info->map[i].phys, |
| 124 | info->map[i].size); | ||
| 133 | if (info->map[i].virt == NULL) { | 125 | if (info->map[i].virt == NULL) { |
| 134 | dev_err(&dev->dev, "Failed to ioremap flash region\n"); | 126 | dev_err(&dev->dev, "Failed to ioremap flash region\n"); |
| 135 | err = EIO; | 127 | err = EIO; |
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index 024e3fffd4bb..a83192f80eba 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c | |||
| @@ -163,9 +163,11 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun, | |||
| 163 | ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0); | 163 | ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0); |
| 164 | 164 | ||
| 165 | #ifdef CONFIG_MTD_OF_PARTS | 165 | #ifdef CONFIG_MTD_OF_PARTS |
| 166 | if (ret == 0) | 166 | if (ret == 0) { |
| 167 | ret = of_mtd_parse_partitions(fun->dev, &fun->mtd, | 167 | ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts); |
| 168 | flash_np, &fun->parts); | 168 | if (ret < 0) |
| 169 | goto err; | ||
| 170 | } | ||
| 169 | #endif | 171 | #endif |
| 170 | if (ret > 0) | 172 | if (ret > 0) |
| 171 | ret = add_mtd_partitions(&fun->mtd, fun->parts, ret); | 173 | ret = add_mtd_partitions(&fun->mtd, fun->parts, ret); |
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c index 75c899039023..9bd6c9ac8443 100644 --- a/drivers/mtd/nand/pasemi_nand.c +++ b/drivers/mtd/nand/pasemi_nand.c | |||
| @@ -141,6 +141,7 @@ static int __devinit pasemi_nand_probe(struct of_device *ofdev, | |||
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | lpcctl = pci_resource_start(pdev, 0); | 143 | lpcctl = pci_resource_start(pdev, 0); |
| 144 | pci_dev_put(pdev); | ||
| 144 | 145 | ||
| 145 | if (!request_region(lpcctl, 4, driver_name)) { | 146 | if (!request_region(lpcctl, 4, driver_name)) { |
| 146 | err = -EBUSY; | 147 | err = -EBUSY; |
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index c0fa9c9edf08..15f0a26730ae 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
| @@ -269,6 +269,7 @@ static struct pxa3xx_nand_timing stm2GbX16_timing = { | |||
| 269 | 269 | ||
| 270 | static struct pxa3xx_nand_flash stm2GbX16 = { | 270 | static struct pxa3xx_nand_flash stm2GbX16 = { |
| 271 | .timing = &stm2GbX16_timing, | 271 | .timing = &stm2GbX16_timing, |
| 272 | .cmdset = &largepage_cmdset, | ||
| 272 | .page_per_block = 64, | 273 | .page_per_block = 64, |
| 273 | .page_size = 2048, | 274 | .page_size = 2048, |
| 274 | .flash_width = 16, | 275 | .flash_width = 16, |
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index e39b21d3e168..a7e4d985f5ef 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
| @@ -32,19 +32,18 @@ | |||
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/dma-mapping.h> | ||
| 36 | #include <linux/io.h> | ||
| 35 | 37 | ||
| 36 | #include <asm/io.h> | ||
| 37 | #include <asm/mach/flash.h> | 38 | #include <asm/mach/flash.h> |
| 38 | #include <asm/arch/gpmc.h> | 39 | #include <mach/gpmc.h> |
| 39 | #include <asm/arch/onenand.h> | 40 | #include <mach/onenand.h> |
| 40 | #include <asm/arch/gpio.h> | 41 | #include <mach/gpio.h> |
| 41 | #include <asm/arch/pm.h> | 42 | #include <mach/pm.h> |
| 42 | 43 | ||
| 43 | #include <linux/dma-mapping.h> | 44 | #include <mach/dma.h> |
| 44 | #include <asm/dma-mapping.h> | ||
| 45 | #include <asm/arch/dma.h> | ||
| 46 | 45 | ||
| 47 | #include <asm/arch/board.h> | 46 | #include <mach/board.h> |
| 48 | 47 | ||
| 49 | #define DRIVER_NAME "omap2-onenand" | 48 | #define DRIVER_NAME "omap2-onenand" |
| 50 | 49 | ||
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index d07e3f148951..9e8222f9e90e 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -543,9 +543,9 @@ bnx2_free_rx_mem(struct bnx2 *bp) | |||
| 543 | for (j = 0; j < bp->rx_max_pg_ring; j++) { | 543 | for (j = 0; j < bp->rx_max_pg_ring; j++) { |
| 544 | if (rxr->rx_pg_desc_ring[j]) | 544 | if (rxr->rx_pg_desc_ring[j]) |
| 545 | pci_free_consistent(bp->pdev, RXBD_RING_SIZE, | 545 | pci_free_consistent(bp->pdev, RXBD_RING_SIZE, |
| 546 | rxr->rx_pg_desc_ring[i], | 546 | rxr->rx_pg_desc_ring[j], |
| 547 | rxr->rx_pg_desc_mapping[i]); | 547 | rxr->rx_pg_desc_mapping[j]); |
| 548 | rxr->rx_pg_desc_ring[i] = NULL; | 548 | rxr->rx_pg_desc_ring[j] = NULL; |
| 549 | } | 549 | } |
| 550 | if (rxr->rx_pg_ring) | 550 | if (rxr->rx_pg_ring) |
| 551 | vfree(rxr->rx_pg_ring); | 551 | vfree(rxr->rx_pg_ring); |
| @@ -3144,6 +3144,28 @@ bnx2_has_work(struct bnx2_napi *bnapi) | |||
| 3144 | return 0; | 3144 | return 0; |
| 3145 | } | 3145 | } |
| 3146 | 3146 | ||
| 3147 | static void | ||
| 3148 | bnx2_chk_missed_msi(struct bnx2 *bp) | ||
| 3149 | { | ||
| 3150 | struct bnx2_napi *bnapi = &bp->bnx2_napi[0]; | ||
| 3151 | u32 msi_ctrl; | ||
| 3152 | |||
| 3153 | if (bnx2_has_work(bnapi)) { | ||
| 3154 | msi_ctrl = REG_RD(bp, BNX2_PCICFG_MSI_CONTROL); | ||
| 3155 | if (!(msi_ctrl & BNX2_PCICFG_MSI_CONTROL_ENABLE)) | ||
| 3156 | return; | ||
| 3157 | |||
| 3158 | if (bnapi->last_status_idx == bp->idle_chk_status_idx) { | ||
| 3159 | REG_WR(bp, BNX2_PCICFG_MSI_CONTROL, msi_ctrl & | ||
| 3160 | ~BNX2_PCICFG_MSI_CONTROL_ENABLE); | ||
| 3161 | REG_WR(bp, BNX2_PCICFG_MSI_CONTROL, msi_ctrl); | ||
| 3162 | bnx2_msi(bp->irq_tbl[0].vector, bnapi); | ||
| 3163 | } | ||
| 3164 | } | ||
| 3165 | |||
| 3166 | bp->idle_chk_status_idx = bnapi->last_status_idx; | ||
| 3167 | } | ||
| 3168 | |||
| 3147 | static void bnx2_poll_link(struct bnx2 *bp, struct bnx2_napi *bnapi) | 3169 | static void bnx2_poll_link(struct bnx2 *bp, struct bnx2_napi *bnapi) |
| 3148 | { | 3170 | { |
| 3149 | struct status_block *sblk = bnapi->status_blk.msi; | 3171 | struct status_block *sblk = bnapi->status_blk.msi; |
| @@ -3218,14 +3240,15 @@ static int bnx2_poll(struct napi_struct *napi, int budget) | |||
| 3218 | 3240 | ||
| 3219 | work_done = bnx2_poll_work(bp, bnapi, work_done, budget); | 3241 | work_done = bnx2_poll_work(bp, bnapi, work_done, budget); |
| 3220 | 3242 | ||
| 3221 | if (unlikely(work_done >= budget)) | ||
| 3222 | break; | ||
| 3223 | |||
| 3224 | /* bnapi->last_status_idx is used below to tell the hw how | 3243 | /* bnapi->last_status_idx is used below to tell the hw how |
| 3225 | * much work has been processed, so we must read it before | 3244 | * much work has been processed, so we must read it before |
| 3226 | * checking for more work. | 3245 | * checking for more work. |
| 3227 | */ | 3246 | */ |
| 3228 | bnapi->last_status_idx = sblk->status_idx; | 3247 | bnapi->last_status_idx = sblk->status_idx; |
| 3248 | |||
| 3249 | if (unlikely(work_done >= budget)) | ||
| 3250 | break; | ||
| 3251 | |||
| 3229 | rmb(); | 3252 | rmb(); |
| 3230 | if (likely(!bnx2_has_work(bnapi))) { | 3253 | if (likely(!bnx2_has_work(bnapi))) { |
| 3231 | netif_rx_complete(bp->dev, napi); | 3254 | netif_rx_complete(bp->dev, napi); |
| @@ -4570,6 +4593,8 @@ bnx2_init_chip(struct bnx2 *bp) | |||
| 4570 | for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) | 4593 | for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) |
| 4571 | bp->bnx2_napi[i].last_status_idx = 0; | 4594 | bp->bnx2_napi[i].last_status_idx = 0; |
| 4572 | 4595 | ||
| 4596 | bp->idle_chk_status_idx = 0xffff; | ||
| 4597 | |||
| 4573 | bp->rx_mode = BNX2_EMAC_RX_MODE_SORT_MODE; | 4598 | bp->rx_mode = BNX2_EMAC_RX_MODE_SORT_MODE; |
| 4574 | 4599 | ||
| 4575 | /* Set up how to generate a link change interrupt. */ | 4600 | /* Set up how to generate a link change interrupt. */ |
| @@ -5718,6 +5743,10 @@ bnx2_timer(unsigned long data) | |||
| 5718 | if (atomic_read(&bp->intr_sem) != 0) | 5743 | if (atomic_read(&bp->intr_sem) != 0) |
| 5719 | goto bnx2_restart_timer; | 5744 | goto bnx2_restart_timer; |
| 5720 | 5745 | ||
| 5746 | if ((bp->flags & (BNX2_FLAG_USING_MSI | BNX2_FLAG_ONE_SHOT_MSI)) == | ||
| 5747 | BNX2_FLAG_USING_MSI) | ||
| 5748 | bnx2_chk_missed_msi(bp); | ||
| 5749 | |||
| 5721 | bnx2_send_heart_beat(bp); | 5750 | bnx2_send_heart_beat(bp); |
| 5722 | 5751 | ||
| 5723 | bp->stats_blk->stat_FwRxDrop = | 5752 | bp->stats_blk->stat_FwRxDrop = |
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 617d95340160..0b032c3c7b61 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
| @@ -378,6 +378,9 @@ struct l2_fhdr { | |||
| 378 | * pci_config_l definition | 378 | * pci_config_l definition |
| 379 | * offset: 0000 | 379 | * offset: 0000 |
| 380 | */ | 380 | */ |
| 381 | #define BNX2_PCICFG_MSI_CONTROL 0x00000058 | ||
| 382 | #define BNX2_PCICFG_MSI_CONTROL_ENABLE (1L<<16) | ||
| 383 | |||
| 381 | #define BNX2_PCICFG_MISC_CONFIG 0x00000068 | 384 | #define BNX2_PCICFG_MISC_CONFIG 0x00000068 |
| 382 | #define BNX2_PCICFG_MISC_CONFIG_TARGET_BYTE_SWAP (1L<<2) | 385 | #define BNX2_PCICFG_MISC_CONFIG_TARGET_BYTE_SWAP (1L<<2) |
| 383 | #define BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP (1L<<3) | 386 | #define BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP (1L<<3) |
| @@ -6863,6 +6866,9 @@ struct bnx2 { | |||
| 6863 | 6866 | ||
| 6864 | u8 num_tx_rings; | 6867 | u8 num_tx_rings; |
| 6865 | u8 num_rx_rings; | 6868 | u8 num_rx_rings; |
| 6869 | |||
| 6870 | u32 idle_chk_status_idx; | ||
| 6871 | |||
| 6866 | }; | 6872 | }; |
| 6867 | 6873 | ||
| 6868 | #define REG_RD(bp, offset) \ | 6874 | #define REG_RD(bp, offset) \ |
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 523b9716a543..d115a6d30f29 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c | |||
| @@ -1893,12 +1893,17 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) | |||
| 1893 | ctrl |= E1000_CTRL_PHY_RST; | 1893 | ctrl |= E1000_CTRL_PHY_RST; |
| 1894 | } | 1894 | } |
| 1895 | ret_val = e1000_acquire_swflag_ich8lan(hw); | 1895 | ret_val = e1000_acquire_swflag_ich8lan(hw); |
| 1896 | /* Whether or not the swflag was acquired, we need to reset the part */ | ||
| 1896 | hw_dbg(hw, "Issuing a global reset to ich8lan"); | 1897 | hw_dbg(hw, "Issuing a global reset to ich8lan"); |
| 1897 | ew32(CTRL, (ctrl | E1000_CTRL_RST)); | 1898 | ew32(CTRL, (ctrl | E1000_CTRL_RST)); |
| 1898 | msleep(20); | 1899 | msleep(20); |
| 1899 | 1900 | ||
| 1900 | /* release the swflag because it is not reset by hardware reset */ | 1901 | if (!ret_val) { |
| 1901 | e1000_release_swflag_ich8lan(hw); | 1902 | /* release the swflag because it is not reset by |
| 1903 | * hardware reset | ||
| 1904 | */ | ||
| 1905 | e1000_release_swflag_ich8lan(hw); | ||
| 1906 | } | ||
| 1902 | 1907 | ||
| 1903 | ret_val = e1000e_get_auto_rd_done(hw); | 1908 | ret_val = e1000e_get_auto_rd_done(hw); |
| 1904 | if (ret_val) { | 1909 | if (ret_val) { |
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index e1b441effbbe..36cb6e95b465 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c | |||
| @@ -568,6 +568,17 @@ static u16 erxrdpt_workaround(u16 next_packet_ptr, u16 start, u16 end) | |||
| 568 | return erxrdpt; | 568 | return erxrdpt; |
| 569 | } | 569 | } |
| 570 | 570 | ||
| 571 | /* | ||
| 572 | * Calculate wrap around when reading beyond the end of the RX buffer | ||
| 573 | */ | ||
| 574 | static u16 rx_packet_start(u16 ptr) | ||
| 575 | { | ||
| 576 | if (ptr + RSV_SIZE > RXEND_INIT) | ||
| 577 | return (ptr + RSV_SIZE) - (RXEND_INIT - RXSTART_INIT + 1); | ||
| 578 | else | ||
| 579 | return ptr + RSV_SIZE; | ||
| 580 | } | ||
| 581 | |||
| 571 | static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end) | 582 | static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end) |
| 572 | { | 583 | { |
| 573 | u16 erxrdpt; | 584 | u16 erxrdpt; |
| @@ -938,8 +949,9 @@ static void enc28j60_hw_rx(struct net_device *ndev) | |||
| 938 | skb->dev = ndev; | 949 | skb->dev = ndev; |
| 939 | skb_reserve(skb, NET_IP_ALIGN); | 950 | skb_reserve(skb, NET_IP_ALIGN); |
| 940 | /* copy the packet from the receive buffer */ | 951 | /* copy the packet from the receive buffer */ |
| 941 | enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv), | 952 | enc28j60_mem_read(priv, |
| 942 | len, skb_put(skb, len)); | 953 | rx_packet_start(priv->next_pk_ptr), |
| 954 | len, skb_put(skb, len)); | ||
| 943 | if (netif_msg_pktdata(priv)) | 955 | if (netif_msg_pktdata(priv)) |
| 944 | dump_packet(__func__, skb->len, skb->data); | 956 | dump_packet(__func__, skb->len, skb->data); |
| 945 | skb->protocol = eth_type_trans(skb, ndev); | 957 | skb->protocol = eth_type_trans(skb, ndev); |
| @@ -947,7 +959,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) | |||
| 947 | ndev->stats.rx_packets++; | 959 | ndev->stats.rx_packets++; |
| 948 | ndev->stats.rx_bytes += len; | 960 | ndev->stats.rx_bytes += len; |
| 949 | ndev->last_rx = jiffies; | 961 | ndev->last_rx = jiffies; |
| 950 | netif_rx(skb); | 962 | netif_rx_ni(skb); |
| 951 | } | 963 | } |
| 952 | } | 964 | } |
| 953 | /* | 965 | /* |
diff --git a/drivers/net/jme.h b/drivers/net/jme.h index f863aee6648b..3f5d91543246 100644 --- a/drivers/net/jme.h +++ b/drivers/net/jme.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #ifndef __JME_H_INCLUDED__ | 24 | #ifndef __JME_H_INCLUDED__ |
| 25 | #define __JME_H_INCLUDEE__ | 25 | #define __JME_H_INCLUDED__ |
| 26 | 26 | ||
| 27 | #define DRV_NAME "jme" | 27 | #define DRV_NAME "jme" |
| 28 | #define DRV_VERSION "1.0.3" | 28 | #define DRV_VERSION "1.0.3" |
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index b9bed82e1d21..b289a0a2b945 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c | |||
| @@ -401,6 +401,8 @@ static int netx_eth_drv_probe(struct platform_device *pdev) | |||
| 401 | priv->xmac_base = priv->xc->xmac_base; | 401 | priv->xmac_base = priv->xc->xmac_base; |
| 402 | priv->sram_base = priv->xc->sram_base; | 402 | priv->sram_base = priv->xc->sram_base; |
| 403 | 403 | ||
| 404 | spin_lock_init(&priv->lock); | ||
| 405 | |||
| 404 | ret = pfifo_request(PFIFO_MASK(priv->id)); | 406 | ret = pfifo_request(PFIFO_MASK(priv->id)); |
| 405 | if (ret) { | 407 | if (ret) { |
| 406 | printk("unable to request PFIFO\n"); | 408 | printk("unable to request PFIFO\n"); |
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 536bda1f428b..289fc267edf3 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c | |||
| @@ -105,8 +105,6 @@ int mdiobus_register(struct mii_bus *bus) | |||
| 105 | return -EINVAL; | 105 | return -EINVAL; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | bus->state = MDIOBUS_REGISTERED; | ||
| 109 | |||
| 110 | mutex_init(&bus->mdio_lock); | 108 | mutex_init(&bus->mdio_lock); |
| 111 | 109 | ||
| 112 | if (bus->reset) | 110 | if (bus->reset) |
| @@ -123,6 +121,9 @@ int mdiobus_register(struct mii_bus *bus) | |||
| 123 | } | 121 | } |
| 124 | } | 122 | } |
| 125 | 123 | ||
| 124 | if (!err) | ||
| 125 | bus->state = MDIOBUS_REGISTERED; | ||
| 126 | |||
| 126 | pr_info("%s: probed\n", bus->name); | 127 | pr_info("%s: probed\n", bus->name); |
| 127 | 128 | ||
| 128 | return err; | 129 | return err; |
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 1d2ef8f47780..5a40f2d78beb 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
| @@ -1509,6 +1509,11 @@ static int __netdev_rx(struct net_device *dev, int *quota) | |||
| 1509 | desc->status = 0; | 1509 | desc->status = 0; |
| 1510 | np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE; | 1510 | np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE; |
| 1511 | } | 1511 | } |
| 1512 | |||
| 1513 | if (*quota == 0) { /* out of rx quota */ | ||
| 1514 | retcode = 1; | ||
| 1515 | goto out; | ||
| 1516 | } | ||
| 1512 | writew(np->rx_done, np->base + CompletionQConsumerIdx); | 1517 | writew(np->rx_done, np->base + CompletionQConsumerIdx); |
| 1513 | 1518 | ||
| 1514 | out: | 1519 | out: |
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 1349e419673c..fed7eba65ead 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -1142,6 +1142,70 @@ static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1142 | return NETDEV_TX_OK; | 1142 | return NETDEV_TX_OK; |
| 1143 | } | 1143 | } |
| 1144 | 1144 | ||
| 1145 | static void gem_pcs_reset(struct gem *gp) | ||
| 1146 | { | ||
| 1147 | int limit; | ||
| 1148 | u32 val; | ||
| 1149 | |||
| 1150 | /* Reset PCS unit. */ | ||
| 1151 | val = readl(gp->regs + PCS_MIICTRL); | ||
| 1152 | val |= PCS_MIICTRL_RST; | ||
| 1153 | writel(val, gp->regs + PCS_MIICTRL); | ||
| 1154 | |||
| 1155 | limit = 32; | ||
| 1156 | while (readl(gp->regs + PCS_MIICTRL) & PCS_MIICTRL_RST) { | ||
| 1157 | udelay(100); | ||
| 1158 | if (limit-- <= 0) | ||
| 1159 | break; | ||
| 1160 | } | ||
| 1161 | if (limit <= 0) | ||
| 1162 | printk(KERN_WARNING "%s: PCS reset bit would not clear.\n", | ||
| 1163 | gp->dev->name); | ||
| 1164 | } | ||
| 1165 | |||
| 1166 | static void gem_pcs_reinit_adv(struct gem *gp) | ||
| 1167 | { | ||
| 1168 | u32 val; | ||
| 1169 | |||
| 1170 | /* Make sure PCS is disabled while changing advertisement | ||
| 1171 | * configuration. | ||
| 1172 | */ | ||
| 1173 | val = readl(gp->regs + PCS_CFG); | ||
| 1174 | val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO); | ||
| 1175 | writel(val, gp->regs + PCS_CFG); | ||
| 1176 | |||
| 1177 | /* Advertise all capabilities except assymetric | ||
| 1178 | * pause. | ||
| 1179 | */ | ||
| 1180 | val = readl(gp->regs + PCS_MIIADV); | ||
| 1181 | val |= (PCS_MIIADV_FD | PCS_MIIADV_HD | | ||
| 1182 | PCS_MIIADV_SP | PCS_MIIADV_AP); | ||
| 1183 | writel(val, gp->regs + PCS_MIIADV); | ||
| 1184 | |||
| 1185 | /* Enable and restart auto-negotiation, disable wrapback/loopback, | ||
| 1186 | * and re-enable PCS. | ||
| 1187 | */ | ||
| 1188 | val = readl(gp->regs + PCS_MIICTRL); | ||
| 1189 | val |= (PCS_MIICTRL_RAN | PCS_MIICTRL_ANE); | ||
| 1190 | val &= ~PCS_MIICTRL_WB; | ||
| 1191 | writel(val, gp->regs + PCS_MIICTRL); | ||
| 1192 | |||
| 1193 | val = readl(gp->regs + PCS_CFG); | ||
| 1194 | val |= PCS_CFG_ENABLE; | ||
| 1195 | writel(val, gp->regs + PCS_CFG); | ||
| 1196 | |||
| 1197 | /* Make sure serialink loopback is off. The meaning | ||
| 1198 | * of this bit is logically inverted based upon whether | ||
| 1199 | * you are in Serialink or SERDES mode. | ||
| 1200 | */ | ||
| 1201 | val = readl(gp->regs + PCS_SCTRL); | ||
| 1202 | if (gp->phy_type == phy_serialink) | ||
| 1203 | val &= ~PCS_SCTRL_LOOP; | ||
| 1204 | else | ||
| 1205 | val |= PCS_SCTRL_LOOP; | ||
| 1206 | writel(val, gp->regs + PCS_SCTRL); | ||
| 1207 | } | ||
| 1208 | |||
| 1145 | #define STOP_TRIES 32 | 1209 | #define STOP_TRIES 32 |
| 1146 | 1210 | ||
| 1147 | /* Must be invoked under gp->lock and gp->tx_lock. */ | 1211 | /* Must be invoked under gp->lock and gp->tx_lock. */ |
| @@ -1168,6 +1232,9 @@ static void gem_reset(struct gem *gp) | |||
| 1168 | 1232 | ||
| 1169 | if (limit <= 0) | 1233 | if (limit <= 0) |
| 1170 | printk(KERN_ERR "%s: SW reset is ghetto.\n", gp->dev->name); | 1234 | printk(KERN_ERR "%s: SW reset is ghetto.\n", gp->dev->name); |
| 1235 | |||
| 1236 | if (gp->phy_type == phy_serialink || gp->phy_type == phy_serdes) | ||
| 1237 | gem_pcs_reinit_adv(gp); | ||
| 1171 | } | 1238 | } |
| 1172 | 1239 | ||
| 1173 | /* Must be invoked under gp->lock and gp->tx_lock. */ | 1240 | /* Must be invoked under gp->lock and gp->tx_lock. */ |
| @@ -1324,7 +1391,7 @@ static int gem_set_link_modes(struct gem *gp) | |||
| 1324 | gp->phy_type == phy_serdes) { | 1391 | gp->phy_type == phy_serdes) { |
| 1325 | u32 pcs_lpa = readl(gp->regs + PCS_MIILP); | 1392 | u32 pcs_lpa = readl(gp->regs + PCS_MIILP); |
| 1326 | 1393 | ||
| 1327 | if (pcs_lpa & PCS_MIIADV_FD) | 1394 | if ((pcs_lpa & PCS_MIIADV_FD) || gp->phy_type == phy_serdes) |
| 1328 | full_duplex = 1; | 1395 | full_duplex = 1; |
| 1329 | speed = SPEED_1000; | 1396 | speed = SPEED_1000; |
| 1330 | } | 1397 | } |
| @@ -1488,6 +1555,9 @@ static void gem_link_timer(unsigned long data) | |||
| 1488 | val = readl(gp->regs + PCS_MIISTAT); | 1555 | val = readl(gp->regs + PCS_MIISTAT); |
| 1489 | 1556 | ||
| 1490 | if ((val & PCS_MIISTAT_LS) != 0) { | 1557 | if ((val & PCS_MIISTAT_LS) != 0) { |
| 1558 | if (gp->lstate == link_up) | ||
| 1559 | goto restart; | ||
| 1560 | |||
| 1491 | gp->lstate = link_up; | 1561 | gp->lstate = link_up; |
| 1492 | netif_carrier_on(gp->dev); | 1562 | netif_carrier_on(gp->dev); |
| 1493 | (void)gem_set_link_modes(gp); | 1563 | (void)gem_set_link_modes(gp); |
| @@ -1708,61 +1778,8 @@ static void gem_init_phy(struct gem *gp) | |||
| 1708 | if (gp->phy_mii.def && gp->phy_mii.def->ops->init) | 1778 | if (gp->phy_mii.def && gp->phy_mii.def->ops->init) |
| 1709 | gp->phy_mii.def->ops->init(&gp->phy_mii); | 1779 | gp->phy_mii.def->ops->init(&gp->phy_mii); |
| 1710 | } else { | 1780 | } else { |
| 1711 | u32 val; | 1781 | gem_pcs_reset(gp); |
| 1712 | int limit; | 1782 | gem_pcs_reinit_adv(gp); |
| 1713 | |||
| 1714 | /* Reset PCS unit. */ | ||
| 1715 | val = readl(gp->regs + PCS_MIICTRL); | ||
| 1716 | val |= PCS_MIICTRL_RST; | ||
| 1717 | writel(val, gp->regs + PCS_MIICTRL); | ||
| 1718 | |||
| 1719 | limit = 32; | ||
| 1720 | while (readl(gp->regs + PCS_MIICTRL) & PCS_MIICTRL_RST) { | ||
| 1721 | udelay(100); | ||
| 1722 | if (limit-- <= 0) | ||
| 1723 | break; | ||
| 1724 | } | ||
| 1725 | if (limit <= 0) | ||
| 1726 | printk(KERN_WARNING "%s: PCS reset bit would not clear.\n", | ||
| 1727 | gp->dev->name); | ||
| 1728 | |||
| 1729 | /* Make sure PCS is disabled while changing advertisement | ||
| 1730 | * configuration. | ||
| 1731 | */ | ||
| 1732 | val = readl(gp->regs + PCS_CFG); | ||
| 1733 | val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO); | ||
| 1734 | writel(val, gp->regs + PCS_CFG); | ||
| 1735 | |||
| 1736 | /* Advertise all capabilities except assymetric | ||
| 1737 | * pause. | ||
| 1738 | */ | ||
| 1739 | val = readl(gp->regs + PCS_MIIADV); | ||
| 1740 | val |= (PCS_MIIADV_FD | PCS_MIIADV_HD | | ||
| 1741 | PCS_MIIADV_SP | PCS_MIIADV_AP); | ||
| 1742 | writel(val, gp->regs + PCS_MIIADV); | ||
| 1743 | |||
| 1744 | /* Enable and restart auto-negotiation, disable wrapback/loopback, | ||
| 1745 | * and re-enable PCS. | ||
| 1746 | */ | ||
| 1747 | val = readl(gp->regs + PCS_MIICTRL); | ||
| 1748 | val |= (PCS_MIICTRL_RAN | PCS_MIICTRL_ANE); | ||
| 1749 | val &= ~PCS_MIICTRL_WB; | ||
| 1750 | writel(val, gp->regs + PCS_MIICTRL); | ||
| 1751 | |||
| 1752 | val = readl(gp->regs + PCS_CFG); | ||
| 1753 | val |= PCS_CFG_ENABLE; | ||
| 1754 | writel(val, gp->regs + PCS_CFG); | ||
| 1755 | |||
| 1756 | /* Make sure serialink loopback is off. The meaning | ||
| 1757 | * of this bit is logically inverted based upon whether | ||
| 1758 | * you are in Serialink or SERDES mode. | ||
| 1759 | */ | ||
| 1760 | val = readl(gp->regs + PCS_SCTRL); | ||
| 1761 | if (gp->phy_type == phy_serialink) | ||
| 1762 | val &= ~PCS_SCTRL_LOOP; | ||
| 1763 | else | ||
| 1764 | val |= PCS_SCTRL_LOOP; | ||
| 1765 | writel(val, gp->regs + PCS_SCTRL); | ||
| 1766 | } | 1783 | } |
| 1767 | 1784 | ||
| 1768 | /* Default aneg parameters */ | 1785 | /* Default aneg parameters */ |
| @@ -2680,6 +2697,21 @@ static int gem_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 2680 | cmd->speed = 0; | 2697 | cmd->speed = 0; |
| 2681 | cmd->duplex = cmd->port = cmd->phy_address = | 2698 | cmd->duplex = cmd->port = cmd->phy_address = |
| 2682 | cmd->transceiver = cmd->autoneg = 0; | 2699 | cmd->transceiver = cmd->autoneg = 0; |
| 2700 | |||
| 2701 | /* serdes means usually a Fibre connector, with most fixed */ | ||
| 2702 | if (gp->phy_type == phy_serdes) { | ||
| 2703 | cmd->port = PORT_FIBRE; | ||
| 2704 | cmd->supported = (SUPPORTED_1000baseT_Half | | ||
| 2705 | SUPPORTED_1000baseT_Full | | ||
| 2706 | SUPPORTED_FIBRE | SUPPORTED_Autoneg | | ||
| 2707 | SUPPORTED_Pause | SUPPORTED_Asym_Pause); | ||
| 2708 | cmd->advertising = cmd->supported; | ||
| 2709 | cmd->transceiver = XCVR_INTERNAL; | ||
| 2710 | if (gp->lstate == link_up) | ||
| 2711 | cmd->speed = SPEED_1000; | ||
| 2712 | cmd->duplex = DUPLEX_FULL; | ||
| 2713 | cmd->autoneg = 1; | ||
| 2714 | } | ||
| 2683 | } | 2715 | } |
| 2684 | cmd->maxtxpkt = cmd->maxrxpkt = 0; | 2716 | cmd->maxtxpkt = cmd->maxrxpkt = 0; |
| 2685 | 2717 | ||
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index c41d68761364..e60498232b94 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
| @@ -1098,6 +1098,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) | |||
| 1098 | dma_addr_t tail_list_phys; | 1098 | dma_addr_t tail_list_phys; |
| 1099 | u8 *tail_buffer; | 1099 | u8 *tail_buffer; |
| 1100 | unsigned long flags; | 1100 | unsigned long flags; |
| 1101 | unsigned int txlen; | ||
| 1101 | 1102 | ||
| 1102 | if ( ! priv->phyOnline ) { | 1103 | if ( ! priv->phyOnline ) { |
| 1103 | TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT: %s PHY is not ready\n", | 1104 | TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT: %s PHY is not ready\n", |
| @@ -1108,6 +1109,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) | |||
| 1108 | 1109 | ||
| 1109 | if (skb_padto(skb, TLAN_MIN_FRAME_SIZE)) | 1110 | if (skb_padto(skb, TLAN_MIN_FRAME_SIZE)) |
| 1110 | return 0; | 1111 | return 0; |
| 1112 | txlen = max(skb->len, (unsigned int)TLAN_MIN_FRAME_SIZE); | ||
| 1111 | 1113 | ||
| 1112 | tail_list = priv->txList + priv->txTail; | 1114 | tail_list = priv->txList + priv->txTail; |
| 1113 | tail_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txTail; | 1115 | tail_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txTail; |
| @@ -1125,16 +1127,16 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) | |||
| 1125 | 1127 | ||
| 1126 | if ( bbuf ) { | 1128 | if ( bbuf ) { |
| 1127 | tail_buffer = priv->txBuffer + ( priv->txTail * TLAN_MAX_FRAME_SIZE ); | 1129 | tail_buffer = priv->txBuffer + ( priv->txTail * TLAN_MAX_FRAME_SIZE ); |
| 1128 | skb_copy_from_linear_data(skb, tail_buffer, skb->len); | 1130 | skb_copy_from_linear_data(skb, tail_buffer, txlen); |
| 1129 | } else { | 1131 | } else { |
| 1130 | tail_list->buffer[0].address = pci_map_single(priv->pciDev, | 1132 | tail_list->buffer[0].address = pci_map_single(priv->pciDev, |
| 1131 | skb->data, skb->len, | 1133 | skb->data, txlen, |
| 1132 | PCI_DMA_TODEVICE); | 1134 | PCI_DMA_TODEVICE); |
| 1133 | TLan_StoreSKB(tail_list, skb); | 1135 | TLan_StoreSKB(tail_list, skb); |
| 1134 | } | 1136 | } |
| 1135 | 1137 | ||
| 1136 | tail_list->frameSize = (u16) skb->len; | 1138 | tail_list->frameSize = (u16) txlen; |
| 1137 | tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) skb->len; | 1139 | tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) txlen; |
| 1138 | tail_list->buffer[1].count = 0; | 1140 | tail_list->buffer[1].count = 0; |
| 1139 | tail_list->buffer[1].address = 0; | 1141 | tail_list->buffer[1].address = 0; |
| 1140 | 1142 | ||
| @@ -1431,7 +1433,9 @@ static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int ) | |||
| 1431 | if ( ! bbuf ) { | 1433 | if ( ! bbuf ) { |
| 1432 | struct sk_buff *skb = TLan_GetSKB(head_list); | 1434 | struct sk_buff *skb = TLan_GetSKB(head_list); |
| 1433 | pci_unmap_single(priv->pciDev, head_list->buffer[0].address, | 1435 | pci_unmap_single(priv->pciDev, head_list->buffer[0].address, |
| 1434 | skb->len, PCI_DMA_TODEVICE); | 1436 | max(skb->len, |
| 1437 | (unsigned int)TLAN_MIN_FRAME_SIZE), | ||
| 1438 | PCI_DMA_TODEVICE); | ||
| 1435 | dev_kfree_skb_any(skb); | 1439 | dev_kfree_skb_any(skb); |
| 1436 | head_list->buffer[8].address = 0; | 1440 | head_list->buffer[8].address = 0; |
| 1437 | head_list->buffer[9].address = 0; | 1441 | head_list->buffer[9].address = 0; |
| @@ -2055,9 +2059,12 @@ static void TLan_FreeLists( struct net_device *dev ) | |||
| 2055 | list = priv->txList + i; | 2059 | list = priv->txList + i; |
| 2056 | skb = TLan_GetSKB(list); | 2060 | skb = TLan_GetSKB(list); |
| 2057 | if ( skb ) { | 2061 | if ( skb ) { |
| 2058 | pci_unmap_single(priv->pciDev, | 2062 | pci_unmap_single( |
| 2059 | list->buffer[0].address, skb->len, | 2063 | priv->pciDev, |
| 2060 | PCI_DMA_TODEVICE); | 2064 | list->buffer[0].address, |
| 2065 | max(skb->len, | ||
| 2066 | (unsigned int)TLAN_MIN_FRAME_SIZE), | ||
| 2067 | PCI_DMA_TODEVICE); | ||
| 2061 | dev_kfree_skb_any( skb ); | 2068 | dev_kfree_skb_any( skb ); |
| 2062 | list->buffer[8].address = 0; | 2069 | list->buffer[8].address = 0; |
| 2063 | list->buffer[9].address = 0; | 2070 | list->buffer[9].address = 0; |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index dcce3542d5a7..7a9f901d4ff6 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
| @@ -3897,6 +3897,7 @@ static int ipw_disassociate(void *data) | |||
| 3897 | if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING))) | 3897 | if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING))) |
| 3898 | return 0; | 3898 | return 0; |
| 3899 | ipw_send_disassociate(data, 0); | 3899 | ipw_send_disassociate(data, 0); |
| 3900 | netif_carrier_off(priv->net_dev); | ||
| 3900 | return 1; | 3901 | return 1; |
| 3901 | } | 3902 | } |
| 3902 | 3903 | ||
| @@ -10190,6 +10191,9 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb, | |||
| 10190 | u16 remaining_bytes; | 10191 | u16 remaining_bytes; |
| 10191 | int fc; | 10192 | int fc; |
| 10192 | 10193 | ||
| 10194 | if (!(priv->status & STATUS_ASSOCIATED)) | ||
| 10195 | goto drop; | ||
| 10196 | |||
| 10193 | hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); | 10197 | hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); |
| 10194 | switch (priv->ieee->iw_mode) { | 10198 | switch (priv->ieee->iw_mode) { |
| 10195 | case IW_MODE_ADHOC: | 10199 | case IW_MODE_ADHOC: |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 4c312c55f90c..01a845851338 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
| @@ -290,6 +290,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv) | |||
| 290 | priv->num_stations = 0; | 290 | priv->num_stations = 0; |
| 291 | memset(priv->stations, 0, sizeof(priv->stations)); | 291 | memset(priv->stations, 0, sizeof(priv->stations)); |
| 292 | 292 | ||
| 293 | /* clean ucode key table bit map */ | ||
| 294 | priv->ucode_key_table = 0; | ||
| 295 | |||
| 293 | spin_unlock_irqrestore(&priv->sta_lock, flags); | 296 | spin_unlock_irqrestore(&priv->sta_lock, flags); |
| 294 | } | 297 | } |
| 295 | EXPORT_SYMBOL(iwl_clear_stations_table); | 298 | EXPORT_SYMBOL(iwl_clear_stations_table); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 61797f3f8d5c..26f7084d3011 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
| @@ -475,7 +475,7 @@ static int iwl_get_free_ucode_key_index(struct iwl_priv *priv) | |||
| 475 | if (!test_and_set_bit(i, &priv->ucode_key_table)) | 475 | if (!test_and_set_bit(i, &priv->ucode_key_table)) |
| 476 | return i; | 476 | return i; |
| 477 | 477 | ||
| 478 | return -1; | 478 | return WEP_INVALID_OFFSET; |
| 479 | } | 479 | } |
| 480 | 480 | ||
| 481 | int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty) | 481 | int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty) |
| @@ -620,6 +620,9 @@ static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv, | |||
| 620 | /* else, we are overriding an existing key => no need to allocated room | 620 | /* else, we are overriding an existing key => no need to allocated room |
| 621 | * in uCode. */ | 621 | * in uCode. */ |
| 622 | 622 | ||
| 623 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, | ||
| 624 | "no space for new kew"); | ||
| 625 | |||
| 623 | priv->stations[sta_id].sta.key.key_flags = key_flags; | 626 | priv->stations[sta_id].sta.key.key_flags = key_flags; |
| 624 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; | 627 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; |
| 625 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; | 628 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; |
| @@ -637,6 +640,7 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv, | |||
| 637 | { | 640 | { |
| 638 | unsigned long flags; | 641 | unsigned long flags; |
| 639 | __le16 key_flags = 0; | 642 | __le16 key_flags = 0; |
| 643 | int ret; | ||
| 640 | 644 | ||
| 641 | key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK); | 645 | key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK); |
| 642 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); | 646 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); |
| @@ -664,14 +668,18 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv, | |||
| 664 | /* else, we are overriding an existing key => no need to allocated room | 668 | /* else, we are overriding an existing key => no need to allocated room |
| 665 | * in uCode. */ | 669 | * in uCode. */ |
| 666 | 670 | ||
| 671 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, | ||
| 672 | "no space for new kew"); | ||
| 673 | |||
| 667 | priv->stations[sta_id].sta.key.key_flags = key_flags; | 674 | priv->stations[sta_id].sta.key.key_flags = key_flags; |
| 668 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; | 675 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; |
| 669 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; | 676 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; |
| 670 | 677 | ||
| 678 | ret = iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC); | ||
| 679 | |||
| 671 | spin_unlock_irqrestore(&priv->sta_lock, flags); | 680 | spin_unlock_irqrestore(&priv->sta_lock, flags); |
| 672 | 681 | ||
| 673 | IWL_DEBUG_INFO("hwcrypto: modify ucode station key info\n"); | 682 | return ret; |
| 674 | return iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC); | ||
| 675 | } | 683 | } |
| 676 | 684 | ||
| 677 | static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, | 685 | static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, |
| @@ -696,6 +704,9 @@ static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, | |||
| 696 | /* else, we are overriding an existing key => no need to allocated room | 704 | /* else, we are overriding an existing key => no need to allocated room |
| 697 | * in uCode. */ | 705 | * in uCode. */ |
| 698 | 706 | ||
| 707 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, | ||
| 708 | "no space for new kew"); | ||
| 709 | |||
| 699 | /* This copy is acutally not needed: we get the key with each TX */ | 710 | /* This copy is acutally not needed: we get the key with each TX */ |
| 700 | memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16); | 711 | memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16); |
| 701 | 712 | ||
| @@ -734,6 +745,13 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, | |||
| 734 | return 0; | 745 | return 0; |
| 735 | } | 746 | } |
| 736 | 747 | ||
| 748 | if (priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) { | ||
| 749 | IWL_WARNING("Removing wrong key %d 0x%x\n", | ||
| 750 | keyconf->keyidx, key_flags); | ||
| 751 | spin_unlock_irqrestore(&priv->sta_lock, flags); | ||
| 752 | return 0; | ||
| 753 | } | ||
| 754 | |||
| 737 | if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset, | 755 | if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset, |
| 738 | &priv->ucode_key_table)) | 756 | &priv->ucode_key_table)) |
| 739 | IWL_ERROR("index %d not used in uCode key table.\n", | 757 | IWL_ERROR("index %d not used in uCode key table.\n", |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index fe1867b25ff7..cac732f4047f 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
| @@ -615,7 +615,7 @@ static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr, | |||
| 615 | struct ieee80211_hdr *tx_hdr; | 615 | struct ieee80211_hdr *tx_hdr; |
| 616 | 616 | ||
| 617 | tx_hdr = (struct ieee80211_hdr *)skb->data; | 617 | tx_hdr = (struct ieee80211_hdr *)skb->data; |
| 618 | if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1))) | 618 | if (likely(!memcmp(tx_hdr->addr2, rx_hdr->addr1, ETH_ALEN))) |
| 619 | { | 619 | { |
| 620 | __skb_unlink(skb, q); | 620 | __skb_unlink(skb, q); |
| 621 | tx_status(hw, skb, IEEE80211_TX_STAT_ACK, stats->signal, 1); | 621 | tx_status(hw, skb, IEEE80211_TX_STAT_ACK, stats->signal, 1); |
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index f9e244da30ae..9bcb6cbd5aa9 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h | |||
| @@ -113,7 +113,7 @@ struct acpiphp_slot { | |||
| 113 | 113 | ||
| 114 | u8 device; /* pci device# */ | 114 | u8 device; /* pci device# */ |
| 115 | 115 | ||
| 116 | u32 sun; /* ACPI _SUN (slot unique number) */ | 116 | unsigned long long sun; /* ACPI _SUN (slot unique number) */ |
| 117 | u32 flags; /* see below */ | 117 | u32 flags; /* see below */ |
| 118 | }; | 118 | }; |
| 119 | 119 | ||
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c index 95b536a23d25..43c10bd261b4 100644 --- a/drivers/pci/hotplug/acpiphp_core.c +++ b/drivers/pci/hotplug/acpiphp_core.c | |||
| @@ -337,7 +337,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) | |||
| 337 | slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN; | 337 | slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN; |
| 338 | 338 | ||
| 339 | acpiphp_slot->slot = slot; | 339 | acpiphp_slot->slot = slot; |
| 340 | snprintf(name, SLOT_NAME_SIZE, "%u", slot->acpi_slot->sun); | 340 | snprintf(name, SLOT_NAME_SIZE, "%llu", slot->acpi_slot->sun); |
| 341 | 341 | ||
| 342 | retval = pci_hp_register(slot->hotplug_slot, | 342 | retval = pci_hp_register(slot->hotplug_slot, |
| 343 | acpiphp_slot->bridge->pci_bus, | 343 | acpiphp_slot->bridge->pci_bus, |
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 955aae4071f7..3affc6472e65 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
| @@ -255,13 +255,13 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
| 255 | 255 | ||
| 256 | bridge->nr_slots++; | 256 | bridge->nr_slots++; |
| 257 | 257 | ||
| 258 | dbg("found ACPI PCI Hotplug slot %d at PCI %04x:%02x:%02x\n", | 258 | dbg("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n", |
| 259 | slot->sun, pci_domain_nr(bridge->pci_bus), | 259 | slot->sun, pci_domain_nr(bridge->pci_bus), |
| 260 | bridge->pci_bus->number, slot->device); | 260 | bridge->pci_bus->number, slot->device); |
| 261 | retval = acpiphp_register_hotplug_slot(slot); | 261 | retval = acpiphp_register_hotplug_slot(slot); |
| 262 | if (retval) { | 262 | if (retval) { |
| 263 | if (retval == -EBUSY) | 263 | if (retval == -EBUSY) |
| 264 | warn("Slot %d already registered by another " | 264 | warn("Slot %llu already registered by another " |
| 265 | "hotplug driver\n", slot->sun); | 265 | "hotplug driver\n", slot->sun); |
| 266 | else | 266 | else |
| 267 | warn("acpiphp_register_hotplug_slot failed " | 267 | warn("acpiphp_register_hotplug_slot failed " |
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index c892daae74d6..633e743442ac 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c | |||
| @@ -1402,10 +1402,6 @@ static int __init ibmphp_init(void) | |||
| 1402 | goto error; | 1402 | goto error; |
| 1403 | } | 1403 | } |
| 1404 | 1404 | ||
| 1405 | /* lock ourselves into memory with a module | ||
| 1406 | * count of -1 so that no one can unload us. */ | ||
| 1407 | module_put(THIS_MODULE); | ||
| 1408 | |||
| 1409 | exit: | 1405 | exit: |
| 1410 | return rc; | 1406 | return rc; |
| 1411 | 1407 | ||
| @@ -1423,4 +1419,3 @@ static void __exit ibmphp_exit(void) | |||
| 1423 | } | 1419 | } |
| 1424 | 1420 | ||
| 1425 | module_init(ibmphp_init); | 1421 | module_init(ibmphp_init); |
| 1426 | module_exit(ibmphp_exit); | ||
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 4b23bc39b11e..39cf248d24e3 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
| @@ -432,18 +432,19 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ | |||
| 432 | goto err_out_release_ctlr; | 432 | goto err_out_release_ctlr; |
| 433 | } | 433 | } |
| 434 | 434 | ||
| 435 | /* Check if slot is occupied */ | ||
| 435 | t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset); | 436 | t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset); |
| 436 | 437 | t_slot->hpc_ops->get_adapter_status(t_slot, &value); | |
| 437 | t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */ | 438 | if (value) { |
| 438 | if (value && pciehp_force) { | 439 | if (pciehp_force) |
| 439 | rc = pciehp_enable_slot(t_slot); | 440 | pciehp_enable_slot(t_slot); |
| 440 | if (rc) /* -ENODEV: shouldn't happen, but deal with it */ | 441 | } else { |
| 441 | value = 0; | 442 | /* Power off slot if not occupied */ |
| 442 | } | 443 | if (POWER_CTRL(ctrl)) { |
| 443 | if ((POWER_CTRL(ctrl)) && !value) { | 444 | rc = t_slot->hpc_ops->power_off_slot(t_slot); |
| 444 | rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/ | 445 | if (rc) |
| 445 | if (rc) | 446 | goto err_out_free_ctrl_slot; |
| 446 | goto err_out_free_ctrl_slot; | 447 | } |
| 447 | } | 448 | } |
| 448 | 449 | ||
| 449 | return 0; | 450 | return 0; |
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index dfc63d01f20a..aac7006949f1 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c | |||
| @@ -252,7 +252,7 @@ static void report_resume(struct pci_dev *dev, void *data) | |||
| 252 | 252 | ||
| 253 | if (!dev->driver || | 253 | if (!dev->driver || |
| 254 | !dev->driver->err_handler || | 254 | !dev->driver->err_handler || |
| 255 | !dev->driver->err_handler->slot_reset) | 255 | !dev->driver->err_handler->resume) |
| 256 | return; | 256 | return; |
| 257 | 257 | ||
| 258 | err_handler = dev->driver->err_handler; | 258 | err_handler = dev->driver->err_handler; |
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 8f63f4c6b85f..9aad608bcf3f 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/jiffies.h> | ||
| 19 | #include <linux/pci-aspm.h> | 20 | #include <linux/pci-aspm.h> |
| 20 | #include "../pci.h" | 21 | #include "../pci.h" |
| 21 | 22 | ||
| @@ -161,11 +162,12 @@ static void pcie_check_clock_pm(struct pci_dev *pdev) | |||
| 161 | */ | 162 | */ |
| 162 | static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) | 163 | static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) |
| 163 | { | 164 | { |
| 164 | int pos, child_pos; | 165 | int pos, child_pos, i = 0; |
| 165 | u16 reg16 = 0; | 166 | u16 reg16 = 0; |
| 166 | struct pci_dev *child_dev; | 167 | struct pci_dev *child_dev; |
| 167 | int same_clock = 1; | 168 | int same_clock = 1; |
| 168 | 169 | unsigned long start_jiffies; | |
| 170 | u16 child_regs[8], parent_reg; | ||
| 169 | /* | 171 | /* |
| 170 | * all functions of a slot should have the same Slot Clock | 172 | * all functions of a slot should have the same Slot Clock |
| 171 | * Configuration, so just check one function | 173 | * Configuration, so just check one function |
| @@ -191,16 +193,19 @@ static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) | |||
| 191 | child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP); | 193 | child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP); |
| 192 | pci_read_config_word(child_dev, child_pos + PCI_EXP_LNKCTL, | 194 | pci_read_config_word(child_dev, child_pos + PCI_EXP_LNKCTL, |
| 193 | ®16); | 195 | ®16); |
| 196 | child_regs[i] = reg16; | ||
| 194 | if (same_clock) | 197 | if (same_clock) |
| 195 | reg16 |= PCI_EXP_LNKCTL_CCC; | 198 | reg16 |= PCI_EXP_LNKCTL_CCC; |
| 196 | else | 199 | else |
| 197 | reg16 &= ~PCI_EXP_LNKCTL_CCC; | 200 | reg16 &= ~PCI_EXP_LNKCTL_CCC; |
| 198 | pci_write_config_word(child_dev, child_pos + PCI_EXP_LNKCTL, | 201 | pci_write_config_word(child_dev, child_pos + PCI_EXP_LNKCTL, |
| 199 | reg16); | 202 | reg16); |
| 203 | i++; | ||
| 200 | } | 204 | } |
| 201 | 205 | ||
| 202 | /* Configure upstream component */ | 206 | /* Configure upstream component */ |
| 203 | pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, ®16); | 207 | pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, ®16); |
| 208 | parent_reg = reg16; | ||
| 204 | if (same_clock) | 209 | if (same_clock) |
| 205 | reg16 |= PCI_EXP_LNKCTL_CCC; | 210 | reg16 |= PCI_EXP_LNKCTL_CCC; |
| 206 | else | 211 | else |
| @@ -212,12 +217,30 @@ static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) | |||
| 212 | pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16); | 217 | pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16); |
| 213 | 218 | ||
| 214 | /* Wait for link training end */ | 219 | /* Wait for link training end */ |
| 215 | while (1) { | 220 | /* break out after waiting for 1 second */ |
| 221 | start_jiffies = jiffies; | ||
| 222 | while ((jiffies - start_jiffies) < HZ) { | ||
| 216 | pci_read_config_word(pdev, pos + PCI_EXP_LNKSTA, ®16); | 223 | pci_read_config_word(pdev, pos + PCI_EXP_LNKSTA, ®16); |
| 217 | if (!(reg16 & PCI_EXP_LNKSTA_LT)) | 224 | if (!(reg16 & PCI_EXP_LNKSTA_LT)) |
| 218 | break; | 225 | break; |
| 219 | cpu_relax(); | 226 | cpu_relax(); |
| 220 | } | 227 | } |
| 228 | /* training failed -> recover */ | ||
| 229 | if ((jiffies - start_jiffies) >= HZ) { | ||
| 230 | dev_printk (KERN_ERR, &pdev->dev, "ASPM: Could not configure" | ||
| 231 | " common clock\n"); | ||
| 232 | i = 0; | ||
| 233 | list_for_each_entry(child_dev, &pdev->subordinate->devices, | ||
| 234 | bus_list) { | ||
| 235 | child_pos = pci_find_capability(child_dev, | ||
| 236 | PCI_CAP_ID_EXP); | ||
| 237 | pci_write_config_word(child_dev, | ||
| 238 | child_pos + PCI_EXP_LNKCTL, | ||
| 239 | child_regs[i]); | ||
| 240 | i++; | ||
| 241 | } | ||
| 242 | pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, parent_reg); | ||
| 243 | } | ||
| 221 | } | 244 | } |
| 222 | 245 | ||
| 223 | /* | 246 | /* |
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index 4dd1c3e157ae..5a8ccb4f604d 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c | |||
| @@ -253,6 +253,7 @@ placeholder: | |||
| 253 | __func__, pci_domain_nr(parent), parent->number, slot_nr); | 253 | __func__, pci_domain_nr(parent), parent->number, slot_nr); |
| 254 | 254 | ||
| 255 | out: | 255 | out: |
| 256 | kfree(slot_name); | ||
| 256 | up_write(&pci_bus_sem); | 257 | up_write(&pci_bus_sem); |
| 257 | return slot; | 258 | return slot; |
| 258 | err: | 259 | err: |
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c index bb7338863fb9..b59d4115d20f 100644 --- a/drivers/pcmcia/bfin_cf_pcmcia.c +++ b/drivers/pcmcia/bfin_cf_pcmcia.c | |||
| @@ -334,6 +334,6 @@ static void __exit bfin_cf_exit(void) | |||
| 334 | module_init(bfin_cf_init); | 334 | module_init(bfin_cf_init); |
| 335 | module_exit(bfin_cf_exit); | 335 | module_exit(bfin_cf_exit); |
| 336 | 336 | ||
| 337 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>") | 337 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); |
| 338 | MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver"); | 338 | MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver"); |
| 339 | MODULE_LICENSE("GPL"); | 339 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c index 341d7a5b45a2..4e91419e8911 100644 --- a/drivers/rtc/rtc-ds1672.c +++ b/drivers/rtc/rtc-ds1672.c | |||
| @@ -209,12 +209,18 @@ static int ds1672_probe(struct i2c_client *client, | |||
| 209 | return err; | 209 | return err; |
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | static struct i2c_device_id ds1672_id[] = { | ||
| 213 | { "ds1672", 0 }, | ||
| 214 | { } | ||
| 215 | }; | ||
| 216 | |||
| 212 | static struct i2c_driver ds1672_driver = { | 217 | static struct i2c_driver ds1672_driver = { |
| 213 | .driver = { | 218 | .driver = { |
| 214 | .name = "rtc-ds1672", | 219 | .name = "rtc-ds1672", |
| 215 | }, | 220 | }, |
| 216 | .probe = &ds1672_probe, | 221 | .probe = &ds1672_probe, |
| 217 | .remove = &ds1672_remove, | 222 | .remove = &ds1672_remove, |
| 223 | .id_table = ds1672_id, | ||
| 218 | }; | 224 | }; |
| 219 | 225 | ||
| 220 | static int __init ds1672_init(void) | 226 | static int __init ds1672_init(void) |
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c index 80782798763f..a4f6665ab3c5 100644 --- a/drivers/rtc/rtc-max6900.c +++ b/drivers/rtc/rtc-max6900.c | |||
| @@ -247,12 +247,18 @@ max6900_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 247 | return 0; | 247 | return 0; |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | static struct i2c_device_id max6900_id[] = { | ||
| 251 | { "max6900", 0 }, | ||
| 252 | { } | ||
| 253 | }; | ||
| 254 | |||
| 250 | static struct i2c_driver max6900_driver = { | 255 | static struct i2c_driver max6900_driver = { |
| 251 | .driver = { | 256 | .driver = { |
| 252 | .name = "rtc-max6900", | 257 | .name = "rtc-max6900", |
| 253 | }, | 258 | }, |
| 254 | .probe = max6900_probe, | 259 | .probe = max6900_probe, |
| 255 | .remove = max6900_remove, | 260 | .remove = max6900_remove, |
| 261 | .id_table = max6900_id, | ||
| 256 | }; | 262 | }; |
| 257 | 263 | ||
| 258 | static int __init max6900_init(void) | 264 | static int __init max6900_init(void) |
diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c index abe87a4d2665..01d8da9afdc8 100644 --- a/drivers/rtc/rtc-twl4030.c +++ b/drivers/rtc/rtc-twl4030.c | |||
| @@ -337,7 +337,7 @@ static int twl4030_rtc_ioctl(struct device *dev, unsigned int cmd, | |||
| 337 | } | 337 | } |
| 338 | 338 | ||
| 339 | #else | 339 | #else |
| 340 | #define omap_rtc_ioctl NULL | 340 | #define twl4030_rtc_ioctl NULL |
| 341 | #endif | 341 | #endif |
| 342 | 342 | ||
| 343 | static irqreturn_t twl4030_rtc_interrupt(int irq, void *rtc) | 343 | static irqreturn_t twl4030_rtc_interrupt(int irq, void *rtc) |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 162cd927d94b..94acbeed4e7c 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
| @@ -175,8 +175,8 @@ static struct aac_driver_ident aac_drivers[] = { | |||
| 175 | { aac_rx_init, "percraid", "DELL ", "PERCRAID ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* PERC 3/Di (Boxster/PERC3DiB) */ | 175 | { aac_rx_init, "percraid", "DELL ", "PERCRAID ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* PERC 3/Di (Boxster/PERC3DiB) */ |
| 176 | { aac_rx_init, "aacraid", "ADAPTEC ", "catapult ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* catapult */ | 176 | { aac_rx_init, "aacraid", "ADAPTEC ", "catapult ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* catapult */ |
| 177 | { aac_rx_init, "aacraid", "ADAPTEC ", "tomcat ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* tomcat */ | 177 | { aac_rx_init, "aacraid", "ADAPTEC ", "tomcat ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* tomcat */ |
| 178 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2120S ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2120S (Crusader) */ | 178 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2120S ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Adaptec 2120S (Crusader) */ |
| 179 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan) */ | 179 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Adaptec 2200S (Vulcan) */ |
| 180 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan-2m) */ | 180 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan-2m) */ |
| 181 | { aac_rx_init, "aacraid", "Legend ", "Legend S220 ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S220 (Legend Crusader) */ | 181 | { aac_rx_init, "aacraid", "Legend ", "Legend S220 ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S220 (Legend Crusader) */ |
| 182 | { aac_rx_init, "aacraid", "Legend ", "Legend S230 ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S230 (Legend Vulcan) */ | 182 | { aac_rx_init, "aacraid", "Legend ", "Legend S230 ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S230 (Legend Vulcan) */ |
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c index 9aec4ca64e56..f7da7530875e 100644 --- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c +++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c | |||
| @@ -107,6 +107,7 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h) | |||
| 107 | struct request *req; | 107 | struct request *req; |
| 108 | int ret; | 108 | int ret; |
| 109 | 109 | ||
| 110 | retry: | ||
| 110 | req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO); | 111 | req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO); |
| 111 | if (!req) | 112 | if (!req) |
| 112 | return SCSI_DH_RES_TEMP_UNAVAIL; | 113 | return SCSI_DH_RES_TEMP_UNAVAIL; |
| @@ -121,7 +122,6 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h) | |||
| 121 | memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE); | 122 | memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE); |
| 122 | req->sense_len = 0; | 123 | req->sense_len = 0; |
| 123 | 124 | ||
| 124 | retry: | ||
| 125 | ret = blk_execute_rq(req->q, NULL, req, 1); | 125 | ret = blk_execute_rq(req->q, NULL, req, 1); |
| 126 | if (ret == -EIO) { | 126 | if (ret == -EIO) { |
| 127 | if (req->sense_len > 0) { | 127 | if (req->sense_len > 0) { |
| @@ -136,8 +136,10 @@ retry: | |||
| 136 | h->path_state = HP_SW_PATH_ACTIVE; | 136 | h->path_state = HP_SW_PATH_ACTIVE; |
| 137 | ret = SCSI_DH_OK; | 137 | ret = SCSI_DH_OK; |
| 138 | } | 138 | } |
| 139 | if (ret == SCSI_DH_IMM_RETRY) | 139 | if (ret == SCSI_DH_IMM_RETRY) { |
| 140 | blk_put_request(req); | ||
| 140 | goto retry; | 141 | goto retry; |
| 142 | } | ||
| 141 | if (ret == SCSI_DH_DEV_OFFLINED) { | 143 | if (ret == SCSI_DH_DEV_OFFLINED) { |
| 142 | h->path_state = HP_SW_PATH_PASSIVE; | 144 | h->path_state = HP_SW_PATH_PASSIVE; |
| 143 | ret = SCSI_DH_OK; | 145 | ret = SCSI_DH_OK; |
| @@ -200,6 +202,7 @@ static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h) | |||
| 200 | struct request *req; | 202 | struct request *req; |
| 201 | int ret, retry; | 203 | int ret, retry; |
| 202 | 204 | ||
| 205 | retry: | ||
| 203 | req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO); | 206 | req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO); |
| 204 | if (!req) | 207 | if (!req) |
| 205 | return SCSI_DH_RES_TEMP_UNAVAIL; | 208 | return SCSI_DH_RES_TEMP_UNAVAIL; |
| @@ -216,7 +219,6 @@ static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h) | |||
| 216 | req->sense_len = 0; | 219 | req->sense_len = 0; |
| 217 | retry = h->retries; | 220 | retry = h->retries; |
| 218 | 221 | ||
| 219 | retry: | ||
| 220 | ret = blk_execute_rq(req->q, NULL, req, 1); | 222 | ret = blk_execute_rq(req->q, NULL, req, 1); |
| 221 | if (ret == -EIO) { | 223 | if (ret == -EIO) { |
| 222 | if (req->sense_len > 0) { | 224 | if (req->sense_len > 0) { |
| @@ -231,8 +233,10 @@ retry: | |||
| 231 | ret = SCSI_DH_OK; | 233 | ret = SCSI_DH_OK; |
| 232 | 234 | ||
| 233 | if (ret == SCSI_DH_RETRY) { | 235 | if (ret == SCSI_DH_RETRY) { |
| 234 | if (--retry) | 236 | if (--retry) { |
| 237 | blk_put_request(req); | ||
| 235 | goto retry; | 238 | goto retry; |
| 239 | } | ||
| 236 | ret = SCSI_DH_IO; | 240 | ret = SCSI_DH_IO; |
| 237 | } | 241 | } |
| 238 | 242 | ||
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c index 2a5b29d12172..e2dd6a45924a 100644 --- a/drivers/scsi/ibmvscsi/ibmvstgt.c +++ b/drivers/scsi/ibmvscsi/ibmvstgt.c | |||
| @@ -864,21 +864,23 @@ static int ibmvstgt_probe(struct vio_dev *dev, const struct vio_device_id *id) | |||
| 864 | 864 | ||
| 865 | INIT_WORK(&vport->crq_work, handle_crq); | 865 | INIT_WORK(&vport->crq_work, handle_crq); |
| 866 | 866 | ||
| 867 | err = crq_queue_create(&vport->crq_queue, target); | 867 | err = scsi_add_host(shost, target->dev); |
| 868 | if (err) | 868 | if (err) |
| 869 | goto free_srp_target; | 869 | goto free_srp_target; |
| 870 | 870 | ||
| 871 | err = scsi_add_host(shost, target->dev); | 871 | err = scsi_tgt_alloc_queue(shost); |
| 872 | if (err) | 872 | if (err) |
| 873 | goto destroy_queue; | 873 | goto remove_host; |
| 874 | 874 | ||
| 875 | err = scsi_tgt_alloc_queue(shost); | 875 | err = crq_queue_create(&vport->crq_queue, target); |
| 876 | if (err) | 876 | if (err) |
| 877 | goto destroy_queue; | 877 | goto free_queue; |
| 878 | 878 | ||
| 879 | return 0; | 879 | return 0; |
| 880 | destroy_queue: | 880 | free_queue: |
| 881 | crq_queue_destroy(target); | 881 | scsi_tgt_free_queue(shost); |
| 882 | remove_host: | ||
| 883 | scsi_remove_host(shost); | ||
| 882 | free_srp_target: | 884 | free_srp_target: |
| 883 | srp_target_free(target); | 885 | srp_target_free(target); |
| 884 | put_host: | 886 | put_host: |
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 801c7cf54d2e..3fdee7370ccc 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
| @@ -489,12 +489,6 @@ __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, | |||
| 489 | if (!__kfifo_get(session->cmdpool.queue, | 489 | if (!__kfifo_get(session->cmdpool.queue, |
| 490 | (void*)&task, sizeof(void*))) | 490 | (void*)&task, sizeof(void*))) |
| 491 | return NULL; | 491 | return NULL; |
| 492 | |||
| 493 | if ((hdr->opcode == (ISCSI_OP_NOOP_OUT | ISCSI_OP_IMMEDIATE)) && | ||
| 494 | hdr->ttt == RESERVED_ITT) { | ||
| 495 | conn->ping_task = task; | ||
| 496 | conn->last_ping = jiffies; | ||
| 497 | } | ||
| 498 | } | 492 | } |
| 499 | /* | 493 | /* |
| 500 | * released in complete pdu for task we expect a response for, and | 494 | * released in complete pdu for task we expect a response for, and |
| @@ -703,6 +697,11 @@ static void iscsi_send_nopout(struct iscsi_conn *conn, struct iscsi_nopin *rhdr) | |||
| 703 | task = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)&hdr, NULL, 0); | 697 | task = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)&hdr, NULL, 0); |
| 704 | if (!task) | 698 | if (!task) |
| 705 | iscsi_conn_printk(KERN_ERR, conn, "Could not send nopout\n"); | 699 | iscsi_conn_printk(KERN_ERR, conn, "Could not send nopout\n"); |
| 700 | else if (!rhdr) { | ||
| 701 | /* only track our nops */ | ||
| 702 | conn->ping_task = task; | ||
| 703 | conn->last_ping = jiffies; | ||
| 704 | } | ||
| 706 | } | 705 | } |
| 707 | 706 | ||
| 708 | static int iscsi_handle_reject(struct iscsi_conn *conn, struct iscsi_hdr *hdr, | 707 | static int iscsi_handle_reject(struct iscsi_conn *conn, struct iscsi_hdr *hdr, |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index fa45a1a66867..148d3af92aef 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -648,8 +648,8 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd) | |||
| 648 | struct request *req = cmd->request; | 648 | struct request *req = cmd->request; |
| 649 | unsigned long flags; | 649 | unsigned long flags; |
| 650 | 650 | ||
| 651 | scsi_unprep_request(req); | ||
| 652 | spin_lock_irqsave(q->queue_lock, flags); | 651 | spin_lock_irqsave(q->queue_lock, flags); |
| 652 | scsi_unprep_request(req); | ||
| 653 | blk_requeue_request(q, req); | 653 | blk_requeue_request(q, req); |
| 654 | spin_unlock_irqrestore(q->queue_lock, flags); | 654 | spin_unlock_irqrestore(q->queue_lock, flags); |
| 655 | 655 | ||
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index c9e1242eaf25..5081b3981d3c 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -757,7 +757,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, | |||
| 757 | * access to the device is prohibited. | 757 | * access to the device is prohibited. |
| 758 | */ | 758 | */ |
| 759 | error = scsi_nonblockable_ioctl(sdp, cmd, p, | 759 | error = scsi_nonblockable_ioctl(sdp, cmd, p, |
| 760 | (mode & FMODE_NDELAY_NOW) != 0); | 760 | (mode & FMODE_NDELAY) != 0); |
| 761 | if (!scsi_block_when_processing_errors(sdp) || !error) | 761 | if (!scsi_block_when_processing_errors(sdp) || !error) |
| 762 | return error; | 762 | return error; |
| 763 | 763 | ||
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 62b6633e3a97..45b66b98a516 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -521,7 +521,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, | |||
| 521 | * if it doesn't recognise the ioctl | 521 | * if it doesn't recognise the ioctl |
| 522 | */ | 522 | */ |
| 523 | ret = scsi_nonblockable_ioctl(sdev, cmd, argp, | 523 | ret = scsi_nonblockable_ioctl(sdev, cmd, argp, |
| 524 | (mode & FMODE_NDELAY_NOW) != 0); | 524 | (mode & FMODE_NDELAY) != 0); |
| 525 | if (ret != -ENODEV) | 525 | if (ret != -ENODEV) |
| 526 | return ret; | 526 | return ret; |
| 527 | return scsi_ioctl(sdev, cmd, argp); | 527 | return scsi_ioctl(sdev, cmd, argp); |
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c index 6dd98f9fb89c..ae3699d77dd0 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/serial/ioc3_serial.c | |||
| @@ -2149,7 +2149,7 @@ out4: | |||
| 2149 | return ret; | 2149 | return ret; |
| 2150 | } | 2150 | } |
| 2151 | 2151 | ||
| 2152 | static struct ioc3_submodule ioc3uart_submodule = { | 2152 | static struct ioc3_submodule ioc3uart_ops = { |
| 2153 | .name = "IOC3uart", | 2153 | .name = "IOC3uart", |
| 2154 | .probe = ioc3uart_probe, | 2154 | .probe = ioc3uart_probe, |
| 2155 | .remove = ioc3uart_remove, | 2155 | .remove = ioc3uart_remove, |
| @@ -2173,7 +2173,7 @@ static int __devinit ioc3uart_init(void) | |||
| 2173 | __func__); | 2173 | __func__); |
| 2174 | return ret; | 2174 | return ret; |
| 2175 | } | 2175 | } |
| 2176 | ret = ioc3_register_submodule(&ioc3uart_submodule); | 2176 | ret = ioc3_register_submodule(&ioc3uart_ops); |
| 2177 | if (ret) | 2177 | if (ret) |
| 2178 | uart_unregister_driver(&ioc3_uart); | 2178 | uart_unregister_driver(&ioc3_uart); |
| 2179 | return ret; | 2179 | return ret; |
| @@ -2181,7 +2181,7 @@ static int __devinit ioc3uart_init(void) | |||
| 2181 | 2181 | ||
| 2182 | static void __devexit ioc3uart_exit(void) | 2182 | static void __devexit ioc3uart_exit(void) |
| 2183 | { | 2183 | { |
| 2184 | ioc3_unregister_submodule(&ioc3uart_submodule); | 2184 | ioc3_unregister_submodule(&ioc3uart_ops); |
| 2185 | uart_unregister_driver(&ioc3_uart); | 2185 | uart_unregister_driver(&ioc3_uart); |
| 2186 | } | 2186 | } |
| 2187 | 2187 | ||
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 6117d3db0b66..28c00c3d58f5 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
| @@ -591,8 +591,8 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new, | |||
| 591 | /* Update the per-port timeout */ | 591 | /* Update the per-port timeout */ |
| 592 | uart_update_timeout(port, new->c_cflag, baud); | 592 | uart_update_timeout(port, new->c_cflag, baud); |
| 593 | 593 | ||
| 594 | /* Do our best to flush TX & RX, so we don't loose anything */ | 594 | /* Do our best to flush TX & RX, so we don't lose anything */ |
| 595 | /* But we don't wait indefinitly ! */ | 595 | /* But we don't wait indefinitely ! */ |
| 596 | j = 5000000; /* Maximum wait */ | 596 | j = 5000000; /* Maximum wait */ |
| 597 | /* FIXME Can't receive chars since set_termios might be called at early | 597 | /* FIXME Can't receive chars since set_termios might be called at early |
| 598 | * boot for the console, all stuff is not yet ready to receive at that | 598 | * boot for the console, all stuff is not yet ready to receive at that |
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c index 317d239ab740..29cbb0afef8e 100644 --- a/drivers/serial/s3c2440.c +++ b/drivers/serial/s3c2440.c | |||
| @@ -177,5 +177,5 @@ module_exit(s3c2440_serial_exit); | |||
| 177 | 177 | ||
| 178 | MODULE_DESCRIPTION("Samsung S3C2440,S3C2442 SoC Serial port driver"); | 178 | MODULE_DESCRIPTION("Samsung S3C2440,S3C2442 SoC Serial port driver"); |
| 179 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); | 179 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); |
| 180 | MODULE_LICENSE("GPLi v2"); | 180 | MODULE_LICENSE("GPL v2"); |
| 181 | MODULE_ALIAS("platform:s3c2440-uart"); | 181 | MODULE_ALIAS("platform:s3c2440-uart"); |
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c index d1812d32f47d..63f0de29aa14 100644 --- a/drivers/sh/maple/maple.c +++ b/drivers/sh/maple/maple.c | |||
| @@ -827,7 +827,7 @@ static int __init maple_bus_init(void) | |||
| 827 | 827 | ||
| 828 | maple_queue_cache = | 828 | maple_queue_cache = |
| 829 | kmem_cache_create("maple_queue_cache", 0x400, 0, | 829 | kmem_cache_create("maple_queue_cache", 0x400, 0, |
| 830 | SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL); | 830 | SLAB_HWCACHE_ALIGN, NULL); |
| 831 | 831 | ||
| 832 | if (!maple_queue_cache) | 832 | if (!maple_queue_cache) |
| 833 | goto cleanup_bothirqs; | 833 | goto cleanup_bothirqs; |
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index c95b286a1239..5d457c96bd7e 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
| @@ -22,6 +22,8 @@ menuconfig STAGING | |||
| 22 | If in doubt, say N here. | 22 | If in doubt, say N here. |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | if STAGING | ||
| 26 | |||
| 25 | config STAGING_EXCLUDE_BUILD | 27 | config STAGING_EXCLUDE_BUILD |
| 26 | bool "Exclude Staging drivers from being built" if STAGING | 28 | bool "Exclude Staging drivers from being built" if STAGING |
| 27 | default y | 29 | default y |
| @@ -62,3 +64,4 @@ source "drivers/staging/at76_usb/Kconfig" | |||
| 62 | source "drivers/staging/poch/Kconfig" | 64 | source "drivers/staging/poch/Kconfig" |
| 63 | 65 | ||
| 64 | endif # !STAGING_EXCLUDE_BUILD | 66 | endif # !STAGING_EXCLUDE_BUILD |
| 67 | endif # STAGING | ||
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 8e74657f106c..43a863c5cc43 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
| @@ -51,6 +51,7 @@ static struct usb_device_id usbtmc_devices[] = { | |||
| 51 | { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), }, | 51 | { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), }, |
| 52 | { 0, } /* terminating entry */ | 52 | { 0, } /* terminating entry */ |
| 53 | }; | 53 | }; |
| 54 | MODULE_DEVICE_TABLE(usb, usbtmc_devices); | ||
| 54 | 55 | ||
| 55 | /* | 56 | /* |
| 56 | * This structure is the capabilities for the device | 57 | * This structure is the capabilities for the device |
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 3d7793d93031..8c081308b0e2 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
| @@ -279,7 +279,9 @@ static int usb_unbind_interface(struct device *dev) | |||
| 279 | * altsetting means creating new endpoint device entries). | 279 | * altsetting means creating new endpoint device entries). |
| 280 | * When either of these happens, defer the Set-Interface. | 280 | * When either of these happens, defer the Set-Interface. |
| 281 | */ | 281 | */ |
| 282 | if (!error && intf->dev.power.status == DPM_ON) | 282 | if (intf->cur_altsetting->desc.bAlternateSetting == 0) |
| 283 | ; /* Already in altsetting 0 so skip Set-Interface */ | ||
| 284 | else if (!error && intf->dev.power.status == DPM_ON) | ||
| 283 | usb_set_interface(udev, intf->altsetting[0]. | 285 | usb_set_interface(udev, intf->altsetting[0]. |
| 284 | desc.bInterfaceNumber, 0); | 286 | desc.bInterfaceNumber, 0); |
| 285 | else | 287 | else |
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c index 428b5993575a..3a8bb53fc473 100644 --- a/drivers/usb/gadget/f_rndis.c +++ b/drivers/usb/gadget/f_rndis.c | |||
| @@ -651,6 +651,8 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f) | |||
| 651 | fs_in_desc.bEndpointAddress; | 651 | fs_in_desc.bEndpointAddress; |
| 652 | hs_out_desc.bEndpointAddress = | 652 | hs_out_desc.bEndpointAddress = |
| 653 | fs_out_desc.bEndpointAddress; | 653 | fs_out_desc.bEndpointAddress; |
| 654 | hs_notify_desc.bEndpointAddress = | ||
| 655 | fs_notify_desc.bEndpointAddress; | ||
| 654 | 656 | ||
| 655 | /* copy descriptors, and track endpoint copies */ | 657 | /* copy descriptors, and track endpoint copies */ |
| 656 | f->hs_descriptors = usb_copy_descriptors(eth_hs_function); | 658 | f->hs_descriptors = usb_copy_descriptors(eth_hs_function); |
| @@ -662,6 +664,8 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f) | |||
| 662 | f->hs_descriptors, &hs_in_desc); | 664 | f->hs_descriptors, &hs_in_desc); |
| 663 | rndis->hs.out = usb_find_endpoint(eth_hs_function, | 665 | rndis->hs.out = usb_find_endpoint(eth_hs_function, |
| 664 | f->hs_descriptors, &hs_out_desc); | 666 | f->hs_descriptors, &hs_out_desc); |
| 667 | rndis->hs.notify = usb_find_endpoint(eth_hs_function, | ||
| 668 | f->hs_descriptors, &hs_notify_desc); | ||
| 665 | } | 669 | } |
| 666 | 670 | ||
| 667 | rndis->port.open = rndis_open; | 671 | rndis->port.open = rndis_open; |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 51d7bdea2869..fb6f2933b01b 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -143,6 +143,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = { | |||
| 143 | static struct usb_device_id id_table_combined [] = { | 143 | static struct usb_device_id id_table_combined [] = { |
| 144 | { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, | 144 | { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, |
| 145 | { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) }, | 145 | { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) }, |
| 146 | { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) }, | ||
| 146 | { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) }, | 147 | { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) }, |
| 147 | { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_1_PID) }, | 148 | { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_1_PID) }, |
| 148 | { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_2_PID) }, | 149 | { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_2_PID) }, |
| @@ -166,6 +167,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 166 | { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) }, | 167 | { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) }, |
| 167 | { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) }, | 168 | { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) }, |
| 168 | { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) }, | 169 | { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) }, |
| 170 | { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) }, | ||
| 169 | { USB_DEVICE(FTDI_VID, FTDI_XF_632_PID) }, | 171 | { USB_DEVICE(FTDI_VID, FTDI_XF_632_PID) }, |
| 170 | { USB_DEVICE(FTDI_VID, FTDI_XF_634_PID) }, | 172 | { USB_DEVICE(FTDI_VID, FTDI_XF_634_PID) }, |
| 171 | { USB_DEVICE(FTDI_VID, FTDI_XF_547_PID) }, | 173 | { USB_DEVICE(FTDI_VID, FTDI_XF_547_PID) }, |
| @@ -1498,7 +1500,7 @@ static int ftdi_open(struct tty_struct *tty, | |||
| 1498 | priv->interface, buf, 0, WDR_TIMEOUT); | 1500 | priv->interface, buf, 0, WDR_TIMEOUT); |
| 1499 | 1501 | ||
| 1500 | /* Termios defaults are set by usb_serial_init. We don't change | 1502 | /* Termios defaults are set by usb_serial_init. We don't change |
| 1501 | port->tty->termios - this would loose speed settings, etc. | 1503 | port->tty->termios - this would lose speed settings, etc. |
| 1502 | This is same behaviour as serial.c/rs_open() - Kuba */ | 1504 | This is same behaviour as serial.c/rs_open() - Kuba */ |
| 1503 | 1505 | ||
| 1504 | /* ftdi_set_termios will send usb control messages */ | 1506 | /* ftdi_set_termios will send usb control messages */ |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 07a3992abad2..373ee09975bb 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -40,6 +40,9 @@ | |||
| 40 | /* AlphaMicro Components AMC-232USB01 device */ | 40 | /* AlphaMicro Components AMC-232USB01 device */ |
| 41 | #define FTDI_AMC232_PID 0xFF00 /* Product Id */ | 41 | #define FTDI_AMC232_PID 0xFF00 /* Product Id */ |
| 42 | 42 | ||
| 43 | /* www.candapter.com Ewert Energy Systems CANdapter device */ | ||
| 44 | #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */ | ||
| 45 | |||
| 43 | /* SCS HF Radio Modems PID's (http://www.scs-ptc.com) */ | 46 | /* SCS HF Radio Modems PID's (http://www.scs-ptc.com) */ |
| 44 | /* the VID is the standard ftdi vid (FTDI_VID) */ | 47 | /* the VID is the standard ftdi vid (FTDI_VID) */ |
| 45 | #define FTDI_SCS_DEVICE_0_PID 0xD010 /* SCS PTC-IIusb */ | 48 | #define FTDI_SCS_DEVICE_0_PID 0xD010 /* SCS PTC-IIusb */ |
| @@ -75,6 +78,9 @@ | |||
| 75 | /* OpenDCC (www.opendcc.de) product id */ | 78 | /* OpenDCC (www.opendcc.de) product id */ |
| 76 | #define FTDI_OPENDCC_PID 0xBFD8 | 79 | #define FTDI_OPENDCC_PID 0xBFD8 |
| 77 | 80 | ||
| 81 | /* Sprog II (Andrew Crosland's SprogII DCC interface) */ | ||
| 82 | #define FTDI_SPROG_II 0xF0C8 | ||
| 83 | |||
| 78 | /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */ | 84 | /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */ |
| 79 | /* they use the ftdi chipset for the USB interface and the vendor id is the same */ | 85 | /* they use the ftdi chipset for the USB interface and the vendor id is the same */ |
| 80 | #define FTDI_XF_632_PID 0xFC08 /* 632: 16x2 Character Display */ | 86 | #define FTDI_XF_632_PID 0xFC08 /* 632: 16x2 Character Display */ |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 491c8857b644..1aed584be5eb 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
| @@ -91,6 +91,8 @@ static struct usb_device_id id_table [] = { | |||
| 91 | { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) }, | 91 | { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) }, |
| 92 | { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) }, | 92 | { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) }, |
| 93 | { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) }, | 93 | { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) }, |
| 94 | { USB_DEVICE(SUPERIAL_VENDOR_ID, SUPERIAL_PRODUCT_ID) }, | ||
| 95 | { USB_DEVICE(HP_VENDOR_ID, HP_LD220_PRODUCT_ID) }, | ||
| 94 | { } /* Terminating entry */ | 96 | { } /* Terminating entry */ |
| 95 | }; | 97 | }; |
| 96 | 98 | ||
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index a3bd039c78e9..54974f446a8c 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
| @@ -110,3 +110,11 @@ | |||
| 110 | /* Y.C. Cable U.S.A., Inc - USB to RS-232 */ | 110 | /* Y.C. Cable U.S.A., Inc - USB to RS-232 */ |
| 111 | #define YCCABLE_VENDOR_ID 0x05ad | 111 | #define YCCABLE_VENDOR_ID 0x05ad |
| 112 | #define YCCABLE_PRODUCT_ID 0x0fba | 112 | #define YCCABLE_PRODUCT_ID 0x0fba |
| 113 | |||
| 114 | /* "Superial" USB - Serial */ | ||
| 115 | #define SUPERIAL_VENDOR_ID 0x5372 | ||
| 116 | #define SUPERIAL_PRODUCT_ID 0x2303 | ||
| 117 | |||
| 118 | /* Hewlett-Packard LD220-HP POS Pole Display */ | ||
| 119 | #define HP_VENDOR_ID 0x03f0 | ||
| 120 | #define HP_LD220_PRODUCT_ID 0x3524 | ||
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 31c42d1cae13..01d0c70d60e9 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
| @@ -16,56 +16,6 @@ | |||
| 16 | * For questions or problems with this driver, contact Texas Instruments | 16 | * For questions or problems with this driver, contact Texas Instruments |
| 17 | * technical support, or Al Borchers <alborchers@steinerpoint.com>, or | 17 | * technical support, or Al Borchers <alborchers@steinerpoint.com>, or |
| 18 | * Peter Berger <pberger@brimson.com>. | 18 | * Peter Berger <pberger@brimson.com>. |
| 19 | * | ||
| 20 | * This driver needs this hotplug script in /etc/hotplug/usb/ti_usb_3410_5052 | ||
| 21 | * or in /etc/hotplug.d/usb/ti_usb_3410_5052.hotplug to set the device | ||
| 22 | * configuration. | ||
| 23 | * | ||
| 24 | * #!/bin/bash | ||
| 25 | * | ||
| 26 | * BOOT_CONFIG=1 | ||
| 27 | * ACTIVE_CONFIG=2 | ||
| 28 | * | ||
| 29 | * if [[ "$ACTION" != "add" ]] | ||
| 30 | * then | ||
| 31 | * exit | ||
| 32 | * fi | ||
| 33 | * | ||
| 34 | * CONFIG_PATH=/sys${DEVPATH%/?*}/bConfigurationValue | ||
| 35 | * | ||
| 36 | * if [[ 0`cat $CONFIG_PATH` -ne $BOOT_CONFIG ]] | ||
| 37 | * then | ||
| 38 | * exit | ||
| 39 | * fi | ||
| 40 | * | ||
| 41 | * PRODUCT=${PRODUCT%/?*} # delete version | ||
| 42 | * VENDOR_ID=`printf "%d" 0x${PRODUCT%/?*}` | ||
| 43 | * PRODUCT_ID=`printf "%d" 0x${PRODUCT#*?/}` | ||
| 44 | * | ||
| 45 | * PARAM_PATH=/sys/module/ti_usb_3410_5052/parameters | ||
| 46 | * | ||
| 47 | * function scan() { | ||
| 48 | * s=$1 | ||
| 49 | * shift | ||
| 50 | * for i | ||
| 51 | * do | ||
| 52 | * if [[ $s -eq $i ]] | ||
| 53 | * then | ||
| 54 | * return 0 | ||
| 55 | * fi | ||
| 56 | * done | ||
| 57 | * return 1 | ||
| 58 | * } | ||
| 59 | * | ||
| 60 | * IFS=$IFS, | ||
| 61 | * | ||
| 62 | * if (scan $VENDOR_ID 1105 `cat $PARAM_PATH/vendor_3410` && | ||
| 63 | * scan $PRODUCT_ID 13328 `cat $PARAM_PATH/product_3410`) || | ||
| 64 | * (scan $VENDOR_ID 1105 `cat $PARAM_PATH/vendor_5052` && | ||
| 65 | * scan $PRODUCT_ID 20562 20818 20570 20575 `cat $PARAM_PATH/product_5052`) | ||
| 66 | * then | ||
| 67 | * echo $ACTIVE_CONFIG > $CONFIG_PATH | ||
| 68 | * fi | ||
| 69 | */ | 19 | */ |
| 70 | 20 | ||
| 71 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| @@ -457,9 +407,10 @@ static int ti_startup(struct usb_serial *serial) | |||
| 457 | goto free_tdev; | 407 | goto free_tdev; |
| 458 | } | 408 | } |
| 459 | 409 | ||
| 460 | /* the second configuration must be set (in sysfs by hotplug script) */ | 410 | /* the second configuration must be set */ |
| 461 | if (dev->actconfig->desc.bConfigurationValue == TI_BOOT_CONFIG) { | 411 | if (dev->actconfig->desc.bConfigurationValue == TI_BOOT_CONFIG) { |
| 462 | status = -ENODEV; | 412 | status = usb_driver_set_configuration(dev, TI_ACTIVE_CONFIG); |
| 413 | status = status ? status : -ENODEV; | ||
| 463 | goto free_tdev; | 414 | goto free_tdev; |
| 464 | } | 415 | } |
| 465 | 416 | ||
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index e61f2bfc64ad..bfcc1fe82518 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -167,8 +167,22 @@ UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x0600, | |||
| 167 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 167 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 168 | US_FL_FIX_CAPACITY ), | 168 | US_FL_FIX_CAPACITY ), |
| 169 | 169 | ||
| 170 | /* Reported by Ozan Sener <themgzzy@gmail.com> */ | ||
| 171 | UNUSUAL_DEV( 0x0421, 0x0060, 0x0551, 0x0551, | ||
| 172 | "Nokia", | ||
| 173 | "3500c", | ||
| 174 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 175 | US_FL_FIX_CAPACITY ), | ||
| 176 | |||
| 177 | /* Reported by CSECSY Laszlo <boobaa@frugalware.org> */ | ||
| 178 | UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x0601, | ||
| 179 | "Nokia", | ||
| 180 | "Nokia 3109c", | ||
| 181 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 182 | US_FL_FIX_CAPACITY ), | ||
| 183 | |||
| 170 | /* Patch for Nokia 5310 capacity */ | 184 | /* Patch for Nokia 5310 capacity */ |
| 171 | UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591, | 185 | UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0701, |
| 172 | "Nokia", | 186 | "Nokia", |
| 173 | "5310", | 187 | "5310", |
| 174 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 188 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c index a547e5d4c8bf..a469a3d6edcb 100644 --- a/drivers/video/aty/radeon_accel.c +++ b/drivers/video/aty/radeon_accel.c | |||
| @@ -5,61 +5,61 @@ | |||
| 5 | * --dte | 5 | * --dte |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #define FLUSH_CACHE_WORKAROUND 1 | 8 | static void radeon_fixup_offset(struct radeonfb_info *rinfo) |
| 9 | |||
| 10 | void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries) | ||
| 11 | { | 9 | { |
| 12 | int i; | 10 | u32 local_base; |
| 11 | |||
| 12 | /* *** Ugly workaround *** */ | ||
| 13 | /* | ||
| 14 | * On some platforms, the video memory is mapped at 0 in radeon chip space | ||
| 15 | * (like PPCs) by the firmware. X will always move it up so that it's seen | ||
| 16 | * by the chip to be at the same address as the PCI BAR. | ||
| 17 | * That means that when switching back from X, there is a mismatch between | ||
| 18 | * the offsets programmed into the engine. This means that potentially, | ||
| 19 | * accel operations done before radeonfb has a chance to re-init the engine | ||
| 20 | * will have incorrect offsets, and potentially trash system memory ! | ||
| 21 | * | ||
| 22 | * The correct fix is for fbcon to never call any accel op before the engine | ||
| 23 | * has properly been re-initialized (by a call to set_var), but this is a | ||
| 24 | * complex fix. This workaround in the meantime, called before every accel | ||
| 25 | * operation, makes sure the offsets are in sync. | ||
| 26 | */ | ||
| 13 | 27 | ||
| 14 | for (i=0; i<2000000; i++) { | 28 | radeon_fifo_wait (1); |
| 15 | rinfo->fifo_free = INREG(RBBM_STATUS) & 0x7f; | 29 | local_base = INREG(MC_FB_LOCATION) << 16; |
| 16 | if (rinfo->fifo_free >= entries) | 30 | if (local_base == rinfo->fb_local_base) |
| 17 | return; | 31 | return; |
| 18 | udelay(10); | ||
| 19 | } | ||
| 20 | printk(KERN_ERR "radeonfb: FIFO Timeout !\n"); | ||
| 21 | /* XXX Todo: attempt to reset the engine */ | ||
| 22 | } | ||
| 23 | 32 | ||
| 24 | static inline void radeon_fifo_wait(struct radeonfb_info *rinfo, int entries) | 33 | rinfo->fb_local_base = local_base; |
| 25 | { | ||
| 26 | if (entries <= rinfo->fifo_free) | ||
| 27 | rinfo->fifo_free -= entries; | ||
| 28 | else | ||
| 29 | radeon_fifo_update_and_wait(rinfo, entries); | ||
| 30 | } | ||
| 31 | 34 | ||
| 32 | static inline void radeonfb_set_creg(struct radeonfb_info *rinfo, u32 reg, | 35 | radeon_fifo_wait (3); |
| 33 | u32 *cache, u32 new_val) | 36 | OUTREG(DEFAULT_PITCH_OFFSET, (rinfo->pitch << 0x16) | |
| 34 | { | 37 | (rinfo->fb_local_base >> 10)); |
| 35 | if (new_val == *cache) | 38 | OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); |
| 36 | return; | 39 | OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); |
| 37 | *cache = new_val; | ||
| 38 | radeon_fifo_wait(rinfo, 1); | ||
| 39 | OUTREG(reg, new_val); | ||
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, | 42 | static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, |
| 43 | const struct fb_fillrect *region) | 43 | const struct fb_fillrect *region) |
| 44 | { | 44 | { |
| 45 | radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache, | 45 | radeon_fifo_wait(4); |
| 46 | rinfo->dp_gui_mc_base | GMC_BRUSH_SOLID_COLOR | ROP3_P); | 46 | |
| 47 | radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache, | 47 | OUTREG(DP_GUI_MASTER_CNTL, |
| 48 | DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM); | 48 | rinfo->dp_gui_master_cntl /* contains, like GMC_DST_32BPP */ |
| 49 | radeonfb_set_creg(rinfo, DP_BRUSH_FRGD_CLR, &rinfo->dp_brush_fg_cache, | 49 | | GMC_BRUSH_SOLID_COLOR |
| 50 | region->color); | 50 | | ROP3_P); |
| 51 | 51 | if (radeon_get_dstbpp(rinfo->depth) != DST_8BPP) | |
| 52 | /* Ensure the dst cache is flushed and the engine idle before | 52 | OUTREG(DP_BRUSH_FRGD_CLR, rinfo->pseudo_palette[region->color]); |
| 53 | * issuing the operation. | 53 | else |
| 54 | * | 54 | OUTREG(DP_BRUSH_FRGD_CLR, region->color); |
| 55 | * This works around engine lockups on some cards | 55 | OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 56 | */ | 56 | OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM)); |
| 57 | #if FLUSH_CACHE_WORKAROUND | 57 | |
| 58 | radeon_fifo_wait(rinfo, 2); | 58 | radeon_fifo_wait(2); |
| 59 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); | 59 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); |
| 60 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); | 60 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); |
| 61 | #endif | 61 | |
| 62 | radeon_fifo_wait(rinfo, 2); | 62 | radeon_fifo_wait(2); |
| 63 | OUTREG(DST_Y_X, (region->dy << 16) | region->dx); | 63 | OUTREG(DST_Y_X, (region->dy << 16) | region->dx); |
| 64 | OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height); | 64 | OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height); |
| 65 | } | 65 | } |
| @@ -70,14 +70,15 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region) | |||
| 70 | struct fb_fillrect modded; | 70 | struct fb_fillrect modded; |
| 71 | int vxres, vyres; | 71 | int vxres, vyres; |
| 72 | 72 | ||
| 73 | WARN_ON(rinfo->gfx_mode); | 73 | if (info->state != FBINFO_STATE_RUNNING) |
| 74 | if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode) | ||
| 75 | return; | 74 | return; |
| 76 | if (info->flags & FBINFO_HWACCEL_DISABLED) { | 75 | if (info->flags & FBINFO_HWACCEL_DISABLED) { |
| 77 | cfb_fillrect(info, region); | 76 | cfb_fillrect(info, region); |
| 78 | return; | 77 | return; |
| 79 | } | 78 | } |
| 80 | 79 | ||
| 80 | radeon_fixup_offset(rinfo); | ||
| 81 | |||
| 81 | vxres = info->var.xres_virtual; | 82 | vxres = info->var.xres_virtual; |
| 82 | vyres = info->var.yres_virtual; | 83 | vyres = info->var.yres_virtual; |
| 83 | 84 | ||
| @@ -90,10 +91,6 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region) | |||
| 90 | if(modded.dx + modded.width > vxres) modded.width = vxres - modded.dx; | 91 | if(modded.dx + modded.width > vxres) modded.width = vxres - modded.dx; |
| 91 | if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy; | 92 | if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy; |
| 92 | 93 | ||
| 93 | if (info->fix.visual == FB_VISUAL_TRUECOLOR || | ||
| 94 | info->fix.visual == FB_VISUAL_DIRECTCOLOR ) | ||
| 95 | modded.color = ((u32 *) (info->pseudo_palette))[region->color]; | ||
| 96 | |||
| 97 | radeonfb_prim_fillrect(rinfo, &modded); | 94 | radeonfb_prim_fillrect(rinfo, &modded); |
| 98 | } | 95 | } |
| 99 | 96 | ||
| @@ -112,22 +109,22 @@ static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo, | |||
| 112 | if ( xdir < 0 ) { sx += w-1; dx += w-1; } | 109 | if ( xdir < 0 ) { sx += w-1; dx += w-1; } |
| 113 | if ( ydir < 0 ) { sy += h-1; dy += h-1; } | 110 | if ( ydir < 0 ) { sy += h-1; dy += h-1; } |
| 114 | 111 | ||
| 115 | radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache, | 112 | radeon_fifo_wait(3); |
| 116 | rinfo->dp_gui_mc_base | | 113 | OUTREG(DP_GUI_MASTER_CNTL, |
| 117 | GMC_BRUSH_NONE | | 114 | rinfo->dp_gui_master_cntl /* i.e. GMC_DST_32BPP */ |
| 118 | GMC_SRC_DATATYPE_COLOR | | 115 | | GMC_BRUSH_NONE |
| 119 | ROP3_S | | 116 | | GMC_SRC_DSTCOLOR |
| 120 | DP_SRC_SOURCE_MEMORY); | 117 | | ROP3_S |
| 121 | radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache, | 118 | | DP_SRC_SOURCE_MEMORY ); |
| 122 | (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) | | 119 | OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 123 | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0)); | 120 | OUTREG(DP_CNTL, (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) |
| 124 | 121 | | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0)); | |
| 125 | #if FLUSH_CACHE_WORKAROUND | 122 | |
| 126 | radeon_fifo_wait(rinfo, 2); | 123 | radeon_fifo_wait(2); |
| 127 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); | 124 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); |
| 128 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); | 125 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); |
| 129 | #endif | 126 | |
| 130 | radeon_fifo_wait(rinfo, 3); | 127 | radeon_fifo_wait(3); |
| 131 | OUTREG(SRC_Y_X, (sy << 16) | sx); | 128 | OUTREG(SRC_Y_X, (sy << 16) | sx); |
| 132 | OUTREG(DST_Y_X, (dy << 16) | dx); | 129 | OUTREG(DST_Y_X, (dy << 16) | dx); |
| 133 | OUTREG(DST_HEIGHT_WIDTH, (h << 16) | w); | 130 | OUTREG(DST_HEIGHT_WIDTH, (h << 16) | w); |
| @@ -146,14 +143,15 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
| 146 | modded.width = area->width; | 143 | modded.width = area->width; |
| 147 | modded.height = area->height; | 144 | modded.height = area->height; |
| 148 | 145 | ||
| 149 | WARN_ON(rinfo->gfx_mode); | 146 | if (info->state != FBINFO_STATE_RUNNING) |
| 150 | if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode) | ||
| 151 | return; | 147 | return; |
| 152 | if (info->flags & FBINFO_HWACCEL_DISABLED) { | 148 | if (info->flags & FBINFO_HWACCEL_DISABLED) { |
| 153 | cfb_copyarea(info, area); | 149 | cfb_copyarea(info, area); |
| 154 | return; | 150 | return; |
| 155 | } | 151 | } |
| 156 | 152 | ||
| 153 | radeon_fixup_offset(rinfo); | ||
| 154 | |||
| 157 | vxres = info->var.xres_virtual; | 155 | vxres = info->var.xres_virtual; |
| 158 | vyres = info->var.yres_virtual; | 156 | vyres = info->var.yres_virtual; |
| 159 | 157 | ||
| @@ -170,115 +168,13 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
| 170 | radeonfb_prim_copyarea(rinfo, &modded); | 168 | radeonfb_prim_copyarea(rinfo, &modded); |
| 171 | } | 169 | } |
| 172 | 170 | ||
| 173 | static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo, | ||
| 174 | const struct fb_image *image, | ||
| 175 | u32 fg, u32 bg) | ||
| 176 | { | ||
| 177 | unsigned int dwords; | ||
| 178 | u32 *bits; | ||
| 179 | |||
| 180 | radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache, | ||
| 181 | rinfo->dp_gui_mc_base | | ||
| 182 | GMC_BRUSH_NONE | GMC_DST_CLIP_LEAVE | | ||
| 183 | GMC_SRC_DATATYPE_MONO_FG_BG | | ||
| 184 | ROP3_S | | ||
| 185 | GMC_BYTE_ORDER_MSB_TO_LSB | | ||
| 186 | DP_SRC_SOURCE_HOST_DATA); | ||
| 187 | radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache, | ||
| 188 | DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM); | ||
| 189 | radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &rinfo->dp_src_fg_cache, fg); | ||
| 190 | radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &rinfo->dp_src_bg_cache, bg); | ||
| 191 | |||
| 192 | /* Ensure the dst cache is flushed and the engine idle before | ||
| 193 | * issuing the operation. | ||
| 194 | * | ||
| 195 | * This works around engine lockups on some cards | ||
| 196 | */ | ||
| 197 | #if FLUSH_CACHE_WORKAROUND | ||
| 198 | radeon_fifo_wait(rinfo, 2); | ||
| 199 | OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL); | ||
| 200 | OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE)); | ||
| 201 | #endif | ||
| 202 | |||
| 203 | /* X here pads width to a multiple of 32 and uses the clipper to | ||
| 204 | * adjust the result. Is that really necessary ? Things seem to | ||
| 205 | * work ok for me without that and the doco doesn't seem to imply] | ||
| 206 | * there is such a restriction. | ||
| 207 | */ | ||
| 208 | radeon_fifo_wait(rinfo, 4); | ||
| 209 | OUTREG(SC_TOP_LEFT, (image->dy << 16) | image->dx); | ||
| 210 | OUTREG(SC_BOTTOM_RIGHT, ((image->dy + image->height) << 16) | | ||
| 211 | (image->dx + image->width)); | ||
| 212 | OUTREG(DST_Y_X, (image->dy << 16) | image->dx); | ||
| 213 | |||
| 214 | OUTREG(DST_HEIGHT_WIDTH, (image->height << 16) | ((image->width + 31) & ~31)); | ||
| 215 | |||
| 216 | dwords = (image->width + 31) >> 5; | ||
| 217 | dwords *= image->height; | ||
| 218 | bits = (u32*)(image->data); | ||
| 219 | |||
| 220 | while(dwords >= 8) { | ||
| 221 | radeon_fifo_wait(rinfo, 8); | ||
| 222 | #if BITS_PER_LONG == 64 | ||
| 223 | __raw_writeq(*((u64 *)(bits)), rinfo->mmio_base + HOST_DATA0); | ||
| 224 | __raw_writeq(*((u64 *)(bits+2)), rinfo->mmio_base + HOST_DATA2); | ||
| 225 | __raw_writeq(*((u64 *)(bits+4)), rinfo->mmio_base + HOST_DATA4); | ||
| 226 | __raw_writeq(*((u64 *)(bits+6)), rinfo->mmio_base + HOST_DATA6); | ||
| 227 | bits += 8; | ||
| 228 | #else | ||
| 229 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0); | ||
| 230 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA1); | ||
| 231 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA2); | ||
| 232 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA3); | ||
| 233 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA4); | ||
| 234 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA5); | ||
| 235 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA6); | ||
| 236 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA7); | ||
| 237 | #endif | ||
| 238 | dwords -= 8; | ||
| 239 | } | ||
| 240 | while(dwords--) { | ||
| 241 | radeon_fifo_wait(rinfo, 1); | ||
| 242 | __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0); | ||
| 243 | } | ||
| 244 | } | ||
| 245 | |||
| 246 | void radeonfb_imageblit(struct fb_info *info, const struct fb_image *image) | 171 | void radeonfb_imageblit(struct fb_info *info, const struct fb_image *image) |
| 247 | { | 172 | { |
| 248 | struct radeonfb_info *rinfo = info->par; | 173 | struct radeonfb_info *rinfo = info->par; |
| 249 | u32 fg, bg; | ||
| 250 | |||
| 251 | WARN_ON(rinfo->gfx_mode); | ||
| 252 | if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode) | ||
| 253 | return; | ||
| 254 | 174 | ||
| 255 | if (!image->width || !image->height) | 175 | if (info->state != FBINFO_STATE_RUNNING) |
| 256 | return; | 176 | return; |
| 257 | 177 | radeon_engine_idle(); | |
| 258 | /* We only do 1 bpp color expansion for now */ | ||
| 259 | if (info->flags & FBINFO_HWACCEL_DISABLED || image->depth != 1) | ||
| 260 | goto fallback; | ||
| 261 | |||
| 262 | /* Fallback if running out of the screen. We may do clipping | ||
| 263 | * in the future */ | ||
| 264 | if ((image->dx + image->width) > info->var.xres_virtual || | ||
| 265 | (image->dy + image->height) > info->var.yres_virtual) | ||
| 266 | goto fallback; | ||
| 267 | |||
| 268 | if (info->fix.visual == FB_VISUAL_TRUECOLOR || | ||
| 269 | info->fix.visual == FB_VISUAL_DIRECTCOLOR) { | ||
| 270 | fg = ((u32*)(info->pseudo_palette))[image->fg_color]; | ||
| 271 | bg = ((u32*)(info->pseudo_palette))[image->bg_color]; | ||
| 272 | } else { | ||
| 273 | fg = image->fg_color; | ||
| 274 | bg = image->bg_color; | ||
| 275 | } | ||
| 276 | |||
| 277 | radeonfb_prim_imageblit(rinfo, image, fg, bg); | ||
| 278 | return; | ||
| 279 | |||
| 280 | fallback: | ||
| 281 | radeon_engine_idle(rinfo); | ||
| 282 | 178 | ||
| 283 | cfb_imageblit(info, image); | 179 | cfb_imageblit(info, image); |
| 284 | } | 180 | } |
| @@ -289,8 +185,7 @@ int radeonfb_sync(struct fb_info *info) | |||
| 289 | 185 | ||
| 290 | if (info->state != FBINFO_STATE_RUNNING) | 186 | if (info->state != FBINFO_STATE_RUNNING) |
| 291 | return 0; | 187 | return 0; |
| 292 | 188 | radeon_engine_idle(); | |
| 293 | radeon_engine_idle(rinfo); | ||
| 294 | 189 | ||
| 295 | return 0; | 190 | return 0; |
| 296 | } | 191 | } |
| @@ -366,10 +261,9 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo) | |||
| 366 | /* disable 3D engine */ | 261 | /* disable 3D engine */ |
| 367 | OUTREG(RB3D_CNTL, 0); | 262 | OUTREG(RB3D_CNTL, 0); |
| 368 | 263 | ||
| 369 | rinfo->fifo_free = 0; | ||
| 370 | radeonfb_engine_reset(rinfo); | 264 | radeonfb_engine_reset(rinfo); |
| 371 | 265 | ||
| 372 | radeon_fifo_wait(rinfo, 1); | 266 | radeon_fifo_wait (1); |
| 373 | if (IS_R300_VARIANT(rinfo)) { | 267 | if (IS_R300_VARIANT(rinfo)) { |
| 374 | OUTREG(RB2D_DSTCACHE_MODE, INREG(RB2D_DSTCACHE_MODE) | | 268 | OUTREG(RB2D_DSTCACHE_MODE, INREG(RB2D_DSTCACHE_MODE) | |
| 375 | RB2D_DC_AUTOFLUSH_ENABLE | | 269 | RB2D_DC_AUTOFLUSH_ENABLE | |
| @@ -383,7 +277,7 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo) | |||
| 383 | OUTREG(RB2D_DSTCACHE_MODE, 0); | 277 | OUTREG(RB2D_DSTCACHE_MODE, 0); |
| 384 | } | 278 | } |
| 385 | 279 | ||
| 386 | radeon_fifo_wait(rinfo, 3); | 280 | radeon_fifo_wait (3); |
| 387 | /* We re-read MC_FB_LOCATION from card as it can have been | 281 | /* We re-read MC_FB_LOCATION from card as it can have been |
| 388 | * modified by XFree drivers (ouch !) | 282 | * modified by XFree drivers (ouch !) |
| 389 | */ | 283 | */ |
| @@ -394,57 +288,41 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo) | |||
| 394 | OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); | 288 | OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); |
| 395 | OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); | 289 | OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10)); |
| 396 | 290 | ||
| 397 | radeon_fifo_wait(rinfo, 1); | 291 | radeon_fifo_wait (1); |
| 398 | #ifdef __BIG_ENDIAN | 292 | #if defined(__BIG_ENDIAN) |
| 399 | OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN); | 293 | OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN); |
| 400 | #else | 294 | #else |
| 401 | OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN); | 295 | OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN); |
| 402 | #endif | 296 | #endif |
| 403 | radeon_fifo_wait(rinfo, 2); | 297 | radeon_fifo_wait (2); |
| 404 | OUTREG(DEFAULT_SC_TOP_LEFT, 0); | 298 | OUTREG(DEFAULT_SC_TOP_LEFT, 0); |
| 405 | OUTREG(DEFAULT_SC_BOTTOM_RIGHT, (DEFAULT_SC_RIGHT_MAX | | 299 | OUTREG(DEFAULT_SC_BOTTOM_RIGHT, (DEFAULT_SC_RIGHT_MAX | |
| 406 | DEFAULT_SC_BOTTOM_MAX)); | 300 | DEFAULT_SC_BOTTOM_MAX)); |
| 407 | 301 | ||
| 408 | /* set default DP_GUI_MASTER_CNTL */ | ||
| 409 | temp = radeon_get_dstbpp(rinfo->depth); | 302 | temp = radeon_get_dstbpp(rinfo->depth); |
| 410 | rinfo->dp_gui_mc_base = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS); | 303 | rinfo->dp_gui_master_cntl = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS); |
| 411 | 304 | ||
| 412 | rinfo->dp_gui_mc_cache = rinfo->dp_gui_mc_base | | 305 | radeon_fifo_wait (1); |
| 413 | GMC_BRUSH_SOLID_COLOR | | 306 | OUTREG(DP_GUI_MASTER_CNTL, (rinfo->dp_gui_master_cntl | |
| 414 | GMC_SRC_DATATYPE_COLOR; | 307 | GMC_BRUSH_SOLID_COLOR | |
| 415 | radeon_fifo_wait(rinfo, 1); | 308 | GMC_SRC_DATATYPE_COLOR)); |
| 416 | OUTREG(DP_GUI_MASTER_CNTL, rinfo->dp_gui_mc_cache); | ||
| 417 | 309 | ||
| 310 | radeon_fifo_wait (7); | ||
| 418 | 311 | ||
| 419 | /* clear line drawing regs */ | 312 | /* clear line drawing regs */ |
| 420 | radeon_fifo_wait(rinfo, 2); | ||
| 421 | OUTREG(DST_LINE_START, 0); | 313 | OUTREG(DST_LINE_START, 0); |
| 422 | OUTREG(DST_LINE_END, 0); | 314 | OUTREG(DST_LINE_END, 0); |
| 423 | 315 | ||
| 424 | /* set brush and source color regs */ | 316 | /* set brush color regs */ |
| 425 | rinfo->dp_brush_fg_cache = 0xffffffff; | 317 | OUTREG(DP_BRUSH_FRGD_CLR, 0xffffffff); |
| 426 | rinfo->dp_brush_bg_cache = 0x00000000; | 318 | OUTREG(DP_BRUSH_BKGD_CLR, 0x00000000); |
| 427 | rinfo->dp_src_fg_cache = 0xffffffff; | 319 | |
| 428 | rinfo->dp_src_bg_cache = 0x00000000; | 320 | /* set source color regs */ |
| 429 | radeon_fifo_wait(rinfo, 4); | 321 | OUTREG(DP_SRC_FRGD_CLR, 0xffffffff); |
| 430 | OUTREG(DP_BRUSH_FRGD_CLR, rinfo->dp_brush_fg_cache); | 322 | OUTREG(DP_SRC_BKGD_CLR, 0x00000000); |
| 431 | OUTREG(DP_BRUSH_BKGD_CLR, rinfo->dp_brush_bg_cache); | ||
| 432 | OUTREG(DP_SRC_FRGD_CLR, rinfo->dp_src_fg_cache); | ||
| 433 | OUTREG(DP_SRC_BKGD_CLR, rinfo->dp_src_bg_cache); | ||
| 434 | |||
| 435 | /* Default direction */ | ||
| 436 | rinfo->dp_cntl_cache = DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM; | ||
| 437 | radeon_fifo_wait(rinfo, 1); | ||
| 438 | OUTREG(DP_CNTL, rinfo->dp_cntl_cache); | ||
| 439 | 323 | ||
| 440 | /* default write mask */ | 324 | /* default write mask */ |
| 441 | radeon_fifo_wait(rinfo, 1); | ||
| 442 | OUTREG(DP_WRITE_MSK, 0xffffffff); | 325 | OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 443 | 326 | ||
| 444 | /* Default to no swapping of host data */ | 327 | radeon_engine_idle (); |
| 445 | radeon_fifo_wait(rinfo, 1); | ||
| 446 | OUTREG(RBBM_GUICNTL, RBBM_GUICNTL_HOST_DATA_SWAP_NONE); | ||
| 447 | |||
| 448 | /* Make sure it's settled */ | ||
| 449 | radeon_engine_idle(rinfo); | ||
| 450 | } | 328 | } |
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c index f343ba83f0ae..1a056adb61c8 100644 --- a/drivers/video/aty/radeon_backlight.c +++ b/drivers/video/aty/radeon_backlight.c | |||
| @@ -66,7 +66,7 @@ static int radeon_bl_update_status(struct backlight_device *bd) | |||
| 66 | level = bd->props.brightness; | 66 | level = bd->props.brightness; |
| 67 | 67 | ||
| 68 | del_timer_sync(&rinfo->lvds_timer); | 68 | del_timer_sync(&rinfo->lvds_timer); |
| 69 | radeon_engine_idle(rinfo); | 69 | radeon_engine_idle(); |
| 70 | 70 | ||
| 71 | lvds_gen_cntl = INREG(LVDS_GEN_CNTL); | 71 | lvds_gen_cntl = INREG(LVDS_GEN_CNTL); |
| 72 | if (level > 0) { | 72 | if (level > 0) { |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index b3ffe8205d2b..d0f1a7fc2c9d 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
| @@ -852,6 +852,7 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var, | |||
| 852 | if (rinfo->asleep) | 852 | if (rinfo->asleep) |
| 853 | return 0; | 853 | return 0; |
| 854 | 854 | ||
| 855 | radeon_fifo_wait(2); | ||
| 855 | OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset) | 856 | OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset) |
| 856 | * var->bits_per_pixel / 8) & ~7); | 857 | * var->bits_per_pixel / 8) & ~7); |
| 857 | return 0; | 858 | return 0; |
| @@ -881,6 +882,7 @@ static int radeonfb_ioctl (struct fb_info *info, unsigned int cmd, | |||
| 881 | if (rc) | 882 | if (rc) |
| 882 | return rc; | 883 | return rc; |
| 883 | 884 | ||
| 885 | radeon_fifo_wait(2); | ||
| 884 | if (value & 0x01) { | 886 | if (value & 0x01) { |
| 885 | tmp = INREG(LVDS_GEN_CNTL); | 887 | tmp = INREG(LVDS_GEN_CNTL); |
| 886 | 888 | ||
| @@ -938,7 +940,7 @@ int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch) | |||
| 938 | if (rinfo->lock_blank) | 940 | if (rinfo->lock_blank) |
| 939 | return 0; | 941 | return 0; |
| 940 | 942 | ||
| 941 | radeon_engine_idle(rinfo); | 943 | radeon_engine_idle(); |
| 942 | 944 | ||
| 943 | val = INREG(CRTC_EXT_CNTL); | 945 | val = INREG(CRTC_EXT_CNTL); |
| 944 | val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS | | 946 | val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS | |
| @@ -1046,7 +1048,7 @@ static int radeonfb_blank (int blank, struct fb_info *info) | |||
| 1046 | 1048 | ||
| 1047 | if (rinfo->asleep) | 1049 | if (rinfo->asleep) |
| 1048 | return 0; | 1050 | return 0; |
| 1049 | 1051 | ||
| 1050 | return radeon_screen_blank(rinfo, blank, 0); | 1052 | return radeon_screen_blank(rinfo, blank, 0); |
| 1051 | } | 1053 | } |
| 1052 | 1054 | ||
| @@ -1072,6 +1074,8 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green, | |||
| 1072 | pindex = regno; | 1074 | pindex = regno; |
| 1073 | 1075 | ||
| 1074 | if (!rinfo->asleep) { | 1076 | if (!rinfo->asleep) { |
| 1077 | radeon_fifo_wait(9); | ||
| 1078 | |||
| 1075 | if (rinfo->bpp == 16) { | 1079 | if (rinfo->bpp == 16) { |
| 1076 | pindex = regno * 8; | 1080 | pindex = regno * 8; |
| 1077 | 1081 | ||
| @@ -1240,6 +1244,8 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg | |||
| 1240 | { | 1244 | { |
| 1241 | int i; | 1245 | int i; |
| 1242 | 1246 | ||
| 1247 | radeon_fifo_wait(20); | ||
| 1248 | |||
| 1243 | /* Workaround from XFree */ | 1249 | /* Workaround from XFree */ |
| 1244 | if (rinfo->is_mobility) { | 1250 | if (rinfo->is_mobility) { |
| 1245 | /* A temporal workaround for the occational blanking on certain laptop | 1251 | /* A temporal workaround for the occational blanking on certain laptop |
| @@ -1335,7 +1341,7 @@ static void radeon_lvds_timer_func(unsigned long data) | |||
| 1335 | { | 1341 | { |
| 1336 | struct radeonfb_info *rinfo = (struct radeonfb_info *)data; | 1342 | struct radeonfb_info *rinfo = (struct radeonfb_info *)data; |
| 1337 | 1343 | ||
| 1338 | radeon_engine_idle(rinfo); | 1344 | radeon_engine_idle(); |
| 1339 | 1345 | ||
| 1340 | OUTREG(LVDS_GEN_CNTL, rinfo->pending_lvds_gen_cntl); | 1346 | OUTREG(LVDS_GEN_CNTL, rinfo->pending_lvds_gen_cntl); |
| 1341 | } | 1347 | } |
| @@ -1353,11 +1359,10 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode, | |||
| 1353 | if (nomodeset) | 1359 | if (nomodeset) |
| 1354 | return; | 1360 | return; |
| 1355 | 1361 | ||
| 1356 | radeon_engine_idle(rinfo); | ||
| 1357 | |||
| 1358 | if (!regs_only) | 1362 | if (!regs_only) |
| 1359 | radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0); | 1363 | radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0); |
| 1360 | 1364 | ||
| 1365 | radeon_fifo_wait(31); | ||
| 1361 | for (i=0; i<10; i++) | 1366 | for (i=0; i<10; i++) |
| 1362 | OUTREG(common_regs[i].reg, common_regs[i].val); | 1367 | OUTREG(common_regs[i].reg, common_regs[i].val); |
| 1363 | 1368 | ||
| @@ -1385,6 +1390,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode, | |||
| 1385 | radeon_write_pll_regs(rinfo, mode); | 1390 | radeon_write_pll_regs(rinfo, mode); |
| 1386 | 1391 | ||
| 1387 | if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) { | 1392 | if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) { |
| 1393 | radeon_fifo_wait(10); | ||
| 1388 | OUTREG(FP_CRTC_H_TOTAL_DISP, mode->fp_crtc_h_total_disp); | 1394 | OUTREG(FP_CRTC_H_TOTAL_DISP, mode->fp_crtc_h_total_disp); |
| 1389 | OUTREG(FP_CRTC_V_TOTAL_DISP, mode->fp_crtc_v_total_disp); | 1395 | OUTREG(FP_CRTC_V_TOTAL_DISP, mode->fp_crtc_v_total_disp); |
| 1390 | OUTREG(FP_H_SYNC_STRT_WID, mode->fp_h_sync_strt_wid); | 1396 | OUTREG(FP_H_SYNC_STRT_WID, mode->fp_h_sync_strt_wid); |
| @@ -1399,6 +1405,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode, | |||
| 1399 | if (!regs_only) | 1405 | if (!regs_only) |
| 1400 | radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 0); | 1406 | radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 0); |
| 1401 | 1407 | ||
| 1408 | radeon_fifo_wait(2); | ||
| 1402 | OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl); | 1409 | OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl); |
| 1403 | 1410 | ||
| 1404 | return; | 1411 | return; |
| @@ -1549,7 +1556,7 @@ static int radeonfb_set_par(struct fb_info *info) | |||
| 1549 | /* We always want engine to be idle on a mode switch, even | 1556 | /* We always want engine to be idle on a mode switch, even |
| 1550 | * if we won't actually change the mode | 1557 | * if we won't actually change the mode |
| 1551 | */ | 1558 | */ |
| 1552 | radeon_engine_idle(rinfo); | 1559 | radeon_engine_idle(); |
| 1553 | 1560 | ||
| 1554 | hSyncStart = mode->xres + mode->right_margin; | 1561 | hSyncStart = mode->xres + mode->right_margin; |
| 1555 | hSyncEnd = hSyncStart + mode->hsync_len; | 1562 | hSyncEnd = hSyncStart + mode->hsync_len; |
| @@ -1844,6 +1851,7 @@ static int radeonfb_set_par(struct fb_info *info) | |||
| 1844 | return 0; | 1851 | return 0; |
| 1845 | } | 1852 | } |
| 1846 | 1853 | ||
| 1854 | |||
| 1847 | static struct fb_ops radeonfb_ops = { | 1855 | static struct fb_ops radeonfb_ops = { |
| 1848 | .owner = THIS_MODULE, | 1856 | .owner = THIS_MODULE, |
| 1849 | .fb_check_var = radeonfb_check_var, | 1857 | .fb_check_var = radeonfb_check_var, |
| @@ -1867,7 +1875,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) | |||
| 1867 | info->par = rinfo; | 1875 | info->par = rinfo; |
| 1868 | info->pseudo_palette = rinfo->pseudo_palette; | 1876 | info->pseudo_palette = rinfo->pseudo_palette; |
| 1869 | info->flags = FBINFO_DEFAULT | 1877 | info->flags = FBINFO_DEFAULT |
| 1870 | | FBINFO_HWACCEL_IMAGEBLIT | ||
| 1871 | | FBINFO_HWACCEL_COPYAREA | 1878 | | FBINFO_HWACCEL_COPYAREA |
| 1872 | | FBINFO_HWACCEL_FILLRECT | 1879 | | FBINFO_HWACCEL_FILLRECT |
| 1873 | | FBINFO_HWACCEL_XPAN | 1880 | | FBINFO_HWACCEL_XPAN |
| @@ -1875,7 +1882,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) | |||
| 1875 | info->fbops = &radeonfb_ops; | 1882 | info->fbops = &radeonfb_ops; |
| 1876 | info->screen_base = rinfo->fb_base; | 1883 | info->screen_base = rinfo->fb_base; |
| 1877 | info->screen_size = rinfo->mapped_vram; | 1884 | info->screen_size = rinfo->mapped_vram; |
| 1878 | |||
| 1879 | /* Fill fix common fields */ | 1885 | /* Fill fix common fields */ |
| 1880 | strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id)); | 1886 | strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id)); |
| 1881 | info->fix.smem_start = rinfo->fb_base_phys; | 1887 | info->fix.smem_start = rinfo->fb_base_phys; |
| @@ -1890,25 +1896,8 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) | |||
| 1890 | info->fix.mmio_len = RADEON_REGSIZE; | 1896 | info->fix.mmio_len = RADEON_REGSIZE; |
| 1891 | info->fix.accel = FB_ACCEL_ATI_RADEON; | 1897 | info->fix.accel = FB_ACCEL_ATI_RADEON; |
| 1892 | 1898 | ||
| 1893 | /* Allocate colormap */ | ||
| 1894 | fb_alloc_cmap(&info->cmap, 256, 0); | 1899 | fb_alloc_cmap(&info->cmap, 256, 0); |
| 1895 | 1900 | ||
| 1896 | /* Setup pixmap used for acceleration */ | ||
| 1897 | #define PIXMAP_SIZE (2048 * 4) | ||
| 1898 | |||
| 1899 | info->pixmap.addr = kmalloc(PIXMAP_SIZE, GFP_KERNEL); | ||
| 1900 | if (!info->pixmap.addr) { | ||
| 1901 | printk(KERN_ERR "radeonfb: Failed to allocate pixmap !\n"); | ||
| 1902 | noaccel = 1; | ||
| 1903 | goto bail; | ||
| 1904 | } | ||
| 1905 | info->pixmap.size = PIXMAP_SIZE; | ||
| 1906 | info->pixmap.flags = FB_PIXMAP_SYSTEM; | ||
| 1907 | info->pixmap.scan_align = 4; | ||
| 1908 | info->pixmap.buf_align = 4; | ||
| 1909 | info->pixmap.access_align = 32; | ||
| 1910 | |||
| 1911 | bail: | ||
| 1912 | if (noaccel) | 1901 | if (noaccel) |
| 1913 | info->flags |= FBINFO_HWACCEL_DISABLED; | 1902 | info->flags |= FBINFO_HWACCEL_DISABLED; |
| 1914 | 1903 | ||
| @@ -2017,6 +2006,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) | |||
| 2017 | u32 tom = INREG(NB_TOM); | 2006 | u32 tom = INREG(NB_TOM); |
| 2018 | tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024); | 2007 | tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024); |
| 2019 | 2008 | ||
| 2009 | radeon_fifo_wait(6); | ||
| 2020 | OUTREG(MC_FB_LOCATION, tom); | 2010 | OUTREG(MC_FB_LOCATION, tom); |
| 2021 | OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16); | 2011 | OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16); |
| 2022 | OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16); | 2012 | OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16); |
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index 3df5015f1d13..675abdafc2d8 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c | |||
| @@ -2653,9 +2653,9 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg) | |||
| 2653 | 2653 | ||
| 2654 | if (!(info->flags & FBINFO_HWACCEL_DISABLED)) { | 2654 | if (!(info->flags & FBINFO_HWACCEL_DISABLED)) { |
| 2655 | /* Make sure engine is reset */ | 2655 | /* Make sure engine is reset */ |
| 2656 | radeon_engine_idle(rinfo); | 2656 | radeon_engine_idle(); |
| 2657 | radeonfb_engine_reset(rinfo); | 2657 | radeonfb_engine_reset(rinfo); |
| 2658 | radeon_engine_idle(rinfo); | 2658 | radeon_engine_idle(); |
| 2659 | } | 2659 | } |
| 2660 | 2660 | ||
| 2661 | /* Blank display and LCD */ | 2661 | /* Blank display and LCD */ |
| @@ -2767,7 +2767,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev) | |||
| 2767 | 2767 | ||
| 2768 | rinfo->asleep = 0; | 2768 | rinfo->asleep = 0; |
| 2769 | } else | 2769 | } else |
| 2770 | radeon_engine_idle(rinfo); | 2770 | radeon_engine_idle(); |
| 2771 | 2771 | ||
| 2772 | /* Restore display & engine */ | 2772 | /* Restore display & engine */ |
| 2773 | radeon_write_mode (rinfo, &rinfo->state, 1); | 2773 | radeon_write_mode (rinfo, &rinfo->state, 1); |
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h index ea0b5b47acaf..3ea1b00fdd22 100644 --- a/drivers/video/aty/radeonfb.h +++ b/drivers/video/aty/radeonfb.h | |||
| @@ -336,15 +336,7 @@ struct radeonfb_info { | |||
| 336 | int mon2_type; | 336 | int mon2_type; |
| 337 | u8 *mon2_EDID; | 337 | u8 *mon2_EDID; |
| 338 | 338 | ||
| 339 | /* accel bits */ | 339 | u32 dp_gui_master_cntl; |
| 340 | u32 dp_gui_mc_base; | ||
| 341 | u32 dp_gui_mc_cache; | ||
| 342 | u32 dp_cntl_cache; | ||
| 343 | u32 dp_brush_fg_cache; | ||
| 344 | u32 dp_brush_bg_cache; | ||
| 345 | u32 dp_src_fg_cache; | ||
| 346 | u32 dp_src_bg_cache; | ||
| 347 | u32 fifo_free; | ||
| 348 | 340 | ||
| 349 | struct pll_info pll; | 341 | struct pll_info pll; |
| 350 | 342 | ||
| @@ -356,7 +348,6 @@ struct radeonfb_info { | |||
| 356 | int lock_blank; | 348 | int lock_blank; |
| 357 | int dynclk; | 349 | int dynclk; |
| 358 | int no_schedule; | 350 | int no_schedule; |
| 359 | int gfx_mode; | ||
| 360 | enum radeon_pm_mode pm_mode; | 351 | enum radeon_pm_mode pm_mode; |
| 361 | reinit_function_ptr reinit_func; | 352 | reinit_function_ptr reinit_func; |
| 362 | 353 | ||
| @@ -401,14 +392,8 @@ static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms) | |||
| 401 | #define OUTREG8(addr,val) writeb(val, (rinfo->mmio_base)+addr) | 392 | #define OUTREG8(addr,val) writeb(val, (rinfo->mmio_base)+addr) |
| 402 | #define INREG16(addr) readw((rinfo->mmio_base)+addr) | 393 | #define INREG16(addr) readw((rinfo->mmio_base)+addr) |
| 403 | #define OUTREG16(addr,val) writew(val, (rinfo->mmio_base)+addr) | 394 | #define OUTREG16(addr,val) writew(val, (rinfo->mmio_base)+addr) |
| 404 | |||
| 405 | #ifdef CONFIG_PPC | ||
| 406 | #define INREG(addr) ({ eieio(); ld_le32(rinfo->mmio_base+(addr)); }) | ||
| 407 | #define OUTREG(addr,val) do { eieio(); st_le32(rinfo->mmio_base+(addr),(val)); } while(0) | ||
| 408 | #else | ||
| 409 | #define INREG(addr) readl((rinfo->mmio_base)+addr) | 395 | #define INREG(addr) readl((rinfo->mmio_base)+addr) |
| 410 | #define OUTREG(addr,val) writel(val, (rinfo->mmio_base)+addr) | 396 | #define OUTREG(addr,val) writel(val, (rinfo->mmio_base)+addr) |
| 411 | #endif | ||
| 412 | 397 | ||
| 413 | static inline void _OUTREGP(struct radeonfb_info *rinfo, u32 addr, | 398 | static inline void _OUTREGP(struct radeonfb_info *rinfo, u32 addr, |
| 414 | u32 val, u32 mask) | 399 | u32 val, u32 mask) |
| @@ -550,7 +535,17 @@ static inline u32 radeon_get_dstbpp(u16 depth) | |||
| 550 | * 2D Engine helper routines | 535 | * 2D Engine helper routines |
| 551 | */ | 536 | */ |
| 552 | 537 | ||
| 553 | extern void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries); | 538 | static inline void _radeon_fifo_wait(struct radeonfb_info *rinfo, int entries) |
| 539 | { | ||
| 540 | int i; | ||
| 541 | |||
| 542 | for (i=0; i<2000000; i++) { | ||
| 543 | if ((INREG(RBBM_STATUS) & 0x7f) >= entries) | ||
| 544 | return; | ||
| 545 | udelay(1); | ||
| 546 | } | ||
| 547 | printk(KERN_ERR "radeonfb: FIFO Timeout !\n"); | ||
| 548 | } | ||
| 554 | 549 | ||
| 555 | static inline void radeon_engine_flush (struct radeonfb_info *rinfo) | 550 | static inline void radeon_engine_flush (struct radeonfb_info *rinfo) |
| 556 | { | 551 | { |
| @@ -563,7 +558,7 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo) | |||
| 563 | /* Ensure FIFO is empty, ie, make sure the flush commands | 558 | /* Ensure FIFO is empty, ie, make sure the flush commands |
| 564 | * has reached the cache | 559 | * has reached the cache |
| 565 | */ | 560 | */ |
| 566 | radeon_fifo_update_and_wait(rinfo, 64); | 561 | _radeon_fifo_wait (rinfo, 64); |
| 567 | 562 | ||
| 568 | /* Wait for the flush to complete */ | 563 | /* Wait for the flush to complete */ |
| 569 | for (i=0; i < 2000000; i++) { | 564 | for (i=0; i < 2000000; i++) { |
| @@ -575,12 +570,12 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo) | |||
| 575 | } | 570 | } |
| 576 | 571 | ||
| 577 | 572 | ||
| 578 | static inline void radeon_engine_idle(struct radeonfb_info *rinfo) | 573 | static inline void _radeon_engine_idle(struct radeonfb_info *rinfo) |
| 579 | { | 574 | { |
| 580 | int i; | 575 | int i; |
| 581 | 576 | ||
| 582 | /* ensure FIFO is empty before waiting for idle */ | 577 | /* ensure FIFO is empty before waiting for idle */ |
| 583 | radeon_fifo_update_and_wait (rinfo, 64); | 578 | _radeon_fifo_wait (rinfo, 64); |
| 584 | 579 | ||
| 585 | for (i=0; i<2000000; i++) { | 580 | for (i=0; i<2000000; i++) { |
| 586 | if (((INREG(RBBM_STATUS) & GUI_ACTIVE)) == 0) { | 581 | if (((INREG(RBBM_STATUS) & GUI_ACTIVE)) == 0) { |
| @@ -593,6 +588,8 @@ static inline void radeon_engine_idle(struct radeonfb_info *rinfo) | |||
| 593 | } | 588 | } |
| 594 | 589 | ||
| 595 | 590 | ||
| 591 | #define radeon_engine_idle() _radeon_engine_idle(rinfo) | ||
| 592 | #define radeon_fifo_wait(entries) _radeon_fifo_wait(rinfo,entries) | ||
| 596 | #define radeon_msleep(ms) _radeon_msleep(rinfo,ms) | 593 | #define radeon_msleep(ms) _radeon_msleep(rinfo,ms) |
| 597 | 594 | ||
| 598 | 595 | ||
| @@ -622,7 +619,6 @@ extern void radeonfb_imageblit(struct fb_info *p, const struct fb_image *image); | |||
| 622 | extern int radeonfb_sync(struct fb_info *info); | 619 | extern int radeonfb_sync(struct fb_info *info); |
| 623 | extern void radeonfb_engine_init (struct radeonfb_info *rinfo); | 620 | extern void radeonfb_engine_init (struct radeonfb_info *rinfo); |
| 624 | extern void radeonfb_engine_reset(struct radeonfb_info *rinfo); | 621 | extern void radeonfb_engine_reset(struct radeonfb_info *rinfo); |
| 625 | extern void radeon_fixup_mem_offset(struct radeonfb_info *rinfo); | ||
| 626 | 622 | ||
| 627 | /* Other functions */ | 623 | /* Other functions */ |
| 628 | extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch); | 624 | extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch); |
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 67ff370d80af..0b2adefe9e3d 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
| @@ -3531,12 +3531,18 @@ static void fbcon_exit(void) | |||
| 3531 | softback_buf = 0UL; | 3531 | softback_buf = 0UL; |
| 3532 | 3532 | ||
| 3533 | for (i = 0; i < FB_MAX; i++) { | 3533 | for (i = 0; i < FB_MAX; i++) { |
| 3534 | int pending; | ||
| 3535 | |||
| 3534 | mapped = 0; | 3536 | mapped = 0; |
| 3535 | info = registered_fb[i]; | 3537 | info = registered_fb[i]; |
| 3536 | 3538 | ||
| 3537 | if (info == NULL) | 3539 | if (info == NULL) |
| 3538 | continue; | 3540 | continue; |
| 3539 | 3541 | ||
| 3542 | pending = cancel_work_sync(&info->queue); | ||
| 3543 | DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" : | ||
| 3544 | "no")); | ||
| 3545 | |||
| 3540 | for (j = first_fb_vc; j <= last_fb_vc; j++) { | 3546 | for (j = first_fb_vc; j <= last_fb_vc; j++) { |
| 3541 | if (con2fb_map[j] == i) | 3547 | if (con2fb_map[j] == i) |
| 3542 | mapped = 1; | 3548 | mapped = 1; |
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c index 38718d95fbb9..fb64234a3825 100644 --- a/drivers/video/mb862xx/mb862xxfb.c +++ b/drivers/video/mb862xx/mb862xxfb.c | |||
| @@ -927,9 +927,9 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, | |||
| 927 | } | 927 | } |
| 928 | 928 | ||
| 929 | dev_dbg(dev, "fb phys 0x%llx 0x%lx\n", | 929 | dev_dbg(dev, "fb phys 0x%llx 0x%lx\n", |
| 930 | (u64)par->fb_base_phys, (ulong)par->mapped_vram); | 930 | (unsigned long long)par->fb_base_phys, (ulong)par->mapped_vram); |
| 931 | dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n", | 931 | dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n", |
| 932 | (u64)par->mmio_base_phys, (ulong)par->mmio_len); | 932 | (unsigned long long)par->mmio_base_phys, (ulong)par->mmio_len); |
| 933 | 933 | ||
| 934 | if (mb862xx_pci_gdc_init(par)) | 934 | if (mb862xx_pci_gdc_init(par)) |
| 935 | goto io_unmap; | 935 | goto io_unmap; |
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 5a5e407dc45f..1a49519dafa4 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
| @@ -392,7 +392,7 @@ static void set_fb_fix(struct fb_info *fbi) | |||
| 392 | int bpp; | 392 | int bpp; |
| 393 | 393 | ||
| 394 | rg = &plane->fbdev->mem_desc.region[plane->idx]; | 394 | rg = &plane->fbdev->mem_desc.region[plane->idx]; |
| 395 | fbi->screen_base = (char __iomem *)rg->vaddr; | 395 | fbi->screen_base = rg->vaddr; |
| 396 | fix->smem_start = rg->paddr; | 396 | fix->smem_start = rg->paddr; |
| 397 | fix->smem_len = rg->size; | 397 | fix->smem_len = rg->size; |
| 398 | 398 | ||
diff --git a/fs/9p/fid.c b/fs/9p/fid.c index 3031e3233dd6..2a983d49d19c 100644 --- a/fs/9p/fid.c +++ b/fs/9p/fid.c | |||
| @@ -45,7 +45,7 @@ int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid) | |||
| 45 | struct v9fs_dentry *dent; | 45 | struct v9fs_dentry *dent; |
| 46 | 46 | ||
| 47 | P9_DPRINTK(P9_DEBUG_VFS, "fid %d dentry %s\n", | 47 | P9_DPRINTK(P9_DEBUG_VFS, "fid %d dentry %s\n", |
| 48 | fid->fid, dentry->d_iname); | 48 | fid->fid, dentry->d_name.name); |
| 49 | 49 | ||
| 50 | dent = dentry->d_fsdata; | 50 | dent = dentry->d_fsdata; |
| 51 | if (!dent) { | 51 | if (!dent) { |
| @@ -79,7 +79,7 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, u32 uid, int any) | |||
| 79 | struct p9_fid *fid, *ret; | 79 | struct p9_fid *fid, *ret; |
| 80 | 80 | ||
| 81 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n", | 81 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n", |
| 82 | dentry->d_iname, dentry, uid, any); | 82 | dentry->d_name.name, dentry, uid, any); |
| 83 | dent = (struct v9fs_dentry *) dentry->d_fsdata; | 83 | dent = (struct v9fs_dentry *) dentry->d_fsdata; |
| 84 | ret = NULL; | 84 | ret = NULL; |
| 85 | if (dent) { | 85 | if (dent) { |
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 24eb01087b6d..332b5ff02fec 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c | |||
| @@ -160,7 +160,7 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses) | |||
| 160 | v9ses->flags |= V9FS_ACCESS_ANY; | 160 | v9ses->flags |= V9FS_ACCESS_ANY; |
| 161 | else { | 161 | else { |
| 162 | v9ses->flags |= V9FS_ACCESS_SINGLE; | 162 | v9ses->flags |= V9FS_ACCESS_SINGLE; |
| 163 | v9ses->uid = simple_strtol(s, &e, 10); | 163 | v9ses->uid = simple_strtoul(s, &e, 10); |
| 164 | if (*e != '\0') | 164 | if (*e != '\0') |
| 165 | v9ses->uid = ~0; | 165 | v9ses->uid = ~0; |
| 166 | } | 166 | } |
diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c index f9534f18df0a..06dcc7c4f234 100644 --- a/fs/9p/vfs_dentry.c +++ b/fs/9p/vfs_dentry.c | |||
| @@ -52,7 +52,8 @@ | |||
| 52 | 52 | ||
| 53 | static int v9fs_dentry_delete(struct dentry *dentry) | 53 | static int v9fs_dentry_delete(struct dentry *dentry) |
| 54 | { | 54 | { |
| 55 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); | 55 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name, |
| 56 | dentry); | ||
| 56 | 57 | ||
| 57 | return 1; | 58 | return 1; |
| 58 | } | 59 | } |
| @@ -69,7 +70,8 @@ static int v9fs_dentry_delete(struct dentry *dentry) | |||
| 69 | static int v9fs_cached_dentry_delete(struct dentry *dentry) | 70 | static int v9fs_cached_dentry_delete(struct dentry *dentry) |
| 70 | { | 71 | { |
| 71 | struct inode *inode = dentry->d_inode; | 72 | struct inode *inode = dentry->d_inode; |
| 72 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); | 73 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name, |
| 74 | dentry); | ||
| 73 | 75 | ||
| 74 | if(!inode) | 76 | if(!inode) |
| 75 | return 1; | 77 | return 1; |
| @@ -88,7 +90,8 @@ void v9fs_dentry_release(struct dentry *dentry) | |||
| 88 | struct v9fs_dentry *dent; | 90 | struct v9fs_dentry *dent; |
| 89 | struct p9_fid *temp, *current_fid; | 91 | struct p9_fid *temp, *current_fid; |
| 90 | 92 | ||
| 91 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); | 93 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name, |
| 94 | dentry); | ||
| 92 | dent = dentry->d_fsdata; | 95 | dent = dentry->d_fsdata; |
| 93 | if (dent) { | 96 | if (dent) { |
| 94 | list_for_each_entry_safe(current_fid, temp, &dent->fidlist, | 97 | list_for_each_entry_safe(current_fid, temp, &dent->fidlist, |
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 8314d3f43b71..2dfcf5487efe 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
| @@ -963,7 +963,8 @@ static int v9fs_vfs_readlink(struct dentry *dentry, char __user * buffer, | |||
| 963 | if (buflen > PATH_MAX) | 963 | if (buflen > PATH_MAX) |
| 964 | buflen = PATH_MAX; | 964 | buflen = PATH_MAX; |
| 965 | 965 | ||
| 966 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); | 966 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name, |
| 967 | dentry); | ||
| 967 | 968 | ||
| 968 | retval = v9fs_readlink(dentry, link, buflen); | 969 | retval = v9fs_readlink(dentry, link, buflen); |
| 969 | 970 | ||
| @@ -1022,7 +1023,8 @@ v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) | |||
| 1022 | { | 1023 | { |
| 1023 | char *s = nd_get_link(nd); | 1024 | char *s = nd_get_link(nd); |
| 1024 | 1025 | ||
| 1025 | P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, s); | 1026 | P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, |
| 1027 | IS_ERR(s) ? "<error>" : s); | ||
| 1026 | if (!IS_ERR(s)) | 1028 | if (!IS_ERR(s)) |
| 1027 | __putname(s); | 1029 | __putname(s); |
| 1028 | } | 1030 | } |
diff --git a/fs/block_dev.c b/fs/block_dev.c index db831efbdbbd..99e0ae1a4c78 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -1135,12 +1135,15 @@ static int blkdev_open(struct inode * inode, struct file * filp) | |||
| 1135 | if (res) | 1135 | if (res) |
| 1136 | return res; | 1136 | return res; |
| 1137 | 1137 | ||
| 1138 | if (!(filp->f_mode & FMODE_EXCL)) | 1138 | if (filp->f_mode & FMODE_EXCL) { |
| 1139 | return 0; | 1139 | res = bd_claim(bdev, filp); |
| 1140 | if (res) | ||
| 1141 | goto out_blkdev_put; | ||
| 1142 | } | ||
| 1140 | 1143 | ||
| 1141 | if (!(res = bd_claim(bdev, filp))) | 1144 | return 0; |
| 1142 | return 0; | ||
| 1143 | 1145 | ||
| 1146 | out_blkdev_put: | ||
| 1144 | blkdev_put(bdev, filp->f_mode); | 1147 | blkdev_put(bdev, filp->f_mode); |
| 1145 | return res; | 1148 | return res; |
| 1146 | } | 1149 | } |
| @@ -1203,8 +1206,16 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg) | |||
| 1203 | { | 1206 | { |
| 1204 | struct block_device *bdev = I_BDEV(file->f_mapping->host); | 1207 | struct block_device *bdev = I_BDEV(file->f_mapping->host); |
| 1205 | fmode_t mode = file->f_mode; | 1208 | fmode_t mode = file->f_mode; |
| 1209 | |||
| 1210 | /* | ||
| 1211 | * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have | ||
| 1212 | * to updated it before every ioctl. | ||
| 1213 | */ | ||
| 1206 | if (file->f_flags & O_NDELAY) | 1214 | if (file->f_flags & O_NDELAY) |
| 1207 | mode |= FMODE_NDELAY_NOW; | 1215 | mode |= FMODE_NDELAY; |
| 1216 | else | ||
| 1217 | mode &= ~FMODE_NDELAY; | ||
| 1218 | |||
| 1208 | return blkdev_ioctl(bdev, mode, cmd, arg); | 1219 | return blkdev_ioctl(bdev, mode, cmd, arg); |
| 1209 | } | 1220 | } |
| 1210 | 1221 | ||
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 2af8626ced43..6d51696dc762 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
| @@ -3983,7 +3983,8 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, | |||
| 3983 | 3983 | ||
| 3984 | node->flags = le16_to_cpu(pSMBr->DFSFlags); | 3984 | node->flags = le16_to_cpu(pSMBr->DFSFlags); |
| 3985 | if (is_unicode) { | 3985 | if (is_unicode) { |
| 3986 | __le16 *tmp = kmalloc(strlen(searchName)*2, GFP_KERNEL); | 3986 | __le16 *tmp = kmalloc(strlen(searchName)*2 + 2, |
| 3987 | GFP_KERNEL); | ||
| 3987 | cifsConvertToUCS((__le16 *) tmp, searchName, | 3988 | cifsConvertToUCS((__le16 *) tmp, searchName, |
| 3988 | PATH_MAX, nls_codepage, remap); | 3989 | PATH_MAX, nls_codepage, remap); |
| 3989 | node->path_consumed = hostlen_fromUCS(tmp, | 3990 | node->path_consumed = hostlen_fromUCS(tmp, |
| @@ -1159,6 +1159,7 @@ EXPORT_SYMBOL(remove_arg_zero); | |||
| 1159 | */ | 1159 | */ |
| 1160 | int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | 1160 | int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) |
| 1161 | { | 1161 | { |
| 1162 | unsigned int depth = bprm->recursion_depth; | ||
| 1162 | int try,retval; | 1163 | int try,retval; |
| 1163 | struct linux_binfmt *fmt; | 1164 | struct linux_binfmt *fmt; |
| 1164 | #ifdef __alpha__ | 1165 | #ifdef __alpha__ |
| @@ -1219,8 +1220,15 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | |||
| 1219 | continue; | 1220 | continue; |
| 1220 | read_unlock(&binfmt_lock); | 1221 | read_unlock(&binfmt_lock); |
| 1221 | retval = fn(bprm, regs); | 1222 | retval = fn(bprm, regs); |
| 1223 | /* | ||
| 1224 | * Restore the depth counter to its starting value | ||
| 1225 | * in this call, so we don't have to rely on every | ||
| 1226 | * load_binary function to restore it on return. | ||
| 1227 | */ | ||
| 1228 | bprm->recursion_depth = depth; | ||
| 1222 | if (retval >= 0) { | 1229 | if (retval >= 0) { |
| 1223 | tracehook_report_exec(fmt, bprm, regs); | 1230 | if (depth == 0) |
| 1231 | tracehook_report_exec(fmt, bprm, regs); | ||
| 1224 | put_binfmt(fmt); | 1232 | put_binfmt(fmt); |
| 1225 | allow_write_access(bprm->file); | 1233 | allow_write_access(bprm->file); |
| 1226 | if (bprm->file) | 1234 | if (bprm->file) |
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index 80246bad1b7f..890e01828817 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c | |||
| @@ -367,6 +367,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid, | |||
| 367 | * Try to get any dentry for the given file handle from the filesystem. | 367 | * Try to get any dentry for the given file handle from the filesystem. |
| 368 | */ | 368 | */ |
| 369 | result = nop->fh_to_dentry(mnt->mnt_sb, fid, fh_len, fileid_type); | 369 | result = nop->fh_to_dentry(mnt->mnt_sb, fid, fh_len, fileid_type); |
| 370 | if (!result) | ||
| 371 | result = ERR_PTR(-ESTALE); | ||
| 370 | if (IS_ERR(result)) | 372 | if (IS_ERR(result)) |
| 371 | return result; | 373 | return result; |
| 372 | 374 | ||
| @@ -420,6 +422,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid, | |||
| 420 | 422 | ||
| 421 | target_dir = nop->fh_to_parent(mnt->mnt_sb, fid, | 423 | target_dir = nop->fh_to_parent(mnt->mnt_sb, fid, |
| 422 | fh_len, fileid_type); | 424 | fh_len, fileid_type); |
| 425 | if (!target_dir) | ||
| 426 | goto err_result; | ||
| 423 | err = PTR_ERR(target_dir); | 427 | err = PTR_ERR(target_dir); |
| 424 | if (IS_ERR(target_dir)) | 428 | if (IS_ERR(target_dir)) |
| 425 | goto err_result; | 429 | goto err_result; |
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index d2003cdc36aa..db35cfdb3c8b 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c | |||
| @@ -609,8 +609,8 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks) | |||
| 609 | 609 | ||
| 610 | if (free_blocks - (nblocks + root_blocks + dirty_blocks) < | 610 | if (free_blocks - (nblocks + root_blocks + dirty_blocks) < |
| 611 | EXT4_FREEBLOCKS_WATERMARK) { | 611 | EXT4_FREEBLOCKS_WATERMARK) { |
| 612 | free_blocks = percpu_counter_sum(fbc); | 612 | free_blocks = percpu_counter_sum_positive(fbc); |
| 613 | dirty_blocks = percpu_counter_sum(dbc); | 613 | dirty_blocks = percpu_counter_sum_positive(dbc); |
| 614 | if (dirty_blocks < 0) { | 614 | if (dirty_blocks < 0) { |
| 615 | printk(KERN_CRIT "Dirty block accounting " | 615 | printk(KERN_CRIT "Dirty block accounting " |
| 616 | "went wrong %lld\n", | 616 | "went wrong %lld\n", |
diff --git a/fs/fcntl.c b/fs/fcntl.c index ac4f7db9f134..549daf8005fb 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/signal.h> | 19 | #include <linux/signal.h> |
| 20 | #include <linux/rcupdate.h> | 20 | #include <linux/rcupdate.h> |
| 21 | #include <linux/pid_namespace.h> | 21 | #include <linux/pid_namespace.h> |
| 22 | #include <linux/smp_lock.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/poll.h> | 24 | #include <asm/poll.h> |
| 24 | #include <asm/siginfo.h> | 25 | #include <asm/siginfo.h> |
| @@ -175,6 +176,11 @@ static int setfl(int fd, struct file * filp, unsigned long arg) | |||
| 175 | if (error) | 176 | if (error) |
| 176 | return error; | 177 | return error; |
| 177 | 178 | ||
| 179 | /* | ||
| 180 | * We still need a lock here for now to keep multiple FASYNC calls | ||
| 181 | * from racing with each other. | ||
| 182 | */ | ||
| 183 | lock_kernel(); | ||
| 178 | if ((arg ^ filp->f_flags) & FASYNC) { | 184 | if ((arg ^ filp->f_flags) & FASYNC) { |
| 179 | if (filp->f_op && filp->f_op->fasync) { | 185 | if (filp->f_op && filp->f_op->fasync) { |
| 180 | error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); | 186 | error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); |
| @@ -185,6 +191,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg) | |||
| 185 | 191 | ||
| 186 | filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK); | 192 | filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK); |
| 187 | out: | 193 | out: |
| 194 | unlock_kernel(); | ||
| 188 | return error; | 195 | return error; |
| 189 | } | 196 | } |
| 190 | 197 | ||
diff --git a/fs/inotify.c b/fs/inotify.c index 7bbed1b89825..dae3f28f30d4 100644 --- a/fs/inotify.c +++ b/fs/inotify.c | |||
| @@ -428,11 +428,13 @@ void inotify_unmount_inodes(struct list_head *list) | |||
| 428 | watches = &inode->inotify_watches; | 428 | watches = &inode->inotify_watches; |
| 429 | list_for_each_entry_safe(watch, next_w, watches, i_list) { | 429 | list_for_each_entry_safe(watch, next_w, watches, i_list) { |
| 430 | struct inotify_handle *ih= watch->ih; | 430 | struct inotify_handle *ih= watch->ih; |
| 431 | get_inotify_watch(watch); | ||
| 431 | mutex_lock(&ih->mutex); | 432 | mutex_lock(&ih->mutex); |
| 432 | ih->in_ops->handle_event(watch, watch->wd, IN_UNMOUNT, 0, | 433 | ih->in_ops->handle_event(watch, watch->wd, IN_UNMOUNT, 0, |
| 433 | NULL, NULL); | 434 | NULL, NULL); |
| 434 | inotify_remove_watch_locked(ih, watch); | 435 | inotify_remove_watch_locked(ih, watch); |
| 435 | mutex_unlock(&ih->mutex); | 436 | mutex_unlock(&ih->mutex); |
| 437 | put_inotify_watch(watch); | ||
| 436 | } | 438 | } |
| 437 | mutex_unlock(&inode->inotify_mutex); | 439 | mutex_unlock(&inode->inotify_mutex); |
| 438 | iput(inode); | 440 | iput(inode); |
diff --git a/fs/ioctl.c b/fs/ioctl.c index d152856c371b..43e8b2c0664b 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c | |||
| @@ -400,11 +400,9 @@ static int ioctl_fioasync(unsigned int fd, struct file *filp, | |||
| 400 | 400 | ||
| 401 | /* Did FASYNC state change ? */ | 401 | /* Did FASYNC state change ? */ |
| 402 | if ((flag ^ filp->f_flags) & FASYNC) { | 402 | if ((flag ^ filp->f_flags) & FASYNC) { |
| 403 | if (filp->f_op && filp->f_op->fasync) { | 403 | if (filp->f_op && filp->f_op->fasync) |
| 404 | lock_kernel(); | ||
| 405 | error = filp->f_op->fasync(fd, filp, on); | 404 | error = filp->f_op->fasync(fd, filp, on); |
| 406 | unlock_kernel(); | 405 | else |
| 407 | } else | ||
| 408 | error = -ENOTTY; | 406 | error = -ENOTTY; |
| 409 | } | 407 | } |
| 410 | if (error) | 408 | if (error) |
| @@ -440,11 +438,17 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, | |||
| 440 | break; | 438 | break; |
| 441 | 439 | ||
| 442 | case FIONBIO: | 440 | case FIONBIO: |
| 441 | /* BKL needed to avoid races tweaking f_flags */ | ||
| 442 | lock_kernel(); | ||
| 443 | error = ioctl_fionbio(filp, argp); | 443 | error = ioctl_fionbio(filp, argp); |
| 444 | unlock_kernel(); | ||
| 444 | break; | 445 | break; |
| 445 | 446 | ||
| 446 | case FIOASYNC: | 447 | case FIOASYNC: |
| 448 | /* BKL needed to avoid races tweaking f_flags */ | ||
| 449 | lock_kernel(); | ||
| 447 | error = ioctl_fioasync(fd, filp, argp); | 450 | error = ioctl_fioasync(fd, filp, argp); |
| 451 | unlock_kernel(); | ||
| 448 | break; | 452 | break; |
| 449 | 453 | ||
| 450 | case FIOQSIZE: | 454 | case FIOQSIZE: |
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index 5f180cf7abbd..5e0c0d0aef7d 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h | |||
| @@ -86,7 +86,8 @@ | |||
| 86 | #define OCFS2_CLEAR_INCOMPAT_FEATURE(sb,mask) \ | 86 | #define OCFS2_CLEAR_INCOMPAT_FEATURE(sb,mask) \ |
| 87 | OCFS2_SB(sb)->s_feature_incompat &= ~(mask) | 87 | OCFS2_SB(sb)->s_feature_incompat &= ~(mask) |
| 88 | 88 | ||
| 89 | #define OCFS2_FEATURE_COMPAT_SUPP OCFS2_FEATURE_COMPAT_BACKUP_SB | 89 | #define OCFS2_FEATURE_COMPAT_SUPP (OCFS2_FEATURE_COMPAT_BACKUP_SB \ |
| 90 | | OCFS2_FEATURE_COMPAT_JBD2_SB) | ||
| 90 | #define OCFS2_FEATURE_INCOMPAT_SUPP (OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT \ | 91 | #define OCFS2_FEATURE_INCOMPAT_SUPP (OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT \ |
| 91 | | OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC \ | 92 | | OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC \ |
| 92 | | OCFS2_FEATURE_INCOMPAT_INLINE_DATA \ | 93 | | OCFS2_FEATURE_INCOMPAT_INLINE_DATA \ |
| @@ -153,6 +154,11 @@ | |||
| 153 | #define OCFS2_FEATURE_COMPAT_BACKUP_SB 0x0001 | 154 | #define OCFS2_FEATURE_COMPAT_BACKUP_SB 0x0001 |
| 154 | 155 | ||
| 155 | /* | 156 | /* |
| 157 | * The filesystem will correctly handle journal feature bits. | ||
| 158 | */ | ||
| 159 | #define OCFS2_FEATURE_COMPAT_JBD2_SB 0x0002 | ||
| 160 | |||
| 161 | /* | ||
| 156 | * Unwritten extents support. | 162 | * Unwritten extents support. |
| 157 | */ | 163 | */ |
| 158 | #define OCFS2_FEATURE_RO_COMPAT_UNWRITTEN 0x0001 | 164 | #define OCFS2_FEATURE_RO_COMPAT_UNWRITTEN 0x0001 |
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 054e2efb0b7e..74d7367ade13 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c | |||
| @@ -2645,9 +2645,9 @@ static int ocfs2_xattr_update_xattr_search(struct inode *inode, | |||
| 2645 | return ret; | 2645 | return ret; |
| 2646 | } | 2646 | } |
| 2647 | 2647 | ||
| 2648 | i = xs->here - old_xh->xh_entries; | ||
| 2649 | xs->here = &xs->header->xh_entries[i]; | ||
| 2650 | } | 2648 | } |
| 2649 | i = xs->here - old_xh->xh_entries; | ||
| 2650 | xs->here = &xs->header->xh_entries[i]; | ||
| 2651 | } | 2651 | } |
| 2652 | 2652 | ||
| 2653 | return ret; | 2653 | return ret; |
diff --git a/fs/proc/base.c b/fs/proc/base.c index 486cf3fe7139..d4677603c889 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -371,7 +371,7 @@ static int lstats_show_proc(struct seq_file *m, void *v) | |||
| 371 | task->latency_record[i].time, | 371 | task->latency_record[i].time, |
| 372 | task->latency_record[i].max); | 372 | task->latency_record[i].max); |
| 373 | for (q = 0; q < LT_BACKTRACEDEPTH; q++) { | 373 | for (q = 0; q < LT_BACKTRACEDEPTH; q++) { |
| 374 | char sym[KSYM_NAME_LEN]; | 374 | char sym[KSYM_SYMBOL_LEN]; |
| 375 | char *c; | 375 | char *c; |
| 376 | if (!task->latency_record[i].backtrace[q]) | 376 | if (!task->latency_record[i].backtrace[q]) |
| 377 | break; | 377 | break; |
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index b770c095e45c..3a8bdd7f5756 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
| @@ -557,9 +557,9 @@ static u64 swap_pte_to_pagemap_entry(pte_t pte) | |||
| 557 | return swp_type(e) | (swp_offset(e) << MAX_SWAPFILES_SHIFT); | 557 | return swp_type(e) | (swp_offset(e) << MAX_SWAPFILES_SHIFT); |
| 558 | } | 558 | } |
| 559 | 559 | ||
| 560 | static unsigned long pte_to_pagemap_entry(pte_t pte) | 560 | static u64 pte_to_pagemap_entry(pte_t pte) |
| 561 | { | 561 | { |
| 562 | unsigned long pme = 0; | 562 | u64 pme = 0; |
| 563 | if (is_swap_pte(pte)) | 563 | if (is_swap_pte(pte)) |
| 564 | pme = PM_PFRAME(swap_pte_to_pagemap_entry(pte)) | 564 | pme = PM_PFRAME(swap_pte_to_pagemap_entry(pte)) |
| 565 | | PM_PSHIFT(PAGE_SHIFT) | PM_SWAP; | 565 | | PM_PSHIFT(PAGE_SHIFT) | PM_SWAP; |
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index 4ec0a296bdec..7abdaa91ccd3 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h | |||
| @@ -251,7 +251,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) | |||
| 251 | #define atomic_long_cmpxchg(l, old, new) \ | 251 | #define atomic_long_cmpxchg(l, old, new) \ |
| 252 | (atomic_cmpxchg((atomic_t *)(l), (old), (new))) | 252 | (atomic_cmpxchg((atomic_t *)(l), (old), (new))) |
| 253 | #define atomic_long_xchg(v, new) \ | 253 | #define atomic_long_xchg(v, new) \ |
| 254 | (atomic_xchg((atomic_t *)(l), (new))) | 254 | (atomic_xchg((atomic_t *)(v), (new))) |
| 255 | 255 | ||
| 256 | #endif /* BITS_PER_LONG == 64 */ | 256 | #endif /* BITS_PER_LONG == 64 */ |
| 257 | 257 | ||
diff --git a/include/asm-generic/audit_write.h b/include/asm-generic/audit_write.h index f10d367fb2a5..c5f1c2c920e2 100644 --- a/include/asm-generic/audit_write.h +++ b/include/asm-generic/audit_write.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #include <asm-generic/audit_dir_write.h> | 1 | #include <asm-generic/audit_dir_write.h> |
| 2 | __NR_acct, | 2 | __NR_acct, |
| 3 | #ifdef __NR_swapon | ||
| 3 | __NR_swapon, | 4 | __NR_swapon, |
| 5 | #endif | ||
| 4 | __NR_quotactl, | 6 | __NR_quotactl, |
| 5 | __NR_truncate, | 7 | __NR_truncate, |
| 6 | #ifdef __NR_truncate64 | 8 | #ifdef __NR_truncate64 |
diff --git a/include/asm-mn10300/uaccess.h b/include/asm-mn10300/uaccess.h index 46b9b647f3c3..8a3a4dd55763 100644 --- a/include/asm-mn10300/uaccess.h +++ b/include/asm-mn10300/uaccess.h | |||
| @@ -266,7 +266,7 @@ extern int __get_user_unknown(void); | |||
| 266 | " .section .fixup,\"ax\" \n" \ | 266 | " .section .fixup,\"ax\" \n" \ |
| 267 | "4: \n" \ | 267 | "4: \n" \ |
| 268 | " mov %5,%0 \n" \ | 268 | " mov %5,%0 \n" \ |
| 269 | " jmp 2b \n" \ | 269 | " jmp 3b \n" \ |
| 270 | " .previous \n" \ | 270 | " .previous \n" \ |
| 271 | " .section __ex_table,\"a\"\n" \ | 271 | " .section __ex_table,\"a\"\n" \ |
| 272 | " .balign 4 \n" \ | 272 | " .balign 4 \n" \ |
diff --git a/include/linux/audit.h b/include/linux/audit.h index 6272a395d43c..8f0672d13eb1 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -391,6 +391,7 @@ extern int audit_classify_arch(int arch); | |||
| 391 | #ifdef CONFIG_AUDITSYSCALL | 391 | #ifdef CONFIG_AUDITSYSCALL |
| 392 | /* These are defined in auditsc.c */ | 392 | /* These are defined in auditsc.c */ |
| 393 | /* Public API */ | 393 | /* Public API */ |
| 394 | extern void audit_finish_fork(struct task_struct *child); | ||
| 394 | extern int audit_alloc(struct task_struct *task); | 395 | extern int audit_alloc(struct task_struct *task); |
| 395 | extern void audit_free(struct task_struct *task); | 396 | extern void audit_free(struct task_struct *task); |
| 396 | extern void audit_syscall_entry(int arch, | 397 | extern void audit_syscall_entry(int arch, |
| @@ -434,7 +435,7 @@ static inline void audit_ptrace(struct task_struct *t) | |||
| 434 | 435 | ||
| 435 | /* Private API (for audit.c only) */ | 436 | /* Private API (for audit.c only) */ |
| 436 | extern unsigned int audit_serial(void); | 437 | extern unsigned int audit_serial(void); |
| 437 | extern void auditsc_get_stamp(struct audit_context *ctx, | 438 | extern int auditsc_get_stamp(struct audit_context *ctx, |
| 438 | struct timespec *t, unsigned int *serial); | 439 | struct timespec *t, unsigned int *serial); |
| 439 | extern int audit_set_loginuid(struct task_struct *task, uid_t loginuid); | 440 | extern int audit_set_loginuid(struct task_struct *task, uid_t loginuid); |
| 440 | #define audit_get_loginuid(t) ((t)->loginuid) | 441 | #define audit_get_loginuid(t) ((t)->loginuid) |
| @@ -504,6 +505,7 @@ static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat) | |||
| 504 | extern int audit_n_rules; | 505 | extern int audit_n_rules; |
| 505 | extern int audit_signals; | 506 | extern int audit_signals; |
| 506 | #else | 507 | #else |
| 508 | #define audit_finish_fork(t) | ||
| 507 | #define audit_alloc(t) ({ 0; }) | 509 | #define audit_alloc(t) ({ 0; }) |
| 508 | #define audit_free(t) do { ; } while (0) | 510 | #define audit_free(t) do { ; } while (0) |
| 509 | #define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0) | 511 | #define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0) |
| @@ -516,7 +518,7 @@ extern int audit_signals; | |||
| 516 | #define audit_inode(n,d) do { ; } while (0) | 518 | #define audit_inode(n,d) do { ; } while (0) |
| 517 | #define audit_inode_child(d,i,p) do { ; } while (0) | 519 | #define audit_inode_child(d,i,p) do { ; } while (0) |
| 518 | #define audit_core_dumps(i) do { ; } while (0) | 520 | #define audit_core_dumps(i) do { ; } while (0) |
| 519 | #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0) | 521 | #define auditsc_get_stamp(c,t,s) (0) |
| 520 | #define audit_get_loginuid(t) (-1) | 522 | #define audit_get_loginuid(t) (-1) |
| 521 | #define audit_get_sessionid(t) (-1) | 523 | #define audit_get_sessionid(t) (-1) |
| 522 | #define audit_log_task_context(b) do { ; } while (0) | 524 | #define audit_log_task_context(b) do { ; } while (0) |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 6dcd30d806cd..031a315c0509 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -662,6 +662,7 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn; | |||
| 662 | * default timeout for SG_IO if none specified | 662 | * default timeout for SG_IO if none specified |
| 663 | */ | 663 | */ |
| 664 | #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) | 664 | #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) |
| 665 | #define BLK_MIN_SG_TIMEOUT (7 * HZ) | ||
| 665 | 666 | ||
| 666 | #ifdef CONFIG_BOUNCE | 667 | #ifdef CONFIG_BOUNCE |
| 667 | extern int init_emergency_isa_pool(void); | 668 | extern int init_emergency_isa_pool(void); |
diff --git a/include/linux/can/core.h b/include/linux/can/core.h index e9ca210ffa5b..f50785ad4781 100644 --- a/include/linux/can/core.h +++ b/include/linux/can/core.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/skbuff.h> | 19 | #include <linux/skbuff.h> |
| 20 | #include <linux/netdevice.h> | 20 | #include <linux/netdevice.h> |
| 21 | 21 | ||
| 22 | #define CAN_VERSION "20071116" | 22 | #define CAN_VERSION "20081130" |
| 23 | 23 | ||
| 24 | /* increment this number each time you change some user-space interface */ | 24 | /* increment this number each time you change some user-space interface */ |
| 25 | #define CAN_ABI_VERSION "8" | 25 | #define CAN_ABI_VERSION "8" |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 965b9ba3865d..1ba7630e329c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -63,23 +63,24 @@ extern int dir_notify_enable; | |||
| 63 | #define MAY_ACCESS 16 | 63 | #define MAY_ACCESS 16 |
| 64 | #define MAY_OPEN 32 | 64 | #define MAY_OPEN 32 |
| 65 | 65 | ||
| 66 | #define FMODE_READ ((__force fmode_t)1) | 66 | /* file is open for reading */ |
| 67 | #define FMODE_WRITE ((__force fmode_t)2) | 67 | #define FMODE_READ ((__force fmode_t)1) |
| 68 | 68 | /* file is open for writing */ | |
| 69 | /* Internal kernel extensions */ | 69 | #define FMODE_WRITE ((__force fmode_t)2) |
| 70 | #define FMODE_LSEEK ((__force fmode_t)4) | 70 | /* file is seekable */ |
| 71 | #define FMODE_PREAD ((__force fmode_t)8) | 71 | #define FMODE_LSEEK ((__force fmode_t)4) |
| 72 | #define FMODE_PWRITE FMODE_PREAD /* These go hand in hand */ | 72 | /* file can be accessed using pread/pwrite */ |
| 73 | 73 | #define FMODE_PREAD ((__force fmode_t)8) | |
| 74 | /* File is being opened for execution. Primary users of this flag are | 74 | #define FMODE_PWRITE FMODE_PREAD /* These go hand in hand */ |
| 75 | distributed filesystems that can use it to achieve correct ETXTBUSY | 75 | /* File is opened for execution with sys_execve / sys_uselib */ |
| 76 | behavior for cross-node execution/opening_for_writing of files */ | 76 | #define FMODE_EXEC ((__force fmode_t)16) |
| 77 | #define FMODE_EXEC ((__force fmode_t)16) | 77 | /* File is opened with O_NDELAY (only set for block devices) */ |
| 78 | 78 | #define FMODE_NDELAY ((__force fmode_t)32) | |
| 79 | #define FMODE_NDELAY ((__force fmode_t)32) | 79 | /* File is opened with O_EXCL (only set for block devices) */ |
| 80 | #define FMODE_EXCL ((__force fmode_t)64) | 80 | #define FMODE_EXCL ((__force fmode_t)64) |
| 81 | /* File is opened using open(.., 3, ..) and is writeable only for ioctls | ||
| 82 | (specialy hack for floppy.c) */ | ||
| 81 | #define FMODE_WRITE_IOCTL ((__force fmode_t)128) | 83 | #define FMODE_WRITE_IOCTL ((__force fmode_t)128) |
| 82 | #define FMODE_NDELAY_NOW ((__force fmode_t)256) | ||
| 83 | 84 | ||
| 84 | /* | 85 | /* |
| 85 | * Don't update ctime and mtime. | 86 | * Don't update ctime and mtime. |
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 703eb53cfa2b..9c5bc6be2b09 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/ktime.h> | 6 | #include <linux/ktime.h> |
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/module.h> | ||
| 9 | #include <linux/kallsyms.h> | 10 | #include <linux/kallsyms.h> |
| 10 | 11 | ||
| 11 | #ifdef CONFIG_FUNCTION_TRACER | 12 | #ifdef CONFIG_FUNCTION_TRACER |
| @@ -231,7 +232,7 @@ ftrace_init_module(unsigned long *start, unsigned long *end) { } | |||
| 231 | 232 | ||
| 232 | struct boot_trace { | 233 | struct boot_trace { |
| 233 | pid_t caller; | 234 | pid_t caller; |
| 234 | char func[KSYM_NAME_LEN]; | 235 | char func[KSYM_SYMBOL_LEN]; |
| 235 | int result; | 236 | int result; |
| 236 | unsigned long long duration; /* usecs */ | 237 | unsigned long long duration; /* usecs */ |
| 237 | ktime_t calltime; | 238 | ktime_t calltime; |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9d77b1d7dca8..e26f54952892 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -319,6 +319,7 @@ enum | |||
| 319 | { | 319 | { |
| 320 | NAPI_STATE_SCHED, /* Poll is scheduled */ | 320 | NAPI_STATE_SCHED, /* Poll is scheduled */ |
| 321 | NAPI_STATE_DISABLE, /* Disable pending */ | 321 | NAPI_STATE_DISABLE, /* Disable pending */ |
| 322 | NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from poll_list */ | ||
| 322 | }; | 323 | }; |
| 323 | 324 | ||
| 324 | extern void __napi_schedule(struct napi_struct *n); | 325 | extern void __napi_schedule(struct napi_struct *n); |
| @@ -1497,6 +1498,12 @@ static inline void netif_rx_complete(struct net_device *dev, | |||
| 1497 | { | 1498 | { |
| 1498 | unsigned long flags; | 1499 | unsigned long flags; |
| 1499 | 1500 | ||
| 1501 | /* | ||
| 1502 | * don't let napi dequeue from the cpu poll list | ||
| 1503 | * just in case its running on a different cpu | ||
| 1504 | */ | ||
| 1505 | if (unlikely(test_bit(NAPI_STATE_NPSVC, &napi->state))) | ||
| 1506 | return; | ||
| 1500 | local_irq_save(flags); | 1507 | local_irq_save(flags); |
| 1501 | __netif_rx_complete(dev, napi); | 1508 | __netif_rx_complete(dev, napi); |
| 1502 | local_irq_restore(flags); | 1509 | local_irq_restore(flags); |
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h index c19595c89304..29fe9ea1d346 100644 --- a/include/linux/netfilter/nfnetlink_conntrack.h +++ b/include/linux/netfilter/nfnetlink_conntrack.h | |||
| @@ -141,6 +141,7 @@ enum ctattr_protonat { | |||
| 141 | #define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) | 141 | #define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) |
| 142 | 142 | ||
| 143 | enum ctattr_natseq { | 143 | enum ctattr_natseq { |
| 144 | CTA_NAT_SEQ_UNSPEC, | ||
| 144 | CTA_NAT_SEQ_CORRECTION_POS, | 145 | CTA_NAT_SEQ_CORRECTION_POS, |
| 145 | CTA_NAT_SEQ_OFFSET_BEFORE, | 146 | CTA_NAT_SEQ_OFFSET_BEFORE, |
| 146 | CTA_NAT_SEQ_OFFSET_AFTER, | 147 | CTA_NAT_SEQ_OFFSET_AFTER, |
diff --git a/include/linux/smp.h b/include/linux/smp.h index 3f9a60043a97..6e7ba16ff454 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
| @@ -146,6 +146,8 @@ static inline void smp_send_reschedule(int cpu) { } | |||
| 146 | }) | 146 | }) |
| 147 | #define smp_call_function_mask(mask, func, info, wait) \ | 147 | #define smp_call_function_mask(mask, func, info, wait) \ |
| 148 | (up_smp_call_function(func, info)) | 148 | (up_smp_call_function(func, info)) |
| 149 | #define smp_call_function_many(mask, func, info, wait) \ | ||
| 150 | (up_smp_call_function(func, info)) | ||
| 149 | static inline void init_call_single_data(void) | 151 | static inline void init_call_single_data(void) |
| 150 | { | 152 | { |
| 151 | } | 153 | } |
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h index 73a2f4eb1f7a..9b42baed3900 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h | |||
| @@ -158,8 +158,12 @@ struct usb_ctrlrequest { | |||
| 158 | * (rarely) accepted by SET_DESCRIPTOR. | 158 | * (rarely) accepted by SET_DESCRIPTOR. |
| 159 | * | 159 | * |
| 160 | * Note that all multi-byte values here are encoded in little endian | 160 | * Note that all multi-byte values here are encoded in little endian |
| 161 | * byte order "on the wire". But when exposed through Linux-USB APIs, | 161 | * byte order "on the wire". Within the kernel and when exposed |
| 162 | * they've been converted to cpu byte order. | 162 | * through the Linux-USB APIs, they are not converted to cpu byte |
| 163 | * order; it is the responsibility of the client code to do this. | ||
| 164 | * The single exception is when device and configuration descriptors (but | ||
| 165 | * not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD); | ||
| 166 | * in this case the fields are converted to host endianness by the kernel. | ||
| 163 | */ | 167 | */ |
| 164 | 168 | ||
| 165 | /* | 169 | /* |
diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h index 3025ae17ddbe..94c852d47d0f 100644 --- a/include/net/irda/irda_device.h +++ b/include/net/irda/irda_device.h | |||
| @@ -135,9 +135,11 @@ struct dongle_reg { | |||
| 135 | 135 | ||
| 136 | /* | 136 | /* |
| 137 | * Per-packet information we need to hide inside sk_buff | 137 | * Per-packet information we need to hide inside sk_buff |
| 138 | * (must not exceed 48 bytes, check with struct sk_buff) | 138 | * (must not exceed 48 bytes, check with struct sk_buff) |
| 139 | * The default_qdisc_pad field is a temporary hack. | ||
| 139 | */ | 140 | */ |
| 140 | struct irda_skb_cb { | 141 | struct irda_skb_cb { |
| 142 | unsigned int default_qdisc_pad; | ||
| 141 | magic_t magic; /* Be sure that we can trust the information */ | 143 | magic_t magic; /* Be sure that we can trust the information */ |
| 142 | __u32 next_speed; /* The Speed to be set *after* this frame */ | 144 | __u32 next_speed; /* The Speed to be set *after* this frame */ |
| 143 | __u16 mtt; /* Minimum turn around time */ | 145 | __u16 mtt; /* Minimum turn around time */ |
diff --git a/include/video/radeon.h b/include/video/radeon.h index d5dcaf154ba4..1cd09cc5b169 100644 --- a/include/video/radeon.h +++ b/include/video/radeon.h | |||
| @@ -525,9 +525,6 @@ | |||
| 525 | #define CRTC_DISPLAY_DIS (1 << 10) | 525 | #define CRTC_DISPLAY_DIS (1 << 10) |
| 526 | #define CRTC_CRT_ON (1 << 15) | 526 | #define CRTC_CRT_ON (1 << 15) |
| 527 | 527 | ||
| 528 | /* DSTCACHE_MODE bits constants */ | ||
| 529 | #define RB2D_DC_AUTOFLUSH_ENABLE (1 << 8) | ||
| 530 | #define RB2D_DC_DC_DISABLE_IGNORE_PE (1 << 17) | ||
| 531 | 528 | ||
| 532 | /* DSTCACHE_CTLSTAT bit constants */ | 529 | /* DSTCACHE_CTLSTAT bit constants */ |
| 533 | #define RB2D_DC_FLUSH_2D (1 << 0) | 530 | #define RB2D_DC_FLUSH_2D (1 << 0) |
| @@ -869,10 +866,15 @@ | |||
| 869 | #define GMC_DST_16BPP_YVYU422 0x00000c00 | 866 | #define GMC_DST_16BPP_YVYU422 0x00000c00 |
| 870 | #define GMC_DST_32BPP_AYUV444 0x00000e00 | 867 | #define GMC_DST_32BPP_AYUV444 0x00000e00 |
| 871 | #define GMC_DST_16BPP_ARGB4444 0x00000f00 | 868 | #define GMC_DST_16BPP_ARGB4444 0x00000f00 |
| 869 | #define GMC_SRC_MONO 0x00000000 | ||
| 870 | #define GMC_SRC_MONO_LBKGD 0x00001000 | ||
| 871 | #define GMC_SRC_DSTCOLOR 0x00003000 | ||
| 872 | #define GMC_BYTE_ORDER_MSB_TO_LSB 0x00000000 | 872 | #define GMC_BYTE_ORDER_MSB_TO_LSB 0x00000000 |
| 873 | #define GMC_BYTE_ORDER_LSB_TO_MSB 0x00004000 | 873 | #define GMC_BYTE_ORDER_LSB_TO_MSB 0x00004000 |
| 874 | #define GMC_DP_CONVERSION_TEMP_9300 0x00008000 | 874 | #define GMC_DP_CONVERSION_TEMP_9300 0x00008000 |
| 875 | #define GMC_DP_CONVERSION_TEMP_6500 0x00000000 | 875 | #define GMC_DP_CONVERSION_TEMP_6500 0x00000000 |
| 876 | #define GMC_DP_SRC_RECT 0x02000000 | ||
| 877 | #define GMC_DP_SRC_HOST 0x03000000 | ||
| 876 | #define GMC_DP_SRC_HOST_BYTEALIGN 0x04000000 | 878 | #define GMC_DP_SRC_HOST_BYTEALIGN 0x04000000 |
| 877 | #define GMC_3D_FCN_EN_CLR 0x00000000 | 879 | #define GMC_3D_FCN_EN_CLR 0x00000000 |
| 878 | #define GMC_3D_FCN_EN_SET 0x08000000 | 880 | #define GMC_3D_FCN_EN_SET 0x08000000 |
| @@ -883,9 +885,6 @@ | |||
| 883 | #define GMC_WRITE_MASK_LEAVE 0x00000000 | 885 | #define GMC_WRITE_MASK_LEAVE 0x00000000 |
| 884 | #define GMC_WRITE_MASK_SET 0x40000000 | 886 | #define GMC_WRITE_MASK_SET 0x40000000 |
| 885 | #define GMC_CLR_CMP_CNTL_DIS (1 << 28) | 887 | #define GMC_CLR_CMP_CNTL_DIS (1 << 28) |
| 886 | #define GMC_SRC_DATATYPE_MASK (3 << 12) | ||
| 887 | #define GMC_SRC_DATATYPE_MONO_FG_BG (0 << 12) | ||
| 888 | #define GMC_SRC_DATATYPE_MONO_FG_LA (1 << 12) | ||
| 889 | #define GMC_SRC_DATATYPE_COLOR (3 << 12) | 888 | #define GMC_SRC_DATATYPE_COLOR (3 << 12) |
| 890 | #define ROP3_S 0x00cc0000 | 889 | #define ROP3_S 0x00cc0000 |
| 891 | #define ROP3_SRCCOPY 0x00cc0000 | 890 | #define ROP3_SRCCOPY 0x00cc0000 |
| @@ -894,7 +893,6 @@ | |||
| 894 | #define DP_SRC_SOURCE_MASK (7 << 24) | 893 | #define DP_SRC_SOURCE_MASK (7 << 24) |
| 895 | #define GMC_BRUSH_NONE (15 << 4) | 894 | #define GMC_BRUSH_NONE (15 << 4) |
| 896 | #define DP_SRC_SOURCE_MEMORY (2 << 24) | 895 | #define DP_SRC_SOURCE_MEMORY (2 << 24) |
| 897 | #define DP_SRC_SOURCE_HOST_DATA (3 << 24) | ||
| 898 | #define GMC_BRUSH_SOLIDCOLOR 0x000000d0 | 896 | #define GMC_BRUSH_SOLIDCOLOR 0x000000d0 |
| 899 | 897 | ||
| 900 | /* DP_MIX bit constants */ | 898 | /* DP_MIX bit constants */ |
| @@ -980,12 +978,6 @@ | |||
| 980 | #define DISP_PWR_MAN_TV_ENABLE_RST (1 << 25) | 978 | #define DISP_PWR_MAN_TV_ENABLE_RST (1 << 25) |
| 981 | #define DISP_PWR_MAN_AUTO_PWRUP_EN (1 << 26) | 979 | #define DISP_PWR_MAN_AUTO_PWRUP_EN (1 << 26) |
| 982 | 980 | ||
| 983 | /* RBBM_GUICNTL constants */ | ||
| 984 | #define RBBM_GUICNTL_HOST_DATA_SWAP_NONE (0 << 0) | ||
| 985 | #define RBBM_GUICNTL_HOST_DATA_SWAP_16BIT (1 << 0) | ||
| 986 | #define RBBM_GUICNTL_HOST_DATA_SWAP_32BIT (2 << 0) | ||
| 987 | #define RBBM_GUICNTL_HOST_DATA_SWAP_HDW (3 << 0) | ||
| 988 | |||
| 989 | /* masks */ | 981 | /* masks */ |
| 990 | 982 | ||
| 991 | #define CONFIG_MEMSIZE_MASK 0x1f000000 | 983 | #define CONFIG_MEMSIZE_MASK 0x1f000000 |
diff --git a/kernel/audit.c b/kernel/audit.c index 4414e93d8750..ce6d8ea3131e 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -61,8 +61,11 @@ | |||
| 61 | 61 | ||
| 62 | #include "audit.h" | 62 | #include "audit.h" |
| 63 | 63 | ||
| 64 | /* No auditing will take place until audit_initialized != 0. | 64 | /* No auditing will take place until audit_initialized == AUDIT_INITIALIZED. |
| 65 | * (Initialization happens after skb_init is called.) */ | 65 | * (Initialization happens after skb_init is called.) */ |
| 66 | #define AUDIT_DISABLED -1 | ||
| 67 | #define AUDIT_UNINITIALIZED 0 | ||
| 68 | #define AUDIT_INITIALIZED 1 | ||
| 66 | static int audit_initialized; | 69 | static int audit_initialized; |
| 67 | 70 | ||
| 68 | #define AUDIT_OFF 0 | 71 | #define AUDIT_OFF 0 |
| @@ -965,6 +968,9 @@ static int __init audit_init(void) | |||
| 965 | { | 968 | { |
| 966 | int i; | 969 | int i; |
| 967 | 970 | ||
| 971 | if (audit_initialized == AUDIT_DISABLED) | ||
| 972 | return 0; | ||
| 973 | |||
| 968 | printk(KERN_INFO "audit: initializing netlink socket (%s)\n", | 974 | printk(KERN_INFO "audit: initializing netlink socket (%s)\n", |
| 969 | audit_default ? "enabled" : "disabled"); | 975 | audit_default ? "enabled" : "disabled"); |
| 970 | audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, 0, | 976 | audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, 0, |
| @@ -976,7 +982,7 @@ static int __init audit_init(void) | |||
| 976 | 982 | ||
| 977 | skb_queue_head_init(&audit_skb_queue); | 983 | skb_queue_head_init(&audit_skb_queue); |
| 978 | skb_queue_head_init(&audit_skb_hold_queue); | 984 | skb_queue_head_init(&audit_skb_hold_queue); |
| 979 | audit_initialized = 1; | 985 | audit_initialized = AUDIT_INITIALIZED; |
| 980 | audit_enabled = audit_default; | 986 | audit_enabled = audit_default; |
| 981 | audit_ever_enabled |= !!audit_default; | 987 | audit_ever_enabled |= !!audit_default; |
| 982 | 988 | ||
| @@ -999,13 +1005,21 @@ __initcall(audit_init); | |||
| 999 | static int __init audit_enable(char *str) | 1005 | static int __init audit_enable(char *str) |
| 1000 | { | 1006 | { |
| 1001 | audit_default = !!simple_strtol(str, NULL, 0); | 1007 | audit_default = !!simple_strtol(str, NULL, 0); |
| 1002 | printk(KERN_INFO "audit: %s%s\n", | 1008 | if (!audit_default) |
| 1003 | audit_default ? "enabled" : "disabled", | 1009 | audit_initialized = AUDIT_DISABLED; |
| 1004 | audit_initialized ? "" : " (after initialization)"); | 1010 | |
| 1005 | if (audit_initialized) { | 1011 | printk(KERN_INFO "audit: %s", audit_default ? "enabled" : "disabled"); |
| 1012 | |||
| 1013 | if (audit_initialized == AUDIT_INITIALIZED) { | ||
| 1006 | audit_enabled = audit_default; | 1014 | audit_enabled = audit_default; |
| 1007 | audit_ever_enabled |= !!audit_default; | 1015 | audit_ever_enabled |= !!audit_default; |
| 1016 | } else if (audit_initialized == AUDIT_UNINITIALIZED) { | ||
| 1017 | printk(" (after initialization)"); | ||
| 1018 | } else { | ||
| 1019 | printk(" (until reboot)"); | ||
| 1008 | } | 1020 | } |
| 1021 | printk("\n"); | ||
| 1022 | |||
| 1009 | return 1; | 1023 | return 1; |
| 1010 | } | 1024 | } |
| 1011 | 1025 | ||
| @@ -1107,9 +1121,7 @@ unsigned int audit_serial(void) | |||
| 1107 | static inline void audit_get_stamp(struct audit_context *ctx, | 1121 | static inline void audit_get_stamp(struct audit_context *ctx, |
| 1108 | struct timespec *t, unsigned int *serial) | 1122 | struct timespec *t, unsigned int *serial) |
| 1109 | { | 1123 | { |
| 1110 | if (ctx) | 1124 | if (!ctx || !auditsc_get_stamp(ctx, t, serial)) { |
| 1111 | auditsc_get_stamp(ctx, t, serial); | ||
| 1112 | else { | ||
| 1113 | *t = CURRENT_TIME; | 1125 | *t = CURRENT_TIME; |
| 1114 | *serial = audit_serial(); | 1126 | *serial = audit_serial(); |
| 1115 | } | 1127 | } |
| @@ -1146,7 +1158,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, | |||
| 1146 | int reserve; | 1158 | int reserve; |
| 1147 | unsigned long timeout_start = jiffies; | 1159 | unsigned long timeout_start = jiffies; |
| 1148 | 1160 | ||
| 1149 | if (!audit_initialized) | 1161 | if (audit_initialized != AUDIT_INITIALIZED) |
| 1150 | return NULL; | 1162 | return NULL; |
| 1151 | 1163 | ||
| 1152 | if (unlikely(audit_filter_type(type))) | 1164 | if (unlikely(audit_filter_type(type))) |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index cf5bc2f5f9c3..2a3f0afc4d2a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -1459,7 +1459,6 @@ void audit_free(struct task_struct *tsk) | |||
| 1459 | 1459 | ||
| 1460 | /** | 1460 | /** |
| 1461 | * audit_syscall_entry - fill in an audit record at syscall entry | 1461 | * audit_syscall_entry - fill in an audit record at syscall entry |
| 1462 | * @tsk: task being audited | ||
| 1463 | * @arch: architecture type | 1462 | * @arch: architecture type |
| 1464 | * @major: major syscall type (function) | 1463 | * @major: major syscall type (function) |
| 1465 | * @a1: additional syscall register 1 | 1464 | * @a1: additional syscall register 1 |
| @@ -1548,9 +1547,25 @@ void audit_syscall_entry(int arch, int major, | |||
| 1548 | context->ppid = 0; | 1547 | context->ppid = 0; |
| 1549 | } | 1548 | } |
| 1550 | 1549 | ||
| 1550 | void audit_finish_fork(struct task_struct *child) | ||
| 1551 | { | ||
| 1552 | struct audit_context *ctx = current->audit_context; | ||
| 1553 | struct audit_context *p = child->audit_context; | ||
| 1554 | if (!p || !ctx || !ctx->auditable) | ||
| 1555 | return; | ||
| 1556 | p->arch = ctx->arch; | ||
| 1557 | p->major = ctx->major; | ||
| 1558 | memcpy(p->argv, ctx->argv, sizeof(ctx->argv)); | ||
| 1559 | p->ctime = ctx->ctime; | ||
| 1560 | p->dummy = ctx->dummy; | ||
| 1561 | p->auditable = ctx->auditable; | ||
| 1562 | p->in_syscall = ctx->in_syscall; | ||
| 1563 | p->filterkey = kstrdup(ctx->filterkey, GFP_KERNEL); | ||
| 1564 | p->ppid = current->pid; | ||
| 1565 | } | ||
| 1566 | |||
| 1551 | /** | 1567 | /** |
| 1552 | * audit_syscall_exit - deallocate audit context after a system call | 1568 | * audit_syscall_exit - deallocate audit context after a system call |
| 1553 | * @tsk: task being audited | ||
| 1554 | * @valid: success/failure flag | 1569 | * @valid: success/failure flag |
| 1555 | * @return_code: syscall return value | 1570 | * @return_code: syscall return value |
| 1556 | * | 1571 | * |
| @@ -1942,15 +1957,18 @@ EXPORT_SYMBOL_GPL(__audit_inode_child); | |||
| 1942 | * | 1957 | * |
| 1943 | * Also sets the context as auditable. | 1958 | * Also sets the context as auditable. |
| 1944 | */ | 1959 | */ |
| 1945 | void auditsc_get_stamp(struct audit_context *ctx, | 1960 | int auditsc_get_stamp(struct audit_context *ctx, |
| 1946 | struct timespec *t, unsigned int *serial) | 1961 | struct timespec *t, unsigned int *serial) |
| 1947 | { | 1962 | { |
| 1963 | if (!ctx->in_syscall) | ||
| 1964 | return 0; | ||
| 1948 | if (!ctx->serial) | 1965 | if (!ctx->serial) |
| 1949 | ctx->serial = audit_serial(); | 1966 | ctx->serial = audit_serial(); |
| 1950 | t->tv_sec = ctx->ctime.tv_sec; | 1967 | t->tv_sec = ctx->ctime.tv_sec; |
| 1951 | t->tv_nsec = ctx->ctime.tv_nsec; | 1968 | t->tv_nsec = ctx->ctime.tv_nsec; |
| 1952 | *serial = ctx->serial; | 1969 | *serial = ctx->serial; |
| 1953 | ctx->auditable = 1; | 1970 | ctx->auditable = 1; |
| 1971 | return 1; | ||
| 1954 | } | 1972 | } |
| 1955 | 1973 | ||
| 1956 | /* global counter which is incremented every time something logs in */ | 1974 | /* global counter which is incremented every time something logs in */ |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index fe00b3b983a8..8185a0f09594 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -702,7 +702,7 @@ static int rebind_subsystems(struct cgroupfs_root *root, | |||
| 702 | * any child cgroups exist. This is theoretically supportable | 702 | * any child cgroups exist. This is theoretically supportable |
| 703 | * but involves complex error handling, so it's being left until | 703 | * but involves complex error handling, so it's being left until |
| 704 | * later */ | 704 | * later */ |
| 705 | if (!list_empty(&cgrp->children)) | 705 | if (root->number_of_cgroups > 1) |
| 706 | return -EBUSY; | 706 | return -EBUSY; |
| 707 | 707 | ||
| 708 | /* Process each subsystem */ | 708 | /* Process each subsystem */ |
diff --git a/kernel/fork.c b/kernel/fork.c index 2a372a0e206f..495da2e9a8b4 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -315,17 +315,20 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) | |||
| 315 | file = tmp->vm_file; | 315 | file = tmp->vm_file; |
| 316 | if (file) { | 316 | if (file) { |
| 317 | struct inode *inode = file->f_path.dentry->d_inode; | 317 | struct inode *inode = file->f_path.dentry->d_inode; |
| 318 | struct address_space *mapping = file->f_mapping; | ||
| 319 | |||
| 318 | get_file(file); | 320 | get_file(file); |
| 319 | if (tmp->vm_flags & VM_DENYWRITE) | 321 | if (tmp->vm_flags & VM_DENYWRITE) |
| 320 | atomic_dec(&inode->i_writecount); | 322 | atomic_dec(&inode->i_writecount); |
| 321 | 323 | spin_lock(&mapping->i_mmap_lock); | |
| 322 | /* insert tmp into the share list, just after mpnt */ | 324 | if (tmp->vm_flags & VM_SHARED) |
| 323 | spin_lock(&file->f_mapping->i_mmap_lock); | 325 | mapping->i_mmap_writable++; |
| 324 | tmp->vm_truncate_count = mpnt->vm_truncate_count; | 326 | tmp->vm_truncate_count = mpnt->vm_truncate_count; |
| 325 | flush_dcache_mmap_lock(file->f_mapping); | 327 | flush_dcache_mmap_lock(mapping); |
| 328 | /* insert tmp into the share list, just after mpnt */ | ||
| 326 | vma_prio_tree_add(tmp, mpnt); | 329 | vma_prio_tree_add(tmp, mpnt); |
| 327 | flush_dcache_mmap_unlock(file->f_mapping); | 330 | flush_dcache_mmap_unlock(mapping); |
| 328 | spin_unlock(&file->f_mapping->i_mmap_lock); | 331 | spin_unlock(&mapping->i_mmap_lock); |
| 329 | } | 332 | } |
| 330 | 333 | ||
| 331 | /* | 334 | /* |
| @@ -1398,6 +1401,7 @@ long do_fork(unsigned long clone_flags, | |||
| 1398 | init_completion(&vfork); | 1401 | init_completion(&vfork); |
| 1399 | } | 1402 | } |
| 1400 | 1403 | ||
| 1404 | audit_finish_fork(p); | ||
| 1401 | tracehook_report_clone(trace, regs, clone_flags, nr, p); | 1405 | tracehook_report_clone(trace, regs, clone_flags, nr, p); |
| 1402 | 1406 | ||
| 1403 | /* | 1407 | /* |
diff --git a/kernel/latencytop.c b/kernel/latencytop.c index 5e7b45c56923..449db466bdbc 100644 --- a/kernel/latencytop.c +++ b/kernel/latencytop.c | |||
| @@ -191,7 +191,7 @@ static int lstats_show(struct seq_file *m, void *v) | |||
| 191 | latency_record[i].time, | 191 | latency_record[i].time, |
| 192 | latency_record[i].max); | 192 | latency_record[i].max); |
| 193 | for (q = 0; q < LT_BACKTRACEDEPTH; q++) { | 193 | for (q = 0; q < LT_BACKTRACEDEPTH; q++) { |
| 194 | char sym[KSYM_NAME_LEN]; | 194 | char sym[KSYM_SYMBOL_LEN]; |
| 195 | char *c; | 195 | char *c; |
| 196 | if (!latency_record[i].backtrace[q]) | 196 | if (!latency_record[i].backtrace[q]) |
| 197 | break; | 197 | break; |
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index 895337b16a24..4e5288a831de 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c | |||
| @@ -311,7 +311,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock, | |||
| 311 | struct task_cputime cputime; | 311 | struct task_cputime cputime; |
| 312 | 312 | ||
| 313 | thread_group_cputime(p, &cputime); | 313 | thread_group_cputime(p, &cputime); |
| 314 | switch (which_clock) { | 314 | switch (CPUCLOCK_WHICH(which_clock)) { |
| 315 | default: | 315 | default: |
| 316 | return -EINVAL; | 316 | return -EINVAL; |
| 317 | case CPUCLOCK_PROF: | 317 | case CPUCLOCK_PROF: |
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 5e79c662294b..a140e44eebba 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
| @@ -197,6 +197,11 @@ static int common_timer_create(struct k_itimer *new_timer) | |||
| 197 | return 0; | 197 | return 0; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | static int no_timer_create(struct k_itimer *new_timer) | ||
| 201 | { | ||
| 202 | return -EOPNOTSUPP; | ||
| 203 | } | ||
| 204 | |||
| 200 | /* | 205 | /* |
| 201 | * Return nonzero if we know a priori this clockid_t value is bogus. | 206 | * Return nonzero if we know a priori this clockid_t value is bogus. |
| 202 | */ | 207 | */ |
| @@ -248,6 +253,7 @@ static __init int init_posix_timers(void) | |||
| 248 | .clock_getres = hrtimer_get_res, | 253 | .clock_getres = hrtimer_get_res, |
| 249 | .clock_get = posix_get_monotonic_raw, | 254 | .clock_get = posix_get_monotonic_raw, |
| 250 | .clock_set = do_posix_clock_nosettime, | 255 | .clock_set = do_posix_clock_nosettime, |
| 256 | .timer_create = no_timer_create, | ||
| 251 | }; | 257 | }; |
| 252 | 258 | ||
| 253 | register_posix_clock(CLOCK_REALTIME, &clock_realtime); | 259 | register_posix_clock(CLOCK_REALTIME, &clock_realtime); |
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index b7713b53d07a..6da14358537c 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
| @@ -633,7 +633,7 @@ void swsusp_close(fmode_t mode) | |||
| 633 | return; | 633 | return; |
| 634 | } | 634 | } |
| 635 | 635 | ||
| 636 | blkdev_put(resume_bdev, mode); /* move up */ | 636 | blkdev_put(resume_bdev, mode); |
| 637 | } | 637 | } |
| 638 | 638 | ||
| 639 | static int swsusp_header_init(void) | 639 | static int swsusp_header_init(void) |
diff --git a/kernel/relay.c b/kernel/relay.c index 32b0befdcb6a..09ac2008f77b 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
| @@ -1317,12 +1317,9 @@ static ssize_t relay_file_splice_read(struct file *in, | |||
| 1317 | if (ret < 0) | 1317 | if (ret < 0) |
| 1318 | break; | 1318 | break; |
| 1319 | else if (!ret) { | 1319 | else if (!ret) { |
| 1320 | if (spliced) | 1320 | if (flags & SPLICE_F_NONBLOCK) |
| 1321 | break; | ||
| 1322 | if (flags & SPLICE_F_NONBLOCK) { | ||
| 1323 | ret = -EAGAIN; | 1321 | ret = -EAGAIN; |
| 1324 | break; | 1322 | break; |
| 1325 | } | ||
| 1326 | } | 1323 | } |
| 1327 | 1324 | ||
| 1328 | *ppos += ret; | 1325 | *ppos += ret; |
diff --git a/kernel/sched.c b/kernel/sched.c index b7480fb5c3dc..e4bb1dd7b308 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -6587,7 +6587,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
| 6587 | req = list_entry(rq->migration_queue.next, | 6587 | req = list_entry(rq->migration_queue.next, |
| 6588 | struct migration_req, list); | 6588 | struct migration_req, list); |
| 6589 | list_del_init(&req->list); | 6589 | list_del_init(&req->list); |
| 6590 | spin_unlock_irq(&rq->lock); | ||
| 6590 | complete(&req->done); | 6591 | complete(&req->done); |
| 6592 | spin_lock_irq(&rq->lock); | ||
| 6591 | } | 6593 | } |
| 6592 | spin_unlock_irq(&rq->lock); | 6594 | spin_unlock_irq(&rq->lock); |
| 6593 | break; | 6595 | break; |
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c index 81787248b60f..e8ab096ddfe3 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c | |||
| @@ -118,13 +118,13 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now) | |||
| 118 | 118 | ||
| 119 | /* | 119 | /* |
| 120 | * scd->clock = clamp(scd->tick_gtod + delta, | 120 | * scd->clock = clamp(scd->tick_gtod + delta, |
| 121 | * max(scd->tick_gtod, scd->clock), | 121 | * max(scd->tick_gtod, scd->clock), |
| 122 | * max(scd->clock, scd->tick_gtod + TICK_NSEC)); | 122 | * scd->tick_gtod + TICK_NSEC); |
| 123 | */ | 123 | */ |
| 124 | 124 | ||
| 125 | clock = scd->tick_gtod + delta; | 125 | clock = scd->tick_gtod + delta; |
| 126 | min_clock = wrap_max(scd->tick_gtod, scd->clock); | 126 | min_clock = wrap_max(scd->tick_gtod, scd->clock); |
| 127 | max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC); | 127 | max_clock = scd->tick_gtod + TICK_NSEC; |
| 128 | 128 | ||
| 129 | clock = wrap_max(clock, min_clock); | 129 | clock = wrap_max(clock, min_clock); |
| 130 | clock = wrap_min(clock, max_clock); | 130 | clock = wrap_min(clock, max_clock); |
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 3953e4aed733..dc0b3be6b7d5 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
| @@ -188,7 +188,7 @@ static void check_hung_task(struct task_struct *t, unsigned long now) | |||
| 188 | if ((long)(now - t->last_switch_timestamp) < | 188 | if ((long)(now - t->last_switch_timestamp) < |
| 189 | sysctl_hung_task_timeout_secs) | 189 | sysctl_hung_task_timeout_secs) |
| 190 | return; | 190 | return; |
| 191 | if (sysctl_hung_task_warnings < 0) | 191 | if (!sysctl_hung_task_warnings) |
| 192 | return; | 192 | return; |
| 193 | sysctl_hung_task_warnings--; | 193 | sysctl_hung_task_warnings--; |
| 194 | 194 | ||
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index e7acfb482a68..fa05e88aa76f 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
| @@ -518,6 +518,28 @@ void update_wall_time(void) | |||
| 518 | /* correct the clock when NTP error is too big */ | 518 | /* correct the clock when NTP error is too big */ |
| 519 | clocksource_adjust(offset); | 519 | clocksource_adjust(offset); |
| 520 | 520 | ||
| 521 | /* | ||
| 522 | * Since in the loop above, we accumulate any amount of time | ||
| 523 | * in xtime_nsec over a second into xtime.tv_sec, its possible for | ||
| 524 | * xtime_nsec to be fairly small after the loop. Further, if we're | ||
| 525 | * slightly speeding the clocksource up in clocksource_adjust(), | ||
| 526 | * its possible the required corrective factor to xtime_nsec could | ||
| 527 | * cause it to underflow. | ||
| 528 | * | ||
| 529 | * Now, we cannot simply roll the accumulated second back, since | ||
| 530 | * the NTP subsystem has been notified via second_overflow. So | ||
| 531 | * instead we push xtime_nsec forward by the amount we underflowed, | ||
| 532 | * and add that amount into the error. | ||
| 533 | * | ||
| 534 | * We'll correct this error next time through this function, when | ||
| 535 | * xtime_nsec is not as small. | ||
| 536 | */ | ||
| 537 | if (unlikely((s64)clock->xtime_nsec < 0)) { | ||
| 538 | s64 neg = -(s64)clock->xtime_nsec; | ||
| 539 | clock->xtime_nsec = 0; | ||
| 540 | clock->error += neg << (NTP_SCALE_SHIFT - clock->shift); | ||
| 541 | } | ||
| 542 | |||
| 521 | /* store full nanoseconds into xtime after rounding it up and | 543 | /* store full nanoseconds into xtime after rounding it up and |
| 522 | * add the remainder to the error difference. | 544 | * add the remainder to the error difference. |
| 523 | */ | 545 | */ |
diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c index d83660fd6fdd..8e30295e8566 100644 --- a/lib/dynamic_printk.c +++ b/lib/dynamic_printk.c | |||
| @@ -135,7 +135,7 @@ int unregister_dynamic_debug_module(char *mod_name) | |||
| 135 | nr_entries--; | 135 | nr_entries--; |
| 136 | out: | 136 | out: |
| 137 | up(&debug_list_mutex); | 137 | up(&debug_list_mutex); |
| 138 | return 0; | 138 | return ret; |
| 139 | } | 139 | } |
| 140 | EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module); | 140 | EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module); |
| 141 | 141 | ||
| @@ -289,7 +289,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf, | |||
| 289 | dynamic_enabled = DYNAMIC_ENABLED_SOME; | 289 | dynamic_enabled = DYNAMIC_ENABLED_SOME; |
| 290 | err = 0; | 290 | err = 0; |
| 291 | printk(KERN_DEBUG | 291 | printk(KERN_DEBUG |
| 292 | "debugging enabled for module %s", | 292 | "debugging enabled for module %s\n", |
| 293 | elem->name); | 293 | elem->name); |
| 294 | } else if (!value && (elem->enable == 1)) { | 294 | } else if (!value && (elem->enable == 1)) { |
| 295 | elem->enable = 0; | 295 | elem->enable = 0; |
| @@ -309,7 +309,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf, | |||
| 309 | err = 0; | 309 | err = 0; |
| 310 | printk(KERN_DEBUG | 310 | printk(KERN_DEBUG |
| 311 | "debugging disabled for module " | 311 | "debugging disabled for module " |
| 312 | "%s", elem->name); | 312 | "%s\n", elem->name); |
| 313 | } | 313 | } |
| 314 | } | 314 | } |
| 315 | } | 315 | } |
| @@ -220,8 +220,14 @@ build_up: | |||
| 220 | */ | 220 | */ |
| 221 | while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) { | 221 | while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) { |
| 222 | layers++; | 222 | layers++; |
| 223 | if (!p->count) | 223 | if (!p->count) { |
| 224 | /* special case: if the tree is currently empty, | ||
| 225 | * then we grow the tree by moving the top node | ||
| 226 | * upwards. | ||
| 227 | */ | ||
| 228 | p->layer++; | ||
| 224 | continue; | 229 | continue; |
| 230 | } | ||
| 225 | if (!(new = get_from_free_list(idp))) { | 231 | if (!(new = get_from_free_list(idp))) { |
| 226 | /* | 232 | /* |
| 227 | * The allocation failed. If we built part of | 233 | * The allocation failed. If we built part of |
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c index a8663890a88c..b255b939bc1b 100644 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c | |||
| @@ -62,10 +62,7 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc) | |||
| 62 | for_each_online_cpu(cpu) { | 62 | for_each_online_cpu(cpu) { |
| 63 | s32 *pcount = per_cpu_ptr(fbc->counters, cpu); | 63 | s32 *pcount = per_cpu_ptr(fbc->counters, cpu); |
| 64 | ret += *pcount; | 64 | ret += *pcount; |
| 65 | *pcount = 0; | ||
| 66 | } | 65 | } |
| 67 | fbc->count = ret; | ||
| 68 | |||
| 69 | spin_unlock(&fbc->lock); | 66 | spin_unlock(&fbc->lock); |
| 70 | return ret; | 67 | return ret; |
| 71 | } | 68 | } |
| @@ -104,13 +101,13 @@ void percpu_counter_destroy(struct percpu_counter *fbc) | |||
| 104 | if (!fbc->counters) | 101 | if (!fbc->counters) |
| 105 | return; | 102 | return; |
| 106 | 103 | ||
| 107 | free_percpu(fbc->counters); | ||
| 108 | fbc->counters = NULL; | ||
| 109 | #ifdef CONFIG_HOTPLUG_CPU | 104 | #ifdef CONFIG_HOTPLUG_CPU |
| 110 | mutex_lock(&percpu_counters_lock); | 105 | mutex_lock(&percpu_counters_lock); |
| 111 | list_del(&fbc->list); | 106 | list_del(&fbc->list); |
| 112 | mutex_unlock(&percpu_counters_lock); | 107 | mutex_unlock(&percpu_counters_lock); |
| 113 | #endif | 108 | #endif |
| 109 | free_percpu(fbc->counters); | ||
| 110 | fbc->counters = NULL; | ||
| 114 | } | 111 | } |
| 115 | EXPORT_SYMBOL(percpu_counter_destroy); | 112 | EXPORT_SYMBOL(percpu_counter_destroy); |
| 116 | 113 | ||
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 2a56124dbc28..801c08b046e6 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c | |||
| @@ -176,7 +176,7 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent, | |||
| 176 | int ret = 0; | 176 | int ret = 0; |
| 177 | struct device *dev; | 177 | struct device *dev; |
| 178 | 178 | ||
| 179 | if (WARN_ON(bdi->dev)) | 179 | if (bdi->dev) /* The driver needs to use separate queues per device */ |
| 180 | goto exit; | 180 | goto exit; |
| 181 | 181 | ||
| 182 | va_start(args, fmt); | 182 | va_start(args, fmt); |
diff --git a/mm/migrate.c b/mm/migrate.c index 1e0d6b237f44..037b0967c1e3 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -987,25 +987,18 @@ out: | |||
| 987 | /* | 987 | /* |
| 988 | * Determine the nodes of an array of pages and store it in an array of status. | 988 | * Determine the nodes of an array of pages and store it in an array of status. |
| 989 | */ | 989 | */ |
| 990 | static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, | 990 | static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages, |
| 991 | const void __user * __user *pages, | 991 | const void __user **pages, int *status) |
| 992 | int __user *status) | ||
| 993 | { | 992 | { |
| 994 | unsigned long i; | 993 | unsigned long i; |
| 995 | int err; | ||
| 996 | 994 | ||
| 997 | down_read(&mm->mmap_sem); | 995 | down_read(&mm->mmap_sem); |
| 998 | 996 | ||
| 999 | for (i = 0; i < nr_pages; i++) { | 997 | for (i = 0; i < nr_pages; i++) { |
| 1000 | const void __user *p; | 998 | unsigned long addr = (unsigned long)(*pages); |
| 1001 | unsigned long addr; | ||
| 1002 | struct vm_area_struct *vma; | 999 | struct vm_area_struct *vma; |
| 1003 | struct page *page; | 1000 | struct page *page; |
| 1004 | 1001 | int err = -EFAULT; | |
| 1005 | err = -EFAULT; | ||
| 1006 | if (get_user(p, pages+i)) | ||
| 1007 | goto out; | ||
| 1008 | addr = (unsigned long) p; | ||
| 1009 | 1002 | ||
| 1010 | vma = find_vma(mm, addr); | 1003 | vma = find_vma(mm, addr); |
| 1011 | if (!vma) | 1004 | if (!vma) |
| @@ -1024,12 +1017,52 @@ static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, | |||
| 1024 | 1017 | ||
| 1025 | err = page_to_nid(page); | 1018 | err = page_to_nid(page); |
| 1026 | set_status: | 1019 | set_status: |
| 1027 | put_user(err, status+i); | 1020 | *status = err; |
| 1021 | |||
| 1022 | pages++; | ||
| 1023 | status++; | ||
| 1024 | } | ||
| 1025 | |||
| 1026 | up_read(&mm->mmap_sem); | ||
| 1027 | } | ||
| 1028 | |||
| 1029 | /* | ||
| 1030 | * Determine the nodes of a user array of pages and store it in | ||
| 1031 | * a user array of status. | ||
| 1032 | */ | ||
| 1033 | static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, | ||
| 1034 | const void __user * __user *pages, | ||
| 1035 | int __user *status) | ||
| 1036 | { | ||
| 1037 | #define DO_PAGES_STAT_CHUNK_NR 16 | ||
| 1038 | const void __user *chunk_pages[DO_PAGES_STAT_CHUNK_NR]; | ||
| 1039 | int chunk_status[DO_PAGES_STAT_CHUNK_NR]; | ||
| 1040 | unsigned long i, chunk_nr = DO_PAGES_STAT_CHUNK_NR; | ||
| 1041 | int err; | ||
| 1042 | |||
| 1043 | for (i = 0; i < nr_pages; i += chunk_nr) { | ||
| 1044 | if (chunk_nr + i > nr_pages) | ||
| 1045 | chunk_nr = nr_pages - i; | ||
| 1046 | |||
| 1047 | err = copy_from_user(chunk_pages, &pages[i], | ||
| 1048 | chunk_nr * sizeof(*chunk_pages)); | ||
| 1049 | if (err) { | ||
| 1050 | err = -EFAULT; | ||
| 1051 | goto out; | ||
| 1052 | } | ||
| 1053 | |||
| 1054 | do_pages_stat_array(mm, chunk_nr, chunk_pages, chunk_status); | ||
| 1055 | |||
| 1056 | err = copy_to_user(&status[i], chunk_status, | ||
| 1057 | chunk_nr * sizeof(*chunk_status)); | ||
| 1058 | if (err) { | ||
| 1059 | err = -EFAULT; | ||
| 1060 | goto out; | ||
| 1061 | } | ||
| 1028 | } | 1062 | } |
| 1029 | err = 0; | 1063 | err = 0; |
| 1030 | 1064 | ||
| 1031 | out: | 1065 | out: |
| 1032 | up_read(&mm->mmap_sem); | ||
| 1033 | return err; | 1066 | return err; |
| 1034 | } | 1067 | } |
| 1035 | 1068 | ||
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 0b3cbf090a67..ab27ff750519 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c | |||
| @@ -49,6 +49,9 @@ static int __init alloc_node_page_cgroup(int nid) | |||
| 49 | start_pfn = NODE_DATA(nid)->node_start_pfn; | 49 | start_pfn = NODE_DATA(nid)->node_start_pfn; |
| 50 | nr_pages = NODE_DATA(nid)->node_spanned_pages; | 50 | nr_pages = NODE_DATA(nid)->node_spanned_pages; |
| 51 | 51 | ||
| 52 | if (!nr_pages) | ||
| 53 | return 0; | ||
| 54 | |||
| 52 | table_size = sizeof(struct page_cgroup) * nr_pages; | 55 | table_size = sizeof(struct page_cgroup) * nr_pages; |
| 53 | 56 | ||
| 54 | base = __alloc_bootmem_node_nopanic(NODE_DATA(nid), | 57 | base = __alloc_bootmem_node_nopanic(NODE_DATA(nid), |
| @@ -535,7 +535,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, | |||
| 535 | struct kmem_cache *c; | 535 | struct kmem_cache *c; |
| 536 | 536 | ||
| 537 | c = slob_alloc(sizeof(struct kmem_cache), | 537 | c = slob_alloc(sizeof(struct kmem_cache), |
| 538 | flags, ARCH_KMALLOC_MINALIGN, -1); | 538 | GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1); |
| 539 | 539 | ||
| 540 | if (c) { | 540 | if (c) { |
| 541 | c->name = name; | 541 | c->name = name; |
| @@ -3597,7 +3597,7 @@ static int list_locations(struct kmem_cache *s, char *buf, | |||
| 3597 | for (i = 0; i < t.count; i++) { | 3597 | for (i = 0; i < t.count; i++) { |
| 3598 | struct location *l = &t.loc[i]; | 3598 | struct location *l = &t.loc[i]; |
| 3599 | 3599 | ||
| 3600 | if (len > PAGE_SIZE - 100) | 3600 | if (len > PAGE_SIZE - KSYM_SYMBOL_LEN - 100) |
| 3601 | break; | 3601 | break; |
| 3602 | len += sprintf(buf + len, "%7ld ", l->count); | 3602 | len += sprintf(buf + len, "%7ld ", l->count); |
| 3603 | 3603 | ||
| @@ -299,7 +299,6 @@ void lru_add_drain(void) | |||
| 299 | put_cpu(); | 299 | put_cpu(); |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | #if defined(CONFIG_NUMA) || defined(CONFIG_UNEVICTABLE_LRU) | ||
| 303 | static void lru_add_drain_per_cpu(struct work_struct *dummy) | 302 | static void lru_add_drain_per_cpu(struct work_struct *dummy) |
| 304 | { | 303 | { |
| 305 | lru_add_drain(); | 304 | lru_add_drain(); |
| @@ -313,18 +312,6 @@ int lru_add_drain_all(void) | |||
| 313 | return schedule_on_each_cpu(lru_add_drain_per_cpu); | 312 | return schedule_on_each_cpu(lru_add_drain_per_cpu); |
| 314 | } | 313 | } |
| 315 | 314 | ||
| 316 | #else | ||
| 317 | |||
| 318 | /* | ||
| 319 | * Returns 0 for success | ||
| 320 | */ | ||
| 321 | int lru_add_drain_all(void) | ||
| 322 | { | ||
| 323 | lru_add_drain(); | ||
| 324 | return 0; | ||
| 325 | } | ||
| 326 | #endif | ||
| 327 | |||
| 328 | /* | 315 | /* |
| 329 | * Batched page_cache_release(). Decrement the reference count on all the | 316 | * Batched page_cache_release(). Decrement the reference count on all the |
| 330 | * passed pages. If it fell to zero then remove the page from the LRU and | 317 | * passed pages. If it fell to zero then remove the page from the LRU and |
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index f3f6e0758562..1ddb77ba3995 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -1717,7 +1717,7 @@ static int s_show(struct seq_file *m, void *p) | |||
| 1717 | v->addr, v->addr + v->size, v->size); | 1717 | v->addr, v->addr + v->size, v->size); |
| 1718 | 1718 | ||
| 1719 | if (v->caller) { | 1719 | if (v->caller) { |
| 1720 | char buff[2 * KSYM_NAME_LEN]; | 1720 | char buff[KSYM_SYMBOL_LEN]; |
| 1721 | 1721 | ||
| 1722 | seq_putc(m, ' '); | 1722 | seq_putc(m, ' '); |
| 1723 | sprint_symbol(buff, (unsigned long)v->caller); | 1723 | sprint_symbol(buff, (unsigned long)v->caller); |
diff --git a/net/atm/svc.c b/net/atm/svc.c index de1e4f2f3a43..8fb54dc870b3 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c | |||
| @@ -293,7 +293,10 @@ static int svc_listen(struct socket *sock,int backlog) | |||
| 293 | error = -EINVAL; | 293 | error = -EINVAL; |
| 294 | goto out; | 294 | goto out; |
| 295 | } | 295 | } |
| 296 | vcc_insert_socket(sk); | 296 | if (test_bit(ATM_VF_LISTEN, &vcc->flags)) { |
| 297 | error = -EADDRINUSE; | ||
| 298 | goto out; | ||
| 299 | } | ||
| 297 | set_bit(ATM_VF_WAITING, &vcc->flags); | 300 | set_bit(ATM_VF_WAITING, &vcc->flags); |
| 298 | prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); | 301 | prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); |
| 299 | sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local); | 302 | sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local); |
| @@ -307,6 +310,7 @@ static int svc_listen(struct socket *sock,int backlog) | |||
| 307 | goto out; | 310 | goto out; |
| 308 | } | 311 | } |
| 309 | set_bit(ATM_VF_LISTEN,&vcc->flags); | 312 | set_bit(ATM_VF_LISTEN,&vcc->flags); |
| 313 | vcc_insert_socket(sk); | ||
| 310 | sk->sk_max_ack_backlog = backlog > 0 ? backlog : ATM_BACKLOG_DEFAULT; | 314 | sk->sk_max_ack_backlog = backlog > 0 ? backlog : ATM_BACKLOG_DEFAULT; |
| 311 | error = -sk->sk_err; | 315 | error = -sk->sk_err; |
| 312 | out: | 316 | out: |
diff --git a/net/can/af_can.c b/net/can/af_can.c index 7d4d2b3c137e..3dadb338addd 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
| @@ -319,23 +319,52 @@ static struct dev_rcv_lists *find_dev_rcv_lists(struct net_device *dev) | |||
| 319 | return n ? d : NULL; | 319 | return n ? d : NULL; |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | /** | ||
| 323 | * find_rcv_list - determine optimal filterlist inside device filter struct | ||
| 324 | * @can_id: pointer to CAN identifier of a given can_filter | ||
| 325 | * @mask: pointer to CAN mask of a given can_filter | ||
| 326 | * @d: pointer to the device filter struct | ||
| 327 | * | ||
| 328 | * Description: | ||
| 329 | * Returns the optimal filterlist to reduce the filter handling in the | ||
| 330 | * receive path. This function is called by service functions that need | ||
| 331 | * to register or unregister a can_filter in the filter lists. | ||
| 332 | * | ||
| 333 | * A filter matches in general, when | ||
| 334 | * | ||
| 335 | * <received_can_id> & mask == can_id & mask | ||
| 336 | * | ||
| 337 | * so every bit set in the mask (even CAN_EFF_FLAG, CAN_RTR_FLAG) describe | ||
| 338 | * relevant bits for the filter. | ||
| 339 | * | ||
| 340 | * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can | ||
| 341 | * filter for error frames (CAN_ERR_FLAG bit set in mask). For error frames | ||
| 342 | * there is a special filterlist and a special rx path filter handling. | ||
| 343 | * | ||
| 344 | * Return: | ||
| 345 | * Pointer to optimal filterlist for the given can_id/mask pair. | ||
| 346 | * Constistency checked mask. | ||
| 347 | * Reduced can_id to have a preprocessed filter compare value. | ||
| 348 | */ | ||
| 322 | static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, | 349 | static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, |
| 323 | struct dev_rcv_lists *d) | 350 | struct dev_rcv_lists *d) |
| 324 | { | 351 | { |
| 325 | canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */ | 352 | canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */ |
| 326 | 353 | ||
| 327 | /* filter error frames */ | 354 | /* filter for error frames in extra filterlist */ |
| 328 | if (*mask & CAN_ERR_FLAG) { | 355 | if (*mask & CAN_ERR_FLAG) { |
| 329 | /* clear CAN_ERR_FLAG in list entry */ | 356 | /* clear CAN_ERR_FLAG in filter entry */ |
| 330 | *mask &= CAN_ERR_MASK; | 357 | *mask &= CAN_ERR_MASK; |
| 331 | return &d->rx[RX_ERR]; | 358 | return &d->rx[RX_ERR]; |
| 332 | } | 359 | } |
| 333 | 360 | ||
| 334 | /* ensure valid values in can_mask */ | 361 | /* with cleared CAN_ERR_FLAG we have a simple mask/value filterpair */ |
| 335 | if (*mask & CAN_EFF_FLAG) | 362 | |
| 336 | *mask &= (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG); | 363 | #define CAN_EFF_RTR_FLAGS (CAN_EFF_FLAG | CAN_RTR_FLAG) |
| 337 | else | 364 | |
| 338 | *mask &= (CAN_SFF_MASK | CAN_RTR_FLAG); | 365 | /* ensure valid values in can_mask for 'SFF only' frame filtering */ |
| 366 | if ((*mask & CAN_EFF_FLAG) && !(*can_id & CAN_EFF_FLAG)) | ||
| 367 | *mask &= (CAN_SFF_MASK | CAN_EFF_RTR_FLAGS); | ||
| 339 | 368 | ||
| 340 | /* reduce condition testing at receive time */ | 369 | /* reduce condition testing at receive time */ |
| 341 | *can_id &= *mask; | 370 | *can_id &= *mask; |
| @@ -348,15 +377,19 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, | |||
| 348 | if (!(*mask)) | 377 | if (!(*mask)) |
| 349 | return &d->rx[RX_ALL]; | 378 | return &d->rx[RX_ALL]; |
| 350 | 379 | ||
| 351 | /* use extra filterset for the subscription of exactly *ONE* can_id */ | 380 | /* extra filterlists for the subscription of a single non-RTR can_id */ |
| 352 | if (*can_id & CAN_EFF_FLAG) { | 381 | if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) |
| 353 | if (*mask == (CAN_EFF_MASK | CAN_EFF_FLAG)) { | 382 | && !(*can_id & CAN_RTR_FLAG)) { |
| 354 | /* RFC: a use-case for hash-tables in the future? */ | 383 | |
| 355 | return &d->rx[RX_EFF]; | 384 | if (*can_id & CAN_EFF_FLAG) { |
| 385 | if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS)) { | ||
| 386 | /* RFC: a future use-case for hash-tables? */ | ||
| 387 | return &d->rx[RX_EFF]; | ||
| 388 | } | ||
| 389 | } else { | ||
| 390 | if (*mask == (CAN_SFF_MASK | CAN_EFF_RTR_FLAGS)) | ||
| 391 | return &d->rx_sff[*can_id]; | ||
| 356 | } | 392 | } |
| 357 | } else { | ||
| 358 | if (*mask == CAN_SFF_MASK) | ||
| 359 | return &d->rx_sff[*can_id]; | ||
| 360 | } | 393 | } |
| 361 | 394 | ||
| 362 | /* default: filter via can_id/can_mask */ | 395 | /* default: filter via can_id/can_mask */ |
| @@ -589,7 +622,10 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb) | |||
| 589 | } | 622 | } |
| 590 | } | 623 | } |
| 591 | 624 | ||
| 592 | /* check CAN_ID specific entries */ | 625 | /* check filterlists for single non-RTR can_ids */ |
| 626 | if (can_id & CAN_RTR_FLAG) | ||
| 627 | return matches; | ||
| 628 | |||
| 593 | if (can_id & CAN_EFF_FLAG) { | 629 | if (can_id & CAN_EFF_FLAG) { |
| 594 | hlist_for_each_entry_rcu(r, n, &d->rx[RX_EFF], list) { | 630 | hlist_for_each_entry_rcu(r, n, &d->rx[RX_EFF], list) { |
| 595 | if (r->can_id == can_id) { | 631 | if (r->can_id == can_id) { |
diff --git a/net/can/bcm.c b/net/can/bcm.c index d0dd382001e2..da0d426c0ce4 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
| @@ -64,10 +64,11 @@ | |||
| 64 | #define BCM_CAN_DLC_MASK 0x0F /* clean private flags in can_dlc by masking */ | 64 | #define BCM_CAN_DLC_MASK 0x0F /* clean private flags in can_dlc by masking */ |
| 65 | 65 | ||
| 66 | /* get best masking value for can_rx_register() for a given single can_id */ | 66 | /* get best masking value for can_rx_register() for a given single can_id */ |
| 67 | #define REGMASK(id) ((id & CAN_RTR_FLAG) | ((id & CAN_EFF_FLAG) ? \ | 67 | #define REGMASK(id) ((id & CAN_EFF_FLAG) ? \ |
| 68 | (CAN_EFF_MASK | CAN_EFF_FLAG) : CAN_SFF_MASK)) | 68 | (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ |
| 69 | (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)) | ||
| 69 | 70 | ||
| 70 | #define CAN_BCM_VERSION "20080415" | 71 | #define CAN_BCM_VERSION CAN_VERSION |
| 71 | static __initdata const char banner[] = KERN_INFO | 72 | static __initdata const char banner[] = KERN_INFO |
| 72 | "can: broadcast manager protocol (rev " CAN_BCM_VERSION ")\n"; | 73 | "can: broadcast manager protocol (rev " CAN_BCM_VERSION ")\n"; |
| 73 | 74 | ||
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 6c7af390be0a..dadac6281f20 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
| @@ -133,9 +133,11 @@ static int poll_one_napi(struct netpoll_info *npinfo, | |||
| 133 | 133 | ||
| 134 | npinfo->rx_flags |= NETPOLL_RX_DROP; | 134 | npinfo->rx_flags |= NETPOLL_RX_DROP; |
| 135 | atomic_inc(&trapped); | 135 | atomic_inc(&trapped); |
| 136 | set_bit(NAPI_STATE_NPSVC, &napi->state); | ||
| 136 | 137 | ||
| 137 | work = napi->poll(napi, budget); | 138 | work = napi->poll(napi, budget); |
| 138 | 139 | ||
| 140 | clear_bit(NAPI_STATE_NPSVC, &napi->state); | ||
| 139 | atomic_dec(&trapped); | 141 | atomic_dec(&trapped); |
| 140 | npinfo->rx_flags &= ~NETPOLL_RX_DROP; | 142 | npinfo->rx_flags &= ~NETPOLL_RX_DROP; |
| 141 | 143 | ||
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c index bea54a685109..8d489e746b21 100644 --- a/net/ipv4/netfilter/nf_nat_rule.c +++ b/net/ipv4/netfilter/nf_nat_rule.c | |||
| @@ -61,7 +61,7 @@ static struct | |||
| 61 | static struct xt_table nat_table = { | 61 | static struct xt_table nat_table = { |
| 62 | .name = "nat", | 62 | .name = "nat", |
| 63 | .valid_hooks = NAT_VALID_HOOKS, | 63 | .valid_hooks = NAT_VALID_HOOKS, |
| 64 | .lock = __RW_LOCK_UNLOCKED(__nat_table.lock), | 64 | .lock = __RW_LOCK_UNLOCKED(nat_table.lock), |
| 65 | .me = THIS_MODULE, | 65 | .me = THIS_MODULE, |
| 66 | .af = AF_INET, | 66 | .af = AF_INET, |
| 67 | }; | 67 | }; |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 85b07eba1879..fe3b4bdfd251 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -722,8 +722,7 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb) | |||
| 722 | static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb, | 722 | static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb, |
| 723 | unsigned int mss_now) | 723 | unsigned int mss_now) |
| 724 | { | 724 | { |
| 725 | if (skb->len <= mss_now || !sk_can_gso(sk) || | 725 | if (skb->len <= mss_now || !sk_can_gso(sk)) { |
| 726 | tcp_urg_mode(tcp_sk(sk))) { | ||
| 727 | /* Avoid the costly divide in the normal | 726 | /* Avoid the costly divide in the normal |
| 728 | * non-TSO case. | 727 | * non-TSO case. |
| 729 | */ | 728 | */ |
| @@ -1029,10 +1028,6 @@ unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu) | |||
| 1029 | 1028 | ||
| 1030 | /* Compute the current effective MSS, taking SACKs and IP options, | 1029 | /* Compute the current effective MSS, taking SACKs and IP options, |
| 1031 | * and even PMTU discovery events into account. | 1030 | * and even PMTU discovery events into account. |
| 1032 | * | ||
| 1033 | * LARGESEND note: !tcp_urg_mode is overkill, only frames up to snd_up | ||
| 1034 | * cannot be large. However, taking into account rare use of URG, this | ||
| 1035 | * is not a big flaw. | ||
| 1036 | */ | 1031 | */ |
| 1037 | unsigned int tcp_current_mss(struct sock *sk, int large_allowed) | 1032 | unsigned int tcp_current_mss(struct sock *sk, int large_allowed) |
| 1038 | { | 1033 | { |
| @@ -1047,7 +1042,7 @@ unsigned int tcp_current_mss(struct sock *sk, int large_allowed) | |||
| 1047 | 1042 | ||
| 1048 | mss_now = tp->mss_cache; | 1043 | mss_now = tp->mss_cache; |
| 1049 | 1044 | ||
| 1050 | if (large_allowed && sk_can_gso(sk) && !tcp_urg_mode(tp)) | 1045 | if (large_allowed && sk_can_gso(sk)) |
| 1051 | doing_tso = 1; | 1046 | doing_tso = 1; |
| 1052 | 1047 | ||
| 1053 | if (dst) { | 1048 | if (dst) { |
| @@ -1164,9 +1159,7 @@ static int tcp_init_tso_segs(struct sock *sk, struct sk_buff *skb, | |||
| 1164 | { | 1159 | { |
| 1165 | int tso_segs = tcp_skb_pcount(skb); | 1160 | int tso_segs = tcp_skb_pcount(skb); |
| 1166 | 1161 | ||
| 1167 | if (!tso_segs || | 1162 | if (!tso_segs || (tso_segs > 1 && tcp_skb_mss(skb) != mss_now)) { |
| 1168 | (tso_segs > 1 && (tcp_skb_mss(skb) != mss_now || | ||
| 1169 | tcp_urg_mode(tcp_sk(sk))))) { | ||
| 1170 | tcp_set_skb_tso_segs(sk, skb, mss_now); | 1163 | tcp_set_skb_tso_segs(sk, skb, mss_now); |
| 1171 | tso_segs = tcp_skb_pcount(skb); | 1164 | tso_segs = tcp_skb_pcount(skb); |
| 1172 | } | 1165 | } |
| @@ -1519,6 +1512,10 @@ static int tcp_mtu_probe(struct sock *sk) | |||
| 1519 | * send_head. This happens as incoming acks open up the remote | 1512 | * send_head. This happens as incoming acks open up the remote |
| 1520 | * window for us. | 1513 | * window for us. |
| 1521 | * | 1514 | * |
| 1515 | * LARGESEND note: !tcp_urg_mode is overkill, only frames between | ||
| 1516 | * snd_up-64k-mss .. snd_up cannot be large. However, taking into | ||
| 1517 | * account rare use of URG, this is not a big flaw. | ||
| 1518 | * | ||
| 1522 | * Returns 1, if no segments are in flight and we have queued segments, but | 1519 | * Returns 1, if no segments are in flight and we have queued segments, but |
| 1523 | * cannot send anything now because of SWS or another problem. | 1520 | * cannot send anything now because of SWS or another problem. |
| 1524 | */ | 1521 | */ |
| @@ -1570,7 +1567,7 @@ static int tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle) | |||
| 1570 | } | 1567 | } |
| 1571 | 1568 | ||
| 1572 | limit = mss_now; | 1569 | limit = mss_now; |
| 1573 | if (tso_segs > 1) | 1570 | if (tso_segs > 1 && !tcp_urg_mode(tp)) |
| 1574 | limit = tcp_mss_split_point(sk, skb, mss_now, | 1571 | limit = tcp_mss_split_point(sk, skb, mss_now, |
| 1575 | cwnd_quota); | 1572 | cwnd_quota); |
| 1576 | 1573 | ||
| @@ -1619,6 +1616,7 @@ void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss, | |||
| 1619 | */ | 1616 | */ |
| 1620 | void tcp_push_one(struct sock *sk, unsigned int mss_now) | 1617 | void tcp_push_one(struct sock *sk, unsigned int mss_now) |
| 1621 | { | 1618 | { |
| 1619 | struct tcp_sock *tp = tcp_sk(sk); | ||
| 1622 | struct sk_buff *skb = tcp_send_head(sk); | 1620 | struct sk_buff *skb = tcp_send_head(sk); |
| 1623 | unsigned int tso_segs, cwnd_quota; | 1621 | unsigned int tso_segs, cwnd_quota; |
| 1624 | 1622 | ||
| @@ -1633,7 +1631,7 @@ void tcp_push_one(struct sock *sk, unsigned int mss_now) | |||
| 1633 | BUG_ON(!tso_segs); | 1631 | BUG_ON(!tso_segs); |
| 1634 | 1632 | ||
| 1635 | limit = mss_now; | 1633 | limit = mss_now; |
| 1636 | if (tso_segs > 1) | 1634 | if (tso_segs > 1 && !tcp_urg_mode(tp)) |
| 1637 | limit = tcp_mss_split_point(sk, skb, mss_now, | 1635 | limit = tcp_mss_split_point(sk, skb, mss_now, |
| 1638 | cwnd_quota); | 1636 | cwnd_quota); |
| 1639 | 1637 | ||
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c index 14504dada116..a453aac91bd3 100644 --- a/net/ipv4/tcp_vegas.c +++ b/net/ipv4/tcp_vegas.c | |||
| @@ -40,18 +40,14 @@ | |||
| 40 | 40 | ||
| 41 | #include "tcp_vegas.h" | 41 | #include "tcp_vegas.h" |
| 42 | 42 | ||
| 43 | /* Default values of the Vegas variables, in fixed-point representation | 43 | static int alpha = 2; |
| 44 | * with V_PARAM_SHIFT bits to the right of the binary point. | 44 | static int beta = 4; |
| 45 | */ | 45 | static int gamma = 1; |
| 46 | #define V_PARAM_SHIFT 1 | ||
| 47 | static int alpha = 2<<V_PARAM_SHIFT; | ||
| 48 | static int beta = 4<<V_PARAM_SHIFT; | ||
| 49 | static int gamma = 1<<V_PARAM_SHIFT; | ||
| 50 | 46 | ||
| 51 | module_param(alpha, int, 0644); | 47 | module_param(alpha, int, 0644); |
| 52 | MODULE_PARM_DESC(alpha, "lower bound of packets in network (scale by 2)"); | 48 | MODULE_PARM_DESC(alpha, "lower bound of packets in network"); |
| 53 | module_param(beta, int, 0644); | 49 | module_param(beta, int, 0644); |
| 54 | MODULE_PARM_DESC(beta, "upper bound of packets in network (scale by 2)"); | 50 | MODULE_PARM_DESC(beta, "upper bound of packets in network"); |
| 55 | module_param(gamma, int, 0644); | 51 | module_param(gamma, int, 0644); |
| 56 | MODULE_PARM_DESC(gamma, "limit on increase (scale by 2)"); | 52 | MODULE_PARM_DESC(gamma, "limit on increase (scale by 2)"); |
| 57 | 53 | ||
| @@ -172,49 +168,13 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 172 | return; | 168 | return; |
| 173 | } | 169 | } |
| 174 | 170 | ||
| 175 | /* The key players are v_beg_snd_una and v_beg_snd_nxt. | ||
| 176 | * | ||
| 177 | * These are so named because they represent the approximate values | ||
| 178 | * of snd_una and snd_nxt at the beginning of the current RTT. More | ||
| 179 | * precisely, they represent the amount of data sent during the RTT. | ||
| 180 | * At the end of the RTT, when we receive an ACK for v_beg_snd_nxt, | ||
| 181 | * we will calculate that (v_beg_snd_nxt - v_beg_snd_una) outstanding | ||
| 182 | * bytes of data have been ACKed during the course of the RTT, giving | ||
| 183 | * an "actual" rate of: | ||
| 184 | * | ||
| 185 | * (v_beg_snd_nxt - v_beg_snd_una) / (rtt duration) | ||
| 186 | * | ||
| 187 | * Unfortunately, v_beg_snd_una is not exactly equal to snd_una, | ||
| 188 | * because delayed ACKs can cover more than one segment, so they | ||
| 189 | * don't line up nicely with the boundaries of RTTs. | ||
| 190 | * | ||
| 191 | * Another unfortunate fact of life is that delayed ACKs delay the | ||
| 192 | * advance of the left edge of our send window, so that the number | ||
| 193 | * of bytes we send in an RTT is often less than our cwnd will allow. | ||
| 194 | * So we keep track of our cwnd separately, in v_beg_snd_cwnd. | ||
| 195 | */ | ||
| 196 | |||
| 197 | if (after(ack, vegas->beg_snd_nxt)) { | 171 | if (after(ack, vegas->beg_snd_nxt)) { |
| 198 | /* Do the Vegas once-per-RTT cwnd adjustment. */ | 172 | /* Do the Vegas once-per-RTT cwnd adjustment. */ |
| 199 | u32 old_wnd, old_snd_cwnd; | ||
| 200 | |||
| 201 | |||
| 202 | /* Here old_wnd is essentially the window of data that was | ||
| 203 | * sent during the previous RTT, and has all | ||
| 204 | * been acknowledged in the course of the RTT that ended | ||
| 205 | * with the ACK we just received. Likewise, old_snd_cwnd | ||
| 206 | * is the cwnd during the previous RTT. | ||
| 207 | */ | ||
| 208 | old_wnd = (vegas->beg_snd_nxt - vegas->beg_snd_una) / | ||
| 209 | tp->mss_cache; | ||
| 210 | old_snd_cwnd = vegas->beg_snd_cwnd; | ||
| 211 | 173 | ||
| 212 | /* Save the extent of the current window so we can use this | 174 | /* Save the extent of the current window so we can use this |
| 213 | * at the end of the next RTT. | 175 | * at the end of the next RTT. |
| 214 | */ | 176 | */ |
| 215 | vegas->beg_snd_una = vegas->beg_snd_nxt; | ||
| 216 | vegas->beg_snd_nxt = tp->snd_nxt; | 177 | vegas->beg_snd_nxt = tp->snd_nxt; |
| 217 | vegas->beg_snd_cwnd = tp->snd_cwnd; | ||
| 218 | 178 | ||
| 219 | /* We do the Vegas calculations only if we got enough RTT | 179 | /* We do the Vegas calculations only if we got enough RTT |
| 220 | * samples that we can be reasonably sure that we got | 180 | * samples that we can be reasonably sure that we got |
| @@ -252,22 +212,14 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 252 | * | 212 | * |
| 253 | * This is: | 213 | * This is: |
| 254 | * (actual rate in segments) * baseRTT | 214 | * (actual rate in segments) * baseRTT |
| 255 | * We keep it as a fixed point number with | ||
| 256 | * V_PARAM_SHIFT bits to the right of the binary point. | ||
| 257 | */ | 215 | */ |
| 258 | target_cwnd = ((u64)old_wnd * vegas->baseRTT); | 216 | target_cwnd = tp->snd_cwnd * vegas->baseRTT / rtt; |
| 259 | target_cwnd <<= V_PARAM_SHIFT; | ||
| 260 | do_div(target_cwnd, rtt); | ||
| 261 | 217 | ||
| 262 | /* Calculate the difference between the window we had, | 218 | /* Calculate the difference between the window we had, |
| 263 | * and the window we would like to have. This quantity | 219 | * and the window we would like to have. This quantity |
| 264 | * is the "Diff" from the Arizona Vegas papers. | 220 | * is the "Diff" from the Arizona Vegas papers. |
| 265 | * | ||
| 266 | * Again, this is a fixed point number with | ||
| 267 | * V_PARAM_SHIFT bits to the right of the binary | ||
| 268 | * point. | ||
| 269 | */ | 221 | */ |
| 270 | diff = (old_wnd << V_PARAM_SHIFT) - target_cwnd; | 222 | diff = tp->snd_cwnd * (rtt-vegas->baseRTT) / vegas->baseRTT; |
| 271 | 223 | ||
| 272 | if (diff > gamma && tp->snd_ssthresh > 2 ) { | 224 | if (diff > gamma && tp->snd_ssthresh > 2 ) { |
| 273 | /* Going too fast. Time to slow down | 225 | /* Going too fast. Time to slow down |
| @@ -282,16 +234,13 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 282 | * truncation robs us of full link | 234 | * truncation robs us of full link |
| 283 | * utilization. | 235 | * utilization. |
| 284 | */ | 236 | */ |
| 285 | tp->snd_cwnd = min(tp->snd_cwnd, | 237 | tp->snd_cwnd = min(tp->snd_cwnd, (u32)target_cwnd+1); |
| 286 | ((u32)target_cwnd >> | ||
| 287 | V_PARAM_SHIFT)+1); | ||
| 288 | 238 | ||
| 289 | } else if (tp->snd_cwnd <= tp->snd_ssthresh) { | 239 | } else if (tp->snd_cwnd <= tp->snd_ssthresh) { |
| 290 | /* Slow start. */ | 240 | /* Slow start. */ |
| 291 | tcp_slow_start(tp); | 241 | tcp_slow_start(tp); |
| 292 | } else { | 242 | } else { |
| 293 | /* Congestion avoidance. */ | 243 | /* Congestion avoidance. */ |
| 294 | u32 next_snd_cwnd; | ||
| 295 | 244 | ||
| 296 | /* Figure out where we would like cwnd | 245 | /* Figure out where we would like cwnd |
| 297 | * to be. | 246 | * to be. |
| @@ -300,32 +249,25 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 300 | /* The old window was too fast, so | 249 | /* The old window was too fast, so |
| 301 | * we slow down. | 250 | * we slow down. |
| 302 | */ | 251 | */ |
| 303 | next_snd_cwnd = old_snd_cwnd - 1; | 252 | tp->snd_cwnd--; |
| 304 | } else if (diff < alpha) { | 253 | } else if (diff < alpha) { |
| 305 | /* We don't have enough extra packets | 254 | /* We don't have enough extra packets |
| 306 | * in the network, so speed up. | 255 | * in the network, so speed up. |
| 307 | */ | 256 | */ |
| 308 | next_snd_cwnd = old_snd_cwnd + 1; | 257 | tp->snd_cwnd++; |
| 309 | } else { | 258 | } else { |
| 310 | /* Sending just as fast as we | 259 | /* Sending just as fast as we |
| 311 | * should be. | 260 | * should be. |
| 312 | */ | 261 | */ |
| 313 | next_snd_cwnd = old_snd_cwnd; | ||
| 314 | } | 262 | } |
| 315 | |||
| 316 | /* Adjust cwnd upward or downward, toward the | ||
| 317 | * desired value. | ||
| 318 | */ | ||
| 319 | if (next_snd_cwnd > tp->snd_cwnd) | ||
| 320 | tp->snd_cwnd++; | ||
| 321 | else if (next_snd_cwnd < tp->snd_cwnd) | ||
| 322 | tp->snd_cwnd--; | ||
| 323 | } | 263 | } |
| 324 | 264 | ||
| 325 | if (tp->snd_cwnd < 2) | 265 | if (tp->snd_cwnd < 2) |
| 326 | tp->snd_cwnd = 2; | 266 | tp->snd_cwnd = 2; |
| 327 | else if (tp->snd_cwnd > tp->snd_cwnd_clamp) | 267 | else if (tp->snd_cwnd > tp->snd_cwnd_clamp) |
| 328 | tp->snd_cwnd = tp->snd_cwnd_clamp; | 268 | tp->snd_cwnd = tp->snd_cwnd_clamp; |
| 269 | |||
| 270 | tp->snd_ssthresh = tcp_current_ssthresh(sk); | ||
| 329 | } | 271 | } |
| 330 | 272 | ||
| 331 | /* Wipe the slate clean for the next RTT. */ | 273 | /* Wipe the slate clean for the next RTT. */ |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 172438320eec..d0f54d18e19b 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -912,8 +912,13 @@ static void ndisc_recv_na(struct sk_buff *skb) | |||
| 912 | is invalid, but ndisc specs say nothing | 912 | is invalid, but ndisc specs say nothing |
| 913 | about it. It could be misconfiguration, or | 913 | about it. It could be misconfiguration, or |
| 914 | an smart proxy agent tries to help us :-) | 914 | an smart proxy agent tries to help us :-) |
| 915 | |||
| 916 | We should not print the error if NA has been | ||
| 917 | received from loopback - it is just our own | ||
| 918 | unsolicited advertisement. | ||
| 915 | */ | 919 | */ |
| 916 | ND_PRINTK1(KERN_WARNING | 920 | if (skb->pkt_type != PACKET_LOOPBACK) |
| 921 | ND_PRINTK1(KERN_WARNING | ||
| 917 | "ICMPv6 NA: someone advertises our address on %s!\n", | 922 | "ICMPv6 NA: someone advertises our address on %s!\n", |
| 918 | ifp->idev->dev->name); | 923 | ifp->idev->dev->name); |
| 919 | in6_ifa_put(ifp); | 924 | in6_ifa_put(ifp); |
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 7fef8ea1f5ec..d254446b85b5 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
| @@ -99,7 +99,7 @@ struct sta_info *sta_info_get(struct ieee80211_local *local, const u8 *addr) | |||
| 99 | 99 | ||
| 100 | sta = rcu_dereference(local->sta_hash[STA_HASH(addr)]); | 100 | sta = rcu_dereference(local->sta_hash[STA_HASH(addr)]); |
| 101 | while (sta) { | 101 | while (sta) { |
| 102 | if (compare_ether_addr(sta->sta.addr, addr) == 0) | 102 | if (memcmp(sta->sta.addr, addr, ETH_ALEN) == 0) |
| 103 | break; | 103 | break; |
| 104 | sta = rcu_dereference(sta->hnext); | 104 | sta = rcu_dereference(sta->hnext); |
| 105 | } | 105 | } |
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c index 02a8fed21082..1acc089be7e9 100644 --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c | |||
| @@ -141,7 +141,7 @@ socket_mt(const struct sk_buff *skb, const struct xt_match_param *par) | |||
| 141 | sk = nf_tproxy_get_sock_v4(dev_net(skb->dev), protocol, | 141 | sk = nf_tproxy_get_sock_v4(dev_net(skb->dev), protocol, |
| 142 | saddr, daddr, sport, dport, par->in, false); | 142 | saddr, daddr, sport, dport, par->in, false); |
| 143 | if (sk != NULL) { | 143 | if (sk != NULL) { |
| 144 | bool wildcard = (inet_sk(sk)->rcv_saddr == 0); | 144 | bool wildcard = (sk->sk_state != TCP_TIME_WAIT && inet_sk(sk)->rcv_saddr == 0); |
| 145 | 145 | ||
| 146 | nf_tproxy_put_sock(sk); | 146 | nf_tproxy_put_sock(sk); |
| 147 | if (wildcard) | 147 | if (wildcard) |
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index e8a5c32b0f10..8c0308032178 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c | |||
| @@ -562,7 +562,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, | |||
| 562 | const struct in_addr *mask, | 562 | const struct in_addr *mask, |
| 563 | struct netlbl_audit *audit_info) | 563 | struct netlbl_audit *audit_info) |
| 564 | { | 564 | { |
| 565 | int ret_val = 0; | ||
| 566 | struct netlbl_af4list *list_entry; | 565 | struct netlbl_af4list *list_entry; |
| 567 | struct netlbl_unlhsh_addr4 *entry; | 566 | struct netlbl_unlhsh_addr4 *entry; |
| 568 | struct audit_buffer *audit_buf; | 567 | struct audit_buffer *audit_buf; |
| @@ -574,9 +573,10 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, | |||
| 574 | list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr, | 573 | list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr, |
| 575 | &iface->addr4_list); | 574 | &iface->addr4_list); |
| 576 | spin_unlock(&netlbl_unlhsh_lock); | 575 | spin_unlock(&netlbl_unlhsh_lock); |
| 577 | if (list_entry == NULL) | 576 | if (list_entry != NULL) |
| 578 | ret_val = -ENOENT; | 577 | entry = netlbl_unlhsh_addr4_entry(list_entry); |
| 579 | entry = netlbl_unlhsh_addr4_entry(list_entry); | 578 | else |
| 579 | entry = NULL; | ||
| 580 | 580 | ||
| 581 | audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL, | 581 | audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL, |
| 582 | audit_info); | 582 | audit_info); |
| @@ -587,19 +587,21 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, | |||
| 587 | addr->s_addr, mask->s_addr); | 587 | addr->s_addr, mask->s_addr); |
| 588 | if (dev != NULL) | 588 | if (dev != NULL) |
| 589 | dev_put(dev); | 589 | dev_put(dev); |
| 590 | if (entry && security_secid_to_secctx(entry->secid, | 590 | if (entry != NULL && |
| 591 | &secctx, | 591 | security_secid_to_secctx(entry->secid, |
| 592 | &secctx_len) == 0) { | 592 | &secctx, &secctx_len) == 0) { |
| 593 | audit_log_format(audit_buf, " sec_obj=%s", secctx); | 593 | audit_log_format(audit_buf, " sec_obj=%s", secctx); |
| 594 | security_release_secctx(secctx, secctx_len); | 594 | security_release_secctx(secctx, secctx_len); |
| 595 | } | 595 | } |
| 596 | audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0); | 596 | audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0); |
| 597 | audit_log_end(audit_buf); | 597 | audit_log_end(audit_buf); |
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | if (ret_val == 0) | 600 | if (entry == NULL) |
| 601 | call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4); | 601 | return -ENOENT; |
| 602 | return ret_val; | 602 | |
| 603 | call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4); | ||
| 604 | return 0; | ||
| 603 | } | 605 | } |
| 604 | 606 | ||
| 605 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 607 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| @@ -623,7 +625,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, | |||
| 623 | const struct in6_addr *mask, | 625 | const struct in6_addr *mask, |
| 624 | struct netlbl_audit *audit_info) | 626 | struct netlbl_audit *audit_info) |
| 625 | { | 627 | { |
| 626 | int ret_val = 0; | ||
| 627 | struct netlbl_af6list *list_entry; | 628 | struct netlbl_af6list *list_entry; |
| 628 | struct netlbl_unlhsh_addr6 *entry; | 629 | struct netlbl_unlhsh_addr6 *entry; |
| 629 | struct audit_buffer *audit_buf; | 630 | struct audit_buffer *audit_buf; |
| @@ -634,9 +635,10 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, | |||
| 634 | spin_lock(&netlbl_unlhsh_lock); | 635 | spin_lock(&netlbl_unlhsh_lock); |
| 635 | list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list); | 636 | list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list); |
| 636 | spin_unlock(&netlbl_unlhsh_lock); | 637 | spin_unlock(&netlbl_unlhsh_lock); |
| 637 | if (list_entry == NULL) | 638 | if (list_entry != NULL) |
| 638 | ret_val = -ENOENT; | 639 | entry = netlbl_unlhsh_addr6_entry(list_entry); |
| 639 | entry = netlbl_unlhsh_addr6_entry(list_entry); | 640 | else |
| 641 | entry = NULL; | ||
| 640 | 642 | ||
| 641 | audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL, | 643 | audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL, |
| 642 | audit_info); | 644 | audit_info); |
| @@ -647,19 +649,21 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, | |||
| 647 | addr, mask); | 649 | addr, mask); |
| 648 | if (dev != NULL) | 650 | if (dev != NULL) |
| 649 | dev_put(dev); | 651 | dev_put(dev); |
| 650 | if (entry && security_secid_to_secctx(entry->secid, | 652 | if (entry != NULL && |
| 651 | &secctx, | 653 | security_secid_to_secctx(entry->secid, |
| 652 | &secctx_len) == 0) { | 654 | &secctx, &secctx_len) == 0) { |
| 653 | audit_log_format(audit_buf, " sec_obj=%s", secctx); | 655 | audit_log_format(audit_buf, " sec_obj=%s", secctx); |
| 654 | security_release_secctx(secctx, secctx_len); | 656 | security_release_secctx(secctx, secctx_len); |
| 655 | } | 657 | } |
| 656 | audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0); | 658 | audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0); |
| 657 | audit_log_end(audit_buf); | 659 | audit_log_end(audit_buf); |
| 658 | } | 660 | } |
| 659 | 661 | ||
| 660 | if (ret_val == 0) | 662 | if (entry == NULL) |
| 661 | call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6); | 663 | return -ENOENT; |
| 662 | return ret_val; | 664 | |
| 665 | call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6); | ||
| 666 | return 0; | ||
| 663 | } | 667 | } |
| 664 | #endif /* IPv6 */ | 668 | #endif /* IPv6 */ |
| 665 | 669 | ||
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c index 9978afbd9f2a..803eeef0aa85 100644 --- a/net/phonet/pep-gprs.c +++ b/net/phonet/pep-gprs.c | |||
| @@ -155,12 +155,13 @@ static void gprs_data_ready(struct sock *sk, int len) | |||
| 155 | static void gprs_write_space(struct sock *sk) | 155 | static void gprs_write_space(struct sock *sk) |
| 156 | { | 156 | { |
| 157 | struct gprs_dev *dev = sk->sk_user_data; | 157 | struct gprs_dev *dev = sk->sk_user_data; |
| 158 | struct net_device *net = dev->net; | ||
| 158 | unsigned credits = pep_writeable(sk); | 159 | unsigned credits = pep_writeable(sk); |
| 159 | 160 | ||
| 160 | spin_lock_bh(&dev->tx_lock); | 161 | spin_lock_bh(&dev->tx_lock); |
| 161 | dev->tx_max = credits; | 162 | dev->tx_max = credits; |
| 162 | if (credits > skb_queue_len(&dev->tx_queue)) | 163 | if (credits > skb_queue_len(&dev->tx_queue) && netif_running(net)) |
| 163 | netif_wake_queue(dev->net); | 164 | netif_wake_queue(net); |
| 164 | spin_unlock_bh(&dev->tx_lock); | 165 | spin_unlock_bh(&dev->tx_lock); |
| 165 | } | 166 | } |
| 166 | 167 | ||
| @@ -168,6 +169,23 @@ static void gprs_write_space(struct sock *sk) | |||
| 168 | * Network device callbacks | 169 | * Network device callbacks |
| 169 | */ | 170 | */ |
| 170 | 171 | ||
| 172 | static int gprs_open(struct net_device *dev) | ||
| 173 | { | ||
| 174 | struct gprs_dev *gp = netdev_priv(dev); | ||
| 175 | |||
| 176 | gprs_write_space(gp->sk); | ||
| 177 | return 0; | ||
| 178 | } | ||
| 179 | |||
| 180 | static int gprs_close(struct net_device *dev) | ||
| 181 | { | ||
| 182 | struct gprs_dev *gp = netdev_priv(dev); | ||
| 183 | |||
| 184 | netif_stop_queue(dev); | ||
| 185 | flush_work(&gp->tx_work); | ||
| 186 | return 0; | ||
| 187 | } | ||
| 188 | |||
| 171 | static int gprs_xmit(struct sk_buff *skb, struct net_device *net) | 189 | static int gprs_xmit(struct sk_buff *skb, struct net_device *net) |
| 172 | { | 190 | { |
| 173 | struct gprs_dev *dev = netdev_priv(net); | 191 | struct gprs_dev *dev = netdev_priv(net); |
| @@ -254,6 +272,8 @@ static void gprs_setup(struct net_device *net) | |||
| 254 | net->tx_queue_len = 10; | 272 | net->tx_queue_len = 10; |
| 255 | 273 | ||
| 256 | net->destructor = free_netdev; | 274 | net->destructor = free_netdev; |
| 275 | net->open = gprs_open; | ||
| 276 | net->stop = gprs_close; | ||
| 257 | net->hard_start_xmit = gprs_xmit; /* mandatory */ | 277 | net->hard_start_xmit = gprs_xmit; /* mandatory */ |
| 258 | net->change_mtu = gprs_set_mtu; | 278 | net->change_mtu = gprs_set_mtu; |
| 259 | net->get_stats = gprs_get_stats; | 279 | net->get_stats = gprs_get_stats; |
| @@ -318,7 +338,6 @@ int gprs_attach(struct sock *sk) | |||
| 318 | dev->sk = sk; | 338 | dev->sk = sk; |
| 319 | 339 | ||
| 320 | printk(KERN_DEBUG"%s: attached\n", net->name); | 340 | printk(KERN_DEBUG"%s: attached\n", net->name); |
| 321 | gprs_write_space(sk); /* kick off TX */ | ||
| 322 | return net->ifindex; | 341 | return net->ifindex; |
| 323 | 342 | ||
| 324 | out_rel: | 343 | out_rel: |
| @@ -341,7 +360,5 @@ void gprs_detach(struct sock *sk) | |||
| 341 | 360 | ||
| 342 | printk(KERN_DEBUG"%s: detached\n", net->name); | 361 | printk(KERN_DEBUG"%s: detached\n", net->name); |
| 343 | unregister_netdev(net); | 362 | unregister_netdev(net); |
| 344 | flush_scheduled_work(); | ||
| 345 | sock_put(sk); | 363 | sock_put(sk); |
| 346 | skb_queue_purge(&dev->tx_queue); | ||
| 347 | } | 364 | } |
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c index b1770d66bc8d..242fe8f8c322 100644 --- a/net/phonet/pn_netlink.c +++ b/net/phonet/pn_netlink.c | |||
| @@ -123,6 +123,7 @@ nla_put_failure: | |||
| 123 | 123 | ||
| 124 | static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) | 124 | static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) |
| 125 | { | 125 | { |
| 126 | struct net *net = sock_net(skb->sk); | ||
| 126 | struct phonet_device *pnd; | 127 | struct phonet_device *pnd; |
| 127 | int dev_idx = 0, dev_start_idx = cb->args[0]; | 128 | int dev_idx = 0, dev_start_idx = cb->args[0]; |
| 128 | int addr_idx = 0, addr_start_idx = cb->args[1]; | 129 | int addr_idx = 0, addr_start_idx = cb->args[1]; |
| @@ -131,6 +132,8 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 131 | list_for_each_entry(pnd, &pndevs.list, list) { | 132 | list_for_each_entry(pnd, &pndevs.list, list) { |
| 132 | u8 addr; | 133 | u8 addr; |
| 133 | 134 | ||
| 135 | if (!net_eq(dev_net(pnd->netdev), net)) | ||
| 136 | continue; | ||
| 134 | if (dev_idx > dev_start_idx) | 137 | if (dev_idx > dev_start_idx) |
| 135 | addr_start_idx = 0; | 138 | addr_start_idx = 0; |
| 136 | if (dev_idx++ < dev_start_idx) | 139 | if (dev_idx++ < dev_start_idx) |
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index a11959908d9a..98402f0efa47 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
| @@ -46,9 +46,6 @@ | |||
| 46 | layering other disciplines. It does not need to do bandwidth | 46 | layering other disciplines. It does not need to do bandwidth |
| 47 | control either since that can be handled by using token | 47 | control either since that can be handled by using token |
| 48 | bucket or other rate control. | 48 | bucket or other rate control. |
| 49 | |||
| 50 | The simulator is limited by the Linux timer resolution | ||
| 51 | and will create packet bursts on the HZ boundary (1ms). | ||
| 52 | */ | 49 | */ |
| 53 | 50 | ||
| 54 | struct netem_sched_data { | 51 | struct netem_sched_data { |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 058f04f54b90..fb216c9adf86 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -817,6 +817,7 @@ int xfrm_policy_flush(u8 type, struct xfrm_audit *audit_info) | |||
| 817 | continue; | 817 | continue; |
| 818 | hlist_del(&pol->bydst); | 818 | hlist_del(&pol->bydst); |
| 819 | hlist_del(&pol->byidx); | 819 | hlist_del(&pol->byidx); |
| 820 | list_del(&pol->walk.all); | ||
| 820 | write_unlock_bh(&xfrm_policy_lock); | 821 | write_unlock_bh(&xfrm_policy_lock); |
| 821 | 822 | ||
| 822 | xfrm_audit_policy_delete(pol, 1, audit_info->loginuid, | 823 | xfrm_audit_policy_delete(pol, 1, audit_info->loginuid, |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 5dd3e89f620a..596ceabd6504 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -69,6 +69,7 @@ enum { | |||
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | enum { | 71 | enum { |
| 72 | STAC_92HD73XX_NO_JD, /* no jack-detection */ | ||
| 72 | STAC_92HD73XX_REF, | 73 | STAC_92HD73XX_REF, |
| 73 | STAC_DELL_M6_AMIC, | 74 | STAC_DELL_M6_AMIC, |
| 74 | STAC_DELL_M6_DMIC, | 75 | STAC_DELL_M6_DMIC, |
| @@ -127,6 +128,7 @@ enum { | |||
| 127 | }; | 128 | }; |
| 128 | 129 | ||
| 129 | enum { | 130 | enum { |
| 131 | STAC_D965_REF_NO_JD, /* no jack-detection */ | ||
| 130 | STAC_D965_REF, | 132 | STAC_D965_REF, |
| 131 | STAC_D965_3ST, | 133 | STAC_D965_3ST, |
| 132 | STAC_D965_5ST, | 134 | STAC_D965_5ST, |
| @@ -1611,6 +1613,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { | |||
| 1611 | }; | 1613 | }; |
| 1612 | 1614 | ||
| 1613 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { | 1615 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { |
| 1616 | [STAC_92HD73XX_NO_JD] = "no-jd", | ||
| 1614 | [STAC_92HD73XX_REF] = "ref", | 1617 | [STAC_92HD73XX_REF] = "ref", |
| 1615 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", | 1618 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", |
| 1616 | [STAC_DELL_M6_DMIC] = "dell-m6-dmic", | 1619 | [STAC_DELL_M6_DMIC] = "dell-m6-dmic", |
| @@ -1640,6 +1643,8 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { | |||
| 1640 | "unknown Dell", STAC_DELL_M6_DMIC), | 1643 | "unknown Dell", STAC_DELL_M6_DMIC), |
| 1641 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f, | 1644 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f, |
| 1642 | "Dell Studio 1537", STAC_DELL_M6_DMIC), | 1645 | "Dell Studio 1537", STAC_DELL_M6_DMIC), |
| 1646 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0, | ||
| 1647 | "Dell Studio 17", STAC_DELL_M6_DMIC), | ||
| 1643 | {} /* terminator */ | 1648 | {} /* terminator */ |
| 1644 | }; | 1649 | }; |
| 1645 | 1650 | ||
| @@ -2027,6 +2032,7 @@ static unsigned int dell_3st_pin_configs[14] = { | |||
| 2027 | }; | 2032 | }; |
| 2028 | 2033 | ||
| 2029 | static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { | 2034 | static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { |
| 2035 | [STAC_D965_REF_NO_JD] = ref927x_pin_configs, | ||
| 2030 | [STAC_D965_REF] = ref927x_pin_configs, | 2036 | [STAC_D965_REF] = ref927x_pin_configs, |
| 2031 | [STAC_D965_3ST] = d965_3st_pin_configs, | 2037 | [STAC_D965_3ST] = d965_3st_pin_configs, |
| 2032 | [STAC_D965_5ST] = d965_5st_pin_configs, | 2038 | [STAC_D965_5ST] = d965_5st_pin_configs, |
| @@ -2035,6 +2041,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { | |||
| 2035 | }; | 2041 | }; |
| 2036 | 2042 | ||
| 2037 | static const char *stac927x_models[STAC_927X_MODELS] = { | 2043 | static const char *stac927x_models[STAC_927X_MODELS] = { |
| 2044 | [STAC_D965_REF_NO_JD] = "ref-no-jd", | ||
| 2038 | [STAC_D965_REF] = "ref", | 2045 | [STAC_D965_REF] = "ref", |
| 2039 | [STAC_D965_3ST] = "3stack", | 2046 | [STAC_D965_3ST] = "3stack", |
| 2040 | [STAC_D965_5ST] = "5stack", | 2047 | [STAC_D965_5ST] = "5stack", |
| @@ -2896,7 +2903,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec, | |||
| 2896 | } | 2903 | } |
| 2897 | 2904 | ||
| 2898 | if ((spec->multiout.num_dacs - cfg->line_outs) > 0 && | 2905 | if ((spec->multiout.num_dacs - cfg->line_outs) > 0 && |
| 2899 | cfg->hp_outs && !spec->multiout.hp_nid) | 2906 | cfg->hp_outs == 1 && !spec->multiout.hp_nid) |
| 2900 | spec->multiout.hp_nid = nid; | 2907 | spec->multiout.hp_nid = nid; |
| 2901 | 2908 | ||
| 2902 | if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) { | 2909 | if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) { |
| @@ -4254,14 +4261,17 @@ again: | |||
| 4254 | 4261 | ||
| 4255 | switch (spec->multiout.num_dacs) { | 4262 | switch (spec->multiout.num_dacs) { |
| 4256 | case 0x3: /* 6 Channel */ | 4263 | case 0x3: /* 6 Channel */ |
| 4264 | spec->multiout.hp_nid = 0x17; | ||
| 4257 | spec->mixer = stac92hd73xx_6ch_mixer; | 4265 | spec->mixer = stac92hd73xx_6ch_mixer; |
| 4258 | spec->init = stac92hd73xx_6ch_core_init; | 4266 | spec->init = stac92hd73xx_6ch_core_init; |
| 4259 | break; | 4267 | break; |
| 4260 | case 0x4: /* 8 Channel */ | 4268 | case 0x4: /* 8 Channel */ |
| 4269 | spec->multiout.hp_nid = 0x18; | ||
| 4261 | spec->mixer = stac92hd73xx_8ch_mixer; | 4270 | spec->mixer = stac92hd73xx_8ch_mixer; |
| 4262 | spec->init = stac92hd73xx_8ch_core_init; | 4271 | spec->init = stac92hd73xx_8ch_core_init; |
| 4263 | break; | 4272 | break; |
| 4264 | case 0x5: /* 10 Channel */ | 4273 | case 0x5: /* 10 Channel */ |
| 4274 | spec->multiout.hp_nid = 0x19; | ||
| 4265 | spec->mixer = stac92hd73xx_10ch_mixer; | 4275 | spec->mixer = stac92hd73xx_10ch_mixer; |
| 4266 | spec->init = stac92hd73xx_10ch_core_init; | 4276 | spec->init = stac92hd73xx_10ch_core_init; |
| 4267 | }; | 4277 | }; |
| @@ -4297,6 +4307,7 @@ again: | |||
| 4297 | spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP]; | 4307 | spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP]; |
| 4298 | spec->eapd_switch = 0; | 4308 | spec->eapd_switch = 0; |
| 4299 | spec->num_amps = 1; | 4309 | spec->num_amps = 1; |
| 4310 | spec->multiout.hp_nid = 0; /* dual HPs */ | ||
| 4300 | 4311 | ||
| 4301 | if (!spec->init) | 4312 | if (!spec->init) |
| 4302 | spec->init = dell_m6_core_init; | 4313 | spec->init = dell_m6_core_init; |
| @@ -4351,6 +4362,9 @@ again: | |||
| 4351 | return err; | 4362 | return err; |
| 4352 | } | 4363 | } |
| 4353 | 4364 | ||
| 4365 | if (spec->board_config == STAC_92HD73XX_NO_JD) | ||
| 4366 | spec->hp_detect = 0; | ||
| 4367 | |||
| 4354 | codec->patch_ops = stac92xx_patch_ops; | 4368 | codec->patch_ops = stac92xx_patch_ops; |
| 4355 | 4369 | ||
| 4356 | return 0; | 4370 | return 0; |
| @@ -4899,6 +4913,10 @@ static int patch_stac927x(struct hda_codec *codec) | |||
| 4899 | */ | 4913 | */ |
| 4900 | codec->bus->needs_damn_long_delay = 1; | 4914 | codec->bus->needs_damn_long_delay = 1; |
| 4901 | 4915 | ||
| 4916 | /* no jack detecion for ref-no-jd model */ | ||
| 4917 | if (spec->board_config == STAC_D965_REF_NO_JD) | ||
| 4918 | spec->hp_detect = 0; | ||
| 4919 | |||
| 4902 | return 0; | 4920 | return 0; |
| 4903 | } | 4921 | } |
| 4904 | 4922 | ||
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index e9084fdd2082..acd68efb2b75 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
| @@ -233,7 +233,7 @@ static int omap_pcm_open(struct snd_pcm_substream *substream) | |||
| 233 | if (ret < 0) | 233 | if (ret < 0) |
| 234 | goto out; | 234 | goto out; |
| 235 | 235 | ||
| 236 | prtd = kzalloc(sizeof(prtd), GFP_KERNEL); | 236 | prtd = kzalloc(sizeof(*prtd), GFP_KERNEL); |
| 237 | if (prtd == NULL) { | 237 | if (prtd == NULL) { |
| 238 | ret = -ENOMEM; | 238 | ret = -ENOMEM; |
| 239 | goto out; | 239 | goto out; |