diff options
348 files changed, 4114 insertions, 4522 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 90b3924071b6..e87bdbfbcc75 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -17,6 +17,12 @@ are specified on the kernel command line with the module name plus | |||
| 17 | 17 | ||
| 18 | usbcore.blinkenlights=1 | 18 | usbcore.blinkenlights=1 |
| 19 | 19 | ||
| 20 | Hyphens (dashes) and underscores are equivalent in parameter names, so | ||
| 21 | log_buf_len=1M print-fatal-signals=1 | ||
| 22 | can also be entered as | ||
| 23 | log-buf-len=1M print_fatal_signals=1 | ||
| 24 | |||
| 25 | |||
| 20 | This document may not be entirely up to date and comprehensive. The command | 26 | This document may not be entirely up to date and comprehensive. The command |
| 21 | "modinfo -p ${modulename}" shows a current list of all parameters of a loadable | 27 | "modinfo -p ${modulename}" shows a current list of all parameters of a loadable |
| 22 | module. Loadable modules, after being loaded into the running kernel, also | 28 | module. Loadable modules, after being loaded into the running kernel, also |
| @@ -345,7 +351,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 345 | not play well with APC CPU idle - disable it if you have | 351 | not play well with APC CPU idle - disable it if you have |
| 346 | APC and your system crashes randomly. | 352 | APC and your system crashes randomly. |
| 347 | 353 | ||
| 348 | apic= [APIC,i386] Advanced Programmable Interrupt Controller | 354 | apic= [APIC,X86-32] Advanced Programmable Interrupt Controller |
| 349 | Change the output verbosity whilst booting | 355 | Change the output verbosity whilst booting |
| 350 | Format: { quiet (default) | verbose | debug } | 356 | Format: { quiet (default) | verbose | debug } |
| 351 | Change the amount of debugging information output | 357 | Change the amount of debugging information output |
| @@ -702,7 +708,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 702 | to discrete, to make X server driver able to add WB | 708 | to discrete, to make X server driver able to add WB |
| 703 | entry later. This parameter enables that. | 709 | entry later. This parameter enables that. |
| 704 | 710 | ||
| 705 | enable_timer_pin_1 [i386,x86-64] | 711 | enable_timer_pin_1 [X86] |
| 706 | Enable PIN 1 of APIC timer | 712 | Enable PIN 1 of APIC timer |
| 707 | Can be useful to work around chipset bugs | 713 | Can be useful to work around chipset bugs |
| 708 | (in particular on some ATI chipsets). | 714 | (in particular on some ATI chipsets). |
| @@ -775,7 +781,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 775 | 781 | ||
| 776 | hashdist= [KNL,NUMA] Large hashes allocated during boot | 782 | hashdist= [KNL,NUMA] Large hashes allocated during boot |
| 777 | are distributed across NUMA nodes. Defaults on | 783 | are distributed across NUMA nodes. Defaults on |
| 778 | for IA-64, off otherwise. | 784 | for 64bit NUMA, off otherwise. |
| 779 | Format: 0 | 1 (for off | on) | 785 | Format: 0 | 1 (for off | on) |
| 780 | 786 | ||
| 781 | hcl= [IA-64] SGI's Hardware Graph compatibility layer | 787 | hcl= [IA-64] SGI's Hardware Graph compatibility layer |
diff --git a/Documentation/lockdep-design.txt b/Documentation/lockdep-design.txt index 938ea22f2cc0..e20d913d5914 100644 --- a/Documentation/lockdep-design.txt +++ b/Documentation/lockdep-design.txt | |||
| @@ -54,9 +54,9 @@ locking error messages, inside curlies. A contrived example: | |||
| 54 | The bit position indicates STATE, STATE-read, for each of the states listed | 54 | The bit position indicates STATE, STATE-read, for each of the states listed |
| 55 | above, and the character displayed in each indicates: | 55 | above, and the character displayed in each indicates: |
| 56 | 56 | ||
| 57 | '.' acquired while irqs disabled | 57 | '.' acquired while irqs disabled and not in irq context |
| 58 | '+' acquired in irq context | 58 | '-' acquired in irq context |
| 59 | '-' acquired with irqs enabled | 59 | '+' acquired with irqs enabled |
| 60 | '?' acquired in irq context with irqs enabled. | 60 | '?' acquired in irq context with irqs enabled. |
| 61 | 61 | ||
| 62 | Unused mutexes cannot be part of the cause of an error. | 62 | Unused mutexes cannot be part of the cause of an error. |
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt index 6049a2a84dda..5d8bc2cd250c 100644 --- a/Documentation/sysfs-rules.txt +++ b/Documentation/sysfs-rules.txt | |||
| @@ -113,7 +113,7 @@ versions of the sysfs interface. | |||
| 113 | "devices" directory at /sys/subsystem/<name>/devices. | 113 | "devices" directory at /sys/subsystem/<name>/devices. |
| 114 | 114 | ||
| 115 | If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be | 115 | If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be |
| 116 | ignored. If it does not exist, you have always to scan all three | 116 | ignored. If it does not exist, you always have to scan all three |
| 117 | places, as the kernel is free to move a subsystem from one place to | 117 | places, as the kernel is free to move a subsystem from one place to |
| 118 | the other, as long as the devices are still reachable by the same | 118 | the other, as long as the devices are still reachable by the same |
| 119 | subsystem name. | 119 | subsystem name. |
diff --git a/MAINTAINERS b/MAINTAINERS index 9de961bd1214..2b349ba4add4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3434,11 +3434,10 @@ L: linuxppc-dev@ozlabs.org | |||
| 3434 | S: Maintained | 3434 | S: Maintained |
| 3435 | 3435 | ||
| 3436 | LINUX FOR POWERPC EMBEDDED MPC5XXX | 3436 | LINUX FOR POWERPC EMBEDDED MPC5XXX |
| 3437 | P: Sylvain Munaut | ||
| 3438 | M: tnt@246tNt.com | ||
| 3439 | P: Grant Likely | 3437 | P: Grant Likely |
| 3440 | M: grant.likely@secretlab.ca | 3438 | M: grant.likely@secretlab.ca |
| 3441 | L: linuxppc-dev@ozlabs.org | 3439 | L: linuxppc-dev@ozlabs.org |
| 3440 | T: git git://git.secretlab.ca/git/linux-2.6.git | ||
| 3442 | S: Maintained | 3441 | S: Maintained |
| 3443 | 3442 | ||
| 3444 | LINUX FOR POWERPC EMBEDDED PPC4XX | 3443 | LINUX FOR POWERPC EMBEDDED PPC4XX |
| @@ -3456,6 +3455,7 @@ P: Grant Likely | |||
| 3456 | M: grant.likely@secretlab.ca | 3455 | M: grant.likely@secretlab.ca |
| 3457 | W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex | 3456 | W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex |
| 3458 | L: linuxppc-dev@ozlabs.org | 3457 | L: linuxppc-dev@ozlabs.org |
| 3458 | T: git git://git.secretlab.ca/git/linux-2.6.git | ||
| 3459 | S: Maintained | 3459 | S: Maintained |
| 3460 | 3460 | ||
| 3461 | LINUX FOR POWERPC EMBEDDED PPC8XX | 3461 | LINUX FOR POWERPC EMBEDDED PPC8XX |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 30 | 3 | SUBLEVEL = 30 |
| 4 | EXTRAVERSION = -rc4 | 4 | EXTRAVERSION = -rc5 |
| 5 | NAME = Vindictive Armadillo | 5 | NAME = Vindictive Armadillo |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/alpha/include/asm/percpu.h b/arch/alpha/include/asm/percpu.h index e9e0bb5a23bf..06c5c7a4afd3 100644 --- a/arch/alpha/include/asm/percpu.h +++ b/arch/alpha/include/asm/percpu.h | |||
| @@ -1,7 +1,9 @@ | |||
| 1 | #ifndef __ALPHA_PERCPU_H | 1 | #ifndef __ALPHA_PERCPU_H |
| 2 | #define __ALPHA_PERCPU_H | 2 | #define __ALPHA_PERCPU_H |
| 3 | |||
| 3 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
| 4 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 6 | #include <linux/percpu-defs.h> | ||
| 5 | 7 | ||
| 6 | /* | 8 | /* |
| 7 | * Determine the real variable name from the name visible in the | 9 | * Determine the real variable name from the name visible in the |
| @@ -73,6 +75,28 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; | |||
| 73 | 75 | ||
| 74 | #endif /* SMP */ | 76 | #endif /* SMP */ |
| 75 | 77 | ||
| 76 | #include <asm-generic/percpu.h> | 78 | #ifdef CONFIG_SMP |
| 79 | #define PER_CPU_BASE_SECTION ".data.percpu" | ||
| 80 | #else | ||
| 81 | #define PER_CPU_BASE_SECTION ".data" | ||
| 82 | #endif | ||
| 83 | |||
| 84 | #ifdef CONFIG_SMP | ||
| 85 | |||
| 86 | #ifdef MODULE | ||
| 87 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | ||
| 88 | #else | ||
| 89 | #define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned" | ||
| 90 | #endif | ||
| 91 | #define PER_CPU_FIRST_SECTION ".first" | ||
| 92 | |||
| 93 | #else | ||
| 94 | |||
| 95 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | ||
| 96 | #define PER_CPU_FIRST_SECTION "" | ||
| 97 | |||
| 98 | #endif | ||
| 99 | |||
| 100 | #define PER_CPU_ATTRIBUTES | ||
| 77 | 101 | ||
| 78 | #endif /* __ALPHA_PERCPU_H */ | 102 | #endif /* __ALPHA_PERCPU_H */ |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9faccc411c2a..e60ec54df334 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -454,6 +454,7 @@ config ARCH_MXC | |||
| 454 | select ARCH_MTD_XIP | 454 | select ARCH_MTD_XIP |
| 455 | select GENERIC_GPIO | 455 | select GENERIC_GPIO |
| 456 | select ARCH_REQUIRE_GPIOLIB | 456 | select ARCH_REQUIRE_GPIOLIB |
| 457 | select HAVE_CLK | ||
| 457 | help | 458 | help |
| 458 | Support for Freescale MXC/iMX-based family of processors | 459 | Support for Freescale MXC/iMX-based family of processors |
| 459 | 460 | ||
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index c367ae44012e..dcf8153a947d 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_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.29-rc5 | 3 | # Linux kernel version: 2.6.30-rc4 |
| 4 | # Tue Mar 3 21:45:57 2009 | 4 | # Mon May 4 11:58:57 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| @@ -66,20 +66,20 @@ CONFIG_NAMESPACES=y | |||
| 66 | # CONFIG_BLK_DEV_INITRD is not set | 66 | # CONFIG_BLK_DEV_INITRD is not set |
| 67 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 67 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 68 | CONFIG_SYSCTL=y | 68 | CONFIG_SYSCTL=y |
| 69 | CONFIG_ANON_INODES=y | ||
| 69 | # CONFIG_EMBEDDED is not set | 70 | # CONFIG_EMBEDDED is not set |
| 70 | CONFIG_UID16=y | 71 | CONFIG_UID16=y |
| 71 | CONFIG_SYSCTL_SYSCALL=y | 72 | CONFIG_SYSCTL_SYSCALL=y |
| 72 | CONFIG_KALLSYMS=y | 73 | CONFIG_KALLSYMS=y |
| 73 | # CONFIG_KALLSYMS_ALL is not set | 74 | # CONFIG_KALLSYMS_ALL is not set |
| 74 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 75 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 76 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 75 | CONFIG_HOTPLUG=y | 77 | CONFIG_HOTPLUG=y |
| 76 | CONFIG_PRINTK=y | 78 | CONFIG_PRINTK=y |
| 77 | CONFIG_BUG=y | 79 | CONFIG_BUG=y |
| 78 | CONFIG_ELF_CORE=y | 80 | CONFIG_ELF_CORE=y |
| 79 | CONFIG_COMPAT_BRK=y | ||
| 80 | CONFIG_BASE_FULL=y | 81 | CONFIG_BASE_FULL=y |
| 81 | CONFIG_FUTEX=y | 82 | CONFIG_FUTEX=y |
| 82 | CONFIG_ANON_INODES=y | ||
| 83 | CONFIG_EPOLL=y | 83 | CONFIG_EPOLL=y |
| 84 | CONFIG_SIGNALFD=y | 84 | CONFIG_SIGNALFD=y |
| 85 | CONFIG_TIMERFD=y | 85 | CONFIG_TIMERFD=y |
| @@ -89,6 +89,7 @@ CONFIG_AIO=y | |||
| 89 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
| 90 | CONFIG_PCI_QUIRKS=y | 90 | CONFIG_PCI_QUIRKS=y |
| 91 | CONFIG_SLUB_DEBUG=y | 91 | CONFIG_SLUB_DEBUG=y |
| 92 | CONFIG_COMPAT_BRK=y | ||
| 92 | # CONFIG_SLAB is not set | 93 | # CONFIG_SLAB is not set |
| 93 | CONFIG_SLUB=y | 94 | CONFIG_SLUB=y |
| 94 | # CONFIG_SLOB is not set | 95 | # CONFIG_SLOB is not set |
| @@ -101,6 +102,7 @@ CONFIG_KPROBES=y | |||
| 101 | CONFIG_KRETPROBES=y | 102 | CONFIG_KRETPROBES=y |
| 102 | CONFIG_HAVE_KPROBES=y | 103 | CONFIG_HAVE_KPROBES=y |
| 103 | CONFIG_HAVE_KRETPROBES=y | 104 | CONFIG_HAVE_KRETPROBES=y |
| 105 | # CONFIG_SLOW_WORK is not set | ||
| 104 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | 106 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
| 105 | CONFIG_SLABINFO=y | 107 | CONFIG_SLABINFO=y |
| 106 | CONFIG_RT_MUTEXES=y | 108 | CONFIG_RT_MUTEXES=y |
| @@ -113,7 +115,6 @@ CONFIG_MODULE_UNLOAD=y | |||
| 113 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 115 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 114 | CONFIG_BLOCK=y | 116 | CONFIG_BLOCK=y |
| 115 | # CONFIG_LBD is not set | 117 | # CONFIG_LBD is not set |
| 116 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 117 | # CONFIG_BLK_DEV_BSG is not set | 118 | # CONFIG_BLK_DEV_BSG is not set |
| 118 | # CONFIG_BLK_DEV_INTEGRITY is not set | 119 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 119 | 120 | ||
| @@ -142,6 +143,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" | |||
| 142 | # CONFIG_ARCH_CLPS711X is not set | 143 | # CONFIG_ARCH_CLPS711X is not set |
| 143 | # CONFIG_ARCH_EBSA110 is not set | 144 | # CONFIG_ARCH_EBSA110 is not set |
| 144 | # CONFIG_ARCH_EP93XX is not set | 145 | # CONFIG_ARCH_EP93XX is not set |
| 146 | # CONFIG_ARCH_GEMINI is not set | ||
| 145 | # CONFIG_ARCH_FOOTBRIDGE is not set | 147 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 146 | # CONFIG_ARCH_NETX is not set | 148 | # CONFIG_ARCH_NETX is not set |
| 147 | # CONFIG_ARCH_H720X is not set | 149 | # CONFIG_ARCH_H720X is not set |
| @@ -162,6 +164,7 @@ CONFIG_ARCH_KIRKWOOD=y | |||
| 162 | # CONFIG_ARCH_ORION5X is not set | 164 | # CONFIG_ARCH_ORION5X is not set |
| 163 | # CONFIG_ARCH_PNX4008 is not set | 165 | # CONFIG_ARCH_PNX4008 is not set |
| 164 | # CONFIG_ARCH_PXA is not set | 166 | # CONFIG_ARCH_PXA is not set |
| 167 | # CONFIG_ARCH_MMP is not set | ||
| 165 | # CONFIG_ARCH_RPC is not set | 168 | # CONFIG_ARCH_RPC is not set |
| 166 | # CONFIG_ARCH_SA1100 is not set | 169 | # CONFIG_ARCH_SA1100 is not set |
| 167 | # CONFIG_ARCH_S3C2410 is not set | 170 | # CONFIG_ARCH_S3C2410 is not set |
| @@ -217,6 +220,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 217 | CONFIG_PCI_LEGACY=y | 220 | CONFIG_PCI_LEGACY=y |
| 218 | # CONFIG_PCI_DEBUG is not set | 221 | # CONFIG_PCI_DEBUG is not set |
| 219 | # CONFIG_PCI_STUB is not set | 222 | # CONFIG_PCI_STUB is not set |
| 223 | # CONFIG_PCI_IOV is not set | ||
| 220 | # CONFIG_PCCARD is not set | 224 | # CONFIG_PCCARD is not set |
| 221 | 225 | ||
| 222 | # | 226 | # |
| @@ -237,6 +241,7 @@ CONFIG_AEABI=y | |||
| 237 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | 241 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y |
| 238 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | 242 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set |
| 239 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | 243 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set |
| 244 | # CONFIG_HIGHMEM is not set | ||
| 240 | CONFIG_SELECT_MEMORY_MODEL=y | 245 | CONFIG_SELECT_MEMORY_MODEL=y |
| 241 | CONFIG_FLATMEM_MANUAL=y | 246 | CONFIG_FLATMEM_MANUAL=y |
| 242 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 247 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -249,6 +254,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 | |||
| 249 | CONFIG_ZONE_DMA_FLAG=0 | 254 | CONFIG_ZONE_DMA_FLAG=0 |
| 250 | CONFIG_VIRT_TO_BUS=y | 255 | CONFIG_VIRT_TO_BUS=y |
| 251 | CONFIG_UNEVICTABLE_LRU=y | 256 | CONFIG_UNEVICTABLE_LRU=y |
| 257 | CONFIG_HAVE_MLOCK=y | ||
| 258 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 252 | CONFIG_ALIGNMENT_TRAP=y | 259 | CONFIG_ALIGNMENT_TRAP=y |
| 253 | 260 | ||
| 254 | # | 261 | # |
| @@ -293,7 +300,6 @@ CONFIG_NET=y | |||
| 293 | # | 300 | # |
| 294 | # Networking options | 301 | # Networking options |
| 295 | # | 302 | # |
| 296 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 297 | CONFIG_PACKET=y | 303 | CONFIG_PACKET=y |
| 298 | CONFIG_PACKET_MMAP=y | 304 | CONFIG_PACKET_MMAP=y |
| 299 | CONFIG_UNIX=y | 305 | CONFIG_UNIX=y |
| @@ -324,7 +330,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 324 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 330 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 325 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 331 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 326 | CONFIG_INET_XFRM_MODE_BEET=y | 332 | CONFIG_INET_XFRM_MODE_BEET=y |
| 327 | # CONFIG_INET_LRO is not set | 333 | CONFIG_INET_LRO=y |
| 328 | CONFIG_INET_DIAG=y | 334 | CONFIG_INET_DIAG=y |
| 329 | CONFIG_INET_TCP_DIAG=y | 335 | CONFIG_INET_TCP_DIAG=y |
| 330 | # CONFIG_TCP_CONG_ADVANCED is not set | 336 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -357,6 +363,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=y | |||
| 357 | # CONFIG_LAPB is not set | 363 | # CONFIG_LAPB is not set |
| 358 | # CONFIG_ECONET is not set | 364 | # CONFIG_ECONET is not set |
| 359 | # CONFIG_WAN_ROUTER is not set | 365 | # CONFIG_WAN_ROUTER is not set |
| 366 | # CONFIG_PHONET is not set | ||
| 360 | # CONFIG_NET_SCHED is not set | 367 | # CONFIG_NET_SCHED is not set |
| 361 | # CONFIG_DCB is not set | 368 | # CONFIG_DCB is not set |
| 362 | 369 | ||
| @@ -365,20 +372,20 @@ CONFIG_NET_DSA_MV88E6123_61_65=y | |||
| 365 | # | 372 | # |
| 366 | CONFIG_NET_PKTGEN=m | 373 | CONFIG_NET_PKTGEN=m |
| 367 | # CONFIG_NET_TCPPROBE is not set | 374 | # CONFIG_NET_TCPPROBE is not set |
| 375 | # CONFIG_NET_DROP_MONITOR is not set | ||
| 368 | # CONFIG_HAMRADIO is not set | 376 | # CONFIG_HAMRADIO is not set |
| 369 | # CONFIG_CAN is not set | 377 | # CONFIG_CAN is not set |
| 370 | # CONFIG_IRDA is not set | 378 | # CONFIG_IRDA is not set |
| 371 | # CONFIG_BT is not set | 379 | # CONFIG_BT is not set |
| 372 | # CONFIG_AF_RXRPC is not set | 380 | # CONFIG_AF_RXRPC is not set |
| 373 | # CONFIG_PHONET is not set | ||
| 374 | CONFIG_WIRELESS=y | 381 | CONFIG_WIRELESS=y |
| 375 | CONFIG_CFG80211=y | 382 | CONFIG_CFG80211=y |
| 376 | # CONFIG_CFG80211_REG_DEBUG is not set | 383 | # CONFIG_CFG80211_REG_DEBUG is not set |
| 377 | # CONFIG_NL80211 is not set | ||
| 378 | CONFIG_WIRELESS_OLD_REGULATORY=y | 384 | CONFIG_WIRELESS_OLD_REGULATORY=y |
| 379 | CONFIG_WIRELESS_EXT=y | 385 | CONFIG_WIRELESS_EXT=y |
| 380 | CONFIG_WIRELESS_EXT_SYSFS=y | 386 | CONFIG_WIRELESS_EXT_SYSFS=y |
| 381 | CONFIG_LIB80211=y | 387 | CONFIG_LIB80211=y |
| 388 | # CONFIG_LIB80211_DEBUG is not set | ||
| 382 | CONFIG_MAC80211=y | 389 | CONFIG_MAC80211=y |
| 383 | 390 | ||
| 384 | # | 391 | # |
| @@ -513,7 +520,6 @@ CONFIG_MTD_NAND_ORION=y | |||
| 513 | # LPDDR flash memory drivers | 520 | # LPDDR flash memory drivers |
| 514 | # | 521 | # |
| 515 | # CONFIG_MTD_LPDDR is not set | 522 | # CONFIG_MTD_LPDDR is not set |
| 516 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 517 | 523 | ||
| 518 | # | 524 | # |
| 519 | # UBI - Unsorted block images | 525 | # UBI - Unsorted block images |
| @@ -592,8 +598,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 592 | # CONFIG_MEGARAID_NEWGEN is not set | 598 | # CONFIG_MEGARAID_NEWGEN is not set |
| 593 | # CONFIG_MEGARAID_LEGACY is not set | 599 | # CONFIG_MEGARAID_LEGACY is not set |
| 594 | # CONFIG_MEGARAID_SAS is not set | 600 | # CONFIG_MEGARAID_SAS is not set |
| 601 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 595 | # CONFIG_SCSI_HPTIOP is not set | 602 | # CONFIG_SCSI_HPTIOP is not set |
| 596 | # CONFIG_LIBFC is not set | 603 | # CONFIG_LIBFC is not set |
| 604 | # CONFIG_LIBFCOE is not set | ||
| 597 | # CONFIG_FCOE is not set | 605 | # CONFIG_FCOE is not set |
| 598 | # CONFIG_SCSI_DMX3191D is not set | 606 | # CONFIG_SCSI_DMX3191D is not set |
| 599 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 607 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -614,6 +622,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 614 | # CONFIG_SCSI_DEBUG is not set | 622 | # CONFIG_SCSI_DEBUG is not set |
| 615 | # CONFIG_SCSI_SRP is not set | 623 | # CONFIG_SCSI_SRP is not set |
| 616 | # CONFIG_SCSI_DH is not set | 624 | # CONFIG_SCSI_DH is not set |
| 625 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 617 | CONFIG_ATA=y | 626 | CONFIG_ATA=y |
| 618 | # CONFIG_ATA_NONSTANDARD is not set | 627 | # CONFIG_ATA_NONSTANDARD is not set |
| 619 | CONFIG_SATA_PMP=y | 628 | CONFIG_SATA_PMP=y |
| @@ -687,6 +696,7 @@ CONFIG_SATA_MV=y | |||
| 687 | # CONFIG_IEEE1394 is not set | 696 | # CONFIG_IEEE1394 is not set |
| 688 | # CONFIG_I2O is not set | 697 | # CONFIG_I2O is not set |
| 689 | CONFIG_NETDEVICES=y | 698 | CONFIG_NETDEVICES=y |
| 699 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 690 | # CONFIG_DUMMY is not set | 700 | # CONFIG_DUMMY is not set |
| 691 | # CONFIG_BONDING is not set | 701 | # CONFIG_BONDING is not set |
| 692 | # CONFIG_MACVLAN is not set | 702 | # CONFIG_MACVLAN is not set |
| @@ -724,8 +734,10 @@ CONFIG_MII=y | |||
| 724 | # CONFIG_SMC91X is not set | 734 | # CONFIG_SMC91X is not set |
| 725 | # CONFIG_DM9000 is not set | 735 | # CONFIG_DM9000 is not set |
| 726 | # CONFIG_ENC28J60 is not set | 736 | # CONFIG_ENC28J60 is not set |
| 737 | # CONFIG_ETHOC is not set | ||
| 727 | # CONFIG_SMC911X is not set | 738 | # CONFIG_SMC911X is not set |
| 728 | # CONFIG_SMSC911X is not set | 739 | # CONFIG_SMSC911X is not set |
| 740 | # CONFIG_DNET is not set | ||
| 729 | # CONFIG_NET_TULIP is not set | 741 | # CONFIG_NET_TULIP is not set |
| 730 | # CONFIG_HP100 is not set | 742 | # CONFIG_HP100 is not set |
| 731 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 743 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -763,6 +775,7 @@ CONFIG_NETDEV_1000=y | |||
| 763 | # CONFIG_E1000E is not set | 775 | # CONFIG_E1000E is not set |
| 764 | # CONFIG_IP1000 is not set | 776 | # CONFIG_IP1000 is not set |
| 765 | # CONFIG_IGB is not set | 777 | # CONFIG_IGB is not set |
| 778 | # CONFIG_IGBVF is not set | ||
| 766 | # CONFIG_NS83820 is not set | 779 | # CONFIG_NS83820 is not set |
| 767 | # CONFIG_HAMACHI is not set | 780 | # CONFIG_HAMACHI is not set |
| 768 | # CONFIG_YELLOWFIN is not set | 781 | # CONFIG_YELLOWFIN is not set |
| @@ -777,6 +790,7 @@ CONFIG_MV643XX_ETH=y | |||
| 777 | # CONFIG_QLA3XXX is not set | 790 | # CONFIG_QLA3XXX is not set |
| 778 | # CONFIG_ATL1 is not set | 791 | # CONFIG_ATL1 is not set |
| 779 | # CONFIG_ATL1E is not set | 792 | # CONFIG_ATL1E is not set |
| 793 | # CONFIG_ATL1C is not set | ||
| 780 | # CONFIG_JME is not set | 794 | # CONFIG_JME is not set |
| 781 | # CONFIG_NETDEV_10000 is not set | 795 | # CONFIG_NETDEV_10000 is not set |
| 782 | # CONFIG_TR is not set | 796 | # CONFIG_TR is not set |
| @@ -789,10 +803,11 @@ CONFIG_WLAN_80211=y | |||
| 789 | CONFIG_LIBERTAS=y | 803 | CONFIG_LIBERTAS=y |
| 790 | # CONFIG_LIBERTAS_USB is not set | 804 | # CONFIG_LIBERTAS_USB is not set |
| 791 | CONFIG_LIBERTAS_SDIO=y | 805 | CONFIG_LIBERTAS_SDIO=y |
| 806 | # CONFIG_LIBERTAS_SPI is not set | ||
| 792 | # CONFIG_LIBERTAS_DEBUG is not set | 807 | # CONFIG_LIBERTAS_DEBUG is not set |
| 793 | # CONFIG_LIBERTAS_THINFIRM is not set | 808 | # CONFIG_LIBERTAS_THINFIRM is not set |
| 794 | # CONFIG_HERMES is not set | ||
| 795 | # CONFIG_ATMEL is not set | 809 | # CONFIG_ATMEL is not set |
| 810 | # CONFIG_AT76C50X_USB is not set | ||
| 796 | # CONFIG_PRISM54 is not set | 811 | # CONFIG_PRISM54 is not set |
| 797 | # CONFIG_USB_ZD1201 is not set | 812 | # CONFIG_USB_ZD1201 is not set |
| 798 | # CONFIG_USB_NET_RNDIS_WLAN is not set | 813 | # CONFIG_USB_NET_RNDIS_WLAN is not set |
| @@ -800,20 +815,20 @@ CONFIG_LIBERTAS_SDIO=y | |||
| 800 | # CONFIG_RTL8187 is not set | 815 | # CONFIG_RTL8187 is not set |
| 801 | # CONFIG_ADM8211 is not set | 816 | # CONFIG_ADM8211 is not set |
| 802 | # CONFIG_MAC80211_HWSIM is not set | 817 | # CONFIG_MAC80211_HWSIM is not set |
| 818 | # CONFIG_MWL8K is not set | ||
| 803 | # CONFIG_P54_COMMON is not set | 819 | # CONFIG_P54_COMMON is not set |
| 804 | # CONFIG_ATH5K is not set | 820 | # CONFIG_ATH5K is not set |
| 805 | # CONFIG_ATH9K is not set | 821 | # CONFIG_ATH9K is not set |
| 822 | # CONFIG_AR9170_USB is not set | ||
| 806 | # CONFIG_IPW2100 is not set | 823 | # CONFIG_IPW2100 is not set |
| 807 | # CONFIG_IPW2200 is not set | 824 | # CONFIG_IPW2200 is not set |
| 808 | # CONFIG_IWLCORE is not set | 825 | # CONFIG_IWLWIFI is not set |
| 809 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 810 | # CONFIG_IWLAGN is not set | ||
| 811 | # CONFIG_IWL3945 is not set | ||
| 812 | # CONFIG_HOSTAP is not set | 826 | # CONFIG_HOSTAP is not set |
| 813 | # CONFIG_B43 is not set | 827 | # CONFIG_B43 is not set |
| 814 | # CONFIG_B43LEGACY is not set | 828 | # CONFIG_B43LEGACY is not set |
| 815 | # CONFIG_ZD1211RW is not set | 829 | # CONFIG_ZD1211RW is not set |
| 816 | # CONFIG_RT2X00 is not set | 830 | # CONFIG_RT2X00 is not set |
| 831 | # CONFIG_HERMES is not set | ||
| 817 | 832 | ||
| 818 | # | 833 | # |
| 819 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 834 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -908,6 +923,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | |||
| 908 | # | 923 | # |
| 909 | # Non-8250 serial port support | 924 | # Non-8250 serial port support |
| 910 | # | 925 | # |
| 926 | # CONFIG_SERIAL_MAX3100 is not set | ||
| 911 | CONFIG_SERIAL_CORE=y | 927 | CONFIG_SERIAL_CORE=y |
| 912 | CONFIG_SERIAL_CORE_CONSOLE=y | 928 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 913 | # CONFIG_SERIAL_JSM is not set | 929 | # CONFIG_SERIAL_JSM is not set |
| @@ -982,7 +998,6 @@ CONFIG_I2C_MV64XXX=y | |||
| 982 | # CONFIG_SENSORS_PCF8574 is not set | 998 | # CONFIG_SENSORS_PCF8574 is not set |
| 983 | # CONFIG_PCF8575 is not set | 999 | # CONFIG_PCF8575 is not set |
| 984 | # CONFIG_SENSORS_PCA9539 is not set | 1000 | # CONFIG_SENSORS_PCA9539 is not set |
| 985 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 986 | # CONFIG_SENSORS_MAX6875 is not set | 1001 | # CONFIG_SENSORS_MAX6875 is not set |
| 987 | # CONFIG_SENSORS_TSL2550 is not set | 1002 | # CONFIG_SENSORS_TSL2550 is not set |
| 988 | # CONFIG_I2C_DEBUG_CORE is not set | 1003 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -1082,15 +1097,17 @@ CONFIG_USB_HID=y | |||
| 1082 | # | 1097 | # |
| 1083 | # Special HID drivers | 1098 | # Special HID drivers |
| 1084 | # | 1099 | # |
| 1085 | CONFIG_HID_COMPAT=y | ||
| 1086 | CONFIG_HID_A4TECH=y | 1100 | CONFIG_HID_A4TECH=y |
| 1087 | CONFIG_HID_APPLE=y | 1101 | CONFIG_HID_APPLE=y |
| 1088 | CONFIG_HID_BELKIN=y | 1102 | CONFIG_HID_BELKIN=y |
| 1089 | CONFIG_HID_CHERRY=y | 1103 | CONFIG_HID_CHERRY=y |
| 1090 | CONFIG_HID_CHICONY=y | 1104 | CONFIG_HID_CHICONY=y |
| 1091 | CONFIG_HID_CYPRESS=y | 1105 | CONFIG_HID_CYPRESS=y |
| 1106 | # CONFIG_DRAGONRISE_FF is not set | ||
| 1092 | CONFIG_HID_EZKEY=y | 1107 | CONFIG_HID_EZKEY=y |
| 1108 | CONFIG_HID_KYE=y | ||
| 1093 | CONFIG_HID_GYRATION=y | 1109 | CONFIG_HID_GYRATION=y |
| 1110 | CONFIG_HID_KENSINGTON=y | ||
| 1094 | CONFIG_HID_LOGITECH=y | 1111 | CONFIG_HID_LOGITECH=y |
| 1095 | # CONFIG_LOGITECH_FF is not set | 1112 | # CONFIG_LOGITECH_FF is not set |
| 1096 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1113 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| @@ -1152,11 +1169,11 @@ CONFIG_USB_PRINTER=m | |||
| 1152 | # CONFIG_USB_TMC is not set | 1169 | # CONFIG_USB_TMC is not set |
| 1153 | 1170 | ||
| 1154 | # | 1171 | # |
| 1155 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 1172 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 1156 | # | 1173 | # |
| 1157 | 1174 | ||
| 1158 | # | 1175 | # |
| 1159 | # see USB_STORAGE Help for more information | 1176 | # also be needed; see USB_STORAGE Help for more info |
| 1160 | # | 1177 | # |
| 1161 | CONFIG_USB_STORAGE=y | 1178 | CONFIG_USB_STORAGE=y |
| 1162 | # CONFIG_USB_STORAGE_DEBUG is not set | 1179 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1198,7 +1215,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1198 | # CONFIG_USB_LED is not set | 1215 | # CONFIG_USB_LED is not set |
| 1199 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1216 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1200 | # CONFIG_USB_CYTHERM is not set | 1217 | # CONFIG_USB_CYTHERM is not set |
| 1201 | # CONFIG_USB_PHIDGET is not set | ||
| 1202 | # CONFIG_USB_IDMOUSE is not set | 1218 | # CONFIG_USB_IDMOUSE is not set |
| 1203 | # CONFIG_USB_FTDI_ELAN is not set | 1219 | # CONFIG_USB_FTDI_ELAN is not set |
| 1204 | # CONFIG_USB_APPLEDISPLAY is not set | 1220 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -1215,6 +1231,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1215 | # OTG and related infrastructure | 1231 | # OTG and related infrastructure |
| 1216 | # | 1232 | # |
| 1217 | # CONFIG_USB_GPIO_VBUS is not set | 1233 | # CONFIG_USB_GPIO_VBUS is not set |
| 1234 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 1218 | # CONFIG_UWB is not set | 1235 | # CONFIG_UWB is not set |
| 1219 | CONFIG_MMC=y | 1236 | CONFIG_MMC=y |
| 1220 | # CONFIG_MMC_DEBUG is not set | 1237 | # CONFIG_MMC_DEBUG is not set |
| @@ -1245,7 +1262,11 @@ CONFIG_LEDS_CLASS=y | |||
| 1245 | # | 1262 | # |
| 1246 | # CONFIG_LEDS_PCA9532 is not set | 1263 | # CONFIG_LEDS_PCA9532 is not set |
| 1247 | CONFIG_LEDS_GPIO=y | 1264 | CONFIG_LEDS_GPIO=y |
| 1265 | CONFIG_LEDS_GPIO_PLATFORM=y | ||
| 1266 | # CONFIG_LEDS_LP5521 is not set | ||
| 1248 | # CONFIG_LEDS_PCA955X is not set | 1267 | # CONFIG_LEDS_PCA955X is not set |
| 1268 | # CONFIG_LEDS_DAC124S085 is not set | ||
| 1269 | # CONFIG_LEDS_BD2802 is not set | ||
| 1249 | 1270 | ||
| 1250 | # | 1271 | # |
| 1251 | # LED Triggers | 1272 | # LED Triggers |
| @@ -1255,6 +1276,10 @@ CONFIG_LEDS_TRIGGER_TIMER=y | |||
| 1255 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 1276 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 1256 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | 1277 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set |
| 1257 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | 1278 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y |
| 1279 | |||
| 1280 | # | ||
| 1281 | # iptables trigger is under Netfilter config (LED target) | ||
| 1282 | # | ||
| 1258 | CONFIG_RTC_LIB=y | 1283 | CONFIG_RTC_LIB=y |
| 1259 | CONFIG_RTC_CLASS=y | 1284 | CONFIG_RTC_CLASS=y |
| 1260 | CONFIG_RTC_HCTOSYS=y | 1285 | CONFIG_RTC_HCTOSYS=y |
| @@ -1329,7 +1354,9 @@ CONFIG_DMA_ENGINE=y | |||
| 1329 | # DMA Clients | 1354 | # DMA Clients |
| 1330 | # | 1355 | # |
| 1331 | # CONFIG_NET_DMA is not set | 1356 | # CONFIG_NET_DMA is not set |
| 1357 | # CONFIG_ASYNC_TX_DMA is not set | ||
| 1332 | # CONFIG_DMATEST is not set | 1358 | # CONFIG_DMATEST is not set |
| 1359 | # CONFIG_AUXDISPLAY is not set | ||
| 1333 | # CONFIG_REGULATOR is not set | 1360 | # CONFIG_REGULATOR is not set |
| 1334 | # CONFIG_UIO is not set | 1361 | # CONFIG_UIO is not set |
| 1335 | # CONFIG_STAGING is not set | 1362 | # CONFIG_STAGING is not set |
| @@ -1341,6 +1368,7 @@ CONFIG_EXT2_FS=y | |||
| 1341 | # CONFIG_EXT2_FS_XATTR is not set | 1368 | # CONFIG_EXT2_FS_XATTR is not set |
| 1342 | # CONFIG_EXT2_FS_XIP is not set | 1369 | # CONFIG_EXT2_FS_XIP is not set |
| 1343 | CONFIG_EXT3_FS=y | 1370 | CONFIG_EXT3_FS=y |
| 1371 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1344 | # CONFIG_EXT3_FS_XATTR is not set | 1372 | # CONFIG_EXT3_FS_XATTR is not set |
| 1345 | # CONFIG_EXT4_FS is not set | 1373 | # CONFIG_EXT4_FS is not set |
| 1346 | CONFIG_JBD=y | 1374 | CONFIG_JBD=y |
| @@ -1361,6 +1389,11 @@ CONFIG_INOTIFY_USER=y | |||
| 1361 | # CONFIG_FUSE_FS is not set | 1389 | # CONFIG_FUSE_FS is not set |
| 1362 | 1390 | ||
| 1363 | # | 1391 | # |
| 1392 | # Caches | ||
| 1393 | # | ||
| 1394 | # CONFIG_FSCACHE is not set | ||
| 1395 | |||
| 1396 | # | ||
| 1364 | # CD-ROM/DVD Filesystems | 1397 | # CD-ROM/DVD Filesystems |
| 1365 | # | 1398 | # |
| 1366 | CONFIG_ISO9660_FS=m | 1399 | CONFIG_ISO9660_FS=m |
| @@ -1419,6 +1452,7 @@ CONFIG_CRAMFS=y | |||
| 1419 | # CONFIG_ROMFS_FS is not set | 1452 | # CONFIG_ROMFS_FS is not set |
| 1420 | # CONFIG_SYSV_FS is not set | 1453 | # CONFIG_SYSV_FS is not set |
| 1421 | # CONFIG_UFS_FS is not set | 1454 | # CONFIG_UFS_FS is not set |
| 1455 | # CONFIG_NILFS2_FS is not set | ||
| 1422 | CONFIG_NETWORK_FILESYSTEMS=y | 1456 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1423 | CONFIG_NFS_FS=y | 1457 | CONFIG_NFS_FS=y |
| 1424 | CONFIG_NFS_V3=y | 1458 | CONFIG_NFS_V3=y |
| @@ -1430,7 +1464,6 @@ CONFIG_LOCKD=y | |||
| 1430 | CONFIG_LOCKD_V4=y | 1464 | CONFIG_LOCKD_V4=y |
| 1431 | CONFIG_NFS_COMMON=y | 1465 | CONFIG_NFS_COMMON=y |
| 1432 | CONFIG_SUNRPC=y | 1466 | CONFIG_SUNRPC=y |
| 1433 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1434 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1467 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1435 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1468 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1436 | # CONFIG_SMB_FS is not set | 1469 | # CONFIG_SMB_FS is not set |
| @@ -1502,6 +1535,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 1502 | CONFIG_DETECT_SOFTLOCKUP=y | 1535 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1503 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1536 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1504 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1537 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1538 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1539 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1540 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1505 | # CONFIG_SCHED_DEBUG is not set | 1541 | # CONFIG_SCHED_DEBUG is not set |
| 1506 | # CONFIG_SCHEDSTATS is not set | 1542 | # CONFIG_SCHEDSTATS is not set |
| 1507 | # CONFIG_TIMER_STATS is not set | 1543 | # CONFIG_TIMER_STATS is not set |
| @@ -1538,10 +1574,12 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 1538 | # CONFIG_FAULT_INJECTION is not set | 1574 | # CONFIG_FAULT_INJECTION is not set |
| 1539 | # CONFIG_LATENCYTOP is not set | 1575 | # CONFIG_LATENCYTOP is not set |
| 1540 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1576 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1577 | # CONFIG_PAGE_POISONING is not set | ||
| 1541 | CONFIG_NOP_TRACER=y | 1578 | CONFIG_NOP_TRACER=y |
| 1542 | CONFIG_HAVE_FUNCTION_TRACER=y | 1579 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1543 | CONFIG_RING_BUFFER=y | 1580 | CONFIG_RING_BUFFER=y |
| 1544 | CONFIG_TRACING=y | 1581 | CONFIG_TRACING=y |
| 1582 | CONFIG_TRACING_SUPPORT=y | ||
| 1545 | 1583 | ||
| 1546 | # | 1584 | # |
| 1547 | # Tracers | 1585 | # Tracers |
| @@ -1551,11 +1589,15 @@ CONFIG_TRACING=y | |||
| 1551 | # CONFIG_PREEMPT_TRACER is not set | 1589 | # CONFIG_PREEMPT_TRACER is not set |
| 1552 | # CONFIG_SCHED_TRACER is not set | 1590 | # CONFIG_SCHED_TRACER is not set |
| 1553 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1591 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1592 | # CONFIG_EVENT_TRACER is not set | ||
| 1554 | # CONFIG_BOOT_TRACER is not set | 1593 | # CONFIG_BOOT_TRACER is not set |
| 1555 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1594 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1556 | # CONFIG_STACK_TRACER is not set | 1595 | # CONFIG_STACK_TRACER is not set |
| 1596 | # CONFIG_KMEMTRACE is not set | ||
| 1597 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1598 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1557 | # CONFIG_FTRACE_STARTUP_TEST is not set | 1599 | # CONFIG_FTRACE_STARTUP_TEST is not set |
| 1558 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1600 | # CONFIG_DYNAMIC_DEBUG is not set |
| 1559 | # CONFIG_SAMPLES is not set | 1601 | # CONFIG_SAMPLES is not set |
| 1560 | CONFIG_HAVE_ARCH_KGDB=y | 1602 | CONFIG_HAVE_ARCH_KGDB=y |
| 1561 | # CONFIG_KGDB is not set | 1603 | # CONFIG_KGDB is not set |
| @@ -1587,10 +1629,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 1587 | CONFIG_CRYPTO_HASH=y | 1629 | CONFIG_CRYPTO_HASH=y |
| 1588 | CONFIG_CRYPTO_HASH2=y | 1630 | CONFIG_CRYPTO_HASH2=y |
| 1589 | CONFIG_CRYPTO_RNG2=y | 1631 | CONFIG_CRYPTO_RNG2=y |
| 1632 | CONFIG_CRYPTO_PCOMP=y | ||
| 1590 | CONFIG_CRYPTO_MANAGER=y | 1633 | CONFIG_CRYPTO_MANAGER=y |
| 1591 | CONFIG_CRYPTO_MANAGER2=y | 1634 | CONFIG_CRYPTO_MANAGER2=y |
| 1592 | # CONFIG_CRYPTO_GF128MUL is not set | 1635 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1593 | # CONFIG_CRYPTO_NULL is not set | 1636 | # CONFIG_CRYPTO_NULL is not set |
| 1637 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1594 | # CONFIG_CRYPTO_CRYPTD is not set | 1638 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1595 | # CONFIG_CRYPTO_AUTHENC is not set | 1639 | # CONFIG_CRYPTO_AUTHENC is not set |
| 1596 | # CONFIG_CRYPTO_TEST is not set | 1640 | # CONFIG_CRYPTO_TEST is not set |
| @@ -1659,6 +1703,7 @@ CONFIG_CRYPTO_ARC4=y | |||
| 1659 | # Compression | 1703 | # Compression |
| 1660 | # | 1704 | # |
| 1661 | # CONFIG_CRYPTO_DEFLATE is not set | 1705 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1706 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1662 | # CONFIG_CRYPTO_LZO is not set | 1707 | # CONFIG_CRYPTO_LZO is not set |
| 1663 | 1708 | ||
| 1664 | # | 1709 | # |
| @@ -1667,6 +1712,7 @@ CONFIG_CRYPTO_ARC4=y | |||
| 1667 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1712 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1668 | CONFIG_CRYPTO_HW=y | 1713 | CONFIG_CRYPTO_HW=y |
| 1669 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1714 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1715 | CONFIG_BINARY_PRINTF=y | ||
| 1670 | 1716 | ||
| 1671 | # | 1717 | # |
| 1672 | # Library routines | 1718 | # Library routines |
| @@ -1682,7 +1728,7 @@ CONFIG_CRC32=y | |||
| 1682 | CONFIG_LIBCRC32C=y | 1728 | CONFIG_LIBCRC32C=y |
| 1683 | CONFIG_ZLIB_INFLATE=y | 1729 | CONFIG_ZLIB_INFLATE=y |
| 1684 | CONFIG_ZLIB_DEFLATE=y | 1730 | CONFIG_ZLIB_DEFLATE=y |
| 1685 | CONFIG_PLIST=y | ||
| 1686 | CONFIG_HAS_IOMEM=y | 1731 | CONFIG_HAS_IOMEM=y |
| 1687 | CONFIG_HAS_IOPORT=y | 1732 | CONFIG_HAS_IOPORT=y |
| 1688 | CONFIG_HAS_DMA=y | 1733 | CONFIG_HAS_DMA=y |
| 1734 | CONFIG_NLATTR=y | ||
diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig index b0698722e0cb..398274b0771a 100644 --- a/arch/arm/configs/mv78xx0_defconfig +++ b/arch/arm/configs/mv78xx0_defconfig | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.30-rc4 |
| 4 | # Fri Jun 13 02:57:32 2008 | 4 | # Mon May 4 14:22:12 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| 8 | # CONFIG_GENERIC_GPIO is not set | 8 | CONFIG_GENERIC_GPIO=y |
| 9 | CONFIG_GENERIC_TIME=y | 9 | CONFIG_GENERIC_TIME=y |
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | 10 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 11 | CONFIG_MMU=y | 11 | CONFIG_MMU=y |
| @@ -22,8 +22,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 23 | CONFIG_GENERIC_HWEIGHT=y | 23 | CONFIG_GENERIC_HWEIGHT=y |
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 25 | CONFIG_ARCH_SUPPORTS_AOUT=y | 25 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_VECTORS_BASE=0xffff0000 | 26 | CONFIG_VECTORS_BASE=0xffff0000 |
| 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 29 | 28 | ||
| @@ -43,10 +42,19 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 43 | # CONFIG_BSD_PROCESS_ACCT is not set | 42 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 44 | # CONFIG_TASKSTATS is not set | 43 | # CONFIG_TASKSTATS is not set |
| 45 | # CONFIG_AUDIT is not set | 44 | # CONFIG_AUDIT is not set |
| 45 | |||
| 46 | # | ||
| 47 | # RCU Subsystem | ||
| 48 | # | ||
| 49 | CONFIG_CLASSIC_RCU=y | ||
| 50 | # CONFIG_TREE_RCU is not set | ||
| 51 | # CONFIG_PREEMPT_RCU is not set | ||
| 52 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 53 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 46 | # CONFIG_IKCONFIG is not set | 54 | # CONFIG_IKCONFIG is not set |
| 47 | CONFIG_LOG_BUF_SHIFT=14 | 55 | CONFIG_LOG_BUF_SHIFT=14 |
| 48 | # CONFIG_CGROUPS is not set | ||
| 49 | # CONFIG_GROUP_SCHED is not set | 56 | # CONFIG_GROUP_SCHED is not set |
| 57 | # CONFIG_CGROUPS is not set | ||
| 50 | CONFIG_SYSFS_DEPRECATED=y | 58 | CONFIG_SYSFS_DEPRECATED=y |
| 51 | CONFIG_SYSFS_DEPRECATED_V2=y | 59 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 52 | # CONFIG_RELAY is not set | 60 | # CONFIG_RELAY is not set |
| @@ -54,32 +62,35 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 54 | # CONFIG_BLK_DEV_INITRD is not set | 62 | # CONFIG_BLK_DEV_INITRD is not set |
| 55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 63 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 56 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 57 | CONFIG_EMBEDDED=y | 66 | CONFIG_EMBEDDED=y |
| 58 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 59 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 60 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 61 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 62 | CONFIG_KALLSYMS_ALL=y | 70 | CONFIG_KALLSYMS_ALL=y |
| 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 71 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 72 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 64 | CONFIG_HOTPLUG=y | 73 | CONFIG_HOTPLUG=y |
| 65 | CONFIG_PRINTK=y | 74 | CONFIG_PRINTK=y |
| 66 | CONFIG_BUG=y | 75 | CONFIG_BUG=y |
| 67 | CONFIG_ELF_CORE=y | 76 | CONFIG_ELF_CORE=y |
| 68 | CONFIG_COMPAT_BRK=y | ||
| 69 | CONFIG_BASE_FULL=y | 77 | CONFIG_BASE_FULL=y |
| 70 | CONFIG_FUTEX=y | 78 | CONFIG_FUTEX=y |
| 71 | CONFIG_ANON_INODES=y | ||
| 72 | CONFIG_EPOLL=y | 79 | CONFIG_EPOLL=y |
| 73 | CONFIG_SIGNALFD=y | 80 | CONFIG_SIGNALFD=y |
| 74 | CONFIG_TIMERFD=y | 81 | CONFIG_TIMERFD=y |
| 75 | CONFIG_EVENTFD=y | 82 | CONFIG_EVENTFD=y |
| 76 | CONFIG_SHMEM=y | 83 | CONFIG_SHMEM=y |
| 84 | CONFIG_AIO=y | ||
| 77 | CONFIG_VM_EVENT_COUNTERS=y | 85 | CONFIG_VM_EVENT_COUNTERS=y |
| 86 | CONFIG_PCI_QUIRKS=y | ||
| 78 | # CONFIG_SLUB_DEBUG is not set | 87 | # CONFIG_SLUB_DEBUG is not set |
| 88 | CONFIG_COMPAT_BRK=y | ||
| 79 | # CONFIG_SLAB is not set | 89 | # CONFIG_SLAB is not set |
| 80 | CONFIG_SLUB=y | 90 | CONFIG_SLUB=y |
| 81 | # CONFIG_SLOB is not set | 91 | # CONFIG_SLOB is not set |
| 82 | CONFIG_PROFILING=y | 92 | CONFIG_PROFILING=y |
| 93 | CONFIG_TRACEPOINTS=y | ||
| 83 | # CONFIG_MARKERS is not set | 94 | # CONFIG_MARKERS is not set |
| 84 | CONFIG_OPROFILE=y | 95 | CONFIG_OPROFILE=y |
| 85 | CONFIG_HAVE_OPROFILE=y | 96 | CONFIG_HAVE_OPROFILE=y |
| @@ -87,10 +98,9 @@ CONFIG_KPROBES=y | |||
| 87 | CONFIG_KRETPROBES=y | 98 | CONFIG_KRETPROBES=y |
| 88 | CONFIG_HAVE_KPROBES=y | 99 | CONFIG_HAVE_KPROBES=y |
| 89 | CONFIG_HAVE_KRETPROBES=y | 100 | CONFIG_HAVE_KRETPROBES=y |
| 90 | # CONFIG_HAVE_DMA_ATTRS is not set | 101 | # CONFIG_SLOW_WORK is not set |
| 91 | CONFIG_PROC_PAGE_MONITOR=y | 102 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
| 92 | CONFIG_RT_MUTEXES=y | 103 | CONFIG_RT_MUTEXES=y |
| 93 | # CONFIG_TINY_SHMEM is not set | ||
| 94 | CONFIG_BASE_SMALL=0 | 104 | CONFIG_BASE_SMALL=0 |
| 95 | CONFIG_MODULES=y | 105 | CONFIG_MODULES=y |
| 96 | # CONFIG_MODULE_FORCE_LOAD is not set | 106 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -98,12 +108,10 @@ CONFIG_MODULE_UNLOAD=y | |||
| 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 108 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 99 | # CONFIG_MODVERSIONS is not set | 109 | # CONFIG_MODVERSIONS is not set |
| 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 110 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 101 | # CONFIG_KMOD is not set | ||
| 102 | CONFIG_BLOCK=y | 111 | CONFIG_BLOCK=y |
| 103 | # CONFIG_LBD is not set | 112 | # CONFIG_LBD is not set |
| 104 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 105 | # CONFIG_LSF is not set | ||
| 106 | # CONFIG_BLK_DEV_BSG is not set | 113 | # CONFIG_BLK_DEV_BSG is not set |
| 114 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 107 | 115 | ||
| 108 | # | 116 | # |
| 109 | # IO Schedulers | 117 | # IO Schedulers |
| @@ -117,7 +125,7 @@ CONFIG_IOSCHED_CFQ=y | |||
| 117 | CONFIG_DEFAULT_CFQ=y | 125 | CONFIG_DEFAULT_CFQ=y |
| 118 | # CONFIG_DEFAULT_NOOP is not set | 126 | # CONFIG_DEFAULT_NOOP is not set |
| 119 | CONFIG_DEFAULT_IOSCHED="cfq" | 127 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 120 | CONFIG_CLASSIC_RCU=y | 128 | # CONFIG_FREEZER is not set |
| 121 | 129 | ||
| 122 | # | 130 | # |
| 123 | # System Type | 131 | # System Type |
| @@ -127,11 +135,10 @@ CONFIG_CLASSIC_RCU=y | |||
| 127 | # CONFIG_ARCH_REALVIEW is not set | 135 | # CONFIG_ARCH_REALVIEW is not set |
| 128 | # CONFIG_ARCH_VERSATILE is not set | 136 | # CONFIG_ARCH_VERSATILE is not set |
| 129 | # CONFIG_ARCH_AT91 is not set | 137 | # CONFIG_ARCH_AT91 is not set |
| 130 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 131 | # CONFIG_ARCH_CLPS711X is not set | 138 | # CONFIG_ARCH_CLPS711X is not set |
| 132 | # CONFIG_ARCH_CO285 is not set | ||
| 133 | # CONFIG_ARCH_EBSA110 is not set | 139 | # CONFIG_ARCH_EBSA110 is not set |
| 134 | # CONFIG_ARCH_EP93XX is not set | 140 | # CONFIG_ARCH_EP93XX is not set |
| 141 | # CONFIG_ARCH_GEMINI is not set | ||
| 135 | # CONFIG_ARCH_FOOTBRIDGE is not set | 142 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 136 | # CONFIG_ARCH_NETX is not set | 143 | # CONFIG_ARCH_NETX is not set |
| 137 | # CONFIG_ARCH_H720X is not set | 144 | # CONFIG_ARCH_H720X is not set |
| @@ -152,28 +159,23 @@ CONFIG_ARCH_MV78XX0=y | |||
| 152 | # CONFIG_ARCH_ORION5X is not set | 159 | # CONFIG_ARCH_ORION5X is not set |
| 153 | # CONFIG_ARCH_PNX4008 is not set | 160 | # CONFIG_ARCH_PNX4008 is not set |
| 154 | # CONFIG_ARCH_PXA is not set | 161 | # CONFIG_ARCH_PXA is not set |
| 162 | # CONFIG_ARCH_MMP is not set | ||
| 155 | # CONFIG_ARCH_RPC is not set | 163 | # CONFIG_ARCH_RPC is not set |
| 156 | # CONFIG_ARCH_SA1100 is not set | 164 | # CONFIG_ARCH_SA1100 is not set |
| 157 | # CONFIG_ARCH_S3C2410 is not set | 165 | # CONFIG_ARCH_S3C2410 is not set |
| 166 | # CONFIG_ARCH_S3C64XX is not set | ||
| 158 | # CONFIG_ARCH_SHARK is not set | 167 | # CONFIG_ARCH_SHARK is not set |
| 159 | # CONFIG_ARCH_LH7A40X is not set | 168 | # CONFIG_ARCH_LH7A40X is not set |
| 160 | # CONFIG_ARCH_DAVINCI is not set | 169 | # CONFIG_ARCH_DAVINCI is not set |
| 161 | # CONFIG_ARCH_OMAP is not set | 170 | # CONFIG_ARCH_OMAP is not set |
| 162 | # CONFIG_ARCH_MSM7X00A is not set | 171 | # CONFIG_ARCH_MSM is not set |
| 172 | # CONFIG_ARCH_W90X900 is not set | ||
| 163 | 173 | ||
| 164 | # | 174 | # |
| 165 | # Marvell MV78xx0 Implementations | 175 | # Marvell MV78xx0 Implementations |
| 166 | # | 176 | # |
| 167 | CONFIG_MACH_DB78X00_BP=y | 177 | CONFIG_MACH_DB78X00_BP=y |
| 168 | CONFIG_MACH_RD78X00_MASA=y | 178 | CONFIG_MACH_RD78X00_MASA=y |
| 169 | |||
| 170 | # | ||
| 171 | # Boot options | ||
| 172 | # | ||
| 173 | |||
| 174 | # | ||
| 175 | # Power management | ||
| 176 | # | ||
| 177 | CONFIG_PLAT_ORION=y | 179 | CONFIG_PLAT_ORION=y |
| 178 | 180 | ||
| 179 | # | 181 | # |
| @@ -199,6 +201,7 @@ CONFIG_ARM_THUMB=y | |||
| 199 | # CONFIG_CPU_DCACHE_DISABLE is not set | 201 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 200 | CONFIG_OUTER_CACHE=y | 202 | CONFIG_OUTER_CACHE=y |
| 201 | CONFIG_CACHE_FEROCEON_L2=y | 203 | CONFIG_CACHE_FEROCEON_L2=y |
| 204 | # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set | ||
| 202 | 205 | ||
| 203 | # | 206 | # |
| 204 | # Bus support | 207 | # Bus support |
| @@ -208,6 +211,8 @@ CONFIG_PCI_SYSCALL=y | |||
| 208 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 211 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 209 | CONFIG_PCI_LEGACY=y | 212 | CONFIG_PCI_LEGACY=y |
| 210 | # CONFIG_PCI_DEBUG is not set | 213 | # CONFIG_PCI_DEBUG is not set |
| 214 | # CONFIG_PCI_STUB is not set | ||
| 215 | # CONFIG_PCI_IOV is not set | ||
| 211 | # CONFIG_PCCARD is not set | 216 | # CONFIG_PCCARD is not set |
| 212 | 217 | ||
| 213 | # | 218 | # |
| @@ -217,25 +222,33 @@ CONFIG_TICK_ONESHOT=y | |||
| 217 | CONFIG_NO_HZ=y | 222 | CONFIG_NO_HZ=y |
| 218 | CONFIG_HIGH_RES_TIMERS=y | 223 | CONFIG_HIGH_RES_TIMERS=y |
| 219 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 224 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| 225 | CONFIG_VMSPLIT_3G=y | ||
| 226 | # CONFIG_VMSPLIT_2G is not set | ||
| 227 | # CONFIG_VMSPLIT_1G is not set | ||
| 228 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
| 220 | CONFIG_PREEMPT=y | 229 | CONFIG_PREEMPT=y |
| 221 | CONFIG_HZ=100 | 230 | CONFIG_HZ=100 |
| 222 | CONFIG_AEABI=y | 231 | CONFIG_AEABI=y |
| 223 | CONFIG_OABI_COMPAT=y | 232 | CONFIG_OABI_COMPAT=y |
| 224 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 233 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y |
| 234 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
| 235 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
| 236 | CONFIG_HIGHMEM=y | ||
| 225 | CONFIG_SELECT_MEMORY_MODEL=y | 237 | CONFIG_SELECT_MEMORY_MODEL=y |
| 226 | CONFIG_FLATMEM_MANUAL=y | 238 | CONFIG_FLATMEM_MANUAL=y |
| 227 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 239 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 228 | # CONFIG_SPARSEMEM_MANUAL is not set | 240 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 229 | CONFIG_FLATMEM=y | 241 | CONFIG_FLATMEM=y |
| 230 | CONFIG_FLAT_NODE_MEM_MAP=y | 242 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 231 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 232 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 233 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 234 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
| 235 | # CONFIG_RESOURCES_64BIT is not set | 245 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 236 | CONFIG_ZONE_DMA_FLAG=1 | 246 | CONFIG_ZONE_DMA_FLAG=0 |
| 237 | CONFIG_BOUNCE=y | 247 | CONFIG_BOUNCE=y |
| 238 | CONFIG_VIRT_TO_BUS=y | 248 | CONFIG_VIRT_TO_BUS=y |
| 249 | CONFIG_UNEVICTABLE_LRU=y | ||
| 250 | CONFIG_HAVE_MLOCK=y | ||
| 251 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 239 | CONFIG_ALIGNMENT_TRAP=y | 252 | CONFIG_ALIGNMENT_TRAP=y |
| 240 | 253 | ||
| 241 | # | 254 | # |
| @@ -248,6 +261,11 @@ CONFIG_CMDLINE="" | |||
| 248 | # CONFIG_KEXEC is not set | 261 | # CONFIG_KEXEC is not set |
| 249 | 262 | ||
| 250 | # | 263 | # |
| 264 | # CPU Power Management | ||
| 265 | # | ||
| 266 | # CONFIG_CPU_IDLE is not set | ||
| 267 | |||
| 268 | # | ||
| 251 | # Floating point emulation | 269 | # Floating point emulation |
| 252 | # | 270 | # |
| 253 | 271 | ||
| @@ -263,6 +281,8 @@ CONFIG_VFP=y | |||
| 263 | # Userspace binary formats | 281 | # Userspace binary formats |
| 264 | # | 282 | # |
| 265 | CONFIG_BINFMT_ELF=y | 283 | CONFIG_BINFMT_ELF=y |
| 284 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 285 | CONFIG_HAVE_AOUT=y | ||
| 266 | # CONFIG_BINFMT_AOUT is not set | 286 | # CONFIG_BINFMT_AOUT is not set |
| 267 | # CONFIG_BINFMT_MISC is not set | 287 | # CONFIG_BINFMT_MISC is not set |
| 268 | 288 | ||
| @@ -271,10 +291,6 @@ CONFIG_BINFMT_ELF=y | |||
| 271 | # | 291 | # |
| 272 | # CONFIG_PM is not set | 292 | # CONFIG_PM is not set |
| 273 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 293 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 274 | |||
| 275 | # | ||
| 276 | # Networking | ||
| 277 | # | ||
| 278 | CONFIG_NET=y | 294 | CONFIG_NET=y |
| 279 | 295 | ||
| 280 | # | 296 | # |
| @@ -310,7 +326,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 310 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 326 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 311 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 327 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 312 | CONFIG_INET_XFRM_MODE_BEET=y | 328 | CONFIG_INET_XFRM_MODE_BEET=y |
| 313 | # CONFIG_INET_LRO is not set | 329 | CONFIG_INET_LRO=y |
| 314 | CONFIG_INET_DIAG=y | 330 | CONFIG_INET_DIAG=y |
| 315 | CONFIG_INET_TCP_DIAG=y | 331 | CONFIG_INET_TCP_DIAG=y |
| 316 | # CONFIG_TCP_CONG_ADVANCED is not set | 332 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -325,6 +341,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 325 | # CONFIG_TIPC is not set | 341 | # CONFIG_TIPC is not set |
| 326 | # CONFIG_ATM is not set | 342 | # CONFIG_ATM is not set |
| 327 | # CONFIG_BRIDGE is not set | 343 | # CONFIG_BRIDGE is not set |
| 344 | # CONFIG_NET_DSA is not set | ||
| 328 | # CONFIG_VLAN_8021Q is not set | 345 | # CONFIG_VLAN_8021Q is not set |
| 329 | # CONFIG_DECNET is not set | 346 | # CONFIG_DECNET is not set |
| 330 | # CONFIG_LLC2 is not set | 347 | # CONFIG_LLC2 is not set |
| @@ -334,26 +351,23 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 334 | # CONFIG_LAPB is not set | 351 | # CONFIG_LAPB is not set |
| 335 | # CONFIG_ECONET is not set | 352 | # CONFIG_ECONET is not set |
| 336 | # CONFIG_WAN_ROUTER is not set | 353 | # CONFIG_WAN_ROUTER is not set |
| 354 | # CONFIG_PHONET is not set | ||
| 337 | # CONFIG_NET_SCHED is not set | 355 | # CONFIG_NET_SCHED is not set |
| 356 | # CONFIG_DCB is not set | ||
| 338 | 357 | ||
| 339 | # | 358 | # |
| 340 | # Network testing | 359 | # Network testing |
| 341 | # | 360 | # |
| 342 | CONFIG_NET_PKTGEN=m | 361 | CONFIG_NET_PKTGEN=m |
| 343 | # CONFIG_NET_TCPPROBE is not set | 362 | # CONFIG_NET_TCPPROBE is not set |
| 363 | # CONFIG_NET_DROP_MONITOR is not set | ||
| 344 | # CONFIG_HAMRADIO is not set | 364 | # CONFIG_HAMRADIO is not set |
| 345 | # CONFIG_CAN is not set | 365 | # CONFIG_CAN is not set |
| 346 | # CONFIG_IRDA is not set | 366 | # CONFIG_IRDA is not set |
| 347 | # CONFIG_BT is not set | 367 | # CONFIG_BT is not set |
| 348 | # CONFIG_AF_RXRPC is not set | 368 | # CONFIG_AF_RXRPC is not set |
| 349 | 369 | # CONFIG_WIRELESS is not set | |
| 350 | # | 370 | # CONFIG_WIMAX is not set |
| 351 | # Wireless | ||
| 352 | # | ||
| 353 | # CONFIG_CFG80211 is not set | ||
| 354 | CONFIG_WIRELESS_EXT=y | ||
| 355 | # CONFIG_MAC80211 is not set | ||
| 356 | # CONFIG_IEEE80211 is not set | ||
| 357 | # CONFIG_RFKILL is not set | 371 | # CONFIG_RFKILL is not set |
| 358 | # CONFIG_NET_9P is not set | 372 | # CONFIG_NET_9P is not set |
| 359 | 373 | ||
| @@ -368,6 +382,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 368 | CONFIG_STANDALONE=y | 382 | CONFIG_STANDALONE=y |
| 369 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 383 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 370 | CONFIG_FW_LOADER=y | 384 | CONFIG_FW_LOADER=y |
| 385 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 386 | CONFIG_EXTRA_FIRMWARE="" | ||
| 371 | # CONFIG_DEBUG_DRIVER is not set | 387 | # CONFIG_DEBUG_DRIVER is not set |
| 372 | # CONFIG_DEBUG_DEVRES is not set | 388 | # CONFIG_DEBUG_DEVRES is not set |
| 373 | # CONFIG_SYS_HYPERVISOR is not set | 389 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -376,6 +392,7 @@ CONFIG_MTD=y | |||
| 376 | # CONFIG_MTD_DEBUG is not set | 392 | # CONFIG_MTD_DEBUG is not set |
| 377 | # CONFIG_MTD_CONCAT is not set | 393 | # CONFIG_MTD_CONCAT is not set |
| 378 | CONFIG_MTD_PARTITIONS=y | 394 | CONFIG_MTD_PARTITIONS=y |
| 395 | # CONFIG_MTD_TESTS is not set | ||
| 379 | # CONFIG_MTD_REDBOOT_PARTS is not set | 396 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 380 | CONFIG_MTD_CMDLINE_PARTS=y | 397 | CONFIG_MTD_CMDLINE_PARTS=y |
| 381 | # CONFIG_MTD_AFS_PARTS is not set | 398 | # CONFIG_MTD_AFS_PARTS is not set |
| @@ -429,9 +446,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 429 | # | 446 | # |
| 430 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 447 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 431 | CONFIG_MTD_PHYSMAP=y | 448 | CONFIG_MTD_PHYSMAP=y |
| 432 | CONFIG_MTD_PHYSMAP_START=0x0 | 449 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
| 433 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 434 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
| 435 | # CONFIG_MTD_ARM_INTEGRATOR is not set | 450 | # CONFIG_MTD_ARM_INTEGRATOR is not set |
| 436 | # CONFIG_MTD_IMPA7 is not set | 451 | # CONFIG_MTD_IMPA7 is not set |
| 437 | # CONFIG_MTD_INTEL_VR_NOR is not set | 452 | # CONFIG_MTD_INTEL_VR_NOR is not set |
| @@ -456,6 +471,7 @@ CONFIG_MTD_NAND=y | |||
| 456 | CONFIG_MTD_NAND_VERIFY_WRITE=y | 471 | CONFIG_MTD_NAND_VERIFY_WRITE=y |
| 457 | # CONFIG_MTD_NAND_ECC_SMC is not set | 472 | # CONFIG_MTD_NAND_ECC_SMC is not set |
| 458 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 473 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
| 474 | # CONFIG_MTD_NAND_GPIO is not set | ||
| 459 | CONFIG_MTD_NAND_IDS=y | 475 | CONFIG_MTD_NAND_IDS=y |
| 460 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 476 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 461 | # CONFIG_MTD_NAND_CAFE is not set | 477 | # CONFIG_MTD_NAND_CAFE is not set |
| @@ -466,6 +482,11 @@ CONFIG_MTD_NAND_ORION=y | |||
| 466 | # CONFIG_MTD_ONENAND is not set | 482 | # CONFIG_MTD_ONENAND is not set |
| 467 | 483 | ||
| 468 | # | 484 | # |
| 485 | # LPDDR flash memory drivers | ||
| 486 | # | ||
| 487 | # CONFIG_MTD_LPDDR is not set | ||
| 488 | |||
| 489 | # | ||
| 469 | # UBI - Unsorted block images | 490 | # UBI - Unsorted block images |
| 470 | # | 491 | # |
| 471 | # CONFIG_MTD_UBI is not set | 492 | # CONFIG_MTD_UBI is not set |
| @@ -486,10 +507,20 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 486 | # CONFIG_ATA_OVER_ETH is not set | 507 | # CONFIG_ATA_OVER_ETH is not set |
| 487 | CONFIG_MISC_DEVICES=y | 508 | CONFIG_MISC_DEVICES=y |
| 488 | # CONFIG_PHANTOM is not set | 509 | # CONFIG_PHANTOM is not set |
| 489 | # CONFIG_EEPROM_93CX6 is not set | ||
| 490 | # CONFIG_SGI_IOC4 is not set | 510 | # CONFIG_SGI_IOC4 is not set |
| 491 | # CONFIG_TIFM_CORE is not set | 511 | # CONFIG_TIFM_CORE is not set |
| 512 | # CONFIG_ICS932S401 is not set | ||
| 492 | # CONFIG_ENCLOSURE_SERVICES is not set | 513 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 514 | # CONFIG_HP_ILO is not set | ||
| 515 | # CONFIG_ISL29003 is not set | ||
| 516 | # CONFIG_C2PORT is not set | ||
| 517 | |||
| 518 | # | ||
| 519 | # EEPROM support | ||
| 520 | # | ||
| 521 | # CONFIG_EEPROM_AT24 is not set | ||
| 522 | # CONFIG_EEPROM_LEGACY is not set | ||
| 523 | # CONFIG_EEPROM_93CX6 is not set | ||
| 493 | CONFIG_HAVE_IDE=y | 524 | CONFIG_HAVE_IDE=y |
| 494 | # CONFIG_IDE is not set | 525 | # CONFIG_IDE is not set |
| 495 | 526 | ||
| @@ -547,7 +578,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 547 | # CONFIG_MEGARAID_NEWGEN is not set | 578 | # CONFIG_MEGARAID_NEWGEN is not set |
| 548 | # CONFIG_MEGARAID_LEGACY is not set | 579 | # CONFIG_MEGARAID_LEGACY is not set |
| 549 | # CONFIG_MEGARAID_SAS is not set | 580 | # CONFIG_MEGARAID_SAS is not set |
| 581 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 550 | # CONFIG_SCSI_HPTIOP is not set | 582 | # CONFIG_SCSI_HPTIOP is not set |
| 583 | # CONFIG_LIBFC is not set | ||
| 584 | # CONFIG_LIBFCOE is not set | ||
| 585 | # CONFIG_FCOE is not set | ||
| 551 | # CONFIG_SCSI_DMX3191D is not set | 586 | # CONFIG_SCSI_DMX3191D is not set |
| 552 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 587 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| 553 | # CONFIG_SCSI_IPS is not set | 588 | # CONFIG_SCSI_IPS is not set |
| @@ -566,6 +601,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 566 | # CONFIG_SCSI_NSP32 is not set | 601 | # CONFIG_SCSI_NSP32 is not set |
| 567 | # CONFIG_SCSI_DEBUG is not set | 602 | # CONFIG_SCSI_DEBUG is not set |
| 568 | # CONFIG_SCSI_SRP is not set | 603 | # CONFIG_SCSI_SRP is not set |
| 604 | # CONFIG_SCSI_DH is not set | ||
| 605 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 569 | CONFIG_ATA=y | 606 | CONFIG_ATA=y |
| 570 | # CONFIG_ATA_NONSTANDARD is not set | 607 | # CONFIG_ATA_NONSTANDARD is not set |
| 571 | CONFIG_SATA_PMP=y | 608 | CONFIG_SATA_PMP=y |
| @@ -632,11 +669,15 @@ CONFIG_SATA_MV=y | |||
| 632 | # | 669 | # |
| 633 | # IEEE 1394 (FireWire) support | 670 | # IEEE 1394 (FireWire) support |
| 634 | # | 671 | # |
| 672 | |||
| 673 | # | ||
| 674 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 675 | # | ||
| 635 | # CONFIG_FIREWIRE is not set | 676 | # CONFIG_FIREWIRE is not set |
| 636 | # CONFIG_IEEE1394 is not set | 677 | # CONFIG_IEEE1394 is not set |
| 637 | # CONFIG_I2O is not set | 678 | # CONFIG_I2O is not set |
| 638 | CONFIG_NETDEVICES=y | 679 | CONFIG_NETDEVICES=y |
| 639 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 680 | CONFIG_COMPAT_NET_DEV_OPS=y |
| 640 | # CONFIG_DUMMY is not set | 681 | # CONFIG_DUMMY is not set |
| 641 | # CONFIG_BONDING is not set | 682 | # CONFIG_BONDING is not set |
| 642 | # CONFIG_MACVLAN is not set | 683 | # CONFIG_MACVLAN is not set |
| @@ -644,7 +685,26 @@ CONFIG_NETDEVICES=y | |||
| 644 | # CONFIG_TUN is not set | 685 | # CONFIG_TUN is not set |
| 645 | # CONFIG_VETH is not set | 686 | # CONFIG_VETH is not set |
| 646 | # CONFIG_ARCNET is not set | 687 | # CONFIG_ARCNET is not set |
| 647 | # CONFIG_PHYLIB is not set | 688 | CONFIG_PHYLIB=y |
| 689 | |||
| 690 | # | ||
| 691 | # MII PHY device drivers | ||
| 692 | # | ||
| 693 | CONFIG_MARVELL_PHY=y | ||
| 694 | # CONFIG_DAVICOM_PHY is not set | ||
| 695 | # CONFIG_QSEMI_PHY is not set | ||
| 696 | # CONFIG_LXT_PHY is not set | ||
| 697 | # CONFIG_CICADA_PHY is not set | ||
| 698 | # CONFIG_VITESSE_PHY is not set | ||
| 699 | # CONFIG_SMSC_PHY is not set | ||
| 700 | # CONFIG_BROADCOM_PHY is not set | ||
| 701 | # CONFIG_ICPLUS_PHY is not set | ||
| 702 | # CONFIG_REALTEK_PHY is not set | ||
| 703 | # CONFIG_NATIONAL_PHY is not set | ||
| 704 | # CONFIG_STE10XP is not set | ||
| 705 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 706 | # CONFIG_FIXED_PHY is not set | ||
| 707 | # CONFIG_MDIO_BITBANG is not set | ||
| 648 | CONFIG_NET_ETHERNET=y | 708 | CONFIG_NET_ETHERNET=y |
| 649 | CONFIG_MII=y | 709 | CONFIG_MII=y |
| 650 | # CONFIG_AX88796 is not set | 710 | # CONFIG_AX88796 is not set |
| @@ -654,19 +714,25 @@ CONFIG_MII=y | |||
| 654 | # CONFIG_NET_VENDOR_3COM is not set | 714 | # CONFIG_NET_VENDOR_3COM is not set |
| 655 | # CONFIG_SMC91X is not set | 715 | # CONFIG_SMC91X is not set |
| 656 | # CONFIG_DM9000 is not set | 716 | # CONFIG_DM9000 is not set |
| 717 | # CONFIG_ETHOC is not set | ||
| 718 | # CONFIG_SMC911X is not set | ||
| 719 | # CONFIG_SMSC911X is not set | ||
| 720 | # CONFIG_DNET is not set | ||
| 657 | # CONFIG_NET_TULIP is not set | 721 | # CONFIG_NET_TULIP is not set |
| 658 | # CONFIG_HP100 is not set | 722 | # CONFIG_HP100 is not set |
| 659 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 723 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 660 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 724 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 661 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 725 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 662 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 726 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 727 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 728 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 729 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 663 | CONFIG_NET_PCI=y | 730 | CONFIG_NET_PCI=y |
| 664 | # CONFIG_PCNET32 is not set | 731 | # CONFIG_PCNET32 is not set |
| 665 | # CONFIG_AMD8111_ETH is not set | 732 | # CONFIG_AMD8111_ETH is not set |
| 666 | # CONFIG_ADAPTEC_STARFIRE is not set | 733 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 667 | # CONFIG_B44 is not set | 734 | # CONFIG_B44 is not set |
| 668 | # CONFIG_FORCEDETH is not set | 735 | # CONFIG_FORCEDETH is not set |
| 669 | # CONFIG_EEPRO100 is not set | ||
| 670 | # CONFIG_E100 is not set | 736 | # CONFIG_E100 is not set |
| 671 | # CONFIG_FEALNX is not set | 737 | # CONFIG_FEALNX is not set |
| 672 | # CONFIG_NATSEMI is not set | 738 | # CONFIG_NATSEMI is not set |
| @@ -676,18 +742,20 @@ CONFIG_NET_PCI=y | |||
| 676 | # CONFIG_R6040 is not set | 742 | # CONFIG_R6040 is not set |
| 677 | # CONFIG_SIS900 is not set | 743 | # CONFIG_SIS900 is not set |
| 678 | # CONFIG_EPIC100 is not set | 744 | # CONFIG_EPIC100 is not set |
| 745 | # CONFIG_SMSC9420 is not set | ||
| 679 | # CONFIG_SUNDANCE is not set | 746 | # CONFIG_SUNDANCE is not set |
| 680 | # CONFIG_TLAN is not set | 747 | # CONFIG_TLAN is not set |
| 681 | # CONFIG_VIA_RHINE is not set | 748 | # CONFIG_VIA_RHINE is not set |
| 682 | # CONFIG_SC92031 is not set | 749 | # CONFIG_SC92031 is not set |
| 750 | # CONFIG_ATL2 is not set | ||
| 683 | CONFIG_NETDEV_1000=y | 751 | CONFIG_NETDEV_1000=y |
| 684 | # CONFIG_ACENIC is not set | 752 | # CONFIG_ACENIC is not set |
| 685 | # CONFIG_DL2K is not set | 753 | # CONFIG_DL2K is not set |
| 686 | # CONFIG_E1000 is not set | 754 | # CONFIG_E1000 is not set |
| 687 | # CONFIG_E1000E is not set | 755 | # CONFIG_E1000E is not set |
| 688 | # CONFIG_E1000E_ENABLED is not set | ||
| 689 | # CONFIG_IP1000 is not set | 756 | # CONFIG_IP1000 is not set |
| 690 | # CONFIG_IGB is not set | 757 | # CONFIG_IGB is not set |
| 758 | # CONFIG_IGBVF is not set | ||
| 691 | # CONFIG_NS83820 is not set | 759 | # CONFIG_NS83820 is not set |
| 692 | # CONFIG_HAMACHI is not set | 760 | # CONFIG_HAMACHI is not set |
| 693 | # CONFIG_YELLOWFIN is not set | 761 | # CONFIG_YELLOWFIN is not set |
| @@ -701,6 +769,9 @@ CONFIG_NETDEV_1000=y | |||
| 701 | CONFIG_MV643XX_ETH=y | 769 | CONFIG_MV643XX_ETH=y |
| 702 | # CONFIG_QLA3XXX is not set | 770 | # CONFIG_QLA3XXX is not set |
| 703 | # CONFIG_ATL1 is not set | 771 | # CONFIG_ATL1 is not set |
| 772 | # CONFIG_ATL1E is not set | ||
| 773 | # CONFIG_ATL1C is not set | ||
| 774 | # CONFIG_JME is not set | ||
| 704 | # CONFIG_NETDEV_10000 is not set | 775 | # CONFIG_NETDEV_10000 is not set |
| 705 | # CONFIG_TR is not set | 776 | # CONFIG_TR is not set |
| 706 | 777 | ||
| @@ -709,7 +780,10 @@ CONFIG_MV643XX_ETH=y | |||
| 709 | # | 780 | # |
| 710 | # CONFIG_WLAN_PRE80211 is not set | 781 | # CONFIG_WLAN_PRE80211 is not set |
| 711 | # CONFIG_WLAN_80211 is not set | 782 | # CONFIG_WLAN_80211 is not set |
| 712 | # CONFIG_IWLWIFI_LEDS is not set | 783 | |
| 784 | # | ||
| 785 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 786 | # | ||
| 713 | 787 | ||
| 714 | # | 788 | # |
| 715 | # USB Network Adapters | 789 | # USB Network Adapters |
| @@ -786,11 +860,11 @@ CONFIG_SERIAL_CORE=y | |||
| 786 | CONFIG_SERIAL_CORE_CONSOLE=y | 860 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 787 | # CONFIG_SERIAL_JSM is not set | 861 | # CONFIG_SERIAL_JSM is not set |
| 788 | CONFIG_UNIX98_PTYS=y | 862 | CONFIG_UNIX98_PTYS=y |
| 863 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 789 | CONFIG_LEGACY_PTYS=y | 864 | CONFIG_LEGACY_PTYS=y |
| 790 | CONFIG_LEGACY_PTY_COUNT=16 | 865 | CONFIG_LEGACY_PTY_COUNT=16 |
| 791 | # CONFIG_IPMI_HANDLER is not set | 866 | # CONFIG_IPMI_HANDLER is not set |
| 792 | # CONFIG_HW_RANDOM is not set | 867 | # CONFIG_HW_RANDOM is not set |
| 793 | # CONFIG_NVRAM is not set | ||
| 794 | # CONFIG_R3964 is not set | 868 | # CONFIG_R3964 is not set |
| 795 | # CONFIG_APPLICOM is not set | 869 | # CONFIG_APPLICOM is not set |
| 796 | # CONFIG_RAW_DRIVER is not set | 870 | # CONFIG_RAW_DRIVER is not set |
| @@ -799,44 +873,63 @@ CONFIG_DEVPORT=y | |||
| 799 | CONFIG_I2C=y | 873 | CONFIG_I2C=y |
| 800 | CONFIG_I2C_BOARDINFO=y | 874 | CONFIG_I2C_BOARDINFO=y |
| 801 | CONFIG_I2C_CHARDEV=y | 875 | CONFIG_I2C_CHARDEV=y |
| 876 | CONFIG_I2C_HELPER_AUTO=y | ||
| 802 | 877 | ||
| 803 | # | 878 | # |
| 804 | # I2C Hardware Bus support | 879 | # I2C Hardware Bus support |
| 805 | # | 880 | # |
| 881 | |||
| 882 | # | ||
| 883 | # PC SMBus host controller drivers | ||
| 884 | # | ||
| 806 | # CONFIG_I2C_ALI1535 is not set | 885 | # CONFIG_I2C_ALI1535 is not set |
| 807 | # CONFIG_I2C_ALI1563 is not set | 886 | # CONFIG_I2C_ALI1563 is not set |
| 808 | # CONFIG_I2C_ALI15X3 is not set | 887 | # CONFIG_I2C_ALI15X3 is not set |
| 809 | # CONFIG_I2C_AMD756 is not set | 888 | # CONFIG_I2C_AMD756 is not set |
| 810 | # CONFIG_I2C_AMD8111 is not set | 889 | # CONFIG_I2C_AMD8111 is not set |
| 811 | # CONFIG_I2C_I801 is not set | 890 | # CONFIG_I2C_I801 is not set |
| 812 | # CONFIG_I2C_I810 is not set | 891 | # CONFIG_I2C_ISCH is not set |
| 813 | # CONFIG_I2C_PIIX4 is not set | 892 | # CONFIG_I2C_PIIX4 is not set |
| 814 | # CONFIG_I2C_NFORCE2 is not set | 893 | # CONFIG_I2C_NFORCE2 is not set |
| 815 | # CONFIG_I2C_OCORES is not set | ||
| 816 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 817 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 818 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 819 | # CONFIG_I2C_SIMTEC is not set | ||
| 820 | # CONFIG_I2C_SIS5595 is not set | 894 | # CONFIG_I2C_SIS5595 is not set |
| 821 | # CONFIG_I2C_SIS630 is not set | 895 | # CONFIG_I2C_SIS630 is not set |
| 822 | # CONFIG_I2C_SIS96X is not set | 896 | # CONFIG_I2C_SIS96X is not set |
| 823 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 824 | # CONFIG_I2C_STUB is not set | ||
| 825 | # CONFIG_I2C_TINY_USB is not set | ||
| 826 | # CONFIG_I2C_VIA is not set | 897 | # CONFIG_I2C_VIA is not set |
| 827 | # CONFIG_I2C_VIAPRO is not set | 898 | # CONFIG_I2C_VIAPRO is not set |
| 899 | |||
| 900 | # | ||
| 901 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 902 | # | ||
| 903 | # CONFIG_I2C_GPIO is not set | ||
| 904 | CONFIG_I2C_MV64XXX=y | ||
| 905 | # CONFIG_I2C_OCORES is not set | ||
| 906 | # CONFIG_I2C_SIMTEC is not set | ||
| 907 | |||
| 908 | # | ||
| 909 | # External I2C/SMBus adapter drivers | ||
| 910 | # | ||
| 911 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 912 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 913 | # CONFIG_I2C_TINY_USB is not set | ||
| 914 | |||
| 915 | # | ||
| 916 | # Graphics adapter I2C/DDC channel drivers | ||
| 917 | # | ||
| 828 | # CONFIG_I2C_VOODOO3 is not set | 918 | # CONFIG_I2C_VOODOO3 is not set |
| 919 | |||
| 920 | # | ||
| 921 | # Other I2C/SMBus bus drivers | ||
| 922 | # | ||
| 829 | # CONFIG_I2C_PCA_PLATFORM is not set | 923 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 830 | CONFIG_I2C_MV64XXX=y | 924 | # CONFIG_I2C_STUB is not set |
| 831 | 925 | ||
| 832 | # | 926 | # |
| 833 | # Miscellaneous I2C Chip support | 927 | # Miscellaneous I2C Chip support |
| 834 | # | 928 | # |
| 835 | # CONFIG_DS1682 is not set | 929 | # CONFIG_DS1682 is not set |
| 836 | # CONFIG_EEPROM_LEGACY is not set | ||
| 837 | # CONFIG_SENSORS_PCF8574 is not set | 930 | # CONFIG_SENSORS_PCF8574 is not set |
| 838 | # CONFIG_PCF8575 is not set | 931 | # CONFIG_PCF8575 is not set |
| 839 | # CONFIG_SENSORS_PCF8591 is not set | 932 | # CONFIG_SENSORS_PCA9539 is not set |
| 840 | # CONFIG_SENSORS_MAX6875 is not set | 933 | # CONFIG_SENSORS_MAX6875 is not set |
| 841 | # CONFIG_SENSORS_TSL2550 is not set | 934 | # CONFIG_SENSORS_TSL2550 is not set |
| 842 | # CONFIG_I2C_DEBUG_CORE is not set | 935 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -848,6 +941,7 @@ CONFIG_I2C_MV64XXX=y | |||
| 848 | # CONFIG_POWER_SUPPLY is not set | 941 | # CONFIG_POWER_SUPPLY is not set |
| 849 | CONFIG_HWMON=y | 942 | CONFIG_HWMON=y |
| 850 | # CONFIG_HWMON_VID is not set | 943 | # CONFIG_HWMON_VID is not set |
| 944 | # CONFIG_SENSORS_AD7414 is not set | ||
| 851 | # CONFIG_SENSORS_AD7418 is not set | 945 | # CONFIG_SENSORS_AD7418 is not set |
| 852 | # CONFIG_SENSORS_ADM1021 is not set | 946 | # CONFIG_SENSORS_ADM1021 is not set |
| 853 | # CONFIG_SENSORS_ADM1025 is not set | 947 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -855,14 +949,17 @@ CONFIG_HWMON=y | |||
| 855 | # CONFIG_SENSORS_ADM1029 is not set | 949 | # CONFIG_SENSORS_ADM1029 is not set |
| 856 | # CONFIG_SENSORS_ADM1031 is not set | 950 | # CONFIG_SENSORS_ADM1031 is not set |
| 857 | # CONFIG_SENSORS_ADM9240 is not set | 951 | # CONFIG_SENSORS_ADM9240 is not set |
| 952 | # CONFIG_SENSORS_ADT7462 is not set | ||
| 858 | # CONFIG_SENSORS_ADT7470 is not set | 953 | # CONFIG_SENSORS_ADT7470 is not set |
| 859 | # CONFIG_SENSORS_ADT7473 is not set | 954 | # CONFIG_SENSORS_ADT7473 is not set |
| 955 | # CONFIG_SENSORS_ADT7475 is not set | ||
| 860 | # CONFIG_SENSORS_ATXP1 is not set | 956 | # CONFIG_SENSORS_ATXP1 is not set |
| 861 | # CONFIG_SENSORS_DS1621 is not set | 957 | # CONFIG_SENSORS_DS1621 is not set |
| 862 | # CONFIG_SENSORS_I5K_AMB is not set | 958 | # CONFIG_SENSORS_I5K_AMB is not set |
| 863 | # CONFIG_SENSORS_F71805F is not set | 959 | # CONFIG_SENSORS_F71805F is not set |
| 864 | # CONFIG_SENSORS_F71882FG is not set | 960 | # CONFIG_SENSORS_F71882FG is not set |
| 865 | # CONFIG_SENSORS_F75375S is not set | 961 | # CONFIG_SENSORS_F75375S is not set |
| 962 | # CONFIG_SENSORS_G760A is not set | ||
| 866 | # CONFIG_SENSORS_GL518SM is not set | 963 | # CONFIG_SENSORS_GL518SM is not set |
| 867 | # CONFIG_SENSORS_GL520SM is not set | 964 | # CONFIG_SENSORS_GL520SM is not set |
| 868 | # CONFIG_SENSORS_IT87 is not set | 965 | # CONFIG_SENSORS_IT87 is not set |
| @@ -877,10 +974,15 @@ CONFIG_HWMON=y | |||
| 877 | # CONFIG_SENSORS_LM90 is not set | 974 | # CONFIG_SENSORS_LM90 is not set |
| 878 | # CONFIG_SENSORS_LM92 is not set | 975 | # CONFIG_SENSORS_LM92 is not set |
| 879 | # CONFIG_SENSORS_LM93 is not set | 976 | # CONFIG_SENSORS_LM93 is not set |
| 977 | # CONFIG_SENSORS_LTC4215 is not set | ||
| 978 | # CONFIG_SENSORS_LTC4245 is not set | ||
| 979 | # CONFIG_SENSORS_LM95241 is not set | ||
| 880 | # CONFIG_SENSORS_MAX1619 is not set | 980 | # CONFIG_SENSORS_MAX1619 is not set |
| 881 | # CONFIG_SENSORS_MAX6650 is not set | 981 | # CONFIG_SENSORS_MAX6650 is not set |
| 882 | # CONFIG_SENSORS_PC87360 is not set | 982 | # CONFIG_SENSORS_PC87360 is not set |
| 883 | # CONFIG_SENSORS_PC87427 is not set | 983 | # CONFIG_SENSORS_PC87427 is not set |
| 984 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 985 | # CONFIG_SENSORS_SHT15 is not set | ||
| 884 | # CONFIG_SENSORS_SIS5595 is not set | 986 | # CONFIG_SENSORS_SIS5595 is not set |
| 885 | # CONFIG_SENSORS_DME1737 is not set | 987 | # CONFIG_SENSORS_DME1737 is not set |
| 886 | # CONFIG_SENSORS_SMSC47M1 is not set | 988 | # CONFIG_SENSORS_SMSC47M1 is not set |
| @@ -900,20 +1002,28 @@ CONFIG_HWMON=y | |||
| 900 | # CONFIG_SENSORS_W83627HF is not set | 1002 | # CONFIG_SENSORS_W83627HF is not set |
| 901 | # CONFIG_SENSORS_W83627EHF is not set | 1003 | # CONFIG_SENSORS_W83627EHF is not set |
| 902 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1004 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 1005 | # CONFIG_THERMAL is not set | ||
| 1006 | # CONFIG_THERMAL_HWMON is not set | ||
| 903 | # CONFIG_WATCHDOG is not set | 1007 | # CONFIG_WATCHDOG is not set |
| 1008 | CONFIG_SSB_POSSIBLE=y | ||
| 904 | 1009 | ||
| 905 | # | 1010 | # |
| 906 | # Sonics Silicon Backplane | 1011 | # Sonics Silicon Backplane |
| 907 | # | 1012 | # |
| 908 | CONFIG_SSB_POSSIBLE=y | ||
| 909 | # CONFIG_SSB is not set | 1013 | # CONFIG_SSB is not set |
| 910 | 1014 | ||
| 911 | # | 1015 | # |
| 912 | # Multifunction device drivers | 1016 | # Multifunction device drivers |
| 913 | # | 1017 | # |
| 1018 | # CONFIG_MFD_CORE is not set | ||
| 914 | # CONFIG_MFD_SM501 is not set | 1019 | # CONFIG_MFD_SM501 is not set |
| 915 | # CONFIG_MFD_ASIC3 is not set | ||
| 916 | # CONFIG_HTC_PASIC3 is not set | 1020 | # CONFIG_HTC_PASIC3 is not set |
| 1021 | # CONFIG_TWL4030_CORE is not set | ||
| 1022 | # CONFIG_MFD_TMIO is not set | ||
| 1023 | # CONFIG_PMIC_DA903X is not set | ||
| 1024 | # CONFIG_MFD_WM8400 is not set | ||
| 1025 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 1026 | # CONFIG_MFD_PCF50633 is not set | ||
| 917 | 1027 | ||
| 918 | # | 1028 | # |
| 919 | # Multimedia devices | 1029 | # Multimedia devices |
| @@ -944,10 +1054,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 944 | # Display device support | 1054 | # Display device support |
| 945 | # | 1055 | # |
| 946 | # CONFIG_DISPLAY_SUPPORT is not set | 1056 | # CONFIG_DISPLAY_SUPPORT is not set |
| 947 | |||
| 948 | # | ||
| 949 | # Sound | ||
| 950 | # | ||
| 951 | # CONFIG_SOUND is not set | 1057 | # CONFIG_SOUND is not set |
| 952 | CONFIG_HID_SUPPORT=y | 1058 | CONFIG_HID_SUPPORT=y |
| 953 | CONFIG_HID=y | 1059 | CONFIG_HID=y |
| @@ -958,9 +1064,36 @@ CONFIG_HID=y | |||
| 958 | # USB Input Devices | 1064 | # USB Input Devices |
| 959 | # | 1065 | # |
| 960 | CONFIG_USB_HID=y | 1066 | CONFIG_USB_HID=y |
| 961 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1067 | # CONFIG_HID_PID is not set |
| 962 | # CONFIG_HID_FF is not set | ||
| 963 | # CONFIG_USB_HIDDEV is not set | 1068 | # CONFIG_USB_HIDDEV is not set |
| 1069 | |||
| 1070 | # | ||
| 1071 | # Special HID drivers | ||
| 1072 | # | ||
| 1073 | # CONFIG_HID_A4TECH is not set | ||
| 1074 | # CONFIG_HID_APPLE is not set | ||
| 1075 | # CONFIG_HID_BELKIN is not set | ||
| 1076 | # CONFIG_HID_CHERRY is not set | ||
| 1077 | # CONFIG_HID_CHICONY is not set | ||
| 1078 | # CONFIG_HID_CYPRESS is not set | ||
| 1079 | # CONFIG_DRAGONRISE_FF is not set | ||
| 1080 | # CONFIG_HID_EZKEY is not set | ||
| 1081 | # CONFIG_HID_KYE is not set | ||
| 1082 | # CONFIG_HID_GYRATION is not set | ||
| 1083 | # CONFIG_HID_KENSINGTON is not set | ||
| 1084 | # CONFIG_HID_LOGITECH is not set | ||
| 1085 | # CONFIG_HID_MICROSOFT is not set | ||
| 1086 | # CONFIG_HID_MONTEREY is not set | ||
| 1087 | # CONFIG_HID_NTRIG is not set | ||
| 1088 | # CONFIG_HID_PANTHERLORD is not set | ||
| 1089 | # CONFIG_HID_PETALYNX is not set | ||
| 1090 | # CONFIG_HID_SAMSUNG is not set | ||
| 1091 | # CONFIG_HID_SONY is not set | ||
| 1092 | # CONFIG_HID_SUNPLUS is not set | ||
| 1093 | # CONFIG_GREENASIA_FF is not set | ||
| 1094 | # CONFIG_HID_TOPSEED is not set | ||
| 1095 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 1096 | # CONFIG_ZEROPLUS_FF is not set | ||
| 964 | CONFIG_USB_SUPPORT=y | 1097 | CONFIG_USB_SUPPORT=y |
| 965 | CONFIG_USB_ARCH_HAS_HCD=y | 1098 | CONFIG_USB_ARCH_HAS_HCD=y |
| 966 | CONFIG_USB_ARCH_HAS_OHCI=y | 1099 | CONFIG_USB_ARCH_HAS_OHCI=y |
| @@ -978,6 +1111,9 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 978 | # CONFIG_USB_OTG is not set | 1111 | # CONFIG_USB_OTG is not set |
| 979 | # CONFIG_USB_OTG_WHITELIST is not set | 1112 | # CONFIG_USB_OTG_WHITELIST is not set |
| 980 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1113 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1114 | # CONFIG_USB_MON is not set | ||
| 1115 | # CONFIG_USB_WUSB is not set | ||
| 1116 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 981 | 1117 | ||
| 982 | # | 1118 | # |
| 983 | # USB Host Controller Drivers | 1119 | # USB Host Controller Drivers |
| @@ -986,12 +1122,15 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 986 | CONFIG_USB_EHCI_HCD=y | 1122 | CONFIG_USB_EHCI_HCD=y |
| 987 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1123 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 988 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1124 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
| 1125 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 989 | # CONFIG_USB_ISP116X_HCD is not set | 1126 | # CONFIG_USB_ISP116X_HCD is not set |
| 990 | # CONFIG_USB_ISP1760_HCD is not set | 1127 | # CONFIG_USB_ISP1760_HCD is not set |
| 991 | # CONFIG_USB_OHCI_HCD is not set | 1128 | # CONFIG_USB_OHCI_HCD is not set |
| 992 | # CONFIG_USB_UHCI_HCD is not set | 1129 | # CONFIG_USB_UHCI_HCD is not set |
| 993 | # CONFIG_USB_SL811_HCD is not set | 1130 | # CONFIG_USB_SL811_HCD is not set |
| 994 | # CONFIG_USB_R8A66597_HCD is not set | 1131 | # CONFIG_USB_R8A66597_HCD is not set |
| 1132 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1133 | # CONFIG_USB_HWA_HCD is not set | ||
| 995 | 1134 | ||
| 996 | # | 1135 | # |
| 997 | # USB Device Class drivers | 1136 | # USB Device Class drivers |
| @@ -999,20 +1138,20 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y | |||
| 999 | # CONFIG_USB_ACM is not set | 1138 | # CONFIG_USB_ACM is not set |
| 1000 | CONFIG_USB_PRINTER=y | 1139 | CONFIG_USB_PRINTER=y |
| 1001 | # CONFIG_USB_WDM is not set | 1140 | # CONFIG_USB_WDM is not set |
| 1141 | # CONFIG_USB_TMC is not set | ||
| 1002 | 1142 | ||
| 1003 | # | 1143 | # |
| 1004 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1144 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 1005 | # | 1145 | # |
| 1006 | 1146 | ||
| 1007 | # | 1147 | # |
| 1008 | # may also be needed; see USB_STORAGE Help for more information | 1148 | # also be needed; see USB_STORAGE Help for more info |
| 1009 | # | 1149 | # |
| 1010 | CONFIG_USB_STORAGE=y | 1150 | CONFIG_USB_STORAGE=y |
| 1011 | # CONFIG_USB_STORAGE_DEBUG is not set | 1151 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1012 | CONFIG_USB_STORAGE_DATAFAB=y | 1152 | CONFIG_USB_STORAGE_DATAFAB=y |
| 1013 | CONFIG_USB_STORAGE_FREECOM=y | 1153 | CONFIG_USB_STORAGE_FREECOM=y |
| 1014 | # CONFIG_USB_STORAGE_ISD200 is not set | 1154 | # CONFIG_USB_STORAGE_ISD200 is not set |
| 1015 | CONFIG_USB_STORAGE_DPCM=y | ||
| 1016 | # CONFIG_USB_STORAGE_USBAT is not set | 1155 | # CONFIG_USB_STORAGE_USBAT is not set |
| 1017 | CONFIG_USB_STORAGE_SDDR09=y | 1156 | CONFIG_USB_STORAGE_SDDR09=y |
| 1018 | CONFIG_USB_STORAGE_SDDR55=y | 1157 | CONFIG_USB_STORAGE_SDDR55=y |
| @@ -1028,7 +1167,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1028 | # | 1167 | # |
| 1029 | # CONFIG_USB_MDC800 is not set | 1168 | # CONFIG_USB_MDC800 is not set |
| 1030 | # CONFIG_USB_MICROTEK is not set | 1169 | # CONFIG_USB_MICROTEK is not set |
| 1031 | # CONFIG_USB_MON is not set | ||
| 1032 | 1170 | ||
| 1033 | # | 1171 | # |
| 1034 | # USB port drivers | 1172 | # USB port drivers |
| @@ -1041,7 +1179,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1041 | # CONFIG_USB_EMI62 is not set | 1179 | # CONFIG_USB_EMI62 is not set |
| 1042 | # CONFIG_USB_EMI26 is not set | 1180 | # CONFIG_USB_EMI26 is not set |
| 1043 | # CONFIG_USB_ADUTUX is not set | 1181 | # CONFIG_USB_ADUTUX is not set |
| 1044 | # CONFIG_USB_AUERSWALD is not set | 1182 | # CONFIG_USB_SEVSEG is not set |
| 1045 | # CONFIG_USB_RIO500 is not set | 1183 | # CONFIG_USB_RIO500 is not set |
| 1046 | # CONFIG_USB_LEGOTOWER is not set | 1184 | # CONFIG_USB_LEGOTOWER is not set |
| 1047 | # CONFIG_USB_LCD is not set | 1185 | # CONFIG_USB_LCD is not set |
| @@ -1049,7 +1187,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1049 | # CONFIG_USB_LED is not set | 1187 | # CONFIG_USB_LED is not set |
| 1050 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1188 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1051 | # CONFIG_USB_CYTHERM is not set | 1189 | # CONFIG_USB_CYTHERM is not set |
| 1052 | # CONFIG_USB_PHIDGET is not set | ||
| 1053 | # CONFIG_USB_IDMOUSE is not set | 1190 | # CONFIG_USB_IDMOUSE is not set |
| 1054 | # CONFIG_USB_FTDI_ELAN is not set | 1191 | # CONFIG_USB_FTDI_ELAN is not set |
| 1055 | # CONFIG_USB_APPLEDISPLAY is not set | 1192 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -1059,14 +1196,29 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1059 | # CONFIG_USB_IOWARRIOR is not set | 1196 | # CONFIG_USB_IOWARRIOR is not set |
| 1060 | # CONFIG_USB_TEST is not set | 1197 | # CONFIG_USB_TEST is not set |
| 1061 | # CONFIG_USB_ISIGHTFW is not set | 1198 | # CONFIG_USB_ISIGHTFW is not set |
| 1199 | # CONFIG_USB_VST is not set | ||
| 1062 | # CONFIG_USB_GADGET is not set | 1200 | # CONFIG_USB_GADGET is not set |
| 1201 | |||
| 1202 | # | ||
| 1203 | # OTG and related infrastructure | ||
| 1204 | # | ||
| 1205 | # CONFIG_USB_GPIO_VBUS is not set | ||
| 1206 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 1207 | # CONFIG_UWB is not set | ||
| 1063 | # CONFIG_MMC is not set | 1208 | # CONFIG_MMC is not set |
| 1209 | # CONFIG_MEMSTICK is not set | ||
| 1210 | # CONFIG_ACCESSIBILITY is not set | ||
| 1064 | CONFIG_NEW_LEDS=y | 1211 | CONFIG_NEW_LEDS=y |
| 1065 | CONFIG_LEDS_CLASS=y | 1212 | CONFIG_LEDS_CLASS=y |
| 1066 | 1213 | ||
| 1067 | # | 1214 | # |
| 1068 | # LED drivers | 1215 | # LED drivers |
| 1069 | # | 1216 | # |
| 1217 | # CONFIG_LEDS_PCA9532 is not set | ||
| 1218 | # CONFIG_LEDS_GPIO is not set | ||
| 1219 | # CONFIG_LEDS_LP5521 is not set | ||
| 1220 | # CONFIG_LEDS_PCA955X is not set | ||
| 1221 | # CONFIG_LEDS_BD2802 is not set | ||
| 1070 | 1222 | ||
| 1071 | # | 1223 | # |
| 1072 | # LED Triggers | 1224 | # LED Triggers |
| @@ -1074,7 +1226,12 @@ CONFIG_LEDS_CLASS=y | |||
| 1074 | CONFIG_LEDS_TRIGGERS=y | 1226 | CONFIG_LEDS_TRIGGERS=y |
| 1075 | CONFIG_LEDS_TRIGGER_TIMER=y | 1227 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 1076 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 1228 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 1229 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
| 1077 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | 1230 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set |
| 1231 | |||
| 1232 | # | ||
| 1233 | # iptables trigger is under Netfilter config (LED target) | ||
| 1234 | # | ||
| 1078 | CONFIG_RTC_LIB=y | 1235 | CONFIG_RTC_LIB=y |
| 1079 | CONFIG_RTC_CLASS=y | 1236 | CONFIG_RTC_CLASS=y |
| 1080 | CONFIG_RTC_HCTOSYS=y | 1237 | CONFIG_RTC_HCTOSYS=y |
| @@ -1105,6 +1262,8 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1105 | CONFIG_RTC_DRV_M41T80=y | 1262 | CONFIG_RTC_DRV_M41T80=y |
| 1106 | # CONFIG_RTC_DRV_M41T80_WDT is not set | 1263 | # CONFIG_RTC_DRV_M41T80_WDT is not set |
| 1107 | # CONFIG_RTC_DRV_S35390A is not set | 1264 | # CONFIG_RTC_DRV_S35390A is not set |
| 1265 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1266 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 1108 | 1267 | ||
| 1109 | # | 1268 | # |
| 1110 | # SPI RTC drivers | 1269 | # SPI RTC drivers |
| @@ -1114,18 +1273,25 @@ CONFIG_RTC_DRV_M41T80=y | |||
| 1114 | # Platform RTC drivers | 1273 | # Platform RTC drivers |
| 1115 | # | 1274 | # |
| 1116 | # CONFIG_RTC_DRV_CMOS is not set | 1275 | # CONFIG_RTC_DRV_CMOS is not set |
| 1276 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1117 | # CONFIG_RTC_DRV_DS1511 is not set | 1277 | # CONFIG_RTC_DRV_DS1511 is not set |
| 1118 | # CONFIG_RTC_DRV_DS1553 is not set | 1278 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1119 | # CONFIG_RTC_DRV_DS1742 is not set | 1279 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1120 | # CONFIG_RTC_DRV_STK17TA8 is not set | 1280 | # CONFIG_RTC_DRV_STK17TA8 is not set |
| 1121 | # CONFIG_RTC_DRV_M48T86 is not set | 1281 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1282 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1122 | # CONFIG_RTC_DRV_M48T59 is not set | 1283 | # CONFIG_RTC_DRV_M48T59 is not set |
| 1284 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1123 | # CONFIG_RTC_DRV_V3020 is not set | 1285 | # CONFIG_RTC_DRV_V3020 is not set |
| 1124 | 1286 | ||
| 1125 | # | 1287 | # |
| 1126 | # on-CPU RTC drivers | 1288 | # on-CPU RTC drivers |
| 1127 | # | 1289 | # |
| 1290 | # CONFIG_DMADEVICES is not set | ||
| 1291 | # CONFIG_AUXDISPLAY is not set | ||
| 1292 | # CONFIG_REGULATOR is not set | ||
| 1128 | # CONFIG_UIO is not set | 1293 | # CONFIG_UIO is not set |
| 1294 | # CONFIG_STAGING is not set | ||
| 1129 | 1295 | ||
| 1130 | # | 1296 | # |
| 1131 | # File systems | 1297 | # File systems |
| @@ -1134,14 +1300,25 @@ CONFIG_EXT2_FS=y | |||
| 1134 | # CONFIG_EXT2_FS_XATTR is not set | 1300 | # CONFIG_EXT2_FS_XATTR is not set |
| 1135 | # CONFIG_EXT2_FS_XIP is not set | 1301 | # CONFIG_EXT2_FS_XIP is not set |
| 1136 | CONFIG_EXT3_FS=y | 1302 | CONFIG_EXT3_FS=y |
| 1303 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1137 | # CONFIG_EXT3_FS_XATTR is not set | 1304 | # CONFIG_EXT3_FS_XATTR is not set |
| 1138 | # CONFIG_EXT4DEV_FS is not set | 1305 | CONFIG_EXT4_FS=m |
| 1306 | # CONFIG_EXT4DEV_COMPAT is not set | ||
| 1307 | CONFIG_EXT4_FS_XATTR=y | ||
| 1308 | # CONFIG_EXT4_FS_POSIX_ACL is not set | ||
| 1309 | # CONFIG_EXT4_FS_SECURITY is not set | ||
| 1139 | CONFIG_JBD=y | 1310 | CONFIG_JBD=y |
| 1311 | # CONFIG_JBD_DEBUG is not set | ||
| 1312 | CONFIG_JBD2=m | ||
| 1313 | # CONFIG_JBD2_DEBUG is not set | ||
| 1314 | CONFIG_FS_MBCACHE=m | ||
| 1140 | # CONFIG_REISERFS_FS is not set | 1315 | # CONFIG_REISERFS_FS is not set |
| 1141 | # CONFIG_JFS_FS is not set | 1316 | # CONFIG_JFS_FS is not set |
| 1142 | # CONFIG_FS_POSIX_ACL is not set | 1317 | # CONFIG_FS_POSIX_ACL is not set |
| 1318 | CONFIG_FILE_LOCKING=y | ||
| 1143 | # CONFIG_XFS_FS is not set | 1319 | # CONFIG_XFS_FS is not set |
| 1144 | # CONFIG_OCFS2_FS is not set | 1320 | # CONFIG_OCFS2_FS is not set |
| 1321 | # CONFIG_BTRFS_FS is not set | ||
| 1145 | CONFIG_DNOTIFY=y | 1322 | CONFIG_DNOTIFY=y |
| 1146 | CONFIG_INOTIFY=y | 1323 | CONFIG_INOTIFY=y |
| 1147 | CONFIG_INOTIFY_USER=y | 1324 | CONFIG_INOTIFY_USER=y |
| @@ -1151,6 +1328,11 @@ CONFIG_INOTIFY_USER=y | |||
| 1151 | # CONFIG_FUSE_FS is not set | 1328 | # CONFIG_FUSE_FS is not set |
| 1152 | 1329 | ||
| 1153 | # | 1330 | # |
| 1331 | # Caches | ||
| 1332 | # | ||
| 1333 | # CONFIG_FSCACHE is not set | ||
| 1334 | |||
| 1335 | # | ||
| 1154 | # CD-ROM/DVD Filesystems | 1336 | # CD-ROM/DVD Filesystems |
| 1155 | # | 1337 | # |
| 1156 | CONFIG_ISO9660_FS=m | 1338 | CONFIG_ISO9660_FS=m |
| @@ -1174,15 +1356,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1174 | # | 1356 | # |
| 1175 | CONFIG_PROC_FS=y | 1357 | CONFIG_PROC_FS=y |
| 1176 | CONFIG_PROC_SYSCTL=y | 1358 | CONFIG_PROC_SYSCTL=y |
| 1359 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1177 | CONFIG_SYSFS=y | 1360 | CONFIG_SYSFS=y |
| 1178 | CONFIG_TMPFS=y | 1361 | CONFIG_TMPFS=y |
| 1179 | # CONFIG_TMPFS_POSIX_ACL is not set | 1362 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1180 | # CONFIG_HUGETLB_PAGE is not set | 1363 | # CONFIG_HUGETLB_PAGE is not set |
| 1181 | # CONFIG_CONFIGFS_FS is not set | 1364 | # CONFIG_CONFIGFS_FS is not set |
| 1182 | 1365 | CONFIG_MISC_FILESYSTEMS=y | |
| 1183 | # | ||
| 1184 | # Miscellaneous filesystems | ||
| 1185 | # | ||
| 1186 | # CONFIG_ADFS_FS is not set | 1366 | # CONFIG_ADFS_FS is not set |
| 1187 | # CONFIG_AFFS_FS is not set | 1367 | # CONFIG_AFFS_FS is not set |
| 1188 | # CONFIG_HFS_FS is not set | 1368 | # CONFIG_HFS_FS is not set |
| @@ -1202,25 +1382,27 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1202 | CONFIG_JFFS2_RTIME=y | 1382 | CONFIG_JFFS2_RTIME=y |
| 1203 | # CONFIG_JFFS2_RUBIN is not set | 1383 | # CONFIG_JFFS2_RUBIN is not set |
| 1204 | CONFIG_CRAMFS=y | 1384 | CONFIG_CRAMFS=y |
| 1385 | # CONFIG_SQUASHFS is not set | ||
| 1205 | # CONFIG_VXFS_FS is not set | 1386 | # CONFIG_VXFS_FS is not set |
| 1206 | # CONFIG_MINIX_FS is not set | 1387 | # CONFIG_MINIX_FS is not set |
| 1388 | # CONFIG_OMFS_FS is not set | ||
| 1207 | # CONFIG_HPFS_FS is not set | 1389 | # CONFIG_HPFS_FS is not set |
| 1208 | # CONFIG_QNX4FS_FS is not set | 1390 | # CONFIG_QNX4FS_FS is not set |
| 1209 | # CONFIG_ROMFS_FS is not set | 1391 | # CONFIG_ROMFS_FS is not set |
| 1210 | # CONFIG_SYSV_FS is not set | 1392 | # CONFIG_SYSV_FS is not set |
| 1211 | # CONFIG_UFS_FS is not set | 1393 | # CONFIG_UFS_FS is not set |
| 1394 | # CONFIG_NILFS2_FS is not set | ||
| 1212 | CONFIG_NETWORK_FILESYSTEMS=y | 1395 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1213 | CONFIG_NFS_FS=y | 1396 | CONFIG_NFS_FS=y |
| 1214 | CONFIG_NFS_V3=y | 1397 | CONFIG_NFS_V3=y |
| 1215 | # CONFIG_NFS_V3_ACL is not set | 1398 | # CONFIG_NFS_V3_ACL is not set |
| 1216 | # CONFIG_NFS_V4 is not set | 1399 | # CONFIG_NFS_V4 is not set |
| 1217 | # CONFIG_NFSD is not set | ||
| 1218 | CONFIG_ROOT_NFS=y | 1400 | CONFIG_ROOT_NFS=y |
| 1401 | # CONFIG_NFSD is not set | ||
| 1219 | CONFIG_LOCKD=y | 1402 | CONFIG_LOCKD=y |
| 1220 | CONFIG_LOCKD_V4=y | 1403 | CONFIG_LOCKD_V4=y |
| 1221 | CONFIG_NFS_COMMON=y | 1404 | CONFIG_NFS_COMMON=y |
| 1222 | CONFIG_SUNRPC=y | 1405 | CONFIG_SUNRPC=y |
| 1223 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1224 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1406 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1225 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1407 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1226 | # CONFIG_SMB_FS is not set | 1408 | # CONFIG_SMB_FS is not set |
| @@ -1301,11 +1483,16 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1301 | CONFIG_FRAME_WARN=1024 | 1483 | CONFIG_FRAME_WARN=1024 |
| 1302 | CONFIG_MAGIC_SYSRQ=y | 1484 | CONFIG_MAGIC_SYSRQ=y |
| 1303 | # CONFIG_UNUSED_SYMBOLS is not set | 1485 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1304 | # CONFIG_DEBUG_FS is not set | 1486 | CONFIG_DEBUG_FS=y |
| 1305 | # CONFIG_HEADERS_CHECK is not set | 1487 | # CONFIG_HEADERS_CHECK is not set |
| 1306 | CONFIG_DEBUG_KERNEL=y | 1488 | CONFIG_DEBUG_KERNEL=y |
| 1307 | # CONFIG_DEBUG_SHIRQ is not set | 1489 | # CONFIG_DEBUG_SHIRQ is not set |
| 1308 | CONFIG_DETECT_SOFTLOCKUP=y | 1490 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1491 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1492 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1493 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1494 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1495 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1309 | CONFIG_SCHED_DEBUG=y | 1496 | CONFIG_SCHED_DEBUG=y |
| 1310 | CONFIG_SCHEDSTATS=y | 1497 | CONFIG_SCHEDSTATS=y |
| 1311 | # CONFIG_TIMER_STATS is not set | 1498 | # CONFIG_TIMER_STATS is not set |
| @@ -1320,22 +1507,55 @@ CONFIG_DEBUG_PREEMPT=y | |||
| 1320 | # CONFIG_LOCK_STAT is not set | 1507 | # CONFIG_LOCK_STAT is not set |
| 1321 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1508 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1322 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1509 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1510 | CONFIG_STACKTRACE=y | ||
| 1323 | # CONFIG_DEBUG_KOBJECT is not set | 1511 | # CONFIG_DEBUG_KOBJECT is not set |
| 1512 | # CONFIG_DEBUG_HIGHMEM is not set | ||
| 1324 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1513 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1325 | CONFIG_DEBUG_INFO=y | 1514 | CONFIG_DEBUG_INFO=y |
| 1326 | # CONFIG_DEBUG_VM is not set | 1515 | # CONFIG_DEBUG_VM is not set |
| 1327 | # CONFIG_DEBUG_WRITECOUNT is not set | 1516 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1517 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1328 | # CONFIG_DEBUG_LIST is not set | 1518 | # CONFIG_DEBUG_LIST is not set |
| 1329 | # CONFIG_DEBUG_SG is not set | 1519 | # CONFIG_DEBUG_SG is not set |
| 1330 | CONFIG_FRAME_POINTER=y | 1520 | # CONFIG_DEBUG_NOTIFIERS is not set |
| 1331 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1521 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1332 | # CONFIG_RCU_TORTURE_TEST is not set | 1522 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1523 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1333 | # CONFIG_KPROBES_SANITY_TEST is not set | 1524 | # CONFIG_KPROBES_SANITY_TEST is not set |
| 1334 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1525 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1526 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1335 | # CONFIG_LKDTM is not set | 1527 | # CONFIG_LKDTM is not set |
| 1336 | # CONFIG_FAULT_INJECTION is not set | 1528 | # CONFIG_FAULT_INJECTION is not set |
| 1337 | # CONFIG_LATENCYTOP is not set | 1529 | # CONFIG_LATENCYTOP is not set |
| 1530 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1531 | # CONFIG_PAGE_POISONING is not set | ||
| 1532 | CONFIG_NOP_TRACER=y | ||
| 1533 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1534 | CONFIG_RING_BUFFER=y | ||
| 1535 | CONFIG_TRACING=y | ||
| 1536 | CONFIG_TRACING_SUPPORT=y | ||
| 1537 | |||
| 1538 | # | ||
| 1539 | # Tracers | ||
| 1540 | # | ||
| 1541 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1542 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1543 | # CONFIG_PREEMPT_TRACER is not set | ||
| 1544 | # CONFIG_SCHED_TRACER is not set | ||
| 1545 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1546 | # CONFIG_EVENT_TRACER is not set | ||
| 1547 | # CONFIG_BOOT_TRACER is not set | ||
| 1548 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1549 | # CONFIG_STACK_TRACER is not set | ||
| 1550 | # CONFIG_KMEMTRACE is not set | ||
| 1551 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1552 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1553 | # CONFIG_FTRACE_STARTUP_TEST is not set | ||
| 1554 | # CONFIG_DYNAMIC_DEBUG is not set | ||
| 1338 | # CONFIG_SAMPLES is not set | 1555 | # CONFIG_SAMPLES is not set |
| 1556 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1557 | # CONFIG_KGDB is not set | ||
| 1558 | CONFIG_ARM_UNWIND=y | ||
| 1339 | CONFIG_DEBUG_USER=y | 1559 | CONFIG_DEBUG_USER=y |
| 1340 | CONFIG_DEBUG_ERRORS=y | 1560 | CONFIG_DEBUG_ERRORS=y |
| 1341 | # CONFIG_DEBUG_STACK_USAGE is not set | 1561 | # CONFIG_DEBUG_STACK_USAGE is not set |
| @@ -1347,17 +1567,27 @@ CONFIG_DEBUG_LL=y | |||
| 1347 | # | 1567 | # |
| 1348 | # CONFIG_KEYS is not set | 1568 | # CONFIG_KEYS is not set |
| 1349 | # CONFIG_SECURITY is not set | 1569 | # CONFIG_SECURITY is not set |
| 1570 | # CONFIG_SECURITYFS is not set | ||
| 1350 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1571 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1351 | CONFIG_CRYPTO=y | 1572 | CONFIG_CRYPTO=y |
| 1352 | 1573 | ||
| 1353 | # | 1574 | # |
| 1354 | # Crypto core or helper | 1575 | # Crypto core or helper |
| 1355 | # | 1576 | # |
| 1577 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1356 | CONFIG_CRYPTO_ALGAPI=m | 1578 | CONFIG_CRYPTO_ALGAPI=m |
| 1579 | CONFIG_CRYPTO_ALGAPI2=m | ||
| 1580 | CONFIG_CRYPTO_AEAD2=m | ||
| 1357 | CONFIG_CRYPTO_BLKCIPHER=m | 1581 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1582 | CONFIG_CRYPTO_BLKCIPHER2=m | ||
| 1583 | CONFIG_CRYPTO_HASH2=m | ||
| 1584 | CONFIG_CRYPTO_RNG2=m | ||
| 1585 | CONFIG_CRYPTO_PCOMP=m | ||
| 1358 | CONFIG_CRYPTO_MANAGER=m | 1586 | CONFIG_CRYPTO_MANAGER=m |
| 1587 | CONFIG_CRYPTO_MANAGER2=m | ||
| 1359 | # CONFIG_CRYPTO_GF128MUL is not set | 1588 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1360 | # CONFIG_CRYPTO_NULL is not set | 1589 | # CONFIG_CRYPTO_NULL is not set |
| 1590 | CONFIG_CRYPTO_WORKQUEUE=m | ||
| 1361 | # CONFIG_CRYPTO_CRYPTD is not set | 1591 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1362 | # CONFIG_CRYPTO_AUTHENC is not set | 1592 | # CONFIG_CRYPTO_AUTHENC is not set |
| 1363 | # CONFIG_CRYPTO_TEST is not set | 1593 | # CONFIG_CRYPTO_TEST is not set |
| @@ -1393,6 +1623,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1393 | # CONFIG_CRYPTO_MD4 is not set | 1623 | # CONFIG_CRYPTO_MD4 is not set |
| 1394 | # CONFIG_CRYPTO_MD5 is not set | 1624 | # CONFIG_CRYPTO_MD5 is not set |
| 1395 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1625 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1626 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1627 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1628 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1629 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1396 | # CONFIG_CRYPTO_SHA1 is not set | 1630 | # CONFIG_CRYPTO_SHA1 is not set |
| 1397 | # CONFIG_CRYPTO_SHA256 is not set | 1631 | # CONFIG_CRYPTO_SHA256 is not set |
| 1398 | # CONFIG_CRYPTO_SHA512 is not set | 1632 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1422,25 +1656,32 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1422 | # Compression | 1656 | # Compression |
| 1423 | # | 1657 | # |
| 1424 | # CONFIG_CRYPTO_DEFLATE is not set | 1658 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1659 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1425 | # CONFIG_CRYPTO_LZO is not set | 1660 | # CONFIG_CRYPTO_LZO is not set |
| 1661 | |||
| 1662 | # | ||
| 1663 | # Random Number Generation | ||
| 1664 | # | ||
| 1665 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1426 | CONFIG_CRYPTO_HW=y | 1666 | CONFIG_CRYPTO_HW=y |
| 1427 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1667 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1668 | CONFIG_BINARY_PRINTF=y | ||
| 1428 | 1669 | ||
| 1429 | # | 1670 | # |
| 1430 | # Library routines | 1671 | # Library routines |
| 1431 | # | 1672 | # |
| 1432 | CONFIG_BITREVERSE=y | 1673 | CONFIG_BITREVERSE=y |
| 1433 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1674 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 1434 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1435 | # CONFIG_CRC_CCITT is not set | 1675 | # CONFIG_CRC_CCITT is not set |
| 1436 | # CONFIG_CRC16 is not set | 1676 | CONFIG_CRC16=m |
| 1677 | # CONFIG_CRC_T10DIF is not set | ||
| 1437 | CONFIG_CRC_ITU_T=m | 1678 | CONFIG_CRC_ITU_T=m |
| 1438 | CONFIG_CRC32=y | 1679 | CONFIG_CRC32=y |
| 1439 | # CONFIG_CRC7 is not set | 1680 | # CONFIG_CRC7 is not set |
| 1440 | # CONFIG_LIBCRC32C is not set | 1681 | # CONFIG_LIBCRC32C is not set |
| 1441 | CONFIG_ZLIB_INFLATE=y | 1682 | CONFIG_ZLIB_INFLATE=y |
| 1442 | CONFIG_ZLIB_DEFLATE=y | 1683 | CONFIG_ZLIB_DEFLATE=y |
| 1443 | CONFIG_PLIST=y | ||
| 1444 | CONFIG_HAS_IOMEM=y | 1684 | CONFIG_HAS_IOMEM=y |
| 1445 | CONFIG_HAS_IOPORT=y | 1685 | CONFIG_HAS_IOPORT=y |
| 1446 | CONFIG_HAS_DMA=y | 1686 | CONFIG_HAS_DMA=y |
| 1687 | CONFIG_NLATTR=y | ||
diff --git a/arch/arm/configs/mx31moboard_defconfig b/arch/arm/configs/mx31moboard_defconfig deleted file mode 100644 index e90f86d6deef..000000000000 --- a/arch/arm/configs/mx31moboard_defconfig +++ /dev/null | |||
| @@ -1,790 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.27-rc5 | ||
| 4 | # Fri Oct 24 11:41:22 2008 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 16 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 23 | CONFIG_GENERIC_HWEIGHT=y | ||
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_ARCH_MTD_XIP=y | ||
| 28 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 29 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 30 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 31 | |||
| 32 | # | ||
| 33 | # General setup | ||
| 34 | # | ||
| 35 | CONFIG_EXPERIMENTAL=y | ||
| 36 | CONFIG_BROKEN_ON_SMP=y | ||
| 37 | CONFIG_LOCK_KERNEL=y | ||
| 38 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 39 | CONFIG_LOCALVERSION="" | ||
| 40 | CONFIG_LOCALVERSION_AUTO=y | ||
| 41 | CONFIG_SWAP=y | ||
| 42 | CONFIG_SYSVIPC=y | ||
| 43 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 44 | # CONFIG_POSIX_MQUEUE is not set | ||
| 45 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 46 | # CONFIG_TASKSTATS is not set | ||
| 47 | # CONFIG_AUDIT is not set | ||
| 48 | CONFIG_IKCONFIG=y | ||
| 49 | CONFIG_IKCONFIG_PROC=y | ||
| 50 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 51 | # CONFIG_CGROUPS is not set | ||
| 52 | CONFIG_GROUP_SCHED=y | ||
| 53 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 54 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 55 | CONFIG_USER_SCHED=y | ||
| 56 | # CONFIG_CGROUP_SCHED is not set | ||
| 57 | CONFIG_SYSFS_DEPRECATED=y | ||
| 58 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 59 | # CONFIG_RELAY is not set | ||
| 60 | # CONFIG_NAMESPACES is not set | ||
| 61 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 62 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 63 | CONFIG_SYSCTL=y | ||
| 64 | CONFIG_EMBEDDED=y | ||
| 65 | CONFIG_UID16=y | ||
| 66 | CONFIG_SYSCTL_SYSCALL=y | ||
| 67 | CONFIG_KALLSYMS=y | ||
| 68 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 69 | CONFIG_HOTPLUG=y | ||
| 70 | CONFIG_PRINTK=y | ||
| 71 | CONFIG_BUG=y | ||
| 72 | CONFIG_ELF_CORE=y | ||
| 73 | CONFIG_COMPAT_BRK=y | ||
| 74 | CONFIG_BASE_FULL=y | ||
| 75 | CONFIG_FUTEX=y | ||
| 76 | CONFIG_ANON_INODES=y | ||
| 77 | CONFIG_EPOLL=y | ||
| 78 | CONFIG_SIGNALFD=y | ||
| 79 | CONFIG_TIMERFD=y | ||
| 80 | CONFIG_EVENTFD=y | ||
| 81 | CONFIG_SHMEM=y | ||
| 82 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 83 | CONFIG_SLAB=y | ||
| 84 | # CONFIG_SLUB is not set | ||
| 85 | # CONFIG_SLOB is not set | ||
| 86 | # CONFIG_PROFILING is not set | ||
| 87 | # CONFIG_MARKERS is not set | ||
| 88 | CONFIG_HAVE_OPROFILE=y | ||
| 89 | # CONFIG_KPROBES is not set | ||
| 90 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 91 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 92 | CONFIG_HAVE_KPROBES=y | ||
| 93 | CONFIG_HAVE_KRETPROBES=y | ||
| 94 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 95 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 96 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 97 | # CONFIG_HAVE_CLK is not set | ||
| 98 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 99 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 100 | CONFIG_SLABINFO=y | ||
| 101 | CONFIG_RT_MUTEXES=y | ||
| 102 | # CONFIG_TINY_SHMEM is not set | ||
| 103 | CONFIG_BASE_SMALL=0 | ||
| 104 | CONFIG_MODULES=y | ||
| 105 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 106 | CONFIG_MODULE_UNLOAD=y | ||
| 107 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 108 | CONFIG_MODVERSIONS=y | ||
| 109 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 110 | CONFIG_KMOD=y | ||
| 111 | CONFIG_BLOCK=y | ||
| 112 | # CONFIG_LBD is not set | ||
| 113 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 114 | # CONFIG_LSF is not set | ||
| 115 | # CONFIG_BLK_DEV_BSG is not set | ||
| 116 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 117 | |||
| 118 | # | ||
| 119 | # IO Schedulers | ||
| 120 | # | ||
| 121 | CONFIG_IOSCHED_NOOP=y | ||
| 122 | CONFIG_IOSCHED_AS=y | ||
| 123 | CONFIG_IOSCHED_DEADLINE=y | ||
| 124 | CONFIG_IOSCHED_CFQ=y | ||
| 125 | # CONFIG_DEFAULT_AS is not set | ||
| 126 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 127 | CONFIG_DEFAULT_CFQ=y | ||
| 128 | # CONFIG_DEFAULT_NOOP is not set | ||
| 129 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 130 | CONFIG_CLASSIC_RCU=y | ||
| 131 | |||
| 132 | # | ||
| 133 | # System Type | ||
| 134 | # | ||
| 135 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 136 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 137 | # CONFIG_ARCH_REALVIEW is not set | ||
| 138 | # CONFIG_ARCH_VERSATILE is not set | ||
| 139 | # CONFIG_ARCH_AT91 is not set | ||
| 140 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 141 | # CONFIG_ARCH_CLPS711X is not set | ||
| 142 | # CONFIG_ARCH_EBSA110 is not set | ||
| 143 | # CONFIG_ARCH_EP93XX is not set | ||
| 144 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 145 | # CONFIG_ARCH_NETX is not set | ||
| 146 | # CONFIG_ARCH_H720X is not set | ||
| 147 | # CONFIG_ARCH_IMX is not set | ||
| 148 | # CONFIG_ARCH_IOP13XX is not set | ||
| 149 | # CONFIG_ARCH_IOP32X is not set | ||
| 150 | # CONFIG_ARCH_IOP33X is not set | ||
| 151 | # CONFIG_ARCH_IXP23XX is not set | ||
| 152 | # CONFIG_ARCH_IXP2000 is not set | ||
| 153 | # CONFIG_ARCH_IXP4XX is not set | ||
| 154 | # CONFIG_ARCH_L7200 is not set | ||
| 155 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 156 | # CONFIG_ARCH_KS8695 is not set | ||
| 157 | # CONFIG_ARCH_NS9XXX is not set | ||
| 158 | # CONFIG_ARCH_LOKI is not set | ||
| 159 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 160 | CONFIG_ARCH_MXC=y | ||
| 161 | # CONFIG_ARCH_ORION5X is not set | ||
| 162 | # CONFIG_ARCH_PNX4008 is not set | ||
| 163 | # CONFIG_ARCH_PXA is not set | ||
| 164 | # CONFIG_ARCH_RPC is not set | ||
| 165 | # CONFIG_ARCH_SA1100 is not set | ||
| 166 | # CONFIG_ARCH_S3C2410 is not set | ||
| 167 | # CONFIG_ARCH_SHARK is not set | ||
| 168 | # CONFIG_ARCH_LH7A40X is not set | ||
| 169 | # CONFIG_ARCH_DAVINCI is not set | ||
| 170 | # CONFIG_ARCH_OMAP is not set | ||
| 171 | # CONFIG_ARCH_MSM7X00A is not set | ||
| 172 | |||
| 173 | # | ||
| 174 | # Boot options | ||
| 175 | # | ||
| 176 | |||
| 177 | # | ||
| 178 | # Power management | ||
| 179 | # | ||
| 180 | |||
| 181 | # | ||
| 182 | # Freescale MXC Implementations | ||
| 183 | # | ||
| 184 | # CONFIG_ARCH_MX2 is not set | ||
| 185 | CONFIG_ARCH_MX3=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # MX3 Options | ||
| 189 | # | ||
| 190 | # CONFIG_MACH_MX31ADS is not set | ||
| 191 | # CONFIG_MACH_PCM037 is not set | ||
| 192 | # CONFIG_MACH_MX31LITE is not set | ||
| 193 | CONFIG_MACH_MX31MOBOARD=y | ||
| 194 | # CONFIG_MXC_IRQ_PRIOR is not set | ||
| 195 | |||
| 196 | # | ||
| 197 | # Processor Type | ||
| 198 | # | ||
| 199 | CONFIG_CPU_32=y | ||
| 200 | CONFIG_CPU_V6=y | ||
| 201 | # CONFIG_CPU_32v6K is not set | ||
| 202 | CONFIG_CPU_32v6=y | ||
| 203 | CONFIG_CPU_ABRT_EV6=y | ||
| 204 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 205 | CONFIG_CPU_CACHE_V6=y | ||
| 206 | CONFIG_CPU_CACHE_VIPT=y | ||
| 207 | CONFIG_CPU_COPY_V6=y | ||
| 208 | CONFIG_CPU_TLB_V6=y | ||
| 209 | CONFIG_CPU_HAS_ASID=y | ||
| 210 | CONFIG_CPU_CP15=y | ||
| 211 | CONFIG_CPU_CP15_MMU=y | ||
| 212 | |||
| 213 | # | ||
| 214 | # Processor Features | ||
| 215 | # | ||
| 216 | CONFIG_ARM_THUMB=y | ||
| 217 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 218 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 219 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
| 220 | # CONFIG_OUTER_CACHE is not set | ||
| 221 | |||
| 222 | # | ||
| 223 | # Bus support | ||
| 224 | # | ||
| 225 | # CONFIG_PCI_SYSCALL is not set | ||
| 226 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 227 | # CONFIG_PCCARD is not set | ||
| 228 | |||
| 229 | # | ||
| 230 | # Kernel Features | ||
| 231 | # | ||
| 232 | CONFIG_TICK_ONESHOT=y | ||
| 233 | CONFIG_NO_HZ=y | ||
| 234 | CONFIG_HIGH_RES_TIMERS=y | ||
| 235 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 236 | CONFIG_PREEMPT=y | ||
| 237 | CONFIG_HZ=100 | ||
| 238 | CONFIG_AEABI=y | ||
| 239 | # CONFIG_OABI_COMPAT is not set | ||
| 240 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
| 241 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 242 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 243 | CONFIG_FLATMEM_MANUAL=y | ||
| 244 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 245 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 246 | CONFIG_FLATMEM=y | ||
| 247 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 248 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 249 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 250 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 251 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 252 | # CONFIG_RESOURCES_64BIT is not set | ||
| 253 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 254 | CONFIG_BOUNCE=y | ||
| 255 | CONFIG_VIRT_TO_BUS=y | ||
| 256 | CONFIG_ALIGNMENT_TRAP=y | ||
| 257 | |||
| 258 | # | ||
| 259 | # Boot options | ||
| 260 | # | ||
| 261 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 262 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 263 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw ip=off" | ||
| 264 | # CONFIG_XIP_KERNEL is not set | ||
| 265 | # CONFIG_KEXEC is not set | ||
| 266 | |||
| 267 | # | ||
| 268 | # Floating point emulation | ||
| 269 | # | ||
| 270 | |||
| 271 | # | ||
| 272 | # At least one emulation must be selected | ||
| 273 | # | ||
| 274 | CONFIG_VFP=y | ||
| 275 | |||
| 276 | # | ||
| 277 | # Userspace binary formats | ||
| 278 | # | ||
| 279 | CONFIG_BINFMT_ELF=y | ||
| 280 | # CONFIG_BINFMT_AOUT is not set | ||
| 281 | # CONFIG_BINFMT_MISC is not set | ||
| 282 | |||
| 283 | # | ||
| 284 | # Power management options | ||
| 285 | # | ||
| 286 | # CONFIG_PM is not set | ||
| 287 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 288 | CONFIG_NET=y | ||
| 289 | |||
| 290 | # | ||
| 291 | # Networking options | ||
| 292 | # | ||
| 293 | CONFIG_PACKET=y | ||
| 294 | # CONFIG_PACKET_MMAP is not set | ||
| 295 | CONFIG_UNIX=y | ||
| 296 | # CONFIG_NET_KEY is not set | ||
| 297 | CONFIG_INET=y | ||
| 298 | # CONFIG_IP_MULTICAST is not set | ||
| 299 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 300 | CONFIG_IP_FIB_HASH=y | ||
| 301 | CONFIG_IP_PNP=y | ||
| 302 | CONFIG_IP_PNP_DHCP=y | ||
| 303 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 304 | # CONFIG_IP_PNP_RARP is not set | ||
| 305 | # CONFIG_NET_IPIP is not set | ||
| 306 | # CONFIG_NET_IPGRE is not set | ||
| 307 | # CONFIG_ARPD is not set | ||
| 308 | # CONFIG_SYN_COOKIES is not set | ||
| 309 | # CONFIG_INET_AH is not set | ||
| 310 | # CONFIG_INET_ESP is not set | ||
| 311 | # CONFIG_INET_IPCOMP is not set | ||
| 312 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 313 | # CONFIG_INET_TUNNEL is not set | ||
| 314 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 315 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 316 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 317 | # CONFIG_INET_LRO is not set | ||
| 318 | # CONFIG_INET_DIAG is not set | ||
| 319 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 320 | CONFIG_TCP_CONG_CUBIC=y | ||
| 321 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 322 | # CONFIG_TCP_MD5SIG is not set | ||
| 323 | # CONFIG_IPV6 is not set | ||
| 324 | # CONFIG_NETWORK_SECMARK is not set | ||
| 325 | # CONFIG_NETFILTER is not set | ||
| 326 | # CONFIG_IP_DCCP is not set | ||
| 327 | # CONFIG_IP_SCTP is not set | ||
| 328 | # CONFIG_TIPC is not set | ||
| 329 | # CONFIG_ATM is not set | ||
| 330 | # CONFIG_BRIDGE is not set | ||
| 331 | # CONFIG_VLAN_8021Q is not set | ||
| 332 | # CONFIG_DECNET is not set | ||
| 333 | # CONFIG_LLC2 is not set | ||
| 334 | # CONFIG_IPX is not set | ||
| 335 | # CONFIG_ATALK is not set | ||
| 336 | # CONFIG_X25 is not set | ||
| 337 | # CONFIG_LAPB is not set | ||
| 338 | # CONFIG_ECONET is not set | ||
| 339 | # CONFIG_WAN_ROUTER is not set | ||
| 340 | # CONFIG_NET_SCHED is not set | ||
| 341 | |||
| 342 | # | ||
| 343 | # Network testing | ||
| 344 | # | ||
| 345 | # CONFIG_NET_PKTGEN is not set | ||
| 346 | # CONFIG_HAMRADIO is not set | ||
| 347 | # CONFIG_CAN is not set | ||
| 348 | # CONFIG_IRDA is not set | ||
| 349 | # CONFIG_BT is not set | ||
| 350 | # CONFIG_AF_RXRPC is not set | ||
| 351 | |||
| 352 | # | ||
| 353 | # Wireless | ||
| 354 | # | ||
| 355 | # CONFIG_CFG80211 is not set | ||
| 356 | # CONFIG_WIRELESS_EXT is not set | ||
| 357 | # CONFIG_MAC80211 is not set | ||
| 358 | # CONFIG_IEEE80211 is not set | ||
| 359 | # CONFIG_RFKILL is not set | ||
| 360 | # CONFIG_NET_9P is not set | ||
| 361 | |||
| 362 | # | ||
| 363 | # Device Drivers | ||
| 364 | # | ||
| 365 | |||
| 366 | # | ||
| 367 | # Generic Driver Options | ||
| 368 | # | ||
| 369 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 370 | CONFIG_STANDALONE=y | ||
| 371 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 372 | CONFIG_FW_LOADER=m | ||
| 373 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 374 | CONFIG_EXTRA_FIRMWARE="" | ||
| 375 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 376 | # CONFIG_CONNECTOR is not set | ||
| 377 | CONFIG_MTD=y | ||
| 378 | # CONFIG_MTD_DEBUG is not set | ||
| 379 | # CONFIG_MTD_CONCAT is not set | ||
| 380 | CONFIG_MTD_PARTITIONS=y | ||
| 381 | CONFIG_MTD_REDBOOT_PARTS=y | ||
| 382 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
| 383 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
| 384 | CONFIG_MTD_REDBOOT_PARTS_READONLY=y | ||
| 385 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 386 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 387 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 388 | |||
| 389 | # | ||
| 390 | # User Modules And Translation Layers | ||
| 391 | # | ||
| 392 | CONFIG_MTD_CHAR=y | ||
| 393 | CONFIG_MTD_BLKDEVS=y | ||
| 394 | CONFIG_MTD_BLOCK=y | ||
| 395 | # CONFIG_FTL is not set | ||
| 396 | # CONFIG_NFTL is not set | ||
| 397 | # CONFIG_INFTL is not set | ||
| 398 | # CONFIG_RFD_FTL is not set | ||
| 399 | # CONFIG_SSFDC is not set | ||
| 400 | # CONFIG_MTD_OOPS is not set | ||
| 401 | |||
| 402 | # | ||
| 403 | # RAM/ROM/Flash chip drivers | ||
| 404 | # | ||
| 405 | CONFIG_MTD_CFI=y | ||
| 406 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 407 | CONFIG_MTD_GEN_PROBE=y | ||
| 408 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
| 409 | CONFIG_MTD_CFI_NOSWAP=y | ||
| 410 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
| 411 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
| 412 | CONFIG_MTD_CFI_GEOMETRY=y | ||
| 413 | # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set | ||
| 414 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 415 | # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set | ||
| 416 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 417 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 418 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 419 | CONFIG_MTD_CFI_I1=y | ||
| 420 | # CONFIG_MTD_CFI_I2 is not set | ||
| 421 | # CONFIG_MTD_CFI_I4 is not set | ||
| 422 | # CONFIG_MTD_CFI_I8 is not set | ||
| 423 | # CONFIG_MTD_OTP is not set | ||
| 424 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
| 425 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 426 | # CONFIG_MTD_CFI_STAA is not set | ||
| 427 | CONFIG_MTD_CFI_UTIL=y | ||
| 428 | # CONFIG_MTD_RAM is not set | ||
| 429 | # CONFIG_MTD_ROM is not set | ||
| 430 | # CONFIG_MTD_ABSENT is not set | ||
| 431 | # CONFIG_MTD_XIP is not set | ||
| 432 | |||
| 433 | # | ||
| 434 | # Mapping drivers for chip access | ||
| 435 | # | ||
| 436 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 437 | CONFIG_MTD_PHYSMAP=y | ||
| 438 | CONFIG_MTD_PHYSMAP_START=0x0 | ||
| 439 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 440 | CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | ||
| 441 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 442 | # CONFIG_MTD_PLATRAM is not set | ||
| 443 | |||
| 444 | # | ||
| 445 | # Self-contained MTD device drivers | ||
| 446 | # | ||
| 447 | # CONFIG_MTD_SLRAM is not set | ||
| 448 | # CONFIG_MTD_PHRAM is not set | ||
| 449 | # CONFIG_MTD_MTDRAM is not set | ||
| 450 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 451 | |||
| 452 | # | ||
| 453 | # Disk-On-Chip Device Drivers | ||
| 454 | # | ||
| 455 | # CONFIG_MTD_DOC2000 is not set | ||
| 456 | # CONFIG_MTD_DOC2001 is not set | ||
| 457 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 458 | # CONFIG_MTD_NAND is not set | ||
| 459 | # CONFIG_MTD_ONENAND is not set | ||
| 460 | |||
| 461 | # | ||
| 462 | # UBI - Unsorted block images | ||
| 463 | # | ||
| 464 | # CONFIG_MTD_UBI is not set | ||
| 465 | # CONFIG_PARPORT is not set | ||
| 466 | # CONFIG_BLK_DEV is not set | ||
| 467 | # CONFIG_MISC_DEVICES is not set | ||
| 468 | CONFIG_HAVE_IDE=y | ||
| 469 | # CONFIG_IDE is not set | ||
| 470 | |||
| 471 | # | ||
| 472 | # SCSI device support | ||
| 473 | # | ||
| 474 | # CONFIG_RAID_ATTRS is not set | ||
| 475 | # CONFIG_SCSI is not set | ||
| 476 | # CONFIG_SCSI_DMA is not set | ||
| 477 | # CONFIG_SCSI_NETLINK is not set | ||
| 478 | # CONFIG_ATA is not set | ||
| 479 | # CONFIG_MD is not set | ||
| 480 | CONFIG_NETDEVICES=y | ||
| 481 | # CONFIG_DUMMY is not set | ||
| 482 | # CONFIG_BONDING is not set | ||
| 483 | # CONFIG_MACVLAN is not set | ||
| 484 | # CONFIG_EQUALIZER is not set | ||
| 485 | # CONFIG_TUN is not set | ||
| 486 | # CONFIG_VETH is not set | ||
| 487 | # CONFIG_PHYLIB is not set | ||
| 488 | CONFIG_NET_ETHERNET=y | ||
| 489 | CONFIG_MII=y | ||
| 490 | # CONFIG_AX88796 is not set | ||
| 491 | CONFIG_SMC91X=y | ||
| 492 | # CONFIG_DM9000 is not set | ||
| 493 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 494 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 495 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 496 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 497 | # CONFIG_B44 is not set | ||
| 498 | # CONFIG_NETDEV_1000 is not set | ||
| 499 | # CONFIG_NETDEV_10000 is not set | ||
| 500 | |||
| 501 | # | ||
| 502 | # Wireless LAN | ||
| 503 | # | ||
| 504 | # CONFIG_WLAN_PRE80211 is not set | ||
| 505 | # CONFIG_WLAN_80211 is not set | ||
| 506 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 507 | # CONFIG_WAN is not set | ||
| 508 | # CONFIG_PPP is not set | ||
| 509 | # CONFIG_SLIP is not set | ||
| 510 | # CONFIG_NETCONSOLE is not set | ||
| 511 | # CONFIG_NETPOLL is not set | ||
| 512 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 513 | # CONFIG_ISDN is not set | ||
| 514 | |||
| 515 | # | ||
| 516 | # Input device support | ||
| 517 | # | ||
| 518 | # CONFIG_INPUT is not set | ||
| 519 | |||
| 520 | # | ||
| 521 | # Hardware I/O ports | ||
| 522 | # | ||
| 523 | # CONFIG_SERIO is not set | ||
| 524 | # CONFIG_GAMEPORT is not set | ||
| 525 | |||
| 526 | # | ||
| 527 | # Character devices | ||
| 528 | # | ||
| 529 | # CONFIG_VT is not set | ||
| 530 | CONFIG_DEVKMEM=y | ||
| 531 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 532 | |||
| 533 | # | ||
| 534 | # Serial drivers | ||
| 535 | # | ||
| 536 | # CONFIG_SERIAL_8250 is not set | ||
| 537 | |||
| 538 | # | ||
| 539 | # Non-8250 serial port support | ||
| 540 | # | ||
| 541 | CONFIG_SERIAL_IMX=y | ||
| 542 | CONFIG_SERIAL_IMX_CONSOLE=y | ||
| 543 | CONFIG_SERIAL_CORE=y | ||
| 544 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 545 | CONFIG_UNIX98_PTYS=y | ||
| 546 | # CONFIG_LEGACY_PTYS is not set | ||
| 547 | # CONFIG_IPMI_HANDLER is not set | ||
| 548 | # CONFIG_HW_RANDOM is not set | ||
| 549 | # CONFIG_NVRAM is not set | ||
| 550 | # CONFIG_R3964 is not set | ||
| 551 | # CONFIG_RAW_DRIVER is not set | ||
| 552 | # CONFIG_TCG_TPM is not set | ||
| 553 | # CONFIG_I2C is not set | ||
| 554 | # CONFIG_SPI is not set | ||
| 555 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 556 | CONFIG_GPIOLIB=y | ||
| 557 | # CONFIG_GPIO_SYSFS is not set | ||
| 558 | |||
| 559 | # | ||
| 560 | # I2C GPIO expanders: | ||
| 561 | # | ||
| 562 | |||
| 563 | # | ||
| 564 | # PCI GPIO expanders: | ||
| 565 | # | ||
| 566 | |||
| 567 | # | ||
| 568 | # SPI GPIO expanders: | ||
| 569 | # | ||
| 570 | # CONFIG_W1 is not set | ||
| 571 | # CONFIG_POWER_SUPPLY is not set | ||
| 572 | # CONFIG_HWMON is not set | ||
| 573 | # CONFIG_WATCHDOG is not set | ||
| 574 | |||
| 575 | # | ||
| 576 | # Sonics Silicon Backplane | ||
| 577 | # | ||
| 578 | CONFIG_SSB_POSSIBLE=y | ||
| 579 | # CONFIG_SSB is not set | ||
| 580 | |||
| 581 | # | ||
| 582 | # Multifunction device drivers | ||
| 583 | # | ||
| 584 | # CONFIG_MFD_CORE is not set | ||
| 585 | # CONFIG_MFD_SM501 is not set | ||
| 586 | # CONFIG_HTC_EGPIO is not set | ||
| 587 | # CONFIG_HTC_PASIC3 is not set | ||
| 588 | # CONFIG_MFD_TMIO is not set | ||
| 589 | # CONFIG_MFD_T7L66XB is not set | ||
| 590 | # CONFIG_MFD_TC6387XB is not set | ||
| 591 | # CONFIG_MFD_TC6393XB is not set | ||
| 592 | |||
| 593 | # | ||
| 594 | # Multimedia devices | ||
| 595 | # | ||
| 596 | |||
| 597 | # | ||
| 598 | # Multimedia core support | ||
| 599 | # | ||
| 600 | # CONFIG_VIDEO_DEV is not set | ||
| 601 | # CONFIG_DVB_CORE is not set | ||
| 602 | # CONFIG_VIDEO_MEDIA is not set | ||
| 603 | |||
| 604 | # | ||
| 605 | # Multimedia drivers | ||
| 606 | # | ||
| 607 | # CONFIG_DAB is not set | ||
| 608 | |||
| 609 | # | ||
| 610 | # Graphics support | ||
| 611 | # | ||
| 612 | # CONFIG_VGASTATE is not set | ||
| 613 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 614 | # CONFIG_FB is not set | ||
| 615 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 616 | |||
| 617 | # | ||
| 618 | # Display device support | ||
| 619 | # | ||
| 620 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 621 | # CONFIG_SOUND is not set | ||
| 622 | # CONFIG_USB_SUPPORT is not set | ||
| 623 | # CONFIG_MMC is not set | ||
| 624 | # CONFIG_NEW_LEDS is not set | ||
| 625 | CONFIG_RTC_LIB=y | ||
| 626 | # CONFIG_RTC_CLASS is not set | ||
| 627 | # CONFIG_DMADEVICES is not set | ||
| 628 | |||
| 629 | # | ||
| 630 | # Voltage and Current regulators | ||
| 631 | # | ||
| 632 | # CONFIG_REGULATOR is not set | ||
| 633 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 634 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 635 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 636 | # CONFIG_UIO is not set | ||
| 637 | |||
| 638 | # | ||
| 639 | # File systems | ||
| 640 | # | ||
| 641 | # CONFIG_EXT2_FS is not set | ||
| 642 | # CONFIG_EXT3_FS is not set | ||
| 643 | # CONFIG_EXT4DEV_FS is not set | ||
| 644 | # CONFIG_REISERFS_FS is not set | ||
| 645 | # CONFIG_JFS_FS is not set | ||
| 646 | # CONFIG_FS_POSIX_ACL is not set | ||
| 647 | # CONFIG_XFS_FS is not set | ||
| 648 | # CONFIG_OCFS2_FS is not set | ||
| 649 | # CONFIG_DNOTIFY is not set | ||
| 650 | CONFIG_INOTIFY=y | ||
| 651 | CONFIG_INOTIFY_USER=y | ||
| 652 | # CONFIG_QUOTA is not set | ||
| 653 | # CONFIG_AUTOFS_FS is not set | ||
| 654 | # CONFIG_AUTOFS4_FS is not set | ||
| 655 | # CONFIG_FUSE_FS is not set | ||
| 656 | |||
| 657 | # | ||
| 658 | # CD-ROM/DVD Filesystems | ||
| 659 | # | ||
| 660 | # CONFIG_ISO9660_FS is not set | ||
| 661 | # CONFIG_UDF_FS is not set | ||
| 662 | |||
| 663 | # | ||
| 664 | # DOS/FAT/NT Filesystems | ||
| 665 | # | ||
| 666 | # CONFIG_MSDOS_FS is not set | ||
| 667 | # CONFIG_VFAT_FS is not set | ||
| 668 | # CONFIG_NTFS_FS is not set | ||
| 669 | |||
| 670 | # | ||
| 671 | # Pseudo filesystems | ||
| 672 | # | ||
| 673 | CONFIG_PROC_FS=y | ||
| 674 | CONFIG_PROC_SYSCTL=y | ||
| 675 | CONFIG_SYSFS=y | ||
| 676 | CONFIG_TMPFS=y | ||
| 677 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 678 | # CONFIG_HUGETLB_PAGE is not set | ||
| 679 | # CONFIG_CONFIGFS_FS is not set | ||
| 680 | |||
| 681 | # | ||
| 682 | # Miscellaneous filesystems | ||
| 683 | # | ||
| 684 | # CONFIG_ADFS_FS is not set | ||
| 685 | # CONFIG_AFFS_FS is not set | ||
| 686 | # CONFIG_HFS_FS is not set | ||
| 687 | # CONFIG_HFSPLUS_FS is not set | ||
| 688 | # CONFIG_BEFS_FS is not set | ||
| 689 | # CONFIG_BFS_FS is not set | ||
| 690 | # CONFIG_EFS_FS is not set | ||
| 691 | CONFIG_JFFS2_FS=y | ||
| 692 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 693 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 694 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 695 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 696 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 697 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 698 | CONFIG_JFFS2_ZLIB=y | ||
| 699 | # CONFIG_JFFS2_LZO is not set | ||
| 700 | CONFIG_JFFS2_RTIME=y | ||
| 701 | # CONFIG_JFFS2_RUBIN is not set | ||
| 702 | # CONFIG_CRAMFS is not set | ||
| 703 | # CONFIG_VXFS_FS is not set | ||
| 704 | # CONFIG_MINIX_FS is not set | ||
| 705 | # CONFIG_OMFS_FS is not set | ||
| 706 | # CONFIG_HPFS_FS is not set | ||
| 707 | # CONFIG_QNX4FS_FS is not set | ||
| 708 | # CONFIG_ROMFS_FS is not set | ||
| 709 | # CONFIG_SYSV_FS is not set | ||
| 710 | # CONFIG_UFS_FS is not set | ||
| 711 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 712 | CONFIG_NFS_FS=y | ||
| 713 | # CONFIG_NFS_V3 is not set | ||
| 714 | # CONFIG_NFS_V4 is not set | ||
| 715 | CONFIG_ROOT_NFS=y | ||
| 716 | # CONFIG_NFSD is not set | ||
| 717 | CONFIG_LOCKD=y | ||
| 718 | CONFIG_NFS_COMMON=y | ||
| 719 | CONFIG_SUNRPC=y | ||
| 720 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 721 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 722 | # CONFIG_SMB_FS is not set | ||
| 723 | # CONFIG_CIFS is not set | ||
| 724 | # CONFIG_NCP_FS is not set | ||
| 725 | # CONFIG_CODA_FS is not set | ||
| 726 | # CONFIG_AFS_FS is not set | ||
| 727 | |||
| 728 | # | ||
| 729 | # Partition Types | ||
| 730 | # | ||
| 731 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 732 | CONFIG_MSDOS_PARTITION=y | ||
| 733 | # CONFIG_NLS is not set | ||
| 734 | # CONFIG_DLM is not set | ||
| 735 | |||
| 736 | # | ||
| 737 | # Kernel hacking | ||
| 738 | # | ||
| 739 | # CONFIG_PRINTK_TIME is not set | ||
| 740 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
| 741 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
| 742 | CONFIG_FRAME_WARN=1024 | ||
| 743 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 744 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 745 | # CONFIG_DEBUG_FS is not set | ||
| 746 | # CONFIG_HEADERS_CHECK is not set | ||
| 747 | # CONFIG_DEBUG_KERNEL is not set | ||
| 748 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 749 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 750 | CONFIG_FRAME_POINTER=y | ||
| 751 | # CONFIG_LATENCYTOP is not set | ||
| 752 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 753 | CONFIG_HAVE_FTRACE=y | ||
| 754 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 755 | # CONFIG_FTRACE is not set | ||
| 756 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 757 | # CONFIG_PREEMPT_TRACER is not set | ||
| 758 | # CONFIG_SCHED_TRACER is not set | ||
| 759 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 760 | # CONFIG_SAMPLES is not set | ||
| 761 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 762 | # CONFIG_DEBUG_USER is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # Security options | ||
| 766 | # | ||
| 767 | # CONFIG_KEYS is not set | ||
| 768 | # CONFIG_SECURITY is not set | ||
| 769 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 770 | # CONFIG_CRYPTO is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # Library routines | ||
| 774 | # | ||
| 775 | CONFIG_BITREVERSE=y | ||
| 776 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 777 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 778 | # CONFIG_CRC_CCITT is not set | ||
| 779 | # CONFIG_CRC16 is not set | ||
| 780 | # CONFIG_CRC_T10DIF is not set | ||
| 781 | # CONFIG_CRC_ITU_T is not set | ||
| 782 | CONFIG_CRC32=y | ||
| 783 | # CONFIG_CRC7 is not set | ||
| 784 | # CONFIG_LIBCRC32C is not set | ||
| 785 | CONFIG_ZLIB_INFLATE=y | ||
| 786 | CONFIG_ZLIB_DEFLATE=y | ||
| 787 | CONFIG_PLIST=y | ||
| 788 | CONFIG_HAS_IOMEM=y | ||
| 789 | CONFIG_HAS_IOPORT=y | ||
| 790 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig index 72a8201a5370..20ada526f6de 100644 --- a/arch/arm/configs/mx3_defconfig +++ b/arch/arm/configs/mx3_defconfig | |||
| @@ -197,7 +197,7 @@ CONFIG_MXC_PWM=y | |||
| 197 | # | 197 | # |
| 198 | CONFIG_CPU_32=y | 198 | CONFIG_CPU_32=y |
| 199 | CONFIG_CPU_V6=y | 199 | CONFIG_CPU_V6=y |
| 200 | CONFIG_CPU_32v6K=y | 200 | # CONFIG_CPU_32v6K is not set |
| 201 | CONFIG_CPU_32v6=y | 201 | CONFIG_CPU_32v6=y |
| 202 | CONFIG_CPU_ABRT_EV6=y | 202 | CONFIG_CPU_ABRT_EV6=y |
| 203 | CONFIG_CPU_PABRT_NOIFAR=y | 203 | CONFIG_CPU_PABRT_NOIFAR=y |
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 020e6a8a9e5c..5b98f7645119 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27-rc4 | 3 | # Linux kernel version: 2.6.30-rc4 |
| 4 | # Fri Aug 22 12:38:51 2008 | 4 | # Mon May 4 14:07:25 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| @@ -22,8 +22,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 23 | CONFIG_GENERIC_HWEIGHT=y | 23 | CONFIG_GENERIC_HWEIGHT=y |
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 25 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 28 | CONFIG_VECTORS_BASE=0xffff0000 | 26 | CONFIG_VECTORS_BASE=0xffff0000 |
| 29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -44,10 +42,19 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 44 | # CONFIG_BSD_PROCESS_ACCT is not set | 42 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 45 | # CONFIG_TASKSTATS is not set | 43 | # CONFIG_TASKSTATS is not set |
| 46 | # CONFIG_AUDIT is not set | 44 | # CONFIG_AUDIT is not set |
| 45 | |||
| 46 | # | ||
| 47 | # RCU Subsystem | ||
| 48 | # | ||
| 49 | CONFIG_CLASSIC_RCU=y | ||
| 50 | # CONFIG_TREE_RCU is not set | ||
| 51 | # CONFIG_PREEMPT_RCU is not set | ||
| 52 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 53 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 47 | # CONFIG_IKCONFIG is not set | 54 | # CONFIG_IKCONFIG is not set |
| 48 | CONFIG_LOG_BUF_SHIFT=14 | 55 | CONFIG_LOG_BUF_SHIFT=14 |
| 49 | # CONFIG_CGROUPS is not set | ||
| 50 | # CONFIG_GROUP_SCHED is not set | 56 | # CONFIG_GROUP_SCHED is not set |
| 57 | # CONFIG_CGROUPS is not set | ||
| 51 | CONFIG_SYSFS_DEPRECATED=y | 58 | CONFIG_SYSFS_DEPRECATED=y |
| 52 | CONFIG_SYSFS_DEPRECATED_V2=y | 59 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 53 | # CONFIG_RELAY is not set | 60 | # CONFIG_RELAY is not set |
| @@ -55,48 +62,45 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 55 | # CONFIG_BLK_DEV_INITRD is not set | 62 | # CONFIG_BLK_DEV_INITRD is not set |
| 56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 63 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 57 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 58 | CONFIG_EMBEDDED=y | 66 | CONFIG_EMBEDDED=y |
| 59 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 60 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 61 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 62 | CONFIG_KALLSYMS_ALL=y | 70 | CONFIG_KALLSYMS_ALL=y |
| 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 71 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 72 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 64 | CONFIG_HOTPLUG=y | 73 | CONFIG_HOTPLUG=y |
| 65 | CONFIG_PRINTK=y | 74 | CONFIG_PRINTK=y |
| 66 | CONFIG_BUG=y | 75 | CONFIG_BUG=y |
| 67 | CONFIG_ELF_CORE=y | 76 | CONFIG_ELF_CORE=y |
| 68 | CONFIG_COMPAT_BRK=y | ||
| 69 | CONFIG_BASE_FULL=y | 77 | CONFIG_BASE_FULL=y |
| 70 | CONFIG_FUTEX=y | 78 | CONFIG_FUTEX=y |
| 71 | CONFIG_ANON_INODES=y | ||
| 72 | CONFIG_EPOLL=y | 79 | CONFIG_EPOLL=y |
| 73 | CONFIG_SIGNALFD=y | 80 | CONFIG_SIGNALFD=y |
| 74 | CONFIG_TIMERFD=y | 81 | CONFIG_TIMERFD=y |
| 75 | CONFIG_EVENTFD=y | 82 | CONFIG_EVENTFD=y |
| 76 | CONFIG_SHMEM=y | 83 | CONFIG_SHMEM=y |
| 84 | CONFIG_AIO=y | ||
| 77 | CONFIG_VM_EVENT_COUNTERS=y | 85 | CONFIG_VM_EVENT_COUNTERS=y |
| 86 | CONFIG_PCI_QUIRKS=y | ||
| 78 | # CONFIG_SLUB_DEBUG is not set | 87 | # CONFIG_SLUB_DEBUG is not set |
| 88 | CONFIG_COMPAT_BRK=y | ||
| 79 | # CONFIG_SLAB is not set | 89 | # CONFIG_SLAB is not set |
| 80 | CONFIG_SLUB=y | 90 | CONFIG_SLUB=y |
| 81 | # CONFIG_SLOB is not set | 91 | # CONFIG_SLOB is not set |
| 82 | CONFIG_PROFILING=y | 92 | CONFIG_PROFILING=y |
| 93 | CONFIG_TRACEPOINTS=y | ||
| 83 | # CONFIG_MARKERS is not set | 94 | # CONFIG_MARKERS is not set |
| 84 | CONFIG_OPROFILE=y | 95 | CONFIG_OPROFILE=y |
| 85 | CONFIG_HAVE_OPROFILE=y | 96 | CONFIG_HAVE_OPROFILE=y |
| 86 | CONFIG_KPROBES=y | 97 | CONFIG_KPROBES=y |
| 87 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 88 | CONFIG_KRETPROBES=y | 98 | CONFIG_KRETPROBES=y |
| 89 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 90 | CONFIG_HAVE_KPROBES=y | 99 | CONFIG_HAVE_KPROBES=y |
| 91 | CONFIG_HAVE_KRETPROBES=y | 100 | CONFIG_HAVE_KRETPROBES=y |
| 92 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | 101 | # CONFIG_SLOW_WORK is not set |
| 93 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 94 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 95 | # CONFIG_HAVE_CLK is not set | ||
| 96 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 97 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | 102 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
| 98 | CONFIG_RT_MUTEXES=y | 103 | CONFIG_RT_MUTEXES=y |
| 99 | # CONFIG_TINY_SHMEM is not set | ||
| 100 | CONFIG_BASE_SMALL=0 | 104 | CONFIG_BASE_SMALL=0 |
| 101 | CONFIG_MODULES=y | 105 | CONFIG_MODULES=y |
| 102 | # CONFIG_MODULE_FORCE_LOAD is not set | 106 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -104,11 +108,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 104 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 108 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 105 | # CONFIG_MODVERSIONS is not set | 109 | # CONFIG_MODVERSIONS is not set |
| 106 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 110 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 107 | CONFIG_KMOD=y | ||
| 108 | CONFIG_BLOCK=y | 111 | CONFIG_BLOCK=y |
| 109 | # CONFIG_LBD is not set | 112 | # CONFIG_LBD is not set |
| 110 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 111 | # CONFIG_LSF is not set | ||
| 112 | # CONFIG_BLK_DEV_BSG is not set | 113 | # CONFIG_BLK_DEV_BSG is not set |
| 113 | # CONFIG_BLK_DEV_INTEGRITY is not set | 114 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 114 | 115 | ||
| @@ -124,7 +125,7 @@ CONFIG_IOSCHED_CFQ=y | |||
| 124 | CONFIG_DEFAULT_CFQ=y | 125 | CONFIG_DEFAULT_CFQ=y |
| 125 | # CONFIG_DEFAULT_NOOP is not set | 126 | # CONFIG_DEFAULT_NOOP is not set |
| 126 | CONFIG_DEFAULT_IOSCHED="cfq" | 127 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 127 | CONFIG_CLASSIC_RCU=y | 128 | # CONFIG_FREEZER is not set |
| 128 | 129 | ||
| 129 | # | 130 | # |
| 130 | # System Type | 131 | # System Type |
| @@ -134,10 +135,10 @@ CONFIG_CLASSIC_RCU=y | |||
| 134 | # CONFIG_ARCH_REALVIEW is not set | 135 | # CONFIG_ARCH_REALVIEW is not set |
| 135 | # CONFIG_ARCH_VERSATILE is not set | 136 | # CONFIG_ARCH_VERSATILE is not set |
| 136 | # CONFIG_ARCH_AT91 is not set | 137 | # CONFIG_ARCH_AT91 is not set |
| 137 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 138 | # CONFIG_ARCH_CLPS711X is not set | 138 | # CONFIG_ARCH_CLPS711X is not set |
| 139 | # CONFIG_ARCH_EBSA110 is not set | 139 | # CONFIG_ARCH_EBSA110 is not set |
| 140 | # CONFIG_ARCH_EP93XX is not set | 140 | # CONFIG_ARCH_EP93XX is not set |
| 141 | # CONFIG_ARCH_GEMINI is not set | ||
| 141 | # CONFIG_ARCH_FOOTBRIDGE is not set | 142 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 142 | # CONFIG_ARCH_NETX is not set | 143 | # CONFIG_ARCH_NETX is not set |
| 143 | # CONFIG_ARCH_H720X is not set | 144 | # CONFIG_ARCH_H720X is not set |
| @@ -158,14 +159,17 @@ CONFIG_CLASSIC_RCU=y | |||
| 158 | CONFIG_ARCH_ORION5X=y | 159 | CONFIG_ARCH_ORION5X=y |
| 159 | # CONFIG_ARCH_PNX4008 is not set | 160 | # CONFIG_ARCH_PNX4008 is not set |
| 160 | # CONFIG_ARCH_PXA is not set | 161 | # CONFIG_ARCH_PXA is not set |
| 162 | # CONFIG_ARCH_MMP is not set | ||
| 161 | # CONFIG_ARCH_RPC is not set | 163 | # CONFIG_ARCH_RPC is not set |
| 162 | # CONFIG_ARCH_SA1100 is not set | 164 | # CONFIG_ARCH_SA1100 is not set |
| 163 | # CONFIG_ARCH_S3C2410 is not set | 165 | # CONFIG_ARCH_S3C2410 is not set |
| 166 | # CONFIG_ARCH_S3C64XX is not set | ||
| 164 | # CONFIG_ARCH_SHARK is not set | 167 | # CONFIG_ARCH_SHARK is not set |
| 165 | # CONFIG_ARCH_LH7A40X is not set | 168 | # CONFIG_ARCH_LH7A40X is not set |
| 166 | # CONFIG_ARCH_DAVINCI is not set | 169 | # CONFIG_ARCH_DAVINCI is not set |
| 167 | # CONFIG_ARCH_OMAP is not set | 170 | # CONFIG_ARCH_OMAP is not set |
| 168 | # CONFIG_ARCH_MSM7X00A is not set | 171 | # CONFIG_ARCH_MSM is not set |
| 172 | # CONFIG_ARCH_W90X900 is not set | ||
| 169 | 173 | ||
| 170 | # | 174 | # |
| 171 | # Orion Implementations | 175 | # Orion Implementations |
| @@ -175,6 +179,7 @@ CONFIG_MACH_RD88F5182=y | |||
| 175 | CONFIG_MACH_KUROBOX_PRO=y | 179 | CONFIG_MACH_KUROBOX_PRO=y |
| 176 | CONFIG_MACH_DNS323=y | 180 | CONFIG_MACH_DNS323=y |
| 177 | CONFIG_MACH_TS209=y | 181 | CONFIG_MACH_TS209=y |
| 182 | CONFIG_MACH_TERASTATION_PRO2=y | ||
| 178 | CONFIG_MACH_LINKSTATION_PRO=y | 183 | CONFIG_MACH_LINKSTATION_PRO=y |
| 179 | CONFIG_MACH_LINKSTATION_MINI=y | 184 | CONFIG_MACH_LINKSTATION_MINI=y |
| 180 | CONFIG_MACH_TS409=y | 185 | CONFIG_MACH_TS409=y |
| @@ -187,14 +192,6 @@ CONFIG_MACH_WNR854T=y | |||
| 187 | CONFIG_MACH_RD88F5181L_GE=y | 192 | CONFIG_MACH_RD88F5181L_GE=y |
| 188 | CONFIG_MACH_RD88F5181L_FXO=y | 193 | CONFIG_MACH_RD88F5181L_FXO=y |
| 189 | CONFIG_MACH_RD88F6183AP_GE=y | 194 | CONFIG_MACH_RD88F6183AP_GE=y |
| 190 | |||
| 191 | # | ||
| 192 | # Boot options | ||
| 193 | # | ||
| 194 | |||
| 195 | # | ||
| 196 | # Power management | ||
| 197 | # | ||
| 198 | CONFIG_PLAT_ORION=y | 195 | CONFIG_PLAT_ORION=y |
| 199 | 196 | ||
| 200 | # | 197 | # |
| @@ -228,6 +225,8 @@ CONFIG_PCI_SYSCALL=y | |||
| 228 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 225 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 229 | CONFIG_PCI_LEGACY=y | 226 | CONFIG_PCI_LEGACY=y |
| 230 | # CONFIG_PCI_DEBUG is not set | 227 | # CONFIG_PCI_DEBUG is not set |
| 228 | # CONFIG_PCI_STUB is not set | ||
| 229 | # CONFIG_PCI_IOV is not set | ||
| 231 | # CONFIG_PCCARD is not set | 230 | # CONFIG_PCCARD is not set |
| 232 | 231 | ||
| 233 | # | 232 | # |
| @@ -237,25 +236,32 @@ CONFIG_TICK_ONESHOT=y | |||
| 237 | CONFIG_NO_HZ=y | 236 | CONFIG_NO_HZ=y |
| 238 | CONFIG_HIGH_RES_TIMERS=y | 237 | CONFIG_HIGH_RES_TIMERS=y |
| 239 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 238 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| 239 | CONFIG_VMSPLIT_3G=y | ||
| 240 | # CONFIG_VMSPLIT_2G is not set | ||
| 241 | # CONFIG_VMSPLIT_1G is not set | ||
| 242 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
| 240 | CONFIG_PREEMPT=y | 243 | CONFIG_PREEMPT=y |
| 241 | CONFIG_HZ=100 | 244 | CONFIG_HZ=100 |
| 242 | CONFIG_AEABI=y | 245 | CONFIG_AEABI=y |
| 243 | CONFIG_OABI_COMPAT=y | 246 | CONFIG_OABI_COMPAT=y |
| 244 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 247 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y |
| 248 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
| 249 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
| 250 | # CONFIG_HIGHMEM is not set | ||
| 245 | CONFIG_SELECT_MEMORY_MODEL=y | 251 | CONFIG_SELECT_MEMORY_MODEL=y |
| 246 | CONFIG_FLATMEM_MANUAL=y | 252 | CONFIG_FLATMEM_MANUAL=y |
| 247 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 253 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 248 | # CONFIG_SPARSEMEM_MANUAL is not set | 254 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 249 | CONFIG_FLATMEM=y | 255 | CONFIG_FLATMEM=y |
| 250 | CONFIG_FLAT_NODE_MEM_MAP=y | 256 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 251 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 252 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 253 | CONFIG_PAGEFLAGS_EXTENDED=y | 257 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 254 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 258 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
| 255 | # CONFIG_RESOURCES_64BIT is not set | 259 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 256 | CONFIG_ZONE_DMA_FLAG=1 | 260 | CONFIG_ZONE_DMA_FLAG=0 |
| 257 | CONFIG_BOUNCE=y | ||
| 258 | CONFIG_VIRT_TO_BUS=y | 261 | CONFIG_VIRT_TO_BUS=y |
| 262 | CONFIG_UNEVICTABLE_LRU=y | ||
| 263 | CONFIG_HAVE_MLOCK=y | ||
| 264 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 259 | CONFIG_LEDS=y | 265 | CONFIG_LEDS=y |
| 260 | CONFIG_LEDS_CPU=y | 266 | CONFIG_LEDS_CPU=y |
| 261 | CONFIG_ALIGNMENT_TRAP=y | 267 | CONFIG_ALIGNMENT_TRAP=y |
| @@ -270,6 +276,11 @@ CONFIG_CMDLINE="" | |||
| 270 | # CONFIG_KEXEC is not set | 276 | # CONFIG_KEXEC is not set |
| 271 | 277 | ||
| 272 | # | 278 | # |
| 279 | # CPU Power Management | ||
| 280 | # | ||
| 281 | # CONFIG_CPU_IDLE is not set | ||
| 282 | |||
| 283 | # | ||
| 273 | # Floating point emulation | 284 | # Floating point emulation |
| 274 | # | 285 | # |
| 275 | 286 | ||
| @@ -285,13 +296,18 @@ CONFIG_VFP=y | |||
| 285 | # Userspace binary formats | 296 | # Userspace binary formats |
| 286 | # | 297 | # |
| 287 | CONFIG_BINFMT_ELF=y | 298 | CONFIG_BINFMT_ELF=y |
| 299 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 300 | CONFIG_HAVE_AOUT=y | ||
| 288 | # CONFIG_BINFMT_AOUT is not set | 301 | # CONFIG_BINFMT_AOUT is not set |
| 289 | # CONFIG_BINFMT_MISC is not set | 302 | # CONFIG_BINFMT_MISC is not set |
| 290 | 303 | ||
| 291 | # | 304 | # |
| 292 | # Power management options | 305 | # Power management options |
| 293 | # | 306 | # |
| 294 | # CONFIG_PM is not set | 307 | CONFIG_PM=y |
| 308 | # CONFIG_PM_DEBUG is not set | ||
| 309 | # CONFIG_SUSPEND is not set | ||
| 310 | # CONFIG_APM_EMULATION is not set | ||
| 295 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 311 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 296 | CONFIG_NET=y | 312 | CONFIG_NET=y |
| 297 | 313 | ||
| @@ -328,7 +344,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 328 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 344 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 329 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 345 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 330 | CONFIG_INET_XFRM_MODE_BEET=y | 346 | CONFIG_INET_XFRM_MODE_BEET=y |
| 331 | # CONFIG_INET_LRO is not set | 347 | CONFIG_INET_LRO=y |
| 332 | CONFIG_INET_DIAG=y | 348 | CONFIG_INET_DIAG=y |
| 333 | CONFIG_INET_TCP_DIAG=y | 349 | CONFIG_INET_TCP_DIAG=y |
| 334 | # CONFIG_TCP_CONG_ADVANCED is not set | 350 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -343,6 +359,15 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 343 | # CONFIG_TIPC is not set | 359 | # CONFIG_TIPC is not set |
| 344 | # CONFIG_ATM is not set | 360 | # CONFIG_ATM is not set |
| 345 | # CONFIG_BRIDGE is not set | 361 | # CONFIG_BRIDGE is not set |
| 362 | CONFIG_NET_DSA=y | ||
| 363 | CONFIG_NET_DSA_TAG_DSA=y | ||
| 364 | CONFIG_NET_DSA_TAG_EDSA=y | ||
| 365 | # CONFIG_NET_DSA_TAG_TRAILER is not set | ||
| 366 | CONFIG_NET_DSA_MV88E6XXX=y | ||
| 367 | # CONFIG_NET_DSA_MV88E6060 is not set | ||
| 368 | CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y | ||
| 369 | CONFIG_NET_DSA_MV88E6131=y | ||
| 370 | CONFIG_NET_DSA_MV88E6123_61_65=y | ||
| 346 | # CONFIG_VLAN_8021Q is not set | 371 | # CONFIG_VLAN_8021Q is not set |
| 347 | # CONFIG_DECNET is not set | 372 | # CONFIG_DECNET is not set |
| 348 | # CONFIG_LLC2 is not set | 373 | # CONFIG_LLC2 is not set |
| @@ -352,27 +377,29 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 352 | # CONFIG_LAPB is not set | 377 | # CONFIG_LAPB is not set |
| 353 | # CONFIG_ECONET is not set | 378 | # CONFIG_ECONET is not set |
| 354 | # CONFIG_WAN_ROUTER is not set | 379 | # CONFIG_WAN_ROUTER is not set |
| 380 | # CONFIG_PHONET is not set | ||
| 355 | # CONFIG_NET_SCHED is not set | 381 | # CONFIG_NET_SCHED is not set |
| 382 | # CONFIG_DCB is not set | ||
| 356 | 383 | ||
| 357 | # | 384 | # |
| 358 | # Network testing | 385 | # Network testing |
| 359 | # | 386 | # |
| 360 | CONFIG_NET_PKTGEN=m | 387 | CONFIG_NET_PKTGEN=m |
| 361 | # CONFIG_NET_TCPPROBE is not set | 388 | # CONFIG_NET_TCPPROBE is not set |
| 389 | # CONFIG_NET_DROP_MONITOR is not set | ||
| 362 | # CONFIG_HAMRADIO is not set | 390 | # CONFIG_HAMRADIO is not set |
| 363 | # CONFIG_CAN is not set | 391 | # CONFIG_CAN is not set |
| 364 | # CONFIG_IRDA is not set | 392 | # CONFIG_IRDA is not set |
| 365 | # CONFIG_BT is not set | 393 | # CONFIG_BT is not set |
| 366 | # CONFIG_AF_RXRPC is not set | 394 | # CONFIG_AF_RXRPC is not set |
| 367 | 395 | CONFIG_WIRELESS=y | |
| 368 | # | ||
| 369 | # Wireless | ||
| 370 | # | ||
| 371 | # CONFIG_CFG80211 is not set | 396 | # CONFIG_CFG80211 is not set |
| 397 | # CONFIG_WIRELESS_OLD_REGULATORY is not set | ||
| 372 | CONFIG_WIRELESS_EXT=y | 398 | CONFIG_WIRELESS_EXT=y |
| 373 | CONFIG_WIRELESS_EXT_SYSFS=y | 399 | CONFIG_WIRELESS_EXT_SYSFS=y |
| 400 | # CONFIG_LIB80211 is not set | ||
| 374 | # CONFIG_MAC80211 is not set | 401 | # CONFIG_MAC80211 is not set |
| 375 | # CONFIG_IEEE80211 is not set | 402 | # CONFIG_WIMAX is not set |
| 376 | # CONFIG_RFKILL is not set | 403 | # CONFIG_RFKILL is not set |
| 377 | # CONFIG_NET_9P is not set | 404 | # CONFIG_NET_9P is not set |
| 378 | 405 | ||
| @@ -397,6 +424,7 @@ CONFIG_MTD=y | |||
| 397 | # CONFIG_MTD_DEBUG is not set | 424 | # CONFIG_MTD_DEBUG is not set |
| 398 | # CONFIG_MTD_CONCAT is not set | 425 | # CONFIG_MTD_CONCAT is not set |
| 399 | CONFIG_MTD_PARTITIONS=y | 426 | CONFIG_MTD_PARTITIONS=y |
| 427 | # CONFIG_MTD_TESTS is not set | ||
| 400 | # CONFIG_MTD_REDBOOT_PARTS is not set | 428 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 401 | CONFIG_MTD_CMDLINE_PARTS=y | 429 | CONFIG_MTD_CMDLINE_PARTS=y |
| 402 | # CONFIG_MTD_AFS_PARTS is not set | 430 | # CONFIG_MTD_AFS_PARTS is not set |
| @@ -450,9 +478,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 450 | # | 478 | # |
| 451 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 479 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 452 | CONFIG_MTD_PHYSMAP=y | 480 | CONFIG_MTD_PHYSMAP=y |
| 453 | CONFIG_MTD_PHYSMAP_START=0x0 | 481 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
| 454 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 455 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
| 456 | # CONFIG_MTD_ARM_INTEGRATOR is not set | 482 | # CONFIG_MTD_ARM_INTEGRATOR is not set |
| 457 | # CONFIG_MTD_IMPA7 is not set | 483 | # CONFIG_MTD_IMPA7 is not set |
| 458 | # CONFIG_MTD_INTEL_VR_NOR is not set | 484 | # CONFIG_MTD_INTEL_VR_NOR is not set |
| @@ -477,6 +503,7 @@ CONFIG_MTD_NAND=y | |||
| 477 | CONFIG_MTD_NAND_VERIFY_WRITE=y | 503 | CONFIG_MTD_NAND_VERIFY_WRITE=y |
| 478 | # CONFIG_MTD_NAND_ECC_SMC is not set | 504 | # CONFIG_MTD_NAND_ECC_SMC is not set |
| 479 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 505 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
| 506 | # CONFIG_MTD_NAND_GPIO is not set | ||
| 480 | CONFIG_MTD_NAND_IDS=y | 507 | CONFIG_MTD_NAND_IDS=y |
| 481 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 508 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 482 | # CONFIG_MTD_NAND_CAFE is not set | 509 | # CONFIG_MTD_NAND_CAFE is not set |
| @@ -487,6 +514,11 @@ CONFIG_MTD_NAND_ORION=y | |||
| 487 | # CONFIG_MTD_ONENAND is not set | 514 | # CONFIG_MTD_ONENAND is not set |
| 488 | 515 | ||
| 489 | # | 516 | # |
| 517 | # LPDDR flash memory drivers | ||
| 518 | # | ||
| 519 | # CONFIG_MTD_LPDDR is not set | ||
| 520 | |||
| 521 | # | ||
| 490 | # UBI - Unsorted block images | 522 | # UBI - Unsorted block images |
| 491 | # | 523 | # |
| 492 | # CONFIG_MTD_UBI is not set | 524 | # CONFIG_MTD_UBI is not set |
| @@ -507,11 +539,20 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 507 | # CONFIG_ATA_OVER_ETH is not set | 539 | # CONFIG_ATA_OVER_ETH is not set |
| 508 | CONFIG_MISC_DEVICES=y | 540 | CONFIG_MISC_DEVICES=y |
| 509 | # CONFIG_PHANTOM is not set | 541 | # CONFIG_PHANTOM is not set |
| 510 | # CONFIG_EEPROM_93CX6 is not set | ||
| 511 | # CONFIG_SGI_IOC4 is not set | 542 | # CONFIG_SGI_IOC4 is not set |
| 512 | # CONFIG_TIFM_CORE is not set | 543 | # CONFIG_TIFM_CORE is not set |
| 544 | # CONFIG_ICS932S401 is not set | ||
| 513 | # CONFIG_ENCLOSURE_SERVICES is not set | 545 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 514 | # CONFIG_HP_ILO is not set | 546 | # CONFIG_HP_ILO is not set |
| 547 | # CONFIG_ISL29003 is not set | ||
| 548 | # CONFIG_C2PORT is not set | ||
| 549 | |||
| 550 | # | ||
| 551 | # EEPROM support | ||
| 552 | # | ||
| 553 | # CONFIG_EEPROM_AT24 is not set | ||
| 554 | # CONFIG_EEPROM_LEGACY is not set | ||
| 555 | # CONFIG_EEPROM_93CX6 is not set | ||
| 515 | CONFIG_HAVE_IDE=y | 556 | CONFIG_HAVE_IDE=y |
| 516 | # CONFIG_IDE is not set | 557 | # CONFIG_IDE is not set |
| 517 | 558 | ||
| @@ -569,7 +610,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 569 | # CONFIG_MEGARAID_NEWGEN is not set | 610 | # CONFIG_MEGARAID_NEWGEN is not set |
| 570 | # CONFIG_MEGARAID_LEGACY is not set | 611 | # CONFIG_MEGARAID_LEGACY is not set |
| 571 | # CONFIG_MEGARAID_SAS is not set | 612 | # CONFIG_MEGARAID_SAS is not set |
| 613 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 572 | # CONFIG_SCSI_HPTIOP is not set | 614 | # CONFIG_SCSI_HPTIOP is not set |
| 615 | # CONFIG_LIBFC is not set | ||
| 616 | # CONFIG_LIBFCOE is not set | ||
| 617 | # CONFIG_FCOE is not set | ||
| 573 | # CONFIG_SCSI_DMX3191D is not set | 618 | # CONFIG_SCSI_DMX3191D is not set |
| 574 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 619 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| 575 | # CONFIG_SCSI_IPS is not set | 620 | # CONFIG_SCSI_IPS is not set |
| @@ -589,6 +634,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 589 | # CONFIG_SCSI_DEBUG is not set | 634 | # CONFIG_SCSI_DEBUG is not set |
| 590 | # CONFIG_SCSI_SRP is not set | 635 | # CONFIG_SCSI_SRP is not set |
| 591 | # CONFIG_SCSI_DH is not set | 636 | # CONFIG_SCSI_DH is not set |
| 637 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 592 | CONFIG_ATA=y | 638 | CONFIG_ATA=y |
| 593 | # CONFIG_ATA_NONSTANDARD is not set | 639 | # CONFIG_ATA_NONSTANDARD is not set |
| 594 | CONFIG_SATA_PMP=y | 640 | CONFIG_SATA_PMP=y |
| @@ -663,6 +709,7 @@ CONFIG_SATA_MV=y | |||
| 663 | # CONFIG_IEEE1394 is not set | 709 | # CONFIG_IEEE1394 is not set |
| 664 | # CONFIG_I2O is not set | 710 | # CONFIG_I2O is not set |
| 665 | CONFIG_NETDEVICES=y | 711 | CONFIG_NETDEVICES=y |
| 712 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 666 | # CONFIG_DUMMY is not set | 713 | # CONFIG_DUMMY is not set |
| 667 | # CONFIG_BONDING is not set | 714 | # CONFIG_BONDING is not set |
| 668 | # CONFIG_MACVLAN is not set | 715 | # CONFIG_MACVLAN is not set |
| @@ -670,7 +717,26 @@ CONFIG_NETDEVICES=y | |||
| 670 | # CONFIG_TUN is not set | 717 | # CONFIG_TUN is not set |
| 671 | # CONFIG_VETH is not set | 718 | # CONFIG_VETH is not set |
| 672 | # CONFIG_ARCNET is not set | 719 | # CONFIG_ARCNET is not set |
| 673 | # CONFIG_PHYLIB is not set | 720 | CONFIG_PHYLIB=y |
| 721 | |||
| 722 | # | ||
| 723 | # MII PHY device drivers | ||
| 724 | # | ||
| 725 | CONFIG_MARVELL_PHY=y | ||
| 726 | # CONFIG_DAVICOM_PHY is not set | ||
| 727 | # CONFIG_QSEMI_PHY is not set | ||
| 728 | # CONFIG_LXT_PHY is not set | ||
| 729 | # CONFIG_CICADA_PHY is not set | ||
| 730 | # CONFIG_VITESSE_PHY is not set | ||
| 731 | # CONFIG_SMSC_PHY is not set | ||
| 732 | # CONFIG_BROADCOM_PHY is not set | ||
| 733 | # CONFIG_ICPLUS_PHY is not set | ||
| 734 | # CONFIG_REALTEK_PHY is not set | ||
| 735 | # CONFIG_NATIONAL_PHY is not set | ||
| 736 | # CONFIG_STE10XP is not set | ||
| 737 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 738 | # CONFIG_FIXED_PHY is not set | ||
| 739 | # CONFIG_MDIO_BITBANG is not set | ||
| 674 | CONFIG_NET_ETHERNET=y | 740 | CONFIG_NET_ETHERNET=y |
| 675 | CONFIG_MII=y | 741 | CONFIG_MII=y |
| 676 | # CONFIG_AX88796 is not set | 742 | # CONFIG_AX88796 is not set |
| @@ -680,19 +746,25 @@ CONFIG_MII=y | |||
| 680 | # CONFIG_NET_VENDOR_3COM is not set | 746 | # CONFIG_NET_VENDOR_3COM is not set |
| 681 | # CONFIG_SMC91X is not set | 747 | # CONFIG_SMC91X is not set |
| 682 | # CONFIG_DM9000 is not set | 748 | # CONFIG_DM9000 is not set |
| 749 | # CONFIG_ETHOC is not set | ||
| 750 | # CONFIG_SMC911X is not set | ||
| 751 | # CONFIG_SMSC911X is not set | ||
| 752 | # CONFIG_DNET is not set | ||
| 683 | # CONFIG_NET_TULIP is not set | 753 | # CONFIG_NET_TULIP is not set |
| 684 | # CONFIG_HP100 is not set | 754 | # CONFIG_HP100 is not set |
| 685 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 755 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 686 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 756 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 687 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 757 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 688 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 758 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 759 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 760 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 761 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 689 | CONFIG_NET_PCI=y | 762 | CONFIG_NET_PCI=y |
| 690 | # CONFIG_PCNET32 is not set | 763 | # CONFIG_PCNET32 is not set |
| 691 | # CONFIG_AMD8111_ETH is not set | 764 | # CONFIG_AMD8111_ETH is not set |
| 692 | # CONFIG_ADAPTEC_STARFIRE is not set | 765 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 693 | # CONFIG_B44 is not set | 766 | # CONFIG_B44 is not set |
| 694 | # CONFIG_FORCEDETH is not set | 767 | # CONFIG_FORCEDETH is not set |
| 695 | # CONFIG_EEPRO100 is not set | ||
| 696 | # CONFIG_E100 is not set | 768 | # CONFIG_E100 is not set |
| 697 | # CONFIG_FEALNX is not set | 769 | # CONFIG_FEALNX is not set |
| 698 | # CONFIG_NATSEMI is not set | 770 | # CONFIG_NATSEMI is not set |
| @@ -702,10 +774,12 @@ CONFIG_NET_PCI=y | |||
| 702 | # CONFIG_R6040 is not set | 774 | # CONFIG_R6040 is not set |
| 703 | # CONFIG_SIS900 is not set | 775 | # CONFIG_SIS900 is not set |
| 704 | # CONFIG_EPIC100 is not set | 776 | # CONFIG_EPIC100 is not set |
| 777 | # CONFIG_SMSC9420 is not set | ||
| 705 | # CONFIG_SUNDANCE is not set | 778 | # CONFIG_SUNDANCE is not set |
| 706 | # CONFIG_TLAN is not set | 779 | # CONFIG_TLAN is not set |
| 707 | # CONFIG_VIA_RHINE is not set | 780 | # CONFIG_VIA_RHINE is not set |
| 708 | # CONFIG_SC92031 is not set | 781 | # CONFIG_SC92031 is not set |
| 782 | # CONFIG_ATL2 is not set | ||
| 709 | CONFIG_NETDEV_1000=y | 783 | CONFIG_NETDEV_1000=y |
| 710 | # CONFIG_ACENIC is not set | 784 | # CONFIG_ACENIC is not set |
| 711 | # CONFIG_DL2K is not set | 785 | # CONFIG_DL2K is not set |
| @@ -713,6 +787,7 @@ CONFIG_NETDEV_1000=y | |||
| 713 | # CONFIG_E1000E is not set | 787 | # CONFIG_E1000E is not set |
| 714 | # CONFIG_IP1000 is not set | 788 | # CONFIG_IP1000 is not set |
| 715 | # CONFIG_IGB is not set | 789 | # CONFIG_IGB is not set |
| 790 | # CONFIG_IGBVF is not set | ||
| 716 | # CONFIG_NS83820 is not set | 791 | # CONFIG_NS83820 is not set |
| 717 | # CONFIG_HAMACHI is not set | 792 | # CONFIG_HAMACHI is not set |
| 718 | # CONFIG_YELLOWFIN is not set | 793 | # CONFIG_YELLOWFIN is not set |
| @@ -727,6 +802,8 @@ CONFIG_MV643XX_ETH=y | |||
| 727 | # CONFIG_QLA3XXX is not set | 802 | # CONFIG_QLA3XXX is not set |
| 728 | # CONFIG_ATL1 is not set | 803 | # CONFIG_ATL1 is not set |
| 729 | # CONFIG_ATL1E is not set | 804 | # CONFIG_ATL1E is not set |
| 805 | # CONFIG_ATL1C is not set | ||
| 806 | # CONFIG_JME is not set | ||
| 730 | # CONFIG_NETDEV_10000 is not set | 807 | # CONFIG_NETDEV_10000 is not set |
| 731 | # CONFIG_TR is not set | 808 | # CONFIG_TR is not set |
| 732 | 809 | ||
| @@ -735,7 +812,10 @@ CONFIG_MV643XX_ETH=y | |||
| 735 | # | 812 | # |
| 736 | # CONFIG_WLAN_PRE80211 is not set | 813 | # CONFIG_WLAN_PRE80211 is not set |
| 737 | # CONFIG_WLAN_80211 is not set | 814 | # CONFIG_WLAN_80211 is not set |
| 738 | # CONFIG_IWLWIFI_LEDS is not set | 815 | |
| 816 | # | ||
| 817 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 818 | # | ||
| 739 | 819 | ||
| 740 | # | 820 | # |
| 741 | # USB Network Adapters | 821 | # USB Network Adapters |
| @@ -819,11 +899,11 @@ CONFIG_SERIAL_CORE=y | |||
| 819 | CONFIG_SERIAL_CORE_CONSOLE=y | 899 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 820 | # CONFIG_SERIAL_JSM is not set | 900 | # CONFIG_SERIAL_JSM is not set |
| 821 | CONFIG_UNIX98_PTYS=y | 901 | CONFIG_UNIX98_PTYS=y |
| 902 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 822 | CONFIG_LEGACY_PTYS=y | 903 | CONFIG_LEGACY_PTYS=y |
| 823 | CONFIG_LEGACY_PTY_COUNT=16 | 904 | CONFIG_LEGACY_PTY_COUNT=16 |
| 824 | # CONFIG_IPMI_HANDLER is not set | 905 | # CONFIG_IPMI_HANDLER is not set |
| 825 | # CONFIG_HW_RANDOM is not set | 906 | # CONFIG_HW_RANDOM is not set |
| 826 | # CONFIG_NVRAM is not set | ||
| 827 | # CONFIG_R3964 is not set | 907 | # CONFIG_R3964 is not set |
| 828 | # CONFIG_APPLICOM is not set | 908 | # CONFIG_APPLICOM is not set |
| 829 | # CONFIG_RAW_DRIVER is not set | 909 | # CONFIG_RAW_DRIVER is not set |
| @@ -886,12 +966,9 @@ CONFIG_I2C_MV64XXX=y | |||
| 886 | # Miscellaneous I2C Chip support | 966 | # Miscellaneous I2C Chip support |
| 887 | # | 967 | # |
| 888 | # CONFIG_DS1682 is not set | 968 | # CONFIG_DS1682 is not set |
| 889 | # CONFIG_EEPROM_AT24 is not set | ||
| 890 | # CONFIG_EEPROM_LEGACY is not set | ||
| 891 | # CONFIG_SENSORS_PCF8574 is not set | 969 | # CONFIG_SENSORS_PCF8574 is not set |
| 892 | # CONFIG_PCF8575 is not set | 970 | # CONFIG_PCF8575 is not set |
| 893 | # CONFIG_SENSORS_PCA9539 is not set | 971 | # CONFIG_SENSORS_PCA9539 is not set |
| 894 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 895 | # CONFIG_SENSORS_MAX6875 is not set | 972 | # CONFIG_SENSORS_MAX6875 is not set |
| 896 | # CONFIG_SENSORS_TSL2550 is not set | 973 | # CONFIG_SENSORS_TSL2550 is not set |
| 897 | # CONFIG_I2C_DEBUG_CORE is not set | 974 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -911,14 +988,17 @@ CONFIG_HWMON=y | |||
| 911 | # CONFIG_SENSORS_ADM1029 is not set | 988 | # CONFIG_SENSORS_ADM1029 is not set |
| 912 | # CONFIG_SENSORS_ADM1031 is not set | 989 | # CONFIG_SENSORS_ADM1031 is not set |
| 913 | # CONFIG_SENSORS_ADM9240 is not set | 990 | # CONFIG_SENSORS_ADM9240 is not set |
| 991 | # CONFIG_SENSORS_ADT7462 is not set | ||
| 914 | # CONFIG_SENSORS_ADT7470 is not set | 992 | # CONFIG_SENSORS_ADT7470 is not set |
| 915 | # CONFIG_SENSORS_ADT7473 is not set | 993 | # CONFIG_SENSORS_ADT7473 is not set |
| 994 | # CONFIG_SENSORS_ADT7475 is not set | ||
| 916 | # CONFIG_SENSORS_ATXP1 is not set | 995 | # CONFIG_SENSORS_ATXP1 is not set |
| 917 | # CONFIG_SENSORS_DS1621 is not set | 996 | # CONFIG_SENSORS_DS1621 is not set |
| 918 | # CONFIG_SENSORS_I5K_AMB is not set | 997 | # CONFIG_SENSORS_I5K_AMB is not set |
| 919 | # CONFIG_SENSORS_F71805F is not set | 998 | # CONFIG_SENSORS_F71805F is not set |
| 920 | # CONFIG_SENSORS_F71882FG is not set | 999 | # CONFIG_SENSORS_F71882FG is not set |
| 921 | # CONFIG_SENSORS_F75375S is not set | 1000 | # CONFIG_SENSORS_F75375S is not set |
| 1001 | # CONFIG_SENSORS_G760A is not set | ||
| 922 | # CONFIG_SENSORS_GL518SM is not set | 1002 | # CONFIG_SENSORS_GL518SM is not set |
| 923 | # CONFIG_SENSORS_GL520SM is not set | 1003 | # CONFIG_SENSORS_GL520SM is not set |
| 924 | # CONFIG_SENSORS_IT87 is not set | 1004 | # CONFIG_SENSORS_IT87 is not set |
| @@ -933,10 +1013,15 @@ CONFIG_SENSORS_LM75=y | |||
| 933 | # CONFIG_SENSORS_LM90 is not set | 1013 | # CONFIG_SENSORS_LM90 is not set |
| 934 | # CONFIG_SENSORS_LM92 is not set | 1014 | # CONFIG_SENSORS_LM92 is not set |
| 935 | # CONFIG_SENSORS_LM93 is not set | 1015 | # CONFIG_SENSORS_LM93 is not set |
| 1016 | # CONFIG_SENSORS_LTC4215 is not set | ||
| 1017 | # CONFIG_SENSORS_LTC4245 is not set | ||
| 1018 | # CONFIG_SENSORS_LM95241 is not set | ||
| 936 | # CONFIG_SENSORS_MAX1619 is not set | 1019 | # CONFIG_SENSORS_MAX1619 is not set |
| 937 | # CONFIG_SENSORS_MAX6650 is not set | 1020 | # CONFIG_SENSORS_MAX6650 is not set |
| 938 | # CONFIG_SENSORS_PC87360 is not set | 1021 | # CONFIG_SENSORS_PC87360 is not set |
| 939 | # CONFIG_SENSORS_PC87427 is not set | 1022 | # CONFIG_SENSORS_PC87427 is not set |
| 1023 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 1024 | # CONFIG_SENSORS_SHT15 is not set | ||
| 940 | # CONFIG_SENSORS_SIS5595 is not set | 1025 | # CONFIG_SENSORS_SIS5595 is not set |
| 941 | # CONFIG_SENSORS_DME1737 is not set | 1026 | # CONFIG_SENSORS_DME1737 is not set |
| 942 | # CONFIG_SENSORS_SMSC47M1 is not set | 1027 | # CONFIG_SENSORS_SMSC47M1 is not set |
| @@ -956,12 +1041,14 @@ CONFIG_SENSORS_LM75=y | |||
| 956 | # CONFIG_SENSORS_W83627HF is not set | 1041 | # CONFIG_SENSORS_W83627HF is not set |
| 957 | # CONFIG_SENSORS_W83627EHF is not set | 1042 | # CONFIG_SENSORS_W83627EHF is not set |
| 958 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1043 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 1044 | # CONFIG_THERMAL is not set | ||
| 1045 | # CONFIG_THERMAL_HWMON is not set | ||
| 959 | # CONFIG_WATCHDOG is not set | 1046 | # CONFIG_WATCHDOG is not set |
| 1047 | CONFIG_SSB_POSSIBLE=y | ||
| 960 | 1048 | ||
| 961 | # | 1049 | # |
| 962 | # Sonics Silicon Backplane | 1050 | # Sonics Silicon Backplane |
| 963 | # | 1051 | # |
| 964 | CONFIG_SSB_POSSIBLE=y | ||
| 965 | # CONFIG_SSB is not set | 1052 | # CONFIG_SSB is not set |
| 966 | 1053 | ||
| 967 | # | 1054 | # |
| @@ -970,9 +1057,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 970 | # CONFIG_MFD_CORE is not set | 1057 | # CONFIG_MFD_CORE is not set |
| 971 | # CONFIG_MFD_SM501 is not set | 1058 | # CONFIG_MFD_SM501 is not set |
| 972 | # CONFIG_HTC_PASIC3 is not set | 1059 | # CONFIG_HTC_PASIC3 is not set |
| 1060 | # CONFIG_TWL4030_CORE is not set | ||
| 973 | # CONFIG_MFD_TMIO is not set | 1061 | # CONFIG_MFD_TMIO is not set |
| 974 | # CONFIG_MFD_T7L66XB is not set | 1062 | # CONFIG_PMIC_DA903X is not set |
| 975 | # CONFIG_MFD_TC6387XB is not set | 1063 | # CONFIG_MFD_WM8400 is not set |
| 1064 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 1065 | # CONFIG_MFD_PCF50633 is not set | ||
| 976 | 1066 | ||
| 977 | # | 1067 | # |
| 978 | # Multimedia devices | 1068 | # Multimedia devices |
| @@ -1013,9 +1103,36 @@ CONFIG_HID=y | |||
| 1013 | # USB Input Devices | 1103 | # USB Input Devices |
| 1014 | # | 1104 | # |
| 1015 | CONFIG_USB_HID=y | 1105 | CONFIG_USB_HID=y |
| 1016 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1106 | # CONFIG_HID_PID is not set |
| 1017 | # CONFIG_HID_FF is not set | ||
| 1018 | # CONFIG_USB_HIDDEV is not set | 1107 | # CONFIG_USB_HIDDEV is not set |
| 1108 | |||
| 1109 | # | ||
| 1110 | # Special HID drivers | ||
| 1111 | # | ||
| 1112 | # CONFIG_HID_A4TECH is not set | ||
| 1113 | # CONFIG_HID_APPLE is not set | ||
| 1114 | # CONFIG_HID_BELKIN is not set | ||
| 1115 | # CONFIG_HID_CHERRY is not set | ||
| 1116 | # CONFIG_HID_CHICONY is not set | ||
| 1117 | # CONFIG_HID_CYPRESS is not set | ||
| 1118 | # CONFIG_DRAGONRISE_FF is not set | ||
| 1119 | # CONFIG_HID_EZKEY is not set | ||
| 1120 | # CONFIG_HID_KYE is not set | ||
| 1121 | # CONFIG_HID_GYRATION is not set | ||
| 1122 | # CONFIG_HID_KENSINGTON is not set | ||
| 1123 | # CONFIG_HID_LOGITECH is not set | ||
| 1124 | # CONFIG_HID_MICROSOFT is not set | ||
| 1125 | # CONFIG_HID_MONTEREY is not set | ||
| 1126 | # CONFIG_HID_NTRIG is not set | ||
| 1127 | # CONFIG_HID_PANTHERLORD is not set | ||
| 1128 | # CONFIG_HID_PETALYNX is not set | ||
| 1129 | # CONFIG_HID_SAMSUNG is not set | ||
| 1130 | # CONFIG_HID_SONY is not set | ||
| 1131 | # CONFIG_HID_SUNPLUS is not set | ||
| 1132 | # CONFIG_GREENASIA_FF is not set | ||
| 1133 | # CONFIG_HID_TOPSEED is not set | ||
| 1134 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 1135 | # CONFIG_ZEROPLUS_FF is not set | ||
| 1019 | CONFIG_USB_SUPPORT=y | 1136 | CONFIG_USB_SUPPORT=y |
| 1020 | CONFIG_USB_ARCH_HAS_HCD=y | 1137 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1021 | CONFIG_USB_ARCH_HAS_OHCI=y | 1138 | CONFIG_USB_ARCH_HAS_OHCI=y |
| @@ -1030,10 +1147,13 @@ CONFIG_USB=y | |||
| 1030 | CONFIG_USB_DEVICEFS=y | 1147 | CONFIG_USB_DEVICEFS=y |
| 1031 | CONFIG_USB_DEVICE_CLASS=y | 1148 | CONFIG_USB_DEVICE_CLASS=y |
| 1032 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1149 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1150 | # CONFIG_USB_SUSPEND is not set | ||
| 1033 | # CONFIG_USB_OTG is not set | 1151 | # CONFIG_USB_OTG is not set |
| 1034 | # CONFIG_USB_OTG_WHITELIST is not set | 1152 | # CONFIG_USB_OTG_WHITELIST is not set |
| 1035 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1153 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 1036 | # CONFIG_USB_MON is not set | 1154 | # CONFIG_USB_MON is not set |
| 1155 | # CONFIG_USB_WUSB is not set | ||
| 1156 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 1037 | 1157 | ||
| 1038 | # | 1158 | # |
| 1039 | # USB Host Controller Drivers | 1159 | # USB Host Controller Drivers |
| @@ -1042,12 +1162,15 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1042 | CONFIG_USB_EHCI_HCD=y | 1162 | CONFIG_USB_EHCI_HCD=y |
| 1043 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1163 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1044 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1164 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
| 1165 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 1045 | # CONFIG_USB_ISP116X_HCD is not set | 1166 | # CONFIG_USB_ISP116X_HCD is not set |
| 1046 | # CONFIG_USB_ISP1760_HCD is not set | 1167 | # CONFIG_USB_ISP1760_HCD is not set |
| 1047 | # CONFIG_USB_OHCI_HCD is not set | 1168 | # CONFIG_USB_OHCI_HCD is not set |
| 1048 | # CONFIG_USB_UHCI_HCD is not set | 1169 | # CONFIG_USB_UHCI_HCD is not set |
| 1049 | # CONFIG_USB_SL811_HCD is not set | 1170 | # CONFIG_USB_SL811_HCD is not set |
| 1050 | # CONFIG_USB_R8A66597_HCD is not set | 1171 | # CONFIG_USB_R8A66597_HCD is not set |
| 1172 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1173 | # CONFIG_USB_HWA_HCD is not set | ||
| 1051 | 1174 | ||
| 1052 | # | 1175 | # |
| 1053 | # USB Device Class drivers | 1176 | # USB Device Class drivers |
| @@ -1055,20 +1178,20 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y | |||
| 1055 | # CONFIG_USB_ACM is not set | 1178 | # CONFIG_USB_ACM is not set |
| 1056 | CONFIG_USB_PRINTER=y | 1179 | CONFIG_USB_PRINTER=y |
| 1057 | # CONFIG_USB_WDM is not set | 1180 | # CONFIG_USB_WDM is not set |
| 1181 | # CONFIG_USB_TMC is not set | ||
| 1058 | 1182 | ||
| 1059 | # | 1183 | # |
| 1060 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1184 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 1061 | # | 1185 | # |
| 1062 | 1186 | ||
| 1063 | # | 1187 | # |
| 1064 | # may also be needed; see USB_STORAGE Help for more information | 1188 | # also be needed; see USB_STORAGE Help for more info |
| 1065 | # | 1189 | # |
| 1066 | CONFIG_USB_STORAGE=y | 1190 | CONFIG_USB_STORAGE=y |
| 1067 | # CONFIG_USB_STORAGE_DEBUG is not set | 1191 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1068 | CONFIG_USB_STORAGE_DATAFAB=y | 1192 | CONFIG_USB_STORAGE_DATAFAB=y |
| 1069 | CONFIG_USB_STORAGE_FREECOM=y | 1193 | CONFIG_USB_STORAGE_FREECOM=y |
| 1070 | # CONFIG_USB_STORAGE_ISD200 is not set | 1194 | # CONFIG_USB_STORAGE_ISD200 is not set |
| 1071 | CONFIG_USB_STORAGE_DPCM=y | ||
| 1072 | # CONFIG_USB_STORAGE_USBAT is not set | 1195 | # CONFIG_USB_STORAGE_USBAT is not set |
| 1073 | CONFIG_USB_STORAGE_SDDR09=y | 1196 | CONFIG_USB_STORAGE_SDDR09=y |
| 1074 | CONFIG_USB_STORAGE_SDDR55=y | 1197 | CONFIG_USB_STORAGE_SDDR55=y |
| @@ -1076,7 +1199,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1076 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1199 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1077 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1200 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1078 | # CONFIG_USB_STORAGE_KARMA is not set | 1201 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1079 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
| 1080 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1202 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1081 | # CONFIG_USB_LIBUSUAL is not set | 1203 | # CONFIG_USB_LIBUSUAL is not set |
| 1082 | 1204 | ||
| @@ -1097,6 +1219,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1097 | # CONFIG_USB_EMI62 is not set | 1219 | # CONFIG_USB_EMI62 is not set |
| 1098 | # CONFIG_USB_EMI26 is not set | 1220 | # CONFIG_USB_EMI26 is not set |
| 1099 | # CONFIG_USB_ADUTUX is not set | 1221 | # CONFIG_USB_ADUTUX is not set |
| 1222 | # CONFIG_USB_SEVSEG is not set | ||
| 1100 | # CONFIG_USB_RIO500 is not set | 1223 | # CONFIG_USB_RIO500 is not set |
| 1101 | # CONFIG_USB_LEGOTOWER is not set | 1224 | # CONFIG_USB_LEGOTOWER is not set |
| 1102 | # CONFIG_USB_LCD is not set | 1225 | # CONFIG_USB_LCD is not set |
| @@ -1104,7 +1227,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1104 | # CONFIG_USB_LED is not set | 1227 | # CONFIG_USB_LED is not set |
| 1105 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1228 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1106 | # CONFIG_USB_CYTHERM is not set | 1229 | # CONFIG_USB_CYTHERM is not set |
| 1107 | # CONFIG_USB_PHIDGET is not set | ||
| 1108 | # CONFIG_USB_IDMOUSE is not set | 1230 | # CONFIG_USB_IDMOUSE is not set |
| 1109 | # CONFIG_USB_FTDI_ELAN is not set | 1231 | # CONFIG_USB_FTDI_ELAN is not set |
| 1110 | # CONFIG_USB_APPLEDISPLAY is not set | 1232 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -1114,8 +1236,18 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1114 | # CONFIG_USB_IOWARRIOR is not set | 1236 | # CONFIG_USB_IOWARRIOR is not set |
| 1115 | # CONFIG_USB_TEST is not set | 1237 | # CONFIG_USB_TEST is not set |
| 1116 | # CONFIG_USB_ISIGHTFW is not set | 1238 | # CONFIG_USB_ISIGHTFW is not set |
| 1239 | # CONFIG_USB_VST is not set | ||
| 1117 | # CONFIG_USB_GADGET is not set | 1240 | # CONFIG_USB_GADGET is not set |
| 1241 | |||
| 1242 | # | ||
| 1243 | # OTG and related infrastructure | ||
| 1244 | # | ||
| 1245 | # CONFIG_USB_GPIO_VBUS is not set | ||
| 1246 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 1247 | # CONFIG_UWB is not set | ||
| 1118 | # CONFIG_MMC is not set | 1248 | # CONFIG_MMC is not set |
| 1249 | # CONFIG_MEMSTICK is not set | ||
| 1250 | # CONFIG_ACCESSIBILITY is not set | ||
| 1119 | CONFIG_NEW_LEDS=y | 1251 | CONFIG_NEW_LEDS=y |
| 1120 | CONFIG_LEDS_CLASS=y | 1252 | CONFIG_LEDS_CLASS=y |
| 1121 | 1253 | ||
| @@ -1124,7 +1256,10 @@ CONFIG_LEDS_CLASS=y | |||
| 1124 | # | 1256 | # |
| 1125 | # CONFIG_LEDS_PCA9532 is not set | 1257 | # CONFIG_LEDS_PCA9532 is not set |
| 1126 | CONFIG_LEDS_GPIO=y | 1258 | CONFIG_LEDS_GPIO=y |
| 1259 | CONFIG_LEDS_GPIO_PLATFORM=y | ||
| 1260 | # CONFIG_LEDS_LP5521 is not set | ||
| 1127 | # CONFIG_LEDS_PCA955X is not set | 1261 | # CONFIG_LEDS_PCA955X is not set |
| 1262 | # CONFIG_LEDS_BD2802 is not set | ||
| 1128 | 1263 | ||
| 1129 | # | 1264 | # |
| 1130 | # LED Triggers | 1265 | # LED Triggers |
| @@ -1132,7 +1267,12 @@ CONFIG_LEDS_GPIO=y | |||
| 1132 | CONFIG_LEDS_TRIGGERS=y | 1267 | CONFIG_LEDS_TRIGGERS=y |
| 1133 | CONFIG_LEDS_TRIGGER_TIMER=y | 1268 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 1134 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 1269 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 1270 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
| 1135 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | 1271 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y |
| 1272 | |||
| 1273 | # | ||
| 1274 | # iptables trigger is under Netfilter config (LED target) | ||
| 1275 | # | ||
| 1136 | CONFIG_RTC_LIB=y | 1276 | CONFIG_RTC_LIB=y |
| 1137 | CONFIG_RTC_CLASS=y | 1277 | CONFIG_RTC_CLASS=y |
| 1138 | CONFIG_RTC_HCTOSYS=y | 1278 | CONFIG_RTC_HCTOSYS=y |
| @@ -1164,6 +1304,7 @@ CONFIG_RTC_DRV_M41T80=y | |||
| 1164 | # CONFIG_RTC_DRV_M41T80_WDT is not set | 1304 | # CONFIG_RTC_DRV_M41T80_WDT is not set |
| 1165 | CONFIG_RTC_DRV_S35390A=y | 1305 | CONFIG_RTC_DRV_S35390A=y |
| 1166 | # CONFIG_RTC_DRV_FM3130 is not set | 1306 | # CONFIG_RTC_DRV_FM3130 is not set |
| 1307 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 1167 | 1308 | ||
| 1168 | # | 1309 | # |
| 1169 | # SPI RTC drivers | 1310 | # SPI RTC drivers |
| @@ -1173,12 +1314,15 @@ CONFIG_RTC_DRV_S35390A=y | |||
| 1173 | # Platform RTC drivers | 1314 | # Platform RTC drivers |
| 1174 | # | 1315 | # |
| 1175 | # CONFIG_RTC_DRV_CMOS is not set | 1316 | # CONFIG_RTC_DRV_CMOS is not set |
| 1317 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1176 | # CONFIG_RTC_DRV_DS1511 is not set | 1318 | # CONFIG_RTC_DRV_DS1511 is not set |
| 1177 | # CONFIG_RTC_DRV_DS1553 is not set | 1319 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1178 | # CONFIG_RTC_DRV_DS1742 is not set | 1320 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1179 | # CONFIG_RTC_DRV_STK17TA8 is not set | 1321 | # CONFIG_RTC_DRV_STK17TA8 is not set |
| 1180 | CONFIG_RTC_DRV_M48T86=y | 1322 | CONFIG_RTC_DRV_M48T86=y |
| 1323 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1181 | # CONFIG_RTC_DRV_M48T59 is not set | 1324 | # CONFIG_RTC_DRV_M48T59 is not set |
| 1325 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1182 | # CONFIG_RTC_DRV_V3020 is not set | 1326 | # CONFIG_RTC_DRV_V3020 is not set |
| 1183 | 1327 | ||
| 1184 | # | 1328 | # |
| @@ -1196,16 +1340,12 @@ CONFIG_DMA_ENGINE=y | |||
| 1196 | # DMA Clients | 1340 | # DMA Clients |
| 1197 | # | 1341 | # |
| 1198 | # CONFIG_NET_DMA is not set | 1342 | # CONFIG_NET_DMA is not set |
| 1343 | # CONFIG_ASYNC_TX_DMA is not set | ||
| 1199 | # CONFIG_DMATEST is not set | 1344 | # CONFIG_DMATEST is not set |
| 1200 | 1345 | # CONFIG_AUXDISPLAY is not set | |
| 1201 | # | ||
| 1202 | # Voltage and Current regulators | ||
| 1203 | # | ||
| 1204 | # CONFIG_REGULATOR is not set | 1346 | # CONFIG_REGULATOR is not set |
| 1205 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 1206 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 1207 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 1208 | # CONFIG_UIO is not set | 1347 | # CONFIG_UIO is not set |
| 1348 | # CONFIG_STAGING is not set | ||
| 1209 | 1349 | ||
| 1210 | # | 1350 | # |
| 1211 | # File systems | 1351 | # File systems |
| @@ -1214,14 +1354,25 @@ CONFIG_EXT2_FS=y | |||
| 1214 | # CONFIG_EXT2_FS_XATTR is not set | 1354 | # CONFIG_EXT2_FS_XATTR is not set |
| 1215 | # CONFIG_EXT2_FS_XIP is not set | 1355 | # CONFIG_EXT2_FS_XIP is not set |
| 1216 | CONFIG_EXT3_FS=y | 1356 | CONFIG_EXT3_FS=y |
| 1357 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1217 | # CONFIG_EXT3_FS_XATTR is not set | 1358 | # CONFIG_EXT3_FS_XATTR is not set |
| 1218 | # CONFIG_EXT4DEV_FS is not set | 1359 | CONFIG_EXT4_FS=m |
| 1360 | # CONFIG_EXT4DEV_COMPAT is not set | ||
| 1361 | CONFIG_EXT4_FS_XATTR=y | ||
| 1362 | # CONFIG_EXT4_FS_POSIX_ACL is not set | ||
| 1363 | # CONFIG_EXT4_FS_SECURITY is not set | ||
| 1219 | CONFIG_JBD=y | 1364 | CONFIG_JBD=y |
| 1365 | # CONFIG_JBD_DEBUG is not set | ||
| 1366 | CONFIG_JBD2=m | ||
| 1367 | # CONFIG_JBD2_DEBUG is not set | ||
| 1368 | CONFIG_FS_MBCACHE=m | ||
| 1220 | # CONFIG_REISERFS_FS is not set | 1369 | # CONFIG_REISERFS_FS is not set |
| 1221 | # CONFIG_JFS_FS is not set | 1370 | # CONFIG_JFS_FS is not set |
| 1222 | # CONFIG_FS_POSIX_ACL is not set | 1371 | # CONFIG_FS_POSIX_ACL is not set |
| 1372 | CONFIG_FILE_LOCKING=y | ||
| 1223 | # CONFIG_XFS_FS is not set | 1373 | # CONFIG_XFS_FS is not set |
| 1224 | # CONFIG_OCFS2_FS is not set | 1374 | # CONFIG_OCFS2_FS is not set |
| 1375 | # CONFIG_BTRFS_FS is not set | ||
| 1225 | CONFIG_DNOTIFY=y | 1376 | CONFIG_DNOTIFY=y |
| 1226 | CONFIG_INOTIFY=y | 1377 | CONFIG_INOTIFY=y |
| 1227 | CONFIG_INOTIFY_USER=y | 1378 | CONFIG_INOTIFY_USER=y |
| @@ -1231,6 +1382,11 @@ CONFIG_INOTIFY_USER=y | |||
| 1231 | # CONFIG_FUSE_FS is not set | 1382 | # CONFIG_FUSE_FS is not set |
| 1232 | 1383 | ||
| 1233 | # | 1384 | # |
| 1385 | # Caches | ||
| 1386 | # | ||
| 1387 | # CONFIG_FSCACHE is not set | ||
| 1388 | |||
| 1389 | # | ||
| 1234 | # CD-ROM/DVD Filesystems | 1390 | # CD-ROM/DVD Filesystems |
| 1235 | # | 1391 | # |
| 1236 | CONFIG_ISO9660_FS=m | 1392 | CONFIG_ISO9660_FS=m |
| @@ -1254,15 +1410,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1254 | # | 1410 | # |
| 1255 | CONFIG_PROC_FS=y | 1411 | CONFIG_PROC_FS=y |
| 1256 | CONFIG_PROC_SYSCTL=y | 1412 | CONFIG_PROC_SYSCTL=y |
| 1413 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1257 | CONFIG_SYSFS=y | 1414 | CONFIG_SYSFS=y |
| 1258 | CONFIG_TMPFS=y | 1415 | CONFIG_TMPFS=y |
| 1259 | # CONFIG_TMPFS_POSIX_ACL is not set | 1416 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1260 | # CONFIG_HUGETLB_PAGE is not set | 1417 | # CONFIG_HUGETLB_PAGE is not set |
| 1261 | # CONFIG_CONFIGFS_FS is not set | 1418 | # CONFIG_CONFIGFS_FS is not set |
| 1262 | 1419 | CONFIG_MISC_FILESYSTEMS=y | |
| 1263 | # | ||
| 1264 | # Miscellaneous filesystems | ||
| 1265 | # | ||
| 1266 | # CONFIG_ADFS_FS is not set | 1420 | # CONFIG_ADFS_FS is not set |
| 1267 | # CONFIG_AFFS_FS is not set | 1421 | # CONFIG_AFFS_FS is not set |
| 1268 | # CONFIG_HFS_FS is not set | 1422 | # CONFIG_HFS_FS is not set |
| @@ -1282,6 +1436,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1282 | CONFIG_JFFS2_RTIME=y | 1436 | CONFIG_JFFS2_RTIME=y |
| 1283 | # CONFIG_JFFS2_RUBIN is not set | 1437 | # CONFIG_JFFS2_RUBIN is not set |
| 1284 | CONFIG_CRAMFS=y | 1438 | CONFIG_CRAMFS=y |
| 1439 | # CONFIG_SQUASHFS is not set | ||
| 1285 | # CONFIG_VXFS_FS is not set | 1440 | # CONFIG_VXFS_FS is not set |
| 1286 | # CONFIG_MINIX_FS is not set | 1441 | # CONFIG_MINIX_FS is not set |
| 1287 | # CONFIG_OMFS_FS is not set | 1442 | # CONFIG_OMFS_FS is not set |
| @@ -1290,6 +1445,7 @@ CONFIG_CRAMFS=y | |||
| 1290 | # CONFIG_ROMFS_FS is not set | 1445 | # CONFIG_ROMFS_FS is not set |
| 1291 | # CONFIG_SYSV_FS is not set | 1446 | # CONFIG_SYSV_FS is not set |
| 1292 | # CONFIG_UFS_FS is not set | 1447 | # CONFIG_UFS_FS is not set |
| 1448 | # CONFIG_NILFS2_FS is not set | ||
| 1293 | CONFIG_NETWORK_FILESYSTEMS=y | 1449 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1294 | CONFIG_NFS_FS=y | 1450 | CONFIG_NFS_FS=y |
| 1295 | CONFIG_NFS_V3=y | 1451 | CONFIG_NFS_V3=y |
| @@ -1381,13 +1537,16 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1381 | CONFIG_FRAME_WARN=1024 | 1537 | CONFIG_FRAME_WARN=1024 |
| 1382 | CONFIG_MAGIC_SYSRQ=y | 1538 | CONFIG_MAGIC_SYSRQ=y |
| 1383 | # CONFIG_UNUSED_SYMBOLS is not set | 1539 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1384 | # CONFIG_DEBUG_FS is not set | 1540 | CONFIG_DEBUG_FS=y |
| 1385 | # CONFIG_HEADERS_CHECK is not set | 1541 | # CONFIG_HEADERS_CHECK is not set |
| 1386 | CONFIG_DEBUG_KERNEL=y | 1542 | CONFIG_DEBUG_KERNEL=y |
| 1387 | # CONFIG_DEBUG_SHIRQ is not set | 1543 | # CONFIG_DEBUG_SHIRQ is not set |
| 1388 | CONFIG_DETECT_SOFTLOCKUP=y | 1544 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1389 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1545 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1390 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1546 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1547 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1548 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1549 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1391 | CONFIG_SCHED_DEBUG=y | 1550 | CONFIG_SCHED_DEBUG=y |
| 1392 | CONFIG_SCHEDSTATS=y | 1551 | CONFIG_SCHEDSTATS=y |
| 1393 | # CONFIG_TIMER_STATS is not set | 1552 | # CONFIG_TIMER_STATS is not set |
| @@ -1411,25 +1570,46 @@ CONFIG_DEBUG_INFO=y | |||
| 1411 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1570 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1412 | # CONFIG_DEBUG_LIST is not set | 1571 | # CONFIG_DEBUG_LIST is not set |
| 1413 | # CONFIG_DEBUG_SG is not set | 1572 | # CONFIG_DEBUG_SG is not set |
| 1573 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1414 | CONFIG_FRAME_POINTER=y | 1574 | CONFIG_FRAME_POINTER=y |
| 1415 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1575 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1416 | # CONFIG_RCU_TORTURE_TEST is not set | 1576 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1577 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1417 | # CONFIG_KPROBES_SANITY_TEST is not set | 1578 | # CONFIG_KPROBES_SANITY_TEST is not set |
| 1418 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1579 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1580 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1419 | # CONFIG_LKDTM is not set | 1581 | # CONFIG_LKDTM is not set |
| 1420 | # CONFIG_FAULT_INJECTION is not set | 1582 | # CONFIG_FAULT_INJECTION is not set |
| 1421 | CONFIG_LATENCYTOP=y | 1583 | CONFIG_LATENCYTOP=y |
| 1422 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1584 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1423 | CONFIG_HAVE_FTRACE=y | 1585 | # CONFIG_PAGE_POISONING is not set |
| 1424 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1586 | CONFIG_NOP_TRACER=y |
| 1425 | # CONFIG_FTRACE is not set | 1587 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1588 | CONFIG_RING_BUFFER=y | ||
| 1589 | CONFIG_TRACING=y | ||
| 1590 | CONFIG_TRACING_SUPPORT=y | ||
| 1591 | |||
| 1592 | # | ||
| 1593 | # Tracers | ||
| 1594 | # | ||
| 1595 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1426 | # CONFIG_IRQSOFF_TRACER is not set | 1596 | # CONFIG_IRQSOFF_TRACER is not set |
| 1427 | # CONFIG_PREEMPT_TRACER is not set | 1597 | # CONFIG_PREEMPT_TRACER is not set |
| 1428 | # CONFIG_SCHED_TRACER is not set | 1598 | # CONFIG_SCHED_TRACER is not set |
| 1429 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1599 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1600 | # CONFIG_EVENT_TRACER is not set | ||
| 1601 | # CONFIG_BOOT_TRACER is not set | ||
| 1602 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1603 | # CONFIG_STACK_TRACER is not set | ||
| 1604 | # CONFIG_KMEMTRACE is not set | ||
| 1605 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1606 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1607 | # CONFIG_FTRACE_STARTUP_TEST is not set | ||
| 1608 | # CONFIG_DYNAMIC_DEBUG is not set | ||
| 1430 | # CONFIG_SAMPLES is not set | 1609 | # CONFIG_SAMPLES is not set |
| 1431 | CONFIG_HAVE_ARCH_KGDB=y | 1610 | CONFIG_HAVE_ARCH_KGDB=y |
| 1432 | # CONFIG_KGDB is not set | 1611 | # CONFIG_KGDB is not set |
| 1612 | CONFIG_ARM_UNWIND=y | ||
| 1433 | CONFIG_DEBUG_USER=y | 1613 | CONFIG_DEBUG_USER=y |
| 1434 | CONFIG_DEBUG_ERRORS=y | 1614 | CONFIG_DEBUG_ERRORS=y |
| 1435 | # CONFIG_DEBUG_STACK_USAGE is not set | 1615 | # CONFIG_DEBUG_STACK_USAGE is not set |
| @@ -1441,18 +1621,27 @@ CONFIG_DEBUG_LL=y | |||
| 1441 | # | 1621 | # |
| 1442 | # CONFIG_KEYS is not set | 1622 | # CONFIG_KEYS is not set |
| 1443 | # CONFIG_SECURITY is not set | 1623 | # CONFIG_SECURITY is not set |
| 1624 | # CONFIG_SECURITYFS is not set | ||
| 1444 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1625 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1445 | CONFIG_ASYNC_CORE=y | ||
| 1446 | CONFIG_CRYPTO=y | 1626 | CONFIG_CRYPTO=y |
| 1447 | 1627 | ||
| 1448 | # | 1628 | # |
| 1449 | # Crypto core or helper | 1629 | # Crypto core or helper |
| 1450 | # | 1630 | # |
| 1631 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1451 | CONFIG_CRYPTO_ALGAPI=m | 1632 | CONFIG_CRYPTO_ALGAPI=m |
| 1633 | CONFIG_CRYPTO_ALGAPI2=m | ||
| 1634 | CONFIG_CRYPTO_AEAD2=m | ||
| 1452 | CONFIG_CRYPTO_BLKCIPHER=m | 1635 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1636 | CONFIG_CRYPTO_BLKCIPHER2=m | ||
| 1637 | CONFIG_CRYPTO_HASH2=m | ||
| 1638 | CONFIG_CRYPTO_RNG2=m | ||
| 1639 | CONFIG_CRYPTO_PCOMP=m | ||
| 1453 | CONFIG_CRYPTO_MANAGER=m | 1640 | CONFIG_CRYPTO_MANAGER=m |
| 1641 | CONFIG_CRYPTO_MANAGER2=m | ||
| 1454 | # CONFIG_CRYPTO_GF128MUL is not set | 1642 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1455 | # CONFIG_CRYPTO_NULL is not set | 1643 | # CONFIG_CRYPTO_NULL is not set |
| 1644 | CONFIG_CRYPTO_WORKQUEUE=m | ||
| 1456 | # CONFIG_CRYPTO_CRYPTD is not set | 1645 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1457 | # CONFIG_CRYPTO_AUTHENC is not set | 1646 | # CONFIG_CRYPTO_AUTHENC is not set |
| 1458 | # CONFIG_CRYPTO_TEST is not set | 1647 | # CONFIG_CRYPTO_TEST is not set |
| @@ -1521,18 +1710,24 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1521 | # Compression | 1710 | # Compression |
| 1522 | # | 1711 | # |
| 1523 | # CONFIG_CRYPTO_DEFLATE is not set | 1712 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1713 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1524 | # CONFIG_CRYPTO_LZO is not set | 1714 | # CONFIG_CRYPTO_LZO is not set |
| 1715 | |||
| 1716 | # | ||
| 1717 | # Random Number Generation | ||
| 1718 | # | ||
| 1719 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1525 | CONFIG_CRYPTO_HW=y | 1720 | CONFIG_CRYPTO_HW=y |
| 1526 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1721 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1722 | CONFIG_BINARY_PRINTF=y | ||
| 1527 | 1723 | ||
| 1528 | # | 1724 | # |
| 1529 | # Library routines | 1725 | # Library routines |
| 1530 | # | 1726 | # |
| 1531 | CONFIG_BITREVERSE=y | 1727 | CONFIG_BITREVERSE=y |
| 1532 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1728 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 1533 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1534 | # CONFIG_CRC_CCITT is not set | 1729 | # CONFIG_CRC_CCITT is not set |
| 1535 | # CONFIG_CRC16 is not set | 1730 | CONFIG_CRC16=m |
| 1536 | CONFIG_CRC_T10DIF=y | 1731 | CONFIG_CRC_T10DIF=y |
| 1537 | CONFIG_CRC_ITU_T=m | 1732 | CONFIG_CRC_ITU_T=m |
| 1538 | CONFIG_CRC32=y | 1733 | CONFIG_CRC32=y |
| @@ -1540,7 +1735,7 @@ CONFIG_CRC32=y | |||
| 1540 | # CONFIG_LIBCRC32C is not set | 1735 | # CONFIG_LIBCRC32C is not set |
| 1541 | CONFIG_ZLIB_INFLATE=y | 1736 | CONFIG_ZLIB_INFLATE=y |
| 1542 | CONFIG_ZLIB_DEFLATE=y | 1737 | CONFIG_ZLIB_DEFLATE=y |
| 1543 | CONFIG_PLIST=y | ||
| 1544 | CONFIG_HAS_IOMEM=y | 1738 | CONFIG_HAS_IOMEM=y |
| 1545 | CONFIG_HAS_IOPORT=y | 1739 | CONFIG_HAS_IOPORT=y |
| 1546 | CONFIG_HAS_DMA=y | 1740 | CONFIG_HAS_DMA=y |
| 1741 | CONFIG_NLATTR=y | ||
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index d7da19bcf928..c207504de84d 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h | |||
| @@ -45,13 +45,15 @@ typedef struct user_fp elf_fpregset_t; | |||
| 45 | #define EF_ARM_HASENTRY 0x00000002 /* All */ | 45 | #define EF_ARM_HASENTRY 0x00000002 /* All */ |
| 46 | #define EF_ARM_RELEXEC 0x00000001 /* All */ | 46 | #define EF_ARM_RELEXEC 0x00000001 /* All */ |
| 47 | 47 | ||
| 48 | #define R_ARM_NONE 0 | 48 | #define R_ARM_NONE 0 |
| 49 | #define R_ARM_PC24 1 | 49 | #define R_ARM_PC24 1 |
| 50 | #define R_ARM_ABS32 2 | 50 | #define R_ARM_ABS32 2 |
| 51 | #define R_ARM_CALL 28 | 51 | #define R_ARM_CALL 28 |
| 52 | #define R_ARM_JUMP24 29 | 52 | #define R_ARM_JUMP24 29 |
| 53 | #define R_ARM_V4BX 40 | 53 | #define R_ARM_V4BX 40 |
| 54 | #define R_ARM_PREL31 42 | 54 | #define R_ARM_PREL31 42 |
| 55 | #define R_ARM_MOVW_ABS_NC 43 | ||
| 56 | #define R_ARM_MOVT_ABS 44 | ||
| 55 | 57 | ||
| 56 | /* | 58 | /* |
| 57 | * These are used to set parameters in the core dumps. | 59 | * These are used to set parameters in the core dumps. |
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index d1731e39b496..bac03c81489d 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
| @@ -169,6 +169,21 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, | |||
| 169 | *(u32 *)loc = offset & 0x7fffffff; | 169 | *(u32 *)loc = offset & 0x7fffffff; |
| 170 | break; | 170 | break; |
| 171 | 171 | ||
| 172 | case R_ARM_MOVW_ABS_NC: | ||
| 173 | case R_ARM_MOVT_ABS: | ||
| 174 | offset = *(u32 *)loc; | ||
| 175 | offset = ((offset & 0xf0000) >> 4) | (offset & 0xfff); | ||
| 176 | offset = (offset ^ 0x8000) - 0x8000; | ||
| 177 | |||
| 178 | offset += sym->st_value; | ||
| 179 | if (ELF32_R_TYPE(rel->r_info) == R_ARM_MOVT_ABS) | ||
| 180 | offset >>= 16; | ||
| 181 | |||
| 182 | *(u32 *)loc &= 0xfff0f000; | ||
| 183 | *(u32 *)loc |= ((offset & 0xf000) << 4) | | ||
| 184 | (offset & 0x0fff); | ||
| 185 | break; | ||
| 186 | |||
| 172 | default: | 187 | default: |
| 173 | printk(KERN_ERR "%s: unknown relocation: %u\n", | 188 | printk(KERN_ERR "%s: unknown relocation: %u\n", |
| 174 | module->name, ELF32_R_TYPE(rel->r_info)); | 189 | module->name, ELF32_R_TYPE(rel->r_info)); |
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index c039674fe99e..b2e7f9c63bc5 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c | |||
| @@ -211,7 +211,7 @@ static struct resource ide_resources[] = { | |||
| 211 | }, | 211 | }, |
| 212 | }; | 212 | }; |
| 213 | 213 | ||
| 214 | static u64 ide_dma_mask = DMA_32BIT_MASK; | 214 | static u64 ide_dma_mask = DMA_BIT_MASK(32); |
| 215 | 215 | ||
| 216 | static struct platform_device ide_dev = { | 216 | static struct platform_device ide_dev = { |
| 217 | .name = "palm_bk3710", | 217 | .name = "palm_bk3710", |
| @@ -220,7 +220,7 @@ static struct platform_device ide_dev = { | |||
| 220 | .num_resources = ARRAY_SIZE(ide_resources), | 220 | .num_resources = ARRAY_SIZE(ide_resources), |
| 221 | .dev = { | 221 | .dev = { |
| 222 | .dma_mask = &ide_dma_mask, | 222 | .dma_mask = &ide_dma_mask, |
| 223 | .coherent_dma_mask = DMA_32BIT_MASK, | 223 | .coherent_dma_mask = DMA_BIT_MASK(32), |
| 224 | }, | 224 | }, |
| 225 | }; | 225 | }; |
| 226 | 226 | ||
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c index 252310234903..7bb8e778e4b6 100644 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c | |||
| @@ -714,7 +714,7 @@ static int __init npe_init_module(void) | |||
| 714 | } | 714 | } |
| 715 | 715 | ||
| 716 | if (!found) | 716 | if (!found) |
| 717 | return -ENOSYS; | 717 | return -ENODEV; |
| 718 | return 0; | 718 | return 0; |
| 719 | } | 719 | } |
| 720 | 720 | ||
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 3e66d9099eab..17d3fbd368a3 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -289,12 +289,12 @@ config MACH_LITTLETON | |||
| 289 | config MACH_TAVOREVB | 289 | config MACH_TAVOREVB |
| 290 | bool "PXA930 Evaluation Board (aka TavorEVB)" | 290 | bool "PXA930 Evaluation Board (aka TavorEVB)" |
| 291 | select PXA3xx | 291 | select PXA3xx |
| 292 | select PXA930 | 292 | select CPU_PXA930 |
| 293 | 293 | ||
| 294 | config MACH_SAAR | 294 | config MACH_SAAR |
| 295 | bool "PXA930 Handheld Platform (aka SAAR)" | 295 | bool "PXA930 Handheld Platform (aka SAAR)" |
| 296 | select PXA3xx | 296 | select PXA3xx |
| 297 | select PXA930 | 297 | select CPU_PXA930 |
| 298 | 298 | ||
| 299 | config MACH_ARMCORE | 299 | config MACH_ARMCORE |
| 300 | bool "CompuLab CM-X255/CM-X270 modules" | 300 | bool "CompuLab CM-X255/CM-X270 modules" |
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c index c9cfe40e21f6..a7417c479ffe 100644 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | 22 | ||
| 23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 24 | #include <asm/cacheflush.h> | ||
| 24 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
| 25 | 26 | ||
| 26 | #include <mach/regs-power.h> | 27 | #include <mach/regs-power.h> |
| @@ -39,6 +40,8 @@ static void s3c2412_cpu_suspend(void) | |||
| 39 | { | 40 | { |
| 40 | unsigned long tmp; | 41 | unsigned long tmp; |
| 41 | 42 | ||
| 43 | flush_cache_all(); | ||
| 44 | |||
| 42 | /* set our standby method to sleep */ | 45 | /* set our standby method to sleep */ |
| 43 | 46 | ||
| 44 | tmp = __raw_readl(S3C2412_PWRCFG); | 47 | tmp = __raw_readl(S3C2412_PWRCFG); |
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index baf1c0f1ea5a..8199972ed5bd 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h | |||
| @@ -40,6 +40,8 @@ | |||
| 40 | 40 | ||
| 41 | #define S3C64XX_PA_FB (0x77100000) | 41 | #define S3C64XX_PA_FB (0x77100000) |
| 42 | #define S3C64XX_PA_SYSCON (0x7E00F000) | 42 | #define S3C64XX_PA_SYSCON (0x7E00F000) |
| 43 | #define S3C64XX_PA_IIS0 (0x7F002000) | ||
| 44 | #define S3C64XX_PA_IIS1 (0x7F003000) | ||
| 43 | #define S3C64XX_PA_TIMER (0x7F006000) | 45 | #define S3C64XX_PA_TIMER (0x7F006000) |
| 44 | #define S3C64XX_PA_IIC0 (0x7F004000) | 46 | #define S3C64XX_PA_IIC0 (0x7F004000) |
| 45 | #define S3C64XX_PA_IIC1 (0x7F00F000) | 47 | #define S3C64XX_PA_IIC1 (0x7F00F000) |
diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c index e364a5ed10f1..77646436c00e 100644 --- a/arch/arm/plat-mxc/dma-mx1-mx2.c +++ b/arch/arm/plat-mxc/dma-mx1-mx2.c | |||
| @@ -693,12 +693,15 @@ int imx_dma_request(int channel, const char *name) | |||
| 693 | local_irq_restore(flags); | 693 | local_irq_restore(flags); |
| 694 | return -EBUSY; | 694 | return -EBUSY; |
| 695 | } | 695 | } |
| 696 | memset(imxdma, 0, sizeof(imxdma)); | ||
| 697 | imxdma->name = name; | ||
| 698 | local_irq_restore(flags); /* request_irq() can block */ | ||
| 696 | 699 | ||
| 697 | #ifdef CONFIG_ARCH_MX2 | 700 | #ifdef CONFIG_ARCH_MX2 |
| 698 | ret = request_irq(MXC_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA", | 701 | ret = request_irq(MXC_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA", |
| 699 | NULL); | 702 | NULL); |
| 700 | if (ret) { | 703 | if (ret) { |
| 701 | local_irq_restore(flags); | 704 | imxdma->name = NULL; |
| 702 | printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n", | 705 | printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n", |
| 703 | MXC_INT_DMACH0 + channel, channel); | 706 | MXC_INT_DMACH0 + channel, channel); |
| 704 | return ret; | 707 | return ret; |
| @@ -708,13 +711,6 @@ int imx_dma_request(int channel, const char *name) | |||
| 708 | imxdma->watchdog.data = channel; | 711 | imxdma->watchdog.data = channel; |
| 709 | #endif | 712 | #endif |
| 710 | 713 | ||
| 711 | imxdma->name = name; | ||
| 712 | imxdma->irq_handler = NULL; | ||
| 713 | imxdma->err_handler = NULL; | ||
| 714 | imxdma->data = NULL; | ||
| 715 | imxdma->sg = NULL; | ||
| 716 | |||
| 717 | local_irq_restore(flags); | ||
| 718 | return ret; | 714 | return ret; |
| 719 | } | 715 | } |
| 720 | EXPORT_SYMBOL(imx_dma_request); | 716 | EXPORT_SYMBOL(imx_dma_request); |
| @@ -737,10 +733,7 @@ void imx_dma_free(int channel) | |||
| 737 | 733 | ||
| 738 | local_irq_save(flags); | 734 | local_irq_save(flags); |
| 739 | /* Disable interrupts */ | 735 | /* Disable interrupts */ |
| 740 | __raw_writel(__raw_readl(DMA_BASE + DMA_DIMR) | (1 << channel), | 736 | imx_dma_disable(channel); |
| 741 | DMA_BASE + DMA_DIMR); | ||
| 742 | __raw_writel(__raw_readl(DMA_BASE + DMA_CCR(channel)) & ~CCR_CEN, | ||
| 743 | DMA_BASE + DMA_CCR(channel)); | ||
| 744 | imxdma->name = NULL; | 737 | imxdma->name = NULL; |
| 745 | 738 | ||
| 746 | #ifdef CONFIG_ARCH_MX2 | 739 | #ifdef CONFIG_ARCH_MX2 |
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c index c6483bad8a26..89e95798cc3b 100644 --- a/arch/arm/plat-mxc/gpio.c +++ b/arch/arm/plat-mxc/gpio.c | |||
| @@ -124,7 +124,7 @@ static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) | |||
| 124 | 124 | ||
| 125 | irq_stat = __raw_readl(port->base + GPIO_ISR) & | 125 | irq_stat = __raw_readl(port->base + GPIO_ISR) & |
| 126 | __raw_readl(port->base + GPIO_IMR); | 126 | __raw_readl(port->base + GPIO_IMR); |
| 127 | BUG_ON(!irq_stat); | 127 | |
| 128 | mxc_gpio_irq_handler(port, irq_stat); | 128 | mxc_gpio_irq_handler(port, irq_stat); |
| 129 | } | 129 | } |
| 130 | #endif | 130 | #endif |
diff --git a/arch/arm/plat-mxc/include/mach/board-mx27ads.h b/arch/arm/plat-mxc/include/mach/board-mx27ads.h index 1cac9d1135cd..d42f4e6116f8 100644 --- a/arch/arm/plat-mxc/include/mach/board-mx27ads.h +++ b/arch/arm/plat-mxc/include/mach/board-mx27ads.h | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | /* | 47 | /* |
| 48 | * Base address of PBC controller, CS4 | 48 | * Base address of PBC controller, CS4 |
| 49 | */ | 49 | */ |
| 50 | #define PBC_BASE_ADDRESS 0xEB000000 | 50 | #define PBC_BASE_ADDRESS 0xf4300000 |
| 51 | #define PBC_REG_ADDR(offset) (void __force __iomem *) \ | 51 | #define PBC_REG_ADDR(offset) (void __force __iomem *) \ |
| 52 | (PBC_BASE_ADDRESS + (offset)) | 52 | (PBC_BASE_ADDRESS + (offset)) |
| 53 | 53 | ||
diff --git a/arch/cris/Makefile b/arch/cris/Makefile index 3662cfb7b61d..71e17d3eeddb 100644 --- a/arch/cris/Makefile +++ b/arch/cris/Makefile | |||
| @@ -70,7 +70,7 @@ SRC_ARCH = $(srctree)/arch/cris | |||
| 70 | # cris object files path | 70 | # cris object files path |
| 71 | OBJ_ARCH = $(objtree)/arch/cris | 71 | OBJ_ARCH = $(objtree)/arch/cris |
| 72 | 72 | ||
| 73 | boot := arch/cris/$(SARCH)/boot | 73 | boot := arch/cris/boot |
| 74 | MACHINE := arch/cris/$(SARCH) | 74 | MACHINE := arch/cris/$(SARCH) |
| 75 | 75 | ||
| 76 | all: zImage | 76 | all: zImage |
| @@ -81,15 +81,15 @@ zImage Image: vmlinux | |||
| 81 | archprepare: | 81 | archprepare: |
| 82 | 82 | ||
| 83 | archclean: | 83 | archclean: |
| 84 | $(Q)if [ -e arch/cris/$(SARCH)/boot ]; then \ | 84 | $(Q)if [ -e arch/cris/boot ]; then \ |
| 85 | $(MAKE) $(clean)=arch/cris/$(SARCH)/boot; \ | 85 | $(MAKE) $(clean)=arch/cris/boot; \ |
| 86 | fi | 86 | fi |
| 87 | 87 | ||
| 88 | CLEAN_FILES += \ | 88 | CLEAN_FILES += \ |
| 89 | $(MACHINE)/boot/zImage \ | 89 | $(boot)/zImage \ |
| 90 | $(MACHINE)/boot/compressed/decompress.bin \ | 90 | $(boot)/compressed/decompress.bin \ |
| 91 | $(MACHINE)/boot/compressed/piggy.gz \ | 91 | $(boot)/compressed/piggy.gz \ |
| 92 | $(MACHINE)/boot/rescue/rescue.bin | 92 | $(boot)/rescue/rescue.bin |
| 93 | 93 | ||
| 94 | 94 | ||
| 95 | # MRPROPER_FILES += | 95 | # MRPROPER_FILES += |
diff --git a/arch/cris/arch-v10/boot/Makefile b/arch/cris/arch-v10/boot/Makefile deleted file mode 100644 index 217203014433..000000000000 --- a/arch/cris/arch-v10/boot/Makefile +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | # | ||
| 2 | # arch/cris/arch-v10/boot/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | OBJCOPYFLAGS = -O binary --remove-section=.bss | ||
| 6 | |||
| 7 | subdir- := compressed rescue | ||
| 8 | targets := Image | ||
| 9 | |||
| 10 | $(obj)/Image: vmlinux FORCE | ||
| 11 | $(call if_changed,objcopy) | ||
| 12 | @echo ' Kernel: $@ is ready' | ||
| 13 | |||
| 14 | $(obj)/compressed/vmlinux: $(obj)/Image FORCE | ||
| 15 | $(Q)$(MAKE) $(build)=$(obj)/compressed $@ | ||
| 16 | $(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin | ||
| 17 | |||
| 18 | $(obj)/zImage: $(obj)/compressed/vmlinux | ||
| 19 | @cp $< $@ | ||
| 20 | @echo ' Kernel: $@ is ready' | ||
diff --git a/arch/cris/arch-v10/boot/compressed/README b/arch/cris/arch-v10/boot/compressed/README deleted file mode 100644 index 48b3db9924b9..000000000000 --- a/arch/cris/arch-v10/boot/compressed/README +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | Creation of the self-extracting compressed kernel image (vmlinuz) | ||
| 2 | ----------------------------------------------------------------- | ||
| 3 | $Id: README,v 1.1 2001/12/17 13:59:27 bjornw Exp $ | ||
| 4 | |||
| 5 | This can be slightly confusing because it's a process with many steps. | ||
| 6 | |||
| 7 | The kernel object built by the arch/etrax100/Makefile, vmlinux, is split | ||
| 8 | by that makefile into text and data binary files, vmlinux.text and | ||
| 9 | vmlinux.data. | ||
| 10 | |||
| 11 | Those files together with a ROM filesystem can be catted together and | ||
| 12 | burned into a flash or executed directly at the DRAM origin. | ||
| 13 | |||
| 14 | They can also be catted together and compressed with gzip, which is what | ||
| 15 | happens in this makefile. Together they make up piggy.img. | ||
| 16 | |||
| 17 | The decompressor is built into the file decompress.o. It is turned into | ||
| 18 | the binary file decompress.bin, which is catted together with piggy.img | ||
| 19 | into the file vmlinuz. It can be executed in an arbitrary place in flash. | ||
| 20 | |||
| 21 | Be careful - it assumes some things about free locations in DRAM. It | ||
| 22 | assumes the DRAM starts at 0x40000000 and that it is at least 8 MB, | ||
| 23 | so it puts its code at 0x40700000, and initial stack at 0x40800000. | ||
| 24 | |||
| 25 | -Bjorn | ||
diff --git a/arch/cris/arch-v10/boot/compressed/misc.c b/arch/cris/arch-v10/boot/compressed/misc.c deleted file mode 100644 index a4db1507d3b1..000000000000 --- a/arch/cris/arch-v10/boot/compressed/misc.c +++ /dev/null | |||
| @@ -1,246 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * misc.c | ||
| 3 | * | ||
| 4 | * This is a collection of several routines from gzip-1.0.3 | ||
| 5 | * adapted for Linux. | ||
| 6 | * | ||
| 7 | * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 | ||
| 8 | * puts by Nick Holloway 1993, better puts by Martin Mares 1995 | ||
| 9 | * adaptation for Linux/CRIS Axis Communications AB, 1999 | ||
| 10 | * | ||
| 11 | */ | ||
| 12 | |||
| 13 | /* where the piggybacked kernel image expects itself to live. | ||
| 14 | * it is the same address we use when we network load an uncompressed | ||
| 15 | * image into DRAM, and it is the address the kernel is linked to live | ||
| 16 | * at by vmlinux.lds.S | ||
| 17 | */ | ||
| 18 | |||
| 19 | #define KERNEL_LOAD_ADR 0x40004000 | ||
| 20 | |||
| 21 | |||
| 22 | #include <linux/types.h> | ||
| 23 | #include <arch/svinto.h> | ||
| 24 | |||
| 25 | /* | ||
| 26 | * gzip declarations | ||
| 27 | */ | ||
| 28 | |||
| 29 | #define OF(args) args | ||
| 30 | #define STATIC static | ||
| 31 | |||
| 32 | void *memset(void *s, int c, size_t n); | ||
| 33 | void *memcpy(void *__dest, __const void *__src, size_t __n); | ||
| 34 | |||
| 35 | #define memzero(s, n) memset((s), 0, (n)) | ||
| 36 | |||
| 37 | typedef unsigned char uch; | ||
| 38 | typedef unsigned short ush; | ||
| 39 | typedef unsigned long ulg; | ||
| 40 | |||
| 41 | #define WSIZE 0x8000 /* Window size must be at least 32k, */ | ||
| 42 | /* and a power of two */ | ||
| 43 | |||
| 44 | static uch *inbuf; /* input buffer */ | ||
| 45 | static uch window[WSIZE]; /* Sliding window buffer */ | ||
| 46 | |||
| 47 | unsigned inptr = 0; /* index of next byte to be processed in inbuf | ||
| 48 | * After decompression it will contain the | ||
| 49 | * compressed size, and head.S will read it. | ||
| 50 | */ | ||
| 51 | |||
| 52 | static unsigned outcnt = 0; /* bytes in output buffer */ | ||
| 53 | |||
| 54 | /* gzip flag byte */ | ||
| 55 | #define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ | ||
| 56 | #define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ | ||
| 57 | #define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ | ||
| 58 | #define ORIG_NAME 0x08 /* bit 3 set: original file name present */ | ||
| 59 | #define COMMENT 0x10 /* bit 4 set: file comment present */ | ||
| 60 | #define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ | ||
| 61 | #define RESERVED 0xC0 /* bit 6,7: reserved */ | ||
| 62 | |||
| 63 | #define get_byte() (inbuf[inptr++]) | ||
| 64 | |||
| 65 | /* Diagnostic functions */ | ||
| 66 | #ifdef DEBUG | ||
| 67 | # define Assert(cond, msg) do { \ | ||
| 68 | if (!(cond)) \ | ||
| 69 | error(msg); \ | ||
| 70 | } while (0) | ||
| 71 | # define Trace(x) fprintf x | ||
| 72 | # define Tracev(x) do { \ | ||
| 73 | if (verbose) \ | ||
| 74 | fprintf x; \ | ||
| 75 | } while (0) | ||
| 76 | # define Tracevv(x) do { \ | ||
| 77 | if (verbose > 1) \ | ||
| 78 | fprintf x; \ | ||
| 79 | } while (0) | ||
| 80 | # define Tracec(c, x) do { \ | ||
| 81 | if (verbose && (c)) \ | ||
| 82 | fprintf x; \ | ||
| 83 | } while (0) | ||
| 84 | # define Tracecv(c, x) do { \ | ||
| 85 | if (verbose > 1 && (c)) \ | ||
| 86 | fprintf x; \ | ||
| 87 | } while (0) | ||
| 88 | #else | ||
| 89 | # define Assert(cond, msg) | ||
| 90 | # define Trace(x) | ||
| 91 | # define Tracev(x) | ||
| 92 | # define Tracevv(x) | ||
| 93 | # define Tracec(c, x) | ||
| 94 | # define Tracecv(c, x) | ||
| 95 | #endif | ||
| 96 | |||
| 97 | static void flush_window(void); | ||
| 98 | static void error(char *m); | ||
| 99 | |||
| 100 | extern char *input_data; /* lives in head.S */ | ||
| 101 | |||
| 102 | static long bytes_out = 0; | ||
| 103 | static uch *output_data; | ||
| 104 | static unsigned long output_ptr = 0; | ||
| 105 | static void puts(const char *); | ||
| 106 | |||
| 107 | /* the "heap" is put directly after the BSS ends, at end */ | ||
| 108 | |||
| 109 | extern int _end; | ||
| 110 | static long free_mem_ptr = (long)&_end; | ||
| 111 | static long free_mem_end_ptr; | ||
| 112 | |||
| 113 | #include "../../../../../lib/inflate.c" | ||
| 114 | |||
| 115 | /* decompressor info and error messages to serial console */ | ||
| 116 | |||
| 117 | static void | ||
| 118 | puts(const char *s) | ||
| 119 | { | ||
| 120 | #ifndef CONFIG_ETRAX_DEBUG_PORT_NULL | ||
| 121 | while (*s) { | ||
| 122 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 | ||
| 123 | while (!(*R_SERIAL0_STATUS & (1 << 5))) ; | ||
| 124 | *R_SERIAL0_TR_DATA = *s++; | ||
| 125 | #endif | ||
| 126 | #ifdef CONFIG_ETRAX_DEBUG_PORT1 | ||
| 127 | while (!(*R_SERIAL1_STATUS & (1 << 5))) ; | ||
| 128 | *R_SERIAL1_TR_DATA = *s++; | ||
| 129 | #endif | ||
| 130 | #ifdef CONFIG_ETRAX_DEBUG_PORT2 | ||
| 131 | while (!(*R_SERIAL2_STATUS & (1 << 5))) ; | ||
| 132 | *R_SERIAL2_TR_DATA = *s++; | ||
| 133 | #endif | ||
| 134 | #ifdef CONFIG_ETRAX_DEBUG_PORT3 | ||
| 135 | while (!(*R_SERIAL3_STATUS & (1 << 5))) ; | ||
| 136 | *R_SERIAL3_TR_DATA = *s++; | ||
| 137 | #endif | ||
| 138 | } | ||
| 139 | #endif | ||
| 140 | } | ||
| 141 | |||
| 142 | void *memset(void *s, int c, size_t n) | ||
| 143 | { | ||
| 144 | int i; | ||
| 145 | char *ss = (char *)s; | ||
| 146 | |||
| 147 | for (i = 0; i < n; i++) | ||
| 148 | ss[i] = c; | ||
| 149 | |||
| 150 | return s; | ||
| 151 | } | ||
| 152 | |||
| 153 | void *memcpy(void *__dest, __const void *__src, size_t __n) | ||
| 154 | { | ||
| 155 | int i; | ||
| 156 | char *d = (char *)__dest, *s = (char *)__src; | ||
| 157 | |||
| 158 | for (i = 0; i < __n; i++) | ||
| 159 | d[i] = s[i]; | ||
| 160 | |||
| 161 | return __dest; | ||
| 162 | } | ||
| 163 | |||
| 164 | /* =========================================================================== | ||
| 165 | * Write the output window window[0..outcnt-1] and update crc and bytes_out. | ||
| 166 | * (Used for the decompressed data only.) | ||
| 167 | */ | ||
| 168 | |||
| 169 | static void flush_window(void) | ||
| 170 | { | ||
| 171 | ulg c = crc; /* temporary variable */ | ||
| 172 | unsigned n; | ||
| 173 | uch *in, *out, ch; | ||
| 174 | |||
| 175 | in = window; | ||
| 176 | out = &output_data[output_ptr]; | ||
| 177 | for (n = 0; n < outcnt; n++) { | ||
| 178 | ch = *out = *in; | ||
| 179 | out++; | ||
| 180 | in++; | ||
| 181 | c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); | ||
| 182 | } | ||
| 183 | crc = c; | ||
| 184 | bytes_out += (ulg)outcnt; | ||
| 185 | output_ptr += (ulg)outcnt; | ||
| 186 | outcnt = 0; | ||
| 187 | } | ||
| 188 | |||
| 189 | static void error(char *x) | ||
| 190 | { | ||
| 191 | puts("\n\n"); | ||
| 192 | puts(x); | ||
| 193 | puts("\n\n -- System halted\n"); | ||
| 194 | |||
| 195 | while (1); /* Halt */ | ||
| 196 | } | ||
| 197 | |||
| 198 | void setup_normal_output_buffer(void) | ||
| 199 | { | ||
| 200 | output_data = (char *)KERNEL_LOAD_ADR; | ||
| 201 | } | ||
| 202 | |||
| 203 | void decompress_kernel(void) | ||
| 204 | { | ||
| 205 | char revision; | ||
| 206 | |||
| 207 | /* input_data is set in head.S */ | ||
| 208 | inbuf = input_data; | ||
| 209 | |||
| 210 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 | ||
| 211 | *R_SERIAL0_XOFF = 0; | ||
| 212 | *R_SERIAL0_BAUD = 0x99; | ||
| 213 | *R_SERIAL0_TR_CTRL = 0x40; | ||
| 214 | #endif | ||
| 215 | #ifdef CONFIG_ETRAX_DEBUG_PORT1 | ||
| 216 | *R_SERIAL1_XOFF = 0; | ||
| 217 | *R_SERIAL1_BAUD = 0x99; | ||
| 218 | *R_SERIAL1_TR_CTRL = 0x40; | ||
| 219 | #endif | ||
| 220 | #ifdef CONFIG_ETRAX_DEBUG_PORT2 | ||
| 221 | *R_GEN_CONFIG = 0x08; | ||
| 222 | *R_SERIAL2_XOFF = 0; | ||
| 223 | *R_SERIAL2_BAUD = 0x99; | ||
| 224 | *R_SERIAL2_TR_CTRL = 0x40; | ||
| 225 | #endif | ||
| 226 | #ifdef CONFIG_ETRAX_DEBUG_PORT3 | ||
| 227 | *R_GEN_CONFIG = 0x100; | ||
| 228 | *R_SERIAL3_XOFF = 0; | ||
| 229 | *R_SERIAL3_BAUD = 0x99; | ||
| 230 | *R_SERIAL3_TR_CTRL = 0x40; | ||
| 231 | #endif | ||
| 232 | |||
| 233 | setup_normal_output_buffer(); | ||
| 234 | |||
| 235 | makecrc(); | ||
| 236 | |||
| 237 | __asm__ volatile ("move $vr,%0" : "=rm" (revision)); | ||
| 238 | if (revision < 10) { | ||
| 239 | puts("You need an ETRAX 100LX to run linux 2.6\n"); | ||
| 240 | while (1); | ||
| 241 | } | ||
| 242 | |||
| 243 | puts("Uncompressing Linux...\n"); | ||
| 244 | gunzip(); | ||
| 245 | puts("Done. Now booting the kernel.\n"); | ||
| 246 | } | ||
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index 72f5cd319b97..2c18d08cd913 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S | |||
| @@ -536,10 +536,10 @@ multiple_interrupt: | |||
| 536 | movem $r13, [$sp] | 536 | movem $r13, [$sp] |
| 537 | push $r10 ; push orig_r10 | 537 | push $r10 ; push orig_r10 |
| 538 | clear.d [$sp=$sp-4] ; frametype == 0, normal frame | 538 | clear.d [$sp=$sp-4] ; frametype == 0, normal frame |
| 539 | 539 | ||
| 540 | move.d $sp, $r10 | 540 | move.d $sp, $r10 |
| 541 | jsr do_multiple_IRQ | 541 | jsr do_multiple_IRQ |
| 542 | 542 | ||
| 543 | jump ret_from_intr | 543 | jump ret_from_intr |
| 544 | 544 | ||
| 545 | do_sigtrap: | 545 | do_sigtrap: |
| @@ -585,7 +585,7 @@ _ugdb_handle_breakpoint: | |||
| 585 | pop $r0 ; Restore r0. | 585 | pop $r0 ; Restore r0. |
| 586 | ba do_sigtrap ; SIGTRAP the offending process. | 586 | ba do_sigtrap ; SIGTRAP the offending process. |
| 587 | pop $dccr ; Restore dccr in delay slot. | 587 | pop $dccr ; Restore dccr in delay slot. |
| 588 | 588 | ||
| 589 | .global kernel_execve | 589 | .global kernel_execve |
| 590 | kernel_execve: | 590 | kernel_execve: |
| 591 | move.d __NR_execve, $r9 | 591 | move.d __NR_execve, $r9 |
| @@ -929,6 +929,14 @@ sys_call_table: | |||
| 929 | .long sys_fallocate | 929 | .long sys_fallocate |
| 930 | .long sys_timerfd_settime /* 325 */ | 930 | .long sys_timerfd_settime /* 325 */ |
| 931 | .long sys_timerfd_gettime | 931 | .long sys_timerfd_gettime |
| 932 | .long sys_signalfd4 | ||
| 933 | .long sys_eventfd2 | ||
| 934 | .long sys_epoll_create1 | ||
| 935 | .long sys_dup3 /* 330 */ | ||
| 936 | .long sys_pipe2 | ||
| 937 | .long sys_inotify_init1 | ||
| 938 | .long sys_preadv | ||
| 939 | .long sys_pwritev | ||
| 932 | 940 | ||
| 933 | /* | 941 | /* |
| 934 | * NOTE!! This doesn't have to be exact - we just have | 942 | * NOTE!! This doesn't have to be exact - we just have |
diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile deleted file mode 100644 index e176b8b69d92..000000000000 --- a/arch/cris/arch-v32/boot/compressed/Makefile +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | # | ||
| 2 | # arch/cris/arch-v32/boot/compressed/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | asflags-y += -I$(srctree)/include/asm/mach/ -I$(srctree)/include/asm/arch | ||
| 6 | ccflags-y += -O2 -I$(srctree)/include/asm/mach/ -I$(srctree)/include/asm/arch | ||
| 7 | ldflags-y += -T$(srctree)/$(src)/decompress.lds | ||
| 8 | OBJECTS = $(obj)/head.o $(obj)/misc.o | ||
| 9 | OBJCOPYFLAGS = -O binary --remove-section=.bss | ||
| 10 | |||
| 11 | quiet_cmd_image = BUILD $@ | ||
| 12 | cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@ | ||
| 13 | |||
| 14 | targets := vmlinux piggy.gz decompress.o decompress.bin | ||
| 15 | |||
| 16 | $(obj)/decompress.o: $(OBJECTS) FORCE | ||
| 17 | $(call if_changed,ld) | ||
| 18 | |||
| 19 | $(obj)/decompress.bin: $(obj)/decompress.o FORCE | ||
| 20 | $(call if_changed,objcopy) | ||
| 21 | |||
| 22 | $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE | ||
| 23 | $(call if_changed,image) | ||
| 24 | |||
| 25 | $(obj)/piggy.gz: $(obj)/../Image FORCE | ||
| 26 | $(call if_changed,gzip) | ||
diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile deleted file mode 100644 index 566aac663a38..000000000000 --- a/arch/cris/arch-v32/boot/rescue/Makefile +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Makefile for rescue (bootstrap) code | ||
| 3 | # | ||
| 4 | |||
| 5 | CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE) | ||
| 6 | ccflags-y += -O2 -I $(srctree)/include/asm/arch/mach/ \ | ||
| 7 | -I $(srctree)/include/asm/arch | ||
| 8 | asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch | ||
| 9 | LD = gcc-cris -mlinux -march=v32 -nostdlib | ||
| 10 | ldflags-y += -T $(srctree)/$(src)/rescue.lds | ||
| 11 | LDPOSTFLAGS = -lgcc | ||
| 12 | OBJCOPYFLAGS = -O binary --remove-section=.bss | ||
| 13 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o | ||
| 14 | OBJECT := $(obj)/head.o | ||
| 15 | |||
| 16 | targets := rescue.o rescue.bin | ||
| 17 | |||
| 18 | quiet_cmd_ldlibgcc = LD $@ | ||
| 19 | cmd_ldlibgcc = $(LD) $(LDFLAGS) $(filter-out FORCE,$^) $(LDPOSTFLAGS) -o $@ | ||
| 20 | |||
| 21 | $(obj)/rescue.o: $(OBJECTS) FORCE | ||
| 22 | $(call if_changed,ldlibgcc) | ||
| 23 | |||
| 24 | $(obj)/rescue.bin: $(obj)/rescue.o FORCE | ||
| 25 | $(call if_changed,objcopy) | ||
| 26 | cp -p $(obj)/rescue.bin $(objtree) | ||
diff --git a/arch/cris/arch-v32/drivers/mach-a3/gpio.c b/arch/cris/arch-v32/drivers/mach-a3/gpio.c index 7a87bc0ae2e8..97357cfd17bb 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/gpio.c +++ b/arch/cris/arch-v32/drivers/mach-a3/gpio.c | |||
| @@ -681,7 +681,7 @@ static int virtual_gpio_ioctl(struct file *file, unsigned int cmd, | |||
| 681 | shadow |= ~readl(dir_oe[priv->minor]) | | 681 | shadow |= ~readl(dir_oe[priv->minor]) | |
| 682 | (arg & changeable_bits[priv->minor]); | 682 | (arg & changeable_bits[priv->minor]); |
| 683 | i2c_write(VIRT_I2C_ADDR, (void *)&shadow, sizeof(shadow)); | 683 | i2c_write(VIRT_I2C_ADDR, (void *)&shadow, sizeof(shadow)); |
| 684 | spin_lock_irqrestore(&gpio_lock, flags); | 684 | spin_unlock_irqrestore(&gpio_lock, flags); |
| 685 | break; | 685 | break; |
| 686 | case IO_CLRBITS: | 686 | case IO_CLRBITS: |
| 687 | spin_lock_irqsave(&gpio_lock, flags); | 687 | spin_lock_irqsave(&gpio_lock, flags); |
| @@ -690,7 +690,7 @@ static int virtual_gpio_ioctl(struct file *file, unsigned int cmd, | |||
| 690 | shadow |= ~readl(dir_oe[priv->minor]) & | 690 | shadow |= ~readl(dir_oe[priv->minor]) & |
| 691 | ~(arg & changeable_bits[priv->minor]); | 691 | ~(arg & changeable_bits[priv->minor]); |
| 692 | i2c_write(VIRT_I2C_ADDR, (void *)&shadow, sizeof(shadow)); | 692 | i2c_write(VIRT_I2C_ADDR, (void *)&shadow, sizeof(shadow)); |
| 693 | spin_lock_irqrestore(&gpio_lock, flags); | 693 | spin_unlock_irqrestore(&gpio_lock, flags); |
| 694 | break; | 694 | break; |
| 695 | case IO_HIGHALARM: | 695 | case IO_HIGHALARM: |
| 696 | /* Set alarm when bits with 1 in arg go high. */ | 696 | /* Set alarm when bits with 1 in arg go high. */ |
diff --git a/arch/cris/arch-v32/kernel/Makefile b/arch/cris/arch-v32/kernel/Makefile index 993d987b0078..40358355d0cb 100644 --- a/arch/cris/arch-v32/kernel/Makefile +++ b/arch/cris/arch-v32/kernel/Makefile | |||
| @@ -9,8 +9,6 @@ obj-y := entry.o traps.o irq.o debugport.o \ | |||
| 9 | process.o ptrace.o setup.o signal.o traps.o time.o \ | 9 | process.o ptrace.o setup.o signal.o traps.o time.o \ |
| 10 | cache.o cacheflush.o | 10 | cache.o cacheflush.o |
| 11 | 11 | ||
| 12 | obj-$(CONFIG_ETRAXFS_SIM) += vcs_hook.o | ||
| 13 | |||
| 14 | obj-$(CONFIG_SMP) += smp.o | 12 | obj-$(CONFIG_SMP) += smp.o |
| 15 | obj-$(CONFIG_ETRAX_KGDB) += kgdb.o kgdb_asm.o | 13 | obj-$(CONFIG_ETRAX_KGDB) += kgdb.o kgdb_asm.o |
| 16 | obj-$(CONFIG_ETRAX_FAST_TIMER) += fasttimer.o | 14 | obj-$(CONFIG_ETRAX_FAST_TIMER) += fasttimer.o |
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S index 5e674c8f7c51..435b9671bd4b 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S | |||
| @@ -852,6 +852,14 @@ sys_call_table: | |||
| 852 | .long sys_fallocate | 852 | .long sys_fallocate |
| 853 | .long sys_timerfd_settime /* 325 */ | 853 | .long sys_timerfd_settime /* 325 */ |
| 854 | .long sys_timerfd_gettime | 854 | .long sys_timerfd_gettime |
| 855 | .long sys_signalfd4 | ||
| 856 | .long sys_eventfd2 | ||
| 857 | .long sys_epoll_create1 | ||
| 858 | .long sys_dup3 /* 330 */ | ||
| 859 | .long sys_pipe2 | ||
| 860 | .long sys_inotify_init1 | ||
| 861 | .long sys_preadv | ||
| 862 | .long sys_pwritev | ||
| 855 | 863 | ||
| 856 | /* | 864 | /* |
| 857 | * NOTE!! This doesn't have to be exact - we just have | 865 | * NOTE!! This doesn't have to be exact - we just have |
diff --git a/arch/cris/arch-v10/boot/.gitignore b/arch/cris/boot/.gitignore index 171a0853caf8..171a0853caf8 100644 --- a/arch/cris/arch-v10/boot/.gitignore +++ b/arch/cris/boot/.gitignore | |||
diff --git a/arch/cris/arch-v32/boot/Makefile b/arch/cris/boot/Makefile index 99896ad60b30..144f3afa0119 100644 --- a/arch/cris/arch-v32/boot/Makefile +++ b/arch/cris/boot/Makefile | |||
| @@ -1,8 +1,12 @@ | |||
| 1 | # | 1 | # |
| 2 | # arch/cris/arch-v32/boot/Makefile | 2 | # arch/cris/boot/Makefile |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | OBJCOPYFLAGS = -O binary -R .note -R .comment | 5 | objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment |
| 6 | objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss | ||
| 7 | |||
| 8 | OBJCOPYFLAGS = -O binary $(objcopyflags-y) | ||
| 9 | |||
| 6 | 10 | ||
| 7 | subdir- := compressed rescue | 11 | subdir- := compressed rescue |
| 8 | targets := Image | 12 | targets := Image |
diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/boot/compressed/Makefile index 6fe0ffaf3be6..8fe9338c1775 100644 --- a/arch/cris/arch-v10/boot/compressed/Makefile +++ b/arch/cris/boot/compressed/Makefile | |||
| @@ -1,11 +1,23 @@ | |||
| 1 | # | 1 | # |
| 2 | # arch/cris/arch-v10/boot/compressed/Makefile | 2 | # arch/cris/boot/compressed/Makefile |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | asflags-y += $(LINUXINCLUDE) | 5 | asflags-y += $(LINUXINCLUDE) |
| 6 | ccflags-y += -O2 $(LINUXINCLUDE) | 6 | ccflags-y += -O2 $(LINUXINCLUDE) |
| 7 | ldflags-y += -T $(srctree)/$(src)/decompress.lds | 7 | |
| 8 | OBJECTS = $(obj)/head.o $(obj)/misc.o | 8 | # asflags-$(CONFIG_ETRAX_ARCH_V32) += -I$(srctree)/include/asm/mach \ |
| 9 | # -I$(srctree)/include/asm/arch | ||
| 10 | # ccflags-$(CONFIG_ETRAX_ARCH_V32) += -O2 -I$(srctree)/include/asm/mach | ||
| 11 | # -I$(srctree)/include/asm/arch | ||
| 12 | |||
| 13 | arch-$(CONFIG_ETRAX_ARCH_V10) = v10 | ||
| 14 | arch-$(CONFIG_ETRAX_ARCH_V32) = v32 | ||
| 15 | |||
| 16 | ldflags-y += -T $(srctree)/$(src)/decompress_$(arch-y).lds | ||
| 17 | |||
| 18 | OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o | ||
| 19 | OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o | ||
| 20 | OBJECTS= $(OBJECTS-y) $(obj)/misc.o | ||
| 9 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 21 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 10 | 22 | ||
| 11 | quiet_cmd_image = BUILD $@ | 23 | quiet_cmd_image = BUILD $@ |
| @@ -24,4 +36,3 @@ $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE | |||
| 24 | 36 | ||
| 25 | $(obj)/piggy.gz: $(obj)/../Image FORCE | 37 | $(obj)/piggy.gz: $(obj)/../Image FORCE |
| 26 | $(call if_changed,gzip) | 38 | $(call if_changed,gzip) |
| 27 | |||
diff --git a/arch/cris/arch-v32/boot/compressed/README b/arch/cris/boot/compressed/README index 182c5d75784b..182c5d75784b 100644 --- a/arch/cris/arch-v32/boot/compressed/README +++ b/arch/cris/boot/compressed/README | |||
diff --git a/arch/cris/arch-v10/boot/compressed/decompress.lds b/arch/cris/boot/compressed/decompress_v10.lds index e80f4594d543..e80f4594d543 100644 --- a/arch/cris/arch-v10/boot/compressed/decompress.lds +++ b/arch/cris/boot/compressed/decompress_v10.lds | |||
diff --git a/arch/cris/arch-v32/boot/compressed/decompress.lds b/arch/cris/boot/compressed/decompress_v32.lds index 3c837feca3ac..3c837feca3ac 100644 --- a/arch/cris/arch-v32/boot/compressed/decompress.lds +++ b/arch/cris/boot/compressed/decompress_v32.lds | |||
diff --git a/arch/cris/arch-v10/boot/compressed/head.S b/arch/cris/boot/compressed/head_v10.S index 0bb4dcc29254..9edb8ade7e1f 100644 --- a/arch/cris/arch-v10/boot/compressed/head.S +++ b/arch/cris/boot/compressed/head_v10.S | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | beq dram_init_finished | 30 | beq dram_init_finished |
| 31 | nop | 31 | nop |
| 32 | 32 | ||
| 33 | #include "../../lib/dram_init.S" | 33 | #include "../../arch-v10/lib/dram_init.S" |
| 34 | 34 | ||
| 35 | dram_init_finished: | 35 | dram_init_finished: |
| 36 | 36 | ||
| @@ -123,4 +123,4 @@ _cmd_line_magic: | |||
| 123 | .dword 0 | 123 | .dword 0 |
| 124 | _cmd_line_addr: | 124 | _cmd_line_addr: |
| 125 | .dword 0 | 125 | .dword 0 |
| 126 | #include "../../lib/hw_settings.S" | 126 | #include "../../arch-v10/lib/hw_settings.S" |
diff --git a/arch/cris/arch-v32/boot/compressed/head.S b/arch/cris/boot/compressed/head_v32.S index a4a65c5c669e..f483005f3d48 100644 --- a/arch/cris/arch-v32/boot/compressed/head.S +++ b/arch/cris/boot/compressed/head_v32.S | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | .globl input_data | 17 | .globl input_data |
| 18 | 18 | ||
| 19 | .text | 19 | .text |
| 20 | _start: | 20 | start: |
| 21 | di | 21 | di |
| 22 | 22 | ||
| 23 | ;; Start clocks for used blocks. | 23 | ;; Start clocks for used blocks. |
| @@ -29,9 +29,9 @@ _start: | |||
| 29 | nop | 29 | nop |
| 30 | 30 | ||
| 31 | #if defined CONFIG_ETRAXFS | 31 | #if defined CONFIG_ETRAXFS |
| 32 | #include "../../mach-fs/dram_init.S" | 32 | #include "../../arch-v32/mach-fs/dram_init.S" |
| 33 | #elif defined CONFIG_CRIS_MACH_ARTPEC3 | 33 | #elif defined CONFIG_CRIS_MACH_ARTPEC3 |
| 34 | #include "../../mach-a3/dram_init.S" | 34 | #include "../../arch-v32/mach-a3/dram_init.S" |
| 35 | #else | 35 | #else |
| 36 | #error Only ETRAXFS and ARTPEC-3 supported! | 36 | #error Only ETRAXFS and ARTPEC-3 supported! |
| 37 | #endif | 37 | #endif |
| @@ -137,9 +137,9 @@ _boot_source: | |||
| 137 | .dword 0 | 137 | .dword 0 |
| 138 | 138 | ||
| 139 | #if defined CONFIG_ETRAXFS | 139 | #if defined CONFIG_ETRAXFS |
| 140 | #include "../../mach-fs/hw_settings.S" | 140 | #include "../../arch-v32/mach-fs/hw_settings.S" |
| 141 | #elif defined CONFIG_CRIS_MACH_ARTPEC3 | 141 | #elif defined CONFIG_CRIS_MACH_ARTPEC3 |
| 142 | #include "../../mach-a3/hw_settings.S" | 142 | #include "../../arch-v32/mach-a3/hw_settings.S" |
| 143 | #else | 143 | #else |
| 144 | #error Only ETRAXFS and ARTPEC-3 supported! | 144 | #error Only ETRAXFS and ARTPEC-3 supported! |
| 145 | #endif | 145 | #endif |
diff --git a/arch/cris/arch-v32/boot/compressed/misc.c b/arch/cris/boot/compressed/misc.c index 3595e16e82bc..47bc190ba6d4 100644 --- a/arch/cris/arch-v32/boot/compressed/misc.c +++ b/arch/cris/boot/compressed/misc.c | |||
| @@ -18,8 +18,9 @@ | |||
| 18 | 18 | ||
| 19 | #define KERNEL_LOAD_ADR 0x40004000 | 19 | #define KERNEL_LOAD_ADR 0x40004000 |
| 20 | 20 | ||
| 21 | |||
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | |||
| 23 | #ifdef CONFIG_ETRAX_ARCH_V32 | ||
| 23 | #include <hwregs/reg_rdwr.h> | 24 | #include <hwregs/reg_rdwr.h> |
| 24 | #include <hwregs/reg_map.h> | 25 | #include <hwregs/reg_map.h> |
| 25 | #include <hwregs/ser_defs.h> | 26 | #include <hwregs/ser_defs.h> |
| @@ -27,6 +28,9 @@ | |||
| 27 | #ifdef CONFIG_CRIS_MACH_ARTPEC3 | 28 | #ifdef CONFIG_CRIS_MACH_ARTPEC3 |
| 28 | #include <hwregs/clkgen_defs.h> | 29 | #include <hwregs/clkgen_defs.h> |
| 29 | #endif | 30 | #endif |
| 31 | #else | ||
| 32 | #include <arch/svinto.h> | ||
| 33 | #endif | ||
| 30 | 34 | ||
| 31 | /* | 35 | /* |
| 32 | * gzip declarations | 36 | * gzip declarations |
| @@ -35,12 +39,10 @@ | |||
| 35 | #define OF(args) args | 39 | #define OF(args) args |
| 36 | #define STATIC static | 40 | #define STATIC static |
| 37 | 41 | ||
| 38 | void* memset(void* s, int c, size_t n); | 42 | void *memset(void *s, int c, size_t n); |
| 39 | void* memcpy(void* __dest, __const void* __src, | 43 | void *memcpy(void *__dest, __const void *__src, size_t __n); |
| 40 | size_t __n); | ||
| 41 | |||
| 42 | #define memzero(s, n) memset ((s), 0, (n)) | ||
| 43 | 44 | ||
| 45 | #define memzero(s, n) memset((s), 0, (n)) | ||
| 44 | 46 | ||
| 45 | typedef unsigned char uch; | 47 | typedef unsigned char uch; |
| 46 | typedef unsigned short ush; | 48 | typedef unsigned short ush; |
| @@ -68,27 +70,43 @@ static unsigned outcnt = 0; /* bytes in output buffer */ | |||
| 68 | #define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ | 70 | #define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ |
| 69 | #define RESERVED 0xC0 /* bit 6,7: reserved */ | 71 | #define RESERVED 0xC0 /* bit 6,7: reserved */ |
| 70 | 72 | ||
| 71 | #define get_byte() inbuf[inptr++] | 73 | #define get_byte() (inbuf[inptr++]) |
| 72 | 74 | ||
| 73 | /* Diagnostic functions */ | 75 | /* Diagnostic functions */ |
| 74 | #ifdef DEBUG | 76 | #ifdef DEBUG |
| 75 | # define Assert(cond,msg) {if(!(cond)) error(msg);} | 77 | # define Assert(cond, msg) do { \ |
| 78 | if (!(cond)) \ | ||
| 79 | error(msg); \ | ||
| 80 | } while (0) | ||
| 76 | # define Trace(x) fprintf x | 81 | # define Trace(x) fprintf x |
| 77 | # define Tracev(x) {if (verbose) fprintf x ;} | 82 | # define Tracev(x) do { \ |
| 78 | # define Tracevv(x) {if (verbose>1) fprintf x ;} | 83 | if (verbose) \ |
| 79 | # define Tracec(c,x) {if (verbose && (c)) fprintf x ;} | 84 | fprintf x; \ |
| 80 | # define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;} | 85 | } while (0) |
| 86 | # define Tracevv(x) do { \ | ||
| 87 | if (verbose > 1) \ | ||
| 88 | fprintf x; \ | ||
| 89 | } while (0) | ||
| 90 | # define Tracec(c, x) do { \ | ||
| 91 | if (verbose && (c)) \ | ||
| 92 | fprintf x; \ | ||
| 93 | } while (0) | ||
| 94 | # define Tracecv(c, x) do { \ | ||
| 95 | if (verbose > 1 && (c)) \ | ||
| 96 | fprintf x; \ | ||
| 97 | } while (0) | ||
| 81 | #else | 98 | #else |
| 82 | # define Assert(cond,msg) | 99 | # define Assert(cond, msg) |
| 83 | # define Trace(x) | 100 | # define Trace(x) |
| 84 | # define Tracev(x) | 101 | # define Tracev(x) |
| 85 | # define Tracevv(x) | 102 | # define Tracevv(x) |
| 86 | # define Tracec(c,x) | 103 | # define Tracec(c, x) |
| 87 | # define Tracecv(c,x) | 104 | # define Tracecv(c, x) |
| 88 | #endif | 105 | #endif |
| 89 | 106 | ||
| 90 | static void flush_window(void); | 107 | static void flush_window(void); |
| 91 | static void error(char *m); | 108 | static void error(char *m); |
| 109 | static void puts(const char *); | ||
| 92 | 110 | ||
| 93 | extern char *input_data; /* lives in head.S */ | 111 | extern char *input_data; /* lives in head.S */ |
| 94 | 112 | ||
| @@ -96,10 +114,6 @@ static long bytes_out; | |||
| 96 | static uch *output_data; | 114 | static uch *output_data; |
| 97 | static unsigned long output_ptr; | 115 | static unsigned long output_ptr; |
| 98 | 116 | ||
| 99 | static void error(char *m); | ||
| 100 | |||
| 101 | static void puts(const char *); | ||
| 102 | |||
| 103 | /* the "heap" is put directly after the BSS ends, at end */ | 117 | /* the "heap" is put directly after the BSS ends, at end */ |
| 104 | 118 | ||
| 105 | extern int _end; | 119 | extern int _end; |
| @@ -110,8 +124,8 @@ static long free_mem_end_ptr; | |||
| 110 | 124 | ||
| 111 | /* decompressor info and error messages to serial console */ | 125 | /* decompressor info and error messages to serial console */ |
| 112 | 126 | ||
| 113 | static inline void | 127 | #ifdef CONFIG_ETRAX_ARCH_V32 |
| 114 | serout(const char *s, reg_scope_instances regi_ser) | 128 | static inline void serout(const char *s, reg_scope_instances regi_ser) |
| 115 | { | 129 | { |
| 116 | reg_ser_rs_stat_din rs; | 130 | reg_ser_rs_stat_din rs; |
| 117 | reg_ser_rw_dout dout = {.data = *s}; | 131 | reg_ser_rw_dout dout = {.data = *s}; |
| @@ -123,23 +137,47 @@ serout(const char *s, reg_scope_instances regi_ser) | |||
| 123 | 137 | ||
| 124 | REG_WR(ser, regi_ser, rw_dout, dout); | 138 | REG_WR(ser, regi_ser, rw_dout, dout); |
| 125 | } | 139 | } |
| 140 | #endif | ||
| 126 | 141 | ||
| 127 | static void | 142 | static void puts(const char *s) |
| 128 | puts(const char *s) | ||
| 129 | { | 143 | { |
| 130 | #ifndef CONFIG_ETRAX_DEBUG_PORT_NULL | 144 | #ifndef CONFIG_ETRAX_DEBUG_PORT_NULL |
| 131 | while (*s) { | 145 | while (*s) { |
| 132 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 | 146 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 |
| 147 | #ifdef CONFIG_ETRAX_ARCH_V32 | ||
| 133 | serout(s, regi_ser0); | 148 | serout(s, regi_ser0); |
| 149 | #else | ||
| 150 | while (!(*R_SERIAL0_STATUS & (1 << 5))) | ||
| 151 | ; | ||
| 152 | *R_SERIAL0_TR_DATA = *s++; | ||
| 153 | #endif | ||
| 134 | #endif | 154 | #endif |
| 135 | #ifdef CONFIG_ETRAX_DEBUG_PORT1 | 155 | #ifdef CONFIG_ETRAX_DEBUG_PORT1 |
| 156 | #ifdef CONFIG_ETRAX_ARCH_V32 | ||
| 136 | serout(s, regi_ser1); | 157 | serout(s, regi_ser1); |
| 158 | #else | ||
| 159 | while (!(*R_SERIAL1_STATUS & (1 << 5))) | ||
| 160 | ; | ||
| 161 | *R_SERIAL1_TR_DATA = *s++; | ||
| 162 | #endif | ||
| 137 | #endif | 163 | #endif |
| 138 | #ifdef CONFIG_ETRAX_DEBUG_PORT2 | 164 | #ifdef CONFIG_ETRAX_DEBUG_PORT2 |
| 165 | #ifdef CONFIG_ETRAX_ARCH_V32 | ||
| 139 | serout(s, regi_ser2); | 166 | serout(s, regi_ser2); |
| 167 | #else | ||
| 168 | while (!(*R_SERIAL2_STATUS & (1 << 5))) | ||
| 169 | ; | ||
| 170 | *R_SERIAL2_TR_DATA = *s++; | ||
| 171 | #endif | ||
| 140 | #endif | 172 | #endif |
| 141 | #ifdef CONFIG_ETRAX_DEBUG_PORT3 | 173 | #ifdef CONFIG_ETRAX_DEBUG_PORT3 |
| 174 | #ifdef CONFIG_ETRAX_ARCH_V32 | ||
| 142 | serout(s, regi_ser3); | 175 | serout(s, regi_ser3); |
| 176 | #else | ||
| 177 | while (!(*R_SERIAL3_STATUS & (1 << 5))) | ||
| 178 | ; | ||
| 179 | *R_SERIAL3_TR_DATA = *s++; | ||
| 180 | #endif | ||
| 143 | #endif | 181 | #endif |
| 144 | *s++; | 182 | *s++; |
| 145 | } | 183 | } |
| @@ -147,8 +185,7 @@ puts(const char *s) | |||
| 147 | #endif | 185 | #endif |
| 148 | } | 186 | } |
| 149 | 187 | ||
| 150 | void* | 188 | void *memset(void *s, int c, size_t n) |
| 151 | memset(void* s, int c, size_t n) | ||
| 152 | { | 189 | { |
| 153 | int i; | 190 | int i; |
| 154 | char *ss = (char*)s; | 191 | char *ss = (char*)s; |
| @@ -158,14 +195,13 @@ memset(void* s, int c, size_t n) | |||
| 158 | return s; | 195 | return s; |
| 159 | } | 196 | } |
| 160 | 197 | ||
| 161 | void* | 198 | void *memcpy(void *__dest, __const void *__src, size_t __n) |
| 162 | memcpy(void* __dest, __const void* __src, | ||
| 163 | size_t __n) | ||
| 164 | { | 199 | { |
| 165 | int i; | 200 | int i; |
| 166 | char *d = (char *)__dest, *s = (char *)__src; | 201 | char *d = (char *)__dest, *s = (char *)__src; |
| 167 | 202 | ||
| 168 | for (i=0;i<__n;i++) d[i] = s[i]; | 203 | for (i = 0; i < __n; i++) |
| 204 | d[i] = s[i]; | ||
| 169 | 205 | ||
| 170 | return __dest; | 206 | return __dest; |
| 171 | } | 207 | } |
| @@ -175,43 +211,42 @@ memcpy(void* __dest, __const void* __src, | |||
| 175 | * (Used for the decompressed data only.) | 211 | * (Used for the decompressed data only.) |
| 176 | */ | 212 | */ |
| 177 | 213 | ||
| 178 | static void | 214 | static void flush_window(void) |
| 179 | flush_window() | ||
| 180 | { | 215 | { |
| 181 | ulg c = crc; /* temporary variable */ | 216 | ulg c = crc; /* temporary variable */ |
| 182 | unsigned n; | 217 | unsigned n; |
| 183 | uch *in, *out, ch; | 218 | uch *in, *out, ch; |
| 184 | 219 | ||
| 185 | in = window; | 220 | in = window; |
| 186 | out = &output_data[output_ptr]; | 221 | out = &output_data[output_ptr]; |
| 187 | for (n = 0; n < outcnt; n++) { | 222 | for (n = 0; n < outcnt; n++) { |
| 188 | ch = *out++ = *in++; | 223 | ch = *out = *in; |
| 189 | c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); | 224 | out++; |
| 190 | } | 225 | in++; |
| 191 | crc = c; | 226 | c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); |
| 192 | bytes_out += (ulg)outcnt; | 227 | } |
| 193 | output_ptr += (ulg)outcnt; | 228 | crc = c; |
| 194 | outcnt = 0; | 229 | bytes_out += (ulg)outcnt; |
| 230 | output_ptr += (ulg)outcnt; | ||
| 231 | outcnt = 0; | ||
| 195 | } | 232 | } |
| 196 | 233 | ||
| 197 | static void | 234 | static void error(char *x) |
| 198 | error(char *x) | ||
| 199 | { | 235 | { |
| 200 | puts("\r\n\n"); | 236 | puts("\n\n"); |
| 201 | puts(x); | 237 | puts(x); |
| 202 | puts("\r\n\n -- System halted\n"); | 238 | puts("\n\n -- System halted\n"); |
| 203 | 239 | ||
| 204 | while(1); /* Halt */ | 240 | while(1); /* Halt */ |
| 205 | } | 241 | } |
| 206 | 242 | ||
| 207 | void | 243 | void setup_normal_output_buffer(void) |
| 208 | setup_normal_output_buffer(void) | ||
| 209 | { | 244 | { |
| 210 | output_data = (char *)KERNEL_LOAD_ADR; | 245 | output_data = (char *)KERNEL_LOAD_ADR; |
| 211 | } | 246 | } |
| 212 | 247 | ||
| 213 | static inline void | 248 | #ifdef CONFIG_ETRAX_ARCH_V32 |
| 214 | serial_setup(reg_scope_instances regi_ser) | 249 | static inline void serial_setup(reg_scope_instances regi_ser) |
| 215 | { | 250 | { |
| 216 | reg_ser_rw_xoff xoff; | 251 | reg_ser_rw_xoff xoff; |
| 217 | reg_ser_rw_tr_ctrl tr_ctrl; | 252 | reg_ser_rw_tr_ctrl tr_ctrl; |
| @@ -252,12 +287,16 @@ serial_setup(reg_scope_instances regi_ser) | |||
| 252 | REG_WR(ser, regi_ser, rw_rec_ctrl, rec_ctrl); | 287 | REG_WR(ser, regi_ser, rw_rec_ctrl, rec_ctrl); |
| 253 | REG_WR(ser, regi_ser, rw_rec_baud_div, rec_baud); | 288 | REG_WR(ser, regi_ser, rw_rec_baud_div, rec_baud); |
| 254 | } | 289 | } |
| 290 | #endif | ||
| 255 | 291 | ||
| 256 | void | 292 | void decompress_kernel(void) |
| 257 | decompress_kernel(void) | ||
| 258 | { | 293 | { |
| 259 | char revision; | 294 | char revision; |
| 295 | char compile_rev; | ||
| 260 | 296 | ||
| 297 | #ifdef CONFIG_ETRAX_ARCH_V32 | ||
| 298 | /* Need at least a CRISv32 to run. */ | ||
| 299 | compile_rev = 32; | ||
| 261 | #if defined(CONFIG_ETRAX_DEBUG_PORT1) || \ | 300 | #if defined(CONFIG_ETRAX_DEBUG_PORT1) || \ |
| 262 | defined(CONFIG_ETRAX_DEBUG_PORT2) || \ | 301 | defined(CONFIG_ETRAX_DEBUG_PORT2) || \ |
| 263 | defined(CONFIG_ETRAX_DEBUG_PORT3) | 302 | defined(CONFIG_ETRAX_DEBUG_PORT3) |
| @@ -277,6 +316,7 @@ decompress_kernel(void) | |||
| 277 | hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot); | 316 | hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot); |
| 278 | #endif | 317 | #endif |
| 279 | 318 | ||
| 319 | |||
| 280 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 | 320 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 |
| 281 | serial_setup(regi_ser0); | 321 | serial_setup(regi_ser0); |
| 282 | #endif | 322 | #endif |
| @@ -300,19 +340,52 @@ decompress_kernel(void) | |||
| 300 | 340 | ||
| 301 | /* input_data is set in head.S */ | 341 | /* input_data is set in head.S */ |
| 302 | inbuf = input_data; | 342 | inbuf = input_data; |
| 343 | #else /* CRISv10 */ | ||
| 344 | /* Need at least a crisv10 to run. */ | ||
| 345 | compile_rev = 10; | ||
| 346 | |||
| 347 | /* input_data is set in head.S */ | ||
| 348 | inbuf = input_data; | ||
| 349 | |||
| 350 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 | ||
| 351 | *R_SERIAL0_XOFF = 0; | ||
| 352 | *R_SERIAL0_BAUD = 0x99; | ||
| 353 | *R_SERIAL0_TR_CTRL = 0x40; | ||
| 354 | #endif | ||
| 355 | #ifdef CONFIG_ETRAX_DEBUG_PORT1 | ||
| 356 | *R_SERIAL1_XOFF = 0; | ||
| 357 | *R_SERIAL1_BAUD = 0x99; | ||
| 358 | *R_SERIAL1_TR_CTRL = 0x40; | ||
| 359 | #endif | ||
| 360 | #ifdef CONFIG_ETRAX_DEBUG_PORT2 | ||
| 361 | *R_GEN_CONFIG = 0x08; | ||
| 362 | *R_SERIAL2_XOFF = 0; | ||
| 363 | *R_SERIAL2_BAUD = 0x99; | ||
| 364 | *R_SERIAL2_TR_CTRL = 0x40; | ||
| 365 | #endif | ||
| 366 | #ifdef CONFIG_ETRAX_DEBUG_PORT3 | ||
| 367 | *R_GEN_CONFIG = 0x100; | ||
| 368 | *R_SERIAL3_XOFF = 0; | ||
| 369 | *R_SERIAL3_BAUD = 0x99; | ||
| 370 | *R_SERIAL3_TR_CTRL = 0x40; | ||
| 371 | #endif | ||
| 372 | #endif | ||
| 303 | 373 | ||
| 304 | setup_normal_output_buffer(); | 374 | setup_normal_output_buffer(); |
| 305 | 375 | ||
| 306 | makecrc(); | 376 | makecrc(); |
| 307 | 377 | ||
| 308 | __asm__ volatile ("move $vr,%0" : "=rm" (revision)); | 378 | __asm__ volatile ("move $vr,%0" : "=rm" (revision)); |
| 309 | if (revision < 32) | 379 | if (revision < compile_rev) { |
| 310 | { | 380 | #ifdef CONFIG_ETRAX_ARCH_V32 |
| 311 | puts("You need an ETRAX FS to run Linux 2.6/crisv32.\r\n"); | 381 | puts("You need an ETRAX FS to run Linux 2.6/crisv32\n"); |
| 382 | #else | ||
| 383 | puts("You need an ETRAX 100LX to run linux 2.6\n"); | ||
| 384 | #endif | ||
| 312 | while(1); | 385 | while(1); |
| 313 | } | 386 | } |
| 314 | 387 | ||
| 315 | puts("Uncompressing Linux...\r\n"); | 388 | puts("Uncompressing Linux...\n"); |
| 316 | gunzip(); | 389 | gunzip(); |
| 317 | puts("Done. Now booting the kernel.\r\n"); | 390 | puts("Done. Now booting the kernel\n"); |
| 318 | } | 391 | } |
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/boot/rescue/Makefile index 82ab59b968e5..52bd0bd1dd22 100644 --- a/arch/cris/arch-v10/boot/rescue/Makefile +++ b/arch/cris/boot/rescue/Makefile | |||
| @@ -2,16 +2,26 @@ | |||
| 2 | # Makefile for rescue (bootstrap) code | 2 | # Makefile for rescue (bootstrap) code |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | ccflags-y += -O2 $(LINUXINCLUDE) | 5 | # CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE) |
| 6 | # ccflags-$(CONFIG_ETRAX_ARCH_V32) += -I$(srctree)/include/asm/arch/mach/ \ | ||
| 7 | # -I$(srctree)/include/asm/arch | ||
| 8 | # asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch | ||
| 9 | # LD = gcc-cris -mlinux -march=v32 -nostdlib | ||
| 10 | |||
| 6 | asflags-y += $(LINUXINCLUDE) | 11 | asflags-y += $(LINUXINCLUDE) |
| 7 | ldflags-y += -T $(srctree)/$(src)/rescue.lds | 12 | ccflags-y += -O2 $(LINUXINCLUDE) |
| 13 | arch-$(CONFIG_ETRAX_ARCH_V10) = v10 | ||
| 14 | arch-$(CONFIG_ETRAX_ARCH_V32) = v32 | ||
| 15 | |||
| 16 | ldflags-y += -T $(srctree)/$(src)/rescue_$(arch-y).lds | ||
| 8 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 17 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 9 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o | 18 | obj-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o |
| 10 | OBJECT := $(obj)/head.o | 19 | obj-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o |
| 20 | OBJECTS := $(obj-y) | ||
| 11 | 21 | ||
| 12 | targets := rescue.o rescue.bin | 22 | targets := rescue.o rescue.bin |
| 13 | 23 | ||
| 14 | $(obj)/rescue.o: $(OBJECT) FORCE | 24 | $(obj)/rescue.o: $(OBJECTS) FORCE |
| 15 | $(call if_changed,ld) | 25 | $(call if_changed,ld) |
| 16 | 26 | ||
| 17 | $(obj)/rescue.bin: $(obj)/rescue.o FORCE | 27 | $(obj)/rescue.bin: $(obj)/rescue.o FORCE |
| @@ -26,6 +36,7 @@ $(obj)/testrescue.bin: $(obj)/testrescue.o | |||
| 26 | dd if=testrescue_tmp.bin of=$(obj)/testrescue.bin bs=1 count=784 | 36 | dd if=testrescue_tmp.bin of=$(obj)/testrescue.bin bs=1 count=784 |
| 27 | rm tr.bin tmp2423 testrescue_tmp.bin | 37 | rm tr.bin tmp2423 testrescue_tmp.bin |
| 28 | 38 | ||
| 39 | |||
| 29 | $(obj)/kimagerescue.bin: $(obj)/kimagerescue.o | 40 | $(obj)/kimagerescue.bin: $(obj)/kimagerescue.o |
| 30 | $(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/kimagerescue.o ktr.bin | 41 | $(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/kimagerescue.o ktr.bin |
| 31 | # Pad it to 784 bytes, that's what the rescue loader expects | 42 | # Pad it to 784 bytes, that's what the rescue loader expects |
| @@ -33,3 +44,4 @@ $(obj)/kimagerescue.bin: $(obj)/kimagerescue.o | |||
| 33 | cat ktr.bin tmp2423 >kimagerescue_tmp.bin | 44 | cat ktr.bin tmp2423 >kimagerescue_tmp.bin |
| 34 | dd if=kimagerescue_tmp.bin of=$(obj)/kimagerescue.bin bs=1 count=784 | 45 | dd if=kimagerescue_tmp.bin of=$(obj)/kimagerescue.bin bs=1 count=784 |
| 35 | rm ktr.bin tmp2423 kimagerescue_tmp.bin | 46 | rm ktr.bin tmp2423 kimagerescue_tmp.bin |
| 47 | |||
diff --git a/arch/cris/arch-v10/boot/rescue/head.S b/arch/cris/boot/rescue/head_v10.S index fb503d1eeea4..2fafe247a25b 100644 --- a/arch/cris/arch-v10/boot/rescue/head.S +++ b/arch/cris/boot/rescue/head_v10.S | |||
| @@ -155,7 +155,7 @@ no_newjump: | |||
| 155 | #endif | 155 | #endif |
| 156 | 156 | ||
| 157 | ;; We need to setup the bus registers before we start using the DRAM | 157 | ;; We need to setup the bus registers before we start using the DRAM |
| 158 | #include "../../lib/dram_init.S" | 158 | #include "../../../arch-v10/lib/dram_init.S" |
| 159 | 159 | ||
| 160 | ;; we now should go through the checksum-table and check the listed | 160 | ;; we now should go through the checksum-table and check the listed |
| 161 | ;; partitions for errors. | 161 | ;; partitions for errors. |
diff --git a/arch/cris/arch-v32/boot/rescue/head.S b/arch/cris/boot/rescue/head_v32.S index 5f846b7700a3..5f846b7700a3 100644 --- a/arch/cris/arch-v32/boot/rescue/head.S +++ b/arch/cris/boot/rescue/head_v32.S | |||
diff --git a/arch/cris/arch-v10/boot/rescue/kimagerescue.S b/arch/cris/boot/rescue/kimagerescue.S index 6f7b3e61260b..6f7b3e61260b 100644 --- a/arch/cris/arch-v10/boot/rescue/kimagerescue.S +++ b/arch/cris/boot/rescue/kimagerescue.S | |||
diff --git a/arch/cris/arch-v10/boot/rescue/rescue.lds b/arch/cris/boot/rescue/rescue_v10.lds index 0b52a9490db6..0b52a9490db6 100644 --- a/arch/cris/arch-v10/boot/rescue/rescue.lds +++ b/arch/cris/boot/rescue/rescue_v10.lds | |||
diff --git a/arch/cris/arch-v32/boot/rescue/rescue.lds b/arch/cris/boot/rescue/rescue_v32.lds index 8ac646bc1a2b..8ac646bc1a2b 100644 --- a/arch/cris/arch-v32/boot/rescue/rescue.lds +++ b/arch/cris/boot/rescue/rescue_v32.lds | |||
diff --git a/arch/cris/arch-v10/boot/rescue/testrescue.S b/arch/cris/boot/rescue/testrescue.S index fc7ec674eca5..fc7ec674eca5 100644 --- a/arch/cris/arch-v10/boot/rescue/testrescue.S +++ b/arch/cris/boot/rescue/testrescue.S | |||
diff --git a/arch/cris/arch-v10/boot/tools/build.c b/arch/cris/boot/tools/build.c index c8adef364160..c8adef364160 100644 --- a/arch/cris/arch-v10/boot/tools/build.c +++ b/arch/cris/boot/tools/build.c | |||
diff --git a/arch/cris/include/asm/unistd.h b/arch/cris/include/asm/unistd.h index 235d076379d5..c17079388bb9 100644 --- a/arch/cris/include/asm/unistd.h +++ b/arch/cris/include/asm/unistd.h | |||
| @@ -281,7 +281,7 @@ | |||
| 281 | #define __NR_mbind 274 | 281 | #define __NR_mbind 274 |
| 282 | #define __NR_get_mempolicy 275 | 282 | #define __NR_get_mempolicy 275 |
| 283 | #define __NR_set_mempolicy 276 | 283 | #define __NR_set_mempolicy 276 |
| 284 | #define __NR_mq_open 277 | 284 | #define __NR_mq_open 277 |
| 285 | #define __NR_mq_unlink (__NR_mq_open+1) | 285 | #define __NR_mq_unlink (__NR_mq_open+1) |
| 286 | #define __NR_mq_timedsend (__NR_mq_open+2) | 286 | #define __NR_mq_timedsend (__NR_mq_open+2) |
| 287 | #define __NR_mq_timedreceive (__NR_mq_open+3) | 287 | #define __NR_mq_timedreceive (__NR_mq_open+3) |
| @@ -331,10 +331,18 @@ | |||
| 331 | #define __NR_fallocate 324 | 331 | #define __NR_fallocate 324 |
| 332 | #define __NR_timerfd_settime 325 | 332 | #define __NR_timerfd_settime 325 |
| 333 | #define __NR_timerfd_gettime 326 | 333 | #define __NR_timerfd_gettime 326 |
| 334 | #define __NR_signalfd4 327 | ||
| 335 | #define __NR_eventfd2 328 | ||
| 336 | #define __NR_epoll_create1 329 | ||
| 337 | #define __NR_dup3 330 | ||
| 338 | #define __NR_pipe2 331 | ||
| 339 | #define __NR_inotify_init1 332 | ||
| 340 | #define __NR_preadv 333 | ||
| 341 | #define __NR_pwritev 334 | ||
| 334 | 342 | ||
| 335 | #ifdef __KERNEL__ | 343 | #ifdef __KERNEL__ |
| 336 | 344 | ||
| 337 | #define NR_syscalls 327 | 345 | #define NR_syscalls 335 |
| 338 | 346 | ||
| 339 | #include <arch/unistd.h> | 347 | #include <arch/unistd.h> |
| 340 | 348 | ||
diff --git a/arch/ia64/include/asm/idle.h b/arch/ia64/include/asm/idle.h new file mode 100644 index 000000000000..b7685015a8ba --- /dev/null +++ b/arch/ia64/include/asm/idle.h | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | #ifndef _ASM_IA64_IDLE_H | ||
| 2 | #define _ASM_IA64_IDLE_H | ||
| 3 | |||
| 4 | static inline void enter_idle(void) { } | ||
| 5 | static inline void exit_idle(void) { } | ||
| 6 | |||
| 7 | #endif /* _ASM_IA64_IDLE_H */ | ||
diff --git a/arch/ia64/include/asm/xen/events.h b/arch/ia64/include/asm/xen/events.h index 73248781fba8..b8370c8b6198 100644 --- a/arch/ia64/include/asm/xen/events.h +++ b/arch/ia64/include/asm/xen/events.h | |||
| @@ -36,14 +36,9 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) | |||
| 36 | return !(ia64_psr(regs)->i); | 36 | return !(ia64_psr(regs)->i); |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | static inline void xen_do_IRQ(int irq, struct pt_regs *regs) | 39 | static inline void handle_irq(int irq, struct pt_regs *regs) |
| 40 | { | 40 | { |
| 41 | struct pt_regs *old_regs; | ||
| 42 | old_regs = set_irq_regs(regs); | ||
| 43 | irq_enter(); | ||
| 44 | __do_IRQ(irq); | 41 | __do_IRQ(irq); |
| 45 | irq_exit(); | ||
| 46 | set_irq_regs(old_regs); | ||
| 47 | } | 42 | } |
| 48 | #define irq_ctx_init(cpu) do { } while (0) | 43 | #define irq_ctx_init(cpu) do { } while (0) |
| 49 | 44 | ||
diff --git a/arch/ia64/xen/xensetup.S b/arch/ia64/xen/xensetup.S index 28fed1fcc079..aff8346ea193 100644 --- a/arch/ia64/xen/xensetup.S +++ b/arch/ia64/xen/xensetup.S | |||
| @@ -54,8 +54,6 @@ END(startup_xen) | |||
| 54 | 54 | ||
| 55 | #define isBP p3 // are we the Bootstrap Processor? | 55 | #define isBP p3 // are we the Bootstrap Processor? |
| 56 | 56 | ||
| 57 | .text | ||
| 58 | |||
| 59 | GLOBAL_ENTRY(xen_setup_hook) | 57 | GLOBAL_ENTRY(xen_setup_hook) |
| 60 | mov r8=XEN_PV_DOMAIN_ASM | 58 | mov r8=XEN_PV_DOMAIN_ASM |
| 61 | (isBP) movl r9=xen_domain_type;; | 59 | (isBP) movl r9=xen_domain_type;; |
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-static.c b/arch/microblaze/kernel/cpu/cpuinfo-static.c index cfe44effdb77..450ca6bb828d 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-static.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | #include <asm/cpuinfo.h> | 14 | #include <asm/cpuinfo.h> |
| 15 | #include <asm/pvr.h> | 15 | #include <asm/pvr.h> |
| 16 | 16 | ||
| 17 | const static char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; | 17 | static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; |
| 18 | const static char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; | 18 | static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; |
| 19 | 19 | ||
| 20 | #define err_printk(x) \ | 20 | #define err_printk(x) \ |
| 21 | early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n"); | 21 | early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n"); |
diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c index ba0568c2cc1c..31905ff590b7 100644 --- a/arch/microblaze/kernel/sys_microblaze.c +++ b/arch/microblaze/kernel/sys_microblaze.c | |||
| @@ -131,7 +131,7 @@ sys_ipc(uint call, int first, int second, int third, void *ptr, long fifth) | |||
| 131 | ret = sys_shmctl(first, second, (struct shmid_ds *) ptr); | 131 | ret = sys_shmctl(first, second, (struct shmid_ds *) ptr); |
| 132 | break; | 132 | break; |
| 133 | } | 133 | } |
| 134 | return -EINVAL; | 134 | return ret; |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | asmlinkage int sys_vfork(struct pt_regs *regs) | 137 | asmlinkage int sys_vfork(struct pt_regs *regs) |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index cd1b687544f3..f9c40f869c6e 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -382,7 +382,8 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 382 | .icache_bsize = 128, | 382 | .icache_bsize = 128, |
| 383 | .dcache_bsize = 128, | 383 | .dcache_bsize = 128, |
| 384 | .machine_check = machine_check_generic, | 384 | .machine_check = machine_check_generic, |
| 385 | .oprofile_cpu_type = "ppc64/compat-power5+", | 385 | .oprofile_cpu_type = "ppc64/ibm-compat-v1", |
| 386 | .oprofile_type = PPC_OPROFILE_POWER4, | ||
| 386 | .platform = "power5+", | 387 | .platform = "power5+", |
| 387 | }, | 388 | }, |
| 388 | { /* Power6 */ | 389 | { /* Power6 */ |
| @@ -416,7 +417,8 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 416 | .icache_bsize = 128, | 417 | .icache_bsize = 128, |
| 417 | .dcache_bsize = 128, | 418 | .dcache_bsize = 128, |
| 418 | .machine_check = machine_check_generic, | 419 | .machine_check = machine_check_generic, |
| 419 | .oprofile_cpu_type = "ppc64/compat-power6", | 420 | .oprofile_cpu_type = "ppc64/ibm-compat-v1", |
| 421 | .oprofile_type = PPC_OPROFILE_POWER4, | ||
| 420 | .platform = "power6", | 422 | .platform = "power6", |
| 421 | }, | 423 | }, |
| 422 | { /* 2.06-compliant processor, i.e. Power7 "architected" mode */ | 424 | { /* 2.06-compliant processor, i.e. Power7 "architected" mode */ |
| @@ -429,7 +431,8 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 429 | .icache_bsize = 128, | 431 | .icache_bsize = 128, |
| 430 | .dcache_bsize = 128, | 432 | .dcache_bsize = 128, |
| 431 | .machine_check = machine_check_generic, | 433 | .machine_check = machine_check_generic, |
| 432 | .oprofile_cpu_type = "ppc64/compat-power7", | 434 | .oprofile_type = PPC_OPROFILE_POWER4, |
| 435 | .oprofile_cpu_type = "ppc64/ibm-compat-v1", | ||
| 433 | .platform = "power7", | 436 | .platform = "power7", |
| 434 | }, | 437 | }, |
| 435 | { /* Power7 */ | 438 | { /* Power7 */ |
| @@ -1833,8 +1836,10 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s) | |||
| 1833 | * and, in that case, keep the current value for | 1836 | * and, in that case, keep the current value for |
| 1834 | * oprofile_cpu_type. | 1837 | * oprofile_cpu_type. |
| 1835 | */ | 1838 | */ |
| 1836 | if (old.oprofile_cpu_type == NULL) | 1839 | if (old.oprofile_cpu_type == NULL) { |
| 1837 | t->oprofile_cpu_type = s->oprofile_cpu_type; | 1840 | t->oprofile_cpu_type = old.oprofile_cpu_type; |
| 1841 | t->oprofile_type = old.oprofile_type; | ||
| 1842 | } | ||
| 1838 | } | 1843 | } |
| 1839 | 1844 | ||
| 1840 | *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec; | 1845 | *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec; |
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 42c33cebf00f..8c0be0902dac 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
| @@ -49,10 +49,10 @@ | |||
| 49 | #define IVHD_DEV_EXT_SELECT 0x46 | 49 | #define IVHD_DEV_EXT_SELECT 0x46 |
| 50 | #define IVHD_DEV_EXT_SELECT_RANGE 0x47 | 50 | #define IVHD_DEV_EXT_SELECT_RANGE 0x47 |
| 51 | 51 | ||
| 52 | #define IVHD_FLAG_HT_TUN_EN 0x00 | 52 | #define IVHD_FLAG_HT_TUN_EN_MASK 0x01 |
| 53 | #define IVHD_FLAG_PASSPW_EN 0x01 | 53 | #define IVHD_FLAG_PASSPW_EN_MASK 0x02 |
| 54 | #define IVHD_FLAG_RESPASSPW_EN 0x02 | 54 | #define IVHD_FLAG_RESPASSPW_EN_MASK 0x04 |
| 55 | #define IVHD_FLAG_ISOC_EN 0x03 | 55 | #define IVHD_FLAG_ISOC_EN_MASK 0x08 |
| 56 | 56 | ||
| 57 | #define IVMD_FLAG_EXCL_RANGE 0x08 | 57 | #define IVMD_FLAG_EXCL_RANGE 0x08 |
| 58 | #define IVMD_FLAG_UNITY_MAP 0x01 | 58 | #define IVMD_FLAG_UNITY_MAP 0x01 |
| @@ -569,19 +569,19 @@ static void __init init_iommu_from_acpi(struct amd_iommu *iommu, | |||
| 569 | * First set the recommended feature enable bits from ACPI | 569 | * First set the recommended feature enable bits from ACPI |
| 570 | * into the IOMMU control registers | 570 | * into the IOMMU control registers |
| 571 | */ | 571 | */ |
| 572 | h->flags & IVHD_FLAG_HT_TUN_EN ? | 572 | h->flags & IVHD_FLAG_HT_TUN_EN_MASK ? |
| 573 | iommu_feature_enable(iommu, CONTROL_HT_TUN_EN) : | 573 | iommu_feature_enable(iommu, CONTROL_HT_TUN_EN) : |
| 574 | iommu_feature_disable(iommu, CONTROL_HT_TUN_EN); | 574 | iommu_feature_disable(iommu, CONTROL_HT_TUN_EN); |
| 575 | 575 | ||
| 576 | h->flags & IVHD_FLAG_PASSPW_EN ? | 576 | h->flags & IVHD_FLAG_PASSPW_EN_MASK ? |
| 577 | iommu_feature_enable(iommu, CONTROL_PASSPW_EN) : | 577 | iommu_feature_enable(iommu, CONTROL_PASSPW_EN) : |
| 578 | iommu_feature_disable(iommu, CONTROL_PASSPW_EN); | 578 | iommu_feature_disable(iommu, CONTROL_PASSPW_EN); |
| 579 | 579 | ||
| 580 | h->flags & IVHD_FLAG_RESPASSPW_EN ? | 580 | h->flags & IVHD_FLAG_RESPASSPW_EN_MASK ? |
| 581 | iommu_feature_enable(iommu, CONTROL_RESPASSPW_EN) : | 581 | iommu_feature_enable(iommu, CONTROL_RESPASSPW_EN) : |
| 582 | iommu_feature_disable(iommu, CONTROL_RESPASSPW_EN); | 582 | iommu_feature_disable(iommu, CONTROL_RESPASSPW_EN); |
| 583 | 583 | ||
| 584 | h->flags & IVHD_FLAG_ISOC_EN ? | 584 | h->flags & IVHD_FLAG_ISOC_EN_MASK ? |
| 585 | iommu_feature_enable(iommu, CONTROL_ISOC_EN) : | 585 | iommu_feature_enable(iommu, CONTROL_ISOC_EN) : |
| 586 | iommu_feature_disable(iommu, CONTROL_ISOC_EN); | 586 | iommu_feature_disable(iommu, CONTROL_ISOC_EN); |
| 587 | 587 | ||
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index c4f667896c28..c1caefc82e62 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -1203,6 +1203,8 @@ void __cpuinit cpu_init(void) | |||
| 1203 | load_TR_desc(); | 1203 | load_TR_desc(); |
| 1204 | load_LDT(&init_mm.context); | 1204 | load_LDT(&init_mm.context); |
| 1205 | 1205 | ||
| 1206 | t->x86_tss.io_bitmap_base = offsetof(struct tss_struct, io_bitmap); | ||
| 1207 | |||
| 1206 | #ifdef CONFIG_DOUBLEFAULT | 1208 | #ifdef CONFIG_DOUBLEFAULT |
| 1207 | /* Set up doublefault TSS pointer in the GDT */ | 1209 | /* Set up doublefault TSS pointer in the GDT */ |
| 1208 | __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss); | 1210 | __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss); |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c index d6b72df89d69..cef3ee30744b 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c | |||
| @@ -151,10 +151,11 @@ static void print_update(char *type, int *hdr, int num) | |||
| 151 | static void cmci_discover(int banks, int boot) | 151 | static void cmci_discover(int banks, int boot) |
| 152 | { | 152 | { |
| 153 | unsigned long *owned = (void *)&__get_cpu_var(mce_banks_owned); | 153 | unsigned long *owned = (void *)&__get_cpu_var(mce_banks_owned); |
| 154 | unsigned long flags; | ||
| 154 | int hdr = 0; | 155 | int hdr = 0; |
| 155 | int i; | 156 | int i; |
| 156 | 157 | ||
| 157 | spin_lock(&cmci_discover_lock); | 158 | spin_lock_irqsave(&cmci_discover_lock, flags); |
| 158 | for (i = 0; i < banks; i++) { | 159 | for (i = 0; i < banks; i++) { |
| 159 | u64 val; | 160 | u64 val; |
| 160 | 161 | ||
| @@ -184,7 +185,7 @@ static void cmci_discover(int banks, int boot) | |||
| 184 | WARN_ON(!test_bit(i, __get_cpu_var(mce_poll_banks))); | 185 | WARN_ON(!test_bit(i, __get_cpu_var(mce_poll_banks))); |
| 185 | } | 186 | } |
| 186 | } | 187 | } |
| 187 | spin_unlock(&cmci_discover_lock); | 188 | spin_unlock_irqrestore(&cmci_discover_lock, flags); |
| 188 | if (hdr) | 189 | if (hdr) |
| 189 | printk(KERN_CONT "\n"); | 190 | printk(KERN_CONT "\n"); |
| 190 | } | 191 | } |
| @@ -211,13 +212,14 @@ void cmci_recheck(void) | |||
| 211 | */ | 212 | */ |
| 212 | void cmci_clear(void) | 213 | void cmci_clear(void) |
| 213 | { | 214 | { |
| 215 | unsigned long flags; | ||
| 214 | int i; | 216 | int i; |
| 215 | int banks; | 217 | int banks; |
| 216 | u64 val; | 218 | u64 val; |
| 217 | 219 | ||
| 218 | if (!cmci_supported(&banks)) | 220 | if (!cmci_supported(&banks)) |
| 219 | return; | 221 | return; |
| 220 | spin_lock(&cmci_discover_lock); | 222 | spin_lock_irqsave(&cmci_discover_lock, flags); |
| 221 | for (i = 0; i < banks; i++) { | 223 | for (i = 0; i < banks; i++) { |
| 222 | if (!test_bit(i, __get_cpu_var(mce_banks_owned))) | 224 | if (!test_bit(i, __get_cpu_var(mce_banks_owned))) |
| 223 | continue; | 225 | continue; |
| @@ -227,7 +229,7 @@ void cmci_clear(void) | |||
| 227 | wrmsrl(MSR_IA32_MC0_CTL2 + i, val); | 229 | wrmsrl(MSR_IA32_MC0_CTL2 + i, val); |
| 228 | __clear_bit(i, __get_cpu_var(mce_banks_owned)); | 230 | __clear_bit(i, __get_cpu_var(mce_banks_owned)); |
| 229 | } | 231 | } |
| 230 | spin_unlock(&cmci_discover_lock); | 232 | spin_unlock_irqrestore(&cmci_discover_lock, flags); |
| 231 | } | 233 | } |
| 232 | 234 | ||
| 233 | /* | 235 | /* |
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index f93047fed791..d5e30397246b 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c | |||
| @@ -14,7 +14,7 @@ static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c, | |||
| 14 | if (c->x86_max_cores * smp_num_siblings > 1) { | 14 | if (c->x86_max_cores * smp_num_siblings > 1) { |
| 15 | seq_printf(m, "physical id\t: %d\n", c->phys_proc_id); | 15 | seq_printf(m, "physical id\t: %d\n", c->phys_proc_id); |
| 16 | seq_printf(m, "siblings\t: %d\n", | 16 | seq_printf(m, "siblings\t: %d\n", |
| 17 | cpumask_weight(cpu_sibling_mask(cpu))); | 17 | cpumask_weight(cpu_core_mask(cpu))); |
| 18 | seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id); | 18 | seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id); |
| 19 | seq_printf(m, "cpu cores\t: %d\n", c->booted_cores); | 19 | seq_printf(m, "cpu cores\t: %d\n", c->booted_cores); |
| 20 | seq_printf(m, "apicid\t\t: %d\n", c->apicid); | 20 | seq_printf(m, "apicid\t\t: %d\n", c->apicid); |
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index ef2c3563357d..006281302925 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
| @@ -1074,12 +1074,13 @@ u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align) | |||
| 1074 | u64 addr; | 1074 | u64 addr; |
| 1075 | u64 start; | 1075 | u64 start; |
| 1076 | 1076 | ||
| 1077 | start = startt; | 1077 | for (start = startt; ; start += size) { |
| 1078 | while (size < sizet && (start + 1)) | ||
| 1079 | start = find_e820_area_size(start, &size, align); | 1078 | start = find_e820_area_size(start, &size, align); |
| 1080 | 1079 | if (!(start + 1)) | |
| 1081 | if (size < sizet) | 1080 | return 0; |
| 1082 | return 0; | 1081 | if (size >= sizet) |
| 1082 | break; | ||
| 1083 | } | ||
| 1083 | 1084 | ||
| 1084 | #ifdef CONFIG_X86_32 | 1085 | #ifdef CONFIG_X86_32 |
| 1085 | if (start >= MAXMEM) | 1086 | if (start >= MAXMEM) |
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index e7368c1da01d..c1c429d00130 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c | |||
| @@ -194,7 +194,7 @@ void machine_kexec(struct kimage *image) | |||
| 194 | unsigned int preserve_context); | 194 | unsigned int preserve_context); |
| 195 | 195 | ||
| 196 | #ifdef CONFIG_KEXEC_JUMP | 196 | #ifdef CONFIG_KEXEC_JUMP |
| 197 | if (kexec_image->preserve_context) | 197 | if (image->preserve_context) |
| 198 | save_processor_state(); | 198 | save_processor_state(); |
| 199 | #endif | 199 | #endif |
| 200 | 200 | ||
| @@ -253,7 +253,7 @@ void machine_kexec(struct kimage *image) | |||
| 253 | image->preserve_context); | 253 | image->preserve_context); |
| 254 | 254 | ||
| 255 | #ifdef CONFIG_KEXEC_JUMP | 255 | #ifdef CONFIG_KEXEC_JUMP |
| 256 | if (kexec_image->preserve_context) | 256 | if (image->preserve_context) |
| 257 | restore_processor_state(); | 257 | restore_processor_state(); |
| 258 | #endif | 258 | #endif |
| 259 | 259 | ||
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 89cea4d44679..84c3bf209e98 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c | |||
| @@ -274,7 +274,7 @@ void machine_kexec(struct kimage *image) | |||
| 274 | int save_ftrace_enabled; | 274 | int save_ftrace_enabled; |
| 275 | 275 | ||
| 276 | #ifdef CONFIG_KEXEC_JUMP | 276 | #ifdef CONFIG_KEXEC_JUMP |
| 277 | if (kexec_image->preserve_context) | 277 | if (image->preserve_context) |
| 278 | save_processor_state(); | 278 | save_processor_state(); |
| 279 | #endif | 279 | #endif |
| 280 | 280 | ||
| @@ -333,7 +333,7 @@ void machine_kexec(struct kimage *image) | |||
| 333 | image->preserve_context); | 333 | image->preserve_context); |
| 334 | 334 | ||
| 335 | #ifdef CONFIG_KEXEC_JUMP | 335 | #ifdef CONFIG_KEXEC_JUMP |
| 336 | if (kexec_image->preserve_context) | 336 | if (image->preserve_context) |
| 337 | restore_processor_state(); | 337 | restore_processor_state(); |
| 338 | #endif | 338 | #endif |
| 339 | 339 | ||
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index fd3da1dda1c9..ae4f7b5d7104 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <asm/page.h> | 7 | #include <asm/page.h> |
| 8 | #include <asm/page_types.h> | 8 | #include <asm/page_types.h> |
| 9 | #include <asm/sections.h> | 9 | #include <asm/sections.h> |
| 10 | #include <asm/setup.h> | ||
| 10 | #include <asm/system.h> | 11 | #include <asm/system.h> |
| 11 | #include <asm/tlbflush.h> | 12 | #include <asm/tlbflush.h> |
| 12 | 13 | ||
| @@ -304,8 +305,23 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, | |||
| 304 | #endif | 305 | #endif |
| 305 | 306 | ||
| 306 | #ifdef CONFIG_X86_64 | 307 | #ifdef CONFIG_X86_64 |
| 307 | if (!after_bootmem) | 308 | if (!after_bootmem && !start) { |
| 309 | pud_t *pud; | ||
| 310 | pmd_t *pmd; | ||
| 311 | |||
| 308 | mmu_cr4_features = read_cr4(); | 312 | mmu_cr4_features = read_cr4(); |
| 313 | |||
| 314 | /* | ||
| 315 | * _brk_end cannot change anymore, but it and _end may be | ||
| 316 | * located on different 2M pages. cleanup_highmap(), however, | ||
| 317 | * can only consider _end when it runs, so destroy any | ||
| 318 | * mappings beyond _brk_end here. | ||
| 319 | */ | ||
| 320 | pud = pud_offset(pgd_offset_k(_brk_end), _brk_end); | ||
| 321 | pmd = pmd_offset(pud, _brk_end - 1); | ||
| 322 | while (++pmd <= pmd_offset(pud, (unsigned long)_end - 1)) | ||
| 323 | pmd_clear(pmd); | ||
| 324 | } | ||
| 309 | #endif | 325 | #endif |
| 310 | __flush_tlb_all(); | 326 | __flush_tlb_all(); |
| 311 | 327 | ||
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 4f115e00486b..50dc802a1c46 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c | |||
| @@ -87,7 +87,7 @@ static struct kmmio_probe *get_kmmio_probe(unsigned long addr) | |||
| 87 | { | 87 | { |
| 88 | struct kmmio_probe *p; | 88 | struct kmmio_probe *p; |
| 89 | list_for_each_entry_rcu(p, &kmmio_probes, list) { | 89 | list_for_each_entry_rcu(p, &kmmio_probes, list) { |
| 90 | if (addr >= p->addr && addr <= (p->addr + p->len)) | 90 | if (addr >= p->addr && addr < (p->addr + p->len)) |
| 91 | return p; | 91 | return p; |
| 92 | } | 92 | } |
| 93 | return NULL; | 93 | return NULL; |
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c index 16ae70fc57e7..29a0e37114f8 100644 --- a/arch/x86/mm/srat_32.c +++ b/arch/x86/mm/srat_32.c | |||
| @@ -216,7 +216,7 @@ int __init get_memcfg_from_srat(void) | |||
| 216 | 216 | ||
| 217 | if (num_memory_chunks == 0) { | 217 | if (num_memory_chunks == 0) { |
| 218 | printk(KERN_WARNING | 218 | printk(KERN_WARNING |
| 219 | "could not finy any ACPI SRAT memory areas.\n"); | 219 | "could not find any ACPI SRAT memory areas.\n"); |
| 220 | goto out_fail; | 220 | goto out_fail; |
| 221 | } | 221 | } |
| 222 | 222 | ||
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 33c5fa57e43d..01765955baaf 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
| @@ -361,6 +361,7 @@ static void __init unparse_node(int node) | |||
| 361 | { | 361 | { |
| 362 | int i; | 362 | int i; |
| 363 | node_clear(node, nodes_parsed); | 363 | node_clear(node, nodes_parsed); |
| 364 | node_clear(node, cpu_nodes_parsed); | ||
| 364 | for (i = 0; i < MAX_LOCAL_APIC; i++) { | 365 | for (i = 0; i < MAX_LOCAL_APIC; i++) { |
| 365 | if (apicid_to_node[i] == node) | 366 | if (apicid_to_node[i] == node) |
| 366 | apicid_to_node[i] = NUMA_NO_NODE; | 367 | apicid_to_node[i] = NUMA_NO_NODE; |
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c index d9d35824c56f..6a40b78b46aa 100644 --- a/arch/x86/vdso/vclock_gettime.c +++ b/arch/x86/vdso/vclock_gettime.c | |||
| @@ -104,11 +104,13 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) | |||
| 104 | { | 104 | { |
| 105 | long ret; | 105 | long ret; |
| 106 | if (likely(gtod->sysctl_enabled && gtod->clock.vread)) { | 106 | if (likely(gtod->sysctl_enabled && gtod->clock.vread)) { |
| 107 | BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != | 107 | if (likely(tv != NULL)) { |
| 108 | offsetof(struct timespec, tv_nsec) || | 108 | BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != |
| 109 | sizeof(*tv) != sizeof(struct timespec)); | 109 | offsetof(struct timespec, tv_nsec) || |
| 110 | do_realtime((struct timespec *)tv); | 110 | sizeof(*tv) != sizeof(struct timespec)); |
| 111 | tv->tv_usec /= 1000; | 111 | do_realtime((struct timespec *)tv); |
| 112 | tv->tv_usec /= 1000; | ||
| 113 | } | ||
| 112 | if (unlikely(tz != NULL)) { | 114 | if (unlikely(tz != NULL)) { |
| 113 | /* Avoid memcpy. Some old compilers fail to inline it */ | 115 | /* Avoid memcpy. Some old compilers fail to inline it */ |
| 114 | tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest; | 116 | tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest; |
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 9842b1212407..e25a78e1113a 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -1794,6 +1794,11 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, | |||
| 1794 | 1794 | ||
| 1795 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(swapper_pg_dir))); | 1795 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(swapper_pg_dir))); |
| 1796 | 1796 | ||
| 1797 | reserve_early(__pa(xen_start_info->pt_base), | ||
| 1798 | __pa(xen_start_info->pt_base + | ||
| 1799 | xen_start_info->nr_pt_frames * PAGE_SIZE), | ||
| 1800 | "XEN PAGETABLES"); | ||
| 1801 | |||
| 1797 | return swapper_pg_dir; | 1802 | return swapper_pg_dir; |
| 1798 | } | 1803 | } |
| 1799 | #endif /* CONFIG_X86_64 */ | 1804 | #endif /* CONFIG_X86_64 */ |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 942d14ac8792..d51a17c0f59b 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -72,6 +72,7 @@ | |||
| 72 | * ICH2 spec c #20 - IDE PRD must not cross a 64K boundary | 72 | * ICH2 spec c #20 - IDE PRD must not cross a 64K boundary |
| 73 | * and must be dword aligned | 73 | * and must be dword aligned |
| 74 | * ICH2 spec c #24 - UDMA mode 4,5 t85/86 should be 6ns not 3.3 | 74 | * ICH2 spec c #24 - UDMA mode 4,5 t85/86 should be 6ns not 3.3 |
| 75 | * ICH7 errata #16 - MWDMA1 timings are incorrect | ||
| 75 | * | 76 | * |
| 76 | * Should have been BIOS fixed: | 77 | * Should have been BIOS fixed: |
| 77 | * 450NX: errata #19 - DMA hangs on old 450NX | 78 | * 450NX: errata #19 - DMA hangs on old 450NX |
| @@ -94,7 +95,7 @@ | |||
| 94 | #include <linux/dmi.h> | 95 | #include <linux/dmi.h> |
| 95 | 96 | ||
| 96 | #define DRV_NAME "ata_piix" | 97 | #define DRV_NAME "ata_piix" |
| 97 | #define DRV_VERSION "2.12" | 98 | #define DRV_VERSION "2.13" |
| 98 | 99 | ||
| 99 | enum { | 100 | enum { |
| 100 | PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ | 101 | PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ |
| @@ -136,6 +137,7 @@ enum piix_controller_ids { | |||
| 136 | ich_pata_33, /* ICH up to UDMA 33 only */ | 137 | ich_pata_33, /* ICH up to UDMA 33 only */ |
| 137 | ich_pata_66, /* ICH up to 66 Mhz */ | 138 | ich_pata_66, /* ICH up to 66 Mhz */ |
| 138 | ich_pata_100, /* ICH up to UDMA 100 */ | 139 | ich_pata_100, /* ICH up to UDMA 100 */ |
| 140 | ich_pata_100_nomwdma1, /* ICH up to UDMA 100 but with no MWDMA1*/ | ||
| 139 | ich5_sata, | 141 | ich5_sata, |
| 140 | ich6_sata, | 142 | ich6_sata, |
| 141 | ich6m_sata, | 143 | ich6m_sata, |
| @@ -216,8 +218,8 @@ static const struct pci_device_id piix_pci_tbl[] = { | |||
| 216 | /* ICH6 (and 6) (i915) UDMA 100 */ | 218 | /* ICH6 (and 6) (i915) UDMA 100 */ |
| 217 | { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 219 | { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
| 218 | /* ICH7/7-R (i945, i975) UDMA 100*/ | 220 | /* ICH7/7-R (i945, i975) UDMA 100*/ |
| 219 | { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 221 | { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 }, |
| 220 | { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 222 | { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 }, |
| 221 | /* ICH8 Mobile PATA Controller */ | 223 | /* ICH8 Mobile PATA Controller */ |
| 222 | { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 224 | { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
| 223 | 225 | ||
| @@ -487,6 +489,15 @@ static struct ata_port_info piix_port_info[] = { | |||
| 487 | .port_ops = &ich_pata_ops, | 489 | .port_ops = &ich_pata_ops, |
| 488 | }, | 490 | }, |
| 489 | 491 | ||
| 492 | [ich_pata_100_nomwdma1] = | ||
| 493 | { | ||
| 494 | .flags = PIIX_PATA_FLAGS | PIIX_FLAG_CHECKINTR, | ||
| 495 | .pio_mask = ATA_PIO4, | ||
| 496 | .mwdma_mask = ATA_MWDMA2_ONLY, | ||
| 497 | .udma_mask = ATA_UDMA5, | ||
| 498 | .port_ops = &ich_pata_ops, | ||
| 499 | }, | ||
| 500 | |||
| 490 | [ich5_sata] = | 501 | [ich5_sata] = |
| 491 | { | 502 | { |
| 492 | .flags = PIIX_SATA_FLAGS, | 503 | .flags = PIIX_SATA_FLAGS, |
| @@ -594,6 +605,7 @@ static const struct ich_laptop ich_laptop[] = { | |||
| 594 | { 0x24CA, 0x1025, 0x003d }, /* ICH4 on ACER TM290 */ | 605 | { 0x24CA, 0x1025, 0x003d }, /* ICH4 on ACER TM290 */ |
| 595 | { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */ | 606 | { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */ |
| 596 | { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ | 607 | { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ |
| 608 | { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ | ||
| 597 | /* end marker */ | 609 | /* end marker */ |
| 598 | { 0, } | 610 | { 0, } |
| 599 | }; | 611 | }; |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 17c5d48a75d2..c9242301cfa1 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -4091,7 +4091,9 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class, | |||
| 4091 | 4091 | ||
| 4092 | /* fail early if !ATA && !ATAPI to avoid issuing [P]IDENTIFY to PMP */ | 4092 | /* fail early if !ATA && !ATAPI to avoid issuing [P]IDENTIFY to PMP */ |
| 4093 | if (ata_class_enabled(new_class) && | 4093 | if (ata_class_enabled(new_class) && |
| 4094 | new_class != ATA_DEV_ATA && new_class != ATA_DEV_ATAPI) { | 4094 | new_class != ATA_DEV_ATA && |
| 4095 | new_class != ATA_DEV_ATAPI && | ||
| 4096 | new_class != ATA_DEV_SEMB) { | ||
| 4095 | ata_dev_printk(dev, KERN_INFO, "class mismatch %u != %u\n", | 4097 | ata_dev_printk(dev, KERN_INFO, "class mismatch %u != %u\n", |
| 4096 | dev->class, new_class); | 4098 | dev->class, new_class); |
| 4097 | rc = -ENODEV; | 4099 | rc = -ENODEV; |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 01831312c360..94919ad03df1 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
| @@ -2783,6 +2783,12 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
| 2783 | } else if (dev->class == ATA_DEV_UNKNOWN && | 2783 | } else if (dev->class == ATA_DEV_UNKNOWN && |
| 2784 | ehc->tries[dev->devno] && | 2784 | ehc->tries[dev->devno] && |
| 2785 | ata_class_enabled(ehc->classes[dev->devno])) { | 2785 | ata_class_enabled(ehc->classes[dev->devno])) { |
| 2786 | /* Temporarily set dev->class, it will be | ||
| 2787 | * permanently set once all configurations are | ||
| 2788 | * complete. This is necessary because new | ||
| 2789 | * device configuration is done in two | ||
| 2790 | * separate loops. | ||
| 2791 | */ | ||
| 2786 | dev->class = ehc->classes[dev->devno]; | 2792 | dev->class = ehc->classes[dev->devno]; |
| 2787 | 2793 | ||
| 2788 | if (dev->class == ATA_DEV_PMP) | 2794 | if (dev->class == ATA_DEV_PMP) |
| @@ -2790,6 +2796,11 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
| 2790 | else | 2796 | else |
| 2791 | rc = ata_dev_read_id(dev, &dev->class, | 2797 | rc = ata_dev_read_id(dev, &dev->class, |
| 2792 | readid_flags, dev->id); | 2798 | readid_flags, dev->id); |
| 2799 | |||
| 2800 | /* read_id might have changed class, store and reset */ | ||
| 2801 | ehc->classes[dev->devno] = dev->class; | ||
| 2802 | dev->class = ATA_DEV_UNKNOWN; | ||
| 2803 | |||
| 2793 | switch (rc) { | 2804 | switch (rc) { |
| 2794 | case 0: | 2805 | case 0: |
| 2795 | /* clear error info accumulated during probe */ | 2806 | /* clear error info accumulated during probe */ |
| @@ -2799,13 +2810,11 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
| 2799 | case -ENOENT: | 2810 | case -ENOENT: |
| 2800 | /* IDENTIFY was issued to non-existent | 2811 | /* IDENTIFY was issued to non-existent |
| 2801 | * device. No need to reset. Just | 2812 | * device. No need to reset. Just |
| 2802 | * thaw and kill the device. | 2813 | * thaw and ignore the device. |
| 2803 | */ | 2814 | */ |
| 2804 | ata_eh_thaw_port(ap); | 2815 | ata_eh_thaw_port(ap); |
| 2805 | dev->class = ATA_DEV_UNKNOWN; | ||
| 2806 | break; | 2816 | break; |
| 2807 | default: | 2817 | default: |
| 2808 | dev->class = ATA_DEV_UNKNOWN; | ||
| 2809 | goto err; | 2818 | goto err; |
| 2810 | } | 2819 | } |
| 2811 | } | 2820 | } |
| @@ -2826,11 +2835,15 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
| 2826 | dev->class == ATA_DEV_PMP) | 2835 | dev->class == ATA_DEV_PMP) |
| 2827 | continue; | 2836 | continue; |
| 2828 | 2837 | ||
| 2838 | dev->class = ehc->classes[dev->devno]; | ||
| 2839 | |||
| 2829 | ehc->i.flags |= ATA_EHI_PRINTINFO; | 2840 | ehc->i.flags |= ATA_EHI_PRINTINFO; |
| 2830 | rc = ata_dev_configure(dev); | 2841 | rc = ata_dev_configure(dev); |
| 2831 | ehc->i.flags &= ~ATA_EHI_PRINTINFO; | 2842 | ehc->i.flags &= ~ATA_EHI_PRINTINFO; |
| 2832 | if (rc) | 2843 | if (rc) { |
| 2844 | dev->class = ATA_DEV_UNKNOWN; | ||
| 2833 | goto err; | 2845 | goto err; |
| 2846 | } | ||
| 2834 | 2847 | ||
| 2835 | spin_lock_irqsave(ap->lock, flags); | 2848 | spin_lock_irqsave(ap->lock, flags); |
| 2836 | ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG; | 2849 | ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG; |
| @@ -3494,6 +3507,8 @@ static void ata_eh_handle_port_suspend(struct ata_port *ap) | |||
| 3494 | */ | 3507 | */ |
| 3495 | static void ata_eh_handle_port_resume(struct ata_port *ap) | 3508 | static void ata_eh_handle_port_resume(struct ata_port *ap) |
| 3496 | { | 3509 | { |
| 3510 | struct ata_link *link; | ||
| 3511 | struct ata_device *dev; | ||
| 3497 | unsigned long flags; | 3512 | unsigned long flags; |
| 3498 | int rc = 0; | 3513 | int rc = 0; |
| 3499 | 3514 | ||
| @@ -3508,6 +3523,17 @@ static void ata_eh_handle_port_resume(struct ata_port *ap) | |||
| 3508 | 3523 | ||
| 3509 | WARN_ON(!(ap->pflags & ATA_PFLAG_SUSPENDED)); | 3524 | WARN_ON(!(ap->pflags & ATA_PFLAG_SUSPENDED)); |
| 3510 | 3525 | ||
| 3526 | /* | ||
| 3527 | * Error timestamps are in jiffies which doesn't run while | ||
| 3528 | * suspended and PHY events during resume isn't too uncommon. | ||
| 3529 | * When the two are combined, it can lead to unnecessary speed | ||
| 3530 | * downs if the machine is suspended and resumed repeatedly. | ||
| 3531 | * Clear error history. | ||
| 3532 | */ | ||
| 3533 | ata_for_each_link(link, ap, HOST_FIRST) | ||
| 3534 | ata_for_each_dev(dev, link, ALL) | ||
| 3535 | ata_ering_clear(&dev->ering); | ||
| 3536 | |||
| 3511 | ata_acpi_set_state(ap, PMSG_ON); | 3537 | ata_acpi_set_state(ap, PMSG_ON); |
| 3512 | 3538 | ||
| 3513 | if (ap->ops->port_resume) | 3539 | if (ap->ops->port_resume) |
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 2733b0c90b75..68d9132d8f6f 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
| @@ -313,7 +313,7 @@ ata_scsi_em_message_show(struct device *dev, struct device_attribute *attr, | |||
| 313 | return ap->ops->em_show(ap, buf); | 313 | return ap->ops->em_show(ap, buf); |
| 314 | return -EINVAL; | 314 | return -EINVAL; |
| 315 | } | 315 | } |
| 316 | DEVICE_ATTR(em_message, S_IRUGO | S_IWUGO, | 316 | DEVICE_ATTR(em_message, S_IRUGO | S_IWUSR, |
| 317 | ata_scsi_em_message_show, ata_scsi_em_message_store); | 317 | ata_scsi_em_message_show, ata_scsi_em_message_store); |
| 318 | EXPORT_SYMBOL_GPL(dev_attr_em_message); | 318 | EXPORT_SYMBOL_GPL(dev_attr_em_message); |
| 319 | 319 | ||
| @@ -366,7 +366,7 @@ ata_scsi_activity_store(struct device *dev, struct device_attribute *attr, | |||
| 366 | } | 366 | } |
| 367 | return -EINVAL; | 367 | return -EINVAL; |
| 368 | } | 368 | } |
| 369 | DEVICE_ATTR(sw_activity, S_IWUGO | S_IRUGO, ata_scsi_activity_show, | 369 | DEVICE_ATTR(sw_activity, S_IWUSR | S_IRUGO, ata_scsi_activity_show, |
| 370 | ata_scsi_activity_store); | 370 | ata_scsi_activity_store); |
| 371 | EXPORT_SYMBOL_GPL(dev_attr_sw_activity); | 371 | EXPORT_SYMBOL_GPL(dev_attr_sw_activity); |
| 372 | 372 | ||
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c index 5fedb3d4032b..2f3c9bed63d9 100644 --- a/drivers/ata/pata_pdc202xx_old.c +++ b/drivers/ata/pata_pdc202xx_old.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * pata_pdc202xx_old.c - Promise PDC202xx PATA for new ATA layer | 2 | * pata_pdc202xx_old.c - Promise PDC202xx PATA for new ATA layer |
| 3 | * (C) 2005 Red Hat Inc | 3 | * (C) 2005 Red Hat Inc |
| 4 | * Alan Cox <alan@lxorguk.ukuu.org.uk> | 4 | * Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 5 | * (C) 2007 Bartlomiej Zolnierkiewicz | 5 | * (C) 2007,2009 Bartlomiej Zolnierkiewicz |
| 6 | * | 6 | * |
| 7 | * Based in part on linux/drivers/ide/pci/pdc202xx_old.c | 7 | * Based in part on linux/drivers/ide/pci/pdc202xx_old.c |
| 8 | * | 8 | * |
| @@ -158,7 +158,7 @@ static void pdc2026x_bmdma_start(struct ata_queued_cmd *qc) | |||
| 158 | u32 len; | 158 | u32 len; |
| 159 | 159 | ||
| 160 | /* Check we keep host level locking here */ | 160 | /* Check we keep host level locking here */ |
| 161 | if (adev->dma_mode >= XFER_UDMA_2) | 161 | if (adev->dma_mode > XFER_UDMA_2) |
| 162 | iowrite8(ioread8(clock) | sel66, clock); | 162 | iowrite8(ioread8(clock) | sel66, clock); |
| 163 | else | 163 | else |
| 164 | iowrite8(ioread8(clock) & ~sel66, clock); | 164 | iowrite8(ioread8(clock) & ~sel66, clock); |
| @@ -212,7 +212,7 @@ static void pdc2026x_bmdma_stop(struct ata_queued_cmd *qc) | |||
| 212 | iowrite8(ioread8(clock) & ~sel66, clock); | 212 | iowrite8(ioread8(clock) & ~sel66, clock); |
| 213 | } | 213 | } |
| 214 | /* Flip back to 33Mhz for PIO */ | 214 | /* Flip back to 33Mhz for PIO */ |
| 215 | if (adev->dma_mode >= XFER_UDMA_2) | 215 | if (adev->dma_mode > XFER_UDMA_2) |
| 216 | iowrite8(ioread8(clock) & ~sel66, clock); | 216 | iowrite8(ioread8(clock) & ~sel66, clock); |
| 217 | ata_bmdma_stop(qc); | 217 | ata_bmdma_stop(qc); |
| 218 | pdc202xx_set_piomode(ap, adev); | 218 | pdc202xx_set_piomode(ap, adev); |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 870dcfd82357..23714aefb825 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -293,6 +293,10 @@ enum { | |||
| 293 | FISCFG_WAIT_DEV_ERR = (1 << 8), /* wait for host on DevErr */ | 293 | FISCFG_WAIT_DEV_ERR = (1 << 8), /* wait for host on DevErr */ |
| 294 | FISCFG_SINGLE_SYNC = (1 << 16), /* SYNC on DMA activation */ | 294 | FISCFG_SINGLE_SYNC = (1 << 16), /* SYNC on DMA activation */ |
| 295 | 295 | ||
| 296 | PHY_MODE9_GEN2 = 0x398, | ||
| 297 | PHY_MODE9_GEN1 = 0x39c, | ||
| 298 | PHYCFG_OFS = 0x3a0, /* only in 65n devices */ | ||
| 299 | |||
| 296 | MV5_PHY_MODE = 0x74, | 300 | MV5_PHY_MODE = 0x74, |
| 297 | MV5_LTMODE = 0x30, | 301 | MV5_LTMODE = 0x30, |
| 298 | MV5_PHY_CTL = 0x0C, | 302 | MV5_PHY_CTL = 0x0C, |
| @@ -609,6 +613,8 @@ static int mv_soc_reset_hc(struct mv_host_priv *hpriv, | |||
| 609 | static void mv_soc_reset_flash(struct mv_host_priv *hpriv, | 613 | static void mv_soc_reset_flash(struct mv_host_priv *hpriv, |
| 610 | void __iomem *mmio); | 614 | void __iomem *mmio); |
| 611 | static void mv_soc_reset_bus(struct ata_host *host, void __iomem *mmio); | 615 | static void mv_soc_reset_bus(struct ata_host *host, void __iomem *mmio); |
| 616 | static void mv_soc_65n_phy_errata(struct mv_host_priv *hpriv, | ||
| 617 | void __iomem *mmio, unsigned int port); | ||
| 612 | static void mv_reset_pci_bus(struct ata_host *host, void __iomem *mmio); | 618 | static void mv_reset_pci_bus(struct ata_host *host, void __iomem *mmio); |
| 613 | static void mv_reset_channel(struct mv_host_priv *hpriv, void __iomem *mmio, | 619 | static void mv_reset_channel(struct mv_host_priv *hpriv, void __iomem *mmio, |
| 614 | unsigned int port_no); | 620 | unsigned int port_no); |
| @@ -807,6 +813,14 @@ static const struct mv_hw_ops mv_soc_ops = { | |||
| 807 | .reset_bus = mv_soc_reset_bus, | 813 | .reset_bus = mv_soc_reset_bus, |
| 808 | }; | 814 | }; |
| 809 | 815 | ||
| 816 | static const struct mv_hw_ops mv_soc_65n_ops = { | ||
| 817 | .phy_errata = mv_soc_65n_phy_errata, | ||
| 818 | .enable_leds = mv_soc_enable_leds, | ||
| 819 | .reset_hc = mv_soc_reset_hc, | ||
| 820 | .reset_flash = mv_soc_reset_flash, | ||
| 821 | .reset_bus = mv_soc_reset_bus, | ||
| 822 | }; | ||
| 823 | |||
| 810 | /* | 824 | /* |
| 811 | * Functions | 825 | * Functions |
| 812 | */ | 826 | */ |
| @@ -3397,6 +3411,53 @@ static void mv_soc_reset_bus(struct ata_host *host, void __iomem *mmio) | |||
| 3397 | return; | 3411 | return; |
| 3398 | } | 3412 | } |
| 3399 | 3413 | ||
| 3414 | static void mv_soc_65n_phy_errata(struct mv_host_priv *hpriv, | ||
| 3415 | void __iomem *mmio, unsigned int port) | ||
| 3416 | { | ||
| 3417 | void __iomem *port_mmio = mv_port_base(mmio, port); | ||
| 3418 | u32 reg; | ||
| 3419 | |||
| 3420 | reg = readl(port_mmio + PHY_MODE3); | ||
| 3421 | reg &= ~(0x3 << 27); /* SELMUPF (bits 28:27) to 1 */ | ||
| 3422 | reg |= (0x1 << 27); | ||
| 3423 | reg &= ~(0x3 << 29); /* SELMUPI (bits 30:29) to 1 */ | ||
| 3424 | reg |= (0x1 << 29); | ||
| 3425 | writel(reg, port_mmio + PHY_MODE3); | ||
| 3426 | |||
| 3427 | reg = readl(port_mmio + PHY_MODE4); | ||
| 3428 | reg &= ~0x1; /* SATU_OD8 (bit 0) to 0, reserved bit 16 must be set */ | ||
| 3429 | reg |= (0x1 << 16); | ||
| 3430 | writel(reg, port_mmio + PHY_MODE4); | ||
| 3431 | |||
| 3432 | reg = readl(port_mmio + PHY_MODE9_GEN2); | ||
| 3433 | reg &= ~0xf; /* TXAMP[3:0] (bits 3:0) to 8 */ | ||
| 3434 | reg |= 0x8; | ||
| 3435 | reg &= ~(0x1 << 14); /* TXAMP[4] (bit 14) to 0 */ | ||
| 3436 | writel(reg, port_mmio + PHY_MODE9_GEN2); | ||
| 3437 | |||
| 3438 | reg = readl(port_mmio + PHY_MODE9_GEN1); | ||
| 3439 | reg &= ~0xf; /* TXAMP[3:0] (bits 3:0) to 8 */ | ||
| 3440 | reg |= 0x8; | ||
| 3441 | reg &= ~(0x1 << 14); /* TXAMP[4] (bit 14) to 0 */ | ||
| 3442 | writel(reg, port_mmio + PHY_MODE9_GEN1); | ||
| 3443 | } | ||
| 3444 | |||
| 3445 | /** | ||
| 3446 | * soc_is_65 - check if the soc is 65 nano device | ||
| 3447 | * | ||
| 3448 | * Detect the type of the SoC, this is done by reading the PHYCFG_OFS | ||
| 3449 | * register, this register should contain non-zero value and it exists only | ||
| 3450 | * in the 65 nano devices, when reading it from older devices we get 0. | ||
| 3451 | */ | ||
| 3452 | static bool soc_is_65n(struct mv_host_priv *hpriv) | ||
| 3453 | { | ||
| 3454 | void __iomem *port0_mmio = mv_port_base(hpriv->base, 0); | ||
| 3455 | |||
| 3456 | if (readl(port0_mmio + PHYCFG_OFS)) | ||
| 3457 | return true; | ||
| 3458 | return false; | ||
| 3459 | } | ||
| 3460 | |||
| 3400 | static void mv_setup_ifcfg(void __iomem *port_mmio, int want_gen2i) | 3461 | static void mv_setup_ifcfg(void __iomem *port_mmio, int want_gen2i) |
| 3401 | { | 3462 | { |
| 3402 | u32 ifcfg = readl(port_mmio + SATA_IFCFG); | 3463 | u32 ifcfg = readl(port_mmio + SATA_IFCFG); |
| @@ -3737,7 +3798,10 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx) | |||
| 3737 | } | 3798 | } |
| 3738 | break; | 3799 | break; |
| 3739 | case chip_soc: | 3800 | case chip_soc: |
| 3740 | hpriv->ops = &mv_soc_ops; | 3801 | if (soc_is_65n(hpriv)) |
| 3802 | hpriv->ops = &mv_soc_65n_ops; | ||
| 3803 | else | ||
| 3804 | hpriv->ops = &mv_soc_ops; | ||
| 3741 | hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE | | 3805 | hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE | |
| 3742 | MV_HP_ERRATA_60X1C0; | 3806 | MV_HP_ERRATA_60X1C0; |
| 3743 | break; | 3807 | break; |
| @@ -3800,7 +3864,8 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx) | |||
| 3800 | n_hc = mv_get_hc_count(host->ports[0]->flags); | 3864 | n_hc = mv_get_hc_count(host->ports[0]->flags); |
| 3801 | 3865 | ||
| 3802 | for (port = 0; port < host->n_ports; port++) | 3866 | for (port = 0; port < host->n_ports; port++) |
| 3803 | hpriv->ops->read_preamp(hpriv, port, mmio); | 3867 | if (hpriv->ops->read_preamp) |
| 3868 | hpriv->ops->read_preamp(hpriv, port, mmio); | ||
| 3804 | 3869 | ||
| 3805 | rc = hpriv->ops->reset_hc(hpriv, mmio, n_hc); | 3870 | rc = hpriv->ops->reset_hc(hpriv, mmio, n_hc); |
| 3806 | if (rc) | 3871 | if (rc) |
diff --git a/drivers/base/iommu.c b/drivers/base/iommu.c index 9f0e672f4be8..8ad4ffea6920 100644 --- a/drivers/base/iommu.c +++ b/drivers/base/iommu.c | |||
| @@ -18,6 +18,8 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/bug.h> | 19 | #include <linux/bug.h> |
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <linux/module.h> | ||
| 22 | #include <linux/slab.h> | ||
| 21 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 22 | #include <linux/iommu.h> | 24 | #include <linux/iommu.h> |
| 23 | 25 | ||
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index b5b6c973a2e0..8b4708e06244 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
| @@ -217,7 +217,6 @@ int platform_device_add_data(struct platform_device *pdev, const void *data, | |||
| 217 | if (d) { | 217 | if (d) { |
| 218 | memcpy(d, data, size); | 218 | memcpy(d, data, size); |
| 219 | pdev->dev.platform_data = d; | 219 | pdev->dev.platform_data = d; |
| 220 | pdev->platform_data = d; | ||
| 221 | } | 220 | } |
| 222 | return d ? 0 : -ENOMEM; | 221 | return d ? 0 : -ENOMEM; |
| 223 | } | 222 | } |
| @@ -247,21 +246,6 @@ int platform_device_add(struct platform_device *pdev) | |||
| 247 | else | 246 | else |
| 248 | dev_set_name(&pdev->dev, pdev->name); | 247 | dev_set_name(&pdev->dev, pdev->name); |
| 249 | 248 | ||
| 250 | /* We will remove platform_data field from struct device | ||
| 251 | * if all platform devices pass its platform specific data | ||
| 252 | * from platform_device. The conversion is going to be a | ||
| 253 | * long time, so we allow the two cases coexist to make | ||
| 254 | * this kind of fix more easily*/ | ||
| 255 | if (pdev->platform_data && pdev->dev.platform_data) { | ||
| 256 | printk(KERN_ERR | ||
| 257 | "%s: use which platform_data?\n", | ||
| 258 | dev_name(&pdev->dev)); | ||
| 259 | } else if (pdev->platform_data) { | ||
| 260 | pdev->dev.platform_data = pdev->platform_data; | ||
| 261 | } else if (pdev->dev.platform_data) { | ||
| 262 | pdev->platform_data = pdev->dev.platform_data; | ||
| 263 | } | ||
| 264 | |||
| 265 | for (i = 0; i < pdev->num_resources; i++) { | 249 | for (i = 0; i < pdev->num_resources; i++) { |
| 266 | struct resource *p, *r = &pdev->resource[i]; | 250 | struct resource *p, *r = &pdev->resource[i]; |
| 267 | 251 | ||
| @@ -1028,7 +1012,7 @@ static __initdata LIST_HEAD(early_platform_device_list); | |||
| 1028 | 1012 | ||
| 1029 | /** | 1013 | /** |
| 1030 | * early_platform_driver_register | 1014 | * early_platform_driver_register |
| 1031 | * @edrv: early_platform driver structure | 1015 | * @epdrv: early_platform driver structure |
| 1032 | * @buf: string passed from early_param() | 1016 | * @buf: string passed from early_param() |
| 1033 | */ | 1017 | */ |
| 1034 | int __init early_platform_driver_register(struct early_platform_driver *epdrv, | 1018 | int __init early_platform_driver_register(struct early_platform_driver *epdrv, |
| @@ -1112,7 +1096,7 @@ void __init early_platform_driver_register_all(char *class_str) | |||
| 1112 | 1096 | ||
| 1113 | /** | 1097 | /** |
| 1114 | * early_platform_match | 1098 | * early_platform_match |
| 1115 | * @edrv: early platform driver structure | 1099 | * @epdrv: early platform driver structure |
| 1116 | * @id: id to match against | 1100 | * @id: id to match against |
| 1117 | */ | 1101 | */ |
| 1118 | static __init struct platform_device * | 1102 | static __init struct platform_device * |
| @@ -1130,7 +1114,7 @@ early_platform_match(struct early_platform_driver *epdrv, int id) | |||
| 1130 | 1114 | ||
| 1131 | /** | 1115 | /** |
| 1132 | * early_platform_left | 1116 | * early_platform_left |
| 1133 | * @edrv: early platform driver structure | 1117 | * @epdrv: early platform driver structure |
| 1134 | * @id: return true if id or above exists | 1118 | * @id: return true if id or above exists |
| 1135 | */ | 1119 | */ |
| 1136 | static __init int early_platform_left(struct early_platform_driver *epdrv, | 1120 | static __init int early_platform_left(struct early_platform_driver *epdrv, |
diff --git a/drivers/char/random.c b/drivers/char/random.c index f824ef8a9273..b2ced39d76b2 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -1665,15 +1665,20 @@ EXPORT_SYMBOL(secure_dccp_sequence_number); | |||
| 1665 | * value is not cryptographically secure but for several uses the cost of | 1665 | * value is not cryptographically secure but for several uses the cost of |
| 1666 | * depleting entropy is too high | 1666 | * depleting entropy is too high |
| 1667 | */ | 1667 | */ |
| 1668 | DEFINE_PER_CPU(__u32 [4], get_random_int_hash); | ||
| 1668 | unsigned int get_random_int(void) | 1669 | unsigned int get_random_int(void) |
| 1669 | { | 1670 | { |
| 1670 | /* | 1671 | struct keydata *keyptr; |
| 1671 | * Use IP's RNG. It suits our purpose perfectly: it re-keys itself | 1672 | __u32 *hash = get_cpu_var(get_random_int_hash); |
| 1672 | * every second, from the entropy pool (and thus creates a limited | 1673 | int ret; |
| 1673 | * drain on it), and uses halfMD4Transform within the second. We | 1674 | |
| 1674 | * also mix it with jiffies and the PID: | 1675 | keyptr = get_keyptr(); |
| 1675 | */ | 1676 | hash[0] += current->pid + jiffies + get_cycles() + (int)(long)&ret; |
| 1676 | return secure_ip_id((__force __be32)(current->pid + jiffies)); | 1677 | |
| 1678 | ret = half_md4_transform(hash, keyptr->secret); | ||
| 1679 | put_cpu_var(get_random_int_hash); | ||
| 1680 | |||
| 1681 | return ret; | ||
| 1677 | } | 1682 | } |
| 1678 | 1683 | ||
| 1679 | /* | 1684 | /* |
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index a2dee0eb6dad..e6ce632a393e 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c | |||
| @@ -400,6 +400,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, | |||
| 400 | case KIOCSOUND: | 400 | case KIOCSOUND: |
| 401 | if (!perm) | 401 | if (!perm) |
| 402 | goto eperm; | 402 | goto eperm; |
| 403 | /* FIXME: This is an old broken API but we need to keep it | ||
| 404 | supported and somehow separate the historic advertised | ||
| 405 | tick rate from any real one */ | ||
| 403 | if (arg) | 406 | if (arg) |
| 404 | arg = CLOCK_TICK_RATE / arg; | 407 | arg = CLOCK_TICK_RATE / arg; |
| 405 | kd_mksound(arg, 0); | 408 | kd_mksound(arg, 0); |
| @@ -417,6 +420,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, | |||
| 417 | */ | 420 | */ |
| 418 | ticks = HZ * ((arg >> 16) & 0xffff) / 1000; | 421 | ticks = HZ * ((arg >> 16) & 0xffff) / 1000; |
| 419 | count = ticks ? (arg & 0xffff) : 0; | 422 | count = ticks ? (arg & 0xffff) : 0; |
| 423 | /* FIXME: This is an old broken API but we need to keep it | ||
| 424 | supported and somehow separate the historic advertised | ||
| 425 | tick rate from any real one */ | ||
| 420 | if (count) | 426 | if (count) |
| 421 | count = CLOCK_TICK_RATE / count; | 427 | count = CLOCK_TICK_RATE / count; |
| 422 | kd_mksound(count, ticks); | 428 | kd_mksound(count, ticks); |
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 92438e9dacc3..5a87384ea4ff 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -804,11 +804,14 @@ dma_async_memcpy_buf_to_buf(struct dma_chan *chan, void *dest, | |||
| 804 | dma_addr_t dma_dest, dma_src; | 804 | dma_addr_t dma_dest, dma_src; |
| 805 | dma_cookie_t cookie; | 805 | dma_cookie_t cookie; |
| 806 | int cpu; | 806 | int cpu; |
| 807 | unsigned long flags; | ||
| 807 | 808 | ||
| 808 | dma_src = dma_map_single(dev->dev, src, len, DMA_TO_DEVICE); | 809 | dma_src = dma_map_single(dev->dev, src, len, DMA_TO_DEVICE); |
| 809 | dma_dest = dma_map_single(dev->dev, dest, len, DMA_FROM_DEVICE); | 810 | dma_dest = dma_map_single(dev->dev, dest, len, DMA_FROM_DEVICE); |
| 810 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, | 811 | flags = DMA_CTRL_ACK | |
| 811 | DMA_CTRL_ACK); | 812 | DMA_COMPL_SRC_UNMAP_SINGLE | |
| 813 | DMA_COMPL_DEST_UNMAP_SINGLE; | ||
| 814 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags); | ||
| 812 | 815 | ||
| 813 | if (!tx) { | 816 | if (!tx) { |
| 814 | dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE); | 817 | dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE); |
| @@ -850,11 +853,12 @@ dma_async_memcpy_buf_to_pg(struct dma_chan *chan, struct page *page, | |||
| 850 | dma_addr_t dma_dest, dma_src; | 853 | dma_addr_t dma_dest, dma_src; |
| 851 | dma_cookie_t cookie; | 854 | dma_cookie_t cookie; |
| 852 | int cpu; | 855 | int cpu; |
| 856 | unsigned long flags; | ||
| 853 | 857 | ||
| 854 | dma_src = dma_map_single(dev->dev, kdata, len, DMA_TO_DEVICE); | 858 | dma_src = dma_map_single(dev->dev, kdata, len, DMA_TO_DEVICE); |
| 855 | dma_dest = dma_map_page(dev->dev, page, offset, len, DMA_FROM_DEVICE); | 859 | dma_dest = dma_map_page(dev->dev, page, offset, len, DMA_FROM_DEVICE); |
| 856 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, | 860 | flags = DMA_CTRL_ACK | DMA_COMPL_SRC_UNMAP_SINGLE; |
| 857 | DMA_CTRL_ACK); | 861 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags); |
| 858 | 862 | ||
| 859 | if (!tx) { | 863 | if (!tx) { |
| 860 | dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE); | 864 | dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE); |
| @@ -898,12 +902,13 @@ dma_async_memcpy_pg_to_pg(struct dma_chan *chan, struct page *dest_pg, | |||
| 898 | dma_addr_t dma_dest, dma_src; | 902 | dma_addr_t dma_dest, dma_src; |
| 899 | dma_cookie_t cookie; | 903 | dma_cookie_t cookie; |
| 900 | int cpu; | 904 | int cpu; |
| 905 | unsigned long flags; | ||
| 901 | 906 | ||
| 902 | dma_src = dma_map_page(dev->dev, src_pg, src_off, len, DMA_TO_DEVICE); | 907 | dma_src = dma_map_page(dev->dev, src_pg, src_off, len, DMA_TO_DEVICE); |
| 903 | dma_dest = dma_map_page(dev->dev, dest_pg, dest_off, len, | 908 | dma_dest = dma_map_page(dev->dev, dest_pg, dest_off, len, |
| 904 | DMA_FROM_DEVICE); | 909 | DMA_FROM_DEVICE); |
| 905 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, | 910 | flags = DMA_CTRL_ACK; |
| 906 | DMA_CTRL_ACK); | 911 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags); |
| 907 | 912 | ||
| 908 | if (!tx) { | 913 | if (!tx) { |
| 909 | dma_unmap_page(dev->dev, dma_src, len, DMA_TO_DEVICE); | 914 | dma_unmap_page(dev->dev, dma_src, len, DMA_TO_DEVICE); |
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index a27c0fb1bc11..fb7da5141e96 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
| @@ -531,9 +531,7 @@ static int __init dmatest_init(void) | |||
| 531 | chan = dma_request_channel(mask, filter, NULL); | 531 | chan = dma_request_channel(mask, filter, NULL); |
| 532 | if (chan) { | 532 | if (chan) { |
| 533 | err = dmatest_add_channel(chan); | 533 | err = dmatest_add_channel(chan); |
| 534 | if (err == 0) | 534 | if (err) { |
| 535 | continue; | ||
| 536 | else { | ||
| 537 | dma_release_channel(chan); | 535 | dma_release_channel(chan); |
| 538 | break; /* add_channel failed, punt */ | 536 | break; /* add_channel failed, punt */ |
| 539 | } | 537 | } |
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index e4fc33c1c32f..1955ee8d6d20 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c | |||
| @@ -1063,22 +1063,31 @@ static void ioat_dma_cleanup_tasklet(unsigned long data) | |||
| 1063 | static void | 1063 | static void |
| 1064 | ioat_dma_unmap(struct ioat_dma_chan *ioat_chan, struct ioat_desc_sw *desc) | 1064 | ioat_dma_unmap(struct ioat_dma_chan *ioat_chan, struct ioat_desc_sw *desc) |
| 1065 | { | 1065 | { |
| 1066 | /* | 1066 | if (!(desc->async_tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) { |
| 1067 | * yes we are unmapping both _page and _single | 1067 | if (desc->async_tx.flags & DMA_COMPL_DEST_UNMAP_SINGLE) |
| 1068 | * alloc'd regions with unmap_page. Is this | 1068 | pci_unmap_single(ioat_chan->device->pdev, |
| 1069 | * *really* that bad? | 1069 | pci_unmap_addr(desc, dst), |
| 1070 | */ | 1070 | pci_unmap_len(desc, len), |
| 1071 | if (!(desc->async_tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) | 1071 | PCI_DMA_FROMDEVICE); |
| 1072 | pci_unmap_page(ioat_chan->device->pdev, | 1072 | else |
| 1073 | pci_unmap_addr(desc, dst), | 1073 | pci_unmap_page(ioat_chan->device->pdev, |
| 1074 | pci_unmap_len(desc, len), | 1074 | pci_unmap_addr(desc, dst), |
| 1075 | PCI_DMA_FROMDEVICE); | 1075 | pci_unmap_len(desc, len), |
| 1076 | 1076 | PCI_DMA_FROMDEVICE); | |
| 1077 | if (!(desc->async_tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) | 1077 | } |
| 1078 | pci_unmap_page(ioat_chan->device->pdev, | 1078 | |
| 1079 | pci_unmap_addr(desc, src), | 1079 | if (!(desc->async_tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) { |
| 1080 | pci_unmap_len(desc, len), | 1080 | if (desc->async_tx.flags & DMA_COMPL_SRC_UNMAP_SINGLE) |
| 1081 | PCI_DMA_TODEVICE); | 1081 | pci_unmap_single(ioat_chan->device->pdev, |
| 1082 | pci_unmap_addr(desc, src), | ||
| 1083 | pci_unmap_len(desc, len), | ||
| 1084 | PCI_DMA_TODEVICE); | ||
| 1085 | else | ||
| 1086 | pci_unmap_page(ioat_chan->device->pdev, | ||
| 1087 | pci_unmap_addr(desc, src), | ||
| 1088 | pci_unmap_len(desc, len), | ||
| 1089 | PCI_DMA_TODEVICE); | ||
| 1090 | } | ||
| 1082 | } | 1091 | } |
| 1083 | 1092 | ||
| 1084 | /** | 1093 | /** |
| @@ -1363,6 +1372,7 @@ static int ioat_dma_self_test(struct ioatdma_device *device) | |||
| 1363 | int err = 0; | 1372 | int err = 0; |
| 1364 | struct completion cmp; | 1373 | struct completion cmp; |
| 1365 | unsigned long tmo; | 1374 | unsigned long tmo; |
| 1375 | unsigned long flags; | ||
| 1366 | 1376 | ||
| 1367 | src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL); | 1377 | src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL); |
| 1368 | if (!src) | 1378 | if (!src) |
| @@ -1392,8 +1402,9 @@ static int ioat_dma_self_test(struct ioatdma_device *device) | |||
| 1392 | DMA_TO_DEVICE); | 1402 | DMA_TO_DEVICE); |
| 1393 | dma_dest = dma_map_single(dma_chan->device->dev, dest, IOAT_TEST_SIZE, | 1403 | dma_dest = dma_map_single(dma_chan->device->dev, dest, IOAT_TEST_SIZE, |
| 1394 | DMA_FROM_DEVICE); | 1404 | DMA_FROM_DEVICE); |
| 1405 | flags = DMA_COMPL_SRC_UNMAP_SINGLE | DMA_COMPL_DEST_UNMAP_SINGLE; | ||
| 1395 | tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src, | 1406 | tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src, |
| 1396 | IOAT_TEST_SIZE, 0); | 1407 | IOAT_TEST_SIZE, flags); |
| 1397 | if (!tx) { | 1408 | if (!tx) { |
| 1398 | dev_err(&device->pdev->dev, | 1409 | dev_err(&device->pdev->dev, |
| 1399 | "Self-test prep failed, disabling\n"); | 1410 | "Self-test prep failed, disabling\n"); |
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index e202a6ce5573..9a5bc1a7389e 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c | |||
| @@ -1272,7 +1272,8 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id) | |||
| 1272 | /* Other interrupts do not interfere with this channel */ | 1272 | /* Other interrupts do not interfere with this channel */ |
| 1273 | spin_lock(&ichan->lock); | 1273 | spin_lock(&ichan->lock); |
| 1274 | if (unlikely(chan_id != IDMAC_SDC_0 && chan_id != IDMAC_SDC_1 && | 1274 | if (unlikely(chan_id != IDMAC_SDC_0 && chan_id != IDMAC_SDC_1 && |
| 1275 | ((curbuf >> chan_id) & 1) == ichan->active_buffer)) { | 1275 | ((curbuf >> chan_id) & 1) == ichan->active_buffer && |
| 1276 | !list_is_last(ichan->queue.next, &ichan->queue))) { | ||
| 1276 | int i = 100; | 1277 | int i = 100; |
| 1277 | 1278 | ||
| 1278 | /* This doesn't help. See comment in ipu_disable_channel() */ | 1279 | /* This doesn't help. See comment in ipu_disable_channel() */ |
| @@ -1547,7 +1548,7 @@ static irqreturn_t ic_sof_irq(int irq, void *dev_id) | |||
| 1547 | struct idmac_channel *ichan = dev_id; | 1548 | struct idmac_channel *ichan = dev_id; |
| 1548 | printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n", | 1549 | printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n", |
| 1549 | irq, ichan->dma_chan.chan_id); | 1550 | irq, ichan->dma_chan.chan_id); |
| 1550 | disable_irq(irq); | 1551 | disable_irq_nosync(irq); |
| 1551 | return IRQ_HANDLED; | 1552 | return IRQ_HANDLED; |
| 1552 | } | 1553 | } |
| 1553 | 1554 | ||
| @@ -1556,7 +1557,7 @@ static irqreturn_t ic_eof_irq(int irq, void *dev_id) | |||
| 1556 | struct idmac_channel *ichan = dev_id; | 1557 | struct idmac_channel *ichan = dev_id; |
| 1557 | printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n", | 1558 | printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n", |
| 1558 | irq, ichan->dma_chan.chan_id); | 1559 | irq, ichan->dma_chan.chan_id); |
| 1559 | disable_irq(irq); | 1560 | disable_irq_nosync(irq); |
| 1560 | return IRQ_HANDLED; | 1561 | return IRQ_HANDLED; |
| 1561 | } | 1562 | } |
| 1562 | 1563 | ||
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index a04639dc633d..45890447feec 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
| @@ -561,7 +561,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, | |||
| 561 | int saved_x, saved_y; | 561 | int saved_x, saved_y; |
| 562 | struct drm_encoder *encoder; | 562 | struct drm_encoder *encoder; |
| 563 | bool ret = true; | 563 | bool ret = true; |
| 564 | bool depth_changed, bpp_changed; | ||
| 565 | 564 | ||
| 566 | adjusted_mode = drm_mode_duplicate(dev, mode); | 565 | adjusted_mode = drm_mode_duplicate(dev, mode); |
| 567 | 566 | ||
| @@ -570,15 +569,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, | |||
| 570 | if (!crtc->enabled) | 569 | if (!crtc->enabled) |
| 571 | return true; | 570 | return true; |
| 572 | 571 | ||
| 573 | if (old_fb && crtc->fb) { | ||
| 574 | depth_changed = (old_fb->depth != crtc->fb->depth); | ||
| 575 | bpp_changed = (old_fb->bits_per_pixel != | ||
| 576 | crtc->fb->bits_per_pixel); | ||
| 577 | } else { | ||
| 578 | depth_changed = true; | ||
| 579 | bpp_changed = true; | ||
| 580 | } | ||
| 581 | |||
| 582 | saved_mode = crtc->mode; | 572 | saved_mode = crtc->mode; |
| 583 | saved_x = crtc->x; | 573 | saved_x = crtc->x; |
| 584 | saved_y = crtc->y; | 574 | saved_y = crtc->y; |
| @@ -590,15 +580,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, | |||
| 590 | crtc->x = x; | 580 | crtc->x = x; |
| 591 | crtc->y = y; | 581 | crtc->y = y; |
| 592 | 582 | ||
| 593 | if (drm_mode_equal(&saved_mode, &crtc->mode)) { | ||
| 594 | if (saved_x != crtc->x || saved_y != crtc->y || | ||
| 595 | depth_changed || bpp_changed) { | ||
| 596 | ret = !crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y, | ||
| 597 | old_fb); | ||
| 598 | goto done; | ||
| 599 | } | ||
| 600 | } | ||
| 601 | |||
| 602 | /* Pass our mode to the connectors and the CRTC to give them a chance to | 583 | /* Pass our mode to the connectors and the CRTC to give them a chance to |
| 603 | * adjust it according to limitations or connector properties, and also | 584 | * adjust it according to limitations or connector properties, and also |
| 604 | * a chance to reject the mode entirely. | 585 | * a chance to reject the mode entirely. |
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index c4ada8b6295b..f01def16a669 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -456,7 +456,8 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
| 456 | retcode = -EINVAL; | 456 | retcode = -EINVAL; |
| 457 | } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || | 457 | } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || |
| 458 | ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || | 458 | ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || |
| 459 | ((ioctl->flags & DRM_MASTER) && !file_priv->is_master)) { | 459 | ((ioctl->flags & DRM_MASTER) && !file_priv->is_master) || |
| 460 | (!(ioctl->flags & DRM_CONTROL_ALLOW) && (file_priv->minor->type == DRM_MINOR_CONTROL))) { | ||
| 460 | retcode = -EACCES; | 461 | retcode = -EACCES; |
| 461 | } else { | 462 | } else { |
| 462 | if (cmd & (IOC_IN | IOC_OUT)) { | 463 | if (cmd & (IOC_IN | IOC_OUT)) { |
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index ef878615c49f..b9631e3a1ea6 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c | |||
| @@ -402,14 +402,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, | |||
| 402 | if (dev->driver->load) { | 402 | if (dev->driver->load) { |
| 403 | ret = dev->driver->load(dev, ent->driver_data); | 403 | ret = dev->driver->load(dev, ent->driver_data); |
| 404 | if (ret) | 404 | if (ret) |
| 405 | goto err_g3; | 405 | goto err_g4; |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | /* setup the grouping for the legacy output */ | 408 | /* setup the grouping for the legacy output */ |
| 409 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | 409 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
| 410 | ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); | 410 | ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); |
| 411 | if (ret) | 411 | if (ret) |
| 412 | goto err_g3; | 412 | goto err_g4; |
| 413 | } | 413 | } |
| 414 | 414 | ||
| 415 | list_add_tail(&dev->driver_item, &driver->device_list); | 415 | list_add_tail(&dev->driver_item, &driver->device_list); |
| @@ -420,8 +420,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, | |||
| 420 | 420 | ||
| 421 | return 0; | 421 | return 0; |
| 422 | 422 | ||
| 423 | err_g3: | 423 | err_g4: |
| 424 | drm_put_minor(&dev->primary); | 424 | drm_put_minor(&dev->primary); |
| 425 | err_g3: | ||
| 426 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | ||
| 427 | drm_put_minor(&dev->control); | ||
| 425 | err_g2: | 428 | err_g2: |
| 426 | pci_disable_device(pdev); | 429 | pci_disable_device(pdev); |
| 427 | err_g1: | 430 | err_g1: |
| @@ -502,11 +505,11 @@ void drm_put_dev(struct drm_device *dev) | |||
| 502 | dev->agp = NULL; | 505 | dev->agp = NULL; |
| 503 | } | 506 | } |
| 504 | 507 | ||
| 505 | drm_ht_remove(&dev->map_hash); | ||
| 506 | drm_ctxbitmap_cleanup(dev); | ||
| 507 | |||
| 508 | list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) | 508 | list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) |
| 509 | drm_rmmap(dev, r_list->map); | 509 | drm_rmmap(dev, r_list->map); |
| 510 | drm_ht_remove(&dev->map_hash); | ||
| 511 | |||
| 512 | drm_ctxbitmap_cleanup(dev); | ||
| 510 | 513 | ||
| 511 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | 514 | if (drm_core_check_feature(dev, DRIVER_MODESET)) |
| 512 | drm_put_minor(&dev->control); | 515 | drm_put_minor(&dev->control); |
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 022876ae34f0..8f9372921f82 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
| @@ -489,9 +489,7 @@ int drm_sysfs_device_add(struct drm_minor *minor) | |||
| 489 | 489 | ||
| 490 | return 0; | 490 | return 0; |
| 491 | 491 | ||
| 492 | device_unregister(&minor->kdev); | ||
| 493 | err_out: | 492 | err_out: |
| 494 | |||
| 495 | return err; | 493 | return err; |
| 496 | } | 494 | } |
| 497 | 495 | ||
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index 32de4cedc363..077c0455a6b9 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c | |||
| @@ -511,9 +511,9 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init) | |||
| 511 | 511 | ||
| 512 | #if __OS_HAS_AGP | 512 | #if __OS_HAS_AGP |
| 513 | if (!dev_priv->is_pci) { | 513 | if (!dev_priv->is_pci) { |
| 514 | drm_core_ioremap(dev_priv->cce_ring, dev); | 514 | drm_core_ioremap_wc(dev_priv->cce_ring, dev); |
| 515 | drm_core_ioremap(dev_priv->ring_rptr, dev); | 515 | drm_core_ioremap_wc(dev_priv->ring_rptr, dev); |
| 516 | drm_core_ioremap(dev->agp_buffer_map, dev); | 516 | drm_core_ioremap_wc(dev->agp_buffer_map, dev); |
| 517 | if (!dev_priv->cce_ring->handle || | 517 | if (!dev_priv->cce_ring->handle || |
| 518 | !dev_priv->ring_rptr->handle || | 518 | !dev_priv->ring_rptr->handle || |
| 519 | !dev->agp_buffer_map->handle) { | 519 | !dev->agp_buffer_map->handle) { |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index ed4d27e6ee6f..8071d965f142 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
| @@ -99,9 +99,10 @@ | |||
| 99 | * 1.27- Add support for IGP GART | 99 | * 1.27- Add support for IGP GART |
| 100 | * 1.28- Add support for VBL on CRTC2 | 100 | * 1.28- Add support for VBL on CRTC2 |
| 101 | * 1.29- R500 3D cmd buffer support | 101 | * 1.29- R500 3D cmd buffer support |
| 102 | * 1.30- Add support for occlusion queries | ||
| 102 | */ | 103 | */ |
| 103 | #define DRIVER_MAJOR 1 | 104 | #define DRIVER_MAJOR 1 |
| 104 | #define DRIVER_MINOR 29 | 105 | #define DRIVER_MINOR 30 |
| 105 | #define DRIVER_PATCHLEVEL 0 | 106 | #define DRIVER_PATCHLEVEL 0 |
| 106 | 107 | ||
| 107 | /* | 108 | /* |
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index 0897edef2574..bff0103610c1 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c | |||
| @@ -348,6 +348,7 @@ static int validate_hwmon_pack(struct atk_data *data, union acpi_object *obj) | |||
| 348 | return 0; | 348 | return 0; |
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | #ifdef DEBUG | ||
| 351 | static char const *atk_sensor_type(union acpi_object *flags) | 352 | static char const *atk_sensor_type(union acpi_object *flags) |
| 352 | { | 353 | { |
| 353 | u64 type = flags->integer.value & ATK_TYPE_MASK; | 354 | u64 type = flags->integer.value & ATK_TYPE_MASK; |
| @@ -370,6 +371,7 @@ static char const *atk_sensor_type(union acpi_object *flags) | |||
| 370 | 371 | ||
| 371 | return what; | 372 | return what; |
| 372 | } | 373 | } |
| 374 | #endif | ||
| 373 | 375 | ||
| 374 | static void atk_print_sensor(struct atk_data *data, union acpi_object *obj) | 376 | static void atk_print_sensor(struct atk_data *data, union acpi_object *obj) |
| 375 | { | 377 | { |
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index dbfb30c588d8..0bdab959b736 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
| @@ -1462,7 +1462,8 @@ static struct w83781d_data *w83781d_update_device(struct device *dev) | |||
| 1462 | data->pwm[i] = | 1462 | data->pwm[i] = |
| 1463 | w83781d_read_value(data, | 1463 | w83781d_read_value(data, |
| 1464 | W83781D_REG_PWM[i]); | 1464 | W83781D_REG_PWM[i]); |
| 1465 | if ((data->type != w83782d || !client->driver) | 1465 | /* Only W83782D on SMBus has PWM3 and PWM4 */ |
| 1466 | if ((data->type != w83782d || !client) | ||
| 1466 | && i == 1) | 1467 | && i == 1) |
| 1467 | break; | 1468 | break; |
| 1468 | } | 1469 | } |
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index d420cc5f5633..e25e13980af3 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c | |||
| @@ -104,7 +104,7 @@ static int sclhi(struct i2c_algo_bit_data *adap) | |||
| 104 | * chips may hold it low ("clock stretching") while they | 104 | * chips may hold it low ("clock stretching") while they |
| 105 | * are processing data internally. | 105 | * are processing data internally. |
| 106 | */ | 106 | */ |
| 107 | if (time_after_eq(jiffies, start + adap->timeout)) | 107 | if (time_after(jiffies, start + adap->timeout)) |
| 108 | return -ETIMEDOUT; | 108 | return -ETIMEDOUT; |
| 109 | cond_resched(); | 109 | cond_resched(); |
| 110 | } | 110 | } |
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index 6318f7ddc1d4..78d42aae0089 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c | |||
| @@ -287,10 +287,21 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, | |||
| 287 | 287 | ||
| 288 | case 0x30: /* Data byte in I2CDAT has been transmitted; NOT ACK has been received */ | 288 | case 0x30: /* Data byte in I2CDAT has been transmitted; NOT ACK has been received */ |
| 289 | DEB2("NOT ACK received after data byte\n"); | 289 | DEB2("NOT ACK received after data byte\n"); |
| 290 | pca_stop(adap); | ||
| 290 | goto out; | 291 | goto out; |
| 291 | 292 | ||
| 292 | case 0x38: /* Arbitration lost during SLA+W, SLA+R or data bytes */ | 293 | case 0x38: /* Arbitration lost during SLA+W, SLA+R or data bytes */ |
| 293 | DEB2("Arbitration lost\n"); | 294 | DEB2("Arbitration lost\n"); |
| 295 | /* | ||
| 296 | * The PCA9564 data sheet (2006-09-01) says "A | ||
| 297 | * START condition will be transmitted when the | ||
| 298 | * bus becomes free (STOP or SCL and SDA high)" | ||
| 299 | * when the STA bit is set (p. 11). | ||
| 300 | * | ||
| 301 | * In case this won't work, try pca_reset() | ||
| 302 | * instead. | ||
| 303 | */ | ||
| 304 | pca_start(adap); | ||
| 294 | goto out; | 305 | goto out; |
| 295 | 306 | ||
| 296 | case 0x58: /* Data byte has been received; NOT ACK has been returned */ | 307 | case 0x58: /* Data byte has been received; NOT ACK has been returned */ |
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index a48c8aee0218..f1c6ca7e2852 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -467,7 +467,7 @@ config I2C_PXA_SLAVE | |||
| 467 | 467 | ||
| 468 | config I2C_S3C2410 | 468 | config I2C_S3C2410 |
| 469 | tristate "S3C2410 I2C Driver" | 469 | tristate "S3C2410 I2C Driver" |
| 470 | depends on ARCH_S3C2410 | 470 | depends on ARCH_S3C2410 || ARCH_S3C64XX |
| 471 | help | 471 | help |
| 472 | Say Y here to include support for I2C controller in the | 472 | Say Y here to include support for I2C controller in the |
| 473 | Samsung S3C2410 based System-on-Chip devices. | 473 | Samsung S3C2410 based System-on-Chip devices. |
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c index 981e080b32ae..d108450df064 100644 --- a/drivers/i2c/busses/i2c-ali1535.c +++ b/drivers/i2c/busses/i2c-ali1535.c | |||
| @@ -284,7 +284,7 @@ static int ali1535_transaction(struct i2c_adapter *adap) | |||
| 284 | && (timeout++ < MAX_TIMEOUT)); | 284 | && (timeout++ < MAX_TIMEOUT)); |
| 285 | 285 | ||
| 286 | /* If the SMBus is still busy, we give up */ | 286 | /* If the SMBus is still busy, we give up */ |
| 287 | if (timeout >= MAX_TIMEOUT) { | 287 | if (timeout > MAX_TIMEOUT) { |
| 288 | result = -ETIMEDOUT; | 288 | result = -ETIMEDOUT; |
| 289 | dev_err(&adap->dev, "SMBus Timeout!\n"); | 289 | dev_err(&adap->dev, "SMBus Timeout!\n"); |
| 290 | } | 290 | } |
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index 39066dee46e3..d627fceb790b 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c | |||
| @@ -306,7 +306,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap) | |||
| 306 | && (timeout++ < MAX_TIMEOUT)); | 306 | && (timeout++ < MAX_TIMEOUT)); |
| 307 | 307 | ||
| 308 | /* If the SMBus is still busy, we give up */ | 308 | /* If the SMBus is still busy, we give up */ |
| 309 | if (timeout >= MAX_TIMEOUT) { | 309 | if (timeout > MAX_TIMEOUT) { |
| 310 | result = -ETIMEDOUT; | 310 | result = -ETIMEDOUT; |
| 311 | dev_err(&adap->dev, "SMBus Timeout!\n"); | 311 | dev_err(&adap->dev, "SMBus Timeout!\n"); |
| 312 | } | 312 | } |
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 220f4a1eee1d..f7d6fe9c49ba 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c | |||
| @@ -126,7 +126,7 @@ static int amd756_transaction(struct i2c_adapter *adap) | |||
| 126 | } while ((temp & (GS_HST_STS | GS_SMB_STS)) && | 126 | } while ((temp & (GS_HST_STS | GS_SMB_STS)) && |
| 127 | (timeout++ < MAX_TIMEOUT)); | 127 | (timeout++ < MAX_TIMEOUT)); |
| 128 | /* If the SMBus is still busy, we give up */ | 128 | /* If the SMBus is still busy, we give up */ |
| 129 | if (timeout >= MAX_TIMEOUT) { | 129 | if (timeout > MAX_TIMEOUT) { |
| 130 | dev_dbg(&adap->dev, "Busy wait timeout (%04x)\n", temp); | 130 | dev_dbg(&adap->dev, "Busy wait timeout (%04x)\n", temp); |
| 131 | goto abort; | 131 | goto abort; |
| 132 | } | 132 | } |
| @@ -143,7 +143,7 @@ static int amd756_transaction(struct i2c_adapter *adap) | |||
| 143 | } while ((temp & GS_HST_STS) && (timeout++ < MAX_TIMEOUT)); | 143 | } while ((temp & GS_HST_STS) && (timeout++ < MAX_TIMEOUT)); |
| 144 | 144 | ||
| 145 | /* If the SMBus is still busy, we give up */ | 145 | /* If the SMBus is still busy, we give up */ |
| 146 | if (timeout >= MAX_TIMEOUT) { | 146 | if (timeout > MAX_TIMEOUT) { |
| 147 | dev_dbg(&adap->dev, "Completion timeout!\n"); | 147 | dev_dbg(&adap->dev, "Completion timeout!\n"); |
| 148 | goto abort; | 148 | goto abort; |
| 149 | } | 149 | } |
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 3fcf78e906db..b5db8b883615 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c | |||
| @@ -531,16 +531,16 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) | |||
| 531 | rbdf = cpm->rbase; | 531 | rbdf = cpm->rbase; |
| 532 | 532 | ||
| 533 | for (i = 0; i < CPM_MAXBD; i++) { | 533 | for (i = 0; i < CPM_MAXBD; i++) { |
| 534 | cpm->rxbuf[i] = dma_alloc_coherent( | 534 | cpm->rxbuf[i] = dma_alloc_coherent(&cpm->ofdev->dev, |
| 535 | NULL, CPM_MAX_READ + 1, &cpm->rxdma[i], GFP_KERNEL); | 535 | CPM_MAX_READ + 1, |
| 536 | &cpm->rxdma[i], GFP_KERNEL); | ||
| 536 | if (!cpm->rxbuf[i]) { | 537 | if (!cpm->rxbuf[i]) { |
| 537 | ret = -ENOMEM; | 538 | ret = -ENOMEM; |
| 538 | goto out_muram; | 539 | goto out_muram; |
| 539 | } | 540 | } |
| 540 | out_be32(&rbdf[i].cbd_bufaddr, ((cpm->rxdma[i] + 1) & ~1)); | 541 | out_be32(&rbdf[i].cbd_bufaddr, ((cpm->rxdma[i] + 1) & ~1)); |
| 541 | 542 | ||
| 542 | cpm->txbuf[i] = (unsigned char *)dma_alloc_coherent( | 543 | cpm->txbuf[i] = (unsigned char *)dma_alloc_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, &cpm->txdma[i], GFP_KERNEL); |
| 543 | NULL, CPM_MAX_READ + 1, &cpm->txdma[i], GFP_KERNEL); | ||
| 544 | if (!cpm->txbuf[i]) { | 544 | if (!cpm->txbuf[i]) { |
| 545 | ret = -ENOMEM; | 545 | ret = -ENOMEM; |
| 546 | goto out_muram; | 546 | goto out_muram; |
| @@ -585,10 +585,10 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) | |||
| 585 | out_muram: | 585 | out_muram: |
| 586 | for (i = 0; i < CPM_MAXBD; i++) { | 586 | for (i = 0; i < CPM_MAXBD; i++) { |
| 587 | if (cpm->rxbuf[i]) | 587 | if (cpm->rxbuf[i]) |
| 588 | dma_free_coherent(NULL, CPM_MAX_READ + 1, | 588 | dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, |
| 589 | cpm->rxbuf[i], cpm->rxdma[i]); | 589 | cpm->rxbuf[i], cpm->rxdma[i]); |
| 590 | if (cpm->txbuf[i]) | 590 | if (cpm->txbuf[i]) |
| 591 | dma_free_coherent(NULL, CPM_MAX_READ + 1, | 591 | dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, |
| 592 | cpm->txbuf[i], cpm->txdma[i]); | 592 | cpm->txbuf[i], cpm->txdma[i]); |
| 593 | } | 593 | } |
| 594 | cpm_muram_free(cpm->dp_addr); | 594 | cpm_muram_free(cpm->dp_addr); |
| @@ -619,9 +619,9 @@ static void cpm_i2c_shutdown(struct cpm_i2c *cpm) | |||
| 619 | 619 | ||
| 620 | /* Free all memory */ | 620 | /* Free all memory */ |
| 621 | for (i = 0; i < CPM_MAXBD; i++) { | 621 | for (i = 0; i < CPM_MAXBD; i++) { |
| 622 | dma_free_coherent(NULL, CPM_MAX_READ + 1, | 622 | dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, |
| 623 | cpm->rxbuf[i], cpm->rxdma[i]); | 623 | cpm->rxbuf[i], cpm->rxdma[i]); |
| 624 | dma_free_coherent(NULL, CPM_MAX_READ + 1, | 624 | dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, |
| 625 | cpm->txbuf[i], cpm->txdma[i]); | 625 | cpm->txbuf[i], cpm->txdma[i]); |
| 626 | } | 626 | } |
| 627 | 627 | ||
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 10411848fd70..9d2c5adf5d4f 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
| @@ -237,7 +237,7 @@ static int i801_transaction(int xact) | |||
| 237 | status = inb_p(SMBHSTSTS); | 237 | status = inb_p(SMBHSTSTS); |
| 238 | } while ((status & SMBHSTSTS_HOST_BUSY) && (timeout++ < MAX_TIMEOUT)); | 238 | } while ((status & SMBHSTSTS_HOST_BUSY) && (timeout++ < MAX_TIMEOUT)); |
| 239 | 239 | ||
| 240 | result = i801_check_post(status, timeout >= MAX_TIMEOUT); | 240 | result = i801_check_post(status, timeout > MAX_TIMEOUT); |
| 241 | if (result < 0) | 241 | if (result < 0) |
| 242 | return result; | 242 | return result; |
| 243 | 243 | ||
| @@ -257,9 +257,9 @@ static void i801_wait_hwpec(void) | |||
| 257 | } while ((!(status & SMBHSTSTS_INTR)) | 257 | } while ((!(status & SMBHSTSTS_INTR)) |
| 258 | && (timeout++ < MAX_TIMEOUT)); | 258 | && (timeout++ < MAX_TIMEOUT)); |
| 259 | 259 | ||
| 260 | if (timeout >= MAX_TIMEOUT) { | 260 | if (timeout > MAX_TIMEOUT) |
| 261 | dev_dbg(&I801_dev->dev, "PEC Timeout!\n"); | 261 | dev_dbg(&I801_dev->dev, "PEC Timeout!\n"); |
| 262 | } | 262 | |
| 263 | outb_p(status, SMBHSTSTS); | 263 | outb_p(status, SMBHSTSTS); |
| 264 | } | 264 | } |
| 265 | 265 | ||
| @@ -344,7 +344,7 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data, | |||
| 344 | while ((!(status & SMBHSTSTS_BYTE_DONE)) | 344 | while ((!(status & SMBHSTSTS_BYTE_DONE)) |
| 345 | && (timeout++ < MAX_TIMEOUT)); | 345 | && (timeout++ < MAX_TIMEOUT)); |
| 346 | 346 | ||
| 347 | result = i801_check_post(status, timeout >= MAX_TIMEOUT); | 347 | result = i801_check_post(status, timeout > MAX_TIMEOUT); |
| 348 | if (result < 0) | 348 | if (result < 0) |
| 349 | return result; | 349 | return result; |
| 350 | 350 | ||
diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c index b9c01aa90036..9f6b8e0f8632 100644 --- a/drivers/i2c/busses/i2c-isch.c +++ b/drivers/i2c/busses/i2c-isch.c | |||
| @@ -112,7 +112,7 @@ static int sch_transaction(void) | |||
| 112 | } while ((temp & 0x08) && (timeout++ < MAX_TIMEOUT)); | 112 | } while ((temp & 0x08) && (timeout++ < MAX_TIMEOUT)); |
| 113 | 113 | ||
| 114 | /* If the SMBus is still busy, we give up */ | 114 | /* If the SMBus is still busy, we give up */ |
| 115 | if (timeout >= MAX_TIMEOUT) { | 115 | if (timeout > MAX_TIMEOUT) { |
| 116 | dev_err(&sch_adapter.dev, "SMBus Timeout!\n"); | 116 | dev_err(&sch_adapter.dev, "SMBus Timeout!\n"); |
| 117 | result = -ETIMEDOUT; | 117 | result = -ETIMEDOUT; |
| 118 | } | 118 | } |
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 4af5c09f0e8f..dd778d7ae047 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
| @@ -164,7 +164,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) | |||
| 164 | return 0; | 164 | return 0; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | #ifdef CONFIG_PPC_52xx | 167 | #ifdef CONFIG_PPC_MPC52xx |
| 168 | static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = { | 168 | static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = { |
| 169 | {20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23}, | 169 | {20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23}, |
| 170 | {28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02}, | 170 | {28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02}, |
| @@ -188,7 +188,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = { | |||
| 188 | 188 | ||
| 189 | int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler) | 189 | int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler) |
| 190 | { | 190 | { |
| 191 | const struct mpc52xx_i2c_divider *div = NULL; | 191 | const struct mpc_i2c_divider *div = NULL; |
| 192 | unsigned int pvr = mfspr(SPRN_PVR); | 192 | unsigned int pvr = mfspr(SPRN_PVR); |
| 193 | u32 divider; | 193 | u32 divider; |
| 194 | int i; | 194 | int i; |
| @@ -203,7 +203,7 @@ int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler) | |||
| 203 | * We want to choose an FDR/DFSR that generates an I2C bus speed that | 203 | * We want to choose an FDR/DFSR that generates an I2C bus speed that |
| 204 | * is equal to or lower than the requested speed. | 204 | * is equal to or lower than the requested speed. |
| 205 | */ | 205 | */ |
| 206 | for (i = 0; i < ARRAY_SIZE(mpc52xx_i2c_dividers); i++) { | 206 | for (i = 0; i < ARRAY_SIZE(mpc_i2c_dividers_52xx); i++) { |
| 207 | div = &mpc_i2c_dividers_52xx[i]; | 207 | div = &mpc_i2c_dividers_52xx[i]; |
| 208 | /* Old MPC5200 rev A CPUs do not support the high bits */ | 208 | /* Old MPC5200 rev A CPUs do not support the high bits */ |
| 209 | if (div->fdr & 0xc0 && pvr == 0x80822011) | 209 | if (div->fdr & 0xc0 && pvr == 0x80822011) |
| @@ -219,20 +219,23 @@ static void mpc_i2c_setclock_52xx(struct device_node *node, | |||
| 219 | struct mpc_i2c *i2c, | 219 | struct mpc_i2c *i2c, |
| 220 | u32 clock, u32 prescaler) | 220 | u32 clock, u32 prescaler) |
| 221 | { | 221 | { |
| 222 | int fdr = mpc52xx_i2c_get_fdr(node, clock, prescaler); | 222 | int ret, fdr; |
| 223 | |||
| 224 | ret = mpc_i2c_get_fdr_52xx(node, clock, prescaler); | ||
| 225 | fdr = (ret >= 0) ? ret : 0x3f; /* backward compatibility */ | ||
| 223 | 226 | ||
| 224 | if (fdr < 0) | ||
| 225 | fdr = 0x3f; /* backward compatibility */ | ||
| 226 | writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR); | 227 | writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR); |
| 227 | dev_info(i2c->dev, "clock %d Hz (fdr=%d)\n", clock, fdr); | 228 | |
| 229 | if (ret >= 0) | ||
| 230 | dev_info(i2c->dev, "clock %d Hz (fdr=%d)\n", clock, fdr); | ||
| 228 | } | 231 | } |
| 229 | #else /* !CONFIG_PPC_52xx */ | 232 | #else /* !CONFIG_PPC_MPC52xx */ |
| 230 | static void mpc_i2c_setclock_52xx(struct device_node *node, | 233 | static void mpc_i2c_setclock_52xx(struct device_node *node, |
| 231 | struct mpc_i2c *i2c, | 234 | struct mpc_i2c *i2c, |
| 232 | u32 clock, u32 prescaler) | 235 | u32 clock, u32 prescaler) |
| 233 | { | 236 | { |
| 234 | } | 237 | } |
| 235 | #endif /* CONFIG_PPC_52xx*/ | 238 | #endif /* CONFIG_PPC_MPC52xx*/ |
| 236 | 239 | ||
| 237 | #ifdef CONFIG_FSL_SOC | 240 | #ifdef CONFIG_FSL_SOC |
| 238 | static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] = { | 241 | static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] = { |
| @@ -321,14 +324,17 @@ static void mpc_i2c_setclock_8xxx(struct device_node *node, | |||
| 321 | struct mpc_i2c *i2c, | 324 | struct mpc_i2c *i2c, |
| 322 | u32 clock, u32 prescaler) | 325 | u32 clock, u32 prescaler) |
| 323 | { | 326 | { |
| 324 | int fdr = mpc_i2c_get_fdr_8xxx(node, clock, prescaler); | 327 | int ret, fdr; |
| 328 | |||
| 329 | ret = mpc_i2c_get_fdr_8xxx(node, clock, prescaler); | ||
| 330 | fdr = (ret >= 0) ? ret : 0x1031; /* backward compatibility */ | ||
| 325 | 331 | ||
| 326 | if (fdr < 0) | ||
| 327 | fdr = 0x1031; /* backward compatibility */ | ||
| 328 | writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR); | 332 | writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR); |
| 329 | writeb((fdr >> 8) & 0xff, i2c->base + MPC_I2C_DFSRR); | 333 | writeb((fdr >> 8) & 0xff, i2c->base + MPC_I2C_DFSRR); |
| 330 | dev_info(i2c->dev, "clock %d Hz (dfsrr=%d fdr=%d)\n", | 334 | |
| 331 | clock, fdr >> 8, fdr & 0xff); | 335 | if (ret >= 0) |
| 336 | dev_info(i2c->dev, "clock %d Hz (dfsrr=%d fdr=%d)\n", | ||
| 337 | clock, fdr >> 8, fdr & 0xff); | ||
| 332 | } | 338 | } |
| 333 | 339 | ||
| 334 | #else /* !CONFIG_FSL_SOC */ | 340 | #else /* !CONFIG_FSL_SOC */ |
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c index 2ff4683703a8..ec11d1c4e77b 100644 --- a/drivers/i2c/busses/i2c-nforce2.c +++ b/drivers/i2c/busses/i2c-nforce2.c | |||
| @@ -173,7 +173,7 @@ static int nforce2_check_status(struct i2c_adapter *adap) | |||
| 173 | temp = inb_p(NVIDIA_SMB_STS); | 173 | temp = inb_p(NVIDIA_SMB_STS); |
| 174 | } while ((!temp) && (timeout++ < MAX_TIMEOUT)); | 174 | } while ((!temp) && (timeout++ < MAX_TIMEOUT)); |
| 175 | 175 | ||
| 176 | if (timeout >= MAX_TIMEOUT) { | 176 | if (timeout > MAX_TIMEOUT) { |
| 177 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); | 177 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); |
| 178 | if (smbus->can_abort) | 178 | if (smbus->can_abort) |
| 179 | nforce2_abort(adap); | 179 | nforce2_abort(adap); |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index c1405c8f6ba5..acc7143d9655 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
| @@ -265,10 +265,10 @@ static int i2c_pxa_wait_bus_not_busy(struct pxa_i2c *i2c) | |||
| 265 | show_state(i2c); | 265 | show_state(i2c); |
| 266 | } | 266 | } |
| 267 | 267 | ||
| 268 | if (timeout <= 0) | 268 | if (timeout < 0) |
| 269 | show_state(i2c); | 269 | show_state(i2c); |
| 270 | 270 | ||
| 271 | return timeout <= 0 ? I2C_RETRY : 0; | 271 | return timeout < 0 ? I2C_RETRY : 0; |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | static int i2c_pxa_wait_master(struct pxa_i2c *i2c) | 274 | static int i2c_pxa_wait_master(struct pxa_i2c *i2c) |
| @@ -612,7 +612,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c) | |||
| 612 | show_state(i2c); | 612 | show_state(i2c); |
| 613 | } | 613 | } |
| 614 | 614 | ||
| 615 | if (timeout <= 0) { | 615 | if (timeout < 0) { |
| 616 | show_state(i2c); | 616 | show_state(i2c); |
| 617 | dev_err(&i2c->adap.dev, | 617 | dev_err(&i2c->adap.dev, |
| 618 | "i2c_pxa: timeout waiting for bus free\n"); | 618 | "i2c_pxa: timeout waiting for bus free\n"); |
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index f320ab27da46..139f0c7f12a4 100644 --- a/drivers/i2c/busses/i2c-sis5595.c +++ b/drivers/i2c/busses/i2c-sis5595.c | |||
| @@ -256,7 +256,7 @@ static int sis5595_transaction(struct i2c_adapter *adap) | |||
| 256 | } while (!(temp & 0x40) && (timeout++ < MAX_TIMEOUT)); | 256 | } while (!(temp & 0x40) && (timeout++ < MAX_TIMEOUT)); |
| 257 | 257 | ||
| 258 | /* If the SMBus is still busy, we give up */ | 258 | /* If the SMBus is still busy, we give up */ |
| 259 | if (timeout >= MAX_TIMEOUT) { | 259 | if (timeout > MAX_TIMEOUT) { |
| 260 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); | 260 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); |
| 261 | result = -ETIMEDOUT; | 261 | result = -ETIMEDOUT; |
| 262 | } | 262 | } |
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index 50c3610e6028..70ca41e90e58 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c | |||
| @@ -173,7 +173,7 @@ static int sis630_transaction_wait(struct i2c_adapter *adap, int size) | |||
| 173 | } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); | 173 | } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); |
| 174 | 174 | ||
| 175 | /* If the SMBus is still busy, we give up */ | 175 | /* If the SMBus is still busy, we give up */ |
| 176 | if (timeout >= MAX_TIMEOUT) { | 176 | if (timeout > MAX_TIMEOUT) { |
| 177 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); | 177 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); |
| 178 | result = -ETIMEDOUT; | 178 | result = -ETIMEDOUT; |
| 179 | } | 179 | } |
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c index 7e1594b40579..8295885b2fdb 100644 --- a/drivers/i2c/busses/i2c-sis96x.c +++ b/drivers/i2c/busses/i2c-sis96x.c | |||
| @@ -132,7 +132,7 @@ static int sis96x_transaction(int size) | |||
| 132 | } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); | 132 | } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); |
| 133 | 133 | ||
| 134 | /* If the SMBus is still busy, we give up */ | 134 | /* If the SMBus is still busy, we give up */ |
| 135 | if (timeout >= MAX_TIMEOUT) { | 135 | if (timeout > MAX_TIMEOUT) { |
| 136 | dev_dbg(&sis96x_adapter.dev, "SMBus Timeout! (0x%02x)\n", temp); | 136 | dev_dbg(&sis96x_adapter.dev, "SMBus Timeout! (0x%02x)\n", temp); |
| 137 | result = -ETIMEDOUT; | 137 | result = -ETIMEDOUT; |
| 138 | } | 138 | } |
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index 8dc2bb781605..b3684060465e 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
| @@ -347,7 +347,7 @@ static int ipathfs_fill_super(struct super_block *sb, void *data, | |||
| 347 | spin_unlock_irqrestore(&ipath_devs_lock, flags); | 347 | spin_unlock_irqrestore(&ipath_devs_lock, flags); |
| 348 | ret = create_device_files(sb, dd); | 348 | ret = create_device_files(sb, dd); |
| 349 | if (ret) { | 349 | if (ret) { |
| 350 | deactivate_super(sb); | 350 | deactivate_locked_super(sb); |
| 351 | goto bail; | 351 | goto bail; |
| 352 | } | 352 | } |
| 353 | spin_lock_irqsave(&ipath_devs_lock, flags); | 353 | spin_lock_irqsave(&ipath_devs_lock, flags); |
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index bc4e40f3ede7..2d1415e16834 100644 --- a/drivers/input/ff-memless.c +++ b/drivers/input/ff-memless.c | |||
| @@ -226,7 +226,7 @@ static int get_compatible_type(struct ff_device *ff, int effect_type) | |||
| 226 | */ | 226 | */ |
| 227 | static void ml_combine_effects(struct ff_effect *effect, | 227 | static void ml_combine_effects(struct ff_effect *effect, |
| 228 | struct ml_effect_state *state, | 228 | struct ml_effect_state *state, |
| 229 | int gain) | 229 | unsigned int gain) |
| 230 | { | 230 | { |
| 231 | struct ff_effect *new = state->effect; | 231 | struct ff_effect *new = state->effect; |
| 232 | unsigned int strong, weak, i; | 232 | unsigned int strong, weak, i; |
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 4224f0112849..012a5e753991 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
| @@ -843,7 +843,13 @@ static const struct input_device_id joydev_blacklist[] = { | |||
| 843 | INPUT_DEVICE_ID_MATCH_KEYBIT, | 843 | INPUT_DEVICE_ID_MATCH_KEYBIT, |
| 844 | .evbit = { BIT_MASK(EV_KEY) }, | 844 | .evbit = { BIT_MASK(EV_KEY) }, |
| 845 | .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, | 845 | .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, |
| 846 | }, /* Avoid itouchpads, touchscreens and tablets */ | 846 | }, /* Avoid itouchpads and touchscreens */ |
| 847 | { | ||
| 848 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | ||
| 849 | INPUT_DEVICE_ID_MATCH_KEYBIT, | ||
| 850 | .evbit = { BIT_MASK(EV_KEY) }, | ||
| 851 | .keybit = { [BIT_WORD(BTN_DIGI)] = BIT_MASK(BTN_DIGI) }, | ||
| 852 | }, /* Avoid tablets, digitisers and similar devices */ | ||
| 847 | { } /* Terminating entry */ | 853 | { } /* Terminating entry */ |
| 848 | }; | 854 | }; |
| 849 | 855 | ||
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 444dec07e5d8..df3f8aa68115 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
| @@ -895,6 +895,13 @@ static unsigned int atkbd_amilo_pa1510_forced_release_keys[] = { | |||
| 895 | }; | 895 | }; |
| 896 | 896 | ||
| 897 | /* | 897 | /* |
| 898 | * Amilo Xi 3650 key release for light touch bar not working | ||
| 899 | */ | ||
| 900 | static unsigned int atkbd_amilo_xi3650_forced_release_keys[] = { | ||
| 901 | 0x67, 0xed, 0x90, 0xa2, 0x99, 0xa4, 0xae, 0xb0, -1U | ||
| 902 | }; | ||
| 903 | |||
| 904 | /* | ||
| 898 | * atkbd_set_keycode_table() initializes keyboard's keycode table | 905 | * atkbd_set_keycode_table() initializes keyboard's keycode table |
| 899 | * according to the selected scancode set | 906 | * according to the selected scancode set |
| 900 | */ | 907 | */ |
| @@ -1560,6 +1567,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = { | |||
| 1560 | .callback = atkbd_setup_forced_release, | 1567 | .callback = atkbd_setup_forced_release, |
| 1561 | .driver_data = atkbd_amilo_pa1510_forced_release_keys, | 1568 | .driver_data = atkbd_amilo_pa1510_forced_release_keys, |
| 1562 | }, | 1569 | }, |
| 1570 | { | ||
| 1571 | .ident = "Fujitsu Amilo Xi 3650", | ||
| 1572 | .matches = { | ||
| 1573 | DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), | ||
| 1574 | DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 3650"), | ||
| 1575 | }, | ||
| 1576 | .callback = atkbd_setup_forced_release, | ||
| 1577 | .driver_data = atkbd_amilo_xi3650_forced_release_keys, | ||
| 1578 | }, | ||
| 1563 | { } | 1579 | { } |
| 1564 | }; | 1580 | }; |
| 1565 | 1581 | ||
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index 536668fbda22..948e167557f1 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
| @@ -200,8 +200,9 @@ static int tsc2007_read_values(struct tsc2007 *tsc) | |||
| 200 | static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle) | 200 | static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle) |
| 201 | { | 201 | { |
| 202 | struct tsc2007 *ts = container_of(handle, struct tsc2007, timer); | 202 | struct tsc2007 *ts = container_of(handle, struct tsc2007, timer); |
| 203 | unsigned long flags; | ||
| 203 | 204 | ||
| 204 | spin_lock_irq(&ts->lock); | 205 | spin_lock_irqsave(&ts->lock, flags); |
| 205 | 206 | ||
| 206 | if (unlikely(!ts->get_pendown_state() && ts->pendown)) { | 207 | if (unlikely(!ts->get_pendown_state() && ts->pendown)) { |
| 207 | struct input_dev *input = ts->input; | 208 | struct input_dev *input = ts->input; |
| @@ -222,7 +223,7 @@ static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle) | |||
| 222 | tsc2007_send_event(ts); | 223 | tsc2007_send_event(ts); |
| 223 | } | 224 | } |
| 224 | 225 | ||
| 225 | spin_unlock_irq(&ts->lock); | 226 | spin_unlock_irqrestore(&ts->lock, flags); |
| 226 | 227 | ||
| 227 | return HRTIMER_NORESTART; | 228 | return HRTIMER_NORESTART; |
| 228 | } | 229 | } |
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c index b129409925af..bff72d81f263 100644 --- a/drivers/isdn/capi/capifs.c +++ b/drivers/isdn/capi/capifs.c | |||
| @@ -75,15 +75,17 @@ static int capifs_remount(struct super_block *s, int *flags, char *data) | |||
| 75 | } | 75 | } |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | kfree(s->s_options); | 78 | mutex_lock(&s->s_root->d_inode->i_mutex); |
| 79 | s->s_options = new_opt; | ||
| 80 | 79 | ||
| 80 | replace_mount_options(s, new_opt); | ||
| 81 | config.setuid = setuid; | 81 | config.setuid = setuid; |
| 82 | config.setgid = setgid; | 82 | config.setgid = setgid; |
| 83 | config.uid = uid; | 83 | config.uid = uid; |
| 84 | config.gid = gid; | 84 | config.gid = gid; |
| 85 | config.mode = mode; | 85 | config.mode = mode; |
| 86 | 86 | ||
| 87 | mutex_unlock(&s->s_root->d_inode->i_mutex); | ||
| 88 | |||
| 87 | return 0; | 89 | return 0; |
| 88 | } | 90 | } |
| 89 | 91 | ||
| @@ -154,13 +156,16 @@ void capifs_new_ncci(unsigned int number, dev_t device) | |||
| 154 | if (!inode) | 156 | if (!inode) |
| 155 | return; | 157 | return; |
| 156 | inode->i_ino = number+2; | 158 | inode->i_ino = number+2; |
| 159 | |||
| 160 | dentry = get_node(number); | ||
| 161 | |||
| 162 | /* config contents is protected by root's i_mutex */ | ||
| 157 | inode->i_uid = config.setuid ? config.uid : current_fsuid(); | 163 | inode->i_uid = config.setuid ? config.uid : current_fsuid(); |
| 158 | inode->i_gid = config.setgid ? config.gid : current_fsgid(); | 164 | inode->i_gid = config.setgid ? config.gid : current_fsgid(); |
| 159 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; | 165 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; |
| 160 | init_special_inode(inode, S_IFCHR|config.mode, device); | 166 | init_special_inode(inode, S_IFCHR|config.mode, device); |
| 161 | //inode->i_op = &capifs_file_inode_operations; | 167 | //inode->i_op = &capifs_file_inode_operations; |
| 162 | 168 | ||
| 163 | dentry = get_node(number); | ||
| 164 | if (!IS_ERR(dentry) && !dentry->d_inode) | 169 | if (!IS_ERR(dentry) && !dentry->d_inode) |
| 165 | d_instantiate(dentry, inode); | 170 | d_instantiate(dentry, inode); |
| 166 | mutex_unlock(&capifs_root->d_inode->i_mutex); | 171 | mutex_unlock(&capifs_root->d_inode->i_mutex); |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 1fb91edc7de2..47c68bc75a17 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
| @@ -986,6 +986,9 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) | |||
| 986 | oldindex = index; | 986 | oldindex = index; |
| 987 | oldpage = page; | 987 | oldpage = page; |
| 988 | 988 | ||
| 989 | bitmap->filemap[bitmap->file_pages++] = page; | ||
| 990 | bitmap->last_page_size = count; | ||
| 991 | |||
| 989 | if (outofdate) { | 992 | if (outofdate) { |
| 990 | /* | 993 | /* |
| 991 | * if bitmap is out of date, dirty the | 994 | * if bitmap is out of date, dirty the |
| @@ -998,15 +1001,9 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) | |||
| 998 | write_page(bitmap, page, 1); | 1001 | write_page(bitmap, page, 1); |
| 999 | 1002 | ||
| 1000 | ret = -EIO; | 1003 | ret = -EIO; |
| 1001 | if (bitmap->flags & BITMAP_WRITE_ERROR) { | 1004 | if (bitmap->flags & BITMAP_WRITE_ERROR) |
| 1002 | /* release, page not in filemap yet */ | ||
| 1003 | put_page(page); | ||
| 1004 | goto err; | 1005 | goto err; |
| 1005 | } | ||
| 1006 | } | 1006 | } |
| 1007 | |||
| 1008 | bitmap->filemap[bitmap->file_pages++] = page; | ||
| 1009 | bitmap->last_page_size = count; | ||
| 1010 | } | 1007 | } |
| 1011 | paddr = kmap_atomic(page, KM_USER0); | 1008 | paddr = kmap_atomic(page, KM_USER0); |
| 1012 | if (bitmap->flags & BITMAP_HOSTENDIAN) | 1009 | if (bitmap->flags & BITMAP_HOSTENDIAN) |
| @@ -1016,9 +1013,11 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) | |||
| 1016 | kunmap_atomic(paddr, KM_USER0); | 1013 | kunmap_atomic(paddr, KM_USER0); |
| 1017 | if (b) { | 1014 | if (b) { |
| 1018 | /* if the disk bit is set, set the memory bit */ | 1015 | /* if the disk bit is set, set the memory bit */ |
| 1019 | bitmap_set_memory_bits(bitmap, i << CHUNK_BLOCK_SHIFT(bitmap), | 1016 | int needed = ((sector_t)(i+1) << (CHUNK_BLOCK_SHIFT(bitmap)) |
| 1020 | ((i+1) << (CHUNK_BLOCK_SHIFT(bitmap)) >= start) | 1017 | >= start); |
| 1021 | ); | 1018 | bitmap_set_memory_bits(bitmap, |
| 1019 | (sector_t)i << CHUNK_BLOCK_SHIFT(bitmap), | ||
| 1020 | needed); | ||
| 1022 | bit_cnt++; | 1021 | bit_cnt++; |
| 1023 | set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN); | 1022 | set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN); |
| 1024 | } | 1023 | } |
| @@ -1154,8 +1153,9 @@ void bitmap_daemon_work(struct bitmap *bitmap) | |||
| 1154 | spin_lock_irqsave(&bitmap->lock, flags); | 1153 | spin_lock_irqsave(&bitmap->lock, flags); |
| 1155 | clear_page_attr(bitmap, page, BITMAP_PAGE_CLEAN); | 1154 | clear_page_attr(bitmap, page, BITMAP_PAGE_CLEAN); |
| 1156 | } | 1155 | } |
| 1157 | bmc = bitmap_get_counter(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap), | 1156 | bmc = bitmap_get_counter(bitmap, |
| 1158 | &blocks, 0); | 1157 | (sector_t)j << CHUNK_BLOCK_SHIFT(bitmap), |
| 1158 | &blocks, 0); | ||
| 1159 | if (bmc) { | 1159 | if (bmc) { |
| 1160 | /* | 1160 | /* |
| 1161 | if (j < 100) printk("bitmap: j=%lu, *bmc = 0x%x\n", j, *bmc); | 1161 | if (j < 100) printk("bitmap: j=%lu, *bmc = 0x%x\n", j, *bmc); |
| @@ -1169,7 +1169,8 @@ void bitmap_daemon_work(struct bitmap *bitmap) | |||
| 1169 | } else if (*bmc == 1) { | 1169 | } else if (*bmc == 1) { |
| 1170 | /* we can clear the bit */ | 1170 | /* we can clear the bit */ |
| 1171 | *bmc = 0; | 1171 | *bmc = 0; |
| 1172 | bitmap_count_page(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap), | 1172 | bitmap_count_page(bitmap, |
| 1173 | (sector_t)j << CHUNK_BLOCK_SHIFT(bitmap), | ||
| 1173 | -1); | 1174 | -1); |
| 1174 | 1175 | ||
| 1175 | /* clear the bit */ | 1176 | /* clear the bit */ |
| @@ -1514,7 +1515,7 @@ void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e) | |||
| 1514 | unsigned long chunk; | 1515 | unsigned long chunk; |
| 1515 | 1516 | ||
| 1516 | for (chunk = s; chunk <= e; chunk++) { | 1517 | for (chunk = s; chunk <= e; chunk++) { |
| 1517 | sector_t sec = chunk << CHUNK_BLOCK_SHIFT(bitmap); | 1518 | sector_t sec = (sector_t)chunk << CHUNK_BLOCK_SHIFT(bitmap); |
| 1518 | bitmap_set_memory_bits(bitmap, sec, 1); | 1519 | bitmap_set_memory_bits(bitmap, sec, 1); |
| 1519 | bitmap_file_set_bit(bitmap, sec); | 1520 | bitmap_file_set_bit(bitmap, sec); |
| 1520 | } | 1521 | } |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 612343fdde94..fccc8343a250 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -3066,11 +3066,8 @@ array_state_store(mddev_t *mddev, const char *buf, size_t len) | |||
| 3066 | } else | 3066 | } else |
| 3067 | err = -EBUSY; | 3067 | err = -EBUSY; |
| 3068 | spin_unlock_irq(&mddev->write_lock); | 3068 | spin_unlock_irq(&mddev->write_lock); |
| 3069 | } else { | 3069 | } else |
| 3070 | mddev->ro = 0; | 3070 | err = -EINVAL; |
| 3071 | mddev->recovery_cp = MaxSector; | ||
| 3072 | err = do_md_run(mddev); | ||
| 3073 | } | ||
| 3074 | break; | 3071 | break; |
| 3075 | case active: | 3072 | case active: |
| 3076 | if (mddev->pers) { | 3073 | if (mddev->pers) { |
| @@ -4297,6 +4294,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
| 4297 | { | 4294 | { |
| 4298 | int err = 0; | 4295 | int err = 0; |
| 4299 | struct gendisk *disk = mddev->gendisk; | 4296 | struct gendisk *disk = mddev->gendisk; |
| 4297 | mdk_rdev_t *rdev; | ||
| 4300 | 4298 | ||
| 4301 | if (atomic_read(&mddev->openers) > is_open) { | 4299 | if (atomic_read(&mddev->openers) > is_open) { |
| 4302 | printk("md: %s still in use.\n",mdname(mddev)); | 4300 | printk("md: %s still in use.\n",mdname(mddev)); |
| @@ -4339,6 +4337,13 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
| 4339 | /* tell userspace to handle 'inactive' */ | 4337 | /* tell userspace to handle 'inactive' */ |
| 4340 | sysfs_notify_dirent(mddev->sysfs_state); | 4338 | sysfs_notify_dirent(mddev->sysfs_state); |
| 4341 | 4339 | ||
| 4340 | list_for_each_entry(rdev, &mddev->disks, same_set) | ||
| 4341 | if (rdev->raid_disk >= 0) { | ||
| 4342 | char nm[20]; | ||
| 4343 | sprintf(nm, "rd%d", rdev->raid_disk); | ||
| 4344 | sysfs_remove_link(&mddev->kobj, nm); | ||
| 4345 | } | ||
| 4346 | |||
| 4342 | set_capacity(disk, 0); | 4347 | set_capacity(disk, 0); |
| 4343 | mddev->changed = 1; | 4348 | mddev->changed = 1; |
| 4344 | 4349 | ||
| @@ -4359,7 +4364,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
| 4359 | * Free resources if final stop | 4364 | * Free resources if final stop |
| 4360 | */ | 4365 | */ |
| 4361 | if (mode == 0) { | 4366 | if (mode == 0) { |
| 4362 | mdk_rdev_t *rdev; | ||
| 4363 | 4367 | ||
| 4364 | printk(KERN_INFO "md: %s stopped.\n", mdname(mddev)); | 4368 | printk(KERN_INFO "md: %s stopped.\n", mdname(mddev)); |
| 4365 | 4369 | ||
| @@ -4371,13 +4375,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
| 4371 | } | 4375 | } |
| 4372 | mddev->bitmap_offset = 0; | 4376 | mddev->bitmap_offset = 0; |
| 4373 | 4377 | ||
| 4374 | list_for_each_entry(rdev, &mddev->disks, same_set) | ||
| 4375 | if (rdev->raid_disk >= 0) { | ||
| 4376 | char nm[20]; | ||
| 4377 | sprintf(nm, "rd%d", rdev->raid_disk); | ||
| 4378 | sysfs_remove_link(&mddev->kobj, nm); | ||
| 4379 | } | ||
| 4380 | |||
| 4381 | /* make sure all md_delayed_delete calls have finished */ | 4378 | /* make sure all md_delayed_delete calls have finished */ |
| 4382 | flush_scheduled_work(); | 4379 | flush_scheduled_work(); |
| 4383 | 4380 | ||
| @@ -5705,37 +5702,38 @@ static void status_unused(struct seq_file *seq) | |||
| 5705 | 5702 | ||
| 5706 | static void status_resync(struct seq_file *seq, mddev_t * mddev) | 5703 | static void status_resync(struct seq_file *seq, mddev_t * mddev) |
| 5707 | { | 5704 | { |
| 5708 | sector_t max_blocks, resync, res; | 5705 | sector_t max_sectors, resync, res; |
| 5709 | unsigned long dt, db, rt; | 5706 | unsigned long dt, db; |
| 5707 | sector_t rt; | ||
| 5710 | int scale; | 5708 | int scale; |
| 5711 | unsigned int per_milli; | 5709 | unsigned int per_milli; |
| 5712 | 5710 | ||
| 5713 | resync = (mddev->curr_resync - atomic_read(&mddev->recovery_active))/2; | 5711 | resync = mddev->curr_resync - atomic_read(&mddev->recovery_active); |
| 5714 | 5712 | ||
| 5715 | if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) | 5713 | if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) |
| 5716 | max_blocks = mddev->resync_max_sectors >> 1; | 5714 | max_sectors = mddev->resync_max_sectors; |
| 5717 | else | 5715 | else |
| 5718 | max_blocks = mddev->dev_sectors / 2; | 5716 | max_sectors = mddev->dev_sectors; |
| 5719 | 5717 | ||
| 5720 | /* | 5718 | /* |
| 5721 | * Should not happen. | 5719 | * Should not happen. |
| 5722 | */ | 5720 | */ |
| 5723 | if (!max_blocks) { | 5721 | if (!max_sectors) { |
| 5724 | MD_BUG(); | 5722 | MD_BUG(); |
| 5725 | return; | 5723 | return; |
| 5726 | } | 5724 | } |
| 5727 | /* Pick 'scale' such that (resync>>scale)*1000 will fit | 5725 | /* Pick 'scale' such that (resync>>scale)*1000 will fit |
| 5728 | * in a sector_t, and (max_blocks>>scale) will fit in a | 5726 | * in a sector_t, and (max_sectors>>scale) will fit in a |
| 5729 | * u32, as those are the requirements for sector_div. | 5727 | * u32, as those are the requirements for sector_div. |
| 5730 | * Thus 'scale' must be at least 10 | 5728 | * Thus 'scale' must be at least 10 |
| 5731 | */ | 5729 | */ |
| 5732 | scale = 10; | 5730 | scale = 10; |
| 5733 | if (sizeof(sector_t) > sizeof(unsigned long)) { | 5731 | if (sizeof(sector_t) > sizeof(unsigned long)) { |
| 5734 | while ( max_blocks/2 > (1ULL<<(scale+32))) | 5732 | while ( max_sectors/2 > (1ULL<<(scale+32))) |
| 5735 | scale++; | 5733 | scale++; |
| 5736 | } | 5734 | } |
| 5737 | res = (resync>>scale)*1000; | 5735 | res = (resync>>scale)*1000; |
| 5738 | sector_div(res, (u32)((max_blocks>>scale)+1)); | 5736 | sector_div(res, (u32)((max_sectors>>scale)+1)); |
| 5739 | 5737 | ||
| 5740 | per_milli = res; | 5738 | per_milli = res; |
| 5741 | { | 5739 | { |
| @@ -5756,25 +5754,35 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev) | |||
| 5756 | (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ? | 5754 | (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ? |
| 5757 | "resync" : "recovery"))), | 5755 | "resync" : "recovery"))), |
| 5758 | per_milli/10, per_milli % 10, | 5756 | per_milli/10, per_milli % 10, |
| 5759 | (unsigned long long) resync, | 5757 | (unsigned long long) resync/2, |
| 5760 | (unsigned long long) max_blocks); | 5758 | (unsigned long long) max_sectors/2); |
| 5761 | 5759 | ||
| 5762 | /* | 5760 | /* |
| 5763 | * We do not want to overflow, so the order of operands and | ||
| 5764 | * the * 100 / 100 trick are important. We do a +1 to be | ||
| 5765 | * safe against division by zero. We only estimate anyway. | ||
| 5766 | * | ||
| 5767 | * dt: time from mark until now | 5761 | * dt: time from mark until now |
| 5768 | * db: blocks written from mark until now | 5762 | * db: blocks written from mark until now |
| 5769 | * rt: remaining time | 5763 | * rt: remaining time |
| 5764 | * | ||
| 5765 | * rt is a sector_t, so could be 32bit or 64bit. | ||
| 5766 | * So we divide before multiply in case it is 32bit and close | ||
| 5767 | * to the limit. | ||
| 5768 | * We scale the divisor (db) by 32 to avoid loosing precision | ||
| 5769 | * near the end of resync when the number of remaining sectors | ||
| 5770 | * is close to 'db'. | ||
| 5771 | * We then divide rt by 32 after multiplying by db to compensate. | ||
| 5772 | * The '+1' avoids division by zero if db is very small. | ||
| 5770 | */ | 5773 | */ |
| 5771 | dt = ((jiffies - mddev->resync_mark) / HZ); | 5774 | dt = ((jiffies - mddev->resync_mark) / HZ); |
| 5772 | if (!dt) dt++; | 5775 | if (!dt) dt++; |
| 5773 | db = (mddev->curr_mark_cnt - atomic_read(&mddev->recovery_active)) | 5776 | db = (mddev->curr_mark_cnt - atomic_read(&mddev->recovery_active)) |
| 5774 | - mddev->resync_mark_cnt; | 5777 | - mddev->resync_mark_cnt; |
| 5775 | rt = (dt * ((unsigned long)(max_blocks-resync) / (db/2/100+1)))/100; | ||
| 5776 | 5778 | ||
| 5777 | seq_printf(seq, " finish=%lu.%lumin", rt / 60, (rt % 60)/6); | 5779 | rt = max_sectors - resync; /* number of remaining sectors */ |
| 5780 | sector_div(rt, db/32+1); | ||
| 5781 | rt *= dt; | ||
| 5782 | rt >>= 5; | ||
| 5783 | |||
| 5784 | seq_printf(seq, " finish=%lu.%lumin", (unsigned long)rt / 60, | ||
| 5785 | ((unsigned long)rt % 60)/6); | ||
| 5778 | 5786 | ||
| 5779 | seq_printf(seq, " speed=%ldK/sec", db/2/dt); | 5787 | seq_printf(seq, " speed=%ldK/sec", db/2/dt); |
| 5780 | } | 5788 | } |
| @@ -5965,7 +5973,7 @@ static int md_seq_show(struct seq_file *seq, void *v) | |||
| 5965 | return 0; | 5973 | return 0; |
| 5966 | } | 5974 | } |
| 5967 | 5975 | ||
| 5968 | static struct seq_operations md_seq_ops = { | 5976 | static const struct seq_operations md_seq_ops = { |
| 5969 | .start = md_seq_start, | 5977 | .start = md_seq_start, |
| 5970 | .next = md_seq_next, | 5978 | .next = md_seq_next, |
| 5971 | .stop = md_seq_stop, | 5979 | .stop = md_seq_stop, |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 81a54f17417e..499620afb44b 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -1809,17 +1809,17 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i | |||
| 1809 | r10_bio->sector = sect; | 1809 | r10_bio->sector = sect; |
| 1810 | 1810 | ||
| 1811 | raid10_find_phys(conf, r10_bio); | 1811 | raid10_find_phys(conf, r10_bio); |
| 1812 | /* Need to check if this section will still be | 1812 | |
| 1813 | /* Need to check if the array will still be | ||
| 1813 | * degraded | 1814 | * degraded |
| 1814 | */ | 1815 | */ |
| 1815 | for (j=0; j<conf->copies;j++) { | 1816 | for (j=0; j<conf->raid_disks; j++) |
| 1816 | int d = r10_bio->devs[j].devnum; | 1817 | if (conf->mirrors[j].rdev == NULL || |
| 1817 | if (conf->mirrors[d].rdev == NULL || | 1818 | test_bit(Faulty, &conf->mirrors[j].rdev->flags)) { |
| 1818 | test_bit(Faulty, &conf->mirrors[d].rdev->flags)) { | ||
| 1819 | still_degraded = 1; | 1819 | still_degraded = 1; |
| 1820 | break; | 1820 | break; |
| 1821 | } | 1821 | } |
| 1822 | } | 1822 | |
| 1823 | must_sync = bitmap_start_sync(mddev->bitmap, sect, | 1823 | must_sync = bitmap_start_sync(mddev->bitmap, sect, |
| 1824 | &sync_blocks, still_degraded); | 1824 | &sync_blocks, still_degraded); |
| 1825 | 1825 | ||
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c index 1dba8f0832a0..5cf6c45b91fe 100644 --- a/drivers/media/radio/radio-sf16fmi.c +++ b/drivers/media/radio/radio-sf16fmi.c | |||
| @@ -153,7 +153,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
| 153 | mult = (fmi->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; | 153 | mult = (fmi->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; |
| 154 | v->rangelow = RSF16_MINFREQ / mult; | 154 | v->rangelow = RSF16_MINFREQ / mult; |
| 155 | v->rangehigh = RSF16_MAXFREQ / mult; | 155 | v->rangehigh = RSF16_MAXFREQ / mult; |
| 156 | v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO; | 156 | v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; |
| 157 | v->capability = fmi->flags & V4L2_TUNER_CAP_LOW; | 157 | v->capability = fmi->flags & V4L2_TUNER_CAP_LOW; |
| 158 | v->audmode = V4L2_TUNER_MODE_STEREO; | 158 | v->audmode = V4L2_TUNER_MODE_STEREO; |
| 159 | v->signal = fmi_getsigstr(fmi); | 159 | v->signal = fmi_getsigstr(fmi); |
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c index c09ca8600ea1..935ff9bcdfcc 100644 --- a/drivers/media/radio/radio-sf16fmr2.c +++ b/drivers/media/radio/radio-sf16fmr2.c | |||
| @@ -233,7 +233,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
| 233 | mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; | 233 | mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; |
| 234 | v->rangelow = RSF16_MINFREQ / mult; | 234 | v->rangelow = RSF16_MINFREQ / mult; |
| 235 | v->rangehigh = RSF16_MAXFREQ / mult; | 235 | v->rangehigh = RSF16_MAXFREQ / mult; |
| 236 | v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO; | 236 | v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; |
| 237 | v->capability = fmr2->flags&V4L2_TUNER_CAP_LOW; | 237 | v->capability = fmr2->flags&V4L2_TUNER_CAP_LOW; |
| 238 | v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO: | 238 | v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO: |
| 239 | V4L2_TUNER_MODE_MONO; | 239 | V4L2_TUNER_MODE_MONO; |
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 5f582726985d..c4d181dde1ca 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
| @@ -774,6 +774,7 @@ static int cafe_cam_init(struct cafe_camera *cam) | |||
| 774 | ret = __cafe_cam_reset(cam); | 774 | ret = __cafe_cam_reset(cam); |
| 775 | if (ret) | 775 | if (ret) |
| 776 | goto out; | 776 | goto out; |
| 777 | chip.ident = V4L2_IDENT_NONE; | ||
| 777 | chip.match.type = V4L2_CHIP_MATCH_I2C_ADDR; | 778 | chip.match.type = V4L2_CHIP_MATCH_I2C_ADDR; |
| 778 | chip.match.addr = cam->sensor_addr; | 779 | chip.match.addr = cam->sensor_addr; |
| 779 | ret = sensor_call(cam, core, g_chip_ident, &chip); | 780 | ret = sensor_call(cam, core, g_chip_ident, &chip); |
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 0c49a98213c4..1dc070da8652 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
| @@ -472,7 +472,7 @@ static int dvb_register(struct cx23885_tsport *port) | |||
| 472 | static struct xc2028_ctrl ctl = { | 472 | static struct xc2028_ctrl ctl = { |
| 473 | .fname = XC2028_DEFAULT_FIRMWARE, | 473 | .fname = XC2028_DEFAULT_FIRMWARE, |
| 474 | .max_len = 64, | 474 | .max_len = 64, |
| 475 | .scode_table = XC3028_FE_OREN538, | 475 | .demod = XC3028_FE_OREN538, |
| 476 | }; | 476 | }; |
| 477 | 477 | ||
| 478 | fe = dvb_attach(xc2028_attach, | 478 | fe = dvb_attach(xc2028_attach, |
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index b0195e8ee4d1..db2ac9a99acd 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
| @@ -305,14 +305,17 @@ int ivtv_waitq(wait_queue_head_t *waitq) | |||
| 305 | /* Generic utility functions */ | 305 | /* Generic utility functions */ |
| 306 | int ivtv_msleep_timeout(unsigned int msecs, int intr) | 306 | int ivtv_msleep_timeout(unsigned int msecs, int intr) |
| 307 | { | 307 | { |
| 308 | int ret; | ||
| 309 | int timeout = msecs_to_jiffies(msecs); | 308 | int timeout = msecs_to_jiffies(msecs); |
| 310 | 309 | ||
| 311 | do { | 310 | do { |
| 312 | set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); | 311 | set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); |
| 313 | timeout = schedule_timeout(timeout); | 312 | timeout = schedule_timeout(timeout); |
| 314 | if (intr && (ret = signal_pending(current))) | 313 | if (intr) { |
| 315 | return ret; | 314 | int ret = signal_pending(current); |
| 315 | |||
| 316 | if (ret) | ||
| 317 | return ret; | ||
| 318 | } | ||
| 316 | } while (timeout); | 319 | } while (timeout); |
| 317 | return 0; | 320 | return 0; |
| 318 | } | 321 | } |
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c index ceb05bdcaf62..85ac707228e7 100644 --- a/drivers/media/video/ivtv/ivtv-gpio.c +++ b/drivers/media/video/ivtv/ivtv-gpio.c | |||
| @@ -190,8 +190,8 @@ static int subdev_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) | |||
| 190 | 190 | ||
| 191 | mask = itv->card->gpio_audio_detect.mask; | 191 | mask = itv->card->gpio_audio_detect.mask; |
| 192 | if (mask == 0 || (read_reg(IVTV_REG_GPIO_IN) & mask)) | 192 | if (mask == 0 || (read_reg(IVTV_REG_GPIO_IN) & mask)) |
| 193 | vt->rxsubchans = V4L2_TUNER_MODE_STEREO | | 193 | vt->rxsubchans = V4L2_TUNER_SUB_STEREO | |
| 194 | V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; | 194 | V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2; |
| 195 | else | 195 | else |
| 196 | vt->rxsubchans = V4L2_TUNER_SUB_MONO; | 196 | vt->rxsubchans = V4L2_TUNER_SUB_MONO; |
| 197 | return 0; | 197 | return 0; |
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 4a2d464f055e..c342a9fe983e 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
| @@ -180,7 +180,7 @@ int ivtv_set_speed(struct ivtv *itv, int speed) | |||
| 180 | 180 | ||
| 181 | /* Wait for any DMA to finish */ | 181 | /* Wait for any DMA to finish */ |
| 182 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); | 182 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); |
| 183 | while (itv->i_flags & IVTV_F_I_DMA) { | 183 | while (test_bit(IVTV_F_I_DMA, &itv->i_flags)) { |
| 184 | got_sig = signal_pending(current); | 184 | got_sig = signal_pending(current); |
| 185 | if (got_sig) | 185 | if (got_sig) |
| 186 | break; | 186 | break; |
| @@ -1710,7 +1710,8 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) | |||
| 1710 | we are waiting unlock first and later lock again. */ | 1710 | we are waiting unlock first and later lock again. */ |
| 1711 | mutex_unlock(&itv->serialize_lock); | 1711 | mutex_unlock(&itv->serialize_lock); |
| 1712 | prepare_to_wait(&itv->event_waitq, &wait, TASK_INTERRUPTIBLE); | 1712 | prepare_to_wait(&itv->event_waitq, &wait, TASK_INTERRUPTIBLE); |
| 1713 | if ((itv->i_flags & (IVTV_F_I_EV_DEC_STOPPED|IVTV_F_I_EV_VSYNC)) == 0) | 1713 | if (!test_bit(IVTV_F_I_EV_DEC_STOPPED, &itv->i_flags) && |
| 1714 | !test_bit(IVTV_F_I_EV_VSYNC, &itv->i_flags)) | ||
| 1714 | schedule(); | 1715 | schedule(); |
| 1715 | finish_wait(&itv->event_waitq, &wait); | 1716 | finish_wait(&itv->event_waitq, &wait); |
| 1716 | mutex_lock(&itv->serialize_lock); | 1717 | mutex_lock(&itv->serialize_lock); |
diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c index 01c14d2b381a..cd9db0bf33bf 100644 --- a/drivers/media/video/ivtv/ivtv-irq.c +++ b/drivers/media/video/ivtv/ivtv-irq.c | |||
| @@ -196,7 +196,7 @@ static int stream_enc_dma_append(struct ivtv_stream *s, u32 data[CX2341X_MBOX_MA | |||
| 196 | bytes_needed, s->name); | 196 | bytes_needed, s->name); |
| 197 | return -1; | 197 | return -1; |
| 198 | } | 198 | } |
| 199 | if (rc && !s->buffers_stolen && (s->s_flags & IVTV_F_S_APPL_IO)) { | 199 | if (rc && !s->buffers_stolen && test_bit(IVTV_F_S_APPL_IO, &s->s_flags)) { |
| 200 | IVTV_WARN("All %s stream buffers are full. Dropping data.\n", s->name); | 200 | IVTV_WARN("All %s stream buffers are full. Dropping data.\n", s->name); |
| 201 | IVTV_WARN("Cause: the application is not reading fast enough.\n"); | 201 | IVTV_WARN("Cause: the application is not reading fast enough.\n"); |
| 202 | } | 202 | } |
diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c index 7912ed6b72ee..c0875378acc2 100644 --- a/drivers/media/video/ivtv/ivtv-yuv.c +++ b/drivers/media/video/ivtv/ivtv-yuv.c | |||
| @@ -1063,7 +1063,8 @@ static int ivtv_yuv_udma_frame(struct ivtv *itv, struct ivtv_dma_frame *args) | |||
| 1063 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); | 1063 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); |
| 1064 | /* if no UDMA is pending and no UDMA is in progress, then the DMA | 1064 | /* if no UDMA is pending and no UDMA is in progress, then the DMA |
| 1065 | is finished */ | 1065 | is finished */ |
| 1066 | while (itv->i_flags & (IVTV_F_I_UDMA_PENDING | IVTV_F_I_UDMA)) { | 1066 | while (test_bit(IVTV_F_I_UDMA_PENDING, &itv->i_flags) || |
| 1067 | test_bit(IVTV_F_I_UDMA, &itv->i_flags)) { | ||
| 1067 | /* don't interrupt if the DMA is in progress but break off | 1068 | /* don't interrupt if the DMA is in progress but break off |
| 1068 | a still pending DMA. */ | 1069 | a still pending DMA. */ |
| 1069 | got_sig = signal_pending(current); | 1070 | got_sig = signal_pending(current); |
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 66e6eb513076..fa6bb85cb4b0 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c | |||
| @@ -298,7 +298,8 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv, | |||
| 298 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); | 298 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); |
| 299 | /* if no UDMA is pending and no UDMA is in progress, then the DMA | 299 | /* if no UDMA is pending and no UDMA is in progress, then the DMA |
| 300 | is finished */ | 300 | is finished */ |
| 301 | while (itv->i_flags & (IVTV_F_I_UDMA_PENDING | IVTV_F_I_UDMA)) { | 301 | while (test_bit(IVTV_F_I_UDMA_PENDING, &itv->i_flags) || |
| 302 | test_bit(IVTV_F_I_UDMA, &itv->i_flags)) { | ||
| 302 | /* don't interrupt if the DMA is in progress but break off | 303 | /* don't interrupt if the DMA is in progress but break off |
| 303 | a still pending DMA. */ | 304 | a still pending DMA. */ |
| 304 | got_sig = signal_pending(current); | 305 | got_sig = signal_pending(current); |
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index 399412d7f020..507dc85646b2 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
| @@ -1726,14 +1726,17 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message) | |||
| 1726 | static int __uvc_resume(struct usb_interface *intf, int reset) | 1726 | static int __uvc_resume(struct usb_interface *intf, int reset) |
| 1727 | { | 1727 | { |
| 1728 | struct uvc_device *dev = usb_get_intfdata(intf); | 1728 | struct uvc_device *dev = usb_get_intfdata(intf); |
| 1729 | int ret; | ||
| 1730 | 1729 | ||
| 1731 | uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n", | 1730 | uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n", |
| 1732 | intf->cur_altsetting->desc.bInterfaceNumber); | 1731 | intf->cur_altsetting->desc.bInterfaceNumber); |
| 1733 | 1732 | ||
| 1734 | if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) { | 1733 | if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) { |
| 1735 | if (reset && (ret = uvc_ctrl_resume_device(dev)) < 0) | 1734 | if (reset) { |
| 1736 | return ret; | 1735 | int ret = uvc_ctrl_resume_device(dev); |
| 1736 | |||
| 1737 | if (ret < 0) | ||
| 1738 | return ret; | ||
| 1739 | } | ||
| 1737 | 1740 | ||
| 1738 | return uvc_status_resume(dev); | 1741 | return uvc_status_resume(dev); |
| 1739 | } | 1742 | } |
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index a95e17329c5b..6ce974d7362f 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c | |||
| @@ -742,7 +742,7 @@ static int uvc_alloc_urb_buffers(struct uvc_video_device *video, | |||
| 742 | 742 | ||
| 743 | /* Buffers are already allocated, bail out. */ | 743 | /* Buffers are already allocated, bail out. */ |
| 744 | if (video->urb_size) | 744 | if (video->urb_size) |
| 745 | return 0; | 745 | return video->urb_size / psize; |
| 746 | 746 | ||
| 747 | /* Compute the number of packets. Bulk endpoints might transfer UVC | 747 | /* Compute the number of packets. Bulk endpoints might transfer UVC |
| 748 | * payloads accross multiple URBs. | 748 | * payloads accross multiple URBs. |
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 88f10d6cbc92..be64a502ea27 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
| @@ -42,6 +42,12 @@ | |||
| 42 | printk(KERN_DEBUG "%s: " fmt, vfd->name, ## arg);\ | 42 | printk(KERN_DEBUG "%s: " fmt, vfd->name, ## arg);\ |
| 43 | } while (0) | 43 | } while (0) |
| 44 | 44 | ||
| 45 | /* Zero out the end of the struct pointed to by p. Everthing after, but | ||
| 46 | * not including, the specified field is cleared. */ | ||
| 47 | #define CLEAR_AFTER_FIELD(p, field) \ | ||
| 48 | memset((u8 *)(p) + offsetof(typeof(*(p)), field) + sizeof((p)->field), \ | ||
| 49 | 0, sizeof(*(p)) - offsetof(typeof(*(p)), field) - sizeof((p)->field)) | ||
| 50 | |||
| 45 | struct std_descr { | 51 | struct std_descr { |
| 46 | v4l2_std_id std; | 52 | v4l2_std_id std; |
| 47 | const char *descr; | 53 | const char *descr; |
| @@ -544,39 +550,39 @@ static int check_fmt(const struct v4l2_ioctl_ops *ops, enum v4l2_buf_type type) | |||
| 544 | 550 | ||
| 545 | switch (type) { | 551 | switch (type) { |
| 546 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 552 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
| 547 | if (ops->vidioc_try_fmt_vid_cap) | 553 | if (ops->vidioc_g_fmt_vid_cap) |
| 548 | return 0; | 554 | return 0; |
| 549 | break; | 555 | break; |
| 550 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 556 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
| 551 | if (ops->vidioc_try_fmt_vid_overlay) | 557 | if (ops->vidioc_g_fmt_vid_overlay) |
| 552 | return 0; | 558 | return 0; |
| 553 | break; | 559 | break; |
| 554 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 560 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
| 555 | if (ops->vidioc_try_fmt_vid_out) | 561 | if (ops->vidioc_g_fmt_vid_out) |
| 556 | return 0; | 562 | return 0; |
| 557 | break; | 563 | break; |
| 558 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 564 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
| 559 | if (ops->vidioc_try_fmt_vid_out_overlay) | 565 | if (ops->vidioc_g_fmt_vid_out_overlay) |
| 560 | return 0; | 566 | return 0; |
| 561 | break; | 567 | break; |
| 562 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 568 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
| 563 | if (ops->vidioc_try_fmt_vbi_cap) | 569 | if (ops->vidioc_g_fmt_vbi_cap) |
| 564 | return 0; | 570 | return 0; |
| 565 | break; | 571 | break; |
| 566 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 572 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
| 567 | if (ops->vidioc_try_fmt_vbi_out) | 573 | if (ops->vidioc_g_fmt_vbi_out) |
| 568 | return 0; | 574 | return 0; |
| 569 | break; | 575 | break; |
| 570 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | 576 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: |
| 571 | if (ops->vidioc_try_fmt_sliced_vbi_cap) | 577 | if (ops->vidioc_g_fmt_sliced_vbi_cap) |
| 572 | return 0; | 578 | return 0; |
| 573 | break; | 579 | break; |
| 574 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 580 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: |
| 575 | if (ops->vidioc_try_fmt_sliced_vbi_out) | 581 | if (ops->vidioc_g_fmt_sliced_vbi_out) |
| 576 | return 0; | 582 | return 0; |
| 577 | break; | 583 | break; |
| 578 | case V4L2_BUF_TYPE_PRIVATE: | 584 | case V4L2_BUF_TYPE_PRIVATE: |
| 579 | if (ops->vidioc_try_fmt_type_private) | 585 | if (ops->vidioc_g_fmt_type_private) |
| 580 | return 0; | 586 | return 0; |
| 581 | break; | 587 | break; |
| 582 | } | 588 | } |
| @@ -782,44 +788,53 @@ static long __video_do_ioctl(struct file *file, | |||
| 782 | 788 | ||
| 783 | switch (f->type) { | 789 | switch (f->type) { |
| 784 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 790 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
| 791 | CLEAR_AFTER_FIELD(f, fmt.pix); | ||
| 785 | v4l_print_pix_fmt(vfd, &f->fmt.pix); | 792 | v4l_print_pix_fmt(vfd, &f->fmt.pix); |
| 786 | if (ops->vidioc_s_fmt_vid_cap) | 793 | if (ops->vidioc_s_fmt_vid_cap) |
| 787 | ret = ops->vidioc_s_fmt_vid_cap(file, fh, f); | 794 | ret = ops->vidioc_s_fmt_vid_cap(file, fh, f); |
| 788 | break; | 795 | break; |
| 789 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 796 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
| 797 | CLEAR_AFTER_FIELD(f, fmt.win); | ||
| 790 | if (ops->vidioc_s_fmt_vid_overlay) | 798 | if (ops->vidioc_s_fmt_vid_overlay) |
| 791 | ret = ops->vidioc_s_fmt_vid_overlay(file, | 799 | ret = ops->vidioc_s_fmt_vid_overlay(file, |
| 792 | fh, f); | 800 | fh, f); |
| 793 | break; | 801 | break; |
| 794 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 802 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
| 803 | CLEAR_AFTER_FIELD(f, fmt.pix); | ||
| 795 | v4l_print_pix_fmt(vfd, &f->fmt.pix); | 804 | v4l_print_pix_fmt(vfd, &f->fmt.pix); |
| 796 | if (ops->vidioc_s_fmt_vid_out) | 805 | if (ops->vidioc_s_fmt_vid_out) |
| 797 | ret = ops->vidioc_s_fmt_vid_out(file, fh, f); | 806 | ret = ops->vidioc_s_fmt_vid_out(file, fh, f); |
| 798 | break; | 807 | break; |
| 799 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 808 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
| 809 | CLEAR_AFTER_FIELD(f, fmt.win); | ||
| 800 | if (ops->vidioc_s_fmt_vid_out_overlay) | 810 | if (ops->vidioc_s_fmt_vid_out_overlay) |
| 801 | ret = ops->vidioc_s_fmt_vid_out_overlay(file, | 811 | ret = ops->vidioc_s_fmt_vid_out_overlay(file, |
| 802 | fh, f); | 812 | fh, f); |
| 803 | break; | 813 | break; |
| 804 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 814 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
| 815 | CLEAR_AFTER_FIELD(f, fmt.vbi); | ||
| 805 | if (ops->vidioc_s_fmt_vbi_cap) | 816 | if (ops->vidioc_s_fmt_vbi_cap) |
| 806 | ret = ops->vidioc_s_fmt_vbi_cap(file, fh, f); | 817 | ret = ops->vidioc_s_fmt_vbi_cap(file, fh, f); |
| 807 | break; | 818 | break; |
| 808 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 819 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
| 820 | CLEAR_AFTER_FIELD(f, fmt.vbi); | ||
| 809 | if (ops->vidioc_s_fmt_vbi_out) | 821 | if (ops->vidioc_s_fmt_vbi_out) |
| 810 | ret = ops->vidioc_s_fmt_vbi_out(file, fh, f); | 822 | ret = ops->vidioc_s_fmt_vbi_out(file, fh, f); |
| 811 | break; | 823 | break; |
| 812 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | 824 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: |
| 825 | CLEAR_AFTER_FIELD(f, fmt.sliced); | ||
| 813 | if (ops->vidioc_s_fmt_sliced_vbi_cap) | 826 | if (ops->vidioc_s_fmt_sliced_vbi_cap) |
| 814 | ret = ops->vidioc_s_fmt_sliced_vbi_cap(file, | 827 | ret = ops->vidioc_s_fmt_sliced_vbi_cap(file, |
| 815 | fh, f); | 828 | fh, f); |
| 816 | break; | 829 | break; |
| 817 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 830 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: |
| 831 | CLEAR_AFTER_FIELD(f, fmt.sliced); | ||
| 818 | if (ops->vidioc_s_fmt_sliced_vbi_out) | 832 | if (ops->vidioc_s_fmt_sliced_vbi_out) |
| 819 | ret = ops->vidioc_s_fmt_sliced_vbi_out(file, | 833 | ret = ops->vidioc_s_fmt_sliced_vbi_out(file, |
| 820 | fh, f); | 834 | fh, f); |
| 821 | break; | 835 | break; |
| 822 | case V4L2_BUF_TYPE_PRIVATE: | 836 | case V4L2_BUF_TYPE_PRIVATE: |
| 837 | /* CLEAR_AFTER_FIELD(f, fmt.raw_data); <- does nothing */ | ||
| 823 | if (ops->vidioc_s_fmt_type_private) | 838 | if (ops->vidioc_s_fmt_type_private) |
| 824 | ret = ops->vidioc_s_fmt_type_private(file, | 839 | ret = ops->vidioc_s_fmt_type_private(file, |
| 825 | fh, f); | 840 | fh, f); |
| @@ -836,46 +851,55 @@ static long __video_do_ioctl(struct file *file, | |||
| 836 | v4l2_type_names)); | 851 | v4l2_type_names)); |
| 837 | switch (f->type) { | 852 | switch (f->type) { |
| 838 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 853 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
| 854 | CLEAR_AFTER_FIELD(f, fmt.pix); | ||
| 839 | if (ops->vidioc_try_fmt_vid_cap) | 855 | if (ops->vidioc_try_fmt_vid_cap) |
| 840 | ret = ops->vidioc_try_fmt_vid_cap(file, fh, f); | 856 | ret = ops->vidioc_try_fmt_vid_cap(file, fh, f); |
| 841 | if (!ret) | 857 | if (!ret) |
| 842 | v4l_print_pix_fmt(vfd, &f->fmt.pix); | 858 | v4l_print_pix_fmt(vfd, &f->fmt.pix); |
| 843 | break; | 859 | break; |
| 844 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 860 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
| 861 | CLEAR_AFTER_FIELD(f, fmt.win); | ||
| 845 | if (ops->vidioc_try_fmt_vid_overlay) | 862 | if (ops->vidioc_try_fmt_vid_overlay) |
| 846 | ret = ops->vidioc_try_fmt_vid_overlay(file, | 863 | ret = ops->vidioc_try_fmt_vid_overlay(file, |
| 847 | fh, f); | 864 | fh, f); |
| 848 | break; | 865 | break; |
| 849 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 866 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
| 867 | CLEAR_AFTER_FIELD(f, fmt.pix); | ||
| 850 | if (ops->vidioc_try_fmt_vid_out) | 868 | if (ops->vidioc_try_fmt_vid_out) |
| 851 | ret = ops->vidioc_try_fmt_vid_out(file, fh, f); | 869 | ret = ops->vidioc_try_fmt_vid_out(file, fh, f); |
| 852 | if (!ret) | 870 | if (!ret) |
| 853 | v4l_print_pix_fmt(vfd, &f->fmt.pix); | 871 | v4l_print_pix_fmt(vfd, &f->fmt.pix); |
| 854 | break; | 872 | break; |
| 855 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 873 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
| 874 | CLEAR_AFTER_FIELD(f, fmt.win); | ||
| 856 | if (ops->vidioc_try_fmt_vid_out_overlay) | 875 | if (ops->vidioc_try_fmt_vid_out_overlay) |
| 857 | ret = ops->vidioc_try_fmt_vid_out_overlay(file, | 876 | ret = ops->vidioc_try_fmt_vid_out_overlay(file, |
| 858 | fh, f); | 877 | fh, f); |
| 859 | break; | 878 | break; |
| 860 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 879 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
| 880 | CLEAR_AFTER_FIELD(f, fmt.vbi); | ||
| 861 | if (ops->vidioc_try_fmt_vbi_cap) | 881 | if (ops->vidioc_try_fmt_vbi_cap) |
| 862 | ret = ops->vidioc_try_fmt_vbi_cap(file, fh, f); | 882 | ret = ops->vidioc_try_fmt_vbi_cap(file, fh, f); |
| 863 | break; | 883 | break; |
| 864 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 884 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
| 885 | CLEAR_AFTER_FIELD(f, fmt.vbi); | ||
| 865 | if (ops->vidioc_try_fmt_vbi_out) | 886 | if (ops->vidioc_try_fmt_vbi_out) |
| 866 | ret = ops->vidioc_try_fmt_vbi_out(file, fh, f); | 887 | ret = ops->vidioc_try_fmt_vbi_out(file, fh, f); |
| 867 | break; | 888 | break; |
| 868 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | 889 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: |
| 890 | CLEAR_AFTER_FIELD(f, fmt.sliced); | ||
| 869 | if (ops->vidioc_try_fmt_sliced_vbi_cap) | 891 | if (ops->vidioc_try_fmt_sliced_vbi_cap) |
| 870 | ret = ops->vidioc_try_fmt_sliced_vbi_cap(file, | 892 | ret = ops->vidioc_try_fmt_sliced_vbi_cap(file, |
| 871 | fh, f); | 893 | fh, f); |
| 872 | break; | 894 | break; |
| 873 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 895 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: |
| 896 | CLEAR_AFTER_FIELD(f, fmt.sliced); | ||
| 874 | if (ops->vidioc_try_fmt_sliced_vbi_out) | 897 | if (ops->vidioc_try_fmt_sliced_vbi_out) |
| 875 | ret = ops->vidioc_try_fmt_sliced_vbi_out(file, | 898 | ret = ops->vidioc_try_fmt_sliced_vbi_out(file, |
| 876 | fh, f); | 899 | fh, f); |
| 877 | break; | 900 | break; |
| 878 | case V4L2_BUF_TYPE_PRIVATE: | 901 | case V4L2_BUF_TYPE_PRIVATE: |
| 902 | /* CLEAR_AFTER_FIELD(f, fmt.raw_data); <- does nothing */ | ||
| 879 | if (ops->vidioc_try_fmt_type_private) | 903 | if (ops->vidioc_try_fmt_type_private) |
| 880 | ret = ops->vidioc_try_fmt_type_private(file, | 904 | ret = ops->vidioc_try_fmt_type_private(file, |
| 881 | fh, f); | 905 | fh, f); |
| @@ -898,6 +922,9 @@ static long __video_do_ioctl(struct file *file, | |||
| 898 | if (ret) | 922 | if (ret) |
| 899 | break; | 923 | break; |
| 900 | 924 | ||
| 925 | if (p->type < V4L2_BUF_TYPE_PRIVATE) | ||
| 926 | CLEAR_AFTER_FIELD(p, memory); | ||
| 927 | |||
| 901 | ret = ops->vidioc_reqbufs(file, fh, p); | 928 | ret = ops->vidioc_reqbufs(file, fh, p); |
| 902 | dbgarg(cmd, "count=%d, type=%s, memory=%s\n", | 929 | dbgarg(cmd, "count=%d, type=%s, memory=%s\n", |
| 903 | p->count, | 930 | p->count, |
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index 092333b1c34f..643cccaa1aab 100644 --- a/drivers/media/video/zoran/zoran_driver.c +++ b/drivers/media/video/zoran/zoran_driver.c | |||
| @@ -1863,22 +1863,20 @@ static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capability | |||
| 1863 | 1863 | ||
| 1864 | static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag) | 1864 | static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag) |
| 1865 | { | 1865 | { |
| 1866 | int num = -1, i; | 1866 | unsigned int num, i; |
| 1867 | 1867 | ||
| 1868 | for (i = 0; i < NUM_FORMATS; i++) { | 1868 | for (num = i = 0; i < NUM_FORMATS; i++) { |
| 1869 | if (zoran_formats[i].flags & flag) | 1869 | if (zoran_formats[i].flags & flag && num++ == fmt->index) { |
| 1870 | num++; | 1870 | strncpy(fmt->description, zoran_formats[i].name, |
| 1871 | if (num == fmt->index) | 1871 | sizeof(fmt->description) - 1); |
| 1872 | break; | 1872 | /* fmt struct pre-zeroed, so adding '\0' not neeed */ |
| 1873 | fmt->pixelformat = zoran_formats[i].fourcc; | ||
| 1874 | if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED) | ||
| 1875 | fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; | ||
| 1876 | return 0; | ||
| 1877 | } | ||
| 1873 | } | 1878 | } |
| 1874 | if (fmt->index < 0 /* late, but not too late */ || i == NUM_FORMATS) | 1879 | return -EINVAL; |
| 1875 | return -EINVAL; | ||
| 1876 | |||
| 1877 | strncpy(fmt->description, zoran_formats[i].name, sizeof(fmt->description)-1); | ||
| 1878 | fmt->pixelformat = zoran_formats[i].fourcc; | ||
| 1879 | if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED) | ||
| 1880 | fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; | ||
| 1881 | return 0; | ||
| 1882 | } | 1880 | } |
| 1883 | 1881 | ||
| 1884 | static int zoran_enum_fmt_vid_cap(struct file *file, void *__fh, | 1882 | static int zoran_enum_fmt_vid_cap(struct file *file, void *__fh, |
diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c index 2e2a5923d4c2..a71e245801ee 100644 --- a/drivers/misc/isl29003.c +++ b/drivers/misc/isl29003.c | |||
| @@ -64,6 +64,7 @@ struct isl29003_data { | |||
| 64 | struct i2c_client *client; | 64 | struct i2c_client *client; |
| 65 | struct mutex lock; | 65 | struct mutex lock; |
| 66 | u8 reg_cache[ISL29003_NUM_CACHABLE_REGS]; | 66 | u8 reg_cache[ISL29003_NUM_CACHABLE_REGS]; |
| 67 | u8 power_state_before_suspend; | ||
| 67 | }; | 68 | }; |
| 68 | 69 | ||
| 69 | static int gain_range[] = { | 70 | static int gain_range[] = { |
| @@ -411,6 +412,9 @@ static int __devexit isl29003_remove(struct i2c_client *client) | |||
| 411 | #ifdef CONFIG_PM | 412 | #ifdef CONFIG_PM |
| 412 | static int isl29003_suspend(struct i2c_client *client, pm_message_t mesg) | 413 | static int isl29003_suspend(struct i2c_client *client, pm_message_t mesg) |
| 413 | { | 414 | { |
| 415 | struct isl29003_data *data = i2c_get_clientdata(client); | ||
| 416 | |||
| 417 | data->power_state_before_suspend = isl29003_get_power_state(client); | ||
| 414 | return isl29003_set_power_state(client, 0); | 418 | return isl29003_set_power_state(client, 0); |
| 415 | } | 419 | } |
| 416 | 420 | ||
| @@ -421,10 +425,11 @@ static int isl29003_resume(struct i2c_client *client) | |||
| 421 | 425 | ||
| 422 | /* restore registers from cache */ | 426 | /* restore registers from cache */ |
| 423 | for (i = 0; i < ARRAY_SIZE(data->reg_cache); i++) | 427 | for (i = 0; i < ARRAY_SIZE(data->reg_cache); i++) |
| 424 | if (!i2c_smbus_write_byte_data(client, i, data->reg_cache[i])) | 428 | if (i2c_smbus_write_byte_data(client, i, data->reg_cache[i])) |
| 425 | return -EIO; | 429 | return -EIO; |
| 426 | 430 | ||
| 427 | return 0; | 431 | return isl29003_set_power_state(client, |
| 432 | data->power_state_before_suspend); | ||
| 428 | } | 433 | } |
| 429 | 434 | ||
| 430 | #else | 435 | #else |
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index fe8041e619ea..b25e9b6516ae 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
| @@ -254,6 +254,14 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) | |||
| 254 | brq.data.blocks = req->nr_sectors; | 254 | brq.data.blocks = req->nr_sectors; |
| 255 | 255 | ||
| 256 | /* | 256 | /* |
| 257 | * The block layer doesn't support all sector count | ||
| 258 | * restrictions, so we need to be prepared for too big | ||
| 259 | * requests. | ||
| 260 | */ | ||
| 261 | if (brq.data.blocks > card->host->max_blk_count) | ||
| 262 | brq.data.blocks = card->host->max_blk_count; | ||
| 263 | |||
| 264 | /* | ||
| 257 | * After a read error, we redo the request one sector at a time | 265 | * After a read error, we redo the request one sector at a time |
| 258 | * in order to accurately determine which sectors can be read | 266 | * in order to accurately determine which sectors can be read |
| 259 | * successfully. | 267 | * successfully. |
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index fa073ab3fa34..264911732756 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c | |||
| @@ -706,7 +706,7 @@ static void mmc_power_up(struct mmc_host *host) | |||
| 706 | * This delay should be sufficient to allow the power supply | 706 | * This delay should be sufficient to allow the power supply |
| 707 | * to reach the minimum voltage. | 707 | * to reach the minimum voltage. |
| 708 | */ | 708 | */ |
| 709 | mmc_delay(2); | 709 | mmc_delay(10); |
| 710 | 710 | ||
| 711 | host->ios.clock = host->f_min; | 711 | host->ios.clock = host->f_min; |
| 712 | host->ios.power_mode = MMC_POWER_ON; | 712 | host->ios.power_mode = MMC_POWER_ON; |
| @@ -716,7 +716,7 @@ static void mmc_power_up(struct mmc_host *host) | |||
| 716 | * This delay must be at least 74 clock sizes, or 1 ms, or the | 716 | * This delay must be at least 74 clock sizes, or 1 ms, or the |
| 717 | * time required to reach a stable voltage. | 717 | * time required to reach a stable voltage. |
| 718 | */ | 718 | */ |
| 719 | mmc_delay(2); | 719 | mmc_delay(10); |
| 720 | } | 720 | } |
| 721 | 721 | ||
| 722 | static void mmc_power_off(struct mmc_host *host) | 722 | static void mmc_power_off(struct mmc_host *host) |
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index a663429b3d55..36875dcfa492 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
| @@ -514,6 +514,7 @@ static int __devinit mmci_probe(struct amba_device *dev, void *id) | |||
| 514 | } | 514 | } |
| 515 | 515 | ||
| 516 | host = mmc_priv(mmc); | 516 | host = mmc_priv(mmc); |
| 517 | host->mmc = mmc; | ||
| 517 | /* Bits 12 thru 19 is the designer */ | 518 | /* Bits 12 thru 19 is the designer */ |
| 518 | host->hw_designer = (dev->periphid >> 12) & 0xff; | 519 | host->hw_designer = (dev->periphid >> 12) & 0xff; |
| 519 | /* Bits 20 thru 23 is the revison */ | 520 | /* Bits 20 thru 23 is the revison */ |
| @@ -545,7 +546,6 @@ static int __devinit mmci_probe(struct amba_device *dev, void *id) | |||
| 545 | host->mclk = clk_get_rate(host->clk); | 546 | host->mclk = clk_get_rate(host->clk); |
| 546 | DBG(host, "eventual mclk rate: %u Hz\n", host->mclk); | 547 | DBG(host, "eventual mclk rate: %u Hz\n", host->mclk); |
| 547 | } | 548 | } |
| 548 | host->mmc = mmc; | ||
| 549 | host->base = ioremap(dev->res.start, SZ_4K); | 549 | host->base = ioremap(dev->res.start, SZ_4K); |
| 550 | if (!host->base) { | 550 | if (!host->base) { |
| 551 | ret = -ENOMEM; | 551 | ret = -ENOMEM; |
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index b5c375d94ab3..c643d0fe118f 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c | |||
| @@ -825,24 +825,23 @@ static int __exit mvsd_remove(struct platform_device *pdev) | |||
| 825 | } | 825 | } |
| 826 | 826 | ||
| 827 | #ifdef CONFIG_PM | 827 | #ifdef CONFIG_PM |
| 828 | static int mvsd_suspend(struct platform_device *dev, pm_message_t state, | 828 | static int mvsd_suspend(struct platform_device *dev, pm_message_t state) |
| 829 | u32 level) | ||
| 830 | { | 829 | { |
| 831 | struct mmc_host *mmc = platform_get_drvdata(dev); | 830 | struct mmc_host *mmc = platform_get_drvdata(dev); |
| 832 | int ret = 0; | 831 | int ret = 0; |
| 833 | 832 | ||
| 834 | if (mmc && level == SUSPEND_DISABLE) | 833 | if (mmc) |
| 835 | ret = mmc_suspend_host(mmc, state); | 834 | ret = mmc_suspend_host(mmc, state); |
| 836 | 835 | ||
| 837 | return ret; | 836 | return ret; |
| 838 | } | 837 | } |
| 839 | 838 | ||
| 840 | static int mvsd_resume(struct platform_device *dev, u32 level) | 839 | static int mvsd_resume(struct platform_device *dev) |
| 841 | { | 840 | { |
| 842 | struct mmc_host *mmc = platform_dev_get_drvdata(dev); | 841 | struct mmc_host *mmc = platform_get_drvdata(dev); |
| 843 | int ret = 0; | 842 | int ret = 0; |
| 844 | 843 | ||
| 845 | if (mmc && level == RESUME_ENABLE) | 844 | if (mmc) |
| 846 | ret = mmc_resume_host(mmc); | 845 | ret = mmc_resume_host(mmc); |
| 847 | 846 | ||
| 848 | return ret; | 847 | return ret; |
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index cd37962ec44f..65be27995d5c 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c | |||
| @@ -522,8 +522,8 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( | |||
| 522 | 522 | ||
| 523 | host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pci_slot)); | 523 | host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pci_slot)); |
| 524 | if (IS_ERR(host)) { | 524 | if (IS_ERR(host)) { |
| 525 | ret = PTR_ERR(host); | 525 | dev_err(&pdev->dev, "cannot allocate host\n"); |
| 526 | goto unmap; | 526 | return ERR_PTR(PTR_ERR(host)); |
| 527 | } | 527 | } |
| 528 | 528 | ||
| 529 | slot = sdhci_priv(host); | 529 | slot = sdhci_priv(host); |
| @@ -541,7 +541,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( | |||
| 541 | ret = pci_request_region(pdev, bar, mmc_hostname(host->mmc)); | 541 | ret = pci_request_region(pdev, bar, mmc_hostname(host->mmc)); |
| 542 | if (ret) { | 542 | if (ret) { |
| 543 | dev_err(&pdev->dev, "cannot request region\n"); | 543 | dev_err(&pdev->dev, "cannot request region\n"); |
| 544 | return ERR_PTR(ret); | 544 | goto free; |
| 545 | } | 545 | } |
| 546 | 546 | ||
| 547 | addr = pci_resource_start(pdev, bar); | 547 | addr = pci_resource_start(pdev, bar); |
| @@ -572,6 +572,8 @@ unmap: | |||
| 572 | 572 | ||
| 573 | release: | 573 | release: |
| 574 | pci_release_region(pdev, bar); | 574 | pci_release_region(pdev, bar); |
| 575 | |||
| 576 | free: | ||
| 575 | sdhci_free_host(host); | 577 | sdhci_free_host(host); |
| 576 | 578 | ||
| 577 | return ERR_PTR(ret); | 579 | return ERR_PTR(ret); |
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index f20a834f4309..65c6f996bbd3 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h | |||
| @@ -125,7 +125,7 @@ | |||
| 125 | #define SDHCI_INT_DATA_MASK (SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | \ | 125 | #define SDHCI_INT_DATA_MASK (SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | \ |
| 126 | SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \ | 126 | SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \ |
| 127 | SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \ | 127 | SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \ |
| 128 | SDHCI_INT_DATA_END_BIT) | 128 | SDHCI_INT_DATA_END_BIT | SDHCI_ADMA_ERROR) |
| 129 | #define SDHCI_INT_ALL_MASK ((unsigned int)-1) | 129 | #define SDHCI_INT_ALL_MASK ((unsigned int)-1) |
| 130 | 130 | ||
| 131 | #define SDHCI_ACMD12_ERR 0x3C | 131 | #define SDHCI_ACMD12_ERR 0x3C |
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 8185b1f3e5e6..cc6369ea67dd 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | #define SR_SRWD 0x80 /* SR write protect */ | 54 | #define SR_SRWD 0x80 /* SR write protect */ |
| 55 | 55 | ||
| 56 | /* Define max times to check status register before we give up. */ | 56 | /* Define max times to check status register before we give up. */ |
| 57 | #define MAX_READY_WAIT_COUNT 100000 | 57 | #define MAX_READY_WAIT_JIFFIES (10 * HZ) /* eg. M25P128 specs 6s max sector erase */ |
| 58 | #define CMD_SIZE 4 | 58 | #define CMD_SIZE 4 |
| 59 | 59 | ||
| 60 | #ifdef CONFIG_M25PXX_USE_FAST_READ | 60 | #ifdef CONFIG_M25PXX_USE_FAST_READ |
| @@ -139,20 +139,20 @@ static inline int write_enable(struct m25p *flash) | |||
| 139 | */ | 139 | */ |
| 140 | static int wait_till_ready(struct m25p *flash) | 140 | static int wait_till_ready(struct m25p *flash) |
| 141 | { | 141 | { |
| 142 | int count; | 142 | unsigned long deadline; |
| 143 | int sr; | 143 | int sr; |
| 144 | 144 | ||
| 145 | /* one chip guarantees max 5 msec wait here after page writes, | 145 | deadline = jiffies + MAX_READY_WAIT_JIFFIES; |
| 146 | * but potentially three seconds (!) after page erase. | 146 | |
| 147 | */ | 147 | do { |
| 148 | for (count = 0; count < MAX_READY_WAIT_COUNT; count++) { | ||
| 149 | if ((sr = read_sr(flash)) < 0) | 148 | if ((sr = read_sr(flash)) < 0) |
| 150 | break; | 149 | break; |
| 151 | else if (!(sr & SR_WIP)) | 150 | else if (!(sr & SR_WIP)) |
| 152 | return 0; | 151 | return 0; |
| 153 | 152 | ||
| 154 | /* REVISIT sometimes sleeping would be best */ | 153 | cond_resched(); |
| 155 | } | 154 | |
| 155 | } while (!time_after_eq(jiffies, deadline)); | ||
| 156 | 156 | ||
| 157 | return 1; | 157 | return 1; |
| 158 | } | 158 | } |
| @@ -246,10 +246,12 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr) | |||
| 246 | mutex_lock(&flash->lock); | 246 | mutex_lock(&flash->lock); |
| 247 | 247 | ||
| 248 | /* whole-chip erase? */ | 248 | /* whole-chip erase? */ |
| 249 | if (len == flash->mtd.size && erase_chip(flash)) { | 249 | if (len == flash->mtd.size) { |
| 250 | instr->state = MTD_ERASE_FAILED; | 250 | if (erase_chip(flash)) { |
| 251 | mutex_unlock(&flash->lock); | 251 | instr->state = MTD_ERASE_FAILED; |
| 252 | return -EIO; | 252 | mutex_unlock(&flash->lock); |
| 253 | return -EIO; | ||
| 254 | } | ||
| 253 | 255 | ||
| 254 | /* REVISIT in some cases we could speed up erasing large regions | 256 | /* REVISIT in some cases we could speed up erasing large regions |
| 255 | * by using OPCODE_SE instead of OPCODE_BE_4K. We may have set up | 257 | * by using OPCODE_SE instead of OPCODE_BE_4K. We may have set up |
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index fdd6ae859397..bccb4b1ffc46 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c | |||
| @@ -48,11 +48,11 @@ static LIST_HEAD(mtd_notifiers); | |||
| 48 | */ | 48 | */ |
| 49 | static void mtd_release(struct device *dev) | 49 | static void mtd_release(struct device *dev) |
| 50 | { | 50 | { |
| 51 | struct mtd_info *mtd = dev_to_mtd(dev); | 51 | dev_t index = MTD_DEVT(dev_to_mtd(dev)->index); |
| 52 | 52 | ||
| 53 | /* remove /dev/mtdXro node if needed */ | 53 | /* remove /dev/mtdXro node if needed */ |
| 54 | if (MTD_DEVT(mtd->index)) | 54 | if (index) |
| 55 | device_destroy(mtd_class, MTD_DEVT(mtd->index) + 1); | 55 | device_destroy(mtd_class, index + 1); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static ssize_t mtd_type_show(struct device *dev, | 58 | static ssize_t mtd_type_show(struct device *dev, |
| @@ -132,6 +132,17 @@ static ssize_t mtd_writesize_show(struct device *dev, | |||
| 132 | } | 132 | } |
| 133 | static DEVICE_ATTR(writesize, S_IRUGO, mtd_writesize_show, NULL); | 133 | static DEVICE_ATTR(writesize, S_IRUGO, mtd_writesize_show, NULL); |
| 134 | 134 | ||
| 135 | static ssize_t mtd_subpagesize_show(struct device *dev, | ||
| 136 | struct device_attribute *attr, char *buf) | ||
| 137 | { | ||
| 138 | struct mtd_info *mtd = dev_to_mtd(dev); | ||
| 139 | unsigned int subpagesize = mtd->writesize >> mtd->subpage_sft; | ||
| 140 | |||
| 141 | return snprintf(buf, PAGE_SIZE, "%u\n", subpagesize); | ||
| 142 | |||
| 143 | } | ||
| 144 | static DEVICE_ATTR(subpagesize, S_IRUGO, mtd_subpagesize_show, NULL); | ||
| 145 | |||
| 135 | static ssize_t mtd_oobsize_show(struct device *dev, | 146 | static ssize_t mtd_oobsize_show(struct device *dev, |
| 136 | struct device_attribute *attr, char *buf) | 147 | struct device_attribute *attr, char *buf) |
| 137 | { | 148 | { |
| @@ -169,6 +180,7 @@ static struct attribute *mtd_attrs[] = { | |||
| 169 | &dev_attr_size.attr, | 180 | &dev_attr_size.attr, |
| 170 | &dev_attr_erasesize.attr, | 181 | &dev_attr_erasesize.attr, |
| 171 | &dev_attr_writesize.attr, | 182 | &dev_attr_writesize.attr, |
| 183 | &dev_attr_subpagesize.attr, | ||
| 172 | &dev_attr_oobsize.attr, | 184 | &dev_attr_oobsize.attr, |
| 173 | &dev_attr_numeraseregions.attr, | 185 | &dev_attr_numeraseregions.attr, |
| 174 | &dev_attr_name.attr, | 186 | &dev_attr_name.attr, |
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index 92285d0089c2..af8b42e0a55b 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c | |||
| @@ -74,8 +74,7 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags, | |||
| 74 | 74 | ||
| 75 | ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); | 75 | ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); |
| 76 | if (ret < 0) { | 76 | if (ret < 0) { |
| 77 | up_write(&sb->s_umount); | 77 | deactivate_locked_super(sb); |
| 78 | deactivate_super(sb); | ||
| 79 | return ret; | 78 | return ret; |
| 80 | } | 79 | } |
| 81 | 80 | ||
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 448487e22fa3..a740053d3af3 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
| @@ -338,12 +338,12 @@ static int ixp4xx_mdio_register(void) | |||
| 338 | if (cpu_is_ixp43x()) { | 338 | if (cpu_is_ixp43x()) { |
| 339 | /* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */ | 339 | /* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */ |
| 340 | if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEC_ETH)) | 340 | if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEC_ETH)) |
| 341 | return -ENOSYS; | 341 | return -ENODEV; |
| 342 | mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT; | 342 | mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT; |
| 343 | } else { | 343 | } else { |
| 344 | /* All MII PHY accesses use NPE-B Ethernet registers */ | 344 | /* All MII PHY accesses use NPE-B Ethernet registers */ |
| 345 | if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0)) | 345 | if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0)) |
| 346 | return -ENOSYS; | 346 | return -ENODEV; |
| 347 | mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT; | 347 | mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT; |
| 348 | } | 348 | } |
| 349 | 349 | ||
| @@ -1174,7 +1174,7 @@ static int __devinit eth_init_one(struct platform_device *pdev) | |||
| 1174 | regs_phys = IXP4XX_EthC_BASE_PHYS; | 1174 | regs_phys = IXP4XX_EthC_BASE_PHYS; |
| 1175 | break; | 1175 | break; |
| 1176 | default: | 1176 | default: |
| 1177 | err = -ENOSYS; | 1177 | err = -ENODEV; |
| 1178 | goto err_free; | 1178 | goto err_free; |
| 1179 | } | 1179 | } |
| 1180 | 1180 | ||
| @@ -1189,15 +1189,10 @@ static int __devinit eth_init_one(struct platform_device *pdev) | |||
| 1189 | goto err_free; | 1189 | goto err_free; |
| 1190 | } | 1190 | } |
| 1191 | 1191 | ||
| 1192 | if (register_netdev(dev)) { | ||
| 1193 | err = -EIO; | ||
| 1194 | goto err_npe_rel; | ||
| 1195 | } | ||
| 1196 | |||
| 1197 | port->mem_res = request_mem_region(regs_phys, REGS_SIZE, dev->name); | 1192 | port->mem_res = request_mem_region(regs_phys, REGS_SIZE, dev->name); |
| 1198 | if (!port->mem_res) { | 1193 | if (!port->mem_res) { |
| 1199 | err = -EBUSY; | 1194 | err = -EBUSY; |
| 1200 | goto err_unreg; | 1195 | goto err_npe_rel; |
| 1201 | } | 1196 | } |
| 1202 | 1197 | ||
| 1203 | port->plat = plat; | 1198 | port->plat = plat; |
| @@ -1215,20 +1210,25 @@ static int __devinit eth_init_one(struct platform_device *pdev) | |||
| 1215 | snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy); | 1210 | snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy); |
| 1216 | port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0, | 1211 | port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0, |
| 1217 | PHY_INTERFACE_MODE_MII); | 1212 | PHY_INTERFACE_MODE_MII); |
| 1218 | if (IS_ERR(port->phydev)) { | 1213 | if ((err = IS_ERR(port->phydev))) |
| 1219 | printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); | 1214 | goto err_free_mem; |
| 1220 | return PTR_ERR(port->phydev); | ||
| 1221 | } | ||
| 1222 | 1215 | ||
| 1223 | port->phydev->irq = PHY_POLL; | 1216 | port->phydev->irq = PHY_POLL; |
| 1224 | 1217 | ||
| 1218 | if ((err = register_netdev(dev))) | ||
| 1219 | goto err_phy_dis; | ||
| 1220 | |||
| 1225 | printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy, | 1221 | printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy, |
| 1226 | npe_name(port->npe)); | 1222 | npe_name(port->npe)); |
| 1227 | 1223 | ||
| 1228 | return 0; | 1224 | return 0; |
| 1229 | 1225 | ||
| 1230 | err_unreg: | 1226 | err_phy_dis: |
| 1231 | unregister_netdev(dev); | 1227 | phy_disconnect(port->phydev); |
| 1228 | err_free_mem: | ||
| 1229 | npe_port_tab[NPE_ID(port->id)] = NULL; | ||
| 1230 | platform_set_drvdata(pdev, NULL); | ||
| 1231 | release_resource(port->mem_res); | ||
| 1232 | err_npe_rel: | 1232 | err_npe_rel: |
| 1233 | npe_release(port->npe); | 1233 | npe_release(port->npe); |
| 1234 | err_free: | 1234 | err_free: |
| @@ -1242,6 +1242,7 @@ static int __devexit eth_remove_one(struct platform_device *pdev) | |||
| 1242 | struct port *port = netdev_priv(dev); | 1242 | struct port *port = netdev_priv(dev); |
| 1243 | 1243 | ||
| 1244 | unregister_netdev(dev); | 1244 | unregister_netdev(dev); |
| 1245 | phy_disconnect(port->phydev); | ||
| 1245 | npe_port_tab[NPE_ID(port->id)] = NULL; | 1246 | npe_port_tab[NPE_ID(port->id)] = NULL; |
| 1246 | platform_set_drvdata(pdev, NULL); | 1247 | platform_set_drvdata(pdev, NULL); |
| 1247 | npe_release(port->npe); | 1248 | npe_release(port->npe); |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index d47839184a06..b0cb29d4cc01 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -54,8 +54,8 @@ | |||
| 54 | 54 | ||
| 55 | #define DRV_MODULE_NAME "bnx2" | 55 | #define DRV_MODULE_NAME "bnx2" |
| 56 | #define PFX DRV_MODULE_NAME ": " | 56 | #define PFX DRV_MODULE_NAME ": " |
| 57 | #define DRV_MODULE_VERSION "2.0.0" | 57 | #define DRV_MODULE_VERSION "2.0.1" |
| 58 | #define DRV_MODULE_RELDATE "April 2, 2009" | 58 | #define DRV_MODULE_RELDATE "May 6, 2009" |
| 59 | #define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-4.6.16.fw" | 59 | #define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-4.6.16.fw" |
| 60 | #define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-4.6.16.fw" | 60 | #define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-4.6.16.fw" |
| 61 | #define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-4.6.17.fw" | 61 | #define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-4.6.17.fw" |
| @@ -2600,6 +2600,7 @@ bnx2_get_hw_tx_cons(struct bnx2_napi *bnapi) | |||
| 2600 | /* Tell compiler that status block fields can change. */ | 2600 | /* Tell compiler that status block fields can change. */ |
| 2601 | barrier(); | 2601 | barrier(); |
| 2602 | cons = *bnapi->hw_tx_cons_ptr; | 2602 | cons = *bnapi->hw_tx_cons_ptr; |
| 2603 | barrier(); | ||
| 2603 | if (unlikely((cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT)) | 2604 | if (unlikely((cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT)) |
| 2604 | cons++; | 2605 | cons++; |
| 2605 | return cons; | 2606 | return cons; |
| @@ -2879,6 +2880,7 @@ bnx2_get_hw_rx_cons(struct bnx2_napi *bnapi) | |||
| 2879 | /* Tell compiler that status block fields can change. */ | 2880 | /* Tell compiler that status block fields can change. */ |
| 2880 | barrier(); | 2881 | barrier(); |
| 2881 | cons = *bnapi->hw_rx_cons_ptr; | 2882 | cons = *bnapi->hw_rx_cons_ptr; |
| 2883 | barrier(); | ||
| 2882 | if (unlikely((cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT)) | 2884 | if (unlikely((cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT)) |
| 2883 | cons++; | 2885 | cons++; |
| 2884 | return cons; | 2886 | return cons; |
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 553a89919778..46d312bedfb8 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
| @@ -1706,10 +1706,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave | |||
| 1706 | * Called with RTNL | 1706 | * Called with RTNL |
| 1707 | */ | 1707 | */ |
| 1708 | int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) | 1708 | int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) |
| 1709 | __releases(&bond->curr_slave_lock) | ||
| 1710 | __releases(&bond->lock) | ||
| 1711 | __acquires(&bond->lock) | 1709 | __acquires(&bond->lock) |
| 1712 | __acquires(&bond->curr_slave_lock) | 1710 | __releases(&bond->lock) |
| 1713 | { | 1711 | { |
| 1714 | struct bonding *bond = netdev_priv(bond_dev); | 1712 | struct bonding *bond = netdev_priv(bond_dev); |
| 1715 | struct sockaddr *sa = addr; | 1713 | struct sockaddr *sa = addr; |
| @@ -1745,9 +1743,6 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) | |||
| 1745 | } | 1743 | } |
| 1746 | } | 1744 | } |
| 1747 | 1745 | ||
| 1748 | write_unlock_bh(&bond->curr_slave_lock); | ||
| 1749 | read_unlock(&bond->lock); | ||
| 1750 | |||
| 1751 | if (swap_slave) { | 1746 | if (swap_slave) { |
| 1752 | alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave); | 1747 | alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave); |
| 1753 | alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave); | 1748 | alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave); |
| @@ -1755,16 +1750,15 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) | |||
| 1755 | alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr, | 1750 | alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr, |
| 1756 | bond->alb_info.rlb_enabled); | 1751 | bond->alb_info.rlb_enabled); |
| 1757 | 1752 | ||
| 1753 | read_lock(&bond->lock); | ||
| 1758 | alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr); | 1754 | alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr); |
| 1759 | if (bond->alb_info.rlb_enabled) { | 1755 | if (bond->alb_info.rlb_enabled) { |
| 1760 | /* inform clients mac address has changed */ | 1756 | /* inform clients mac address has changed */ |
| 1761 | rlb_req_update_slave_clients(bond, bond->curr_active_slave); | 1757 | rlb_req_update_slave_clients(bond, bond->curr_active_slave); |
| 1762 | } | 1758 | } |
| 1759 | read_unlock(&bond->lock); | ||
| 1763 | } | 1760 | } |
| 1764 | 1761 | ||
| 1765 | read_lock(&bond->lock); | ||
| 1766 | write_lock_bh(&bond->curr_slave_lock); | ||
| 1767 | |||
| 1768 | return 0; | 1762 | return 0; |
| 1769 | } | 1763 | } |
| 1770 | 1764 | ||
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 63369b6b14d4..74824028f85c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -2213,33 +2213,24 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in | |||
| 2213 | { | 2213 | { |
| 2214 | struct bonding *bond = netdev_priv(bond_dev); | 2214 | struct bonding *bond = netdev_priv(bond_dev); |
| 2215 | struct slave *slave; | 2215 | struct slave *slave; |
| 2216 | int i, found = 0; | 2216 | int i, res = -ENODEV; |
| 2217 | |||
| 2218 | if (info->slave_id < 0) { | ||
| 2219 | return -ENODEV; | ||
| 2220 | } | ||
| 2221 | 2217 | ||
| 2222 | read_lock(&bond->lock); | 2218 | read_lock(&bond->lock); |
| 2223 | 2219 | ||
| 2224 | bond_for_each_slave(bond, slave, i) { | 2220 | bond_for_each_slave(bond, slave, i) { |
| 2225 | if (i == (int)info->slave_id) { | 2221 | if (i == (int)info->slave_id) { |
| 2226 | found = 1; | 2222 | res = 0; |
| 2223 | strcpy(info->slave_name, slave->dev->name); | ||
| 2224 | info->link = slave->link; | ||
| 2225 | info->state = slave->state; | ||
| 2226 | info->link_failure_count = slave->link_failure_count; | ||
| 2227 | break; | 2227 | break; |
| 2228 | } | 2228 | } |
| 2229 | } | 2229 | } |
| 2230 | 2230 | ||
| 2231 | read_unlock(&bond->lock); | 2231 | read_unlock(&bond->lock); |
| 2232 | 2232 | ||
| 2233 | if (found) { | 2233 | return res; |
| 2234 | strcpy(info->slave_name, slave->dev->name); | ||
| 2235 | info->link = slave->link; | ||
| 2236 | info->state = slave->state; | ||
| 2237 | info->link_failure_count = slave->link_failure_count; | ||
| 2238 | } else { | ||
| 2239 | return -ENODEV; | ||
| 2240 | } | ||
| 2241 | |||
| 2242 | return 0; | ||
| 2243 | } | 2234 | } |
| 2244 | 2235 | ||
| 2245 | /*-------------------------------- Monitoring -------------------------------*/ | 2236 | /*-------------------------------- Monitoring -------------------------------*/ |
| @@ -5167,16 +5158,15 @@ int bond_create(char *name, struct bond_params *params) | |||
| 5167 | up_write(&bonding_rwsem); | 5158 | up_write(&bonding_rwsem); |
| 5168 | rtnl_unlock(); /* allows sysfs registration of net device */ | 5159 | rtnl_unlock(); /* allows sysfs registration of net device */ |
| 5169 | res = bond_create_sysfs_entry(netdev_priv(bond_dev)); | 5160 | res = bond_create_sysfs_entry(netdev_priv(bond_dev)); |
| 5170 | if (res < 0) { | 5161 | if (res < 0) |
| 5171 | rtnl_lock(); | 5162 | goto out_unreg; |
| 5172 | down_write(&bonding_rwsem); | ||
| 5173 | bond_deinit(bond_dev); | ||
| 5174 | unregister_netdevice(bond_dev); | ||
| 5175 | goto out_rtnl; | ||
| 5176 | } | ||
| 5177 | 5163 | ||
| 5178 | return 0; | 5164 | return 0; |
| 5179 | 5165 | ||
| 5166 | out_unreg: | ||
| 5167 | rtnl_lock(); | ||
| 5168 | down_write(&bonding_rwsem); | ||
| 5169 | unregister_netdevice(bond_dev); | ||
| 5180 | out_bond: | 5170 | out_bond: |
| 5181 | bond_deinit(bond_dev); | 5171 | bond_deinit(bond_dev); |
| 5182 | out_netdev: | 5172 | out_netdev: |
| @@ -5191,7 +5181,6 @@ static int __init bonding_init(void) | |||
| 5191 | { | 5181 | { |
| 5192 | int i; | 5182 | int i; |
| 5193 | int res; | 5183 | int res; |
| 5194 | struct bonding *bond; | ||
| 5195 | 5184 | ||
| 5196 | printk(KERN_INFO "%s", version); | 5185 | printk(KERN_INFO "%s", version); |
| 5197 | 5186 | ||
| @@ -5222,13 +5211,6 @@ static int __init bonding_init(void) | |||
| 5222 | 5211 | ||
| 5223 | goto out; | 5212 | goto out; |
| 5224 | err: | 5213 | err: |
| 5225 | list_for_each_entry(bond, &bond_dev_list, bond_list) { | ||
| 5226 | bond_work_cancel_all(bond); | ||
| 5227 | destroy_workqueue(bond->wq); | ||
| 5228 | } | ||
| 5229 | |||
| 5230 | bond_destroy_sysfs(); | ||
| 5231 | |||
| 5232 | rtnl_lock(); | 5214 | rtnl_lock(); |
| 5233 | bond_free_all(); | 5215 | bond_free_all(); |
| 5234 | rtnl_unlock(); | 5216 | rtnl_unlock(); |
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index e1bd690ff831..4f68aeb2679a 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
| @@ -3779,7 +3779,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, | |||
| 3779 | 3779 | ||
| 3780 | adapter->params.info = ai; | 3780 | adapter->params.info = ai; |
| 3781 | adapter->params.nports = ai->nports0 + ai->nports1; | 3781 | adapter->params.nports = ai->nports0 + ai->nports1; |
| 3782 | adapter->params.chan_map = !!ai->nports0 | (!!ai->nports1 << 1); | 3782 | adapter->params.chan_map = (!!ai->nports0) | (!!ai->nports1 << 1); |
| 3783 | adapter->params.rev = t3_read_reg(adapter, A_PL_REV); | 3783 | adapter->params.rev = t3_read_reg(adapter, A_PL_REV); |
| 3784 | /* | 3784 | /* |
| 3785 | * We used to only run the "adapter check task" once a second if | 3785 | * We used to only run the "adapter check task" once a second if |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 6a46ceed9436..b1419e21b46b 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -3738,7 +3738,7 @@ static irqreturn_t e1000_intr(int irq, void *data) | |||
| 3738 | struct e1000_hw *hw = &adapter->hw; | 3738 | struct e1000_hw *hw = &adapter->hw; |
| 3739 | u32 rctl, icr = er32(ICR); | 3739 | u32 rctl, icr = er32(ICR); |
| 3740 | 3740 | ||
| 3741 | if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags))) | 3741 | if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags))) |
| 3742 | return IRQ_NONE; /* Not our interrupt */ | 3742 | return IRQ_NONE; /* Not our interrupt */ |
| 3743 | 3743 | ||
| 3744 | /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is | 3744 | /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is |
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index 6e317caf429c..16a41389575a 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 41 | 41 | ||
| 42 | #define DRV_NAME "ehea" | 42 | #define DRV_NAME "ehea" |
| 43 | #define DRV_VERSION "EHEA_0100" | 43 | #define DRV_VERSION "EHEA_0101" |
| 44 | 44 | ||
| 45 | /* eHEA capability flags */ | 45 | /* eHEA capability flags */ |
| 46 | #define DLPAR_PORT_ADD_REM 1 | 46 | #define DLPAR_PORT_ADD_REM 1 |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 604c844d0769..b22dab9153f6 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
| @@ -545,14 +545,17 @@ static inline struct sk_buff *get_skb_by_index(struct sk_buff **skb_array, | |||
| 545 | x &= (arr_len - 1); | 545 | x &= (arr_len - 1); |
| 546 | 546 | ||
| 547 | pref = skb_array[x]; | 547 | pref = skb_array[x]; |
| 548 | prefetchw(pref); | 548 | if (pref) { |
| 549 | prefetchw(pref + EHEA_CACHE_LINE); | 549 | prefetchw(pref); |
| 550 | 550 | prefetchw(pref + EHEA_CACHE_LINE); | |
| 551 | pref = (skb_array[x]->data); | 551 | |
| 552 | prefetch(pref); | 552 | pref = (skb_array[x]->data); |
| 553 | prefetch(pref + EHEA_CACHE_LINE); | 553 | prefetch(pref); |
| 554 | prefetch(pref + EHEA_CACHE_LINE * 2); | 554 | prefetch(pref + EHEA_CACHE_LINE); |
| 555 | prefetch(pref + EHEA_CACHE_LINE * 3); | 555 | prefetch(pref + EHEA_CACHE_LINE * 2); |
| 556 | prefetch(pref + EHEA_CACHE_LINE * 3); | ||
| 557 | } | ||
| 558 | |||
| 556 | skb = skb_array[skb_index]; | 559 | skb = skb_array[skb_index]; |
| 557 | skb_array[skb_index] = NULL; | 560 | skb_array[skb_index] = NULL; |
| 558 | return skb; | 561 | return skb; |
| @@ -569,12 +572,14 @@ static inline struct sk_buff *get_skb_by_index_ll(struct sk_buff **skb_array, | |||
| 569 | x &= (arr_len - 1); | 572 | x &= (arr_len - 1); |
| 570 | 573 | ||
| 571 | pref = skb_array[x]; | 574 | pref = skb_array[x]; |
| 572 | prefetchw(pref); | 575 | if (pref) { |
| 573 | prefetchw(pref + EHEA_CACHE_LINE); | 576 | prefetchw(pref); |
| 577 | prefetchw(pref + EHEA_CACHE_LINE); | ||
| 574 | 578 | ||
| 575 | pref = (skb_array[x]->data); | 579 | pref = (skb_array[x]->data); |
| 576 | prefetchw(pref); | 580 | prefetchw(pref); |
| 577 | prefetchw(pref + EHEA_CACHE_LINE); | 581 | prefetchw(pref + EHEA_CACHE_LINE); |
| 582 | } | ||
| 578 | 583 | ||
| 579 | skb = skb_array[wqe_index]; | 584 | skb = skb_array[wqe_index]; |
| 580 | skb_array[wqe_index] = NULL; | 585 | skb_array[wqe_index] = NULL; |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 08c801490c72..e25343588fc7 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -2006,7 +2006,7 @@ static void igb_setup_rctl(struct igb_adapter *adapter) | |||
| 2006 | struct e1000_hw *hw = &adapter->hw; | 2006 | struct e1000_hw *hw = &adapter->hw; |
| 2007 | u32 rctl; | 2007 | u32 rctl; |
| 2008 | u32 srrctl = 0; | 2008 | u32 srrctl = 0; |
| 2009 | int i, j; | 2009 | int i; |
| 2010 | 2010 | ||
| 2011 | rctl = rd32(E1000_RCTL); | 2011 | rctl = rd32(E1000_RCTL); |
| 2012 | 2012 | ||
| @@ -2071,8 +2071,6 @@ static void igb_setup_rctl(struct igb_adapter *adapter) | |||
| 2071 | if (adapter->vfs_allocated_count) { | 2071 | if (adapter->vfs_allocated_count) { |
| 2072 | u32 vmolr; | 2072 | u32 vmolr; |
| 2073 | 2073 | ||
| 2074 | j = adapter->rx_ring[0].reg_idx; | ||
| 2075 | |||
| 2076 | /* set all queue drop enable bits */ | 2074 | /* set all queue drop enable bits */ |
| 2077 | wr32(E1000_QDE, ALL_QUEUES); | 2075 | wr32(E1000_QDE, ALL_QUEUES); |
| 2078 | srrctl |= E1000_SRRCTL_DROP_EN; | 2076 | srrctl |= E1000_SRRCTL_DROP_EN; |
| @@ -2080,16 +2078,16 @@ static void igb_setup_rctl(struct igb_adapter *adapter) | |||
| 2080 | /* disable queue 0 to prevent tail write w/o re-config */ | 2078 | /* disable queue 0 to prevent tail write w/o re-config */ |
| 2081 | wr32(E1000_RXDCTL(0), 0); | 2079 | wr32(E1000_RXDCTL(0), 0); |
| 2082 | 2080 | ||
| 2083 | vmolr = rd32(E1000_VMOLR(j)); | 2081 | vmolr = rd32(E1000_VMOLR(adapter->vfs_allocated_count)); |
| 2084 | if (rctl & E1000_RCTL_LPE) | 2082 | if (rctl & E1000_RCTL_LPE) |
| 2085 | vmolr |= E1000_VMOLR_LPE; | 2083 | vmolr |= E1000_VMOLR_LPE; |
| 2086 | if (adapter->num_rx_queues > 0) | 2084 | if (adapter->num_rx_queues > 1) |
| 2087 | vmolr |= E1000_VMOLR_RSSE; | 2085 | vmolr |= E1000_VMOLR_RSSE; |
| 2088 | wr32(E1000_VMOLR(j), vmolr); | 2086 | wr32(E1000_VMOLR(adapter->vfs_allocated_count), vmolr); |
| 2089 | } | 2087 | } |
| 2090 | 2088 | ||
| 2091 | for (i = 0; i < adapter->num_rx_queues; i++) { | 2089 | for (i = 0; i < adapter->num_rx_queues; i++) { |
| 2092 | j = adapter->rx_ring[i].reg_idx; | 2090 | int j = adapter->rx_ring[i].reg_idx; |
| 2093 | wr32(E1000_SRRCTL(j), srrctl); | 2091 | wr32(E1000_SRRCTL(j), srrctl); |
| 2094 | } | 2092 | } |
| 2095 | 2093 | ||
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c index 7942c4d3cd88..9ee873e872b3 100644 --- a/drivers/net/mlx4/en_rx.c +++ b/drivers/net/mlx4/en_rx.c | |||
| @@ -951,7 +951,6 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, | |||
| 951 | if (err) { | 951 | if (err) { |
| 952 | mlx4_err(mdev, "Failed to allocate qp #%d\n", qpn); | 952 | mlx4_err(mdev, "Failed to allocate qp #%d\n", qpn); |
| 953 | goto out; | 953 | goto out; |
| 954 | return err; | ||
| 955 | } | 954 | } |
| 956 | qp->event = mlx4_en_sqp_event; | 955 | qp->event = mlx4_en_sqp_event; |
| 957 | 956 | ||
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index b3185bf2c158..a400d7115f78 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -393,12 +393,12 @@ struct mv643xx_eth_private { | |||
| 393 | struct work_struct tx_timeout_task; | 393 | struct work_struct tx_timeout_task; |
| 394 | 394 | ||
| 395 | struct napi_struct napi; | 395 | struct napi_struct napi; |
| 396 | u8 oom; | ||
| 396 | u8 work_link; | 397 | u8 work_link; |
| 397 | u8 work_tx; | 398 | u8 work_tx; |
| 398 | u8 work_tx_end; | 399 | u8 work_tx_end; |
| 399 | u8 work_rx; | 400 | u8 work_rx; |
| 400 | u8 work_rx_refill; | 401 | u8 work_rx_refill; |
| 401 | u8 work_rx_oom; | ||
| 402 | 402 | ||
| 403 | int skb_size; | 403 | int skb_size; |
| 404 | struct sk_buff_head rx_recycle; | 404 | struct sk_buff_head rx_recycle; |
| @@ -661,7 +661,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget) | |||
| 661 | dma_get_cache_alignment() - 1); | 661 | dma_get_cache_alignment() - 1); |
| 662 | 662 | ||
| 663 | if (skb == NULL) { | 663 | if (skb == NULL) { |
| 664 | mp->work_rx_oom |= 1 << rxq->index; | 664 | mp->oom = 1; |
| 665 | goto oom; | 665 | goto oom; |
| 666 | } | 666 | } |
| 667 | 667 | ||
| @@ -1255,7 +1255,6 @@ static void mib_counters_update(struct mv643xx_eth_private *mp) | |||
| 1255 | 1255 | ||
| 1256 | spin_lock_bh(&mp->mib_counters_lock); | 1256 | spin_lock_bh(&mp->mib_counters_lock); |
| 1257 | p->good_octets_received += mib_read(mp, 0x00); | 1257 | p->good_octets_received += mib_read(mp, 0x00); |
| 1258 | p->good_octets_received += (u64)mib_read(mp, 0x04) << 32; | ||
| 1259 | p->bad_octets_received += mib_read(mp, 0x08); | 1258 | p->bad_octets_received += mib_read(mp, 0x08); |
| 1260 | p->internal_mac_transmit_err += mib_read(mp, 0x0c); | 1259 | p->internal_mac_transmit_err += mib_read(mp, 0x0c); |
| 1261 | p->good_frames_received += mib_read(mp, 0x10); | 1260 | p->good_frames_received += mib_read(mp, 0x10); |
| @@ -1269,7 +1268,6 @@ static void mib_counters_update(struct mv643xx_eth_private *mp) | |||
| 1269 | p->frames_512_to_1023_octets += mib_read(mp, 0x30); | 1268 | p->frames_512_to_1023_octets += mib_read(mp, 0x30); |
| 1270 | p->frames_1024_to_max_octets += mib_read(mp, 0x34); | 1269 | p->frames_1024_to_max_octets += mib_read(mp, 0x34); |
| 1271 | p->good_octets_sent += mib_read(mp, 0x38); | 1270 | p->good_octets_sent += mib_read(mp, 0x38); |
| 1272 | p->good_octets_sent += (u64)mib_read(mp, 0x3c) << 32; | ||
| 1273 | p->good_frames_sent += mib_read(mp, 0x40); | 1271 | p->good_frames_sent += mib_read(mp, 0x40); |
| 1274 | p->excessive_collision += mib_read(mp, 0x44); | 1272 | p->excessive_collision += mib_read(mp, 0x44); |
| 1275 | p->multicast_frames_sent += mib_read(mp, 0x48); | 1273 | p->multicast_frames_sent += mib_read(mp, 0x48); |
| @@ -2167,8 +2165,10 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
| 2167 | 2165 | ||
| 2168 | mp = container_of(napi, struct mv643xx_eth_private, napi); | 2166 | mp = container_of(napi, struct mv643xx_eth_private, napi); |
| 2169 | 2167 | ||
| 2170 | mp->work_rx_refill |= mp->work_rx_oom; | 2168 | if (unlikely(mp->oom)) { |
| 2171 | mp->work_rx_oom = 0; | 2169 | mp->oom = 0; |
| 2170 | del_timer(&mp->rx_oom); | ||
| 2171 | } | ||
| 2172 | 2172 | ||
| 2173 | work_done = 0; | 2173 | work_done = 0; |
| 2174 | while (work_done < budget) { | 2174 | while (work_done < budget) { |
| @@ -2182,8 +2182,10 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
| 2182 | continue; | 2182 | continue; |
| 2183 | } | 2183 | } |
| 2184 | 2184 | ||
| 2185 | queue_mask = mp->work_tx | mp->work_tx_end | | 2185 | queue_mask = mp->work_tx | mp->work_tx_end | mp->work_rx; |
| 2186 | mp->work_rx | mp->work_rx_refill; | 2186 | if (likely(!mp->oom)) |
| 2187 | queue_mask |= mp->work_rx_refill; | ||
| 2188 | |||
| 2187 | if (!queue_mask) { | 2189 | if (!queue_mask) { |
| 2188 | if (mv643xx_eth_collect_events(mp)) | 2190 | if (mv643xx_eth_collect_events(mp)) |
| 2189 | continue; | 2191 | continue; |
| @@ -2204,7 +2206,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
| 2204 | txq_maybe_wake(mp->txq + queue); | 2206 | txq_maybe_wake(mp->txq + queue); |
| 2205 | } else if (mp->work_rx & queue_mask) { | 2207 | } else if (mp->work_rx & queue_mask) { |
| 2206 | work_done += rxq_process(mp->rxq + queue, work_tbd); | 2208 | work_done += rxq_process(mp->rxq + queue, work_tbd); |
| 2207 | } else if (mp->work_rx_refill & queue_mask) { | 2209 | } else if (!mp->oom && (mp->work_rx_refill & queue_mask)) { |
| 2208 | work_done += rxq_refill(mp->rxq + queue, work_tbd); | 2210 | work_done += rxq_refill(mp->rxq + queue, work_tbd); |
| 2209 | } else { | 2211 | } else { |
| 2210 | BUG(); | 2212 | BUG(); |
| @@ -2212,7 +2214,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
| 2212 | } | 2214 | } |
| 2213 | 2215 | ||
| 2214 | if (work_done < budget) { | 2216 | if (work_done < budget) { |
| 2215 | if (mp->work_rx_oom) | 2217 | if (mp->oom) |
| 2216 | mod_timer(&mp->rx_oom, jiffies + (HZ / 10)); | 2218 | mod_timer(&mp->rx_oom, jiffies + (HZ / 10)); |
| 2217 | napi_complete(napi); | 2219 | napi_complete(napi); |
| 2218 | wrlp(mp, INT_MASK, INT_TX_END | INT_RX | INT_EXT); | 2220 | wrlp(mp, INT_MASK, INT_TX_END | INT_RX | INT_EXT); |
| @@ -2372,7 +2374,7 @@ static int mv643xx_eth_open(struct net_device *dev) | |||
| 2372 | rxq_refill(mp->rxq + i, INT_MAX); | 2374 | rxq_refill(mp->rxq + i, INT_MAX); |
| 2373 | } | 2375 | } |
| 2374 | 2376 | ||
| 2375 | if (mp->work_rx_oom) { | 2377 | if (mp->oom) { |
| 2376 | mp->rx_oom.expires = jiffies + (HZ / 10); | 2378 | mp->rx_oom.expires = jiffies + (HZ / 10); |
| 2377 | add_timer(&mp->rx_oom); | 2379 | add_timer(&mp->rx_oom); |
| 2378 | } | 2380 | } |
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index eb66f658f9d1..7d83896b8c26 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
| @@ -374,18 +374,17 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, | |||
| 374 | dev->ethtool_ops = &ne2k_pci_ethtool_ops; | 374 | dev->ethtool_ops = &ne2k_pci_ethtool_ops; |
| 375 | NS8390_init(dev, 0); | 375 | NS8390_init(dev, 0); |
| 376 | 376 | ||
| 377 | memcpy(dev->dev_addr, SA_prom, 6); | ||
| 378 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
| 379 | |||
| 377 | i = register_netdev(dev); | 380 | i = register_netdev(dev); |
| 378 | if (i) | 381 | if (i) |
| 379 | goto err_out_free_netdev; | 382 | goto err_out_free_netdev; |
| 380 | 383 | ||
| 381 | for(i = 0; i < 6; i++) | ||
| 382 | dev->dev_addr[i] = SA_prom[i]; | ||
| 383 | printk("%s: %s found at %#lx, IRQ %d, %pM.\n", | 384 | printk("%s: %s found at %#lx, IRQ %d, %pM.\n", |
| 384 | dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq, | 385 | dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq, |
| 385 | dev->dev_addr); | 386 | dev->dev_addr); |
| 386 | 387 | ||
| 387 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
| 388 | |||
| 389 | return 0; | 388 | return 0; |
| 390 | 389 | ||
| 391 | err_out_free_netdev: | 390 | err_out_free_netdev: |
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index eceadf787a67..bf4af5248cb7 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c | |||
| @@ -664,7 +664,7 @@ static int netconsole_netdev_event(struct notifier_block *this, | |||
| 664 | struct netconsole_target *nt; | 664 | struct netconsole_target *nt; |
| 665 | struct net_device *dev = ptr; | 665 | struct net_device *dev = ptr; |
| 666 | 666 | ||
| 667 | if (!(event == NETDEV_CHANGENAME)) | 667 | if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER)) |
| 668 | goto done; | 668 | goto done; |
| 669 | 669 | ||
| 670 | spin_lock_irqsave(&target_list_lock, flags); | 670 | spin_lock_irqsave(&target_list_lock, flags); |
| @@ -675,6 +675,15 @@ static int netconsole_netdev_event(struct notifier_block *this, | |||
| 675 | case NETDEV_CHANGENAME: | 675 | case NETDEV_CHANGENAME: |
| 676 | strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); | 676 | strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); |
| 677 | break; | 677 | break; |
| 678 | case NETDEV_UNREGISTER: | ||
| 679 | if (!nt->enabled) | ||
| 680 | break; | ||
| 681 | netpoll_cleanup(&nt->np); | ||
| 682 | nt->enabled = 0; | ||
| 683 | printk(KERN_INFO "netconsole: network logging stopped" | ||
| 684 | ", interface %s unregistered\n", | ||
| 685 | dev->name); | ||
| 686 | break; | ||
| 678 | } | 687 | } |
| 679 | } | 688 | } |
| 680 | netconsole_target_put(nt); | 689 | netconsole_target_put(nt); |
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 8ee21030e9ac..dfc6cf765fbd 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig | |||
| @@ -180,6 +180,20 @@ config USB_NET_CDCETHER | |||
| 180 | IEEE 802 "local assignment" bit is set in the address, a "usbX" | 180 | IEEE 802 "local assignment" bit is set in the address, a "usbX" |
| 181 | name is used instead. | 181 | name is used instead. |
| 182 | 182 | ||
| 183 | config USB_NET_CDC_EEM | ||
| 184 | tristate "CDC EEM support" | ||
| 185 | depends on USB_USBNET && EXPERIMENTAL | ||
| 186 | help | ||
| 187 | This option supports devices conforming to the Communication Device | ||
| 188 | Class (CDC) Ethernet Emulation Model, a specification that's easy to | ||
| 189 | implement in device firmware. The CDC EEM specifications are available | ||
| 190 | from <http://www.usb.org/>. | ||
| 191 | |||
| 192 | This driver creates an interface named "ethX", where X depends on | ||
| 193 | what other networking devices you have in use. However, if the | ||
| 194 | IEEE 802 "local assignment" bit is set in the address, a "usbX" | ||
| 195 | name is used instead. | ||
| 196 | |||
| 183 | config USB_NET_DM9601 | 197 | config USB_NET_DM9601 |
| 184 | tristate "Davicom DM9601 based USB 1.1 10/100 ethernet devices" | 198 | tristate "Davicom DM9601 based USB 1.1 10/100 ethernet devices" |
| 185 | depends on USB_USBNET | 199 | depends on USB_USBNET |
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index 88a87eeb376a..c8aef62cf2b7 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile | |||
| @@ -9,6 +9,7 @@ obj-$(CONFIG_USB_RTL8150) += rtl8150.o | |||
| 9 | obj-$(CONFIG_USB_HSO) += hso.o | 9 | obj-$(CONFIG_USB_HSO) += hso.o |
| 10 | obj-$(CONFIG_USB_NET_AX8817X) += asix.o | 10 | obj-$(CONFIG_USB_NET_AX8817X) += asix.o |
| 11 | obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o | 11 | obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o |
| 12 | obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o | ||
| 12 | obj-$(CONFIG_USB_NET_DM9601) += dm9601.o | 13 | obj-$(CONFIG_USB_NET_DM9601) += dm9601.o |
| 13 | obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o | 14 | obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o |
| 14 | obj-$(CONFIG_USB_NET_GL620A) += gl620a.o | 15 | obj-$(CONFIG_USB_NET_GL620A) += gl620a.o |
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c new file mode 100644 index 000000000000..80e01778dd3b --- /dev/null +++ b/drivers/net/usb/cdc_eem.c | |||
| @@ -0,0 +1,381 @@ | |||
| 1 | /* | ||
| 2 | * USB CDC EEM network interface driver | ||
| 3 | * Copyright (C) 2009 Oberthur Technologies | ||
| 4 | * by Omar Laazimani, Olivier Condemine | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 19 | */ | ||
| 20 | |||
| 21 | #include <linux/module.h> | ||
| 22 | #include <linux/init.h> | ||
| 23 | #include <linux/netdevice.h> | ||
| 24 | #include <linux/etherdevice.h> | ||
| 25 | #include <linux/ctype.h> | ||
| 26 | #include <linux/ethtool.h> | ||
| 27 | #include <linux/workqueue.h> | ||
| 28 | #include <linux/mii.h> | ||
| 29 | #include <linux/usb.h> | ||
| 30 | #include <linux/crc32.h> | ||
| 31 | #include <linux/usb/cdc.h> | ||
| 32 | #include <linux/usb/usbnet.h> | ||
| 33 | |||
| 34 | |||
| 35 | /* | ||
| 36 | * This driver is an implementation of the CDC "Ethernet Emulation | ||
| 37 | * Model" (EEM) specification, which encapsulates Ethernet frames | ||
| 38 | * for transport over USB using a simpler USB device model than the | ||
| 39 | * previous CDC "Ethernet Control Model" (ECM, or "CDC Ethernet"). | ||
| 40 | * | ||
| 41 | * For details, see www.usb.org/developers/devclass_docs/CDC_EEM10.pdf | ||
| 42 | * | ||
| 43 | * This version has been tested with GIGAntIC WuaoW SIM Smart Card on 2.6.24, | ||
| 44 | * 2.6.27 and 2.6.30rc2 kernel. | ||
| 45 | * It has also been validated on Openmoko Om 2008.12 (based on 2.6.24 kernel). | ||
| 46 | * build on 23-April-2009 | ||
| 47 | */ | ||
| 48 | |||
| 49 | #define EEM_HEAD 2 /* 2 byte header */ | ||
| 50 | |||
| 51 | /*-------------------------------------------------------------------------*/ | ||
| 52 | |||
| 53 | static void eem_linkcmd_complete(struct urb *urb) | ||
| 54 | { | ||
| 55 | dev_kfree_skb(urb->context); | ||
| 56 | usb_free_urb(urb); | ||
| 57 | } | ||
| 58 | |||
| 59 | static void eem_linkcmd(struct usbnet *dev, struct sk_buff *skb) | ||
| 60 | { | ||
| 61 | struct urb *urb; | ||
| 62 | int status; | ||
| 63 | |||
| 64 | urb = usb_alloc_urb(0, GFP_ATOMIC); | ||
| 65 | if (!urb) | ||
| 66 | goto fail; | ||
| 67 | |||
| 68 | usb_fill_bulk_urb(urb, dev->udev, dev->out, | ||
| 69 | skb->data, skb->len, eem_linkcmd_complete, skb); | ||
| 70 | |||
| 71 | status = usb_submit_urb(urb, GFP_ATOMIC); | ||
| 72 | if (status) { | ||
| 73 | usb_free_urb(urb); | ||
| 74 | fail: | ||
| 75 | dev_kfree_skb(skb); | ||
| 76 | devwarn(dev, "link cmd failure\n"); | ||
| 77 | return; | ||
| 78 | } | ||
| 79 | } | ||
| 80 | |||
| 81 | static int eem_bind(struct usbnet *dev, struct usb_interface *intf) | ||
| 82 | { | ||
| 83 | int status = 0; | ||
| 84 | |||
| 85 | status = usbnet_get_endpoints(dev, intf); | ||
| 86 | if (status < 0) { | ||
| 87 | usb_set_intfdata(intf, NULL); | ||
| 88 | usb_driver_release_interface(driver_of(intf), intf); | ||
| 89 | return status; | ||
| 90 | } | ||
| 91 | |||
| 92 | /* no jumbogram (16K) support for now */ | ||
| 93 | |||
| 94 | dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN; | ||
| 95 | |||
| 96 | return 0; | ||
| 97 | } | ||
| 98 | |||
| 99 | /* | ||
| 100 | * EEM permits packing multiple Ethernet frames into USB transfers | ||
| 101 | * (a "bundle"), but for TX we don't try to do that. | ||
| 102 | */ | ||
| 103 | static struct sk_buff *eem_tx_fixup(struct usbnet *dev, struct sk_buff *skb, | ||
| 104 | gfp_t flags) | ||
| 105 | { | ||
| 106 | struct sk_buff *skb2 = NULL; | ||
| 107 | u16 len = skb->len; | ||
| 108 | u32 crc = 0; | ||
| 109 | int padlen = 0; | ||
| 110 | |||
| 111 | /* When ((len + EEM_HEAD + ETH_FCS_LEN) % dev->maxpacket) is | ||
| 112 | * zero, stick two bytes of zero length EEM packet on the end. | ||
| 113 | * Else the framework would add invalid single byte padding, | ||
| 114 | * since it can't know whether ZLPs will be handled right by | ||
| 115 | * all the relevant hardware and software. | ||
| 116 | */ | ||
| 117 | if (!((len + EEM_HEAD + ETH_FCS_LEN) % dev->maxpacket)) | ||
| 118 | padlen += 2; | ||
| 119 | |||
| 120 | if (!skb_cloned(skb)) { | ||
| 121 | int headroom = skb_headroom(skb); | ||
| 122 | int tailroom = skb_tailroom(skb); | ||
| 123 | |||
| 124 | if ((tailroom >= ETH_FCS_LEN + padlen) | ||
| 125 | && (headroom >= EEM_HEAD)) | ||
| 126 | goto done; | ||
| 127 | |||
| 128 | if ((headroom + tailroom) | ||
| 129 | > (EEM_HEAD + ETH_FCS_LEN + padlen)) { | ||
| 130 | skb->data = memmove(skb->head + | ||
| 131 | EEM_HEAD, | ||
| 132 | skb->data, | ||
| 133 | skb->len); | ||
| 134 | skb_set_tail_pointer(skb, len); | ||
| 135 | goto done; | ||
| 136 | } | ||
| 137 | } | ||
| 138 | |||
| 139 | skb2 = skb_copy_expand(skb, EEM_HEAD, ETH_FCS_LEN + padlen, flags); | ||
| 140 | if (!skb2) | ||
| 141 | return NULL; | ||
| 142 | |||
| 143 | dev_kfree_skb_any(skb); | ||
| 144 | skb = skb2; | ||
| 145 | |||
| 146 | done: | ||
| 147 | /* we don't use the "no Ethernet CRC" option */ | ||
| 148 | crc = crc32_le(~0, skb->data, skb->len); | ||
| 149 | crc = ~crc; | ||
| 150 | |||
| 151 | put_unaligned_le32(crc, skb_put(skb, 4)); | ||
| 152 | |||
| 153 | /* EEM packet header format: | ||
| 154 | * b0..13: length of ethernet frame | ||
| 155 | * b14: bmCRC (1 == valid Ethernet CRC) | ||
| 156 | * b15: bmType (0 == data) | ||
| 157 | */ | ||
| 158 | len = skb->len; | ||
| 159 | put_unaligned_le16(BIT(14) | len, skb_push(skb, 2)); | ||
| 160 | |||
| 161 | /* Bundle a zero length EEM packet if needed */ | ||
| 162 | if (padlen) | ||
| 163 | put_unaligned_le16(0, skb_put(skb, 2)); | ||
| 164 | |||
| 165 | return skb; | ||
| 166 | } | ||
| 167 | |||
| 168 | static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | ||
| 169 | { | ||
| 170 | /* | ||
| 171 | * Our task here is to strip off framing, leaving skb with one | ||
| 172 | * data frame for the usbnet framework code to process. But we | ||
| 173 | * may have received multiple EEM payloads, or command payloads. | ||
| 174 | * So we must process _everything_ as if it's a header, except | ||
| 175 | * maybe the last data payload | ||
| 176 | * | ||
| 177 | * REVISIT the framework needs updating so that when we consume | ||
| 178 | * all payloads (the last or only message was a command, or a | ||
| 179 | * zero length EEM packet) that is not accounted as an rx_error. | ||
| 180 | */ | ||
| 181 | do { | ||
| 182 | struct sk_buff *skb2 = NULL; | ||
| 183 | u16 header; | ||
| 184 | u16 len = 0; | ||
| 185 | |||
| 186 | /* incomplete EEM header? */ | ||
| 187 | if (skb->len < EEM_HEAD) | ||
| 188 | return 0; | ||
| 189 | |||
| 190 | /* | ||
| 191 | * EEM packet header format: | ||
| 192 | * b0..14: EEM type dependant (Data or Command) | ||
| 193 | * b15: bmType | ||
| 194 | */ | ||
| 195 | header = get_unaligned_le16(skb->data); | ||
| 196 | skb_pull(skb, EEM_HEAD); | ||
| 197 | |||
| 198 | /* | ||
| 199 | * The bmType bit helps to denote when EEM | ||
| 200 | * packet is data or command : | ||
| 201 | * bmType = 0 : EEM data payload | ||
| 202 | * bmType = 1 : EEM (link) command | ||
| 203 | */ | ||
| 204 | if (header & BIT(15)) { | ||
| 205 | u16 bmEEMCmd; | ||
| 206 | |||
| 207 | /* | ||
| 208 | * EEM (link) command packet: | ||
| 209 | * b0..10: bmEEMCmdParam | ||
| 210 | * b11..13: bmEEMCmd | ||
| 211 | * b14: bmReserved (must be 0) | ||
| 212 | * b15: 1 (EEM command) | ||
| 213 | */ | ||
| 214 | if (header & BIT(14)) { | ||
| 215 | devdbg(dev, "reserved command %04x\n", header); | ||
| 216 | continue; | ||
| 217 | } | ||
| 218 | |||
| 219 | bmEEMCmd = (header >> 11) & 0x7; | ||
| 220 | switch (bmEEMCmd) { | ||
| 221 | |||
| 222 | /* Responding to echo requests is mandatory. */ | ||
| 223 | case 0: /* Echo command */ | ||
| 224 | len = header & 0x7FF; | ||
| 225 | |||
| 226 | /* bogus command? */ | ||
| 227 | if (skb->len < len) | ||
| 228 | return 0; | ||
| 229 | |||
| 230 | skb2 = skb_clone(skb, GFP_ATOMIC); | ||
| 231 | if (unlikely(!skb2)) | ||
| 232 | goto next; | ||
| 233 | skb_trim(skb2, len); | ||
| 234 | put_unaligned_le16(BIT(15) | (1 << 11) | len, | ||
| 235 | skb_push(skb2, 2)); | ||
| 236 | eem_linkcmd(dev, skb2); | ||
| 237 | break; | ||
| 238 | |||
| 239 | /* | ||
| 240 | * Host may choose to ignore hints. | ||
| 241 | * - suspend: peripheral ready to suspend | ||
| 242 | * - response: suggest N millisec polling | ||
| 243 | * - response complete: suggest N sec polling | ||
| 244 | */ | ||
| 245 | case 2: /* Suspend hint */ | ||
| 246 | case 3: /* Response hint */ | ||
| 247 | case 4: /* Response complete hint */ | ||
| 248 | continue; | ||
| 249 | |||
| 250 | /* | ||
| 251 | * Hosts should never receive host-to-peripheral | ||
| 252 | * or reserved command codes; or responses to an | ||
| 253 | * echo command we didn't send. | ||
| 254 | */ | ||
| 255 | case 1: /* Echo response */ | ||
| 256 | case 5: /* Tickle */ | ||
| 257 | default: /* reserved */ | ||
| 258 | devwarn(dev, "unexpected link command %d\n", | ||
| 259 | bmEEMCmd); | ||
| 260 | continue; | ||
| 261 | } | ||
| 262 | |||
| 263 | } else { | ||
| 264 | u32 crc, crc2; | ||
| 265 | int is_last; | ||
| 266 | |||
| 267 | /* zero length EEM packet? */ | ||
| 268 | if (header == 0) | ||
| 269 | continue; | ||
| 270 | |||
| 271 | /* | ||
| 272 | * EEM data packet header : | ||
| 273 | * b0..13: length of ethernet frame | ||
| 274 | * b14: bmCRC | ||
| 275 | * b15: 0 (EEM data) | ||
| 276 | */ | ||
| 277 | len = header & 0x3FFF; | ||
| 278 | |||
| 279 | /* bogus EEM payload? */ | ||
| 280 | if (skb->len < len) | ||
| 281 | return 0; | ||
| 282 | |||
| 283 | /* bogus ethernet frame? */ | ||
| 284 | if (len < (ETH_HLEN + ETH_FCS_LEN)) | ||
| 285 | goto next; | ||
| 286 | |||
| 287 | /* | ||
| 288 | * Treat the last payload differently: framework | ||
| 289 | * code expects our "fixup" to have stripped off | ||
| 290 | * headers, so "skb" is a data packet (or error). | ||
| 291 | * Else if it's not the last payload, keep "skb" | ||
| 292 | * for further processing. | ||
| 293 | */ | ||
| 294 | is_last = (len == skb->len); | ||
| 295 | if (is_last) | ||
| 296 | skb2 = skb; | ||
| 297 | else { | ||
| 298 | skb2 = skb_clone(skb, GFP_ATOMIC); | ||
| 299 | if (unlikely(!skb2)) | ||
| 300 | return 0; | ||
| 301 | } | ||
| 302 | |||
| 303 | crc = get_unaligned_le32(skb2->data | ||
| 304 | + len - ETH_FCS_LEN); | ||
| 305 | skb_trim(skb2, len - ETH_FCS_LEN); | ||
| 306 | |||
| 307 | /* | ||
| 308 | * The bmCRC helps to denote when the CRC field in | ||
| 309 | * the Ethernet frame contains a calculated CRC: | ||
| 310 | * bmCRC = 1 : CRC is calculated | ||
| 311 | * bmCRC = 0 : CRC = 0xDEADBEEF | ||
| 312 | */ | ||
| 313 | if (header & BIT(14)) | ||
| 314 | crc2 = ~crc32_le(~0, skb2->data, len); | ||
| 315 | else | ||
| 316 | crc2 = 0xdeadbeef; | ||
| 317 | |||
| 318 | if (is_last) | ||
| 319 | return crc == crc2; | ||
| 320 | |||
| 321 | if (unlikely(crc != crc2)) { | ||
| 322 | dev->stats.rx_errors++; | ||
| 323 | dev_kfree_skb_any(skb2); | ||
| 324 | } else | ||
| 325 | usbnet_skb_return(dev, skb2); | ||
| 326 | } | ||
| 327 | |||
| 328 | next: | ||
| 329 | skb_pull(skb, len); | ||
| 330 | } while (skb->len); | ||
| 331 | |||
| 332 | return 1; | ||
| 333 | } | ||
| 334 | |||
| 335 | static const struct driver_info eem_info = { | ||
| 336 | .description = "CDC EEM Device", | ||
| 337 | .flags = FLAG_ETHER, | ||
| 338 | .bind = eem_bind, | ||
| 339 | .rx_fixup = eem_rx_fixup, | ||
| 340 | .tx_fixup = eem_tx_fixup, | ||
| 341 | }; | ||
| 342 | |||
| 343 | /*-------------------------------------------------------------------------*/ | ||
| 344 | |||
| 345 | static const struct usb_device_id products[] = { | ||
| 346 | { | ||
| 347 | USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_EEM, | ||
| 348 | USB_CDC_PROTO_EEM), | ||
| 349 | .driver_info = (unsigned long) &eem_info, | ||
| 350 | }, | ||
| 351 | { | ||
| 352 | /* EMPTY == end of list */ | ||
| 353 | }, | ||
| 354 | }; | ||
| 355 | MODULE_DEVICE_TABLE(usb, products); | ||
| 356 | |||
| 357 | static struct usb_driver eem_driver = { | ||
| 358 | .name = "cdc_eem", | ||
| 359 | .id_table = products, | ||
| 360 | .probe = usbnet_probe, | ||
| 361 | .disconnect = usbnet_disconnect, | ||
| 362 | .suspend = usbnet_suspend, | ||
| 363 | .resume = usbnet_resume, | ||
| 364 | }; | ||
| 365 | |||
| 366 | |||
| 367 | static int __init eem_init(void) | ||
| 368 | { | ||
| 369 | return usb_register(&eem_driver); | ||
| 370 | } | ||
| 371 | module_init(eem_init); | ||
| 372 | |||
| 373 | static void __exit eem_exit(void) | ||
| 374 | { | ||
| 375 | usb_deregister(&eem_driver); | ||
| 376 | } | ||
| 377 | module_exit(eem_exit); | ||
| 378 | |||
| 379 | MODULE_AUTHOR("Omar Laazimani <omar.oberthur@gmail.com>"); | ||
| 380 | MODULE_DESCRIPTION("USB CDC EEM"); | ||
| 381 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index dc1665326592..5a7283372b53 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
| @@ -941,6 +941,16 @@ static int smsc95xx_reset(struct usbnet *dev) | |||
| 941 | if (netif_msg_ifup(dev)) | 941 | if (netif_msg_ifup(dev)) |
| 942 | devdbg(dev, "ID_REV = 0x%08x", read_buf); | 942 | devdbg(dev, "ID_REV = 0x%08x", read_buf); |
| 943 | 943 | ||
| 944 | /* Configure GPIO pins as LED outputs */ | ||
| 945 | write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED | | ||
| 946 | LED_GPIO_CFG_FDX_LED; | ||
| 947 | ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf); | ||
| 948 | if (ret < 0) { | ||
| 949 | devwarn(dev, "Failed to write LED_GPIO_CFG register, ret=%d", | ||
| 950 | ret); | ||
| 951 | return ret; | ||
| 952 | } | ||
| 953 | |||
| 944 | /* Init Tx */ | 954 | /* Init Tx */ |
| 945 | write_buf = 0; | 955 | write_buf = 0; |
| 946 | ret = smsc95xx_write_reg(dev, FLOW, write_buf); | 956 | ret = smsc95xx_write_reg(dev, FLOW, write_buf); |
| @@ -1231,6 +1241,11 @@ static const struct usb_device_id products[] = { | |||
| 1231 | USB_DEVICE(0x0424, 0x9500), | 1241 | USB_DEVICE(0x0424, 0x9500), |
| 1232 | .driver_info = (unsigned long) &smsc95xx_info, | 1242 | .driver_info = (unsigned long) &smsc95xx_info, |
| 1233 | }, | 1243 | }, |
| 1244 | { | ||
| 1245 | /* SMSC9512/9514 USB Hub & Ethernet Device */ | ||
| 1246 | USB_DEVICE(0x0424, 0xec00), | ||
| 1247 | .driver_info = (unsigned long) &smsc95xx_info, | ||
| 1248 | }, | ||
| 1234 | { }, /* END */ | 1249 | { }, /* END */ |
| 1235 | }; | 1250 | }; |
| 1236 | MODULE_DEVICE_TABLE(usb, products); | 1251 | MODULE_DEVICE_TABLE(usb, products); |
diff --git a/drivers/net/usb/smsc95xx.h b/drivers/net/usb/smsc95xx.h index 66b5c84f302e..86bc44977fbd 100644 --- a/drivers/net/usb/smsc95xx.h +++ b/drivers/net/usb/smsc95xx.h | |||
| @@ -99,6 +99,9 @@ | |||
| 99 | #define PM_CTL_WUPS_MULTI_ (0x00000003) | 99 | #define PM_CTL_WUPS_MULTI_ (0x00000003) |
| 100 | 100 | ||
| 101 | #define LED_GPIO_CFG (0x24) | 101 | #define LED_GPIO_CFG (0x24) |
| 102 | #define LED_GPIO_CFG_SPD_LED (0x01000000) | ||
| 103 | #define LED_GPIO_CFG_LNK_LED (0x00100000) | ||
| 104 | #define LED_GPIO_CFG_FDX_LED (0x00010000) | ||
| 102 | 105 | ||
| 103 | #define GPIO_CFG (0x28) | 106 | #define GPIO_CFG (0x28) |
| 104 | 107 | ||
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9c82a39497e5..4d1d47953fc6 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -616,10 +616,11 @@ static int virtnet_open(struct net_device *dev) | |||
| 616 | static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, | 616 | static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, |
| 617 | struct scatterlist *data, int out, int in) | 617 | struct scatterlist *data, int out, int in) |
| 618 | { | 618 | { |
| 619 | struct scatterlist sg[VIRTNET_SEND_COMMAND_SG_MAX + 2]; | 619 | struct scatterlist *s, sg[VIRTNET_SEND_COMMAND_SG_MAX + 2]; |
| 620 | struct virtio_net_ctrl_hdr ctrl; | 620 | struct virtio_net_ctrl_hdr ctrl; |
| 621 | virtio_net_ctrl_ack status = ~0; | 621 | virtio_net_ctrl_ack status = ~0; |
| 622 | unsigned int tmp; | 622 | unsigned int tmp; |
| 623 | int i; | ||
| 623 | 624 | ||
| 624 | if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) { | 625 | if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) { |
| 625 | BUG(); /* Caller should know better */ | 626 | BUG(); /* Caller should know better */ |
| @@ -637,7 +638,8 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, | |||
| 637 | sg_init_table(sg, out + in); | 638 | sg_init_table(sg, out + in); |
| 638 | 639 | ||
| 639 | sg_set_buf(&sg[0], &ctrl, sizeof(ctrl)); | 640 | sg_set_buf(&sg[0], &ctrl, sizeof(ctrl)); |
| 640 | memcpy(&sg[1], data, sizeof(struct scatterlist) * (out + in - 2)); | 641 | for_each_sg(data, s, out + in - 2, i) |
| 642 | sg_set_buf(&sg[i + 1], sg_virt(s), s->length); | ||
| 641 | sg_set_buf(&sg[out + in - 1], &status, sizeof(status)); | 643 | sg_set_buf(&sg[out + in - 1], &status, sizeof(status)); |
| 642 | 644 | ||
| 643 | if (vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) != 0) | 645 | if (vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) != 0) |
| @@ -692,7 +694,7 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
| 692 | promisc = ((dev->flags & IFF_PROMISC) != 0); | 694 | promisc = ((dev->flags & IFF_PROMISC) != 0); |
| 693 | allmulti = ((dev->flags & IFF_ALLMULTI) != 0); | 695 | allmulti = ((dev->flags & IFF_ALLMULTI) != 0); |
| 694 | 696 | ||
| 695 | sg_set_buf(sg, &promisc, sizeof(promisc)); | 697 | sg_init_one(sg, &promisc, sizeof(promisc)); |
| 696 | 698 | ||
| 697 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, | 699 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, |
| 698 | VIRTIO_NET_CTRL_RX_PROMISC, | 700 | VIRTIO_NET_CTRL_RX_PROMISC, |
| @@ -700,7 +702,7 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
| 700 | dev_warn(&dev->dev, "Failed to %sable promisc mode.\n", | 702 | dev_warn(&dev->dev, "Failed to %sable promisc mode.\n", |
| 701 | promisc ? "en" : "dis"); | 703 | promisc ? "en" : "dis"); |
| 702 | 704 | ||
| 703 | sg_set_buf(sg, &allmulti, sizeof(allmulti)); | 705 | sg_init_one(sg, &allmulti, sizeof(allmulti)); |
| 704 | 706 | ||
| 705 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, | 707 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, |
| 706 | VIRTIO_NET_CTRL_RX_ALLMULTI, | 708 | VIRTIO_NET_CTRL_RX_ALLMULTI, |
| @@ -716,6 +718,8 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
| 716 | return; | 718 | return; |
| 717 | } | 719 | } |
| 718 | 720 | ||
| 721 | sg_init_table(sg, 2); | ||
| 722 | |||
| 719 | /* Store the unicast list and count in the front of the buffer */ | 723 | /* Store the unicast list and count in the front of the buffer */ |
| 720 | mac_data->entries = dev->uc_count; | 724 | mac_data->entries = dev->uc_count; |
| 721 | addr = dev->uc_list; | 725 | addr = dev->uc_list; |
| @@ -744,24 +748,24 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
| 744 | kfree(buf); | 748 | kfree(buf); |
| 745 | } | 749 | } |
| 746 | 750 | ||
| 747 | static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid) | 751 | static void virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid) |
| 748 | { | 752 | { |
| 749 | struct virtnet_info *vi = netdev_priv(dev); | 753 | struct virtnet_info *vi = netdev_priv(dev); |
| 750 | struct scatterlist sg; | 754 | struct scatterlist sg; |
| 751 | 755 | ||
| 752 | sg_set_buf(&sg, &vid, sizeof(vid)); | 756 | sg_init_one(&sg, &vid, sizeof(vid)); |
| 753 | 757 | ||
| 754 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, | 758 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, |
| 755 | VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0)) | 759 | VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0)) |
| 756 | dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid); | 760 | dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid); |
| 757 | } | 761 | } |
| 758 | 762 | ||
| 759 | static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid) | 763 | static void virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid) |
| 760 | { | 764 | { |
| 761 | struct virtnet_info *vi = netdev_priv(dev); | 765 | struct virtnet_info *vi = netdev_priv(dev); |
| 762 | struct scatterlist sg; | 766 | struct scatterlist sg; |
| 763 | 767 | ||
| 764 | sg_set_buf(&sg, &vid, sizeof(vid)); | 768 | sg_init_one(&sg, &vid, sizeof(vid)); |
| 765 | 769 | ||
| 766 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, | 770 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, |
| 767 | VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0)) | 771 | VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0)) |
| @@ -794,8 +798,8 @@ static const struct net_device_ops virtnet_netdev = { | |||
| 794 | .ndo_set_mac_address = virtnet_set_mac_address, | 798 | .ndo_set_mac_address = virtnet_set_mac_address, |
| 795 | .ndo_set_rx_mode = virtnet_set_rx_mode, | 799 | .ndo_set_rx_mode = virtnet_set_rx_mode, |
| 796 | .ndo_change_mtu = virtnet_change_mtu, | 800 | .ndo_change_mtu = virtnet_change_mtu, |
| 797 | .ndo_vlan_rx_add_vid = virnet_vlan_rx_add_vid, | 801 | .ndo_vlan_rx_add_vid = virtnet_vlan_rx_add_vid, |
| 798 | .ndo_vlan_rx_kill_vid = virnet_vlan_rx_kill_vid, | 802 | .ndo_vlan_rx_kill_vid = virtnet_vlan_rx_kill_vid, |
| 799 | #ifdef CONFIG_NET_POLL_CONTROLLER | 803 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 800 | .ndo_poll_controller = virtnet_netpoll, | 804 | .ndo_poll_controller = virtnet_netpoll, |
| 801 | #endif | 805 | #endif |
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 3bf7d3f447db..765a7f5d6aa4 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c | |||
| @@ -1249,7 +1249,7 @@ static int __devinit hss_init_one(struct platform_device *pdev) | |||
| 1249 | return -ENOMEM; | 1249 | return -ENOMEM; |
| 1250 | 1250 | ||
| 1251 | if ((port->npe = npe_request(0)) == NULL) { | 1251 | if ((port->npe = npe_request(0)) == NULL) { |
| 1252 | err = -ENOSYS; | 1252 | err = -ENODEV; |
| 1253 | goto err_free; | 1253 | goto err_free; |
| 1254 | } | 1254 | } |
| 1255 | 1255 | ||
| @@ -1311,7 +1311,7 @@ static int __init hss_init_module(void) | |||
| 1311 | if ((ixp4xx_read_feature_bits() & | 1311 | if ((ixp4xx_read_feature_bits() & |
| 1312 | (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) != | 1312 | (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) != |
| 1313 | (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) | 1313 | (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) |
| 1314 | return -ENOSYS; | 1314 | return -ENODEV; |
| 1315 | 1315 | ||
| 1316 | spin_lock_init(&npe_lock); | 1316 | spin_lock_init(&npe_lock); |
| 1317 | 1317 | ||
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c index 9770bb3d40f9..4904a07e4b59 100644 --- a/drivers/net/wireless/ath5k/debug.c +++ b/drivers/net/wireless/ath5k/debug.c | |||
| @@ -424,7 +424,7 @@ ath5k_debug_dump_bands(struct ath5k_softc *sc) | |||
| 424 | 424 | ||
| 425 | for (b = 0; b < IEEE80211_NUM_BANDS; b++) { | 425 | for (b = 0; b < IEEE80211_NUM_BANDS; b++) { |
| 426 | struct ieee80211_supported_band *band = &sc->sbands[b]; | 426 | struct ieee80211_supported_band *band = &sc->sbands[b]; |
| 427 | char bname[5]; | 427 | char bname[6]; |
| 428 | switch (band->band) { | 428 | switch (band->band) { |
| 429 | case IEEE80211_BAND_2GHZ: | 429 | case IEEE80211_BAND_2GHZ: |
| 430 | strcpy(bname, "2 GHz"); | 430 | strcpy(bname, "2 GHz"); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 23644cf884f1..e7c65c4f741b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
| @@ -925,11 +925,11 @@ void iwl_bg_scan_completed(struct work_struct *work) | |||
| 925 | 925 | ||
| 926 | IWL_DEBUG_SCAN(priv, "SCAN complete scan\n"); | 926 | IWL_DEBUG_SCAN(priv, "SCAN complete scan\n"); |
| 927 | 927 | ||
| 928 | ieee80211_scan_completed(priv->hw, false); | ||
| 929 | |||
| 928 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) | 930 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) |
| 929 | return; | 931 | return; |
| 930 | 932 | ||
| 931 | ieee80211_scan_completed(priv->hw, false); | ||
| 932 | |||
| 933 | /* Since setting the TXPOWER may have been deferred while | 933 | /* Since setting the TXPOWER may have been deferred while |
| 934 | * performing the scan, fire one off */ | 934 | * performing the scan, fire one off */ |
| 935 | mutex_lock(&priv->mutex); | 935 | mutex_lock(&priv->mutex); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 5798fe49c771..44ab03a12e40 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
| @@ -719,6 +719,14 @@ static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, | |||
| 719 | { | 719 | { |
| 720 | unsigned long flags; | 720 | unsigned long flags; |
| 721 | int ret = 0; | 721 | int ret = 0; |
| 722 | __le16 key_flags = 0; | ||
| 723 | |||
| 724 | key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK); | ||
| 725 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); | ||
| 726 | key_flags &= ~STA_KEY_FLG_INVALID; | ||
| 727 | |||
| 728 | if (sta_id == priv->hw_params.bcast_sta_id) | ||
| 729 | key_flags |= STA_KEY_MULTICAST_MSK; | ||
| 722 | 730 | ||
| 723 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; | 731 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; |
| 724 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; | 732 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; |
| @@ -738,6 +746,9 @@ static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, | |||
| 738 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, | 746 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, |
| 739 | "no space for a new key"); | 747 | "no space for a new key"); |
| 740 | 748 | ||
| 749 | priv->stations[sta_id].sta.key.key_flags = key_flags; | ||
| 750 | |||
| 751 | |||
| 741 | /* This copy is acutally not needed: we get the key with each TX */ | 752 | /* This copy is acutally not needed: we get the key with each TX */ |
| 742 | memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16); | 753 | memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16); |
| 743 | 754 | ||
| @@ -754,9 +765,7 @@ void iwl_update_tkip_key(struct iwl_priv *priv, | |||
| 754 | { | 765 | { |
| 755 | u8 sta_id = IWL_INVALID_STATION; | 766 | u8 sta_id = IWL_INVALID_STATION; |
| 756 | unsigned long flags; | 767 | unsigned long flags; |
| 757 | __le16 key_flags = 0; | ||
| 758 | int i; | 768 | int i; |
| 759 | DECLARE_MAC_BUF(mac); | ||
| 760 | 769 | ||
| 761 | sta_id = iwl_find_station(priv, addr); | 770 | sta_id = iwl_find_station(priv, addr); |
| 762 | if (sta_id == IWL_INVALID_STATION) { | 771 | if (sta_id == IWL_INVALID_STATION) { |
| @@ -771,16 +780,8 @@ void iwl_update_tkip_key(struct iwl_priv *priv, | |||
| 771 | return; | 780 | return; |
| 772 | } | 781 | } |
| 773 | 782 | ||
| 774 | key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK); | ||
| 775 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); | ||
| 776 | key_flags &= ~STA_KEY_FLG_INVALID; | ||
| 777 | |||
| 778 | if (sta_id == priv->hw_params.bcast_sta_id) | ||
| 779 | key_flags |= STA_KEY_MULTICAST_MSK; | ||
| 780 | |||
| 781 | spin_lock_irqsave(&priv->sta_lock, flags); | 783 | spin_lock_irqsave(&priv->sta_lock, flags); |
| 782 | 784 | ||
| 783 | priv->stations[sta_id].sta.key.key_flags = key_flags; | ||
| 784 | priv->stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32; | 785 | priv->stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32; |
| 785 | 786 | ||
| 786 | for (i = 0; i < 5; i++) | 787 | for (i = 0; i < 5; i++) |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 617c4235d971..4cce66133500 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -1694,7 +1694,6 @@ void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq) | |||
| 1694 | rxq->free_count = 0; | 1694 | rxq->free_count = 0; |
| 1695 | spin_unlock_irqrestore(&rxq->lock, flags); | 1695 | spin_unlock_irqrestore(&rxq->lock, flags); |
| 1696 | } | 1696 | } |
| 1697 | EXPORT_SYMBOL(iwl3945_rx_queue_reset); | ||
| 1698 | 1697 | ||
| 1699 | /* | 1698 | /* |
| 1700 | * this should be called while priv->lock is locked | 1699 | * this should be called while priv->lock is locked |
| @@ -1745,7 +1744,6 @@ static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rx | |||
| 1745 | rxq->bd = NULL; | 1744 | rxq->bd = NULL; |
| 1746 | rxq->rb_stts = NULL; | 1745 | rxq->rb_stts = NULL; |
| 1747 | } | 1746 | } |
| 1748 | EXPORT_SYMBOL(iwl3945_rx_queue_free); | ||
| 1749 | 1747 | ||
| 1750 | 1748 | ||
| 1751 | /* Convert linear signal-to-noise ratio into dB */ | 1749 | /* Convert linear signal-to-noise ratio into dB */ |
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index db91db776508..bebf735cd4bd 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
| @@ -2558,6 +2558,11 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf) | |||
| 2558 | mutex_init(&priv->command_lock); | 2558 | mutex_init(&priv->command_lock); |
| 2559 | spin_lock_init(&priv->stats_lock); | 2559 | spin_lock_init(&priv->stats_lock); |
| 2560 | 2560 | ||
| 2561 | /* because rndis_command() sleeps we need to use workqueue */ | ||
| 2562 | priv->workqueue = create_singlethread_workqueue("rndis_wlan"); | ||
| 2563 | INIT_WORK(&priv->work, rndis_wext_worker); | ||
| 2564 | INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats); | ||
| 2565 | |||
| 2561 | /* try bind rndis_host */ | 2566 | /* try bind rndis_host */ |
| 2562 | retval = generic_rndis_bind(usbdev, intf, FLAG_RNDIS_PHYM_WIRELESS); | 2567 | retval = generic_rndis_bind(usbdev, intf, FLAG_RNDIS_PHYM_WIRELESS); |
| 2563 | if (retval < 0) | 2568 | if (retval < 0) |
| @@ -2603,16 +2608,17 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf) | |||
| 2603 | disassociate(usbdev, 1); | 2608 | disassociate(usbdev, 1); |
| 2604 | netif_carrier_off(usbdev->net); | 2609 | netif_carrier_off(usbdev->net); |
| 2605 | 2610 | ||
| 2606 | /* because rndis_command() sleeps we need to use workqueue */ | ||
| 2607 | priv->workqueue = create_singlethread_workqueue("rndis_wlan"); | ||
| 2608 | INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats); | ||
| 2609 | queue_delayed_work(priv->workqueue, &priv->stats_work, | 2611 | queue_delayed_work(priv->workqueue, &priv->stats_work, |
| 2610 | round_jiffies_relative(STATS_UPDATE_JIFFIES)); | 2612 | round_jiffies_relative(STATS_UPDATE_JIFFIES)); |
| 2611 | INIT_WORK(&priv->work, rndis_wext_worker); | ||
| 2612 | 2613 | ||
| 2613 | return 0; | 2614 | return 0; |
| 2614 | 2615 | ||
| 2615 | fail: | 2616 | fail: |
| 2617 | cancel_delayed_work_sync(&priv->stats_work); | ||
| 2618 | cancel_work_sync(&priv->work); | ||
| 2619 | flush_workqueue(priv->workqueue); | ||
| 2620 | destroy_workqueue(priv->workqueue); | ||
| 2621 | |||
| 2616 | kfree(priv); | 2622 | kfree(priv); |
| 2617 | return retval; | 2623 | return retval; |
| 2618 | } | 2624 | } |
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 001b328adf80..a563fbe559d0 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
| @@ -59,6 +59,10 @@ | |||
| 59 | #define DMA_32BIT_PFN IOVA_PFN(DMA_BIT_MASK(32)) | 59 | #define DMA_32BIT_PFN IOVA_PFN(DMA_BIT_MASK(32)) |
| 60 | #define DMA_64BIT_PFN IOVA_PFN(DMA_BIT_MASK(64)) | 60 | #define DMA_64BIT_PFN IOVA_PFN(DMA_BIT_MASK(64)) |
| 61 | 61 | ||
| 62 | #ifndef PHYSICAL_PAGE_MASK | ||
| 63 | #define PHYSICAL_PAGE_MASK PAGE_MASK | ||
| 64 | #endif | ||
| 65 | |||
| 62 | /* global iommu list, set NULL for ignored DMAR units */ | 66 | /* global iommu list, set NULL for ignored DMAR units */ |
| 63 | static struct intel_iommu **g_iommus; | 67 | static struct intel_iommu **g_iommus; |
| 64 | 68 | ||
| @@ -1216,7 +1220,7 @@ static void dmar_init_reserved_ranges(void) | |||
| 1216 | if (!r->flags || !(r->flags & IORESOURCE_MEM)) | 1220 | if (!r->flags || !(r->flags & IORESOURCE_MEM)) |
| 1217 | continue; | 1221 | continue; |
| 1218 | addr = r->start; | 1222 | addr = r->start; |
| 1219 | addr &= PAGE_MASK; | 1223 | addr &= PHYSICAL_PAGE_MASK; |
| 1220 | size = r->end - addr; | 1224 | size = r->end - addr; |
| 1221 | size = PAGE_ALIGN(size); | 1225 | size = PAGE_ALIGN(size); |
| 1222 | iova = reserve_iova(&reserved_iova_list, IOVA_PFN(addr), | 1226 | iova = reserve_iova(&reserved_iova_list, IOVA_PFN(addr), |
| @@ -2173,7 +2177,8 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr, | |||
| 2173 | * is not a big problem | 2177 | * is not a big problem |
| 2174 | */ | 2178 | */ |
| 2175 | ret = domain_page_mapping(domain, start_paddr, | 2179 | ret = domain_page_mapping(domain, start_paddr, |
| 2176 | ((u64)paddr) & PAGE_MASK, size, prot); | 2180 | ((u64)paddr) & PHYSICAL_PAGE_MASK, |
| 2181 | size, prot); | ||
| 2177 | if (ret) | 2182 | if (ret) |
| 2178 | goto error; | 2183 | goto error; |
| 2179 | 2184 | ||
| @@ -2463,8 +2468,8 @@ static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int ne | |||
| 2463 | addr = page_to_phys(sg_page(sg)) + sg->offset; | 2468 | addr = page_to_phys(sg_page(sg)) + sg->offset; |
| 2464 | size = aligned_size((u64)addr, sg->length); | 2469 | size = aligned_size((u64)addr, sg->length); |
| 2465 | ret = domain_page_mapping(domain, start_addr + offset, | 2470 | ret = domain_page_mapping(domain, start_addr + offset, |
| 2466 | ((u64)addr) & PAGE_MASK, | 2471 | ((u64)addr) & PHYSICAL_PAGE_MASK, |
| 2467 | size, prot); | 2472 | size, prot); |
| 2468 | if (ret) { | 2473 | if (ret) { |
| 2469 | /* clear the page */ | 2474 | /* clear the page */ |
| 2470 | dma_pte_clear_range(domain, start_addr, | 2475 | dma_pte_clear_range(domain, start_addr, |
diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c index a6341e4f9a0f..9c8c70c497dc 100644 --- a/drivers/rtc/rtc-twl4030.c +++ b/drivers/rtc/rtc-twl4030.c | |||
| @@ -495,9 +495,7 @@ static int twl4030_rtc_suspend(struct platform_device *pdev, pm_message_t state) | |||
| 495 | { | 495 | { |
| 496 | irqstat = rtc_irq_bits; | 496 | irqstat = rtc_irq_bits; |
| 497 | 497 | ||
| 498 | /* REVISIT alarm may need to wake us from sleep */ | 498 | mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M); |
| 499 | mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M | | ||
| 500 | BIT_RTC_INTERRUPTS_REG_IT_ALARM_M); | ||
| 501 | return 0; | 499 | return 0; |
| 502 | } | 500 | } |
| 503 | 501 | ||
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index f644c9571eab..22b59e13ba83 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c | |||
| @@ -173,26 +173,26 @@ static const struct file_operations osd_fops = { | |||
| 173 | .unlocked_ioctl = osd_uld_ioctl, | 173 | .unlocked_ioctl = osd_uld_ioctl, |
| 174 | }; | 174 | }; |
| 175 | 175 | ||
| 176 | struct osd_dev *osduld_path_lookup(const char *path) | 176 | struct osd_dev *osduld_path_lookup(const char *name) |
| 177 | { | 177 | { |
| 178 | struct nameidata nd; | 178 | struct path path; |
| 179 | struct inode *inode; | 179 | struct inode *inode; |
| 180 | struct cdev *cdev; | 180 | struct cdev *cdev; |
| 181 | struct osd_uld_device *uninitialized_var(oud); | 181 | struct osd_uld_device *uninitialized_var(oud); |
| 182 | int error; | 182 | int error; |
| 183 | 183 | ||
| 184 | if (!path || !*path) { | 184 | if (!name || !*name) { |
| 185 | OSD_ERR("Mount with !path || !*path\n"); | 185 | OSD_ERR("Mount with !path || !*path\n"); |
| 186 | return ERR_PTR(-EINVAL); | 186 | return ERR_PTR(-EINVAL); |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | error = path_lookup(path, LOOKUP_FOLLOW, &nd); | 189 | error = kern_path(name, LOOKUP_FOLLOW, &path); |
| 190 | if (error) { | 190 | if (error) { |
| 191 | OSD_ERR("path_lookup of %s faild=>%d\n", path, error); | 191 | OSD_ERR("path_lookup of %s failed=>%d\n", name, error); |
| 192 | return ERR_PTR(error); | 192 | return ERR_PTR(error); |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | inode = nd.path.dentry->d_inode; | 195 | inode = path.dentry->d_inode; |
| 196 | error = -EINVAL; /* Not the right device e.g osd_uld_device */ | 196 | error = -EINVAL; /* Not the right device e.g osd_uld_device */ |
| 197 | if (!S_ISCHR(inode->i_mode)) { | 197 | if (!S_ISCHR(inode->i_mode)) { |
| 198 | OSD_DEBUG("!S_ISCHR()\n"); | 198 | OSD_DEBUG("!S_ISCHR()\n"); |
| @@ -202,15 +202,15 @@ struct osd_dev *osduld_path_lookup(const char *path) | |||
| 202 | cdev = inode->i_cdev; | 202 | cdev = inode->i_cdev; |
| 203 | if (!cdev) { | 203 | if (!cdev) { |
| 204 | OSD_ERR("Before mounting an OSD Based filesystem\n"); | 204 | OSD_ERR("Before mounting an OSD Based filesystem\n"); |
| 205 | OSD_ERR(" user-mode must open+close the %s device\n", path); | 205 | OSD_ERR(" user-mode must open+close the %s device\n", name); |
| 206 | OSD_ERR(" Example: bash: echo < %s\n", path); | 206 | OSD_ERR(" Example: bash: echo < %s\n", name); |
| 207 | goto out; | 207 | goto out; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | /* The Magic wand. Is it our char-dev */ | 210 | /* The Magic wand. Is it our char-dev */ |
| 211 | /* TODO: Support sg devices */ | 211 | /* TODO: Support sg devices */ |
| 212 | if (cdev->owner != THIS_MODULE) { | 212 | if (cdev->owner != THIS_MODULE) { |
| 213 | OSD_ERR("Error mounting %s - is not an OSD device\n", path); | 213 | OSD_ERR("Error mounting %s - is not an OSD device\n", name); |
| 214 | goto out; | 214 | goto out; |
| 215 | } | 215 | } |
| 216 | 216 | ||
| @@ -220,7 +220,7 @@ struct osd_dev *osduld_path_lookup(const char *path) | |||
| 220 | error = 0; | 220 | error = 0; |
| 221 | 221 | ||
| 222 | out: | 222 | out: |
| 223 | path_put(&nd.path); | 223 | path_put(&path); |
| 224 | return error ? ERR_PTR(error) : &oud->od; | 224 | return error ? ERR_PTR(error) : &oud->od; |
| 225 | } | 225 | } |
| 226 | EXPORT_SYMBOL(osduld_path_lookup); | 226 | EXPORT_SYMBOL(osduld_path_lookup); |
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h index 8871aaa3dba6..c0a3e2734e24 100644 --- a/drivers/serial/jsm/jsm.h +++ b/drivers/serial/jsm/jsm.h | |||
| @@ -130,8 +130,6 @@ struct jsm_board | |||
| 130 | struct pci_dev *pci_dev; | 130 | struct pci_dev *pci_dev; |
| 131 | u32 maxports; /* MAX ports this board can handle */ | 131 | u32 maxports; /* MAX ports this board can handle */ |
| 132 | 132 | ||
| 133 | spinlock_t bd_lock; /* Used to protect board */ | ||
| 134 | |||
| 135 | spinlock_t bd_intr_lock; /* Used to protect the poller tasklet and | 133 | spinlock_t bd_intr_lock; /* Used to protect the poller tasklet and |
| 136 | * the interrupt routine from each other. | 134 | * the interrupt routine from each other. |
| 137 | */ | 135 | */ |
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c index d2d32a198629..b3604aa322a4 100644 --- a/drivers/serial/jsm/jsm_driver.c +++ b/drivers/serial/jsm/jsm_driver.c | |||
| @@ -88,7 +88,6 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device | |||
| 88 | else | 88 | else |
| 89 | brd->maxports = 2; | 89 | brd->maxports = 2; |
| 90 | 90 | ||
| 91 | spin_lock_init(&brd->bd_lock); | ||
| 92 | spin_lock_init(&brd->bd_intr_lock); | 91 | spin_lock_init(&brd->bd_intr_lock); |
| 93 | 92 | ||
| 94 | /* store which revision we have */ | 93 | /* store which revision we have */ |
diff --git a/drivers/serial/s3c6400.c b/drivers/serial/s3c6400.c index 06936d13393f..3e3785233682 100644 --- a/drivers/serial/s3c6400.c +++ b/drivers/serial/s3c6400.c | |||
| @@ -102,6 +102,7 @@ static struct s3c24xx_uart_info s3c6400_uart_inf = { | |||
| 102 | .name = "Samsung S3C6400 UART", | 102 | .name = "Samsung S3C6400 UART", |
| 103 | .type = PORT_S3C6400, | 103 | .type = PORT_S3C6400, |
| 104 | .fifosize = 64, | 104 | .fifosize = 64, |
| 105 | .has_divslot = 1, | ||
| 105 | .rx_fifomask = S3C2440_UFSTAT_RXMASK, | 106 | .rx_fifomask = S3C2440_UFSTAT_RXMASK, |
| 106 | .rx_fifoshift = S3C2440_UFSTAT_RXSHIFT, | 107 | .rx_fifoshift = S3C2440_UFSTAT_RXSHIFT, |
| 107 | .rx_fifofull = S3C2440_UFSTAT_RXFULL, | 108 | .rx_fifofull = S3C2440_UFSTAT_RXFULL, |
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index e06686ae858b..93b5d75db126 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c | |||
| @@ -508,6 +508,7 @@ s3c24xx_serial_setsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c) | |||
| 508 | struct baud_calc { | 508 | struct baud_calc { |
| 509 | struct s3c24xx_uart_clksrc *clksrc; | 509 | struct s3c24xx_uart_clksrc *clksrc; |
| 510 | unsigned int calc; | 510 | unsigned int calc; |
| 511 | unsigned int divslot; | ||
| 511 | unsigned int quot; | 512 | unsigned int quot; |
| 512 | struct clk *src; | 513 | struct clk *src; |
| 513 | }; | 514 | }; |
| @@ -517,6 +518,7 @@ static int s3c24xx_serial_calcbaud(struct baud_calc *calc, | |||
| 517 | struct s3c24xx_uart_clksrc *clksrc, | 518 | struct s3c24xx_uart_clksrc *clksrc, |
| 518 | unsigned int baud) | 519 | unsigned int baud) |
| 519 | { | 520 | { |
| 521 | struct s3c24xx_uart_port *ourport = to_ourport(port); | ||
| 520 | unsigned long rate; | 522 | unsigned long rate; |
| 521 | 523 | ||
| 522 | calc->src = clk_get(port->dev, clksrc->name); | 524 | calc->src = clk_get(port->dev, clksrc->name); |
| @@ -527,8 +529,24 @@ static int s3c24xx_serial_calcbaud(struct baud_calc *calc, | |||
| 527 | rate /= clksrc->divisor; | 529 | rate /= clksrc->divisor; |
| 528 | 530 | ||
| 529 | calc->clksrc = clksrc; | 531 | calc->clksrc = clksrc; |
| 530 | calc->quot = (rate + (8 * baud)) / (16 * baud); | 532 | |
| 531 | calc->calc = (rate / (calc->quot * 16)); | 533 | if (ourport->info->has_divslot) { |
| 534 | unsigned long div = rate / baud; | ||
| 535 | |||
| 536 | /* The UDIVSLOT register on the newer UARTs allows us to | ||
| 537 | * get a divisor adjustment of 1/16th on the baud clock. | ||
| 538 | * | ||
| 539 | * We don't keep the UDIVSLOT value (the 16ths we calculated | ||
| 540 | * by not multiplying the baud by 16) as it is easy enough | ||
| 541 | * to recalculate. | ||
| 542 | */ | ||
| 543 | |||
| 544 | calc->quot = div / 16; | ||
| 545 | calc->calc = rate / div; | ||
| 546 | } else { | ||
| 547 | calc->quot = (rate + (8 * baud)) / (16 * baud); | ||
| 548 | calc->calc = (rate / (calc->quot * 16)); | ||
| 549 | } | ||
| 532 | 550 | ||
| 533 | calc->quot--; | 551 | calc->quot--; |
| 534 | return 1; | 552 | return 1; |
| @@ -611,6 +629,30 @@ static unsigned int s3c24xx_serial_getclk(struct uart_port *port, | |||
| 611 | return best->quot; | 629 | return best->quot; |
| 612 | } | 630 | } |
| 613 | 631 | ||
| 632 | /* udivslot_table[] | ||
| 633 | * | ||
| 634 | * This table takes the fractional value of the baud divisor and gives | ||
| 635 | * the recommended setting for the UDIVSLOT register. | ||
| 636 | */ | ||
| 637 | static u16 udivslot_table[16] = { | ||
| 638 | [0] = 0x0000, | ||
| 639 | [1] = 0x0080, | ||
| 640 | [2] = 0x0808, | ||
| 641 | [3] = 0x0888, | ||
| 642 | [4] = 0x2222, | ||
| 643 | [5] = 0x4924, | ||
| 644 | [6] = 0x4A52, | ||
| 645 | [7] = 0x54AA, | ||
| 646 | [8] = 0x5555, | ||
| 647 | [9] = 0xD555, | ||
| 648 | [10] = 0xD5D5, | ||
| 649 | [11] = 0xDDD5, | ||
| 650 | [12] = 0xDDDD, | ||
| 651 | [13] = 0xDFDD, | ||
| 652 | [14] = 0xDFDF, | ||
| 653 | [15] = 0xFFDF, | ||
| 654 | }; | ||
| 655 | |||
| 614 | static void s3c24xx_serial_set_termios(struct uart_port *port, | 656 | static void s3c24xx_serial_set_termios(struct uart_port *port, |
| 615 | struct ktermios *termios, | 657 | struct ktermios *termios, |
| 616 | struct ktermios *old) | 658 | struct ktermios *old) |
| @@ -623,6 +665,7 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
| 623 | unsigned int baud, quot; | 665 | unsigned int baud, quot; |
| 624 | unsigned int ulcon; | 666 | unsigned int ulcon; |
| 625 | unsigned int umcon; | 667 | unsigned int umcon; |
| 668 | unsigned int udivslot = 0; | ||
| 626 | 669 | ||
| 627 | /* | 670 | /* |
| 628 | * We don't support modem control lines. | 671 | * We don't support modem control lines. |
| @@ -644,6 +687,7 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
| 644 | /* check to see if we need to change clock source */ | 687 | /* check to see if we need to change clock source */ |
| 645 | 688 | ||
| 646 | if (ourport->clksrc != clksrc || ourport->baudclk != clk) { | 689 | if (ourport->clksrc != clksrc || ourport->baudclk != clk) { |
| 690 | dbg("selecting clock %p\n", clk); | ||
| 647 | s3c24xx_serial_setsource(port, clksrc); | 691 | s3c24xx_serial_setsource(port, clksrc); |
| 648 | 692 | ||
| 649 | if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) { | 693 | if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) { |
| @@ -658,6 +702,13 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
| 658 | ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; | 702 | ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; |
| 659 | } | 703 | } |
| 660 | 704 | ||
| 705 | if (ourport->info->has_divslot) { | ||
| 706 | unsigned int div = ourport->baudclk_rate / baud; | ||
| 707 | |||
| 708 | udivslot = udivslot_table[div & 15]; | ||
| 709 | dbg("udivslot = %04x (div %d)\n", udivslot, div & 15); | ||
| 710 | } | ||
| 711 | |||
| 661 | switch (termios->c_cflag & CSIZE) { | 712 | switch (termios->c_cflag & CSIZE) { |
| 662 | case CS5: | 713 | case CS5: |
| 663 | dbg("config: 5bits/char\n"); | 714 | dbg("config: 5bits/char\n"); |
| @@ -697,12 +748,16 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
| 697 | 748 | ||
| 698 | spin_lock_irqsave(&port->lock, flags); | 749 | spin_lock_irqsave(&port->lock, flags); |
| 699 | 750 | ||
| 700 | dbg("setting ulcon to %08x, brddiv to %d\n", ulcon, quot); | 751 | dbg("setting ulcon to %08x, brddiv to %d, udivslot %08x\n", |
| 752 | ulcon, quot, udivslot); | ||
| 701 | 753 | ||
| 702 | wr_regl(port, S3C2410_ULCON, ulcon); | 754 | wr_regl(port, S3C2410_ULCON, ulcon); |
| 703 | wr_regl(port, S3C2410_UBRDIV, quot); | 755 | wr_regl(port, S3C2410_UBRDIV, quot); |
| 704 | wr_regl(port, S3C2410_UMCON, umcon); | 756 | wr_regl(port, S3C2410_UMCON, umcon); |
| 705 | 757 | ||
| 758 | if (ourport->info->has_divslot) | ||
| 759 | wr_regl(port, S3C2443_DIVSLOT, udivslot); | ||
| 760 | |||
| 706 | dbg("uart: ulcon = 0x%08x, ucon = 0x%08x, ufcon = 0x%08x\n", | 761 | dbg("uart: ulcon = 0x%08x, ucon = 0x%08x, ufcon = 0x%08x\n", |
| 707 | rd_regl(port, S3C2410_ULCON), | 762 | rd_regl(port, S3C2410_ULCON), |
| 708 | rd_regl(port, S3C2410_UCON), | 763 | rd_regl(port, S3C2410_UCON), |
diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h index 571d6b90d206..7afb94843a08 100644 --- a/drivers/serial/samsung.h +++ b/drivers/serial/samsung.h | |||
| @@ -21,6 +21,10 @@ struct s3c24xx_uart_info { | |||
| 21 | unsigned long tx_fifoshift; | 21 | unsigned long tx_fifoshift; |
| 22 | unsigned long tx_fifofull; | 22 | unsigned long tx_fifofull; |
| 23 | 23 | ||
| 24 | /* uart port features */ | ||
| 25 | |||
| 26 | unsigned int has_divslot:1; | ||
| 27 | |||
| 24 | /* clock source control */ | 28 | /* clock source control */ |
| 25 | 29 | ||
| 26 | int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk); | 30 | int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk); |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 885194a07418..3f3c08c6ba4e 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
| @@ -1373,6 +1373,9 @@ static void cleanup(struct spi_device *spi) | |||
| 1373 | { | 1373 | { |
| 1374 | struct chip_data *chip = spi_get_ctldata(spi); | 1374 | struct chip_data *chip = spi_get_ctldata(spi); |
| 1375 | 1375 | ||
| 1376 | if (!chip) | ||
| 1377 | return; | ||
| 1378 | |||
| 1376 | if (gpio_is_valid(chip->gpio_cs)) | 1379 | if (gpio_is_valid(chip->gpio_cs)) |
| 1377 | gpio_free(chip->gpio_cs); | 1380 | gpio_free(chip->gpio_cs); |
| 1378 | 1381 | ||
diff --git a/drivers/staging/comedi/TODO b/drivers/staging/comedi/TODO index 557812958464..15c9348fb938 100644 --- a/drivers/staging/comedi/TODO +++ b/drivers/staging/comedi/TODO | |||
| @@ -11,4 +11,3 @@ Please send patches to Greg Kroah-Hartman <greg@kroah.com> and | |||
| 11 | copy: | 11 | copy: |
| 12 | Ian Abbott <abbotti@mev.co.uk> | 12 | Ian Abbott <abbotti@mev.co.uk> |
| 13 | Frank Mori Hess <fmhess@users.sourceforge.net> | 13 | Frank Mori Hess <fmhess@users.sourceforge.net> |
| 14 | David Schleef <ds@schleef.org> | ||
diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h index a42caa370808..a69cf338e498 100644 --- a/drivers/staging/rt2870/rt2870.h +++ b/drivers/staging/rt2870/rt2870.h | |||
| @@ -145,6 +145,7 @@ | |||
| 145 | {USB_DEVICE(0x0789,0x0162)}, /* Logitec */ \ | 145 | {USB_DEVICE(0x0789,0x0162)}, /* Logitec */ \ |
| 146 | {USB_DEVICE(0x0789,0x0163)}, /* Logitec */ \ | 146 | {USB_DEVICE(0x0789,0x0163)}, /* Logitec */ \ |
| 147 | {USB_DEVICE(0x0789,0x0164)}, /* Logitec */ \ | 147 | {USB_DEVICE(0x0789,0x0164)}, /* Logitec */ \ |
| 148 | {USB_DEVICE(0x7392,0x7717)}, /* Edimax */ \ | ||
| 148 | { }/* Terminating entry */ \ | 149 | { }/* Terminating entry */ \ |
| 149 | } | 150 | } |
| 150 | 151 | ||
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h index 12215fc61ddc..db446b7e2e08 100644 --- a/drivers/staging/rtl8187se/r8180.h +++ b/drivers/staging/rtl8187se/r8180.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #define R8180H | 19 | #define R8180H |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | #define RTL8180_MODULE_NAME "rtl8180" | 22 | #define RTL8180_MODULE_NAME "r8180" |
| 23 | #define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a) | 23 | #define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a) |
| 24 | #define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a) | 24 | #define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a) |
| 25 | #define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a) | 25 | #define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a) |
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 6ecd12de4296..e10413cee0df 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c | |||
| @@ -640,11 +640,9 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
| 640 | { | 640 | { |
| 641 | struct proc_dir_entry *e; | 641 | struct proc_dir_entry *e; |
| 642 | struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); | 642 | struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); |
| 643 | priv->dir_dev = create_proc_entry(dev->name, | 643 | priv->dir_dev = rtl8180_proc; |
| 644 | S_IFDIR | S_IRUGO | S_IXUGO, | ||
| 645 | rtl8180_proc); | ||
| 646 | if (!priv->dir_dev) { | 644 | if (!priv->dir_dev) { |
| 647 | DMESGE("Unable to initialize /proc/net/rtl8180/%s\n", | 645 | DMESGE("Unable to initialize /proc/net/r8180/%s\n", |
| 648 | dev->name); | 646 | dev->name); |
| 649 | return; | 647 | return; |
| 650 | } | 648 | } |
| @@ -654,7 +652,7 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
| 654 | 652 | ||
| 655 | if (!e) { | 653 | if (!e) { |
| 656 | DMESGE("Unable to initialize " | 654 | DMESGE("Unable to initialize " |
| 657 | "/proc/net/rtl8180/%s/stats-hw\n", | 655 | "/proc/net/r8180/%s/stats-hw\n", |
| 658 | dev->name); | 656 | dev->name); |
| 659 | } | 657 | } |
| 660 | 658 | ||
| @@ -663,7 +661,7 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
| 663 | 661 | ||
| 664 | if (!e) { | 662 | if (!e) { |
| 665 | DMESGE("Unable to initialize " | 663 | DMESGE("Unable to initialize " |
| 666 | "/proc/net/rtl8180/%s/stats-rx\n", | 664 | "/proc/net/r8180/%s/stats-rx\n", |
| 667 | dev->name); | 665 | dev->name); |
| 668 | } | 666 | } |
| 669 | 667 | ||
| @@ -673,7 +671,7 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
| 673 | 671 | ||
| 674 | if (!e) { | 672 | if (!e) { |
| 675 | DMESGE("Unable to initialize " | 673 | DMESGE("Unable to initialize " |
| 676 | "/proc/net/rtl8180/%s/stats-tx\n", | 674 | "/proc/net/r8180/%s/stats-tx\n", |
| 677 | dev->name); | 675 | dev->name); |
| 678 | } | 676 | } |
| 679 | #if 0 | 677 | #if 0 |
| @@ -702,7 +700,7 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
| 702 | 700 | ||
| 703 | if (!e) { | 701 | if (!e) { |
| 704 | DMESGE("Unable to initialize " | 702 | DMESGE("Unable to initialize " |
| 705 | "/proc/net/rtl8180/%s/registers\n", | 703 | "/proc/net/r8180/%s/registers\n", |
| 706 | dev->name); | 704 | dev->name); |
| 707 | } | 705 | } |
| 708 | } | 706 | } |
| @@ -977,13 +975,6 @@ void check_tx_ring(struct net_device *dev, int pri) | |||
| 977 | *tmp & (1<<15)? "ok": "err", *(tmp+4)); | 975 | *tmp & (1<<15)? "ok": "err", *(tmp+4)); |
| 978 | } | 976 | } |
| 979 | 977 | ||
| 980 | DMESG("nic at %d", | ||
| 981 | (nic-nicbegin) / 8 /4); | ||
| 982 | DMESG("tail at %d", ((int)tail - (int)begin) /8 /4); | ||
| 983 | DMESG("head at %d", ((int)head - (int)begin) /8 /4); | ||
| 984 | DMESG("check free desc returns %d", check_nic_enought_desc(dev,pri)); | ||
| 985 | DMESG("free desc is %d\n", get_curr_tx_free_desc(dev,pri)); | ||
| 986 | //rtl8180_reset(dev); | ||
| 987 | return; | 978 | return; |
| 988 | } | 979 | } |
| 989 | 980 | ||
| @@ -1736,17 +1727,7 @@ short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count, | |||
| 1736 | * descriptor's buffer must be 256 byte aligned | 1727 | * descriptor's buffer must be 256 byte aligned |
| 1737 | * we shouldn't be here, since we set DMA mask ! | 1728 | * we shouldn't be here, since we set DMA mask ! |
| 1738 | */ | 1729 | */ |
| 1739 | DMESGW("Fixing TX alignment"); | 1730 | WARN(1, "DMA buffer is not aligned\n"); |
| 1740 | desc = (u32*)((u8*)desc + 256); | ||
| 1741 | #if (defined(CONFIG_HIGHMEM64G) || defined(CONFIG_64BIT_PHYS_ADDR)) | ||
| 1742 | desc = (u32*)((u64)desc &~ 0xff); | ||
| 1743 | dma_desc = (dma_addr_t)((u8*)dma_desc + 256); | ||
| 1744 | dma_desc = (dma_addr_t)((u64)dma_desc &~ 0xff); | ||
| 1745 | #else | ||
| 1746 | desc = (u32*)((u32)desc &~ 0xff); | ||
| 1747 | dma_desc = (dma_addr_t)((u8*)dma_desc + 256); | ||
| 1748 | dma_desc = (dma_addr_t)((u32)dma_desc &~ 0xff); | ||
| 1749 | #endif | ||
| 1750 | } | 1731 | } |
| 1751 | tmp=desc; | 1732 | tmp=desc; |
| 1752 | for (i=0;i<count;i++) | 1733 | for (i=0;i<count;i++) |
| @@ -1984,18 +1965,7 @@ short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count) | |||
| 1984 | * descriptor's buffer must be 256 byte aligned | 1965 | * descriptor's buffer must be 256 byte aligned |
| 1985 | * should never happen since we specify the DMA mask | 1966 | * should never happen since we specify the DMA mask |
| 1986 | */ | 1967 | */ |
| 1987 | 1968 | WARN(1, "DMA buffer is not aligned\n"); | |
| 1988 | DMESGW("Fixing RX alignment"); | ||
| 1989 | desc = (u32*)((u8*)desc + 256); | ||
| 1990 | #if (defined(CONFIG_HIGHMEM64G) || defined(CONFIG_64BIT_PHYS_ADDR)) | ||
| 1991 | desc = (u32*)((u64)desc &~ 0xff); | ||
| 1992 | dma_desc = (dma_addr_t)((u8*)dma_desc + 256); | ||
| 1993 | dma_desc = (dma_addr_t)((u64)dma_desc &~ 0xff); | ||
| 1994 | #else | ||
| 1995 | desc = (u32*)((u32)desc &~ 0xff); | ||
| 1996 | dma_desc = (dma_addr_t)((u8*)dma_desc + 256); | ||
| 1997 | dma_desc = (dma_addr_t)((u32)dma_desc &~ 0xff); | ||
| 1998 | #endif | ||
| 1999 | } | 1969 | } |
| 2000 | 1970 | ||
| 2001 | priv->rxring=desc; | 1971 | priv->rxring=desc; |
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c index 9c3f9439f35e..3b2d52819b4c 100644 --- a/drivers/staging/winbond/wbusb.c +++ b/drivers/staging/winbond/wbusb.c | |||
| @@ -386,7 +386,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id | |||
| 386 | if (err) | 386 | if (err) |
| 387 | goto error_free_hw; | 387 | goto error_free_hw; |
| 388 | 388 | ||
| 389 | usb_set_intfdata(intf, priv); | 389 | usb_set_intfdata(intf, dev); |
| 390 | 390 | ||
| 391 | return 0; | 391 | return 0; |
| 392 | 392 | ||
| @@ -415,10 +415,15 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter) | |||
| 415 | 415 | ||
| 416 | static void wb35_disconnect(struct usb_interface *intf) | 416 | static void wb35_disconnect(struct usb_interface *intf) |
| 417 | { | 417 | { |
| 418 | struct wbsoft_priv *priv = usb_get_intfdata(intf); | 418 | struct ieee80211_hw *hw = usb_get_intfdata(intf); |
| 419 | struct wbsoft_priv *priv = hw->priv; | ||
| 419 | 420 | ||
| 420 | wb35_hw_halt(priv); | 421 | wb35_hw_halt(priv); |
| 421 | 422 | ||
| 423 | ieee80211_stop_queues(hw); | ||
| 424 | ieee80211_unregister_hw(hw); | ||
| 425 | ieee80211_free_hw(hw); | ||
| 426 | |||
| 422 | usb_set_intfdata(intf, NULL); | 427 | usb_set_intfdata(intf, NULL); |
| 423 | usb_put_dev(interface_to_usbdev(intf)); | 428 | usb_put_dev(interface_to_usbdev(intf)); |
| 424 | } | 429 | } |
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 89299a5ce168..0716cdb44cd8 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
| @@ -27,6 +27,8 @@ obj-$(CONFIG_USB_WUSB) += wusbcore/ | |||
| 27 | 27 | ||
| 28 | obj-$(CONFIG_USB_ACM) += class/ | 28 | obj-$(CONFIG_USB_ACM) += class/ |
| 29 | obj-$(CONFIG_USB_PRINTER) += class/ | 29 | obj-$(CONFIG_USB_PRINTER) += class/ |
| 30 | obj-$(CONFIG_USB_WDM) += class/ | ||
| 31 | obj-$(CONFIG_USB_TMC) += class/ | ||
| 30 | 32 | ||
| 31 | obj-$(CONFIG_USB_STORAGE) += storage/ | 33 | obj-$(CONFIG_USB_STORAGE) += storage/ |
| 32 | obj-$(CONFIG_USB) += storage/ | 34 | obj-$(CONFIG_USB) += storage/ |
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 6789089e2461..56802d2e994b 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
| @@ -227,8 +227,14 @@ static ssize_t cxacru_sysfs_showattr_s8(s8 value, char *buf) | |||
| 227 | 227 | ||
| 228 | static ssize_t cxacru_sysfs_showattr_dB(s16 value, char *buf) | 228 | static ssize_t cxacru_sysfs_showattr_dB(s16 value, char *buf) |
| 229 | { | 229 | { |
| 230 | return snprintf(buf, PAGE_SIZE, "%d.%02u\n", | 230 | if (likely(value >= 0)) { |
| 231 | value / 100, abs(value) % 100); | 231 | return snprintf(buf, PAGE_SIZE, "%u.%02u\n", |
| 232 | value / 100, value % 100); | ||
| 233 | } else { | ||
| 234 | value = -value; | ||
| 235 | return snprintf(buf, PAGE_SIZE, "-%u.%02u\n", | ||
| 236 | value / 100, value % 100); | ||
| 237 | } | ||
| 232 | } | 238 | } |
| 233 | 239 | ||
| 234 | static ssize_t cxacru_sysfs_showattr_bool(u32 value, char *buf) | 240 | static ssize_t cxacru_sysfs_showattr_bool(u32 value, char *buf) |
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c index 4154be375c7a..58c4d37d312a 100644 --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c | |||
| @@ -38,7 +38,7 @@ static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len) | |||
| 38 | uchar = (c & 0x1f) << 6; | 38 | uchar = (c & 0x1f) << 6; |
| 39 | 39 | ||
| 40 | c = (u8) *s++; | 40 | c = (u8) *s++; |
| 41 | if ((c & 0xc0) != 0xc0) | 41 | if ((c & 0xc0) != 0x80) |
| 42 | goto fail; | 42 | goto fail; |
| 43 | c &= 0x3f; | 43 | c &= 0x3f; |
| 44 | uchar |= c; | 44 | uchar |= c; |
| @@ -49,13 +49,13 @@ static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len) | |||
| 49 | uchar = (c & 0x0f) << 12; | 49 | uchar = (c & 0x0f) << 12; |
| 50 | 50 | ||
| 51 | c = (u8) *s++; | 51 | c = (u8) *s++; |
| 52 | if ((c & 0xc0) != 0xc0) | 52 | if ((c & 0xc0) != 0x80) |
| 53 | goto fail; | 53 | goto fail; |
| 54 | c &= 0x3f; | 54 | c &= 0x3f; |
| 55 | uchar |= c << 6; | 55 | uchar |= c << 6; |
| 56 | 56 | ||
| 57 | c = (u8) *s++; | 57 | c = (u8) *s++; |
| 58 | if ((c & 0xc0) != 0xc0) | 58 | if ((c & 0xc0) != 0x80) |
| 59 | goto fail; | 59 | goto fail; |
| 60 | c &= 0x3f; | 60 | c &= 0x3f; |
| 61 | uchar |= c; | 61 | uchar |= c; |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 8100f1d25904..0ab8474b00cb 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -56,6 +56,7 @@ static __u16 vendor = FTDI_VID; | |||
| 56 | static __u16 product; | 56 | static __u16 product; |
| 57 | 57 | ||
| 58 | struct ftdi_private { | 58 | struct ftdi_private { |
| 59 | struct kref kref; | ||
| 59 | ftdi_chip_type_t chip_type; | 60 | ftdi_chip_type_t chip_type; |
| 60 | /* type of device, either SIO or FT8U232AM */ | 61 | /* type of device, either SIO or FT8U232AM */ |
| 61 | int baud_base; /* baud base clock for divisor setting */ | 62 | int baud_base; /* baud base clock for divisor setting */ |
| @@ -669,6 +670,8 @@ static struct usb_device_id id_table_combined [] = { | |||
| 669 | { USB_DEVICE(ADI_VID, ADI_GNICE_PID), | 670 | { USB_DEVICE(ADI_VID, ADI_GNICE_PID), |
| 670 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 671 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 671 | { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, | 672 | { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, |
| 673 | { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), | ||
| 674 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
| 672 | { }, /* Optional parameter entry */ | 675 | { }, /* Optional parameter entry */ |
| 673 | { } /* Terminating entry */ | 676 | { } /* Terminating entry */ |
| 674 | }; | 677 | }; |
| @@ -1352,6 +1355,7 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port) | |||
| 1352 | return -ENOMEM; | 1355 | return -ENOMEM; |
| 1353 | } | 1356 | } |
| 1354 | 1357 | ||
| 1358 | kref_init(&priv->kref); | ||
| 1355 | spin_lock_init(&priv->rx_lock); | 1359 | spin_lock_init(&priv->rx_lock); |
| 1356 | spin_lock_init(&priv->tx_lock); | 1360 | spin_lock_init(&priv->tx_lock); |
| 1357 | init_waitqueue_head(&priv->delta_msr_wait); | 1361 | init_waitqueue_head(&priv->delta_msr_wait); |
| @@ -1468,6 +1472,13 @@ static void ftdi_shutdown(struct usb_serial *serial) | |||
| 1468 | dbg("%s", __func__); | 1472 | dbg("%s", __func__); |
| 1469 | } | 1473 | } |
| 1470 | 1474 | ||
| 1475 | static void ftdi_sio_priv_release(struct kref *k) | ||
| 1476 | { | ||
| 1477 | struct ftdi_private *priv = container_of(k, struct ftdi_private, kref); | ||
| 1478 | |||
| 1479 | kfree(priv); | ||
| 1480 | } | ||
| 1481 | |||
| 1471 | static int ftdi_sio_port_remove(struct usb_serial_port *port) | 1482 | static int ftdi_sio_port_remove(struct usb_serial_port *port) |
| 1472 | { | 1483 | { |
| 1473 | struct ftdi_private *priv = usb_get_serial_port_data(port); | 1484 | struct ftdi_private *priv = usb_get_serial_port_data(port); |
| @@ -1482,7 +1493,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port) | |||
| 1482 | 1493 | ||
| 1483 | if (priv) { | 1494 | if (priv) { |
| 1484 | usb_set_serial_port_data(port, NULL); | 1495 | usb_set_serial_port_data(port, NULL); |
| 1485 | kfree(priv); | 1496 | kref_put(&priv->kref, ftdi_sio_priv_release); |
| 1486 | } | 1497 | } |
| 1487 | 1498 | ||
| 1488 | return 0; | 1499 | return 0; |
| @@ -1547,7 +1558,8 @@ static int ftdi_open(struct tty_struct *tty, | |||
| 1547 | dev_err(&port->dev, | 1558 | dev_err(&port->dev, |
| 1548 | "%s - failed submitting read urb, error %d\n", | 1559 | "%s - failed submitting read urb, error %d\n", |
| 1549 | __func__, result); | 1560 | __func__, result); |
| 1550 | 1561 | else | |
| 1562 | kref_get(&priv->kref); | ||
| 1551 | 1563 | ||
| 1552 | return result; | 1564 | return result; |
| 1553 | } /* ftdi_open */ | 1565 | } /* ftdi_open */ |
| @@ -1589,11 +1601,11 @@ static void ftdi_close(struct tty_struct *tty, | |||
| 1589 | mutex_unlock(&port->serial->disc_mutex); | 1601 | mutex_unlock(&port->serial->disc_mutex); |
| 1590 | 1602 | ||
| 1591 | /* cancel any scheduled reading */ | 1603 | /* cancel any scheduled reading */ |
| 1592 | cancel_delayed_work(&priv->rx_work); | 1604 | cancel_delayed_work_sync(&priv->rx_work); |
| 1593 | flush_scheduled_work(); | ||
| 1594 | 1605 | ||
| 1595 | /* shutdown our bulk read */ | 1606 | /* shutdown our bulk read */ |
| 1596 | usb_kill_urb(port->read_urb); | 1607 | usb_kill_urb(port->read_urb); |
| 1608 | kref_put(&priv->kref, ftdi_sio_priv_release); | ||
| 1597 | } /* ftdi_close */ | 1609 | } /* ftdi_close */ |
| 1598 | 1610 | ||
| 1599 | 1611 | ||
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index c09f658a448b..12330fa1c095 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -920,6 +920,12 @@ | |||
| 920 | #define JETI_SPC1201_PID 0x04b2 | 920 | #define JETI_SPC1201_PID 0x04b2 |
| 921 | 921 | ||
| 922 | /* | 922 | /* |
| 923 | * Marvell SheevaPlug | ||
| 924 | */ | ||
| 925 | #define MARVELL_VID 0x9e88 | ||
| 926 | #define MARVELL_SHEEVAPLUG_PID 0x9e8f | ||
| 927 | |||
| 928 | /* | ||
| 923 | * BmRequestType: 1100 0000b | 929 | * BmRequestType: 1100 0000b |
| 924 | * bRequest: FTDI_E2_READ | 930 | * bRequest: FTDI_E2_READ |
| 925 | * wValue: 0 | 931 | * wValue: 0 |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index fa65a3b08601..4b8b69045fe6 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -160,8 +160,9 @@ UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x0100, | |||
| 160 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 160 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 161 | US_FL_IGNORE_RESIDUE ), | 161 | US_FL_IGNORE_RESIDUE ), |
| 162 | 162 | ||
| 163 | /* Reported by Andrew Nayenko <relan@bk.ru> */ | 163 | /* Reported by Andrew Nayenko <relan@bk.ru> |
| 164 | UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x0592, | 164 | * Updated for new firmware by Phillip Potter <phillipinda@hotmail.com> */ |
| 165 | UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x0610, | ||
| 165 | "Nokia", | 166 | "Nokia", |
| 166 | "Nokia 6288", | 167 | "Nokia 6288", |
| 167 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 168 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 7826bdce4bbe..0048f1185a60 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1128,13 +1128,6 @@ config FB_INTEL | |||
| 1128 | 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets. | 1128 | 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets. |
| 1129 | Say Y if you have and plan to use such a board. | 1129 | Say Y if you have and plan to use such a board. |
| 1130 | 1130 | ||
| 1131 | If you say Y here and want DDC/I2C support you must first say Y to | ||
| 1132 | "I2C support" and "I2C bit-banging support" in the character devices | ||
| 1133 | section. | ||
| 1134 | |||
| 1135 | If you say M here then "I2C support" and "I2C bit-banging support" | ||
| 1136 | can be build either as modules or built-in. | ||
| 1137 | |||
| 1138 | To compile this driver as a module, choose M here: the | 1131 | To compile this driver as a module, choose M here: the |
| 1139 | module will be called intelfb. | 1132 | module will be called intelfb. |
| 1140 | 1133 | ||
| @@ -1207,11 +1200,10 @@ config FB_MATROX_G | |||
| 1207 | pixel and 32 bpp packed pixel. You can also use font widths | 1200 | pixel and 32 bpp packed pixel. You can also use font widths |
| 1208 | different from 8. | 1201 | different from 8. |
| 1209 | 1202 | ||
| 1210 | If you need support for G400 secondary head, you must first say Y to | 1203 | If you need support for G400 secondary head, you must say Y to |
| 1211 | "I2C support" in the character devices section, and then to | 1204 | "Matrox I2C support" and "G400 second head support" right below. |
| 1212 | "Matrox I2C support" and "G400 second head support" here in the | 1205 | G450/G550 secondary head and digital output are supported without |
| 1213 | framebuffer section. G450/G550 secondary head and digital output | 1206 | additional modules. |
| 1214 | are supported without additional modules. | ||
| 1215 | 1207 | ||
| 1216 | The driver starts in monitor mode. You must use the matroxset tool | 1208 | The driver starts in monitor mode. You must use the matroxset tool |
| 1217 | (available at <ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/>) to | 1209 | (available at <ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/>) to |
| @@ -1310,13 +1302,6 @@ config FB_RADEON | |||
| 1310 | a framebuffer device. There are both PCI and AGP versions. You | 1302 | a framebuffer device. There are both PCI and AGP versions. You |
| 1311 | don't need to choose this to run the Radeon in plain VGA mode. | 1303 | don't need to choose this to run the Radeon in plain VGA mode. |
| 1312 | 1304 | ||
| 1313 | If you say Y here and want DDC/I2C support you must first say Y to | ||
| 1314 | "I2C support" and "I2C bit-banging support" in the character devices | ||
| 1315 | section. | ||
| 1316 | |||
| 1317 | If you say M here then "I2C support" and "I2C bit-banging support" | ||
| 1318 | can be build either as modules or built-in. | ||
| 1319 | |||
| 1320 | There is a product page at | 1305 | There is a product page at |
| 1321 | http://apps.ati.com/ATIcompare/ | 1306 | http://apps.ati.com/ATIcompare/ |
| 1322 | 1307 | ||
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 0dbd6c68d76b..d8d0be5151e3 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
| @@ -56,7 +56,6 @@ obj-$(CONFIG_FB_CT65550) += chipsfb.o | |||
| 56 | obj-$(CONFIG_FB_IMSTT) += imsttfb.o | 56 | obj-$(CONFIG_FB_IMSTT) += imsttfb.o |
| 57 | obj-$(CONFIG_FB_FM2) += fm2fb.o | 57 | obj-$(CONFIG_FB_FM2) += fm2fb.o |
| 58 | obj-$(CONFIG_FB_VT8623) += vt8623fb.o | 58 | obj-$(CONFIG_FB_VT8623) += vt8623fb.o |
| 59 | obj-$(CONFIG_FB_CYBLA) += cyblafb.o | ||
| 60 | obj-$(CONFIG_FB_TRIDENT) += tridentfb.o | 59 | obj-$(CONFIG_FB_TRIDENT) += tridentfb.o |
| 61 | obj-$(CONFIG_FB_LE80578) += vermilion/ | 60 | obj-$(CONFIG_FB_LE80578) += vermilion/ |
| 62 | obj-$(CONFIG_FB_S3) += s3fb.o | 61 | obj-$(CONFIG_FB_S3) += s3fb.o |
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c index 64b35766b2a2..ba9f58b2a5e8 100644 --- a/drivers/video/cfbfillrect.c +++ b/drivers/video/cfbfillrect.c | |||
| @@ -9,10 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * NOTES: | 10 | * NOTES: |
| 11 | * | 11 | * |
| 12 | * The code for depths like 24 that don't have integer number of pixels per | ||
| 13 | * long is broken and needs to be fixed. For now I turned these types of | ||
| 14 | * mode off. | ||
| 15 | * | ||
| 16 | * Also need to add code to deal with cards endians that are different than | 12 | * Also need to add code to deal with cards endians that are different than |
| 17 | * the native cpu endians. I also need to deal with MSB position in the word. | 13 | * the native cpu endians. I also need to deal with MSB position in the word. |
| 18 | * | 14 | * |
| @@ -139,7 +135,7 @@ bitfill_unaligned(struct fb_info *p, unsigned long __iomem *dst, int dst_idx, | |||
| 139 | 135 | ||
| 140 | // Trailing bits | 136 | // Trailing bits |
| 141 | if (last) | 137 | if (last) |
| 142 | FB_WRITEL(comp(pat, FB_READL(dst), first), dst); | 138 | FB_WRITEL(comp(pat, FB_READL(dst), last), dst); |
| 143 | } | 139 | } |
| 144 | } | 140 | } |
| 145 | 141 | ||
| @@ -281,7 +277,7 @@ bitfill_unaligned_rev(struct fb_info *p, unsigned long __iomem *dst, | |||
| 281 | 277 | ||
| 282 | void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | 278 | void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) |
| 283 | { | 279 | { |
| 284 | unsigned long pat, fg; | 280 | unsigned long pat, pat2, fg; |
| 285 | unsigned long width = rect->width, height = rect->height; | 281 | unsigned long width = rect->width, height = rect->height; |
| 286 | int bits = BITS_PER_LONG, bytes = bits >> 3; | 282 | int bits = BITS_PER_LONG, bytes = bits >> 3; |
| 287 | u32 bpp = p->var.bits_per_pixel; | 283 | u32 bpp = p->var.bits_per_pixel; |
| @@ -297,7 +293,7 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
| 297 | else | 293 | else |
| 298 | fg = rect->color; | 294 | fg = rect->color; |
| 299 | 295 | ||
| 300 | pat = pixel_to_pat( bpp, fg); | 296 | pat = pixel_to_pat(bpp, fg); |
| 301 | 297 | ||
| 302 | dst = (unsigned long __iomem *)((unsigned long)p->screen_base & ~(bytes-1)); | 298 | dst = (unsigned long __iomem *)((unsigned long)p->screen_base & ~(bytes-1)); |
| 303 | dst_idx = ((unsigned long)p->screen_base & (bytes - 1))*8; | 299 | dst_idx = ((unsigned long)p->screen_base & (bytes - 1))*8; |
| @@ -333,17 +329,16 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
| 333 | dst_idx += p->fix.line_length*8; | 329 | dst_idx += p->fix.line_length*8; |
| 334 | } | 330 | } |
| 335 | } else { | 331 | } else { |
| 336 | int right; | 332 | int right, r; |
| 337 | int r; | ||
| 338 | int rot = (left-dst_idx) % bpp; | ||
| 339 | void (*fill_op)(struct fb_info *p, unsigned long __iomem *dst, | 333 | void (*fill_op)(struct fb_info *p, unsigned long __iomem *dst, |
| 340 | int dst_idx, unsigned long pat, int left, | 334 | int dst_idx, unsigned long pat, int left, |
| 341 | int right, unsigned n, int bits) = NULL; | 335 | int right, unsigned n, int bits) = NULL; |
| 342 | 336 | #ifdef __LITTLE_ENDIAN | |
| 343 | /* rotate pattern to correct start position */ | 337 | right = left; |
| 344 | pat = pat << rot | pat >> (bpp-rot); | 338 | left = bpp - right; |
| 345 | 339 | #else | |
| 346 | right = bpp-left; | 340 | right = bpp - left; |
| 341 | #endif | ||
| 347 | switch (rect->rop) { | 342 | switch (rect->rop) { |
| 348 | case ROP_XOR: | 343 | case ROP_XOR: |
| 349 | fill_op = bitfill_unaligned_rev; | 344 | fill_op = bitfill_unaligned_rev; |
| @@ -352,17 +347,18 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
| 352 | fill_op = bitfill_unaligned; | 347 | fill_op = bitfill_unaligned; |
| 353 | break; | 348 | break; |
| 354 | default: | 349 | default: |
| 355 | printk( KERN_ERR "cfb_fillrect(): unknown rop, defaulting to ROP_COPY\n"); | 350 | printk(KERN_ERR "cfb_fillrect(): unknown rop, defaulting to ROP_COPY\n"); |
| 356 | fill_op = bitfill_unaligned; | 351 | fill_op = bitfill_unaligned; |
| 357 | break; | 352 | break; |
| 358 | } | 353 | } |
| 359 | while (height--) { | 354 | while (height--) { |
| 360 | dst += dst_idx >> (ffs(bits) - 1); | 355 | dst += dst_idx / bits; |
| 361 | dst_idx &= (bits - 1); | 356 | dst_idx &= (bits - 1); |
| 362 | fill_op(p, dst, dst_idx, pat, left, right, | 357 | r = dst_idx % bpp; |
| 358 | /* rotate pattern to the correct start position */ | ||
| 359 | pat2 = le_long_to_cpu(rolx(cpu_to_le_long(pat), r, bpp)); | ||
| 360 | fill_op(p, dst, dst_idx, pat2, left, right, | ||
| 363 | width*bpp, bits); | 361 | width*bpp, bits); |
| 364 | r = (p->fix.line_length*8) % bpp; | ||
| 365 | pat = pat << (bpp-r) | pat >> r; | ||
| 366 | dst_idx += p->fix.line_length*8; | 362 | dst_idx += p->fix.line_length*8; |
| 367 | } | 363 | } |
| 368 | } | 364 | } |
diff --git a/drivers/video/fb_draw.h b/drivers/video/fb_draw.h index 1db622192bde..04c01faaf772 100644 --- a/drivers/video/fb_draw.h +++ b/drivers/video/fb_draw.h | |||
| @@ -33,11 +33,11 @@ pixel_to_pat( u32 bpp, u32 pixel) | |||
| 33 | case 8: | 33 | case 8: |
| 34 | return 0x0101010101010101ul*pixel; | 34 | return 0x0101010101010101ul*pixel; |
| 35 | case 12: | 35 | case 12: |
| 36 | return 0x0001001001001001ul*pixel; | 36 | return 0x1001001001001001ul*pixel; |
| 37 | case 16: | 37 | case 16: |
| 38 | return 0x0001000100010001ul*pixel; | 38 | return 0x0001000100010001ul*pixel; |
| 39 | case 24: | 39 | case 24: |
| 40 | return 0x0000000001000001ul*pixel; | 40 | return 0x0001000001000001ul*pixel; |
| 41 | case 32: | 41 | case 32: |
| 42 | return 0x0000000100000001ul*pixel; | 42 | return 0x0000000100000001ul*pixel; |
| 43 | default: | 43 | default: |
| @@ -58,11 +58,11 @@ pixel_to_pat( u32 bpp, u32 pixel) | |||
| 58 | case 8: | 58 | case 8: |
| 59 | return 0x01010101ul*pixel; | 59 | return 0x01010101ul*pixel; |
| 60 | case 12: | 60 | case 12: |
| 61 | return 0x00001001ul*pixel; | 61 | return 0x01001001ul*pixel; |
| 62 | case 16: | 62 | case 16: |
| 63 | return 0x00010001ul*pixel; | 63 | return 0x00010001ul*pixel; |
| 64 | case 24: | 64 | case 24: |
| 65 | return 0x00000001ul*pixel; | 65 | return 0x01000001ul*pixel; |
| 66 | case 32: | 66 | case 32: |
| 67 | return 0x00000001ul*pixel; | 67 | return 0x00000001ul*pixel; |
| 68 | default: | 68 | default: |
| @@ -167,4 +167,17 @@ static inline unsigned long fb_rev_pixels_in_long(unsigned long val, | |||
| 167 | 167 | ||
| 168 | #endif /* CONFIG_FB_CFB_REV_PIXELS_IN_BYTE */ | 168 | #endif /* CONFIG_FB_CFB_REV_PIXELS_IN_BYTE */ |
| 169 | 169 | ||
| 170 | #define cpu_to_le_long _cpu_to_le_long(BITS_PER_LONG) | ||
| 171 | #define _cpu_to_le_long(x) __cpu_to_le_long(x) | ||
| 172 | #define __cpu_to_le_long(x) cpu_to_le##x | ||
| 173 | |||
| 174 | #define le_long_to_cpu _le_long_to_cpu(BITS_PER_LONG) | ||
| 175 | #define _le_long_to_cpu(x) __le_long_to_cpu(x) | ||
| 176 | #define __le_long_to_cpu(x) le##x##_to_cpu | ||
| 177 | |||
| 178 | static inline unsigned long rolx(unsigned long word, unsigned int shift, unsigned int x) | ||
| 179 | { | ||
| 180 | return (word << shift) | (word >> (x - shift)); | ||
| 181 | } | ||
| 182 | |||
| 170 | #endif /* FB_DRAW_H */ | 183 | #endif /* FB_DRAW_H */ |
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 21b3692092f2..9894de1c9b9f 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c | |||
| @@ -1152,11 +1152,11 @@ static struct fb_ops mx3fb_ops = { | |||
| 1152 | */ | 1152 | */ |
| 1153 | static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) | 1153 | static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) |
| 1154 | { | 1154 | { |
| 1155 | struct mx3fb_data *drv_data = platform_get_drvdata(pdev); | 1155 | struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); |
| 1156 | struct mx3fb_info *mx3_fbi = drv_data->fbi->par; | 1156 | struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; |
| 1157 | 1157 | ||
| 1158 | acquire_console_sem(); | 1158 | acquire_console_sem(); |
| 1159 | fb_set_suspend(drv_data->fbi, 1); | 1159 | fb_set_suspend(mx3fb->fbi, 1); |
| 1160 | release_console_sem(); | 1160 | release_console_sem(); |
| 1161 | 1161 | ||
| 1162 | if (mx3_fbi->blank == FB_BLANK_UNBLANK) { | 1162 | if (mx3_fbi->blank == FB_BLANK_UNBLANK) { |
| @@ -1172,16 +1172,16 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) | |||
| 1172 | */ | 1172 | */ |
| 1173 | static int mx3fb_resume(struct platform_device *pdev) | 1173 | static int mx3fb_resume(struct platform_device *pdev) |
| 1174 | { | 1174 | { |
| 1175 | struct mx3fb_data *drv_data = platform_get_drvdata(pdev); | 1175 | struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); |
| 1176 | struct mx3fb_info *mx3_fbi = drv_data->fbi->par; | 1176 | struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; |
| 1177 | 1177 | ||
| 1178 | if (mx3_fbi->blank == FB_BLANK_UNBLANK) { | 1178 | if (mx3_fbi->blank == FB_BLANK_UNBLANK) { |
| 1179 | sdc_enable_channel(mx3_fbi); | 1179 | sdc_enable_channel(mx3_fbi); |
| 1180 | sdc_set_brightness(mx3fb, drv_data->backlight_level); | 1180 | sdc_set_brightness(mx3fb, mx3fb->backlight_level); |
| 1181 | } | 1181 | } |
| 1182 | 1182 | ||
| 1183 | acquire_console_sem(); | 1183 | acquire_console_sem(); |
| 1184 | fb_set_suspend(drv_data->fbi, 0); | 1184 | fb_set_suspend(mx3fb->fbi, 0); |
| 1185 | release_console_sem(); | 1185 | release_console_sem(); |
| 1186 | 1186 | ||
| 1187 | return 0; | 1187 | return 0; |
diff --git a/drivers/video/sysfillrect.c b/drivers/video/sysfillrect.c index f94d6b6e29ee..33ee3d34f9d2 100644 --- a/drivers/video/sysfillrect.c +++ b/drivers/video/sysfillrect.c | |||
| @@ -124,7 +124,7 @@ bitfill_unaligned(struct fb_info *p, unsigned long *dst, int dst_idx, | |||
| 124 | 124 | ||
| 125 | /* Trailing bits */ | 125 | /* Trailing bits */ |
| 126 | if (last) | 126 | if (last) |
| 127 | *dst = comp(pat, *dst, first); | 127 | *dst = comp(pat, *dst, last); |
| 128 | } | 128 | } |
| 129 | } | 129 | } |
| 130 | 130 | ||
| @@ -242,7 +242,7 @@ bitfill_unaligned_rev(struct fb_info *p, unsigned long *dst, int dst_idx, | |||
| 242 | 242 | ||
| 243 | void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | 243 | void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect) |
| 244 | { | 244 | { |
| 245 | unsigned long pat, fg; | 245 | unsigned long pat, pat2, fg; |
| 246 | unsigned long width = rect->width, height = rect->height; | 246 | unsigned long width = rect->width, height = rect->height; |
| 247 | int bits = BITS_PER_LONG, bytes = bits >> 3; | 247 | int bits = BITS_PER_LONG, bytes = bits >> 3; |
| 248 | u32 bpp = p->var.bits_per_pixel; | 248 | u32 bpp = p->var.bits_per_pixel; |
| @@ -292,17 +292,16 @@ void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
| 292 | dst_idx += p->fix.line_length*8; | 292 | dst_idx += p->fix.line_length*8; |
| 293 | } | 293 | } |
| 294 | } else { | 294 | } else { |
| 295 | int right; | 295 | int right, r; |
| 296 | int r; | ||
| 297 | int rot = (left-dst_idx) % bpp; | ||
| 298 | void (*fill_op)(struct fb_info *p, unsigned long *dst, | 296 | void (*fill_op)(struct fb_info *p, unsigned long *dst, |
| 299 | int dst_idx, unsigned long pat, int left, | 297 | int dst_idx, unsigned long pat, int left, |
| 300 | int right, unsigned n, int bits) = NULL; | 298 | int right, unsigned n, int bits) = NULL; |
| 301 | 299 | #ifdef __LITTLE_ENDIAN | |
| 302 | /* rotate pattern to correct start position */ | 300 | right = left; |
| 303 | pat = pat << rot | pat >> (bpp-rot); | 301 | left = bpp - right; |
| 304 | 302 | #else | |
| 305 | right = bpp-left; | 303 | right = bpp - left; |
| 304 | #endif | ||
| 306 | switch (rect->rop) { | 305 | switch (rect->rop) { |
| 307 | case ROP_XOR: | 306 | case ROP_XOR: |
| 308 | fill_op = bitfill_unaligned_rev; | 307 | fill_op = bitfill_unaligned_rev; |
| @@ -311,18 +310,19 @@ void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
| 311 | fill_op = bitfill_unaligned; | 310 | fill_op = bitfill_unaligned; |
| 312 | break; | 311 | break; |
| 313 | default: | 312 | default: |
| 314 | printk(KERN_ERR "cfb_fillrect(): unknown rop, " | 313 | printk(KERN_ERR "sys_fillrect(): unknown rop, " |
| 315 | "defaulting to ROP_COPY\n"); | 314 | "defaulting to ROP_COPY\n"); |
| 316 | fill_op = bitfill_unaligned; | 315 | fill_op = bitfill_unaligned; |
| 317 | break; | 316 | break; |
| 318 | } | 317 | } |
| 319 | while (height--) { | 318 | while (height--) { |
| 320 | dst += dst_idx >> (ffs(bits) - 1); | 319 | dst += dst_idx / bits; |
| 321 | dst_idx &= (bits - 1); | 320 | dst_idx &= (bits - 1); |
| 322 | fill_op(p, dst, dst_idx, pat, left, right, | 321 | r = dst_idx % bpp; |
| 322 | /* rotate pattern to the correct start position */ | ||
| 323 | pat2 = le_long_to_cpu(rolx(cpu_to_le_long(pat), r, bpp)); | ||
| 324 | fill_op(p, dst, dst_idx, pat2, left, right, | ||
| 323 | width*bpp, bits); | 325 | width*bpp, bits); |
| 324 | r = (p->fix.line_length*8) % bpp; | ||
| 325 | pat = pat << (bpp-r) | pat >> r; | ||
| 326 | dst_idx += p->fix.line_length*8; | 326 | dst_idx += p->fix.line_length*8; |
| 327 | } | 327 | } |
| 328 | } | 328 | } |
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index e327b84820d2..a0fec298216e 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c | |||
| @@ -2103,7 +2103,7 @@ static void viafb_remove_proc(struct proc_dir_entry *viafb_entry) | |||
| 2103 | 2103 | ||
| 2104 | static int __devinit via_pci_probe(void) | 2104 | static int __devinit via_pci_probe(void) |
| 2105 | { | 2105 | { |
| 2106 | unsigned int default_xres, default_yres; | 2106 | unsigned long default_xres, default_yres; |
| 2107 | char *tmpc, *tmpm; | 2107 | char *tmpc, *tmpm; |
| 2108 | char *tmpc_sec, *tmpm_sec; | 2108 | char *tmpc_sec, *tmpm_sec; |
| 2109 | int vmode_index; | 2109 | int vmode_index; |
| @@ -2196,8 +2196,8 @@ static int __devinit via_pci_probe(void) | |||
| 2196 | viafb_FB_MM = viaparinfo->fbmem_virt; | 2196 | viafb_FB_MM = viaparinfo->fbmem_virt; |
| 2197 | tmpm = viafb_mode; | 2197 | tmpm = viafb_mode; |
| 2198 | tmpc = strsep(&tmpm, "x"); | 2198 | tmpc = strsep(&tmpm, "x"); |
| 2199 | strict_strtoul(tmpc, 0, (unsigned long *)&default_xres); | 2199 | strict_strtoul(tmpc, 0, &default_xres); |
| 2200 | strict_strtoul(tmpm, 0, (unsigned long *)&default_yres); | 2200 | strict_strtoul(tmpm, 0, &default_yres); |
| 2201 | 2201 | ||
| 2202 | vmode_index = viafb_get_mode_index(default_xres, default_yres, 0); | 2202 | vmode_index = viafb_get_mode_index(default_xres, default_yres, 0); |
| 2203 | DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index); | 2203 | DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index); |
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index efa4b363ce72..f5bbd9e83416 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
| @@ -513,7 +513,8 @@ static ssize_t show_target(struct sys_device *dev, struct sysdev_attribute *attr | |||
| 513 | char *buf) | 513 | char *buf) |
| 514 | { | 514 | { |
| 515 | return sprintf(buf, "%llu\n", | 515 | return sprintf(buf, "%llu\n", |
| 516 | (u64)balloon_stats.target_pages << PAGE_SHIFT); | 516 | (unsigned long long)balloon_stats.target_pages |
| 517 | << PAGE_SHIFT); | ||
| 517 | } | 518 | } |
| 518 | 519 | ||
| 519 | static ssize_t store_target(struct sys_device *dev, | 520 | static ssize_t store_target(struct sys_device *dev, |
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index 5f8ab8adb5f5..ab5547ff29a1 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/mount.h> | 37 | #include <linux/mount.h> |
| 38 | #include <linux/idr.h> | 38 | #include <linux/idr.h> |
| 39 | #include <linux/sched.h> | 39 | #include <linux/sched.h> |
| 40 | #include <linux/smp_lock.h> | ||
| 40 | #include <net/9p/9p.h> | 41 | #include <net/9p/9p.h> |
| 41 | #include <net/9p/client.h> | 42 | #include <net/9p/client.h> |
| 42 | 43 | ||
| @@ -155,6 +156,7 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags, | |||
| 155 | 156 | ||
| 156 | root = d_alloc_root(inode); | 157 | root = d_alloc_root(inode); |
| 157 | if (!root) { | 158 | if (!root) { |
| 159 | iput(inode); | ||
| 158 | retval = -ENOMEM; | 160 | retval = -ENOMEM; |
| 159 | goto release_sb; | 161 | goto release_sb; |
| 160 | } | 162 | } |
| @@ -173,10 +175,7 @@ P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n"); | |||
| 173 | return 0; | 175 | return 0; |
| 174 | 176 | ||
| 175 | release_sb: | 177 | release_sb: |
| 176 | if (sb) { | 178 | deactivate_locked_super(sb); |
| 177 | up_write(&sb->s_umount); | ||
| 178 | deactivate_super(sb); | ||
| 179 | } | ||
| 180 | 179 | ||
| 181 | free_stat: | 180 | free_stat: |
| 182 | kfree(st); | 181 | kfree(st); |
| @@ -230,9 +229,12 @@ static int v9fs_show_options(struct seq_file *m, struct vfsmount *mnt) | |||
| 230 | static void | 229 | static void |
| 231 | v9fs_umount_begin(struct super_block *sb) | 230 | v9fs_umount_begin(struct super_block *sb) |
| 232 | { | 231 | { |
| 233 | struct v9fs_session_info *v9ses = sb->s_fs_info; | 232 | struct v9fs_session_info *v9ses; |
| 234 | 233 | ||
| 234 | lock_kernel(); | ||
| 235 | v9ses = sb->s_fs_info; | ||
| 235 | v9fs_session_cancel(v9ses); | 236 | v9fs_session_cancel(v9ses); |
| 237 | unlock_kernel(); | ||
| 236 | } | 238 | } |
| 237 | 239 | ||
| 238 | static const struct super_operations v9fs_super_ops = { | 240 | static const struct super_operations v9fs_super_ops = { |
diff --git a/fs/affs/super.c b/fs/affs/super.c index 5ce695e707fe..63f5183f263b 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c | |||
| @@ -507,8 +507,7 @@ affs_remount(struct super_block *sb, int *flags, char *data) | |||
| 507 | kfree(new_opts); | 507 | kfree(new_opts); |
| 508 | return -EINVAL; | 508 | return -EINVAL; |
| 509 | } | 509 | } |
| 510 | kfree(sb->s_options); | 510 | replace_mount_options(sb, new_opts); |
| 511 | sb->s_options = new_opts; | ||
| 512 | 511 | ||
| 513 | sbi->s_flags = mount_flags; | 512 | sbi->s_flags = mount_flags; |
| 514 | sbi->s_mode = mode; | 513 | sbi->s_mode = mode; |
diff --git a/fs/afs/super.c b/fs/afs/super.c index aee239a048cb..76828e5f8a39 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
| @@ -405,21 +405,20 @@ static int afs_get_sb(struct file_system_type *fs_type, | |||
| 405 | sb->s_flags = flags; | 405 | sb->s_flags = flags; |
| 406 | ret = afs_fill_super(sb, ¶ms); | 406 | ret = afs_fill_super(sb, ¶ms); |
| 407 | if (ret < 0) { | 407 | if (ret < 0) { |
| 408 | up_write(&sb->s_umount); | 408 | deactivate_locked_super(sb); |
| 409 | deactivate_super(sb); | ||
| 410 | goto error; | 409 | goto error; |
| 411 | } | 410 | } |
| 412 | sb->s_options = new_opts; | 411 | save_mount_options(sb, new_opts); |
| 413 | sb->s_flags |= MS_ACTIVE; | 412 | sb->s_flags |= MS_ACTIVE; |
| 414 | } else { | 413 | } else { |
| 415 | _debug("reuse"); | 414 | _debug("reuse"); |
| 416 | kfree(new_opts); | ||
| 417 | ASSERTCMP(sb->s_flags, &, MS_ACTIVE); | 415 | ASSERTCMP(sb->s_flags, &, MS_ACTIVE); |
| 418 | } | 416 | } |
| 419 | 417 | ||
| 420 | simple_set_mnt(mnt, sb); | 418 | simple_set_mnt(mnt, sb); |
| 421 | afs_put_volume(params.volume); | 419 | afs_put_volume(params.volume); |
| 422 | afs_put_cell(params.cell); | 420 | afs_put_cell(params.cell); |
| 421 | kfree(new_opts); | ||
| 423 | _leave(" = 0 [%p]", sb); | 422 | _leave(" = 0 [%p]", sb); |
| 424 | return 0; | 423 | return 0; |
| 425 | 424 | ||
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 3536bdb2d7cb..6dfae5b28f59 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
| @@ -502,8 +502,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, | |||
| 502 | 502 | ||
| 503 | if (s->s_root) { | 503 | if (s->s_root) { |
| 504 | if ((flags ^ s->s_flags) & MS_RDONLY) { | 504 | if ((flags ^ s->s_flags) & MS_RDONLY) { |
| 505 | up_write(&s->s_umount); | 505 | deactivate_locked_super(s); |
| 506 | deactivate_super(s); | ||
| 507 | error = -EBUSY; | 506 | error = -EBUSY; |
| 508 | goto error_close_devices; | 507 | goto error_close_devices; |
| 509 | } | 508 | } |
| @@ -517,8 +516,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, | |||
| 517 | error = btrfs_fill_super(s, fs_devices, data, | 516 | error = btrfs_fill_super(s, fs_devices, data, |
| 518 | flags & MS_SILENT ? 1 : 0); | 517 | flags & MS_SILENT ? 1 : 0); |
| 519 | if (error) { | 518 | if (error) { |
| 520 | up_write(&s->s_umount); | 519 | deactivate_locked_super(s); |
| 521 | deactivate_super(s); | ||
| 522 | goto error_free_subvol_name; | 520 | goto error_free_subvol_name; |
| 523 | } | 521 | } |
| 524 | 522 | ||
| @@ -535,15 +533,13 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, | |||
| 535 | mutex_unlock(&s->s_root->d_inode->i_mutex); | 533 | mutex_unlock(&s->s_root->d_inode->i_mutex); |
| 536 | 534 | ||
| 537 | if (IS_ERR(root)) { | 535 | if (IS_ERR(root)) { |
| 538 | up_write(&s->s_umount); | 536 | deactivate_locked_super(s); |
| 539 | deactivate_super(s); | ||
| 540 | error = PTR_ERR(root); | 537 | error = PTR_ERR(root); |
| 541 | goto error_free_subvol_name; | 538 | goto error_free_subvol_name; |
| 542 | } | 539 | } |
| 543 | if (!root->d_inode) { | 540 | if (!root->d_inode) { |
| 544 | dput(root); | 541 | dput(root); |
| 545 | up_write(&s->s_umount); | 542 | deactivate_locked_super(s); |
| 546 | deactivate_super(s); | ||
| 547 | error = -ENXIO; | 543 | error = -ENXIO; |
| 548 | goto error_free_subvol_name; | 544 | goto error_free_subvol_name; |
| 549 | } | 545 | } |
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index 9d1fb6ec8a5a..f20c4069c220 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | Version 1.58 | ||
| 2 | ------------ | ||
| 3 | Guard against buffer overruns in various UCS-2 to UTF-8 string conversions | ||
| 4 | when the UTF-8 string is composed of unusually long (more than 4 byte) converted | ||
| 5 | characters. Add support for mounting root of a share which redirects immediately | ||
| 6 | to DFS target. Convert string conversion functions from Unicode to more | ||
| 7 | accurately mark string length before allocating memory (which may help the | ||
| 8 | rare cases where a UTF-8 string is much larger than the UCS2 string that | ||
| 9 | we converted from). Fix endianness of the vcnum field used during | ||
| 10 | session setup to distinguish multiple mounts to same server from different | ||
| 11 | userids. Raw NTLMSSP fixed (it requires /proc/fs/cifs/experimental | ||
| 12 | flag to be set to 2, and mount must enable krb5 to turn on extended security). | ||
| 13 | |||
| 1 | Version 1.57 | 14 | Version 1.57 |
| 2 | ------------ | 15 | ------------ |
| 3 | Improve support for multiple security contexts to the same server. We | 16 | Improve support for multiple security contexts to the same server. We |
diff --git a/fs/cifs/README b/fs/cifs/README index 07434181623b..db208ddb9899 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
| @@ -651,7 +651,15 @@ Experimental When set to 1 used to enable certain experimental | |||
| 651 | signing turned on in case buffer was modified | 651 | signing turned on in case buffer was modified |
| 652 | just before it was sent, also this flag will | 652 | just before it was sent, also this flag will |
| 653 | be used to use the new experimental directory change | 653 | be used to use the new experimental directory change |
| 654 | notification code). | 654 | notification code). When set to 2 enables |
| 655 | an additional experimental feature, "raw ntlmssp" | ||
| 656 | session establishment support (which allows | ||
| 657 | specifying "sec=ntlmssp" on mount). The Linux cifs | ||
| 658 | module will use ntlmv2 authentication encapsulated | ||
| 659 | in "raw ntlmssp" (not using SPNEGO) when | ||
| 660 | "sec=ntlmssp" is specified on mount. | ||
| 661 | This support also requires building cifs with | ||
| 662 | the CONFIG_CIFS_EXPERIMENTAL configuration flag. | ||
| 655 | 663 | ||
| 656 | These experimental features and tracing can be enabled by changing flags in | 664 | These experimental features and tracing can be enabled by changing flags in |
| 657 | /proc/fs/cifs (after the cifs module has been installed or built into the | 665 | /proc/fs/cifs (after the cifs module has been installed or built into the |
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 5fdbf8a14472..83d62759c7c7 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
| @@ -340,28 +340,24 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) | |||
| 340 | cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); | 340 | cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); |
| 341 | 341 | ||
| 342 | for (i = 0; i < num_referrals; i++) { | 342 | for (i = 0; i < num_referrals; i++) { |
| 343 | int len; | ||
| 343 | dump_referral(referrals+i); | 344 | dump_referral(referrals+i); |
| 344 | /* connect to a storage node */ | 345 | /* connect to a node */ |
| 345 | if (referrals[i].flags & DFSREF_STORAGE_SERVER) { | 346 | len = strlen(referrals[i].node_name); |
| 346 | int len; | 347 | if (len < 2) { |
| 347 | len = strlen(referrals[i].node_name); | 348 | cERROR(1, ("%s: Net Address path too short: %s", |
| 348 | if (len < 2) { | ||
| 349 | cERROR(1, ("%s: Net Address path too short: %s", | ||
| 350 | __func__, referrals[i].node_name)); | 349 | __func__, referrals[i].node_name)); |
| 351 | rc = -EINVAL; | 350 | rc = -EINVAL; |
| 352 | goto out_err; | 351 | goto out_err; |
| 353 | } | 352 | } |
| 354 | mnt = cifs_dfs_do_refmount(nd->path.mnt, | 353 | mnt = cifs_dfs_do_refmount(nd->path.mnt, |
| 355 | nd->path.dentry, | 354 | nd->path.dentry, referrals + i); |
| 356 | referrals + i); | 355 | cFYI(1, ("%s: cifs_dfs_do_refmount:%s , mnt:%p", __func__, |
| 357 | cFYI(1, ("%s: cifs_dfs_do_refmount:%s , mnt:%p", | ||
| 358 | __func__, | ||
| 359 | referrals[i].node_name, mnt)); | 356 | referrals[i].node_name, mnt)); |
| 360 | 357 | ||
| 361 | /* complete mount procedure if we accured submount */ | 358 | /* complete mount procedure if we accured submount */ |
| 362 | if (!IS_ERR(mnt)) | 359 | if (!IS_ERR(mnt)) |
| 363 | break; | 360 | break; |
| 364 | } | ||
| 365 | } | 361 | } |
| 366 | 362 | ||
| 367 | /* we need it cause for() above could exit without valid submount */ | 363 | /* we need it cause for() above could exit without valid submount */ |
diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c index 7d75272a6b3f..60e3c4253de0 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * fs/cifs/cifs_unicode.c | 2 | * fs/cifs/cifs_unicode.c |
| 3 | * | 3 | * |
| 4 | * Copyright (c) International Business Machines Corp., 2000,2005 | 4 | * Copyright (c) International Business Machines Corp., 2000,2009 |
| 5 | * Modified by Steve French (sfrench@us.ibm.com) | 5 | * Modified by Steve French (sfrench@us.ibm.com) |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -26,31 +26,157 @@ | |||
| 26 | #include "cifs_debug.h" | 26 | #include "cifs_debug.h" |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * NAME: cifs_strfromUCS() | 29 | * cifs_ucs2_bytes - how long will a string be after conversion? |
| 30 | * | 30 | * @ucs - pointer to input string |
| 31 | * FUNCTION: Convert little-endian unicode string to character string | 31 | * @maxbytes - don't go past this many bytes of input string |
| 32 | * @codepage - destination codepage | ||
| 32 | * | 33 | * |
| 34 | * Walk a ucs2le string and return the number of bytes that the string will | ||
| 35 | * be after being converted to the given charset, not including any null | ||
| 36 | * termination required. Don't walk past maxbytes in the source buffer. | ||
| 33 | */ | 37 | */ |
| 34 | int | 38 | int |
| 35 | cifs_strfromUCS_le(char *to, const __le16 *from, | 39 | cifs_ucs2_bytes(const __le16 *from, int maxbytes, |
| 36 | int len, const struct nls_table *codepage) | 40 | const struct nls_table *codepage) |
| 37 | { | 41 | { |
| 38 | int i; | 42 | int i; |
| 39 | int outlen = 0; | 43 | int charlen, outlen = 0; |
| 44 | int maxwords = maxbytes / 2; | ||
| 45 | char tmp[NLS_MAX_CHARSET_SIZE]; | ||
| 40 | 46 | ||
| 41 | for (i = 0; (i < len) && from[i]; i++) { | 47 | for (i = 0; from[i] && i < maxwords; i++) { |
| 42 | int charlen; | 48 | charlen = codepage->uni2char(le16_to_cpu(from[i]), tmp, |
| 43 | /* 2.4.0 kernel or greater */ | 49 | NLS_MAX_CHARSET_SIZE); |
| 44 | charlen = | 50 | if (charlen > 0) |
| 45 | codepage->uni2char(le16_to_cpu(from[i]), &to[outlen], | ||
| 46 | NLS_MAX_CHARSET_SIZE); | ||
| 47 | if (charlen > 0) { | ||
| 48 | outlen += charlen; | 51 | outlen += charlen; |
| 49 | } else { | 52 | else |
| 50 | to[outlen++] = '?'; | 53 | outlen++; |
| 54 | } | ||
| 55 | |||
| 56 | return outlen; | ||
| 57 | } | ||
| 58 | |||
| 59 | /* | ||
| 60 | * cifs_mapchar - convert a little-endian char to proper char in codepage | ||
| 61 | * @target - where converted character should be copied | ||
| 62 | * @src_char - 2 byte little-endian source character | ||
| 63 | * @cp - codepage to which character should be converted | ||
| 64 | * @mapchar - should character be mapped according to mapchars mount option? | ||
| 65 | * | ||
| 66 | * This function handles the conversion of a single character. It is the | ||
| 67 | * responsibility of the caller to ensure that the target buffer is large | ||
| 68 | * enough to hold the result of the conversion (at least NLS_MAX_CHARSET_SIZE). | ||
| 69 | */ | ||
| 70 | static int | ||
| 71 | cifs_mapchar(char *target, const __le16 src_char, const struct nls_table *cp, | ||
| 72 | bool mapchar) | ||
| 73 | { | ||
| 74 | int len = 1; | ||
| 75 | |||
| 76 | if (!mapchar) | ||
| 77 | goto cp_convert; | ||
| 78 | |||
| 79 | /* | ||
| 80 | * BB: Cannot handle remapping UNI_SLASH until all the calls to | ||
| 81 | * build_path_from_dentry are modified, as they use slash as | ||
| 82 | * separator. | ||
| 83 | */ | ||
| 84 | switch (le16_to_cpu(src_char)) { | ||
| 85 | case UNI_COLON: | ||
| 86 | *target = ':'; | ||
| 87 | break; | ||
| 88 | case UNI_ASTERIK: | ||
| 89 | *target = '*'; | ||
| 90 | break; | ||
| 91 | case UNI_QUESTION: | ||
| 92 | *target = '?'; | ||
| 93 | break; | ||
| 94 | case UNI_PIPE: | ||
| 95 | *target = '|'; | ||
| 96 | break; | ||
| 97 | case UNI_GRTRTHAN: | ||
| 98 | *target = '>'; | ||
| 99 | break; | ||
| 100 | case UNI_LESSTHAN: | ||
| 101 | *target = '<'; | ||
| 102 | break; | ||
| 103 | default: | ||
| 104 | goto cp_convert; | ||
| 105 | } | ||
| 106 | |||
| 107 | out: | ||
| 108 | return len; | ||
| 109 | |||
| 110 | cp_convert: | ||
| 111 | len = cp->uni2char(le16_to_cpu(src_char), target, | ||
| 112 | NLS_MAX_CHARSET_SIZE); | ||
| 113 | if (len <= 0) { | ||
| 114 | *target = '?'; | ||
| 115 | len = 1; | ||
| 116 | } | ||
| 117 | goto out; | ||
| 118 | } | ||
| 119 | |||
| 120 | /* | ||
| 121 | * cifs_from_ucs2 - convert utf16le string to local charset | ||
| 122 | * @to - destination buffer | ||
| 123 | * @from - source buffer | ||
| 124 | * @tolen - destination buffer size (in bytes) | ||
| 125 | * @fromlen - source buffer size (in bytes) | ||
| 126 | * @codepage - codepage to which characters should be converted | ||
| 127 | * @mapchar - should characters be remapped according to the mapchars option? | ||
| 128 | * | ||
| 129 | * Convert a little-endian ucs2le string (as sent by the server) to a string | ||
| 130 | * in the provided codepage. The tolen and fromlen parameters are to ensure | ||
| 131 | * that the code doesn't walk off of the end of the buffer (which is always | ||
| 132 | * a danger if the alignment of the source buffer is off). The destination | ||
| 133 | * string is always properly null terminated and fits in the destination | ||
| 134 | * buffer. Returns the length of the destination string in bytes (including | ||
| 135 | * null terminator). | ||
| 136 | * | ||
| 137 | * Note that some windows versions actually send multiword UTF-16 characters | ||
| 138 | * instead of straight UCS-2. The linux nls routines however aren't able to | ||
| 139 | * deal with those characters properly. In the event that we get some of | ||
| 140 | * those characters, they won't be translated properly. | ||
| 141 | */ | ||
| 142 | int | ||
| 143 | cifs_from_ucs2(char *to, const __le16 *from, int tolen, int fromlen, | ||
| 144 | const struct nls_table *codepage, bool mapchar) | ||
| 145 | { | ||
| 146 | int i, charlen, safelen; | ||
| 147 | int outlen = 0; | ||
| 148 | int nullsize = nls_nullsize(codepage); | ||
| 149 | int fromwords = fromlen / 2; | ||
| 150 | char tmp[NLS_MAX_CHARSET_SIZE]; | ||
| 151 | |||
| 152 | /* | ||
| 153 | * because the chars can be of varying widths, we need to take care | ||
| 154 | * not to overflow the destination buffer when we get close to the | ||
| 155 | * end of it. Until we get to this offset, we don't need to check | ||
| 156 | * for overflow however. | ||
| 157 | */ | ||
| 158 | safelen = tolen - (NLS_MAX_CHARSET_SIZE + nullsize); | ||
| 159 | |||
| 160 | for (i = 0; i < fromwords && from[i]; i++) { | ||
| 161 | /* | ||
| 162 | * check to see if converting this character might make the | ||
| 163 | * conversion bleed into the null terminator | ||
| 164 | */ | ||
| 165 | if (outlen >= safelen) { | ||
| 166 | charlen = cifs_mapchar(tmp, from[i], codepage, mapchar); | ||
| 167 | if ((outlen + charlen) > (tolen - nullsize)) | ||
| 168 | break; | ||
| 51 | } | 169 | } |
| 170 | |||
| 171 | /* put converted char into 'to' buffer */ | ||
| 172 | charlen = cifs_mapchar(&to[outlen], from[i], codepage, mapchar); | ||
| 173 | outlen += charlen; | ||
| 52 | } | 174 | } |
| 53 | to[outlen] = 0; | 175 | |
| 176 | /* properly null-terminate string */ | ||
| 177 | for (i = 0; i < nullsize; i++) | ||
| 178 | to[outlen++] = 0; | ||
| 179 | |||
| 54 | return outlen; | 180 | return outlen; |
| 55 | } | 181 | } |
| 56 | 182 | ||
| @@ -88,3 +214,41 @@ cifs_strtoUCS(__le16 *to, const char *from, int len, | |||
| 88 | return i; | 214 | return i; |
| 89 | } | 215 | } |
| 90 | 216 | ||
| 217 | /* | ||
| 218 | * cifs_strndup_from_ucs - copy a string from wire format to the local codepage | ||
| 219 | * @src - source string | ||
| 220 | * @maxlen - don't walk past this many bytes in the source string | ||
| 221 | * @is_unicode - is this a unicode string? | ||
| 222 | * @codepage - destination codepage | ||
| 223 | * | ||
| 224 | * Take a string given by the server, convert it to the local codepage and | ||
| 225 | * put it in a new buffer. Returns a pointer to the new string or NULL on | ||
| 226 | * error. | ||
| 227 | */ | ||
| 228 | char * | ||
| 229 | cifs_strndup_from_ucs(const char *src, const int maxlen, const bool is_unicode, | ||
| 230 | const struct nls_table *codepage) | ||
| 231 | { | ||
| 232 | int len; | ||
| 233 | char *dst; | ||
| 234 | |||
| 235 | if (is_unicode) { | ||
| 236 | len = cifs_ucs2_bytes((__le16 *) src, maxlen, codepage); | ||
| 237 | len += nls_nullsize(codepage); | ||
| 238 | dst = kmalloc(len, GFP_KERNEL); | ||
| 239 | if (!dst) | ||
| 240 | return NULL; | ||
| 241 | cifs_from_ucs2(dst, (__le16 *) src, len, maxlen, codepage, | ||
| 242 | false); | ||
| 243 | } else { | ||
| 244 | len = strnlen(src, maxlen); | ||
| 245 | len++; | ||
| 246 | dst = kmalloc(len, GFP_KERNEL); | ||
| 247 | if (!dst) | ||
| 248 | return NULL; | ||
| 249 | strlcpy(dst, src, len); | ||
| 250 | } | ||
| 251 | |||
| 252 | return dst; | ||
| 253 | } | ||
| 254 | |||
diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index 14eb9a2395d3..650638275a6f 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * Convert a unicode character to upper or lower case using | 5 | * Convert a unicode character to upper or lower case using |
| 6 | * compressed tables. | 6 | * compressed tables. |
| 7 | * | 7 | * |
| 8 | * Copyright (c) International Business Machines Corp., 2000,2007 | 8 | * Copyright (c) International Business Machines Corp., 2000,2009 |
| 9 | * | 9 | * |
| 10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |
| @@ -37,6 +37,19 @@ | |||
| 37 | 37 | ||
| 38 | #define UNIUPR_NOLOWER /* Example to not expand lower case tables */ | 38 | #define UNIUPR_NOLOWER /* Example to not expand lower case tables */ |
| 39 | 39 | ||
| 40 | /* | ||
| 41 | * Windows maps these to the user defined 16 bit Unicode range since they are | ||
| 42 | * reserved symbols (along with \ and /), otherwise illegal to store | ||
| 43 | * in filenames in NTFS | ||
| 44 | */ | ||
| 45 | #define UNI_ASTERIK (__u16) ('*' + 0xF000) | ||
| 46 | #define UNI_QUESTION (__u16) ('?' + 0xF000) | ||
| 47 | #define UNI_COLON (__u16) (':' + 0xF000) | ||
| 48 | #define UNI_GRTRTHAN (__u16) ('>' + 0xF000) | ||
| 49 | #define UNI_LESSTHAN (__u16) ('<' + 0xF000) | ||
| 50 | #define UNI_PIPE (__u16) ('|' + 0xF000) | ||
| 51 | #define UNI_SLASH (__u16) ('\\' + 0xF000) | ||
| 52 | |||
| 40 | /* Just define what we want from uniupr.h. We don't want to define the tables | 53 | /* Just define what we want from uniupr.h. We don't want to define the tables |
| 41 | * in each source file. | 54 | * in each source file. |
| 42 | */ | 55 | */ |
| @@ -59,8 +72,14 @@ extern struct UniCaseRange UniLowerRange[]; | |||
| 59 | #endif /* UNIUPR_NOLOWER */ | 72 | #endif /* UNIUPR_NOLOWER */ |
| 60 | 73 | ||
| 61 | #ifdef __KERNEL__ | 74 | #ifdef __KERNEL__ |
| 62 | int cifs_strfromUCS_le(char *, const __le16 *, int, const struct nls_table *); | 75 | int cifs_from_ucs2(char *to, const __le16 *from, int tolen, int fromlen, |
| 76 | const struct nls_table *codepage, bool mapchar); | ||
| 77 | int cifs_ucs2_bytes(const __le16 *from, int maxbytes, | ||
| 78 | const struct nls_table *codepage); | ||
| 63 | int cifs_strtoUCS(__le16 *, const char *, int, const struct nls_table *); | 79 | int cifs_strtoUCS(__le16 *, const char *, int, const struct nls_table *); |
| 80 | char *cifs_strndup_from_ucs(const char *src, const int maxlen, | ||
| 81 | const bool is_unicode, | ||
| 82 | const struct nls_table *codepage); | ||
| 64 | #endif | 83 | #endif |
| 65 | 84 | ||
| 66 | /* | 85 | /* |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 0d6d8b573652..5e6d35804d73 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | #include <linux/kthread.h> | 36 | #include <linux/kthread.h> |
| 37 | #include <linux/freezer.h> | 37 | #include <linux/freezer.h> |
| 38 | #include <linux/smp_lock.h> | ||
| 38 | #include "cifsfs.h" | 39 | #include "cifsfs.h" |
| 39 | #include "cifspdu.h" | 40 | #include "cifspdu.h" |
| 40 | #define DECLARE_GLOBALS_HERE | 41 | #define DECLARE_GLOBALS_HERE |
| @@ -530,6 +531,7 @@ static void cifs_umount_begin(struct super_block *sb) | |||
| 530 | if (tcon == NULL) | 531 | if (tcon == NULL) |
| 531 | return; | 532 | return; |
| 532 | 533 | ||
| 534 | lock_kernel(); | ||
| 533 | read_lock(&cifs_tcp_ses_lock); | 535 | read_lock(&cifs_tcp_ses_lock); |
| 534 | if (tcon->tc_count == 1) | 536 | if (tcon->tc_count == 1) |
| 535 | tcon->tidStatus = CifsExiting; | 537 | tcon->tidStatus = CifsExiting; |
| @@ -548,6 +550,7 @@ static void cifs_umount_begin(struct super_block *sb) | |||
| 548 | } | 550 | } |
| 549 | /* BB FIXME - finish add checks for tidStatus BB */ | 551 | /* BB FIXME - finish add checks for tidStatus BB */ |
| 550 | 552 | ||
| 553 | unlock_kernel(); | ||
| 551 | return; | 554 | return; |
| 552 | } | 555 | } |
| 553 | 556 | ||
| @@ -599,8 +602,7 @@ cifs_get_sb(struct file_system_type *fs_type, | |||
| 599 | 602 | ||
| 600 | rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0); | 603 | rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0); |
| 601 | if (rc) { | 604 | if (rc) { |
| 602 | up_write(&sb->s_umount); | 605 | deactivate_locked_super(sb); |
| 603 | deactivate_super(sb); | ||
| 604 | return rc; | 606 | return rc; |
| 605 | } | 607 | } |
| 606 | sb->s_flags |= MS_ACTIVE; | 608 | sb->s_flags |= MS_ACTIVE; |
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 77e190dc2883..051b71cfdea9 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
| @@ -100,5 +100,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); | |||
| 100 | extern const struct export_operations cifs_export_ops; | 100 | extern const struct export_operations cifs_export_ops; |
| 101 | #endif /* EXPERIMENTAL */ | 101 | #endif /* EXPERIMENTAL */ |
| 102 | 102 | ||
| 103 | #define CIFS_VERSION "1.57" | 103 | #define CIFS_VERSION "1.58" |
| 104 | #endif /* _CIFSFS_H */ | 104 | #endif /* _CIFSFS_H */ |
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index df40ab64cd95..a61ab772c6f6 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
| @@ -82,8 +82,8 @@ enum securityEnum { | |||
| 82 | LANMAN, /* Legacy LANMAN auth */ | 82 | LANMAN, /* Legacy LANMAN auth */ |
| 83 | NTLM, /* Legacy NTLM012 auth with NTLM hash */ | 83 | NTLM, /* Legacy NTLM012 auth with NTLM hash */ |
| 84 | NTLMv2, /* Legacy NTLM auth with NTLMv2 hash */ | 84 | NTLMv2, /* Legacy NTLM auth with NTLMv2 hash */ |
| 85 | RawNTLMSSP, /* NTLMSSP without SPNEGO */ | 85 | RawNTLMSSP, /* NTLMSSP without SPNEGO, NTLMv2 hash */ |
| 86 | NTLMSSP, /* NTLMSSP via SPNEGO */ | 86 | NTLMSSP, /* NTLMSSP via SPNEGO, NTLMv2 hash */ |
| 87 | Kerberos, /* Kerberos via SPNEGO */ | 87 | Kerberos, /* Kerberos via SPNEGO */ |
| 88 | MSKerberos, /* MS Kerberos via SPNEGO */ | 88 | MSKerberos, /* MS Kerberos via SPNEGO */ |
| 89 | }; | 89 | }; |
| @@ -531,6 +531,7 @@ static inline void free_dfs_info_array(struct dfs_info3_param *param, | |||
| 531 | #define CIFSSEC_MAY_PLNTXT 0 | 531 | #define CIFSSEC_MAY_PLNTXT 0 |
| 532 | #endif /* weak passwords */ | 532 | #endif /* weak passwords */ |
| 533 | #define CIFSSEC_MAY_SEAL 0x00040 /* not supported yet */ | 533 | #define CIFSSEC_MAY_SEAL 0x00040 /* not supported yet */ |
| 534 | #define CIFSSEC_MAY_NTLMSSP 0x00080 /* raw ntlmssp with ntlmv2 */ | ||
| 534 | 535 | ||
| 535 | #define CIFSSEC_MUST_SIGN 0x01001 | 536 | #define CIFSSEC_MUST_SIGN 0x01001 |
| 536 | /* note that only one of the following can be set so the | 537 | /* note that only one of the following can be set so the |
| @@ -543,22 +544,23 @@ require use of the stronger protocol */ | |||
| 543 | #define CIFSSEC_MUST_LANMAN 0x10010 | 544 | #define CIFSSEC_MUST_LANMAN 0x10010 |
| 544 | #define CIFSSEC_MUST_PLNTXT 0x20020 | 545 | #define CIFSSEC_MUST_PLNTXT 0x20020 |
| 545 | #ifdef CONFIG_CIFS_UPCALL | 546 | #ifdef CONFIG_CIFS_UPCALL |
| 546 | #define CIFSSEC_MASK 0x3F03F /* allows weak security but also krb5 */ | 547 | #define CIFSSEC_MASK 0xAF0AF /* allows weak security but also krb5 */ |
| 547 | #else | 548 | #else |
| 548 | #define CIFSSEC_MASK 0x37037 /* current flags supported if weak */ | 549 | #define CIFSSEC_MASK 0xA70A7 /* current flags supported if weak */ |
| 549 | #endif /* UPCALL */ | 550 | #endif /* UPCALL */ |
| 550 | #else /* do not allow weak pw hash */ | 551 | #else /* do not allow weak pw hash */ |
| 551 | #ifdef CONFIG_CIFS_UPCALL | 552 | #ifdef CONFIG_CIFS_UPCALL |
| 552 | #define CIFSSEC_MASK 0x0F00F /* flags supported if no weak allowed */ | 553 | #define CIFSSEC_MASK 0x8F08F /* flags supported if no weak allowed */ |
| 553 | #else | 554 | #else |
| 554 | #define CIFSSEC_MASK 0x07007 /* flags supported if no weak allowed */ | 555 | #define CIFSSEC_MASK 0x87087 /* flags supported if no weak allowed */ |
| 555 | #endif /* UPCALL */ | 556 | #endif /* UPCALL */ |
| 556 | #endif /* WEAK_PW_HASH */ | 557 | #endif /* WEAK_PW_HASH */ |
| 557 | #define CIFSSEC_MUST_SEAL 0x40040 /* not supported yet */ | 558 | #define CIFSSEC_MUST_SEAL 0x40040 /* not supported yet */ |
| 559 | #define CIFSSEC_MUST_NTLMSSP 0x80080 /* raw ntlmssp with ntlmv2 */ | ||
| 558 | 560 | ||
| 559 | #define CIFSSEC_DEF (CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLM | CIFSSEC_MAY_NTLMV2) | 561 | #define CIFSSEC_DEF (CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLM | CIFSSEC_MAY_NTLMV2) |
| 560 | #define CIFSSEC_MAX (CIFSSEC_MUST_SIGN | CIFSSEC_MUST_NTLMV2) | 562 | #define CIFSSEC_MAX (CIFSSEC_MUST_SIGN | CIFSSEC_MUST_NTLMV2) |
| 561 | #define CIFSSEC_AUTH_MASK (CIFSSEC_MAY_NTLM | CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_LANMAN | CIFSSEC_MAY_PLNTXT | CIFSSEC_MAY_KRB5) | 563 | #define CIFSSEC_AUTH_MASK (CIFSSEC_MAY_NTLM | CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_LANMAN | CIFSSEC_MAY_PLNTXT | CIFSSEC_MAY_KRB5 | CIFSSEC_MAY_NTLMSSP) |
| 562 | /* | 564 | /* |
| 563 | ***************************************************************** | 565 | ***************************************************************** |
| 564 | * All constants go here | 566 | * All constants go here |
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 4167716d32f2..fae083930eee 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
| @@ -260,8 +260,7 @@ extern int CIFSUnixCreateSymLink(const int xid, | |||
| 260 | const struct nls_table *nls_codepage); | 260 | const struct nls_table *nls_codepage); |
| 261 | extern int CIFSSMBUnixQuerySymLink(const int xid, | 261 | extern int CIFSSMBUnixQuerySymLink(const int xid, |
| 262 | struct cifsTconInfo *tcon, | 262 | struct cifsTconInfo *tcon, |
| 263 | const unsigned char *searchName, | 263 | const unsigned char *searchName, char **syminfo, |
| 264 | char *syminfo, const int buflen, | ||
| 265 | const struct nls_table *nls_codepage); | 264 | const struct nls_table *nls_codepage); |
| 266 | extern int CIFSSMBQueryReparseLinkInfo(const int xid, | 265 | extern int CIFSSMBQueryReparseLinkInfo(const int xid, |
| 267 | struct cifsTconInfo *tcon, | 266 | struct cifsTconInfo *tcon, |
| @@ -307,8 +306,6 @@ extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon, | |||
| 307 | const unsigned char *searchName, __u64 *inode_number, | 306 | const unsigned char *searchName, __u64 *inode_number, |
| 308 | const struct nls_table *nls_codepage, | 307 | const struct nls_table *nls_codepage, |
| 309 | int remap_special_chars); | 308 | int remap_special_chars); |
| 310 | extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen, | ||
| 311 | const struct nls_table *codepage); | ||
| 312 | extern int cifsConvertToUCS(__le16 *target, const char *source, int maxlen, | 309 | extern int cifsConvertToUCS(__le16 *target, const char *source, int maxlen, |
| 313 | const struct nls_table *cp, int mapChars); | 310 | const struct nls_table *cp, int mapChars); |
| 314 | 311 | ||
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index a0845dc7b8a9..75e6623a8635 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * fs/cifs/cifssmb.c | 2 | * fs/cifs/cifssmb.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) International Business Machines Corp., 2002,2008 | 4 | * Copyright (C) International Business Machines Corp., 2002,2009 |
| 5 | * Author(s): Steve French (sfrench@us.ibm.com) | 5 | * Author(s): Steve French (sfrench@us.ibm.com) |
| 6 | * | 6 | * |
| 7 | * Contains the routines for constructing the SMB PDUs themselves | 7 | * Contains the routines for constructing the SMB PDUs themselves |
| @@ -81,41 +81,6 @@ static struct { | |||
| 81 | #endif /* CONFIG_CIFS_WEAK_PW_HASH */ | 81 | #endif /* CONFIG_CIFS_WEAK_PW_HASH */ |
| 82 | #endif /* CIFS_POSIX */ | 82 | #endif /* CIFS_POSIX */ |
| 83 | 83 | ||
| 84 | /* Allocates buffer into dst and copies smb string from src to it. | ||
| 85 | * caller is responsible for freeing dst if function returned 0. | ||
| 86 | * returns: | ||
| 87 | * on success - 0 | ||
| 88 | * on failure - errno | ||
| 89 | */ | ||
| 90 | static int | ||
| 91 | cifs_strncpy_to_host(char **dst, const char *src, const int maxlen, | ||
| 92 | const bool is_unicode, const struct nls_table *nls_codepage) | ||
| 93 | { | ||
| 94 | int plen; | ||
| 95 | |||
| 96 | if (is_unicode) { | ||
| 97 | plen = UniStrnlen((wchar_t *)src, maxlen); | ||
| 98 | *dst = kmalloc(plen + 2, GFP_KERNEL); | ||
| 99 | if (!*dst) | ||
| 100 | goto cifs_strncpy_to_host_ErrExit; | ||
| 101 | cifs_strfromUCS_le(*dst, (__le16 *)src, plen, nls_codepage); | ||
| 102 | } else { | ||
| 103 | plen = strnlen(src, maxlen); | ||
| 104 | *dst = kmalloc(plen + 2, GFP_KERNEL); | ||
| 105 | if (!*dst) | ||
| 106 | goto cifs_strncpy_to_host_ErrExit; | ||
| 107 | strncpy(*dst, src, plen); | ||
| 108 | } | ||
| 109 | (*dst)[plen] = 0; | ||
| 110 | (*dst)[plen+1] = 0; /* harmless for ASCII case, needed for Unicode */ | ||
| 111 | return 0; | ||
| 112 | |||
| 113 | cifs_strncpy_to_host_ErrExit: | ||
| 114 | cERROR(1, ("Failed to allocate buffer for string\n")); | ||
| 115 | return -ENOMEM; | ||
| 116 | } | ||
| 117 | |||
| 118 | |||
| 119 | /* Mark as invalid, all open files on tree connections since they | 84 | /* Mark as invalid, all open files on tree connections since they |
| 120 | were closed when session to server was lost */ | 85 | were closed when session to server was lost */ |
| 121 | static void mark_open_files_invalid(struct cifsTconInfo *pTcon) | 86 | static void mark_open_files_invalid(struct cifsTconInfo *pTcon) |
| @@ -484,6 +449,14 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) | |||
| 484 | cFYI(1, ("Kerberos only mechanism, enable extended security")); | 449 | cFYI(1, ("Kerberos only mechanism, enable extended security")); |
| 485 | pSMB->hdr.Flags2 |= SMBFLG2_EXT_SEC; | 450 | pSMB->hdr.Flags2 |= SMBFLG2_EXT_SEC; |
| 486 | } | 451 | } |
| 452 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
| 453 | else if ((secFlags & CIFSSEC_MUST_NTLMSSP) == CIFSSEC_MUST_NTLMSSP) | ||
| 454 | pSMB->hdr.Flags2 |= SMBFLG2_EXT_SEC; | ||
| 455 | else if ((secFlags & CIFSSEC_AUTH_MASK) == CIFSSEC_MAY_NTLMSSP) { | ||
| 456 | cFYI(1, ("NTLMSSP only mechanism, enable extended security")); | ||
| 457 | pSMB->hdr.Flags2 |= SMBFLG2_EXT_SEC; | ||
| 458 | } | ||
| 459 | #endif | ||
| 487 | 460 | ||
| 488 | count = 0; | 461 | count = 0; |
| 489 | for (i = 0; i < CIFS_NUM_PROT; i++) { | 462 | for (i = 0; i < CIFS_NUM_PROT; i++) { |
| @@ -620,6 +593,8 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) | |||
| 620 | server->secType = NTLMv2; | 593 | server->secType = NTLMv2; |
| 621 | else if (secFlags & CIFSSEC_MAY_KRB5) | 594 | else if (secFlags & CIFSSEC_MAY_KRB5) |
| 622 | server->secType = Kerberos; | 595 | server->secType = Kerberos; |
| 596 | else if (secFlags & CIFSSEC_MAY_NTLMSSP) | ||
| 597 | server->secType = NTLMSSP; | ||
| 623 | else if (secFlags & CIFSSEC_MAY_LANMAN) | 598 | else if (secFlags & CIFSSEC_MAY_LANMAN) |
| 624 | server->secType = LANMAN; | 599 | server->secType = LANMAN; |
| 625 | /* #ifdef CONFIG_CIFS_EXPERIMENTAL | 600 | /* #ifdef CONFIG_CIFS_EXPERIMENTAL |
| @@ -2417,8 +2392,7 @@ winCreateHardLinkRetry: | |||
| 2417 | 2392 | ||
| 2418 | int | 2393 | int |
| 2419 | CIFSSMBUnixQuerySymLink(const int xid, struct cifsTconInfo *tcon, | 2394 | CIFSSMBUnixQuerySymLink(const int xid, struct cifsTconInfo *tcon, |
| 2420 | const unsigned char *searchName, | 2395 | const unsigned char *searchName, char **symlinkinfo, |
| 2421 | char *symlinkinfo, const int buflen, | ||
| 2422 | const struct nls_table *nls_codepage) | 2396 | const struct nls_table *nls_codepage) |
| 2423 | { | 2397 | { |
| 2424 | /* SMB_QUERY_FILE_UNIX_LINK */ | 2398 | /* SMB_QUERY_FILE_UNIX_LINK */ |
| @@ -2428,6 +2402,7 @@ CIFSSMBUnixQuerySymLink(const int xid, struct cifsTconInfo *tcon, | |||
| 2428 | int bytes_returned; | 2402 | int bytes_returned; |
| 2429 | int name_len; | 2403 | int name_len; |
| 2430 | __u16 params, byte_count; | 2404 | __u16 params, byte_count; |
| 2405 | char *data_start; | ||
| 2431 | 2406 | ||
| 2432 | cFYI(1, ("In QPathSymLinkInfo (Unix) for path %s", searchName)); | 2407 | cFYI(1, ("In QPathSymLinkInfo (Unix) for path %s", searchName)); |
| 2433 | 2408 | ||
| @@ -2482,30 +2457,26 @@ querySymLinkRetry: | |||
| 2482 | /* decode response */ | 2457 | /* decode response */ |
| 2483 | 2458 | ||
| 2484 | rc = validate_t2((struct smb_t2_rsp *)pSMBr); | 2459 | rc = validate_t2((struct smb_t2_rsp *)pSMBr); |
| 2485 | if (rc || (pSMBr->ByteCount < 2)) | ||
| 2486 | /* BB also check enough total bytes returned */ | 2460 | /* BB also check enough total bytes returned */ |
| 2487 | rc = -EIO; /* bad smb */ | 2461 | if (rc || (pSMBr->ByteCount < 2)) |
| 2462 | rc = -EIO; | ||
| 2488 | else { | 2463 | else { |
| 2489 | __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset); | 2464 | bool is_unicode; |
| 2490 | __u16 count = le16_to_cpu(pSMBr->t2.DataCount); | 2465 | u16 count = le16_to_cpu(pSMBr->t2.DataCount); |
| 2466 | |||
| 2467 | data_start = ((char *) &pSMBr->hdr.Protocol) + | ||
| 2468 | le16_to_cpu(pSMBr->t2.DataOffset); | ||
| 2469 | |||
| 2470 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) | ||
| 2471 | is_unicode = true; | ||
| 2472 | else | ||
| 2473 | is_unicode = false; | ||
| 2491 | 2474 | ||
| 2492 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { | ||
| 2493 | name_len = UniStrnlen((wchar_t *) ((char *) | ||
| 2494 | &pSMBr->hdr.Protocol + data_offset), | ||
| 2495 | min_t(const int, buflen, count) / 2); | ||
| 2496 | /* BB FIXME investigate remapping reserved chars here */ | 2475 | /* BB FIXME investigate remapping reserved chars here */ |
| 2497 | cifs_strfromUCS_le(symlinkinfo, | 2476 | *symlinkinfo = cifs_strndup_from_ucs(data_start, count, |
| 2498 | (__le16 *) ((char *)&pSMBr->hdr.Protocol | 2477 | is_unicode, nls_codepage); |
| 2499 | + data_offset), | 2478 | if (!symlinkinfo) |
| 2500 | name_len, nls_codepage); | 2479 | rc = -ENOMEM; |
| 2501 | } else { | ||
| 2502 | strncpy(symlinkinfo, | ||
| 2503 | (char *) &pSMBr->hdr.Protocol + | ||
| 2504 | data_offset, | ||
| 2505 | min_t(const int, buflen, count)); | ||
| 2506 | } | ||
| 2507 | symlinkinfo[buflen] = 0; | ||
| 2508 | /* just in case so calling code does not go off the end of buffer */ | ||
| 2509 | } | 2480 | } |
| 2510 | } | 2481 | } |
| 2511 | cifs_buf_release(pSMB); | 2482 | cifs_buf_release(pSMB); |
| @@ -2603,7 +2574,6 @@ validate_ntransact(char *buf, char **ppparm, char **ppdata, | |||
| 2603 | *pparmlen = parm_count; | 2574 | *pparmlen = parm_count; |
| 2604 | return 0; | 2575 | return 0; |
| 2605 | } | 2576 | } |
| 2606 | #endif /* CIFS_EXPERIMENTAL */ | ||
| 2607 | 2577 | ||
| 2608 | int | 2578 | int |
| 2609 | CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon, | 2579 | CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon, |
| @@ -2613,7 +2583,6 @@ CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon, | |||
| 2613 | { | 2583 | { |
| 2614 | int rc = 0; | 2584 | int rc = 0; |
| 2615 | int bytes_returned; | 2585 | int bytes_returned; |
| 2616 | int name_len; | ||
| 2617 | struct smb_com_transaction_ioctl_req *pSMB; | 2586 | struct smb_com_transaction_ioctl_req *pSMB; |
| 2618 | struct smb_com_transaction_ioctl_rsp *pSMBr; | 2587 | struct smb_com_transaction_ioctl_rsp *pSMBr; |
| 2619 | 2588 | ||
| @@ -2650,59 +2619,55 @@ CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon, | |||
| 2650 | } else { /* decode response */ | 2619 | } else { /* decode response */ |
| 2651 | __u32 data_offset = le32_to_cpu(pSMBr->DataOffset); | 2620 | __u32 data_offset = le32_to_cpu(pSMBr->DataOffset); |
| 2652 | __u32 data_count = le32_to_cpu(pSMBr->DataCount); | 2621 | __u32 data_count = le32_to_cpu(pSMBr->DataCount); |
| 2653 | if ((pSMBr->ByteCount < 2) || (data_offset > 512)) | 2622 | if ((pSMBr->ByteCount < 2) || (data_offset > 512)) { |
| 2654 | /* BB also check enough total bytes returned */ | 2623 | /* BB also check enough total bytes returned */ |
| 2655 | rc = -EIO; /* bad smb */ | 2624 | rc = -EIO; /* bad smb */ |
| 2656 | else { | 2625 | goto qreparse_out; |
| 2657 | if (data_count && (data_count < 2048)) { | 2626 | } |
| 2658 | char *end_of_smb = 2 /* sizeof byte count */ + | 2627 | if (data_count && (data_count < 2048)) { |
| 2659 | pSMBr->ByteCount + | 2628 | char *end_of_smb = 2 /* sizeof byte count */ + |
| 2660 | (char *)&pSMBr->ByteCount; | 2629 | pSMBr->ByteCount + (char *)&pSMBr->ByteCount; |
| 2661 | 2630 | ||
| 2662 | struct reparse_data *reparse_buf = | 2631 | struct reparse_data *reparse_buf = |
| 2663 | (struct reparse_data *) | 2632 | (struct reparse_data *) |
| 2664 | ((char *)&pSMBr->hdr.Protocol | 2633 | ((char *)&pSMBr->hdr.Protocol |
| 2665 | + data_offset); | 2634 | + data_offset); |
| 2666 | if ((char *)reparse_buf >= end_of_smb) { | 2635 | if ((char *)reparse_buf >= end_of_smb) { |
| 2667 | rc = -EIO; | 2636 | rc = -EIO; |
| 2668 | goto qreparse_out; | 2637 | goto qreparse_out; |
| 2669 | } | 2638 | } |
| 2670 | if ((reparse_buf->LinkNamesBuf + | 2639 | if ((reparse_buf->LinkNamesBuf + |
| 2671 | reparse_buf->TargetNameOffset + | 2640 | reparse_buf->TargetNameOffset + |
| 2672 | reparse_buf->TargetNameLen) > | 2641 | reparse_buf->TargetNameLen) > end_of_smb) { |
| 2673 | end_of_smb) { | 2642 | cFYI(1, ("reparse buf beyond SMB")); |
| 2674 | cFYI(1, ("reparse buf beyond SMB")); | 2643 | rc = -EIO; |
| 2675 | rc = -EIO; | 2644 | goto qreparse_out; |
| 2676 | goto qreparse_out; | 2645 | } |
| 2677 | } | ||
| 2678 | 2646 | ||
| 2679 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { | 2647 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 2680 | name_len = UniStrnlen((wchar_t *) | 2648 | cifs_from_ucs2(symlinkinfo, (__le16 *) |
| 2681 | (reparse_buf->LinkNamesBuf + | 2649 | (reparse_buf->LinkNamesBuf + |
| 2682 | reparse_buf->TargetNameOffset), | 2650 | reparse_buf->TargetNameOffset), |
| 2683 | min(buflen/2, | 2651 | buflen, |
| 2684 | reparse_buf->TargetNameLen / 2)); | 2652 | reparse_buf->TargetNameLen, |
| 2685 | cifs_strfromUCS_le(symlinkinfo, | 2653 | nls_codepage, 0); |
| 2686 | (__le16 *) (reparse_buf->LinkNamesBuf + | 2654 | } else { /* ASCII names */ |
| 2687 | reparse_buf->TargetNameOffset), | 2655 | strncpy(symlinkinfo, |
| 2688 | name_len, nls_codepage); | 2656 | reparse_buf->LinkNamesBuf + |
| 2689 | } else { /* ASCII names */ | 2657 | reparse_buf->TargetNameOffset, |
| 2690 | strncpy(symlinkinfo, | 2658 | min_t(const int, buflen, |
| 2691 | reparse_buf->LinkNamesBuf + | 2659 | reparse_buf->TargetNameLen)); |
| 2692 | reparse_buf->TargetNameOffset, | ||
| 2693 | min_t(const int, buflen, | ||
| 2694 | reparse_buf->TargetNameLen)); | ||
| 2695 | } | ||
| 2696 | } else { | ||
| 2697 | rc = -EIO; | ||
| 2698 | cFYI(1, ("Invalid return data count on " | ||
| 2699 | "get reparse info ioctl")); | ||
| 2700 | } | 2660 | } |
| 2701 | symlinkinfo[buflen] = 0; /* just in case so the caller | 2661 | } else { |
| 2702 | does not go off the end of the buffer */ | 2662 | rc = -EIO; |
| 2703 | cFYI(1, ("readlink result - %s", symlinkinfo)); | 2663 | cFYI(1, ("Invalid return data count on " |
| 2664 | "get reparse info ioctl")); | ||
| 2704 | } | 2665 | } |
| 2666 | symlinkinfo[buflen] = 0; /* just in case so the caller | ||
| 2667 | does not go off the end of the buffer */ | ||
| 2668 | cFYI(1, ("readlink result - %s", symlinkinfo)); | ||
| 2705 | } | 2669 | } |
| 2670 | |||
| 2706 | qreparse_out: | 2671 | qreparse_out: |
| 2707 | cifs_buf_release(pSMB); | 2672 | cifs_buf_release(pSMB); |
| 2708 | 2673 | ||
| @@ -2711,6 +2676,7 @@ qreparse_out: | |||
| 2711 | 2676 | ||
| 2712 | return rc; | 2677 | return rc; |
| 2713 | } | 2678 | } |
| 2679 | #endif /* CIFS_EXPERIMENTAL */ | ||
| 2714 | 2680 | ||
| 2715 | #ifdef CONFIG_CIFS_POSIX | 2681 | #ifdef CONFIG_CIFS_POSIX |
| 2716 | 2682 | ||
| @@ -3928,27 +3894,6 @@ GetInodeNumOut: | |||
| 3928 | return rc; | 3894 | return rc; |
| 3929 | } | 3895 | } |
| 3930 | 3896 | ||
| 3931 | /* computes length of UCS string converted to host codepage | ||
| 3932 | * @src: UCS string | ||
| 3933 | * @maxlen: length of the input string in UCS characters | ||
| 3934 | * (not in bytes) | ||
| 3935 | * | ||
| 3936 | * return: size of input string in host codepage | ||
| 3937 | */ | ||
| 3938 | static int hostlen_fromUCS(const __le16 *src, const int maxlen, | ||
| 3939 | const struct nls_table *nls_codepage) { | ||
| 3940 | int i; | ||
| 3941 | int hostlen = 0; | ||
| 3942 | char to[4]; | ||
| 3943 | int charlen; | ||
| 3944 | for (i = 0; (i < maxlen) && src[i]; ++i) { | ||
| 3945 | charlen = nls_codepage->uni2char(le16_to_cpu(src[i]), | ||
| 3946 | to, NLS_MAX_CHARSET_SIZE); | ||
| 3947 | hostlen += charlen > 0 ? charlen : 1; | ||
| 3948 | } | ||
| 3949 | return hostlen; | ||
| 3950 | } | ||
| 3951 | |||
| 3952 | /* parses DFS refferal V3 structure | 3897 | /* parses DFS refferal V3 structure |
| 3953 | * caller is responsible for freeing target_nodes | 3898 | * caller is responsible for freeing target_nodes |
| 3954 | * returns: | 3899 | * returns: |
| @@ -3994,7 +3939,7 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, | |||
| 3994 | 3939 | ||
| 3995 | cFYI(1, ("num_referrals: %d dfs flags: 0x%x ... \n", | 3940 | cFYI(1, ("num_referrals: %d dfs flags: 0x%x ... \n", |
| 3996 | *num_of_nodes, | 3941 | *num_of_nodes, |
| 3997 | le16_to_cpu(pSMBr->DFSFlags))); | 3942 | le32_to_cpu(pSMBr->DFSFlags))); |
| 3998 | 3943 | ||
| 3999 | *target_nodes = kzalloc(sizeof(struct dfs_info3_param) * | 3944 | *target_nodes = kzalloc(sizeof(struct dfs_info3_param) * |
| 4000 | *num_of_nodes, GFP_KERNEL); | 3945 | *num_of_nodes, GFP_KERNEL); |
| @@ -4010,14 +3955,14 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, | |||
| 4010 | int max_len; | 3955 | int max_len; |
| 4011 | struct dfs_info3_param *node = (*target_nodes)+i; | 3956 | struct dfs_info3_param *node = (*target_nodes)+i; |
| 4012 | 3957 | ||
| 4013 | node->flags = le16_to_cpu(pSMBr->DFSFlags); | 3958 | node->flags = le32_to_cpu(pSMBr->DFSFlags); |
| 4014 | if (is_unicode) { | 3959 | if (is_unicode) { |
| 4015 | __le16 *tmp = kmalloc(strlen(searchName)*2 + 2, | 3960 | __le16 *tmp = kmalloc(strlen(searchName)*2 + 2, |
| 4016 | GFP_KERNEL); | 3961 | GFP_KERNEL); |
| 4017 | cifsConvertToUCS((__le16 *) tmp, searchName, | 3962 | cifsConvertToUCS((__le16 *) tmp, searchName, |
| 4018 | PATH_MAX, nls_codepage, remap); | 3963 | PATH_MAX, nls_codepage, remap); |
| 4019 | node->path_consumed = hostlen_fromUCS(tmp, | 3964 | node->path_consumed = cifs_ucs2_bytes(tmp, |
| 4020 | le16_to_cpu(pSMBr->PathConsumed)/2, | 3965 | le16_to_cpu(pSMBr->PathConsumed), |
| 4021 | nls_codepage); | 3966 | nls_codepage); |
| 4022 | kfree(tmp); | 3967 | kfree(tmp); |
| 4023 | } else | 3968 | } else |
| @@ -4029,20 +3974,24 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, | |||
| 4029 | /* copy DfsPath */ | 3974 | /* copy DfsPath */ |
| 4030 | temp = (char *)ref + le16_to_cpu(ref->DfsPathOffset); | 3975 | temp = (char *)ref + le16_to_cpu(ref->DfsPathOffset); |
| 4031 | max_len = data_end - temp; | 3976 | max_len = data_end - temp; |
| 4032 | rc = cifs_strncpy_to_host(&(node->path_name), temp, | 3977 | node->path_name = cifs_strndup_from_ucs(temp, max_len, |
| 4033 | max_len, is_unicode, nls_codepage); | 3978 | is_unicode, nls_codepage); |
| 4034 | if (rc) | 3979 | if (IS_ERR(node->path_name)) { |
| 3980 | rc = PTR_ERR(node->path_name); | ||
| 3981 | node->path_name = NULL; | ||
| 4035 | goto parse_DFS_referrals_exit; | 3982 | goto parse_DFS_referrals_exit; |
| 3983 | } | ||
| 4036 | 3984 | ||
| 4037 | /* copy link target UNC */ | 3985 | /* copy link target UNC */ |
| 4038 | temp = (char *)ref + le16_to_cpu(ref->NetworkAddressOffset); | 3986 | temp = (char *)ref + le16_to_cpu(ref->NetworkAddressOffset); |
| 4039 | max_len = data_end - temp; | 3987 | max_len = data_end - temp; |
| 4040 | rc = cifs_strncpy_to_host(&(node->node_name), temp, | 3988 | node->node_name = cifs_strndup_from_ucs(temp, max_len, |
| 4041 | max_len, is_unicode, nls_codepage); | 3989 | is_unicode, nls_codepage); |
| 4042 | if (rc) | 3990 | if (IS_ERR(node->node_name)) { |
| 3991 | rc = PTR_ERR(node->node_name); | ||
| 3992 | node->node_name = NULL; | ||
| 4043 | goto parse_DFS_referrals_exit; | 3993 | goto parse_DFS_referrals_exit; |
| 4044 | 3994 | } | |
| 4045 | ref += le16_to_cpu(ref->Size); | ||
| 4046 | } | 3995 | } |
| 4047 | 3996 | ||
| 4048 | parse_DFS_referrals_exit: | 3997 | parse_DFS_referrals_exit: |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index bacdef1546b7..4aa81a507b74 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * fs/cifs/connect.c | 2 | * fs/cifs/connect.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) International Business Machines Corp., 2002,2008 | 4 | * Copyright (C) International Business Machines Corp., 2002,2009 |
| 5 | * Author(s): Steve French (sfrench@us.ibm.com) | 5 | * Author(s): Steve French (sfrench@us.ibm.com) |
| 6 | * | 6 | * |
| 7 | * This library is free software; you can redistribute it and/or modify | 7 | * This library is free software; you can redistribute it and/or modify |
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/kthread.h> | 32 | #include <linux/kthread.h> |
| 33 | #include <linux/pagevec.h> | 33 | #include <linux/pagevec.h> |
| 34 | #include <linux/freezer.h> | 34 | #include <linux/freezer.h> |
| 35 | #include <linux/namei.h> | ||
| 35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
| 36 | #include <asm/processor.h> | 37 | #include <asm/processor.h> |
| 37 | #include <net/ipv6.h> | 38 | #include <net/ipv6.h> |
| @@ -978,6 +979,13 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
| 978 | return 1; | 979 | return 1; |
| 979 | } else if (strnicmp(value, "krb5", 4) == 0) { | 980 | } else if (strnicmp(value, "krb5", 4) == 0) { |
| 980 | vol->secFlg |= CIFSSEC_MAY_KRB5; | 981 | vol->secFlg |= CIFSSEC_MAY_KRB5; |
| 982 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
| 983 | } else if (strnicmp(value, "ntlmsspi", 8) == 0) { | ||
| 984 | vol->secFlg |= CIFSSEC_MAY_NTLMSSP | | ||
| 985 | CIFSSEC_MUST_SIGN; | ||
| 986 | } else if (strnicmp(value, "ntlmssp", 7) == 0) { | ||
| 987 | vol->secFlg |= CIFSSEC_MAY_NTLMSSP; | ||
| 988 | #endif | ||
| 981 | } else if (strnicmp(value, "ntlmv2i", 7) == 0) { | 989 | } else if (strnicmp(value, "ntlmv2i", 7) == 0) { |
| 982 | vol->secFlg |= CIFSSEC_MAY_NTLMV2 | | 990 | vol->secFlg |= CIFSSEC_MAY_NTLMV2 | |
| 983 | CIFSSEC_MUST_SIGN; | 991 | CIFSSEC_MUST_SIGN; |
| @@ -2278,6 +2286,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
| 2278 | #ifdef CONFIG_CIFS_DFS_UPCALL | 2286 | #ifdef CONFIG_CIFS_DFS_UPCALL |
| 2279 | struct dfs_info3_param *referrals = NULL; | 2287 | struct dfs_info3_param *referrals = NULL; |
| 2280 | unsigned int num_referrals = 0; | 2288 | unsigned int num_referrals = 0; |
| 2289 | int referral_walks_count = 0; | ||
| 2281 | try_mount_again: | 2290 | try_mount_again: |
| 2282 | #endif | 2291 | #endif |
| 2283 | full_path = NULL; | 2292 | full_path = NULL; |
| @@ -2525,6 +2534,16 @@ remote_path_check: | |||
| 2525 | /* get referral if needed */ | 2534 | /* get referral if needed */ |
| 2526 | if (rc == -EREMOTE) { | 2535 | if (rc == -EREMOTE) { |
| 2527 | #ifdef CONFIG_CIFS_DFS_UPCALL | 2536 | #ifdef CONFIG_CIFS_DFS_UPCALL |
| 2537 | if (referral_walks_count > MAX_NESTED_LINKS) { | ||
| 2538 | /* | ||
| 2539 | * BB: when we implement proper loop detection, | ||
| 2540 | * we will remove this check. But now we need it | ||
| 2541 | * to prevent an indefinite loop if 'DFS tree' is | ||
| 2542 | * misconfigured (i.e. has loops). | ||
| 2543 | */ | ||
| 2544 | rc = -ELOOP; | ||
| 2545 | goto mount_fail_check; | ||
| 2546 | } | ||
| 2528 | /* convert forward to back slashes in prepath here if needed */ | 2547 | /* convert forward to back slashes in prepath here if needed */ |
| 2529 | if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) == 0) | 2548 | if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) == 0) |
| 2530 | convert_delimiter(cifs_sb->prepath, | 2549 | convert_delimiter(cifs_sb->prepath, |
| @@ -2558,6 +2577,7 @@ remote_path_check: | |||
| 2558 | cleanup_volume_info(&volume_info); | 2577 | cleanup_volume_info(&volume_info); |
| 2559 | FreeXid(xid); | 2578 | FreeXid(xid); |
| 2560 | kfree(full_path); | 2579 | kfree(full_path); |
| 2580 | referral_walks_count++; | ||
| 2561 | goto try_mount_again; | 2581 | goto try_mount_again; |
| 2562 | } | 2582 | } |
| 2563 | #else /* No DFS support, return error on mount */ | 2583 | #else /* No DFS support, return error on mount */ |
| @@ -2592,1041 +2612,6 @@ out: | |||
| 2592 | return rc; | 2612 | return rc; |
| 2593 | } | 2613 | } |
| 2594 | 2614 | ||
| 2595 | static int | ||
| 2596 | CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, | ||
| 2597 | char session_key[CIFS_SESS_KEY_SIZE], | ||
| 2598 | const struct nls_table *nls_codepage) | ||
| 2599 | { | ||
| 2600 | struct smb_hdr *smb_buffer; | ||
| 2601 | struct smb_hdr *smb_buffer_response; | ||
| 2602 | SESSION_SETUP_ANDX *pSMB; | ||
| 2603 | SESSION_SETUP_ANDX *pSMBr; | ||
| 2604 | char *bcc_ptr; | ||
| 2605 | char *user; | ||
| 2606 | char *domain; | ||
| 2607 | int rc = 0; | ||
| 2608 | int remaining_words = 0; | ||
| 2609 | int bytes_returned = 0; | ||
| 2610 | int len; | ||
| 2611 | __u32 capabilities; | ||
| 2612 | __u16 count; | ||
| 2613 | |||
| 2614 | cFYI(1, ("In sesssetup")); | ||
| 2615 | if (ses == NULL) | ||
| 2616 | return -EINVAL; | ||
| 2617 | user = ses->userName; | ||
| 2618 | domain = ses->domainName; | ||
| 2619 | smb_buffer = cifs_buf_get(); | ||
| 2620 | |||
| 2621 | if (smb_buffer == NULL) | ||
| 2622 | return -ENOMEM; | ||
| 2623 | |||
| 2624 | smb_buffer_response = smb_buffer; | ||
| 2625 | pSMBr = pSMB = (SESSION_SETUP_ANDX *) smb_buffer; | ||
| 2626 | |||
| 2627 | /* send SMBsessionSetup here */ | ||
| 2628 | header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, | ||
| 2629 | NULL /* no tCon exists yet */ , 13 /* wct */ ); | ||
| 2630 | |||
| 2631 | smb_buffer->Mid = GetNextMid(ses->server); | ||
| 2632 | pSMB->req_no_secext.AndXCommand = 0xFF; | ||
| 2633 | pSMB->req_no_secext.MaxBufferSize = cpu_to_le16(ses->server->maxBuf); | ||
| 2634 | pSMB->req_no_secext.MaxMpxCount = cpu_to_le16(ses->server->maxReq); | ||
| 2635 | |||
| 2636 | if (ses->server->secMode & | ||
| 2637 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) | ||
| 2638 | smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; | ||
| 2639 | |||
| 2640 | capabilities = CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS | | ||
| 2641 | CAP_LARGE_WRITE_X | CAP_LARGE_READ_X; | ||
| 2642 | if (ses->capabilities & CAP_UNICODE) { | ||
| 2643 | smb_buffer->Flags2 |= SMBFLG2_UNICODE; | ||
| 2644 | capabilities |= CAP_UNICODE; | ||
| 2645 | } | ||
| 2646 | if (ses->capabilities & CAP_STATUS32) { | ||
| 2647 | smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; | ||
| 2648 | capabilities |= CAP_STATUS32; | ||
| 2649 | } | ||
| 2650 | if (ses->capabilities & CAP_DFS) { | ||
| 2651 | smb_buffer->Flags2 |= SMBFLG2_DFS; | ||
| 2652 | capabilities |= CAP_DFS; | ||
| 2653 | } | ||
| 2654 | pSMB->req_no_secext.Capabilities = cpu_to_le32(capabilities); | ||
| 2655 | |||
| 2656 | pSMB->req_no_secext.CaseInsensitivePasswordLength = | ||
| 2657 | cpu_to_le16(CIFS_SESS_KEY_SIZE); | ||
| 2658 | |||
| 2659 | pSMB->req_no_secext.CaseSensitivePasswordLength = | ||
| 2660 | cpu_to_le16(CIFS_SESS_KEY_SIZE); | ||
| 2661 | bcc_ptr = pByteArea(smb_buffer); | ||
| 2662 | memcpy(bcc_ptr, (char *) session_key, CIFS_SESS_KEY_SIZE); | ||
| 2663 | bcc_ptr += CIFS_SESS_KEY_SIZE; | ||
| 2664 | memcpy(bcc_ptr, (char *) session_key, CIFS_SESS_KEY_SIZE); | ||
| 2665 | bcc_ptr += CIFS_SESS_KEY_SIZE; | ||
| 2666 | |||
| 2667 | if (ses->capabilities & CAP_UNICODE) { | ||
| 2668 | if ((long) bcc_ptr % 2) { /* must be word aligned for Unicode */ | ||
| 2669 | *bcc_ptr = 0; | ||
| 2670 | bcc_ptr++; | ||
| 2671 | } | ||
| 2672 | if (user == NULL) | ||
| 2673 | bytes_returned = 0; /* skip null user */ | ||
| 2674 | else | ||
| 2675 | bytes_returned = | ||
| 2676 | cifs_strtoUCS((__le16 *) bcc_ptr, user, 100, | ||
| 2677 | nls_codepage); | ||
| 2678 | /* convert number of 16 bit words to bytes */ | ||
| 2679 | bcc_ptr += 2 * bytes_returned; | ||
| 2680 | bcc_ptr += 2; /* trailing null */ | ||
| 2681 | if (domain == NULL) | ||
| 2682 | bytes_returned = | ||
| 2683 | cifs_strtoUCS((__le16 *) bcc_ptr, | ||
| 2684 | "CIFS_LINUX_DOM", 32, nls_codepage); | ||
| 2685 | else | ||
| 2686 | bytes_returned = | ||
| 2687 | cifs_strtoUCS((__le16 *) bcc_ptr, domain, 64, | ||
| 2688 | nls_codepage); | ||
| 2689 | bcc_ptr += 2 * bytes_returned; | ||
| 2690 | bcc_ptr += 2; | ||
| 2691 | bytes_returned = | ||
| 2692 | cifs_strtoUCS((__le16 *) bcc_ptr, "Linux version ", | ||
| 2693 | 32, nls_codepage); | ||
| 2694 | bcc_ptr += 2 * bytes_returned; | ||
| 2695 | bytes_returned = | ||
| 2696 | cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release, | ||
| 2697 | 32, nls_codepage); | ||
| 2698 | bcc_ptr += 2 * bytes_returned; | ||
| 2699 | bcc_ptr += 2; | ||
| 2700 | bytes_returned = | ||
| 2701 | cifs_strtoUCS((__le16 *) bcc_ptr, CIFS_NETWORK_OPSYS, | ||
| 2702 | 64, nls_codepage); | ||
| 2703 | bcc_ptr += 2 * bytes_returned; | ||
| 2704 | bcc_ptr += 2; | ||
| 2705 | } else { | ||
| 2706 | if (user != NULL) { | ||
| 2707 | strncpy(bcc_ptr, user, 200); | ||
| 2708 | bcc_ptr += strnlen(user, 200); | ||
| 2709 | } | ||
| 2710 | *bcc_ptr = 0; | ||
| 2711 | bcc_ptr++; | ||
| 2712 | if (domain == NULL) { | ||
| 2713 | strcpy(bcc_ptr, "CIFS_LINUX_DOM"); | ||
| 2714 | bcc_ptr += strlen("CIFS_LINUX_DOM") + 1; | ||
| 2715 | } else { | ||
| 2716 | strncpy(bcc_ptr, domain, 64); | ||
| 2717 | bcc_ptr += strnlen(domain, 64); | ||
| 2718 | *bcc_ptr = 0; | ||
| 2719 | bcc_ptr++; | ||
| 2720 | } | ||
| 2721 | strcpy(bcc_ptr, "Linux version "); | ||
| 2722 | bcc_ptr += strlen("Linux version "); | ||
| 2723 | strcpy(bcc_ptr, utsname()->release); | ||
| 2724 | bcc_ptr += strlen(utsname()->release) + 1; | ||
| 2725 | strcpy(bcc_ptr, CIFS_NETWORK_OPSYS); | ||
| 2726 | bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1; | ||
| 2727 | } | ||
| 2728 | count = (long) bcc_ptr - (long) pByteArea(smb_buffer); | ||
| 2729 | smb_buffer->smb_buf_length += count; | ||
| 2730 | pSMB->req_no_secext.ByteCount = cpu_to_le16(count); | ||
| 2731 | |||
| 2732 | rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, | ||
| 2733 | &bytes_returned, CIFS_LONG_OP); | ||
| 2734 | if (rc) { | ||
| 2735 | /* rc = map_smb_to_linux_error(smb_buffer_response); now done in SendReceive */ | ||
| 2736 | } else if ((smb_buffer_response->WordCount == 3) | ||
| 2737 | || (smb_buffer_response->WordCount == 4)) { | ||
| 2738 | __u16 action = le16_to_cpu(pSMBr->resp.Action); | ||
| 2739 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); | ||
| 2740 | if (action & GUEST_LOGIN) | ||
| 2741 | cFYI(1, ("Guest login")); /* BB mark SesInfo struct? */ | ||
| 2742 | ses->Suid = smb_buffer_response->Uid; /* UID left in wire format | ||
| 2743 | (little endian) */ | ||
| 2744 | cFYI(1, ("UID = %d ", ses->Suid)); | ||
| 2745 | /* response can have either 3 or 4 word count - Samba sends 3 */ | ||
| 2746 | bcc_ptr = pByteArea(smb_buffer_response); | ||
| 2747 | if ((pSMBr->resp.hdr.WordCount == 3) | ||
| 2748 | || ((pSMBr->resp.hdr.WordCount == 4) | ||
| 2749 | && (blob_len < pSMBr->resp.ByteCount))) { | ||
| 2750 | if (pSMBr->resp.hdr.WordCount == 4) | ||
| 2751 | bcc_ptr += blob_len; | ||
| 2752 | |||
| 2753 | if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { | ||
| 2754 | if ((long) (bcc_ptr) % 2) { | ||
| 2755 | remaining_words = | ||
| 2756 | (BCC(smb_buffer_response) - 1) / 2; | ||
| 2757 | /* Unicode strings must be word | ||
| 2758 | aligned */ | ||
| 2759 | bcc_ptr++; | ||
| 2760 | } else { | ||
| 2761 | remaining_words = | ||
| 2762 | BCC(smb_buffer_response) / 2; | ||
| 2763 | } | ||
| 2764 | len = | ||
| 2765 | UniStrnlen((wchar_t *) bcc_ptr, | ||
| 2766 | remaining_words - 1); | ||
| 2767 | /* We look for obvious messed up bcc or strings in response so we do not go off | ||
| 2768 | the end since (at least) WIN2K and Windows XP have a major bug in not null | ||
| 2769 | terminating last Unicode string in response */ | ||
| 2770 | kfree(ses->serverOS); | ||
| 2771 | ses->serverOS = kzalloc(2 * (len + 1), | ||
| 2772 | GFP_KERNEL); | ||
| 2773 | if (ses->serverOS == NULL) | ||
| 2774 | goto sesssetup_nomem; | ||
| 2775 | cifs_strfromUCS_le(ses->serverOS, | ||
| 2776 | (__le16 *)bcc_ptr, | ||
| 2777 | len, nls_codepage); | ||
| 2778 | bcc_ptr += 2 * (len + 1); | ||
| 2779 | remaining_words -= len + 1; | ||
| 2780 | ses->serverOS[2 * len] = 0; | ||
| 2781 | ses->serverOS[1 + (2 * len)] = 0; | ||
| 2782 | if (remaining_words > 0) { | ||
| 2783 | len = UniStrnlen((wchar_t *)bcc_ptr, | ||
| 2784 | remaining_words-1); | ||
| 2785 | kfree(ses->serverNOS); | ||
| 2786 | ses->serverNOS = kzalloc(2 * (len + 1), | ||
| 2787 | GFP_KERNEL); | ||
| 2788 | if (ses->serverNOS == NULL) | ||
| 2789 | goto sesssetup_nomem; | ||
| 2790 | cifs_strfromUCS_le(ses->serverNOS, | ||
| 2791 | (__le16 *)bcc_ptr, | ||
| 2792 | len, nls_codepage); | ||
| 2793 | bcc_ptr += 2 * (len + 1); | ||
| 2794 | ses->serverNOS[2 * len] = 0; | ||
| 2795 | ses->serverNOS[1 + (2 * len)] = 0; | ||
| 2796 | if (strncmp(ses->serverNOS, | ||
| 2797 | "NT LAN Manager 4", 16) == 0) { | ||
| 2798 | cFYI(1, ("NT4 server")); | ||
| 2799 | ses->flags |= CIFS_SES_NT4; | ||
| 2800 | } | ||
| 2801 | remaining_words -= len + 1; | ||
| 2802 | if (remaining_words > 0) { | ||
| 2803 | len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words); | ||
| 2804 | /* last string is not always null terminated | ||
| 2805 | (for e.g. for Windows XP & 2000) */ | ||
| 2806 | kfree(ses->serverDomain); | ||
| 2807 | ses->serverDomain = | ||
| 2808 | kzalloc(2*(len+1), | ||
| 2809 | GFP_KERNEL); | ||
| 2810 | if (ses->serverDomain == NULL) | ||
| 2811 | goto sesssetup_nomem; | ||
| 2812 | cifs_strfromUCS_le(ses->serverDomain, | ||
| 2813 | (__le16 *)bcc_ptr, | ||
| 2814 | len, nls_codepage); | ||
| 2815 | bcc_ptr += 2 * (len + 1); | ||
| 2816 | ses->serverDomain[2*len] = 0; | ||
| 2817 | ses->serverDomain[1+(2*len)] = 0; | ||
| 2818 | } else { /* else no more room so create | ||
| 2819 | dummy domain string */ | ||
| 2820 | kfree(ses->serverDomain); | ||
| 2821 | ses->serverDomain = | ||
| 2822 | kzalloc(2, GFP_KERNEL); | ||
| 2823 | } | ||
| 2824 | } else { /* no room so create dummy domain | ||
| 2825 | and NOS string */ | ||
| 2826 | |||
| 2827 | /* if these kcallocs fail not much we | ||
| 2828 | can do, but better to not fail the | ||
| 2829 | sesssetup itself */ | ||
| 2830 | kfree(ses->serverDomain); | ||
| 2831 | ses->serverDomain = | ||
| 2832 | kzalloc(2, GFP_KERNEL); | ||
| 2833 | kfree(ses->serverNOS); | ||
| 2834 | ses->serverNOS = | ||
| 2835 | kzalloc(2, GFP_KERNEL); | ||
| 2836 | } | ||
| 2837 | } else { /* ASCII */ | ||
| 2838 | len = strnlen(bcc_ptr, 1024); | ||
| 2839 | if (((long) bcc_ptr + len) - (long) | ||
| 2840 | pByteArea(smb_buffer_response) | ||
| 2841 | <= BCC(smb_buffer_response)) { | ||
| 2842 | kfree(ses->serverOS); | ||
| 2843 | ses->serverOS = kzalloc(len + 1, | ||
| 2844 | GFP_KERNEL); | ||
| 2845 | if (ses->serverOS == NULL) | ||
| 2846 | goto sesssetup_nomem; | ||
| 2847 | strncpy(ses->serverOS, bcc_ptr, len); | ||
| 2848 | |||
| 2849 | bcc_ptr += len; | ||
| 2850 | /* null terminate the string */ | ||
| 2851 | bcc_ptr[0] = 0; | ||
| 2852 | bcc_ptr++; | ||
| 2853 | |||
| 2854 | len = strnlen(bcc_ptr, 1024); | ||
| 2855 | kfree(ses->serverNOS); | ||
| 2856 | ses->serverNOS = kzalloc(len + 1, | ||
| 2857 | GFP_KERNEL); | ||
| 2858 | if (ses->serverNOS == NULL) | ||
| 2859 | goto sesssetup_nomem; | ||
| 2860 | strncpy(ses->serverNOS, bcc_ptr, len); | ||
| 2861 | bcc_ptr += len; | ||
| 2862 | bcc_ptr[0] = 0; | ||
| 2863 | bcc_ptr++; | ||
| 2864 | |||
| 2865 | len = strnlen(bcc_ptr, 1024); | ||
| 2866 | kfree(ses->serverDomain); | ||
| 2867 | ses->serverDomain = kzalloc(len + 1, | ||
| 2868 | GFP_KERNEL); | ||
| 2869 | if (ses->serverDomain == NULL) | ||
| 2870 | goto sesssetup_nomem; | ||
| 2871 | strncpy(ses->serverDomain, bcc_ptr, | ||
| 2872 | len); | ||
| 2873 | bcc_ptr += len; | ||
| 2874 | bcc_ptr[0] = 0; | ||
| 2875 | bcc_ptr++; | ||
| 2876 | } else | ||
| 2877 | cFYI(1, | ||
| 2878 | ("Variable field of length %d " | ||
| 2879 | "extends beyond end of smb ", | ||
| 2880 | len)); | ||
| 2881 | } | ||
| 2882 | } else { | ||
| 2883 | cERROR(1, ("Security Blob Length extends beyond " | ||
| 2884 | "end of SMB")); | ||
| 2885 | } | ||
| 2886 | } else { | ||
| 2887 | cERROR(1, ("Invalid Word count %d: ", | ||
| 2888 | smb_buffer_response->WordCount)); | ||
| 2889 | rc = -EIO; | ||
| 2890 | } | ||
| 2891 | sesssetup_nomem: /* do not return an error on nomem for the info strings, | ||
| 2892 | since that could make reconnection harder, and | ||
| 2893 | reconnection might be needed to free memory */ | ||
| 2894 | cifs_buf_release(smb_buffer); | ||
| 2895 | |||
| 2896 | return rc; | ||
| 2897 | } | ||
| 2898 | |||
| 2899 | static int | ||
| 2900 | CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, | ||
| 2901 | struct cifsSesInfo *ses, bool *pNTLMv2_flag, | ||
| 2902 | const struct nls_table *nls_codepage) | ||
| 2903 | { | ||
| 2904 | struct smb_hdr *smb_buffer; | ||
| 2905 | struct smb_hdr *smb_buffer_response; | ||
| 2906 | SESSION_SETUP_ANDX *pSMB; | ||
| 2907 | SESSION_SETUP_ANDX *pSMBr; | ||
| 2908 | char *bcc_ptr; | ||
| 2909 | char *domain; | ||
| 2910 | int rc = 0; | ||
| 2911 | int remaining_words = 0; | ||
| 2912 | int bytes_returned = 0; | ||
| 2913 | int len; | ||
| 2914 | int SecurityBlobLength = sizeof(NEGOTIATE_MESSAGE); | ||
| 2915 | PNEGOTIATE_MESSAGE SecurityBlob; | ||
| 2916 | PCHALLENGE_MESSAGE SecurityBlob2; | ||
| 2917 | __u32 negotiate_flags, capabilities; | ||
| 2918 | __u16 count; | ||
| 2919 | |||
| 2920 | cFYI(1, ("In NTLMSSP sesssetup (negotiate)")); | ||
| 2921 | if (ses == NULL) | ||
| 2922 | return -EINVAL; | ||
| 2923 | domain = ses->domainName; | ||
| 2924 | *pNTLMv2_flag = false; | ||
| 2925 | smb_buffer = cifs_buf_get(); | ||
| 2926 | if (smb_buffer == NULL) { | ||
| 2927 | return -ENOMEM; | ||
| 2928 | } | ||
| 2929 | smb_buffer_response = smb_buffer; | ||
| 2930 | pSMB = (SESSION_SETUP_ANDX *) smb_buffer; | ||
| 2931 | pSMBr = (SESSION_SETUP_ANDX *) smb_buffer_response; | ||
| 2932 | |||
| 2933 | /* send SMBsessionSetup here */ | ||
| 2934 | header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, | ||
| 2935 | NULL /* no tCon exists yet */ , 12 /* wct */ ); | ||
| 2936 | |||
| 2937 | smb_buffer->Mid = GetNextMid(ses->server); | ||
| 2938 | pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; | ||
| 2939 | pSMB->req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT); | ||
| 2940 | |||
| 2941 | pSMB->req.AndXCommand = 0xFF; | ||
| 2942 | pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf); | ||
| 2943 | pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq); | ||
| 2944 | |||
| 2945 | if (ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) | ||
| 2946 | smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; | ||
| 2947 | |||
| 2948 | capabilities = CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS | | ||
| 2949 | CAP_EXTENDED_SECURITY; | ||
| 2950 | if (ses->capabilities & CAP_UNICODE) { | ||
| 2951 | smb_buffer->Flags2 |= SMBFLG2_UNICODE; | ||
| 2952 | capabilities |= CAP_UNICODE; | ||
| 2953 | } | ||
| 2954 | if (ses->capabilities & CAP_STATUS32) { | ||
| 2955 | smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; | ||
| 2956 | capabilities |= CAP_STATUS32; | ||
| 2957 | } | ||
| 2958 | if (ses->capabilities & CAP_DFS) { | ||
| 2959 | smb_buffer->Flags2 |= SMBFLG2_DFS; | ||
| 2960 | capabilities |= CAP_DFS; | ||
| 2961 | } | ||
| 2962 | pSMB->req.Capabilities = cpu_to_le32(capabilities); | ||
| 2963 | |||
| 2964 | bcc_ptr = (char *) &pSMB->req.SecurityBlob; | ||
| 2965 | SecurityBlob = (PNEGOTIATE_MESSAGE) bcc_ptr; | ||
| 2966 | strncpy(SecurityBlob->Signature, NTLMSSP_SIGNATURE, 8); | ||
| 2967 | SecurityBlob->MessageType = NtLmNegotiate; | ||
| 2968 | negotiate_flags = | ||
| 2969 | NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_OEM | | ||
| 2970 | NTLMSSP_REQUEST_TARGET | NTLMSSP_NEGOTIATE_NTLM | | ||
| 2971 | NTLMSSP_NEGOTIATE_56 | | ||
| 2972 | /* NTLMSSP_NEGOTIATE_ALWAYS_SIGN | */ NTLMSSP_NEGOTIATE_128; | ||
| 2973 | if (sign_CIFS_PDUs) | ||
| 2974 | negotiate_flags |= NTLMSSP_NEGOTIATE_SIGN; | ||
| 2975 | /* if (ntlmv2_support) | ||
| 2976 | negotiate_flags |= NTLMSSP_NEGOTIATE_NTLMV2;*/ | ||
| 2977 | /* setup pointers to domain name and workstation name */ | ||
| 2978 | bcc_ptr += SecurityBlobLength; | ||
| 2979 | |||
| 2980 | SecurityBlob->WorkstationName.Buffer = 0; | ||
| 2981 | SecurityBlob->WorkstationName.Length = 0; | ||
| 2982 | SecurityBlob->WorkstationName.MaximumLength = 0; | ||
| 2983 | |||
| 2984 | /* Domain not sent on first Sesssetup in NTLMSSP, instead it is sent | ||
| 2985 | along with username on auth request (ie the response to challenge) */ | ||
| 2986 | SecurityBlob->DomainName.Buffer = 0; | ||
| 2987 | SecurityBlob->DomainName.Length = 0; | ||
| 2988 | SecurityBlob->DomainName.MaximumLength = 0; | ||
| 2989 | if (ses->capabilities & CAP_UNICODE) { | ||
| 2990 | if ((long) bcc_ptr % 2) { | ||
| 2991 | *bcc_ptr = 0; | ||
| 2992 | bcc_ptr++; | ||
| 2993 | } | ||
| 2994 | |||
| 2995 | bytes_returned = | ||
| 2996 | cifs_strtoUCS((__le16 *) bcc_ptr, "Linux version ", | ||
| 2997 | 32, nls_codepage); | ||
| 2998 | bcc_ptr += 2 * bytes_returned; | ||
| 2999 | bytes_returned = | ||
| 3000 | cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release, 32, | ||
| 3001 | nls_codepage); | ||
| 3002 | bcc_ptr += 2 * bytes_returned; | ||
| 3003 | bcc_ptr += 2; /* null terminate Linux version */ | ||
| 3004 | bytes_returned = | ||
| 3005 | cifs_strtoUCS((__le16 *) bcc_ptr, CIFS_NETWORK_OPSYS, | ||
| 3006 | 64, nls_codepage); | ||
| 3007 | bcc_ptr += 2 * bytes_returned; | ||
| 3008 | *(bcc_ptr + 1) = 0; | ||
| 3009 | *(bcc_ptr + 2) = 0; | ||
| 3010 | bcc_ptr += 2; /* null terminate network opsys string */ | ||
| 3011 | *(bcc_ptr + 1) = 0; | ||
| 3012 | *(bcc_ptr + 2) = 0; | ||
| 3013 | bcc_ptr += 2; /* null domain */ | ||
| 3014 | } else { /* ASCII */ | ||
| 3015 | strcpy(bcc_ptr, "Linux version "); | ||
| 3016 | bcc_ptr += strlen("Linux version "); | ||
| 3017 | strcpy(bcc_ptr, utsname()->release); | ||
| 3018 | bcc_ptr += strlen(utsname()->release) + 1; | ||
| 3019 | strcpy(bcc_ptr, CIFS_NETWORK_OPSYS); | ||
| 3020 | bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1; | ||
| 3021 | bcc_ptr++; /* empty domain field */ | ||
| 3022 | *bcc_ptr = 0; | ||
| 3023 | } | ||
| 3024 | SecurityBlob->NegotiateFlags = cpu_to_le32(negotiate_flags); | ||
| 3025 | pSMB->req.SecurityBlobLength = cpu_to_le16(SecurityBlobLength); | ||
| 3026 | count = (long) bcc_ptr - (long) pByteArea(smb_buffer); | ||
| 3027 | smb_buffer->smb_buf_length += count; | ||
| 3028 | pSMB->req.ByteCount = cpu_to_le16(count); | ||
| 3029 | |||
| 3030 | rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, | ||
| 3031 | &bytes_returned, CIFS_LONG_OP); | ||
| 3032 | |||
| 3033 | if (smb_buffer_response->Status.CifsError == | ||
| 3034 | cpu_to_le32(NT_STATUS_MORE_PROCESSING_REQUIRED)) | ||
| 3035 | rc = 0; | ||
| 3036 | |||
| 3037 | if (rc) { | ||
| 3038 | /* rc = map_smb_to_linux_error(smb_buffer_response); *//* done in SendReceive now */ | ||
| 3039 | } else if ((smb_buffer_response->WordCount == 3) | ||
| 3040 | || (smb_buffer_response->WordCount == 4)) { | ||
| 3041 | __u16 action = le16_to_cpu(pSMBr->resp.Action); | ||
| 3042 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); | ||
| 3043 | |||
| 3044 | if (action & GUEST_LOGIN) | ||
| 3045 | cFYI(1, ("Guest login")); | ||
| 3046 | /* Do we want to set anything in SesInfo struct when guest login? */ | ||
| 3047 | |||
| 3048 | bcc_ptr = pByteArea(smb_buffer_response); | ||
| 3049 | /* response can have either 3 or 4 word count - Samba sends 3 */ | ||
| 3050 | |||
| 3051 | SecurityBlob2 = (PCHALLENGE_MESSAGE) bcc_ptr; | ||
| 3052 | if (SecurityBlob2->MessageType != NtLmChallenge) { | ||
| 3053 | cFYI(1, ("Unexpected NTLMSSP message type received %d", | ||
| 3054 | SecurityBlob2->MessageType)); | ||
| 3055 | } else if (ses) { | ||
| 3056 | ses->Suid = smb_buffer_response->Uid; /* UID left in le format */ | ||
| 3057 | cFYI(1, ("UID = %d", ses->Suid)); | ||
| 3058 | if ((pSMBr->resp.hdr.WordCount == 3) | ||
| 3059 | || ((pSMBr->resp.hdr.WordCount == 4) | ||
| 3060 | && (blob_len < | ||
| 3061 | pSMBr->resp.ByteCount))) { | ||
| 3062 | |||
| 3063 | if (pSMBr->resp.hdr.WordCount == 4) { | ||
| 3064 | bcc_ptr += blob_len; | ||
| 3065 | cFYI(1, ("Security Blob Length %d", | ||
| 3066 | blob_len)); | ||
| 3067 | } | ||
| 3068 | |||
| 3069 | cFYI(1, ("NTLMSSP Challenge rcvd")); | ||
| 3070 | |||
| 3071 | memcpy(ses->server->cryptKey, | ||
| 3072 | SecurityBlob2->Challenge, | ||
| 3073 | CIFS_CRYPTO_KEY_SIZE); | ||
| 3074 | if (SecurityBlob2->NegotiateFlags & | ||
| 3075 | cpu_to_le32(NTLMSSP_NEGOTIATE_NTLMV2)) | ||
| 3076 | *pNTLMv2_flag = true; | ||
| 3077 | |||
| 3078 | if ((SecurityBlob2->NegotiateFlags & | ||
| 3079 | cpu_to_le32(NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) | ||
| 3080 | || (sign_CIFS_PDUs > 1)) | ||
| 3081 | ses->server->secMode |= | ||
| 3082 | SECMODE_SIGN_REQUIRED; | ||
| 3083 | if ((SecurityBlob2->NegotiateFlags & | ||
| 3084 | cpu_to_le32(NTLMSSP_NEGOTIATE_SIGN)) && (sign_CIFS_PDUs)) | ||
| 3085 | ses->server->secMode |= | ||
| 3086 | SECMODE_SIGN_ENABLED; | ||
| 3087 | |||
| 3088 | if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { | ||
| 3089 | if ((long) (bcc_ptr) % 2) { | ||
| 3090 | remaining_words = | ||
| 3091 | (BCC(smb_buffer_response) | ||
| 3092 | - 1) / 2; | ||
| 3093 | /* Must word align unicode strings */ | ||
| 3094 | bcc_ptr++; | ||
| 3095 | } else { | ||
| 3096 | remaining_words = | ||
| 3097 | BCC | ||
| 3098 | (smb_buffer_response) / 2; | ||
| 3099 | } | ||
| 3100 | len = | ||
| 3101 | UniStrnlen((wchar_t *) bcc_ptr, | ||
| 3102 | remaining_words - 1); | ||
| 3103 | /* We look for obvious messed up bcc or strings in response so we do not go off | ||
| 3104 | the end since (at least) WIN2K and Windows XP have a major bug in not null | ||
| 3105 | terminating last Unicode string in response */ | ||
| 3106 | kfree(ses->serverOS); | ||
| 3107 | ses->serverOS = | ||
| 3108 | kzalloc(2 * (len + 1), GFP_KERNEL); | ||
| 3109 | cifs_strfromUCS_le(ses->serverOS, | ||
| 3110 | (__le16 *) | ||
| 3111 | bcc_ptr, len, | ||
| 3112 | nls_codepage); | ||
| 3113 | bcc_ptr += 2 * (len + 1); | ||
| 3114 | remaining_words -= len + 1; | ||
| 3115 | ses->serverOS[2 * len] = 0; | ||
| 3116 | ses->serverOS[1 + (2 * len)] = 0; | ||
| 3117 | if (remaining_words > 0) { | ||
| 3118 | len = UniStrnlen((wchar_t *) | ||
| 3119 | bcc_ptr, | ||
| 3120 | remaining_words | ||
| 3121 | - 1); | ||
| 3122 | kfree(ses->serverNOS); | ||
| 3123 | ses->serverNOS = | ||
| 3124 | kzalloc(2 * (len + 1), | ||
| 3125 | GFP_KERNEL); | ||
| 3126 | cifs_strfromUCS_le(ses-> | ||
| 3127 | serverNOS, | ||
| 3128 | (__le16 *) | ||
| 3129 | bcc_ptr, | ||
| 3130 | len, | ||
| 3131 | nls_codepage); | ||
| 3132 | bcc_ptr += 2 * (len + 1); | ||
| 3133 | ses->serverNOS[2 * len] = 0; | ||
| 3134 | ses->serverNOS[1 + | ||
| 3135 | (2 * len)] = 0; | ||
| 3136 | remaining_words -= len + 1; | ||
| 3137 | if (remaining_words > 0) { | ||
| 3138 | len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words); | ||
| 3139 | /* last string not always null terminated | ||
| 3140 | (for e.g. for Windows XP & 2000) */ | ||
| 3141 | kfree(ses->serverDomain); | ||
| 3142 | ses->serverDomain = | ||
| 3143 | kzalloc(2 * | ||
| 3144 | (len + | ||
| 3145 | 1), | ||
| 3146 | GFP_KERNEL); | ||
| 3147 | cifs_strfromUCS_le | ||
| 3148 | (ses->serverDomain, | ||
| 3149 | (__le16 *)bcc_ptr, | ||
| 3150 | len, nls_codepage); | ||
| 3151 | bcc_ptr += | ||
| 3152 | 2 * (len + 1); | ||
| 3153 | ses->serverDomain[2*len] | ||
| 3154 | = 0; | ||
| 3155 | ses->serverDomain | ||
| 3156 | [1 + (2 * len)] | ||
| 3157 | = 0; | ||
| 3158 | } /* else no more room so create dummy domain string */ | ||
| 3159 | else { | ||
| 3160 | kfree(ses->serverDomain); | ||
| 3161 | ses->serverDomain = | ||
| 3162 | kzalloc(2, | ||
| 3163 | GFP_KERNEL); | ||
| 3164 | } | ||
| 3165 | } else { /* no room so create dummy domain and NOS string */ | ||
| 3166 | kfree(ses->serverDomain); | ||
| 3167 | ses->serverDomain = | ||
| 3168 | kzalloc(2, GFP_KERNEL); | ||
| 3169 | kfree(ses->serverNOS); | ||
| 3170 | ses->serverNOS = | ||
| 3171 | kzalloc(2, GFP_KERNEL); | ||
| 3172 | } | ||
| 3173 | } else { /* ASCII */ | ||
| 3174 | len = strnlen(bcc_ptr, 1024); | ||
| 3175 | if (((long) bcc_ptr + len) - (long) | ||
| 3176 | pByteArea(smb_buffer_response) | ||
| 3177 | <= BCC(smb_buffer_response)) { | ||
| 3178 | kfree(ses->serverOS); | ||
| 3179 | ses->serverOS = | ||
| 3180 | kzalloc(len + 1, | ||
| 3181 | GFP_KERNEL); | ||
| 3182 | strncpy(ses->serverOS, | ||
| 3183 | bcc_ptr, len); | ||
| 3184 | |||
| 3185 | bcc_ptr += len; | ||
| 3186 | bcc_ptr[0] = 0; /* null terminate string */ | ||
| 3187 | bcc_ptr++; | ||
| 3188 | |||
| 3189 | len = strnlen(bcc_ptr, 1024); | ||
| 3190 | kfree(ses->serverNOS); | ||
| 3191 | ses->serverNOS = | ||
| 3192 | kzalloc(len + 1, | ||
| 3193 | GFP_KERNEL); | ||
| 3194 | strncpy(ses->serverNOS, bcc_ptr, len); | ||
| 3195 | bcc_ptr += len; | ||
| 3196 | bcc_ptr[0] = 0; | ||
| 3197 | bcc_ptr++; | ||
| 3198 | |||
| 3199 | len = strnlen(bcc_ptr, 1024); | ||
| 3200 | kfree(ses->serverDomain); | ||
| 3201 | ses->serverDomain = | ||
| 3202 | kzalloc(len + 1, | ||
| 3203 | GFP_KERNEL); | ||
| 3204 | strncpy(ses->serverDomain, | ||
| 3205 | bcc_ptr, len); | ||
| 3206 | bcc_ptr += len; | ||
| 3207 | bcc_ptr[0] = 0; | ||
| 3208 | bcc_ptr++; | ||
| 3209 | } else | ||
| 3210 | cFYI(1, | ||
| 3211 | ("field of length %d " | ||
| 3212 | "extends beyond end of smb", | ||
| 3213 | len)); | ||
| 3214 | } | ||
| 3215 | } else { | ||
| 3216 | cERROR(1, ("Security Blob Length extends beyond" | ||
| 3217 | " end of SMB")); | ||
| 3218 | } | ||
| 3219 | } else { | ||
| 3220 | cERROR(1, ("No session structure passed in.")); | ||
| 3221 | } | ||
| 3222 | } else { | ||
| 3223 | cERROR(1, ("Invalid Word count %d:", | ||
| 3224 | smb_buffer_response->WordCount)); | ||
| 3225 | rc = -EIO; | ||
| 3226 | } | ||
| 3227 | |||
| 3228 | cifs_buf_release(smb_buffer); | ||
| 3229 | |||
| 3230 | return rc; | ||
| 3231 | } | ||
| 3232 | static int | ||
| 3233 | CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, | ||
| 3234 | char *ntlm_session_key, bool ntlmv2_flag, | ||
| 3235 | const struct nls_table *nls_codepage) | ||
| 3236 | { | ||
| 3237 | struct smb_hdr *smb_buffer; | ||
| 3238 | struct smb_hdr *smb_buffer_response; | ||
| 3239 | SESSION_SETUP_ANDX *pSMB; | ||
| 3240 | SESSION_SETUP_ANDX *pSMBr; | ||
| 3241 | char *bcc_ptr; | ||
| 3242 | char *user; | ||
| 3243 | char *domain; | ||
| 3244 | int rc = 0; | ||
| 3245 | int remaining_words = 0; | ||
| 3246 | int bytes_returned = 0; | ||
| 3247 | int len; | ||
| 3248 | int SecurityBlobLength = sizeof(AUTHENTICATE_MESSAGE); | ||
| 3249 | PAUTHENTICATE_MESSAGE SecurityBlob; | ||
| 3250 | __u32 negotiate_flags, capabilities; | ||
| 3251 | __u16 count; | ||
| 3252 | |||
| 3253 | cFYI(1, ("In NTLMSSPSessSetup (Authenticate)")); | ||
| 3254 | if (ses == NULL) | ||
| 3255 | return -EINVAL; | ||
| 3256 | user = ses->userName; | ||
| 3257 | domain = ses->domainName; | ||
| 3258 | smb_buffer = cifs_buf_get(); | ||
| 3259 | if (smb_buffer == NULL) { | ||
| 3260 | return -ENOMEM; | ||
| 3261 | } | ||
| 3262 | smb_buffer_response = smb_buffer; | ||
| 3263 | pSMB = (SESSION_SETUP_ANDX *)smb_buffer; | ||
| 3264 | pSMBr = (SESSION_SETUP_ANDX *)smb_buffer_response; | ||
| 3265 | |||
| 3266 | /* send SMBsessionSetup here */ | ||
| 3267 | header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, | ||
| 3268 | NULL /* no tCon exists yet */ , 12 /* wct */ ); | ||
| 3269 | |||
| 3270 | smb_buffer->Mid = GetNextMid(ses->server); | ||
| 3271 | pSMB->req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT); | ||
| 3272 | pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; | ||
| 3273 | pSMB->req.AndXCommand = 0xFF; | ||
| 3274 | pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf); | ||
| 3275 | pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq); | ||
| 3276 | |||
| 3277 | pSMB->req.hdr.Uid = ses->Suid; | ||
| 3278 | |||
| 3279 | if (ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) | ||
| 3280 | smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; | ||
| 3281 | |||
| 3282 | capabilities = CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS | | ||
| 3283 | CAP_EXTENDED_SECURITY; | ||
| 3284 | if (ses->capabilities & CAP_UNICODE) { | ||
| 3285 | smb_buffer->Flags2 |= SMBFLG2_UNICODE; | ||
| 3286 | capabilities |= CAP_UNICODE; | ||
| 3287 | } | ||
| 3288 | if (ses->capabilities & CAP_STATUS32) { | ||
| 3289 | smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; | ||
| 3290 | capabilities |= CAP_STATUS32; | ||
| 3291 | } | ||
| 3292 | if (ses->capabilities & CAP_DFS) { | ||
| 3293 | smb_buffer->Flags2 |= SMBFLG2_DFS; | ||
| 3294 | capabilities |= CAP_DFS; | ||
| 3295 | } | ||
| 3296 | pSMB->req.Capabilities = cpu_to_le32(capabilities); | ||
| 3297 | |||
| 3298 | bcc_ptr = (char *)&pSMB->req.SecurityBlob; | ||
| 3299 | SecurityBlob = (PAUTHENTICATE_MESSAGE)bcc_ptr; | ||
| 3300 | strncpy(SecurityBlob->Signature, NTLMSSP_SIGNATURE, 8); | ||
| 3301 | SecurityBlob->MessageType = NtLmAuthenticate; | ||
| 3302 | bcc_ptr += SecurityBlobLength; | ||
| 3303 | negotiate_flags = NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_REQUEST_TARGET | | ||
| 3304 | NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_TARGET_INFO | | ||
| 3305 | 0x80000000 | NTLMSSP_NEGOTIATE_128; | ||
| 3306 | if (sign_CIFS_PDUs) | ||
| 3307 | negotiate_flags |= /* NTLMSSP_NEGOTIATE_ALWAYS_SIGN |*/ NTLMSSP_NEGOTIATE_SIGN; | ||
| 3308 | if (ntlmv2_flag) | ||
| 3309 | negotiate_flags |= NTLMSSP_NEGOTIATE_NTLMV2; | ||
| 3310 | |||
| 3311 | /* setup pointers to domain name and workstation name */ | ||
| 3312 | |||
| 3313 | SecurityBlob->WorkstationName.Buffer = 0; | ||
| 3314 | SecurityBlob->WorkstationName.Length = 0; | ||
| 3315 | SecurityBlob->WorkstationName.MaximumLength = 0; | ||
| 3316 | SecurityBlob->SessionKey.Length = 0; | ||
| 3317 | SecurityBlob->SessionKey.MaximumLength = 0; | ||
| 3318 | SecurityBlob->SessionKey.Buffer = 0; | ||
| 3319 | |||
| 3320 | SecurityBlob->LmChallengeResponse.Length = 0; | ||
| 3321 | SecurityBlob->LmChallengeResponse.MaximumLength = 0; | ||
| 3322 | SecurityBlob->LmChallengeResponse.Buffer = 0; | ||
| 3323 | |||
| 3324 | SecurityBlob->NtChallengeResponse.Length = | ||
| 3325 | cpu_to_le16(CIFS_SESS_KEY_SIZE); | ||
| 3326 | SecurityBlob->NtChallengeResponse.MaximumLength = | ||
| 3327 | cpu_to_le16(CIFS_SESS_KEY_SIZE); | ||
| 3328 | memcpy(bcc_ptr, ntlm_session_key, CIFS_SESS_KEY_SIZE); | ||
| 3329 | SecurityBlob->NtChallengeResponse.Buffer = | ||
| 3330 | cpu_to_le32(SecurityBlobLength); | ||
| 3331 | SecurityBlobLength += CIFS_SESS_KEY_SIZE; | ||
| 3332 | bcc_ptr += CIFS_SESS_KEY_SIZE; | ||
| 3333 | |||
| 3334 | if (ses->capabilities & CAP_UNICODE) { | ||
| 3335 | if (domain == NULL) { | ||
| 3336 | SecurityBlob->DomainName.Buffer = 0; | ||
| 3337 | SecurityBlob->DomainName.Length = 0; | ||
| 3338 | SecurityBlob->DomainName.MaximumLength = 0; | ||
| 3339 | } else { | ||
| 3340 | __u16 ln = cifs_strtoUCS((__le16 *) bcc_ptr, domain, 64, | ||
| 3341 | nls_codepage); | ||
| 3342 | ln *= 2; | ||
| 3343 | SecurityBlob->DomainName.MaximumLength = | ||
| 3344 | cpu_to_le16(ln); | ||
| 3345 | SecurityBlob->DomainName.Buffer = | ||
| 3346 | cpu_to_le32(SecurityBlobLength); | ||
| 3347 | bcc_ptr += ln; | ||
| 3348 | SecurityBlobLength += ln; | ||
| 3349 | SecurityBlob->DomainName.Length = cpu_to_le16(ln); | ||
| 3350 | } | ||
| 3351 | if (user == NULL) { | ||
| 3352 | SecurityBlob->UserName.Buffer = 0; | ||
| 3353 | SecurityBlob->UserName.Length = 0; | ||
| 3354 | SecurityBlob->UserName.MaximumLength = 0; | ||
| 3355 | } else { | ||
| 3356 | __u16 ln = cifs_strtoUCS((__le16 *) bcc_ptr, user, 64, | ||
| 3357 | nls_codepage); | ||
| 3358 | ln *= 2; | ||
| 3359 | SecurityBlob->UserName.MaximumLength = | ||
| 3360 | cpu_to_le16(ln); | ||
| 3361 | SecurityBlob->UserName.Buffer = | ||
| 3362 | cpu_to_le32(SecurityBlobLength); | ||
| 3363 | bcc_ptr += ln; | ||
| 3364 | SecurityBlobLength += ln; | ||
| 3365 | SecurityBlob->UserName.Length = cpu_to_le16(ln); | ||
| 3366 | } | ||
| 3367 | |||
| 3368 | /* SecurityBlob->WorkstationName.Length = | ||
| 3369 | cifs_strtoUCS((__le16 *) bcc_ptr, "AMACHINE",64, nls_codepage); | ||
| 3370 | SecurityBlob->WorkstationName.Length *= 2; | ||
| 3371 | SecurityBlob->WorkstationName.MaximumLength = | ||
| 3372 | cpu_to_le16(SecurityBlob->WorkstationName.Length); | ||
| 3373 | SecurityBlob->WorkstationName.Buffer = | ||
| 3374 | cpu_to_le32(SecurityBlobLength); | ||
| 3375 | bcc_ptr += SecurityBlob->WorkstationName.Length; | ||
| 3376 | SecurityBlobLength += SecurityBlob->WorkstationName.Length; | ||
| 3377 | SecurityBlob->WorkstationName.Length = | ||
| 3378 | cpu_to_le16(SecurityBlob->WorkstationName.Length); */ | ||
| 3379 | |||
| 3380 | if ((long) bcc_ptr % 2) { | ||
| 3381 | *bcc_ptr = 0; | ||
| 3382 | bcc_ptr++; | ||
| 3383 | } | ||
| 3384 | bytes_returned = | ||
| 3385 | cifs_strtoUCS((__le16 *) bcc_ptr, "Linux version ", | ||
| 3386 | 32, nls_codepage); | ||
| 3387 | bcc_ptr += 2 * bytes_returned; | ||
| 3388 | bytes_returned = | ||
| 3389 | cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release, 32, | ||
| 3390 | nls_codepage); | ||
| 3391 | bcc_ptr += 2 * bytes_returned; | ||
| 3392 | bcc_ptr += 2; /* null term version string */ | ||
| 3393 | bytes_returned = | ||
| 3394 | cifs_strtoUCS((__le16 *) bcc_ptr, CIFS_NETWORK_OPSYS, | ||
| 3395 | 64, nls_codepage); | ||
| 3396 | bcc_ptr += 2 * bytes_returned; | ||
| 3397 | *(bcc_ptr + 1) = 0; | ||
| 3398 | *(bcc_ptr + 2) = 0; | ||
| 3399 | bcc_ptr += 2; /* null terminate network opsys string */ | ||
| 3400 | *(bcc_ptr + 1) = 0; | ||
| 3401 | *(bcc_ptr + 2) = 0; | ||
| 3402 | bcc_ptr += 2; /* null domain */ | ||
| 3403 | } else { /* ASCII */ | ||
| 3404 | if (domain == NULL) { | ||
| 3405 | SecurityBlob->DomainName.Buffer = 0; | ||
| 3406 | SecurityBlob->DomainName.Length = 0; | ||
| 3407 | SecurityBlob->DomainName.MaximumLength = 0; | ||
| 3408 | } else { | ||
| 3409 | __u16 ln; | ||
| 3410 | negotiate_flags |= NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED; | ||
| 3411 | strncpy(bcc_ptr, domain, 63); | ||
| 3412 | ln = strnlen(domain, 64); | ||
| 3413 | SecurityBlob->DomainName.MaximumLength = | ||
| 3414 | cpu_to_le16(ln); | ||
| 3415 | SecurityBlob->DomainName.Buffer = | ||
| 3416 | cpu_to_le32(SecurityBlobLength); | ||
| 3417 | bcc_ptr += ln; | ||
| 3418 | SecurityBlobLength += ln; | ||
| 3419 | SecurityBlob->DomainName.Length = cpu_to_le16(ln); | ||
| 3420 | } | ||
| 3421 | if (user == NULL) { | ||
| 3422 | SecurityBlob->UserName.Buffer = 0; | ||
| 3423 | SecurityBlob->UserName.Length = 0; | ||
| 3424 | SecurityBlob->UserName.MaximumLength = 0; | ||
| 3425 | } else { | ||
| 3426 | __u16 ln; | ||
| 3427 | strncpy(bcc_ptr, user, 63); | ||
| 3428 | ln = strnlen(user, 64); | ||
| 3429 | SecurityBlob->UserName.MaximumLength = cpu_to_le16(ln); | ||
| 3430 | SecurityBlob->UserName.Buffer = | ||
| 3431 | cpu_to_le32(SecurityBlobLength); | ||
| 3432 | bcc_ptr += ln; | ||
| 3433 | SecurityBlobLength += ln; | ||
| 3434 | SecurityBlob->UserName.Length = cpu_to_le16(ln); | ||
| 3435 | } | ||
| 3436 | /* BB fill in our workstation name if known BB */ | ||
| 3437 | |||
| 3438 | strcpy(bcc_ptr, "Linux version "); | ||
| 3439 | bcc_ptr += strlen("Linux version "); | ||
| 3440 | strcpy(bcc_ptr, utsname()->release); | ||
| 3441 | bcc_ptr += strlen(utsname()->release) + 1; | ||
| 3442 | strcpy(bcc_ptr, CIFS_NETWORK_OPSYS); | ||
| 3443 | bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1; | ||
| 3444 | bcc_ptr++; /* null domain */ | ||
| 3445 | *bcc_ptr = 0; | ||
| 3446 | } | ||
| 3447 | SecurityBlob->NegotiateFlags = cpu_to_le32(negotiate_flags); | ||
| 3448 | pSMB->req.SecurityBlobLength = cpu_to_le16(SecurityBlobLength); | ||
| 3449 | count = (long) bcc_ptr - (long) pByteArea(smb_buffer); | ||
| 3450 | smb_buffer->smb_buf_length += count; | ||
| 3451 | pSMB->req.ByteCount = cpu_to_le16(count); | ||
| 3452 | |||
| 3453 | rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, | ||
| 3454 | &bytes_returned, CIFS_LONG_OP); | ||
| 3455 | if (rc) { | ||
| 3456 | /* rc = map_smb_to_linux_error(smb_buffer_response) done in SendReceive now */ | ||
| 3457 | } else if ((smb_buffer_response->WordCount == 3) || | ||
| 3458 | (smb_buffer_response->WordCount == 4)) { | ||
| 3459 | __u16 action = le16_to_cpu(pSMBr->resp.Action); | ||
| 3460 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); | ||
| 3461 | if (action & GUEST_LOGIN) | ||
| 3462 | cFYI(1, ("Guest login")); /* BB Should we set anything | ||
| 3463 | in SesInfo struct ? */ | ||
| 3464 | /* if (SecurityBlob2->MessageType != NtLm??) { | ||
| 3465 | cFYI("Unexpected message type on auth response is %d")); | ||
| 3466 | } */ | ||
| 3467 | |||
| 3468 | if (ses) { | ||
| 3469 | cFYI(1, | ||
| 3470 | ("Check challenge UID %d vs auth response UID %d", | ||
| 3471 | ses->Suid, smb_buffer_response->Uid)); | ||
| 3472 | /* UID left in wire format */ | ||
| 3473 | ses->Suid = smb_buffer_response->Uid; | ||
| 3474 | bcc_ptr = pByteArea(smb_buffer_response); | ||
| 3475 | /* response can have either 3 or 4 word count - Samba sends 3 */ | ||
| 3476 | if ((pSMBr->resp.hdr.WordCount == 3) | ||
| 3477 | || ((pSMBr->resp.hdr.WordCount == 4) | ||
| 3478 | && (blob_len < | ||
| 3479 | pSMBr->resp.ByteCount))) { | ||
| 3480 | if (pSMBr->resp.hdr.WordCount == 4) { | ||
| 3481 | bcc_ptr += | ||
| 3482 | blob_len; | ||
| 3483 | cFYI(1, | ||
| 3484 | ("Security Blob Length %d ", | ||
| 3485 | blob_len)); | ||
| 3486 | } | ||
| 3487 | |||
| 3488 | cFYI(1, | ||
| 3489 | ("NTLMSSP response to Authenticate ")); | ||
| 3490 | |||
| 3491 | if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { | ||
| 3492 | if ((long) (bcc_ptr) % 2) { | ||
| 3493 | remaining_words = | ||
| 3494 | (BCC(smb_buffer_response) | ||
| 3495 | - 1) / 2; | ||
| 3496 | bcc_ptr++; /* Unicode strings must be word aligned */ | ||
| 3497 | } else { | ||
| 3498 | remaining_words = BCC(smb_buffer_response) / 2; | ||
| 3499 | } | ||
| 3500 | len = UniStrnlen((wchar_t *) bcc_ptr, | ||
| 3501 | remaining_words - 1); | ||
| 3502 | /* We look for obvious messed up bcc or strings in response so we do not go off | ||
| 3503 | the end since (at least) WIN2K and Windows XP have a major bug in not null | ||
| 3504 | terminating last Unicode string in response */ | ||
| 3505 | kfree(ses->serverOS); | ||
| 3506 | ses->serverOS = | ||
| 3507 | kzalloc(2 * (len + 1), GFP_KERNEL); | ||
| 3508 | cifs_strfromUCS_le(ses->serverOS, | ||
| 3509 | (__le16 *) | ||
| 3510 | bcc_ptr, len, | ||
| 3511 | nls_codepage); | ||
| 3512 | bcc_ptr += 2 * (len + 1); | ||
| 3513 | remaining_words -= len + 1; | ||
| 3514 | ses->serverOS[2 * len] = 0; | ||
| 3515 | ses->serverOS[1 + (2 * len)] = 0; | ||
| 3516 | if (remaining_words > 0) { | ||
| 3517 | len = UniStrnlen((wchar_t *) | ||
| 3518 | bcc_ptr, | ||
| 3519 | remaining_words | ||
| 3520 | - 1); | ||
| 3521 | kfree(ses->serverNOS); | ||
| 3522 | ses->serverNOS = | ||
| 3523 | kzalloc(2 * (len + 1), | ||
| 3524 | GFP_KERNEL); | ||
| 3525 | cifs_strfromUCS_le(ses-> | ||
| 3526 | serverNOS, | ||
| 3527 | (__le16 *) | ||
| 3528 | bcc_ptr, | ||
| 3529 | len, | ||
| 3530 | nls_codepage); | ||
| 3531 | bcc_ptr += 2 * (len + 1); | ||
| 3532 | ses->serverNOS[2 * len] = 0; | ||
| 3533 | ses->serverNOS[1+(2*len)] = 0; | ||
| 3534 | remaining_words -= len + 1; | ||
| 3535 | if (remaining_words > 0) { | ||
| 3536 | len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words); | ||
| 3537 | /* last string not always null terminated (e.g. for Windows XP & 2000) */ | ||
| 3538 | kfree(ses->serverDomain); | ||
| 3539 | ses->serverDomain = | ||
| 3540 | kzalloc(2 * | ||
| 3541 | (len + | ||
| 3542 | 1), | ||
| 3543 | GFP_KERNEL); | ||
| 3544 | cifs_strfromUCS_le | ||
| 3545 | (ses-> | ||
| 3546 | serverDomain, | ||
| 3547 | (__le16 *) | ||
| 3548 | bcc_ptr, len, | ||
| 3549 | nls_codepage); | ||
| 3550 | bcc_ptr += | ||
| 3551 | 2 * (len + 1); | ||
| 3552 | ses-> | ||
| 3553 | serverDomain[2 | ||
| 3554 | * len] | ||
| 3555 | = 0; | ||
| 3556 | ses-> | ||
| 3557 | serverDomain[1 | ||
| 3558 | + | ||
| 3559 | (2 | ||
| 3560 | * | ||
| 3561 | len)] | ||
| 3562 | = 0; | ||
| 3563 | } /* else no more room so create dummy domain string */ | ||
| 3564 | else { | ||
| 3565 | kfree(ses->serverDomain); | ||
| 3566 | ses->serverDomain = kzalloc(2,GFP_KERNEL); | ||
| 3567 | } | ||
| 3568 | } else { /* no room so create dummy domain and NOS string */ | ||
| 3569 | kfree(ses->serverDomain); | ||
| 3570 | ses->serverDomain = kzalloc(2, GFP_KERNEL); | ||
| 3571 | kfree(ses->serverNOS); | ||
| 3572 | ses->serverNOS = kzalloc(2, GFP_KERNEL); | ||
| 3573 | } | ||
| 3574 | } else { /* ASCII */ | ||
| 3575 | len = strnlen(bcc_ptr, 1024); | ||
| 3576 | if (((long) bcc_ptr + len) - | ||
| 3577 | (long) pByteArea(smb_buffer_response) | ||
| 3578 | <= BCC(smb_buffer_response)) { | ||
| 3579 | kfree(ses->serverOS); | ||
| 3580 | ses->serverOS = kzalloc(len + 1, GFP_KERNEL); | ||
| 3581 | strncpy(ses->serverOS,bcc_ptr, len); | ||
| 3582 | |||
| 3583 | bcc_ptr += len; | ||
| 3584 | bcc_ptr[0] = 0; /* null terminate the string */ | ||
| 3585 | bcc_ptr++; | ||
| 3586 | |||
| 3587 | len = strnlen(bcc_ptr, 1024); | ||
| 3588 | kfree(ses->serverNOS); | ||
| 3589 | ses->serverNOS = kzalloc(len+1, | ||
| 3590 | GFP_KERNEL); | ||
| 3591 | strncpy(ses->serverNOS, | ||
| 3592 | bcc_ptr, len); | ||
| 3593 | bcc_ptr += len; | ||
| 3594 | bcc_ptr[0] = 0; | ||
| 3595 | bcc_ptr++; | ||
| 3596 | |||
| 3597 | len = strnlen(bcc_ptr, 1024); | ||
| 3598 | kfree(ses->serverDomain); | ||
| 3599 | ses->serverDomain = | ||
| 3600 | kzalloc(len+1, | ||
| 3601 | GFP_KERNEL); | ||
| 3602 | strncpy(ses->serverDomain, | ||
| 3603 | bcc_ptr, len); | ||
| 3604 | bcc_ptr += len; | ||
| 3605 | bcc_ptr[0] = 0; | ||
| 3606 | bcc_ptr++; | ||
| 3607 | } else | ||
| 3608 | cFYI(1, ("field of length %d " | ||
| 3609 | "extends beyond end of smb ", | ||
| 3610 | len)); | ||
| 3611 | } | ||
| 3612 | } else { | ||
| 3613 | cERROR(1, ("Security Blob extends beyond end " | ||
| 3614 | "of SMB")); | ||
| 3615 | } | ||
| 3616 | } else { | ||
| 3617 | cERROR(1, ("No session structure passed in.")); | ||
| 3618 | } | ||
| 3619 | } else { | ||
| 3620 | cERROR(1, ("Invalid Word count %d: ", | ||
| 3621 | smb_buffer_response->WordCount)); | ||
| 3622 | rc = -EIO; | ||
| 3623 | } | ||
| 3624 | |||
| 3625 | cifs_buf_release(smb_buffer); | ||
| 3626 | |||
| 3627 | return rc; | ||
| 3628 | } | ||
| 3629 | |||
| 3630 | int | 2615 | int |
| 3631 | CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, | 2616 | CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, |
| 3632 | const char *tree, struct cifsTconInfo *tcon, | 2617 | const char *tree, struct cifsTconInfo *tcon, |
| @@ -3638,7 +2623,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, | |||
| 3638 | TCONX_RSP *pSMBr; | 2623 | TCONX_RSP *pSMBr; |
| 3639 | unsigned char *bcc_ptr; | 2624 | unsigned char *bcc_ptr; |
| 3640 | int rc = 0; | 2625 | int rc = 0; |
| 3641 | int length; | 2626 | int length, bytes_left; |
| 3642 | __u16 count; | 2627 | __u16 count; |
| 3643 | 2628 | ||
| 3644 | if (ses == NULL) | 2629 | if (ses == NULL) |
| @@ -3726,14 +2711,22 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, | |||
| 3726 | rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, &length, | 2711 | rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, &length, |
| 3727 | CIFS_STD_OP); | 2712 | CIFS_STD_OP); |
| 3728 | 2713 | ||
| 3729 | /* if (rc) rc = map_smb_to_linux_error(smb_buffer_response); */ | ||
| 3730 | /* above now done in SendReceive */ | 2714 | /* above now done in SendReceive */ |
| 3731 | if ((rc == 0) && (tcon != NULL)) { | 2715 | if ((rc == 0) && (tcon != NULL)) { |
| 2716 | bool is_unicode; | ||
| 2717 | |||
| 3732 | tcon->tidStatus = CifsGood; | 2718 | tcon->tidStatus = CifsGood; |
| 3733 | tcon->need_reconnect = false; | 2719 | tcon->need_reconnect = false; |
| 3734 | tcon->tid = smb_buffer_response->Tid; | 2720 | tcon->tid = smb_buffer_response->Tid; |
| 3735 | bcc_ptr = pByteArea(smb_buffer_response); | 2721 | bcc_ptr = pByteArea(smb_buffer_response); |
| 3736 | length = strnlen(bcc_ptr, BCC(smb_buffer_response) - 2); | 2722 | bytes_left = BCC(smb_buffer_response); |
| 2723 | length = strnlen(bcc_ptr, bytes_left - 2); | ||
| 2724 | if (smb_buffer->Flags2 & SMBFLG2_UNICODE) | ||
| 2725 | is_unicode = true; | ||
| 2726 | else | ||
| 2727 | is_unicode = false; | ||
| 2728 | |||
| 2729 | |||
| 3737 | /* skip service field (NB: this field is always ASCII) */ | 2730 | /* skip service field (NB: this field is always ASCII) */ |
| 3738 | if (length == 3) { | 2731 | if (length == 3) { |
| 3739 | if ((bcc_ptr[0] == 'I') && (bcc_ptr[1] == 'P') && | 2732 | if ((bcc_ptr[0] == 'I') && (bcc_ptr[1] == 'P') && |
| @@ -3748,39 +2741,16 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, | |||
| 3748 | } | 2741 | } |
| 3749 | } | 2742 | } |
| 3750 | bcc_ptr += length + 1; | 2743 | bcc_ptr += length + 1; |
| 2744 | bytes_left -= (length + 1); | ||
| 3751 | strncpy(tcon->treeName, tree, MAX_TREE_SIZE); | 2745 | strncpy(tcon->treeName, tree, MAX_TREE_SIZE); |
| 3752 | if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { | 2746 | |
| 3753 | length = UniStrnlen((wchar_t *) bcc_ptr, 512); | 2747 | /* mostly informational -- no need to fail on error here */ |
| 3754 | if ((bcc_ptr + (2 * length)) - | 2748 | tcon->nativeFileSystem = cifs_strndup_from_ucs(bcc_ptr, |
| 3755 | pByteArea(smb_buffer_response) <= | 2749 | bytes_left, is_unicode, |
| 3756 | BCC(smb_buffer_response)) { | 2750 | nls_codepage); |
| 3757 | kfree(tcon->nativeFileSystem); | 2751 | |
| 3758 | tcon->nativeFileSystem = | 2752 | cFYI(1, ("nativeFileSystem=%s", tcon->nativeFileSystem)); |
| 3759 | kzalloc((4 * length) + 2, GFP_KERNEL); | 2753 | |
| 3760 | if (tcon->nativeFileSystem) { | ||
| 3761 | cifs_strfromUCS_le( | ||
| 3762 | tcon->nativeFileSystem, | ||
| 3763 | (__le16 *) bcc_ptr, | ||
| 3764 | length, nls_codepage); | ||
| 3765 | cFYI(1, ("nativeFileSystem=%s", | ||
| 3766 | tcon->nativeFileSystem)); | ||
| 3767 | } | ||
| 3768 | } | ||
| 3769 | /* else do not bother copying these information fields*/ | ||
| 3770 | } else { | ||
| 3771 | length = strnlen(bcc_ptr, 1024); | ||
| 3772 | if ((bcc_ptr + length) - | ||
| 3773 | pByteArea(smb_buffer_response) <= | ||
| 3774 | BCC(smb_buffer_response)) { | ||
| 3775 | kfree(tcon->nativeFileSystem); | ||
| 3776 | tcon->nativeFileSystem = | ||
| 3777 | kzalloc(length + 1, GFP_KERNEL); | ||
| 3778 | if (tcon->nativeFileSystem) | ||
| 3779 | strncpy(tcon->nativeFileSystem, bcc_ptr, | ||
| 3780 | length); | ||
| 3781 | } | ||
| 3782 | /* else do not bother copying these information fields*/ | ||
| 3783 | } | ||
| 3784 | if ((smb_buffer_response->WordCount == 3) || | 2754 | if ((smb_buffer_response->WordCount == 3) || |
| 3785 | (smb_buffer_response->WordCount == 7)) | 2755 | (smb_buffer_response->WordCount == 7)) |
| 3786 | /* field is in same location */ | 2756 | /* field is in same location */ |
| @@ -3819,8 +2789,6 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
| 3819 | struct nls_table *nls_info) | 2789 | struct nls_table *nls_info) |
| 3820 | { | 2790 | { |
| 3821 | int rc = 0; | 2791 | int rc = 0; |
| 3822 | char ntlm_session_key[CIFS_SESS_KEY_SIZE]; | ||
| 3823 | bool ntlmv2_flag = false; | ||
| 3824 | int first_time = 0; | 2792 | int first_time = 0; |
| 3825 | struct TCP_Server_Info *server = pSesInfo->server; | 2793 | struct TCP_Server_Info *server = pSesInfo->server; |
| 3826 | 2794 | ||
| @@ -3852,83 +2820,19 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
| 3852 | pSesInfo->capabilities = server->capabilities; | 2820 | pSesInfo->capabilities = server->capabilities; |
| 3853 | if (linuxExtEnabled == 0) | 2821 | if (linuxExtEnabled == 0) |
| 3854 | pSesInfo->capabilities &= (~CAP_UNIX); | 2822 | pSesInfo->capabilities &= (~CAP_UNIX); |
| 3855 | /* pSesInfo->sequence_number = 0;*/ | 2823 | |
| 3856 | cFYI(1, ("Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d", | 2824 | cFYI(1, ("Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d", |
| 3857 | server->secMode, server->capabilities, server->timeAdj)); | 2825 | server->secMode, server->capabilities, server->timeAdj)); |
| 3858 | 2826 | ||
| 3859 | if (experimEnabled < 2) | 2827 | rc = CIFS_SessSetup(xid, pSesInfo, first_time, nls_info); |
| 3860 | rc = CIFS_SessSetup(xid, pSesInfo, first_time, nls_info); | ||
| 3861 | else if (extended_security | ||
| 3862 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) | ||
| 3863 | && (server->secType == NTLMSSP)) { | ||
| 3864 | rc = -EOPNOTSUPP; | ||
| 3865 | } else if (extended_security | ||
| 3866 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) | ||
| 3867 | && (server->secType == RawNTLMSSP)) { | ||
| 3868 | cFYI(1, ("NTLMSSP sesssetup")); | ||
| 3869 | rc = CIFSNTLMSSPNegotiateSessSetup(xid, pSesInfo, &ntlmv2_flag, | ||
| 3870 | nls_info); | ||
| 3871 | if (!rc) { | ||
| 3872 | if (ntlmv2_flag) { | ||
| 3873 | char *v2_response; | ||
| 3874 | cFYI(1, ("more secure NTLM ver2 hash")); | ||
| 3875 | if (CalcNTLMv2_partial_mac_key(pSesInfo, | ||
| 3876 | nls_info)) { | ||
| 3877 | rc = -ENOMEM; | ||
| 3878 | goto ss_err_exit; | ||
| 3879 | } else | ||
| 3880 | v2_response = kmalloc(16 + 64 /* blob*/, | ||
| 3881 | GFP_KERNEL); | ||
| 3882 | if (v2_response) { | ||
| 3883 | CalcNTLMv2_response(pSesInfo, | ||
| 3884 | v2_response); | ||
| 3885 | /* if (first_time) | ||
| 3886 | cifs_calculate_ntlmv2_mac_key */ | ||
| 3887 | kfree(v2_response); | ||
| 3888 | /* BB Put dummy sig in SessSetup PDU? */ | ||
| 3889 | } else { | ||
| 3890 | rc = -ENOMEM; | ||
| 3891 | goto ss_err_exit; | ||
| 3892 | } | ||
| 3893 | |||
| 3894 | } else { | ||
| 3895 | SMBNTencrypt(pSesInfo->password, | ||
| 3896 | server->cryptKey, | ||
| 3897 | ntlm_session_key); | ||
| 3898 | |||
| 3899 | if (first_time) | ||
| 3900 | cifs_calculate_mac_key( | ||
| 3901 | &server->mac_signing_key, | ||
| 3902 | ntlm_session_key, | ||
| 3903 | pSesInfo->password); | ||
| 3904 | } | ||
| 3905 | /* for better security the weaker lanman hash not sent | ||
| 3906 | in AuthSessSetup so we no longer calculate it */ | ||
| 3907 | |||
| 3908 | rc = CIFSNTLMSSPAuthSessSetup(xid, pSesInfo, | ||
| 3909 | ntlm_session_key, | ||
| 3910 | ntlmv2_flag, | ||
| 3911 | nls_info); | ||
| 3912 | } | ||
| 3913 | } else { /* old style NTLM 0.12 session setup */ | ||
| 3914 | SMBNTencrypt(pSesInfo->password, server->cryptKey, | ||
| 3915 | ntlm_session_key); | ||
| 3916 | |||
| 3917 | if (first_time) | ||
| 3918 | cifs_calculate_mac_key(&server->mac_signing_key, | ||
| 3919 | ntlm_session_key, | ||
| 3920 | pSesInfo->password); | ||
| 3921 | |||
| 3922 | rc = CIFSSessSetup(xid, pSesInfo, ntlm_session_key, nls_info); | ||
| 3923 | } | ||
| 3924 | if (rc) { | 2828 | if (rc) { |
| 3925 | cERROR(1, ("Send error in SessSetup = %d", rc)); | 2829 | cERROR(1, ("Send error in SessSetup = %d", rc)); |
| 3926 | } else { | 2830 | } else { |
| 3927 | cFYI(1, ("CIFS Session Established successfully")); | 2831 | cFYI(1, ("CIFS Session Established successfully")); |
| 3928 | spin_lock(&GlobalMid_Lock); | 2832 | spin_lock(&GlobalMid_Lock); |
| 3929 | pSesInfo->status = CifsGood; | 2833 | pSesInfo->status = CifsGood; |
| 3930 | pSesInfo->need_reconnect = false; | 2834 | pSesInfo->need_reconnect = false; |
| 3931 | spin_unlock(&GlobalMid_Lock); | 2835 | spin_unlock(&GlobalMid_Lock); |
| 3932 | } | 2836 | } |
| 3933 | 2837 | ||
| 3934 | ss_err_exit: | 2838 | ss_err_exit: |
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 461750e01364..11431ed72a7f 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
| @@ -281,6 +281,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, | |||
| 281 | int create_options = CREATE_NOT_DIR; | 281 | int create_options = CREATE_NOT_DIR; |
| 282 | int oplock = 0; | 282 | int oplock = 0; |
| 283 | int oflags; | 283 | int oflags; |
| 284 | bool posix_create = false; | ||
| 284 | /* | 285 | /* |
| 285 | * BB below access is probably too much for mknod to request | 286 | * BB below access is probably too much for mknod to request |
| 286 | * but we have to do query and setpathinfo so requesting | 287 | * but we have to do query and setpathinfo so requesting |
| @@ -328,11 +329,13 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, | |||
| 328 | negotation. EREMOTE indicates DFS junction, which is not | 329 | negotation. EREMOTE indicates DFS junction, which is not |
| 329 | handled in posix open */ | 330 | handled in posix open */ |
| 330 | 331 | ||
| 331 | if ((rc == 0) && (newinode == NULL)) | 332 | if (rc == 0) { |
| 332 | goto cifs_create_get_file_info; /* query inode info */ | 333 | posix_create = true; |
| 333 | else if (rc == 0) /* success, no need to query */ | 334 | if (newinode == NULL) /* query inode info */ |
| 334 | goto cifs_create_set_dentry; | 335 | goto cifs_create_get_file_info; |
| 335 | else if ((rc != -EIO) && (rc != -EREMOTE) && | 336 | else /* success, no need to query */ |
| 337 | goto cifs_create_set_dentry; | ||
| 338 | } else if ((rc != -EIO) && (rc != -EREMOTE) && | ||
| 336 | (rc != -EOPNOTSUPP)) /* path not found or net err */ | 339 | (rc != -EOPNOTSUPP)) /* path not found or net err */ |
| 337 | goto cifs_create_out; | 340 | goto cifs_create_out; |
| 338 | /* else fallthrough to retry, using older open call, this is | 341 | /* else fallthrough to retry, using older open call, this is |
| @@ -464,7 +467,7 @@ cifs_create_set_dentry: | |||
| 464 | if ((nd == NULL) || (!(nd->flags & LOOKUP_OPEN))) { | 467 | if ((nd == NULL) || (!(nd->flags & LOOKUP_OPEN))) { |
| 465 | /* mknod case - do not leave file open */ | 468 | /* mknod case - do not leave file open */ |
| 466 | CIFSSMBClose(xid, tcon, fileHandle); | 469 | CIFSSMBClose(xid, tcon, fileHandle); |
| 467 | } else if (newinode) { | 470 | } else if (!(posix_create) && (newinode)) { |
| 468 | cifs_fill_fileinfo(newinode, fileHandle, | 471 | cifs_fill_fileinfo(newinode, fileHandle, |
| 469 | cifs_sb->tcon, write_only); | 472 | cifs_sb->tcon, write_only); |
| 470 | } | 473 | } |
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 50ca088d8860..38c06f826575 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
| @@ -129,15 +129,12 @@ static inline int cifs_posix_open_inode_helper(struct inode *inode, | |||
| 129 | struct file *file, struct cifsInodeInfo *pCifsInode, | 129 | struct file *file, struct cifsInodeInfo *pCifsInode, |
| 130 | struct cifsFileInfo *pCifsFile, int oplock, u16 netfid) | 130 | struct cifsFileInfo *pCifsFile, int oplock, u16 netfid) |
| 131 | { | 131 | { |
| 132 | struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); | ||
| 133 | /* struct timespec temp; */ /* BB REMOVEME BB */ | ||
| 134 | 132 | ||
| 135 | file->private_data = kmalloc(sizeof(struct cifsFileInfo), GFP_KERNEL); | 133 | file->private_data = kmalloc(sizeof(struct cifsFileInfo), GFP_KERNEL); |
| 136 | if (file->private_data == NULL) | 134 | if (file->private_data == NULL) |
| 137 | return -ENOMEM; | 135 | return -ENOMEM; |
| 138 | pCifsFile = cifs_init_private(file->private_data, inode, file, netfid); | 136 | pCifsFile = cifs_init_private(file->private_data, inode, file, netfid); |
| 139 | write_lock(&GlobalSMBSeslock); | 137 | write_lock(&GlobalSMBSeslock); |
| 140 | list_add(&pCifsFile->tlist, &cifs_sb->tcon->openFileList); | ||
| 141 | 138 | ||
| 142 | pCifsInode = CIFS_I(file->f_path.dentry->d_inode); | 139 | pCifsInode = CIFS_I(file->f_path.dentry->d_inode); |
| 143 | if (pCifsInode == NULL) { | 140 | if (pCifsInode == NULL) { |
| @@ -145,17 +142,6 @@ static inline int cifs_posix_open_inode_helper(struct inode *inode, | |||
| 145 | return -EINVAL; | 142 | return -EINVAL; |
| 146 | } | 143 | } |
| 147 | 144 | ||
| 148 | /* want handles we can use to read with first | ||
| 149 | in the list so we do not have to walk the | ||
| 150 | list to search for one in write_begin */ | ||
| 151 | if ((file->f_flags & O_ACCMODE) == O_WRONLY) { | ||
| 152 | list_add_tail(&pCifsFile->flist, | ||
| 153 | &pCifsInode->openFileList); | ||
| 154 | } else { | ||
| 155 | list_add(&pCifsFile->flist, | ||
| 156 | &pCifsInode->openFileList); | ||
| 157 | } | ||
| 158 | |||
| 159 | if (pCifsInode->clientCanCacheRead) { | 145 | if (pCifsInode->clientCanCacheRead) { |
| 160 | /* we have the inode open somewhere else | 146 | /* we have the inode open somewhere else |
| 161 | no need to discard cache data */ | 147 | no need to discard cache data */ |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index f36b4e40e443..9c869a6dcba1 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -962,13 +962,21 @@ undo_setattr: | |||
| 962 | goto out_close; | 962 | goto out_close; |
| 963 | } | 963 | } |
| 964 | 964 | ||
| 965 | |||
| 966 | /* | ||
| 967 | * If dentry->d_inode is null (usually meaning the cached dentry | ||
| 968 | * is a negative dentry) then we would attempt a standard SMB delete, but | ||
| 969 | * if that fails we can not attempt the fall back mechanisms on EACESS | ||
| 970 | * but will return the EACESS to the caller. Note that the VFS does not call | ||
| 971 | * unlink on negative dentries currently. | ||
| 972 | */ | ||
| 965 | int cifs_unlink(struct inode *dir, struct dentry *dentry) | 973 | int cifs_unlink(struct inode *dir, struct dentry *dentry) |
| 966 | { | 974 | { |
| 967 | int rc = 0; | 975 | int rc = 0; |
| 968 | int xid; | 976 | int xid; |
| 969 | char *full_path = NULL; | 977 | char *full_path = NULL; |
| 970 | struct inode *inode = dentry->d_inode; | 978 | struct inode *inode = dentry->d_inode; |
| 971 | struct cifsInodeInfo *cifsInode = CIFS_I(inode); | 979 | struct cifsInodeInfo *cifs_inode; |
| 972 | struct super_block *sb = dir->i_sb; | 980 | struct super_block *sb = dir->i_sb; |
| 973 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | 981 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); |
| 974 | struct cifsTconInfo *tcon = cifs_sb->tcon; | 982 | struct cifsTconInfo *tcon = cifs_sb->tcon; |
| @@ -1012,7 +1020,7 @@ psx_del_no_retry: | |||
| 1012 | rc = cifs_rename_pending_delete(full_path, dentry, xid); | 1020 | rc = cifs_rename_pending_delete(full_path, dentry, xid); |
| 1013 | if (rc == 0) | 1021 | if (rc == 0) |
| 1014 | drop_nlink(inode); | 1022 | drop_nlink(inode); |
| 1015 | } else if (rc == -EACCES && dosattr == 0) { | 1023 | } else if ((rc == -EACCES) && (dosattr == 0) && inode) { |
| 1016 | attrs = kzalloc(sizeof(*attrs), GFP_KERNEL); | 1024 | attrs = kzalloc(sizeof(*attrs), GFP_KERNEL); |
| 1017 | if (attrs == NULL) { | 1025 | if (attrs == NULL) { |
| 1018 | rc = -ENOMEM; | 1026 | rc = -ENOMEM; |
| @@ -1020,7 +1028,8 @@ psx_del_no_retry: | |||
| 1020 | } | 1028 | } |
| 1021 | 1029 | ||
| 1022 | /* try to reset dos attributes */ | 1030 | /* try to reset dos attributes */ |
| 1023 | origattr = cifsInode->cifsAttrs; | 1031 | cifs_inode = CIFS_I(inode); |
| 1032 | origattr = cifs_inode->cifsAttrs; | ||
| 1024 | if (origattr == 0) | 1033 | if (origattr == 0) |
| 1025 | origattr |= ATTR_NORMAL; | 1034 | origattr |= ATTR_NORMAL; |
| 1026 | dosattr = origattr & ~ATTR_READONLY; | 1035 | dosattr = origattr & ~ATTR_READONLY; |
| @@ -1041,13 +1050,13 @@ psx_del_no_retry: | |||
| 1041 | 1050 | ||
| 1042 | out_reval: | 1051 | out_reval: |
| 1043 | if (inode) { | 1052 | if (inode) { |
| 1044 | cifsInode = CIFS_I(inode); | 1053 | cifs_inode = CIFS_I(inode); |
| 1045 | cifsInode->time = 0; /* will force revalidate to get info | 1054 | cifs_inode->time = 0; /* will force revalidate to get info |
| 1046 | when needed */ | 1055 | when needed */ |
| 1047 | inode->i_ctime = current_fs_time(sb); | 1056 | inode->i_ctime = current_fs_time(sb); |
| 1048 | } | 1057 | } |
| 1049 | dir->i_ctime = dir->i_mtime = current_fs_time(sb); | 1058 | dir->i_ctime = dir->i_mtime = current_fs_time(sb); |
| 1050 | cifsInode = CIFS_I(dir); | 1059 | cifs_inode = CIFS_I(dir); |
| 1051 | CIFS_I(dir)->time = 0; /* force revalidate of dir as well */ | 1060 | CIFS_I(dir)->time = 0; /* force revalidate of dir as well */ |
| 1052 | 1061 | ||
| 1053 | kfree(full_path); | 1062 | kfree(full_path); |
diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 63f644000ce5..ea9d11e3dcbb 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c | |||
| @@ -119,16 +119,11 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd) | |||
| 119 | full_path = build_path_from_dentry(direntry); | 119 | full_path = build_path_from_dentry(direntry); |
| 120 | 120 | ||
| 121 | if (!full_path) | 121 | if (!full_path) |
| 122 | goto out_no_free; | 122 | goto out; |
| 123 | 123 | ||
| 124 | cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode)); | 124 | cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode)); |
| 125 | cifs_sb = CIFS_SB(inode->i_sb); | 125 | cifs_sb = CIFS_SB(inode->i_sb); |
| 126 | pTcon = cifs_sb->tcon; | 126 | pTcon = cifs_sb->tcon; |
| 127 | target_path = kmalloc(PATH_MAX, GFP_KERNEL); | ||
| 128 | if (!target_path) { | ||
| 129 | target_path = ERR_PTR(-ENOMEM); | ||
| 130 | goto out; | ||
| 131 | } | ||
| 132 | 127 | ||
| 133 | /* We could change this to: | 128 | /* We could change this to: |
| 134 | if (pTcon->unix_ext) | 129 | if (pTcon->unix_ext) |
| @@ -138,8 +133,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd) | |||
| 138 | 133 | ||
| 139 | if (pTcon->ses->capabilities & CAP_UNIX) | 134 | if (pTcon->ses->capabilities & CAP_UNIX) |
| 140 | rc = CIFSSMBUnixQuerySymLink(xid, pTcon, full_path, | 135 | rc = CIFSSMBUnixQuerySymLink(xid, pTcon, full_path, |
| 141 | target_path, | 136 | &target_path, |
| 142 | PATH_MAX-1, | ||
| 143 | cifs_sb->local_nls); | 137 | cifs_sb->local_nls); |
| 144 | else { | 138 | else { |
| 145 | /* BB add read reparse point symlink code here */ | 139 | /* BB add read reparse point symlink code here */ |
| @@ -148,22 +142,16 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd) | |||
| 148 | /* BB Add MAC style xsymlink check here if enabled */ | 142 | /* BB Add MAC style xsymlink check here if enabled */ |
| 149 | } | 143 | } |
| 150 | 144 | ||
| 151 | if (rc == 0) { | 145 | if (rc != 0) { |
| 152 | |||
| 153 | /* BB Add special case check for Samba DFS symlinks */ | ||
| 154 | |||
| 155 | target_path[PATH_MAX-1] = 0; | ||
| 156 | } else { | ||
| 157 | kfree(target_path); | 146 | kfree(target_path); |
| 158 | target_path = ERR_PTR(rc); | 147 | target_path = ERR_PTR(rc); |
| 159 | } | 148 | } |
| 160 | 149 | ||
| 161 | out: | ||
| 162 | kfree(full_path); | 150 | kfree(full_path); |
| 163 | out_no_free: | 151 | out: |
| 164 | FreeXid(xid); | 152 | FreeXid(xid); |
| 165 | nd_set_link(nd, target_path); | 153 | nd_set_link(nd, target_path); |
| 166 | return NULL; /* No cookie */ | 154 | return NULL; |
| 167 | } | 155 | } |
| 168 | 156 | ||
| 169 | int | 157 | int |
| @@ -224,98 +212,6 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname) | |||
| 224 | return rc; | 212 | return rc; |
| 225 | } | 213 | } |
| 226 | 214 | ||
| 227 | int | ||
| 228 | cifs_readlink(struct dentry *direntry, char __user *pBuffer, int buflen) | ||
| 229 | { | ||
| 230 | struct inode *inode = direntry->d_inode; | ||
| 231 | int rc = -EACCES; | ||
| 232 | int xid; | ||
| 233 | int oplock = 0; | ||
| 234 | struct cifs_sb_info *cifs_sb; | ||
| 235 | struct cifsTconInfo *pTcon; | ||
| 236 | char *full_path = NULL; | ||
| 237 | char *tmpbuffer; | ||
| 238 | int len; | ||
| 239 | __u16 fid; | ||
| 240 | |||
| 241 | xid = GetXid(); | ||
| 242 | cifs_sb = CIFS_SB(inode->i_sb); | ||
| 243 | pTcon = cifs_sb->tcon; | ||
| 244 | |||
| 245 | /* BB would it be safe against deadlock to grab this sem | ||
| 246 | even though rename itself grabs the sem and calls lookup? */ | ||
| 247 | /* mutex_lock(&inode->i_sb->s_vfs_rename_mutex);*/ | ||
| 248 | full_path = build_path_from_dentry(direntry); | ||
| 249 | /* mutex_unlock(&inode->i_sb->s_vfs_rename_mutex);*/ | ||
| 250 | |||
| 251 | if (full_path == NULL) { | ||
| 252 | FreeXid(xid); | ||
| 253 | return -ENOMEM; | ||
| 254 | } | ||
| 255 | |||
| 256 | cFYI(1, | ||
| 257 | ("Full path: %s inode = 0x%p pBuffer = 0x%p buflen = %d", | ||
| 258 | full_path, inode, pBuffer, buflen)); | ||
| 259 | if (buflen > PATH_MAX) | ||
| 260 | len = PATH_MAX; | ||
| 261 | else | ||
| 262 | len = buflen; | ||
| 263 | tmpbuffer = kmalloc(len, GFP_KERNEL); | ||
| 264 | if (tmpbuffer == NULL) { | ||
| 265 | kfree(full_path); | ||
| 266 | FreeXid(xid); | ||
| 267 | return -ENOMEM; | ||
| 268 | } | ||
| 269 | |||
| 270 | /* BB add read reparse point symlink code and | ||
| 271 | Unix extensions symlink code here BB */ | ||
| 272 | /* We could disable this based on pTcon->unix_ext flag instead ... but why? */ | ||
| 273 | if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) | ||
| 274 | rc = CIFSSMBUnixQuerySymLink(xid, pTcon, full_path, | ||
| 275 | tmpbuffer, | ||
| 276 | len - 1, | ||
| 277 | cifs_sb->local_nls); | ||
| 278 | else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) { | ||
| 279 | cERROR(1, ("SFU style symlinks not implemented yet")); | ||
| 280 | /* add open and read as in fs/cifs/inode.c */ | ||
| 281 | } else { | ||
| 282 | rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, GENERIC_READ, | ||
| 283 | OPEN_REPARSE_POINT, &fid, &oplock, NULL, | ||
| 284 | cifs_sb->local_nls, | ||
| 285 | cifs_sb->mnt_cifs_flags & | ||
| 286 | CIFS_MOUNT_MAP_SPECIAL_CHR); | ||
| 287 | if (!rc) { | ||
| 288 | rc = CIFSSMBQueryReparseLinkInfo(xid, pTcon, full_path, | ||
| 289 | tmpbuffer, | ||
| 290 | len - 1, | ||
| 291 | fid, | ||
| 292 | cifs_sb->local_nls); | ||
| 293 | if (CIFSSMBClose(xid, pTcon, fid)) { | ||
| 294 | cFYI(1, ("Error closing junction point " | ||
| 295 | "(open for ioctl)")); | ||
| 296 | } | ||
| 297 | /* If it is a DFS junction earlier we would have gotten | ||
| 298 | PATH_NOT_COVERED returned from server so we do | ||
| 299 | not need to request the DFS info here */ | ||
| 300 | } | ||
| 301 | } | ||
| 302 | /* BB Anything else to do to handle recursive links? */ | ||
| 303 | /* BB Should we be using page ops here? */ | ||
| 304 | |||
| 305 | /* BB null terminate returned string in pBuffer? BB */ | ||
| 306 | if (rc == 0) { | ||
| 307 | rc = vfs_readlink(direntry, pBuffer, len, tmpbuffer); | ||
| 308 | cFYI(1, | ||
| 309 | ("vfs_readlink called from cifs_readlink returned %d", | ||
| 310 | rc)); | ||
| 311 | } | ||
| 312 | |||
| 313 | kfree(tmpbuffer); | ||
| 314 | kfree(full_path); | ||
| 315 | FreeXid(xid); | ||
| 316 | return rc; | ||
| 317 | } | ||
| 318 | |||
| 319 | void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) | 215 | void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) |
| 320 | { | 216 | { |
| 321 | char *p = nd_get_link(nd); | 217 | char *p = nd_get_link(nd); |
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 4c89c572891a..e079a9190ec4 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c | |||
| @@ -635,77 +635,6 @@ dump_smb(struct smb_hdr *smb_buf, int smb_buf_length) | |||
| 635 | return; | 635 | return; |
| 636 | } | 636 | } |
| 637 | 637 | ||
| 638 | /* Windows maps these to the user defined 16 bit Unicode range since they are | ||
| 639 | reserved symbols (along with \ and /), otherwise illegal to store | ||
| 640 | in filenames in NTFS */ | ||
| 641 | #define UNI_ASTERIK (__u16) ('*' + 0xF000) | ||
| 642 | #define UNI_QUESTION (__u16) ('?' + 0xF000) | ||
| 643 | #define UNI_COLON (__u16) (':' + 0xF000) | ||
| 644 | #define UNI_GRTRTHAN (__u16) ('>' + 0xF000) | ||
| 645 | #define UNI_LESSTHAN (__u16) ('<' + 0xF000) | ||
| 646 | #define UNI_PIPE (__u16) ('|' + 0xF000) | ||
| 647 | #define UNI_SLASH (__u16) ('\\' + 0xF000) | ||
| 648 | |||
| 649 | /* Convert 16 bit Unicode pathname from wire format to string in current code | ||
| 650 | page. Conversion may involve remapping up the seven characters that are | ||
| 651 | only legal in POSIX-like OS (if they are present in the string). Path | ||
| 652 | names are little endian 16 bit Unicode on the wire */ | ||
| 653 | int | ||
| 654 | cifs_convertUCSpath(char *target, const __le16 *source, int maxlen, | ||
| 655 | const struct nls_table *cp) | ||
| 656 | { | ||
| 657 | int i, j, len; | ||
| 658 | __u16 src_char; | ||
| 659 | |||
| 660 | for (i = 0, j = 0; i < maxlen; i++) { | ||
| 661 | src_char = le16_to_cpu(source[i]); | ||
| 662 | switch (src_char) { | ||
| 663 | case 0: | ||
| 664 | goto cUCS_out; /* BB check this BB */ | ||
| 665 | case UNI_COLON: | ||
| 666 | target[j] = ':'; | ||
| 667 | break; | ||
| 668 | case UNI_ASTERIK: | ||
| 669 | target[j] = '*'; | ||
| 670 | break; | ||
| 671 | case UNI_QUESTION: | ||
| 672 | target[j] = '?'; | ||
| 673 | break; | ||
| 674 | /* BB We can not handle remapping slash until | ||
| 675 | all the calls to build_path_from_dentry | ||
| 676 | are modified, as they use slash as separator BB */ | ||
| 677 | /* case UNI_SLASH: | ||
| 678 | target[j] = '\\'; | ||
| 679 | break;*/ | ||
| 680 | case UNI_PIPE: | ||
| 681 | target[j] = '|'; | ||
| 682 | break; | ||
| 683 | case UNI_GRTRTHAN: | ||
| 684 | target[j] = '>'; | ||
| 685 | break; | ||
| 686 | case UNI_LESSTHAN: | ||
| 687 | target[j] = '<'; | ||
| 688 | break; | ||
| 689 | default: | ||
| 690 | len = cp->uni2char(src_char, &target[j], | ||
| 691 | NLS_MAX_CHARSET_SIZE); | ||
| 692 | if (len > 0) { | ||
| 693 | j += len; | ||
| 694 | continue; | ||
| 695 | } else { | ||
| 696 | target[j] = '?'; | ||
| 697 | } | ||
| 698 | } | ||
| 699 | j++; | ||
| 700 | /* make sure we do not overrun callers allocated temp buffer */ | ||
| 701 | if (j >= (2 * NAME_MAX)) | ||
| 702 | break; | ||
| 703 | } | ||
| 704 | cUCS_out: | ||
| 705 | target[j] = 0; | ||
| 706 | return j; | ||
| 707 | } | ||
| 708 | |||
| 709 | /* Convert 16 bit Unicode pathname to wire format from string in current code | 638 | /* Convert 16 bit Unicode pathname to wire format from string in current code |
| 710 | page. Conversion may involve remapping up the seven characters that are | 639 | page. Conversion may involve remapping up the seven characters that are |
| 711 | only legal in POSIX-like OS (if they are present in the string). Path | 640 | only legal in POSIX-like OS (if they are present in the string). Path |
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index 8703d68f5b20..e2fe998989a3 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c | |||
| @@ -79,6 +79,7 @@ static const struct smb_to_posix_error mapping_table_ERRDOS[] = { | |||
| 79 | {ErrQuota, -EDQUOT}, | 79 | {ErrQuota, -EDQUOT}, |
| 80 | {ErrNotALink, -ENOLINK}, | 80 | {ErrNotALink, -ENOLINK}, |
| 81 | {ERRnetlogonNotStarted, -ENOPROTOOPT}, | 81 | {ERRnetlogonNotStarted, -ENOPROTOOPT}, |
| 82 | {ERRsymlink, -EOPNOTSUPP}, | ||
| 82 | {ErrTooManyLinks, -EMLINK}, | 83 | {ErrTooManyLinks, -EMLINK}, |
| 83 | {0, 0} | 84 | {0, 0} |
| 84 | }; | 85 | }; |
| @@ -714,6 +715,7 @@ static const struct { | |||
| 714 | ERRDOS, ERRnoaccess, 0xc000028f}, { | 715 | ERRDOS, ERRnoaccess, 0xc000028f}, { |
| 715 | ERRDOS, ERRnoaccess, 0xc0000290}, { | 716 | ERRDOS, ERRnoaccess, 0xc0000290}, { |
| 716 | ERRDOS, ERRbadfunc, 0xc000029c}, { | 717 | ERRDOS, ERRbadfunc, 0xc000029c}, { |
| 718 | ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, { | ||
| 717 | ERRDOS, ERRinvlevel, 0x007c0001}, }; | 719 | ERRDOS, ERRinvlevel, 0x007c0001}, }; |
| 718 | 720 | ||
| 719 | /***************************************************************************** | 721 | /***************************************************************************** |
diff --git a/fs/cifs/nterr.h b/fs/cifs/nterr.h index 588abbb9d08c..257267367d41 100644 --- a/fs/cifs/nterr.h +++ b/fs/cifs/nterr.h | |||
| @@ -35,8 +35,6 @@ struct nt_err_code_struct { | |||
| 35 | extern const struct nt_err_code_struct nt_errs[]; | 35 | extern const struct nt_err_code_struct nt_errs[]; |
| 36 | 36 | ||
| 37 | /* Win32 Status codes. */ | 37 | /* Win32 Status codes. */ |
| 38 | |||
| 39 | #define STATUS_BUFFER_OVERFLOW 0x80000005 | ||
| 40 | #define STATUS_MORE_ENTRIES 0x0105 | 38 | #define STATUS_MORE_ENTRIES 0x0105 |
| 41 | #define ERROR_INVALID_PARAMETER 0x0057 | 39 | #define ERROR_INVALID_PARAMETER 0x0057 |
| 42 | #define ERROR_INSUFFICIENT_BUFFER 0x007a | 40 | #define ERROR_INSUFFICIENT_BUFFER 0x007a |
| @@ -50,6 +48,13 @@ extern const struct nt_err_code_struct nt_errs[]; | |||
| 50 | #define STATUS_SOME_UNMAPPED 0x0107 | 48 | #define STATUS_SOME_UNMAPPED 0x0107 |
| 51 | #define STATUS_BUFFER_OVERFLOW 0x80000005 | 49 | #define STATUS_BUFFER_OVERFLOW 0x80000005 |
| 52 | #define NT_STATUS_NO_MORE_ENTRIES 0x8000001a | 50 | #define NT_STATUS_NO_MORE_ENTRIES 0x8000001a |
| 51 | #define NT_STATUS_MEDIA_CHANGED 0x8000001c | ||
| 52 | #define NT_STATUS_END_OF_MEDIA 0x8000001e | ||
| 53 | #define NT_STATUS_MEDIA_CHECK 0x80000020 | ||
| 54 | #define NT_STATUS_NO_DATA_DETECTED 0x8000001c | ||
| 55 | #define NT_STATUS_STOPPED_ON_SYMLINK 0x8000002d | ||
| 56 | #define NT_STATUS_DEVICE_REQUIRES_CLEANING 0x80000288 | ||
| 57 | #define NT_STATUS_DEVICE_DOOR_OPEN 0x80000288 | ||
| 53 | #define NT_STATUS_UNSUCCESSFUL 0xC0000000 | 0x0001 | 58 | #define NT_STATUS_UNSUCCESSFUL 0xC0000000 | 0x0001 |
| 54 | #define NT_STATUS_NOT_IMPLEMENTED 0xC0000000 | 0x0002 | 59 | #define NT_STATUS_NOT_IMPLEMENTED 0xC0000000 | 0x0002 |
| 55 | #define NT_STATUS_INVALID_INFO_CLASS 0xC0000000 | 0x0003 | 60 | #define NT_STATUS_INVALID_INFO_CLASS 0xC0000000 | 0x0003 |
diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h index c377d8065d99..49c9a4e75319 100644 --- a/fs/cifs/ntlmssp.h +++ b/fs/cifs/ntlmssp.h | |||
| @@ -27,29 +27,39 @@ | |||
| 27 | #define UnknownMessage cpu_to_le32(8) | 27 | #define UnknownMessage cpu_to_le32(8) |
| 28 | 28 | ||
| 29 | /* Negotiate Flags */ | 29 | /* Negotiate Flags */ |
| 30 | #define NTLMSSP_NEGOTIATE_UNICODE 0x01 /* Text strings are in unicode */ | 30 | #define NTLMSSP_NEGOTIATE_UNICODE 0x01 /* Text strings are unicode */ |
| 31 | #define NTLMSSP_NEGOTIATE_OEM 0x02 /* Text strings are in OEM */ | 31 | #define NTLMSSP_NEGOTIATE_OEM 0x02 /* Text strings are in OEM */ |
| 32 | #define NTLMSSP_REQUEST_TARGET 0x04 /* Server return its auth realm */ | 32 | #define NTLMSSP_REQUEST_TARGET 0x04 /* Srv returns its auth realm */ |
| 33 | #define NTLMSSP_NEGOTIATE_SIGN 0x0010 /* Request signature capability */ | 33 | /* define reserved9 0x08 */ |
| 34 | #define NTLMSSP_NEGOTIATE_SEAL 0x0020 /* Request confidentiality */ | 34 | #define NTLMSSP_NEGOTIATE_SIGN 0x0010 /* Request signing capability */ |
| 35 | #define NTLMSSP_NEGOTIATE_DGRAM 0x0040 | 35 | #define NTLMSSP_NEGOTIATE_SEAL 0x0020 /* Request confidentiality */ |
| 36 | #define NTLMSSP_NEGOTIATE_LM_KEY 0x0080 /* Sign/seal use LM session key */ | 36 | #define NTLMSSP_NEGOTIATE_DGRAM 0x0040 |
| 37 | #define NTLMSSP_NEGOTIATE_NTLM 0x0200 /* NTLM authentication */ | 37 | #define NTLMSSP_NEGOTIATE_LM_KEY 0x0080 /* Use LM session key */ |
| 38 | #define NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED 0x1000 | 38 | /* defined reserved 8 0x0100 */ |
| 39 | #define NTLMSSP_NEGOTIATE_NTLM 0x0200 /* NTLM authentication */ | ||
| 40 | #define NTLMSSP_NEGOTIATE_NT_ONLY 0x0400 /* Lanman not allowed */ | ||
| 41 | #define NTLMSSP_ANONYMOUS 0x0800 | ||
| 42 | #define NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED 0x1000 /* reserved6 */ | ||
| 39 | #define NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED 0x2000 | 43 | #define NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED 0x2000 |
| 40 | #define NTLMSSP_NEGOTIATE_LOCAL_CALL 0x4000 /* client/server on same machine */ | 44 | #define NTLMSSP_NEGOTIATE_LOCAL_CALL 0x4000 /* client/server same machine */ |
| 41 | #define NTLMSSP_NEGOTIATE_ALWAYS_SIGN 0x8000 /* Sign for all security levels */ | 45 | #define NTLMSSP_NEGOTIATE_ALWAYS_SIGN 0x8000 /* Sign. All security levels */ |
| 42 | #define NTLMSSP_TARGET_TYPE_DOMAIN 0x10000 | 46 | #define NTLMSSP_TARGET_TYPE_DOMAIN 0x10000 |
| 43 | #define NTLMSSP_TARGET_TYPE_SERVER 0x20000 | 47 | #define NTLMSSP_TARGET_TYPE_SERVER 0x20000 |
| 44 | #define NTLMSSP_TARGET_TYPE_SHARE 0x40000 | 48 | #define NTLMSSP_TARGET_TYPE_SHARE 0x40000 |
| 45 | #define NTLMSSP_NEGOTIATE_NTLMV2 0x80000 | 49 | #define NTLMSSP_NEGOTIATE_EXTENDED_SEC 0x80000 /* NB:not related to NTLMv2 pwd*/ |
| 46 | #define NTLMSSP_REQUEST_INIT_RESP 0x100000 | 50 | /* #define NTLMSSP_REQUEST_INIT_RESP 0x100000 */ |
| 47 | #define NTLMSSP_REQUEST_ACCEPT_RESP 0x200000 | 51 | #define NTLMSSP_NEGOTIATE_IDENTIFY 0x100000 |
| 48 | #define NTLMSSP_REQUEST_NOT_NT_KEY 0x400000 | 52 | #define NTLMSSP_REQUEST_ACCEPT_RESP 0x200000 /* reserved5 */ |
| 53 | #define NTLMSSP_REQUEST_NON_NT_KEY 0x400000 | ||
| 49 | #define NTLMSSP_NEGOTIATE_TARGET_INFO 0x800000 | 54 | #define NTLMSSP_NEGOTIATE_TARGET_INFO 0x800000 |
| 50 | #define NTLMSSP_NEGOTIATE_128 0x20000000 | 55 | /* #define reserved4 0x1000000 */ |
| 51 | #define NTLMSSP_NEGOTIATE_KEY_XCH 0x40000000 | 56 | #define NTLMSSP_NEGOTIATE_VERSION 0x2000000 /* we do not set */ |
| 52 | #define NTLMSSP_NEGOTIATE_56 0x80000000 | 57 | /* #define reserved3 0x4000000 */ |
| 58 | /* #define reserved2 0x8000000 */ | ||
| 59 | /* #define reserved1 0x10000000 */ | ||
| 60 | #define NTLMSSP_NEGOTIATE_128 0x20000000 | ||
| 61 | #define NTLMSSP_NEGOTIATE_KEY_XCH 0x40000000 | ||
| 62 | #define NTLMSSP_NEGOTIATE_56 0x80000000 | ||
| 53 | 63 | ||
| 54 | /* Although typedefs are not commonly used for structure definitions */ | 64 | /* Although typedefs are not commonly used for structure definitions */ |
| 55 | /* in the Linux kernel, in this particular case they are useful */ | 65 | /* in the Linux kernel, in this particular case they are useful */ |
| @@ -60,32 +70,36 @@ | |||
| 60 | typedef struct _SECURITY_BUFFER { | 70 | typedef struct _SECURITY_BUFFER { |
| 61 | __le16 Length; | 71 | __le16 Length; |
| 62 | __le16 MaximumLength; | 72 | __le16 MaximumLength; |
| 63 | __le32 Buffer; /* offset to buffer */ | 73 | __le32 BufferOffset; /* offset to buffer */ |
| 64 | } __attribute__((packed)) SECURITY_BUFFER; | 74 | } __attribute__((packed)) SECURITY_BUFFER; |
| 65 | 75 | ||
| 66 | typedef struct _NEGOTIATE_MESSAGE { | 76 | typedef struct _NEGOTIATE_MESSAGE { |
| 67 | __u8 Signature[sizeof(NTLMSSP_SIGNATURE)]; | 77 | __u8 Signature[sizeof(NTLMSSP_SIGNATURE)]; |
| 68 | __le32 MessageType; /* 1 */ | 78 | __le32 MessageType; /* NtLmNegotiate = 1 */ |
| 69 | __le32 NegotiateFlags; | 79 | __le32 NegotiateFlags; |
| 70 | SECURITY_BUFFER DomainName; /* RFC 1001 style and ASCII */ | 80 | SECURITY_BUFFER DomainName; /* RFC 1001 style and ASCII */ |
| 71 | SECURITY_BUFFER WorkstationName; /* RFC 1001 and ASCII */ | 81 | SECURITY_BUFFER WorkstationName; /* RFC 1001 and ASCII */ |
| 82 | /* SECURITY_BUFFER for version info not present since we | ||
| 83 | do not set the version is present flag */ | ||
| 72 | char DomainString[0]; | 84 | char DomainString[0]; |
| 73 | /* followed by WorkstationString */ | 85 | /* followed by WorkstationString */ |
| 74 | } __attribute__((packed)) NEGOTIATE_MESSAGE, *PNEGOTIATE_MESSAGE; | 86 | } __attribute__((packed)) NEGOTIATE_MESSAGE, *PNEGOTIATE_MESSAGE; |
| 75 | 87 | ||
| 76 | typedef struct _CHALLENGE_MESSAGE { | 88 | typedef struct _CHALLENGE_MESSAGE { |
| 77 | __u8 Signature[sizeof(NTLMSSP_SIGNATURE)]; | 89 | __u8 Signature[sizeof(NTLMSSP_SIGNATURE)]; |
| 78 | __le32 MessageType; /* 2 */ | 90 | __le32 MessageType; /* NtLmChallenge = 2 */ |
| 79 | SECURITY_BUFFER TargetName; | 91 | SECURITY_BUFFER TargetName; |
| 80 | __le32 NegotiateFlags; | 92 | __le32 NegotiateFlags; |
| 81 | __u8 Challenge[CIFS_CRYPTO_KEY_SIZE]; | 93 | __u8 Challenge[CIFS_CRYPTO_KEY_SIZE]; |
| 82 | __u8 Reserved[8]; | 94 | __u8 Reserved[8]; |
| 83 | SECURITY_BUFFER TargetInfoArray; | 95 | SECURITY_BUFFER TargetInfoArray; |
| 96 | /* SECURITY_BUFFER for version info not present since we | ||
| 97 | do not set the version is present flag */ | ||
| 84 | } __attribute__((packed)) CHALLENGE_MESSAGE, *PCHALLENGE_MESSAGE; | 98 | } __attribute__((packed)) CHALLENGE_MESSAGE, *PCHALLENGE_MESSAGE; |
| 85 | 99 | ||
| 86 | typedef struct _AUTHENTICATE_MESSAGE { | 100 | typedef struct _AUTHENTICATE_MESSAGE { |
| 87 | __u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; | 101 | __u8 Signature[sizeof(NTLMSSP_SIGNATURE)]; |
| 88 | __le32 MessageType; /* 3 */ | 102 | __le32 MessageType; /* NtLmsAuthenticate = 3 */ |
| 89 | SECURITY_BUFFER LmChallengeResponse; | 103 | SECURITY_BUFFER LmChallengeResponse; |
| 90 | SECURITY_BUFFER NtChallengeResponse; | 104 | SECURITY_BUFFER NtChallengeResponse; |
| 91 | SECURITY_BUFFER DomainName; | 105 | SECURITY_BUFFER DomainName; |
| @@ -93,5 +107,7 @@ typedef struct _AUTHENTICATE_MESSAGE { | |||
| 93 | SECURITY_BUFFER WorkstationName; | 107 | SECURITY_BUFFER WorkstationName; |
| 94 | SECURITY_BUFFER SessionKey; | 108 | SECURITY_BUFFER SessionKey; |
| 95 | __le32 NegotiateFlags; | 109 | __le32 NegotiateFlags; |
| 110 | /* SECURITY_BUFFER for version info not present since we | ||
| 111 | do not set the version is present flag */ | ||
| 96 | char UserString[0]; | 112 | char UserString[0]; |
| 97 | } __attribute__((packed)) AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE; | 113 | } __attribute__((packed)) AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE; |
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 1a8be6228333..964e097c8203 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
| @@ -31,6 +31,13 @@ | |||
| 31 | #include "cifs_fs_sb.h" | 31 | #include "cifs_fs_sb.h" |
| 32 | #include "cifsfs.h" | 32 | #include "cifsfs.h" |
| 33 | 33 | ||
| 34 | /* | ||
| 35 | * To be safe - for UCS to UTF-8 with strings loaded with the rare long | ||
| 36 | * characters alloc more to account for such multibyte target UTF-8 | ||
| 37 | * characters. | ||
| 38 | */ | ||
| 39 | #define UNICODE_NAME_MAX ((4 * NAME_MAX) + 2) | ||
| 40 | |||
| 34 | #ifdef CONFIG_CIFS_DEBUG2 | 41 | #ifdef CONFIG_CIFS_DEBUG2 |
| 35 | static void dump_cifs_file_struct(struct file *file, char *label) | 42 | static void dump_cifs_file_struct(struct file *file, char *label) |
| 36 | { | 43 | { |
| @@ -438,6 +445,38 @@ static void unix_fill_in_inode(struct inode *tmp_inode, | |||
| 438 | } | 445 | } |
| 439 | } | 446 | } |
| 440 | 447 | ||
| 448 | /* BB eventually need to add the following helper function to | ||
| 449 | resolve NT_STATUS_STOPPED_ON_SYMLINK return code when | ||
| 450 | we try to do FindFirst on (NTFS) directory symlinks */ | ||
| 451 | /* | ||
| 452 | int get_symlink_reparse_path(char *full_path, struct cifs_sb_info *cifs_sb, | ||
| 453 | int xid) | ||
| 454 | { | ||
| 455 | __u16 fid; | ||
| 456 | int len; | ||
| 457 | int oplock = 0; | ||
| 458 | int rc; | ||
| 459 | struct cifsTconInfo *ptcon = cifs_sb->tcon; | ||
| 460 | char *tmpbuffer; | ||
| 461 | |||
| 462 | rc = CIFSSMBOpen(xid, ptcon, full_path, FILE_OPEN, GENERIC_READ, | ||
| 463 | OPEN_REPARSE_POINT, &fid, &oplock, NULL, | ||
| 464 | cifs_sb->local_nls, | ||
| 465 | cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); | ||
| 466 | if (!rc) { | ||
| 467 | tmpbuffer = kmalloc(maxpath); | ||
| 468 | rc = CIFSSMBQueryReparseLinkInfo(xid, ptcon, full_path, | ||
| 469 | tmpbuffer, | ||
| 470 | maxpath -1, | ||
| 471 | fid, | ||
| 472 | cifs_sb->local_nls); | ||
| 473 | if (CIFSSMBClose(xid, ptcon, fid)) { | ||
| 474 | cFYI(1, ("Error closing temporary reparsepoint open)")); | ||
| 475 | } | ||
| 476 | } | ||
| 477 | } | ||
| 478 | */ | ||
| 479 | |||
| 441 | static int initiate_cifs_search(const int xid, struct file *file) | 480 | static int initiate_cifs_search(const int xid, struct file *file) |
| 442 | { | 481 | { |
| 443 | int rc = 0; | 482 | int rc = 0; |
| @@ -493,7 +532,10 @@ ffirst_retry: | |||
| 493 | CIFS_MOUNT_MAP_SPECIAL_CHR, CIFS_DIR_SEP(cifs_sb)); | 532 | CIFS_MOUNT_MAP_SPECIAL_CHR, CIFS_DIR_SEP(cifs_sb)); |
| 494 | if (rc == 0) | 533 | if (rc == 0) |
| 495 | cifsFile->invalidHandle = false; | 534 | cifsFile->invalidHandle = false; |
| 496 | if ((rc == -EOPNOTSUPP) && | 535 | /* BB add following call to handle readdir on new NTFS symlink errors |
| 536 | else if STATUS_STOPPED_ON_SYMLINK | ||
| 537 | call get_symlink_reparse_path and retry with new path */ | ||
| 538 | else if ((rc == -EOPNOTSUPP) && | ||
| 497 | (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)) { | 539 | (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)) { |
| 498 | cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM; | 540 | cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM; |
| 499 | goto ffirst_retry; | 541 | goto ffirst_retry; |
| @@ -822,7 +864,7 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, | |||
| 822 | /* inode num, inode type and filename returned */ | 864 | /* inode num, inode type and filename returned */ |
| 823 | static int cifs_get_name_from_search_buf(struct qstr *pqst, | 865 | static int cifs_get_name_from_search_buf(struct qstr *pqst, |
| 824 | char *current_entry, __u16 level, unsigned int unicode, | 866 | char *current_entry, __u16 level, unsigned int unicode, |
| 825 | struct cifs_sb_info *cifs_sb, int max_len, __u64 *pinum) | 867 | struct cifs_sb_info *cifs_sb, unsigned int max_len, __u64 *pinum) |
| 826 | { | 868 | { |
| 827 | int rc = 0; | 869 | int rc = 0; |
| 828 | unsigned int len = 0; | 870 | unsigned int len = 0; |
| @@ -881,14 +923,12 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst, | |||
| 881 | } | 923 | } |
| 882 | 924 | ||
| 883 | if (unicode) { | 925 | if (unicode) { |
| 884 | /* BB fixme - test with long names */ | 926 | pqst->len = cifs_from_ucs2((char *) pqst->name, |
| 885 | /* Note converted filename can be longer than in unicode */ | 927 | (__le16 *) filename, |
| 886 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR) | 928 | UNICODE_NAME_MAX, |
| 887 | pqst->len = cifs_convertUCSpath((char *)pqst->name, | 929 | min(len, max_len), nlt, |
| 888 | (__le16 *)filename, len/2, nlt); | 930 | cifs_sb->mnt_cifs_flags & |
| 889 | else | 931 | CIFS_MOUNT_MAP_SPECIAL_CHR); |
| 890 | pqst->len = cifs_strfromUCS_le((char *)pqst->name, | ||
| 891 | (__le16 *)filename, len/2, nlt); | ||
| 892 | } else { | 932 | } else { |
| 893 | pqst->name = filename; | 933 | pqst->name = filename; |
| 894 | pqst->len = len; | 934 | pqst->len = len; |
| @@ -898,8 +938,8 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst, | |||
| 898 | return rc; | 938 | return rc; |
| 899 | } | 939 | } |
| 900 | 940 | ||
| 901 | static int cifs_filldir(char *pfindEntry, struct file *file, | 941 | static int cifs_filldir(char *pfindEntry, struct file *file, filldir_t filldir, |
| 902 | filldir_t filldir, void *direntry, char *scratch_buf, int max_len) | 942 | void *direntry, char *scratch_buf, unsigned int max_len) |
| 903 | { | 943 | { |
| 904 | int rc = 0; | 944 | int rc = 0; |
| 905 | struct qstr qstring; | 945 | struct qstr qstring; |
| @@ -996,7 +1036,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) | |||
| 996 | int num_to_fill = 0; | 1036 | int num_to_fill = 0; |
| 997 | char *tmp_buf = NULL; | 1037 | char *tmp_buf = NULL; |
| 998 | char *end_of_smb; | 1038 | char *end_of_smb; |
| 999 | int max_len; | 1039 | unsigned int max_len; |
| 1000 | 1040 | ||
| 1001 | xid = GetXid(); | 1041 | xid = GetXid(); |
| 1002 | 1042 | ||
| @@ -1070,11 +1110,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) | |||
| 1070 | cifsFile->srch_inf.ntwrk_buf_start); | 1110 | cifsFile->srch_inf.ntwrk_buf_start); |
| 1071 | end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + max_len; | 1111 | end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + max_len; |
| 1072 | 1112 | ||
| 1073 | /* To be safe - for UCS to UTF-8 with strings loaded | 1113 | tmp_buf = kmalloc(UNICODE_NAME_MAX, GFP_KERNEL); |
| 1074 | with the rare long characters alloc more to account for | ||
| 1075 | such multibyte target UTF-8 characters. cifs_unicode.c, | ||
| 1076 | which actually does the conversion, has the same limit */ | ||
| 1077 | tmp_buf = kmalloc((2 * NAME_MAX) + 4, GFP_KERNEL); | ||
| 1078 | for (i = 0; (i < num_to_fill) && (rc == 0); i++) { | 1114 | for (i = 0; (i < num_to_fill) && (rc == 0); i++) { |
| 1079 | if (current_entry == NULL) { | 1115 | if (current_entry == NULL) { |
| 1080 | /* evaluate whether this case is an error */ | 1116 | /* evaluate whether this case is an error */ |
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index c652c73760dd..897a052270f9 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * SMB/CIFS session setup handling routines | 4 | * SMB/CIFS session setup handling routines |
| 5 | * | 5 | * |
| 6 | * Copyright (c) International Business Machines Corp., 2006, 2007 | 6 | * Copyright (c) International Business Machines Corp., 2006, 2009 |
| 7 | * Author(s): Steve French (sfrench@us.ibm.com) | 7 | * Author(s): Steve French (sfrench@us.ibm.com) |
| 8 | * | 8 | * |
| 9 | * This library is free software; you can redistribute it and/or modify | 9 | * This library is free software; you can redistribute it and/or modify |
| @@ -111,7 +111,7 @@ static __le16 get_next_vcnum(struct cifsSesInfo *ses) | |||
| 111 | get_vc_num_exit: | 111 | get_vc_num_exit: |
| 112 | write_unlock(&cifs_tcp_ses_lock); | 112 | write_unlock(&cifs_tcp_ses_lock); |
| 113 | 113 | ||
| 114 | return le16_to_cpu(vcnum); | 114 | return cpu_to_le16(vcnum); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB) | 117 | static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB) |
| @@ -277,12 +277,11 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifsSesInfo *ses, | |||
| 277 | *pbcc_area = bcc_ptr; | 277 | *pbcc_area = bcc_ptr; |
| 278 | } | 278 | } |
| 279 | 279 | ||
| 280 | static int decode_unicode_ssetup(char **pbcc_area, int bleft, | 280 | static void |
| 281 | struct cifsSesInfo *ses, | 281 | decode_unicode_ssetup(char **pbcc_area, int bleft, struct cifsSesInfo *ses, |
| 282 | const struct nls_table *nls_cp) | 282 | const struct nls_table *nls_cp) |
| 283 | { | 283 | { |
| 284 | int rc = 0; | 284 | int len; |
| 285 | int words_left, len; | ||
| 286 | char *data = *pbcc_area; | 285 | char *data = *pbcc_area; |
| 287 | 286 | ||
| 288 | cFYI(1, ("bleft %d", bleft)); | 287 | cFYI(1, ("bleft %d", bleft)); |
| @@ -300,63 +299,29 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft, | |||
| 300 | ++bleft; | 299 | ++bleft; |
| 301 | } | 300 | } |
| 302 | 301 | ||
| 303 | words_left = bleft / 2; | ||
| 304 | |||
| 305 | /* save off server operating system */ | ||
| 306 | len = UniStrnlen((wchar_t *) data, words_left); | ||
| 307 | |||
| 308 | if (len >= words_left) | ||
| 309 | return rc; | ||
| 310 | |||
| 311 | kfree(ses->serverOS); | 302 | kfree(ses->serverOS); |
| 312 | /* UTF-8 string will not grow more than four times as big as UCS-16 */ | 303 | ses->serverOS = cifs_strndup_from_ucs(data, bleft, true, nls_cp); |
| 313 | ses->serverOS = kzalloc((4 * len) + 2 /* trailing null */, GFP_KERNEL); | 304 | cFYI(1, ("serverOS=%s", ses->serverOS)); |
| 314 | if (ses->serverOS != NULL) { | 305 | len = (UniStrnlen((wchar_t *) data, bleft / 2) * 2) + 2; |
| 315 | cifs_strfromUCS_le(ses->serverOS, (__le16 *)data, len, nls_cp); | 306 | data += len; |
| 316 | cFYI(1, ("serverOS=%s", ses->serverOS)); | 307 | bleft -= len; |
| 317 | } | 308 | if (bleft <= 0) |
| 318 | data += 2 * (len + 1); | 309 | return; |
| 319 | words_left -= len + 1; | ||
| 320 | |||
| 321 | /* save off server network operating system */ | ||
| 322 | len = UniStrnlen((wchar_t *) data, words_left); | ||
| 323 | |||
| 324 | if (len >= words_left) | ||
| 325 | return rc; | ||
| 326 | 310 | ||
| 327 | kfree(ses->serverNOS); | 311 | kfree(ses->serverNOS); |
| 328 | ses->serverNOS = kzalloc((4 * len) + 2 /* trailing null */, GFP_KERNEL); | 312 | ses->serverNOS = cifs_strndup_from_ucs(data, bleft, true, nls_cp); |
| 329 | if (ses->serverNOS != NULL) { | 313 | cFYI(1, ("serverNOS=%s", ses->serverNOS)); |
| 330 | cifs_strfromUCS_le(ses->serverNOS, (__le16 *)data, len, | 314 | len = (UniStrnlen((wchar_t *) data, bleft / 2) * 2) + 2; |
| 331 | nls_cp); | 315 | data += len; |
| 332 | cFYI(1, ("serverNOS=%s", ses->serverNOS)); | 316 | bleft -= len; |
| 333 | if (strncmp(ses->serverNOS, "NT LAN Manager 4", 16) == 0) { | 317 | if (bleft <= 0) |
| 334 | cFYI(1, ("NT4 server")); | 318 | return; |
| 335 | ses->flags |= CIFS_SES_NT4; | ||
| 336 | } | ||
| 337 | } | ||
| 338 | data += 2 * (len + 1); | ||
| 339 | words_left -= len + 1; | ||
| 340 | |||
| 341 | /* save off server domain */ | ||
| 342 | len = UniStrnlen((wchar_t *) data, words_left); | ||
| 343 | |||
| 344 | if (len > words_left) | ||
| 345 | return rc; | ||
| 346 | 319 | ||
| 347 | kfree(ses->serverDomain); | 320 | kfree(ses->serverDomain); |
| 348 | ses->serverDomain = kzalloc((4 * len) + 2, GFP_KERNEL); | 321 | ses->serverDomain = cifs_strndup_from_ucs(data, bleft, true, nls_cp); |
| 349 | if (ses->serverDomain != NULL) { | 322 | cFYI(1, ("serverDomain=%s", ses->serverDomain)); |
| 350 | cifs_strfromUCS_le(ses->serverDomain, (__le16 *)data, len, | ||
| 351 | nls_cp); | ||
| 352 | cFYI(1, ("serverDomain=%s", ses->serverDomain)); | ||
| 353 | } | ||
| 354 | data += 2 * (len + 1); | ||
| 355 | words_left -= len + 1; | ||
| 356 | |||
| 357 | cFYI(1, ("words left: %d", words_left)); | ||
| 358 | 323 | ||
| 359 | return rc; | 324 | return; |
| 360 | } | 325 | } |
| 361 | 326 | ||
| 362 | static int decode_ascii_ssetup(char **pbcc_area, int bleft, | 327 | static int decode_ascii_ssetup(char **pbcc_area, int bleft, |
| @@ -413,6 +378,186 @@ static int decode_ascii_ssetup(char **pbcc_area, int bleft, | |||
| 413 | return rc; | 378 | return rc; |
| 414 | } | 379 | } |
| 415 | 380 | ||
| 381 | static int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len, | ||
| 382 | struct cifsSesInfo *ses) | ||
| 383 | { | ||
| 384 | CHALLENGE_MESSAGE *pblob = (CHALLENGE_MESSAGE *)bcc_ptr; | ||
| 385 | |||
| 386 | if (blob_len < sizeof(CHALLENGE_MESSAGE)) { | ||
| 387 | cERROR(1, ("challenge blob len %d too small", blob_len)); | ||
| 388 | return -EINVAL; | ||
| 389 | } | ||
| 390 | |||
| 391 | if (memcmp(pblob->Signature, "NTLMSSP", 8)) { | ||
| 392 | cERROR(1, ("blob signature incorrect %s", pblob->Signature)); | ||
| 393 | return -EINVAL; | ||
| 394 | } | ||
| 395 | if (pblob->MessageType != NtLmChallenge) { | ||
| 396 | cERROR(1, ("Incorrect message type %d", pblob->MessageType)); | ||
| 397 | return -EINVAL; | ||
| 398 | } | ||
| 399 | |||
| 400 | memcpy(ses->server->cryptKey, pblob->Challenge, CIFS_CRYPTO_KEY_SIZE); | ||
| 401 | /* BB we could decode pblob->NegotiateFlags; some may be useful */ | ||
| 402 | /* In particular we can examine sign flags */ | ||
| 403 | /* BB spec says that if AvId field of MsvAvTimestamp is populated then | ||
| 404 | we must set the MIC field of the AUTHENTICATE_MESSAGE */ | ||
| 405 | |||
| 406 | return 0; | ||
| 407 | } | ||
| 408 | |||
| 409 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
| 410 | /* BB Move to ntlmssp.c eventually */ | ||
| 411 | |||
| 412 | /* We do not malloc the blob, it is passed in pbuffer, because | ||
| 413 | it is fixed size, and small, making this approach cleaner */ | ||
| 414 | static void build_ntlmssp_negotiate_blob(unsigned char *pbuffer, | ||
| 415 | struct cifsSesInfo *ses) | ||
| 416 | { | ||
| 417 | NEGOTIATE_MESSAGE *sec_blob = (NEGOTIATE_MESSAGE *)pbuffer; | ||
| 418 | __u32 flags; | ||
| 419 | |||
| 420 | memcpy(sec_blob->Signature, NTLMSSP_SIGNATURE, 8); | ||
| 421 | sec_blob->MessageType = NtLmNegotiate; | ||
| 422 | |||
| 423 | /* BB is NTLMV2 session security format easier to use here? */ | ||
| 424 | flags = NTLMSSP_NEGOTIATE_56 | NTLMSSP_REQUEST_TARGET | | ||
| 425 | NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_UNICODE | | ||
| 426 | NTLMSSP_NEGOTIATE_NT_ONLY | NTLMSSP_NEGOTIATE_NTLM; | ||
| 427 | if (ses->server->secMode & | ||
| 428 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) | ||
| 429 | flags |= NTLMSSP_NEGOTIATE_SIGN; | ||
| 430 | if (ses->server->secMode & SECMODE_SIGN_REQUIRED) | ||
| 431 | flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; | ||
| 432 | |||
| 433 | sec_blob->NegotiateFlags |= cpu_to_le32(flags); | ||
| 434 | |||
| 435 | sec_blob->WorkstationName.BufferOffset = 0; | ||
| 436 | sec_blob->WorkstationName.Length = 0; | ||
| 437 | sec_blob->WorkstationName.MaximumLength = 0; | ||
| 438 | |||
| 439 | /* Domain name is sent on the Challenge not Negotiate NTLMSSP request */ | ||
| 440 | sec_blob->DomainName.BufferOffset = 0; | ||
| 441 | sec_blob->DomainName.Length = 0; | ||
| 442 | sec_blob->DomainName.MaximumLength = 0; | ||
| 443 | } | ||
| 444 | |||
| 445 | /* We do not malloc the blob, it is passed in pbuffer, because its | ||
| 446 | maximum possible size is fixed and small, making this approach cleaner. | ||
| 447 | This function returns the length of the data in the blob */ | ||
| 448 | static int build_ntlmssp_auth_blob(unsigned char *pbuffer, | ||
| 449 | struct cifsSesInfo *ses, | ||
| 450 | const struct nls_table *nls_cp, int first) | ||
| 451 | { | ||
| 452 | AUTHENTICATE_MESSAGE *sec_blob = (AUTHENTICATE_MESSAGE *)pbuffer; | ||
| 453 | __u32 flags; | ||
| 454 | unsigned char *tmp; | ||
| 455 | char ntlm_session_key[CIFS_SESS_KEY_SIZE]; | ||
| 456 | |||
| 457 | memcpy(sec_blob->Signature, NTLMSSP_SIGNATURE, 8); | ||
| 458 | sec_blob->MessageType = NtLmAuthenticate; | ||
| 459 | |||
| 460 | flags = NTLMSSP_NEGOTIATE_56 | | ||
| 461 | NTLMSSP_REQUEST_TARGET | NTLMSSP_NEGOTIATE_TARGET_INFO | | ||
| 462 | NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_UNICODE | | ||
| 463 | NTLMSSP_NEGOTIATE_NT_ONLY | NTLMSSP_NEGOTIATE_NTLM; | ||
| 464 | if (ses->server->secMode & | ||
| 465 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) | ||
| 466 | flags |= NTLMSSP_NEGOTIATE_SIGN; | ||
| 467 | if (ses->server->secMode & SECMODE_SIGN_REQUIRED) | ||
| 468 | flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; | ||
| 469 | |||
| 470 | tmp = pbuffer + sizeof(AUTHENTICATE_MESSAGE); | ||
| 471 | sec_blob->NegotiateFlags |= cpu_to_le32(flags); | ||
| 472 | |||
| 473 | sec_blob->LmChallengeResponse.BufferOffset = | ||
| 474 | cpu_to_le32(sizeof(AUTHENTICATE_MESSAGE)); | ||
| 475 | sec_blob->LmChallengeResponse.Length = 0; | ||
| 476 | sec_blob->LmChallengeResponse.MaximumLength = 0; | ||
| 477 | |||
| 478 | /* calculate session key, BB what about adding similar ntlmv2 path? */ | ||
| 479 | SMBNTencrypt(ses->password, ses->server->cryptKey, ntlm_session_key); | ||
| 480 | if (first) | ||
| 481 | cifs_calculate_mac_key(&ses->server->mac_signing_key, | ||
| 482 | ntlm_session_key, ses->password); | ||
| 483 | |||
| 484 | memcpy(tmp, ntlm_session_key, CIFS_SESS_KEY_SIZE); | ||
| 485 | sec_blob->NtChallengeResponse.BufferOffset = cpu_to_le32(tmp - pbuffer); | ||
| 486 | sec_blob->NtChallengeResponse.Length = cpu_to_le16(CIFS_SESS_KEY_SIZE); | ||
| 487 | sec_blob->NtChallengeResponse.MaximumLength = | ||
| 488 | cpu_to_le16(CIFS_SESS_KEY_SIZE); | ||
| 489 | |||
| 490 | tmp += CIFS_SESS_KEY_SIZE; | ||
| 491 | |||
| 492 | if (ses->domainName == NULL) { | ||
| 493 | sec_blob->DomainName.BufferOffset = cpu_to_le32(tmp - pbuffer); | ||
| 494 | sec_blob->DomainName.Length = 0; | ||
| 495 | sec_blob->DomainName.MaximumLength = 0; | ||
| 496 | tmp += 2; | ||
| 497 | } else { | ||
| 498 | int len; | ||
| 499 | len = cifs_strtoUCS((__le16 *)tmp, ses->domainName, | ||
| 500 | MAX_USERNAME_SIZE, nls_cp); | ||
| 501 | len *= 2; /* unicode is 2 bytes each */ | ||
| 502 | len += 2; /* trailing null */ | ||
| 503 | sec_blob->DomainName.BufferOffset = cpu_to_le32(tmp - pbuffer); | ||
| 504 | sec_blob->DomainName.Length = cpu_to_le16(len); | ||
| 505 | sec_blob->DomainName.MaximumLength = cpu_to_le16(len); | ||
| 506 | tmp += len; | ||
| 507 | } | ||
| 508 | |||
| 509 | if (ses->userName == NULL) { | ||
| 510 | sec_blob->UserName.BufferOffset = cpu_to_le32(tmp - pbuffer); | ||
| 511 | sec_blob->UserName.Length = 0; | ||
| 512 | sec_blob->UserName.MaximumLength = 0; | ||
| 513 | tmp += 2; | ||
| 514 | } else { | ||
| 515 | int len; | ||
| 516 | len = cifs_strtoUCS((__le16 *)tmp, ses->userName, | ||
| 517 | MAX_USERNAME_SIZE, nls_cp); | ||
| 518 | len *= 2; /* unicode is 2 bytes each */ | ||
| 519 | len += 2; /* trailing null */ | ||
| 520 | sec_blob->UserName.BufferOffset = cpu_to_le32(tmp - pbuffer); | ||
| 521 | sec_blob->UserName.Length = cpu_to_le16(len); | ||
| 522 | sec_blob->UserName.MaximumLength = cpu_to_le16(len); | ||
| 523 | tmp += len; | ||
| 524 | } | ||
| 525 | |||
| 526 | sec_blob->WorkstationName.BufferOffset = cpu_to_le32(tmp - pbuffer); | ||
| 527 | sec_blob->WorkstationName.Length = 0; | ||
| 528 | sec_blob->WorkstationName.MaximumLength = 0; | ||
| 529 | tmp += 2; | ||
| 530 | |||
| 531 | sec_blob->SessionKey.BufferOffset = cpu_to_le32(tmp - pbuffer); | ||
| 532 | sec_blob->SessionKey.Length = 0; | ||
| 533 | sec_blob->SessionKey.MaximumLength = 0; | ||
| 534 | return tmp - pbuffer; | ||
| 535 | } | ||
| 536 | |||
| 537 | |||
| 538 | static void setup_ntlmssp_neg_req(SESSION_SETUP_ANDX *pSMB, | ||
| 539 | struct cifsSesInfo *ses) | ||
| 540 | { | ||
| 541 | build_ntlmssp_negotiate_blob(&pSMB->req.SecurityBlob[0], ses); | ||
| 542 | pSMB->req.SecurityBlobLength = cpu_to_le16(sizeof(NEGOTIATE_MESSAGE)); | ||
| 543 | |||
| 544 | return; | ||
| 545 | } | ||
| 546 | |||
| 547 | static int setup_ntlmssp_auth_req(SESSION_SETUP_ANDX *pSMB, | ||
| 548 | struct cifsSesInfo *ses, | ||
| 549 | const struct nls_table *nls, int first_time) | ||
| 550 | { | ||
| 551 | int bloblen; | ||
| 552 | |||
| 553 | bloblen = build_ntlmssp_auth_blob(&pSMB->req.SecurityBlob[0], ses, nls, | ||
| 554 | first_time); | ||
| 555 | pSMB->req.SecurityBlobLength = cpu_to_le16(bloblen); | ||
| 556 | |||
| 557 | return bloblen; | ||
| 558 | } | ||
| 559 | #endif | ||
| 560 | |||
| 416 | int | 561 | int |
| 417 | CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | 562 | CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, |
| 418 | const struct nls_table *nls_cp) | 563 | const struct nls_table *nls_cp) |
| @@ -431,6 +576,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 431 | __u16 action; | 576 | __u16 action; |
| 432 | int bytes_remaining; | 577 | int bytes_remaining; |
| 433 | struct key *spnego_key = NULL; | 578 | struct key *spnego_key = NULL; |
| 579 | __le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */ | ||
| 434 | 580 | ||
| 435 | if (ses == NULL) | 581 | if (ses == NULL) |
| 436 | return -EINVAL; | 582 | return -EINVAL; |
| @@ -438,6 +584,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 438 | type = ses->server->secType; | 584 | type = ses->server->secType; |
| 439 | 585 | ||
| 440 | cFYI(1, ("sess setup type %d", type)); | 586 | cFYI(1, ("sess setup type %d", type)); |
| 587 | ssetup_ntlmssp_authenticate: | ||
| 588 | if (phase == NtLmChallenge) | ||
| 589 | phase = NtLmAuthenticate; /* if ntlmssp, now final phase */ | ||
| 590 | |||
| 441 | if (type == LANMAN) { | 591 | if (type == LANMAN) { |
| 442 | #ifndef CONFIG_CIFS_WEAK_PW_HASH | 592 | #ifndef CONFIG_CIFS_WEAK_PW_HASH |
| 443 | /* LANMAN and plaintext are less secure and off by default. | 593 | /* LANMAN and plaintext are less secure and off by default. |
| @@ -651,9 +801,53 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 651 | goto ssetup_exit; | 801 | goto ssetup_exit; |
| 652 | #endif /* CONFIG_CIFS_UPCALL */ | 802 | #endif /* CONFIG_CIFS_UPCALL */ |
| 653 | } else { | 803 | } else { |
| 804 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
| 805 | if ((experimEnabled > 1) && (type == RawNTLMSSP)) { | ||
| 806 | if ((pSMB->req.hdr.Flags2 & SMBFLG2_UNICODE) == 0) { | ||
| 807 | cERROR(1, ("NTLMSSP requires Unicode support")); | ||
| 808 | rc = -ENOSYS; | ||
| 809 | goto ssetup_exit; | ||
| 810 | } | ||
| 811 | |||
| 812 | cFYI(1, ("ntlmssp session setup phase %d", phase)); | ||
| 813 | pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; | ||
| 814 | capabilities |= CAP_EXTENDED_SECURITY; | ||
| 815 | pSMB->req.Capabilities |= cpu_to_le32(capabilities); | ||
| 816 | if (phase == NtLmNegotiate) { | ||
| 817 | setup_ntlmssp_neg_req(pSMB, ses); | ||
| 818 | iov[1].iov_len = sizeof(NEGOTIATE_MESSAGE); | ||
| 819 | } else if (phase == NtLmAuthenticate) { | ||
| 820 | int blob_len; | ||
| 821 | blob_len = setup_ntlmssp_auth_req(pSMB, ses, | ||
| 822 | nls_cp, | ||
| 823 | first_time); | ||
| 824 | iov[1].iov_len = blob_len; | ||
| 825 | /* Make sure that we tell the server that we | ||
| 826 | are using the uid that it just gave us back | ||
| 827 | on the response (challenge) */ | ||
| 828 | smb_buf->Uid = ses->Suid; | ||
| 829 | } else { | ||
| 830 | cERROR(1, ("invalid phase %d", phase)); | ||
| 831 | rc = -ENOSYS; | ||
| 832 | goto ssetup_exit; | ||
| 833 | } | ||
| 834 | iov[1].iov_base = &pSMB->req.SecurityBlob[0]; | ||
| 835 | /* unicode strings must be word aligned */ | ||
| 836 | if ((iov[0].iov_len + iov[1].iov_len) % 2) { | ||
| 837 | *bcc_ptr = 0; | ||
| 838 | bcc_ptr++; | ||
| 839 | } | ||
| 840 | unicode_oslm_strings(&bcc_ptr, nls_cp); | ||
| 841 | } else { | ||
| 842 | cERROR(1, ("secType %d not supported!", type)); | ||
| 843 | rc = -ENOSYS; | ||
| 844 | goto ssetup_exit; | ||
| 845 | } | ||
| 846 | #else | ||
| 654 | cERROR(1, ("secType %d not supported!", type)); | 847 | cERROR(1, ("secType %d not supported!", type)); |
| 655 | rc = -ENOSYS; | 848 | rc = -ENOSYS; |
| 656 | goto ssetup_exit; | 849 | goto ssetup_exit; |
| 850 | #endif | ||
| 657 | } | 851 | } |
| 658 | 852 | ||
| 659 | iov[2].iov_base = str_area; | 853 | iov[2].iov_base = str_area; |
| @@ -669,12 +863,23 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 669 | /* SMB request buf freed in SendReceive2 */ | 863 | /* SMB request buf freed in SendReceive2 */ |
| 670 | 864 | ||
| 671 | cFYI(1, ("ssetup rc from sendrecv2 is %d", rc)); | 865 | cFYI(1, ("ssetup rc from sendrecv2 is %d", rc)); |
| 672 | if (rc) | ||
| 673 | goto ssetup_exit; | ||
| 674 | 866 | ||
| 675 | pSMB = (SESSION_SETUP_ANDX *)iov[0].iov_base; | 867 | pSMB = (SESSION_SETUP_ANDX *)iov[0].iov_base; |
| 676 | smb_buf = (struct smb_hdr *)iov[0].iov_base; | 868 | smb_buf = (struct smb_hdr *)iov[0].iov_base; |
| 677 | 869 | ||
| 870 | if ((type == RawNTLMSSP) && (smb_buf->Status.CifsError == | ||
| 871 | cpu_to_le32(NT_STATUS_MORE_PROCESSING_REQUIRED))) { | ||
| 872 | if (phase != NtLmNegotiate) { | ||
| 873 | cERROR(1, ("Unexpected more processing error")); | ||
| 874 | goto ssetup_exit; | ||
| 875 | } | ||
| 876 | /* NTLMSSP Negotiate sent now processing challenge (response) */ | ||
| 877 | phase = NtLmChallenge; /* process ntlmssp challenge */ | ||
| 878 | rc = 0; /* MORE_PROC rc is not an error here, but expected */ | ||
| 879 | } | ||
| 880 | if (rc) | ||
| 881 | goto ssetup_exit; | ||
| 882 | |||
| 678 | if ((smb_buf->WordCount != 3) && (smb_buf->WordCount != 4)) { | 883 | if ((smb_buf->WordCount != 3) && (smb_buf->WordCount != 4)) { |
| 679 | rc = -EIO; | 884 | rc = -EIO; |
| 680 | cERROR(1, ("bad word count %d", smb_buf->WordCount)); | 885 | cERROR(1, ("bad word count %d", smb_buf->WordCount)); |
| @@ -693,12 +898,18 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 693 | if (smb_buf->WordCount == 4) { | 898 | if (smb_buf->WordCount == 4) { |
| 694 | __u16 blob_len; | 899 | __u16 blob_len; |
| 695 | blob_len = le16_to_cpu(pSMB->resp.SecurityBlobLength); | 900 | blob_len = le16_to_cpu(pSMB->resp.SecurityBlobLength); |
| 696 | bcc_ptr += blob_len; | ||
| 697 | if (blob_len > bytes_remaining) { | 901 | if (blob_len > bytes_remaining) { |
| 698 | cERROR(1, ("bad security blob length %d", blob_len)); | 902 | cERROR(1, ("bad security blob length %d", blob_len)); |
| 699 | rc = -EINVAL; | 903 | rc = -EINVAL; |
| 700 | goto ssetup_exit; | 904 | goto ssetup_exit; |
| 701 | } | 905 | } |
| 906 | if (phase == NtLmChallenge) { | ||
| 907 | rc = decode_ntlmssp_challenge(bcc_ptr, blob_len, ses); | ||
| 908 | /* now goto beginning for ntlmssp authenticate phase */ | ||
| 909 | if (rc) | ||
| 910 | goto ssetup_exit; | ||
| 911 | } | ||
| 912 | bcc_ptr += blob_len; | ||
| 702 | bytes_remaining -= blob_len; | 913 | bytes_remaining -= blob_len; |
| 703 | } | 914 | } |
| 704 | 915 | ||
| @@ -709,8 +920,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
| 709 | ++bcc_ptr; | 920 | ++bcc_ptr; |
| 710 | --bytes_remaining; | 921 | --bytes_remaining; |
| 711 | } | 922 | } |
| 712 | rc = decode_unicode_ssetup(&bcc_ptr, bytes_remaining, | 923 | decode_unicode_ssetup(&bcc_ptr, bytes_remaining, ses, nls_cp); |
| 713 | ses, nls_cp); | ||
| 714 | } else { | 924 | } else { |
| 715 | rc = decode_ascii_ssetup(&bcc_ptr, bytes_remaining, | 925 | rc = decode_ascii_ssetup(&bcc_ptr, bytes_remaining, |
| 716 | ses, nls_cp); | 926 | ses, nls_cp); |
| @@ -728,5 +938,9 @@ ssetup_exit: | |||
| 728 | } else if (resp_buf_type == CIFS_LARGE_BUFFER) | 938 | } else if (resp_buf_type == CIFS_LARGE_BUFFER) |
| 729 | cifs_buf_release(iov[0].iov_base); | 939 | cifs_buf_release(iov[0].iov_base); |
| 730 | 940 | ||
| 941 | /* if ntlmssp, and negotiate succeeded, proceed to authenticate phase */ | ||
| 942 | if ((phase == NtLmChallenge) && (rc == 0)) | ||
| 943 | goto ssetup_ntlmssp_authenticate; | ||
| 944 | |||
| 731 | return rc; | 945 | return rc; |
| 732 | } | 946 | } |
diff --git a/fs/cifs/smberr.h b/fs/cifs/smberr.h index 7f50e8577c1c..c5084d27db7c 100644 --- a/fs/cifs/smberr.h +++ b/fs/cifs/smberr.h | |||
| @@ -110,6 +110,7 @@ | |||
| 110 | 110 | ||
| 111 | /* Below errors are used internally (do not come over the wire) for passthrough | 111 | /* Below errors are used internally (do not come over the wire) for passthrough |
| 112 | from STATUS codes to POSIX only */ | 112 | from STATUS codes to POSIX only */ |
| 113 | #define ERRsymlink 0xFFFD | ||
| 113 | #define ErrTooManyLinks 0xFFFE | 114 | #define ErrTooManyLinks 0xFFFE |
| 114 | 115 | ||
| 115 | /* Following error codes may be generated with the ERRSRV error class.*/ | 116 | /* Following error codes may be generated with the ERRSRV error class.*/ |
diff --git a/fs/dcache.c b/fs/dcache.c index 1fcffebfb44f..75659a6fd1f8 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -481,7 +481,7 @@ restart: | |||
| 481 | if ((flags & DCACHE_REFERENCED) | 481 | if ((flags & DCACHE_REFERENCED) |
| 482 | && (dentry->d_flags & DCACHE_REFERENCED)) { | 482 | && (dentry->d_flags & DCACHE_REFERENCED)) { |
| 483 | dentry->d_flags &= ~DCACHE_REFERENCED; | 483 | dentry->d_flags &= ~DCACHE_REFERENCED; |
| 484 | list_move_tail(&dentry->d_lru, &referenced); | 484 | list_move(&dentry->d_lru, &referenced); |
| 485 | spin_unlock(&dentry->d_lock); | 485 | spin_unlock(&dentry->d_lock); |
| 486 | } else { | 486 | } else { |
| 487 | list_move_tail(&dentry->d_lru, &tmp); | 487 | list_move_tail(&dentry->d_lru, &tmp); |
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 63a4a59e4148..21165cf934ff 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c | |||
| @@ -389,11 +389,10 @@ static int devpts_get_sb(struct file_system_type *fs_type, | |||
| 389 | return 0; | 389 | return 0; |
| 390 | 390 | ||
| 391 | out_dput: | 391 | out_dput: |
| 392 | dput(s->s_root); | 392 | dput(s->s_root); /* undo dget() in simple_set_mnt() */ |
| 393 | 393 | ||
| 394 | out_undo_sget: | 394 | out_undo_sget: |
| 395 | up_write(&s->s_umount); | 395 | deactivate_locked_super(s); |
| 396 | deactivate_super(s); | ||
| 397 | return error; | 396 | return error; |
| 398 | } | 397 | } |
| 399 | 398 | ||
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index ccabd5faa04d..9f0aa9883c28 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
| @@ -614,9 +614,8 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags, | |||
| 614 | } | 614 | } |
| 615 | goto out; | 615 | goto out; |
| 616 | out_abort: | 616 | out_abort: |
| 617 | dput(sb->s_root); | 617 | dput(sb->s_root); /* aka mnt->mnt_root, as set by get_sb_nodev() */ |
| 618 | up_write(&sb->s_umount); | 618 | deactivate_locked_super(sb); |
| 619 | deactivate_super(sb); | ||
| 620 | out: | 619 | out: |
| 621 | return rc; | 620 | return rc; |
| 622 | } | 621 | } |
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index a89f370fadb5..5458e80fc558 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
| @@ -1212,7 +1212,7 @@ SYSCALL_DEFINE1(epoll_create1, int, flags) | |||
| 1212 | 1212 | ||
| 1213 | SYSCALL_DEFINE1(epoll_create, int, size) | 1213 | SYSCALL_DEFINE1(epoll_create, int, size) |
| 1214 | { | 1214 | { |
| 1215 | if (size < 0) | 1215 | if (size <= 0) |
| 1216 | return -EINVAL; | 1216 | return -EINVAL; |
| 1217 | 1217 | ||
| 1218 | return sys_epoll_create1(0); | 1218 | return sys_epoll_create1(0); |
| @@ -105,40 +105,28 @@ static inline void put_binfmt(struct linux_binfmt * fmt) | |||
| 105 | SYSCALL_DEFINE1(uselib, const char __user *, library) | 105 | SYSCALL_DEFINE1(uselib, const char __user *, library) |
| 106 | { | 106 | { |
| 107 | struct file *file; | 107 | struct file *file; |
| 108 | struct nameidata nd; | ||
| 109 | char *tmp = getname(library); | 108 | char *tmp = getname(library); |
| 110 | int error = PTR_ERR(tmp); | 109 | int error = PTR_ERR(tmp); |
| 111 | 110 | ||
| 112 | if (!IS_ERR(tmp)) { | 111 | if (IS_ERR(tmp)) |
| 113 | error = path_lookup_open(AT_FDCWD, tmp, | 112 | goto out; |
| 114 | LOOKUP_FOLLOW, &nd, | 113 | |
| 115 | FMODE_READ|FMODE_EXEC); | 114 | file = do_filp_open(AT_FDCWD, tmp, |
| 116 | putname(tmp); | 115 | O_LARGEFILE | O_RDONLY | FMODE_EXEC, 0, |
| 117 | } | 116 | MAY_READ | MAY_EXEC | MAY_OPEN); |
| 118 | if (error) | 117 | putname(tmp); |
| 118 | error = PTR_ERR(file); | ||
| 119 | if (IS_ERR(file)) | ||
| 119 | goto out; | 120 | goto out; |
| 120 | 121 | ||
| 121 | error = -EINVAL; | 122 | error = -EINVAL; |
| 122 | if (!S_ISREG(nd.path.dentry->d_inode->i_mode)) | 123 | if (!S_ISREG(file->f_path.dentry->d_inode->i_mode)) |
| 123 | goto exit; | 124 | goto exit; |
| 124 | 125 | ||
| 125 | error = -EACCES; | 126 | error = -EACCES; |
| 126 | if (nd.path.mnt->mnt_flags & MNT_NOEXEC) | 127 | if (file->f_path.mnt->mnt_flags & MNT_NOEXEC) |
| 127 | goto exit; | ||
| 128 | |||
| 129 | error = inode_permission(nd.path.dentry->d_inode, | ||
| 130 | MAY_READ | MAY_EXEC | MAY_OPEN); | ||
| 131 | if (error) | ||
| 132 | goto exit; | ||
| 133 | error = ima_path_check(&nd.path, MAY_READ | MAY_EXEC | MAY_OPEN); | ||
| 134 | if (error) | ||
| 135 | goto exit; | 128 | goto exit; |
| 136 | 129 | ||
| 137 | file = nameidata_to_filp(&nd, O_RDONLY|O_LARGEFILE); | ||
| 138 | error = PTR_ERR(file); | ||
| 139 | if (IS_ERR(file)) | ||
| 140 | goto out; | ||
| 141 | |||
| 142 | fsnotify_open(file->f_path.dentry); | 130 | fsnotify_open(file->f_path.dentry); |
| 143 | 131 | ||
| 144 | error = -ENOEXEC; | 132 | error = -ENOEXEC; |
| @@ -160,13 +148,10 @@ SYSCALL_DEFINE1(uselib, const char __user *, library) | |||
| 160 | } | 148 | } |
| 161 | read_unlock(&binfmt_lock); | 149 | read_unlock(&binfmt_lock); |
| 162 | } | 150 | } |
| 151 | exit: | ||
| 163 | fput(file); | 152 | fput(file); |
| 164 | out: | 153 | out: |
| 165 | return error; | 154 | return error; |
| 166 | exit: | ||
| 167 | release_open_intent(&nd); | ||
| 168 | path_put(&nd.path); | ||
| 169 | goto out; | ||
| 170 | } | 155 | } |
| 171 | 156 | ||
| 172 | #ifdef CONFIG_MMU | 157 | #ifdef CONFIG_MMU |
| @@ -661,47 +646,33 @@ EXPORT_SYMBOL(setup_arg_pages); | |||
| 661 | 646 | ||
| 662 | struct file *open_exec(const char *name) | 647 | struct file *open_exec(const char *name) |
| 663 | { | 648 | { |
| 664 | struct nameidata nd; | ||
| 665 | struct file *file; | 649 | struct file *file; |
| 666 | int err; | 650 | int err; |
| 667 | 651 | ||
| 668 | err = path_lookup_open(AT_FDCWD, name, LOOKUP_FOLLOW, &nd, | 652 | file = do_filp_open(AT_FDCWD, name, |
| 669 | FMODE_READ|FMODE_EXEC); | 653 | O_LARGEFILE | O_RDONLY | FMODE_EXEC, 0, |
| 670 | if (err) | 654 | MAY_EXEC | MAY_OPEN); |
| 655 | if (IS_ERR(file)) | ||
| 671 | goto out; | 656 | goto out; |
| 672 | 657 | ||
| 673 | err = -EACCES; | 658 | err = -EACCES; |
| 674 | if (!S_ISREG(nd.path.dentry->d_inode->i_mode)) | 659 | if (!S_ISREG(file->f_path.dentry->d_inode->i_mode)) |
| 675 | goto out_path_put; | 660 | goto exit; |
| 676 | |||
| 677 | if (nd.path.mnt->mnt_flags & MNT_NOEXEC) | ||
| 678 | goto out_path_put; | ||
| 679 | |||
| 680 | err = inode_permission(nd.path.dentry->d_inode, MAY_EXEC | MAY_OPEN); | ||
| 681 | if (err) | ||
| 682 | goto out_path_put; | ||
| 683 | err = ima_path_check(&nd.path, MAY_EXEC | MAY_OPEN); | ||
| 684 | if (err) | ||
| 685 | goto out_path_put; | ||
| 686 | 661 | ||
| 687 | file = nameidata_to_filp(&nd, O_RDONLY|O_LARGEFILE); | 662 | if (file->f_path.mnt->mnt_flags & MNT_NOEXEC) |
| 688 | if (IS_ERR(file)) | 663 | goto exit; |
| 689 | return file; | ||
| 690 | 664 | ||
| 691 | fsnotify_open(file->f_path.dentry); | 665 | fsnotify_open(file->f_path.dentry); |
| 692 | 666 | ||
| 693 | err = deny_write_access(file); | 667 | err = deny_write_access(file); |
| 694 | if (err) { | 668 | if (err) |
| 695 | fput(file); | 669 | goto exit; |
| 696 | goto out; | ||
| 697 | } | ||
| 698 | 670 | ||
| 671 | out: | ||
| 699 | return file; | 672 | return file; |
| 700 | 673 | ||
| 701 | out_path_put: | 674 | exit: |
| 702 | release_open_intent(&nd); | 675 | fput(file); |
| 703 | path_put(&nd.path); | ||
| 704 | out: | ||
| 705 | return ERR_PTR(err); | 676 | return ERR_PTR(err); |
| 706 | } | 677 | } |
| 707 | EXPORT_SYMBOL(open_exec); | 678 | EXPORT_SYMBOL(open_exec); |
diff --git a/fs/fcntl.c b/fs/fcntl.c index cc8e4de2fee5..1ad703150dee 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
| @@ -117,11 +117,13 @@ SYSCALL_DEFINE2(dup2, unsigned int, oldfd, unsigned int, newfd) | |||
| 117 | { | 117 | { |
| 118 | if (unlikely(newfd == oldfd)) { /* corner case */ | 118 | if (unlikely(newfd == oldfd)) { /* corner case */ |
| 119 | struct files_struct *files = current->files; | 119 | struct files_struct *files = current->files; |
| 120 | int retval = oldfd; | ||
| 121 | |||
| 120 | rcu_read_lock(); | 122 | rcu_read_lock(); |
| 121 | if (!fcheck_files(files, oldfd)) | 123 | if (!fcheck_files(files, oldfd)) |
| 122 | oldfd = -EBADF; | 124 | retval = -EBADF; |
| 123 | rcu_read_unlock(); | 125 | rcu_read_unlock(); |
| 124 | return oldfd; | 126 | return retval; |
| 125 | } | 127 | } |
| 126 | return sys_dup3(oldfd, newfd, 0); | 128 | return sys_dup3(oldfd, newfd, 0); |
| 127 | } | 129 | } |
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 459b73dd45e1..d1bc4d33ccbc 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/random.h> | 19 | #include <linux/random.h> |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/exportfs.h> | 21 | #include <linux/exportfs.h> |
| 22 | #include <linux/smp_lock.h> | ||
| 22 | 23 | ||
| 23 | MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>"); | 24 | MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>"); |
| 24 | MODULE_DESCRIPTION("Filesystem in Userspace"); | 25 | MODULE_DESCRIPTION("Filesystem in Userspace"); |
| @@ -259,7 +260,9 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid, | |||
| 259 | 260 | ||
| 260 | static void fuse_umount_begin(struct super_block *sb) | 261 | static void fuse_umount_begin(struct super_block *sb) |
| 261 | { | 262 | { |
| 263 | lock_kernel(); | ||
| 262 | fuse_abort_conn(get_fuse_conn_super(sb)); | 264 | fuse_abort_conn(get_fuse_conn_super(sb)); |
| 265 | unlock_kernel(); | ||
| 263 | } | 266 | } |
| 264 | 267 | ||
| 265 | static void fuse_send_destroy(struct fuse_conn *fc) | 268 | static void fuse_send_destroy(struct fuse_conn *fc) |
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 1afd9f26bcb1..ff4981090489 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
| @@ -1304,6 +1304,7 @@ static int gfs2_shrink_glock_memory(int nr, gfp_t gfp_mask) | |||
| 1304 | nr--; | 1304 | nr--; |
| 1305 | if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0) | 1305 | if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0) |
| 1306 | gfs2_glock_put(gl); | 1306 | gfs2_glock_put(gl); |
| 1307 | got_ref = 0; | ||
| 1307 | } | 1308 | } |
| 1308 | spin_lock(&lru_lock); | 1309 | spin_lock(&lru_lock); |
| 1309 | if (may_demote) | 1310 | if (may_demote) |
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 650a730707b7..1ff9473ea753 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
| @@ -1282,21 +1282,21 @@ static int gfs2_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1282 | static struct super_block *get_gfs2_sb(const char *dev_name) | 1282 | static struct super_block *get_gfs2_sb(const char *dev_name) |
| 1283 | { | 1283 | { |
| 1284 | struct super_block *sb; | 1284 | struct super_block *sb; |
| 1285 | struct nameidata nd; | 1285 | struct path path; |
| 1286 | int error; | 1286 | int error; |
| 1287 | 1287 | ||
| 1288 | error = path_lookup(dev_name, LOOKUP_FOLLOW, &nd); | 1288 | error = kern_path(dev_name, LOOKUP_FOLLOW, &path); |
| 1289 | if (error) { | 1289 | if (error) { |
| 1290 | printk(KERN_WARNING "GFS2: path_lookup on %s returned error %d\n", | 1290 | printk(KERN_WARNING "GFS2: path_lookup on %s returned error %d\n", |
| 1291 | dev_name, error); | 1291 | dev_name, error); |
| 1292 | return NULL; | 1292 | return NULL; |
| 1293 | } | 1293 | } |
| 1294 | sb = nd.path.dentry->d_inode->i_sb; | 1294 | sb = path.dentry->d_inode->i_sb; |
| 1295 | if (sb && (sb->s_type == &gfs2_fs_type)) | 1295 | if (sb && (sb->s_type == &gfs2_fs_type)) |
| 1296 | atomic_inc(&sb->s_active); | 1296 | atomic_inc(&sb->s_active); |
| 1297 | else | 1297 | else |
| 1298 | sb = NULL; | 1298 | sb = NULL; |
| 1299 | path_put(&nd.path); | 1299 | path_put(&path); |
| 1300 | return sb; | 1300 | return sb; |
| 1301 | } | 1301 | } |
| 1302 | 1302 | ||
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index fecf402d7b8a..fc77965be841 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c | |||
| @@ -423,8 +423,7 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data) | |||
| 423 | 423 | ||
| 424 | if (!(*flags & MS_RDONLY)) mark_dirty(s); | 424 | if (!(*flags & MS_RDONLY)) mark_dirty(s); |
| 425 | 425 | ||
| 426 | kfree(s->s_options); | 426 | replace_mount_options(s, new_opts); |
| 427 | s->s_options = new_opts; | ||
| 428 | 427 | ||
| 429 | return 0; | 428 | return 0; |
| 430 | 429 | ||
diff --git a/fs/inode.c b/fs/inode.c index 6ad14a1cd8c9..0571983755dc 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -99,7 +99,7 @@ static DEFINE_MUTEX(iprune_mutex); | |||
| 99 | */ | 99 | */ |
| 100 | struct inodes_stat_t inodes_stat; | 100 | struct inodes_stat_t inodes_stat; |
| 101 | 101 | ||
| 102 | static struct kmem_cache * inode_cachep __read_mostly; | 102 | static struct kmem_cache *inode_cachep __read_mostly; |
| 103 | 103 | ||
| 104 | static void wake_up_inode(struct inode *inode) | 104 | static void wake_up_inode(struct inode *inode) |
| 105 | { | 105 | { |
| @@ -124,7 +124,7 @@ struct inode *inode_init_always(struct super_block *sb, struct inode *inode) | |||
| 124 | static struct inode_operations empty_iops; | 124 | static struct inode_operations empty_iops; |
| 125 | static const struct file_operations empty_fops; | 125 | static const struct file_operations empty_fops; |
| 126 | 126 | ||
| 127 | struct address_space * const mapping = &inode->i_data; | 127 | struct address_space *const mapping = &inode->i_data; |
| 128 | 128 | ||
| 129 | inode->i_sb = sb; | 129 | inode->i_sb = sb; |
| 130 | inode->i_blkbits = sb->s_blocksize_bits; | 130 | inode->i_blkbits = sb->s_blocksize_bits; |
| @@ -216,7 +216,7 @@ static struct inode *alloc_inode(struct super_block *sb) | |||
| 216 | return NULL; | 216 | return NULL; |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | void destroy_inode(struct inode *inode) | 219 | void destroy_inode(struct inode *inode) |
| 220 | { | 220 | { |
| 221 | BUG_ON(inode_has_buffers(inode)); | 221 | BUG_ON(inode_has_buffers(inode)); |
| 222 | security_inode_free(inode); | 222 | security_inode_free(inode); |
| @@ -252,12 +252,11 @@ void inode_init_once(struct inode *inode) | |||
| 252 | mutex_init(&inode->inotify_mutex); | 252 | mutex_init(&inode->inotify_mutex); |
| 253 | #endif | 253 | #endif |
| 254 | } | 254 | } |
| 255 | |||
| 256 | EXPORT_SYMBOL(inode_init_once); | 255 | EXPORT_SYMBOL(inode_init_once); |
| 257 | 256 | ||
| 258 | static void init_once(void *foo) | 257 | static void init_once(void *foo) |
| 259 | { | 258 | { |
| 260 | struct inode * inode = (struct inode *) foo; | 259 | struct inode *inode = (struct inode *) foo; |
| 261 | 260 | ||
| 262 | inode_init_once(inode); | 261 | inode_init_once(inode); |
| 263 | } | 262 | } |
| @@ -265,7 +264,7 @@ static void init_once(void *foo) | |||
| 265 | /* | 264 | /* |
| 266 | * inode_lock must be held | 265 | * inode_lock must be held |
| 267 | */ | 266 | */ |
| 268 | void __iget(struct inode * inode) | 267 | void __iget(struct inode *inode) |
| 269 | { | 268 | { |
| 270 | if (atomic_read(&inode->i_count)) { | 269 | if (atomic_read(&inode->i_count)) { |
| 271 | atomic_inc(&inode->i_count); | 270 | atomic_inc(&inode->i_count); |
| @@ -289,7 +288,7 @@ void clear_inode(struct inode *inode) | |||
| 289 | { | 288 | { |
| 290 | might_sleep(); | 289 | might_sleep(); |
| 291 | invalidate_inode_buffers(inode); | 290 | invalidate_inode_buffers(inode); |
| 292 | 291 | ||
| 293 | BUG_ON(inode->i_data.nrpages); | 292 | BUG_ON(inode->i_data.nrpages); |
| 294 | BUG_ON(!(inode->i_state & I_FREEING)); | 293 | BUG_ON(!(inode->i_state & I_FREEING)); |
| 295 | BUG_ON(inode->i_state & I_CLEAR); | 294 | BUG_ON(inode->i_state & I_CLEAR); |
| @@ -303,7 +302,6 @@ void clear_inode(struct inode *inode) | |||
| 303 | cd_forget(inode); | 302 | cd_forget(inode); |
| 304 | inode->i_state = I_CLEAR; | 303 | inode->i_state = I_CLEAR; |
| 305 | } | 304 | } |
| 306 | |||
| 307 | EXPORT_SYMBOL(clear_inode); | 305 | EXPORT_SYMBOL(clear_inode); |
| 308 | 306 | ||
| 309 | /* | 307 | /* |
| @@ -351,8 +349,8 @@ static int invalidate_list(struct list_head *head, struct list_head *dispose) | |||
| 351 | 349 | ||
| 352 | next = head->next; | 350 | next = head->next; |
| 353 | for (;;) { | 351 | for (;;) { |
| 354 | struct list_head * tmp = next; | 352 | struct list_head *tmp = next; |
| 355 | struct inode * inode; | 353 | struct inode *inode; |
| 356 | 354 | ||
| 357 | /* | 355 | /* |
| 358 | * We can reschedule here without worrying about the list's | 356 | * We can reschedule here without worrying about the list's |
| @@ -391,7 +389,7 @@ static int invalidate_list(struct list_head *head, struct list_head *dispose) | |||
| 391 | * fails because there are busy inodes then a non zero value is returned. | 389 | * fails because there are busy inodes then a non zero value is returned. |
| 392 | * If the discard is successful all the inodes have been discarded. | 390 | * If the discard is successful all the inodes have been discarded. |
| 393 | */ | 391 | */ |
| 394 | int invalidate_inodes(struct super_block * sb) | 392 | int invalidate_inodes(struct super_block *sb) |
| 395 | { | 393 | { |
| 396 | int busy; | 394 | int busy; |
| 397 | LIST_HEAD(throw_away); | 395 | LIST_HEAD(throw_away); |
| @@ -407,7 +405,6 @@ int invalidate_inodes(struct super_block * sb) | |||
| 407 | 405 | ||
| 408 | return busy; | 406 | return busy; |
| 409 | } | 407 | } |
| 410 | |||
| 411 | EXPORT_SYMBOL(invalidate_inodes); | 408 | EXPORT_SYMBOL(invalidate_inodes); |
| 412 | 409 | ||
| 413 | static int can_unuse(struct inode *inode) | 410 | static int can_unuse(struct inode *inode) |
| @@ -504,7 +501,7 @@ static int shrink_icache_memory(int nr, gfp_t gfp_mask) | |||
| 504 | * Nasty deadlock avoidance. We may hold various FS locks, | 501 | * Nasty deadlock avoidance. We may hold various FS locks, |
| 505 | * and we don't want to recurse into the FS that called us | 502 | * and we don't want to recurse into the FS that called us |
| 506 | * in clear_inode() and friends.. | 503 | * in clear_inode() and friends.. |
| 507 | */ | 504 | */ |
| 508 | if (!(gfp_mask & __GFP_FS)) | 505 | if (!(gfp_mask & __GFP_FS)) |
| 509 | return -1; | 506 | return -1; |
| 510 | prune_icache(nr); | 507 | prune_icache(nr); |
| @@ -524,10 +521,13 @@ static void __wait_on_freeing_inode(struct inode *inode); | |||
| 524 | * by hand after calling find_inode now! This simplifies iunique and won't | 521 | * by hand after calling find_inode now! This simplifies iunique and won't |
| 525 | * add any additional branch in the common code. | 522 | * add any additional branch in the common code. |
| 526 | */ | 523 | */ |
| 527 | static struct inode * find_inode(struct super_block * sb, struct hlist_head *head, int (*test)(struct inode *, void *), void *data) | 524 | static struct inode *find_inode(struct super_block *sb, |
| 525 | struct hlist_head *head, | ||
| 526 | int (*test)(struct inode *, void *), | ||
| 527 | void *data) | ||
| 528 | { | 528 | { |
| 529 | struct hlist_node *node; | 529 | struct hlist_node *node; |
| 530 | struct inode * inode = NULL; | 530 | struct inode *inode = NULL; |
| 531 | 531 | ||
| 532 | repeat: | 532 | repeat: |
| 533 | hlist_for_each_entry(inode, node, head, i_hash) { | 533 | hlist_for_each_entry(inode, node, head, i_hash) { |
| @@ -548,10 +548,11 @@ repeat: | |||
| 548 | * find_inode_fast is the fast path version of find_inode, see the comment at | 548 | * find_inode_fast is the fast path version of find_inode, see the comment at |
| 549 | * iget_locked for details. | 549 | * iget_locked for details. |
| 550 | */ | 550 | */ |
| 551 | static struct inode * find_inode_fast(struct super_block * sb, struct hlist_head *head, unsigned long ino) | 551 | static struct inode *find_inode_fast(struct super_block *sb, |
| 552 | struct hlist_head *head, unsigned long ino) | ||
| 552 | { | 553 | { |
| 553 | struct hlist_node *node; | 554 | struct hlist_node *node; |
| 554 | struct inode * inode = NULL; | 555 | struct inode *inode = NULL; |
| 555 | 556 | ||
| 556 | repeat: | 557 | repeat: |
| 557 | hlist_for_each_entry(inode, node, head, i_hash) { | 558 | hlist_for_each_entry(inode, node, head, i_hash) { |
| @@ -631,10 +632,10 @@ struct inode *new_inode(struct super_block *sb) | |||
| 631 | * here to attempt to avoid that. | 632 | * here to attempt to avoid that. |
| 632 | */ | 633 | */ |
| 633 | static unsigned int last_ino; | 634 | static unsigned int last_ino; |
| 634 | struct inode * inode; | 635 | struct inode *inode; |
| 635 | 636 | ||
| 636 | spin_lock_prefetch(&inode_lock); | 637 | spin_lock_prefetch(&inode_lock); |
| 637 | 638 | ||
| 638 | inode = alloc_inode(sb); | 639 | inode = alloc_inode(sb); |
| 639 | if (inode) { | 640 | if (inode) { |
| 640 | spin_lock(&inode_lock); | 641 | spin_lock(&inode_lock); |
| @@ -645,7 +646,6 @@ struct inode *new_inode(struct super_block *sb) | |||
| 645 | } | 646 | } |
| 646 | return inode; | 647 | return inode; |
| 647 | } | 648 | } |
| 648 | |||
| 649 | EXPORT_SYMBOL(new_inode); | 649 | EXPORT_SYMBOL(new_inode); |
| 650 | 650 | ||
| 651 | void unlock_new_inode(struct inode *inode) | 651 | void unlock_new_inode(struct inode *inode) |
| @@ -674,7 +674,6 @@ void unlock_new_inode(struct inode *inode) | |||
| 674 | inode->i_state &= ~(I_LOCK|I_NEW); | 674 | inode->i_state &= ~(I_LOCK|I_NEW); |
| 675 | wake_up_inode(inode); | 675 | wake_up_inode(inode); |
| 676 | } | 676 | } |
| 677 | |||
| 678 | EXPORT_SYMBOL(unlock_new_inode); | 677 | EXPORT_SYMBOL(unlock_new_inode); |
| 679 | 678 | ||
| 680 | /* | 679 | /* |
| @@ -683,13 +682,17 @@ EXPORT_SYMBOL(unlock_new_inode); | |||
| 683 | * We no longer cache the sb_flags in i_flags - see fs.h | 682 | * We no longer cache the sb_flags in i_flags - see fs.h |
| 684 | * -- rmk@arm.uk.linux.org | 683 | * -- rmk@arm.uk.linux.org |
| 685 | */ | 684 | */ |
| 686 | static struct inode * get_new_inode(struct super_block *sb, struct hlist_head *head, int (*test)(struct inode *, void *), int (*set)(struct inode *, void *), void *data) | 685 | static struct inode *get_new_inode(struct super_block *sb, |
| 686 | struct hlist_head *head, | ||
| 687 | int (*test)(struct inode *, void *), | ||
| 688 | int (*set)(struct inode *, void *), | ||
| 689 | void *data) | ||
| 687 | { | 690 | { |
| 688 | struct inode * inode; | 691 | struct inode *inode; |
| 689 | 692 | ||
| 690 | inode = alloc_inode(sb); | 693 | inode = alloc_inode(sb); |
| 691 | if (inode) { | 694 | if (inode) { |
| 692 | struct inode * old; | 695 | struct inode *old; |
| 693 | 696 | ||
| 694 | spin_lock(&inode_lock); | 697 | spin_lock(&inode_lock); |
| 695 | /* We released the lock, so.. */ | 698 | /* We released the lock, so.. */ |
| @@ -731,13 +734,14 @@ set_failed: | |||
| 731 | * get_new_inode_fast is the fast path version of get_new_inode, see the | 734 | * get_new_inode_fast is the fast path version of get_new_inode, see the |
| 732 | * comment at iget_locked for details. | 735 | * comment at iget_locked for details. |
| 733 | */ | 736 | */ |
| 734 | static struct inode * get_new_inode_fast(struct super_block *sb, struct hlist_head *head, unsigned long ino) | 737 | static struct inode *get_new_inode_fast(struct super_block *sb, |
| 738 | struct hlist_head *head, unsigned long ino) | ||
| 735 | { | 739 | { |
| 736 | struct inode * inode; | 740 | struct inode *inode; |
| 737 | 741 | ||
| 738 | inode = alloc_inode(sb); | 742 | inode = alloc_inode(sb); |
| 739 | if (inode) { | 743 | if (inode) { |
| 740 | struct inode * old; | 744 | struct inode *old; |
| 741 | 745 | ||
| 742 | spin_lock(&inode_lock); | 746 | spin_lock(&inode_lock); |
| 743 | /* We released the lock, so.. */ | 747 | /* We released the lock, so.. */ |
| @@ -823,7 +827,6 @@ struct inode *igrab(struct inode *inode) | |||
| 823 | spin_unlock(&inode_lock); | 827 | spin_unlock(&inode_lock); |
| 824 | return inode; | 828 | return inode; |
| 825 | } | 829 | } |
| 826 | |||
| 827 | EXPORT_SYMBOL(igrab); | 830 | EXPORT_SYMBOL(igrab); |
| 828 | 831 | ||
| 829 | /** | 832 | /** |
| @@ -924,7 +927,6 @@ struct inode *ilookup5_nowait(struct super_block *sb, unsigned long hashval, | |||
| 924 | 927 | ||
| 925 | return ifind(sb, head, test, data, 0); | 928 | return ifind(sb, head, test, data, 0); |
| 926 | } | 929 | } |
| 927 | |||
| 928 | EXPORT_SYMBOL(ilookup5_nowait); | 930 | EXPORT_SYMBOL(ilookup5_nowait); |
| 929 | 931 | ||
| 930 | /** | 932 | /** |
| @@ -953,7 +955,6 @@ struct inode *ilookup5(struct super_block *sb, unsigned long hashval, | |||
| 953 | 955 | ||
| 954 | return ifind(sb, head, test, data, 1); | 956 | return ifind(sb, head, test, data, 1); |
| 955 | } | 957 | } |
| 956 | |||
| 957 | EXPORT_SYMBOL(ilookup5); | 958 | EXPORT_SYMBOL(ilookup5); |
| 958 | 959 | ||
| 959 | /** | 960 | /** |
| @@ -976,7 +977,6 @@ struct inode *ilookup(struct super_block *sb, unsigned long ino) | |||
| 976 | 977 | ||
| 977 | return ifind_fast(sb, head, ino); | 978 | return ifind_fast(sb, head, ino); |
| 978 | } | 979 | } |
| 979 | |||
| 980 | EXPORT_SYMBOL(ilookup); | 980 | EXPORT_SYMBOL(ilookup); |
| 981 | 981 | ||
| 982 | /** | 982 | /** |
| @@ -1015,7 +1015,6 @@ struct inode *iget5_locked(struct super_block *sb, unsigned long hashval, | |||
| 1015 | */ | 1015 | */ |
| 1016 | return get_new_inode(sb, head, test, set, data); | 1016 | return get_new_inode(sb, head, test, set, data); |
| 1017 | } | 1017 | } |
| 1018 | |||
| 1019 | EXPORT_SYMBOL(iget5_locked); | 1018 | EXPORT_SYMBOL(iget5_locked); |
| 1020 | 1019 | ||
| 1021 | /** | 1020 | /** |
| @@ -1047,7 +1046,6 @@ struct inode *iget_locked(struct super_block *sb, unsigned long ino) | |||
| 1047 | */ | 1046 | */ |
| 1048 | return get_new_inode_fast(sb, head, ino); | 1047 | return get_new_inode_fast(sb, head, ino); |
| 1049 | } | 1048 | } |
| 1050 | |||
| 1051 | EXPORT_SYMBOL(iget_locked); | 1049 | EXPORT_SYMBOL(iget_locked); |
| 1052 | 1050 | ||
| 1053 | int insert_inode_locked(struct inode *inode) | 1051 | int insert_inode_locked(struct inode *inode) |
| @@ -1076,7 +1074,6 @@ int insert_inode_locked(struct inode *inode) | |||
| 1076 | iput(old); | 1074 | iput(old); |
| 1077 | } | 1075 | } |
| 1078 | } | 1076 | } |
| 1079 | |||
| 1080 | EXPORT_SYMBOL(insert_inode_locked); | 1077 | EXPORT_SYMBOL(insert_inode_locked); |
| 1081 | 1078 | ||
| 1082 | int insert_inode_locked4(struct inode *inode, unsigned long hashval, | 1079 | int insert_inode_locked4(struct inode *inode, unsigned long hashval, |
| @@ -1106,7 +1103,6 @@ int insert_inode_locked4(struct inode *inode, unsigned long hashval, | |||
| 1106 | iput(old); | 1103 | iput(old); |
| 1107 | } | 1104 | } |
| 1108 | } | 1105 | } |
| 1109 | |||
| 1110 | EXPORT_SYMBOL(insert_inode_locked4); | 1106 | EXPORT_SYMBOL(insert_inode_locked4); |
| 1111 | 1107 | ||
| 1112 | /** | 1108 | /** |
| @@ -1124,7 +1120,6 @@ void __insert_inode_hash(struct inode *inode, unsigned long hashval) | |||
| 1124 | hlist_add_head(&inode->i_hash, head); | 1120 | hlist_add_head(&inode->i_hash, head); |
| 1125 | spin_unlock(&inode_lock); | 1121 | spin_unlock(&inode_lock); |
| 1126 | } | 1122 | } |
| 1127 | |||
| 1128 | EXPORT_SYMBOL(__insert_inode_hash); | 1123 | EXPORT_SYMBOL(__insert_inode_hash); |
| 1129 | 1124 | ||
| 1130 | /** | 1125 | /** |
| @@ -1139,7 +1134,6 @@ void remove_inode_hash(struct inode *inode) | |||
| 1139 | hlist_del_init(&inode->i_hash); | 1134 | hlist_del_init(&inode->i_hash); |
| 1140 | spin_unlock(&inode_lock); | 1135 | spin_unlock(&inode_lock); |
| 1141 | } | 1136 | } |
| 1142 | |||
| 1143 | EXPORT_SYMBOL(remove_inode_hash); | 1137 | EXPORT_SYMBOL(remove_inode_hash); |
| 1144 | 1138 | ||
| 1145 | /* | 1139 | /* |
| @@ -1187,7 +1181,6 @@ void generic_delete_inode(struct inode *inode) | |||
| 1187 | BUG_ON(inode->i_state != I_CLEAR); | 1181 | BUG_ON(inode->i_state != I_CLEAR); |
| 1188 | destroy_inode(inode); | 1182 | destroy_inode(inode); |
| 1189 | } | 1183 | } |
| 1190 | |||
| 1191 | EXPORT_SYMBOL(generic_delete_inode); | 1184 | EXPORT_SYMBOL(generic_delete_inode); |
| 1192 | 1185 | ||
| 1193 | static void generic_forget_inode(struct inode *inode) | 1186 | static void generic_forget_inode(struct inode *inode) |
| @@ -1237,12 +1230,11 @@ void generic_drop_inode(struct inode *inode) | |||
| 1237 | else | 1230 | else |
| 1238 | generic_forget_inode(inode); | 1231 | generic_forget_inode(inode); |
| 1239 | } | 1232 | } |
| 1240 | |||
| 1241 | EXPORT_SYMBOL_GPL(generic_drop_inode); | 1233 | EXPORT_SYMBOL_GPL(generic_drop_inode); |
| 1242 | 1234 | ||
| 1243 | /* | 1235 | /* |
| 1244 | * Called when we're dropping the last reference | 1236 | * Called when we're dropping the last reference |
| 1245 | * to an inode. | 1237 | * to an inode. |
| 1246 | * | 1238 | * |
| 1247 | * Call the FS "drop()" function, defaulting to | 1239 | * Call the FS "drop()" function, defaulting to |
| 1248 | * the legacy UNIX filesystem behaviour.. | 1240 | * the legacy UNIX filesystem behaviour.. |
| @@ -1262,7 +1254,7 @@ static inline void iput_final(struct inode *inode) | |||
| 1262 | } | 1254 | } |
| 1263 | 1255 | ||
| 1264 | /** | 1256 | /** |
| 1265 | * iput - put an inode | 1257 | * iput - put an inode |
| 1266 | * @inode: inode to put | 1258 | * @inode: inode to put |
| 1267 | * | 1259 | * |
| 1268 | * Puts an inode, dropping its usage count. If the inode use count hits | 1260 | * Puts an inode, dropping its usage count. If the inode use count hits |
| @@ -1279,7 +1271,6 @@ void iput(struct inode *inode) | |||
| 1279 | iput_final(inode); | 1271 | iput_final(inode); |
| 1280 | } | 1272 | } |
| 1281 | } | 1273 | } |
| 1282 | |||
| 1283 | EXPORT_SYMBOL(iput); | 1274 | EXPORT_SYMBOL(iput); |
| 1284 | 1275 | ||
| 1285 | /** | 1276 | /** |
| @@ -1290,10 +1281,10 @@ EXPORT_SYMBOL(iput); | |||
| 1290 | * Returns the block number on the device holding the inode that | 1281 | * Returns the block number on the device holding the inode that |
| 1291 | * is the disk block number for the block of the file requested. | 1282 | * is the disk block number for the block of the file requested. |
| 1292 | * That is, asked for block 4 of inode 1 the function will return the | 1283 | * That is, asked for block 4 of inode 1 the function will return the |
| 1293 | * disk block relative to the disk start that holds that block of the | 1284 | * disk block relative to the disk start that holds that block of the |
| 1294 | * file. | 1285 | * file. |
| 1295 | */ | 1286 | */ |
| 1296 | sector_t bmap(struct inode * inode, sector_t block) | 1287 | sector_t bmap(struct inode *inode, sector_t block) |
| 1297 | { | 1288 | { |
| 1298 | sector_t res = 0; | 1289 | sector_t res = 0; |
| 1299 | if (inode->i_mapping->a_ops->bmap) | 1290 | if (inode->i_mapping->a_ops->bmap) |
| @@ -1425,7 +1416,6 @@ void file_update_time(struct file *file) | |||
| 1425 | mark_inode_dirty_sync(inode); | 1416 | mark_inode_dirty_sync(inode); |
| 1426 | mnt_drop_write(file->f_path.mnt); | 1417 | mnt_drop_write(file->f_path.mnt); |
| 1427 | } | 1418 | } |
| 1428 | |||
| 1429 | EXPORT_SYMBOL(file_update_time); | 1419 | EXPORT_SYMBOL(file_update_time); |
| 1430 | 1420 | ||
| 1431 | int inode_needs_sync(struct inode *inode) | 1421 | int inode_needs_sync(struct inode *inode) |
| @@ -1436,7 +1426,6 @@ int inode_needs_sync(struct inode *inode) | |||
| 1436 | return 1; | 1426 | return 1; |
| 1437 | return 0; | 1427 | return 0; |
| 1438 | } | 1428 | } |
| 1439 | |||
| 1440 | EXPORT_SYMBOL(inode_needs_sync); | 1429 | EXPORT_SYMBOL(inode_needs_sync); |
| 1441 | 1430 | ||
| 1442 | int inode_wait(void *word) | 1431 | int inode_wait(void *word) |
diff --git a/fs/ioctl.c b/fs/ioctl.c index ac2d47e43926..82d9c42b8bac 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c | |||
| @@ -258,7 +258,7 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 258 | long long length = 0, map_len = 0; | 258 | long long length = 0, map_len = 0; |
| 259 | u64 logical = 0, phys = 0, size = 0; | 259 | u64 logical = 0, phys = 0, size = 0; |
| 260 | u32 flags = FIEMAP_EXTENT_MERGED; | 260 | u32 flags = FIEMAP_EXTENT_MERGED; |
| 261 | int ret = 0; | 261 | int ret = 0, past_eof = 0, whole_file = 0; |
| 262 | 262 | ||
| 263 | if ((ret = fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC))) | 263 | if ((ret = fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC))) |
| 264 | return ret; | 264 | return ret; |
| @@ -266,6 +266,9 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 266 | start_blk = logical_to_blk(inode, start); | 266 | start_blk = logical_to_blk(inode, start); |
| 267 | 267 | ||
| 268 | length = (long long)min_t(u64, len, i_size_read(inode)); | 268 | length = (long long)min_t(u64, len, i_size_read(inode)); |
| 269 | if (length < len) | ||
| 270 | whole_file = 1; | ||
| 271 | |||
| 269 | map_len = length; | 272 | map_len = length; |
| 270 | 273 | ||
| 271 | do { | 274 | do { |
| @@ -282,11 +285,26 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 282 | 285 | ||
| 283 | /* HOLE */ | 286 | /* HOLE */ |
| 284 | if (!buffer_mapped(&tmp)) { | 287 | if (!buffer_mapped(&tmp)) { |
| 288 | length -= blk_to_logical(inode, 1); | ||
| 289 | start_blk++; | ||
| 290 | |||
| 291 | /* | ||
| 292 | * we want to handle the case where there is an | ||
| 293 | * allocated block at the front of the file, and then | ||
| 294 | * nothing but holes up to the end of the file properly, | ||
| 295 | * to make sure that extent at the front gets properly | ||
| 296 | * marked with FIEMAP_EXTENT_LAST | ||
| 297 | */ | ||
| 298 | if (!past_eof && | ||
| 299 | blk_to_logical(inode, start_blk) >= | ||
| 300 | blk_to_logical(inode, 0)+i_size_read(inode)) | ||
| 301 | past_eof = 1; | ||
| 302 | |||
| 285 | /* | 303 | /* |
| 286 | * first hole after going past the EOF, this is our | 304 | * first hole after going past the EOF, this is our |
| 287 | * last extent | 305 | * last extent |
| 288 | */ | 306 | */ |
| 289 | if (length <= 0) { | 307 | if (past_eof && size) { |
| 290 | flags = FIEMAP_EXTENT_MERGED|FIEMAP_EXTENT_LAST; | 308 | flags = FIEMAP_EXTENT_MERGED|FIEMAP_EXTENT_LAST; |
| 291 | ret = fiemap_fill_next_extent(fieinfo, logical, | 309 | ret = fiemap_fill_next_extent(fieinfo, logical, |
| 292 | phys, size, | 310 | phys, size, |
| @@ -294,15 +312,37 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 294 | break; | 312 | break; |
| 295 | } | 313 | } |
| 296 | 314 | ||
| 297 | length -= blk_to_logical(inode, 1); | ||
| 298 | |||
| 299 | /* if we have holes up to/past EOF then we're done */ | 315 | /* if we have holes up to/past EOF then we're done */ |
| 300 | if (length <= 0) | 316 | if (length <= 0 || past_eof) |
| 301 | break; | 317 | break; |
| 302 | |||
| 303 | start_blk++; | ||
| 304 | } else { | 318 | } else { |
| 305 | if (length <= 0 && size) { | 319 | /* |
| 320 | * we have gone over the length of what we wanted to | ||
| 321 | * map, and it wasn't the entire file, so add the extent | ||
| 322 | * we got last time and exit. | ||
| 323 | * | ||
| 324 | * This is for the case where say we want to map all the | ||
| 325 | * way up to the second to the last block in a file, but | ||
| 326 | * the last block is a hole, making the second to last | ||
| 327 | * block FIEMAP_EXTENT_LAST. In this case we want to | ||
| 328 | * see if there is a hole after the second to last block | ||
| 329 | * so we can mark it properly. If we found data after | ||
| 330 | * we exceeded the length we were requesting, then we | ||
| 331 | * are good to go, just add the extent to the fieinfo | ||
| 332 | * and break | ||
| 333 | */ | ||
| 334 | if (length <= 0 && !whole_file) { | ||
| 335 | ret = fiemap_fill_next_extent(fieinfo, logical, | ||
| 336 | phys, size, | ||
| 337 | flags); | ||
| 338 | break; | ||
| 339 | } | ||
| 340 | |||
| 341 | /* | ||
| 342 | * if size != 0 then we know we already have an extent | ||
| 343 | * to add, so add it. | ||
| 344 | */ | ||
| 345 | if (size) { | ||
| 306 | ret = fiemap_fill_next_extent(fieinfo, logical, | 346 | ret = fiemap_fill_next_extent(fieinfo, logical, |
| 307 | phys, size, | 347 | phys, size, |
| 308 | flags); | 348 | flags); |
| @@ -319,19 +359,14 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 319 | start_blk += logical_to_blk(inode, size); | 359 | start_blk += logical_to_blk(inode, size); |
| 320 | 360 | ||
| 321 | /* | 361 | /* |
| 322 | * if we are past the EOF we need to loop again to see | 362 | * If we are past the EOF, then we need to make sure as |
| 323 | * if there is a hole so we can mark this extent as the | 363 | * soon as we find a hole that the last extent we found |
| 324 | * last one, and if not keep mapping things until we | 364 | * is marked with FIEMAP_EXTENT_LAST |
| 325 | * find a hole, or we run out of slots in the extent | ||
| 326 | * array | ||
| 327 | */ | 365 | */ |
| 328 | if (length <= 0) | 366 | if (!past_eof && |
| 329 | continue; | 367 | logical+size >= |
| 330 | 368 | blk_to_logical(inode, 0)+i_size_read(inode)) | |
| 331 | ret = fiemap_fill_next_extent(fieinfo, logical, phys, | 369 | past_eof = 1; |
| 332 | size, flags); | ||
| 333 | if (ret) | ||
| 334 | break; | ||
| 335 | } | 370 | } |
| 336 | cond_resched(); | 371 | cond_resched(); |
| 337 | } while (1); | 372 | } while (1); |
diff --git a/fs/libfs.c b/fs/libfs.c index cd223190c4e9..80046ddf5063 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
| @@ -246,8 +246,7 @@ int get_sb_pseudo(struct file_system_type *fs_type, char *name, | |||
| 246 | return 0; | 246 | return 0; |
| 247 | 247 | ||
| 248 | Enomem: | 248 | Enomem: |
| 249 | up_write(&s->s_umount); | 249 | deactivate_locked_super(s); |
| 250 | deactivate_super(s); | ||
| 251 | return -ENOMEM; | 250 | return -ENOMEM; |
| 252 | } | 251 | } |
| 253 | 252 | ||
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index abf83881f68a..1a54ae14a192 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
| @@ -104,6 +104,16 @@ static void set_grace_period(void) | |||
| 104 | schedule_delayed_work(&grace_period_end, grace_period); | 104 | schedule_delayed_work(&grace_period_end, grace_period); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | static void restart_grace(void) | ||
| 108 | { | ||
| 109 | if (nlmsvc_ops) { | ||
| 110 | cancel_delayed_work_sync(&grace_period_end); | ||
| 111 | locks_end_grace(&lockd_manager); | ||
| 112 | nlmsvc_invalidate_all(); | ||
| 113 | set_grace_period(); | ||
| 114 | } | ||
| 115 | } | ||
| 116 | |||
| 107 | /* | 117 | /* |
| 108 | * This is the lockd kernel thread | 118 | * This is the lockd kernel thread |
| 109 | */ | 119 | */ |
| @@ -149,10 +159,7 @@ lockd(void *vrqstp) | |||
| 149 | 159 | ||
| 150 | if (signalled()) { | 160 | if (signalled()) { |
| 151 | flush_signals(current); | 161 | flush_signals(current); |
| 152 | if (nlmsvc_ops) { | 162 | restart_grace(); |
| 153 | nlmsvc_invalidate_all(); | ||
| 154 | set_grace_period(); | ||
| 155 | } | ||
| 156 | continue; | 163 | continue; |
| 157 | } | 164 | } |
| 158 | 165 | ||
diff --git a/fs/namei.c b/fs/namei.c index 78f253cd2d4f..967c3db92724 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -1130,8 +1130,8 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, | |||
| 1130 | * @nd: pointer to nameidata | 1130 | * @nd: pointer to nameidata |
| 1131 | * @open_flags: open intent flags | 1131 | * @open_flags: open intent flags |
| 1132 | */ | 1132 | */ |
| 1133 | int path_lookup_open(int dfd, const char *name, unsigned int lookup_flags, | 1133 | static int path_lookup_open(int dfd, const char *name, |
| 1134 | struct nameidata *nd, int open_flags) | 1134 | unsigned int lookup_flags, struct nameidata *nd, int open_flags) |
| 1135 | { | 1135 | { |
| 1136 | struct file *filp = get_empty_filp(); | 1136 | struct file *filp = get_empty_filp(); |
| 1137 | int err; | 1137 | int err; |
| @@ -1637,18 +1637,19 @@ static int open_will_write_to_fs(int flag, struct inode *inode) | |||
| 1637 | * open_to_namei_flags() for more details. | 1637 | * open_to_namei_flags() for more details. |
| 1638 | */ | 1638 | */ |
| 1639 | struct file *do_filp_open(int dfd, const char *pathname, | 1639 | struct file *do_filp_open(int dfd, const char *pathname, |
| 1640 | int open_flag, int mode) | 1640 | int open_flag, int mode, int acc_mode) |
| 1641 | { | 1641 | { |
| 1642 | struct file *filp; | 1642 | struct file *filp; |
| 1643 | struct nameidata nd; | 1643 | struct nameidata nd; |
| 1644 | int acc_mode, error; | 1644 | int error; |
| 1645 | struct path path; | 1645 | struct path path; |
| 1646 | struct dentry *dir; | 1646 | struct dentry *dir; |
| 1647 | int count = 0; | 1647 | int count = 0; |
| 1648 | int will_write; | 1648 | int will_write; |
| 1649 | int flag = open_to_namei_flags(open_flag); | 1649 | int flag = open_to_namei_flags(open_flag); |
| 1650 | 1650 | ||
| 1651 | acc_mode = MAY_OPEN | ACC_MODE(flag); | 1651 | if (!acc_mode) |
| 1652 | acc_mode = MAY_OPEN | ACC_MODE(flag); | ||
| 1652 | 1653 | ||
| 1653 | /* O_TRUNC implies we need access checks for write permissions */ | 1654 | /* O_TRUNC implies we need access checks for write permissions */ |
| 1654 | if (flag & O_TRUNC) | 1655 | if (flag & O_TRUNC) |
| @@ -1869,7 +1870,7 @@ do_link: | |||
| 1869 | */ | 1870 | */ |
| 1870 | struct file *filp_open(const char *filename, int flags, int mode) | 1871 | struct file *filp_open(const char *filename, int flags, int mode) |
| 1871 | { | 1872 | { |
| 1872 | return do_filp_open(AT_FDCWD, filename, flags, mode); | 1873 | return do_filp_open(AT_FDCWD, filename, flags, mode, 0); |
| 1873 | } | 1874 | } |
| 1874 | EXPORT_SYMBOL(filp_open); | 1875 | EXPORT_SYMBOL(filp_open); |
| 1875 | 1876 | ||
diff --git a/fs/namespace.c b/fs/namespace.c index 41196209a906..134d494158d9 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -695,12 +695,16 @@ static inline void mangle(struct seq_file *m, const char *s) | |||
| 695 | */ | 695 | */ |
| 696 | int generic_show_options(struct seq_file *m, struct vfsmount *mnt) | 696 | int generic_show_options(struct seq_file *m, struct vfsmount *mnt) |
| 697 | { | 697 | { |
| 698 | const char *options = mnt->mnt_sb->s_options; | 698 | const char *options; |
| 699 | |||
| 700 | rcu_read_lock(); | ||
| 701 | options = rcu_dereference(mnt->mnt_sb->s_options); | ||
| 699 | 702 | ||
| 700 | if (options != NULL && options[0]) { | 703 | if (options != NULL && options[0]) { |
| 701 | seq_putc(m, ','); | 704 | seq_putc(m, ','); |
| 702 | mangle(m, options); | 705 | mangle(m, options); |
| 703 | } | 706 | } |
| 707 | rcu_read_unlock(); | ||
| 704 | 708 | ||
| 705 | return 0; | 709 | return 0; |
| 706 | } | 710 | } |
| @@ -721,11 +725,22 @@ EXPORT_SYMBOL(generic_show_options); | |||
| 721 | */ | 725 | */ |
| 722 | void save_mount_options(struct super_block *sb, char *options) | 726 | void save_mount_options(struct super_block *sb, char *options) |
| 723 | { | 727 | { |
| 724 | kfree(sb->s_options); | 728 | BUG_ON(sb->s_options); |
| 725 | sb->s_options = kstrdup(options, GFP_KERNEL); | 729 | rcu_assign_pointer(sb->s_options, kstrdup(options, GFP_KERNEL)); |
| 726 | } | 730 | } |
| 727 | EXPORT_SYMBOL(save_mount_options); | 731 | EXPORT_SYMBOL(save_mount_options); |
| 728 | 732 | ||
| 733 | void replace_mount_options(struct super_block *sb, char *options) | ||
| 734 | { | ||
| 735 | char *old = sb->s_options; | ||
| 736 | rcu_assign_pointer(sb->s_options, options); | ||
| 737 | if (old) { | ||
| 738 | synchronize_rcu(); | ||
| 739 | kfree(old); | ||
| 740 | } | ||
| 741 | } | ||
| 742 | EXPORT_SYMBOL(replace_mount_options); | ||
| 743 | |||
| 729 | #ifdef CONFIG_PROC_FS | 744 | #ifdef CONFIG_PROC_FS |
| 730 | /* iterator */ | 745 | /* iterator */ |
| 731 | static void *m_start(struct seq_file *m, loff_t *pos) | 746 | static void *m_start(struct seq_file *m, loff_t *pos) |
| @@ -1073,9 +1088,7 @@ static int do_umount(struct vfsmount *mnt, int flags) | |||
| 1073 | */ | 1088 | */ |
| 1074 | 1089 | ||
| 1075 | if (flags & MNT_FORCE && sb->s_op->umount_begin) { | 1090 | if (flags & MNT_FORCE && sb->s_op->umount_begin) { |
| 1076 | lock_kernel(); | ||
| 1077 | sb->s_op->umount_begin(sb); | 1091 | sb->s_op->umount_begin(sb); |
| 1078 | unlock_kernel(); | ||
| 1079 | } | 1092 | } |
| 1080 | 1093 | ||
| 1081 | /* | 1094 | /* |
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 5a97bcfe03e5..ec7e27d00bc6 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
| @@ -517,10 +517,10 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 517 | 517 | ||
| 518 | ret = nfs_updatepage(filp, page, 0, pagelen); | 518 | ret = nfs_updatepage(filp, page, 0, pagelen); |
| 519 | out_unlock: | 519 | out_unlock: |
| 520 | if (!ret) | ||
| 521 | return VM_FAULT_LOCKED; | ||
| 520 | unlock_page(page); | 522 | unlock_page(page); |
| 521 | if (ret) | 523 | return VM_FAULT_SIGBUS; |
| 522 | ret = VM_FAULT_SIGBUS; | ||
| 523 | return ret; | ||
| 524 | } | 524 | } |
| 525 | 525 | ||
| 526 | static struct vm_operations_struct nfs_file_vm_ops = { | 526 | static struct vm_operations_struct nfs_file_vm_ops = { |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 6717200923fe..d2d67781c579 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -683,9 +683,12 @@ static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt) | |||
| 683 | */ | 683 | */ |
| 684 | static void nfs_umount_begin(struct super_block *sb) | 684 | static void nfs_umount_begin(struct super_block *sb) |
| 685 | { | 685 | { |
| 686 | struct nfs_server *server = NFS_SB(sb); | 686 | struct nfs_server *server; |
| 687 | struct rpc_clnt *rpc; | 687 | struct rpc_clnt *rpc; |
| 688 | 688 | ||
| 689 | lock_kernel(); | ||
| 690 | |||
| 691 | server = NFS_SB(sb); | ||
| 689 | /* -EIO all pending I/O */ | 692 | /* -EIO all pending I/O */ |
| 690 | rpc = server->client_acl; | 693 | rpc = server->client_acl; |
| 691 | if (!IS_ERR(rpc)) | 694 | if (!IS_ERR(rpc)) |
| @@ -693,6 +696,8 @@ static void nfs_umount_begin(struct super_block *sb) | |||
| 693 | rpc = server->client; | 696 | rpc = server->client; |
| 694 | if (!IS_ERR(rpc)) | 697 | if (!IS_ERR(rpc)) |
| 695 | rpc_killall_tasks(rpc); | 698 | rpc_killall_tasks(rpc); |
| 699 | |||
| 700 | unlock_kernel(); | ||
| 696 | } | 701 | } |
| 697 | 702 | ||
| 698 | /* | 703 | /* |
| @@ -2106,8 +2111,7 @@ out_err_nosb: | |||
| 2106 | error_splat_root: | 2111 | error_splat_root: |
| 2107 | dput(mntroot); | 2112 | dput(mntroot); |
| 2108 | error_splat_super: | 2113 | error_splat_super: |
| 2109 | up_write(&s->s_umount); | 2114 | deactivate_locked_super(s); |
| 2110 | deactivate_super(s); | ||
| 2111 | goto out; | 2115 | goto out; |
| 2112 | } | 2116 | } |
| 2113 | 2117 | ||
| @@ -2203,8 +2207,7 @@ out_err_noserver: | |||
| 2203 | return error; | 2207 | return error; |
| 2204 | 2208 | ||
| 2205 | error_splat_super: | 2209 | error_splat_super: |
| 2206 | up_write(&s->s_umount); | 2210 | deactivate_locked_super(s); |
| 2207 | deactivate_super(s); | ||
| 2208 | dprintk("<-- nfs_xdev_get_sb() = %d [splat]\n", error); | 2211 | dprintk("<-- nfs_xdev_get_sb() = %d [splat]\n", error); |
| 2209 | return error; | 2212 | return error; |
| 2210 | } | 2213 | } |
| @@ -2464,8 +2467,7 @@ out_free: | |||
| 2464 | error_splat_root: | 2467 | error_splat_root: |
| 2465 | dput(mntroot); | 2468 | dput(mntroot); |
| 2466 | error_splat_super: | 2469 | error_splat_super: |
| 2467 | up_write(&s->s_umount); | 2470 | deactivate_locked_super(s); |
| 2468 | deactivate_super(s); | ||
| 2469 | goto out; | 2471 | goto out; |
| 2470 | } | 2472 | } |
| 2471 | 2473 | ||
| @@ -2559,8 +2561,7 @@ out_err_noserver: | |||
| 2559 | return error; | 2561 | return error; |
| 2560 | 2562 | ||
| 2561 | error_splat_super: | 2563 | error_splat_super: |
| 2562 | up_write(&s->s_umount); | 2564 | deactivate_locked_super(s); |
| 2563 | deactivate_super(s); | ||
| 2564 | dprintk("<-- nfs4_xdev_get_sb() = %d [splat]\n", error); | 2565 | dprintk("<-- nfs4_xdev_get_sb() = %d [splat]\n", error); |
| 2565 | return error; | 2566 | return error; |
| 2566 | } | 2567 | } |
| @@ -2644,8 +2645,7 @@ out_err_noserver: | |||
| 2644 | return error; | 2645 | return error; |
| 2645 | 2646 | ||
| 2646 | error_splat_super: | 2647 | error_splat_super: |
| 2647 | up_write(&s->s_umount); | 2648 | deactivate_locked_super(s); |
| 2648 | deactivate_super(s); | ||
| 2649 | dprintk("<-- nfs4_referral_get_sb() = %d [splat]\n", error); | 2649 | dprintk("<-- nfs4_referral_get_sb() = %d [splat]\n", error); |
| 2650 | return error; | 2650 | return error; |
| 2651 | } | 2651 | } |
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 5275097a7565..b5348405046b 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
| @@ -229,7 +229,7 @@ nfsd4_list_rec_dir(struct dentry *dir, recdir_func *f) | |||
| 229 | goto out; | 229 | goto out; |
| 230 | status = vfs_readdir(filp, nfsd4_build_namelist, &names); | 230 | status = vfs_readdir(filp, nfsd4_build_namelist, &names); |
| 231 | fput(filp); | 231 | fput(filp); |
| 232 | mutex_lock(&dir->d_inode->i_mutex); | 232 | mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); |
| 233 | while (!list_empty(&names)) { | 233 | while (!list_empty(&names)) { |
| 234 | entry = list_entry(names.next, struct name_list, list); | 234 | entry = list_entry(names.next, struct name_list, list); |
| 235 | 235 | ||
| @@ -264,7 +264,7 @@ nfsd4_unlink_clid_dir(char *name, int namlen) | |||
| 264 | 264 | ||
| 265 | dprintk("NFSD: nfsd4_unlink_clid_dir. name %.*s\n", namlen, name); | 265 | dprintk("NFSD: nfsd4_unlink_clid_dir. name %.*s\n", namlen, name); |
| 266 | 266 | ||
| 267 | mutex_lock(&rec_dir.dentry->d_inode->i_mutex); | 267 | mutex_lock_nested(&rec_dir.dentry->d_inode->i_mutex, I_MUTEX_PARENT); |
| 268 | dentry = lookup_one_len(name, rec_dir.dentry, namlen); | 268 | dentry = lookup_one_len(name, rec_dir.dentry, namlen); |
| 269 | if (IS_ERR(dentry)) { | 269 | if (IS_ERR(dentry)) { |
| 270 | status = PTR_ERR(dentry); | 270 | status = PTR_ERR(dentry); |
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c65a27b76a9d..3b711f5147a7 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -580,7 +580,6 @@ free_session(struct kref *kref) | |||
| 580 | struct nfsd4_cache_entry *e = &ses->se_slots[i].sl_cache_entry; | 580 | struct nfsd4_cache_entry *e = &ses->se_slots[i].sl_cache_entry; |
| 581 | nfsd4_release_respages(e->ce_respages, e->ce_resused); | 581 | nfsd4_release_respages(e->ce_respages, e->ce_resused); |
| 582 | } | 582 | } |
| 583 | kfree(ses->se_slots); | ||
| 584 | kfree(ses); | 583 | kfree(ses); |
| 585 | } | 584 | } |
| 586 | 585 | ||
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index b820c311931c..b73549d293be 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
| @@ -2214,6 +2214,15 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, | |||
| 2214 | dentry = lookup_one_len(name, cd->rd_fhp->fh_dentry, namlen); | 2214 | dentry = lookup_one_len(name, cd->rd_fhp->fh_dentry, namlen); |
| 2215 | if (IS_ERR(dentry)) | 2215 | if (IS_ERR(dentry)) |
| 2216 | return nfserrno(PTR_ERR(dentry)); | 2216 | return nfserrno(PTR_ERR(dentry)); |
| 2217 | if (!dentry->d_inode) { | ||
| 2218 | /* | ||
| 2219 | * nfsd_buffered_readdir drops the i_mutex between | ||
| 2220 | * readdir and calling this callback, leaving a window | ||
| 2221 | * where this directory entry could have gone away. | ||
| 2222 | */ | ||
| 2223 | dput(dentry); | ||
| 2224 | return nfserr_noent; | ||
| 2225 | } | ||
| 2217 | 2226 | ||
| 2218 | exp_get(exp); | 2227 | exp_get(exp); |
| 2219 | /* | 2228 | /* |
| @@ -2276,6 +2285,7 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, | |||
| 2276 | struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common); | 2285 | struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common); |
| 2277 | int buflen; | 2286 | int buflen; |
| 2278 | __be32 *p = cd->buffer; | 2287 | __be32 *p = cd->buffer; |
| 2288 | __be32 *cookiep; | ||
| 2279 | __be32 nfserr = nfserr_toosmall; | 2289 | __be32 nfserr = nfserr_toosmall; |
| 2280 | 2290 | ||
| 2281 | /* In nfsv4, "." and ".." never make it onto the wire.. */ | 2291 | /* In nfsv4, "." and ".." never make it onto the wire.. */ |
| @@ -2292,7 +2302,7 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, | |||
| 2292 | goto fail; | 2302 | goto fail; |
| 2293 | 2303 | ||
| 2294 | *p++ = xdr_one; /* mark entry present */ | 2304 | *p++ = xdr_one; /* mark entry present */ |
| 2295 | cd->offset = p; /* remember pointer */ | 2305 | cookiep = p; |
| 2296 | p = xdr_encode_hyper(p, NFS_OFFSET_MAX); /* offset of next entry */ | 2306 | p = xdr_encode_hyper(p, NFS_OFFSET_MAX); /* offset of next entry */ |
| 2297 | p = xdr_encode_array(p, name, namlen); /* name length & name */ | 2307 | p = xdr_encode_array(p, name, namlen); /* name length & name */ |
| 2298 | 2308 | ||
| @@ -2306,6 +2316,8 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, | |||
| 2306 | goto fail; | 2316 | goto fail; |
| 2307 | case nfserr_dropit: | 2317 | case nfserr_dropit: |
| 2308 | goto fail; | 2318 | goto fail; |
| 2319 | case nfserr_noent: | ||
| 2320 | goto skip_entry; | ||
| 2309 | default: | 2321 | default: |
| 2310 | /* | 2322 | /* |
| 2311 | * If the client requested the RDATTR_ERROR attribute, | 2323 | * If the client requested the RDATTR_ERROR attribute, |
| @@ -2324,6 +2336,8 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, | |||
| 2324 | } | 2336 | } |
| 2325 | cd->buflen -= (p - cd->buffer); | 2337 | cd->buflen -= (p - cd->buffer); |
| 2326 | cd->buffer = p; | 2338 | cd->buffer = p; |
| 2339 | cd->offset = cookiep; | ||
| 2340 | skip_entry: | ||
| 2327 | cd->common.err = nfs_ok; | 2341 | cd->common.err = nfs_ok; |
| 2328 | return 0; | 2342 | return 0; |
| 2329 | fail: | 2343 | fail: |
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index bed766e435b5..1634319e2404 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c | |||
| @@ -220,7 +220,7 @@ static struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie, | |||
| 220 | rem = 0; | 220 | rem = 0; |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | kevent->name = kmalloc(len + rem, GFP_KERNEL); | 223 | kevent->name = kmalloc(len + rem, GFP_NOFS); |
| 224 | if (unlikely(!kevent->name)) { | 224 | if (unlikely(!kevent->name)) { |
| 225 | kmem_cache_free(event_cachep, kevent); | 225 | kmem_cache_free(event_cachep, kevent); |
| 226 | return NULL; | 226 | return NULL; |
diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c index ed0a0cfd68d2..579dd1b1110f 100644 --- a/fs/ocfs2/symlink.c +++ b/fs/ocfs2/symlink.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
| 40 | #include <linux/pagemap.h> | 40 | #include <linux/pagemap.h> |
| 41 | #include <linux/utsname.h> | 41 | #include <linux/utsname.h> |
| 42 | #include <linux/namei.h> | ||
| 42 | 43 | ||
| 43 | #define MLOG_MASK_PREFIX ML_NAMEI | 44 | #define MLOG_MASK_PREFIX ML_NAMEI |
| 44 | #include <cluster/masklog.h> | 45 | #include <cluster/masklog.h> |
| @@ -54,26 +55,6 @@ | |||
| 54 | 55 | ||
| 55 | #include "buffer_head_io.h" | 56 | #include "buffer_head_io.h" |
| 56 | 57 | ||
| 57 | static char *ocfs2_page_getlink(struct dentry * dentry, | ||
| 58 | struct page **ppage); | ||
| 59 | static char *ocfs2_fast_symlink_getlink(struct inode *inode, | ||
| 60 | struct buffer_head **bh); | ||
| 61 | |||
| 62 | /* get the link contents into pagecache */ | ||
| 63 | static char *ocfs2_page_getlink(struct dentry * dentry, | ||
| 64 | struct page **ppage) | ||
| 65 | { | ||
| 66 | struct page * page; | ||
| 67 | struct address_space *mapping = dentry->d_inode->i_mapping; | ||
| 68 | page = read_mapping_page(mapping, 0, NULL); | ||
| 69 | if (IS_ERR(page)) | ||
| 70 | goto sync_fail; | ||
| 71 | *ppage = page; | ||
| 72 | return kmap(page); | ||
| 73 | |||
| 74 | sync_fail: | ||
| 75 | return (char*)page; | ||
| 76 | } | ||
| 77 | 58 | ||
| 78 | static char *ocfs2_fast_symlink_getlink(struct inode *inode, | 59 | static char *ocfs2_fast_symlink_getlink(struct inode *inode, |
| 79 | struct buffer_head **bh) | 60 | struct buffer_head **bh) |
| @@ -128,40 +109,55 @@ out: | |||
| 128 | return ret; | 109 | return ret; |
| 129 | } | 110 | } |
| 130 | 111 | ||
| 131 | static void *ocfs2_follow_link(struct dentry *dentry, | 112 | static void *ocfs2_fast_follow_link(struct dentry *dentry, |
| 132 | struct nameidata *nd) | 113 | struct nameidata *nd) |
| 133 | { | 114 | { |
| 134 | int status; | 115 | int status = 0; |
| 135 | char *link; | 116 | int len; |
| 117 | char *target, *link = ERR_PTR(-ENOMEM); | ||
| 136 | struct inode *inode = dentry->d_inode; | 118 | struct inode *inode = dentry->d_inode; |
| 137 | struct page *page = NULL; | ||
| 138 | struct buffer_head *bh = NULL; | 119 | struct buffer_head *bh = NULL; |
| 139 | 120 | ||
| 140 | if (ocfs2_inode_is_fast_symlink(inode)) | 121 | mlog_entry_void(); |
| 141 | link = ocfs2_fast_symlink_getlink(inode, &bh); | 122 | |
| 142 | else | 123 | BUG_ON(!ocfs2_inode_is_fast_symlink(inode)); |
| 143 | link = ocfs2_page_getlink(dentry, &page); | 124 | target = ocfs2_fast_symlink_getlink(inode, &bh); |
| 144 | if (IS_ERR(link)) { | 125 | if (IS_ERR(target)) { |
| 145 | status = PTR_ERR(link); | 126 | status = PTR_ERR(target); |
| 146 | mlog_errno(status); | 127 | mlog_errno(status); |
| 147 | goto bail; | 128 | goto bail; |
| 148 | } | 129 | } |
| 149 | 130 | ||
| 150 | status = vfs_follow_link(nd, link); | 131 | /* Fast symlinks can't be large */ |
| 132 | len = strlen(target); | ||
| 133 | link = kzalloc(len + 1, GFP_NOFS); | ||
| 134 | if (!link) { | ||
| 135 | status = -ENOMEM; | ||
| 136 | mlog_errno(status); | ||
| 137 | goto bail; | ||
| 138 | } | ||
| 139 | |||
| 140 | memcpy(link, target, len); | ||
| 141 | nd_set_link(nd, link); | ||
| 151 | 142 | ||
| 152 | bail: | 143 | bail: |
| 153 | if (page) { | ||
| 154 | kunmap(page); | ||
| 155 | page_cache_release(page); | ||
| 156 | } | ||
| 157 | brelse(bh); | 144 | brelse(bh); |
| 158 | 145 | ||
| 159 | return ERR_PTR(status); | 146 | mlog_exit(status); |
| 147 | return status ? ERR_PTR(status) : link; | ||
| 148 | } | ||
| 149 | |||
| 150 | static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) | ||
| 151 | { | ||
| 152 | char *link = cookie; | ||
| 153 | |||
| 154 | kfree(link); | ||
| 160 | } | 155 | } |
| 161 | 156 | ||
| 162 | const struct inode_operations ocfs2_symlink_inode_operations = { | 157 | const struct inode_operations ocfs2_symlink_inode_operations = { |
| 163 | .readlink = page_readlink, | 158 | .readlink = page_readlink, |
| 164 | .follow_link = ocfs2_follow_link, | 159 | .follow_link = page_follow_link_light, |
| 160 | .put_link = page_put_link, | ||
| 165 | .getattr = ocfs2_getattr, | 161 | .getattr = ocfs2_getattr, |
| 166 | .setattr = ocfs2_setattr, | 162 | .setattr = ocfs2_setattr, |
| 167 | .setxattr = generic_setxattr, | 163 | .setxattr = generic_setxattr, |
| @@ -171,7 +167,8 @@ const struct inode_operations ocfs2_symlink_inode_operations = { | |||
| 171 | }; | 167 | }; |
| 172 | const struct inode_operations ocfs2_fast_symlink_inode_operations = { | 168 | const struct inode_operations ocfs2_fast_symlink_inode_operations = { |
| 173 | .readlink = ocfs2_readlink, | 169 | .readlink = ocfs2_readlink, |
| 174 | .follow_link = ocfs2_follow_link, | 170 | .follow_link = ocfs2_fast_follow_link, |
| 171 | .put_link = ocfs2_fast_put_link, | ||
| 175 | .getattr = ocfs2_getattr, | 172 | .getattr = ocfs2_getattr, |
| 176 | .setattr = ocfs2_setattr, | 173 | .setattr = ocfs2_setattr, |
| 177 | .setxattr = generic_setxattr, | 174 | .setxattr = generic_setxattr, |
| @@ -1033,7 +1033,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode) | |||
| 1033 | if (!IS_ERR(tmp)) { | 1033 | if (!IS_ERR(tmp)) { |
| 1034 | fd = get_unused_fd_flags(flags); | 1034 | fd = get_unused_fd_flags(flags); |
| 1035 | if (fd >= 0) { | 1035 | if (fd >= 0) { |
| 1036 | struct file *f = do_filp_open(dfd, tmp, flags, mode); | 1036 | struct file *f = do_filp_open(dfd, tmp, flags, mode, 0); |
| 1037 | if (IS_ERR(f)) { | 1037 | if (IS_ERR(f)) { |
| 1038 | put_unused_fd(fd); | 1038 | put_unused_fd(fd); |
| 1039 | fd = PTR_ERR(f); | 1039 | fd = PTR_ERR(f); |
diff --git a/fs/proc/array.c b/fs/proc/array.c index 7e4877d9dcb5..725a650bbbb8 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
| @@ -80,6 +80,7 @@ | |||
| 80 | #include <linux/delayacct.h> | 80 | #include <linux/delayacct.h> |
| 81 | #include <linux/seq_file.h> | 81 | #include <linux/seq_file.h> |
| 82 | #include <linux/pid_namespace.h> | 82 | #include <linux/pid_namespace.h> |
| 83 | #include <linux/ptrace.h> | ||
| 83 | #include <linux/tracehook.h> | 84 | #include <linux/tracehook.h> |
| 84 | 85 | ||
| 85 | #include <asm/pgtable.h> | 86 | #include <asm/pgtable.h> |
| @@ -352,6 +353,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
| 352 | char state; | 353 | char state; |
| 353 | pid_t ppid = 0, pgid = -1, sid = -1; | 354 | pid_t ppid = 0, pgid = -1, sid = -1; |
| 354 | int num_threads = 0; | 355 | int num_threads = 0; |
| 356 | int permitted; | ||
| 355 | struct mm_struct *mm; | 357 | struct mm_struct *mm; |
| 356 | unsigned long long start_time; | 358 | unsigned long long start_time; |
| 357 | unsigned long cmin_flt = 0, cmaj_flt = 0; | 359 | unsigned long cmin_flt = 0, cmaj_flt = 0; |
| @@ -364,11 +366,14 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
| 364 | 366 | ||
| 365 | state = *get_task_state(task); | 367 | state = *get_task_state(task); |
| 366 | vsize = eip = esp = 0; | 368 | vsize = eip = esp = 0; |
| 369 | permitted = ptrace_may_access(task, PTRACE_MODE_READ); | ||
| 367 | mm = get_task_mm(task); | 370 | mm = get_task_mm(task); |
| 368 | if (mm) { | 371 | if (mm) { |
| 369 | vsize = task_vsize(mm); | 372 | vsize = task_vsize(mm); |
| 370 | eip = KSTK_EIP(task); | 373 | if (permitted) { |
| 371 | esp = KSTK_ESP(task); | 374 | eip = KSTK_EIP(task); |
| 375 | esp = KSTK_ESP(task); | ||
| 376 | } | ||
| 372 | } | 377 | } |
| 373 | 378 | ||
| 374 | get_task_comm(tcomm, task); | 379 | get_task_comm(tcomm, task); |
| @@ -424,7 +429,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
| 424 | unlock_task_sighand(task, &flags); | 429 | unlock_task_sighand(task, &flags); |
| 425 | } | 430 | } |
| 426 | 431 | ||
| 427 | if (!whole || num_threads < 2) | 432 | if (permitted && (!whole || num_threads < 2)) |
| 428 | wchan = get_wchan(task); | 433 | wchan = get_wchan(task); |
| 429 | if (!whole) { | 434 | if (!whole) { |
| 430 | min_flt = task->min_flt; | 435 | min_flt = task->min_flt; |
| @@ -476,7 +481,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
| 476 | rsslim, | 481 | rsslim, |
| 477 | mm ? mm->start_code : 0, | 482 | mm ? mm->start_code : 0, |
| 478 | mm ? mm->end_code : 0, | 483 | mm ? mm->end_code : 0, |
| 479 | mm ? mm->start_stack : 0, | 484 | (permitted && mm) ? mm->start_stack : 0, |
| 480 | esp, | 485 | esp, |
| 481 | eip, | 486 | eip, |
| 482 | /* The signal information here is obsolete. | 487 | /* The signal information here is obsolete. |
diff --git a/fs/proc/base.c b/fs/proc/base.c index aa763ab00777..fb45615943c2 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -322,7 +322,10 @@ static int proc_pid_wchan(struct task_struct *task, char *buffer) | |||
| 322 | wchan = get_wchan(task); | 322 | wchan = get_wchan(task); |
| 323 | 323 | ||
| 324 | if (lookup_symbol_name(wchan, symname) < 0) | 324 | if (lookup_symbol_name(wchan, symname) < 0) |
| 325 | return sprintf(buffer, "%lu", wchan); | 325 | if (!ptrace_may_access(task, PTRACE_MODE_READ)) |
| 326 | return 0; | ||
| 327 | else | ||
| 328 | return sprintf(buffer, "%lu", wchan); | ||
| 326 | else | 329 | else |
| 327 | return sprintf(buffer, "%s", symname); | 330 | return sprintf(buffer, "%s", symname); |
| 328 | } | 331 | } |
diff --git a/fs/proc/root.c b/fs/proc/root.c index 1e15a2b176e8..b080b791d9e3 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -67,8 +67,7 @@ static int proc_get_sb(struct file_system_type *fs_type, | |||
| 67 | sb->s_flags = flags; | 67 | sb->s_flags = flags; |
| 68 | err = proc_fill_super(sb); | 68 | err = proc_fill_super(sb); |
| 69 | if (err) { | 69 | if (err) { |
| 70 | up_write(&sb->s_umount); | 70 | deactivate_locked_super(sb); |
| 71 | deactivate_super(sb); | ||
| 72 | return err; | 71 | return err; |
| 73 | } | 72 | } |
| 74 | 73 | ||
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index 67a80d7e59e2..45ee3d357c70 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c | |||
| @@ -41,6 +41,18 @@ static int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, | |||
| 41 | 41 | ||
| 42 | #define store_ih(where,what) copy_item_head (where, what) | 42 | #define store_ih(where,what) copy_item_head (where, what) |
| 43 | 43 | ||
| 44 | static inline bool is_privroot_deh(struct dentry *dir, | ||
| 45 | struct reiserfs_de_head *deh) | ||
| 46 | { | ||
| 47 | int ret = 0; | ||
| 48 | #ifdef CONFIG_REISERFS_FS_XATTR | ||
| 49 | struct dentry *privroot = REISERFS_SB(dir->d_sb)->priv_root; | ||
| 50 | ret = (dir == dir->d_parent && privroot->d_inode && | ||
| 51 | deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid); | ||
| 52 | #endif | ||
| 53 | return ret; | ||
| 54 | } | ||
| 55 | |||
| 44 | int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent, | 56 | int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent, |
| 45 | filldir_t filldir, loff_t *pos) | 57 | filldir_t filldir, loff_t *pos) |
| 46 | { | 58 | { |
| @@ -138,18 +150,8 @@ int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent, | |||
| 138 | } | 150 | } |
| 139 | 151 | ||
| 140 | /* Ignore the .reiserfs_priv entry */ | 152 | /* Ignore the .reiserfs_priv entry */ |
| 141 | if (reiserfs_xattrs(inode->i_sb) && | 153 | if (is_privroot_deh(dentry, deh)) |
| 142 | !old_format_only(inode->i_sb) && | ||
| 143 | dentry == inode->i_sb->s_root && | ||
| 144 | REISERFS_SB(inode->i_sb)->priv_root && | ||
| 145 | REISERFS_SB(inode->i_sb)->priv_root->d_inode | ||
| 146 | && deh_objectid(deh) == | ||
| 147 | le32_to_cpu(INODE_PKEY | ||
| 148 | (REISERFS_SB(inode->i_sb)-> | ||
| 149 | priv_root->d_inode)-> | ||
| 150 | k_objectid)) { | ||
| 151 | continue; | 154 | continue; |
| 152 | } | ||
| 153 | 155 | ||
| 154 | d_off = deh_offset(deh); | 156 | d_off = deh_offset(deh); |
| 155 | *pos = d_off; | 157 | *pos = d_off; |
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index efd4d720718e..271579128634 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
| @@ -338,21 +338,8 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry, | |||
| 338 | &path_to_entry, &de); | 338 | &path_to_entry, &de); |
| 339 | pathrelse(&path_to_entry); | 339 | pathrelse(&path_to_entry); |
| 340 | if (retval == NAME_FOUND) { | 340 | if (retval == NAME_FOUND) { |
| 341 | /* Hide the .reiserfs_priv directory */ | 341 | inode = reiserfs_iget(dir->i_sb, |
| 342 | if (reiserfs_xattrs(dir->i_sb) && | 342 | (struct cpu_key *)&(de.de_dir_id)); |
| 343 | !old_format_only(dir->i_sb) && | ||
| 344 | REISERFS_SB(dir->i_sb)->priv_root && | ||
| 345 | REISERFS_SB(dir->i_sb)->priv_root->d_inode && | ||
| 346 | de.de_objectid == | ||
| 347 | le32_to_cpu(INODE_PKEY | ||
| 348 | (REISERFS_SB(dir->i_sb)->priv_root->d_inode)-> | ||
| 349 | k_objectid)) { | ||
| 350 | reiserfs_write_unlock(dir->i_sb); | ||
| 351 | return ERR_PTR(-EACCES); | ||
| 352 | } | ||
| 353 | |||
| 354 | inode = | ||
| 355 | reiserfs_iget(dir->i_sb, (struct cpu_key *)&(de.de_dir_id)); | ||
| 356 | if (!inode || IS_ERR(inode)) { | 343 | if (!inode || IS_ERR(inode)) { |
| 357 | reiserfs_write_unlock(dir->i_sb); | 344 | reiserfs_write_unlock(dir->i_sb); |
| 358 | return ERR_PTR(-EACCES); | 345 | return ERR_PTR(-EACCES); |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 0ae6486d9046..1215a4f50cd2 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
| @@ -1316,8 +1316,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
| 1316 | } | 1316 | } |
| 1317 | 1317 | ||
| 1318 | out_ok: | 1318 | out_ok: |
| 1319 | kfree(s->s_options); | 1319 | replace_mount_options(s, new_opts); |
| 1320 | s->s_options = new_opts; | ||
| 1321 | return 0; | 1320 | return 0; |
| 1322 | 1321 | ||
| 1323 | out_err: | 1322 | out_err: |
| @@ -1842,7 +1841,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) | |||
| 1842 | goto error; | 1841 | goto error; |
| 1843 | } | 1842 | } |
| 1844 | 1843 | ||
| 1845 | if ((errval = reiserfs_xattr_init(s, s->s_flags))) { | 1844 | if ((errval = reiserfs_lookup_privroot(s)) || |
| 1845 | (errval = reiserfs_xattr_init(s, s->s_flags))) { | ||
| 1846 | dput(s->s_root); | 1846 | dput(s->s_root); |
| 1847 | s->s_root = NULL; | 1847 | s->s_root = NULL; |
| 1848 | goto error; | 1848 | goto error; |
| @@ -1855,7 +1855,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) | |||
| 1855 | reiserfs_info(s, "using 3.5.x disk format\n"); | 1855 | reiserfs_info(s, "using 3.5.x disk format\n"); |
| 1856 | } | 1856 | } |
| 1857 | 1857 | ||
| 1858 | if ((errval = reiserfs_xattr_init(s, s->s_flags))) { | 1858 | if ((errval = reiserfs_lookup_privroot(s)) || |
| 1859 | (errval = reiserfs_xattr_init(s, s->s_flags))) { | ||
| 1859 | dput(s->s_root); | 1860 | dput(s->s_root); |
| 1860 | s->s_root = NULL; | 1861 | s->s_root = NULL; |
| 1861 | goto error; | 1862 | goto error; |
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index f83f52bae390..2237e10c7c7c 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
| @@ -113,41 +113,28 @@ static int xattr_rmdir(struct inode *dir, struct dentry *dentry) | |||
| 113 | 113 | ||
| 114 | #define xattr_may_create(flags) (!flags || flags & XATTR_CREATE) | 114 | #define xattr_may_create(flags) (!flags || flags & XATTR_CREATE) |
| 115 | 115 | ||
| 116 | /* Returns and possibly creates the xattr dir. */ | 116 | static struct dentry *open_xa_root(struct super_block *sb, int flags) |
| 117 | static struct dentry *lookup_or_create_dir(struct dentry *parent, | ||
| 118 | const char *name, int flags) | ||
| 119 | { | 117 | { |
| 120 | struct dentry *dentry; | 118 | struct dentry *privroot = REISERFS_SB(sb)->priv_root; |
| 121 | BUG_ON(!parent); | 119 | struct dentry *xaroot; |
| 120 | if (!privroot->d_inode) | ||
| 121 | return ERR_PTR(-ENODATA); | ||
| 122 | 122 | ||
| 123 | dentry = lookup_one_len(name, parent, strlen(name)); | 123 | mutex_lock_nested(&privroot->d_inode->i_mutex, I_MUTEX_XATTR); |
| 124 | if (IS_ERR(dentry)) | ||
| 125 | return dentry; | ||
| 126 | else if (!dentry->d_inode) { | ||
| 127 | int err = -ENODATA; | ||
| 128 | |||
| 129 | if (xattr_may_create(flags)) { | ||
| 130 | mutex_lock_nested(&parent->d_inode->i_mutex, | ||
| 131 | I_MUTEX_XATTR); | ||
| 132 | err = xattr_mkdir(parent->d_inode, dentry, 0700); | ||
| 133 | mutex_unlock(&parent->d_inode->i_mutex); | ||
| 134 | } | ||
| 135 | 124 | ||
| 125 | xaroot = dget(REISERFS_SB(sb)->xattr_root); | ||
| 126 | if (!xaroot->d_inode) { | ||
| 127 | int err = -ENODATA; | ||
| 128 | if (xattr_may_create(flags)) | ||
| 129 | err = xattr_mkdir(privroot->d_inode, xaroot, 0700); | ||
| 136 | if (err) { | 130 | if (err) { |
| 137 | dput(dentry); | 131 | dput(xaroot); |
| 138 | dentry = ERR_PTR(err); | 132 | xaroot = ERR_PTR(err); |
| 139 | } | 133 | } |
| 140 | } | 134 | } |
| 141 | 135 | ||
| 142 | return dentry; | 136 | mutex_unlock(&privroot->d_inode->i_mutex); |
| 143 | } | 137 | return xaroot; |
| 144 | |||
| 145 | static struct dentry *open_xa_root(struct super_block *sb, int flags) | ||
| 146 | { | ||
| 147 | struct dentry *privroot = REISERFS_SB(sb)->priv_root; | ||
| 148 | if (!privroot) | ||
| 149 | return ERR_PTR(-ENODATA); | ||
| 150 | return lookup_or_create_dir(privroot, XAROOT_NAME, flags); | ||
| 151 | } | 138 | } |
| 152 | 139 | ||
| 153 | static struct dentry *open_xa_dir(const struct inode *inode, int flags) | 140 | static struct dentry *open_xa_dir(const struct inode *inode, int flags) |
| @@ -163,10 +150,22 @@ static struct dentry *open_xa_dir(const struct inode *inode, int flags) | |||
| 163 | le32_to_cpu(INODE_PKEY(inode)->k_objectid), | 150 | le32_to_cpu(INODE_PKEY(inode)->k_objectid), |
| 164 | inode->i_generation); | 151 | inode->i_generation); |
| 165 | 152 | ||
| 166 | xadir = lookup_or_create_dir(xaroot, namebuf, flags); | 153 | mutex_lock_nested(&xaroot->d_inode->i_mutex, I_MUTEX_XATTR); |
| 154 | |||
| 155 | xadir = lookup_one_len(namebuf, xaroot, strlen(namebuf)); | ||
| 156 | if (!IS_ERR(xadir) && !xadir->d_inode) { | ||
| 157 | int err = -ENODATA; | ||
| 158 | if (xattr_may_create(flags)) | ||
| 159 | err = xattr_mkdir(xaroot->d_inode, xadir, 0700); | ||
| 160 | if (err) { | ||
| 161 | dput(xadir); | ||
| 162 | xadir = ERR_PTR(err); | ||
| 163 | } | ||
| 164 | } | ||
| 165 | |||
| 166 | mutex_unlock(&xaroot->d_inode->i_mutex); | ||
| 167 | dput(xaroot); | 167 | dput(xaroot); |
| 168 | return xadir; | 168 | return xadir; |
| 169 | |||
| 170 | } | 169 | } |
| 171 | 170 | ||
| 172 | /* The following are side effects of other operations that aren't explicitly | 171 | /* The following are side effects of other operations that aren't explicitly |
| @@ -184,6 +183,7 @@ fill_with_dentries(void *buf, const char *name, int namelen, loff_t offset, | |||
| 184 | { | 183 | { |
| 185 | struct reiserfs_dentry_buf *dbuf = buf; | 184 | struct reiserfs_dentry_buf *dbuf = buf; |
| 186 | struct dentry *dentry; | 185 | struct dentry *dentry; |
| 186 | WARN_ON_ONCE(!mutex_is_locked(&dbuf->xadir->d_inode->i_mutex)); | ||
| 187 | 187 | ||
| 188 | if (dbuf->count == ARRAY_SIZE(dbuf->dentries)) | 188 | if (dbuf->count == ARRAY_SIZE(dbuf->dentries)) |
| 189 | return -ENOSPC; | 189 | return -ENOSPC; |
| @@ -349,6 +349,7 @@ static struct dentry *xattr_lookup(struct inode *inode, const char *name, | |||
| 349 | if (IS_ERR(xadir)) | 349 | if (IS_ERR(xadir)) |
| 350 | return ERR_CAST(xadir); | 350 | return ERR_CAST(xadir); |
| 351 | 351 | ||
| 352 | mutex_lock_nested(&xadir->d_inode->i_mutex, I_MUTEX_XATTR); | ||
| 352 | xafile = lookup_one_len(name, xadir, strlen(name)); | 353 | xafile = lookup_one_len(name, xadir, strlen(name)); |
| 353 | if (IS_ERR(xafile)) { | 354 | if (IS_ERR(xafile)) { |
| 354 | err = PTR_ERR(xafile); | 355 | err = PTR_ERR(xafile); |
| @@ -360,18 +361,15 @@ static struct dentry *xattr_lookup(struct inode *inode, const char *name, | |||
| 360 | 361 | ||
| 361 | if (!xafile->d_inode) { | 362 | if (!xafile->d_inode) { |
| 362 | err = -ENODATA; | 363 | err = -ENODATA; |
| 363 | if (xattr_may_create(flags)) { | 364 | if (xattr_may_create(flags)) |
| 364 | mutex_lock_nested(&xadir->d_inode->i_mutex, | ||
| 365 | I_MUTEX_XATTR); | ||
| 366 | err = xattr_create(xadir->d_inode, xafile, | 365 | err = xattr_create(xadir->d_inode, xafile, |
| 367 | 0700|S_IFREG); | 366 | 0700|S_IFREG); |
| 368 | mutex_unlock(&xadir->d_inode->i_mutex); | ||
| 369 | } | ||
| 370 | } | 367 | } |
| 371 | 368 | ||
| 372 | if (err) | 369 | if (err) |
| 373 | dput(xafile); | 370 | dput(xafile); |
| 374 | out: | 371 | out: |
| 372 | mutex_unlock(&xadir->d_inode->i_mutex); | ||
| 375 | dput(xadir); | 373 | dput(xadir); |
| 376 | if (err) | 374 | if (err) |
| 377 | return ERR_PTR(err); | 375 | return ERR_PTR(err); |
| @@ -435,6 +433,7 @@ static int lookup_and_delete_xattr(struct inode *inode, const char *name) | |||
| 435 | if (IS_ERR(xadir)) | 433 | if (IS_ERR(xadir)) |
| 436 | return PTR_ERR(xadir); | 434 | return PTR_ERR(xadir); |
| 437 | 435 | ||
| 436 | mutex_lock_nested(&xadir->d_inode->i_mutex, I_MUTEX_XATTR); | ||
| 438 | dentry = lookup_one_len(name, xadir, strlen(name)); | 437 | dentry = lookup_one_len(name, xadir, strlen(name)); |
| 439 | if (IS_ERR(dentry)) { | 438 | if (IS_ERR(dentry)) { |
| 440 | err = PTR_ERR(dentry); | 439 | err = PTR_ERR(dentry); |
| @@ -442,14 +441,13 @@ static int lookup_and_delete_xattr(struct inode *inode, const char *name) | |||
| 442 | } | 441 | } |
| 443 | 442 | ||
| 444 | if (dentry->d_inode) { | 443 | if (dentry->d_inode) { |
| 445 | mutex_lock_nested(&xadir->d_inode->i_mutex, I_MUTEX_XATTR); | ||
| 446 | err = xattr_unlink(xadir->d_inode, dentry); | 444 | err = xattr_unlink(xadir->d_inode, dentry); |
| 447 | mutex_unlock(&xadir->d_inode->i_mutex); | ||
| 448 | update_ctime(inode); | 445 | update_ctime(inode); |
| 449 | } | 446 | } |
| 450 | 447 | ||
| 451 | dput(dentry); | 448 | dput(dentry); |
| 452 | out_dput: | 449 | out_dput: |
| 450 | mutex_unlock(&xadir->d_inode->i_mutex); | ||
| 453 | dput(xadir); | 451 | dput(xadir); |
| 454 | return err; | 452 | return err; |
| 455 | } | 453 | } |
| @@ -843,7 +841,7 @@ ssize_t reiserfs_listxattr(struct dentry * dentry, char *buffer, size_t size) | |||
| 843 | if (!dentry->d_inode) | 841 | if (!dentry->d_inode) |
| 844 | return -EINVAL; | 842 | return -EINVAL; |
| 845 | 843 | ||
| 846 | if (!reiserfs_xattrs(dentry->d_sb) || | 844 | if (!dentry->d_sb->s_xattr || |
| 847 | get_inode_sd_version(dentry->d_inode) == STAT_DATA_V1) | 845 | get_inode_sd_version(dentry->d_inode) == STAT_DATA_V1) |
| 848 | return -EOPNOTSUPP; | 846 | return -EOPNOTSUPP; |
| 849 | 847 | ||
| @@ -906,19 +904,22 @@ static int create_privroot(struct dentry *dentry) | |||
| 906 | { | 904 | { |
| 907 | int err; | 905 | int err; |
| 908 | struct inode *inode = dentry->d_parent->d_inode; | 906 | struct inode *inode = dentry->d_parent->d_inode; |
| 909 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_XATTR); | 907 | WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex)); |
| 908 | |||
| 910 | err = xattr_mkdir(inode, dentry, 0700); | 909 | err = xattr_mkdir(inode, dentry, 0700); |
| 911 | mutex_unlock(&inode->i_mutex); | 910 | if (err || !dentry->d_inode) { |
| 912 | if (err) { | 911 | reiserfs_warning(dentry->d_sb, "jdm-20006", |
| 913 | dput(dentry); | 912 | "xattrs/ACLs enabled and couldn't " |
| 914 | dentry = NULL; | 913 | "find/create .reiserfs_priv. " |
| 914 | "Failing mount."); | ||
| 915 | return -EOPNOTSUPP; | ||
| 915 | } | 916 | } |
| 916 | 917 | ||
| 917 | if (dentry && dentry->d_inode) | 918 | dentry->d_inode->i_flags |= S_PRIVATE; |
| 918 | reiserfs_info(dentry->d_sb, "Created %s - reserved for xattr " | 919 | reiserfs_info(dentry->d_sb, "Created %s - reserved for xattr " |
| 919 | "storage.\n", PRIVROOT_NAME); | 920 | "storage.\n", PRIVROOT_NAME); |
| 920 | 921 | ||
| 921 | return err; | 922 | return 0; |
| 922 | } | 923 | } |
| 923 | 924 | ||
| 924 | static int xattr_mount_check(struct super_block *s) | 925 | static int xattr_mount_check(struct super_block *s) |
| @@ -950,11 +951,9 @@ static int | |||
| 950 | xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name) | 951 | xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name) |
| 951 | { | 952 | { |
| 952 | struct dentry *priv_root = REISERFS_SB(dentry->d_sb)->priv_root; | 953 | struct dentry *priv_root = REISERFS_SB(dentry->d_sb)->priv_root; |
| 953 | if (name->len == priv_root->d_name.len && | 954 | if (container_of(q1, struct dentry, d_name) == priv_root) |
| 954 | name->hash == priv_root->d_name.hash && | ||
| 955 | !memcmp(name->name, priv_root->d_name.name, name->len)) { | ||
| 956 | return -ENOENT; | 955 | return -ENOENT; |
| 957 | } else if (q1->len == name->len && | 956 | if (q1->len == name->len && |
| 958 | !memcmp(q1->name, name->name, name->len)) | 957 | !memcmp(q1->name, name->name, name->len)) |
| 959 | return 0; | 958 | return 0; |
| 960 | return 1; | 959 | return 1; |
| @@ -964,59 +963,60 @@ static const struct dentry_operations xattr_lookup_poison_ops = { | |||
| 964 | .d_compare = xattr_lookup_poison, | 963 | .d_compare = xattr_lookup_poison, |
| 965 | }; | 964 | }; |
| 966 | 965 | ||
| 966 | int reiserfs_lookup_privroot(struct super_block *s) | ||
| 967 | { | ||
| 968 | struct dentry *dentry; | ||
| 969 | int err = 0; | ||
| 970 | |||
| 971 | /* If we don't have the privroot located yet - go find it */ | ||
| 972 | mutex_lock(&s->s_root->d_inode->i_mutex); | ||
| 973 | dentry = lookup_one_len(PRIVROOT_NAME, s->s_root, | ||
| 974 | strlen(PRIVROOT_NAME)); | ||
| 975 | if (!IS_ERR(dentry)) { | ||
| 976 | REISERFS_SB(s)->priv_root = dentry; | ||
| 977 | s->s_root->d_op = &xattr_lookup_poison_ops; | ||
| 978 | if (dentry->d_inode) | ||
| 979 | dentry->d_inode->i_flags |= S_PRIVATE; | ||
| 980 | } else | ||
| 981 | err = PTR_ERR(dentry); | ||
| 982 | mutex_unlock(&s->s_root->d_inode->i_mutex); | ||
| 983 | |||
| 984 | return err; | ||
| 985 | } | ||
| 986 | |||
| 967 | /* We need to take a copy of the mount flags since things like | 987 | /* We need to take a copy of the mount flags since things like |
| 968 | * MS_RDONLY don't get set until *after* we're called. | 988 | * MS_RDONLY don't get set until *after* we're called. |
| 969 | * mount_flags != mount_options */ | 989 | * mount_flags != mount_options */ |
| 970 | int reiserfs_xattr_init(struct super_block *s, int mount_flags) | 990 | int reiserfs_xattr_init(struct super_block *s, int mount_flags) |
| 971 | { | 991 | { |
| 972 | int err = 0; | 992 | int err = 0; |
| 993 | struct dentry *privroot = REISERFS_SB(s)->priv_root; | ||
| 973 | 994 | ||
| 974 | #ifdef CONFIG_REISERFS_FS_XATTR | 995 | #ifdef CONFIG_REISERFS_FS_XATTR |
| 975 | err = xattr_mount_check(s); | 996 | err = xattr_mount_check(s); |
| 976 | if (err) | 997 | if (err) |
| 977 | goto error; | 998 | goto error; |
| 978 | #endif | ||
| 979 | 999 | ||
| 980 | /* If we don't have the privroot located yet - go find it */ | 1000 | if (!privroot->d_inode && !(mount_flags & MS_RDONLY)) { |
| 981 | if (!REISERFS_SB(s)->priv_root) { | 1001 | mutex_lock(&s->s_root->d_inode->i_mutex); |
| 982 | struct dentry *dentry; | 1002 | err = create_privroot(REISERFS_SB(s)->priv_root); |
| 983 | dentry = lookup_one_len(PRIVROOT_NAME, s->s_root, | 1003 | mutex_unlock(&s->s_root->d_inode->i_mutex); |
| 984 | strlen(PRIVROOT_NAME)); | ||
| 985 | if (!IS_ERR(dentry)) { | ||
| 986 | #ifdef CONFIG_REISERFS_FS_XATTR | ||
| 987 | if (!(mount_flags & MS_RDONLY) && !dentry->d_inode) | ||
| 988 | err = create_privroot(dentry); | ||
| 989 | #endif | ||
| 990 | if (!dentry->d_inode) { | ||
| 991 | dput(dentry); | ||
| 992 | dentry = NULL; | ||
| 993 | } | ||
| 994 | } else | ||
| 995 | err = PTR_ERR(dentry); | ||
| 996 | |||
| 997 | if (!err && dentry) { | ||
| 998 | s->s_root->d_op = &xattr_lookup_poison_ops; | ||
| 999 | dentry->d_inode->i_flags |= S_PRIVATE; | ||
| 1000 | REISERFS_SB(s)->priv_root = dentry; | ||
| 1001 | #ifdef CONFIG_REISERFS_FS_XATTR | ||
| 1002 | /* xattrs are unavailable */ | ||
| 1003 | } else if (!(mount_flags & MS_RDONLY)) { | ||
| 1004 | /* If we're read-only it just means that the dir | ||
| 1005 | * hasn't been created. Not an error -- just no | ||
| 1006 | * xattrs on the fs. We'll check again if we | ||
| 1007 | * go read-write */ | ||
| 1008 | reiserfs_warning(s, "jdm-20006", | ||
| 1009 | "xattrs/ACLs enabled and couldn't " | ||
| 1010 | "find/create .reiserfs_priv. " | ||
| 1011 | "Failing mount."); | ||
| 1012 | err = -EOPNOTSUPP; | ||
| 1013 | #endif | ||
| 1014 | } | ||
| 1015 | } | 1004 | } |
| 1016 | 1005 | ||
| 1017 | #ifdef CONFIG_REISERFS_FS_XATTR | 1006 | if (privroot->d_inode) { |
| 1018 | if (!err) | ||
| 1019 | s->s_xattr = reiserfs_xattr_handlers; | 1007 | s->s_xattr = reiserfs_xattr_handlers; |
| 1008 | mutex_lock(&privroot->d_inode->i_mutex); | ||
| 1009 | if (!REISERFS_SB(s)->xattr_root) { | ||
| 1010 | struct dentry *dentry; | ||
| 1011 | dentry = lookup_one_len(XAROOT_NAME, privroot, | ||
| 1012 | strlen(XAROOT_NAME)); | ||
| 1013 | if (!IS_ERR(dentry)) | ||
| 1014 | REISERFS_SB(s)->xattr_root = dentry; | ||
| 1015 | else | ||
| 1016 | err = PTR_ERR(dentry); | ||
| 1017 | } | ||
| 1018 | mutex_unlock(&privroot->d_inode->i_mutex); | ||
| 1019 | } | ||
| 1020 | 1020 | ||
| 1021 | error: | 1021 | error: |
| 1022 | if (err) { | 1022 | if (err) { |
| @@ -1026,11 +1026,12 @@ error: | |||
| 1026 | #endif | 1026 | #endif |
| 1027 | 1027 | ||
| 1028 | /* The super_block MS_POSIXACL must mirror the (no)acl mount option. */ | 1028 | /* The super_block MS_POSIXACL must mirror the (no)acl mount option. */ |
| 1029 | s->s_flags = s->s_flags & ~MS_POSIXACL; | ||
| 1030 | #ifdef CONFIG_REISERFS_FS_POSIX_ACL | 1029 | #ifdef CONFIG_REISERFS_FS_POSIX_ACL |
| 1031 | if (reiserfs_posixacl(s)) | 1030 | if (reiserfs_posixacl(s)) |
| 1032 | s->s_flags |= MS_POSIXACL; | 1031 | s->s_flags |= MS_POSIXACL; |
| 1032 | else | ||
| 1033 | #endif | 1033 | #endif |
| 1034 | s->s_flags &= ~MS_POSIXACL; | ||
| 1034 | 1035 | ||
| 1035 | return err; | 1036 | return err; |
| 1036 | } | 1037 | } |
diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c index 4d3c20e787c3..a92c8792c0f6 100644 --- a/fs/reiserfs/xattr_security.c +++ b/fs/reiserfs/xattr_security.c | |||
| @@ -55,8 +55,16 @@ int reiserfs_security_init(struct inode *dir, struct inode *inode, | |||
| 55 | struct reiserfs_security_handle *sec) | 55 | struct reiserfs_security_handle *sec) |
| 56 | { | 56 | { |
| 57 | int blocks = 0; | 57 | int blocks = 0; |
| 58 | int error = security_inode_init_security(inode, dir, &sec->name, | 58 | int error; |
| 59 | &sec->value, &sec->length); | 59 | |
| 60 | sec->name = NULL; | ||
| 61 | |||
| 62 | /* Don't add selinux attributes on xattrs - they'll never get used */ | ||
| 63 | if (IS_PRIVATE(dir)) | ||
| 64 | return 0; | ||
| 65 | |||
| 66 | error = security_inode_init_security(inode, dir, &sec->name, | ||
| 67 | &sec->value, &sec->length); | ||
| 60 | if (error) { | 68 | if (error) { |
| 61 | if (error == -EOPNOTSUPP) | 69 | if (error == -EOPNOTSUPP) |
| 62 | error = 0; | 70 | error = 0; |
diff --git a/fs/romfs/super.c b/fs/romfs/super.c index c53b5ef8a02f..4ab3c03d8f95 100644 --- a/fs/romfs/super.c +++ b/fs/romfs/super.c | |||
| @@ -298,7 +298,8 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos) | |||
| 298 | struct romfs_inode ri; | 298 | struct romfs_inode ri; |
| 299 | struct inode *i; | 299 | struct inode *i; |
| 300 | unsigned long nlen; | 300 | unsigned long nlen; |
| 301 | unsigned nextfh, ret; | 301 | unsigned nextfh; |
| 302 | int ret; | ||
| 302 | umode_t mode; | 303 | umode_t mode; |
| 303 | 304 | ||
| 304 | /* we might have to traverse a chain of "hard link" file entries to get | 305 | /* we might have to traverse a chain of "hard link" file entries to get |
diff --git a/fs/super.c b/fs/super.c index 786fe7d72790..1943fdf655fa 100644 --- a/fs/super.c +++ b/fs/super.c | |||
| @@ -208,6 +208,34 @@ void deactivate_super(struct super_block *s) | |||
| 208 | EXPORT_SYMBOL(deactivate_super); | 208 | EXPORT_SYMBOL(deactivate_super); |
| 209 | 209 | ||
| 210 | /** | 210 | /** |
| 211 | * deactivate_locked_super - drop an active reference to superblock | ||
| 212 | * @s: superblock to deactivate | ||
| 213 | * | ||
| 214 | * Equivalent of up_write(&s->s_umount); deactivate_super(s);, except that | ||
| 215 | * it does not unlock it until it's all over. As the result, it's safe to | ||
| 216 | * use to dispose of new superblock on ->get_sb() failure exits - nobody | ||
| 217 | * will see the sucker until it's all over. Equivalent using up_write + | ||
| 218 | * deactivate_super is safe for that purpose only if superblock is either | ||
| 219 | * safe to use or has NULL ->s_root when we unlock. | ||
| 220 | */ | ||
| 221 | void deactivate_locked_super(struct super_block *s) | ||
| 222 | { | ||
| 223 | struct file_system_type *fs = s->s_type; | ||
| 224 | if (atomic_dec_and_lock(&s->s_active, &sb_lock)) { | ||
| 225 | s->s_count -= S_BIAS-1; | ||
| 226 | spin_unlock(&sb_lock); | ||
| 227 | vfs_dq_off(s, 0); | ||
| 228 | fs->kill_sb(s); | ||
| 229 | put_filesystem(fs); | ||
| 230 | put_super(s); | ||
| 231 | } else { | ||
| 232 | up_write(&s->s_umount); | ||
| 233 | } | ||
| 234 | } | ||
| 235 | |||
| 236 | EXPORT_SYMBOL(deactivate_locked_super); | ||
| 237 | |||
| 238 | /** | ||
| 211 | * grab_super - acquire an active reference | 239 | * grab_super - acquire an active reference |
| 212 | * @s: reference we are trying to make active | 240 | * @s: reference we are trying to make active |
| 213 | * | 241 | * |
| @@ -797,8 +825,7 @@ int get_sb_ns(struct file_system_type *fs_type, int flags, void *data, | |||
| 797 | sb->s_flags = flags; | 825 | sb->s_flags = flags; |
| 798 | err = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); | 826 | err = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); |
| 799 | if (err) { | 827 | if (err) { |
| 800 | up_write(&sb->s_umount); | 828 | deactivate_locked_super(sb); |
| 801 | deactivate_super(sb); | ||
| 802 | return err; | 829 | return err; |
| 803 | } | 830 | } |
| 804 | 831 | ||
| @@ -854,8 +881,7 @@ int get_sb_bdev(struct file_system_type *fs_type, | |||
| 854 | 881 | ||
| 855 | if (s->s_root) { | 882 | if (s->s_root) { |
| 856 | if ((flags ^ s->s_flags) & MS_RDONLY) { | 883 | if ((flags ^ s->s_flags) & MS_RDONLY) { |
| 857 | up_write(&s->s_umount); | 884 | deactivate_locked_super(s); |
| 858 | deactivate_super(s); | ||
| 859 | error = -EBUSY; | 885 | error = -EBUSY; |
| 860 | goto error_bdev; | 886 | goto error_bdev; |
| 861 | } | 887 | } |
| @@ -870,8 +896,7 @@ int get_sb_bdev(struct file_system_type *fs_type, | |||
| 870 | sb_set_blocksize(s, block_size(bdev)); | 896 | sb_set_blocksize(s, block_size(bdev)); |
| 871 | error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); | 897 | error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); |
| 872 | if (error) { | 898 | if (error) { |
| 873 | up_write(&s->s_umount); | 899 | deactivate_locked_super(s); |
| 874 | deactivate_super(s); | ||
| 875 | goto error; | 900 | goto error; |
| 876 | } | 901 | } |
| 877 | 902 | ||
| @@ -897,7 +922,7 @@ void kill_block_super(struct super_block *sb) | |||
| 897 | struct block_device *bdev = sb->s_bdev; | 922 | struct block_device *bdev = sb->s_bdev; |
| 898 | fmode_t mode = sb->s_mode; | 923 | fmode_t mode = sb->s_mode; |
| 899 | 924 | ||
| 900 | bdev->bd_super = 0; | 925 | bdev->bd_super = NULL; |
| 901 | generic_shutdown_super(sb); | 926 | generic_shutdown_super(sb); |
| 902 | sync_blockdev(bdev); | 927 | sync_blockdev(bdev); |
| 903 | close_bdev_exclusive(bdev, mode); | 928 | close_bdev_exclusive(bdev, mode); |
| @@ -921,8 +946,7 @@ int get_sb_nodev(struct file_system_type *fs_type, | |||
| 921 | 946 | ||
| 922 | error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); | 947 | error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); |
| 923 | if (error) { | 948 | if (error) { |
| 924 | up_write(&s->s_umount); | 949 | deactivate_locked_super(s); |
| 925 | deactivate_super(s); | ||
| 926 | return error; | 950 | return error; |
| 927 | } | 951 | } |
| 928 | s->s_flags |= MS_ACTIVE; | 952 | s->s_flags |= MS_ACTIVE; |
| @@ -952,8 +976,7 @@ int get_sb_single(struct file_system_type *fs_type, | |||
| 952 | s->s_flags = flags; | 976 | s->s_flags = flags; |
| 953 | error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); | 977 | error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); |
| 954 | if (error) { | 978 | if (error) { |
| 955 | up_write(&s->s_umount); | 979 | deactivate_locked_super(s); |
| 956 | deactivate_super(s); | ||
| 957 | return error; | 980 | return error; |
| 958 | } | 981 | } |
| 959 | s->s_flags |= MS_ACTIVE; | 982 | s->s_flags |= MS_ACTIVE; |
| @@ -1006,8 +1029,7 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void | |||
| 1006 | return mnt; | 1029 | return mnt; |
| 1007 | out_sb: | 1030 | out_sb: |
| 1008 | dput(mnt->mnt_root); | 1031 | dput(mnt->mnt_root); |
| 1009 | up_write(&mnt->mnt_sb->s_umount); | 1032 | deactivate_locked_super(mnt->mnt_sb); |
| 1010 | deactivate_super(mnt->mnt_sb); | ||
| 1011 | out_free_secdata: | 1033 | out_free_secdata: |
| 1012 | free_secdata(secdata); | 1034 | free_secdata(secdata); |
| 1013 | out_mnt: | 1035 | out_mnt: |
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index faa44f90608a..e9f7a754c4f7 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c | |||
| @@ -2055,8 +2055,7 @@ static int ubifs_get_sb(struct file_system_type *fs_type, int flags, | |||
| 2055 | return 0; | 2055 | return 0; |
| 2056 | 2056 | ||
| 2057 | out_deact: | 2057 | out_deact: |
| 2058 | up_write(&sb->s_umount); | 2058 | deactivate_locked_super(sb); |
| 2059 | deactivate_super(sb); | ||
| 2060 | out_close: | 2059 | out_close: |
| 2061 | ubi_close_volume(ubi); | 2060 | ubi_close_volume(ubi); |
| 2062 | return err; | 2061 | return err; |
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index dbbbc4668769..6321b797061b 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c | |||
| @@ -666,6 +666,6 @@ not_empty: | |||
| 666 | const struct file_operations ufs_dir_operations = { | 666 | const struct file_operations ufs_dir_operations = { |
| 667 | .read = generic_read_dir, | 667 | .read = generic_read_dir, |
| 668 | .readdir = ufs_readdir, | 668 | .readdir = ufs_readdir, |
| 669 | .fsync = file_fsync, | 669 | .fsync = ufs_sync_file, |
| 670 | .llseek = generic_file_llseek, | 670 | .llseek = generic_file_llseek, |
| 671 | }; | 671 | }; |
diff --git a/fs/ufs/file.c b/fs/ufs/file.c index 625ef17c6f83..2bd3a1615714 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include "ufs.h" | 30 | #include "ufs.h" |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | static int ufs_sync_file(struct file *file, struct dentry *dentry, int datasync) | 33 | int ufs_sync_file(struct file *file, struct dentry *dentry, int datasync) |
| 34 | { | 34 | { |
| 35 | struct inode *inode = dentry->d_inode; | 35 | struct inode *inode = dentry->d_inode; |
| 36 | int err; | 36 | int err; |
diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h index 69b3427d7885..d0c4acd4f1f3 100644 --- a/fs/ufs/ufs.h +++ b/fs/ufs/ufs.h | |||
| @@ -98,8 +98,8 @@ extern void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de, | |||
| 98 | /* file.c */ | 98 | /* file.c */ |
| 99 | extern const struct inode_operations ufs_file_inode_operations; | 99 | extern const struct inode_operations ufs_file_inode_operations; |
| 100 | extern const struct file_operations ufs_file_operations; | 100 | extern const struct file_operations ufs_file_operations; |
| 101 | |||
| 102 | extern const struct address_space_operations ufs_aops; | 101 | extern const struct address_space_operations ufs_aops; |
| 102 | extern int ufs_sync_file(struct file *, struct dentry *, int); | ||
| 103 | 103 | ||
| 104 | /* ialloc.c */ | 104 | /* ialloc.c */ |
| 105 | extern void ufs_free_inode (struct inode *inode); | 105 | extern void ufs_free_inode (struct inode *inode); |
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index e727fe0d1451..4b6755984d24 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h | |||
| @@ -58,12 +58,13 @@ struct bug_entry { | |||
| 58 | */ | 58 | */ |
| 59 | #ifndef __WARN | 59 | #ifndef __WARN |
| 60 | #ifndef __ASSEMBLY__ | 60 | #ifndef __ASSEMBLY__ |
| 61 | extern void warn_slowpath(const char *file, const int line, | 61 | extern void warn_slowpath_fmt(const char *file, const int line, |
| 62 | const char *fmt, ...) __attribute__((format(printf, 3, 4))); | 62 | const char *fmt, ...) __attribute__((format(printf, 3, 4))); |
| 63 | extern void warn_slowpath_null(const char *file, const int line); | ||
| 63 | #define WANT_WARN_ON_SLOWPATH | 64 | #define WANT_WARN_ON_SLOWPATH |
| 64 | #endif | 65 | #endif |
| 65 | #define __WARN() warn_slowpath(__FILE__, __LINE__, NULL) | 66 | #define __WARN() warn_slowpath_null(__FILE__, __LINE__) |
| 66 | #define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg) | 67 | #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg) |
| 67 | #else | 68 | #else |
| 68 | #define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0) | 69 | #define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0) |
| 69 | #endif | 70 | #endif |
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index ca9b9b9bd331..3f0eaa397ef5 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -138,6 +138,7 @@ header-y += qnxtypes.h | |||
| 138 | header-y += radeonfb.h | 138 | header-y += radeonfb.h |
| 139 | header-y += raw.h | 139 | header-y += raw.h |
| 140 | header-y += resource.h | 140 | header-y += resource.h |
| 141 | header-y += romfs_fs.h | ||
| 141 | header-y += rose.h | 142 | header-y += rose.h |
| 142 | header-y += serial_reg.h | 143 | header-y += serial_reg.h |
| 143 | header-y += smbno.h | 144 | header-y += smbno.h |
| @@ -314,7 +315,6 @@ unifdef-y += irqnr.h | |||
| 314 | unifdef-y += reboot.h | 315 | unifdef-y += reboot.h |
| 315 | unifdef-y += reiserfs_fs.h | 316 | unifdef-y += reiserfs_fs.h |
| 316 | unifdef-y += reiserfs_xattr.h | 317 | unifdef-y += reiserfs_xattr.h |
| 317 | unifdef-y += romfs_fs.h | ||
| 318 | unifdef-y += route.h | 318 | unifdef-y += route.h |
| 319 | unifdef-y += rtc.h | 319 | unifdef-y += rtc.h |
| 320 | unifdef-y += rtnetlink.h | 320 | unifdef-y += rtnetlink.h |
diff --git a/include/linux/device.h b/include/linux/device.h index 6a69caaac18a..5d5c197bad45 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -384,13 +384,8 @@ struct device { | |||
| 384 | struct device_driver *driver; /* which driver has allocated this | 384 | struct device_driver *driver; /* which driver has allocated this |
| 385 | device */ | 385 | device */ |
| 386 | void *driver_data; /* data private to the driver */ | 386 | void *driver_data; /* data private to the driver */ |
| 387 | 387 | void *platform_data; /* Platform specific data, device | |
| 388 | void *platform_data; /* We will remove platform_data | 388 | core doesn't touch it */ |
| 389 | field if all platform devices | ||
| 390 | pass its platform specific data | ||
| 391 | from platform_device->platform_data, | ||
| 392 | other kind of devices should not | ||
| 393 | use platform_data. */ | ||
| 394 | struct dev_pm_info power; | 389 | struct dev_pm_info power; |
| 395 | 390 | ||
| 396 | #ifdef CONFIG_NUMA | 391 | #ifdef CONFIG_NUMA |
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 2e2aa3df170c..ffefba81c818 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -78,12 +78,18 @@ enum dma_transaction_type { | |||
| 78 | * dependency chains | 78 | * dependency chains |
| 79 | * @DMA_COMPL_SKIP_SRC_UNMAP - set to disable dma-unmapping the source buffer(s) | 79 | * @DMA_COMPL_SKIP_SRC_UNMAP - set to disable dma-unmapping the source buffer(s) |
| 80 | * @DMA_COMPL_SKIP_DEST_UNMAP - set to disable dma-unmapping the destination(s) | 80 | * @DMA_COMPL_SKIP_DEST_UNMAP - set to disable dma-unmapping the destination(s) |
| 81 | * @DMA_COMPL_SRC_UNMAP_SINGLE - set to do the source dma-unmapping as single | ||
| 82 | * (if not set, do the source dma-unmapping as page) | ||
| 83 | * @DMA_COMPL_DEST_UNMAP_SINGLE - set to do the destination dma-unmapping as single | ||
| 84 | * (if not set, do the destination dma-unmapping as page) | ||
| 81 | */ | 85 | */ |
| 82 | enum dma_ctrl_flags { | 86 | enum dma_ctrl_flags { |
| 83 | DMA_PREP_INTERRUPT = (1 << 0), | 87 | DMA_PREP_INTERRUPT = (1 << 0), |
| 84 | DMA_CTRL_ACK = (1 << 1), | 88 | DMA_CTRL_ACK = (1 << 1), |
| 85 | DMA_COMPL_SKIP_SRC_UNMAP = (1 << 2), | 89 | DMA_COMPL_SKIP_SRC_UNMAP = (1 << 2), |
| 86 | DMA_COMPL_SKIP_DEST_UNMAP = (1 << 3), | 90 | DMA_COMPL_SKIP_DEST_UNMAP = (1 << 3), |
| 91 | DMA_COMPL_SRC_UNMAP_SINGLE = (1 << 4), | ||
| 92 | DMA_COMPL_DEST_UNMAP_SINGLE = (1 << 5), | ||
| 87 | }; | 93 | }; |
| 88 | 94 | ||
| 89 | /** | 95 | /** |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 5bed436f4353..3b534e527e09 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -1775,6 +1775,7 @@ void kill_block_super(struct super_block *sb); | |||
| 1775 | void kill_anon_super(struct super_block *sb); | 1775 | void kill_anon_super(struct super_block *sb); |
| 1776 | void kill_litter_super(struct super_block *sb); | 1776 | void kill_litter_super(struct super_block *sb); |
| 1777 | void deactivate_super(struct super_block *sb); | 1777 | void deactivate_super(struct super_block *sb); |
| 1778 | void deactivate_locked_super(struct super_block *sb); | ||
| 1778 | int set_anon_super(struct super_block *s, void *data); | 1779 | int set_anon_super(struct super_block *s, void *data); |
| 1779 | struct super_block *sget(struct file_system_type *type, | 1780 | struct super_block *sget(struct file_system_type *type, |
| 1780 | int (*test)(struct super_block *,void *), | 1781 | int (*test)(struct super_block *,void *), |
| @@ -2117,7 +2118,7 @@ extern struct file *create_write_pipe(int flags); | |||
| 2117 | extern void free_write_pipe(struct file *); | 2118 | extern void free_write_pipe(struct file *); |
| 2118 | 2119 | ||
| 2119 | extern struct file *do_filp_open(int dfd, const char *pathname, | 2120 | extern struct file *do_filp_open(int dfd, const char *pathname, |
| 2120 | int open_flag, int mode); | 2121 | int open_flag, int mode, int acc_mode); |
| 2121 | extern int may_open(struct path *, int, int); | 2122 | extern int may_open(struct path *, int, int); |
| 2122 | 2123 | ||
| 2123 | extern int kernel_read(struct file *, unsigned long, char *, unsigned long); | 2124 | extern int kernel_read(struct file *, unsigned long, char *, unsigned long); |
| @@ -2367,6 +2368,7 @@ extern void file_update_time(struct file *file); | |||
| 2367 | 2368 | ||
| 2368 | extern int generic_show_options(struct seq_file *m, struct vfsmount *mnt); | 2369 | extern int generic_show_options(struct seq_file *m, struct vfsmount *mnt); |
| 2369 | extern void save_mount_options(struct super_block *sb, char *options); | 2370 | extern void save_mount_options(struct super_block *sb, char *options); |
| 2371 | extern void replace_mount_options(struct super_block *sb, char *options); | ||
| 2370 | 2372 | ||
| 2371 | static inline ino_t parent_ino(struct dentry *dentry) | 2373 | static inline ino_t parent_ino(struct dentry *dentry) |
| 2372 | { | 2374 | { |
diff --git a/include/linux/namei.h b/include/linux/namei.h index fc2e03579877..518098fe63af 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h | |||
| @@ -69,7 +69,6 @@ extern int path_lookup(const char *, unsigned, struct nameidata *); | |||
| 69 | extern int vfs_path_lookup(struct dentry *, struct vfsmount *, | 69 | extern int vfs_path_lookup(struct dentry *, struct vfsmount *, |
| 70 | const char *, unsigned int, struct nameidata *); | 70 | const char *, unsigned int, struct nameidata *); |
| 71 | 71 | ||
| 72 | extern int path_lookup_open(int dfd, const char *name, unsigned lookup_flags, struct nameidata *, int open_flags); | ||
| 73 | extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, | 72 | extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, |
| 74 | int (*open)(struct inode *, struct file *)); | 73 | int (*open)(struct inode *, struct file *)); |
| 75 | extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); | 74 | extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); |
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 1b2e43502ef7..c9efe039dc57 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
| @@ -472,7 +472,7 @@ static inline void xt_info_rdlock_bh(void) | |||
| 472 | 472 | ||
| 473 | local_bh_disable(); | 473 | local_bh_disable(); |
| 474 | lock = &__get_cpu_var(xt_info_locks); | 474 | lock = &__get_cpu_var(xt_info_locks); |
| 475 | if (!lock->readers++) | 475 | if (likely(!lock->readers++)) |
| 476 | spin_lock(&lock->lock); | 476 | spin_lock(&lock->lock); |
| 477 | } | 477 | } |
| 478 | 478 | ||
| @@ -480,7 +480,7 @@ static inline void xt_info_rdunlock_bh(void) | |||
| 480 | { | 480 | { |
| 481 | struct xt_info_lock *lock = &__get_cpu_var(xt_info_locks); | 481 | struct xt_info_lock *lock = &__get_cpu_var(xt_info_locks); |
| 482 | 482 | ||
| 483 | if (!--lock->readers) | 483 | if (likely(!--lock->readers)) |
| 484 | spin_unlock(&lock->lock); | 484 | spin_unlock(&lock->lock); |
| 485 | local_bh_enable(); | 485 | local_bh_enable(); |
| 486 | } | 486 | } |
diff --git a/include/linux/netfilter/xt_LED.h b/include/linux/netfilter/xt_LED.h index 4c91a0d770d0..f5509e7524d3 100644 --- a/include/linux/netfilter/xt_LED.h +++ b/include/linux/netfilter/xt_LED.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _XT_LED_H | 1 | #ifndef _XT_LED_H |
| 2 | #define _XT_LED_H | 2 | #define _XT_LED_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 5 | |||
| 4 | struct xt_led_info { | 6 | struct xt_led_info { |
| 5 | char id[27]; /* Unique ID for this trigger in the LED class */ | 7 | char id[27]; /* Unique ID for this trigger in the LED class */ |
| 6 | __u8 always_blink; /* Blink even if the LED is already on */ | 8 | __u8 always_blink; /* Blink even if the LED is already on */ |
diff --git a/include/linux/netfilter/xt_cluster.h b/include/linux/netfilter/xt_cluster.h index 5e0a0d07b526..886682656f09 100644 --- a/include/linux/netfilter/xt_cluster.h +++ b/include/linux/netfilter/xt_cluster.h | |||
| @@ -12,4 +12,6 @@ struct xt_cluster_match_info { | |||
| 12 | u_int32_t flags; | 12 | u_int32_t flags; |
| 13 | }; | 13 | }; |
| 14 | 14 | ||
| 15 | #define XT_CLUSTER_NODES_MAX 32 | ||
| 16 | |||
| 15 | #endif /* _XT_CLUSTER_MATCH_H */ | 17 | #endif /* _XT_CLUSTER_MATCH_H */ |
diff --git a/include/linux/nls.h b/include/linux/nls.h index 6a882208301a..52b1a76c1b43 100644 --- a/include/linux/nls.h +++ b/include/linux/nls.h | |||
| @@ -58,6 +58,25 @@ static inline int nls_strnicmp(struct nls_table *t, const unsigned char *s1, | |||
| 58 | return 0; | 58 | return 0; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | /* | ||
| 62 | * nls_nullsize - return length of null character for codepage | ||
| 63 | * @codepage - codepage for which to return length of NULL terminator | ||
| 64 | * | ||
| 65 | * Since we can't guarantee that the null terminator will be a particular | ||
| 66 | * length, we have to check against the codepage. If there's a problem | ||
| 67 | * determining it, assume a single-byte NULL terminator. | ||
| 68 | */ | ||
| 69 | static inline int | ||
| 70 | nls_nullsize(const struct nls_table *codepage) | ||
| 71 | { | ||
| 72 | int charlen; | ||
| 73 | char tmp[NLS_MAX_CHARSET_SIZE]; | ||
| 74 | |||
| 75 | charlen = codepage->uni2char(0, tmp, NLS_MAX_CHARSET_SIZE); | ||
| 76 | |||
| 77 | return charlen > 0 ? charlen : 1; | ||
| 78 | } | ||
| 79 | |||
| 61 | #define MODULE_ALIAS_NLS(name) MODULE_ALIAS("nls_" __stringify(name)) | 80 | #define MODULE_ALIAS_NLS(name) MODULE_ALIAS("nls_" __stringify(name)) |
| 62 | 81 | ||
| 63 | #endif /* _LINUX_NLS_H */ | 82 | #endif /* _LINUX_NLS_H */ |
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 72736fd8223c..b67bb5d7b221 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
| @@ -20,7 +20,6 @@ struct platform_device { | |||
| 20 | struct device dev; | 20 | struct device dev; |
| 21 | u32 num_resources; | 21 | u32 num_resources; |
| 22 | struct resource * resource; | 22 | struct resource * resource; |
| 23 | void *platform_data; | ||
| 24 | 23 | ||
| 25 | struct platform_device_id *id_entry; | 24 | struct platform_device_id *id_entry; |
| 26 | }; | 25 | }; |
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h index 6b361d23a499..6473650c28f1 100644 --- a/include/linux/reiserfs_fs_sb.h +++ b/include/linux/reiserfs_fs_sb.h | |||
| @@ -402,7 +402,7 @@ struct reiserfs_sb_info { | |||
| 402 | int reserved_blocks; /* amount of blocks reserved for further allocations */ | 402 | int reserved_blocks; /* amount of blocks reserved for further allocations */ |
| 403 | spinlock_t bitmap_lock; /* this lock on now only used to protect reserved_blocks variable */ | 403 | spinlock_t bitmap_lock; /* this lock on now only used to protect reserved_blocks variable */ |
| 404 | struct dentry *priv_root; /* root of /.reiserfs_priv */ | 404 | struct dentry *priv_root; /* root of /.reiserfs_priv */ |
| 405 | struct dentry *xattr_root; /* root of /.reiserfs_priv/.xa */ | 405 | struct dentry *xattr_root; /* root of /.reiserfs_priv/xattrs */ |
| 406 | int j_errno; | 406 | int j_errno; |
| 407 | #ifdef CONFIG_QUOTA | 407 | #ifdef CONFIG_QUOTA |
| 408 | char *s_qf_names[MAXQUOTAS]; | 408 | char *s_qf_names[MAXQUOTAS]; |
| @@ -488,7 +488,6 @@ enum reiserfs_mount_options { | |||
| 488 | #define reiserfs_data_log(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_LOG)) | 488 | #define reiserfs_data_log(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_LOG)) |
| 489 | #define reiserfs_data_ordered(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_ORDERED)) | 489 | #define reiserfs_data_ordered(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_ORDERED)) |
| 490 | #define reiserfs_data_writeback(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_WRITEBACK)) | 490 | #define reiserfs_data_writeback(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_WRITEBACK)) |
| 491 | #define reiserfs_xattrs(s) ((s)->s_xattr != NULL) | ||
| 492 | #define reiserfs_xattrs_user(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_XATTRS_USER)) | 491 | #define reiserfs_xattrs_user(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_XATTRS_USER)) |
| 493 | #define reiserfs_posixacl(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_POSIXACL)) | 492 | #define reiserfs_posixacl(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_POSIXACL)) |
| 494 | #define reiserfs_xattrs_optional(s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s)) | 493 | #define reiserfs_xattrs_optional(s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s)) |
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h index dcae01e63e40..cdedc01036e4 100644 --- a/include/linux/reiserfs_xattr.h +++ b/include/linux/reiserfs_xattr.h | |||
| @@ -38,6 +38,7 @@ struct nameidata; | |||
| 38 | int reiserfs_xattr_register_handlers(void) __init; | 38 | int reiserfs_xattr_register_handlers(void) __init; |
| 39 | void reiserfs_xattr_unregister_handlers(void); | 39 | void reiserfs_xattr_unregister_handlers(void); |
| 40 | int reiserfs_xattr_init(struct super_block *sb, int mount_flags); | 40 | int reiserfs_xattr_init(struct super_block *sb, int mount_flags); |
| 41 | int reiserfs_lookup_privroot(struct super_block *sb); | ||
| 41 | int reiserfs_delete_xattrs(struct inode *inode); | 42 | int reiserfs_delete_xattrs(struct inode *inode); |
| 42 | int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs); | 43 | int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs); |
| 43 | 44 | ||
| @@ -97,7 +98,7 @@ static inline size_t reiserfs_xattr_jcreate_nblocks(struct inode *inode) | |||
| 97 | 98 | ||
| 98 | if ((REISERFS_I(inode)->i_flags & i_has_xattr_dir) == 0) { | 99 | if ((REISERFS_I(inode)->i_flags & i_has_xattr_dir) == 0) { |
| 99 | nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb); | 100 | nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb); |
| 100 | if (REISERFS_SB(inode->i_sb)->xattr_root == NULL) | 101 | if (!REISERFS_SB(inode->i_sb)->xattr_root->d_inode) |
| 101 | nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb); | 102 | nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb); |
| 102 | } | 103 | } |
| 103 | 104 | ||
diff --git a/include/linux/romfs_fs.h b/include/linux/romfs_fs.h index e20bbf9eb365..c490fbc43fe2 100644 --- a/include/linux/romfs_fs.h +++ b/include/linux/romfs_fs.h | |||
| @@ -53,9 +53,4 @@ struct romfs_inode { | |||
| 53 | #define ROMFH_PAD (ROMFH_SIZE-1) | 53 | #define ROMFH_PAD (ROMFH_SIZE-1) |
| 54 | #define ROMFH_MASK (~ROMFH_PAD) | 54 | #define ROMFH_MASK (~ROMFH_PAD) |
| 55 | 55 | ||
| 56 | #ifdef __KERNEL__ | ||
| 57 | |||
| 58 | /* Not much now */ | ||
| 59 | |||
| 60 | #endif /* __KERNEL__ */ | ||
| 61 | #endif | 56 | #endif |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 40617c1d8976..30520844b8da 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -433,6 +433,7 @@ asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd, unsigned long arg); | |||
| 433 | asmlinkage long sys_fcntl64(unsigned int fd, | 433 | asmlinkage long sys_fcntl64(unsigned int fd, |
| 434 | unsigned int cmd, unsigned long arg); | 434 | unsigned int cmd, unsigned long arg); |
| 435 | #endif | 435 | #endif |
| 436 | asmlinkage long sys_pipe2(int __user *fildes, int flags); | ||
| 436 | asmlinkage long sys_dup(unsigned int fildes); | 437 | asmlinkage long sys_dup(unsigned int fildes); |
| 437 | asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd); | 438 | asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd); |
| 438 | asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int flags); | 439 | asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int flags); |
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h index 3c86ed25a04c..c24124a42ce5 100644 --- a/include/linux/usb/cdc.h +++ b/include/linux/usb/cdc.h | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #define USB_CDC_SUBCLASS_DMM 0x09 | 17 | #define USB_CDC_SUBCLASS_DMM 0x09 |
| 18 | #define USB_CDC_SUBCLASS_MDLM 0x0a | 18 | #define USB_CDC_SUBCLASS_MDLM 0x0a |
| 19 | #define USB_CDC_SUBCLASS_OBEX 0x0b | 19 | #define USB_CDC_SUBCLASS_OBEX 0x0b |
| 20 | #define USB_CDC_SUBCLASS_EEM 0x0c | ||
| 20 | 21 | ||
| 21 | #define USB_CDC_PROTO_NONE 0 | 22 | #define USB_CDC_PROTO_NONE 0 |
| 22 | 23 | ||
| @@ -28,6 +29,8 @@ | |||
| 28 | #define USB_CDC_ACM_PROTO_AT_CDMA 6 | 29 | #define USB_CDC_ACM_PROTO_AT_CDMA 6 |
| 29 | #define USB_CDC_ACM_PROTO_VENDOR 0xff | 30 | #define USB_CDC_ACM_PROTO_VENDOR 0xff |
| 30 | 31 | ||
| 32 | #define USB_CDC_PROTO_EEM 7 | ||
| 33 | |||
| 31 | /*-------------------------------------------------------------------------*/ | 34 | /*-------------------------------------------------------------------------*/ |
| 32 | 35 | ||
| 33 | /* | 36 | /* |
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 242348bb3766..cec79adbe3ea 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * compatible drivers/servers. */ | 4 | * compatible drivers/servers. */ |
| 5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 6 | #include <linux/virtio_config.h> | 6 | #include <linux/virtio_config.h> |
| 7 | #include <linux/if_ether.h> | ||
| 7 | 8 | ||
| 8 | /* The ID for virtio_net */ | 9 | /* The ID for virtio_net */ |
| 9 | #define VIRTIO_ID_NET 1 | 10 | #define VIRTIO_ID_NET 1 |
diff --git a/include/net/9p/client.h b/include/net/9p/client.h index 4012e07162e5..e26812274b75 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h | |||
| @@ -98,7 +98,6 @@ enum p9_req_status_t { | |||
| 98 | struct p9_req_t { | 98 | struct p9_req_t { |
| 99 | int status; | 99 | int status; |
| 100 | int t_err; | 100 | int t_err; |
| 101 | u16 flush_tag; | ||
| 102 | wait_queue_head_t *wq; | 101 | wait_queue_head_t *wq; |
| 103 | struct p9_fcall *tc; | 102 | struct p9_fcall *tc; |
| 104 | struct p9_fcall *rc; | 103 | struct p9_fcall *rc; |
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index be5bd713d2c9..73aead222b32 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -457,6 +457,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count); | |||
| 457 | 457 | ||
| 458 | int hci_register_sysfs(struct hci_dev *hdev); | 458 | int hci_register_sysfs(struct hci_dev *hdev); |
| 459 | void hci_unregister_sysfs(struct hci_dev *hdev); | 459 | void hci_unregister_sysfs(struct hci_dev *hdev); |
| 460 | void hci_conn_init_sysfs(struct hci_conn *conn); | ||
| 460 | void hci_conn_add_sysfs(struct hci_conn *conn); | 461 | void hci_conn_add_sysfs(struct hci_conn *conn); |
| 461 | void hci_conn_del_sysfs(struct hci_conn *conn); | 462 | void hci_conn_del_sysfs(struct hci_conn *conn); |
| 462 | 463 | ||
diff --git a/include/net/tcp.h b/include/net/tcp.h index 1b94b9bfe2dc..646dbe3962ea 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <net/ip.h> | 41 | #include <net/ip.h> |
| 42 | #include <net/tcp_states.h> | 42 | #include <net/tcp_states.h> |
| 43 | #include <net/inet_ecn.h> | 43 | #include <net/inet_ecn.h> |
| 44 | #include <net/dst.h> | ||
| 44 | 45 | ||
| 45 | #include <linux/seq_file.h> | 46 | #include <linux/seq_file.h> |
| 46 | 47 | ||
| @@ -530,6 +531,17 @@ static inline void tcp_fast_path_check(struct sock *sk) | |||
| 530 | tcp_fast_path_on(tp); | 531 | tcp_fast_path_on(tp); |
| 531 | } | 532 | } |
| 532 | 533 | ||
| 534 | /* Compute the actual rto_min value */ | ||
| 535 | static inline u32 tcp_rto_min(struct sock *sk) | ||
| 536 | { | ||
| 537 | struct dst_entry *dst = __sk_dst_get(sk); | ||
| 538 | u32 rto_min = TCP_RTO_MIN; | ||
| 539 | |||
| 540 | if (dst && dst_metric_locked(dst, RTAX_RTO_MIN)) | ||
| 541 | rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN); | ||
| 542 | return rto_min; | ||
| 543 | } | ||
| 544 | |||
| 533 | /* Compute the actual receive window we are currently advertising. | 545 | /* Compute the actual receive window we are currently advertising. |
| 534 | * Rcv_nxt can be after the window if our peer push more data | 546 | * Rcv_nxt can be after the window if our peer push more data |
| 535 | * than the offered window. | 547 | * than the offered window. |
| @@ -895,7 +907,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb) | |||
| 895 | wake_up_interruptible(sk->sk_sleep); | 907 | wake_up_interruptible(sk->sk_sleep); |
| 896 | if (!inet_csk_ack_scheduled(sk)) | 908 | if (!inet_csk_ack_scheduled(sk)) |
| 897 | inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK, | 909 | inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK, |
| 898 | (3 * TCP_RTO_MIN) / 4, | 910 | (3 * tcp_rto_min(sk)) / 4, |
| 899 | TCP_RTO_MAX); | 911 | TCP_RTO_MAX); |
| 900 | } | 912 | } |
| 901 | return 1; | 913 | return 1; |
diff --git a/include/sound/version.h b/include/sound/version.h index a7e74e23ad2e..456f1359e1c0 100644 --- a/include/sound/version.h +++ b/include/sound/version.h | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | /* include/version.h */ | 1 | /* include/version.h */ |
| 2 | #define CONFIG_SND_VERSION "1.0.19" | 2 | #define CONFIG_SND_VERSION "1.0.20" |
| 3 | #define CONFIG_SND_DATE "" | 3 | #define CONFIG_SND_DATE "" |
diff --git a/init/initramfs.c b/init/initramfs.c index 9ee7b7810417..4c00edc59689 100644 --- a/init/initramfs.c +++ b/init/initramfs.c | |||
| @@ -574,11 +574,10 @@ static int __init populate_rootfs(void) | |||
| 574 | if (initrd_start) { | 574 | if (initrd_start) { |
| 575 | #ifdef CONFIG_BLK_DEV_RAM | 575 | #ifdef CONFIG_BLK_DEV_RAM |
| 576 | int fd; | 576 | int fd; |
| 577 | printk(KERN_INFO "checking if image is initramfs...\n"); | 577 | printk(KERN_INFO "Trying to unpack rootfs image as initramfs...\n"); |
| 578 | err = unpack_to_rootfs((char *)initrd_start, | 578 | err = unpack_to_rootfs((char *)initrd_start, |
| 579 | initrd_end - initrd_start); | 579 | initrd_end - initrd_start); |
| 580 | if (!err) { | 580 | if (!err) { |
| 581 | printk(KERN_INFO "rootfs image is initramfs; unpacking...\n"); | ||
| 582 | free_initrd(); | 581 | free_initrd(); |
| 583 | return 0; | 582 | return 0; |
| 584 | } else { | 583 | } else { |
| @@ -596,15 +595,11 @@ static int __init populate_rootfs(void) | |||
| 596 | free_initrd(); | 595 | free_initrd(); |
| 597 | } | 596 | } |
| 598 | #else | 597 | #else |
| 599 | printk(KERN_INFO "Unpacking initramfs..."); | 598 | printk(KERN_INFO "Unpacking initramfs...\n"); |
| 600 | err = unpack_to_rootfs((char *)initrd_start, | 599 | err = unpack_to_rootfs((char *)initrd_start, |
| 601 | initrd_end - initrd_start); | 600 | initrd_end - initrd_start); |
| 602 | if (err) { | 601 | if (err) |
| 603 | printk(" failed!\n"); | 602 | printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err); |
| 604 | printk(KERN_EMERG "%s\n", err); | ||
| 605 | } else { | ||
| 606 | printk(" done\n"); | ||
| 607 | } | ||
| 608 | free_initrd(); | 603 | free_initrd(); |
| 609 | #endif | 604 | #endif |
| 610 | } | 605 | } |
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index a6fe71fd5d1b..713098ee5a02 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c | |||
| @@ -1028,7 +1028,7 @@ static void audit_update_watch(struct audit_parent *parent, | |||
| 1028 | 1028 | ||
| 1029 | if (audit_enabled) { | 1029 | if (audit_enabled) { |
| 1030 | struct audit_buffer *ab; | 1030 | struct audit_buffer *ab; |
| 1031 | ab = audit_log_start(NULL, GFP_KERNEL, | 1031 | ab = audit_log_start(NULL, GFP_NOFS, |
| 1032 | AUDIT_CONFIG_CHANGE); | 1032 | AUDIT_CONFIG_CHANGE); |
| 1033 | audit_log_format(ab, "auid=%u ses=%u", | 1033 | audit_log_format(ab, "auid=%u ses=%u", |
| 1034 | audit_get_loginuid(current), | 1034 | audit_get_loginuid(current), |
| @@ -1067,7 +1067,7 @@ static void audit_remove_parent_watches(struct audit_parent *parent) | |||
| 1067 | e = container_of(r, struct audit_entry, rule); | 1067 | e = container_of(r, struct audit_entry, rule); |
| 1068 | if (audit_enabled) { | 1068 | if (audit_enabled) { |
| 1069 | struct audit_buffer *ab; | 1069 | struct audit_buffer *ab; |
| 1070 | ab = audit_log_start(NULL, GFP_KERNEL, | 1070 | ab = audit_log_start(NULL, GFP_NOFS, |
| 1071 | AUDIT_CONFIG_CHANGE); | 1071 | AUDIT_CONFIG_CHANGE); |
| 1072 | audit_log_format(ab, "auid=%u ses=%u", | 1072 | audit_log_format(ab, "auid=%u ses=%u", |
| 1073 | audit_get_loginuid(current), | 1073 | audit_get_loginuid(current), |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 382109b5baeb..a7267bfd3765 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -1133,8 +1133,7 @@ static int cgroup_get_sb(struct file_system_type *fs_type, | |||
| 1133 | free_cg_links: | 1133 | free_cg_links: |
| 1134 | free_cg_links(&tmp_cg_links); | 1134 | free_cg_links(&tmp_cg_links); |
| 1135 | drop_new_super: | 1135 | drop_new_super: |
| 1136 | up_write(&sb->s_umount); | 1136 | deactivate_locked_super(sb); |
| 1137 | deactivate_super(sb); | ||
| 1138 | return ret; | 1137 | return ret; |
| 1139 | } | 1138 | } |
| 1140 | 1139 | ||
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index d82142be8dd2..26e08754744f 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
| @@ -363,8 +363,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) | |||
| 363 | irqreturn_t ret, retval = IRQ_NONE; | 363 | irqreturn_t ret, retval = IRQ_NONE; |
| 364 | unsigned int status = 0; | 364 | unsigned int status = 0; |
| 365 | 365 | ||
| 366 | WARN_ONCE(!in_irq(), "BUG: IRQ handler called from non-hardirq context!"); | ||
| 367 | |||
| 368 | if (!(action->flags & IRQF_DISABLED)) | 366 | if (!(action->flags & IRQF_DISABLED)) |
| 369 | local_irq_enable_in_hardirq(); | 367 | local_irq_enable_in_hardirq(); |
| 370 | 368 | ||
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index a5e74ddee0e2..c0fa54b276d9 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
| @@ -319,6 +319,22 @@ struct kprobe __kprobes *get_kprobe(void *addr) | |||
| 319 | return NULL; | 319 | return NULL; |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | /* Arm a kprobe with text_mutex */ | ||
| 323 | static void __kprobes arm_kprobe(struct kprobe *kp) | ||
| 324 | { | ||
| 325 | mutex_lock(&text_mutex); | ||
| 326 | arch_arm_kprobe(kp); | ||
| 327 | mutex_unlock(&text_mutex); | ||
| 328 | } | ||
| 329 | |||
| 330 | /* Disarm a kprobe with text_mutex */ | ||
| 331 | static void __kprobes disarm_kprobe(struct kprobe *kp) | ||
| 332 | { | ||
| 333 | mutex_lock(&text_mutex); | ||
| 334 | arch_disarm_kprobe(kp); | ||
| 335 | mutex_unlock(&text_mutex); | ||
| 336 | } | ||
| 337 | |||
| 322 | /* | 338 | /* |
| 323 | * Aggregate handlers for multiple kprobes support - these handlers | 339 | * Aggregate handlers for multiple kprobes support - these handlers |
| 324 | * take care of invoking the individual kprobe handlers on p->list | 340 | * take care of invoking the individual kprobe handlers on p->list |
| @@ -538,7 +554,7 @@ static int __kprobes add_new_kprobe(struct kprobe *ap, struct kprobe *p) | |||
| 538 | ap->flags &= ~KPROBE_FLAG_DISABLED; | 554 | ap->flags &= ~KPROBE_FLAG_DISABLED; |
| 539 | if (!kprobes_all_disarmed) | 555 | if (!kprobes_all_disarmed) |
| 540 | /* Arm the breakpoint again. */ | 556 | /* Arm the breakpoint again. */ |
| 541 | arch_arm_kprobe(ap); | 557 | arm_kprobe(ap); |
| 542 | } | 558 | } |
| 543 | return 0; | 559 | return 0; |
| 544 | } | 560 | } |
| @@ -789,11 +805,8 @@ static int __kprobes __unregister_kprobe_top(struct kprobe *p) | |||
| 789 | * enabled and not gone - otherwise, the breakpoint would | 805 | * enabled and not gone - otherwise, the breakpoint would |
| 790 | * already have been removed. We save on flushing icache. | 806 | * already have been removed. We save on flushing icache. |
| 791 | */ | 807 | */ |
| 792 | if (!kprobes_all_disarmed && !kprobe_disabled(old_p)) { | 808 | if (!kprobes_all_disarmed && !kprobe_disabled(old_p)) |
| 793 | mutex_lock(&text_mutex); | 809 | disarm_kprobe(p); |
| 794 | arch_disarm_kprobe(p); | ||
| 795 | mutex_unlock(&text_mutex); | ||
| 796 | } | ||
| 797 | hlist_del_rcu(&old_p->hlist); | 810 | hlist_del_rcu(&old_p->hlist); |
| 798 | } else { | 811 | } else { |
| 799 | if (p->break_handler && !kprobe_gone(p)) | 812 | if (p->break_handler && !kprobe_gone(p)) |
| @@ -810,7 +823,7 @@ noclean: | |||
| 810 | if (!kprobe_disabled(old_p)) { | 823 | if (!kprobe_disabled(old_p)) { |
| 811 | try_to_disable_aggr_kprobe(old_p); | 824 | try_to_disable_aggr_kprobe(old_p); |
| 812 | if (!kprobes_all_disarmed && kprobe_disabled(old_p)) | 825 | if (!kprobes_all_disarmed && kprobe_disabled(old_p)) |
| 813 | arch_disarm_kprobe(old_p); | 826 | disarm_kprobe(old_p); |
| 814 | } | 827 | } |
| 815 | } | 828 | } |
| 816 | return 0; | 829 | return 0; |
| @@ -1364,7 +1377,7 @@ int __kprobes disable_kprobe(struct kprobe *kp) | |||
| 1364 | try_to_disable_aggr_kprobe(p); | 1377 | try_to_disable_aggr_kprobe(p); |
| 1365 | 1378 | ||
| 1366 | if (!kprobes_all_disarmed && kprobe_disabled(p)) | 1379 | if (!kprobes_all_disarmed && kprobe_disabled(p)) |
| 1367 | arch_disarm_kprobe(p); | 1380 | disarm_kprobe(p); |
| 1368 | out: | 1381 | out: |
| 1369 | mutex_unlock(&kprobe_mutex); | 1382 | mutex_unlock(&kprobe_mutex); |
| 1370 | return ret; | 1383 | return ret; |
| @@ -1393,7 +1406,7 @@ int __kprobes enable_kprobe(struct kprobe *kp) | |||
| 1393 | } | 1406 | } |
| 1394 | 1407 | ||
| 1395 | if (!kprobes_all_disarmed && kprobe_disabled(p)) | 1408 | if (!kprobes_all_disarmed && kprobe_disabled(p)) |
| 1396 | arch_arm_kprobe(p); | 1409 | arm_kprobe(p); |
| 1397 | 1410 | ||
| 1398 | p->flags &= ~KPROBE_FLAG_DISABLED; | 1411 | p->flags &= ~KPROBE_FLAG_DISABLED; |
| 1399 | if (p != kp) | 1412 | if (p != kp) |
diff --git a/kernel/panic.c b/kernel/panic.c index 3dcaa1661357..874ecf1307ae 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
| @@ -340,7 +340,7 @@ void oops_exit(void) | |||
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | #ifdef WANT_WARN_ON_SLOWPATH | 342 | #ifdef WANT_WARN_ON_SLOWPATH |
| 343 | void warn_slowpath(const char *file, int line, const char *fmt, ...) | 343 | void warn_slowpath_fmt(const char *file, int line, const char *fmt, ...) |
| 344 | { | 344 | { |
| 345 | va_list args; | 345 | va_list args; |
| 346 | char function[KSYM_SYMBOL_LEN]; | 346 | char function[KSYM_SYMBOL_LEN]; |
| @@ -356,7 +356,7 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...) | |||
| 356 | if (board) | 356 | if (board) |
| 357 | printk(KERN_WARNING "Hardware name: %s\n", board); | 357 | printk(KERN_WARNING "Hardware name: %s\n", board); |
| 358 | 358 | ||
| 359 | if (fmt) { | 359 | if (*fmt) { |
| 360 | va_start(args, fmt); | 360 | va_start(args, fmt); |
| 361 | vprintk(fmt, args); | 361 | vprintk(fmt, args); |
| 362 | va_end(args); | 362 | va_end(args); |
| @@ -367,7 +367,14 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...) | |||
| 367 | print_oops_end_marker(); | 367 | print_oops_end_marker(); |
| 368 | add_taint(TAINT_WARN); | 368 | add_taint(TAINT_WARN); |
| 369 | } | 369 | } |
| 370 | EXPORT_SYMBOL(warn_slowpath); | 370 | EXPORT_SYMBOL(warn_slowpath_fmt); |
| 371 | |||
| 372 | void warn_slowpath_null(const char *file, int line) | ||
| 373 | { | ||
| 374 | static const char *empty = ""; | ||
| 375 | warn_slowpath_fmt(file, line, empty); | ||
| 376 | } | ||
| 377 | EXPORT_SYMBOL(warn_slowpath_null); | ||
| 371 | #endif | 378 | #endif |
| 372 | 379 | ||
| 373 | #ifdef CONFIG_CC_STACKPROTECTOR | 380 | #ifdef CONFIG_CC_STACKPROTECTOR |
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index c9dcf98b4463..bece7c0b67b2 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c | |||
| @@ -1420,19 +1420,19 @@ void run_posix_cpu_timers(struct task_struct *tsk) | |||
| 1420 | * timer call will interfere. | 1420 | * timer call will interfere. |
| 1421 | */ | 1421 | */ |
| 1422 | list_for_each_entry_safe(timer, next, &firing, it.cpu.entry) { | 1422 | list_for_each_entry_safe(timer, next, &firing, it.cpu.entry) { |
| 1423 | int firing; | 1423 | int cpu_firing; |
| 1424 | |||
| 1424 | spin_lock(&timer->it_lock); | 1425 | spin_lock(&timer->it_lock); |
| 1425 | list_del_init(&timer->it.cpu.entry); | 1426 | list_del_init(&timer->it.cpu.entry); |
| 1426 | firing = timer->it.cpu.firing; | 1427 | cpu_firing = timer->it.cpu.firing; |
| 1427 | timer->it.cpu.firing = 0; | 1428 | timer->it.cpu.firing = 0; |
| 1428 | /* | 1429 | /* |
| 1429 | * The firing flag is -1 if we collided with a reset | 1430 | * The firing flag is -1 if we collided with a reset |
| 1430 | * of the timer, which already reported this | 1431 | * of the timer, which already reported this |
| 1431 | * almost-firing as an overrun. So don't generate an event. | 1432 | * almost-firing as an overrun. So don't generate an event. |
| 1432 | */ | 1433 | */ |
| 1433 | if (likely(firing >= 0)) { | 1434 | if (likely(cpu_firing >= 0)) |
| 1434 | cpu_timer_fire(timer); | 1435 | cpu_timer_fire(timer); |
| 1435 | } | ||
| 1436 | spin_unlock(&timer->it_lock); | 1436 | spin_unlock(&timer->it_lock); |
| 1437 | } | 1437 | } |
| 1438 | } | 1438 | } |
diff --git a/kernel/sched.c b/kernel/sched.c index b902e587a3a0..26efa475bdc1 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -4732,7 +4732,7 @@ void account_process_tick(struct task_struct *p, int user_tick) | |||
| 4732 | 4732 | ||
| 4733 | if (user_tick) | 4733 | if (user_tick) |
| 4734 | account_user_time(p, one_jiffy, one_jiffy_scaled); | 4734 | account_user_time(p, one_jiffy, one_jiffy_scaled); |
| 4735 | else if (p != rq->idle) | 4735 | else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET)) |
| 4736 | account_system_time(p, HARDIRQ_OFFSET, one_jiffy, | 4736 | account_system_time(p, HARDIRQ_OFFSET, one_jiffy, |
| 4737 | one_jiffy_scaled); | 4737 | one_jiffy_scaled); |
| 4738 | else | 4738 | else |
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 21a5ca849514..83c4417b6a3c 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c | |||
| @@ -93,7 +93,17 @@ void tick_handle_periodic(struct clock_event_device *dev) | |||
| 93 | for (;;) { | 93 | for (;;) { |
| 94 | if (!clockevents_program_event(dev, next, ktime_get())) | 94 | if (!clockevents_program_event(dev, next, ktime_get())) |
| 95 | return; | 95 | return; |
| 96 | tick_periodic(cpu); | 96 | /* |
| 97 | * Have to be careful here. If we're in oneshot mode, | ||
| 98 | * before we call tick_periodic() in a loop, we need | ||
| 99 | * to be sure we're using a real hardware clocksource. | ||
| 100 | * Otherwise we could get trapped in an infinite | ||
| 101 | * loop, as the tick_periodic() increments jiffies, | ||
| 102 | * when then will increment time, posibly causing | ||
| 103 | * the loop to trigger again and again. | ||
| 104 | */ | ||
| 105 | if (timekeeping_valid_for_hres()) | ||
| 106 | tick_periodic(cpu); | ||
| 97 | next = ktime_add(next, tick_period); | 107 | next = ktime_add(next, tick_period); |
| 98 | } | 108 | } |
| 99 | } | 109 | } |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1ce5dc6372b8..a884c09006c4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -3448,6 +3448,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos, | |||
| 3448 | if (!ref) | 3448 | if (!ref) |
| 3449 | break; | 3449 | break; |
| 3450 | 3450 | ||
| 3451 | ref->ref = 1; | ||
| 3451 | ref->buffer = info->tr->buffer; | 3452 | ref->buffer = info->tr->buffer; |
| 3452 | ref->page = ring_buffer_alloc_read_page(ref->buffer); | 3453 | ref->page = ring_buffer_alloc_read_page(ref->buffer); |
| 3453 | if (!ref->page) { | 3454 | if (!ref->page) { |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 812c28207baf..6cdcf38f2da9 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -891,7 +891,6 @@ config DYNAMIC_DEBUG | |||
| 891 | default n | 891 | default n |
| 892 | depends on PRINTK | 892 | depends on PRINTK |
| 893 | depends on DEBUG_FS | 893 | depends on DEBUG_FS |
| 894 | select PRINTK_DEBUG | ||
| 895 | help | 894 | help |
| 896 | 895 | ||
| 897 | Compiles debug level messages into the kernel, which would not | 896 | Compiles debug level messages into the kernel, which would not |
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index d3da7edc034f..69da09a085a1 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
| @@ -400,60 +400,9 @@ out_err: | |||
| 400 | return -ENOMEM; | 400 | return -ENOMEM; |
| 401 | } | 401 | } |
| 402 | 402 | ||
| 403 | static int device_dma_allocations(struct device *dev) | ||
| 404 | { | ||
| 405 | struct dma_debug_entry *entry; | ||
| 406 | unsigned long flags; | ||
| 407 | int count = 0, i; | ||
| 408 | |||
| 409 | for (i = 0; i < HASH_SIZE; ++i) { | ||
| 410 | spin_lock_irqsave(&dma_entry_hash[i].lock, flags); | ||
| 411 | list_for_each_entry(entry, &dma_entry_hash[i].list, list) { | ||
| 412 | if (entry->dev == dev) | ||
| 413 | count += 1; | ||
| 414 | } | ||
| 415 | spin_unlock_irqrestore(&dma_entry_hash[i].lock, flags); | ||
| 416 | } | ||
| 417 | |||
| 418 | return count; | ||
| 419 | } | ||
| 420 | |||
| 421 | static int dma_debug_device_change(struct notifier_block *nb, | ||
| 422 | unsigned long action, void *data) | ||
| 423 | { | ||
| 424 | struct device *dev = data; | ||
| 425 | int count; | ||
| 426 | |||
| 427 | |||
| 428 | switch (action) { | ||
| 429 | case BUS_NOTIFY_UNBIND_DRIVER: | ||
| 430 | count = device_dma_allocations(dev); | ||
| 431 | if (count == 0) | ||
| 432 | break; | ||
| 433 | err_printk(dev, NULL, "DMA-API: device driver has pending " | ||
| 434 | "DMA allocations while released from device " | ||
| 435 | "[count=%d]\n", count); | ||
| 436 | break; | ||
| 437 | default: | ||
| 438 | break; | ||
| 439 | } | ||
| 440 | |||
| 441 | return 0; | ||
| 442 | } | ||
| 443 | |||
| 444 | void dma_debug_add_bus(struct bus_type *bus) | 403 | void dma_debug_add_bus(struct bus_type *bus) |
| 445 | { | 404 | { |
| 446 | struct notifier_block *nb; | 405 | /* FIXME: register notifier */ |
| 447 | |||
| 448 | nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL); | ||
| 449 | if (nb == NULL) { | ||
| 450 | printk(KERN_ERR "dma_debug_add_bus: out of memory\n"); | ||
| 451 | return; | ||
| 452 | } | ||
| 453 | |||
| 454 | nb->notifier_call = dma_debug_device_change; | ||
| 455 | |||
| 456 | bus_register_notifier(bus, nb); | ||
| 457 | } | 406 | } |
| 458 | 407 | ||
| 459 | /* | 408 | /* |
diff --git a/mm/Kconfig b/mm/Kconfig index 57971d2ab848..c2b57d81e153 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -225,3 +225,31 @@ config HAVE_MLOCKED_PAGE_BIT | |||
| 225 | 225 | ||
| 226 | config MMU_NOTIFIER | 226 | config MMU_NOTIFIER |
| 227 | bool | 227 | bool |
| 228 | |||
| 229 | config NOMMU_INITIAL_TRIM_EXCESS | ||
| 230 | int "Turn on mmap() excess space trimming before booting" | ||
| 231 | depends on !MMU | ||
| 232 | default 1 | ||
| 233 | help | ||
| 234 | The NOMMU mmap() frequently needs to allocate large contiguous chunks | ||
| 235 | of memory on which to store mappings, but it can only ask the system | ||
| 236 | allocator for chunks in 2^N*PAGE_SIZE amounts - which is frequently | ||
| 237 | more than it requires. To deal with this, mmap() is able to trim off | ||
| 238 | the excess and return it to the allocator. | ||
| 239 | |||
| 240 | If trimming is enabled, the excess is trimmed off and returned to the | ||
| 241 | system allocator, which can cause extra fragmentation, particularly | ||
| 242 | if there are a lot of transient processes. | ||
| 243 | |||
| 244 | If trimming is disabled, the excess is kept, but not used, which for | ||
| 245 | long-term mappings means that the space is wasted. | ||
| 246 | |||
| 247 | Trimming can be dynamically controlled through a sysctl option | ||
| 248 | (/proc/sys/vm/nr_trim_pages) which specifies the minimum number of | ||
| 249 | excess pages there must be before trimming should occur, or zero if | ||
| 250 | no trimming is to occur. | ||
| 251 | |||
| 252 | This option specifies the initial value of this option. The default | ||
| 253 | of 1 says that all excess pages should be trimmed. | ||
| 254 | |||
| 255 | See Documentation/nommu-mmap.txt for more information. | ||
diff --git a/mm/madvise.c b/mm/madvise.c index b9ce574827c8..36d6ea2b6340 100644 --- a/mm/madvise.c +++ b/mm/madvise.c | |||
| @@ -112,6 +112,14 @@ static long madvise_willneed(struct vm_area_struct * vma, | |||
| 112 | if (!file) | 112 | if (!file) |
| 113 | return -EBADF; | 113 | return -EBADF; |
| 114 | 114 | ||
| 115 | /* | ||
| 116 | * Page cache readahead assumes page cache pages are order-0 which | ||
| 117 | * is not the case for hugetlbfs. Do not give a bad return value | ||
| 118 | * but ignore the advice. | ||
| 119 | */ | ||
| 120 | if (vma->vm_flags & VM_HUGETLB) | ||
| 121 | return 0; | ||
| 122 | |||
| 115 | if (file->f_mapping->a_ops->get_xip_mem) { | 123 | if (file->f_mapping->a_ops->get_xip_mem) { |
| 116 | /* no bad return value, but ignore advice */ | 124 | /* no bad return value, but ignore advice */ |
| 117 | return 0; | 125 | return 0; |
diff --git a/mm/nommu.c b/mm/nommu.c index 809998aa7b50..b571ef707428 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
| @@ -66,7 +66,7 @@ struct percpu_counter vm_committed_as; | |||
| 66 | int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */ | 66 | int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */ |
| 67 | int sysctl_overcommit_ratio = 50; /* default is 50% */ | 67 | int sysctl_overcommit_ratio = 50; /* default is 50% */ |
| 68 | int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; | 68 | int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; |
| 69 | int sysctl_nr_trim_pages = 1; /* page trimming behaviour */ | 69 | int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS; |
| 70 | int heap_stack_gap = 0; | 70 | int heap_stack_gap = 0; |
| 71 | 71 | ||
| 72 | atomic_long_t mmap_pages_allocated; | 72 | atomic_long_t mmap_pages_allocated; |
| @@ -515,8 +515,6 @@ static void add_nommu_region(struct vm_region *region) | |||
| 515 | 515 | ||
| 516 | validate_nommu_regions(); | 516 | validate_nommu_regions(); |
| 517 | 517 | ||
| 518 | BUG_ON(region->vm_start & ~PAGE_MASK); | ||
| 519 | |||
| 520 | parent = NULL; | 518 | parent = NULL; |
| 521 | p = &nommu_region_tree.rb_node; | 519 | p = &nommu_region_tree.rb_node; |
| 522 | while (*p) { | 520 | while (*p) { |
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 2f3166e308d9..92bcf1db16b2 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -514,34 +514,32 @@ void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_mask) | |||
| 514 | */ | 514 | */ |
| 515 | static void __out_of_memory(gfp_t gfp_mask, int order) | 515 | static void __out_of_memory(gfp_t gfp_mask, int order) |
| 516 | { | 516 | { |
| 517 | if (sysctl_oom_kill_allocating_task) { | 517 | struct task_struct *p; |
| 518 | oom_kill_process(current, gfp_mask, order, 0, NULL, | 518 | unsigned long points; |
| 519 | "Out of memory (oom_kill_allocating_task)"); | ||
| 520 | |||
| 521 | } else { | ||
| 522 | unsigned long points; | ||
| 523 | struct task_struct *p; | ||
| 524 | |||
| 525 | retry: | ||
| 526 | /* | ||
| 527 | * Rambo mode: Shoot down a process and hope it solves whatever | ||
| 528 | * issues we may have. | ||
| 529 | */ | ||
| 530 | p = select_bad_process(&points, NULL); | ||
| 531 | 519 | ||
| 532 | if (PTR_ERR(p) == -1UL) | 520 | if (sysctl_oom_kill_allocating_task) |
| 521 | if (!oom_kill_process(current, gfp_mask, order, 0, NULL, | ||
| 522 | "Out of memory (oom_kill_allocating_task)")) | ||
| 533 | return; | 523 | return; |
| 524 | retry: | ||
| 525 | /* | ||
| 526 | * Rambo mode: Shoot down a process and hope it solves whatever | ||
| 527 | * issues we may have. | ||
| 528 | */ | ||
| 529 | p = select_bad_process(&points, NULL); | ||
| 534 | 530 | ||
| 535 | /* Found nothing?!?! Either we hang forever, or we panic. */ | 531 | if (PTR_ERR(p) == -1UL) |
| 536 | if (!p) { | 532 | return; |
| 537 | read_unlock(&tasklist_lock); | ||
| 538 | panic("Out of memory and no killable processes...\n"); | ||
| 539 | } | ||
| 540 | 533 | ||
| 541 | if (oom_kill_process(p, gfp_mask, order, points, NULL, | 534 | /* Found nothing?!?! Either we hang forever, or we panic. */ |
| 542 | "Out of memory")) | 535 | if (!p) { |
| 543 | goto retry; | 536 | read_unlock(&tasklist_lock); |
| 537 | panic("Out of memory and no killable processes...\n"); | ||
| 544 | } | 538 | } |
| 539 | |||
| 540 | if (oom_kill_process(p, gfp_mask, order, points, NULL, | ||
| 541 | "Out of memory")) | ||
| 542 | goto retry; | ||
| 545 | } | 543 | } |
| 546 | 544 | ||
| 547 | /* | 545 | /* |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e2f26991fff1..fe753ecf2aa5 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -2681,6 +2681,7 @@ static void __meminit zone_init_free_lists(struct zone *zone) | |||
| 2681 | 2681 | ||
| 2682 | static int zone_batchsize(struct zone *zone) | 2682 | static int zone_batchsize(struct zone *zone) |
| 2683 | { | 2683 | { |
| 2684 | #ifdef CONFIG_MMU | ||
| 2684 | int batch; | 2685 | int batch; |
| 2685 | 2686 | ||
| 2686 | /* | 2687 | /* |
| @@ -2706,9 +2707,26 @@ static int zone_batchsize(struct zone *zone) | |||
| 2706 | * of pages of one half of the possible page colors | 2707 | * of pages of one half of the possible page colors |
| 2707 | * and the other with pages of the other colors. | 2708 | * and the other with pages of the other colors. |
| 2708 | */ | 2709 | */ |
| 2709 | batch = (1 << (fls(batch + batch/2)-1)) - 1; | 2710 | batch = rounddown_pow_of_two(batch + batch/2) - 1; |
| 2710 | 2711 | ||
| 2711 | return batch; | 2712 | return batch; |
| 2713 | |||
| 2714 | #else | ||
| 2715 | /* The deferral and batching of frees should be suppressed under NOMMU | ||
| 2716 | * conditions. | ||
| 2717 | * | ||
| 2718 | * The problem is that NOMMU needs to be able to allocate large chunks | ||
| 2719 | * of contiguous memory as there's no hardware page translation to | ||
| 2720 | * assemble apparent contiguous memory from discontiguous pages. | ||
| 2721 | * | ||
| 2722 | * Queueing large contiguous runs of pages for batching, however, | ||
| 2723 | * causes the pages to actually be freed in smaller chunks. As there | ||
| 2724 | * can be a significant delay between the individual batches being | ||
| 2725 | * recycled, this leads to the once large chunks of space being | ||
| 2726 | * fragmented and becoming unavailable for high-order allocations. | ||
| 2727 | */ | ||
| 2728 | return 0; | ||
| 2729 | #endif | ||
| 2712 | } | 2730 | } |
| 2713 | 2731 | ||
| 2714 | static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch) | 2732 | static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch) |
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index fab19876b4d1..083716ea38c9 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -402,6 +402,7 @@ overflow: | |||
| 402 | printk(KERN_WARNING | 402 | printk(KERN_WARNING |
| 403 | "vmap allocation for size %lu failed: " | 403 | "vmap allocation for size %lu failed: " |
| 404 | "use vmalloc=<size> to increase size.\n", size); | 404 | "use vmalloc=<size> to increase size.\n", size); |
| 405 | kfree(va); | ||
| 405 | return ERR_PTR(-EBUSY); | 406 | return ERR_PTR(-EBUSY); |
| 406 | } | 407 | } |
| 407 | 408 | ||
diff --git a/net/9p/client.c b/net/9p/client.c index 1eb580c38fbb..dd43a8289b0d 100644 --- a/net/9p/client.c +++ b/net/9p/client.c | |||
| @@ -203,7 +203,6 @@ static struct p9_req_t *p9_tag_alloc(struct p9_client *c, u16 tag) | |||
| 203 | p9pdu_reset(req->tc); | 203 | p9pdu_reset(req->tc); |
| 204 | p9pdu_reset(req->rc); | 204 | p9pdu_reset(req->rc); |
| 205 | 205 | ||
| 206 | req->flush_tag = 0; | ||
| 207 | req->tc->tag = tag-1; | 206 | req->tc->tag = tag-1; |
| 208 | req->status = REQ_STATUS_ALLOC; | 207 | req->status = REQ_STATUS_ALLOC; |
| 209 | 208 | ||
| @@ -324,35 +323,9 @@ static void p9_free_req(struct p9_client *c, struct p9_req_t *r) | |||
| 324 | */ | 323 | */ |
| 325 | void p9_client_cb(struct p9_client *c, struct p9_req_t *req) | 324 | void p9_client_cb(struct p9_client *c, struct p9_req_t *req) |
| 326 | { | 325 | { |
| 327 | struct p9_req_t *other_req; | ||
| 328 | unsigned long flags; | ||
| 329 | |||
| 330 | P9_DPRINTK(P9_DEBUG_MUX, " tag %d\n", req->tc->tag); | 326 | P9_DPRINTK(P9_DEBUG_MUX, " tag %d\n", req->tc->tag); |
| 331 | 327 | wake_up(req->wq); | |
| 332 | if (req->status == REQ_STATUS_ERROR) | 328 | P9_DPRINTK(P9_DEBUG_MUX, "wakeup: %d\n", req->tc->tag); |
| 333 | wake_up(req->wq); | ||
| 334 | |||
| 335 | if (req->flush_tag) { /* flush receive path */ | ||
| 336 | P9_DPRINTK(P9_DEBUG_9P, "<<< RFLUSH %d\n", req->tc->tag); | ||
| 337 | spin_lock_irqsave(&c->lock, flags); | ||
| 338 | other_req = p9_tag_lookup(c, req->flush_tag); | ||
| 339 | if (other_req->status != REQ_STATUS_FLSH) /* stale flush */ | ||
| 340 | spin_unlock_irqrestore(&c->lock, flags); | ||
| 341 | else { | ||
| 342 | other_req->status = REQ_STATUS_FLSHD; | ||
| 343 | spin_unlock_irqrestore(&c->lock, flags); | ||
| 344 | wake_up(other_req->wq); | ||
| 345 | } | ||
| 346 | p9_free_req(c, req); | ||
| 347 | } else { /* normal receive path */ | ||
| 348 | P9_DPRINTK(P9_DEBUG_MUX, "normal: tag %d\n", req->tc->tag); | ||
| 349 | spin_lock_irqsave(&c->lock, flags); | ||
| 350 | if (req->status != REQ_STATUS_FLSHD) | ||
| 351 | req->status = REQ_STATUS_RCVD; | ||
| 352 | spin_unlock_irqrestore(&c->lock, flags); | ||
| 353 | wake_up(req->wq); | ||
| 354 | P9_DPRINTK(P9_DEBUG_MUX, "wakeup: %d\n", req->tc->tag); | ||
| 355 | } | ||
| 356 | } | 329 | } |
| 357 | EXPORT_SYMBOL(p9_client_cb); | 330 | EXPORT_SYMBOL(p9_client_cb); |
| 358 | 331 | ||
| @@ -486,9 +459,15 @@ static int p9_client_flush(struct p9_client *c, struct p9_req_t *oldreq) | |||
| 486 | if (IS_ERR(req)) | 459 | if (IS_ERR(req)) |
| 487 | return PTR_ERR(req); | 460 | return PTR_ERR(req); |
| 488 | 461 | ||
| 489 | req->flush_tag = oldtag; | ||
| 490 | 462 | ||
| 491 | /* we don't free anything here because RPC isn't complete */ | 463 | /* if we haven't received a response for oldreq, |
| 464 | remove it from the list. */ | ||
| 465 | spin_lock(&c->lock); | ||
| 466 | if (oldreq->status == REQ_STATUS_FLSH) | ||
| 467 | list_del(&oldreq->req_list); | ||
| 468 | spin_unlock(&c->lock); | ||
| 469 | |||
| 470 | p9_free_req(c, req); | ||
| 492 | return 0; | 471 | return 0; |
| 493 | } | 472 | } |
| 494 | 473 | ||
| @@ -509,7 +488,6 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) | |||
| 509 | struct p9_req_t *req; | 488 | struct p9_req_t *req; |
| 510 | unsigned long flags; | 489 | unsigned long flags; |
| 511 | int sigpending; | 490 | int sigpending; |
| 512 | int flushed = 0; | ||
| 513 | 491 | ||
| 514 | P9_DPRINTK(P9_DEBUG_MUX, "client %p op %d\n", c, type); | 492 | P9_DPRINTK(P9_DEBUG_MUX, "client %p op %d\n", c, type); |
| 515 | 493 | ||
| @@ -546,42 +524,28 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) | |||
| 546 | goto reterr; | 524 | goto reterr; |
| 547 | } | 525 | } |
| 548 | 526 | ||
| 549 | /* if it was a flush we just transmitted, return our tag */ | ||
| 550 | if (type == P9_TFLUSH) | ||
| 551 | return req; | ||
| 552 | again: | ||
| 553 | P9_DPRINTK(P9_DEBUG_MUX, "wait %p tag: %d\n", req->wq, tag); | 527 | P9_DPRINTK(P9_DEBUG_MUX, "wait %p tag: %d\n", req->wq, tag); |
| 554 | err = wait_event_interruptible(*req->wq, | 528 | err = wait_event_interruptible(*req->wq, |
| 555 | req->status >= REQ_STATUS_RCVD); | 529 | req->status >= REQ_STATUS_RCVD); |
| 556 | P9_DPRINTK(P9_DEBUG_MUX, "wait %p tag: %d returned %d (flushed=%d)\n", | 530 | P9_DPRINTK(P9_DEBUG_MUX, "wait %p tag: %d returned %d\n", |
| 557 | req->wq, tag, err, flushed); | 531 | req->wq, tag, err); |
| 558 | 532 | ||
| 559 | if (req->status == REQ_STATUS_ERROR) { | 533 | if (req->status == REQ_STATUS_ERROR) { |
| 560 | P9_DPRINTK(P9_DEBUG_ERROR, "req_status error %d\n", req->t_err); | 534 | P9_DPRINTK(P9_DEBUG_ERROR, "req_status error %d\n", req->t_err); |
| 561 | err = req->t_err; | 535 | err = req->t_err; |
| 562 | } else if (err == -ERESTARTSYS && flushed) { | ||
| 563 | P9_DPRINTK(P9_DEBUG_MUX, "flushed - going again\n"); | ||
| 564 | goto again; | ||
| 565 | } else if (req->status == REQ_STATUS_FLSHD) { | ||
| 566 | P9_DPRINTK(P9_DEBUG_MUX, "flushed - erestartsys\n"); | ||
| 567 | err = -ERESTARTSYS; | ||
| 568 | } | 536 | } |
| 569 | 537 | ||
| 570 | if ((err == -ERESTARTSYS) && (c->status == Connected) && (!flushed)) { | 538 | if ((err == -ERESTARTSYS) && (c->status == Connected)) { |
| 571 | P9_DPRINTK(P9_DEBUG_MUX, "flushing\n"); | 539 | P9_DPRINTK(P9_DEBUG_MUX, "flushing\n"); |
| 572 | spin_lock_irqsave(&c->lock, flags); | ||
| 573 | if (req->status == REQ_STATUS_SENT) | ||
| 574 | req->status = REQ_STATUS_FLSH; | ||
| 575 | spin_unlock_irqrestore(&c->lock, flags); | ||
| 576 | sigpending = 1; | 540 | sigpending = 1; |
| 577 | flushed = 1; | ||
| 578 | clear_thread_flag(TIF_SIGPENDING); | 541 | clear_thread_flag(TIF_SIGPENDING); |
| 579 | 542 | ||
| 580 | if (c->trans_mod->cancel(c, req)) { | 543 | if (c->trans_mod->cancel(c, req)) |
| 581 | err = p9_client_flush(c, req); | 544 | p9_client_flush(c, req); |
| 582 | if (err == 0) | 545 | |
| 583 | goto again; | 546 | /* if we received the response anyway, don't signal error */ |
| 584 | } | 547 | if (req->status == REQ_STATUS_RCVD) |
| 548 | err = 0; | ||
| 585 | } | 549 | } |
| 586 | 550 | ||
| 587 | if (sigpending) { | 551 | if (sigpending) { |
| @@ -1244,19 +1208,53 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid) | |||
| 1244 | ret->name, ret->uid, ret->gid, ret->muid, ret->extension, | 1208 | ret->name, ret->uid, ret->gid, ret->muid, ret->extension, |
| 1245 | ret->n_uid, ret->n_gid, ret->n_muid); | 1209 | ret->n_uid, ret->n_gid, ret->n_muid); |
| 1246 | 1210 | ||
| 1211 | p9_free_req(clnt, req); | ||
| 1212 | return ret; | ||
| 1213 | |||
| 1247 | free_and_error: | 1214 | free_and_error: |
| 1248 | p9_free_req(clnt, req); | 1215 | p9_free_req(clnt, req); |
| 1249 | error: | 1216 | error: |
| 1250 | return ret; | 1217 | kfree(ret); |
| 1218 | return ERR_PTR(err); | ||
| 1251 | } | 1219 | } |
| 1252 | EXPORT_SYMBOL(p9_client_stat); | 1220 | EXPORT_SYMBOL(p9_client_stat); |
| 1253 | 1221 | ||
| 1222 | static int p9_client_statsize(struct p9_wstat *wst, int optional) | ||
| 1223 | { | ||
| 1224 | int ret; | ||
| 1225 | |||
| 1226 | /* size[2] type[2] dev[4] qid[13] */ | ||
| 1227 | /* mode[4] atime[4] mtime[4] length[8]*/ | ||
| 1228 | /* name[s] uid[s] gid[s] muid[s] */ | ||
| 1229 | ret = 2+2+4+13+4+4+4+8+2+2+2+2; | ||
| 1230 | |||
| 1231 | if (wst->name) | ||
| 1232 | ret += strlen(wst->name); | ||
| 1233 | if (wst->uid) | ||
| 1234 | ret += strlen(wst->uid); | ||
| 1235 | if (wst->gid) | ||
| 1236 | ret += strlen(wst->gid); | ||
| 1237 | if (wst->muid) | ||
| 1238 | ret += strlen(wst->muid); | ||
| 1239 | |||
| 1240 | if (optional) { | ||
| 1241 | ret += 2+4+4+4; /* extension[s] n_uid[4] n_gid[4] n_muid[4] */ | ||
| 1242 | if (wst->extension) | ||
| 1243 | ret += strlen(wst->extension); | ||
| 1244 | } | ||
| 1245 | |||
| 1246 | return ret; | ||
| 1247 | } | ||
| 1248 | |||
| 1254 | int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst) | 1249 | int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst) |
| 1255 | { | 1250 | { |
| 1256 | int err; | 1251 | int err; |
| 1257 | struct p9_req_t *req; | 1252 | struct p9_req_t *req; |
| 1258 | struct p9_client *clnt; | 1253 | struct p9_client *clnt; |
| 1259 | 1254 | ||
| 1255 | err = 0; | ||
| 1256 | clnt = fid->clnt; | ||
| 1257 | wst->size = p9_client_statsize(wst, clnt->dotu); | ||
| 1260 | P9_DPRINTK(P9_DEBUG_9P, ">>> TWSTAT fid %d\n", fid->fid); | 1258 | P9_DPRINTK(P9_DEBUG_9P, ">>> TWSTAT fid %d\n", fid->fid); |
| 1261 | P9_DPRINTK(P9_DEBUG_9P, | 1259 | P9_DPRINTK(P9_DEBUG_9P, |
| 1262 | " sz=%x type=%x dev=%x qid=%x.%llx.%x\n" | 1260 | " sz=%x type=%x dev=%x qid=%x.%llx.%x\n" |
| @@ -1268,10 +1266,8 @@ int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst) | |||
| 1268 | wst->atime, wst->mtime, (unsigned long long)wst->length, | 1266 | wst->atime, wst->mtime, (unsigned long long)wst->length, |
| 1269 | wst->name, wst->uid, wst->gid, wst->muid, wst->extension, | 1267 | wst->name, wst->uid, wst->gid, wst->muid, wst->extension, |
| 1270 | wst->n_uid, wst->n_gid, wst->n_muid); | 1268 | wst->n_uid, wst->n_gid, wst->n_muid); |
| 1271 | err = 0; | ||
| 1272 | clnt = fid->clnt; | ||
| 1273 | 1269 | ||
| 1274 | req = p9_client_rpc(clnt, P9_TWSTAT, "dwS", fid->fid, 0, wst); | 1270 | req = p9_client_rpc(clnt, P9_TWSTAT, "dwS", fid->fid, wst->size, wst); |
| 1275 | if (IS_ERR(req)) { | 1271 | if (IS_ERR(req)) { |
| 1276 | err = PTR_ERR(req); | 1272 | err = PTR_ERR(req); |
| 1277 | goto error; | 1273 | goto error; |
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index c613ed08a5ee..a2a1814c7a8d 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c | |||
| @@ -213,8 +213,8 @@ static void p9_conn_cancel(struct p9_conn *m, int err) | |||
| 213 | spin_unlock_irqrestore(&m->client->lock, flags); | 213 | spin_unlock_irqrestore(&m->client->lock, flags); |
| 214 | 214 | ||
| 215 | list_for_each_entry_safe(req, rtmp, &cancel_list, req_list) { | 215 | list_for_each_entry_safe(req, rtmp, &cancel_list, req_list) { |
| 216 | list_del(&req->req_list); | ||
| 217 | P9_DPRINTK(P9_DEBUG_ERROR, "call back req %p\n", req); | 216 | P9_DPRINTK(P9_DEBUG_ERROR, "call back req %p\n", req); |
| 217 | list_del(&req->req_list); | ||
| 218 | p9_client_cb(m->client, req); | 218 | p9_client_cb(m->client, req); |
| 219 | } | 219 | } |
| 220 | } | 220 | } |
| @@ -336,7 +336,8 @@ static void p9_read_work(struct work_struct *work) | |||
| 336 | "mux %p pkt: size: %d bytes tag: %d\n", m, n, tag); | 336 | "mux %p pkt: size: %d bytes tag: %d\n", m, n, tag); |
| 337 | 337 | ||
| 338 | m->req = p9_tag_lookup(m->client, tag); | 338 | m->req = p9_tag_lookup(m->client, tag); |
| 339 | if (!m->req) { | 339 | if (!m->req || (m->req->status != REQ_STATUS_SENT && |
| 340 | m->req->status != REQ_STATUS_FLSH)) { | ||
| 340 | P9_DPRINTK(P9_DEBUG_ERROR, "Unexpected packet tag %d\n", | 341 | P9_DPRINTK(P9_DEBUG_ERROR, "Unexpected packet tag %d\n", |
| 341 | tag); | 342 | tag); |
| 342 | err = -EIO; | 343 | err = -EIO; |
| @@ -361,10 +362,11 @@ static void p9_read_work(struct work_struct *work) | |||
| 361 | if ((m->req) && (m->rpos == m->rsize)) { /* packet is read in */ | 362 | if ((m->req) && (m->rpos == m->rsize)) { /* packet is read in */ |
| 362 | P9_DPRINTK(P9_DEBUG_TRANS, "got new packet\n"); | 363 | P9_DPRINTK(P9_DEBUG_TRANS, "got new packet\n"); |
| 363 | spin_lock(&m->client->lock); | 364 | spin_lock(&m->client->lock); |
| 365 | if (m->req->status != REQ_STATUS_ERROR) | ||
| 366 | m->req->status = REQ_STATUS_RCVD; | ||
| 364 | list_del(&m->req->req_list); | 367 | list_del(&m->req->req_list); |
| 365 | spin_unlock(&m->client->lock); | 368 | spin_unlock(&m->client->lock); |
| 366 | p9_client_cb(m->client, m->req); | 369 | p9_client_cb(m->client, m->req); |
| 367 | |||
| 368 | m->rbuf = NULL; | 370 | m->rbuf = NULL; |
| 369 | m->rpos = 0; | 371 | m->rpos = 0; |
| 370 | m->rsize = 0; | 372 | m->rsize = 0; |
| @@ -454,6 +456,7 @@ static void p9_write_work(struct work_struct *work) | |||
| 454 | req = list_entry(m->unsent_req_list.next, struct p9_req_t, | 456 | req = list_entry(m->unsent_req_list.next, struct p9_req_t, |
| 455 | req_list); | 457 | req_list); |
| 456 | req->status = REQ_STATUS_SENT; | 458 | req->status = REQ_STATUS_SENT; |
| 459 | P9_DPRINTK(P9_DEBUG_TRANS, "move req %p\n", req); | ||
| 457 | list_move_tail(&req->req_list, &m->req_list); | 460 | list_move_tail(&req->req_list, &m->req_list); |
| 458 | 461 | ||
| 459 | m->wbuf = req->tc->sdata; | 462 | m->wbuf = req->tc->sdata; |
| @@ -683,12 +686,13 @@ static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req) | |||
| 683 | P9_DPRINTK(P9_DEBUG_TRANS, "client %p req %p\n", client, req); | 686 | P9_DPRINTK(P9_DEBUG_TRANS, "client %p req %p\n", client, req); |
| 684 | 687 | ||
| 685 | spin_lock(&client->lock); | 688 | spin_lock(&client->lock); |
| 686 | list_del(&req->req_list); | ||
| 687 | 689 | ||
| 688 | if (req->status == REQ_STATUS_UNSENT) { | 690 | if (req->status == REQ_STATUS_UNSENT) { |
| 691 | list_del(&req->req_list); | ||
| 689 | req->status = REQ_STATUS_FLSHD; | 692 | req->status = REQ_STATUS_FLSHD; |
| 690 | ret = 0; | 693 | ret = 0; |
| 691 | } | 694 | } else if (req->status == REQ_STATUS_SENT) |
| 695 | req->status = REQ_STATUS_FLSH; | ||
| 692 | 696 | ||
| 693 | spin_unlock(&client->lock); | 697 | spin_unlock(&client->lock); |
| 694 | 698 | ||
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index 7fa0eb20b2f6..ac4990041ebb 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c | |||
| @@ -295,6 +295,7 @@ handle_recv(struct p9_client *client, struct p9_trans_rdma *rdma, | |||
| 295 | goto err_out; | 295 | goto err_out; |
| 296 | 296 | ||
| 297 | req->rc = c->rc; | 297 | req->rc = c->rc; |
| 298 | req->status = REQ_STATUS_RCVD; | ||
| 298 | p9_client_cb(client, req); | 299 | p9_client_cb(client, req); |
| 299 | 300 | ||
| 300 | return; | 301 | return; |
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 2d7781ec663b..bb8579a141a8 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c | |||
| @@ -134,6 +134,7 @@ static void req_done(struct virtqueue *vq) | |||
| 134 | P9_DPRINTK(P9_DEBUG_TRANS, ": rc %p\n", rc); | 134 | P9_DPRINTK(P9_DEBUG_TRANS, ": rc %p\n", rc); |
| 135 | P9_DPRINTK(P9_DEBUG_TRANS, ": lookup tag %d\n", rc->tag); | 135 | P9_DPRINTK(P9_DEBUG_TRANS, ": lookup tag %d\n", rc->tag); |
| 136 | req = p9_tag_lookup(chan->client, rc->tag); | 136 | req = p9_tag_lookup(chan->client, rc->tag); |
| 137 | req->status = REQ_STATUS_RCVD; | ||
| 137 | p9_client_cb(chan->client, req); | 138 | p9_client_cb(chan->client, req); |
| 138 | } | 139 | } |
| 139 | } | 140 | } |
diff --git a/net/Kconfig b/net/Kconfig index ce77db4fcec8..c19f549c8e74 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -119,12 +119,6 @@ menuconfig NETFILTER | |||
| 119 | <file:Documentation/Changes> under "iptables" for the location of | 119 | <file:Documentation/Changes> under "iptables" for the location of |
| 120 | these packages. | 120 | these packages. |
| 121 | 121 | ||
| 122 | Make sure to say N to "Fast switching" below if you intend to say Y | ||
| 123 | here, as Fast switching currently bypasses netfilter. | ||
| 124 | |||
| 125 | Chances are that you should say Y here if you compile a kernel which | ||
| 126 | will run as a router and N for regular hosts. If unsure, say N. | ||
| 127 | |||
| 128 | if NETFILTER | 122 | if NETFILTER |
| 129 | 123 | ||
| 130 | config NETFILTER_DEBUG | 124 | config NETFILTER_DEBUG |
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 334fcd4a4ea4..3100a8940afc 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
| @@ -549,6 +549,7 @@ static void br2684_setup(struct net_device *netdev) | |||
| 549 | struct br2684_dev *brdev = BRPRIV(netdev); | 549 | struct br2684_dev *brdev = BRPRIV(netdev); |
| 550 | 550 | ||
| 551 | ether_setup(netdev); | 551 | ether_setup(netdev); |
| 552 | brdev->net_dev = netdev; | ||
| 552 | 553 | ||
| 553 | netdev->netdev_ops = &br2684_netdev_ops; | 554 | netdev->netdev_ops = &br2684_netdev_ops; |
| 554 | 555 | ||
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 375f4b4f7f79..61309b26f271 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
| @@ -248,6 +248,8 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) | |||
| 248 | if (hdev->notify) | 248 | if (hdev->notify) |
| 249 | hdev->notify(hdev, HCI_NOTIFY_CONN_ADD); | 249 | hdev->notify(hdev, HCI_NOTIFY_CONN_ADD); |
| 250 | 250 | ||
| 251 | hci_conn_init_sysfs(conn); | ||
| 252 | |||
| 251 | tasklet_enable(&hdev->tx_task); | 253 | tasklet_enable(&hdev->tx_task); |
| 252 | 254 | ||
| 253 | return conn; | 255 | return conn; |
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index b7c51082ddeb..a05d45eb3ba1 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | struct class *bt_class = NULL; | 9 | struct class *bt_class = NULL; |
| 10 | EXPORT_SYMBOL_GPL(bt_class); | 10 | EXPORT_SYMBOL_GPL(bt_class); |
| 11 | 11 | ||
| 12 | static struct workqueue_struct *bluetooth; | 12 | static struct workqueue_struct *bt_workq; |
| 13 | 13 | ||
| 14 | static inline char *link_typetostr(int type) | 14 | static inline char *link_typetostr(int type) |
| 15 | { | 15 | { |
| @@ -88,9 +88,12 @@ static struct device_type bt_link = { | |||
| 88 | static void add_conn(struct work_struct *work) | 88 | static void add_conn(struct work_struct *work) |
| 89 | { | 89 | { |
| 90 | struct hci_conn *conn = container_of(work, struct hci_conn, work_add); | 90 | struct hci_conn *conn = container_of(work, struct hci_conn, work_add); |
| 91 | struct hci_dev *hdev = conn->hdev; | ||
| 92 | |||
| 93 | /* ensure previous del is complete */ | ||
| 94 | flush_work(&conn->work_del); | ||
| 91 | 95 | ||
| 92 | /* ensure previous add/del is complete */ | 96 | dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle); |
| 93 | flush_workqueue(bluetooth); | ||
| 94 | 97 | ||
| 95 | if (device_add(&conn->dev) < 0) { | 98 | if (device_add(&conn->dev) < 0) { |
| 96 | BT_ERR("Failed to register connection device"); | 99 | BT_ERR("Failed to register connection device"); |
| @@ -98,27 +101,6 @@ static void add_conn(struct work_struct *work) | |||
| 98 | } | 101 | } |
| 99 | } | 102 | } |
| 100 | 103 | ||
| 101 | void hci_conn_add_sysfs(struct hci_conn *conn) | ||
| 102 | { | ||
| 103 | struct hci_dev *hdev = conn->hdev; | ||
| 104 | |||
| 105 | BT_DBG("conn %p", conn); | ||
| 106 | |||
| 107 | conn->dev.type = &bt_link; | ||
| 108 | conn->dev.class = bt_class; | ||
| 109 | conn->dev.parent = &hdev->dev; | ||
| 110 | |||
| 111 | dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle); | ||
| 112 | |||
| 113 | dev_set_drvdata(&conn->dev, conn); | ||
| 114 | |||
| 115 | device_initialize(&conn->dev); | ||
| 116 | |||
| 117 | INIT_WORK(&conn->work_add, add_conn); | ||
| 118 | |||
| 119 | queue_work(bluetooth, &conn->work_add); | ||
| 120 | } | ||
| 121 | |||
| 122 | /* | 104 | /* |
| 123 | * The rfcomm tty device will possibly retain even when conn | 105 | * The rfcomm tty device will possibly retain even when conn |
| 124 | * is down, and sysfs doesn't support move zombie device, | 106 | * is down, and sysfs doesn't support move zombie device, |
| @@ -134,8 +116,11 @@ static void del_conn(struct work_struct *work) | |||
| 134 | struct hci_conn *conn = container_of(work, struct hci_conn, work_del); | 116 | struct hci_conn *conn = container_of(work, struct hci_conn, work_del); |
| 135 | struct hci_dev *hdev = conn->hdev; | 117 | struct hci_dev *hdev = conn->hdev; |
| 136 | 118 | ||
| 137 | /* ensure previous add/del is complete */ | 119 | /* ensure previous add is complete */ |
| 138 | flush_workqueue(bluetooth); | 120 | flush_work(&conn->work_add); |
| 121 | |||
| 122 | if (!device_is_registered(&conn->dev)) | ||
| 123 | return; | ||
| 139 | 124 | ||
| 140 | while (1) { | 125 | while (1) { |
| 141 | struct device *dev; | 126 | struct device *dev; |
| @@ -152,16 +137,36 @@ static void del_conn(struct work_struct *work) | |||
| 152 | hci_dev_put(hdev); | 137 | hci_dev_put(hdev); |
| 153 | } | 138 | } |
| 154 | 139 | ||
| 155 | void hci_conn_del_sysfs(struct hci_conn *conn) | 140 | void hci_conn_init_sysfs(struct hci_conn *conn) |
| 156 | { | 141 | { |
| 142 | struct hci_dev *hdev = conn->hdev; | ||
| 143 | |||
| 157 | BT_DBG("conn %p", conn); | 144 | BT_DBG("conn %p", conn); |
| 158 | 145 | ||
| 159 | if (!device_is_registered(&conn->dev)) | 146 | conn->dev.type = &bt_link; |
| 160 | return; | 147 | conn->dev.class = bt_class; |
| 148 | conn->dev.parent = &hdev->dev; | ||
| 149 | |||
| 150 | dev_set_drvdata(&conn->dev, conn); | ||
| 151 | |||
| 152 | device_initialize(&conn->dev); | ||
| 161 | 153 | ||
| 154 | INIT_WORK(&conn->work_add, add_conn); | ||
| 162 | INIT_WORK(&conn->work_del, del_conn); | 155 | INIT_WORK(&conn->work_del, del_conn); |
| 156 | } | ||
| 157 | |||
| 158 | void hci_conn_add_sysfs(struct hci_conn *conn) | ||
| 159 | { | ||
| 160 | BT_DBG("conn %p", conn); | ||
| 161 | |||
| 162 | queue_work(bt_workq, &conn->work_add); | ||
| 163 | } | ||
| 164 | |||
| 165 | void hci_conn_del_sysfs(struct hci_conn *conn) | ||
| 166 | { | ||
| 167 | BT_DBG("conn %p", conn); | ||
| 163 | 168 | ||
| 164 | queue_work(bluetooth, &conn->work_del); | 169 | queue_work(bt_workq, &conn->work_del); |
| 165 | } | 170 | } |
| 166 | 171 | ||
| 167 | static inline char *host_typetostr(int type) | 172 | static inline char *host_typetostr(int type) |
| @@ -438,13 +443,13 @@ void hci_unregister_sysfs(struct hci_dev *hdev) | |||
| 438 | 443 | ||
| 439 | int __init bt_sysfs_init(void) | 444 | int __init bt_sysfs_init(void) |
| 440 | { | 445 | { |
| 441 | bluetooth = create_singlethread_workqueue("bluetooth"); | 446 | bt_workq = create_singlethread_workqueue("bluetooth"); |
| 442 | if (!bluetooth) | 447 | if (!bt_workq) |
| 443 | return -ENOMEM; | 448 | return -ENOMEM; |
| 444 | 449 | ||
| 445 | bt_class = class_create(THIS_MODULE, "bluetooth"); | 450 | bt_class = class_create(THIS_MODULE, "bluetooth"); |
| 446 | if (IS_ERR(bt_class)) { | 451 | if (IS_ERR(bt_class)) { |
| 447 | destroy_workqueue(bluetooth); | 452 | destroy_workqueue(bt_workq); |
| 448 | return PTR_ERR(bt_class); | 453 | return PTR_ERR(bt_class); |
| 449 | } | 454 | } |
| 450 | 455 | ||
| @@ -453,7 +458,7 @@ int __init bt_sysfs_init(void) | |||
| 453 | 458 | ||
| 454 | void bt_sysfs_cleanup(void) | 459 | void bt_sysfs_cleanup(void) |
| 455 | { | 460 | { |
| 456 | destroy_workqueue(bluetooth); | 461 | destroy_workqueue(bt_workq); |
| 457 | 462 | ||
| 458 | class_destroy(bt_class); | 463 | class_destroy(bt_class); |
| 459 | } | 464 | } |
diff --git a/net/core/dev.c b/net/core/dev.c index 308a7d0c277f..e2e9e4af3ace 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1735,11 +1735,12 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb) | |||
| 1735 | { | 1735 | { |
| 1736 | u32 hash; | 1736 | u32 hash; |
| 1737 | 1737 | ||
| 1738 | if (skb_rx_queue_recorded(skb)) { | 1738 | if (skb_rx_queue_recorded(skb)) |
| 1739 | hash = skb_get_rx_queue(skb); | 1739 | return skb_get_rx_queue(skb) % dev->real_num_tx_queues; |
| 1740 | } else if (skb->sk && skb->sk->sk_hash) { | 1740 | |
| 1741 | if (skb->sk && skb->sk->sk_hash) | ||
| 1741 | hash = skb->sk->sk_hash; | 1742 | hash = skb->sk->sk_hash; |
| 1742 | } else | 1743 | else |
| 1743 | hash = skb->protocol; | 1744 | hash = skb->protocol; |
| 1744 | 1745 | ||
| 1745 | hash = jhash_1word(hash, skb_tx_hashrnd); | 1746 | hash = jhash_1word(hash, skb_tx_hashrnd); |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ce6356cd9f71..d152394b2611 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -502,7 +502,9 @@ int skb_recycle_check(struct sk_buff *skb, int skb_size) | |||
| 502 | shinfo->gso_segs = 0; | 502 | shinfo->gso_segs = 0; |
| 503 | shinfo->gso_type = 0; | 503 | shinfo->gso_type = 0; |
| 504 | shinfo->ip6_frag_id = 0; | 504 | shinfo->ip6_frag_id = 0; |
| 505 | shinfo->tx_flags.flags = 0; | ||
| 505 | shinfo->frag_list = NULL; | 506 | shinfo->frag_list = NULL; |
| 507 | memset(&shinfo->hwtstamps, 0, sizeof(shinfo->hwtstamps)); | ||
| 506 | 508 | ||
| 507 | memset(skb, 0, offsetof(struct sk_buff, tail)); | 509 | memset(skb, 0, offsetof(struct sk_buff, tail)); |
| 508 | skb->data = skb->head + NET_SKB_PAD; | 510 | skb->data = skb->head + NET_SKB_PAD; |
| @@ -1365,9 +1367,8 @@ static void sock_spd_release(struct splice_pipe_desc *spd, unsigned int i) | |||
| 1365 | 1367 | ||
| 1366 | static inline struct page *linear_to_page(struct page *page, unsigned int *len, | 1368 | static inline struct page *linear_to_page(struct page *page, unsigned int *len, |
| 1367 | unsigned int *offset, | 1369 | unsigned int *offset, |
| 1368 | struct sk_buff *skb) | 1370 | struct sk_buff *skb, struct sock *sk) |
| 1369 | { | 1371 | { |
| 1370 | struct sock *sk = skb->sk; | ||
| 1371 | struct page *p = sk->sk_sndmsg_page; | 1372 | struct page *p = sk->sk_sndmsg_page; |
| 1372 | unsigned int off; | 1373 | unsigned int off; |
| 1373 | 1374 | ||
| @@ -1405,13 +1406,14 @@ new_page: | |||
| 1405 | */ | 1406 | */ |
| 1406 | static inline int spd_fill_page(struct splice_pipe_desc *spd, struct page *page, | 1407 | static inline int spd_fill_page(struct splice_pipe_desc *spd, struct page *page, |
| 1407 | unsigned int *len, unsigned int offset, | 1408 | unsigned int *len, unsigned int offset, |
| 1408 | struct sk_buff *skb, int linear) | 1409 | struct sk_buff *skb, int linear, |
| 1410 | struct sock *sk) | ||
| 1409 | { | 1411 | { |
| 1410 | if (unlikely(spd->nr_pages == PIPE_BUFFERS)) | 1412 | if (unlikely(spd->nr_pages == PIPE_BUFFERS)) |
| 1411 | return 1; | 1413 | return 1; |
| 1412 | 1414 | ||
| 1413 | if (linear) { | 1415 | if (linear) { |
| 1414 | page = linear_to_page(page, len, &offset, skb); | 1416 | page = linear_to_page(page, len, &offset, skb, sk); |
| 1415 | if (!page) | 1417 | if (!page) |
| 1416 | return 1; | 1418 | return 1; |
| 1417 | } else | 1419 | } else |
| @@ -1442,7 +1444,8 @@ static inline void __segment_seek(struct page **page, unsigned int *poff, | |||
| 1442 | static inline int __splice_segment(struct page *page, unsigned int poff, | 1444 | static inline int __splice_segment(struct page *page, unsigned int poff, |
| 1443 | unsigned int plen, unsigned int *off, | 1445 | unsigned int plen, unsigned int *off, |
| 1444 | unsigned int *len, struct sk_buff *skb, | 1446 | unsigned int *len, struct sk_buff *skb, |
| 1445 | struct splice_pipe_desc *spd, int linear) | 1447 | struct splice_pipe_desc *spd, int linear, |
| 1448 | struct sock *sk) | ||
| 1446 | { | 1449 | { |
| 1447 | if (!*len) | 1450 | if (!*len) |
| 1448 | return 1; | 1451 | return 1; |
| @@ -1465,7 +1468,7 @@ static inline int __splice_segment(struct page *page, unsigned int poff, | |||
| 1465 | /* the linear region may spread across several pages */ | 1468 | /* the linear region may spread across several pages */ |
| 1466 | flen = min_t(unsigned int, flen, PAGE_SIZE - poff); | 1469 | flen = min_t(unsigned int, flen, PAGE_SIZE - poff); |
| 1467 | 1470 | ||
| 1468 | if (spd_fill_page(spd, page, &flen, poff, skb, linear)) | 1471 | if (spd_fill_page(spd, page, &flen, poff, skb, linear, sk)) |
| 1469 | return 1; | 1472 | return 1; |
| 1470 | 1473 | ||
| 1471 | __segment_seek(&page, &poff, &plen, flen); | 1474 | __segment_seek(&page, &poff, &plen, flen); |
| @@ -1481,8 +1484,8 @@ static inline int __splice_segment(struct page *page, unsigned int poff, | |||
| 1481 | * pipe is full or if we already spliced the requested length. | 1484 | * pipe is full or if we already spliced the requested length. |
| 1482 | */ | 1485 | */ |
| 1483 | static int __skb_splice_bits(struct sk_buff *skb, unsigned int *offset, | 1486 | static int __skb_splice_bits(struct sk_buff *skb, unsigned int *offset, |
| 1484 | unsigned int *len, | 1487 | unsigned int *len, struct splice_pipe_desc *spd, |
| 1485 | struct splice_pipe_desc *spd) | 1488 | struct sock *sk) |
| 1486 | { | 1489 | { |
| 1487 | int seg; | 1490 | int seg; |
| 1488 | 1491 | ||
| @@ -1492,7 +1495,7 @@ static int __skb_splice_bits(struct sk_buff *skb, unsigned int *offset, | |||
| 1492 | if (__splice_segment(virt_to_page(skb->data), | 1495 | if (__splice_segment(virt_to_page(skb->data), |
| 1493 | (unsigned long) skb->data & (PAGE_SIZE - 1), | 1496 | (unsigned long) skb->data & (PAGE_SIZE - 1), |
| 1494 | skb_headlen(skb), | 1497 | skb_headlen(skb), |
| 1495 | offset, len, skb, spd, 1)) | 1498 | offset, len, skb, spd, 1, sk)) |
| 1496 | return 1; | 1499 | return 1; |
| 1497 | 1500 | ||
| 1498 | /* | 1501 | /* |
| @@ -1502,7 +1505,7 @@ static int __skb_splice_bits(struct sk_buff *skb, unsigned int *offset, | |||
| 1502 | const skb_frag_t *f = &skb_shinfo(skb)->frags[seg]; | 1505 | const skb_frag_t *f = &skb_shinfo(skb)->frags[seg]; |
| 1503 | 1506 | ||
| 1504 | if (__splice_segment(f->page, f->page_offset, f->size, | 1507 | if (__splice_segment(f->page, f->page_offset, f->size, |
| 1505 | offset, len, skb, spd, 0)) | 1508 | offset, len, skb, spd, 0, sk)) |
| 1506 | return 1; | 1509 | return 1; |
| 1507 | } | 1510 | } |
| 1508 | 1511 | ||
| @@ -1528,12 +1531,13 @@ int skb_splice_bits(struct sk_buff *skb, unsigned int offset, | |||
| 1528 | .ops = &sock_pipe_buf_ops, | 1531 | .ops = &sock_pipe_buf_ops, |
| 1529 | .spd_release = sock_spd_release, | 1532 | .spd_release = sock_spd_release, |
| 1530 | }; | 1533 | }; |
| 1534 | struct sock *sk = skb->sk; | ||
| 1531 | 1535 | ||
| 1532 | /* | 1536 | /* |
| 1533 | * __skb_splice_bits() only fails if the output has no room left, | 1537 | * __skb_splice_bits() only fails if the output has no room left, |
| 1534 | * so no point in going over the frag_list for the error case. | 1538 | * so no point in going over the frag_list for the error case. |
| 1535 | */ | 1539 | */ |
| 1536 | if (__skb_splice_bits(skb, &offset, &tlen, &spd)) | 1540 | if (__skb_splice_bits(skb, &offset, &tlen, &spd, sk)) |
| 1537 | goto done; | 1541 | goto done; |
| 1538 | else if (!tlen) | 1542 | else if (!tlen) |
| 1539 | goto done; | 1543 | goto done; |
| @@ -1545,14 +1549,13 @@ int skb_splice_bits(struct sk_buff *skb, unsigned int offset, | |||
| 1545 | struct sk_buff *list = skb_shinfo(skb)->frag_list; | 1549 | struct sk_buff *list = skb_shinfo(skb)->frag_list; |
| 1546 | 1550 | ||
| 1547 | for (; list && tlen; list = list->next) { | 1551 | for (; list && tlen; list = list->next) { |
| 1548 | if (__skb_splice_bits(list, &offset, &tlen, &spd)) | 1552 | if (__skb_splice_bits(list, &offset, &tlen, &spd, sk)) |
| 1549 | break; | 1553 | break; |
| 1550 | } | 1554 | } |
| 1551 | } | 1555 | } |
| 1552 | 1556 | ||
| 1553 | done: | 1557 | done: |
| 1554 | if (spd.nr_pages) { | 1558 | if (spd.nr_pages) { |
| 1555 | struct sock *sk = skb->sk; | ||
| 1556 | int ret; | 1559 | int ret; |
| 1557 | 1560 | ||
| 1558 | /* | 1561 | /* |
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index b2cf91e4ccaa..9d26a3da37e5 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -407,7 +407,7 @@ config INET_XFRM_MODE_BEET | |||
| 407 | If unsure, say Y. | 407 | If unsure, say Y. |
| 408 | 408 | ||
| 409 | config INET_LRO | 409 | config INET_LRO |
| 410 | tristate "Large Receive Offload (ipv4/tcp)" | 410 | bool "Large Receive Offload (ipv4/tcp)" |
| 411 | 411 | ||
| 412 | ---help--- | 412 | ---help--- |
| 413 | Support for Large Receive Offload (ipv4/tcp). | 413 | Support for Large Receive Offload (ipv4/tcp). |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index c96a6bb25430..eec3e6f9956c 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -597,16 +597,6 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb) | |||
| 597 | tcp_grow_window(sk, skb); | 597 | tcp_grow_window(sk, skb); |
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | static u32 tcp_rto_min(struct sock *sk) | ||
| 601 | { | ||
| 602 | struct dst_entry *dst = __sk_dst_get(sk); | ||
| 603 | u32 rto_min = TCP_RTO_MIN; | ||
| 604 | |||
| 605 | if (dst && dst_metric_locked(dst, RTAX_RTO_MIN)) | ||
| 606 | rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN); | ||
| 607 | return rto_min; | ||
| 608 | } | ||
| 609 | |||
| 610 | /* Called to compute a smoothed rtt estimate. The data fed to this | 600 | /* Called to compute a smoothed rtt estimate. The data fed to this |
| 611 | * routine either comes from timestamps, or from segments that were | 601 | * routine either comes from timestamps, or from segments that were |
| 612 | * known _not_ to have been retransmitted [see Karn/Partridge | 602 | * known _not_ to have been retransmitted [see Karn/Partridge |
diff --git a/net/ipv6/netfilter/ip6t_ipv6header.c b/net/ipv6/netfilter/ip6t_ipv6header.c index 14e6724d5672..91490ad9302c 100644 --- a/net/ipv6/netfilter/ip6t_ipv6header.c +++ b/net/ipv6/netfilter/ip6t_ipv6header.c | |||
| @@ -50,14 +50,14 @@ ipv6header_mt6(const struct sk_buff *skb, const struct xt_match_param *par) | |||
| 50 | struct ipv6_opt_hdr _hdr; | 50 | struct ipv6_opt_hdr _hdr; |
| 51 | int hdrlen; | 51 | int hdrlen; |
| 52 | 52 | ||
| 53 | /* Is there enough space for the next ext header? */ | ||
| 54 | if (len < (int)sizeof(struct ipv6_opt_hdr)) | ||
| 55 | return false; | ||
| 56 | /* No more exthdr -> evaluate */ | 53 | /* No more exthdr -> evaluate */ |
| 57 | if (nexthdr == NEXTHDR_NONE) { | 54 | if (nexthdr == NEXTHDR_NONE) { |
| 58 | temp |= MASK_NONE; | 55 | temp |= MASK_NONE; |
| 59 | break; | 56 | break; |
| 60 | } | 57 | } |
| 58 | /* Is there enough space for the next ext header? */ | ||
| 59 | if (len < (int)sizeof(struct ipv6_opt_hdr)) | ||
| 60 | return false; | ||
| 61 | /* ESP -> evaluate */ | 61 | /* ESP -> evaluate */ |
| 62 | if (nexthdr == NEXTHDR_ESP) { | 62 | if (nexthdr == NEXTHDR_ESP) { |
| 63 | temp |= MASK_ESP; | 63 | temp |= MASK_ESP; |
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index fbcbed6cad01..14134193cd17 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
| @@ -757,6 +757,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, | |||
| 757 | local->hw.conf.long_frame_max_tx_count = 4; | 757 | local->hw.conf.long_frame_max_tx_count = 4; |
| 758 | local->hw.conf.short_frame_max_tx_count = 7; | 758 | local->hw.conf.short_frame_max_tx_count = 7; |
| 759 | local->hw.conf.radio_enabled = true; | 759 | local->hw.conf.radio_enabled = true; |
| 760 | local->user_power_level = -1; | ||
| 760 | 761 | ||
| 761 | INIT_LIST_HEAD(&local->interfaces); | 762 | INIT_LIST_HEAD(&local->interfaces); |
| 762 | mutex_init(&local->iflist_mtx); | 763 | mutex_init(&local->iflist_mtx); |
| @@ -909,6 +910,13 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) | |||
| 909 | if (result < 0) | 910 | if (result < 0) |
| 910 | goto fail_sta_info; | 911 | goto fail_sta_info; |
| 911 | 912 | ||
| 913 | result = ieee80211_wep_init(local); | ||
| 914 | if (result < 0) { | ||
| 915 | printk(KERN_DEBUG "%s: Failed to initialize wep: %d\n", | ||
| 916 | wiphy_name(local->hw.wiphy), result); | ||
| 917 | goto fail_wep; | ||
| 918 | } | ||
| 919 | |||
| 912 | rtnl_lock(); | 920 | rtnl_lock(); |
| 913 | result = dev_alloc_name(local->mdev, local->mdev->name); | 921 | result = dev_alloc_name(local->mdev, local->mdev->name); |
| 914 | if (result < 0) | 922 | if (result < 0) |
| @@ -930,14 +938,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) | |||
| 930 | goto fail_rate; | 938 | goto fail_rate; |
| 931 | } | 939 | } |
| 932 | 940 | ||
| 933 | result = ieee80211_wep_init(local); | ||
| 934 | |||
| 935 | if (result < 0) { | ||
| 936 | printk(KERN_DEBUG "%s: Failed to initialize wep: %d\n", | ||
| 937 | wiphy_name(local->hw.wiphy), result); | ||
| 938 | goto fail_wep; | ||
| 939 | } | ||
| 940 | |||
| 941 | /* add one default STA interface if supported */ | 941 | /* add one default STA interface if supported */ |
| 942 | if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION)) { | 942 | if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION)) { |
| 943 | result = ieee80211_if_add(local, "wlan%d", NULL, | 943 | result = ieee80211_if_add(local, "wlan%d", NULL, |
| @@ -967,13 +967,13 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) | |||
| 967 | 967 | ||
| 968 | return 0; | 968 | return 0; |
| 969 | 969 | ||
| 970 | fail_wep: | ||
| 971 | rate_control_deinitialize(local); | ||
| 972 | fail_rate: | 970 | fail_rate: |
| 973 | unregister_netdevice(local->mdev); | 971 | unregister_netdevice(local->mdev); |
| 974 | local->mdev = NULL; | 972 | local->mdev = NULL; |
| 975 | fail_dev: | 973 | fail_dev: |
| 976 | rtnl_unlock(); | 974 | rtnl_unlock(); |
| 975 | ieee80211_wep_free(local); | ||
| 976 | fail_wep: | ||
| 977 | sta_info_stop(local); | 977 | sta_info_stop(local); |
| 978 | fail_sta_info: | 978 | fail_sta_info: |
| 979 | debugfs_hw_del(local); | 979 | debugfs_hw_del(local); |
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c index 3824990d340b..70df3dcc3cf6 100644 --- a/net/mac80211/rc80211_minstrel.c +++ b/net/mac80211/rc80211_minstrel.c | |||
| @@ -476,7 +476,7 @@ minstrel_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp) | |||
| 476 | return NULL; | 476 | return NULL; |
| 477 | 477 | ||
| 478 | for (i = 0; i < IEEE80211_NUM_BANDS; i++) { | 478 | for (i = 0; i < IEEE80211_NUM_BANDS; i++) { |
| 479 | sband = hw->wiphy->bands[hw->conf.channel->band]; | 479 | sband = hw->wiphy->bands[i]; |
| 480 | if (sband->n_bitrates > max_rates) | 480 | if (sband->n_bitrates > max_rates) |
| 481 | max_rates = sband->n_bitrates; | 481 | max_rates = sband->n_bitrates; |
| 482 | } | 482 | } |
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c index b16801cde06f..01d59a8e334c 100644 --- a/net/mac80211/rc80211_pid_algo.c +++ b/net/mac80211/rc80211_pid_algo.c | |||
| @@ -317,13 +317,44 @@ rate_control_pid_rate_init(void *priv, struct ieee80211_supported_band *sband, | |||
| 317 | struct ieee80211_sta *sta, void *priv_sta) | 317 | struct ieee80211_sta *sta, void *priv_sta) |
| 318 | { | 318 | { |
| 319 | struct rc_pid_sta_info *spinfo = priv_sta; | 319 | struct rc_pid_sta_info *spinfo = priv_sta; |
| 320 | struct rc_pid_info *pinfo = priv; | ||
| 321 | struct rc_pid_rateinfo *rinfo = pinfo->rinfo; | ||
| 320 | struct sta_info *si; | 322 | struct sta_info *si; |
| 323 | int i, j, tmp; | ||
| 324 | bool s; | ||
| 321 | 325 | ||
| 322 | /* TODO: This routine should consider using RSSI from previous packets | 326 | /* TODO: This routine should consider using RSSI from previous packets |
| 323 | * as we need to have IEEE 802.1X auth succeed immediately after assoc.. | 327 | * as we need to have IEEE 802.1X auth succeed immediately after assoc.. |
| 324 | * Until that method is implemented, we will use the lowest supported | 328 | * Until that method is implemented, we will use the lowest supported |
| 325 | * rate as a workaround. */ | 329 | * rate as a workaround. */ |
| 326 | 330 | ||
| 331 | /* Sort the rates. This is optimized for the most common case (i.e. | ||
| 332 | * almost-sorted CCK+OFDM rates). Kind of bubble-sort with reversed | ||
| 333 | * mapping too. */ | ||
| 334 | for (i = 0; i < sband->n_bitrates; i++) { | ||
| 335 | rinfo[i].index = i; | ||
| 336 | rinfo[i].rev_index = i; | ||
| 337 | if (RC_PID_FAST_START) | ||
| 338 | rinfo[i].diff = 0; | ||
| 339 | else | ||
| 340 | rinfo[i].diff = i * pinfo->norm_offset; | ||
| 341 | } | ||
| 342 | for (i = 1; i < sband->n_bitrates; i++) { | ||
| 343 | s = 0; | ||
| 344 | for (j = 0; j < sband->n_bitrates - i; j++) | ||
| 345 | if (unlikely(sband->bitrates[rinfo[j].index].bitrate > | ||
| 346 | sband->bitrates[rinfo[j + 1].index].bitrate)) { | ||
| 347 | tmp = rinfo[j].index; | ||
| 348 | rinfo[j].index = rinfo[j + 1].index; | ||
| 349 | rinfo[j + 1].index = tmp; | ||
| 350 | rinfo[rinfo[j].index].rev_index = j; | ||
| 351 | rinfo[rinfo[j + 1].index].rev_index = j + 1; | ||
| 352 | s = 1; | ||
| 353 | } | ||
| 354 | if (!s) | ||
| 355 | break; | ||
| 356 | } | ||
| 357 | |||
| 327 | spinfo->txrate_idx = rate_lowest_index(sband, sta); | 358 | spinfo->txrate_idx = rate_lowest_index(sband, sta); |
| 328 | /* HACK */ | 359 | /* HACK */ |
| 329 | si = container_of(sta, struct sta_info, sta); | 360 | si = container_of(sta, struct sta_info, sta); |
| @@ -336,21 +367,22 @@ static void *rate_control_pid_alloc(struct ieee80211_hw *hw, | |||
| 336 | struct rc_pid_info *pinfo; | 367 | struct rc_pid_info *pinfo; |
| 337 | struct rc_pid_rateinfo *rinfo; | 368 | struct rc_pid_rateinfo *rinfo; |
| 338 | struct ieee80211_supported_band *sband; | 369 | struct ieee80211_supported_band *sband; |
| 339 | int i, j, tmp; | 370 | int i, max_rates = 0; |
| 340 | bool s; | ||
| 341 | #ifdef CONFIG_MAC80211_DEBUGFS | 371 | #ifdef CONFIG_MAC80211_DEBUGFS |
| 342 | struct rc_pid_debugfs_entries *de; | 372 | struct rc_pid_debugfs_entries *de; |
| 343 | #endif | 373 | #endif |
| 344 | 374 | ||
| 345 | sband = hw->wiphy->bands[hw->conf.channel->band]; | ||
| 346 | |||
| 347 | pinfo = kmalloc(sizeof(*pinfo), GFP_ATOMIC); | 375 | pinfo = kmalloc(sizeof(*pinfo), GFP_ATOMIC); |
| 348 | if (!pinfo) | 376 | if (!pinfo) |
| 349 | return NULL; | 377 | return NULL; |
| 350 | 378 | ||
| 351 | /* We can safely assume that sband won't change unless we get | 379 | for (i = 0; i < IEEE80211_NUM_BANDS; i++) { |
| 352 | * reinitialized. */ | 380 | sband = hw->wiphy->bands[i]; |
| 353 | rinfo = kmalloc(sizeof(*rinfo) * sband->n_bitrates, GFP_ATOMIC); | 381 | if (sband->n_bitrates > max_rates) |
| 382 | max_rates = sband->n_bitrates; | ||
| 383 | } | ||
| 384 | |||
| 385 | rinfo = kmalloc(sizeof(*rinfo) * max_rates, GFP_ATOMIC); | ||
| 354 | if (!rinfo) { | 386 | if (!rinfo) { |
| 355 | kfree(pinfo); | 387 | kfree(pinfo); |
| 356 | return NULL; | 388 | return NULL; |
| @@ -368,33 +400,6 @@ static void *rate_control_pid_alloc(struct ieee80211_hw *hw, | |||
| 368 | pinfo->rinfo = rinfo; | 400 | pinfo->rinfo = rinfo; |
| 369 | pinfo->oldrate = 0; | 401 | pinfo->oldrate = 0; |
| 370 | 402 | ||
| 371 | /* Sort the rates. This is optimized for the most common case (i.e. | ||
| 372 | * almost-sorted CCK+OFDM rates). Kind of bubble-sort with reversed | ||
| 373 | * mapping too. */ | ||
| 374 | for (i = 0; i < sband->n_bitrates; i++) { | ||
| 375 | rinfo[i].index = i; | ||
| 376 | rinfo[i].rev_index = i; | ||
| 377 | if (RC_PID_FAST_START) | ||
| 378 | rinfo[i].diff = 0; | ||
| 379 | else | ||
| 380 | rinfo[i].diff = i * pinfo->norm_offset; | ||
| 381 | } | ||
| 382 | for (i = 1; i < sband->n_bitrates; i++) { | ||
| 383 | s = 0; | ||
| 384 | for (j = 0; j < sband->n_bitrates - i; j++) | ||
| 385 | if (unlikely(sband->bitrates[rinfo[j].index].bitrate > | ||
| 386 | sband->bitrates[rinfo[j + 1].index].bitrate)) { | ||
| 387 | tmp = rinfo[j].index; | ||
| 388 | rinfo[j].index = rinfo[j + 1].index; | ||
| 389 | rinfo[j + 1].index = tmp; | ||
| 390 | rinfo[rinfo[j].index].rev_index = j; | ||
| 391 | rinfo[rinfo[j + 1].index].rev_index = j + 1; | ||
| 392 | s = 1; | ||
| 393 | } | ||
| 394 | if (!s) | ||
| 395 | break; | ||
| 396 | } | ||
| 397 | |||
| 398 | #ifdef CONFIG_MAC80211_DEBUGFS | 403 | #ifdef CONFIG_MAC80211_DEBUGFS |
| 399 | de = &pinfo->dentries; | 404 | de = &pinfo->dentries; |
| 400 | de->target = debugfs_create_u32("target_pf", S_IRUSR | S_IWUSR, | 405 | de->target = debugfs_create_u32("target_pf", S_IRUSR | S_IWUSR, |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 3fb04a86444d..63656266d567 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
| @@ -772,7 +772,7 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx) | |||
| 772 | hdrlen = ieee80211_hdrlen(hdr->frame_control); | 772 | hdrlen = ieee80211_hdrlen(hdr->frame_control); |
| 773 | 773 | ||
| 774 | /* internal error, why is TX_FRAGMENTED set? */ | 774 | /* internal error, why is TX_FRAGMENTED set? */ |
| 775 | if (WARN_ON(skb->len <= frag_threshold)) | 775 | if (WARN_ON(skb->len + FCS_LEN <= frag_threshold)) |
| 776 | return TX_DROP; | 776 | return TX_DROP; |
| 777 | 777 | ||
| 778 | /* | 778 | /* |
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 881203c4a142..cb3ad741ebf8 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
| @@ -837,6 +837,7 @@ config NETFILTER_XT_MATCH_SOCKET | |||
| 837 | depends on NETFILTER_TPROXY | 837 | depends on NETFILTER_TPROXY |
| 838 | depends on NETFILTER_XTABLES | 838 | depends on NETFILTER_XTABLES |
| 839 | depends on NETFILTER_ADVANCED | 839 | depends on NETFILTER_ADVANCED |
| 840 | depends on !NF_CONNTRACK || NF_CONNTRACK | ||
| 840 | select NF_DEFRAG_IPV4 | 841 | select NF_DEFRAG_IPV4 |
| 841 | help | 842 | help |
| 842 | This option adds a `socket' match, which can be used to match | 843 | This option adds a `socket' match, which can be used to match |
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 60aba45023ff..77bfdfeb966e 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c | |||
| @@ -260,7 +260,10 @@ struct ip_vs_conn *ip_vs_ct_in_get | |||
| 260 | list_for_each_entry(cp, &ip_vs_conn_tab[hash], c_list) { | 260 | list_for_each_entry(cp, &ip_vs_conn_tab[hash], c_list) { |
| 261 | if (cp->af == af && | 261 | if (cp->af == af && |
| 262 | ip_vs_addr_equal(af, s_addr, &cp->caddr) && | 262 | ip_vs_addr_equal(af, s_addr, &cp->caddr) && |
| 263 | ip_vs_addr_equal(af, d_addr, &cp->vaddr) && | 263 | /* protocol should only be IPPROTO_IP if |
| 264 | * d_addr is a fwmark */ | ||
| 265 | ip_vs_addr_equal(protocol == IPPROTO_IP ? AF_UNSPEC : af, | ||
| 266 | d_addr, &cp->vaddr) && | ||
| 264 | s_port == cp->cport && d_port == cp->vport && | 267 | s_port == cp->cport && d_port == cp->vport && |
| 265 | cp->flags & IP_VS_CONN_F_TEMPLATE && | 268 | cp->flags & IP_VS_CONN_F_TEMPLATE && |
| 266 | protocol == cp->protocol) { | 269 | protocol == cp->protocol) { |
| @@ -698,7 +701,9 @@ ip_vs_conn_new(int af, int proto, const union nf_inet_addr *caddr, __be16 cport, | |||
| 698 | cp->cport = cport; | 701 | cp->cport = cport; |
| 699 | ip_vs_addr_copy(af, &cp->vaddr, vaddr); | 702 | ip_vs_addr_copy(af, &cp->vaddr, vaddr); |
| 700 | cp->vport = vport; | 703 | cp->vport = vport; |
| 701 | ip_vs_addr_copy(af, &cp->daddr, daddr); | 704 | /* proto should only be IPPROTO_IP if d_addr is a fwmark */ |
| 705 | ip_vs_addr_copy(proto == IPPROTO_IP ? AF_UNSPEC : af, | ||
| 706 | &cp->daddr, daddr); | ||
| 702 | cp->dport = dport; | 707 | cp->dport = dport; |
| 703 | cp->flags = flags; | 708 | cp->flags = flags; |
| 704 | spin_lock_init(&cp->lock); | 709 | spin_lock_init(&cp->lock); |
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index cb3e031335eb..8dddb17a947a 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c | |||
| @@ -278,7 +278,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc, | |||
| 278 | */ | 278 | */ |
| 279 | if (svc->fwmark) { | 279 | if (svc->fwmark) { |
| 280 | union nf_inet_addr fwmark = { | 280 | union nf_inet_addr fwmark = { |
| 281 | .all = { 0, 0, 0, htonl(svc->fwmark) } | 281 | .ip = htonl(svc->fwmark) |
| 282 | }; | 282 | }; |
| 283 | 283 | ||
| 284 | ct = ip_vs_ct_in_get(svc->af, IPPROTO_IP, &snet, 0, | 284 | ct = ip_vs_ct_in_get(svc->af, IPPROTO_IP, &snet, 0, |
| @@ -306,7 +306,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc, | |||
| 306 | */ | 306 | */ |
| 307 | if (svc->fwmark) { | 307 | if (svc->fwmark) { |
| 308 | union nf_inet_addr fwmark = { | 308 | union nf_inet_addr fwmark = { |
| 309 | .all = { 0, 0, 0, htonl(svc->fwmark) } | 309 | .ip = htonl(svc->fwmark) |
| 310 | }; | 310 | }; |
| 311 | 311 | ||
| 312 | ct = ip_vs_conn_new(svc->af, IPPROTO_IP, | 312 | ct = ip_vs_conn_new(svc->af, IPPROTO_IP, |
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index f13fc57e1ecb..c523f0b8cee5 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
| @@ -1186,28 +1186,6 @@ ctnetlink_change_conntrack(struct nf_conn *ct, struct nlattr *cda[]) | |||
| 1186 | return 0; | 1186 | return 0; |
| 1187 | } | 1187 | } |
| 1188 | 1188 | ||
| 1189 | static inline void | ||
| 1190 | ctnetlink_event_report(struct nf_conn *ct, u32 pid, int report) | ||
| 1191 | { | ||
| 1192 | unsigned int events = 0; | ||
| 1193 | |||
| 1194 | if (test_bit(IPS_EXPECTED_BIT, &ct->status)) | ||
| 1195 | events |= IPCT_RELATED; | ||
| 1196 | else | ||
| 1197 | events |= IPCT_NEW; | ||
| 1198 | |||
| 1199 | nf_conntrack_event_report(IPCT_STATUS | | ||
| 1200 | IPCT_HELPER | | ||
| 1201 | IPCT_REFRESH | | ||
| 1202 | IPCT_PROTOINFO | | ||
| 1203 | IPCT_NATSEQADJ | | ||
| 1204 | IPCT_MARK | | ||
| 1205 | events, | ||
| 1206 | ct, | ||
| 1207 | pid, | ||
| 1208 | report); | ||
| 1209 | } | ||
| 1210 | |||
| 1211 | static struct nf_conn * | 1189 | static struct nf_conn * |
| 1212 | ctnetlink_create_conntrack(struct nlattr *cda[], | 1190 | ctnetlink_create_conntrack(struct nlattr *cda[], |
| 1213 | struct nf_conntrack_tuple *otuple, | 1191 | struct nf_conntrack_tuple *otuple, |
| @@ -1373,6 +1351,7 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb, | |||
| 1373 | err = -ENOENT; | 1351 | err = -ENOENT; |
| 1374 | if (nlh->nlmsg_flags & NLM_F_CREATE) { | 1352 | if (nlh->nlmsg_flags & NLM_F_CREATE) { |
| 1375 | struct nf_conn *ct; | 1353 | struct nf_conn *ct; |
| 1354 | enum ip_conntrack_events events; | ||
| 1376 | 1355 | ||
| 1377 | ct = ctnetlink_create_conntrack(cda, &otuple, | 1356 | ct = ctnetlink_create_conntrack(cda, &otuple, |
| 1378 | &rtuple, u3); | 1357 | &rtuple, u3); |
| @@ -1383,9 +1362,18 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb, | |||
| 1383 | err = 0; | 1362 | err = 0; |
| 1384 | nf_conntrack_get(&ct->ct_general); | 1363 | nf_conntrack_get(&ct->ct_general); |
| 1385 | spin_unlock_bh(&nf_conntrack_lock); | 1364 | spin_unlock_bh(&nf_conntrack_lock); |
| 1386 | ctnetlink_event_report(ct, | 1365 | if (test_bit(IPS_EXPECTED_BIT, &ct->status)) |
| 1387 | NETLINK_CB(skb).pid, | 1366 | events = IPCT_RELATED; |
| 1388 | nlmsg_report(nlh)); | 1367 | else |
| 1368 | events = IPCT_NEW; | ||
| 1369 | |||
| 1370 | nf_conntrack_event_report(IPCT_STATUS | | ||
| 1371 | IPCT_HELPER | | ||
| 1372 | IPCT_PROTOINFO | | ||
| 1373 | IPCT_NATSEQADJ | | ||
| 1374 | IPCT_MARK | events, | ||
| 1375 | ct, NETLINK_CB(skb).pid, | ||
| 1376 | nlmsg_report(nlh)); | ||
| 1389 | nf_ct_put(ct); | 1377 | nf_ct_put(ct); |
| 1390 | } else | 1378 | } else |
| 1391 | spin_unlock_bh(&nf_conntrack_lock); | 1379 | spin_unlock_bh(&nf_conntrack_lock); |
| @@ -1404,9 +1392,13 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb, | |||
| 1404 | if (err == 0) { | 1392 | if (err == 0) { |
| 1405 | nf_conntrack_get(&ct->ct_general); | 1393 | nf_conntrack_get(&ct->ct_general); |
| 1406 | spin_unlock_bh(&nf_conntrack_lock); | 1394 | spin_unlock_bh(&nf_conntrack_lock); |
| 1407 | ctnetlink_event_report(ct, | 1395 | nf_conntrack_event_report(IPCT_STATUS | |
| 1408 | NETLINK_CB(skb).pid, | 1396 | IPCT_HELPER | |
| 1409 | nlmsg_report(nlh)); | 1397 | IPCT_PROTOINFO | |
| 1398 | IPCT_NATSEQADJ | | ||
| 1399 | IPCT_MARK, | ||
| 1400 | ct, NETLINK_CB(skb).pid, | ||
| 1401 | nlmsg_report(nlh)); | ||
| 1410 | nf_ct_put(ct); | 1402 | nf_ct_put(ct); |
| 1411 | } else | 1403 | } else |
| 1412 | spin_unlock_bh(&nf_conntrack_lock); | 1404 | spin_unlock_bh(&nf_conntrack_lock); |
diff --git a/net/netfilter/xt_cluster.c b/net/netfilter/xt_cluster.c index 6c4847662b85..69a639f35403 100644 --- a/net/netfilter/xt_cluster.c +++ b/net/netfilter/xt_cluster.c | |||
| @@ -135,7 +135,13 @@ static bool xt_cluster_mt_checkentry(const struct xt_mtchk_param *par) | |||
| 135 | { | 135 | { |
| 136 | struct xt_cluster_match_info *info = par->matchinfo; | 136 | struct xt_cluster_match_info *info = par->matchinfo; |
| 137 | 137 | ||
| 138 | if (info->node_mask >= (1 << info->total_nodes)) { | 138 | if (info->total_nodes > XT_CLUSTER_NODES_MAX) { |
| 139 | printk(KERN_ERR "xt_cluster: you have exceeded the maximum " | ||
| 140 | "number of cluster nodes (%u > %u)\n", | ||
| 141 | info->total_nodes, XT_CLUSTER_NODES_MAX); | ||
| 142 | return false; | ||
| 143 | } | ||
| 144 | if (info->node_mask >= (1ULL << info->total_nodes)) { | ||
| 139 | printk(KERN_ERR "xt_cluster: this node mask cannot be " | 145 | printk(KERN_ERR "xt_cluster: this node mask cannot be " |
| 140 | "higher than the total number of nodes\n"); | 146 | "higher than the total number of nodes\n"); |
| 141 | return false; | 147 | return false; |
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 173fcc4b050d..0759f32e9dca 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
| @@ -254,7 +254,7 @@ replay: | |||
| 254 | } | 254 | } |
| 255 | tp->ops = tp_ops; | 255 | tp->ops = tp_ops; |
| 256 | tp->protocol = protocol; | 256 | tp->protocol = protocol; |
| 257 | tp->prio = nprio ? : tcf_auto_prio(*back); | 257 | tp->prio = nprio ? : TC_H_MAJ(tcf_auto_prio(*back)); |
| 258 | tp->q = q; | 258 | tp->q = q; |
| 259 | tp->classify = tp_ops->classify; | 259 | tp->classify = tp_ops->classify; |
| 260 | tp->classid = parent; | 260 | tp->classid = parent; |
diff --git a/net/sched/sch_fifo.c b/net/sched/sch_fifo.c index 92cfc9d7e3b9..69188e8358b4 100644 --- a/net/sched/sch_fifo.c +++ b/net/sched/sch_fifo.c | |||
| @@ -51,7 +51,7 @@ static int fifo_init(struct Qdisc *sch, struct nlattr *opt) | |||
| 51 | u32 limit = qdisc_dev(sch)->tx_queue_len ? : 1; | 51 | u32 limit = qdisc_dev(sch)->tx_queue_len ? : 1; |
| 52 | 52 | ||
| 53 | if (sch->ops == &bfifo_qdisc_ops) | 53 | if (sch->ops == &bfifo_qdisc_ops) |
| 54 | limit *= qdisc_dev(sch)->mtu; | 54 | limit *= psched_mtu(qdisc_dev(sch)); |
| 55 | 55 | ||
| 56 | q->limit = limit; | 56 | q->limit = limit; |
| 57 | } else { | 57 | } else { |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index 629a28764da9..42a6f9f20285 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |||
| @@ -265,7 +265,7 @@ static int fast_reg_read_chunks(struct svcxprt_rdma *xprt, | |||
| 265 | frmr->page_list->page_list[page_no] = | 265 | frmr->page_list->page_list[page_no] = |
| 266 | ib_dma_map_single(xprt->sc_cm_id->device, | 266 | ib_dma_map_single(xprt->sc_cm_id->device, |
| 267 | page_address(rqstp->rq_arg.pages[page_no]), | 267 | page_address(rqstp->rq_arg.pages[page_no]), |
| 268 | PAGE_SIZE, DMA_TO_DEVICE); | 268 | PAGE_SIZE, DMA_FROM_DEVICE); |
| 269 | if (ib_dma_mapping_error(xprt->sc_cm_id->device, | 269 | if (ib_dma_mapping_error(xprt->sc_cm_id->device, |
| 270 | frmr->page_list->page_list[page_no])) | 270 | frmr->page_list->page_list[page_no])) |
| 271 | goto fatal_err; | 271 | goto fatal_err; |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index 6c26a675435a..8b510c5e8777 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c | |||
| @@ -183,6 +183,7 @@ static int fast_reg_xdr(struct svcxprt_rdma *xprt, | |||
| 183 | 183 | ||
| 184 | fatal_err: | 184 | fatal_err: |
| 185 | printk("svcrdma: Error fast registering memory for xprt %p\n", xprt); | 185 | printk("svcrdma: Error fast registering memory for xprt %p\n", xprt); |
| 186 | vec->frmr = NULL; | ||
| 186 | svc_rdma_put_frmr(xprt, frmr); | 187 | svc_rdma_put_frmr(xprt, frmr); |
| 187 | return -EIO; | 188 | return -EIO; |
| 188 | } | 189 | } |
| @@ -516,6 +517,7 @@ static int send_reply(struct svcxprt_rdma *rdma, | |||
| 516 | "svcrdma: could not post a receive buffer, err=%d." | 517 | "svcrdma: could not post a receive buffer, err=%d." |
| 517 | "Closing transport %p.\n", ret, rdma); | 518 | "Closing transport %p.\n", ret, rdma); |
| 518 | set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags); | 519 | set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags); |
| 520 | svc_rdma_put_frmr(rdma, vec->frmr); | ||
| 519 | svc_rdma_put_context(ctxt, 0); | 521 | svc_rdma_put_context(ctxt, 0); |
| 520 | return -ENOTCONN; | 522 | return -ENOTCONN; |
| 521 | } | 523 | } |
| @@ -606,6 +608,7 @@ static int send_reply(struct svcxprt_rdma *rdma, | |||
| 606 | return 0; | 608 | return 0; |
| 607 | 609 | ||
| 608 | err: | 610 | err: |
| 611 | svc_rdma_unmap_dma(ctxt); | ||
| 609 | svc_rdma_put_frmr(rdma, vec->frmr); | 612 | svc_rdma_put_frmr(rdma, vec->frmr); |
| 610 | svc_rdma_put_context(ctxt, 1); | 613 | svc_rdma_put_context(ctxt, 1); |
| 611 | return -EIO; | 614 | return -EIO; |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 3d810e7df3fb..4b0c2fa15e0b 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
| @@ -520,8 +520,9 @@ int svc_rdma_post_recv(struct svcxprt_rdma *xprt) | |||
| 520 | svc_xprt_get(&xprt->sc_xprt); | 520 | svc_xprt_get(&xprt->sc_xprt); |
| 521 | ret = ib_post_recv(xprt->sc_qp, &recv_wr, &bad_recv_wr); | 521 | ret = ib_post_recv(xprt->sc_qp, &recv_wr, &bad_recv_wr); |
| 522 | if (ret) { | 522 | if (ret) { |
| 523 | svc_xprt_put(&xprt->sc_xprt); | 523 | svc_rdma_unmap_dma(ctxt); |
| 524 | svc_rdma_put_context(ctxt, 1); | 524 | svc_rdma_put_context(ctxt, 1); |
| 525 | svc_xprt_put(&xprt->sc_xprt); | ||
| 525 | } | 526 | } |
| 526 | return ret; | 527 | return ret; |
| 527 | 528 | ||
diff --git a/net/wimax/op-msg.c b/net/wimax/op-msg.c index 5d149c1b5f0d..9ad4d893a566 100644 --- a/net/wimax/op-msg.c +++ b/net/wimax/op-msg.c | |||
| @@ -149,7 +149,8 @@ struct sk_buff *wimax_msg_alloc(struct wimax_dev *wimax_dev, | |||
| 149 | } | 149 | } |
| 150 | result = nla_put(skb, WIMAX_GNL_MSG_DATA, size, msg); | 150 | result = nla_put(skb, WIMAX_GNL_MSG_DATA, size, msg); |
| 151 | if (result < 0) { | 151 | if (result < 0) { |
| 152 | dev_err(dev, "no memory to add payload in attribute\n"); | 152 | dev_err(dev, "no memory to add payload (msg %p size %zu) in " |
| 153 | "attribute: %d\n", msg, size, result); | ||
| 153 | goto error_nla_put; | 154 | goto error_nla_put; |
| 154 | } | 155 | } |
| 155 | genlmsg_end(skb, genl_msg); | 156 | genlmsg_end(skb, genl_msg); |
| @@ -299,10 +300,10 @@ int wimax_msg(struct wimax_dev *wimax_dev, const char *pipe_name, | |||
| 299 | struct sk_buff *skb; | 300 | struct sk_buff *skb; |
| 300 | 301 | ||
| 301 | skb = wimax_msg_alloc(wimax_dev, pipe_name, buf, size, gfp_flags); | 302 | skb = wimax_msg_alloc(wimax_dev, pipe_name, buf, size, gfp_flags); |
| 302 | if (skb == NULL) | 303 | if (IS_ERR(skb)) |
| 303 | goto error_msg_new; | 304 | result = PTR_ERR(skb); |
| 304 | result = wimax_msg_send(wimax_dev, skb); | 305 | else |
| 305 | error_msg_new: | 306 | result = wimax_msg_send(wimax_dev, skb); |
| 306 | return result; | 307 | return result; |
| 307 | } | 308 | } |
| 308 | EXPORT_SYMBOL_GPL(wimax_msg); | 309 | EXPORT_SYMBOL_GPL(wimax_msg); |
diff --git a/net/wimax/stack.c b/net/wimax/stack.c index a0ee76b52510..933e1422b09f 100644 --- a/net/wimax/stack.c +++ b/net/wimax/stack.c | |||
| @@ -338,8 +338,21 @@ out: | |||
| 338 | */ | 338 | */ |
| 339 | void wimax_state_change(struct wimax_dev *wimax_dev, enum wimax_st new_state) | 339 | void wimax_state_change(struct wimax_dev *wimax_dev, enum wimax_st new_state) |
| 340 | { | 340 | { |
| 341 | /* | ||
| 342 | * A driver cannot take the wimax_dev out of the | ||
| 343 | * __WIMAX_ST_NULL state unless by calling wimax_dev_add(). If | ||
| 344 | * the wimax_dev's state is still NULL, we ignore any request | ||
| 345 | * to change its state because it means it hasn't been yet | ||
| 346 | * registered. | ||
| 347 | * | ||
| 348 | * There is no need to complain about it, as routines that | ||
| 349 | * call this might be shared from different code paths that | ||
| 350 | * are called before or after wimax_dev_add() has done its | ||
| 351 | * job. | ||
| 352 | */ | ||
| 341 | mutex_lock(&wimax_dev->mutex); | 353 | mutex_lock(&wimax_dev->mutex); |
| 342 | __wimax_state_change(wimax_dev, new_state); | 354 | if (wimax_dev->state > __WIMAX_ST_NULL) |
| 355 | __wimax_state_change(wimax_dev, new_state); | ||
| 343 | mutex_unlock(&wimax_dev->mutex); | 356 | mutex_unlock(&wimax_dev->mutex); |
| 344 | return; | 357 | return; |
| 345 | } | 358 | } |
| @@ -376,7 +389,7 @@ EXPORT_SYMBOL_GPL(wimax_state_get); | |||
| 376 | void wimax_dev_init(struct wimax_dev *wimax_dev) | 389 | void wimax_dev_init(struct wimax_dev *wimax_dev) |
| 377 | { | 390 | { |
| 378 | INIT_LIST_HEAD(&wimax_dev->id_table_node); | 391 | INIT_LIST_HEAD(&wimax_dev->id_table_node); |
| 379 | __wimax_state_set(wimax_dev, WIMAX_ST_UNINITIALIZED); | 392 | __wimax_state_set(wimax_dev, __WIMAX_ST_NULL); |
| 380 | mutex_init(&wimax_dev->mutex); | 393 | mutex_init(&wimax_dev->mutex); |
| 381 | mutex_init(&wimax_dev->mutex_reset); | 394 | mutex_init(&wimax_dev->mutex_reset); |
| 382 | } | 395 | } |
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 6c1993d99902..08265ca15785 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
| @@ -907,6 +907,7 @@ EXPORT_SYMBOL(freq_reg_info); | |||
| 907 | int freq_reg_info(struct wiphy *wiphy, u32 center_freq, u32 *bandwidth, | 907 | int freq_reg_info(struct wiphy *wiphy, u32 center_freq, u32 *bandwidth, |
| 908 | const struct ieee80211_reg_rule **reg_rule) | 908 | const struct ieee80211_reg_rule **reg_rule) |
| 909 | { | 909 | { |
| 910 | assert_cfg80211_lock(); | ||
| 910 | return freq_reg_info_regd(wiphy, center_freq, | 911 | return freq_reg_info_regd(wiphy, center_freq, |
| 911 | bandwidth, reg_rule, NULL); | 912 | bandwidth, reg_rule, NULL); |
| 912 | } | 913 | } |
| @@ -1133,7 +1134,8 @@ static bool reg_is_world_roaming(struct wiphy *wiphy) | |||
| 1133 | if (is_world_regdom(cfg80211_regdomain->alpha2) || | 1134 | if (is_world_regdom(cfg80211_regdomain->alpha2) || |
| 1134 | (wiphy->regd && is_world_regdom(wiphy->regd->alpha2))) | 1135 | (wiphy->regd && is_world_regdom(wiphy->regd->alpha2))) |
| 1135 | return true; | 1136 | return true; |
| 1136 | if (last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && | 1137 | if (last_request && |
| 1138 | last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && | ||
| 1137 | wiphy->custom_regulatory) | 1139 | wiphy->custom_regulatory) |
| 1138 | return true; | 1140 | return true; |
| 1139 | return false; | 1141 | return false; |
| @@ -1142,6 +1144,12 @@ static bool reg_is_world_roaming(struct wiphy *wiphy) | |||
| 1142 | /* Reap the advantages of previously found beacons */ | 1144 | /* Reap the advantages of previously found beacons */ |
| 1143 | static void reg_process_beacons(struct wiphy *wiphy) | 1145 | static void reg_process_beacons(struct wiphy *wiphy) |
| 1144 | { | 1146 | { |
| 1147 | /* | ||
| 1148 | * Means we are just firing up cfg80211, so no beacons would | ||
| 1149 | * have been processed yet. | ||
| 1150 | */ | ||
| 1151 | if (!last_request) | ||
| 1152 | return; | ||
| 1145 | if (!reg_is_world_roaming(wiphy)) | 1153 | if (!reg_is_world_roaming(wiphy)) |
| 1146 | return; | 1154 | return; |
| 1147 | wiphy_update_beacon_reg(wiphy); | 1155 | wiphy_update_beacon_reg(wiphy); |
| @@ -1176,6 +1184,8 @@ static void handle_channel_custom(struct wiphy *wiphy, | |||
| 1176 | struct ieee80211_supported_band *sband; | 1184 | struct ieee80211_supported_band *sband; |
| 1177 | struct ieee80211_channel *chan; | 1185 | struct ieee80211_channel *chan; |
| 1178 | 1186 | ||
| 1187 | assert_cfg80211_lock(); | ||
| 1188 | |||
| 1179 | sband = wiphy->bands[band]; | 1189 | sband = wiphy->bands[band]; |
| 1180 | BUG_ON(chan_idx >= sband->n_channels); | 1190 | BUG_ON(chan_idx >= sband->n_channels); |
| 1181 | chan = &sband->channels[chan_idx]; | 1191 | chan = &sband->channels[chan_idx]; |
| @@ -1214,10 +1224,13 @@ void wiphy_apply_custom_regulatory(struct wiphy *wiphy, | |||
| 1214 | const struct ieee80211_regdomain *regd) | 1224 | const struct ieee80211_regdomain *regd) |
| 1215 | { | 1225 | { |
| 1216 | enum ieee80211_band band; | 1226 | enum ieee80211_band band; |
| 1227 | |||
| 1228 | mutex_lock(&cfg80211_mutex); | ||
| 1217 | for (band = 0; band < IEEE80211_NUM_BANDS; band++) { | 1229 | for (band = 0; band < IEEE80211_NUM_BANDS; band++) { |
| 1218 | if (wiphy->bands[band]) | 1230 | if (wiphy->bands[band]) |
| 1219 | handle_band_custom(wiphy, band, regd); | 1231 | handle_band_custom(wiphy, band, regd); |
| 1220 | } | 1232 | } |
| 1233 | mutex_unlock(&cfg80211_mutex); | ||
| 1221 | } | 1234 | } |
| 1222 | EXPORT_SYMBOL(wiphy_apply_custom_regulatory); | 1235 | EXPORT_SYMBOL(wiphy_apply_custom_regulatory); |
| 1223 | 1236 | ||
| @@ -1423,7 +1436,7 @@ new_request: | |||
| 1423 | return call_crda(last_request->alpha2); | 1436 | return call_crda(last_request->alpha2); |
| 1424 | } | 1437 | } |
| 1425 | 1438 | ||
| 1426 | /* This currently only processes user and driver regulatory hints */ | 1439 | /* This processes *all* regulatory hints */ |
| 1427 | static void reg_process_hint(struct regulatory_request *reg_request) | 1440 | static void reg_process_hint(struct regulatory_request *reg_request) |
| 1428 | { | 1441 | { |
| 1429 | int r = 0; | 1442 | int r = 0; |
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 2ae65b39b529..1f260c40b6ca 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
| @@ -395,6 +395,7 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev, | |||
| 395 | memcpy(ies, res->pub.information_elements, ielen); | 395 | memcpy(ies, res->pub.information_elements, ielen); |
| 396 | found->ies_allocated = true; | 396 | found->ies_allocated = true; |
| 397 | found->pub.information_elements = ies; | 397 | found->pub.information_elements = ies; |
| 398 | found->pub.len_information_elements = ielen; | ||
| 398 | } | 399 | } |
| 399 | } | 400 | } |
| 400 | } | 401 | } |
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 936b6f8e46ff..161b7846733e 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -384,11 +384,19 @@ static int parse_elf(struct elf_info *info, const char *filename) | |||
| 384 | return 0; | 384 | return 0; |
| 385 | } | 385 | } |
| 386 | /* Fix endianness in ELF header */ | 386 | /* Fix endianness in ELF header */ |
| 387 | hdr->e_shoff = TO_NATIVE(hdr->e_shoff); | 387 | hdr->e_type = TO_NATIVE(hdr->e_type); |
| 388 | hdr->e_shstrndx = TO_NATIVE(hdr->e_shstrndx); | 388 | hdr->e_machine = TO_NATIVE(hdr->e_machine); |
| 389 | hdr->e_shnum = TO_NATIVE(hdr->e_shnum); | 389 | hdr->e_version = TO_NATIVE(hdr->e_version); |
| 390 | hdr->e_machine = TO_NATIVE(hdr->e_machine); | 390 | hdr->e_entry = TO_NATIVE(hdr->e_entry); |
| 391 | hdr->e_type = TO_NATIVE(hdr->e_type); | 391 | hdr->e_phoff = TO_NATIVE(hdr->e_phoff); |
| 392 | hdr->e_shoff = TO_NATIVE(hdr->e_shoff); | ||
| 393 | hdr->e_flags = TO_NATIVE(hdr->e_flags); | ||
| 394 | hdr->e_ehsize = TO_NATIVE(hdr->e_ehsize); | ||
| 395 | hdr->e_phentsize = TO_NATIVE(hdr->e_phentsize); | ||
| 396 | hdr->e_phnum = TO_NATIVE(hdr->e_phnum); | ||
| 397 | hdr->e_shentsize = TO_NATIVE(hdr->e_shentsize); | ||
| 398 | hdr->e_shnum = TO_NATIVE(hdr->e_shnum); | ||
| 399 | hdr->e_shstrndx = TO_NATIVE(hdr->e_shstrndx); | ||
| 392 | sechdrs = (void *)hdr + hdr->e_shoff; | 400 | sechdrs = (void *)hdr + hdr->e_shoff; |
| 393 | info->sechdrs = sechdrs; | 401 | info->sechdrs = sechdrs; |
| 394 | 402 | ||
| @@ -402,13 +410,16 @@ static int parse_elf(struct elf_info *info, const char *filename) | |||
| 402 | 410 | ||
| 403 | /* Fix endianness in section headers */ | 411 | /* Fix endianness in section headers */ |
| 404 | for (i = 0; i < hdr->e_shnum; i++) { | 412 | for (i = 0; i < hdr->e_shnum; i++) { |
| 405 | sechdrs[i].sh_type = TO_NATIVE(sechdrs[i].sh_type); | 413 | sechdrs[i].sh_name = TO_NATIVE(sechdrs[i].sh_name); |
| 406 | sechdrs[i].sh_offset = TO_NATIVE(sechdrs[i].sh_offset); | 414 | sechdrs[i].sh_type = TO_NATIVE(sechdrs[i].sh_type); |
| 407 | sechdrs[i].sh_size = TO_NATIVE(sechdrs[i].sh_size); | 415 | sechdrs[i].sh_flags = TO_NATIVE(sechdrs[i].sh_flags); |
| 408 | sechdrs[i].sh_link = TO_NATIVE(sechdrs[i].sh_link); | 416 | sechdrs[i].sh_addr = TO_NATIVE(sechdrs[i].sh_addr); |
| 409 | sechdrs[i].sh_name = TO_NATIVE(sechdrs[i].sh_name); | 417 | sechdrs[i].sh_offset = TO_NATIVE(sechdrs[i].sh_offset); |
| 410 | sechdrs[i].sh_info = TO_NATIVE(sechdrs[i].sh_info); | 418 | sechdrs[i].sh_size = TO_NATIVE(sechdrs[i].sh_size); |
| 411 | sechdrs[i].sh_addr = TO_NATIVE(sechdrs[i].sh_addr); | 419 | sechdrs[i].sh_link = TO_NATIVE(sechdrs[i].sh_link); |
| 420 | sechdrs[i].sh_info = TO_NATIVE(sechdrs[i].sh_info); | ||
| 421 | sechdrs[i].sh_addralign = TO_NATIVE(sechdrs[i].sh_addralign); | ||
| 422 | sechdrs[i].sh_entsize = TO_NATIVE(sechdrs[i].sh_entsize); | ||
| 412 | } | 423 | } |
| 413 | /* Find symbol table. */ | 424 | /* Find symbol table. */ |
| 414 | for (i = 1; i < hdr->e_shnum; i++) { | 425 | for (i = 1; i < hdr->e_shnum; i++) { |
| @@ -716,7 +727,17 @@ int match(const char *sym, const char * const pat[]) | |||
| 716 | 727 | ||
| 717 | /* sections that we do not want to do full section mismatch check on */ | 728 | /* sections that we do not want to do full section mismatch check on */ |
| 718 | static const char *section_white_list[] = | 729 | static const char *section_white_list[] = |
| 719 | { ".comment", ".debug*", ".stab*", ".note*", ".got*", ".toc*", NULL }; | 730 | { |
| 731 | ".comment*", | ||
| 732 | ".debug*", | ||
| 733 | ".mdebug*", /* alpha, score, mips etc. */ | ||
| 734 | ".pdr", /* alpha, score, mips etc. */ | ||
| 735 | ".stab*", | ||
| 736 | ".note*", | ||
| 737 | ".got*", | ||
| 738 | ".toc*", | ||
| 739 | NULL | ||
| 740 | }; | ||
| 720 | 741 | ||
| 721 | /* | 742 | /* |
| 722 | * This is used to find sections missing the SHF_ALLOC flag. | 743 | * This is used to find sections missing the SHF_ALLOC flag. |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ba808ef6babb..2fcad7c33eaf 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -3153,7 +3153,7 @@ static int selinux_file_send_sigiotask(struct task_struct *tsk, | |||
| 3153 | struct fown_struct *fown, int signum) | 3153 | struct fown_struct *fown, int signum) |
| 3154 | { | 3154 | { |
| 3155 | struct file *file; | 3155 | struct file *file; |
| 3156 | u32 sid = current_sid(); | 3156 | u32 sid = task_sid(tsk); |
| 3157 | u32 perm; | 3157 | u32 perm; |
| 3158 | struct file_security_struct *fsec; | 3158 | struct file_security_struct *fsec; |
| 3159 | 3159 | ||
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index d4d41b3efc7c..ddfb9cccf468 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c | |||
| @@ -1720,14 +1720,14 @@ static bool tomoyo_policy_loader_exists(void) | |||
| 1720 | * policies are not loaded yet. | 1720 | * policies are not loaded yet. |
| 1721 | * Thus, let do_execve() call this function everytime. | 1721 | * Thus, let do_execve() call this function everytime. |
| 1722 | */ | 1722 | */ |
| 1723 | struct nameidata nd; | 1723 | struct path path; |
| 1724 | 1724 | ||
| 1725 | if (path_lookup(tomoyo_loader, LOOKUP_FOLLOW, &nd)) { | 1725 | if (kern_path(tomoyo_loader, LOOKUP_FOLLOW, &path)) { |
| 1726 | printk(KERN_INFO "Not activating Mandatory Access Control now " | 1726 | printk(KERN_INFO "Not activating Mandatory Access Control now " |
| 1727 | "since %s doesn't exist.\n", tomoyo_loader); | 1727 | "since %s doesn't exist.\n", tomoyo_loader); |
| 1728 | return false; | 1728 | return false; |
| 1729 | } | 1729 | } |
| 1730 | path_put(&nd.path); | 1730 | path_put(&path); |
| 1731 | return true; | 1731 | return true; |
| 1732 | } | 1732 | } |
| 1733 | 1733 | ||
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index bf8e2b451687..40927a84cb6e 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c | |||
| @@ -165,11 +165,11 @@ char *tomoyo_realpath_from_path(struct path *path) | |||
| 165 | */ | 165 | */ |
| 166 | char *tomoyo_realpath(const char *pathname) | 166 | char *tomoyo_realpath(const char *pathname) |
| 167 | { | 167 | { |
| 168 | struct nameidata nd; | 168 | struct path path; |
| 169 | 169 | ||
| 170 | if (pathname && path_lookup(pathname, LOOKUP_FOLLOW, &nd) == 0) { | 170 | if (pathname && kern_path(pathname, LOOKUP_FOLLOW, &path) == 0) { |
| 171 | char *buf = tomoyo_realpath_from_path(&nd.path); | 171 | char *buf = tomoyo_realpath_from_path(&path); |
| 172 | path_put(&nd.path); | 172 | path_put(&path); |
| 173 | return buf; | 173 | return buf; |
| 174 | } | 174 | } |
| 175 | return NULL; | 175 | return NULL; |
| @@ -184,11 +184,11 @@ char *tomoyo_realpath(const char *pathname) | |||
| 184 | */ | 184 | */ |
| 185 | char *tomoyo_realpath_nofollow(const char *pathname) | 185 | char *tomoyo_realpath_nofollow(const char *pathname) |
| 186 | { | 186 | { |
| 187 | struct nameidata nd; | 187 | struct path path; |
| 188 | 188 | ||
| 189 | if (pathname && path_lookup(pathname, 0, &nd) == 0) { | 189 | if (pathname && kern_path(pathname, 0, &path) == 0) { |
| 190 | char *buf = tomoyo_realpath_from_path(&nd.path); | 190 | char *buf = tomoyo_realpath_from_path(&path); |
| 191 | path_put(&nd.path); | 191 | path_put(&path); |
| 192 | return buf; | 192 | return buf; |
| 193 | } | 193 | } |
| 194 | return NULL; | 194 | return NULL; |
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 63d088f2265f..a2a792c18c40 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c | |||
| @@ -249,6 +249,12 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) | |||
| 249 | new_hw_ptr = hw_base + pos; | 249 | new_hw_ptr = hw_base + pos; |
| 250 | } | 250 | } |
| 251 | } | 251 | } |
| 252 | /* Skip the jiffies check for hardwares with BATCH flag. | ||
| 253 | * Such hardware usually just increases the position at each IRQ, | ||
| 254 | * thus it can't give any strange position. | ||
| 255 | */ | ||
| 256 | if (runtime->hw.info & SNDRV_PCM_INFO_BATCH) | ||
| 257 | goto no_jiffies_check; | ||
| 252 | hdelta = new_hw_ptr - old_hw_ptr; | 258 | hdelta = new_hw_ptr - old_hw_ptr; |
| 253 | jdelta = jiffies - runtime->hw_ptr_jiffies; | 259 | jdelta = jiffies - runtime->hw_ptr_jiffies; |
| 254 | if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) { | 260 | if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) { |
| @@ -272,6 +278,7 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) | |||
| 272 | hw_base -= hw_base % runtime->buffer_size; | 278 | hw_base -= hw_base % runtime->buffer_size; |
| 273 | delta = 0; | 279 | delta = 0; |
| 274 | } | 280 | } |
| 281 | no_jiffies_check: | ||
| 275 | if (delta > runtime->period_size + runtime->period_size / 2) { | 282 | if (delta > runtime->period_size + runtime->period_size / 2) { |
| 276 | hw_ptr_error(substream, | 283 | hw_ptr_error(substream, |
| 277 | "Lost interrupts? " | 284 | "Lost interrupts? " |
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index b2b6d50c9425..a25fb7b1f441 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c | |||
| @@ -963,16 +963,11 @@ static int __devinit snd_serial_probe(struct platform_device *devptr) | |||
| 963 | if (err < 0) | 963 | if (err < 0) |
| 964 | goto _err; | 964 | goto _err; |
| 965 | 965 | ||
| 966 | sprintf(card->longname, "%s at 0x%lx, irq %d speed %d div %d outs %d ins %d adaptor %s droponfull %d", | 966 | sprintf(card->longname, "%s [%s] at %#lx, irq %d", |
| 967 | card->shortname, | 967 | card->shortname, |
| 968 | uart->base, | ||
| 969 | uart->irq, | ||
| 970 | uart->speed, | ||
| 971 | (int)uart->divisor, | ||
| 972 | outs[dev], | ||
| 973 | ins[dev], | ||
| 974 | adaptor_names[uart->adaptor], | 968 | adaptor_names[uart->adaptor], |
| 975 | uart->drop_on_full); | 969 | uart->base, |
| 970 | uart->irq); | ||
| 976 | 971 | ||
| 977 | snd_card_set_dev(card, &devptr->dev); | 972 | snd_card_set_dev(card, &devptr->dev); |
| 978 | 973 | ||
diff --git a/sound/isa/msnd/msnd.c b/sound/isa/msnd/msnd.c index 906454413ed2..3a1526ae1729 100644 --- a/sound/isa/msnd/msnd.c +++ b/sound/isa/msnd/msnd.c | |||
| @@ -438,7 +438,8 @@ static void snd_msnd_capture_reset_queue(struct snd_msnd *chip, | |||
| 438 | static struct snd_pcm_hardware snd_msnd_playback = { | 438 | static struct snd_pcm_hardware snd_msnd_playback = { |
| 439 | .info = SNDRV_PCM_INFO_MMAP | | 439 | .info = SNDRV_PCM_INFO_MMAP | |
| 440 | SNDRV_PCM_INFO_INTERLEAVED | | 440 | SNDRV_PCM_INFO_INTERLEAVED | |
| 441 | SNDRV_PCM_INFO_MMAP_VALID, | 441 | SNDRV_PCM_INFO_MMAP_VALID | |
| 442 | SNDRV_PCM_INFO_BATCH, | ||
| 442 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, | 443 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, |
| 443 | .rates = SNDRV_PCM_RATE_8000_48000, | 444 | .rates = SNDRV_PCM_RATE_8000_48000, |
| 444 | .rate_min = 8000, | 445 | .rate_min = 8000, |
| @@ -456,7 +457,8 @@ static struct snd_pcm_hardware snd_msnd_playback = { | |||
| 456 | static struct snd_pcm_hardware snd_msnd_capture = { | 457 | static struct snd_pcm_hardware snd_msnd_capture = { |
| 457 | .info = SNDRV_PCM_INFO_MMAP | | 458 | .info = SNDRV_PCM_INFO_MMAP | |
| 458 | SNDRV_PCM_INFO_INTERLEAVED | | 459 | SNDRV_PCM_INFO_INTERLEAVED | |
| 459 | SNDRV_PCM_INFO_MMAP_VALID, | 460 | SNDRV_PCM_INFO_MMAP_VALID | |
| 461 | SNDRV_PCM_INFO_BATCH, | ||
| 460 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, | 462 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, |
| 461 | .rates = SNDRV_PCM_RATE_8000_48000, | 463 | .rates = SNDRV_PCM_RATE_8000_48000, |
| 462 | .rate_min = 8000, | 464 | .rate_min = 8000, |
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index a299340519df..ce3f2e90f4d7 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
| @@ -349,7 +349,8 @@ static struct snd_pcm_hardware snd_bt87x_digital_hw = { | |||
| 349 | .info = SNDRV_PCM_INFO_MMAP | | 349 | .info = SNDRV_PCM_INFO_MMAP | |
| 350 | SNDRV_PCM_INFO_INTERLEAVED | | 350 | SNDRV_PCM_INFO_INTERLEAVED | |
| 351 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 351 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
| 352 | SNDRV_PCM_INFO_MMAP_VALID, | 352 | SNDRV_PCM_INFO_MMAP_VALID | |
| 353 | SNDRV_PCM_INFO_BATCH, | ||
| 353 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 354 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
| 354 | .rates = 0, /* set at runtime */ | 355 | .rates = 0, /* set at runtime */ |
| 355 | .channels_min = 2, | 356 | .channels_min = 2, |
| @@ -365,7 +366,8 @@ static struct snd_pcm_hardware snd_bt87x_analog_hw = { | |||
| 365 | .info = SNDRV_PCM_INFO_MMAP | | 366 | .info = SNDRV_PCM_INFO_MMAP | |
| 366 | SNDRV_PCM_INFO_INTERLEAVED | | 367 | SNDRV_PCM_INFO_INTERLEAVED | |
| 367 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 368 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
| 368 | SNDRV_PCM_INFO_MMAP_VALID, | 369 | SNDRV_PCM_INFO_MMAP_VALID | |
| 370 | SNDRV_PCM_INFO_BATCH, | ||
| 369 | .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8, | 371 | .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8, |
| 370 | .rates = SNDRV_PCM_RATE_KNOT, | 372 | .rates = SNDRV_PCM_RATE_KNOT, |
| 371 | .rate_min = ANALOG_CLOCK / CLOCK_DIV_MAX, | 373 | .rate_min = ANALOG_CLOCK / CLOCK_DIV_MAX, |
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c index 3482ef69f491..2e44316530a2 100644 --- a/sound/pci/echoaudio/indigodjx.c +++ b/sound/pci/echoaudio/indigodjx.c | |||
| @@ -88,6 +88,7 @@ static struct snd_pcm_hardware pcm_hardware_skel = { | |||
| 88 | .rates = SNDRV_PCM_RATE_32000 | | 88 | .rates = SNDRV_PCM_RATE_32000 | |
| 89 | SNDRV_PCM_RATE_44100 | | 89 | SNDRV_PCM_RATE_44100 | |
| 90 | SNDRV_PCM_RATE_48000 | | 90 | SNDRV_PCM_RATE_48000 | |
| 91 | SNDRV_PCM_RATE_64000 | | ||
| 91 | SNDRV_PCM_RATE_88200 | | 92 | SNDRV_PCM_RATE_88200 | |
| 92 | SNDRV_PCM_RATE_96000, | 93 | SNDRV_PCM_RATE_96000, |
| 93 | .rate_min = 32000, | 94 | .rate_min = 32000, |
diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c index aebee27a40ff..eb3819f9654a 100644 --- a/sound/pci/echoaudio/indigoiox.c +++ b/sound/pci/echoaudio/indigoiox.c | |||
| @@ -89,6 +89,7 @@ static struct snd_pcm_hardware pcm_hardware_skel = { | |||
| 89 | .rates = SNDRV_PCM_RATE_32000 | | 89 | .rates = SNDRV_PCM_RATE_32000 | |
| 90 | SNDRV_PCM_RATE_44100 | | 90 | SNDRV_PCM_RATE_44100 | |
| 91 | SNDRV_PCM_RATE_48000 | | 91 | SNDRV_PCM_RATE_48000 | |
| 92 | SNDRV_PCM_RATE_64000 | | ||
| 92 | SNDRV_PCM_RATE_88200 | | 93 | SNDRV_PCM_RATE_88200 | |
| 93 | SNDRV_PCM_RATE_96000, | 94 | SNDRV_PCM_RATE_96000, |
| 94 | .rate_min = 32000, | 95 | .rate_min = 32000, |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 917bc5d3ac2c..03b3646018a1 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -4079,7 +4079,12 @@ static int stac92xx_init(struct hda_codec *codec) | |||
| 4079 | pinctl = snd_hda_codec_read(codec, nid, 0, | 4079 | pinctl = snd_hda_codec_read(codec, nid, 0, |
| 4080 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | 4080 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); |
| 4081 | /* if PINCTL already set then skip */ | 4081 | /* if PINCTL already set then skip */ |
| 4082 | if (!(pinctl & AC_PINCTL_IN_EN)) { | 4082 | /* Also, if both INPUT and OUTPUT are set, |
| 4083 | * it must be a BIOS bug; need to override, too | ||
| 4084 | */ | ||
| 4085 | if (!(pinctl & AC_PINCTL_IN_EN) || | ||
| 4086 | (pinctl & AC_PINCTL_OUT_EN)) { | ||
| 4087 | pinctl &= ~AC_PINCTL_OUT_EN; | ||
| 4083 | pinctl |= AC_PINCTL_IN_EN; | 4088 | pinctl |= AC_PINCTL_IN_EN; |
| 4084 | stac92xx_auto_set_pinctl(codec, nid, | 4089 | stac92xx_auto_set_pinctl(codec, nid, |
| 4085 | pinctl); | 4090 | pinctl); |
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 8b79969034be..7cc38a11e997 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c | |||
| @@ -1238,7 +1238,8 @@ static struct snd_pcm_hardware snd_korg1212_playback_info = | |||
| 1238 | { | 1238 | { |
| 1239 | .info = (SNDRV_PCM_INFO_MMAP | | 1239 | .info = (SNDRV_PCM_INFO_MMAP | |
| 1240 | SNDRV_PCM_INFO_MMAP_VALID | | 1240 | SNDRV_PCM_INFO_MMAP_VALID | |
| 1241 | SNDRV_PCM_INFO_INTERLEAVED), | 1241 | SNDRV_PCM_INFO_INTERLEAVED | |
| 1242 | SNDRV_PCM_INFO_BATCH), | ||
| 1242 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 1243 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
| 1243 | .rates = (SNDRV_PCM_RATE_44100 | | 1244 | .rates = (SNDRV_PCM_RATE_44100 | |
| 1244 | SNDRV_PCM_RATE_48000), | 1245 | SNDRV_PCM_RATE_48000), |
| @@ -1258,7 +1259,8 @@ static struct snd_pcm_hardware snd_korg1212_capture_info = | |||
| 1258 | { | 1259 | { |
| 1259 | .info = (SNDRV_PCM_INFO_MMAP | | 1260 | .info = (SNDRV_PCM_INFO_MMAP | |
| 1260 | SNDRV_PCM_INFO_MMAP_VALID | | 1261 | SNDRV_PCM_INFO_MMAP_VALID | |
| 1261 | SNDRV_PCM_INFO_INTERLEAVED), | 1262 | SNDRV_PCM_INFO_INTERLEAVED | |
| 1263 | SNDRV_PCM_INFO_BATCH), | ||
| 1262 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 1264 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
| 1263 | .rates = (SNDRV_PCM_RATE_44100 | | 1265 | .rates = (SNDRV_PCM_RATE_44100 | |
| 1264 | SNDRV_PCM_RATE_48000), | 1266 | SNDRV_PCM_RATE_48000), |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 809b233dd4a3..1ef58c51c213 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
| @@ -1687,7 +1687,7 @@ static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol, | |||
| 1687 | return change; | 1687 | return change; |
| 1688 | } | 1688 | } |
| 1689 | 1689 | ||
| 1690 | static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -9450, 150, 1); | 1690 | static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -4650, 150, 1); |
| 1691 | 1691 | ||
| 1692 | static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = { | 1692 | static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = { |
| 1693 | .name = "PCM Playback Volume", | 1693 | .name = "PCM Playback Volume", |
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c index 01066c95580e..d057e6489643 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | |||
| @@ -240,7 +240,8 @@ static int pdacf_pcm_prepare(struct snd_pcm_substream *subs) | |||
| 240 | static struct snd_pcm_hardware pdacf_pcm_capture_hw = { | 240 | static struct snd_pcm_hardware pdacf_pcm_capture_hw = { |
| 241 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 241 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | |
| 242 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME | | 242 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME | |
| 243 | SNDRV_PCM_INFO_MMAP_VALID), | 243 | SNDRV_PCM_INFO_MMAP_VALID | |
| 244 | SNDRV_PCM_INFO_BATCH), | ||
| 244 | .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | | 245 | .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | |
| 245 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE | | 246 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE | |
| 246 | SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE, | 247 | SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE, |
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 30490a259148..594c6c5b7838 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c | |||
| @@ -82,7 +82,7 @@ static struct au1xpsc_audio_dmadata *au1xpsc_audio_pcmdma[2]; | |||
| 82 | /* PCM hardware DMA capabilities - platform specific */ | 82 | /* PCM hardware DMA capabilities - platform specific */ |
| 83 | static const struct snd_pcm_hardware au1xpsc_pcm_hardware = { | 83 | static const struct snd_pcm_hardware au1xpsc_pcm_hardware = { |
| 84 | .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | | 84 | .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | |
| 85 | SNDRV_PCM_INFO_INTERLEAVED, | 85 | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BATCH, |
| 86 | .formats = AU1XPSC_PCM_FMTS, | 86 | .formats = AU1XPSC_PCM_FMTS, |
| 87 | .period_bytes_min = AU1XPSC_PERIOD_MIN_BYTES, | 87 | .period_bytes_min = AU1XPSC_PERIOD_MIN_BYTES, |
| 88 | .period_bytes_max = 4096 * 1024 - 1, | 88 | .period_bytes_max = 4096 * 1024 - 1, |
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 921b205de28a..df7c8c281d2f 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
| @@ -836,6 +836,12 @@ static DECLARE_TLV_DB_SCALE(analog_tlv, -2400, 200, 0); | |||
| 836 | static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1); | 836 | static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1); |
| 837 | 837 | ||
| 838 | /* | 838 | /* |
| 839 | * Gain control for earpiece amplifier | ||
| 840 | * 0 dB to 12 dB in 6 dB steps (mute instead of -6) | ||
| 841 | */ | ||
| 842 | static DECLARE_TLV_DB_SCALE(output_ear_tvl, -600, 600, 1); | ||
| 843 | |||
| 844 | /* | ||
| 839 | * Capture gain after the ADCs | 845 | * Capture gain after the ADCs |
| 840 | * from 0 dB to 31 dB in 1 dB steps | 846 | * from 0 dB to 31 dB in 1 dB steps |
| 841 | */ | 847 | */ |
| @@ -900,7 +906,7 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = { | |||
| 900 | 4, 3, 0, output_tvl), | 906 | 4, 3, 0, output_tvl), |
| 901 | 907 | ||
| 902 | SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume", | 908 | SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume", |
| 903 | TWL4030_REG_EAR_CTL, 4, 3, 0, output_tvl), | 909 | TWL4030_REG_EAR_CTL, 4, 3, 0, output_ear_tvl), |
| 904 | 910 | ||
| 905 | /* Common capture gain controls */ | 911 | /* Common capture gain controls */ |
| 906 | SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume", | 912 | SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume", |
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 3b1d0993bed9..0275321ff8ab 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
| @@ -968,7 +968,7 @@ static int wm8350_pcm_trigger(struct snd_pcm_substream *substream, | |||
| 968 | * required for LRC in master mode. The DACs or ADCs need a | 968 | * required for LRC in master mode. The DACs or ADCs need a |
| 969 | * valid audio path i.e. pin -> ADC or DAC -> pin before | 969 | * valid audio path i.e. pin -> ADC or DAC -> pin before |
| 970 | * the LRC will be enabled in master mode. */ | 970 | * the LRC will be enabled in master mode. */ |
| 971 | if (!master && cmd != SNDRV_PCM_TRIGGER_START) | 971 | if (!master || cmd != SNDRV_PCM_TRIGGER_START) |
| 972 | return 0; | 972 | return 0; |
| 973 | 973 | ||
| 974 | if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { | 974 | if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { |
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index c518c3e5aa3f..40cd274eb1ef 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
| @@ -729,7 +729,7 @@ SND_SOC_DAPM_MIXER_E("INMIXL", WM8990_INTDRIVBITS, WM8990_INMIXL_PWR_BIT, 0, | |||
| 729 | inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), | 729 | inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), |
| 730 | 730 | ||
| 731 | /* AINLMUX */ | 731 | /* AINLMUX */ |
| 732 | SND_SOC_DAPM_MUX_E("AILNMUX", WM8990_INTDRIVBITS, WM8990_AINLMUX_PWR_BIT, 0, | 732 | SND_SOC_DAPM_MUX_E("AINLMUX", WM8990_INTDRIVBITS, WM8990_AINLMUX_PWR_BIT, 0, |
| 733 | &wm8990_dapm_ainlmux_controls, inmixer_event, | 733 | &wm8990_dapm_ainlmux_controls, inmixer_event, |
| 734 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), | 734 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), |
| 735 | 735 | ||
| @@ -740,7 +740,7 @@ SND_SOC_DAPM_MIXER_E("INMIXR", WM8990_INTDRIVBITS, WM8990_INMIXR_PWR_BIT, 0, | |||
| 740 | inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), | 740 | inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), |
| 741 | 741 | ||
| 742 | /* AINRMUX */ | 742 | /* AINRMUX */ |
| 743 | SND_SOC_DAPM_MUX_E("AIRNMUX", WM8990_INTDRIVBITS, WM8990_AINRMUX_PWR_BIT, 0, | 743 | SND_SOC_DAPM_MUX_E("AINRMUX", WM8990_INTDRIVBITS, WM8990_AINRMUX_PWR_BIT, 0, |
| 744 | &wm8990_dapm_ainrmux_controls, inmixer_event, | 744 | &wm8990_dapm_ainrmux_controls, inmixer_event, |
| 745 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), | 745 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), |
| 746 | 746 | ||
| @@ -848,40 +848,40 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
| 848 | {"LIN12 PGA", "LIN2 Switch", "LIN2"}, | 848 | {"LIN12 PGA", "LIN2 Switch", "LIN2"}, |
| 849 | /* LIN34 PGA */ | 849 | /* LIN34 PGA */ |
| 850 | {"LIN34 PGA", "LIN3 Switch", "LIN3"}, | 850 | {"LIN34 PGA", "LIN3 Switch", "LIN3"}, |
| 851 | {"LIN34 PGA", "LIN4 Switch", "LIN4"}, | 851 | {"LIN34 PGA", "LIN4 Switch", "LIN4/RXN"}, |
| 852 | /* INMIXL */ | 852 | /* INMIXL */ |
| 853 | {"INMIXL", "Record Left Volume", "LOMIX"}, | 853 | {"INMIXL", "Record Left Volume", "LOMIX"}, |
| 854 | {"INMIXL", "LIN2 Volume", "LIN2"}, | 854 | {"INMIXL", "LIN2 Volume", "LIN2"}, |
| 855 | {"INMIXL", "LINPGA12 Switch", "LIN12 PGA"}, | 855 | {"INMIXL", "LINPGA12 Switch", "LIN12 PGA"}, |
| 856 | {"INMIXL", "LINPGA34 Switch", "LIN34 PGA"}, | 856 | {"INMIXL", "LINPGA34 Switch", "LIN34 PGA"}, |
| 857 | /* AILNMUX */ | 857 | /* AINLMUX */ |
| 858 | {"AILNMUX", "INMIXL Mix", "INMIXL"}, | 858 | {"AINLMUX", "INMIXL Mix", "INMIXL"}, |
| 859 | {"AILNMUX", "DIFFINL Mix", "LIN12PGA"}, | 859 | {"AINLMUX", "DIFFINL Mix", "LIN12 PGA"}, |
| 860 | {"AILNMUX", "DIFFINL Mix", "LIN34PGA"}, | 860 | {"AINLMUX", "DIFFINL Mix", "LIN34 PGA"}, |
| 861 | {"AILNMUX", "RXVOICE Mix", "LIN4/RXN"}, | 861 | {"AINLMUX", "RXVOICE Mix", "LIN4/RXN"}, |
| 862 | {"AILNMUX", "RXVOICE Mix", "RIN4/RXP"}, | 862 | {"AINLMUX", "RXVOICE Mix", "RIN4/RXP"}, |
| 863 | /* ADC */ | 863 | /* ADC */ |
| 864 | {"Left ADC", NULL, "AILNMUX"}, | 864 | {"Left ADC", NULL, "AINLMUX"}, |
| 865 | 865 | ||
| 866 | /* RIN12 PGA */ | 866 | /* RIN12 PGA */ |
| 867 | {"RIN12 PGA", "RIN1 Switch", "RIN1"}, | 867 | {"RIN12 PGA", "RIN1 Switch", "RIN1"}, |
| 868 | {"RIN12 PGA", "RIN2 Switch", "RIN2"}, | 868 | {"RIN12 PGA", "RIN2 Switch", "RIN2"}, |
| 869 | /* RIN34 PGA */ | 869 | /* RIN34 PGA */ |
| 870 | {"RIN34 PGA", "RIN3 Switch", "RIN3"}, | 870 | {"RIN34 PGA", "RIN3 Switch", "RIN3"}, |
| 871 | {"RIN34 PGA", "RIN4 Switch", "RIN4"}, | 871 | {"RIN34 PGA", "RIN4 Switch", "RIN4/RXP"}, |
| 872 | /* INMIXL */ | 872 | /* INMIXL */ |
| 873 | {"INMIXR", "Record Right Volume", "ROMIX"}, | 873 | {"INMIXR", "Record Right Volume", "ROMIX"}, |
| 874 | {"INMIXR", "RIN2 Volume", "RIN2"}, | 874 | {"INMIXR", "RIN2 Volume", "RIN2"}, |
| 875 | {"INMIXR", "RINPGA12 Switch", "RIN12 PGA"}, | 875 | {"INMIXR", "RINPGA12 Switch", "RIN12 PGA"}, |
| 876 | {"INMIXR", "RINPGA34 Switch", "RIN34 PGA"}, | 876 | {"INMIXR", "RINPGA34 Switch", "RIN34 PGA"}, |
| 877 | /* AIRNMUX */ | 877 | /* AINRMUX */ |
| 878 | {"AIRNMUX", "INMIXR Mix", "INMIXR"}, | 878 | {"AINRMUX", "INMIXR Mix", "INMIXR"}, |
| 879 | {"AIRNMUX", "DIFFINR Mix", "RIN12PGA"}, | 879 | {"AINRMUX", "DIFFINR Mix", "RIN12 PGA"}, |
| 880 | {"AIRNMUX", "DIFFINR Mix", "RIN34PGA"}, | 880 | {"AINRMUX", "DIFFINR Mix", "RIN34 PGA"}, |
| 881 | {"AIRNMUX", "RXVOICE Mix", "RIN4/RXN"}, | 881 | {"AINRMUX", "RXVOICE Mix", "LIN4/RXN"}, |
| 882 | {"AIRNMUX", "RXVOICE Mix", "RIN4/RXP"}, | 882 | {"AINRMUX", "RXVOICE Mix", "RIN4/RXP"}, |
| 883 | /* ADC */ | 883 | /* ADC */ |
| 884 | {"Right ADC", NULL, "AIRNMUX"}, | 884 | {"Right ADC", NULL, "AINRMUX"}, |
| 885 | 885 | ||
| 886 | /* LOMIX */ | 886 | /* LOMIX */ |
| 887 | {"LOMIX", "LOMIX RIN3 Bypass Switch", "RIN3"}, | 887 | {"LOMIX", "LOMIX RIN3 Bypass Switch", "RIN3"}, |
| @@ -922,7 +922,7 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
| 922 | {"LOPMIX", "LOPMIX Left Mixer PGA Switch", "LOPGA"}, | 922 | {"LOPMIX", "LOPMIX Left Mixer PGA Switch", "LOPGA"}, |
| 923 | 923 | ||
| 924 | /* OUT3MIX */ | 924 | /* OUT3MIX */ |
| 925 | {"OUT3MIX", "OUT3MIX LIN4/RXP Bypass Switch", "LIN4/RXP"}, | 925 | {"OUT3MIX", "OUT3MIX LIN4/RXP Bypass Switch", "LIN4/RXN"}, |
| 926 | {"OUT3MIX", "OUT3MIX Left Out PGA Switch", "LOPGA"}, | 926 | {"OUT3MIX", "OUT3MIX Left Out PGA Switch", "LOPGA"}, |
| 927 | 927 | ||
| 928 | /* OUT4MIX */ | 928 | /* OUT4MIX */ |
| @@ -949,7 +949,7 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
| 949 | /* Output Pins */ | 949 | /* Output Pins */ |
| 950 | {"LON", NULL, "LONMIX"}, | 950 | {"LON", NULL, "LONMIX"}, |
| 951 | {"LOP", NULL, "LOPMIX"}, | 951 | {"LOP", NULL, "LOPMIX"}, |
| 952 | {"OUT", NULL, "OUT3MIX"}, | 952 | {"OUT3", NULL, "OUT3MIX"}, |
| 953 | {"LOUT", NULL, "LOUT PGA"}, | 953 | {"LOUT", NULL, "LOUT PGA"}, |
| 954 | {"SPKN", NULL, "SPKMIX"}, | 954 | {"SPKN", NULL, "SPKMIX"}, |
| 955 | {"ROUT", NULL, "ROUT PGA"}, | 955 | {"ROUT", NULL, "ROUT PGA"}, |
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 3aa729df27b5..1111c710118a 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c | |||
| @@ -504,7 +504,8 @@ static struct snd_soc_dai psc_i2s_dai_template = { | |||
| 504 | 504 | ||
| 505 | static const struct snd_pcm_hardware psc_i2s_pcm_hardware = { | 505 | static const struct snd_pcm_hardware psc_i2s_pcm_hardware = { |
| 506 | .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | | 506 | .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | |
| 507 | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER, | 507 | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
| 508 | SNDRV_PCM_INFO_BATCH, | ||
| 508 | .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | | 509 | .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | |
| 509 | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE, | 510 | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE, |
| 510 | .rate_min = 8000, | 511 | .rate_min = 8000, |
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index 0dad3a0bb920..baddb1242c71 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c | |||
| @@ -103,7 +103,8 @@ static struct snd_pcm_hardware camelot_pcm_hardware = { | |||
| 103 | .info = (SNDRV_PCM_INFO_MMAP | | 103 | .info = (SNDRV_PCM_INFO_MMAP | |
| 104 | SNDRV_PCM_INFO_INTERLEAVED | | 104 | SNDRV_PCM_INFO_INTERLEAVED | |
| 105 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 105 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
| 106 | SNDRV_PCM_INFO_MMAP_VALID), | 106 | SNDRV_PCM_INFO_MMAP_VALID | |
| 107 | SNDRV_PCM_INFO_BATCH), | ||
| 107 | .formats = DMABRG_FMTS, | 108 | .formats = DMABRG_FMTS, |
| 108 | .rates = DMABRG_RATES, | 109 | .rates = DMABRG_RATES, |
| 109 | .rate_min = 8000, | 110 | .rate_min = 8000, |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index af95ff1e126c..1d2e51b3f918 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
| @@ -1975,7 +1975,8 @@ static struct snd_pcm_hardware snd_dbri_pcm_hw = { | |||
| 1975 | .info = SNDRV_PCM_INFO_MMAP | | 1975 | .info = SNDRV_PCM_INFO_MMAP | |
| 1976 | SNDRV_PCM_INFO_INTERLEAVED | | 1976 | SNDRV_PCM_INFO_INTERLEAVED | |
| 1977 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 1977 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
| 1978 | SNDRV_PCM_INFO_MMAP_VALID, | 1978 | SNDRV_PCM_INFO_MMAP_VALID | |
| 1979 | SNDRV_PCM_INFO_BATCH, | ||
| 1979 | .formats = SNDRV_PCM_FMTBIT_MU_LAW | | 1980 | .formats = SNDRV_PCM_FMTBIT_MU_LAW | |
| 1980 | SNDRV_PCM_FMTBIT_A_LAW | | 1981 | SNDRV_PCM_FMTBIT_A_LAW | |
| 1981 | SNDRV_PCM_FMTBIT_U8 | | 1982 | SNDRV_PCM_FMTBIT_U8 | |
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 9a608fa85155..dd1ab6177840 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c | |||
| @@ -870,7 +870,8 @@ static struct snd_pcm_hardware snd_usX2Y_2c = | |||
| 870 | { | 870 | { |
| 871 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 871 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | |
| 872 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 872 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
| 873 | SNDRV_PCM_INFO_MMAP_VALID), | 873 | SNDRV_PCM_INFO_MMAP_VALID | |
| 874 | SNDRV_PCM_INFO_BATCH), | ||
| 874 | .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_3LE, | 875 | .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_3LE, |
| 875 | .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, | 876 | .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, |
| 876 | .rate_min = 44100, | 877 | .rate_min = 44100, |