diff options
563 files changed, 5862 insertions, 3721 deletions
diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl index 77c42f40be5d..2510763295d0 100644 --- a/Documentation/DocBook/kernel-locking.tmpl +++ b/Documentation/DocBook/kernel-locking.tmpl | |||
@@ -703,6 +703,31 @@ | |||
703 | </sect1> | 703 | </sect1> |
704 | </chapter> | 704 | </chapter> |
705 | 705 | ||
706 | <chapter id="trylock-functions"> | ||
707 | <title>The trylock Functions</title> | ||
708 | <para> | ||
709 | There are functions that try to acquire a lock only once and immediately | ||
710 | return a value telling about success or failure to acquire the lock. | ||
711 | They can be used if you need no access to the data protected with the lock | ||
712 | when some other thread is holding the lock. You should acquire the lock | ||
713 | later if you then need access to the data protected with the lock. | ||
714 | </para> | ||
715 | |||
716 | <para> | ||
717 | <function>spin_trylock()</function> does not spin but returns non-zero if | ||
718 | it acquires the spinlock on the first try or 0 if not. This function can | ||
719 | be used in all contexts like <function>spin_lock</function>: you must have | ||
720 | disabled the contexts that might interrupt you and acquire the spin lock. | ||
721 | </para> | ||
722 | |||
723 | <para> | ||
724 | <function>mutex_trylock()</function> does not suspend your task | ||
725 | but returns non-zero if it could lock the mutex on the first try | ||
726 | or 0 if not. This function cannot be safely used in hardware or software | ||
727 | interrupt contexts despite not sleeping. | ||
728 | </para> | ||
729 | </chapter> | ||
730 | |||
706 | <chapter id="Examples"> | 731 | <chapter id="Examples"> |
707 | <title>Common Examples</title> | 732 | <title>Common Examples</title> |
708 | <para> | 733 | <para> |
diff --git a/MAINTAINERS b/MAINTAINERS index 915ad48d8bce..b42dcfcbee44 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -982,13 +982,6 @@ L: bonding-devel@lists.sourceforge.net | |||
982 | W: http://sourceforge.net/projects/bonding/ | 982 | W: http://sourceforge.net/projects/bonding/ |
983 | S: Supported | 983 | S: Supported |
984 | 984 | ||
985 | BROADBAND PROCESSOR ARCHITECTURE | ||
986 | P: Arnd Bergmann | ||
987 | M: arnd@arndb.de | ||
988 | L: linuxppc-dev@ozlabs.org | ||
989 | W: http://www.penguinppc.org/ppc64/ | ||
990 | S: Supported | ||
991 | |||
992 | BROADCOM B44 10/100 ETHERNET DRIVER | 985 | BROADCOM B44 10/100 ETHERNET DRIVER |
993 | P: Gary Zambrano | 986 | P: Gary Zambrano |
994 | M: zambrano@broadcom.com | 987 | M: zambrano@broadcom.com |
@@ -1052,6 +1045,14 @@ L: linux-kernel@vger.kernel.org | |||
1052 | L: discuss@x86-64.org | 1045 | L: discuss@x86-64.org |
1053 | S: Maintained | 1046 | S: Maintained |
1054 | 1047 | ||
1048 | CELL BROADBAND ENGINE ARCHITECTURE | ||
1049 | P: Arnd Bergmann | ||
1050 | M: arnd@arndb.de | ||
1051 | L: linuxppc-dev@ozlabs.org | ||
1052 | L: cbe-oss-dev@ozlabs.org | ||
1053 | W: http://www.ibm.com/developerworks/power/cell/ | ||
1054 | S: Supported | ||
1055 | |||
1055 | CFAG12864B LCD DRIVER | 1056 | CFAG12864B LCD DRIVER |
1056 | P: Miguel Ojeda Sandonis | 1057 | P: Miguel Ojeda Sandonis |
1057 | M: maxextreme@gmail.com | 1058 | M: maxextreme@gmail.com |
@@ -1645,8 +1646,10 @@ W: http://linux-fbdev.sourceforge.net/ | |||
1645 | S: Maintained | 1646 | S: Maintained |
1646 | 1647 | ||
1647 | FREESCALE DMA DRIVER | 1648 | FREESCALE DMA DRIVER |
1648 | P; Zhang Wei | 1649 | P: Li Yang |
1649 | M: wei.zhang@freescale.com | 1650 | M: leoli@freescale.com |
1651 | P: Zhang Wei | ||
1652 | M: zw@zh-kernel.org | ||
1650 | L: linuxppc-embedded@ozlabs.org | 1653 | L: linuxppc-embedded@ozlabs.org |
1651 | L: linux-kernel@vger.kernel.org | 1654 | L: linux-kernel@vger.kernel.org |
1652 | S: Maintained | 1655 | S: Maintained |
@@ -2352,24 +2355,24 @@ S: Supported | |||
2352 | KERNEL VIRTUAL MACHINE (KVM) | 2355 | KERNEL VIRTUAL MACHINE (KVM) |
2353 | P: Avi Kivity | 2356 | P: Avi Kivity |
2354 | M: avi@qumranet.com | 2357 | M: avi@qumranet.com |
2355 | L: kvm-devel@lists.sourceforge.net | 2358 | L: kvm@vger.kernel.org |
2356 | W: kvm.sourceforge.net | 2359 | W: http://kvm.qumranet.com |
2357 | S: Supported | 2360 | S: Supported |
2358 | 2361 | ||
2359 | KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC | 2362 | KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC |
2360 | P: Hollis Blanchard | 2363 | P: Hollis Blanchard |
2361 | M: hollisb@us.ibm.com | 2364 | M: hollisb@us.ibm.com |
2362 | L: kvm-ppc-devel@lists.sourceforge.net | 2365 | L: kvm-ppc@vger.kernel.org |
2363 | W: kvm.sourceforge.net | 2366 | W: http://kvm.qumranet.com |
2364 | S: Supported | 2367 | S: Supported |
2365 | 2368 | ||
2366 | KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64) | 2369 | KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64) |
2367 | P: Anthony Xu | 2370 | P: Anthony Xu |
2368 | M: anthony.xu@intel.com | 2371 | M: anthony.xu@intel.com |
2369 | P: Xiantao Zhang | 2372 | P: Xiantao Zhang |
2370 | M: xiantao.zhang@intel.com | 2373 | M: xiantao.zhang@intel.com |
2371 | L: kvm-ia64-devel@lists.sourceforge.net | 2374 | L: kvm-ia64@vger.kernel.org |
2372 | W: kvm.sourceforge.net | 2375 | W: http://kvm.qumranet.com |
2373 | S: Supported | 2376 | S: Supported |
2374 | 2377 | ||
2375 | KERNEL VIRTUAL MACHINE for s390 (KVM/s390) | 2378 | KERNEL VIRTUAL MACHINE for s390 (KVM/s390) |
@@ -2820,6 +2823,15 @@ M: jirislaby@gmail.com | |||
2820 | L: linux-kernel@vger.kernel.org | 2823 | L: linux-kernel@vger.kernel.org |
2821 | S: Maintained | 2824 | S: Maintained |
2822 | 2825 | ||
2826 | MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) | ||
2827 | P: Andrew Gallatin | ||
2828 | M: gallatin@myri.com | ||
2829 | P: Brice Goglin | ||
2830 | M: brice@myri.com | ||
2831 | L: netdev@vger.kernel.org | ||
2832 | W: http://www.myri.com/scs/download-Myri10GE.html | ||
2833 | S: Supported | ||
2834 | |||
2823 | NATSEMI ETHERNET DRIVER (DP8381x) | 2835 | NATSEMI ETHERNET DRIVER (DP8381x) |
2824 | P: Tim Hockin | 2836 | P: Tim Hockin |
2825 | M: thockin@hockin.org | 2837 | M: thockin@hockin.org |
@@ -3133,7 +3145,7 @@ PCI ERROR RECOVERY | |||
3133 | P: Linas Vepstas | 3145 | P: Linas Vepstas |
3134 | M: linas@austin.ibm.com | 3146 | M: linas@austin.ibm.com |
3135 | L: linux-kernel@vger.kernel.org | 3147 | L: linux-kernel@vger.kernel.org |
3136 | L: linux-pci@atrey.karlin.mff.cuni.cz | 3148 | L: linux-pci@vger.kernel.org |
3137 | S: Supported | 3149 | S: Supported |
3138 | 3150 | ||
3139 | PCI SUBSYSTEM | 3151 | PCI SUBSYSTEM |
@@ -3767,6 +3779,14 @@ M: dbrownell@users.sourceforge.net | |||
3767 | L: spi-devel-general@lists.sourceforge.net | 3779 | L: spi-devel-general@lists.sourceforge.net |
3768 | S: Maintained | 3780 | S: Maintained |
3769 | 3781 | ||
3782 | SPU FILE SYSTEM | ||
3783 | P: Jeremy Kerr | ||
3784 | M: jk@ozlabs.org | ||
3785 | L: linuxppc-dev@ozlabs.org | ||
3786 | L: cbe-oss-dev@ozlabs.org | ||
3787 | W: http://www.ibm.com/developerworks/power/cell/ | ||
3788 | S: Supported | ||
3789 | |||
3770 | STABLE BRANCH: | 3790 | STABLE BRANCH: |
3771 | P: Greg Kroah-Hartman | 3791 | P: Greg Kroah-Hartman |
3772 | M: greg@kroah.com | 3792 | M: greg@kroah.com |
@@ -4022,12 +4042,41 @@ M: ballabio_dario@emc.com | |||
4022 | L: linux-scsi@vger.kernel.org | 4042 | L: linux-scsi@vger.kernel.org |
4023 | S: Maintained | 4043 | S: Maintained |
4024 | 4044 | ||
4045 | UCLINUX (AND M68KNOMMU) | ||
4046 | P: Greg Ungerer | ||
4047 | M: gerg@uclinux.org | ||
4048 | W: http://www.uclinux.org/ | ||
4049 | L: uclinux-dev@uclinux.org (subscribers-only) | ||
4050 | S: Maintained | ||
4051 | |||
4052 | UCLINUX FOR NEC V850 | ||
4053 | P: Miles Bader | ||
4054 | |||
4055 | UCLINUX FOR RENESAS H8/300 | ||
4056 | P: Yoshinori Sato | ||
4057 | M: ysato@users.sourceforge.jp | ||
4058 | W: http://uclinux-h8.sourceforge.jp/ | ||
4059 | S: Supported | ||
4060 | |||
4025 | UDF FILESYSTEM | 4061 | UDF FILESYSTEM |
4026 | P: Jan Kara | 4062 | P: Jan Kara |
4027 | M: jack@suse.cz | 4063 | M: jack@suse.cz |
4028 | W: http://linux-udf.sourceforge.net | 4064 | W: http://linux-udf.sourceforge.net |
4029 | S: Maintained | 4065 | S: Maintained |
4030 | 4066 | ||
4067 | UFS FILESYSTEM | ||
4068 | P: Evgeniy Dushistov | ||
4069 | M: dushistov@mail.ru | ||
4070 | L: linux-kernel@vger.kernel.org | ||
4071 | S: Maintained | ||
4072 | |||
4073 | UltraSPARC (sparc64): | ||
4074 | P: David S. Miller | ||
4075 | M: davem@davemloft.net | ||
4076 | L: sparclinux@vger.kernel.org | ||
4077 | T: git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git | ||
4078 | S: Maintained | ||
4079 | |||
4031 | UNIFORM CDROM DRIVER | 4080 | UNIFORM CDROM DRIVER |
4032 | P: Jens Axboe | 4081 | P: Jens Axboe |
4033 | M: axboe@kernel.dk | 4082 | M: axboe@kernel.dk |
@@ -4074,6 +4123,13 @@ L: netdev@vger.kernel.org | |||
4074 | W: http://www.linux-usb.org/usbnet | 4123 | W: http://www.linux-usb.org/usbnet |
4075 | S: Maintained | 4124 | S: Maintained |
4076 | 4125 | ||
4126 | USB DIAMOND RIO500 DRIVER | ||
4127 | P: Cesar Miquel | ||
4128 | M: miquel@df.uba.ar | ||
4129 | L: rio500-users@lists.sourceforge.net | ||
4130 | W: http://rio500.sourceforge.net | ||
4131 | S: Maintained | ||
4132 | |||
4077 | USB EHCI DRIVER | 4133 | USB EHCI DRIVER |
4078 | P: David Brownell | 4134 | P: David Brownell |
4079 | M: dbrownell@users.sourceforge.net | 4135 | M: dbrownell@users.sourceforge.net |
@@ -4328,42 +4384,6 @@ M: romieu@fr.zoreil.com | |||
4328 | L: netdev@vger.kernel.org | 4384 | L: netdev@vger.kernel.org |
4329 | S: Maintained | 4385 | S: Maintained |
4330 | 4386 | ||
4331 | UCLINUX (AND M68KNOMMU) | ||
4332 | P: Greg Ungerer | ||
4333 | M: gerg@uclinux.org | ||
4334 | W: http://www.uclinux.org/ | ||
4335 | L: uclinux-dev@uclinux.org (subscribers-only) | ||
4336 | S: Maintained | ||
4337 | |||
4338 | UCLINUX FOR NEC V850 | ||
4339 | P: Miles Bader | ||
4340 | |||
4341 | UCLINUX FOR RENESAS H8/300 | ||
4342 | P: Yoshinori Sato | ||
4343 | M: ysato@users.sourceforge.jp | ||
4344 | W: http://uclinux-h8.sourceforge.jp/ | ||
4345 | S: Supported | ||
4346 | |||
4347 | UFS FILESYSTEM | ||
4348 | P: Evgeniy Dushistov | ||
4349 | M: dushistov@mail.ru | ||
4350 | L: linux-kernel@vger.kernel.org | ||
4351 | S: Maintained | ||
4352 | |||
4353 | UltraSPARC (sparc64): | ||
4354 | P: David S. Miller | ||
4355 | M: davem@davemloft.net | ||
4356 | L: sparclinux@vger.kernel.org | ||
4357 | T: git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git | ||
4358 | S: Maintained | ||
4359 | |||
4360 | USB DIAMOND RIO500 DRIVER | ||
4361 | P: Cesar Miquel | ||
4362 | M: miquel@df.uba.ar | ||
4363 | L: rio500-users@lists.sourceforge.net | ||
4364 | W: http://rio500.sourceforge.net | ||
4365 | S: Maintained | ||
4366 | |||
4367 | VIDEO FOR LINUX | 4387 | VIDEO FOR LINUX |
4368 | P: Mauro Carvalho Chehab | 4388 | P: Mauro Carvalho Chehab |
4369 | M: mchehab@infradead.org | 4389 | M: mchehab@infradead.org |
diff --git a/arch/alpha/kernel/init_task.c b/arch/alpha/kernel/init_task.c index 835d09a7b332..1f762189fa64 100644 --- a/arch/alpha/kernel/init_task.c +++ b/arch/alpha/kernel/init_task.c | |||
@@ -9,7 +9,6 @@ | |||
9 | 9 | ||
10 | 10 | ||
11 | static struct fs_struct init_fs = INIT_FS; | 11 | static struct fs_struct init_fs = INIT_FS; |
12 | static struct files_struct init_files = INIT_FILES; | ||
13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
15 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/arm/kernel/init_task.c b/arch/arm/kernel/init_task.c index bd4ef53bc6b9..8b8c9d38a761 100644 --- a/arch/arm/kernel/init_task.c +++ b/arch/arm/kernel/init_task.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
14 | 14 | ||
15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
16 | static struct files_struct init_files = INIT_FILES; | ||
17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/avr32/kernel/init_task.c b/arch/avr32/kernel/init_task.c index effcacf9d1a2..44058469c6ec 100644 --- a/arch/avr32/kernel/init_task.c +++ b/arch/avr32/kernel/init_task.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
15 | 15 | ||
16 | static struct fs_struct init_fs = INIT_FS; | 16 | static struct fs_struct init_fs = INIT_FS; |
17 | static struct files_struct init_files = INIT_FILES; | ||
18 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
19 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
20 | struct mm_struct init_mm = INIT_MM(init_mm); | 19 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index fd5708523f2e..b87634e75f20 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -479,16 +479,6 @@ comment "Memory Setup" | |||
479 | 479 | ||
480 | comment "Misc" | 480 | comment "Misc" |
481 | 481 | ||
482 | config ENET_FLASH_PIN | ||
483 | int "PF port/pin used for flash and ethernet sharing" | ||
484 | depends on (BFIN533_STAMP) | ||
485 | default 0 | ||
486 | help | ||
487 | PF port/pin used for flash and ethernet sharing to allow other PF | ||
488 | pins to be used on other platforms without having to touch common | ||
489 | code. | ||
490 | For example: PF0 --> 0,PF1 --> 1,PF2 --> 2, etc. | ||
491 | |||
492 | choice | 482 | choice |
493 | prompt "Blackfin Exception Scratch Register" | 483 | prompt "Blackfin Exception Scratch Register" |
494 | default BFIN_SCRATCH_REG_RETN | 484 | default BFIN_SCRATCH_REG_RETN |
@@ -695,6 +685,8 @@ choice | |||
695 | prompt "Uncached SDRAM region" | 685 | prompt "Uncached SDRAM region" |
696 | default DMA_UNCACHED_1M | 686 | default DMA_UNCACHED_1M |
697 | depends on BFIN_DMA_5XX | 687 | depends on BFIN_DMA_5XX |
688 | config DMA_UNCACHED_4M | ||
689 | bool "Enable 4M DMA region" | ||
698 | config DMA_UNCACHED_2M | 690 | config DMA_UNCACHED_2M |
699 | bool "Enable 2M DMA region" | 691 | bool "Enable 2M DMA region" |
700 | config DMA_UNCACHED_1M | 692 | config DMA_UNCACHED_1M |
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index 64876dfc2e55..5e6fb9d8e50f 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig | |||
@@ -1,6 +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.22.16 | 3 | # Linux kernel version: 2.6.24.7 |
4 | # Fri May 16 10:02:29 2008 | ||
4 | # | 5 | # |
5 | # CONFIG_MMU is not set | 6 | # CONFIG_MMU is not set |
6 | # CONFIG_FPU is not set | 7 | # CONFIG_FPU is not set |
@@ -13,35 +14,34 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
14 | CONFIG_GENERIC_HARDIRQS=y | 15 | CONFIG_GENERIC_HARDIRQS=y |
15 | CONFIG_GENERIC_IRQ_PROBE=y | 16 | CONFIG_GENERIC_IRQ_PROBE=y |
16 | CONFIG_GENERIC_TIME=y | ||
17 | CONFIG_GENERIC_GPIO=y | 17 | CONFIG_GENERIC_GPIO=y |
18 | CONFIG_FORCE_MAX_ZONEORDER=14 | 18 | CONFIG_FORCE_MAX_ZONEORDER=14 |
19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 19 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
21 | 21 | ||
22 | # | 22 | # |
23 | # Code maturity level options | 23 | # General setup |
24 | # | 24 | # |
25 | CONFIG_EXPERIMENTAL=y | 25 | CONFIG_EXPERIMENTAL=y |
26 | CONFIG_BROKEN_ON_SMP=y | 26 | CONFIG_BROKEN_ON_SMP=y |
27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
28 | |||
29 | # | ||
30 | # General setup | ||
31 | # | ||
32 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
33 | CONFIG_LOCALVERSION_AUTO=y | 29 | CONFIG_LOCALVERSION_AUTO=y |
34 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
35 | # CONFIG_IPC_NS is not set | ||
36 | CONFIG_SYSVIPC_SYSCTL=y | 31 | CONFIG_SYSVIPC_SYSCTL=y |
37 | # CONFIG_POSIX_MQUEUE is not set | 32 | # CONFIG_POSIX_MQUEUE is not set |
38 | # CONFIG_BSD_PROCESS_ACCT is not set | 33 | # CONFIG_BSD_PROCESS_ACCT is not set |
39 | # CONFIG_TASKSTATS is not set | 34 | # CONFIG_TASKSTATS is not set |
40 | # CONFIG_UTS_NS is not set | 35 | # CONFIG_USER_NS is not set |
36 | # CONFIG_PID_NS is not set | ||
41 | # CONFIG_AUDIT is not set | 37 | # CONFIG_AUDIT is not set |
42 | CONFIG_IKCONFIG=y | 38 | CONFIG_IKCONFIG=y |
43 | CONFIG_IKCONFIG_PROC=y | 39 | CONFIG_IKCONFIG_PROC=y |
44 | CONFIG_LOG_BUF_SHIFT=14 | 40 | CONFIG_LOG_BUF_SHIFT=14 |
41 | # CONFIG_CGROUPS is not set | ||
42 | CONFIG_FAIR_GROUP_SCHED=y | ||
43 | CONFIG_FAIR_USER_SCHED=y | ||
44 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
45 | CONFIG_SYSFS_DEPRECATED=y | 45 | CONFIG_SYSFS_DEPRECATED=y |
46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
47 | CONFIG_BLK_DEV_INITRD=y | 47 | CONFIG_BLK_DEV_INITRD=y |
@@ -64,32 +64,24 @@ CONFIG_EPOLL=y | |||
64 | CONFIG_SIGNALFD=y | 64 | CONFIG_SIGNALFD=y |
65 | CONFIG_EVENTFD=y | 65 | CONFIG_EVENTFD=y |
66 | CONFIG_VM_EVENT_COUNTERS=y | 66 | CONFIG_VM_EVENT_COUNTERS=y |
67 | CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 | ||
68 | # CONFIG_NP2 is not set | ||
69 | CONFIG_SLAB=y | 67 | CONFIG_SLAB=y |
70 | # CONFIG_SLUB is not set | 68 | # CONFIG_SLUB is not set |
71 | # CONFIG_SLOB is not set | 69 | # CONFIG_SLOB is not set |
70 | CONFIG_SLABINFO=y | ||
72 | CONFIG_RT_MUTEXES=y | 71 | CONFIG_RT_MUTEXES=y |
73 | CONFIG_TINY_SHMEM=y | 72 | CONFIG_TINY_SHMEM=y |
74 | CONFIG_BASE_SMALL=0 | 73 | CONFIG_BASE_SMALL=0 |
75 | |||
76 | # | ||
77 | # Loadable module support | ||
78 | # | ||
79 | CONFIG_MODULES=y | 74 | CONFIG_MODULES=y |
80 | CONFIG_MODULE_UNLOAD=y | 75 | CONFIG_MODULE_UNLOAD=y |
81 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 76 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
82 | # CONFIG_MODVERSIONS is not set | 77 | # CONFIG_MODVERSIONS is not set |
83 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 78 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
84 | CONFIG_KMOD=y | 79 | CONFIG_KMOD=y |
85 | |||
86 | # | ||
87 | # Block layer | ||
88 | # | ||
89 | CONFIG_BLOCK=y | 80 | CONFIG_BLOCK=y |
90 | # CONFIG_LBD is not set | 81 | # CONFIG_LBD is not set |
91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 82 | # CONFIG_BLK_DEV_IO_TRACE is not set |
92 | # CONFIG_LSF is not set | 83 | # CONFIG_LSF is not set |
84 | # CONFIG_BLK_DEV_BSG is not set | ||
93 | 85 | ||
94 | # | 86 | # |
95 | # IO Schedulers | 87 | # IO Schedulers |
@@ -141,7 +133,6 @@ CONFIG_BF_REV_0_0=y | |||
141 | # CONFIG_BF_REV_ANY is not set | 133 | # CONFIG_BF_REV_ANY is not set |
142 | # CONFIG_BF_REV_NONE is not set | 134 | # CONFIG_BF_REV_NONE is not set |
143 | CONFIG_BF52x=y | 135 | CONFIG_BF52x=y |
144 | CONFIG_BFIN_SINGLE_CORE=y | ||
145 | CONFIG_MEM_MT48LC32M16A2TG_75=y | 136 | CONFIG_MEM_MT48LC32M16A2TG_75=y |
146 | CONFIG_BFIN527_EZKIT=y | 137 | CONFIG_BFIN527_EZKIT=y |
147 | 138 | ||
@@ -227,12 +218,14 @@ CONFIG_IRQ_USB_DMA=11 | |||
227 | # Board customizations | 218 | # Board customizations |
228 | # | 219 | # |
229 | # CONFIG_CMDLINE_BOOL is not set | 220 | # CONFIG_CMDLINE_BOOL is not set |
221 | CONFIG_BOOT_LOAD=0x1000 | ||
230 | 222 | ||
231 | # | 223 | # |
232 | # Clock/PLL Setup | 224 | # Clock/PLL Setup |
233 | # | 225 | # |
234 | CONFIG_CLKIN_HZ=25000000 | 226 | CONFIG_CLKIN_HZ=25000000 |
235 | # CONFIG_BFIN_KERNEL_CLOCK is not set | 227 | # CONFIG_BFIN_KERNEL_CLOCK is not set |
228 | CONFIG_MAX_MEM_SIZE=512 | ||
236 | CONFIG_MAX_VCO_HZ=600000000 | 229 | CONFIG_MAX_VCO_HZ=600000000 |
237 | CONFIG_MIN_VCO_HZ=50000000 | 230 | CONFIG_MIN_VCO_HZ=50000000 |
238 | CONFIG_MAX_SCLK_HZ=133333333 | 231 | CONFIG_MAX_SCLK_HZ=133333333 |
@@ -246,13 +239,17 @@ CONFIG_HZ_250=y | |||
246 | # CONFIG_HZ_300 is not set | 239 | # CONFIG_HZ_300 is not set |
247 | # CONFIG_HZ_1000 is not set | 240 | # CONFIG_HZ_1000 is not set |
248 | CONFIG_HZ=250 | 241 | CONFIG_HZ=250 |
242 | CONFIG_GENERIC_TIME=y | ||
243 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
244 | # CONFIG_CYCLES_CLOCKSOURCE is not set | ||
245 | # CONFIG_TICK_ONESHOT is not set | ||
246 | # CONFIG_NO_HZ is not set | ||
247 | # CONFIG_HIGH_RES_TIMERS is not set | ||
248 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
249 | 249 | ||
250 | # | 250 | # |
251 | # Memory Setup | 251 | # Misc |
252 | # | 252 | # |
253 | CONFIG_MAX_MEM_SIZE=512 | ||
254 | CONFIG_MEM_ADD_WIDTH=10 | ||
255 | CONFIG_BOOT_LOAD=0x1000 | ||
256 | CONFIG_BFIN_SCRATCH_REG_RETN=y | 253 | CONFIG_BFIN_SCRATCH_REG_RETN=y |
257 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set | 254 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set |
258 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set | 255 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set |
@@ -288,12 +285,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
288 | CONFIG_FLATMEM=y | 285 | CONFIG_FLATMEM=y |
289 | CONFIG_FLAT_NODE_MEM_MAP=y | 286 | CONFIG_FLAT_NODE_MEM_MAP=y |
290 | # CONFIG_SPARSEMEM_STATIC is not set | 287 | # CONFIG_SPARSEMEM_STATIC is not set |
288 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
291 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 289 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
292 | # CONFIG_RESOURCES_64BIT is not set | 290 | # CONFIG_RESOURCES_64BIT is not set |
293 | CONFIG_ZONE_DMA_FLAG=1 | 291 | CONFIG_ZONE_DMA_FLAG=1 |
294 | CONFIG_LARGE_ALLOCS=y | 292 | CONFIG_VIRT_TO_BUS=y |
295 | # CONFIG_BFIN_GPTIMERS is not set | 293 | # CONFIG_BFIN_GPTIMERS is not set |
296 | CONFIG_BFIN_DMA_5XX=y | 294 | CONFIG_BFIN_DMA_5XX=y |
295 | # CONFIG_DMA_UNCACHED_4M is not set | ||
297 | # CONFIG_DMA_UNCACHED_2M is not set | 296 | # CONFIG_DMA_UNCACHED_2M is not set |
298 | CONFIG_DMA_UNCACHED_1M=y | 297 | CONFIG_DMA_UNCACHED_1M=y |
299 | # CONFIG_DMA_UNCACHED_NONE is not set | 298 | # CONFIG_DMA_UNCACHED_NONE is not set |
@@ -338,10 +337,6 @@ CONFIG_BANK_3=0xFFC0 | |||
338 | # | 337 | # |
339 | # CONFIG_PCI is not set | 338 | # CONFIG_PCI is not set |
340 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 339 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
341 | |||
342 | # | ||
343 | # PCCARD (PCMCIA/CardBus) support | ||
344 | # | ||
345 | # CONFIG_PCCARD is not set | 340 | # CONFIG_PCCARD is not set |
346 | 341 | ||
347 | # | 342 | # |
@@ -357,9 +352,15 @@ CONFIG_BINFMT_ZFLAT=y | |||
357 | # Power management options | 352 | # Power management options |
358 | # | 353 | # |
359 | # CONFIG_PM is not set | 354 | # CONFIG_PM is not set |
355 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
360 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | 356 | # CONFIG_PM_WAKEUP_BY_GPIO is not set |
361 | 357 | ||
362 | # | 358 | # |
359 | # CPU Frequency scaling | ||
360 | # | ||
361 | # CONFIG_CPU_FREQ is not set | ||
362 | |||
363 | # | ||
363 | # Networking | 364 | # Networking |
364 | # | 365 | # |
365 | CONFIG_NET=y | 366 | CONFIG_NET=y |
@@ -395,6 +396,7 @@ CONFIG_SYN_COOKIES=y | |||
395 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 396 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
396 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 397 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
397 | CONFIG_INET_XFRM_MODE_BEET=y | 398 | CONFIG_INET_XFRM_MODE_BEET=y |
399 | # CONFIG_INET_LRO is not set | ||
398 | CONFIG_INET_DIAG=y | 400 | CONFIG_INET_DIAG=y |
399 | CONFIG_INET_TCP_DIAG=y | 401 | CONFIG_INET_TCP_DIAG=y |
400 | # CONFIG_TCP_CONG_ADVANCED is not set | 402 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -421,10 +423,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
421 | # CONFIG_LAPB is not set | 423 | # CONFIG_LAPB is not set |
422 | # CONFIG_ECONET is not set | 424 | # CONFIG_ECONET is not set |
423 | # CONFIG_WAN_ROUTER is not set | 425 | # CONFIG_WAN_ROUTER is not set |
424 | |||
425 | # | ||
426 | # QoS and/or fair queueing | ||
427 | # | ||
428 | # CONFIG_NET_SCHED is not set | 426 | # CONFIG_NET_SCHED is not set |
429 | 427 | ||
430 | # | 428 | # |
@@ -444,6 +442,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
444 | # CONFIG_MAC80211 is not set | 442 | # CONFIG_MAC80211 is not set |
445 | # CONFIG_IEEE80211 is not set | 443 | # CONFIG_IEEE80211 is not set |
446 | # CONFIG_RFKILL is not set | 444 | # CONFIG_RFKILL is not set |
445 | # CONFIG_NET_9P is not set | ||
447 | 446 | ||
448 | # | 447 | # |
449 | # Device Drivers | 448 | # Device Drivers |
@@ -452,14 +451,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
452 | # | 451 | # |
453 | # Generic Driver Options | 452 | # Generic Driver Options |
454 | # | 453 | # |
454 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
455 | CONFIG_STANDALONE=y | 455 | CONFIG_STANDALONE=y |
456 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 456 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
457 | # CONFIG_FW_LOADER is not set | 457 | # CONFIG_FW_LOADER is not set |
458 | # CONFIG_SYS_HYPERVISOR is not set | 458 | # CONFIG_SYS_HYPERVISOR is not set |
459 | |||
460 | # | ||
461 | # Connector - unified userspace <-> kernelspace linker | ||
462 | # | ||
463 | # CONFIG_CONNECTOR is not set | 459 | # CONFIG_CONNECTOR is not set |
464 | CONFIG_MTD=y | 460 | CONFIG_MTD=y |
465 | # CONFIG_MTD_DEBUG is not set | 461 | # CONFIG_MTD_DEBUG is not set |
@@ -479,6 +475,7 @@ CONFIG_MTD_BLOCK=y | |||
479 | # CONFIG_INFTL is not set | 475 | # CONFIG_INFTL is not set |
480 | # CONFIG_RFD_FTL is not set | 476 | # CONFIG_RFD_FTL is not set |
481 | # CONFIG_SSFDC is not set | 477 | # CONFIG_SSFDC is not set |
478 | # CONFIG_MTD_OOPS is not set | ||
482 | 479 | ||
483 | # | 480 | # |
484 | # RAM/ROM/Flash chip drivers | 481 | # RAM/ROM/Flash chip drivers |
@@ -542,39 +539,27 @@ CONFIG_MTD_NAND_IDS=m | |||
542 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 539 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
543 | # CONFIG_MTD_NAND_NANDSIM is not set | 540 | # CONFIG_MTD_NAND_NANDSIM is not set |
544 | # CONFIG_MTD_NAND_PLATFORM is not set | 541 | # CONFIG_MTD_NAND_PLATFORM is not set |
542 | # CONFIG_MTD_ALAUDA is not set | ||
545 | # CONFIG_MTD_ONENAND is not set | 543 | # CONFIG_MTD_ONENAND is not set |
546 | 544 | ||
547 | # | 545 | # |
548 | # UBI - Unsorted block images | 546 | # UBI - Unsorted block images |
549 | # | 547 | # |
550 | # CONFIG_MTD_UBI is not set | 548 | # CONFIG_MTD_UBI is not set |
551 | |||
552 | # | ||
553 | # Parallel port support | ||
554 | # | ||
555 | # CONFIG_PARPORT is not set | 549 | # CONFIG_PARPORT is not set |
556 | 550 | CONFIG_BLK_DEV=y | |
557 | # | ||
558 | # Plug and Play support | ||
559 | # | ||
560 | # CONFIG_PNPACPI is not set | ||
561 | |||
562 | # | ||
563 | # Block devices | ||
564 | # | ||
565 | # CONFIG_BLK_DEV_COW_COMMON is not set | 551 | # CONFIG_BLK_DEV_COW_COMMON is not set |
566 | # CONFIG_BLK_DEV_LOOP is not set | 552 | # CONFIG_BLK_DEV_LOOP is not set |
567 | # CONFIG_BLK_DEV_NBD is not set | 553 | # CONFIG_BLK_DEV_NBD is not set |
554 | # CONFIG_BLK_DEV_UB is not set | ||
568 | CONFIG_BLK_DEV_RAM=y | 555 | CONFIG_BLK_DEV_RAM=y |
569 | CONFIG_BLK_DEV_RAM_COUNT=16 | 556 | CONFIG_BLK_DEV_RAM_COUNT=16 |
570 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 557 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
571 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 558 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
572 | # CONFIG_CDROM_PKTCDVD is not set | 559 | # CONFIG_CDROM_PKTCDVD is not set |
573 | # CONFIG_ATA_OVER_ETH is not set | 560 | # CONFIG_ATA_OVER_ETH is not set |
574 | 561 | CONFIG_MISC_DEVICES=y | |
575 | # | 562 | # CONFIG_EEPROM_93CX6 is not set |
576 | # Misc devices | ||
577 | # | ||
578 | # CONFIG_IDE is not set | 563 | # CONFIG_IDE is not set |
579 | 564 | ||
580 | # | 565 | # |
@@ -582,22 +567,18 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
582 | # | 567 | # |
583 | # CONFIG_RAID_ATTRS is not set | 568 | # CONFIG_RAID_ATTRS is not set |
584 | # CONFIG_SCSI is not set | 569 | # CONFIG_SCSI is not set |
570 | # CONFIG_SCSI_DMA is not set | ||
585 | # CONFIG_SCSI_NETLINK is not set | 571 | # CONFIG_SCSI_NETLINK is not set |
586 | # CONFIG_ATA is not set | 572 | # CONFIG_ATA is not set |
587 | |||
588 | # | ||
589 | # Multi-device support (RAID and LVM) | ||
590 | # | ||
591 | # CONFIG_MD is not set | 573 | # CONFIG_MD is not set |
592 | |||
593 | # | ||
594 | # Network device support | ||
595 | # | ||
596 | CONFIG_NETDEVICES=y | 574 | CONFIG_NETDEVICES=y |
575 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
597 | # CONFIG_DUMMY is not set | 576 | # CONFIG_DUMMY is not set |
598 | # CONFIG_BONDING is not set | 577 | # CONFIG_BONDING is not set |
578 | # CONFIG_MACVLAN is not set | ||
599 | # CONFIG_EQUALIZER is not set | 579 | # CONFIG_EQUALIZER is not set |
600 | # CONFIG_TUN is not set | 580 | # CONFIG_TUN is not set |
581 | # CONFIG_VETH is not set | ||
601 | CONFIG_PHYLIB=y | 582 | CONFIG_PHYLIB=y |
602 | 583 | ||
603 | # | 584 | # |
@@ -611,21 +592,24 @@ CONFIG_PHYLIB=y | |||
611 | # CONFIG_VITESSE_PHY is not set | 592 | # CONFIG_VITESSE_PHY is not set |
612 | # CONFIG_SMSC_PHY is not set | 593 | # CONFIG_SMSC_PHY is not set |
613 | # CONFIG_BROADCOM_PHY is not set | 594 | # CONFIG_BROADCOM_PHY is not set |
595 | # CONFIG_ICPLUS_PHY is not set | ||
614 | # CONFIG_FIXED_PHY is not set | 596 | # CONFIG_FIXED_PHY is not set |
615 | 597 | # CONFIG_MDIO_BITBANG is not set | |
616 | # | ||
617 | # Ethernet (10 or 100Mbit) | ||
618 | # | ||
619 | CONFIG_NET_ETHERNET=y | 598 | CONFIG_NET_ETHERNET=y |
620 | CONFIG_MII=y | 599 | CONFIG_MII=y |
621 | # CONFIG_SMC91X is not set | ||
622 | CONFIG_BFIN_MAC=y | 600 | CONFIG_BFIN_MAC=y |
623 | CONFIG_BFIN_MAC_USE_L1=y | 601 | CONFIG_BFIN_MAC_USE_L1=y |
624 | CONFIG_BFIN_TX_DESC_NUM=10 | 602 | CONFIG_BFIN_TX_DESC_NUM=10 |
625 | CONFIG_BFIN_RX_DESC_NUM=20 | 603 | CONFIG_BFIN_RX_DESC_NUM=20 |
626 | CONFIG_BFIN_MAC_RMII=y | 604 | CONFIG_BFIN_MAC_RMII=y |
605 | # CONFIG_SMC91X is not set | ||
627 | # CONFIG_SMSC911X is not set | 606 | # CONFIG_SMSC911X is not set |
628 | # CONFIG_DM9000 is not set | 607 | # CONFIG_DM9000 is not set |
608 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
609 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
610 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
611 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
612 | # CONFIG_B44 is not set | ||
629 | CONFIG_NETDEV_1000=y | 613 | CONFIG_NETDEV_1000=y |
630 | # CONFIG_AX88180 is not set | 614 | # CONFIG_AX88180 is not set |
631 | CONFIG_NETDEV_10000=y | 615 | CONFIG_NETDEV_10000=y |
@@ -635,6 +619,15 @@ CONFIG_NETDEV_10000=y | |||
635 | # | 619 | # |
636 | # CONFIG_WLAN_PRE80211 is not set | 620 | # CONFIG_WLAN_PRE80211 is not set |
637 | # CONFIG_WLAN_80211 is not set | 621 | # CONFIG_WLAN_80211 is not set |
622 | |||
623 | # | ||
624 | # USB Network Adapters | ||
625 | # | ||
626 | # CONFIG_USB_CATC is not set | ||
627 | # CONFIG_USB_KAWETH is not set | ||
628 | # CONFIG_USB_PEGASUS is not set | ||
629 | # CONFIG_USB_RTL8150 is not set | ||
630 | # CONFIG_USB_USBNET is not set | ||
638 | # CONFIG_WAN is not set | 631 | # CONFIG_WAN is not set |
639 | # CONFIG_PPP is not set | 632 | # CONFIG_PPP is not set |
640 | # CONFIG_SLIP is not set | 633 | # CONFIG_SLIP is not set |
@@ -642,15 +635,7 @@ CONFIG_NETDEV_10000=y | |||
642 | # CONFIG_NETCONSOLE is not set | 635 | # CONFIG_NETCONSOLE is not set |
643 | # CONFIG_NETPOLL is not set | 636 | # CONFIG_NETPOLL is not set |
644 | # CONFIG_NET_POLL_CONTROLLER is not set | 637 | # CONFIG_NET_POLL_CONTROLLER is not set |
645 | |||
646 | # | ||
647 | # ISDN subsystem | ||
648 | # | ||
649 | # CONFIG_ISDN is not set | 638 | # CONFIG_ISDN is not set |
650 | |||
651 | # | ||
652 | # Telephony Support | ||
653 | # | ||
654 | # CONFIG_PHONE is not set | 639 | # CONFIG_PHONE is not set |
655 | 640 | ||
656 | # | 641 | # |
@@ -665,7 +650,6 @@ CONFIG_INPUT=y | |||
665 | # | 650 | # |
666 | # CONFIG_INPUT_MOUSEDEV is not set | 651 | # CONFIG_INPUT_MOUSEDEV is not set |
667 | # CONFIG_INPUT_JOYDEV is not set | 652 | # CONFIG_INPUT_JOYDEV is not set |
668 | # CONFIG_INPUT_TSDEV is not set | ||
669 | # CONFIG_INPUT_EVDEV is not set | 653 | # CONFIG_INPUT_EVDEV is not set |
670 | # CONFIG_INPUT_EVBUG is not set | 654 | # CONFIG_INPUT_EVBUG is not set |
671 | 655 | ||
@@ -697,7 +681,6 @@ CONFIG_INPUT_MISC=y | |||
697 | # | 681 | # |
698 | # CONFIG_AD9960 is not set | 682 | # CONFIG_AD9960 is not set |
699 | # CONFIG_SPI_ADC_BF533 is not set | 683 | # CONFIG_SPI_ADC_BF533 is not set |
700 | # CONFIG_BF5xx_PFLAGS is not set | ||
701 | # CONFIG_BF5xx_PPIFCD is not set | 684 | # CONFIG_BF5xx_PPIFCD is not set |
702 | # CONFIG_BFIN_SIMPLE_TIMER is not set | 685 | # CONFIG_BFIN_SIMPLE_TIMER is not set |
703 | # CONFIG_BF5xx_PPI is not set | 686 | # CONFIG_BF5xx_PPI is not set |
@@ -706,7 +689,7 @@ CONFIG_BFIN_OTP=y | |||
706 | # CONFIG_BFIN_SPORT is not set | 689 | # CONFIG_BFIN_SPORT is not set |
707 | # CONFIG_BFIN_TIMER_LATENCY is not set | 690 | # CONFIG_BFIN_TIMER_LATENCY is not set |
708 | # CONFIG_TWI_LCD is not set | 691 | # CONFIG_TWI_LCD is not set |
709 | # CONFIG_AD5304 is not set | 692 | # CONFIG_SIMPLE_GPIO is not set |
710 | # CONFIG_VT is not set | 693 | # CONFIG_VT is not set |
711 | # CONFIG_SERIAL_NONSTANDARD is not set | 694 | # CONFIG_SERIAL_NONSTANDARD is not set |
712 | 695 | ||
@@ -735,27 +718,11 @@ CONFIG_UNIX98_PTYS=y | |||
735 | # CAN, the car bus and industrial fieldbus | 718 | # CAN, the car bus and industrial fieldbus |
736 | # | 719 | # |
737 | # CONFIG_CAN4LINUX is not set | 720 | # CONFIG_CAN4LINUX is not set |
738 | |||
739 | # | ||
740 | # IPMI | ||
741 | # | ||
742 | # CONFIG_IPMI_HANDLER is not set | 721 | # CONFIG_IPMI_HANDLER is not set |
743 | CONFIG_WATCHDOG=y | ||
744 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
745 | |||
746 | # | ||
747 | # Watchdog Device Drivers | ||
748 | # | ||
749 | # CONFIG_SOFT_WATCHDOG is not set | ||
750 | CONFIG_BFIN_WDT=y | ||
751 | CONFIG_HW_RANDOM=y | 722 | CONFIG_HW_RANDOM=y |
752 | # CONFIG_GEN_RTC is not set | 723 | # CONFIG_GEN_RTC is not set |
753 | # CONFIG_R3964 is not set | 724 | # CONFIG_R3964 is not set |
754 | # CONFIG_RAW_DRIVER is not set | 725 | # CONFIG_RAW_DRIVER is not set |
755 | |||
756 | # | ||
757 | # TPM devices | ||
758 | # | ||
759 | # CONFIG_TCG_TPM is not set | 726 | # CONFIG_TCG_TPM is not set |
760 | CONFIG_I2C=y | 727 | CONFIG_I2C=y |
761 | CONFIG_I2C_BOARDINFO=y | 728 | CONFIG_I2C_BOARDINFO=y |
@@ -777,21 +744,24 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50 | |||
777 | # CONFIG_I2C_OCORES is not set | 744 | # CONFIG_I2C_OCORES is not set |
778 | # CONFIG_I2C_PARPORT_LIGHT is not set | 745 | # CONFIG_I2C_PARPORT_LIGHT is not set |
779 | # CONFIG_I2C_SIMTEC is not set | 746 | # CONFIG_I2C_SIMTEC is not set |
747 | # CONFIG_I2C_TAOS_EVM is not set | ||
780 | # CONFIG_I2C_STUB is not set | 748 | # CONFIG_I2C_STUB is not set |
749 | # CONFIG_I2C_TINY_USB is not set | ||
781 | 750 | ||
782 | # | 751 | # |
783 | # Miscellaneous I2C Chip support | 752 | # Miscellaneous I2C Chip support |
784 | # | 753 | # |
785 | # CONFIG_SENSORS_DS1337 is not set | 754 | # CONFIG_SENSORS_DS1337 is not set |
786 | # CONFIG_SENSORS_DS1374 is not set | 755 | # CONFIG_SENSORS_DS1374 is not set |
756 | # CONFIG_DS1682 is not set | ||
787 | # CONFIG_SENSORS_AD5252 is not set | 757 | # CONFIG_SENSORS_AD5252 is not set |
788 | # CONFIG_SENSORS_EEPROM is not set | 758 | # CONFIG_SENSORS_EEPROM is not set |
789 | # CONFIG_SENSORS_PCF8574 is not set | 759 | # CONFIG_SENSORS_PCF8574 is not set |
790 | # CONFIG_SENSORS_PCF8575 is not set | 760 | # CONFIG_SENSORS_PCF8575 is not set |
791 | # CONFIG_SENSORS_PCA9543 is not set | ||
792 | # CONFIG_SENSORS_PCA9539 is not set | 761 | # CONFIG_SENSORS_PCA9539 is not set |
793 | # CONFIG_SENSORS_PCF8591 is not set | 762 | # CONFIG_SENSORS_PCF8591 is not set |
794 | # CONFIG_SENSORS_MAX6875 is not set | 763 | # CONFIG_SENSORS_MAX6875 is not set |
764 | # CONFIG_SENSORS_TSL2550 is not set | ||
795 | # CONFIG_I2C_DEBUG_CORE is not set | 765 | # CONFIG_I2C_DEBUG_CORE is not set |
796 | # CONFIG_I2C_DEBUG_ALGO is not set | 766 | # CONFIG_I2C_DEBUG_ALGO is not set |
797 | # CONFIG_I2C_DEBUG_BUS is not set | 767 | # CONFIG_I2C_DEBUG_BUS is not set |
@@ -814,14 +784,11 @@ CONFIG_SPI_BFIN=y | |||
814 | # | 784 | # |
815 | # CONFIG_SPI_AT25 is not set | 785 | # CONFIG_SPI_AT25 is not set |
816 | # CONFIG_SPI_SPIDEV is not set | 786 | # CONFIG_SPI_SPIDEV is not set |
817 | 787 | # CONFIG_SPI_TLE62X0 is not set | |
818 | # | ||
819 | # Dallas's 1-wire bus | ||
820 | # | ||
821 | # CONFIG_W1 is not set | 788 | # CONFIG_W1 is not set |
789 | # CONFIG_POWER_SUPPLY is not set | ||
822 | CONFIG_HWMON=y | 790 | CONFIG_HWMON=y |
823 | # CONFIG_HWMON_VID is not set | 791 | # CONFIG_HWMON_VID is not set |
824 | # CONFIG_SENSORS_ABITUGURU is not set | ||
825 | # CONFIG_SENSORS_AD7418 is not set | 792 | # CONFIG_SENSORS_AD7418 is not set |
826 | # CONFIG_SENSORS_ADM1021 is not set | 793 | # CONFIG_SENSORS_ADM1021 is not set |
827 | # CONFIG_SENSORS_ADM1025 is not set | 794 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -829,12 +796,12 @@ CONFIG_HWMON=y | |||
829 | # CONFIG_SENSORS_ADM1029 is not set | 796 | # CONFIG_SENSORS_ADM1029 is not set |
830 | # CONFIG_SENSORS_ADM1031 is not set | 797 | # CONFIG_SENSORS_ADM1031 is not set |
831 | # CONFIG_SENSORS_ADM9240 is not set | 798 | # CONFIG_SENSORS_ADM9240 is not set |
832 | # CONFIG_SENSORS_ASB100 is not set | 799 | # CONFIG_SENSORS_ADT7470 is not set |
833 | # CONFIG_SENSORS_ATXP1 is not set | 800 | # CONFIG_SENSORS_ATXP1 is not set |
834 | # CONFIG_SENSORS_DS1621 is not set | 801 | # CONFIG_SENSORS_DS1621 is not set |
835 | # CONFIG_SENSORS_F71805F is not set | 802 | # CONFIG_SENSORS_F71805F is not set |
836 | # CONFIG_SENSORS_FSCHER is not set | 803 | # CONFIG_SENSORS_F71882FG is not set |
837 | # CONFIG_SENSORS_FSCPOS is not set | 804 | # CONFIG_SENSORS_F75375S is not set |
838 | # CONFIG_SENSORS_GL518SM is not set | 805 | # CONFIG_SENSORS_GL518SM is not set |
839 | # CONFIG_SENSORS_GL520SM is not set | 806 | # CONFIG_SENSORS_GL520SM is not set |
840 | # CONFIG_SENSORS_IT87 is not set | 807 | # CONFIG_SENSORS_IT87 is not set |
@@ -849,13 +816,16 @@ CONFIG_HWMON=y | |||
849 | # CONFIG_SENSORS_LM87 is not set | 816 | # CONFIG_SENSORS_LM87 is not set |
850 | # CONFIG_SENSORS_LM90 is not set | 817 | # CONFIG_SENSORS_LM90 is not set |
851 | # CONFIG_SENSORS_LM92 is not set | 818 | # CONFIG_SENSORS_LM92 is not set |
819 | # CONFIG_SENSORS_LM93 is not set | ||
852 | # CONFIG_SENSORS_MAX1619 is not set | 820 | # CONFIG_SENSORS_MAX1619 is not set |
853 | # CONFIG_SENSORS_MAX6650 is not set | 821 | # CONFIG_SENSORS_MAX6650 is not set |
854 | # CONFIG_SENSORS_PC87360 is not set | 822 | # CONFIG_SENSORS_PC87360 is not set |
855 | # CONFIG_SENSORS_PC87427 is not set | 823 | # CONFIG_SENSORS_PC87427 is not set |
824 | # CONFIG_SENSORS_DME1737 is not set | ||
856 | # CONFIG_SENSORS_SMSC47M1 is not set | 825 | # CONFIG_SENSORS_SMSC47M1 is not set |
857 | # CONFIG_SENSORS_SMSC47M192 is not set | 826 | # CONFIG_SENSORS_SMSC47M192 is not set |
858 | # CONFIG_SENSORS_SMSC47B397 is not set | 827 | # CONFIG_SENSORS_SMSC47B397 is not set |
828 | # CONFIG_SENSORS_THMC50 is not set | ||
859 | # CONFIG_SENSORS_VT1211 is not set | 829 | # CONFIG_SENSORS_VT1211 is not set |
860 | # CONFIG_SENSORS_W83781D is not set | 830 | # CONFIG_SENSORS_W83781D is not set |
861 | # CONFIG_SENSORS_W83791D is not set | 831 | # CONFIG_SENSORS_W83791D is not set |
@@ -865,6 +835,25 @@ CONFIG_HWMON=y | |||
865 | # CONFIG_SENSORS_W83627HF is not set | 835 | # CONFIG_SENSORS_W83627HF is not set |
866 | # CONFIG_SENSORS_W83627EHF is not set | 836 | # CONFIG_SENSORS_W83627EHF is not set |
867 | # CONFIG_HWMON_DEBUG_CHIP is not set | 837 | # CONFIG_HWMON_DEBUG_CHIP is not set |
838 | CONFIG_WATCHDOG=y | ||
839 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
840 | |||
841 | # | ||
842 | # Watchdog Device Drivers | ||
843 | # | ||
844 | # CONFIG_SOFT_WATCHDOG is not set | ||
845 | CONFIG_BFIN_WDT=y | ||
846 | |||
847 | # | ||
848 | # USB-based Watchdog Cards | ||
849 | # | ||
850 | # CONFIG_USBPCWATCHDOG is not set | ||
851 | |||
852 | # | ||
853 | # Sonics Silicon Backplane | ||
854 | # | ||
855 | CONFIG_SSB_POSSIBLE=y | ||
856 | # CONFIG_SSB is not set | ||
868 | 857 | ||
869 | # | 858 | # |
870 | # Multifunction device drivers | 859 | # Multifunction device drivers |
@@ -881,72 +870,133 @@ CONFIG_HWMON=y | |||
881 | # | 870 | # |
882 | # Graphics support | 871 | # Graphics support |
883 | # | 872 | # |
873 | # CONFIG_VGASTATE is not set | ||
874 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
875 | # CONFIG_FB is not set | ||
884 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 876 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
885 | 877 | ||
886 | # | 878 | # |
887 | # Display device support | 879 | # Display device support |
888 | # | 880 | # |
889 | # CONFIG_DISPLAY_SUPPORT is not set | 881 | # CONFIG_DISPLAY_SUPPORT is not set |
890 | # CONFIG_VGASTATE is not set | ||
891 | # CONFIG_FB is not set | ||
892 | 882 | ||
893 | # | 883 | # |
894 | # Sound | 884 | # Sound |
895 | # | 885 | # |
896 | # CONFIG_SOUND is not set | 886 | # CONFIG_SOUND is not set |
897 | 887 | CONFIG_HID_SUPPORT=y | |
898 | # | ||
899 | # HID Devices | ||
900 | # | ||
901 | CONFIG_HID=y | 888 | CONFIG_HID=y |
902 | # CONFIG_HID_DEBUG is not set | 889 | # CONFIG_HID_DEBUG is not set |
890 | # CONFIG_HIDRAW is not set | ||
903 | 891 | ||
904 | # | 892 | # |
905 | # USB support | 893 | # USB Input Devices |
906 | # | 894 | # |
895 | CONFIG_USB_HID=y | ||
896 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
897 | # CONFIG_HID_FF is not set | ||
898 | # CONFIG_USB_HIDDEV is not set | ||
899 | CONFIG_USB_SUPPORT=y | ||
907 | CONFIG_USB_ARCH_HAS_HCD=y | 900 | CONFIG_USB_ARCH_HAS_HCD=y |
908 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 901 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
909 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 902 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
910 | # CONFIG_USB is not set | 903 | CONFIG_USB=y |
904 | # CONFIG_USB_DEBUG is not set | ||
905 | |||
906 | # | ||
907 | # Miscellaneous USB options | ||
908 | # | ||
909 | # CONFIG_USB_DEVICEFS is not set | ||
910 | CONFIG_USB_DEVICE_CLASS=y | ||
911 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
912 | # CONFIG_USB_OTG is not set | ||
913 | # CONFIG_USB_OTG_WHITELIST is not set | ||
914 | CONFIG_USB_OTG_BLACKLIST_HUB=y | ||
915 | |||
916 | # | ||
917 | # USB Host Controller Drivers | ||
918 | # | ||
919 | # CONFIG_USB_ISP116X_HCD is not set | ||
920 | # CONFIG_USB_ISP1362_HCD is not set | ||
921 | # CONFIG_USB_ISP1760_HCD is not set | ||
922 | # CONFIG_USB_SL811_HCD is not set | ||
923 | # CONFIG_USB_R8A66597_HCD is not set | ||
924 | CONFIG_USB_MUSB_HDRC=y | ||
925 | CONFIG_USB_MUSB_SOC=y | ||
911 | 926 | ||
912 | # | 927 | # |
913 | # Enable Host or Gadget support to see Inventra options | 928 | # Blackfin high speed USB support |
914 | # | 929 | # |
930 | CONFIG_USB_MUSB_HOST=y | ||
931 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
932 | # CONFIG_USB_MUSB_OTG is not set | ||
933 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
934 | CONFIG_MUSB_PIO_ONLY=y | ||
935 | CONFIG_USB_MUSB_LOGLEVEL=0 | ||
936 | |||
937 | # | ||
938 | # USB Device Class drivers | ||
939 | # | ||
940 | # CONFIG_USB_ACM is not set | ||
941 | # CONFIG_USB_PRINTER is not set | ||
915 | 942 | ||
916 | # | 943 | # |
917 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 944 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
918 | # | 945 | # |
919 | 946 | ||
920 | # | 947 | # |
921 | # USB Gadget Support | 948 | # may also be needed; see USB_STORAGE Help for more information |
922 | # | 949 | # |
923 | # CONFIG_USB_GADGET is not set | 950 | # CONFIG_USB_LIBUSUAL is not set |
924 | # CONFIG_MMC is not set | ||
925 | 951 | ||
926 | # | 952 | # |
927 | # LED devices | 953 | # USB Imaging devices |
928 | # | 954 | # |
929 | # CONFIG_NEW_LEDS is not set | 955 | # CONFIG_USB_MDC800 is not set |
956 | CONFIG_USB_MON=y | ||
930 | 957 | ||
931 | # | 958 | # |
932 | # LED drivers | 959 | # USB port drivers |
933 | # | 960 | # |
934 | 961 | ||
935 | # | 962 | # |
936 | # LED Triggers | 963 | # USB Serial Converter support |
937 | # | 964 | # |
965 | # CONFIG_USB_SERIAL is not set | ||
938 | 966 | ||
939 | # | 967 | # |
940 | # InfiniBand support | 968 | # USB Miscellaneous drivers |
941 | # | 969 | # |
970 | # CONFIG_USB_EMI62 is not set | ||
971 | # CONFIG_USB_EMI26 is not set | ||
972 | # CONFIG_USB_ADUTUX is not set | ||
973 | # CONFIG_USB_AUERSWALD is not set | ||
974 | # CONFIG_USB_RIO500 is not set | ||
975 | # CONFIG_USB_LEGOTOWER is not set | ||
976 | # CONFIG_USB_LCD is not set | ||
977 | # CONFIG_USB_BERRY_CHARGE is not set | ||
978 | # CONFIG_USB_LED is not set | ||
979 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
980 | # CONFIG_USB_CYTHERM is not set | ||
981 | # CONFIG_USB_PHIDGET is not set | ||
982 | # CONFIG_USB_IDMOUSE is not set | ||
983 | # CONFIG_USB_FTDI_ELAN is not set | ||
984 | # CONFIG_USB_APPLEDISPLAY is not set | ||
985 | # CONFIG_USB_SISUSBVGA is not set | ||
986 | # CONFIG_USB_LD is not set | ||
987 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
988 | # CONFIG_USB_IOWARRIOR is not set | ||
942 | 989 | ||
943 | # | 990 | # |
944 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 991 | # USB DSL modem support |
945 | # | 992 | # |
946 | 993 | ||
947 | # | 994 | # |
948 | # Real Time Clock | 995 | # USB Gadget Support |
949 | # | 996 | # |
997 | # CONFIG_USB_GADGET is not set | ||
998 | # CONFIG_MMC is not set | ||
999 | # CONFIG_NEW_LEDS is not set | ||
950 | CONFIG_RTC_LIB=y | 1000 | CONFIG_RTC_LIB=y |
951 | CONFIG_RTC_CLASS=y | 1001 | CONFIG_RTC_CLASS=y |
952 | CONFIG_RTC_HCTOSYS=y | 1002 | CONFIG_RTC_HCTOSYS=y |
@@ -966,6 +1016,7 @@ CONFIG_RTC_INTF_DEV=y | |||
966 | # I2C RTC drivers | 1016 | # I2C RTC drivers |
967 | # | 1017 | # |
968 | # CONFIG_RTC_DRV_DS1307 is not set | 1018 | # CONFIG_RTC_DRV_DS1307 is not set |
1019 | # CONFIG_RTC_DRV_DS1374 is not set | ||
969 | # CONFIG_RTC_DRV_DS1672 is not set | 1020 | # CONFIG_RTC_DRV_DS1672 is not set |
970 | # CONFIG_RTC_DRV_MAX6900 is not set | 1021 | # CONFIG_RTC_DRV_MAX6900 is not set |
971 | # CONFIG_RTC_DRV_RS5C372 is not set | 1022 | # CONFIG_RTC_DRV_RS5C372 is not set |
@@ -973,6 +1024,7 @@ CONFIG_RTC_INTF_DEV=y | |||
973 | # CONFIG_RTC_DRV_X1205 is not set | 1024 | # CONFIG_RTC_DRV_X1205 is not set |
974 | # CONFIG_RTC_DRV_PCF8563 is not set | 1025 | # CONFIG_RTC_DRV_PCF8563 is not set |
975 | # CONFIG_RTC_DRV_PCF8583 is not set | 1026 | # CONFIG_RTC_DRV_PCF8583 is not set |
1027 | # CONFIG_RTC_DRV_M41T80 is not set | ||
976 | 1028 | ||
977 | # | 1029 | # |
978 | # SPI RTC drivers | 1030 | # SPI RTC drivers |
@@ -984,8 +1036,10 @@ CONFIG_RTC_INTF_DEV=y | |||
984 | # Platform RTC drivers | 1036 | # Platform RTC drivers |
985 | # | 1037 | # |
986 | # CONFIG_RTC_DRV_DS1553 is not set | 1038 | # CONFIG_RTC_DRV_DS1553 is not set |
1039 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
987 | # CONFIG_RTC_DRV_DS1742 is not set | 1040 | # CONFIG_RTC_DRV_DS1742 is not set |
988 | # CONFIG_RTC_DRV_M48T86 is not set | 1041 | # CONFIG_RTC_DRV_M48T86 is not set |
1042 | # CONFIG_RTC_DRV_M48T59 is not set | ||
989 | # CONFIG_RTC_DRV_V3020 is not set | 1043 | # CONFIG_RTC_DRV_V3020 is not set |
990 | 1044 | ||
991 | # | 1045 | # |
@@ -994,22 +1048,9 @@ CONFIG_RTC_INTF_DEV=y | |||
994 | CONFIG_RTC_DRV_BFIN=y | 1048 | CONFIG_RTC_DRV_BFIN=y |
995 | 1049 | ||
996 | # | 1050 | # |
997 | # DMA Engine support | 1051 | # Userspace I/O |
998 | # | ||
999 | # CONFIG_DMA_ENGINE is not set | ||
1000 | |||
1001 | # | ||
1002 | # DMA Clients | ||
1003 | # | 1052 | # |
1004 | 1053 | # CONFIG_UIO is not set | |
1005 | # | ||
1006 | # DMA Devices | ||
1007 | # | ||
1008 | |||
1009 | # | ||
1010 | # PBX support | ||
1011 | # | ||
1012 | # CONFIG_PBX is not set | ||
1013 | 1054 | ||
1014 | # | 1055 | # |
1015 | # File systems | 1056 | # File systems |
@@ -1054,7 +1095,6 @@ CONFIG_PROC_SYSCTL=y | |||
1054 | CONFIG_SYSFS=y | 1095 | CONFIG_SYSFS=y |
1055 | # CONFIG_TMPFS is not set | 1096 | # CONFIG_TMPFS is not set |
1056 | # CONFIG_HUGETLB_PAGE is not set | 1097 | # CONFIG_HUGETLB_PAGE is not set |
1057 | CONFIG_RAMFS=y | ||
1058 | # CONFIG_CONFIGFS_FS is not set | 1098 | # CONFIG_CONFIGFS_FS is not set |
1059 | 1099 | ||
1060 | # | 1100 | # |
@@ -1080,10 +1120,12 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y | |||
1080 | CONFIG_JFFS2_FS=m | 1120 | CONFIG_JFFS2_FS=m |
1081 | CONFIG_JFFS2_FS_DEBUG=0 | 1121 | CONFIG_JFFS2_FS_DEBUG=0 |
1082 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1122 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
1123 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1083 | # CONFIG_JFFS2_SUMMARY is not set | 1124 | # CONFIG_JFFS2_SUMMARY is not set |
1084 | # CONFIG_JFFS2_FS_XATTR is not set | 1125 | # CONFIG_JFFS2_FS_XATTR is not set |
1085 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1126 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
1086 | CONFIG_JFFS2_ZLIB=y | 1127 | CONFIG_JFFS2_ZLIB=y |
1128 | # CONFIG_JFFS2_LZO is not set | ||
1087 | CONFIG_JFFS2_RTIME=y | 1129 | CONFIG_JFFS2_RTIME=y |
1088 | # CONFIG_JFFS2_RUBIN is not set | 1130 | # CONFIG_JFFS2_RUBIN is not set |
1089 | # CONFIG_CRAMFS is not set | 1131 | # CONFIG_CRAMFS is not set |
@@ -1092,10 +1134,7 @@ CONFIG_JFFS2_RTIME=y | |||
1092 | # CONFIG_QNX4FS_FS is not set | 1134 | # CONFIG_QNX4FS_FS is not set |
1093 | # CONFIG_SYSV_FS is not set | 1135 | # CONFIG_SYSV_FS is not set |
1094 | # CONFIG_UFS_FS is not set | 1136 | # CONFIG_UFS_FS is not set |
1095 | 1137 | CONFIG_NETWORK_FILESYSTEMS=y | |
1096 | # | ||
1097 | # Network File Systems | ||
1098 | # | ||
1099 | CONFIG_NFS_FS=m | 1138 | CONFIG_NFS_FS=m |
1100 | CONFIG_NFS_V3=y | 1139 | CONFIG_NFS_V3=y |
1101 | # CONFIG_NFS_V3_ACL is not set | 1140 | # CONFIG_NFS_V3_ACL is not set |
@@ -1115,17 +1154,12 @@ CONFIG_SMB_FS=m | |||
1115 | # CONFIG_NCP_FS is not set | 1154 | # CONFIG_NCP_FS is not set |
1116 | # CONFIG_CODA_FS is not set | 1155 | # CONFIG_CODA_FS is not set |
1117 | # CONFIG_AFS_FS is not set | 1156 | # CONFIG_AFS_FS is not set |
1118 | # CONFIG_9P_FS is not set | ||
1119 | 1157 | ||
1120 | # | 1158 | # |
1121 | # Partition Types | 1159 | # Partition Types |
1122 | # | 1160 | # |
1123 | # CONFIG_PARTITION_ADVANCED is not set | 1161 | # CONFIG_PARTITION_ADVANCED is not set |
1124 | CONFIG_MSDOS_PARTITION=y | 1162 | CONFIG_MSDOS_PARTITION=y |
1125 | |||
1126 | # | ||
1127 | # Native Language Support | ||
1128 | # | ||
1129 | CONFIG_NLS=m | 1163 | CONFIG_NLS=m |
1130 | CONFIG_NLS_DEFAULT="iso8859-1" | 1164 | CONFIG_NLS_DEFAULT="iso8859-1" |
1131 | # CONFIG_NLS_CODEPAGE_437 is not set | 1165 | # CONFIG_NLS_CODEPAGE_437 is not set |
@@ -1166,21 +1200,16 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1166 | # CONFIG_NLS_KOI8_R is not set | 1200 | # CONFIG_NLS_KOI8_R is not set |
1167 | # CONFIG_NLS_KOI8_U is not set | 1201 | # CONFIG_NLS_KOI8_U is not set |
1168 | # CONFIG_NLS_UTF8 is not set | 1202 | # CONFIG_NLS_UTF8 is not set |
1169 | |||
1170 | # | ||
1171 | # Distributed Lock Manager | ||
1172 | # | ||
1173 | # CONFIG_DLM is not set | 1203 | # CONFIG_DLM is not set |
1174 | 1204 | CONFIG_INSTRUMENTATION=y | |
1175 | # | ||
1176 | # Profiling support | ||
1177 | # | ||
1178 | # CONFIG_PROFILING is not set | 1205 | # CONFIG_PROFILING is not set |
1206 | # CONFIG_MARKERS is not set | ||
1179 | 1207 | ||
1180 | # | 1208 | # |
1181 | # Kernel hacking | 1209 | # Kernel hacking |
1182 | # | 1210 | # |
1183 | # CONFIG_PRINTK_TIME is not set | 1211 | # CONFIG_PRINTK_TIME is not set |
1212 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1184 | CONFIG_ENABLE_MUST_CHECK=y | 1213 | CONFIG_ENABLE_MUST_CHECK=y |
1185 | # CONFIG_MAGIC_SYSRQ is not set | 1214 | # CONFIG_MAGIC_SYSRQ is not set |
1186 | # CONFIG_UNUSED_SYMBOLS is not set | 1215 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -1188,6 +1217,7 @@ CONFIG_DEBUG_FS=y | |||
1188 | # CONFIG_HEADERS_CHECK is not set | 1217 | # CONFIG_HEADERS_CHECK is not set |
1189 | # CONFIG_DEBUG_KERNEL is not set | 1218 | # CONFIG_DEBUG_KERNEL is not set |
1190 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1219 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1220 | # CONFIG_SAMPLES is not set | ||
1191 | CONFIG_DEBUG_MMRS=y | 1221 | CONFIG_DEBUG_MMRS=y |
1192 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | 1222 | CONFIG_DEBUG_HUNT_FOR_ZERO=y |
1193 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | 1223 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y |
@@ -1207,11 +1237,8 @@ CONFIG_ACCESS_CHECK=y | |||
1207 | # CONFIG_KEYS is not set | 1237 | # CONFIG_KEYS is not set |
1208 | CONFIG_SECURITY=y | 1238 | CONFIG_SECURITY=y |
1209 | # CONFIG_SECURITY_NETWORK is not set | 1239 | # CONFIG_SECURITY_NETWORK is not set |
1210 | CONFIG_SECURITY_CAPABILITIES=m | 1240 | # CONFIG_SECURITY_CAPABILITIES is not set |
1211 | 1241 | # CONFIG_SECURITY_ROOTPLUG is not set | |
1212 | # | ||
1213 | # Cryptographic options | ||
1214 | # | ||
1215 | # CONFIG_CRYPTO is not set | 1242 | # CONFIG_CRYPTO is not set |
1216 | 1243 | ||
1217 | # | 1244 | # |
@@ -1222,6 +1249,7 @@ CONFIG_CRC_CCITT=m | |||
1222 | # CONFIG_CRC16 is not set | 1249 | # CONFIG_CRC16 is not set |
1223 | # CONFIG_CRC_ITU_T is not set | 1250 | # CONFIG_CRC_ITU_T is not set |
1224 | CONFIG_CRC32=y | 1251 | CONFIG_CRC32=y |
1252 | # CONFIG_CRC7 is not set | ||
1225 | # CONFIG_LIBCRC32C is not set | 1253 | # CONFIG_LIBCRC32C is not set |
1226 | CONFIG_ZLIB_INFLATE=y | 1254 | CONFIG_ZLIB_INFLATE=y |
1227 | CONFIG_ZLIB_DEFLATE=m | 1255 | CONFIG_ZLIB_DEFLATE=m |
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig index 5bfdfb287d13..1ff2ff4b49aa 100644 --- a/arch/blackfin/configs/BF548-EZKIT_defconfig +++ b/arch/blackfin/configs/BF548-EZKIT_defconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.22.16 | 3 | # Linux kernel version: 2.6.24.7 |
4 | # | 4 | # |
5 | # CONFIG_MMU is not set | 5 | # CONFIG_MMU is not set |
6 | # CONFIG_FPU is not set | 6 | # CONFIG_FPU is not set |
@@ -13,35 +13,34 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
13 | CONFIG_GENERIC_HWEIGHT=y | 13 | CONFIG_GENERIC_HWEIGHT=y |
14 | CONFIG_GENERIC_HARDIRQS=y | 14 | CONFIG_GENERIC_HARDIRQS=y |
15 | CONFIG_GENERIC_IRQ_PROBE=y | 15 | CONFIG_GENERIC_IRQ_PROBE=y |
16 | CONFIG_GENERIC_TIME=y | ||
17 | CONFIG_GENERIC_GPIO=y | 16 | CONFIG_GENERIC_GPIO=y |
18 | CONFIG_FORCE_MAX_ZONEORDER=14 | 17 | CONFIG_FORCE_MAX_ZONEORDER=14 |
19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 18 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
21 | 20 | ||
22 | # | 21 | # |
23 | # Code maturity level options | 22 | # General setup |
24 | # | 23 | # |
25 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
26 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
28 | |||
29 | # | ||
30 | # General setup | ||
31 | # | ||
32 | CONFIG_LOCALVERSION="" | 27 | CONFIG_LOCALVERSION="" |
33 | CONFIG_LOCALVERSION_AUTO=y | 28 | CONFIG_LOCALVERSION_AUTO=y |
34 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
35 | # CONFIG_IPC_NS is not set | ||
36 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
37 | # CONFIG_POSIX_MQUEUE is not set | 31 | # CONFIG_POSIX_MQUEUE is not set |
38 | # CONFIG_BSD_PROCESS_ACCT is not set | 32 | # CONFIG_BSD_PROCESS_ACCT is not set |
39 | # CONFIG_TASKSTATS is not set | 33 | # CONFIG_TASKSTATS is not set |
40 | # CONFIG_UTS_NS is not set | 34 | # CONFIG_USER_NS is not set |
35 | # CONFIG_PID_NS is not set | ||
41 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
42 | CONFIG_IKCONFIG=y | 37 | CONFIG_IKCONFIG=y |
43 | CONFIG_IKCONFIG_PROC=y | 38 | CONFIG_IKCONFIG_PROC=y |
44 | CONFIG_LOG_BUF_SHIFT=14 | 39 | CONFIG_LOG_BUF_SHIFT=14 |
40 | # CONFIG_CGROUPS is not set | ||
41 | CONFIG_FAIR_GROUP_SCHED=y | ||
42 | CONFIG_FAIR_USER_SCHED=y | ||
43 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
45 | CONFIG_SYSFS_DEPRECATED=y | 44 | CONFIG_SYSFS_DEPRECATED=y |
46 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
47 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
@@ -64,32 +63,24 @@ CONFIG_EPOLL=y | |||
64 | CONFIG_SIGNALFD=y | 63 | CONFIG_SIGNALFD=y |
65 | CONFIG_EVENTFD=y | 64 | CONFIG_EVENTFD=y |
66 | CONFIG_VM_EVENT_COUNTERS=y | 65 | CONFIG_VM_EVENT_COUNTERS=y |
67 | CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 | ||
68 | # CONFIG_NP2 is not set | ||
69 | CONFIG_SLAB=y | 66 | CONFIG_SLAB=y |
70 | # CONFIG_SLUB is not set | 67 | # CONFIG_SLUB is not set |
71 | # CONFIG_SLOB is not set | 68 | # CONFIG_SLOB is not set |
69 | CONFIG_SLABINFO=y | ||
72 | CONFIG_RT_MUTEXES=y | 70 | CONFIG_RT_MUTEXES=y |
73 | CONFIG_TINY_SHMEM=y | 71 | CONFIG_TINY_SHMEM=y |
74 | CONFIG_BASE_SMALL=0 | 72 | CONFIG_BASE_SMALL=0 |
75 | |||
76 | # | ||
77 | # Loadable module support | ||
78 | # | ||
79 | CONFIG_MODULES=y | 73 | CONFIG_MODULES=y |
80 | CONFIG_MODULE_UNLOAD=y | 74 | CONFIG_MODULE_UNLOAD=y |
81 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 75 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
82 | # CONFIG_MODVERSIONS is not set | 76 | # CONFIG_MODVERSIONS is not set |
83 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 77 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
84 | CONFIG_KMOD=y | 78 | CONFIG_KMOD=y |
85 | |||
86 | # | ||
87 | # Block layer | ||
88 | # | ||
89 | CONFIG_BLOCK=y | 79 | CONFIG_BLOCK=y |
90 | # CONFIG_LBD is not set | 80 | # CONFIG_LBD is not set |
91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 81 | # CONFIG_BLK_DEV_IO_TRACE is not set |
92 | # CONFIG_LSF is not set | 82 | # CONFIG_LSF is not set |
83 | # CONFIG_BLK_DEV_BSG is not set | ||
93 | 84 | ||
94 | # | 85 | # |
95 | # IO Schedulers | 86 | # IO Schedulers |
@@ -141,7 +132,6 @@ CONFIG_BF_REV_0_0=y | |||
141 | # CONFIG_BF_REV_ANY is not set | 132 | # CONFIG_BF_REV_ANY is not set |
142 | # CONFIG_BF_REV_NONE is not set | 133 | # CONFIG_BF_REV_NONE is not set |
143 | CONFIG_BF54x=y | 134 | CONFIG_BF54x=y |
144 | CONFIG_BFIN_SINGLE_CORE=y | ||
145 | CONFIG_IRQ_PLL_WAKEUP=7 | 135 | CONFIG_IRQ_PLL_WAKEUP=7 |
146 | CONFIG_IRQ_RTC=8 | 136 | CONFIG_IRQ_RTC=8 |
147 | CONFIG_IRQ_SPORT0_RX=9 | 137 | CONFIG_IRQ_SPORT0_RX=9 |
@@ -169,6 +159,7 @@ CONFIG_IRQ_TIMER8=11 | |||
169 | CONFIG_IRQ_TIMER9=11 | 159 | CONFIG_IRQ_TIMER9=11 |
170 | CONFIG_IRQ_TIMER10=11 | 160 | CONFIG_IRQ_TIMER10=11 |
171 | CONFIG_BFIN548_EZKIT=y | 161 | CONFIG_BFIN548_EZKIT=y |
162 | # CONFIG_BFIN548_BLUETECHNIX_CM is not set | ||
172 | 163 | ||
173 | # | 164 | # |
174 | # BF548 Specific Configuration | 165 | # BF548 Specific Configuration |
@@ -262,12 +253,14 @@ CONFIG_PINT3_ASSIGN=0x02020303 | |||
262 | # Board customizations | 253 | # Board customizations |
263 | # | 254 | # |
264 | # CONFIG_CMDLINE_BOOL is not set | 255 | # CONFIG_CMDLINE_BOOL is not set |
256 | CONFIG_BOOT_LOAD=0x1000 | ||
265 | 257 | ||
266 | # | 258 | # |
267 | # Clock/PLL Setup | 259 | # Clock/PLL Setup |
268 | # | 260 | # |
269 | CONFIG_CLKIN_HZ=25000000 | 261 | CONFIG_CLKIN_HZ=25000000 |
270 | # CONFIG_BFIN_KERNEL_CLOCK is not set | 262 | # CONFIG_BFIN_KERNEL_CLOCK is not set |
263 | CONFIG_MAX_MEM_SIZE=512 | ||
271 | CONFIG_MAX_VCO_HZ=600000000 | 264 | CONFIG_MAX_VCO_HZ=600000000 |
272 | CONFIG_MIN_VCO_HZ=50000000 | 265 | CONFIG_MIN_VCO_HZ=50000000 |
273 | CONFIG_MAX_SCLK_HZ=133333333 | 266 | CONFIG_MAX_SCLK_HZ=133333333 |
@@ -281,14 +274,17 @@ CONFIG_HZ_250=y | |||
281 | # CONFIG_HZ_300 is not set | 274 | # CONFIG_HZ_300 is not set |
282 | # CONFIG_HZ_1000 is not set | 275 | # CONFIG_HZ_1000 is not set |
283 | CONFIG_HZ=250 | 276 | CONFIG_HZ=250 |
277 | CONFIG_GENERIC_TIME=y | ||
278 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
279 | # CONFIG_CYCLES_CLOCKSOURCE is not set | ||
280 | # CONFIG_TICK_ONESHOT is not set | ||
281 | # CONFIG_NO_HZ is not set | ||
282 | # CONFIG_HIGH_RES_TIMERS is not set | ||
283 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
284 | 284 | ||
285 | # | 285 | # |
286 | # Memory Setup | 286 | # Misc |
287 | # | 287 | # |
288 | CONFIG_MAX_MEM_SIZE=512 | ||
289 | # CONFIG_MEM_MT46V32M16_6T is not set | ||
290 | CONFIG_MEM_MT46V32M16_5B=y | ||
291 | CONFIG_BOOT_LOAD=0x1000 | ||
292 | CONFIG_BFIN_SCRATCH_REG_RETN=y | 288 | CONFIG_BFIN_SCRATCH_REG_RETN=y |
293 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set | 289 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set |
294 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set | 290 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set |
@@ -324,12 +320,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
324 | CONFIG_FLATMEM=y | 320 | CONFIG_FLATMEM=y |
325 | CONFIG_FLAT_NODE_MEM_MAP=y | 321 | CONFIG_FLAT_NODE_MEM_MAP=y |
326 | # CONFIG_SPARSEMEM_STATIC is not set | 322 | # CONFIG_SPARSEMEM_STATIC is not set |
323 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
327 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 324 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
328 | # CONFIG_RESOURCES_64BIT is not set | 325 | # CONFIG_RESOURCES_64BIT is not set |
329 | CONFIG_ZONE_DMA_FLAG=1 | 326 | CONFIG_ZONE_DMA_FLAG=1 |
330 | CONFIG_LARGE_ALLOCS=y | 327 | CONFIG_VIRT_TO_BUS=y |
331 | # CONFIG_BFIN_GPTIMERS is not set | 328 | # CONFIG_BFIN_GPTIMERS is not set |
332 | CONFIG_BFIN_DMA_5XX=y | 329 | CONFIG_BFIN_DMA_5XX=y |
330 | # CONFIG_DMA_UNCACHED_4M is not set | ||
333 | CONFIG_DMA_UNCACHED_2M=y | 331 | CONFIG_DMA_UNCACHED_2M=y |
334 | # CONFIG_DMA_UNCACHED_1M is not set | 332 | # CONFIG_DMA_UNCACHED_1M is not set |
335 | # CONFIG_DMA_UNCACHED_NONE is not set | 333 | # CONFIG_DMA_UNCACHED_NONE is not set |
@@ -377,10 +375,6 @@ CONFIG_EBIU_FCTLVAL=0x6 | |||
377 | # | 375 | # |
378 | # CONFIG_PCI is not set | 376 | # CONFIG_PCI is not set |
379 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 377 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
380 | |||
381 | # | ||
382 | # PCCARD (PCMCIA/CardBus) support | ||
383 | # | ||
384 | # CONFIG_PCCARD is not set | 378 | # CONFIG_PCCARD is not set |
385 | 379 | ||
386 | # | 380 | # |
@@ -396,6 +390,7 @@ CONFIG_BINFMT_ZFLAT=y | |||
396 | # Power management options | 390 | # Power management options |
397 | # | 391 | # |
398 | # CONFIG_PM is not set | 392 | # CONFIG_PM is not set |
393 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
399 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | 394 | # CONFIG_PM_WAKEUP_BY_GPIO is not set |
400 | 395 | ||
401 | # | 396 | # |
@@ -439,6 +434,7 @@ CONFIG_SYN_COOKIES=y | |||
439 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 434 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
440 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 435 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
441 | CONFIG_INET_XFRM_MODE_BEET=y | 436 | CONFIG_INET_XFRM_MODE_BEET=y |
437 | # CONFIG_INET_LRO is not set | ||
442 | CONFIG_INET_DIAG=y | 438 | CONFIG_INET_DIAG=y |
443 | CONFIG_INET_TCP_DIAG=y | 439 | CONFIG_INET_TCP_DIAG=y |
444 | # CONFIG_TCP_CONG_ADVANCED is not set | 440 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -465,10 +461,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
465 | # CONFIG_LAPB is not set | 461 | # CONFIG_LAPB is not set |
466 | # CONFIG_ECONET is not set | 462 | # CONFIG_ECONET is not set |
467 | # CONFIG_WAN_ROUTER is not set | 463 | # CONFIG_WAN_ROUTER is not set |
468 | |||
469 | # | ||
470 | # QoS and/or fair queueing | ||
471 | # | ||
472 | # CONFIG_NET_SCHED is not set | 464 | # CONFIG_NET_SCHED is not set |
473 | 465 | ||
474 | # | 466 | # |
@@ -488,6 +480,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
488 | # CONFIG_MAC80211 is not set | 480 | # CONFIG_MAC80211 is not set |
489 | # CONFIG_IEEE80211 is not set | 481 | # CONFIG_IEEE80211 is not set |
490 | # CONFIG_RFKILL is not set | 482 | # CONFIG_RFKILL is not set |
483 | # CONFIG_NET_9P is not set | ||
491 | 484 | ||
492 | # | 485 | # |
493 | # Device Drivers | 486 | # Device Drivers |
@@ -496,14 +489,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
496 | # | 489 | # |
497 | # Generic Driver Options | 490 | # Generic Driver Options |
498 | # | 491 | # |
492 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
499 | CONFIG_STANDALONE=y | 493 | CONFIG_STANDALONE=y |
500 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 494 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
501 | # CONFIG_FW_LOADER is not set | 495 | # CONFIG_FW_LOADER is not set |
502 | # CONFIG_SYS_HYPERVISOR is not set | 496 | # CONFIG_SYS_HYPERVISOR is not set |
503 | |||
504 | # | ||
505 | # Connector - unified userspace <-> kernelspace linker | ||
506 | # | ||
507 | # CONFIG_CONNECTOR is not set | 497 | # CONFIG_CONNECTOR is not set |
508 | CONFIG_MTD=y | 498 | CONFIG_MTD=y |
509 | # CONFIG_MTD_DEBUG is not set | 499 | # CONFIG_MTD_DEBUG is not set |
@@ -523,6 +513,7 @@ CONFIG_MTD_BLOCK=y | |||
523 | # CONFIG_INFTL is not set | 513 | # CONFIG_INFTL is not set |
524 | # CONFIG_RFD_FTL is not set | 514 | # CONFIG_RFD_FTL is not set |
525 | # CONFIG_SSFDC is not set | 515 | # CONFIG_SSFDC is not set |
516 | # CONFIG_MTD_OOPS is not set | ||
526 | 517 | ||
527 | # | 518 | # |
528 | # RAM/ROM/Flash chip drivers | 519 | # RAM/ROM/Flash chip drivers |
@@ -587,39 +578,27 @@ CONFIG_MTD_NAND_BF5XX_HWECC=y | |||
587 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 578 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
588 | # CONFIG_MTD_NAND_NANDSIM is not set | 579 | # CONFIG_MTD_NAND_NANDSIM is not set |
589 | # CONFIG_MTD_NAND_PLATFORM is not set | 580 | # CONFIG_MTD_NAND_PLATFORM is not set |
581 | # CONFIG_MTD_ALAUDA is not set | ||
590 | # CONFIG_MTD_ONENAND is not set | 582 | # CONFIG_MTD_ONENAND is not set |
591 | 583 | ||
592 | # | 584 | # |
593 | # UBI - Unsorted block images | 585 | # UBI - Unsorted block images |
594 | # | 586 | # |
595 | # CONFIG_MTD_UBI is not set | 587 | # CONFIG_MTD_UBI is not set |
596 | |||
597 | # | ||
598 | # Parallel port support | ||
599 | # | ||
600 | # CONFIG_PARPORT is not set | 588 | # CONFIG_PARPORT is not set |
601 | 589 | CONFIG_BLK_DEV=y | |
602 | # | ||
603 | # Plug and Play support | ||
604 | # | ||
605 | # CONFIG_PNPACPI is not set | ||
606 | |||
607 | # | ||
608 | # Block devices | ||
609 | # | ||
610 | # CONFIG_BLK_DEV_COW_COMMON is not set | 590 | # CONFIG_BLK_DEV_COW_COMMON is not set |
611 | # CONFIG_BLK_DEV_LOOP is not set | 591 | # CONFIG_BLK_DEV_LOOP is not set |
612 | # CONFIG_BLK_DEV_NBD is not set | 592 | # CONFIG_BLK_DEV_NBD is not set |
593 | # CONFIG_BLK_DEV_UB is not set | ||
613 | CONFIG_BLK_DEV_RAM=y | 594 | CONFIG_BLK_DEV_RAM=y |
614 | CONFIG_BLK_DEV_RAM_COUNT=16 | 595 | CONFIG_BLK_DEV_RAM_COUNT=16 |
615 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 596 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
616 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 597 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
617 | # CONFIG_CDROM_PKTCDVD is not set | 598 | # CONFIG_CDROM_PKTCDVD is not set |
618 | # CONFIG_ATA_OVER_ETH is not set | 599 | # CONFIG_ATA_OVER_ETH is not set |
619 | 600 | CONFIG_MISC_DEVICES=y | |
620 | # | 601 | # CONFIG_EEPROM_93CX6 is not set |
621 | # Misc devices | ||
622 | # | ||
623 | # CONFIG_IDE is not set | 602 | # CONFIG_IDE is not set |
624 | 603 | ||
625 | # | 604 | # |
@@ -627,6 +606,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
627 | # | 606 | # |
628 | # CONFIG_RAID_ATTRS is not set | 607 | # CONFIG_RAID_ATTRS is not set |
629 | CONFIG_SCSI=y | 608 | CONFIG_SCSI=y |
609 | CONFIG_SCSI_DMA=y | ||
630 | # CONFIG_SCSI_TGT is not set | 610 | # CONFIG_SCSI_TGT is not set |
631 | # CONFIG_SCSI_NETLINK is not set | 611 | # CONFIG_SCSI_NETLINK is not set |
632 | CONFIG_SCSI_PROC_FS=y | 612 | CONFIG_SCSI_PROC_FS=y |
@@ -657,43 +637,35 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
657 | # CONFIG_SCSI_SPI_ATTRS is not set | 637 | # CONFIG_SCSI_SPI_ATTRS is not set |
658 | # CONFIG_SCSI_FC_ATTRS is not set | 638 | # CONFIG_SCSI_FC_ATTRS is not set |
659 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 639 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
660 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
661 | # CONFIG_SCSI_SAS_LIBSAS is not set | 640 | # CONFIG_SCSI_SAS_LIBSAS is not set |
662 | 641 | # CONFIG_SCSI_SRP_ATTRS is not set | |
663 | # | 642 | CONFIG_SCSI_LOWLEVEL=y |
664 | # SCSI low-level drivers | ||
665 | # | ||
666 | # CONFIG_ISCSI_TCP is not set | 643 | # CONFIG_ISCSI_TCP is not set |
667 | # CONFIG_SCSI_DEBUG is not set | 644 | # CONFIG_SCSI_DEBUG is not set |
668 | CONFIG_ATA=y | 645 | CONFIG_ATA=y |
669 | # CONFIG_ATA_NONSTANDARD is not set | 646 | # CONFIG_ATA_NONSTANDARD is not set |
670 | # CONFIG_PATA_PLATFORM is not set | 647 | # CONFIG_PATA_PLATFORM is not set |
671 | CONFIG_PATA_BF54X=y | 648 | CONFIG_PATA_BF54X=y |
672 | CONFIG_PATA_BF54X_DMA=y | ||
673 | |||
674 | # | ||
675 | # Multi-device support (RAID and LVM) | ||
676 | # | ||
677 | # CONFIG_MD is not set | 649 | # CONFIG_MD is not set |
678 | |||
679 | # | ||
680 | # Network device support | ||
681 | # | ||
682 | CONFIG_NETDEVICES=y | 650 | CONFIG_NETDEVICES=y |
651 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
683 | # CONFIG_DUMMY is not set | 652 | # CONFIG_DUMMY is not set |
684 | # CONFIG_BONDING is not set | 653 | # CONFIG_BONDING is not set |
654 | # CONFIG_MACVLAN is not set | ||
685 | # CONFIG_EQUALIZER is not set | 655 | # CONFIG_EQUALIZER is not set |
686 | # CONFIG_TUN is not set | 656 | # CONFIG_TUN is not set |
657 | # CONFIG_VETH is not set | ||
687 | # CONFIG_PHYLIB is not set | 658 | # CONFIG_PHYLIB is not set |
688 | |||
689 | # | ||
690 | # Ethernet (10 or 100Mbit) | ||
691 | # | ||
692 | CONFIG_NET_ETHERNET=y | 659 | CONFIG_NET_ETHERNET=y |
693 | CONFIG_MII=y | 660 | CONFIG_MII=y |
694 | # CONFIG_SMC91X is not set | 661 | # CONFIG_SMC91X is not set |
695 | CONFIG_SMSC911X=y | 662 | CONFIG_SMSC911X=y |
696 | # CONFIG_DM9000 is not set | 663 | # CONFIG_DM9000 is not set |
664 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
665 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
666 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
667 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
668 | # CONFIG_B44 is not set | ||
697 | CONFIG_NETDEV_1000=y | 669 | CONFIG_NETDEV_1000=y |
698 | # CONFIG_AX88180 is not set | 670 | # CONFIG_AX88180 is not set |
699 | CONFIG_NETDEV_10000=y | 671 | CONFIG_NETDEV_10000=y |
@@ -703,6 +675,15 @@ CONFIG_NETDEV_10000=y | |||
703 | # | 675 | # |
704 | # CONFIG_WLAN_PRE80211 is not set | 676 | # CONFIG_WLAN_PRE80211 is not set |
705 | # CONFIG_WLAN_80211 is not set | 677 | # CONFIG_WLAN_80211 is not set |
678 | |||
679 | # | ||
680 | # USB Network Adapters | ||
681 | # | ||
682 | # CONFIG_USB_CATC is not set | ||
683 | # CONFIG_USB_KAWETH is not set | ||
684 | # CONFIG_USB_PEGASUS is not set | ||
685 | # CONFIG_USB_RTL8150 is not set | ||
686 | # CONFIG_USB_USBNET is not set | ||
706 | # CONFIG_WAN is not set | 687 | # CONFIG_WAN is not set |
707 | # CONFIG_PPP is not set | 688 | # CONFIG_PPP is not set |
708 | # CONFIG_SLIP is not set | 689 | # CONFIG_SLIP is not set |
@@ -710,15 +691,7 @@ CONFIG_NETDEV_10000=y | |||
710 | # CONFIG_NETCONSOLE is not set | 691 | # CONFIG_NETCONSOLE is not set |
711 | # CONFIG_NETPOLL is not set | 692 | # CONFIG_NETPOLL is not set |
712 | # CONFIG_NET_POLL_CONTROLLER is not set | 693 | # CONFIG_NET_POLL_CONTROLLER is not set |
713 | |||
714 | # | ||
715 | # ISDN subsystem | ||
716 | # | ||
717 | # CONFIG_ISDN is not set | 694 | # CONFIG_ISDN is not set |
718 | |||
719 | # | ||
720 | # Telephony Support | ||
721 | # | ||
722 | # CONFIG_PHONE is not set | 695 | # CONFIG_PHONE is not set |
723 | 696 | ||
724 | # | 697 | # |
@@ -733,9 +706,6 @@ CONFIG_INPUT=y | |||
733 | # | 706 | # |
734 | # CONFIG_INPUT_MOUSEDEV is not set | 707 | # CONFIG_INPUT_MOUSEDEV is not set |
735 | # CONFIG_INPUT_JOYDEV is not set | 708 | # CONFIG_INPUT_JOYDEV is not set |
736 | CONFIG_INPUT_TSDEV=m | ||
737 | CONFIG_INPUT_TSDEV_SCREEN_X=240 | ||
738 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 | ||
739 | CONFIG_INPUT_EVDEV=m | 709 | CONFIG_INPUT_EVDEV=m |
740 | CONFIG_INPUT_EVBUG=m | 710 | CONFIG_INPUT_EVBUG=m |
741 | 711 | ||
@@ -758,6 +728,7 @@ CONFIG_KEYBOARD_BFIN=y | |||
758 | CONFIG_INPUT_TOUCHSCREEN=y | 728 | CONFIG_INPUT_TOUCHSCREEN=y |
759 | # CONFIG_TOUCHSCREEN_ADS7846 is not set | 729 | # CONFIG_TOUCHSCREEN_ADS7846 is not set |
760 | CONFIG_TOUCHSCREEN_AD7877=m | 730 | CONFIG_TOUCHSCREEN_AD7877=m |
731 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
761 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 732 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
762 | # CONFIG_TOUCHSCREEN_ELO is not set | 733 | # CONFIG_TOUCHSCREEN_ELO is not set |
763 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 734 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
@@ -787,7 +758,6 @@ CONFIG_INPUT_MISC=y | |||
787 | # | 758 | # |
788 | # CONFIG_AD9960 is not set | 759 | # CONFIG_AD9960 is not set |
789 | # CONFIG_SPI_ADC_BF533 is not set | 760 | # CONFIG_SPI_ADC_BF533 is not set |
790 | # CONFIG_BF5xx_PFLAGS is not set | ||
791 | # CONFIG_BF5xx_PPIFCD is not set | 761 | # CONFIG_BF5xx_PPIFCD is not set |
792 | # CONFIG_BFIN_SIMPLE_TIMER is not set | 762 | # CONFIG_BFIN_SIMPLE_TIMER is not set |
793 | # CONFIG_BF5xx_PPI is not set | 763 | # CONFIG_BF5xx_PPI is not set |
@@ -796,7 +766,7 @@ CONFIG_BFIN_OTP=y | |||
796 | # CONFIG_BFIN_SPORT is not set | 766 | # CONFIG_BFIN_SPORT is not set |
797 | # CONFIG_BFIN_TIMER_LATENCY is not set | 767 | # CONFIG_BFIN_TIMER_LATENCY is not set |
798 | # CONFIG_TWI_LCD is not set | 768 | # CONFIG_TWI_LCD is not set |
799 | # CONFIG_AD5304 is not set | 769 | # CONFIG_SIMPLE_GPIO is not set |
800 | CONFIG_VT=y | 770 | CONFIG_VT=y |
801 | CONFIG_VT_CONSOLE=y | 771 | CONFIG_VT_CONSOLE=y |
802 | CONFIG_HW_CONSOLE=y | 772 | CONFIG_HW_CONSOLE=y |
@@ -830,27 +800,11 @@ CONFIG_UNIX98_PTYS=y | |||
830 | # CAN, the car bus and industrial fieldbus | 800 | # CAN, the car bus and industrial fieldbus |
831 | # | 801 | # |
832 | # CONFIG_CAN4LINUX is not set | 802 | # CONFIG_CAN4LINUX is not set |
833 | |||
834 | # | ||
835 | # IPMI | ||
836 | # | ||
837 | # CONFIG_IPMI_HANDLER is not set | 803 | # CONFIG_IPMI_HANDLER is not set |
838 | CONFIG_WATCHDOG=y | ||
839 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
840 | |||
841 | # | ||
842 | # Watchdog Device Drivers | ||
843 | # | ||
844 | # CONFIG_SOFT_WATCHDOG is not set | ||
845 | CONFIG_BFIN_WDT=y | ||
846 | CONFIG_HW_RANDOM=y | 804 | CONFIG_HW_RANDOM=y |
847 | # CONFIG_GEN_RTC is not set | 805 | # CONFIG_GEN_RTC is not set |
848 | # CONFIG_R3964 is not set | 806 | # CONFIG_R3964 is not set |
849 | # CONFIG_RAW_DRIVER is not set | 807 | # CONFIG_RAW_DRIVER is not set |
850 | |||
851 | # | ||
852 | # TPM devices | ||
853 | # | ||
854 | # CONFIG_TCG_TPM is not set | 808 | # CONFIG_TCG_TPM is not set |
855 | CONFIG_I2C=y | 809 | CONFIG_I2C=y |
856 | CONFIG_I2C_BOARDINFO=y | 810 | CONFIG_I2C_BOARDINFO=y |
@@ -872,21 +826,24 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50 | |||
872 | # CONFIG_I2C_OCORES is not set | 826 | # CONFIG_I2C_OCORES is not set |
873 | # CONFIG_I2C_PARPORT_LIGHT is not set | 827 | # CONFIG_I2C_PARPORT_LIGHT is not set |
874 | # CONFIG_I2C_SIMTEC is not set | 828 | # CONFIG_I2C_SIMTEC is not set |
829 | # CONFIG_I2C_TAOS_EVM is not set | ||
875 | # CONFIG_I2C_STUB is not set | 830 | # CONFIG_I2C_STUB is not set |
831 | # CONFIG_I2C_TINY_USB is not set | ||
876 | 832 | ||
877 | # | 833 | # |
878 | # Miscellaneous I2C Chip support | 834 | # Miscellaneous I2C Chip support |
879 | # | 835 | # |
880 | # CONFIG_SENSORS_DS1337 is not set | 836 | # CONFIG_SENSORS_DS1337 is not set |
881 | # CONFIG_SENSORS_DS1374 is not set | 837 | # CONFIG_SENSORS_DS1374 is not set |
838 | # CONFIG_DS1682 is not set | ||
882 | # CONFIG_SENSORS_AD5252 is not set | 839 | # CONFIG_SENSORS_AD5252 is not set |
883 | # CONFIG_SENSORS_EEPROM is not set | 840 | # CONFIG_SENSORS_EEPROM is not set |
884 | # CONFIG_SENSORS_PCF8574 is not set | 841 | # CONFIG_SENSORS_PCF8574 is not set |
885 | # CONFIG_SENSORS_PCF8575 is not set | 842 | # CONFIG_SENSORS_PCF8575 is not set |
886 | # CONFIG_SENSORS_PCA9543 is not set | ||
887 | # CONFIG_SENSORS_PCA9539 is not set | 843 | # CONFIG_SENSORS_PCA9539 is not set |
888 | # CONFIG_SENSORS_PCF8591 is not set | 844 | # CONFIG_SENSORS_PCF8591 is not set |
889 | # CONFIG_SENSORS_MAX6875 is not set | 845 | # CONFIG_SENSORS_MAX6875 is not set |
846 | # CONFIG_SENSORS_TSL2550 is not set | ||
890 | # CONFIG_I2C_DEBUG_CORE is not set | 847 | # CONFIG_I2C_DEBUG_CORE is not set |
891 | # CONFIG_I2C_DEBUG_ALGO is not set | 848 | # CONFIG_I2C_DEBUG_ALGO is not set |
892 | # CONFIG_I2C_DEBUG_BUS is not set | 849 | # CONFIG_I2C_DEBUG_BUS is not set |
@@ -909,14 +866,11 @@ CONFIG_SPI_BFIN=y | |||
909 | # | 866 | # |
910 | # CONFIG_SPI_AT25 is not set | 867 | # CONFIG_SPI_AT25 is not set |
911 | # CONFIG_SPI_SPIDEV is not set | 868 | # CONFIG_SPI_SPIDEV is not set |
912 | 869 | # CONFIG_SPI_TLE62X0 is not set | |
913 | # | ||
914 | # Dallas's 1-wire bus | ||
915 | # | ||
916 | # CONFIG_W1 is not set | 870 | # CONFIG_W1 is not set |
871 | # CONFIG_POWER_SUPPLY is not set | ||
917 | CONFIG_HWMON=y | 872 | CONFIG_HWMON=y |
918 | # CONFIG_HWMON_VID is not set | 873 | # CONFIG_HWMON_VID is not set |
919 | # CONFIG_SENSORS_ABITUGURU is not set | ||
920 | # CONFIG_SENSORS_AD7418 is not set | 874 | # CONFIG_SENSORS_AD7418 is not set |
921 | # CONFIG_SENSORS_ADM1021 is not set | 875 | # CONFIG_SENSORS_ADM1021 is not set |
922 | # CONFIG_SENSORS_ADM1025 is not set | 876 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -924,12 +878,12 @@ CONFIG_HWMON=y | |||
924 | # CONFIG_SENSORS_ADM1029 is not set | 878 | # CONFIG_SENSORS_ADM1029 is not set |
925 | # CONFIG_SENSORS_ADM1031 is not set | 879 | # CONFIG_SENSORS_ADM1031 is not set |
926 | # CONFIG_SENSORS_ADM9240 is not set | 880 | # CONFIG_SENSORS_ADM9240 is not set |
927 | # CONFIG_SENSORS_ASB100 is not set | 881 | # CONFIG_SENSORS_ADT7470 is not set |
928 | # CONFIG_SENSORS_ATXP1 is not set | 882 | # CONFIG_SENSORS_ATXP1 is not set |
929 | # CONFIG_SENSORS_DS1621 is not set | 883 | # CONFIG_SENSORS_DS1621 is not set |
930 | # CONFIG_SENSORS_F71805F is not set | 884 | # CONFIG_SENSORS_F71805F is not set |
931 | # CONFIG_SENSORS_FSCHER is not set | 885 | # CONFIG_SENSORS_F71882FG is not set |
932 | # CONFIG_SENSORS_FSCPOS is not set | 886 | # CONFIG_SENSORS_F75375S is not set |
933 | # CONFIG_SENSORS_GL518SM is not set | 887 | # CONFIG_SENSORS_GL518SM is not set |
934 | # CONFIG_SENSORS_GL520SM is not set | 888 | # CONFIG_SENSORS_GL520SM is not set |
935 | # CONFIG_SENSORS_IT87 is not set | 889 | # CONFIG_SENSORS_IT87 is not set |
@@ -944,13 +898,16 @@ CONFIG_HWMON=y | |||
944 | # CONFIG_SENSORS_LM87 is not set | 898 | # CONFIG_SENSORS_LM87 is not set |
945 | # CONFIG_SENSORS_LM90 is not set | 899 | # CONFIG_SENSORS_LM90 is not set |
946 | # CONFIG_SENSORS_LM92 is not set | 900 | # CONFIG_SENSORS_LM92 is not set |
901 | # CONFIG_SENSORS_LM93 is not set | ||
947 | # CONFIG_SENSORS_MAX1619 is not set | 902 | # CONFIG_SENSORS_MAX1619 is not set |
948 | # CONFIG_SENSORS_MAX6650 is not set | 903 | # CONFIG_SENSORS_MAX6650 is not set |
949 | # CONFIG_SENSORS_PC87360 is not set | 904 | # CONFIG_SENSORS_PC87360 is not set |
950 | # CONFIG_SENSORS_PC87427 is not set | 905 | # CONFIG_SENSORS_PC87427 is not set |
906 | # CONFIG_SENSORS_DME1737 is not set | ||
951 | # CONFIG_SENSORS_SMSC47M1 is not set | 907 | # CONFIG_SENSORS_SMSC47M1 is not set |
952 | # CONFIG_SENSORS_SMSC47M192 is not set | 908 | # CONFIG_SENSORS_SMSC47M192 is not set |
953 | # CONFIG_SENSORS_SMSC47B397 is not set | 909 | # CONFIG_SENSORS_SMSC47B397 is not set |
910 | # CONFIG_SENSORS_THMC50 is not set | ||
954 | # CONFIG_SENSORS_VT1211 is not set | 911 | # CONFIG_SENSORS_VT1211 is not set |
955 | # CONFIG_SENSORS_W83781D is not set | 912 | # CONFIG_SENSORS_W83781D is not set |
956 | # CONFIG_SENSORS_W83791D is not set | 913 | # CONFIG_SENSORS_W83791D is not set |
@@ -960,6 +917,25 @@ CONFIG_HWMON=y | |||
960 | # CONFIG_SENSORS_W83627HF is not set | 917 | # CONFIG_SENSORS_W83627HF is not set |
961 | # CONFIG_SENSORS_W83627EHF is not set | 918 | # CONFIG_SENSORS_W83627EHF is not set |
962 | # CONFIG_HWMON_DEBUG_CHIP is not set | 919 | # CONFIG_HWMON_DEBUG_CHIP is not set |
920 | CONFIG_WATCHDOG=y | ||
921 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
922 | |||
923 | # | ||
924 | # Watchdog Device Drivers | ||
925 | # | ||
926 | # CONFIG_SOFT_WATCHDOG is not set | ||
927 | CONFIG_BFIN_WDT=y | ||
928 | |||
929 | # | ||
930 | # USB-based Watchdog Cards | ||
931 | # | ||
932 | # CONFIG_USBPCWATCHDOG is not set | ||
933 | |||
934 | # | ||
935 | # Sonics Silicon Backplane | ||
936 | # | ||
937 | CONFIG_SSB_POSSIBLE=y | ||
938 | # CONFIG_SSB is not set | ||
963 | 939 | ||
964 | # | 940 | # |
965 | # Multifunction device drivers | 941 | # Multifunction device drivers |
@@ -972,23 +948,20 @@ CONFIG_HWMON=y | |||
972 | # CONFIG_VIDEO_DEV is not set | 948 | # CONFIG_VIDEO_DEV is not set |
973 | # CONFIG_DVB_CORE is not set | 949 | # CONFIG_DVB_CORE is not set |
974 | CONFIG_DAB=y | 950 | CONFIG_DAB=y |
951 | # CONFIG_USB_DABUSB is not set | ||
975 | 952 | ||
976 | # | 953 | # |
977 | # Graphics support | 954 | # Graphics support |
978 | # | 955 | # |
979 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
980 | |||
981 | # | ||
982 | # Display device support | ||
983 | # | ||
984 | # CONFIG_DISPLAY_SUPPORT is not set | ||
985 | # CONFIG_VGASTATE is not set | 956 | # CONFIG_VGASTATE is not set |
957 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
986 | CONFIG_FB=y | 958 | CONFIG_FB=y |
987 | CONFIG_FIRMWARE_EDID=y | 959 | CONFIG_FIRMWARE_EDID=y |
988 | # CONFIG_FB_DDC is not set | 960 | # CONFIG_FB_DDC is not set |
989 | CONFIG_FB_CFB_FILLRECT=y | 961 | CONFIG_FB_CFB_FILLRECT=y |
990 | CONFIG_FB_CFB_COPYAREA=y | 962 | CONFIG_FB_CFB_COPYAREA=y |
991 | CONFIG_FB_CFB_IMAGEBLIT=y | 963 | CONFIG_FB_CFB_IMAGEBLIT=y |
964 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
992 | # CONFIG_FB_SYS_FILLRECT is not set | 965 | # CONFIG_FB_SYS_FILLRECT is not set |
993 | # CONFIG_FB_SYS_COPYAREA is not set | 966 | # CONFIG_FB_SYS_COPYAREA is not set |
994 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 967 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
@@ -1003,18 +976,24 @@ CONFIG_FB_DEFERRED_IO=y | |||
1003 | # | 976 | # |
1004 | # Frame buffer hardware drivers | 977 | # Frame buffer hardware drivers |
1005 | # | 978 | # |
1006 | # CONFIG_FB_BFIN_7171 is not set | ||
1007 | # CONFIG_FB_BFIN_7393 is not set | ||
1008 | CONFIG_FB_BF54X_LQ043=y | 979 | CONFIG_FB_BF54X_LQ043=y |
1009 | # CONFIG_FB_BFIN_T350MCQB is not set | 980 | # CONFIG_FB_BFIN_T350MCQB is not set |
981 | # CONFIG_FB_BFIN_7393 is not set | ||
1010 | # CONFIG_FB_S1D13XXX is not set | 982 | # CONFIG_FB_S1D13XXX is not set |
1011 | # CONFIG_FB_VIRTUAL is not set | 983 | # CONFIG_FB_VIRTUAL is not set |
984 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
985 | |||
986 | # | ||
987 | # Display device support | ||
988 | # | ||
989 | # CONFIG_DISPLAY_SUPPORT is not set | ||
1012 | 990 | ||
1013 | # | 991 | # |
1014 | # Console display driver support | 992 | # Console display driver support |
1015 | # | 993 | # |
1016 | CONFIG_DUMMY_CONSOLE=y | 994 | CONFIG_DUMMY_CONSOLE=y |
1017 | CONFIG_FRAMEBUFFER_CONSOLE=y | 995 | CONFIG_FRAMEBUFFER_CONSOLE=y |
996 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
1018 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 997 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
1019 | CONFIG_FONTS=y | 998 | CONFIG_FONTS=y |
1020 | # CONFIG_FONT_8x8 is not set | 999 | # CONFIG_FONT_8x8 is not set |
@@ -1065,10 +1044,21 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1065 | # CONFIG_SND_MPU401 is not set | 1044 | # CONFIG_SND_MPU401 is not set |
1066 | 1045 | ||
1067 | # | 1046 | # |
1047 | # SPI devices | ||
1048 | # | ||
1049 | |||
1050 | # | ||
1068 | # ALSA Blackfin devices | 1051 | # ALSA Blackfin devices |
1069 | # | 1052 | # |
1070 | # CONFIG_SND_BLACKFIN_AD1836 is not set | 1053 | # CONFIG_SND_BLACKFIN_AD1836 is not set |
1071 | # CONFIG_SND_BFIN_AD73311 is not set | 1054 | # CONFIG_SND_BFIN_AD73311 is not set |
1055 | # CONFIG_SND_BFIN_AD73322 is not set | ||
1056 | |||
1057 | # | ||
1058 | # USB devices | ||
1059 | # | ||
1060 | # CONFIG_SND_USB_AUDIO is not set | ||
1061 | # CONFIG_SND_USB_CAIAQ is not set | ||
1072 | 1062 | ||
1073 | # | 1063 | # |
1074 | # System on Chip audio support | 1064 | # System on Chip audio support |
@@ -1084,6 +1074,10 @@ CONFIG_SND_BF5XX_SOC_BF548_EZKIT=y | |||
1084 | CONFIG_SND_BF5XX_SPORT_NUM=0 | 1074 | CONFIG_SND_BF5XX_SPORT_NUM=0 |
1085 | CONFIG_SND_BF5XX_HAVE_COLD_RESET=y | 1075 | CONFIG_SND_BF5XX_HAVE_COLD_RESET=y |
1086 | CONFIG_SND_BF5XX_RESET_GPIO_NUM=19 | 1076 | CONFIG_SND_BF5XX_RESET_GPIO_NUM=19 |
1077 | |||
1078 | # | ||
1079 | # SoC Audio support for SuperH | ||
1080 | # | ||
1087 | CONFIG_SND_SOC_AD1980=y | 1081 | CONFIG_SND_SOC_AD1980=y |
1088 | 1082 | ||
1089 | # | 1083 | # |
@@ -1091,72 +1085,152 @@ CONFIG_SND_SOC_AD1980=y | |||
1091 | # | 1085 | # |
1092 | # CONFIG_SOUND_PRIME is not set | 1086 | # CONFIG_SOUND_PRIME is not set |
1093 | CONFIG_AC97_BUS=y | 1087 | CONFIG_AC97_BUS=y |
1094 | 1088 | CONFIG_HID_SUPPORT=y | |
1095 | # | 1089 | CONFIG_HID=y |
1096 | # HID Devices | ||
1097 | # | ||
1098 | CONFIG_HID=m | ||
1099 | # CONFIG_HID_DEBUG is not set | 1090 | # CONFIG_HID_DEBUG is not set |
1091 | # CONFIG_HIDRAW is not set | ||
1100 | 1092 | ||
1101 | # | 1093 | # |
1102 | # USB support | 1094 | # USB Input Devices |
1103 | # | 1095 | # |
1096 | CONFIG_USB_HID=y | ||
1097 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
1098 | # CONFIG_HID_FF is not set | ||
1099 | # CONFIG_USB_HIDDEV is not set | ||
1100 | CONFIG_USB_SUPPORT=y | ||
1104 | CONFIG_USB_ARCH_HAS_HCD=y | 1101 | CONFIG_USB_ARCH_HAS_HCD=y |
1105 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 1102 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
1106 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 1103 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
1107 | # CONFIG_USB is not set | 1104 | CONFIG_USB=y |
1105 | # CONFIG_USB_DEBUG is not set | ||
1106 | |||
1107 | # | ||
1108 | # Miscellaneous USB options | ||
1109 | # | ||
1110 | # CONFIG_USB_DEVICEFS is not set | ||
1111 | CONFIG_USB_DEVICE_CLASS=y | ||
1112 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
1113 | # CONFIG_USB_OTG is not set | ||
1114 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1115 | CONFIG_USB_OTG_BLACKLIST_HUB=y | ||
1108 | 1116 | ||
1109 | # | 1117 | # |
1110 | # Enable Host or Gadget support to see Inventra options | 1118 | # USB Host Controller Drivers |
1111 | # | 1119 | # |
1120 | # CONFIG_USB_ISP116X_HCD is not set | ||
1121 | # CONFIG_USB_ISP1362_HCD is not set | ||
1122 | # CONFIG_USB_ISP1760_HCD is not set | ||
1123 | # CONFIG_USB_SL811_HCD is not set | ||
1124 | # CONFIG_USB_R8A66597_HCD is not set | ||
1125 | CONFIG_USB_MUSB_HDRC=y | ||
1126 | CONFIG_USB_MUSB_SOC=y | ||
1127 | |||
1128 | # | ||
1129 | # Blackfin high speed USB support | ||
1130 | # | ||
1131 | CONFIG_USB_MUSB_HOST=y | ||
1132 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
1133 | # CONFIG_USB_MUSB_OTG is not set | ||
1134 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
1135 | # CONFIG_MUSB_PIO_ONLY is not set | ||
1136 | # CONFIG_USB_INVENTRA_DMA is not set | ||
1137 | # CONFIG_USB_TI_CPPI_DMA is not set | ||
1138 | CONFIG_USB_MUSB_LOGLEVEL=0 | ||
1139 | |||
1140 | # | ||
1141 | # USB Device Class drivers | ||
1142 | # | ||
1143 | # CONFIG_USB_ACM is not set | ||
1144 | # CONFIG_USB_PRINTER is not set | ||
1112 | 1145 | ||
1113 | # | 1146 | # |
1114 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1147 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
1115 | # | 1148 | # |
1116 | 1149 | ||
1117 | # | 1150 | # |
1118 | # USB Gadget Support | 1151 | # may also be needed; see USB_STORAGE Help for more information |
1119 | # | 1152 | # |
1120 | # CONFIG_USB_GADGET is not set | 1153 | CONFIG_USB_STORAGE=m |
1121 | CONFIG_MMC=m | 1154 | # CONFIG_USB_STORAGE_DEBUG is not set |
1122 | # CONFIG_MMC_DEBUG is not set | 1155 | # CONFIG_USB_STORAGE_DATAFAB is not set |
1123 | # CONFIG_MMC_UNSAFE_RESUME is not set | 1156 | # CONFIG_USB_STORAGE_FREECOM is not set |
1157 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
1158 | # CONFIG_USB_STORAGE_DPCM is not set | ||
1159 | # CONFIG_USB_STORAGE_USBAT is not set | ||
1160 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
1161 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
1162 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
1163 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
1164 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1165 | # CONFIG_USB_STORAGE_KARMA is not set | ||
1166 | # CONFIG_USB_LIBUSUAL is not set | ||
1124 | 1167 | ||
1125 | # | 1168 | # |
1126 | # MMC/SD Card Drivers | 1169 | # USB Imaging devices |
1127 | # | 1170 | # |
1128 | CONFIG_MMC_BLOCK=m | 1171 | # CONFIG_USB_MDC800 is not set |
1172 | # CONFIG_USB_MICROTEK is not set | ||
1173 | CONFIG_USB_MON=y | ||
1129 | 1174 | ||
1130 | # | 1175 | # |
1131 | # MMC/SD Host Controller Drivers | 1176 | # USB port drivers |
1132 | # | 1177 | # |
1133 | CONFIG_SDH_BFIN=m | ||
1134 | # CONFIG_SPI_MMC is not set | ||
1135 | 1178 | ||
1136 | # | 1179 | # |
1137 | # LED devices | 1180 | # USB Serial Converter support |
1138 | # | 1181 | # |
1139 | # CONFIG_NEW_LEDS is not set | 1182 | # CONFIG_USB_SERIAL is not set |
1140 | 1183 | ||
1141 | # | 1184 | # |
1142 | # LED drivers | 1185 | # USB Miscellaneous drivers |
1143 | # | 1186 | # |
1187 | # CONFIG_USB_EMI62 is not set | ||
1188 | # CONFIG_USB_EMI26 is not set | ||
1189 | # CONFIG_USB_ADUTUX is not set | ||
1190 | # CONFIG_USB_AUERSWALD is not set | ||
1191 | # CONFIG_USB_RIO500 is not set | ||
1192 | # CONFIG_USB_LEGOTOWER is not set | ||
1193 | # CONFIG_USB_LCD is not set | ||
1194 | # CONFIG_USB_BERRY_CHARGE is not set | ||
1195 | # CONFIG_USB_LED is not set | ||
1196 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
1197 | # CONFIG_USB_CYTHERM is not set | ||
1198 | # CONFIG_USB_PHIDGET is not set | ||
1199 | # CONFIG_USB_IDMOUSE is not set | ||
1200 | # CONFIG_USB_FTDI_ELAN is not set | ||
1201 | # CONFIG_USB_APPLEDISPLAY is not set | ||
1202 | # CONFIG_USB_SISUSBVGA is not set | ||
1203 | # CONFIG_USB_LD is not set | ||
1204 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
1205 | # CONFIG_USB_IOWARRIOR is not set | ||
1144 | 1206 | ||
1145 | # | 1207 | # |
1146 | # LED Triggers | 1208 | # USB DSL modem support |
1147 | # | 1209 | # |
1148 | 1210 | ||
1149 | # | 1211 | # |
1150 | # InfiniBand support | 1212 | # USB Gadget Support |
1151 | # | 1213 | # |
1214 | # CONFIG_USB_GADGET is not set | ||
1215 | CONFIG_MMC=m | ||
1216 | # CONFIG_MMC_DEBUG is not set | ||
1217 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
1152 | 1218 | ||
1153 | # | 1219 | # |
1154 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1220 | # MMC/SD Card Drivers |
1155 | # | 1221 | # |
1222 | CONFIG_MMC_BLOCK=m | ||
1223 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
1224 | # CONFIG_SDIO_UART is not set | ||
1156 | 1225 | ||
1157 | # | 1226 | # |
1158 | # Real Time Clock | 1227 | # MMC/SD Host Controller Drivers |
1159 | # | 1228 | # |
1229 | CONFIG_SDH_BFIN=m | ||
1230 | # CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set | ||
1231 | # CONFIG_MMC_SPI is not set | ||
1232 | # CONFIG_SPI_MMC is not set | ||
1233 | # CONFIG_NEW_LEDS is not set | ||
1160 | CONFIG_RTC_LIB=y | 1234 | CONFIG_RTC_LIB=y |
1161 | CONFIG_RTC_CLASS=y | 1235 | CONFIG_RTC_CLASS=y |
1162 | CONFIG_RTC_HCTOSYS=y | 1236 | CONFIG_RTC_HCTOSYS=y |
@@ -1176,6 +1250,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1176 | # I2C RTC drivers | 1250 | # I2C RTC drivers |
1177 | # | 1251 | # |
1178 | # CONFIG_RTC_DRV_DS1307 is not set | 1252 | # CONFIG_RTC_DRV_DS1307 is not set |
1253 | # CONFIG_RTC_DRV_DS1374 is not set | ||
1179 | # CONFIG_RTC_DRV_DS1672 is not set | 1254 | # CONFIG_RTC_DRV_DS1672 is not set |
1180 | # CONFIG_RTC_DRV_MAX6900 is not set | 1255 | # CONFIG_RTC_DRV_MAX6900 is not set |
1181 | # CONFIG_RTC_DRV_RS5C372 is not set | 1256 | # CONFIG_RTC_DRV_RS5C372 is not set |
@@ -1183,6 +1258,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1183 | # CONFIG_RTC_DRV_X1205 is not set | 1258 | # CONFIG_RTC_DRV_X1205 is not set |
1184 | # CONFIG_RTC_DRV_PCF8563 is not set | 1259 | # CONFIG_RTC_DRV_PCF8563 is not set |
1185 | # CONFIG_RTC_DRV_PCF8583 is not set | 1260 | # CONFIG_RTC_DRV_PCF8583 is not set |
1261 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1186 | 1262 | ||
1187 | # | 1263 | # |
1188 | # SPI RTC drivers | 1264 | # SPI RTC drivers |
@@ -1194,8 +1270,10 @@ CONFIG_RTC_INTF_DEV=y | |||
1194 | # Platform RTC drivers | 1270 | # Platform RTC drivers |
1195 | # | 1271 | # |
1196 | # CONFIG_RTC_DRV_DS1553 is not set | 1272 | # CONFIG_RTC_DRV_DS1553 is not set |
1273 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1197 | # CONFIG_RTC_DRV_DS1742 is not set | 1274 | # CONFIG_RTC_DRV_DS1742 is not set |
1198 | # CONFIG_RTC_DRV_M48T86 is not set | 1275 | # CONFIG_RTC_DRV_M48T86 is not set |
1276 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1199 | # CONFIG_RTC_DRV_V3020 is not set | 1277 | # CONFIG_RTC_DRV_V3020 is not set |
1200 | 1278 | ||
1201 | # | 1279 | # |
@@ -1204,22 +1282,9 @@ CONFIG_RTC_INTF_DEV=y | |||
1204 | CONFIG_RTC_DRV_BFIN=y | 1282 | CONFIG_RTC_DRV_BFIN=y |
1205 | 1283 | ||
1206 | # | 1284 | # |
1207 | # DMA Engine support | 1285 | # Userspace I/O |
1208 | # | ||
1209 | # CONFIG_DMA_ENGINE is not set | ||
1210 | |||
1211 | # | ||
1212 | # DMA Clients | ||
1213 | # | 1286 | # |
1214 | 1287 | # CONFIG_UIO is not set | |
1215 | # | ||
1216 | # DMA Devices | ||
1217 | # | ||
1218 | |||
1219 | # | ||
1220 | # PBX support | ||
1221 | # | ||
1222 | # CONFIG_PBX is not set | ||
1223 | 1288 | ||
1224 | # | 1289 | # |
1225 | # File systems | 1290 | # File systems |
@@ -1280,7 +1345,6 @@ CONFIG_PROC_SYSCTL=y | |||
1280 | CONFIG_SYSFS=y | 1345 | CONFIG_SYSFS=y |
1281 | # CONFIG_TMPFS is not set | 1346 | # CONFIG_TMPFS is not set |
1282 | # CONFIG_HUGETLB_PAGE is not set | 1347 | # CONFIG_HUGETLB_PAGE is not set |
1283 | CONFIG_RAMFS=y | ||
1284 | # CONFIG_CONFIGFS_FS is not set | 1348 | # CONFIG_CONFIGFS_FS is not set |
1285 | 1349 | ||
1286 | # | 1350 | # |
@@ -1306,10 +1370,12 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y | |||
1306 | CONFIG_JFFS2_FS=m | 1370 | CONFIG_JFFS2_FS=m |
1307 | CONFIG_JFFS2_FS_DEBUG=0 | 1371 | CONFIG_JFFS2_FS_DEBUG=0 |
1308 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1372 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
1373 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1309 | # CONFIG_JFFS2_SUMMARY is not set | 1374 | # CONFIG_JFFS2_SUMMARY is not set |
1310 | # CONFIG_JFFS2_FS_XATTR is not set | 1375 | # CONFIG_JFFS2_FS_XATTR is not set |
1311 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1376 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
1312 | CONFIG_JFFS2_ZLIB=y | 1377 | CONFIG_JFFS2_ZLIB=y |
1378 | # CONFIG_JFFS2_LZO is not set | ||
1313 | CONFIG_JFFS2_RTIME=y | 1379 | CONFIG_JFFS2_RTIME=y |
1314 | # CONFIG_JFFS2_RUBIN is not set | 1380 | # CONFIG_JFFS2_RUBIN is not set |
1315 | # CONFIG_CRAMFS is not set | 1381 | # CONFIG_CRAMFS is not set |
@@ -1318,10 +1384,7 @@ CONFIG_JFFS2_RTIME=y | |||
1318 | # CONFIG_QNX4FS_FS is not set | 1384 | # CONFIG_QNX4FS_FS is not set |
1319 | # CONFIG_SYSV_FS is not set | 1385 | # CONFIG_SYSV_FS is not set |
1320 | # CONFIG_UFS_FS is not set | 1386 | # CONFIG_UFS_FS is not set |
1321 | 1387 | CONFIG_NETWORK_FILESYSTEMS=y | |
1322 | # | ||
1323 | # Network File Systems | ||
1324 | # | ||
1325 | CONFIG_NFS_FS=m | 1388 | CONFIG_NFS_FS=m |
1326 | CONFIG_NFS_V3=y | 1389 | CONFIG_NFS_V3=y |
1327 | # CONFIG_NFS_V3_ACL is not set | 1390 | # CONFIG_NFS_V3_ACL is not set |
@@ -1352,7 +1415,6 @@ CONFIG_CIFS=y | |||
1352 | # CONFIG_NCP_FS is not set | 1415 | # CONFIG_NCP_FS is not set |
1353 | # CONFIG_CODA_FS is not set | 1416 | # CONFIG_CODA_FS is not set |
1354 | # CONFIG_AFS_FS is not set | 1417 | # CONFIG_AFS_FS is not set |
1355 | # CONFIG_9P_FS is not set | ||
1356 | 1418 | ||
1357 | # | 1419 | # |
1358 | # Partition Types | 1420 | # Partition Types |
@@ -1375,10 +1437,6 @@ CONFIG_MSDOS_PARTITION=y | |||
1375 | # CONFIG_KARMA_PARTITION is not set | 1437 | # CONFIG_KARMA_PARTITION is not set |
1376 | # CONFIG_EFI_PARTITION is not set | 1438 | # CONFIG_EFI_PARTITION is not set |
1377 | # CONFIG_SYSV68_PARTITION is not set | 1439 | # CONFIG_SYSV68_PARTITION is not set |
1378 | |||
1379 | # | ||
1380 | # Native Language Support | ||
1381 | # | ||
1382 | CONFIG_NLS=y | 1440 | CONFIG_NLS=y |
1383 | CONFIG_NLS_DEFAULT="iso8859-1" | 1441 | CONFIG_NLS_DEFAULT="iso8859-1" |
1384 | CONFIG_NLS_CODEPAGE_437=m | 1442 | CONFIG_NLS_CODEPAGE_437=m |
@@ -1419,21 +1477,16 @@ CONFIG_NLS_ISO8859_15=m | |||
1419 | CONFIG_NLS_KOI8_R=m | 1477 | CONFIG_NLS_KOI8_R=m |
1420 | CONFIG_NLS_KOI8_U=m | 1478 | CONFIG_NLS_KOI8_U=m |
1421 | CONFIG_NLS_UTF8=m | 1479 | CONFIG_NLS_UTF8=m |
1422 | |||
1423 | # | ||
1424 | # Distributed Lock Manager | ||
1425 | # | ||
1426 | # CONFIG_DLM is not set | 1480 | # CONFIG_DLM is not set |
1427 | 1481 | CONFIG_INSTRUMENTATION=y | |
1428 | # | ||
1429 | # Profiling support | ||
1430 | # | ||
1431 | # CONFIG_PROFILING is not set | 1482 | # CONFIG_PROFILING is not set |
1483 | # CONFIG_MARKERS is not set | ||
1432 | 1484 | ||
1433 | # | 1485 | # |
1434 | # Kernel hacking | 1486 | # Kernel hacking |
1435 | # | 1487 | # |
1436 | # CONFIG_PRINTK_TIME is not set | 1488 | # CONFIG_PRINTK_TIME is not set |
1489 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1437 | CONFIG_ENABLE_MUST_CHECK=y | 1490 | CONFIG_ENABLE_MUST_CHECK=y |
1438 | # CONFIG_MAGIC_SYSRQ is not set | 1491 | # CONFIG_MAGIC_SYSRQ is not set |
1439 | # CONFIG_UNUSED_SYMBOLS is not set | 1492 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -1441,6 +1494,7 @@ CONFIG_DEBUG_FS=y | |||
1441 | # CONFIG_HEADERS_CHECK is not set | 1494 | # CONFIG_HEADERS_CHECK is not set |
1442 | # CONFIG_DEBUG_KERNEL is not set | 1495 | # CONFIG_DEBUG_KERNEL is not set |
1443 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1496 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1497 | # CONFIG_SAMPLES is not set | ||
1444 | CONFIG_DEBUG_MMRS=y | 1498 | CONFIG_DEBUG_MMRS=y |
1445 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | 1499 | CONFIG_DEBUG_HUNT_FOR_ZERO=y |
1446 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | 1500 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y |
@@ -1460,11 +1514,8 @@ CONFIG_ACCESS_CHECK=y | |||
1460 | # CONFIG_KEYS is not set | 1514 | # CONFIG_KEYS is not set |
1461 | CONFIG_SECURITY=y | 1515 | CONFIG_SECURITY=y |
1462 | # CONFIG_SECURITY_NETWORK is not set | 1516 | # CONFIG_SECURITY_NETWORK is not set |
1463 | CONFIG_SECURITY_CAPABILITIES=m | 1517 | # CONFIG_SECURITY_CAPABILITIES is not set |
1464 | 1518 | # CONFIG_SECURITY_ROOTPLUG is not set | |
1465 | # | ||
1466 | # Cryptographic options | ||
1467 | # | ||
1468 | # CONFIG_CRYPTO is not set | 1519 | # CONFIG_CRYPTO is not set |
1469 | 1520 | ||
1470 | # | 1521 | # |
@@ -1475,6 +1526,7 @@ CONFIG_CRC_CCITT=m | |||
1475 | # CONFIG_CRC16 is not set | 1526 | # CONFIG_CRC16 is not set |
1476 | # CONFIG_CRC_ITU_T is not set | 1527 | # CONFIG_CRC_ITU_T is not set |
1477 | CONFIG_CRC32=y | 1528 | CONFIG_CRC32=y |
1529 | # CONFIG_CRC7 is not set | ||
1478 | # CONFIG_LIBCRC32C is not set | 1530 | # CONFIG_LIBCRC32C is not set |
1479 | CONFIG_ZLIB_INFLATE=y | 1531 | CONFIG_ZLIB_INFLATE=y |
1480 | CONFIG_ZLIB_DEFLATE=m | 1532 | CONFIG_ZLIB_DEFLATE=m |
diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig index 5f6ff04a86c3..4384a670a8b8 100644 --- a/arch/blackfin/configs/IP0X_defconfig +++ b/arch/blackfin/configs/IP0X_defconfig | |||
@@ -212,7 +212,7 @@ CONFIG_HZ=250 | |||
212 | # | 212 | # |
213 | # Memory Setup | 213 | # Memory Setup |
214 | # | 214 | # |
215 | CONFIG_MEM_SIZE=64 | 215 | CONFIG_MAX_MEM_SIZE=64 |
216 | CONFIG_MEM_ADD_WIDTH=10 | 216 | CONFIG_MEM_ADD_WIDTH=10 |
217 | 217 | ||
218 | # | 218 | # |
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index fd5448d6107c..d54f19085f37 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c | |||
@@ -90,6 +90,17 @@ int request_dma(unsigned int channel, char *device_id) | |||
90 | { | 90 | { |
91 | 91 | ||
92 | pr_debug("request_dma() : BEGIN \n"); | 92 | pr_debug("request_dma() : BEGIN \n"); |
93 | |||
94 | #if defined(CONFIG_BF561) && ANOMALY_05000182 | ||
95 | if (channel >= CH_IMEM_STREAM0_DEST && channel <= CH_IMEM_STREAM1_DEST) { | ||
96 | if (get_cclk() > 500000000) { | ||
97 | printk(KERN_WARNING | ||
98 | "Request IMDMA failed due to ANOMALY 05000182\n"); | ||
99 | return -EFAULT; | ||
100 | } | ||
101 | } | ||
102 | #endif | ||
103 | |||
93 | mutex_lock(&(dma_ch[channel].dmalock)); | 104 | mutex_lock(&(dma_ch[channel].dmalock)); |
94 | 105 | ||
95 | if ((dma_ch[channel].chan_status == DMA_CHANNEL_REQUESTED) | 106 | if ((dma_ch[channel].chan_status == DMA_CHANNEL_REQUESTED) |
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 7e8eaf4a31bb..b6d89d1644cc 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -1130,6 +1130,25 @@ void bfin_gpio_irq_prepare(unsigned gpio) | |||
1130 | 1130 | ||
1131 | #else | 1131 | #else |
1132 | 1132 | ||
1133 | int gpio_get_value(unsigned gpio) | ||
1134 | { | ||
1135 | unsigned long flags; | ||
1136 | int ret; | ||
1137 | |||
1138 | if (unlikely(get_gpio_edge(gpio))) { | ||
1139 | local_irq_save(flags); | ||
1140 | set_gpio_edge(gpio, 0); | ||
1141 | ret = get_gpio_data(gpio); | ||
1142 | set_gpio_edge(gpio, 1); | ||
1143 | local_irq_restore(flags); | ||
1144 | |||
1145 | return ret; | ||
1146 | } else | ||
1147 | return get_gpio_data(gpio); | ||
1148 | } | ||
1149 | EXPORT_SYMBOL(gpio_get_value); | ||
1150 | |||
1151 | |||
1133 | int gpio_direction_input(unsigned gpio) | 1152 | int gpio_direction_input(unsigned gpio) |
1134 | { | 1153 | { |
1135 | unsigned long flags; | 1154 | unsigned long flags; |
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c index 053edff6c0d8..4367330909b2 100644 --- a/arch/blackfin/kernel/bfin_ksyms.c +++ b/arch/blackfin/kernel/bfin_ksyms.c | |||
@@ -90,7 +90,9 @@ EXPORT_SYMBOL(__umodsi3); | |||
90 | EXPORT_SYMBOL(outsb); | 90 | EXPORT_SYMBOL(outsb); |
91 | EXPORT_SYMBOL(insb); | 91 | EXPORT_SYMBOL(insb); |
92 | EXPORT_SYMBOL(outsw); | 92 | EXPORT_SYMBOL(outsw); |
93 | EXPORT_SYMBOL(outsw_8); | ||
93 | EXPORT_SYMBOL(insw); | 94 | EXPORT_SYMBOL(insw); |
95 | EXPORT_SYMBOL(insw_8); | ||
94 | EXPORT_SYMBOL(outsl); | 96 | EXPORT_SYMBOL(outsl); |
95 | EXPORT_SYMBOL(insl); | 97 | EXPORT_SYMBOL(insl); |
96 | EXPORT_SYMBOL(insl_16); | 98 | EXPORT_SYMBOL(insl_16); |
diff --git a/arch/blackfin/kernel/init_task.c b/arch/blackfin/kernel/init_task.c index c640154030e2..6bdba7b21109 100644 --- a/arch/blackfin/kernel/init_task.c +++ b/arch/blackfin/kernel/init_task.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
35 | 35 | ||
36 | static struct fs_struct init_fs = INIT_FS; | 36 | static struct fs_struct init_fs = INIT_FS; |
37 | static struct files_struct init_files = INIT_FILES; | ||
38 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 37 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
39 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 38 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
40 | 39 | ||
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 5b847070dae5..7bfbd958980c 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
@@ -364,13 +364,13 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
364 | /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */ | 364 | /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */ |
365 | case VEC_CPLB_MHIT: | 365 | case VEC_CPLB_MHIT: |
366 | info.si_code = ILL_CPLB_MULHIT; | 366 | info.si_code = ILL_CPLB_MULHIT; |
367 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO | ||
368 | sig = SIGSEGV; | 367 | sig = SIGSEGV; |
369 | printk(KERN_NOTICE "NULL pointer access (probably)\n"); | 368 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO |
370 | #else | 369 | if (saved_dcplb_fault_addr < (void *)FIXED_CODE_START) |
371 | sig = SIGILL; | 370 | printk(KERN_NOTICE "NULL pointer access\n"); |
372 | printk(KERN_NOTICE EXC_0x27(KERN_NOTICE)); | 371 | else |
373 | #endif | 372 | #endif |
373 | printk(KERN_NOTICE EXC_0x27(KERN_NOTICE)); | ||
374 | CHK_DEBUGGER_TRAP(); | 374 | CHK_DEBUGGER_TRAP(); |
375 | break; | 375 | break; |
376 | /* 0x28 - Emulation Watchpoint, handled here */ | 376 | /* 0x28 - Emulation Watchpoint, handled here */ |
@@ -419,13 +419,13 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
419 | /* 0x2D - Instruction CPLB Multiple Hits, handled here */ | 419 | /* 0x2D - Instruction CPLB Multiple Hits, handled here */ |
420 | case VEC_CPLB_I_MHIT: | 420 | case VEC_CPLB_I_MHIT: |
421 | info.si_code = ILL_CPLB_MULHIT; | 421 | info.si_code = ILL_CPLB_MULHIT; |
422 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO | ||
423 | sig = SIGSEGV; | 422 | sig = SIGSEGV; |
424 | printk(KERN_NOTICE "Jump to address 0 - 0x0fff\n"); | 423 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO |
425 | #else | 424 | if (saved_icplb_fault_addr < (void *)FIXED_CODE_START) |
426 | sig = SIGILL; | 425 | printk(KERN_NOTICE "Jump to NULL address\n"); |
427 | printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE)); | 426 | else |
428 | #endif | 427 | #endif |
428 | printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE)); | ||
429 | CHK_DEBUGGER_TRAP(); | 429 | CHK_DEBUGGER_TRAP(); |
430 | break; | 430 | break; |
431 | /* 0x2E - Illegal use of Supervisor Resource, handled here */ | 431 | /* 0x2E - Illegal use of Supervisor Resource, handled here */ |
diff --git a/arch/blackfin/lib/checksum.c b/arch/blackfin/lib/checksum.c index 42768e0c80ca..5c87505165d3 100644 --- a/arch/blackfin/lib/checksum.c +++ b/arch/blackfin/lib/checksum.c | |||
@@ -72,9 +72,9 @@ static unsigned short do_csum(const unsigned char *buff, int len) | |||
72 | * This is a version of ip_compute_csum() optimized for IP headers, | 72 | * This is a version of ip_compute_csum() optimized for IP headers, |
73 | * which always checksum on 4 octet boundaries. | 73 | * which always checksum on 4 octet boundaries. |
74 | */ | 74 | */ |
75 | unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl) | 75 | __sum16 ip_fast_csum(unsigned char *iph, unsigned int ihl) |
76 | { | 76 | { |
77 | return ~do_csum(iph, ihl * 4); | 77 | return (__force __sum16)~do_csum(iph, ihl * 4); |
78 | } | 78 | } |
79 | 79 | ||
80 | /* | 80 | /* |
@@ -89,7 +89,7 @@ unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl) | |||
89 | * | 89 | * |
90 | * it's best to have buff aligned on a 32-bit boundary | 90 | * it's best to have buff aligned on a 32-bit boundary |
91 | */ | 91 | */ |
92 | unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum) | 92 | __wsum csum_partial(const void *buff, int len, __wsum sum) |
93 | { | 93 | { |
94 | /* | 94 | /* |
95 | * Just in case we get nasty checksum data... | 95 | * Just in case we get nasty checksum data... |
@@ -109,22 +109,22 @@ unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum) | |||
109 | * this routine is used for miscellaneous IP-like checksums, mainly | 109 | * this routine is used for miscellaneous IP-like checksums, mainly |
110 | * in icmp.c | 110 | * in icmp.c |
111 | */ | 111 | */ |
112 | unsigned short ip_compute_csum(const unsigned char *buff, int len) | 112 | __sum16 ip_compute_csum(const void *buff, int len) |
113 | { | 113 | { |
114 | return ~do_csum(buff, len); | 114 | return (__force __sum16)~do_csum(buff, len); |
115 | } | 115 | } |
116 | 116 | ||
117 | /* | 117 | /* |
118 | * copy from fs while checksumming, otherwise like csum_partial | 118 | * copy from fs while checksumming, otherwise like csum_partial |
119 | */ | 119 | */ |
120 | 120 | ||
121 | unsigned int | 121 | __wsum |
122 | csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, | 122 | csum_partial_copy_from_user(const void __user *src, void *dst, |
123 | int len, int sum, int *csum_err) | 123 | int len, __wsum sum, int *csum_err) |
124 | { | 124 | { |
125 | if (csum_err) | 125 | if (csum_err) |
126 | *csum_err = 0; | 126 | *csum_err = 0; |
127 | memcpy(dst, src, len); | 127 | memcpy(dst, (__force void *)src, len); |
128 | return csum_partial(dst, len, sum); | 128 | return csum_partial(dst, len, sum); |
129 | } | 129 | } |
130 | 130 | ||
@@ -132,8 +132,7 @@ csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, | |||
132 | * copy from ds while checksumming, otherwise like csum_partial | 132 | * copy from ds while checksumming, otherwise like csum_partial |
133 | */ | 133 | */ |
134 | 134 | ||
135 | unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst, | 135 | __wsum csum_partial_copy(const void *src, void *dst, int len, __wsum sum) |
136 | int len, int sum) | ||
137 | { | 136 | { |
138 | memcpy(dst, src, len); | 137 | memcpy(dst, src, len); |
139 | return csum_partial(dst, len, sum); | 138 | return csum_partial(dst, len, sum); |
diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S index df7b8833a0c5..eba2343b1b59 100644 --- a/arch/blackfin/lib/ins.S +++ b/arch/blackfin/lib/ins.S | |||
@@ -7,7 +7,7 @@ | |||
7 | * Description: Implementation of ins{bwl} for BlackFin processors using zero overhead loops. | 7 | * Description: Implementation of ins{bwl} for BlackFin processors using zero overhead loops. |
8 | * | 8 | * |
9 | * Modified: | 9 | * Modified: |
10 | * Copyright 2004-2006 Analog Devices Inc. | 10 | * Copyright 2004-2008 Analog Devices Inc. |
11 | * Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> | 11 | * Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> |
12 | * | 12 | * |
13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
@@ -63,6 +63,23 @@ ENTRY(_insw) | |||
63 | RTS; | 63 | RTS; |
64 | ENDPROC(_insw) | 64 | ENDPROC(_insw) |
65 | 65 | ||
66 | ENTRY(_insw_8) | ||
67 | P0 = R0; /* P0 = port */ | ||
68 | cli R3; | ||
69 | P1 = R1; /* P1 = address */ | ||
70 | P2 = R2; /* P2 = count */ | ||
71 | SSYNC; | ||
72 | LSETUP( .Lword8_loop_s, .Lword8_loop_e) LC0 = P2; | ||
73 | .Lword8_loop_s: R0 = W[P0]; | ||
74 | B[P1++] = R0; | ||
75 | R0 = R0 >> 8; | ||
76 | B[P1++] = R0; | ||
77 | NOP; | ||
78 | .Lword8_loop_e: NOP; | ||
79 | sti R3; | ||
80 | RTS; | ||
81 | ENDPROC(_insw_8) | ||
82 | |||
66 | ENTRY(_insb) | 83 | ENTRY(_insb) |
67 | P0 = R0; /* P0 = port */ | 84 | P0 = R0; /* P0 = port */ |
68 | cli R3; | 85 | cli R3; |
@@ -78,8 +95,6 @@ ENTRY(_insb) | |||
78 | RTS; | 95 | RTS; |
79 | ENDPROC(_insb) | 96 | ENDPROC(_insb) |
80 | 97 | ||
81 | |||
82 | |||
83 | ENTRY(_insl_16) | 98 | ENTRY(_insl_16) |
84 | P0 = R0; /* P0 = port */ | 99 | P0 = R0; /* P0 = port */ |
85 | cli R3; | 100 | cli R3; |
diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S index 4c3da8ae094e..3daf96035bf6 100644 --- a/arch/blackfin/lib/outs.S +++ b/arch/blackfin/lib/outs.S | |||
@@ -7,7 +7,7 @@ | |||
7 | * Description: Implementation of outs{bwl} for BlackFin processors using zero overhead loops. | 7 | * Description: Implementation of outs{bwl} for BlackFin processors using zero overhead loops. |
8 | * | 8 | * |
9 | * Modified: Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> | 9 | * Modified: Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> |
10 | * Copyright 2004-2006 Analog Devices Inc. | 10 | * Copyright 2004-2008 Analog Devices Inc. |
11 | * | 11 | * |
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
13 | * | 13 | * |
@@ -63,3 +63,17 @@ ENTRY(_outsb) | |||
63 | .Lbyte_loop_e: B[P0] = R0; | 63 | .Lbyte_loop_e: B[P0] = R0; |
64 | RTS; | 64 | RTS; |
65 | ENDPROC(_outsb) | 65 | ENDPROC(_outsb) |
66 | |||
67 | ENTRY(_outsw_8) | ||
68 | P0 = R0; /* P0 = port */ | ||
69 | P1 = R1; /* P1 = address */ | ||
70 | P2 = R2; /* P2 = count */ | ||
71 | |||
72 | LSETUP( .Lword8_loop_s, .Lword8_loop_e) LC0 = P2; | ||
73 | .Lword8_loop_s: R1 = B[P1++]; | ||
74 | R0 = B[P1++]; | ||
75 | R0 = R0 << 8; | ||
76 | R0 = R0 + R1; | ||
77 | .Lword8_loop_e: W[P0] = R0; | ||
78 | RTS; | ||
79 | ENDPROC(_outsw) | ||
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index 7fd35fb32fd5..ec05b236dc3f 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -111,7 +111,7 @@ static struct platform_device net2272_bfin_device = { | |||
111 | }; | 111 | }; |
112 | #endif | 112 | #endif |
113 | 113 | ||
114 | #if defined(CONFIG_MTD_BF5xx) || defined(CONFIG_MTD_BF5xx_MODULE) | 114 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) |
115 | static struct mtd_partition stamp_partitions[] = { | 115 | static struct mtd_partition stamp_partitions[] = { |
116 | { | 116 | { |
117 | .name = "Bootloader", | 117 | .name = "Bootloader", |
@@ -141,13 +141,17 @@ static struct resource stamp_flash_resource[] = { | |||
141 | .end = 0x203fffff, | 141 | .end = 0x203fffff, |
142 | .flags = IORESOURCE_MEM, | 142 | .flags = IORESOURCE_MEM, |
143 | }, { | 143 | }, { |
144 | .start = CONFIG_ENET_FLASH_PIN, | 144 | .start = 0x7BB07BB0, /* AMBCTL0 setting when accessing flash */ |
145 | .end = 0x7BB07BB0, /* AMBCTL1 setting when accessing flash */ | ||
146 | .flags = IORESOURCE_MEM, | ||
147 | }, { | ||
148 | .start = GPIO_PF0, | ||
145 | .flags = IORESOURCE_IRQ, | 149 | .flags = IORESOURCE_IRQ, |
146 | } | 150 | } |
147 | }; | 151 | }; |
148 | 152 | ||
149 | static struct platform_device stamp_flash_device = { | 153 | static struct platform_device stamp_flash_device = { |
150 | .name = "BF5xx-Flash", | 154 | .name = "bfin-async-flash", |
151 | .id = 0, | 155 | .id = 0, |
152 | .dev = { | 156 | .dev = { |
153 | .platform_data = &stamp_flash_data, | 157 | .platform_data = &stamp_flash_data, |
@@ -595,7 +599,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
595 | 599 | ||
596 | &bfin_gpios_device, | 600 | &bfin_gpios_device, |
597 | 601 | ||
598 | #if defined(CONFIG_MTD_BF5xx) || defined(CONFIG_MTD_BF5xx_MODULE) | 602 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) |
599 | &stamp_flash_device, | 603 | &stamp_flash_device, |
600 | #endif | 604 | #endif |
601 | }; | 605 | }; |
@@ -617,8 +621,8 @@ static int __init stamp_init(void) | |||
617 | 621 | ||
618 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 622 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) |
619 | /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */ | 623 | /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */ |
620 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | (1 << CONFIG_ENET_FLASH_PIN)); | 624 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF0); |
621 | bfin_write_FIO_FLAG_S(1 << CONFIG_ENET_FLASH_PIN); | 625 | bfin_write_FIO_FLAG_S(PF0); |
622 | SSYNC(); | 626 | SSYNC(); |
623 | #endif | 627 | #endif |
624 | 628 | ||
@@ -636,8 +640,8 @@ arch_initcall(stamp_init); | |||
636 | 640 | ||
637 | void native_machine_restart(char *cmd) | 641 | void native_machine_restart(char *cmd) |
638 | { | 642 | { |
639 | #define BIT_TO_SET (1 << CONFIG_ENET_FLASH_PIN) | 643 | /* workaround pull up on cpld / flash pin not being strong enough */ |
640 | bfin_write_FIO_INEN(~BIT_TO_SET); | 644 | bfin_write_FIO_INEN(~PF0); |
641 | bfin_write_FIO_DIR(BIT_TO_SET); | 645 | bfin_write_FIO_DIR(PF0); |
642 | bfin_write_FIO_FLAG_C(BIT_TO_SET); | 646 | bfin_write_FIO_FLAG_C(PF0); |
643 | } | 647 | } |
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c index ef2db8fd102a..5933656db5a2 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c | |||
@@ -38,7 +38,6 @@ | |||
38 | */ | 38 | */ |
39 | 39 | ||
40 | static struct fs_struct init_fs = INIT_FS; | 40 | static struct fs_struct init_fs = INIT_FS; |
41 | static struct files_struct init_files = INIT_FILES; | ||
42 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 41 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
43 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 42 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
44 | struct mm_struct init_mm = INIT_MM(init_mm); | 43 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/frv/kernel/init_task.c b/arch/frv/kernel/init_task.c index 22993932b3fc..e2198815b630 100644 --- a/arch/frv/kernel/init_task.c +++ b/arch/frv/kernel/init_task.c | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | 12 | ||
13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
14 | static struct files_struct init_files = INIT_FILES; | ||
15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
17 | struct mm_struct init_mm = INIT_MM(init_mm); | 16 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/h8300/kernel/init_task.c b/arch/h8300/kernel/init_task.c index 19272c2ac56a..93a4899e46c2 100644 --- a/arch/h8300/kernel/init_task.c +++ b/arch/h8300/kernel/init_task.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
14 | 14 | ||
15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
16 | static struct files_struct init_files = INIT_FILES; | ||
17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c index bc8efcad28b8..9d7e1c66faf4 100644 --- a/arch/ia64/kernel/init_task.c +++ b/arch/ia64/kernel/init_task.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <asm/pgtable.h> | 18 | #include <asm/pgtable.h> |
19 | 19 | ||
20 | static struct fs_struct init_fs = INIT_FS; | 20 | static struct fs_struct init_fs = INIT_FS; |
21 | static struct files_struct init_files = INIT_FILES; | ||
22 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 21 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
23 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 22 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
24 | struct mm_struct init_mm = INIT_MM(init_mm); | 23 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 52353397a1a4..112791dd2542 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile | |||
@@ -7,7 +7,6 @@ offsets-file := asm-offsets.h | |||
7 | always := $(offsets-file) | 7 | always := $(offsets-file) |
8 | targets := $(offsets-file) | 8 | targets := $(offsets-file) |
9 | targets += arch/ia64/kvm/asm-offsets.s | 9 | targets += arch/ia64/kvm/asm-offsets.s |
10 | clean-files := $(addprefix $(objtree)/,$(targets) $(obj)/memcpy.S $(obj)/memset.S) | ||
11 | 10 | ||
12 | # Default sed regexp - multiline due to syntax constraints | 11 | # Default sed regexp - multiline due to syntax constraints |
13 | define sed-y | 12 | define sed-y |
@@ -54,5 +53,5 @@ EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 | |||
54 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ | 53 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ |
55 | vtlb.o process.o | 54 | vtlb.o process.o |
56 | #Add link memcpy and memset to avoid possible structure assignment error | 55 | #Add link memcpy and memset to avoid possible structure assignment error |
57 | kvm-intel-objs += ../lib/memset.o ../lib/memcpy.o | 56 | kvm-intel-objs += memcpy.o memset.o |
58 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o | 57 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o |
diff --git a/arch/ia64/kvm/memcpy.S b/arch/ia64/kvm/memcpy.S new file mode 100644 index 000000000000..c04cdbe9f80f --- /dev/null +++ b/arch/ia64/kvm/memcpy.S | |||
@@ -0,0 +1 @@ | |||
#include "../lib/memcpy.S" | |||
diff --git a/arch/ia64/kvm/memset.S b/arch/ia64/kvm/memset.S new file mode 100644 index 000000000000..83c3066d844a --- /dev/null +++ b/arch/ia64/kvm/memset.S | |||
@@ -0,0 +1 @@ | |||
#include "../lib/memset.S" | |||
diff --git a/arch/m32r/kernel/init_task.c b/arch/m32r/kernel/init_task.c index 9e508fd9d970..0d658dbb6766 100644 --- a/arch/m32r/kernel/init_task.c +++ b/arch/m32r/kernel/init_task.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <asm/pgtable.h> | 12 | #include <asm/pgtable.h> |
13 | 13 | ||
14 | static struct fs_struct init_fs = INIT_FS; | 14 | static struct fs_struct init_fs = INIT_FS; |
15 | static struct files_struct init_files = INIT_FILES; | ||
16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
18 | struct mm_struct init_mm = INIT_MM(init_mm); | 17 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 5de4e4ed76ab..7888cdf91f5d 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
@@ -41,7 +41,6 @@ | |||
41 | * setup. | 41 | * setup. |
42 | */ | 42 | */ |
43 | static struct fs_struct init_fs = INIT_FS; | 43 | static struct fs_struct init_fs = INIT_FS; |
44 | static struct files_struct init_files = INIT_FILES; | ||
45 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 44 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
46 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 45 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
47 | struct mm_struct init_mm = INIT_MM(init_mm); | 46 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c index 891e1347bc4e..4253f870e54f 100644 --- a/arch/m68k/lib/string.c +++ b/arch/m68k/lib/string.c | |||
@@ -15,6 +15,12 @@ char *strcpy(char *dest, const char *src) | |||
15 | } | 15 | } |
16 | EXPORT_SYMBOL(strcpy); | 16 | EXPORT_SYMBOL(strcpy); |
17 | 17 | ||
18 | char *strcat(char *dest, const char *src) | ||
19 | { | ||
20 | return __kernel_strcpy(dest + __kernel_strlen(dest), src); | ||
21 | } | ||
22 | EXPORT_SYMBOL(strcat); | ||
23 | |||
18 | void *memset(void *s, int c, size_t count) | 24 | void *memset(void *s, int c, size_t count) |
19 | { | 25 | { |
20 | void *xs = s; | 26 | void *xs = s; |
diff --git a/arch/m68knommu/kernel/init_task.c b/arch/m68knommu/kernel/init_task.c index 3897043a126a..344c01aede08 100644 --- a/arch/m68knommu/kernel/init_task.c +++ b/arch/m68knommu/kernel/init_task.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
14 | 14 | ||
15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
16 | static struct files_struct init_files = INIT_FILES; | ||
17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/mips/kernel/init_task.c b/arch/mips/kernel/init_task.c index aeda7f58391b..d72487ad7c15 100644 --- a/arch/mips/kernel/init_task.c +++ b/arch/mips/kernel/init_task.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
11 | 11 | ||
12 | static struct fs_struct init_fs = INIT_FS; | 12 | static struct fs_struct init_fs = INIT_FS; |
13 | static struct files_struct init_files = INIT_FILES; | ||
14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
16 | struct mm_struct init_mm = INIT_MM(init_mm); | 15 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/mn10300/kernel/init_task.c b/arch/mn10300/kernel/init_task.c index 39fe6882dd1d..af16f6e5c918 100644 --- a/arch/mn10300/kernel/init_task.c +++ b/arch/mn10300/kernel/init_task.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
20 | 20 | ||
21 | static struct fs_struct init_fs = INIT_FS; | 21 | static struct fs_struct init_fs = INIT_FS; |
22 | static struct files_struct init_files = INIT_FILES; | ||
23 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 22 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
24 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 23 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
25 | struct mm_struct init_mm = INIT_MM(init_mm); | 24 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c index 26198a074d67..f5941c086551 100644 --- a/arch/parisc/kernel/init_task.c +++ b/arch/parisc/kernel/init_task.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <asm/pgalloc.h> | 35 | #include <asm/pgalloc.h> |
36 | 36 | ||
37 | static struct fs_struct init_fs = INIT_FS; | 37 | static struct fs_struct init_fs = INIT_FS; |
38 | static struct files_struct init_files = INIT_FILES; | ||
39 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 38 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
40 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 39 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
41 | struct mm_struct init_mm = INIT_MM(init_mm); | 40 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore index 2347294ff35b..2f50acd11a60 100644 --- a/arch/powerpc/boot/.gitignore +++ b/arch/powerpc/boot/.gitignore | |||
@@ -20,21 +20,19 @@ kernel-vmlinux.strip.gz | |||
20 | mktree | 20 | mktree |
21 | uImage | 21 | uImage |
22 | cuImage.* | 22 | cuImage.* |
23 | dtbImage.* | ||
23 | treeImage.* | 24 | treeImage.* |
24 | zImage | 25 | zImage |
26 | zImage.initrd | ||
25 | zImage.bin.* | 27 | zImage.bin.* |
26 | zImage.chrp | 28 | zImage.chrp |
27 | zImage.coff | 29 | zImage.coff |
28 | zImage.coff.lds | 30 | zImage.holly |
29 | zImage.ep* | ||
30 | zImage.iseries | 31 | zImage.iseries |
31 | zImage.*lds | 32 | zImage.*lds |
32 | zImage.miboot | 33 | zImage.miboot |
33 | zImage.pmac | 34 | zImage.pmac |
34 | zImage.pseries | 35 | zImage.pseries |
35 | zImage.redboot* | ||
36 | zImage.sandpoint | ||
37 | zImage.vmode | ||
38 | zconf.h | 36 | zconf.h |
39 | zlib.h | 37 | zlib.h |
40 | zutil.h | 38 | zutil.h |
diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c index 758edf1c5815..5c878436f348 100644 --- a/arch/powerpc/boot/4xx.c +++ b/arch/powerpc/boot/4xx.c | |||
@@ -21,6 +21,25 @@ | |||
21 | #include "reg.h" | 21 | #include "reg.h" |
22 | #include "dcr.h" | 22 | #include "dcr.h" |
23 | 23 | ||
24 | static unsigned long chip_11_errata(unsigned long memsize) | ||
25 | { | ||
26 | unsigned long pvr; | ||
27 | |||
28 | pvr = mfpvr(); | ||
29 | |||
30 | switch (pvr & 0xf0000ff0) { | ||
31 | case 0x40000850: | ||
32 | case 0x400008d0: | ||
33 | case 0x200008d0: | ||
34 | memsize -= 4096; | ||
35 | break; | ||
36 | default: | ||
37 | break; | ||
38 | } | ||
39 | |||
40 | return memsize; | ||
41 | } | ||
42 | |||
24 | /* Read the 4xx SDRAM controller to get size of system memory. */ | 43 | /* Read the 4xx SDRAM controller to get size of system memory. */ |
25 | void ibm4xx_sdram_fixup_memsize(void) | 44 | void ibm4xx_sdram_fixup_memsize(void) |
26 | { | 45 | { |
@@ -34,6 +53,7 @@ void ibm4xx_sdram_fixup_memsize(void) | |||
34 | memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); | 53 | memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); |
35 | } | 54 | } |
36 | 55 | ||
56 | memsize = chip_11_errata(memsize); | ||
37 | dt_fixup_memory(0, memsize); | 57 | dt_fixup_memory(0, memsize); |
38 | } | 58 | } |
39 | 59 | ||
@@ -199,6 +219,7 @@ void ibm4xx_denali_fixup_memsize(void) | |||
199 | bank = 4; /* 4 banks */ | 219 | bank = 4; /* 4 banks */ |
200 | 220 | ||
201 | memsize = cs * (1 << (col+row)) * bank * dpath; | 221 | memsize = cs * (1 << (col+row)) * bank * dpath; |
222 | memsize = chip_11_errata(memsize); | ||
202 | dt_fixup_memory(0, memsize); | 223 | dt_fixup_memory(0, memsize); |
203 | } | 224 | } |
204 | 225 | ||
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 7822d25c9d31..f5e0b2a5af57 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct | |||
99 | @cp $< $@ | 99 | @cp $< $@ |
100 | 100 | ||
101 | clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \ | 101 | clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \ |
102 | empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds | 102 | empty.c zImage.coff.lds zImage.ps3.lds zImage.lds |
103 | 103 | ||
104 | quiet_cmd_bootcc = BOOTCC $@ | 104 | quiet_cmd_bootcc = BOOTCC $@ |
105 | cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< | 105 | cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< |
@@ -339,7 +339,9 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) | |||
339 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< | 339 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< |
340 | 340 | ||
341 | # anything not in $(targets) | 341 | # anything not in $(targets) |
342 | clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \ | 342 | clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ |
343 | zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ | ||
344 | zImage.iseries zImage.miboot zImage.pmac zImage.pseries \ | ||
343 | otheros.bld *.dtb | 345 | otheros.bld *.dtb |
344 | 346 | ||
345 | # clean up files cached by wrapper | 347 | # clean up files cached by wrapper |
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index 1e7802cc31ae..fea592574004 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
@@ -271,27 +271,35 @@ | |||
271 | dma@82a8 { | 271 | dma@82a8 { |
272 | #address-cells = <1>; | 272 | #address-cells = <1>; |
273 | #size-cells = <1>; | 273 | #size-cells = <1>; |
274 | compatible = "fsl,mpc8349-dma"; | 274 | compatible = "fsl,mpc8377-dma", "fsl,elo-dma"; |
275 | reg = <0x82a8 4>; | 275 | reg = <0x82a8 4>; |
276 | ranges = <0 0x8100 0x1a8>; | 276 | ranges = <0 0x8100 0x1a8>; |
277 | interrupt-parent = <&ipic>; | 277 | interrupt-parent = <&ipic>; |
278 | interrupts = <0x47 8>; | 278 | interrupts = <0x47 8>; |
279 | cell-index = <0>; | 279 | cell-index = <0>; |
280 | dma-channel@0 { | 280 | dma-channel@0 { |
281 | compatible = "fsl,mpc8349-dma-channel"; | 281 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
282 | reg = <0 0x80>; | 282 | reg = <0 0x80>; |
283 | interrupt-parent = <&ipic>; | ||
284 | interrupts = <0x47 8>; | ||
283 | }; | 285 | }; |
284 | dma-channel@80 { | 286 | dma-channel@80 { |
285 | compatible = "fsl,mpc8349-dma-channel"; | 287 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
286 | reg = <0x80 0x80>; | 288 | reg = <0x80 0x80>; |
289 | interrupt-parent = <&ipic>; | ||
290 | interrupts = <0x47 8>; | ||
287 | }; | 291 | }; |
288 | dma-channel@100 { | 292 | dma-channel@100 { |
289 | compatible = "fsl,mpc8349-dma-channel"; | 293 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
290 | reg = <0x100 0x80>; | 294 | reg = <0x100 0x80>; |
295 | interrupt-parent = <&ipic>; | ||
296 | interrupts = <0x47 8>; | ||
291 | }; | 297 | }; |
292 | dma-channel@180 { | 298 | dma-channel@180 { |
293 | compatible = "fsl,mpc8349-dma-channel"; | 299 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
294 | reg = <0x180 0x28>; | 300 | reg = <0x180 0x28>; |
301 | interrupt-parent = <&ipic>; | ||
302 | interrupts = <0x47 8>; | ||
295 | }; | 303 | }; |
296 | }; | 304 | }; |
297 | 305 | ||
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index d7fd298bd234..05360d4ef1b1 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:55:37 2008 | 4 | # Tue May 20 20:00:44 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -88,6 +90,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 90 | CONFIG_SYSCTL=y |
89 | # CONFIG_EMBEDDED is not set | 91 | # CONFIG_EMBEDDED is not set |
90 | CONFIG_SYSCTL_SYSCALL=y | 92 | CONFIG_SYSCTL_SYSCALL=y |
93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
91 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
92 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -95,6 +98,7 @@ CONFIG_HOTPLUG=y | |||
95 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
96 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
97 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
98 | # CONFIG_COMPAT_BRK is not set | 102 | # CONFIG_COMPAT_BRK is not set |
99 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
100 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -115,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
115 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
116 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
117 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
119 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
122 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
123 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
124 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
125 | CONFIG_MODULE_FORCE_UNLOAD=y | 131 | CONFIG_MODULE_FORCE_UNLOAD=y |
126 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
@@ -217,11 +223,13 @@ CONFIG_FLATMEM=y | |||
217 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
218 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
224 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
225 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
@@ -245,6 +253,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
245 | # CONFIG_PCI_DEBUG is not set | 253 | # CONFIG_PCI_DEBUG is not set |
246 | # CONFIG_PCCARD is not set | 254 | # CONFIG_PCCARD is not set |
247 | # CONFIG_HOTPLUG_PCI is not set | 255 | # CONFIG_HOTPLUG_PCI is not set |
256 | # CONFIG_HAS_RAPIDIO is not set | ||
248 | 257 | ||
249 | # | 258 | # |
250 | # Advanced setup | 259 | # Advanced setup |
@@ -254,11 +263,11 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
254 | # | 263 | # |
255 | # Default settings for advanced configuration options are used | 264 | # Default settings for advanced configuration options are used |
256 | # | 265 | # |
257 | CONFIG_HIGHMEM_START=0xfe000000 | ||
258 | CONFIG_LOWMEM_SIZE=0x30000000 | 266 | CONFIG_LOWMEM_SIZE=0x30000000 |
267 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
259 | CONFIG_KERNEL_START=0xc0000000 | 268 | CONFIG_KERNEL_START=0xc0000000 |
269 | CONFIG_PHYSICAL_START=0x00000000 | ||
260 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
261 | CONFIG_BOOT_LOAD=0x00800000 | ||
262 | 271 | ||
263 | # | 272 | # |
264 | # Networking | 273 | # Networking |
@@ -299,8 +308,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
299 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
300 | # CONFIG_IP_VS is not set | 309 | # CONFIG_IP_VS is not set |
301 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
303 | # CONFIG_INET6_TUNNEL is not set | ||
304 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
305 | CONFIG_NETFILTER=y | 312 | CONFIG_NETFILTER=y |
306 | # CONFIG_NETFILTER_DEBUG is not set | 313 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -398,6 +405,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
398 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
399 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
400 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
408 | CONFIG_OF_I2C=y | ||
401 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
402 | # CONFIG_PNP is not set | 410 | # CONFIG_PNP is not set |
403 | CONFIG_BLK_DEV=y | 411 | CONFIG_BLK_DEV=y |
@@ -484,22 +492,8 @@ CONFIG_BLK_DEV_SL82C105=y | |||
484 | # CONFIG_BLK_DEV_TRM290 is not set | 492 | # CONFIG_BLK_DEV_TRM290 is not set |
485 | CONFIG_BLK_DEV_VIA82CXXX=y | 493 | CONFIG_BLK_DEV_VIA82CXXX=y |
486 | # CONFIG_BLK_DEV_TC86C001 is not set | 494 | # CONFIG_BLK_DEV_TC86C001 is not set |
487 | |||
488 | # | ||
489 | # Other IDE chipsets support | ||
490 | # | ||
491 | |||
492 | # | ||
493 | # Note: most of these also require special kernel boot parameters | ||
494 | # | ||
495 | # CONFIG_BLK_DEV_4DRIVES is not set | ||
496 | # CONFIG_BLK_DEV_ALI14XX is not set | ||
497 | # CONFIG_BLK_DEV_DTC2278 is not set | ||
498 | # CONFIG_BLK_DEV_HT6560B is not set | ||
499 | # CONFIG_BLK_DEV_QD65XX is not set | ||
500 | # CONFIG_BLK_DEV_UMC8672 is not set | ||
501 | CONFIG_BLK_DEV_IDEDMA=y | 495 | CONFIG_BLK_DEV_IDEDMA=y |
502 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 496 | # CONFIG_BLK_DEV_HD_ONLY is not set |
503 | # CONFIG_BLK_DEV_HD is not set | 497 | # CONFIG_BLK_DEV_HD is not set |
504 | 498 | ||
505 | # | 499 | # |
@@ -641,7 +635,6 @@ CONFIG_DE4X5=y | |||
641 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 635 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
642 | CONFIG_NET_PCI=y | 636 | CONFIG_NET_PCI=y |
643 | CONFIG_PCNET32=y | 637 | CONFIG_PCNET32=y |
644 | # CONFIG_PCNET32_NAPI is not set | ||
645 | # CONFIG_AMD8111_ETH is not set | 638 | # CONFIG_AMD8111_ETH is not set |
646 | # CONFIG_ADAPTEC_STARFIRE is not set | 639 | # CONFIG_ADAPTEC_STARFIRE is not set |
647 | # CONFIG_AC3200 is not set | 640 | # CONFIG_AC3200 is not set |
@@ -684,7 +677,6 @@ CONFIG_NETDEV_1000=y | |||
684 | # CONFIG_SIS190 is not set | 677 | # CONFIG_SIS190 is not set |
685 | # CONFIG_SKGE is not set | 678 | # CONFIG_SKGE is not set |
686 | # CONFIG_SKY2 is not set | 679 | # CONFIG_SKY2 is not set |
687 | # CONFIG_SK98LIN is not set | ||
688 | # CONFIG_VIA_VELOCITY is not set | 680 | # CONFIG_VIA_VELOCITY is not set |
689 | # CONFIG_TIGON3 is not set | 681 | # CONFIG_TIGON3 is not set |
690 | # CONFIG_BNX2 is not set | 682 | # CONFIG_BNX2 is not set |
@@ -703,6 +695,7 @@ CONFIG_NETDEV_10000=y | |||
703 | # CONFIG_MLX4_CORE is not set | 695 | # CONFIG_MLX4_CORE is not set |
704 | # CONFIG_TEHUTI is not set | 696 | # CONFIG_TEHUTI is not set |
705 | # CONFIG_BNX2X is not set | 697 | # CONFIG_BNX2X is not set |
698 | # CONFIG_SFC is not set | ||
706 | # CONFIG_TR is not set | 699 | # CONFIG_TR is not set |
707 | 700 | ||
708 | # | 701 | # |
@@ -710,6 +703,7 @@ CONFIG_NETDEV_10000=y | |||
710 | # | 703 | # |
711 | # CONFIG_WLAN_PRE80211 is not set | 704 | # CONFIG_WLAN_PRE80211 is not set |
712 | # CONFIG_WLAN_80211 is not set | 705 | # CONFIG_WLAN_80211 is not set |
706 | # CONFIG_IWLWIFI_LEDS is not set | ||
713 | 707 | ||
714 | # | 708 | # |
715 | # USB Network Adapters | 709 | # USB Network Adapters |
@@ -813,6 +807,7 @@ CONFIG_VT=y | |||
813 | CONFIG_VT_CONSOLE=y | 807 | CONFIG_VT_CONSOLE=y |
814 | CONFIG_HW_CONSOLE=y | 808 | CONFIG_HW_CONSOLE=y |
815 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 809 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
810 | CONFIG_DEVKMEM=y | ||
816 | # CONFIG_SERIAL_NONSTANDARD is not set | 811 | # CONFIG_SERIAL_NONSTANDARD is not set |
817 | # CONFIG_NOZOMI is not set | 812 | # CONFIG_NOZOMI is not set |
818 | 813 | ||
@@ -853,13 +848,7 @@ CONFIG_DEVPORT=y | |||
853 | CONFIG_I2C=y | 848 | CONFIG_I2C=y |
854 | CONFIG_I2C_BOARDINFO=y | 849 | CONFIG_I2C_BOARDINFO=y |
855 | # CONFIG_I2C_CHARDEV is not set | 850 | # CONFIG_I2C_CHARDEV is not set |
856 | |||
857 | # | ||
858 | # I2C Algorithms | ||
859 | # | ||
860 | CONFIG_I2C_ALGOBIT=y | 851 | CONFIG_I2C_ALGOBIT=y |
861 | # CONFIG_I2C_ALGOPCF is not set | ||
862 | # CONFIG_I2C_ALGOPCA is not set | ||
863 | 852 | ||
864 | # | 853 | # |
865 | # I2C Hardware Bus support | 854 | # I2C Hardware Bus support |
@@ -890,6 +879,7 @@ CONFIG_I2C_ALGOBIT=y | |||
890 | # CONFIG_I2C_VIAPRO is not set | 879 | # CONFIG_I2C_VIAPRO is not set |
891 | # CONFIG_I2C_VOODOO3 is not set | 880 | # CONFIG_I2C_VOODOO3 is not set |
892 | # CONFIG_I2C_PCA_ISA is not set | 881 | # CONFIG_I2C_PCA_ISA is not set |
882 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
893 | 883 | ||
894 | # | 884 | # |
895 | # Miscellaneous I2C Chip support | 885 | # Miscellaneous I2C Chip support |
@@ -899,19 +889,13 @@ CONFIG_I2C_ALGOBIT=y | |||
899 | # CONFIG_SENSORS_PCF8574 is not set | 889 | # CONFIG_SENSORS_PCF8574 is not set |
900 | # CONFIG_PCF8575 is not set | 890 | # CONFIG_PCF8575 is not set |
901 | # CONFIG_SENSORS_PCF8591 is not set | 891 | # CONFIG_SENSORS_PCF8591 is not set |
902 | # CONFIG_TPS65010 is not set | ||
903 | # CONFIG_SENSORS_MAX6875 is not set | 892 | # CONFIG_SENSORS_MAX6875 is not set |
904 | # CONFIG_SENSORS_TSL2550 is not set | 893 | # CONFIG_SENSORS_TSL2550 is not set |
905 | # CONFIG_I2C_DEBUG_CORE is not set | 894 | # CONFIG_I2C_DEBUG_CORE is not set |
906 | # CONFIG_I2C_DEBUG_ALGO is not set | 895 | # CONFIG_I2C_DEBUG_ALGO is not set |
907 | # CONFIG_I2C_DEBUG_BUS is not set | 896 | # CONFIG_I2C_DEBUG_BUS is not set |
908 | # CONFIG_I2C_DEBUG_CHIP is not set | 897 | # CONFIG_I2C_DEBUG_CHIP is not set |
909 | |||
910 | # | ||
911 | # SPI support | ||
912 | # | ||
913 | # CONFIG_SPI is not set | 898 | # CONFIG_SPI is not set |
914 | # CONFIG_SPI_MASTER is not set | ||
915 | # CONFIG_W1 is not set | 899 | # CONFIG_W1 is not set |
916 | # CONFIG_POWER_SUPPLY is not set | 900 | # CONFIG_POWER_SUPPLY is not set |
917 | # CONFIG_HWMON is not set | 901 | # CONFIG_HWMON is not set |
@@ -928,12 +912,22 @@ CONFIG_SSB_POSSIBLE=y | |||
928 | # Multifunction device drivers | 912 | # Multifunction device drivers |
929 | # | 913 | # |
930 | # CONFIG_MFD_SM501 is not set | 914 | # CONFIG_MFD_SM501 is not set |
915 | # CONFIG_HTC_PASIC3 is not set | ||
931 | 916 | ||
932 | # | 917 | # |
933 | # Multimedia devices | 918 | # Multimedia devices |
934 | # | 919 | # |
920 | |||
921 | # | ||
922 | # Multimedia core support | ||
923 | # | ||
935 | # CONFIG_VIDEO_DEV is not set | 924 | # CONFIG_VIDEO_DEV is not set |
936 | # CONFIG_DVB_CORE is not set | 925 | # CONFIG_DVB_CORE is not set |
926 | # CONFIG_VIDEO_MEDIA is not set | ||
927 | |||
928 | # | ||
929 | # Multimedia drivers | ||
930 | # | ||
937 | # CONFIG_DAB is not set | 931 | # CONFIG_DAB is not set |
938 | 932 | ||
939 | # | 933 | # |
@@ -953,8 +947,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
953 | # CONFIG_FB_SYS_FILLRECT is not set | 947 | # CONFIG_FB_SYS_FILLRECT is not set |
954 | # CONFIG_FB_SYS_COPYAREA is not set | 948 | # CONFIG_FB_SYS_COPYAREA is not set |
955 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 949 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
950 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
956 | # CONFIG_FB_SYS_FOPS is not set | 951 | # CONFIG_FB_SYS_FOPS is not set |
957 | CONFIG_FB_DEFERRED_IO=y | ||
958 | # CONFIG_FB_SVGALIB is not set | 952 | # CONFIG_FB_SVGALIB is not set |
959 | CONFIG_FB_MACMODES=y | 953 | CONFIG_FB_MACMODES=y |
960 | CONFIG_FB_BACKLIGHT=y | 954 | CONFIG_FB_BACKLIGHT=y |
@@ -1072,11 +1066,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1072 | # | 1066 | # |
1073 | # USB Host Controller Drivers | 1067 | # USB Host Controller Drivers |
1074 | # | 1068 | # |
1069 | # CONFIG_USB_C67X00_HCD is not set | ||
1075 | CONFIG_USB_EHCI_HCD=m | 1070 | CONFIG_USB_EHCI_HCD=m |
1076 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1071 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1077 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1072 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1078 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1073 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1079 | # CONFIG_USB_ISP116X_HCD is not set | 1074 | # CONFIG_USB_ISP116X_HCD is not set |
1075 | # CONFIG_USB_ISP1760_HCD is not set | ||
1080 | CONFIG_USB_OHCI_HCD=y | 1076 | CONFIG_USB_OHCI_HCD=y |
1081 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1077 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1082 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1078 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1112,6 +1108,7 @@ CONFIG_USB_STORAGE=m | |||
1112 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1108 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1113 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1109 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1114 | # CONFIG_USB_STORAGE_KARMA is not set | 1110 | # CONFIG_USB_STORAGE_KARMA is not set |
1111 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1115 | # CONFIG_USB_LIBUSUAL is not set | 1112 | # CONFIG_USB_LIBUSUAL is not set |
1116 | 1113 | ||
1117 | # | 1114 | # |
@@ -1153,14 +1150,11 @@ CONFIG_USB_MON=y | |||
1153 | # CONFIG_MMC is not set | 1150 | # CONFIG_MMC is not set |
1154 | # CONFIG_MEMSTICK is not set | 1151 | # CONFIG_MEMSTICK is not set |
1155 | # CONFIG_NEW_LEDS is not set | 1152 | # CONFIG_NEW_LEDS is not set |
1153 | # CONFIG_ACCESSIBILITY is not set | ||
1156 | # CONFIG_INFINIBAND is not set | 1154 | # CONFIG_INFINIBAND is not set |
1157 | # CONFIG_EDAC is not set | 1155 | # CONFIG_EDAC is not set |
1158 | # CONFIG_RTC_CLASS is not set | 1156 | # CONFIG_RTC_CLASS is not set |
1159 | # CONFIG_DMADEVICES is not set | 1157 | # CONFIG_DMADEVICES is not set |
1160 | |||
1161 | # | ||
1162 | # Userspace I/O | ||
1163 | # | ||
1164 | # CONFIG_UIO is not set | 1158 | # CONFIG_UIO is not set |
1165 | 1159 | ||
1166 | # | 1160 | # |
@@ -1180,7 +1174,6 @@ CONFIG_FS_MBCACHE=y | |||
1180 | # CONFIG_JFS_FS is not set | 1174 | # CONFIG_JFS_FS is not set |
1181 | # CONFIG_FS_POSIX_ACL is not set | 1175 | # CONFIG_FS_POSIX_ACL is not set |
1182 | # CONFIG_XFS_FS is not set | 1176 | # CONFIG_XFS_FS is not set |
1183 | # CONFIG_GFS2_FS is not set | ||
1184 | # CONFIG_OCFS2_FS is not set | 1177 | # CONFIG_OCFS2_FS is not set |
1185 | CONFIG_DNOTIFY=y | 1178 | CONFIG_DNOTIFY=y |
1186 | CONFIG_INOTIFY=y | 1179 | CONFIG_INOTIFY=y |
@@ -1314,6 +1307,7 @@ CONFIG_NLS_ISO8859_1=m | |||
1314 | # Library routines | 1307 | # Library routines |
1315 | # | 1308 | # |
1316 | CONFIG_BITREVERSE=y | 1309 | CONFIG_BITREVERSE=y |
1310 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1317 | CONFIG_CRC_CCITT=m | 1311 | CONFIG_CRC_CCITT=m |
1318 | # CONFIG_CRC16 is not set | 1312 | # CONFIG_CRC16 is not set |
1319 | # CONFIG_CRC_ITU_T is not set | 1313 | # CONFIG_CRC_ITU_T is not set |
@@ -1334,6 +1328,7 @@ CONFIG_HAVE_LMB=y | |||
1334 | # CONFIG_PRINTK_TIME is not set | 1328 | # CONFIG_PRINTK_TIME is not set |
1335 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1329 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1336 | CONFIG_ENABLE_MUST_CHECK=y | 1330 | CONFIG_ENABLE_MUST_CHECK=y |
1331 | CONFIG_FRAME_WARN=1024 | ||
1337 | CONFIG_MAGIC_SYSRQ=y | 1332 | CONFIG_MAGIC_SYSRQ=y |
1338 | # CONFIG_UNUSED_SYMBOLS is not set | 1333 | # CONFIG_UNUSED_SYMBOLS is not set |
1339 | # CONFIG_DEBUG_FS is not set | 1334 | # CONFIG_DEBUG_FS is not set |
@@ -1344,6 +1339,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1344 | CONFIG_SCHED_DEBUG=y | 1339 | CONFIG_SCHED_DEBUG=y |
1345 | # CONFIG_SCHEDSTATS is not set | 1340 | # CONFIG_SCHEDSTATS is not set |
1346 | # CONFIG_TIMER_STATS is not set | 1341 | # CONFIG_TIMER_STATS is not set |
1342 | # CONFIG_DEBUG_OBJECTS is not set | ||
1347 | # CONFIG_SLUB_DEBUG_ON is not set | 1343 | # CONFIG_SLUB_DEBUG_ON is not set |
1348 | # CONFIG_SLUB_STATS is not set | 1344 | # CONFIG_SLUB_STATS is not set |
1349 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1345 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1357,6 +1353,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y | |||
1357 | CONFIG_DEBUG_BUGVERBOSE=y | 1353 | CONFIG_DEBUG_BUGVERBOSE=y |
1358 | # CONFIG_DEBUG_INFO is not set | 1354 | # CONFIG_DEBUG_INFO is not set |
1359 | # CONFIG_DEBUG_VM is not set | 1355 | # CONFIG_DEBUG_VM is not set |
1356 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1360 | # CONFIG_DEBUG_LIST is not set | 1357 | # CONFIG_DEBUG_LIST is not set |
1361 | # CONFIG_DEBUG_SG is not set | 1358 | # CONFIG_DEBUG_SG is not set |
1362 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1359 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1371,6 +1368,7 @@ CONFIG_DEBUGGER=y | |||
1371 | CONFIG_XMON=y | 1368 | CONFIG_XMON=y |
1372 | CONFIG_XMON_DEFAULT=y | 1369 | CONFIG_XMON_DEFAULT=y |
1373 | CONFIG_XMON_DISASSEMBLY=y | 1370 | CONFIG_XMON_DISASSEMBLY=y |
1371 | CONFIG_IRQSTACKS=y | ||
1374 | # CONFIG_BDI_SWITCH is not set | 1372 | # CONFIG_BDI_SWITCH is not set |
1375 | # CONFIG_BOOTX_TEXT is not set | 1373 | # CONFIG_BOOTX_TEXT is not set |
1376 | # CONFIG_PPC_EARLY_DEBUG is not set | 1374 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1382,50 +1380,80 @@ CONFIG_XMON_DISASSEMBLY=y | |||
1382 | # CONFIG_SECURITY is not set | 1380 | # CONFIG_SECURITY is not set |
1383 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1381 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1384 | CONFIG_CRYPTO=y | 1382 | CONFIG_CRYPTO=y |
1383 | |||
1384 | # | ||
1385 | # Crypto core or helper | ||
1386 | # | ||
1385 | CONFIG_CRYPTO_ALGAPI=m | 1387 | CONFIG_CRYPTO_ALGAPI=m |
1386 | CONFIG_CRYPTO_BLKCIPHER=m | 1388 | CONFIG_CRYPTO_BLKCIPHER=m |
1387 | # CONFIG_CRYPTO_SEQIV is not set | ||
1388 | CONFIG_CRYPTO_MANAGER=m | 1389 | CONFIG_CRYPTO_MANAGER=m |
1390 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1391 | # CONFIG_CRYPTO_NULL is not set | ||
1392 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1393 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1394 | # CONFIG_CRYPTO_TEST is not set | ||
1395 | |||
1396 | # | ||
1397 | # Authenticated Encryption with Associated Data | ||
1398 | # | ||
1399 | # CONFIG_CRYPTO_CCM is not set | ||
1400 | # CONFIG_CRYPTO_GCM is not set | ||
1401 | # CONFIG_CRYPTO_SEQIV is not set | ||
1402 | |||
1403 | # | ||
1404 | # Block modes | ||
1405 | # | ||
1406 | CONFIG_CRYPTO_CBC=m | ||
1407 | # CONFIG_CRYPTO_CTR is not set | ||
1408 | # CONFIG_CRYPTO_CTS is not set | ||
1409 | CONFIG_CRYPTO_ECB=m | ||
1410 | # CONFIG_CRYPTO_LRW is not set | ||
1411 | CONFIG_CRYPTO_PCBC=m | ||
1412 | # CONFIG_CRYPTO_XTS is not set | ||
1413 | |||
1414 | # | ||
1415 | # Hash modes | ||
1416 | # | ||
1389 | # CONFIG_CRYPTO_HMAC is not set | 1417 | # CONFIG_CRYPTO_HMAC is not set |
1390 | # CONFIG_CRYPTO_XCBC is not set | 1418 | # CONFIG_CRYPTO_XCBC is not set |
1391 | # CONFIG_CRYPTO_NULL is not set | 1419 | |
1420 | # | ||
1421 | # Digest | ||
1422 | # | ||
1423 | # CONFIG_CRYPTO_CRC32C is not set | ||
1392 | # CONFIG_CRYPTO_MD4 is not set | 1424 | # CONFIG_CRYPTO_MD4 is not set |
1393 | # CONFIG_CRYPTO_MD5 is not set | 1425 | # CONFIG_CRYPTO_MD5 is not set |
1426 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1394 | CONFIG_CRYPTO_SHA1=m | 1427 | CONFIG_CRYPTO_SHA1=m |
1395 | # CONFIG_CRYPTO_SHA256 is not set | 1428 | # CONFIG_CRYPTO_SHA256 is not set |
1396 | # CONFIG_CRYPTO_SHA512 is not set | 1429 | # CONFIG_CRYPTO_SHA512 is not set |
1397 | # CONFIG_CRYPTO_WP512 is not set | ||
1398 | # CONFIG_CRYPTO_TGR192 is not set | 1430 | # CONFIG_CRYPTO_TGR192 is not set |
1399 | # CONFIG_CRYPTO_GF128MUL is not set | 1431 | # CONFIG_CRYPTO_WP512 is not set |
1400 | CONFIG_CRYPTO_ECB=m | 1432 | |
1401 | CONFIG_CRYPTO_CBC=m | 1433 | # |
1402 | CONFIG_CRYPTO_PCBC=m | 1434 | # Ciphers |
1403 | # CONFIG_CRYPTO_LRW is not set | 1435 | # |
1404 | # CONFIG_CRYPTO_XTS is not set | ||
1405 | # CONFIG_CRYPTO_CTR is not set | ||
1406 | # CONFIG_CRYPTO_GCM is not set | ||
1407 | # CONFIG_CRYPTO_CCM is not set | ||
1408 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1409 | # CONFIG_CRYPTO_DES is not set | ||
1410 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1411 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1412 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1413 | # CONFIG_CRYPTO_SERPENT is not set | ||
1414 | # CONFIG_CRYPTO_AES is not set | 1436 | # CONFIG_CRYPTO_AES is not set |
1437 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1438 | CONFIG_CRYPTO_ARC4=m | ||
1439 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1440 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1415 | # CONFIG_CRYPTO_CAST5 is not set | 1441 | # CONFIG_CRYPTO_CAST5 is not set |
1416 | # CONFIG_CRYPTO_CAST6 is not set | 1442 | # CONFIG_CRYPTO_CAST6 is not set |
1417 | # CONFIG_CRYPTO_TEA is not set | 1443 | # CONFIG_CRYPTO_DES is not set |
1418 | CONFIG_CRYPTO_ARC4=m | 1444 | # CONFIG_CRYPTO_FCRYPT is not set |
1419 | # CONFIG_CRYPTO_KHAZAD is not set | 1445 | # CONFIG_CRYPTO_KHAZAD is not set |
1420 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1421 | # CONFIG_CRYPTO_SEED is not set | ||
1422 | # CONFIG_CRYPTO_SALSA20 is not set | 1446 | # CONFIG_CRYPTO_SALSA20 is not set |
1447 | # CONFIG_CRYPTO_SEED is not set | ||
1448 | # CONFIG_CRYPTO_SERPENT is not set | ||
1449 | # CONFIG_CRYPTO_TEA is not set | ||
1450 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1451 | |||
1452 | # | ||
1453 | # Compression | ||
1454 | # | ||
1423 | # CONFIG_CRYPTO_DEFLATE is not set | 1455 | # CONFIG_CRYPTO_DEFLATE is not set |
1424 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1425 | # CONFIG_CRYPTO_CRC32C is not set | ||
1426 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1427 | # CONFIG_CRYPTO_TEST is not set | ||
1428 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1429 | # CONFIG_CRYPTO_LZO is not set | 1456 | # CONFIG_CRYPTO_LZO is not set |
1430 | # CONFIG_CRYPTO_HW is not set | 1457 | # CONFIG_CRYPTO_HW is not set |
1431 | # CONFIG_PPC_CLOCK is not set | 1458 | # CONFIG_PPC_CLOCK is not set |
1459 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 88338a9f5e95..db34909831a2 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:55:43 2008 | 4 | # Tue May 20 20:01:18 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -29,6 +29,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
31 | CONFIG_IRQ_PER_CPU=y | 31 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | ||
33 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | ||
32 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
33 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
34 | CONFIG_ARCH_HAS_ILOG2_U64=y | 37 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -91,6 +94,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
91 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
92 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
93 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 99 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -119,12 +123,14 @@ CONFIG_HAVE_OPROFILE=y | |||
119 | # CONFIG_KPROBES is not set | 123 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
126 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
122 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
123 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
124 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
125 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
126 | CONFIG_BASE_SMALL=0 | 131 | CONFIG_BASE_SMALL=0 |
127 | CONFIG_MODULES=y | 132 | CONFIG_MODULES=y |
133 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
128 | CONFIG_MODULE_UNLOAD=y | 134 | CONFIG_MODULE_UNLOAD=y |
129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 135 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
130 | CONFIG_MODVERSIONS=y | 136 | CONFIG_MODVERSIONS=y |
@@ -165,11 +171,11 @@ CONFIG_PPC_PMAC=y | |||
165 | CONFIG_PPC_PMAC64=y | 171 | CONFIG_PPC_PMAC64=y |
166 | # CONFIG_PPC_MAPLE is not set | 172 | # CONFIG_PPC_MAPLE is not set |
167 | # CONFIG_PPC_PASEMI is not set | 173 | # CONFIG_PPC_PASEMI is not set |
168 | # CONFIG_PPC_CELLEB is not set | ||
169 | # CONFIG_PPC_PS3 is not set | 174 | # CONFIG_PPC_PS3 is not set |
170 | # CONFIG_PPC_CELL is not set | 175 | # CONFIG_PPC_CELL is not set |
171 | # CONFIG_PPC_CELL_NATIVE is not set | 176 | # CONFIG_PPC_CELL_NATIVE is not set |
172 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 177 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
178 | # CONFIG_PPC_CELLEB is not set | ||
173 | # CONFIG_PQ2ADS is not set | 179 | # CONFIG_PQ2ADS is not set |
174 | CONFIG_PPC_NATIVE=y | 180 | CONFIG_PPC_NATIVE=y |
175 | # CONFIG_IPIC is not set | 181 | # CONFIG_IPIC is not set |
@@ -190,6 +196,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
190 | CONFIG_CPU_FREQ_STAT=y | 196 | CONFIG_CPU_FREQ_STAT=y |
191 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 197 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
192 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 198 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
199 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
193 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 200 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
194 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 201 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 202 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
@@ -224,7 +231,6 @@ CONFIG_PREEMPT_NONE=y | |||
224 | CONFIG_BINFMT_ELF=y | 231 | CONFIG_BINFMT_ELF=y |
225 | CONFIG_COMPAT_BINFMT_ELF=y | 232 | CONFIG_COMPAT_BINFMT_ELF=y |
226 | # CONFIG_BINFMT_MISC is not set | 233 | # CONFIG_BINFMT_MISC is not set |
227 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
228 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 234 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
229 | CONFIG_IOMMU_VMERGE=y | 235 | CONFIG_IOMMU_VMERGE=y |
230 | CONFIG_IOMMU_HELPER=y | 236 | CONFIG_IOMMU_HELPER=y |
@@ -248,12 +254,14 @@ CONFIG_FLATMEM=y | |||
248 | CONFIG_FLAT_NODE_MEM_MAP=y | 254 | CONFIG_FLAT_NODE_MEM_MAP=y |
249 | # CONFIG_SPARSEMEM_STATIC is not set | 255 | # CONFIG_SPARSEMEM_STATIC is not set |
250 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 256 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
257 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
251 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 258 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
252 | CONFIG_RESOURCES_64BIT=y | 259 | CONFIG_RESOURCES_64BIT=y |
253 | CONFIG_ZONE_DMA_FLAG=1 | 260 | CONFIG_ZONE_DMA_FLAG=1 |
254 | CONFIG_BOUNCE=y | 261 | CONFIG_BOUNCE=y |
255 | # CONFIG_PPC_HAS_HASH_64K is not set | 262 | # CONFIG_PPC_HAS_HASH_64K is not set |
256 | # CONFIG_PPC_64K_PAGES is not set | 263 | # CONFIG_PPC_64K_PAGES is not set |
264 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
257 | # CONFIG_SCHED_SMT is not set | 265 | # CONFIG_SCHED_SMT is not set |
258 | CONFIG_PROC_DEVICETREE=y | 266 | CONFIG_PROC_DEVICETREE=y |
259 | # CONFIG_CMDLINE_BOOL is not set | 267 | # CONFIG_CMDLINE_BOOL is not set |
@@ -278,7 +286,10 @@ CONFIG_PCI_MSI=y | |||
278 | # CONFIG_PCI_DEBUG is not set | 286 | # CONFIG_PCI_DEBUG is not set |
279 | # CONFIG_PCCARD is not set | 287 | # CONFIG_PCCARD is not set |
280 | # CONFIG_HOTPLUG_PCI is not set | 288 | # CONFIG_HOTPLUG_PCI is not set |
289 | # CONFIG_HAS_RAPIDIO is not set | ||
290 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
281 | CONFIG_KERNEL_START=0xc000000000000000 | 291 | CONFIG_KERNEL_START=0xc000000000000000 |
292 | CONFIG_PHYSICAL_START=0x00000000 | ||
282 | 293 | ||
283 | # | 294 | # |
284 | # Networking | 295 | # Networking |
@@ -325,8 +336,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
325 | # CONFIG_TCP_MD5SIG is not set | 336 | # CONFIG_TCP_MD5SIG is not set |
326 | # CONFIG_IP_VS is not set | 337 | # CONFIG_IP_VS is not set |
327 | # CONFIG_IPV6 is not set | 338 | # CONFIG_IPV6 is not set |
328 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
329 | # CONFIG_INET6_TUNNEL is not set | ||
330 | # CONFIG_NETWORK_SECMARK is not set | 339 | # CONFIG_NETWORK_SECMARK is not set |
331 | CONFIG_NETFILTER=y | 340 | CONFIG_NETFILTER=y |
332 | # CONFIG_NETFILTER_DEBUG is not set | 341 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -342,6 +351,7 @@ CONFIG_NF_CONNTRACK=m | |||
342 | # CONFIG_NF_CT_ACCT is not set | 351 | # CONFIG_NF_CT_ACCT is not set |
343 | CONFIG_NF_CONNTRACK_MARK=y | 352 | CONFIG_NF_CONNTRACK_MARK=y |
344 | CONFIG_NF_CONNTRACK_EVENTS=y | 353 | CONFIG_NF_CONNTRACK_EVENTS=y |
354 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
345 | # CONFIG_NF_CT_PROTO_SCTP is not set | 355 | # CONFIG_NF_CT_PROTO_SCTP is not set |
346 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 356 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
347 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 357 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
@@ -418,6 +428,7 @@ CONFIG_FW_LOADER=y | |||
418 | # CONFIG_CONNECTOR is not set | 428 | # CONFIG_CONNECTOR is not set |
419 | # CONFIG_MTD is not set | 429 | # CONFIG_MTD is not set |
420 | CONFIG_OF_DEVICE=y | 430 | CONFIG_OF_DEVICE=y |
431 | CONFIG_OF_I2C=y | ||
421 | # CONFIG_PARPORT is not set | 432 | # CONFIG_PARPORT is not set |
422 | CONFIG_BLK_DEV=y | 433 | CONFIG_BLK_DEV=y |
423 | # CONFIG_BLK_DEV_FD is not set | 434 | # CONFIG_BLK_DEV_FD is not set |
@@ -465,7 +476,6 @@ CONFIG_IDE_PROC_FS=y | |||
465 | # | 476 | # |
466 | # IDE chipset support/bugfixes | 477 | # IDE chipset support/bugfixes |
467 | # | 478 | # |
468 | CONFIG_IDE_GENERIC=y | ||
469 | # CONFIG_BLK_DEV_PLATFORM is not set | 479 | # CONFIG_BLK_DEV_PLATFORM is not set |
470 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 480 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
471 | 481 | ||
@@ -506,7 +516,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
506 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 516 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
507 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 517 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
508 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
509 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
510 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
511 | 521 | ||
512 | # | 522 | # |
@@ -584,61 +594,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
584 | # CONFIG_SCSI_SRP is not set | 594 | # CONFIG_SCSI_SRP is not set |
585 | CONFIG_ATA=y | 595 | CONFIG_ATA=y |
586 | # CONFIG_ATA_NONSTANDARD is not set | 596 | # CONFIG_ATA_NONSTANDARD is not set |
597 | CONFIG_SATA_PMP=y | ||
587 | # CONFIG_SATA_AHCI is not set | 598 | # CONFIG_SATA_AHCI is not set |
588 | CONFIG_SATA_SVW=y | ||
589 | # CONFIG_ATA_PIIX is not set | ||
590 | # CONFIG_SATA_MV is not set | ||
591 | # CONFIG_SATA_NV is not set | ||
592 | # CONFIG_PDC_ADMA is not set | ||
593 | # CONFIG_SATA_QSTOR is not set | ||
594 | # CONFIG_SATA_PROMISE is not set | ||
595 | # CONFIG_SATA_SX4 is not set | ||
596 | # CONFIG_SATA_SIL is not set | ||
597 | # CONFIG_SATA_SIL24 is not set | 599 | # CONFIG_SATA_SIL24 is not set |
598 | # CONFIG_SATA_SIS is not set | 600 | # CONFIG_ATA_SFF is not set |
599 | # CONFIG_SATA_ULI is not set | ||
600 | # CONFIG_SATA_VIA is not set | ||
601 | # CONFIG_SATA_VITESSE is not set | ||
602 | # CONFIG_SATA_INIC162X is not set | ||
603 | # CONFIG_PATA_ALI is not set | ||
604 | # CONFIG_PATA_AMD is not set | ||
605 | # CONFIG_PATA_ARTOP is not set | ||
606 | # CONFIG_PATA_ATIIXP is not set | ||
607 | # CONFIG_PATA_CMD640_PCI is not set | ||
608 | # CONFIG_PATA_CMD64X is not set | ||
609 | # CONFIG_PATA_CS5520 is not set | ||
610 | # CONFIG_PATA_CS5530 is not set | ||
611 | # CONFIG_PATA_CYPRESS is not set | ||
612 | # CONFIG_PATA_EFAR is not set | ||
613 | # CONFIG_ATA_GENERIC is not set | ||
614 | # CONFIG_PATA_HPT366 is not set | ||
615 | # CONFIG_PATA_HPT37X is not set | ||
616 | # CONFIG_PATA_HPT3X2N is not set | ||
617 | # CONFIG_PATA_HPT3X3 is not set | ||
618 | # CONFIG_PATA_IT821X is not set | ||
619 | # CONFIG_PATA_IT8213 is not set | ||
620 | # CONFIG_PATA_JMICRON is not set | ||
621 | # CONFIG_PATA_TRIFLEX is not set | ||
622 | # CONFIG_PATA_MARVELL is not set | ||
623 | # CONFIG_PATA_MPIIX is not set | ||
624 | # CONFIG_PATA_OLDPIIX is not set | ||
625 | # CONFIG_PATA_NETCELL is not set | ||
626 | # CONFIG_PATA_NINJA32 is not set | ||
627 | # CONFIG_PATA_NS87410 is not set | ||
628 | # CONFIG_PATA_NS87415 is not set | ||
629 | # CONFIG_PATA_OPTI is not set | ||
630 | # CONFIG_PATA_OPTIDMA is not set | ||
631 | # CONFIG_PATA_PDC_OLD is not set | ||
632 | # CONFIG_PATA_RADISYS is not set | ||
633 | # CONFIG_PATA_RZ1000 is not set | ||
634 | # CONFIG_PATA_SC1200 is not set | ||
635 | # CONFIG_PATA_SERVERWORKS is not set | ||
636 | # CONFIG_PATA_PDC2027X is not set | ||
637 | # CONFIG_PATA_SIL680 is not set | ||
638 | # CONFIG_PATA_SIS is not set | ||
639 | # CONFIG_PATA_VIA is not set | ||
640 | # CONFIG_PATA_WINBOND is not set | ||
641 | # CONFIG_PATA_PLATFORM is not set | ||
642 | CONFIG_MD=y | 601 | CONFIG_MD=y |
643 | CONFIG_BLK_DEV_MD=y | 602 | CONFIG_BLK_DEV_MD=y |
644 | CONFIG_MD_LINEAR=y | 603 | CONFIG_MD_LINEAR=y |
@@ -740,7 +699,6 @@ CONFIG_E1000=y | |||
740 | # CONFIG_SIS190 is not set | 699 | # CONFIG_SIS190 is not set |
741 | # CONFIG_SKGE is not set | 700 | # CONFIG_SKGE is not set |
742 | # CONFIG_SKY2 is not set | 701 | # CONFIG_SKY2 is not set |
743 | # CONFIG_SK98LIN is not set | ||
744 | # CONFIG_VIA_VELOCITY is not set | 702 | # CONFIG_VIA_VELOCITY is not set |
745 | CONFIG_TIGON3=y | 703 | CONFIG_TIGON3=y |
746 | # CONFIG_BNX2 is not set | 704 | # CONFIG_BNX2 is not set |
@@ -755,10 +713,10 @@ CONFIG_NETDEV_10000=y | |||
755 | # CONFIG_MYRI10GE is not set | 713 | # CONFIG_MYRI10GE is not set |
756 | # CONFIG_NETXEN_NIC is not set | 714 | # CONFIG_NETXEN_NIC is not set |
757 | # CONFIG_NIU is not set | 715 | # CONFIG_NIU is not set |
758 | # CONFIG_PASEMI_MAC is not set | ||
759 | # CONFIG_MLX4_CORE is not set | 716 | # CONFIG_MLX4_CORE is not set |
760 | # CONFIG_TEHUTI is not set | 717 | # CONFIG_TEHUTI is not set |
761 | # CONFIG_BNX2X is not set | 718 | # CONFIG_BNX2X is not set |
719 | # CONFIG_SFC is not set | ||
762 | CONFIG_TR=y | 720 | CONFIG_TR=y |
763 | CONFIG_IBMOL=y | 721 | CONFIG_IBMOL=y |
764 | # CONFIG_3C359 is not set | 722 | # CONFIG_3C359 is not set |
@@ -769,6 +727,7 @@ CONFIG_IBMOL=y | |||
769 | # | 727 | # |
770 | # CONFIG_WLAN_PRE80211 is not set | 728 | # CONFIG_WLAN_PRE80211 is not set |
771 | # CONFIG_WLAN_80211 is not set | 729 | # CONFIG_WLAN_80211 is not set |
730 | # CONFIG_IWLWIFI_LEDS is not set | ||
772 | 731 | ||
773 | # | 732 | # |
774 | # USB Network Adapters | 733 | # USB Network Adapters |
@@ -865,6 +824,7 @@ CONFIG_VT=y | |||
865 | CONFIG_VT_CONSOLE=y | 824 | CONFIG_VT_CONSOLE=y |
866 | CONFIG_HW_CONSOLE=y | 825 | CONFIG_HW_CONSOLE=y |
867 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 826 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
827 | CONFIG_DEVKMEM=y | ||
868 | # CONFIG_SERIAL_NONSTANDARD is not set | 828 | # CONFIG_SERIAL_NONSTANDARD is not set |
869 | # CONFIG_NOZOMI is not set | 829 | # CONFIG_NOZOMI is not set |
870 | 830 | ||
@@ -895,13 +855,7 @@ CONFIG_DEVPORT=y | |||
895 | CONFIG_I2C=y | 855 | CONFIG_I2C=y |
896 | CONFIG_I2C_BOARDINFO=y | 856 | CONFIG_I2C_BOARDINFO=y |
897 | CONFIG_I2C_CHARDEV=y | 857 | CONFIG_I2C_CHARDEV=y |
898 | |||
899 | # | ||
900 | # I2C Algorithms | ||
901 | # | ||
902 | CONFIG_I2C_ALGOBIT=y | 858 | CONFIG_I2C_ALGOBIT=y |
903 | # CONFIG_I2C_ALGOPCF is not set | ||
904 | # CONFIG_I2C_ALGOPCA is not set | ||
905 | 859 | ||
906 | # | 860 | # |
907 | # I2C Hardware Bus support | 861 | # I2C Hardware Bus support |
@@ -930,6 +884,7 @@ CONFIG_I2C_POWERMAC=y | |||
930 | # CONFIG_I2C_VIA is not set | 884 | # CONFIG_I2C_VIA is not set |
931 | # CONFIG_I2C_VIAPRO is not set | 885 | # CONFIG_I2C_VIAPRO is not set |
932 | # CONFIG_I2C_VOODOO3 is not set | 886 | # CONFIG_I2C_VOODOO3 is not set |
887 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
933 | 888 | ||
934 | # | 889 | # |
935 | # Miscellaneous I2C Chip support | 890 | # Miscellaneous I2C Chip support |
@@ -939,19 +894,13 @@ CONFIG_I2C_POWERMAC=y | |||
939 | # CONFIG_SENSORS_PCF8574 is not set | 894 | # CONFIG_SENSORS_PCF8574 is not set |
940 | # CONFIG_PCF8575 is not set | 895 | # CONFIG_PCF8575 is not set |
941 | # CONFIG_SENSORS_PCF8591 is not set | 896 | # CONFIG_SENSORS_PCF8591 is not set |
942 | # CONFIG_TPS65010 is not set | ||
943 | # CONFIG_SENSORS_MAX6875 is not set | 897 | # CONFIG_SENSORS_MAX6875 is not set |
944 | # CONFIG_SENSORS_TSL2550 is not set | 898 | # CONFIG_SENSORS_TSL2550 is not set |
945 | # CONFIG_I2C_DEBUG_CORE is not set | 899 | # CONFIG_I2C_DEBUG_CORE is not set |
946 | # CONFIG_I2C_DEBUG_ALGO is not set | 900 | # CONFIG_I2C_DEBUG_ALGO is not set |
947 | # CONFIG_I2C_DEBUG_BUS is not set | 901 | # CONFIG_I2C_DEBUG_BUS is not set |
948 | # CONFIG_I2C_DEBUG_CHIP is not set | 902 | # CONFIG_I2C_DEBUG_CHIP is not set |
949 | |||
950 | # | ||
951 | # SPI support | ||
952 | # | ||
953 | # CONFIG_SPI is not set | 903 | # CONFIG_SPI is not set |
954 | # CONFIG_SPI_MASTER is not set | ||
955 | # CONFIG_W1 is not set | 904 | # CONFIG_W1 is not set |
956 | # CONFIG_POWER_SUPPLY is not set | 905 | # CONFIG_POWER_SUPPLY is not set |
957 | # CONFIG_HWMON is not set | 906 | # CONFIG_HWMON is not set |
@@ -968,12 +917,22 @@ CONFIG_SSB_POSSIBLE=y | |||
968 | # Multifunction device drivers | 917 | # Multifunction device drivers |
969 | # | 918 | # |
970 | # CONFIG_MFD_SM501 is not set | 919 | # CONFIG_MFD_SM501 is not set |
920 | # CONFIG_HTC_PASIC3 is not set | ||
971 | 921 | ||
972 | # | 922 | # |
973 | # Multimedia devices | 923 | # Multimedia devices |
974 | # | 924 | # |
925 | |||
926 | # | ||
927 | # Multimedia core support | ||
928 | # | ||
975 | # CONFIG_VIDEO_DEV is not set | 929 | # CONFIG_VIDEO_DEV is not set |
976 | # CONFIG_DVB_CORE is not set | 930 | # CONFIG_DVB_CORE is not set |
931 | # CONFIG_VIDEO_MEDIA is not set | ||
932 | |||
933 | # | ||
934 | # Multimedia drivers | ||
935 | # | ||
977 | CONFIG_DAB=y | 936 | CONFIG_DAB=y |
978 | # CONFIG_USB_DABUSB is not set | 937 | # CONFIG_USB_DABUSB is not set |
979 | 938 | ||
@@ -995,8 +954,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
995 | # CONFIG_FB_SYS_FILLRECT is not set | 954 | # CONFIG_FB_SYS_FILLRECT is not set |
996 | # CONFIG_FB_SYS_COPYAREA is not set | 955 | # CONFIG_FB_SYS_COPYAREA is not set |
997 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 956 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
957 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
998 | # CONFIG_FB_SYS_FOPS is not set | 958 | # CONFIG_FB_SYS_FOPS is not set |
999 | CONFIG_FB_DEFERRED_IO=y | ||
1000 | # CONFIG_FB_SVGALIB is not set | 959 | # CONFIG_FB_SVGALIB is not set |
1001 | CONFIG_FB_MACMODES=y | 960 | CONFIG_FB_MACMODES=y |
1002 | CONFIG_FB_BACKLIGHT=y | 961 | CONFIG_FB_BACKLIGHT=y |
@@ -1112,6 +1071,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1112 | # CONFIG_SND_AU8810 is not set | 1071 | # CONFIG_SND_AU8810 is not set |
1113 | # CONFIG_SND_AU8820 is not set | 1072 | # CONFIG_SND_AU8820 is not set |
1114 | # CONFIG_SND_AU8830 is not set | 1073 | # CONFIG_SND_AU8830 is not set |
1074 | # CONFIG_SND_AW2 is not set | ||
1115 | # CONFIG_SND_AZT3328 is not set | 1075 | # CONFIG_SND_AZT3328 is not set |
1116 | # CONFIG_SND_BT87X is not set | 1076 | # CONFIG_SND_BT87X is not set |
1117 | # CONFIG_SND_CA0106 is not set | 1077 | # CONFIG_SND_CA0106 is not set |
@@ -1198,11 +1158,11 @@ CONFIG_SND_USB_AUDIO=m | |||
1198 | # CONFIG_SND_SOC is not set | 1158 | # CONFIG_SND_SOC is not set |
1199 | 1159 | ||
1200 | # | 1160 | # |
1201 | # SoC Audio support for SuperH | 1161 | # ALSA SoC audio for Freescale SOCs |
1202 | # | 1162 | # |
1203 | 1163 | ||
1204 | # | 1164 | # |
1205 | # ALSA SoC audio for Freescale SOCs | 1165 | # SoC Audio for the Texas Instruments OMAP |
1206 | # | 1166 | # |
1207 | 1167 | ||
1208 | # | 1168 | # |
@@ -1222,6 +1182,7 @@ CONFIG_USB_HID=y | |||
1222 | CONFIG_HID_FF=y | 1182 | CONFIG_HID_FF=y |
1223 | CONFIG_HID_PID=y | 1183 | CONFIG_HID_PID=y |
1224 | CONFIG_LOGITECH_FF=y | 1184 | CONFIG_LOGITECH_FF=y |
1185 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
1225 | # CONFIG_PANTHERLORD_FF is not set | 1186 | # CONFIG_PANTHERLORD_FF is not set |
1226 | CONFIG_THRUSTMASTER_FF=y | 1187 | CONFIG_THRUSTMASTER_FF=y |
1227 | # CONFIG_ZEROPLUS_FF is not set | 1188 | # CONFIG_ZEROPLUS_FF is not set |
@@ -1245,11 +1206,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1245 | # | 1206 | # |
1246 | # USB Host Controller Drivers | 1207 | # USB Host Controller Drivers |
1247 | # | 1208 | # |
1209 | # CONFIG_USB_C67X00_HCD is not set | ||
1248 | CONFIG_USB_EHCI_HCD=y | 1210 | CONFIG_USB_EHCI_HCD=y |
1249 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1211 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1250 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1212 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1251 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1213 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1252 | # CONFIG_USB_ISP116X_HCD is not set | 1214 | # CONFIG_USB_ISP116X_HCD is not set |
1215 | # CONFIG_USB_ISP1760_HCD is not set | ||
1253 | CONFIG_USB_OHCI_HCD=y | 1216 | CONFIG_USB_OHCI_HCD=y |
1254 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1217 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
1255 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1218 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1288,6 +1251,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1288 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1251 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1289 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1252 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1290 | # CONFIG_USB_STORAGE_KARMA is not set | 1253 | # CONFIG_USB_STORAGE_KARMA is not set |
1254 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1291 | # CONFIG_USB_LIBUSUAL is not set | 1255 | # CONFIG_USB_LIBUSUAL is not set |
1292 | 1256 | ||
1293 | # | 1257 | # |
@@ -1342,9 +1306,11 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m | |||
1342 | CONFIG_USB_SERIAL_MCT_U232=m | 1306 | CONFIG_USB_SERIAL_MCT_U232=m |
1343 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1307 | # CONFIG_USB_SERIAL_MOS7720 is not set |
1344 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1308 | # CONFIG_USB_SERIAL_MOS7840 is not set |
1309 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
1345 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1310 | # CONFIG_USB_SERIAL_NAVMAN is not set |
1346 | CONFIG_USB_SERIAL_PL2303=m | 1311 | CONFIG_USB_SERIAL_PL2303=m |
1347 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1312 | # CONFIG_USB_SERIAL_OTI6858 is not set |
1313 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
1348 | # CONFIG_USB_SERIAL_HP4X is not set | 1314 | # CONFIG_USB_SERIAL_HP4X is not set |
1349 | CONFIG_USB_SERIAL_SAFE=m | 1315 | CONFIG_USB_SERIAL_SAFE=m |
1350 | CONFIG_USB_SERIAL_SAFE_PADDED=y | 1316 | CONFIG_USB_SERIAL_SAFE_PADDED=y |
@@ -1383,14 +1349,11 @@ CONFIG_USB_APPLEDISPLAY=m | |||
1383 | # CONFIG_MMC is not set | 1349 | # CONFIG_MMC is not set |
1384 | # CONFIG_MEMSTICK is not set | 1350 | # CONFIG_MEMSTICK is not set |
1385 | # CONFIG_NEW_LEDS is not set | 1351 | # CONFIG_NEW_LEDS is not set |
1352 | # CONFIG_ACCESSIBILITY is not set | ||
1386 | # CONFIG_INFINIBAND is not set | 1353 | # CONFIG_INFINIBAND is not set |
1387 | # CONFIG_EDAC is not set | 1354 | # CONFIG_EDAC is not set |
1388 | # CONFIG_RTC_CLASS is not set | 1355 | # CONFIG_RTC_CLASS is not set |
1389 | # CONFIG_DMADEVICES is not set | 1356 | # CONFIG_DMADEVICES is not set |
1390 | |||
1391 | # | ||
1392 | # Userspace I/O | ||
1393 | # | ||
1394 | # CONFIG_UIO is not set | 1357 | # CONFIG_UIO is not set |
1395 | 1358 | ||
1396 | # | 1359 | # |
@@ -1420,9 +1383,9 @@ CONFIG_REISERFS_FS_SECURITY=y | |||
1420 | CONFIG_FS_POSIX_ACL=y | 1383 | CONFIG_FS_POSIX_ACL=y |
1421 | CONFIG_XFS_FS=m | 1384 | CONFIG_XFS_FS=m |
1422 | # CONFIG_XFS_QUOTA is not set | 1385 | # CONFIG_XFS_QUOTA is not set |
1423 | CONFIG_XFS_SECURITY=y | ||
1424 | CONFIG_XFS_POSIX_ACL=y | 1386 | CONFIG_XFS_POSIX_ACL=y |
1425 | # CONFIG_XFS_RT is not set | 1387 | # CONFIG_XFS_RT is not set |
1388 | # CONFIG_XFS_DEBUG is not set | ||
1426 | # CONFIG_GFS2_FS is not set | 1389 | # CONFIG_GFS2_FS is not set |
1427 | # CONFIG_OCFS2_FS is not set | 1390 | # CONFIG_OCFS2_FS is not set |
1428 | CONFIG_DNOTIFY=y | 1391 | CONFIG_DNOTIFY=y |
@@ -1488,13 +1451,11 @@ CONFIG_NFS_FS=y | |||
1488 | CONFIG_NFS_V3=y | 1451 | CONFIG_NFS_V3=y |
1489 | CONFIG_NFS_V3_ACL=y | 1452 | CONFIG_NFS_V3_ACL=y |
1490 | CONFIG_NFS_V4=y | 1453 | CONFIG_NFS_V4=y |
1491 | # CONFIG_NFS_DIRECTIO is not set | ||
1492 | CONFIG_NFSD=y | 1454 | CONFIG_NFSD=y |
1493 | CONFIG_NFSD_V2_ACL=y | 1455 | CONFIG_NFSD_V2_ACL=y |
1494 | CONFIG_NFSD_V3=y | 1456 | CONFIG_NFSD_V3=y |
1495 | CONFIG_NFSD_V3_ACL=y | 1457 | CONFIG_NFSD_V3_ACL=y |
1496 | CONFIG_NFSD_V4=y | 1458 | CONFIG_NFSD_V4=y |
1497 | CONFIG_NFSD_TCP=y | ||
1498 | CONFIG_LOCKD=y | 1459 | CONFIG_LOCKD=y |
1499 | CONFIG_LOCKD_V4=y | 1460 | CONFIG_LOCKD_V4=y |
1500 | CONFIG_EXPORTFS=y | 1461 | CONFIG_EXPORTFS=y |
@@ -1583,9 +1544,10 @@ CONFIG_NLS_UTF8=y | |||
1583 | # Library routines | 1544 | # Library routines |
1584 | # | 1545 | # |
1585 | CONFIG_BITREVERSE=y | 1546 | CONFIG_BITREVERSE=y |
1547 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1586 | CONFIG_CRC_CCITT=m | 1548 | CONFIG_CRC_CCITT=m |
1587 | # CONFIG_CRC16 is not set | 1549 | # CONFIG_CRC16 is not set |
1588 | # CONFIG_CRC_ITU_T is not set | 1550 | CONFIG_CRC_ITU_T=m |
1589 | CONFIG_CRC32=y | 1551 | CONFIG_CRC32=y |
1590 | # CONFIG_CRC7 is not set | 1552 | # CONFIG_CRC7 is not set |
1591 | CONFIG_LIBCRC32C=m | 1553 | CONFIG_LIBCRC32C=m |
@@ -1603,6 +1565,7 @@ CONFIG_HAVE_LMB=y | |||
1603 | # CONFIG_PRINTK_TIME is not set | 1565 | # CONFIG_PRINTK_TIME is not set |
1604 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1566 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1605 | CONFIG_ENABLE_MUST_CHECK=y | 1567 | CONFIG_ENABLE_MUST_CHECK=y |
1568 | CONFIG_FRAME_WARN=2048 | ||
1606 | CONFIG_MAGIC_SYSRQ=y | 1569 | CONFIG_MAGIC_SYSRQ=y |
1607 | # CONFIG_UNUSED_SYMBOLS is not set | 1570 | # CONFIG_UNUSED_SYMBOLS is not set |
1608 | CONFIG_DEBUG_FS=y | 1571 | CONFIG_DEBUG_FS=y |
@@ -1613,18 +1576,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1613 | CONFIG_SCHED_DEBUG=y | 1576 | CONFIG_SCHED_DEBUG=y |
1614 | # CONFIG_SCHEDSTATS is not set | 1577 | # CONFIG_SCHEDSTATS is not set |
1615 | # CONFIG_TIMER_STATS is not set | 1578 | # CONFIG_TIMER_STATS is not set |
1579 | # CONFIG_DEBUG_OBJECTS is not set | ||
1616 | # CONFIG_SLUB_DEBUG_ON is not set | 1580 | # CONFIG_SLUB_DEBUG_ON is not set |
1617 | # CONFIG_SLUB_STATS is not set | 1581 | # CONFIG_SLUB_STATS is not set |
1618 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1582 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1619 | # CONFIG_RT_MUTEX_TESTER is not set | 1583 | # CONFIG_RT_MUTEX_TESTER is not set |
1620 | # CONFIG_DEBUG_SPINLOCK is not set | 1584 | # CONFIG_DEBUG_SPINLOCK is not set |
1621 | CONFIG_DEBUG_MUTEXES=y | 1585 | CONFIG_DEBUG_MUTEXES=y |
1586 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1587 | # CONFIG_PROVE_LOCKING is not set | ||
1588 | # CONFIG_LOCK_STAT is not set | ||
1622 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1589 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1623 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1590 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1624 | # CONFIG_DEBUG_KOBJECT is not set | 1591 | # CONFIG_DEBUG_KOBJECT is not set |
1625 | CONFIG_DEBUG_BUGVERBOSE=y | 1592 | CONFIG_DEBUG_BUGVERBOSE=y |
1626 | # CONFIG_DEBUG_INFO is not set | 1593 | # CONFIG_DEBUG_INFO is not set |
1627 | # CONFIG_DEBUG_VM is not set | 1594 | # CONFIG_DEBUG_VM is not set |
1595 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1628 | # CONFIG_DEBUG_LIST is not set | 1596 | # CONFIG_DEBUG_LIST is not set |
1629 | # CONFIG_DEBUG_SG is not set | 1597 | # CONFIG_DEBUG_SG is not set |
1630 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1598 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1648,53 +1616,83 @@ CONFIG_BOOTX_TEXT=y | |||
1648 | # CONFIG_SECURITY is not set | 1616 | # CONFIG_SECURITY is not set |
1649 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1617 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1650 | CONFIG_CRYPTO=y | 1618 | CONFIG_CRYPTO=y |
1619 | |||
1620 | # | ||
1621 | # Crypto core or helper | ||
1622 | # | ||
1651 | CONFIG_CRYPTO_ALGAPI=y | 1623 | CONFIG_CRYPTO_ALGAPI=y |
1652 | CONFIG_CRYPTO_AEAD=m | 1624 | CONFIG_CRYPTO_AEAD=m |
1653 | CONFIG_CRYPTO_BLKCIPHER=y | 1625 | CONFIG_CRYPTO_BLKCIPHER=y |
1654 | # CONFIG_CRYPTO_SEQIV is not set | ||
1655 | CONFIG_CRYPTO_HASH=y | 1626 | CONFIG_CRYPTO_HASH=y |
1656 | CONFIG_CRYPTO_MANAGER=y | 1627 | CONFIG_CRYPTO_MANAGER=y |
1628 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1629 | CONFIG_CRYPTO_NULL=m | ||
1630 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1631 | CONFIG_CRYPTO_AUTHENC=m | ||
1632 | CONFIG_CRYPTO_TEST=m | ||
1633 | |||
1634 | # | ||
1635 | # Authenticated Encryption with Associated Data | ||
1636 | # | ||
1637 | # CONFIG_CRYPTO_CCM is not set | ||
1638 | # CONFIG_CRYPTO_GCM is not set | ||
1639 | # CONFIG_CRYPTO_SEQIV is not set | ||
1640 | |||
1641 | # | ||
1642 | # Block modes | ||
1643 | # | ||
1644 | CONFIG_CRYPTO_CBC=y | ||
1645 | # CONFIG_CRYPTO_CTR is not set | ||
1646 | # CONFIG_CRYPTO_CTS is not set | ||
1647 | CONFIG_CRYPTO_ECB=m | ||
1648 | # CONFIG_CRYPTO_LRW is not set | ||
1649 | CONFIG_CRYPTO_PCBC=m | ||
1650 | # CONFIG_CRYPTO_XTS is not set | ||
1651 | |||
1652 | # | ||
1653 | # Hash modes | ||
1654 | # | ||
1657 | CONFIG_CRYPTO_HMAC=y | 1655 | CONFIG_CRYPTO_HMAC=y |
1658 | # CONFIG_CRYPTO_XCBC is not set | 1656 | # CONFIG_CRYPTO_XCBC is not set |
1659 | CONFIG_CRYPTO_NULL=m | 1657 | |
1658 | # | ||
1659 | # Digest | ||
1660 | # | ||
1661 | CONFIG_CRYPTO_CRC32C=m | ||
1660 | CONFIG_CRYPTO_MD4=m | 1662 | CONFIG_CRYPTO_MD4=m |
1661 | CONFIG_CRYPTO_MD5=y | 1663 | CONFIG_CRYPTO_MD5=y |
1664 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1662 | CONFIG_CRYPTO_SHA1=m | 1665 | CONFIG_CRYPTO_SHA1=m |
1663 | CONFIG_CRYPTO_SHA256=m | 1666 | CONFIG_CRYPTO_SHA256=m |
1664 | CONFIG_CRYPTO_SHA512=m | 1667 | CONFIG_CRYPTO_SHA512=m |
1665 | CONFIG_CRYPTO_WP512=m | ||
1666 | # CONFIG_CRYPTO_TGR192 is not set | 1668 | # CONFIG_CRYPTO_TGR192 is not set |
1667 | # CONFIG_CRYPTO_GF128MUL is not set | 1669 | CONFIG_CRYPTO_WP512=m |
1668 | CONFIG_CRYPTO_ECB=m | 1670 | |
1669 | CONFIG_CRYPTO_CBC=y | 1671 | # |
1670 | CONFIG_CRYPTO_PCBC=m | 1672 | # Ciphers |
1671 | # CONFIG_CRYPTO_LRW is not set | 1673 | # |
1672 | # CONFIG_CRYPTO_XTS is not set | ||
1673 | # CONFIG_CRYPTO_CTR is not set | ||
1674 | # CONFIG_CRYPTO_GCM is not set | ||
1675 | # CONFIG_CRYPTO_CCM is not set | ||
1676 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1677 | CONFIG_CRYPTO_DES=y | ||
1678 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1679 | CONFIG_CRYPTO_BLOWFISH=m | ||
1680 | CONFIG_CRYPTO_TWOFISH=m | ||
1681 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1682 | CONFIG_CRYPTO_SERPENT=m | ||
1683 | CONFIG_CRYPTO_AES=m | 1674 | CONFIG_CRYPTO_AES=m |
1675 | CONFIG_CRYPTO_ANUBIS=m | ||
1676 | CONFIG_CRYPTO_ARC4=m | ||
1677 | CONFIG_CRYPTO_BLOWFISH=m | ||
1678 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1684 | CONFIG_CRYPTO_CAST5=m | 1679 | CONFIG_CRYPTO_CAST5=m |
1685 | CONFIG_CRYPTO_CAST6=m | 1680 | CONFIG_CRYPTO_CAST6=m |
1686 | CONFIG_CRYPTO_TEA=m | 1681 | CONFIG_CRYPTO_DES=y |
1687 | CONFIG_CRYPTO_ARC4=m | 1682 | # CONFIG_CRYPTO_FCRYPT is not set |
1688 | CONFIG_CRYPTO_KHAZAD=m | 1683 | CONFIG_CRYPTO_KHAZAD=m |
1689 | CONFIG_CRYPTO_ANUBIS=m | ||
1690 | # CONFIG_CRYPTO_SEED is not set | ||
1691 | # CONFIG_CRYPTO_SALSA20 is not set | 1684 | # CONFIG_CRYPTO_SALSA20 is not set |
1685 | # CONFIG_CRYPTO_SEED is not set | ||
1686 | CONFIG_CRYPTO_SERPENT=m | ||
1687 | CONFIG_CRYPTO_TEA=m | ||
1688 | CONFIG_CRYPTO_TWOFISH=m | ||
1689 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1690 | |||
1691 | # | ||
1692 | # Compression | ||
1693 | # | ||
1692 | CONFIG_CRYPTO_DEFLATE=m | 1694 | CONFIG_CRYPTO_DEFLATE=m |
1693 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1694 | CONFIG_CRYPTO_CRC32C=m | ||
1695 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1696 | CONFIG_CRYPTO_TEST=m | ||
1697 | CONFIG_CRYPTO_AUTHENC=m | ||
1698 | # CONFIG_CRYPTO_LZO is not set | 1695 | # CONFIG_CRYPTO_LZO is not set |
1699 | # CONFIG_CRYPTO_HW is not set | 1696 | # CONFIG_CRYPTO_HW is not set |
1700 | # CONFIG_PPC_CLOCK is not set | 1697 | # CONFIG_PPC_CLOCK is not set |
1698 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index b3128fb7ce7e..63f0bdb6340d 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:55:45 2008 | 4 | # Tue May 20 20:01:36 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -91,6 +94,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
91 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
92 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
93 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 99 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -118,12 +122,14 @@ CONFIG_HAVE_OPROFILE=y | |||
118 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
119 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
120 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
121 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
122 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
123 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
124 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
125 | CONFIG_BASE_SMALL=0 | 130 | CONFIG_BASE_SMALL=0 |
126 | CONFIG_MODULES=y | 131 | CONFIG_MODULES=y |
132 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
127 | CONFIG_MODULE_UNLOAD=y | 133 | CONFIG_MODULE_UNLOAD=y |
128 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 134 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
129 | CONFIG_MODVERSIONS=y | 135 | CONFIG_MODVERSIONS=y |
@@ -172,11 +178,11 @@ CONFIG_VIOPATH=y | |||
172 | # CONFIG_PPC_PMAC is not set | 178 | # CONFIG_PPC_PMAC is not set |
173 | # CONFIG_PPC_MAPLE is not set | 179 | # CONFIG_PPC_MAPLE is not set |
174 | # CONFIG_PPC_PASEMI is not set | 180 | # CONFIG_PPC_PASEMI is not set |
175 | # CONFIG_PPC_CELLEB is not set | ||
176 | # CONFIG_PPC_PS3 is not set | 181 | # CONFIG_PPC_PS3 is not set |
177 | # CONFIG_PPC_CELL is not set | 182 | # CONFIG_PPC_CELL is not set |
178 | # CONFIG_PPC_CELL_NATIVE is not set | 183 | # CONFIG_PPC_CELL_NATIVE is not set |
179 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 184 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
185 | # CONFIG_PPC_CELLEB is not set | ||
180 | # CONFIG_PQ2ADS is not set | 186 | # CONFIG_PQ2ADS is not set |
181 | # CONFIG_IPIC is not set | 187 | # CONFIG_IPIC is not set |
182 | # CONFIG_MPIC is not set | 188 | # CONFIG_MPIC is not set |
@@ -212,7 +218,6 @@ CONFIG_PREEMPT_NONE=y | |||
212 | CONFIG_BINFMT_ELF=y | 218 | CONFIG_BINFMT_ELF=y |
213 | CONFIG_COMPAT_BINFMT_ELF=y | 219 | CONFIG_COMPAT_BINFMT_ELF=y |
214 | # CONFIG_BINFMT_MISC is not set | 220 | # CONFIG_BINFMT_MISC is not set |
215 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
216 | CONFIG_IOMMU_VMERGE=y | 221 | CONFIG_IOMMU_VMERGE=y |
217 | CONFIG_IOMMU_HELPER=y | 222 | CONFIG_IOMMU_HELPER=y |
218 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 223 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -234,12 +239,14 @@ CONFIG_FLATMEM=y | |||
234 | CONFIG_FLAT_NODE_MEM_MAP=y | 239 | CONFIG_FLAT_NODE_MEM_MAP=y |
235 | # CONFIG_SPARSEMEM_STATIC is not set | 240 | # CONFIG_SPARSEMEM_STATIC is not set |
236 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 241 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
242 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
237 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 243 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
238 | CONFIG_RESOURCES_64BIT=y | 244 | CONFIG_RESOURCES_64BIT=y |
239 | CONFIG_ZONE_DMA_FLAG=1 | 245 | CONFIG_ZONE_DMA_FLAG=1 |
240 | CONFIG_BOUNCE=y | 246 | CONFIG_BOUNCE=y |
241 | # CONFIG_PPC_HAS_HASH_64K is not set | 247 | # CONFIG_PPC_HAS_HASH_64K is not set |
242 | # CONFIG_PPC_64K_PAGES is not set | 248 | # CONFIG_PPC_64K_PAGES is not set |
249 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
243 | # CONFIG_SCHED_SMT is not set | 250 | # CONFIG_SCHED_SMT is not set |
244 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
245 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
@@ -263,7 +270,10 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
263 | # CONFIG_PCI_DEBUG is not set | 270 | # CONFIG_PCI_DEBUG is not set |
264 | # CONFIG_PCCARD is not set | 271 | # CONFIG_PCCARD is not set |
265 | # CONFIG_HOTPLUG_PCI is not set | 272 | # CONFIG_HOTPLUG_PCI is not set |
273 | # CONFIG_HAS_RAPIDIO is not set | ||
274 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
266 | CONFIG_KERNEL_START=0xc000000000000000 | 275 | CONFIG_KERNEL_START=0xc000000000000000 |
276 | CONFIG_PHYSICAL_START=0x00000000 | ||
267 | 277 | ||
268 | # | 278 | # |
269 | # Networking | 279 | # Networking |
@@ -310,8 +320,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
310 | # CONFIG_TCP_MD5SIG is not set | 320 | # CONFIG_TCP_MD5SIG is not set |
311 | # CONFIG_IP_VS is not set | 321 | # CONFIG_IP_VS is not set |
312 | # CONFIG_IPV6 is not set | 322 | # CONFIG_IPV6 is not set |
313 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
314 | # CONFIG_INET6_TUNNEL is not set | ||
315 | # CONFIG_NETWORK_SECMARK is not set | 323 | # CONFIG_NETWORK_SECMARK is not set |
316 | CONFIG_NETFILTER=y | 324 | CONFIG_NETFILTER=y |
317 | # CONFIG_NETFILTER_DEBUG is not set | 325 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -327,6 +335,7 @@ CONFIG_NF_CONNTRACK=m | |||
327 | # CONFIG_NF_CT_ACCT is not set | 335 | # CONFIG_NF_CT_ACCT is not set |
328 | CONFIG_NF_CONNTRACK_MARK=y | 336 | CONFIG_NF_CONNTRACK_MARK=y |
329 | CONFIG_NF_CONNTRACK_EVENTS=y | 337 | CONFIG_NF_CONNTRACK_EVENTS=y |
338 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
330 | # CONFIG_NF_CT_PROTO_SCTP is not set | 339 | # CONFIG_NF_CT_PROTO_SCTP is not set |
331 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 340 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
332 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 341 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
@@ -631,7 +640,6 @@ CONFIG_MII=y | |||
631 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 640 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
632 | CONFIG_NET_PCI=y | 641 | CONFIG_NET_PCI=y |
633 | CONFIG_PCNET32=y | 642 | CONFIG_PCNET32=y |
634 | CONFIG_PCNET32_NAPI=y | ||
635 | # CONFIG_AMD8111_ETH is not set | 643 | # CONFIG_AMD8111_ETH is not set |
636 | # CONFIG_ADAPTEC_STARFIRE is not set | 644 | # CONFIG_ADAPTEC_STARFIRE is not set |
637 | # CONFIG_B44 is not set | 645 | # CONFIG_B44 is not set |
@@ -667,7 +675,6 @@ CONFIG_E1000=m | |||
667 | # CONFIG_SIS190 is not set | 675 | # CONFIG_SIS190 is not set |
668 | # CONFIG_SKGE is not set | 676 | # CONFIG_SKGE is not set |
669 | # CONFIG_SKY2 is not set | 677 | # CONFIG_SKY2 is not set |
670 | # CONFIG_SK98LIN is not set | ||
671 | # CONFIG_VIA_VELOCITY is not set | 678 | # CONFIG_VIA_VELOCITY is not set |
672 | # CONFIG_TIGON3 is not set | 679 | # CONFIG_TIGON3 is not set |
673 | # CONFIG_BNX2 is not set | 680 | # CONFIG_BNX2 is not set |
@@ -682,10 +689,10 @@ CONFIG_NETDEV_10000=y | |||
682 | # CONFIG_MYRI10GE is not set | 689 | # CONFIG_MYRI10GE is not set |
683 | # CONFIG_NETXEN_NIC is not set | 690 | # CONFIG_NETXEN_NIC is not set |
684 | # CONFIG_NIU is not set | 691 | # CONFIG_NIU is not set |
685 | # CONFIG_PASEMI_MAC is not set | ||
686 | # CONFIG_MLX4_CORE is not set | 692 | # CONFIG_MLX4_CORE is not set |
687 | # CONFIG_TEHUTI is not set | 693 | # CONFIG_TEHUTI is not set |
688 | # CONFIG_BNX2X is not set | 694 | # CONFIG_BNX2X is not set |
695 | # CONFIG_SFC is not set | ||
689 | CONFIG_TR=y | 696 | CONFIG_TR=y |
690 | CONFIG_IBMOL=y | 697 | CONFIG_IBMOL=y |
691 | # CONFIG_3C359 is not set | 698 | # CONFIG_3C359 is not set |
@@ -696,6 +703,7 @@ CONFIG_IBMOL=y | |||
696 | # | 703 | # |
697 | # CONFIG_WLAN_PRE80211 is not set | 704 | # CONFIG_WLAN_PRE80211 is not set |
698 | # CONFIG_WLAN_80211 is not set | 705 | # CONFIG_WLAN_80211 is not set |
706 | # CONFIG_IWLWIFI_LEDS is not set | ||
699 | # CONFIG_WAN is not set | 707 | # CONFIG_WAN is not set |
700 | CONFIG_ISERIES_VETH=y | 708 | CONFIG_ISERIES_VETH=y |
701 | # CONFIG_FDDI is not set | 709 | # CONFIG_FDDI is not set |
@@ -762,6 +770,7 @@ CONFIG_VT=y | |||
762 | CONFIG_VT_CONSOLE=y | 770 | CONFIG_VT_CONSOLE=y |
763 | CONFIG_HW_CONSOLE=y | 771 | CONFIG_HW_CONSOLE=y |
764 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 772 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
773 | CONFIG_DEVKMEM=y | ||
765 | # CONFIG_SERIAL_NONSTANDARD is not set | 774 | # CONFIG_SERIAL_NONSTANDARD is not set |
766 | # CONFIG_NOZOMI is not set | 775 | # CONFIG_NOZOMI is not set |
767 | 776 | ||
@@ -793,12 +802,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
793 | # CONFIG_TCG_TPM is not set | 802 | # CONFIG_TCG_TPM is not set |
794 | CONFIG_DEVPORT=y | 803 | CONFIG_DEVPORT=y |
795 | # CONFIG_I2C is not set | 804 | # CONFIG_I2C is not set |
796 | |||
797 | # | ||
798 | # SPI support | ||
799 | # | ||
800 | # CONFIG_SPI is not set | 805 | # CONFIG_SPI is not set |
801 | # CONFIG_SPI_MASTER is not set | ||
802 | # CONFIG_W1 is not set | 806 | # CONFIG_W1 is not set |
803 | # CONFIG_POWER_SUPPLY is not set | 807 | # CONFIG_POWER_SUPPLY is not set |
804 | # CONFIG_HWMON is not set | 808 | # CONFIG_HWMON is not set |
@@ -815,12 +819,22 @@ CONFIG_SSB_POSSIBLE=y | |||
815 | # Multifunction device drivers | 819 | # Multifunction device drivers |
816 | # | 820 | # |
817 | # CONFIG_MFD_SM501 is not set | 821 | # CONFIG_MFD_SM501 is not set |
822 | # CONFIG_HTC_PASIC3 is not set | ||
818 | 823 | ||
819 | # | 824 | # |
820 | # Multimedia devices | 825 | # Multimedia devices |
821 | # | 826 | # |
827 | |||
828 | # | ||
829 | # Multimedia core support | ||
830 | # | ||
822 | # CONFIG_VIDEO_DEV is not set | 831 | # CONFIG_VIDEO_DEV is not set |
823 | # CONFIG_DVB_CORE is not set | 832 | # CONFIG_DVB_CORE is not set |
833 | # CONFIG_VIDEO_MEDIA is not set | ||
834 | |||
835 | # | ||
836 | # Multimedia drivers | ||
837 | # | ||
824 | # CONFIG_DAB is not set | 838 | # CONFIG_DAB is not set |
825 | 839 | ||
826 | # | 840 | # |
@@ -854,14 +868,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
854 | # CONFIG_MMC is not set | 868 | # CONFIG_MMC is not set |
855 | # CONFIG_MEMSTICK is not set | 869 | # CONFIG_MEMSTICK is not set |
856 | # CONFIG_NEW_LEDS is not set | 870 | # CONFIG_NEW_LEDS is not set |
871 | # CONFIG_ACCESSIBILITY is not set | ||
857 | # CONFIG_INFINIBAND is not set | 872 | # CONFIG_INFINIBAND is not set |
858 | # CONFIG_EDAC is not set | 873 | # CONFIG_EDAC is not set |
859 | # CONFIG_RTC_CLASS is not set | 874 | # CONFIG_RTC_CLASS is not set |
860 | # CONFIG_DMADEVICES is not set | 875 | # CONFIG_DMADEVICES is not set |
861 | |||
862 | # | ||
863 | # Userspace I/O | ||
864 | # | ||
865 | # CONFIG_UIO is not set | 876 | # CONFIG_UIO is not set |
866 | 877 | ||
867 | # | 878 | # |
@@ -895,9 +906,9 @@ CONFIG_JFS_SECURITY=y | |||
895 | CONFIG_FS_POSIX_ACL=y | 906 | CONFIG_FS_POSIX_ACL=y |
896 | CONFIG_XFS_FS=m | 907 | CONFIG_XFS_FS=m |
897 | # CONFIG_XFS_QUOTA is not set | 908 | # CONFIG_XFS_QUOTA is not set |
898 | CONFIG_XFS_SECURITY=y | ||
899 | CONFIG_XFS_POSIX_ACL=y | 909 | CONFIG_XFS_POSIX_ACL=y |
900 | # CONFIG_XFS_RT is not set | 910 | # CONFIG_XFS_RT is not set |
911 | # CONFIG_XFS_DEBUG is not set | ||
901 | CONFIG_GFS2_FS=m | 912 | CONFIG_GFS2_FS=m |
902 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | 913 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m |
903 | CONFIG_GFS2_FS_LOCKING_DLM=m | 914 | CONFIG_GFS2_FS_LOCKING_DLM=m |
@@ -966,13 +977,11 @@ CONFIG_NFS_FS=y | |||
966 | CONFIG_NFS_V3=y | 977 | CONFIG_NFS_V3=y |
967 | CONFIG_NFS_V3_ACL=y | 978 | CONFIG_NFS_V3_ACL=y |
968 | CONFIG_NFS_V4=y | 979 | CONFIG_NFS_V4=y |
969 | # CONFIG_NFS_DIRECTIO is not set | ||
970 | CONFIG_NFSD=m | 980 | CONFIG_NFSD=m |
971 | CONFIG_NFSD_V2_ACL=y | 981 | CONFIG_NFSD_V2_ACL=y |
972 | CONFIG_NFSD_V3=y | 982 | CONFIG_NFSD_V3=y |
973 | CONFIG_NFSD_V3_ACL=y | 983 | CONFIG_NFSD_V3_ACL=y |
974 | CONFIG_NFSD_V4=y | 984 | CONFIG_NFSD_V4=y |
975 | CONFIG_NFSD_TCP=y | ||
976 | CONFIG_LOCKD=y | 985 | CONFIG_LOCKD=y |
977 | CONFIG_LOCKD_V4=y | 986 | CONFIG_LOCKD_V4=y |
978 | CONFIG_EXPORTFS=m | 987 | CONFIG_EXPORTFS=m |
@@ -1047,9 +1056,10 @@ CONFIG_DLM=m | |||
1047 | # Library routines | 1056 | # Library routines |
1048 | # | 1057 | # |
1049 | CONFIG_BITREVERSE=y | 1058 | CONFIG_BITREVERSE=y |
1059 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1050 | CONFIG_CRC_CCITT=m | 1060 | CONFIG_CRC_CCITT=m |
1051 | # CONFIG_CRC16 is not set | 1061 | # CONFIG_CRC16 is not set |
1052 | # CONFIG_CRC_ITU_T is not set | 1062 | CONFIG_CRC_ITU_T=m |
1053 | CONFIG_CRC32=y | 1063 | CONFIG_CRC32=y |
1054 | # CONFIG_CRC7 is not set | 1064 | # CONFIG_CRC7 is not set |
1055 | CONFIG_LIBCRC32C=m | 1065 | CONFIG_LIBCRC32C=m |
@@ -1071,6 +1081,7 @@ CONFIG_HAVE_LMB=y | |||
1071 | # CONFIG_PRINTK_TIME is not set | 1081 | # CONFIG_PRINTK_TIME is not set |
1072 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1082 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1073 | CONFIG_ENABLE_MUST_CHECK=y | 1083 | CONFIG_ENABLE_MUST_CHECK=y |
1084 | CONFIG_FRAME_WARN=2048 | ||
1074 | CONFIG_MAGIC_SYSRQ=y | 1085 | CONFIG_MAGIC_SYSRQ=y |
1075 | # CONFIG_UNUSED_SYMBOLS is not set | 1086 | # CONFIG_UNUSED_SYMBOLS is not set |
1076 | CONFIG_DEBUG_FS=y | 1087 | CONFIG_DEBUG_FS=y |
@@ -1081,18 +1092,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1081 | CONFIG_SCHED_DEBUG=y | 1092 | CONFIG_SCHED_DEBUG=y |
1082 | # CONFIG_SCHEDSTATS is not set | 1093 | # CONFIG_SCHEDSTATS is not set |
1083 | # CONFIG_TIMER_STATS is not set | 1094 | # CONFIG_TIMER_STATS is not set |
1095 | # CONFIG_DEBUG_OBJECTS is not set | ||
1084 | # CONFIG_SLUB_DEBUG_ON is not set | 1096 | # CONFIG_SLUB_DEBUG_ON is not set |
1085 | # CONFIG_SLUB_STATS is not set | 1097 | # CONFIG_SLUB_STATS is not set |
1086 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1098 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1087 | # CONFIG_RT_MUTEX_TESTER is not set | 1099 | # CONFIG_RT_MUTEX_TESTER is not set |
1088 | # CONFIG_DEBUG_SPINLOCK is not set | 1100 | # CONFIG_DEBUG_SPINLOCK is not set |
1089 | # CONFIG_DEBUG_MUTEXES is not set | 1101 | # CONFIG_DEBUG_MUTEXES is not set |
1102 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1103 | # CONFIG_PROVE_LOCKING is not set | ||
1104 | # CONFIG_LOCK_STAT is not set | ||
1090 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1105 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1091 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1106 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1092 | # CONFIG_DEBUG_KOBJECT is not set | 1107 | # CONFIG_DEBUG_KOBJECT is not set |
1093 | CONFIG_DEBUG_BUGVERBOSE=y | 1108 | CONFIG_DEBUG_BUGVERBOSE=y |
1094 | # CONFIG_DEBUG_INFO is not set | 1109 | # CONFIG_DEBUG_INFO is not set |
1095 | # CONFIG_DEBUG_VM is not set | 1110 | # CONFIG_DEBUG_VM is not set |
1111 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1096 | # CONFIG_DEBUG_LIST is not set | 1112 | # CONFIG_DEBUG_LIST is not set |
1097 | # CONFIG_DEBUG_SG is not set | 1113 | # CONFIG_DEBUG_SG is not set |
1098 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1114 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1116,53 +1132,83 @@ CONFIG_IRQSTACKS=y | |||
1116 | # CONFIG_SECURITY is not set | 1132 | # CONFIG_SECURITY is not set |
1117 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1133 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1118 | CONFIG_CRYPTO=y | 1134 | CONFIG_CRYPTO=y |
1135 | |||
1136 | # | ||
1137 | # Crypto core or helper | ||
1138 | # | ||
1119 | CONFIG_CRYPTO_ALGAPI=y | 1139 | CONFIG_CRYPTO_ALGAPI=y |
1120 | CONFIG_CRYPTO_AEAD=m | 1140 | CONFIG_CRYPTO_AEAD=m |
1121 | CONFIG_CRYPTO_BLKCIPHER=y | 1141 | CONFIG_CRYPTO_BLKCIPHER=y |
1122 | # CONFIG_CRYPTO_SEQIV is not set | ||
1123 | CONFIG_CRYPTO_HASH=y | 1142 | CONFIG_CRYPTO_HASH=y |
1124 | CONFIG_CRYPTO_MANAGER=y | 1143 | CONFIG_CRYPTO_MANAGER=y |
1144 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1145 | CONFIG_CRYPTO_NULL=m | ||
1146 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1147 | CONFIG_CRYPTO_AUTHENC=m | ||
1148 | CONFIG_CRYPTO_TEST=m | ||
1149 | |||
1150 | # | ||
1151 | # Authenticated Encryption with Associated Data | ||
1152 | # | ||
1153 | # CONFIG_CRYPTO_CCM is not set | ||
1154 | # CONFIG_CRYPTO_GCM is not set | ||
1155 | # CONFIG_CRYPTO_SEQIV is not set | ||
1156 | |||
1157 | # | ||
1158 | # Block modes | ||
1159 | # | ||
1160 | CONFIG_CRYPTO_CBC=y | ||
1161 | # CONFIG_CRYPTO_CTR is not set | ||
1162 | # CONFIG_CRYPTO_CTS is not set | ||
1163 | CONFIG_CRYPTO_ECB=m | ||
1164 | # CONFIG_CRYPTO_LRW is not set | ||
1165 | CONFIG_CRYPTO_PCBC=m | ||
1166 | # CONFIG_CRYPTO_XTS is not set | ||
1167 | |||
1168 | # | ||
1169 | # Hash modes | ||
1170 | # | ||
1125 | CONFIG_CRYPTO_HMAC=y | 1171 | CONFIG_CRYPTO_HMAC=y |
1126 | # CONFIG_CRYPTO_XCBC is not set | 1172 | # CONFIG_CRYPTO_XCBC is not set |
1127 | CONFIG_CRYPTO_NULL=m | 1173 | |
1174 | # | ||
1175 | # Digest | ||
1176 | # | ||
1177 | CONFIG_CRYPTO_CRC32C=m | ||
1128 | CONFIG_CRYPTO_MD4=m | 1178 | CONFIG_CRYPTO_MD4=m |
1129 | CONFIG_CRYPTO_MD5=y | 1179 | CONFIG_CRYPTO_MD5=y |
1180 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1130 | CONFIG_CRYPTO_SHA1=m | 1181 | CONFIG_CRYPTO_SHA1=m |
1131 | CONFIG_CRYPTO_SHA256=m | 1182 | CONFIG_CRYPTO_SHA256=m |
1132 | CONFIG_CRYPTO_SHA512=m | 1183 | CONFIG_CRYPTO_SHA512=m |
1133 | CONFIG_CRYPTO_WP512=m | ||
1134 | CONFIG_CRYPTO_TGR192=m | 1184 | CONFIG_CRYPTO_TGR192=m |
1135 | # CONFIG_CRYPTO_GF128MUL is not set | 1185 | CONFIG_CRYPTO_WP512=m |
1136 | CONFIG_CRYPTO_ECB=m | 1186 | |
1137 | CONFIG_CRYPTO_CBC=y | 1187 | # |
1138 | CONFIG_CRYPTO_PCBC=m | 1188 | # Ciphers |
1139 | # CONFIG_CRYPTO_LRW is not set | 1189 | # |
1140 | # CONFIG_CRYPTO_XTS is not set | ||
1141 | # CONFIG_CRYPTO_CTR is not set | ||
1142 | # CONFIG_CRYPTO_GCM is not set | ||
1143 | # CONFIG_CRYPTO_CCM is not set | ||
1144 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1145 | CONFIG_CRYPTO_DES=y | ||
1146 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1147 | CONFIG_CRYPTO_BLOWFISH=m | ||
1148 | CONFIG_CRYPTO_TWOFISH=m | ||
1149 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1150 | CONFIG_CRYPTO_SERPENT=m | ||
1151 | CONFIG_CRYPTO_AES=m | 1190 | CONFIG_CRYPTO_AES=m |
1191 | CONFIG_CRYPTO_ANUBIS=m | ||
1192 | CONFIG_CRYPTO_ARC4=m | ||
1193 | CONFIG_CRYPTO_BLOWFISH=m | ||
1194 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1152 | CONFIG_CRYPTO_CAST5=m | 1195 | CONFIG_CRYPTO_CAST5=m |
1153 | CONFIG_CRYPTO_CAST6=m | 1196 | CONFIG_CRYPTO_CAST6=m |
1154 | CONFIG_CRYPTO_TEA=m | 1197 | CONFIG_CRYPTO_DES=y |
1155 | CONFIG_CRYPTO_ARC4=m | 1198 | # CONFIG_CRYPTO_FCRYPT is not set |
1156 | CONFIG_CRYPTO_KHAZAD=m | 1199 | CONFIG_CRYPTO_KHAZAD=m |
1157 | CONFIG_CRYPTO_ANUBIS=m | ||
1158 | CONFIG_CRYPTO_SEED=m | ||
1159 | # CONFIG_CRYPTO_SALSA20 is not set | 1200 | # CONFIG_CRYPTO_SALSA20 is not set |
1201 | CONFIG_CRYPTO_SEED=m | ||
1202 | CONFIG_CRYPTO_SERPENT=m | ||
1203 | CONFIG_CRYPTO_TEA=m | ||
1204 | CONFIG_CRYPTO_TWOFISH=m | ||
1205 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1206 | |||
1207 | # | ||
1208 | # Compression | ||
1209 | # | ||
1160 | CONFIG_CRYPTO_DEFLATE=m | 1210 | CONFIG_CRYPTO_DEFLATE=m |
1161 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1162 | CONFIG_CRYPTO_CRC32C=m | ||
1163 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1164 | CONFIG_CRYPTO_TEST=m | ||
1165 | CONFIG_CRYPTO_AUTHENC=m | ||
1166 | # CONFIG_CRYPTO_LZO is not set | 1211 | # CONFIG_CRYPTO_LZO is not set |
1167 | # CONFIG_CRYPTO_HW is not set | 1212 | # CONFIG_CRYPTO_HW is not set |
1168 | # CONFIG_PPC_CLOCK is not set | 1213 | # CONFIG_PPC_CLOCK is not set |
1214 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index fca114252ac7..3688e4bb6fc2 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:56:21 2008 | 4 | # Tue May 20 20:02:24 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -91,6 +93,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
91 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
92 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
93 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -119,12 +122,14 @@ CONFIG_HAVE_OPROFILE=y | |||
119 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
122 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
123 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
124 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
125 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
126 | CONFIG_BASE_SMALL=0 | 130 | CONFIG_BASE_SMALL=0 |
127 | CONFIG_MODULES=y | 131 | CONFIG_MODULES=y |
132 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
128 | CONFIG_MODULE_UNLOAD=y | 133 | CONFIG_MODULE_UNLOAD=y |
129 | CONFIG_MODULE_FORCE_UNLOAD=y | 134 | CONFIG_MODULE_FORCE_UNLOAD=y |
130 | # CONFIG_MODVERSIONS is not set | 135 | # CONFIG_MODVERSIONS is not set |
@@ -185,6 +190,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
185 | CONFIG_CPU_FREQ_STAT=y | 190 | CONFIG_CPU_FREQ_STAT=y |
186 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 191 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
187 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 192 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
193 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
188 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 194 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
189 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
190 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 196 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
@@ -236,16 +242,17 @@ CONFIG_FLATMEM=y | |||
236 | CONFIG_FLAT_NODE_MEM_MAP=y | 242 | CONFIG_FLAT_NODE_MEM_MAP=y |
237 | # CONFIG_SPARSEMEM_STATIC is not set | 243 | # CONFIG_SPARSEMEM_STATIC is not set |
238 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
245 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
239 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 246 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
240 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
241 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
242 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
243 | CONFIG_VIRT_TO_BUS=y | 250 | CONFIG_VIRT_TO_BUS=y |
251 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
244 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
245 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
246 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 254 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
247 | CONFIG_PM=y | 255 | CONFIG_PM=y |
248 | # CONFIG_PM_LEGACY is not set | ||
249 | CONFIG_PM_DEBUG=y | 256 | CONFIG_PM_DEBUG=y |
250 | # CONFIG_PM_VERBOSE is not set | 257 | # CONFIG_PM_VERBOSE is not set |
251 | CONFIG_CAN_PM_TRACE=y | 258 | CONFIG_CAN_PM_TRACE=y |
@@ -292,6 +299,7 @@ CONFIG_YENTA_TOSHIBA=y | |||
292 | # CONFIG_I82092 is not set | 299 | # CONFIG_I82092 is not set |
293 | CONFIG_PCCARD_NONSTATIC=m | 300 | CONFIG_PCCARD_NONSTATIC=m |
294 | # CONFIG_HOTPLUG_PCI is not set | 301 | # CONFIG_HOTPLUG_PCI is not set |
302 | # CONFIG_HAS_RAPIDIO is not set | ||
295 | 303 | ||
296 | # | 304 | # |
297 | # Advanced setup | 305 | # Advanced setup |
@@ -301,11 +309,11 @@ CONFIG_PCCARD_NONSTATIC=m | |||
301 | # | 309 | # |
302 | # Default settings for advanced configuration options are used | 310 | # Default settings for advanced configuration options are used |
303 | # | 311 | # |
304 | CONFIG_HIGHMEM_START=0xfe000000 | ||
305 | CONFIG_LOWMEM_SIZE=0x30000000 | 312 | CONFIG_LOWMEM_SIZE=0x30000000 |
313 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
306 | CONFIG_KERNEL_START=0xc0000000 | 314 | CONFIG_KERNEL_START=0xc0000000 |
315 | CONFIG_PHYSICAL_START=0x00000000 | ||
307 | CONFIG_TASK_SIZE=0xc0000000 | 316 | CONFIG_TASK_SIZE=0xc0000000 |
308 | CONFIG_BOOT_LOAD=0x00800000 | ||
309 | 317 | ||
310 | # | 318 | # |
311 | # Networking | 319 | # Networking |
@@ -352,8 +360,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
352 | # CONFIG_TCP_MD5SIG is not set | 360 | # CONFIG_TCP_MD5SIG is not set |
353 | # CONFIG_IP_VS is not set | 361 | # CONFIG_IP_VS is not set |
354 | # CONFIG_IPV6 is not set | 362 | # CONFIG_IPV6 is not set |
355 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
356 | # CONFIG_INET6_TUNNEL is not set | ||
357 | # CONFIG_NETWORK_SECMARK is not set | 363 | # CONFIG_NETWORK_SECMARK is not set |
358 | CONFIG_NETFILTER=y | 364 | CONFIG_NETFILTER=y |
359 | # CONFIG_NETFILTER_DEBUG is not set | 365 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -369,6 +375,7 @@ CONFIG_NF_CONNTRACK=m | |||
369 | # CONFIG_NF_CT_ACCT is not set | 375 | # CONFIG_NF_CT_ACCT is not set |
370 | # CONFIG_NF_CONNTRACK_MARK is not set | 376 | # CONFIG_NF_CONNTRACK_MARK is not set |
371 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 377 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
378 | CONFIG_NF_CT_PROTO_DCCP=m | ||
372 | # CONFIG_NF_CT_PROTO_SCTP is not set | 379 | # CONFIG_NF_CT_PROTO_SCTP is not set |
373 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 380 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
374 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 381 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
@@ -445,6 +452,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m | |||
445 | CONFIG_IP_NF_TARGET_REDIRECT=m | 452 | CONFIG_IP_NF_TARGET_REDIRECT=m |
446 | CONFIG_IP_NF_TARGET_NETMAP=m | 453 | CONFIG_IP_NF_TARGET_NETMAP=m |
447 | # CONFIG_NF_NAT_SNMP_BASIC is not set | 454 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
455 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
448 | CONFIG_NF_NAT_FTP=m | 456 | CONFIG_NF_NAT_FTP=m |
449 | CONFIG_NF_NAT_IRC=m | 457 | CONFIG_NF_NAT_IRC=m |
450 | CONFIG_NF_NAT_TFTP=m | 458 | CONFIG_NF_NAT_TFTP=m |
@@ -586,7 +594,6 @@ CONFIG_MAC80211=m | |||
586 | # Rate control algorithm selection | 594 | # Rate control algorithm selection |
587 | # | 595 | # |
588 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 596 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
589 | # CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set | ||
590 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | 597 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set |
591 | 598 | ||
592 | # | 599 | # |
@@ -598,7 +605,7 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y | |||
598 | # | 605 | # |
599 | CONFIG_MAC80211_RC_DEFAULT="pid" | 606 | CONFIG_MAC80211_RC_DEFAULT="pid" |
600 | CONFIG_MAC80211_RC_PID=y | 607 | CONFIG_MAC80211_RC_PID=y |
601 | # CONFIG_MAC80211_RC_SIMPLE is not set | 608 | # CONFIG_MAC80211_MESH is not set |
602 | CONFIG_MAC80211_LEDS=y | 609 | CONFIG_MAC80211_LEDS=y |
603 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 610 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set |
604 | # CONFIG_MAC80211_DEBUG is not set | 611 | # CONFIG_MAC80211_DEBUG is not set |
@@ -607,7 +614,6 @@ CONFIG_IEEE80211=m | |||
607 | CONFIG_IEEE80211_CRYPT_WEP=m | 614 | CONFIG_IEEE80211_CRYPT_WEP=m |
608 | CONFIG_IEEE80211_CRYPT_CCMP=m | 615 | CONFIG_IEEE80211_CRYPT_CCMP=m |
609 | CONFIG_IEEE80211_CRYPT_TKIP=m | 616 | CONFIG_IEEE80211_CRYPT_TKIP=m |
610 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
611 | # CONFIG_RFKILL is not set | 617 | # CONFIG_RFKILL is not set |
612 | # CONFIG_NET_9P is not set | 618 | # CONFIG_NET_9P is not set |
613 | 619 | ||
@@ -629,6 +635,7 @@ CONFIG_CONNECTOR=y | |||
629 | CONFIG_PROC_EVENTS=y | 635 | CONFIG_PROC_EVENTS=y |
630 | # CONFIG_MTD is not set | 636 | # CONFIG_MTD is not set |
631 | CONFIG_OF_DEVICE=y | 637 | CONFIG_OF_DEVICE=y |
638 | CONFIG_OF_I2C=y | ||
632 | # CONFIG_PARPORT is not set | 639 | # CONFIG_PARPORT is not set |
633 | CONFIG_BLK_DEV=y | 640 | CONFIG_BLK_DEV=y |
634 | # CONFIG_BLK_DEV_FD is not set | 641 | # CONFIG_BLK_DEV_FD is not set |
@@ -720,7 +727,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
720 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 727 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
721 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 728 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
722 | CONFIG_BLK_DEV_IDEDMA=y | 729 | CONFIG_BLK_DEV_IDEDMA=y |
723 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 730 | # CONFIG_BLK_DEV_HD_ONLY is not set |
724 | # CONFIG_BLK_DEV_HD is not set | 731 | # CONFIG_BLK_DEV_HD is not set |
725 | 732 | ||
726 | # | 733 | # |
@@ -906,7 +913,6 @@ CONFIG_SUNGEM=y | |||
906 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 913 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
907 | CONFIG_NET_PCI=y | 914 | CONFIG_NET_PCI=y |
908 | CONFIG_PCNET32=y | 915 | CONFIG_PCNET32=y |
909 | # CONFIG_PCNET32_NAPI is not set | ||
910 | # CONFIG_AMD8111_ETH is not set | 916 | # CONFIG_AMD8111_ETH is not set |
911 | # CONFIG_ADAPTEC_STARFIRE is not set | 917 | # CONFIG_ADAPTEC_STARFIRE is not set |
912 | # CONFIG_B44 is not set | 918 | # CONFIG_B44 is not set |
@@ -940,7 +946,6 @@ CONFIG_NETDEV_1000=y | |||
940 | # CONFIG_SIS190 is not set | 946 | # CONFIG_SIS190 is not set |
941 | # CONFIG_SKGE is not set | 947 | # CONFIG_SKGE is not set |
942 | # CONFIG_SKY2 is not set | 948 | # CONFIG_SKY2 is not set |
943 | # CONFIG_SK98LIN is not set | ||
944 | # CONFIG_VIA_VELOCITY is not set | 949 | # CONFIG_VIA_VELOCITY is not set |
945 | # CONFIG_TIGON3 is not set | 950 | # CONFIG_TIGON3 is not set |
946 | # CONFIG_BNX2 is not set | 951 | # CONFIG_BNX2 is not set |
@@ -959,6 +964,7 @@ CONFIG_NETDEV_10000=y | |||
959 | # CONFIG_MLX4_CORE is not set | 964 | # CONFIG_MLX4_CORE is not set |
960 | # CONFIG_TEHUTI is not set | 965 | # CONFIG_TEHUTI is not set |
961 | # CONFIG_BNX2X is not set | 966 | # CONFIG_BNX2X is not set |
967 | # CONFIG_SFC is not set | ||
962 | # CONFIG_TR is not set | 968 | # CONFIG_TR is not set |
963 | 969 | ||
964 | # | 970 | # |
@@ -992,6 +998,8 @@ CONFIG_P54_COMMON=m | |||
992 | # CONFIG_P54_USB is not set | 998 | # CONFIG_P54_USB is not set |
993 | # CONFIG_P54_PCI is not set | 999 | # CONFIG_P54_PCI is not set |
994 | # CONFIG_ATH5K is not set | 1000 | # CONFIG_ATH5K is not set |
1001 | # CONFIG_IWLCORE is not set | ||
1002 | # CONFIG_IWLWIFI_LEDS is not set | ||
995 | # CONFIG_IWL4965 is not set | 1003 | # CONFIG_IWL4965 is not set |
996 | # CONFIG_IWL3945 is not set | 1004 | # CONFIG_IWL3945 is not set |
997 | # CONFIG_HOSTAP is not set | 1005 | # CONFIG_HOSTAP is not set |
@@ -1110,6 +1118,7 @@ CONFIG_VT=y | |||
1110 | CONFIG_VT_CONSOLE=y | 1118 | CONFIG_VT_CONSOLE=y |
1111 | CONFIG_HW_CONSOLE=y | 1119 | CONFIG_HW_CONSOLE=y |
1112 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1120 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
1121 | CONFIG_DEVKMEM=y | ||
1113 | # CONFIG_SERIAL_NONSTANDARD is not set | 1122 | # CONFIG_SERIAL_NONSTANDARD is not set |
1114 | # CONFIG_NOZOMI is not set | 1123 | # CONFIG_NOZOMI is not set |
1115 | 1124 | ||
@@ -1156,13 +1165,7 @@ CONFIG_DEVPORT=y | |||
1156 | CONFIG_I2C=y | 1165 | CONFIG_I2C=y |
1157 | CONFIG_I2C_BOARDINFO=y | 1166 | CONFIG_I2C_BOARDINFO=y |
1158 | CONFIG_I2C_CHARDEV=m | 1167 | CONFIG_I2C_CHARDEV=m |
1159 | |||
1160 | # | ||
1161 | # I2C Algorithms | ||
1162 | # | ||
1163 | CONFIG_I2C_ALGOBIT=y | 1168 | CONFIG_I2C_ALGOBIT=y |
1164 | # CONFIG_I2C_ALGOPCF is not set | ||
1165 | # CONFIG_I2C_ALGOPCA is not set | ||
1166 | 1169 | ||
1167 | # | 1170 | # |
1168 | # I2C Hardware Bus support | 1171 | # I2C Hardware Bus support |
@@ -1192,6 +1195,7 @@ CONFIG_I2C_POWERMAC=y | |||
1192 | # CONFIG_I2C_VIA is not set | 1195 | # CONFIG_I2C_VIA is not set |
1193 | # CONFIG_I2C_VIAPRO is not set | 1196 | # CONFIG_I2C_VIAPRO is not set |
1194 | # CONFIG_I2C_VOODOO3 is not set | 1197 | # CONFIG_I2C_VOODOO3 is not set |
1198 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1195 | 1199 | ||
1196 | # | 1200 | # |
1197 | # Miscellaneous I2C Chip support | 1201 | # Miscellaneous I2C Chip support |
@@ -1201,19 +1205,13 @@ CONFIG_I2C_POWERMAC=y | |||
1201 | # CONFIG_SENSORS_PCF8574 is not set | 1205 | # CONFIG_SENSORS_PCF8574 is not set |
1202 | # CONFIG_PCF8575 is not set | 1206 | # CONFIG_PCF8575 is not set |
1203 | # CONFIG_SENSORS_PCF8591 is not set | 1207 | # CONFIG_SENSORS_PCF8591 is not set |
1204 | # CONFIG_TPS65010 is not set | ||
1205 | # CONFIG_SENSORS_MAX6875 is not set | 1208 | # CONFIG_SENSORS_MAX6875 is not set |
1206 | # CONFIG_SENSORS_TSL2550 is not set | 1209 | # CONFIG_SENSORS_TSL2550 is not set |
1207 | # CONFIG_I2C_DEBUG_CORE is not set | 1210 | # CONFIG_I2C_DEBUG_CORE is not set |
1208 | # CONFIG_I2C_DEBUG_ALGO is not set | 1211 | # CONFIG_I2C_DEBUG_ALGO is not set |
1209 | # CONFIG_I2C_DEBUG_BUS is not set | 1212 | # CONFIG_I2C_DEBUG_BUS is not set |
1210 | # CONFIG_I2C_DEBUG_CHIP is not set | 1213 | # CONFIG_I2C_DEBUG_CHIP is not set |
1211 | |||
1212 | # | ||
1213 | # SPI support | ||
1214 | # | ||
1215 | # CONFIG_SPI is not set | 1214 | # CONFIG_SPI is not set |
1216 | # CONFIG_SPI_MASTER is not set | ||
1217 | # CONFIG_W1 is not set | 1215 | # CONFIG_W1 is not set |
1218 | CONFIG_POWER_SUPPLY=y | 1216 | CONFIG_POWER_SUPPLY=y |
1219 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1217 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
@@ -1230,6 +1228,7 @@ CONFIG_BATTERY_PMU=y | |||
1230 | # | 1228 | # |
1231 | CONFIG_SSB_POSSIBLE=y | 1229 | CONFIG_SSB_POSSIBLE=y |
1232 | CONFIG_SSB=m | 1230 | CONFIG_SSB=m |
1231 | CONFIG_SSB_SPROM=y | ||
1233 | CONFIG_SSB_PCIHOST_POSSIBLE=y | 1232 | CONFIG_SSB_PCIHOST_POSSIBLE=y |
1234 | CONFIG_SSB_PCIHOST=y | 1233 | CONFIG_SSB_PCIHOST=y |
1235 | CONFIG_SSB_B43_PCI_BRIDGE=y | 1234 | CONFIG_SSB_B43_PCI_BRIDGE=y |
@@ -1243,12 +1242,22 @@ CONFIG_SSB_DRIVER_PCICORE=y | |||
1243 | # Multifunction device drivers | 1242 | # Multifunction device drivers |
1244 | # | 1243 | # |
1245 | # CONFIG_MFD_SM501 is not set | 1244 | # CONFIG_MFD_SM501 is not set |
1245 | # CONFIG_HTC_PASIC3 is not set | ||
1246 | 1246 | ||
1247 | # | 1247 | # |
1248 | # Multimedia devices | 1248 | # Multimedia devices |
1249 | # | 1249 | # |
1250 | |||
1251 | # | ||
1252 | # Multimedia core support | ||
1253 | # | ||
1250 | # CONFIG_VIDEO_DEV is not set | 1254 | # CONFIG_VIDEO_DEV is not set |
1251 | # CONFIG_DVB_CORE is not set | 1255 | # CONFIG_DVB_CORE is not set |
1256 | # CONFIG_VIDEO_MEDIA is not set | ||
1257 | |||
1258 | # | ||
1259 | # Multimedia drivers | ||
1260 | # | ||
1252 | # CONFIG_DAB is not set | 1261 | # CONFIG_DAB is not set |
1253 | 1262 | ||
1254 | # | 1263 | # |
@@ -1276,8 +1285,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1276 | # CONFIG_FB_SYS_FILLRECT is not set | 1285 | # CONFIG_FB_SYS_FILLRECT is not set |
1277 | # CONFIG_FB_SYS_COPYAREA is not set | 1286 | # CONFIG_FB_SYS_COPYAREA is not set |
1278 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1287 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1288 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1279 | # CONFIG_FB_SYS_FOPS is not set | 1289 | # CONFIG_FB_SYS_FOPS is not set |
1280 | CONFIG_FB_DEFERRED_IO=y | ||
1281 | # CONFIG_FB_SVGALIB is not set | 1290 | # CONFIG_FB_SVGALIB is not set |
1282 | CONFIG_FB_MACMODES=y | 1291 | CONFIG_FB_MACMODES=y |
1283 | CONFIG_FB_BACKLIGHT=y | 1292 | CONFIG_FB_BACKLIGHT=y |
@@ -1413,6 +1422,7 @@ CONFIG_SND_DUMMY=m | |||
1413 | # CONFIG_SND_AU8810 is not set | 1422 | # CONFIG_SND_AU8810 is not set |
1414 | # CONFIG_SND_AU8820 is not set | 1423 | # CONFIG_SND_AU8820 is not set |
1415 | # CONFIG_SND_AU8830 is not set | 1424 | # CONFIG_SND_AU8830 is not set |
1425 | # CONFIG_SND_AW2 is not set | ||
1416 | # CONFIG_SND_AZT3328 is not set | 1426 | # CONFIG_SND_AZT3328 is not set |
1417 | # CONFIG_SND_BT87X is not set | 1427 | # CONFIG_SND_BT87X is not set |
1418 | # CONFIG_SND_CA0106 is not set | 1428 | # CONFIG_SND_CA0106 is not set |
@@ -1505,11 +1515,11 @@ CONFIG_SND_USB_AUDIO=m | |||
1505 | # CONFIG_SND_SOC is not set | 1515 | # CONFIG_SND_SOC is not set |
1506 | 1516 | ||
1507 | # | 1517 | # |
1508 | # SoC Audio support for SuperH | 1518 | # ALSA SoC audio for Freescale SOCs |
1509 | # | 1519 | # |
1510 | 1520 | ||
1511 | # | 1521 | # |
1512 | # ALSA SoC audio for Freescale SOCs | 1522 | # SoC Audio for the Texas Instruments OMAP |
1513 | # | 1523 | # |
1514 | 1524 | ||
1515 | # | 1525 | # |
@@ -1543,17 +1553,18 @@ CONFIG_USB_DEVICEFS=y | |||
1543 | CONFIG_USB_DEVICE_CLASS=y | 1553 | CONFIG_USB_DEVICE_CLASS=y |
1544 | CONFIG_USB_DYNAMIC_MINORS=y | 1554 | CONFIG_USB_DYNAMIC_MINORS=y |
1545 | # CONFIG_USB_SUSPEND is not set | 1555 | # CONFIG_USB_SUSPEND is not set |
1546 | # CONFIG_USB_PERSIST is not set | ||
1547 | # CONFIG_USB_OTG is not set | 1556 | # CONFIG_USB_OTG is not set |
1548 | 1557 | ||
1549 | # | 1558 | # |
1550 | # USB Host Controller Drivers | 1559 | # USB Host Controller Drivers |
1551 | # | 1560 | # |
1561 | # CONFIG_USB_C67X00_HCD is not set | ||
1552 | CONFIG_USB_EHCI_HCD=m | 1562 | CONFIG_USB_EHCI_HCD=m |
1553 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1563 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1554 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1564 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1555 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1565 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1556 | # CONFIG_USB_ISP116X_HCD is not set | 1566 | # CONFIG_USB_ISP116X_HCD is not set |
1567 | # CONFIG_USB_ISP1760_HCD is not set | ||
1557 | CONFIG_USB_OHCI_HCD=y | 1568 | CONFIG_USB_OHCI_HCD=y |
1558 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1569 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1559 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1570 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1587,7 +1598,9 @@ CONFIG_USB_STORAGE=m | |||
1587 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1598 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1588 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1599 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1589 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1600 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1601 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
1590 | # CONFIG_USB_STORAGE_KARMA is not set | 1602 | # CONFIG_USB_STORAGE_KARMA is not set |
1603 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1591 | # CONFIG_USB_LIBUSUAL is not set | 1604 | # CONFIG_USB_LIBUSUAL is not set |
1592 | 1605 | ||
1593 | # | 1606 | # |
@@ -1642,9 +1655,11 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
1642 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1655 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
1643 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1656 | # CONFIG_USB_SERIAL_MOS7720 is not set |
1644 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1657 | # CONFIG_USB_SERIAL_MOS7840 is not set |
1658 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
1645 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1659 | # CONFIG_USB_SERIAL_NAVMAN is not set |
1646 | # CONFIG_USB_SERIAL_PL2303 is not set | 1660 | # CONFIG_USB_SERIAL_PL2303 is not set |
1647 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1661 | # CONFIG_USB_SERIAL_OTI6858 is not set |
1662 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
1648 | # CONFIG_USB_SERIAL_HP4X is not set | 1663 | # CONFIG_USB_SERIAL_HP4X is not set |
1649 | # CONFIG_USB_SERIAL_SAFE is not set | 1664 | # CONFIG_USB_SERIAL_SAFE is not set |
1650 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1665 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
@@ -1695,14 +1710,12 @@ CONFIG_LEDS_TRIGGERS=y | |||
1695 | # CONFIG_LEDS_TRIGGER_TIMER is not set | 1710 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
1696 | CONFIG_LEDS_TRIGGER_IDE_DISK=y | 1711 | CONFIG_LEDS_TRIGGER_IDE_DISK=y |
1697 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 1712 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
1713 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
1714 | # CONFIG_ACCESSIBILITY is not set | ||
1698 | # CONFIG_INFINIBAND is not set | 1715 | # CONFIG_INFINIBAND is not set |
1699 | # CONFIG_EDAC is not set | 1716 | # CONFIG_EDAC is not set |
1700 | # CONFIG_RTC_CLASS is not set | 1717 | # CONFIG_RTC_CLASS is not set |
1701 | # CONFIG_DMADEVICES is not set | 1718 | # CONFIG_DMADEVICES is not set |
1702 | |||
1703 | # | ||
1704 | # Userspace I/O | ||
1705 | # | ||
1706 | # CONFIG_UIO is not set | 1719 | # CONFIG_UIO is not set |
1707 | 1720 | ||
1708 | # | 1721 | # |
@@ -1786,13 +1799,11 @@ CONFIG_NFS_FS=y | |||
1786 | CONFIG_NFS_V3=y | 1799 | CONFIG_NFS_V3=y |
1787 | CONFIG_NFS_V3_ACL=y | 1800 | CONFIG_NFS_V3_ACL=y |
1788 | CONFIG_NFS_V4=y | 1801 | CONFIG_NFS_V4=y |
1789 | # CONFIG_NFS_DIRECTIO is not set | ||
1790 | CONFIG_NFSD=m | 1802 | CONFIG_NFSD=m |
1791 | CONFIG_NFSD_V2_ACL=y | 1803 | CONFIG_NFSD_V2_ACL=y |
1792 | CONFIG_NFSD_V3=y | 1804 | CONFIG_NFSD_V3=y |
1793 | CONFIG_NFSD_V3_ACL=y | 1805 | CONFIG_NFSD_V3_ACL=y |
1794 | CONFIG_NFSD_V4=y | 1806 | CONFIG_NFSD_V4=y |
1795 | CONFIG_NFSD_TCP=y | ||
1796 | CONFIG_LOCKD=y | 1807 | CONFIG_LOCKD=y |
1797 | CONFIG_LOCKD_V4=y | 1808 | CONFIG_LOCKD_V4=y |
1798 | CONFIG_EXPORTFS=m | 1809 | CONFIG_EXPORTFS=m |
@@ -1877,9 +1888,10 @@ CONFIG_NLS_UTF8=m | |||
1877 | # Library routines | 1888 | # Library routines |
1878 | # | 1889 | # |
1879 | CONFIG_BITREVERSE=y | 1890 | CONFIG_BITREVERSE=y |
1891 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1880 | CONFIG_CRC_CCITT=y | 1892 | CONFIG_CRC_CCITT=y |
1881 | CONFIG_CRC16=y | 1893 | CONFIG_CRC16=y |
1882 | # CONFIG_CRC_ITU_T is not set | 1894 | CONFIG_CRC_ITU_T=m |
1883 | CONFIG_CRC32=y | 1895 | CONFIG_CRC32=y |
1884 | # CONFIG_CRC7 is not set | 1896 | # CONFIG_CRC7 is not set |
1885 | CONFIG_LIBCRC32C=m | 1897 | CONFIG_LIBCRC32C=m |
@@ -1901,6 +1913,7 @@ CONFIG_HAVE_LMB=y | |||
1901 | # CONFIG_PRINTK_TIME is not set | 1913 | # CONFIG_PRINTK_TIME is not set |
1902 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1914 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1903 | CONFIG_ENABLE_MUST_CHECK=y | 1915 | CONFIG_ENABLE_MUST_CHECK=y |
1916 | CONFIG_FRAME_WARN=1024 | ||
1904 | CONFIG_MAGIC_SYSRQ=y | 1917 | CONFIG_MAGIC_SYSRQ=y |
1905 | # CONFIG_UNUSED_SYMBOLS is not set | 1918 | # CONFIG_UNUSED_SYMBOLS is not set |
1906 | # CONFIG_DEBUG_FS is not set | 1919 | # CONFIG_DEBUG_FS is not set |
@@ -1911,6 +1924,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1911 | CONFIG_SCHED_DEBUG=y | 1924 | CONFIG_SCHED_DEBUG=y |
1912 | # CONFIG_SCHEDSTATS is not set | 1925 | # CONFIG_SCHEDSTATS is not set |
1913 | # CONFIG_TIMER_STATS is not set | 1926 | # CONFIG_TIMER_STATS is not set |
1927 | # CONFIG_DEBUG_OBJECTS is not set | ||
1914 | # CONFIG_SLUB_DEBUG_ON is not set | 1928 | # CONFIG_SLUB_DEBUG_ON is not set |
1915 | # CONFIG_SLUB_STATS is not set | 1929 | # CONFIG_SLUB_STATS is not set |
1916 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1930 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1923,6 +1937,7 @@ CONFIG_SCHED_DEBUG=y | |||
1923 | CONFIG_DEBUG_BUGVERBOSE=y | 1937 | CONFIG_DEBUG_BUGVERBOSE=y |
1924 | # CONFIG_DEBUG_INFO is not set | 1938 | # CONFIG_DEBUG_INFO is not set |
1925 | # CONFIG_DEBUG_VM is not set | 1939 | # CONFIG_DEBUG_VM is not set |
1940 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1926 | # CONFIG_DEBUG_LIST is not set | 1941 | # CONFIG_DEBUG_LIST is not set |
1927 | # CONFIG_DEBUG_SG is not set | 1942 | # CONFIG_DEBUG_SG is not set |
1928 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1943 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1936,6 +1951,7 @@ CONFIG_DEBUGGER=y | |||
1936 | CONFIG_XMON=y | 1951 | CONFIG_XMON=y |
1937 | CONFIG_XMON_DEFAULT=y | 1952 | CONFIG_XMON_DEFAULT=y |
1938 | CONFIG_XMON_DISASSEMBLY=y | 1953 | CONFIG_XMON_DISASSEMBLY=y |
1954 | CONFIG_IRQSTACKS=y | ||
1939 | # CONFIG_BDI_SWITCH is not set | 1955 | # CONFIG_BDI_SWITCH is not set |
1940 | CONFIG_BOOTX_TEXT=y | 1956 | CONFIG_BOOTX_TEXT=y |
1941 | # CONFIG_PPC_EARLY_DEBUG is not set | 1957 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1947,54 +1963,84 @@ CONFIG_BOOTX_TEXT=y | |||
1947 | # CONFIG_SECURITY is not set | 1963 | # CONFIG_SECURITY is not set |
1948 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1964 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1949 | CONFIG_CRYPTO=y | 1965 | CONFIG_CRYPTO=y |
1966 | |||
1967 | # | ||
1968 | # Crypto core or helper | ||
1969 | # | ||
1950 | CONFIG_CRYPTO_ALGAPI=y | 1970 | CONFIG_CRYPTO_ALGAPI=y |
1951 | CONFIG_CRYPTO_AEAD=y | 1971 | CONFIG_CRYPTO_AEAD=y |
1952 | CONFIG_CRYPTO_BLKCIPHER=y | 1972 | CONFIG_CRYPTO_BLKCIPHER=y |
1953 | # CONFIG_CRYPTO_SEQIV is not set | ||
1954 | CONFIG_CRYPTO_HASH=y | 1973 | CONFIG_CRYPTO_HASH=y |
1955 | CONFIG_CRYPTO_MANAGER=y | 1974 | CONFIG_CRYPTO_MANAGER=y |
1975 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1976 | CONFIG_CRYPTO_NULL=m | ||
1977 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1978 | CONFIG_CRYPTO_AUTHENC=y | ||
1979 | # CONFIG_CRYPTO_TEST is not set | ||
1980 | |||
1981 | # | ||
1982 | # Authenticated Encryption with Associated Data | ||
1983 | # | ||
1984 | # CONFIG_CRYPTO_CCM is not set | ||
1985 | # CONFIG_CRYPTO_GCM is not set | ||
1986 | # CONFIG_CRYPTO_SEQIV is not set | ||
1987 | |||
1988 | # | ||
1989 | # Block modes | ||
1990 | # | ||
1991 | CONFIG_CRYPTO_CBC=y | ||
1992 | # CONFIG_CRYPTO_CTR is not set | ||
1993 | # CONFIG_CRYPTO_CTS is not set | ||
1994 | CONFIG_CRYPTO_ECB=m | ||
1995 | # CONFIG_CRYPTO_LRW is not set | ||
1996 | CONFIG_CRYPTO_PCBC=m | ||
1997 | # CONFIG_CRYPTO_XTS is not set | ||
1998 | |||
1999 | # | ||
2000 | # Hash modes | ||
2001 | # | ||
1956 | CONFIG_CRYPTO_HMAC=y | 2002 | CONFIG_CRYPTO_HMAC=y |
1957 | # CONFIG_CRYPTO_XCBC is not set | 2003 | # CONFIG_CRYPTO_XCBC is not set |
1958 | CONFIG_CRYPTO_NULL=m | 2004 | |
2005 | # | ||
2006 | # Digest | ||
2007 | # | ||
2008 | CONFIG_CRYPTO_CRC32C=m | ||
1959 | CONFIG_CRYPTO_MD4=m | 2009 | CONFIG_CRYPTO_MD4=m |
1960 | CONFIG_CRYPTO_MD5=y | 2010 | CONFIG_CRYPTO_MD5=y |
2011 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1961 | CONFIG_CRYPTO_SHA1=y | 2012 | CONFIG_CRYPTO_SHA1=y |
1962 | CONFIG_CRYPTO_SHA256=m | 2013 | CONFIG_CRYPTO_SHA256=m |
1963 | CONFIG_CRYPTO_SHA512=m | 2014 | CONFIG_CRYPTO_SHA512=m |
1964 | CONFIG_CRYPTO_WP512=m | ||
1965 | CONFIG_CRYPTO_TGR192=m | 2015 | CONFIG_CRYPTO_TGR192=m |
1966 | # CONFIG_CRYPTO_GF128MUL is not set | 2016 | CONFIG_CRYPTO_WP512=m |
1967 | CONFIG_CRYPTO_ECB=m | 2017 | |
1968 | CONFIG_CRYPTO_CBC=y | 2018 | # |
1969 | CONFIG_CRYPTO_PCBC=m | 2019 | # Ciphers |
1970 | # CONFIG_CRYPTO_LRW is not set | 2020 | # |
1971 | # CONFIG_CRYPTO_XTS is not set | ||
1972 | # CONFIG_CRYPTO_CTR is not set | ||
1973 | # CONFIG_CRYPTO_GCM is not set | ||
1974 | # CONFIG_CRYPTO_CCM is not set | ||
1975 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1976 | CONFIG_CRYPTO_DES=y | ||
1977 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1978 | CONFIG_CRYPTO_BLOWFISH=m | ||
1979 | CONFIG_CRYPTO_TWOFISH=m | ||
1980 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1981 | CONFIG_CRYPTO_SERPENT=m | ||
1982 | CONFIG_CRYPTO_AES=m | 2021 | CONFIG_CRYPTO_AES=m |
2022 | CONFIG_CRYPTO_ANUBIS=m | ||
2023 | CONFIG_CRYPTO_ARC4=m | ||
2024 | CONFIG_CRYPTO_BLOWFISH=m | ||
2025 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1983 | CONFIG_CRYPTO_CAST5=m | 2026 | CONFIG_CRYPTO_CAST5=m |
1984 | CONFIG_CRYPTO_CAST6=m | 2027 | CONFIG_CRYPTO_CAST6=m |
1985 | CONFIG_CRYPTO_TEA=m | 2028 | CONFIG_CRYPTO_DES=y |
1986 | CONFIG_CRYPTO_ARC4=m | 2029 | # CONFIG_CRYPTO_FCRYPT is not set |
1987 | CONFIG_CRYPTO_KHAZAD=m | 2030 | CONFIG_CRYPTO_KHAZAD=m |
1988 | CONFIG_CRYPTO_ANUBIS=m | ||
1989 | # CONFIG_CRYPTO_SEED is not set | ||
1990 | # CONFIG_CRYPTO_SALSA20 is not set | 2031 | # CONFIG_CRYPTO_SALSA20 is not set |
2032 | # CONFIG_CRYPTO_SEED is not set | ||
2033 | CONFIG_CRYPTO_SERPENT=m | ||
2034 | CONFIG_CRYPTO_TEA=m | ||
2035 | CONFIG_CRYPTO_TWOFISH=m | ||
2036 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
2037 | |||
2038 | # | ||
2039 | # Compression | ||
2040 | # | ||
1991 | CONFIG_CRYPTO_DEFLATE=m | 2041 | CONFIG_CRYPTO_DEFLATE=m |
1992 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1993 | CONFIG_CRYPTO_CRC32C=m | ||
1994 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1995 | # CONFIG_CRYPTO_TEST is not set | ||
1996 | CONFIG_CRYPTO_AUTHENC=y | ||
1997 | # CONFIG_CRYPTO_LZO is not set | 2042 | # CONFIG_CRYPTO_LZO is not set |
1998 | CONFIG_CRYPTO_HW=y | 2043 | CONFIG_CRYPTO_HW=y |
1999 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 2044 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
2000 | # CONFIG_PPC_CLOCK is not set | 2045 | # CONFIG_PPC_CLOCK is not set |
2046 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 970282b1a004..40f84fa2bd29 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:56:24 2008 | 4 | # Tue May 20 20:03:02 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -82,6 +85,7 @@ CONFIG_LOG_BUF_SHIFT=17 | |||
82 | CONFIG_CGROUPS=y | 85 | CONFIG_CGROUPS=y |
83 | # CONFIG_CGROUP_DEBUG is not set | 86 | # CONFIG_CGROUP_DEBUG is not set |
84 | # CONFIG_CGROUP_NS is not set | 87 | # CONFIG_CGROUP_NS is not set |
88 | # CONFIG_CGROUP_DEVICE is not set | ||
85 | CONFIG_CPUSETS=y | 89 | CONFIG_CPUSETS=y |
86 | # CONFIG_GROUP_SCHED is not set | 90 | # CONFIG_GROUP_SCHED is not set |
87 | # CONFIG_CGROUP_CPUACCT is not set | 91 | # CONFIG_CGROUP_CPUACCT is not set |
@@ -101,6 +105,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
101 | CONFIG_SYSCTL=y | 105 | CONFIG_SYSCTL=y |
102 | # CONFIG_EMBEDDED is not set | 106 | # CONFIG_EMBEDDED is not set |
103 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
104 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
105 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
106 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -108,6 +113,7 @@ CONFIG_HOTPLUG=y | |||
108 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
109 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
110 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
116 | CONFIG_PCSPKR_PLATFORM=y | ||
111 | # CONFIG_COMPAT_BRK is not set | 117 | # CONFIG_COMPAT_BRK is not set |
112 | CONFIG_BASE_FULL=y | 118 | CONFIG_BASE_FULL=y |
113 | CONFIG_FUTEX=y | 119 | CONFIG_FUTEX=y |
@@ -129,12 +135,14 @@ CONFIG_HAVE_OPROFILE=y | |||
129 | # CONFIG_KPROBES is not set | 135 | # CONFIG_KPROBES is not set |
130 | CONFIG_HAVE_KPROBES=y | 136 | CONFIG_HAVE_KPROBES=y |
131 | CONFIG_HAVE_KRETPROBES=y | 137 | CONFIG_HAVE_KRETPROBES=y |
138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
132 | CONFIG_PROC_PAGE_MONITOR=y | 139 | CONFIG_PROC_PAGE_MONITOR=y |
133 | CONFIG_SLABINFO=y | 140 | CONFIG_SLABINFO=y |
134 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
135 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
136 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
137 | CONFIG_MODULES=y | 144 | CONFIG_MODULES=y |
145 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
138 | CONFIG_MODULE_UNLOAD=y | 146 | CONFIG_MODULE_UNLOAD=y |
139 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 147 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
140 | CONFIG_MODVERSIONS=y | 148 | CONFIG_MODVERSIONS=y |
@@ -194,11 +202,11 @@ CONFIG_PPC_PASEMI=y | |||
194 | CONFIG_PPC_PASEMI_IOMMU=y | 202 | CONFIG_PPC_PASEMI_IOMMU=y |
195 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set | 203 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set |
196 | CONFIG_PPC_PASEMI_MDIO=y | 204 | CONFIG_PPC_PASEMI_MDIO=y |
197 | CONFIG_PPC_CELLEB=y | ||
198 | # CONFIG_PPC_PS3 is not set | 205 | # CONFIG_PPC_PS3 is not set |
199 | CONFIG_PPC_CELL=y | 206 | CONFIG_PPC_CELL=y |
200 | CONFIG_PPC_CELL_NATIVE=y | 207 | CONFIG_PPC_CELL_NATIVE=y |
201 | CONFIG_PPC_IBM_CELL_BLADE=y | 208 | CONFIG_PPC_IBM_CELL_BLADE=y |
209 | CONFIG_PPC_CELLEB=y | ||
202 | 210 | ||
203 | # | 211 | # |
204 | # Cell Broadband Engine options | 212 | # Cell Broadband Engine options |
@@ -241,6 +249,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
241 | CONFIG_CPU_FREQ_STAT=y | 249 | CONFIG_CPU_FREQ_STAT=y |
242 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 250 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
243 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 251 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
252 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
244 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 253 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
245 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 254 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
246 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 255 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
@@ -277,7 +286,6 @@ CONFIG_PREEMPT_NONE=y | |||
277 | CONFIG_BINFMT_ELF=y | 286 | CONFIG_BINFMT_ELF=y |
278 | CONFIG_COMPAT_BINFMT_ELF=y | 287 | CONFIG_COMPAT_BINFMT_ELF=y |
279 | CONFIG_BINFMT_MISC=m | 288 | CONFIG_BINFMT_MISC=m |
280 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
281 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 289 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
282 | CONFIG_IOMMU_VMERGE=y | 290 | CONFIG_IOMMU_VMERGE=y |
283 | CONFIG_IOMMU_HELPER=y | 291 | CONFIG_IOMMU_HELPER=y |
@@ -307,6 +315,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | |||
307 | CONFIG_SPARSEMEM_VMEMMAP=y | 315 | CONFIG_SPARSEMEM_VMEMMAP=y |
308 | CONFIG_MEMORY_HOTPLUG=y | 316 | CONFIG_MEMORY_HOTPLUG=y |
309 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | 317 | CONFIG_MEMORY_HOTPLUG_SPARSE=y |
318 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
310 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 319 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
311 | CONFIG_RESOURCES_64BIT=y | 320 | CONFIG_RESOURCES_64BIT=y |
312 | CONFIG_ZONE_DMA_FLAG=1 | 321 | CONFIG_ZONE_DMA_FLAG=1 |
@@ -314,6 +323,7 @@ CONFIG_BOUNCE=y | |||
314 | CONFIG_ARCH_MEMORY_PROBE=y | 323 | CONFIG_ARCH_MEMORY_PROBE=y |
315 | CONFIG_PPC_HAS_HASH_64K=y | 324 | CONFIG_PPC_HAS_HASH_64K=y |
316 | # CONFIG_PPC_64K_PAGES is not set | 325 | # CONFIG_PPC_64K_PAGES is not set |
326 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
317 | # CONFIG_SCHED_SMT is not set | 327 | # CONFIG_SCHED_SMT is not set |
318 | CONFIG_PROC_DEVICETREE=y | 328 | CONFIG_PROC_DEVICETREE=y |
319 | # CONFIG_CMDLINE_BOOL is not set | 329 | # CONFIG_CMDLINE_BOOL is not set |
@@ -356,7 +366,10 @@ CONFIG_HOTPLUG_PCI=m | |||
356 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 366 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
357 | CONFIG_HOTPLUG_PCI_RPA=m | 367 | CONFIG_HOTPLUG_PCI_RPA=m |
358 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | 368 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m |
369 | # CONFIG_HAS_RAPIDIO is not set | ||
370 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
359 | CONFIG_KERNEL_START=0xc000000000000000 | 371 | CONFIG_KERNEL_START=0xc000000000000000 |
372 | CONFIG_PHYSICAL_START=0x00000000 | ||
360 | 373 | ||
361 | # | 374 | # |
362 | # Networking | 375 | # Networking |
@@ -406,8 +419,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
406 | # CONFIG_TCP_MD5SIG is not set | 419 | # CONFIG_TCP_MD5SIG is not set |
407 | # CONFIG_IP_VS is not set | 420 | # CONFIG_IP_VS is not set |
408 | # CONFIG_IPV6 is not set | 421 | # CONFIG_IPV6 is not set |
409 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
410 | # CONFIG_INET6_TUNNEL is not set | ||
411 | # CONFIG_NETWORK_SECMARK is not set | 422 | # CONFIG_NETWORK_SECMARK is not set |
412 | CONFIG_NETFILTER=y | 423 | CONFIG_NETFILTER=y |
413 | # CONFIG_NETFILTER_DEBUG is not set | 424 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -423,6 +434,7 @@ CONFIG_NF_CONNTRACK=m | |||
423 | CONFIG_NF_CT_ACCT=y | 434 | CONFIG_NF_CT_ACCT=y |
424 | CONFIG_NF_CONNTRACK_MARK=y | 435 | CONFIG_NF_CONNTRACK_MARK=y |
425 | CONFIG_NF_CONNTRACK_EVENTS=y | 436 | CONFIG_NF_CONNTRACK_EVENTS=y |
437 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
426 | CONFIG_NF_CT_PROTO_GRE=m | 438 | CONFIG_NF_CT_PROTO_GRE=m |
427 | CONFIG_NF_CT_PROTO_SCTP=m | 439 | CONFIG_NF_CT_PROTO_SCTP=m |
428 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 440 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
@@ -501,6 +513,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m | |||
501 | CONFIG_IP_NF_TARGET_NETMAP=m | 513 | CONFIG_IP_NF_TARGET_NETMAP=m |
502 | CONFIG_NF_NAT_SNMP_BASIC=m | 514 | CONFIG_NF_NAT_SNMP_BASIC=m |
503 | CONFIG_NF_NAT_PROTO_GRE=m | 515 | CONFIG_NF_NAT_PROTO_GRE=m |
516 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
504 | CONFIG_NF_NAT_FTP=m | 517 | CONFIG_NF_NAT_FTP=m |
505 | CONFIG_NF_NAT_IRC=m | 518 | CONFIG_NF_NAT_IRC=m |
506 | CONFIG_NF_NAT_TFTP=m | 519 | CONFIG_NF_NAT_TFTP=m |
@@ -571,6 +584,7 @@ CONFIG_FW_LOADER=y | |||
571 | # CONFIG_CONNECTOR is not set | 584 | # CONFIG_CONNECTOR is not set |
572 | # CONFIG_MTD is not set | 585 | # CONFIG_MTD is not set |
573 | CONFIG_OF_DEVICE=y | 586 | CONFIG_OF_DEVICE=y |
587 | CONFIG_OF_I2C=y | ||
574 | # CONFIG_PARPORT is not set | 588 | # CONFIG_PARPORT is not set |
575 | CONFIG_BLK_DEV=y | 589 | CONFIG_BLK_DEV=y |
576 | CONFIG_BLK_DEV_FD=y | 590 | CONFIG_BLK_DEV_FD=y |
@@ -618,7 +632,6 @@ CONFIG_IDE_PROC_FS=y | |||
618 | # | 632 | # |
619 | # IDE chipset support/bugfixes | 633 | # IDE chipset support/bugfixes |
620 | # | 634 | # |
621 | CONFIG_IDE_GENERIC=y | ||
622 | # CONFIG_BLK_DEV_PLATFORM is not set | 635 | # CONFIG_BLK_DEV_PLATFORM is not set |
623 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 636 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
624 | 637 | ||
@@ -661,7 +674,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
661 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 674 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
662 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 675 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
663 | CONFIG_BLK_DEV_IDEDMA=y | 676 | CONFIG_BLK_DEV_IDEDMA=y |
664 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 677 | # CONFIG_BLK_DEV_HD_ONLY is not set |
665 | # CONFIG_BLK_DEV_HD is not set | 678 | # CONFIG_BLK_DEV_HD is not set |
666 | 679 | ||
667 | # | 680 | # |
@@ -747,64 +760,10 @@ CONFIG_SCSI_DEBUG=m | |||
747 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 760 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
748 | CONFIG_ATA=y | 761 | CONFIG_ATA=y |
749 | CONFIG_ATA_NONSTANDARD=y | 762 | CONFIG_ATA_NONSTANDARD=y |
763 | CONFIG_SATA_PMP=y | ||
750 | # CONFIG_SATA_AHCI is not set | 764 | # CONFIG_SATA_AHCI is not set |
751 | CONFIG_SATA_SVW=y | ||
752 | # CONFIG_ATA_PIIX is not set | ||
753 | CONFIG_SATA_MV=y | ||
754 | # CONFIG_SATA_NV is not set | ||
755 | # CONFIG_PDC_ADMA is not set | ||
756 | # CONFIG_SATA_QSTOR is not set | ||
757 | # CONFIG_SATA_PROMISE is not set | ||
758 | # CONFIG_SATA_SX4 is not set | ||
759 | # CONFIG_SATA_SIL is not set | ||
760 | CONFIG_SATA_SIL24=y | 765 | CONFIG_SATA_SIL24=y |
761 | # CONFIG_SATA_SIS is not set | 766 | # CONFIG_ATA_SFF is not set |
762 | # CONFIG_SATA_ULI is not set | ||
763 | # CONFIG_SATA_VIA is not set | ||
764 | # CONFIG_SATA_VITESSE is not set | ||
765 | # CONFIG_SATA_INIC162X is not set | ||
766 | # CONFIG_PATA_ALI is not set | ||
767 | # CONFIG_PATA_AMD is not set | ||
768 | # CONFIG_PATA_ARTOP is not set | ||
769 | # CONFIG_PATA_ATIIXP is not set | ||
770 | # CONFIG_PATA_CMD640_PCI is not set | ||
771 | # CONFIG_PATA_CMD64X is not set | ||
772 | # CONFIG_PATA_CS5520 is not set | ||
773 | # CONFIG_PATA_CS5530 is not set | ||
774 | # CONFIG_PATA_CYPRESS is not set | ||
775 | # CONFIG_PATA_EFAR is not set | ||
776 | # CONFIG_ATA_GENERIC is not set | ||
777 | # CONFIG_PATA_HPT366 is not set | ||
778 | # CONFIG_PATA_HPT37X is not set | ||
779 | # CONFIG_PATA_HPT3X2N is not set | ||
780 | # CONFIG_PATA_HPT3X3 is not set | ||
781 | # CONFIG_PATA_IT821X is not set | ||
782 | # CONFIG_PATA_IT8213 is not set | ||
783 | # CONFIG_PATA_JMICRON is not set | ||
784 | # CONFIG_PATA_TRIFLEX is not set | ||
785 | # CONFIG_PATA_MARVELL is not set | ||
786 | # CONFIG_PATA_MPIIX is not set | ||
787 | # CONFIG_PATA_OLDPIIX is not set | ||
788 | # CONFIG_PATA_NETCELL is not set | ||
789 | # CONFIG_PATA_NINJA32 is not set | ||
790 | # CONFIG_PATA_NS87410 is not set | ||
791 | # CONFIG_PATA_NS87415 is not set | ||
792 | # CONFIG_PATA_OPTI is not set | ||
793 | # CONFIG_PATA_OPTIDMA is not set | ||
794 | CONFIG_PATA_PCMCIA=y | ||
795 | # CONFIG_PATA_PDC_OLD is not set | ||
796 | # CONFIG_PATA_RADISYS is not set | ||
797 | # CONFIG_PATA_RZ1000 is not set | ||
798 | # CONFIG_PATA_SC1200 is not set | ||
799 | # CONFIG_PATA_SERVERWORKS is not set | ||
800 | # CONFIG_PATA_PDC2027X is not set | ||
801 | # CONFIG_PATA_SIL680 is not set | ||
802 | # CONFIG_PATA_SIS is not set | ||
803 | # CONFIG_PATA_VIA is not set | ||
804 | CONFIG_PATA_WINBOND=y | ||
805 | CONFIG_PATA_PLATFORM=y | ||
806 | # CONFIG_PATA_OF_PLATFORM is not set | ||
807 | CONFIG_PATA_SCC=y | ||
808 | CONFIG_MD=y | 767 | CONFIG_MD=y |
809 | CONFIG_BLK_DEV_MD=y | 768 | CONFIG_BLK_DEV_MD=y |
810 | CONFIG_MD_LINEAR=y | 769 | CONFIG_MD_LINEAR=y |
@@ -866,6 +825,7 @@ CONFIG_WINDFARM=y | |||
866 | CONFIG_WINDFARM_PM81=y | 825 | CONFIG_WINDFARM_PM81=y |
867 | CONFIG_WINDFARM_PM91=y | 826 | CONFIG_WINDFARM_PM91=y |
868 | CONFIG_WINDFARM_PM112=y | 827 | CONFIG_WINDFARM_PM112=y |
828 | CONFIG_WINDFARM_PM121=y | ||
869 | # CONFIG_PMAC_RACKMETER is not set | 829 | # CONFIG_PMAC_RACKMETER is not set |
870 | CONFIG_NETDEVICES=y | 830 | CONFIG_NETDEVICES=y |
871 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 831 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
@@ -911,7 +871,6 @@ CONFIG_IBM_NEW_EMAC_TAH=y | |||
911 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 871 | CONFIG_IBM_NEW_EMAC_EMAC4=y |
912 | CONFIG_NET_PCI=y | 872 | CONFIG_NET_PCI=y |
913 | CONFIG_PCNET32=y | 873 | CONFIG_PCNET32=y |
914 | # CONFIG_PCNET32_NAPI is not set | ||
915 | # CONFIG_AMD8111_ETH is not set | 874 | # CONFIG_AMD8111_ETH is not set |
916 | # CONFIG_ADAPTEC_STARFIRE is not set | 875 | # CONFIG_ADAPTEC_STARFIRE is not set |
917 | # CONFIG_B44 is not set | 876 | # CONFIG_B44 is not set |
@@ -947,7 +906,6 @@ CONFIG_E1000=y | |||
947 | # CONFIG_SIS190 is not set | 906 | # CONFIG_SIS190 is not set |
948 | # CONFIG_SKGE is not set | 907 | # CONFIG_SKGE is not set |
949 | # CONFIG_SKY2 is not set | 908 | # CONFIG_SKY2 is not set |
950 | # CONFIG_SK98LIN is not set | ||
951 | # CONFIG_VIA_VELOCITY is not set | 909 | # CONFIG_VIA_VELOCITY is not set |
952 | CONFIG_TIGON3=y | 910 | CONFIG_TIGON3=y |
953 | # CONFIG_BNX2 is not set | 911 | # CONFIG_BNX2 is not set |
@@ -969,6 +927,7 @@ CONFIG_PASEMI_MAC=y | |||
969 | # CONFIG_MLX4_CORE is not set | 927 | # CONFIG_MLX4_CORE is not set |
970 | # CONFIG_TEHUTI is not set | 928 | # CONFIG_TEHUTI is not set |
971 | # CONFIG_BNX2X is not set | 929 | # CONFIG_BNX2X is not set |
930 | # CONFIG_SFC is not set | ||
972 | CONFIG_TR=y | 931 | CONFIG_TR=y |
973 | CONFIG_IBMOL=y | 932 | CONFIG_IBMOL=y |
974 | # CONFIG_3C359 is not set | 933 | # CONFIG_3C359 is not set |
@@ -979,6 +938,7 @@ CONFIG_IBMOL=y | |||
979 | # | 938 | # |
980 | # CONFIG_WLAN_PRE80211 is not set | 939 | # CONFIG_WLAN_PRE80211 is not set |
981 | # CONFIG_WLAN_80211 is not set | 940 | # CONFIG_WLAN_80211 is not set |
941 | # CONFIG_IWLWIFI_LEDS is not set | ||
982 | 942 | ||
983 | # | 943 | # |
984 | # USB Network Adapters | 944 | # USB Network Adapters |
@@ -1083,6 +1043,7 @@ CONFIG_VT=y | |||
1083 | CONFIG_VT_CONSOLE=y | 1043 | CONFIG_VT_CONSOLE=y |
1084 | CONFIG_HW_CONSOLE=y | 1044 | CONFIG_HW_CONSOLE=y |
1085 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1045 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
1046 | CONFIG_DEVKMEM=y | ||
1086 | # CONFIG_SERIAL_NONSTANDARD is not set | 1047 | # CONFIG_SERIAL_NONSTANDARD is not set |
1087 | # CONFIG_NOZOMI is not set | 1048 | # CONFIG_NOZOMI is not set |
1088 | 1049 | ||
@@ -1121,8 +1082,6 @@ CONFIG_HVC_BEAT=y | |||
1121 | CONFIG_HVCS=m | 1082 | CONFIG_HVCS=m |
1122 | # CONFIG_IPMI_HANDLER is not set | 1083 | # CONFIG_IPMI_HANDLER is not set |
1123 | # CONFIG_HW_RANDOM is not set | 1084 | # CONFIG_HW_RANDOM is not set |
1124 | CONFIG_GEN_RTC=y | ||
1125 | # CONFIG_GEN_RTC_X is not set | ||
1126 | # CONFIG_R3964 is not set | 1085 | # CONFIG_R3964 is not set |
1127 | # CONFIG_APPLICOM is not set | 1086 | # CONFIG_APPLICOM is not set |
1128 | 1087 | ||
@@ -1141,13 +1100,7 @@ CONFIG_DEVPORT=y | |||
1141 | CONFIG_I2C=y | 1100 | CONFIG_I2C=y |
1142 | CONFIG_I2C_BOARDINFO=y | 1101 | CONFIG_I2C_BOARDINFO=y |
1143 | CONFIG_I2C_CHARDEV=y | 1102 | CONFIG_I2C_CHARDEV=y |
1144 | |||
1145 | # | ||
1146 | # I2C Algorithms | ||
1147 | # | ||
1148 | CONFIG_I2C_ALGOBIT=y | 1103 | CONFIG_I2C_ALGOBIT=y |
1149 | # CONFIG_I2C_ALGOPCF is not set | ||
1150 | # CONFIG_I2C_ALGOPCA is not set | ||
1151 | 1104 | ||
1152 | # | 1105 | # |
1153 | # I2C Hardware Bus support | 1106 | # I2C Hardware Bus support |
@@ -1177,6 +1130,7 @@ CONFIG_I2C_PASEMI=y | |||
1177 | # CONFIG_I2C_VIA is not set | 1130 | # CONFIG_I2C_VIA is not set |
1178 | # CONFIG_I2C_VIAPRO is not set | 1131 | # CONFIG_I2C_VIAPRO is not set |
1179 | # CONFIG_I2C_VOODOO3 is not set | 1132 | # CONFIG_I2C_VOODOO3 is not set |
1133 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1180 | 1134 | ||
1181 | # | 1135 | # |
1182 | # Miscellaneous I2C Chip support | 1136 | # Miscellaneous I2C Chip support |
@@ -1186,19 +1140,13 @@ CONFIG_I2C_PASEMI=y | |||
1186 | # CONFIG_SENSORS_PCF8574 is not set | 1140 | # CONFIG_SENSORS_PCF8574 is not set |
1187 | # CONFIG_PCF8575 is not set | 1141 | # CONFIG_PCF8575 is not set |
1188 | # CONFIG_SENSORS_PCF8591 is not set | 1142 | # CONFIG_SENSORS_PCF8591 is not set |
1189 | # CONFIG_TPS65010 is not set | ||
1190 | # CONFIG_SENSORS_MAX6875 is not set | 1143 | # CONFIG_SENSORS_MAX6875 is not set |
1191 | # CONFIG_SENSORS_TSL2550 is not set | 1144 | # CONFIG_SENSORS_TSL2550 is not set |
1192 | # CONFIG_I2C_DEBUG_CORE is not set | 1145 | # CONFIG_I2C_DEBUG_CORE is not set |
1193 | # CONFIG_I2C_DEBUG_ALGO is not set | 1146 | # CONFIG_I2C_DEBUG_ALGO is not set |
1194 | # CONFIG_I2C_DEBUG_BUS is not set | 1147 | # CONFIG_I2C_DEBUG_BUS is not set |
1195 | # CONFIG_I2C_DEBUG_CHIP is not set | 1148 | # CONFIG_I2C_DEBUG_CHIP is not set |
1196 | |||
1197 | # | ||
1198 | # SPI support | ||
1199 | # | ||
1200 | # CONFIG_SPI is not set | 1149 | # CONFIG_SPI is not set |
1201 | # CONFIG_SPI_MASTER is not set | ||
1202 | # CONFIG_W1 is not set | 1150 | # CONFIG_W1 is not set |
1203 | # CONFIG_POWER_SUPPLY is not set | 1151 | # CONFIG_POWER_SUPPLY is not set |
1204 | # CONFIG_HWMON is not set | 1152 | # CONFIG_HWMON is not set |
@@ -1215,12 +1163,22 @@ CONFIG_SSB_POSSIBLE=y | |||
1215 | # Multifunction device drivers | 1163 | # Multifunction device drivers |
1216 | # | 1164 | # |
1217 | # CONFIG_MFD_SM501 is not set | 1165 | # CONFIG_MFD_SM501 is not set |
1166 | # CONFIG_HTC_PASIC3 is not set | ||
1218 | 1167 | ||
1219 | # | 1168 | # |
1220 | # Multimedia devices | 1169 | # Multimedia devices |
1221 | # | 1170 | # |
1171 | |||
1172 | # | ||
1173 | # Multimedia core support | ||
1174 | # | ||
1222 | # CONFIG_VIDEO_DEV is not set | 1175 | # CONFIG_VIDEO_DEV is not set |
1223 | # CONFIG_DVB_CORE is not set | 1176 | # CONFIG_DVB_CORE is not set |
1177 | # CONFIG_VIDEO_MEDIA is not set | ||
1178 | |||
1179 | # | ||
1180 | # Multimedia drivers | ||
1181 | # | ||
1224 | # CONFIG_DAB is not set | 1182 | # CONFIG_DAB is not set |
1225 | 1183 | ||
1226 | # | 1184 | # |
@@ -1240,8 +1198,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1240 | # CONFIG_FB_SYS_FILLRECT is not set | 1198 | # CONFIG_FB_SYS_FILLRECT is not set |
1241 | # CONFIG_FB_SYS_COPYAREA is not set | 1199 | # CONFIG_FB_SYS_COPYAREA is not set |
1242 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1200 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1201 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1243 | # CONFIG_FB_SYS_FOPS is not set | 1202 | # CONFIG_FB_SYS_FOPS is not set |
1244 | CONFIG_FB_DEFERRED_IO=y | ||
1245 | # CONFIG_FB_SVGALIB is not set | 1203 | # CONFIG_FB_SVGALIB is not set |
1246 | CONFIG_FB_MACMODES=y | 1204 | CONFIG_FB_MACMODES=y |
1247 | CONFIG_FB_BACKLIGHT=y | 1205 | CONFIG_FB_BACKLIGHT=y |
@@ -1363,6 +1321,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1363 | # CONFIG_SND_AU8810 is not set | 1321 | # CONFIG_SND_AU8810 is not set |
1364 | # CONFIG_SND_AU8820 is not set | 1322 | # CONFIG_SND_AU8820 is not set |
1365 | # CONFIG_SND_AU8830 is not set | 1323 | # CONFIG_SND_AU8830 is not set |
1324 | # CONFIG_SND_AW2 is not set | ||
1366 | # CONFIG_SND_AZT3328 is not set | 1325 | # CONFIG_SND_AZT3328 is not set |
1367 | # CONFIG_SND_BT87X is not set | 1326 | # CONFIG_SND_BT87X is not set |
1368 | # CONFIG_SND_CA0106 is not set | 1327 | # CONFIG_SND_CA0106 is not set |
@@ -1455,11 +1414,11 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m | |||
1455 | # CONFIG_SND_SOC is not set | 1414 | # CONFIG_SND_SOC is not set |
1456 | 1415 | ||
1457 | # | 1416 | # |
1458 | # SoC Audio support for SuperH | 1417 | # ALSA SoC audio for Freescale SOCs |
1459 | # | 1418 | # |
1460 | 1419 | ||
1461 | # | 1420 | # |
1462 | # ALSA SoC audio for Freescale SOCs | 1421 | # SoC Audio for the Texas Instruments OMAP |
1463 | # | 1422 | # |
1464 | 1423 | ||
1465 | # | 1424 | # |
@@ -1497,12 +1456,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1497 | # | 1456 | # |
1498 | # USB Host Controller Drivers | 1457 | # USB Host Controller Drivers |
1499 | # | 1458 | # |
1459 | # CONFIG_USB_C67X00_HCD is not set | ||
1500 | CONFIG_USB_EHCI_HCD=y | 1460 | CONFIG_USB_EHCI_HCD=y |
1501 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1461 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1502 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1462 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
1503 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | 1463 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y |
1504 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1464 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1505 | # CONFIG_USB_ISP116X_HCD is not set | 1465 | # CONFIG_USB_ISP116X_HCD is not set |
1466 | # CONFIG_USB_ISP1760_HCD is not set | ||
1506 | CONFIG_USB_OHCI_HCD=y | 1467 | CONFIG_USB_OHCI_HCD=y |
1507 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1468 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1508 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1469 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1538,6 +1499,7 @@ CONFIG_USB_STORAGE=m | |||
1538 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1499 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1539 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1500 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1540 | # CONFIG_USB_STORAGE_KARMA is not set | 1501 | # CONFIG_USB_STORAGE_KARMA is not set |
1502 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1541 | # CONFIG_USB_LIBUSUAL is not set | 1503 | # CONFIG_USB_LIBUSUAL is not set |
1542 | 1504 | ||
1543 | # | 1505 | # |
@@ -1579,6 +1541,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
1579 | # CONFIG_MMC is not set | 1541 | # CONFIG_MMC is not set |
1580 | # CONFIG_MEMSTICK is not set | 1542 | # CONFIG_MEMSTICK is not set |
1581 | # CONFIG_NEW_LEDS is not set | 1543 | # CONFIG_NEW_LEDS is not set |
1544 | # CONFIG_ACCESSIBILITY is not set | ||
1582 | CONFIG_INFINIBAND=m | 1545 | CONFIG_INFINIBAND=m |
1583 | # CONFIG_INFINIBAND_USER_MAD is not set | 1546 | # CONFIG_INFINIBAND_USER_MAD is not set |
1584 | # CONFIG_INFINIBAND_USER_ACCESS is not set | 1547 | # CONFIG_INFINIBAND_USER_ACCESS is not set |
@@ -1607,10 +1570,6 @@ CONFIG_EDAC_PASEMI=y | |||
1607 | # CONFIG_EDAC_CELL is not set | 1570 | # CONFIG_EDAC_CELL is not set |
1608 | CONFIG_RTC_LIB=y | 1571 | CONFIG_RTC_LIB=y |
1609 | CONFIG_RTC_CLASS=y | 1572 | CONFIG_RTC_CLASS=y |
1610 | |||
1611 | # | ||
1612 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
1613 | # | ||
1614 | CONFIG_RTC_HCTOSYS=y | 1573 | CONFIG_RTC_HCTOSYS=y |
1615 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1574 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
1616 | # CONFIG_RTC_DEBUG is not set | 1575 | # CONFIG_RTC_DEBUG is not set |
@@ -1659,10 +1618,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
1659 | # on-CPU RTC drivers | 1618 | # on-CPU RTC drivers |
1660 | # | 1619 | # |
1661 | # CONFIG_DMADEVICES is not set | 1620 | # CONFIG_DMADEVICES is not set |
1662 | |||
1663 | # | ||
1664 | # Userspace I/O | ||
1665 | # | ||
1666 | # CONFIG_UIO is not set | 1621 | # CONFIG_UIO is not set |
1667 | 1622 | ||
1668 | # | 1623 | # |
@@ -1696,9 +1651,9 @@ CONFIG_JFS_SECURITY=y | |||
1696 | CONFIG_FS_POSIX_ACL=y | 1651 | CONFIG_FS_POSIX_ACL=y |
1697 | CONFIG_XFS_FS=m | 1652 | CONFIG_XFS_FS=m |
1698 | # CONFIG_XFS_QUOTA is not set | 1653 | # CONFIG_XFS_QUOTA is not set |
1699 | CONFIG_XFS_SECURITY=y | ||
1700 | CONFIG_XFS_POSIX_ACL=y | 1654 | CONFIG_XFS_POSIX_ACL=y |
1701 | # CONFIG_XFS_RT is not set | 1655 | # CONFIG_XFS_RT is not set |
1656 | # CONFIG_XFS_DEBUG is not set | ||
1702 | # CONFIG_GFS2_FS is not set | 1657 | # CONFIG_GFS2_FS is not set |
1703 | # CONFIG_OCFS2_FS is not set | 1658 | # CONFIG_OCFS2_FS is not set |
1704 | CONFIG_DNOTIFY=y | 1659 | CONFIG_DNOTIFY=y |
@@ -1764,13 +1719,11 @@ CONFIG_NFS_FS=y | |||
1764 | CONFIG_NFS_V3=y | 1719 | CONFIG_NFS_V3=y |
1765 | CONFIG_NFS_V3_ACL=y | 1720 | CONFIG_NFS_V3_ACL=y |
1766 | CONFIG_NFS_V4=y | 1721 | CONFIG_NFS_V4=y |
1767 | # CONFIG_NFS_DIRECTIO is not set | ||
1768 | CONFIG_NFSD=m | 1722 | CONFIG_NFSD=m |
1769 | CONFIG_NFSD_V2_ACL=y | 1723 | CONFIG_NFSD_V2_ACL=y |
1770 | CONFIG_NFSD_V3=y | 1724 | CONFIG_NFSD_V3=y |
1771 | CONFIG_NFSD_V3_ACL=y | 1725 | CONFIG_NFSD_V3_ACL=y |
1772 | CONFIG_NFSD_V4=y | 1726 | CONFIG_NFSD_V4=y |
1773 | CONFIG_NFSD_TCP=y | ||
1774 | CONFIG_ROOT_NFS=y | 1727 | CONFIG_ROOT_NFS=y |
1775 | CONFIG_LOCKD=y | 1728 | CONFIG_LOCKD=y |
1776 | CONFIG_LOCKD_V4=y | 1729 | CONFIG_LOCKD_V4=y |
@@ -1862,9 +1815,10 @@ CONFIG_NLS_UTF8=m | |||
1862 | # Library routines | 1815 | # Library routines |
1863 | # | 1816 | # |
1864 | CONFIG_BITREVERSE=y | 1817 | CONFIG_BITREVERSE=y |
1818 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1865 | CONFIG_CRC_CCITT=m | 1819 | CONFIG_CRC_CCITT=m |
1866 | # CONFIG_CRC16 is not set | 1820 | # CONFIG_CRC16 is not set |
1867 | # CONFIG_CRC_ITU_T is not set | 1821 | CONFIG_CRC_ITU_T=m |
1868 | CONFIG_CRC32=y | 1822 | CONFIG_CRC32=y |
1869 | # CONFIG_CRC7 is not set | 1823 | # CONFIG_CRC7 is not set |
1870 | CONFIG_LIBCRC32C=m | 1824 | CONFIG_LIBCRC32C=m |
@@ -1888,6 +1842,7 @@ CONFIG_HAVE_LMB=y | |||
1888 | # CONFIG_PRINTK_TIME is not set | 1842 | # CONFIG_PRINTK_TIME is not set |
1889 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1843 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1890 | CONFIG_ENABLE_MUST_CHECK=y | 1844 | CONFIG_ENABLE_MUST_CHECK=y |
1845 | CONFIG_FRAME_WARN=2048 | ||
1891 | CONFIG_MAGIC_SYSRQ=y | 1846 | CONFIG_MAGIC_SYSRQ=y |
1892 | # CONFIG_UNUSED_SYMBOLS is not set | 1847 | # CONFIG_UNUSED_SYMBOLS is not set |
1893 | CONFIG_DEBUG_FS=y | 1848 | CONFIG_DEBUG_FS=y |
@@ -1898,18 +1853,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1898 | CONFIG_SCHED_DEBUG=y | 1853 | CONFIG_SCHED_DEBUG=y |
1899 | # CONFIG_SCHEDSTATS is not set | 1854 | # CONFIG_SCHEDSTATS is not set |
1900 | # CONFIG_TIMER_STATS is not set | 1855 | # CONFIG_TIMER_STATS is not set |
1856 | # CONFIG_DEBUG_OBJECTS is not set | ||
1901 | # CONFIG_SLUB_DEBUG_ON is not set | 1857 | # CONFIG_SLUB_DEBUG_ON is not set |
1902 | # CONFIG_SLUB_STATS is not set | 1858 | # CONFIG_SLUB_STATS is not set |
1903 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1859 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1904 | # CONFIG_RT_MUTEX_TESTER is not set | 1860 | # CONFIG_RT_MUTEX_TESTER is not set |
1905 | # CONFIG_DEBUG_SPINLOCK is not set | 1861 | # CONFIG_DEBUG_SPINLOCK is not set |
1906 | CONFIG_DEBUG_MUTEXES=y | 1862 | CONFIG_DEBUG_MUTEXES=y |
1863 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1864 | # CONFIG_PROVE_LOCKING is not set | ||
1865 | # CONFIG_LOCK_STAT is not set | ||
1907 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1866 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1908 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1867 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1909 | # CONFIG_DEBUG_KOBJECT is not set | 1868 | # CONFIG_DEBUG_KOBJECT is not set |
1910 | CONFIG_DEBUG_BUGVERBOSE=y | 1869 | CONFIG_DEBUG_BUGVERBOSE=y |
1911 | # CONFIG_DEBUG_INFO is not set | 1870 | # CONFIG_DEBUG_INFO is not set |
1912 | # CONFIG_DEBUG_VM is not set | 1871 | # CONFIG_DEBUG_VM is not set |
1872 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1913 | # CONFIG_DEBUG_LIST is not set | 1873 | # CONFIG_DEBUG_LIST is not set |
1914 | # CONFIG_DEBUG_SG is not set | 1874 | # CONFIG_DEBUG_SG is not set |
1915 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1875 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1941,53 +1901,83 @@ CONFIG_ASYNC_CORE=y | |||
1941 | CONFIG_ASYNC_MEMCPY=y | 1901 | CONFIG_ASYNC_MEMCPY=y |
1942 | CONFIG_ASYNC_XOR=y | 1902 | CONFIG_ASYNC_XOR=y |
1943 | CONFIG_CRYPTO=y | 1903 | CONFIG_CRYPTO=y |
1904 | |||
1905 | # | ||
1906 | # Crypto core or helper | ||
1907 | # | ||
1944 | CONFIG_CRYPTO_ALGAPI=y | 1908 | CONFIG_CRYPTO_ALGAPI=y |
1945 | CONFIG_CRYPTO_AEAD=m | 1909 | CONFIG_CRYPTO_AEAD=m |
1946 | CONFIG_CRYPTO_BLKCIPHER=y | 1910 | CONFIG_CRYPTO_BLKCIPHER=y |
1947 | CONFIG_CRYPTO_SEQIV=m | ||
1948 | CONFIG_CRYPTO_HASH=y | 1911 | CONFIG_CRYPTO_HASH=y |
1949 | CONFIG_CRYPTO_MANAGER=y | 1912 | CONFIG_CRYPTO_MANAGER=y |
1913 | CONFIG_CRYPTO_GF128MUL=m | ||
1914 | CONFIG_CRYPTO_NULL=m | ||
1915 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1916 | CONFIG_CRYPTO_AUTHENC=m | ||
1917 | CONFIG_CRYPTO_TEST=m | ||
1918 | |||
1919 | # | ||
1920 | # Authenticated Encryption with Associated Data | ||
1921 | # | ||
1922 | CONFIG_CRYPTO_CCM=m | ||
1923 | CONFIG_CRYPTO_GCM=m | ||
1924 | CONFIG_CRYPTO_SEQIV=m | ||
1925 | |||
1926 | # | ||
1927 | # Block modes | ||
1928 | # | ||
1929 | CONFIG_CRYPTO_CBC=y | ||
1930 | CONFIG_CRYPTO_CTR=m | ||
1931 | # CONFIG_CRYPTO_CTS is not set | ||
1932 | CONFIG_CRYPTO_ECB=m | ||
1933 | # CONFIG_CRYPTO_LRW is not set | ||
1934 | CONFIG_CRYPTO_PCBC=m | ||
1935 | # CONFIG_CRYPTO_XTS is not set | ||
1936 | |||
1937 | # | ||
1938 | # Hash modes | ||
1939 | # | ||
1950 | CONFIG_CRYPTO_HMAC=y | 1940 | CONFIG_CRYPTO_HMAC=y |
1951 | # CONFIG_CRYPTO_XCBC is not set | 1941 | # CONFIG_CRYPTO_XCBC is not set |
1952 | CONFIG_CRYPTO_NULL=m | 1942 | |
1943 | # | ||
1944 | # Digest | ||
1945 | # | ||
1946 | CONFIG_CRYPTO_CRC32C=m | ||
1953 | CONFIG_CRYPTO_MD4=m | 1947 | CONFIG_CRYPTO_MD4=m |
1954 | CONFIG_CRYPTO_MD5=y | 1948 | CONFIG_CRYPTO_MD5=y |
1949 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1955 | CONFIG_CRYPTO_SHA1=m | 1950 | CONFIG_CRYPTO_SHA1=m |
1956 | CONFIG_CRYPTO_SHA256=m | 1951 | CONFIG_CRYPTO_SHA256=m |
1957 | CONFIG_CRYPTO_SHA512=m | 1952 | CONFIG_CRYPTO_SHA512=m |
1958 | CONFIG_CRYPTO_WP512=m | ||
1959 | CONFIG_CRYPTO_TGR192=m | 1953 | CONFIG_CRYPTO_TGR192=m |
1960 | CONFIG_CRYPTO_GF128MUL=m | 1954 | CONFIG_CRYPTO_WP512=m |
1961 | CONFIG_CRYPTO_ECB=m | 1955 | |
1962 | CONFIG_CRYPTO_CBC=y | 1956 | # |
1963 | CONFIG_CRYPTO_PCBC=m | 1957 | # Ciphers |
1964 | # CONFIG_CRYPTO_LRW is not set | 1958 | # |
1965 | # CONFIG_CRYPTO_XTS is not set | ||
1966 | CONFIG_CRYPTO_CTR=m | ||
1967 | CONFIG_CRYPTO_GCM=m | ||
1968 | CONFIG_CRYPTO_CCM=m | ||
1969 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1970 | CONFIG_CRYPTO_DES=y | ||
1971 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1972 | CONFIG_CRYPTO_BLOWFISH=m | ||
1973 | CONFIG_CRYPTO_TWOFISH=m | ||
1974 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1975 | CONFIG_CRYPTO_SERPENT=m | ||
1976 | CONFIG_CRYPTO_AES=m | 1959 | CONFIG_CRYPTO_AES=m |
1960 | CONFIG_CRYPTO_ANUBIS=m | ||
1961 | CONFIG_CRYPTO_ARC4=m | ||
1962 | CONFIG_CRYPTO_BLOWFISH=m | ||
1963 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1977 | CONFIG_CRYPTO_CAST5=m | 1964 | CONFIG_CRYPTO_CAST5=m |
1978 | CONFIG_CRYPTO_CAST6=m | 1965 | CONFIG_CRYPTO_CAST6=m |
1979 | CONFIG_CRYPTO_TEA=m | 1966 | CONFIG_CRYPTO_DES=y |
1980 | CONFIG_CRYPTO_ARC4=m | 1967 | # CONFIG_CRYPTO_FCRYPT is not set |
1981 | CONFIG_CRYPTO_KHAZAD=m | 1968 | CONFIG_CRYPTO_KHAZAD=m |
1982 | CONFIG_CRYPTO_ANUBIS=m | ||
1983 | # CONFIG_CRYPTO_SEED is not set | ||
1984 | CONFIG_CRYPTO_SALSA20=m | 1969 | CONFIG_CRYPTO_SALSA20=m |
1970 | # CONFIG_CRYPTO_SEED is not set | ||
1971 | CONFIG_CRYPTO_SERPENT=m | ||
1972 | CONFIG_CRYPTO_TEA=m | ||
1973 | CONFIG_CRYPTO_TWOFISH=m | ||
1974 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1975 | |||
1976 | # | ||
1977 | # Compression | ||
1978 | # | ||
1985 | CONFIG_CRYPTO_DEFLATE=m | 1979 | CONFIG_CRYPTO_DEFLATE=m |
1986 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1987 | CONFIG_CRYPTO_CRC32C=m | ||
1988 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1989 | CONFIG_CRYPTO_TEST=m | ||
1990 | CONFIG_CRYPTO_AUTHENC=m | ||
1991 | CONFIG_CRYPTO_LZO=m | 1980 | CONFIG_CRYPTO_LZO=m |
1992 | # CONFIG_CRYPTO_HW is not set | 1981 | # CONFIG_CRYPTO_HW is not set |
1993 | # CONFIG_PPC_CLOCK is not set | 1982 | # CONFIG_PPC_CLOCK is not set |
1983 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 3e2593c60b12..adaa05fb0478 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:56:28 2008 | 4 | # Tue May 20 20:03:28 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -81,6 +84,7 @@ CONFIG_LOG_BUF_SHIFT=17 | |||
81 | CONFIG_CGROUPS=y | 84 | CONFIG_CGROUPS=y |
82 | # CONFIG_CGROUP_DEBUG is not set | 85 | # CONFIG_CGROUP_DEBUG is not set |
83 | CONFIG_CGROUP_NS=y | 86 | CONFIG_CGROUP_NS=y |
87 | CONFIG_CGROUP_DEVICE=y | ||
84 | CONFIG_CPUSETS=y | 88 | CONFIG_CPUSETS=y |
85 | # CONFIG_GROUP_SCHED is not set | 89 | # CONFIG_GROUP_SCHED is not set |
86 | CONFIG_CGROUP_CPUACCT=y | 90 | CONFIG_CGROUP_CPUACCT=y |
@@ -100,6 +104,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
100 | CONFIG_SYSCTL=y | 104 | CONFIG_SYSCTL=y |
101 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
102 | CONFIG_SYSCTL_SYSCALL=y | 106 | CONFIG_SYSCTL_SYSCALL=y |
107 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
103 | CONFIG_KALLSYMS=y | 108 | CONFIG_KALLSYMS=y |
104 | CONFIG_KALLSYMS_ALL=y | 109 | CONFIG_KALLSYMS_ALL=y |
105 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -107,6 +112,7 @@ CONFIG_HOTPLUG=y | |||
107 | CONFIG_PRINTK=y | 112 | CONFIG_PRINTK=y |
108 | CONFIG_BUG=y | 113 | CONFIG_BUG=y |
109 | CONFIG_ELF_CORE=y | 114 | CONFIG_ELF_CORE=y |
115 | CONFIG_PCSPKR_PLATFORM=y | ||
110 | # CONFIG_COMPAT_BRK is not set | 116 | # CONFIG_COMPAT_BRK is not set |
111 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
112 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
@@ -129,12 +135,14 @@ CONFIG_KPROBES=y | |||
129 | CONFIG_KRETPROBES=y | 135 | CONFIG_KRETPROBES=y |
130 | CONFIG_HAVE_KPROBES=y | 136 | CONFIG_HAVE_KPROBES=y |
131 | CONFIG_HAVE_KRETPROBES=y | 137 | CONFIG_HAVE_KRETPROBES=y |
138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
132 | CONFIG_PROC_PAGE_MONITOR=y | 139 | CONFIG_PROC_PAGE_MONITOR=y |
133 | CONFIG_SLABINFO=y | 140 | CONFIG_SLABINFO=y |
134 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
135 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
136 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
137 | CONFIG_MODULES=y | 144 | CONFIG_MODULES=y |
145 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
138 | CONFIG_MODULE_UNLOAD=y | 146 | CONFIG_MODULE_UNLOAD=y |
139 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 147 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
140 | CONFIG_MODVERSIONS=y | 148 | CONFIG_MODVERSIONS=y |
@@ -178,11 +186,11 @@ CONFIG_LPARCFG=y | |||
178 | # CONFIG_PPC_PMAC is not set | 186 | # CONFIG_PPC_PMAC is not set |
179 | # CONFIG_PPC_MAPLE is not set | 187 | # CONFIG_PPC_MAPLE is not set |
180 | # CONFIG_PPC_PASEMI is not set | 188 | # CONFIG_PPC_PASEMI is not set |
181 | # CONFIG_PPC_CELLEB is not set | ||
182 | # CONFIG_PPC_PS3 is not set | 189 | # CONFIG_PPC_PS3 is not set |
183 | # CONFIG_PPC_CELL is not set | 190 | # CONFIG_PPC_CELL is not set |
184 | # CONFIG_PPC_CELL_NATIVE is not set | 191 | # CONFIG_PPC_CELL_NATIVE is not set |
185 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 192 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
193 | # CONFIG_PPC_CELLEB is not set | ||
186 | # CONFIG_PQ2ADS is not set | 194 | # CONFIG_PQ2ADS is not set |
187 | CONFIG_PPC_NATIVE=y | 195 | CONFIG_PPC_NATIVE=y |
188 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 196 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
@@ -225,7 +233,6 @@ CONFIG_PREEMPT_NONE=y | |||
225 | CONFIG_BINFMT_ELF=y | 233 | CONFIG_BINFMT_ELF=y |
226 | CONFIG_COMPAT_BINFMT_ELF=y | 234 | CONFIG_COMPAT_BINFMT_ELF=y |
227 | CONFIG_BINFMT_MISC=m | 235 | CONFIG_BINFMT_MISC=m |
228 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
229 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 236 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
230 | CONFIG_IOMMU_VMERGE=y | 237 | CONFIG_IOMMU_VMERGE=y |
231 | CONFIG_IOMMU_HELPER=y | 238 | CONFIG_IOMMU_HELPER=y |
@@ -255,6 +262,7 @@ CONFIG_SPARSEMEM_EXTREME=y | |||
255 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 262 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
256 | CONFIG_SPARSEMEM_VMEMMAP=y | 263 | CONFIG_SPARSEMEM_VMEMMAP=y |
257 | # CONFIG_MEMORY_HOTPLUG is not set | 264 | # CONFIG_MEMORY_HOTPLUG is not set |
265 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
258 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 266 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
259 | CONFIG_MIGRATION=y | 267 | CONFIG_MIGRATION=y |
260 | CONFIG_RESOURCES_64BIT=y | 268 | CONFIG_RESOURCES_64BIT=y |
@@ -263,6 +271,7 @@ CONFIG_BOUNCE=y | |||
263 | CONFIG_NODES_SPAN_OTHER_NODES=y | 271 | CONFIG_NODES_SPAN_OTHER_NODES=y |
264 | # CONFIG_PPC_HAS_HASH_64K is not set | 272 | # CONFIG_PPC_HAS_HASH_64K is not set |
265 | # CONFIG_PPC_64K_PAGES is not set | 273 | # CONFIG_PPC_64K_PAGES is not set |
274 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
266 | CONFIG_SCHED_SMT=y | 275 | CONFIG_SCHED_SMT=y |
267 | CONFIG_PROC_DEVICETREE=y | 276 | CONFIG_PROC_DEVICETREE=y |
268 | # CONFIG_CMDLINE_BOOL is not set | 277 | # CONFIG_CMDLINE_BOOL is not set |
@@ -291,7 +300,10 @@ CONFIG_HOTPLUG_PCI=m | |||
291 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 300 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
292 | CONFIG_HOTPLUG_PCI_RPA=m | 301 | CONFIG_HOTPLUG_PCI_RPA=m |
293 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | 302 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m |
303 | # CONFIG_HAS_RAPIDIO is not set | ||
304 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
294 | CONFIG_KERNEL_START=0xc000000000000000 | 305 | CONFIG_KERNEL_START=0xc000000000000000 |
306 | CONFIG_PHYSICAL_START=0x00000000 | ||
295 | 307 | ||
296 | # | 308 | # |
297 | # Networking | 309 | # Networking |
@@ -338,8 +350,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
338 | # CONFIG_TCP_MD5SIG is not set | 350 | # CONFIG_TCP_MD5SIG is not set |
339 | # CONFIG_IP_VS is not set | 351 | # CONFIG_IP_VS is not set |
340 | # CONFIG_IPV6 is not set | 352 | # CONFIG_IPV6 is not set |
341 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
342 | # CONFIG_INET6_TUNNEL is not set | ||
343 | # CONFIG_NETWORK_SECMARK is not set | 353 | # CONFIG_NETWORK_SECMARK is not set |
344 | CONFIG_NETFILTER=y | 354 | CONFIG_NETFILTER=y |
345 | # CONFIG_NETFILTER_DEBUG is not set | 355 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -355,6 +365,7 @@ CONFIG_NF_CONNTRACK=m | |||
355 | CONFIG_NF_CT_ACCT=y | 365 | CONFIG_NF_CT_ACCT=y |
356 | CONFIG_NF_CONNTRACK_MARK=y | 366 | CONFIG_NF_CONNTRACK_MARK=y |
357 | CONFIG_NF_CONNTRACK_EVENTS=y | 367 | CONFIG_NF_CONNTRACK_EVENTS=y |
368 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
358 | # CONFIG_NF_CT_PROTO_SCTP is not set | 369 | # CONFIG_NF_CT_PROTO_SCTP is not set |
359 | CONFIG_NF_CT_PROTO_UDPLITE=m | 370 | CONFIG_NF_CT_PROTO_UDPLITE=m |
360 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 371 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
@@ -426,6 +437,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m | |||
426 | CONFIG_IP_NF_TARGET_REDIRECT=m | 437 | CONFIG_IP_NF_TARGET_REDIRECT=m |
427 | CONFIG_IP_NF_TARGET_NETMAP=m | 438 | CONFIG_IP_NF_TARGET_NETMAP=m |
428 | CONFIG_NF_NAT_SNMP_BASIC=m | 439 | CONFIG_NF_NAT_SNMP_BASIC=m |
440 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
429 | CONFIG_NF_NAT_FTP=m | 441 | CONFIG_NF_NAT_FTP=m |
430 | CONFIG_NF_NAT_IRC=m | 442 | CONFIG_NF_NAT_IRC=m |
431 | CONFIG_NF_NAT_TFTP=m | 443 | CONFIG_NF_NAT_TFTP=m |
@@ -492,6 +504,7 @@ CONFIG_FW_LOADER=y | |||
492 | # CONFIG_CONNECTOR is not set | 504 | # CONFIG_CONNECTOR is not set |
493 | # CONFIG_MTD is not set | 505 | # CONFIG_MTD is not set |
494 | CONFIG_OF_DEVICE=y | 506 | CONFIG_OF_DEVICE=y |
507 | CONFIG_OF_I2C=y | ||
495 | CONFIG_PARPORT=m | 508 | CONFIG_PARPORT=m |
496 | CONFIG_PARPORT_PC=m | 509 | CONFIG_PARPORT_PC=m |
497 | # CONFIG_PARPORT_SERIAL is not set | 510 | # CONFIG_PARPORT_SERIAL is not set |
@@ -545,7 +558,6 @@ CONFIG_IDE_PROC_FS=y | |||
545 | # | 558 | # |
546 | # IDE chipset support/bugfixes | 559 | # IDE chipset support/bugfixes |
547 | # | 560 | # |
548 | CONFIG_IDE_GENERIC=y | ||
549 | # CONFIG_BLK_DEV_PLATFORM is not set | 561 | # CONFIG_BLK_DEV_PLATFORM is not set |
550 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 562 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
551 | 563 | ||
@@ -584,7 +596,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
584 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 596 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
585 | # CONFIG_BLK_DEV_TC86C001 is not set | 597 | # CONFIG_BLK_DEV_TC86C001 is not set |
586 | CONFIG_BLK_DEV_IDEDMA=y | 598 | CONFIG_BLK_DEV_IDEDMA=y |
587 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 599 | # CONFIG_BLK_DEV_HD_ONLY is not set |
588 | # CONFIG_BLK_DEV_HD is not set | 600 | # CONFIG_BLK_DEV_HD is not set |
589 | 601 | ||
590 | # | 602 | # |
@@ -671,61 +683,10 @@ CONFIG_SCSI_LPFC=m | |||
671 | # CONFIG_SCSI_SRP is not set | 683 | # CONFIG_SCSI_SRP is not set |
672 | CONFIG_ATA=y | 684 | CONFIG_ATA=y |
673 | # CONFIG_ATA_NONSTANDARD is not set | 685 | # CONFIG_ATA_NONSTANDARD is not set |
686 | CONFIG_SATA_PMP=y | ||
674 | # CONFIG_SATA_AHCI is not set | 687 | # CONFIG_SATA_AHCI is not set |
675 | # CONFIG_SATA_SVW is not set | ||
676 | # CONFIG_ATA_PIIX is not set | ||
677 | # CONFIG_SATA_MV is not set | ||
678 | # CONFIG_SATA_NV is not set | ||
679 | # CONFIG_PDC_ADMA is not set | ||
680 | # CONFIG_SATA_QSTOR is not set | ||
681 | # CONFIG_SATA_PROMISE is not set | ||
682 | # CONFIG_SATA_SX4 is not set | ||
683 | # CONFIG_SATA_SIL is not set | ||
684 | # CONFIG_SATA_SIL24 is not set | 688 | # CONFIG_SATA_SIL24 is not set |
685 | # CONFIG_SATA_SIS is not set | 689 | # CONFIG_ATA_SFF is not set |
686 | # CONFIG_SATA_ULI is not set | ||
687 | # CONFIG_SATA_VIA is not set | ||
688 | # CONFIG_SATA_VITESSE is not set | ||
689 | # CONFIG_SATA_INIC162X is not set | ||
690 | # CONFIG_PATA_ALI is not set | ||
691 | # CONFIG_PATA_AMD is not set | ||
692 | # CONFIG_PATA_ARTOP is not set | ||
693 | # CONFIG_PATA_ATIIXP is not set | ||
694 | # CONFIG_PATA_CMD640_PCI is not set | ||
695 | # CONFIG_PATA_CMD64X is not set | ||
696 | # CONFIG_PATA_CS5520 is not set | ||
697 | # CONFIG_PATA_CS5530 is not set | ||
698 | # CONFIG_PATA_CYPRESS is not set | ||
699 | # CONFIG_PATA_EFAR is not set | ||
700 | # CONFIG_ATA_GENERIC is not set | ||
701 | # CONFIG_PATA_HPT366 is not set | ||
702 | # CONFIG_PATA_HPT37X is not set | ||
703 | # CONFIG_PATA_HPT3X2N is not set | ||
704 | # CONFIG_PATA_HPT3X3 is not set | ||
705 | # CONFIG_PATA_IT821X is not set | ||
706 | # CONFIG_PATA_IT8213 is not set | ||
707 | # CONFIG_PATA_JMICRON is not set | ||
708 | # CONFIG_PATA_TRIFLEX is not set | ||
709 | # CONFIG_PATA_MARVELL is not set | ||
710 | # CONFIG_PATA_MPIIX is not set | ||
711 | # CONFIG_PATA_OLDPIIX is not set | ||
712 | # CONFIG_PATA_NETCELL is not set | ||
713 | # CONFIG_PATA_NINJA32 is not set | ||
714 | # CONFIG_PATA_NS87410 is not set | ||
715 | # CONFIG_PATA_NS87415 is not set | ||
716 | # CONFIG_PATA_OPTI is not set | ||
717 | # CONFIG_PATA_OPTIDMA is not set | ||
718 | # CONFIG_PATA_PDC_OLD is not set | ||
719 | # CONFIG_PATA_RADISYS is not set | ||
720 | # CONFIG_PATA_RZ1000 is not set | ||
721 | # CONFIG_PATA_SC1200 is not set | ||
722 | # CONFIG_PATA_SERVERWORKS is not set | ||
723 | # CONFIG_PATA_PDC2027X is not set | ||
724 | # CONFIG_PATA_SIL680 is not set | ||
725 | # CONFIG_PATA_SIS is not set | ||
726 | # CONFIG_PATA_VIA is not set | ||
727 | CONFIG_PATA_WINBOND=y | ||
728 | # CONFIG_PATA_PLATFORM is not set | ||
729 | CONFIG_MD=y | 690 | CONFIG_MD=y |
730 | CONFIG_BLK_DEV_MD=y | 691 | CONFIG_BLK_DEV_MD=y |
731 | CONFIG_MD_LINEAR=y | 692 | CONFIG_MD_LINEAR=y |
@@ -783,7 +744,6 @@ CONFIG_IBMVETH=y | |||
783 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 744 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
784 | CONFIG_NET_PCI=y | 745 | CONFIG_NET_PCI=y |
785 | CONFIG_PCNET32=y | 746 | CONFIG_PCNET32=y |
786 | # CONFIG_PCNET32_NAPI is not set | ||
787 | # CONFIG_AMD8111_ETH is not set | 747 | # CONFIG_AMD8111_ETH is not set |
788 | # CONFIG_ADAPTEC_STARFIRE is not set | 748 | # CONFIG_ADAPTEC_STARFIRE is not set |
789 | # CONFIG_B44 is not set | 749 | # CONFIG_B44 is not set |
@@ -820,7 +780,6 @@ CONFIG_E1000=y | |||
820 | # CONFIG_SIS190 is not set | 780 | # CONFIG_SIS190 is not set |
821 | # CONFIG_SKGE is not set | 781 | # CONFIG_SKGE is not set |
822 | # CONFIG_SKY2 is not set | 782 | # CONFIG_SKY2 is not set |
823 | # CONFIG_SK98LIN is not set | ||
824 | # CONFIG_VIA_VELOCITY is not set | 783 | # CONFIG_VIA_VELOCITY is not set |
825 | CONFIG_TIGON3=y | 784 | CONFIG_TIGON3=y |
826 | # CONFIG_BNX2 is not set | 785 | # CONFIG_BNX2 is not set |
@@ -829,7 +788,6 @@ CONFIG_TIGON3=y | |||
829 | CONFIG_NETDEV_10000=y | 788 | CONFIG_NETDEV_10000=y |
830 | # CONFIG_CHELSIO_T1 is not set | 789 | # CONFIG_CHELSIO_T1 is not set |
831 | # CONFIG_CHELSIO_T3 is not set | 790 | # CONFIG_CHELSIO_T3 is not set |
832 | CONFIG_EHEA=m | ||
833 | # CONFIG_IXGBE is not set | 791 | # CONFIG_IXGBE is not set |
834 | CONFIG_IXGB=m | 792 | CONFIG_IXGB=m |
835 | # CONFIG_IXGB_NAPI is not set | 793 | # CONFIG_IXGB_NAPI is not set |
@@ -838,10 +796,10 @@ CONFIG_S2IO=m | |||
838 | # CONFIG_MYRI10GE is not set | 796 | # CONFIG_MYRI10GE is not set |
839 | # CONFIG_NETXEN_NIC is not set | 797 | # CONFIG_NETXEN_NIC is not set |
840 | # CONFIG_NIU is not set | 798 | # CONFIG_NIU is not set |
841 | # CONFIG_PASEMI_MAC is not set | ||
842 | # CONFIG_MLX4_CORE is not set | 799 | # CONFIG_MLX4_CORE is not set |
843 | # CONFIG_TEHUTI is not set | 800 | # CONFIG_TEHUTI is not set |
844 | # CONFIG_BNX2X is not set | 801 | # CONFIG_BNX2X is not set |
802 | # CONFIG_SFC is not set | ||
845 | CONFIG_TR=y | 803 | CONFIG_TR=y |
846 | CONFIG_IBMOL=y | 804 | CONFIG_IBMOL=y |
847 | # CONFIG_3C359 is not set | 805 | # CONFIG_3C359 is not set |
@@ -852,6 +810,7 @@ CONFIG_IBMOL=y | |||
852 | # | 810 | # |
853 | # CONFIG_WLAN_PRE80211 is not set | 811 | # CONFIG_WLAN_PRE80211 is not set |
854 | # CONFIG_WLAN_80211 is not set | 812 | # CONFIG_WLAN_80211 is not set |
813 | # CONFIG_IWLWIFI_LEDS is not set | ||
855 | 814 | ||
856 | # | 815 | # |
857 | # USB Network Adapters | 816 | # USB Network Adapters |
@@ -956,6 +915,7 @@ CONFIG_VT=y | |||
956 | CONFIG_VT_CONSOLE=y | 915 | CONFIG_VT_CONSOLE=y |
957 | CONFIG_HW_CONSOLE=y | 916 | CONFIG_HW_CONSOLE=y |
958 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 917 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
918 | CONFIG_DEVKMEM=y | ||
959 | # CONFIG_SERIAL_NONSTANDARD is not set | 919 | # CONFIG_SERIAL_NONSTANDARD is not set |
960 | # CONFIG_NOZOMI is not set | 920 | # CONFIG_NOZOMI is not set |
961 | 921 | ||
@@ -1000,13 +960,7 @@ CONFIG_DEVPORT=y | |||
1000 | CONFIG_I2C=y | 960 | CONFIG_I2C=y |
1001 | CONFIG_I2C_BOARDINFO=y | 961 | CONFIG_I2C_BOARDINFO=y |
1002 | # CONFIG_I2C_CHARDEV is not set | 962 | # CONFIG_I2C_CHARDEV is not set |
1003 | |||
1004 | # | ||
1005 | # I2C Algorithms | ||
1006 | # | ||
1007 | CONFIG_I2C_ALGOBIT=y | 963 | CONFIG_I2C_ALGOBIT=y |
1008 | # CONFIG_I2C_ALGOPCF is not set | ||
1009 | # CONFIG_I2C_ALGOPCA is not set | ||
1010 | 964 | ||
1011 | # | 965 | # |
1012 | # I2C Hardware Bus support | 966 | # I2C Hardware Bus support |
@@ -1035,6 +989,7 @@ CONFIG_I2C_ALGOBIT=y | |||
1035 | # CONFIG_I2C_VIA is not set | 989 | # CONFIG_I2C_VIA is not set |
1036 | # CONFIG_I2C_VIAPRO is not set | 990 | # CONFIG_I2C_VIAPRO is not set |
1037 | # CONFIG_I2C_VOODOO3 is not set | 991 | # CONFIG_I2C_VOODOO3 is not set |
992 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1038 | 993 | ||
1039 | # | 994 | # |
1040 | # Miscellaneous I2C Chip support | 995 | # Miscellaneous I2C Chip support |
@@ -1044,19 +999,13 @@ CONFIG_I2C_ALGOBIT=y | |||
1044 | # CONFIG_SENSORS_PCF8574 is not set | 999 | # CONFIG_SENSORS_PCF8574 is not set |
1045 | # CONFIG_PCF8575 is not set | 1000 | # CONFIG_PCF8575 is not set |
1046 | # CONFIG_SENSORS_PCF8591 is not set | 1001 | # CONFIG_SENSORS_PCF8591 is not set |
1047 | # CONFIG_TPS65010 is not set | ||
1048 | # CONFIG_SENSORS_MAX6875 is not set | 1002 | # CONFIG_SENSORS_MAX6875 is not set |
1049 | # CONFIG_SENSORS_TSL2550 is not set | 1003 | # CONFIG_SENSORS_TSL2550 is not set |
1050 | # CONFIG_I2C_DEBUG_CORE is not set | 1004 | # CONFIG_I2C_DEBUG_CORE is not set |
1051 | # CONFIG_I2C_DEBUG_ALGO is not set | 1005 | # CONFIG_I2C_DEBUG_ALGO is not set |
1052 | # CONFIG_I2C_DEBUG_BUS is not set | 1006 | # CONFIG_I2C_DEBUG_BUS is not set |
1053 | # CONFIG_I2C_DEBUG_CHIP is not set | 1007 | # CONFIG_I2C_DEBUG_CHIP is not set |
1054 | |||
1055 | # | ||
1056 | # SPI support | ||
1057 | # | ||
1058 | # CONFIG_SPI is not set | 1008 | # CONFIG_SPI is not set |
1059 | # CONFIG_SPI_MASTER is not set | ||
1060 | # CONFIG_W1 is not set | 1009 | # CONFIG_W1 is not set |
1061 | # CONFIG_POWER_SUPPLY is not set | 1010 | # CONFIG_POWER_SUPPLY is not set |
1062 | # CONFIG_HWMON is not set | 1011 | # CONFIG_HWMON is not set |
@@ -1073,12 +1022,22 @@ CONFIG_SSB_POSSIBLE=y | |||
1073 | # Multifunction device drivers | 1022 | # Multifunction device drivers |
1074 | # | 1023 | # |
1075 | # CONFIG_MFD_SM501 is not set | 1024 | # CONFIG_MFD_SM501 is not set |
1025 | # CONFIG_HTC_PASIC3 is not set | ||
1076 | 1026 | ||
1077 | # | 1027 | # |
1078 | # Multimedia devices | 1028 | # Multimedia devices |
1079 | # | 1029 | # |
1030 | |||
1031 | # | ||
1032 | # Multimedia core support | ||
1033 | # | ||
1080 | # CONFIG_VIDEO_DEV is not set | 1034 | # CONFIG_VIDEO_DEV is not set |
1081 | # CONFIG_DVB_CORE is not set | 1035 | # CONFIG_DVB_CORE is not set |
1036 | # CONFIG_VIDEO_MEDIA is not set | ||
1037 | |||
1038 | # | ||
1039 | # Multimedia drivers | ||
1040 | # | ||
1082 | # CONFIG_DAB is not set | 1041 | # CONFIG_DAB is not set |
1083 | 1042 | ||
1084 | # | 1043 | # |
@@ -1098,8 +1057,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1098 | # CONFIG_FB_SYS_FILLRECT is not set | 1057 | # CONFIG_FB_SYS_FILLRECT is not set |
1099 | # CONFIG_FB_SYS_COPYAREA is not set | 1058 | # CONFIG_FB_SYS_COPYAREA is not set |
1100 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1059 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1060 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1101 | # CONFIG_FB_SYS_FOPS is not set | 1061 | # CONFIG_FB_SYS_FOPS is not set |
1102 | CONFIG_FB_DEFERRED_IO=y | ||
1103 | # CONFIG_FB_SVGALIB is not set | 1062 | # CONFIG_FB_SVGALIB is not set |
1104 | CONFIG_FB_MACMODES=y | 1063 | CONFIG_FB_MACMODES=y |
1105 | CONFIG_FB_BACKLIGHT=y | 1064 | CONFIG_FB_BACKLIGHT=y |
@@ -1209,11 +1168,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1209 | # | 1168 | # |
1210 | # USB Host Controller Drivers | 1169 | # USB Host Controller Drivers |
1211 | # | 1170 | # |
1171 | # CONFIG_USB_C67X00_HCD is not set | ||
1212 | CONFIG_USB_EHCI_HCD=y | 1172 | CONFIG_USB_EHCI_HCD=y |
1213 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1173 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1214 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1174 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1215 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1175 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1216 | # CONFIG_USB_ISP116X_HCD is not set | 1176 | # CONFIG_USB_ISP116X_HCD is not set |
1177 | # CONFIG_USB_ISP1760_HCD is not set | ||
1217 | CONFIG_USB_OHCI_HCD=y | 1178 | CONFIG_USB_OHCI_HCD=y |
1218 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1179 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1219 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1180 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1247,7 +1208,9 @@ CONFIG_USB_STORAGE=y | |||
1247 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1208 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1248 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1209 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1249 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1210 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1211 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
1250 | # CONFIG_USB_STORAGE_KARMA is not set | 1212 | # CONFIG_USB_STORAGE_KARMA is not set |
1213 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1251 | # CONFIG_USB_LIBUSUAL is not set | 1214 | # CONFIG_USB_LIBUSUAL is not set |
1252 | 1215 | ||
1253 | # | 1216 | # |
@@ -1290,6 +1253,7 @@ CONFIG_USB_MON=y | |||
1290 | # CONFIG_MMC is not set | 1253 | # CONFIG_MMC is not set |
1291 | # CONFIG_MEMSTICK is not set | 1254 | # CONFIG_MEMSTICK is not set |
1292 | # CONFIG_NEW_LEDS is not set | 1255 | # CONFIG_NEW_LEDS is not set |
1256 | # CONFIG_ACCESSIBILITY is not set | ||
1293 | CONFIG_INFINIBAND=m | 1257 | CONFIG_INFINIBAND=m |
1294 | CONFIG_INFINIBAND_USER_MAD=m | 1258 | CONFIG_INFINIBAND_USER_MAD=m |
1295 | CONFIG_INFINIBAND_USER_ACCESS=m | 1259 | CONFIG_INFINIBAND_USER_ACCESS=m |
@@ -1312,10 +1276,6 @@ CONFIG_INFINIBAND_SRP=m | |||
1312 | # CONFIG_RTC_CLASS is not set | 1276 | # CONFIG_RTC_CLASS is not set |
1313 | # CONFIG_DMADEVICES is not set | 1277 | # CONFIG_DMADEVICES is not set |
1314 | # CONFIG_AUXDISPLAY is not set | 1278 | # CONFIG_AUXDISPLAY is not set |
1315 | |||
1316 | # | ||
1317 | # Userspace I/O | ||
1318 | # | ||
1319 | # CONFIG_UIO is not set | 1279 | # CONFIG_UIO is not set |
1320 | 1280 | ||
1321 | # | 1281 | # |
@@ -1349,11 +1309,12 @@ CONFIG_JFS_SECURITY=y | |||
1349 | CONFIG_FS_POSIX_ACL=y | 1309 | CONFIG_FS_POSIX_ACL=y |
1350 | CONFIG_XFS_FS=m | 1310 | CONFIG_XFS_FS=m |
1351 | # CONFIG_XFS_QUOTA is not set | 1311 | # CONFIG_XFS_QUOTA is not set |
1352 | CONFIG_XFS_SECURITY=y | ||
1353 | CONFIG_XFS_POSIX_ACL=y | 1312 | CONFIG_XFS_POSIX_ACL=y |
1354 | # CONFIG_XFS_RT is not set | 1313 | # CONFIG_XFS_RT is not set |
1314 | # CONFIG_XFS_DEBUG is not set | ||
1355 | # CONFIG_GFS2_FS is not set | 1315 | # CONFIG_GFS2_FS is not set |
1356 | CONFIG_OCFS2_FS=m | 1316 | CONFIG_OCFS2_FS=m |
1317 | CONFIG_OCFS2_FS_O2CB=m | ||
1357 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1318 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
1358 | # CONFIG_OCFS2_DEBUG_FS is not set | 1319 | # CONFIG_OCFS2_DEBUG_FS is not set |
1359 | CONFIG_DNOTIFY=y | 1320 | CONFIG_DNOTIFY=y |
@@ -1419,13 +1380,11 @@ CONFIG_NFS_FS=y | |||
1419 | CONFIG_NFS_V3=y | 1380 | CONFIG_NFS_V3=y |
1420 | CONFIG_NFS_V3_ACL=y | 1381 | CONFIG_NFS_V3_ACL=y |
1421 | CONFIG_NFS_V4=y | 1382 | CONFIG_NFS_V4=y |
1422 | # CONFIG_NFS_DIRECTIO is not set | ||
1423 | CONFIG_NFSD=y | 1383 | CONFIG_NFSD=y |
1424 | CONFIG_NFSD_V2_ACL=y | 1384 | CONFIG_NFSD_V2_ACL=y |
1425 | CONFIG_NFSD_V3=y | 1385 | CONFIG_NFSD_V3=y |
1426 | CONFIG_NFSD_V3_ACL=y | 1386 | CONFIG_NFSD_V3_ACL=y |
1427 | CONFIG_NFSD_V4=y | 1387 | CONFIG_NFSD_V4=y |
1428 | CONFIG_NFSD_TCP=y | ||
1429 | CONFIG_LOCKD=y | 1388 | CONFIG_LOCKD=y |
1430 | CONFIG_LOCKD_V4=y | 1389 | CONFIG_LOCKD_V4=y |
1431 | CONFIG_EXPORTFS=y | 1390 | CONFIG_EXPORTFS=y |
@@ -1500,9 +1459,10 @@ CONFIG_NLS_ISO8859_1=y | |||
1500 | # Library routines | 1459 | # Library routines |
1501 | # | 1460 | # |
1502 | CONFIG_BITREVERSE=y | 1461 | CONFIG_BITREVERSE=y |
1462 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1503 | CONFIG_CRC_CCITT=m | 1463 | CONFIG_CRC_CCITT=m |
1504 | # CONFIG_CRC16 is not set | 1464 | # CONFIG_CRC16 is not set |
1505 | # CONFIG_CRC_ITU_T is not set | 1465 | CONFIG_CRC_ITU_T=m |
1506 | CONFIG_CRC32=y | 1466 | CONFIG_CRC32=y |
1507 | # CONFIG_CRC7 is not set | 1467 | # CONFIG_CRC7 is not set |
1508 | CONFIG_LIBCRC32C=m | 1468 | CONFIG_LIBCRC32C=m |
@@ -1526,6 +1486,7 @@ CONFIG_HAVE_LMB=y | |||
1526 | # CONFIG_PRINTK_TIME is not set | 1486 | # CONFIG_PRINTK_TIME is not set |
1527 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1487 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1528 | CONFIG_ENABLE_MUST_CHECK=y | 1488 | CONFIG_ENABLE_MUST_CHECK=y |
1489 | CONFIG_FRAME_WARN=2048 | ||
1529 | CONFIG_MAGIC_SYSRQ=y | 1490 | CONFIG_MAGIC_SYSRQ=y |
1530 | # CONFIG_UNUSED_SYMBOLS is not set | 1491 | # CONFIG_UNUSED_SYMBOLS is not set |
1531 | CONFIG_DEBUG_FS=y | 1492 | CONFIG_DEBUG_FS=y |
@@ -1536,18 +1497,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1536 | CONFIG_SCHED_DEBUG=y | 1497 | CONFIG_SCHED_DEBUG=y |
1537 | # CONFIG_SCHEDSTATS is not set | 1498 | # CONFIG_SCHEDSTATS is not set |
1538 | # CONFIG_TIMER_STATS is not set | 1499 | # CONFIG_TIMER_STATS is not set |
1500 | # CONFIG_DEBUG_OBJECTS is not set | ||
1539 | # CONFIG_SLUB_DEBUG_ON is not set | 1501 | # CONFIG_SLUB_DEBUG_ON is not set |
1540 | # CONFIG_SLUB_STATS is not set | 1502 | # CONFIG_SLUB_STATS is not set |
1541 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1503 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1542 | # CONFIG_RT_MUTEX_TESTER is not set | 1504 | # CONFIG_RT_MUTEX_TESTER is not set |
1543 | # CONFIG_DEBUG_SPINLOCK is not set | 1505 | # CONFIG_DEBUG_SPINLOCK is not set |
1544 | # CONFIG_DEBUG_MUTEXES is not set | 1506 | # CONFIG_DEBUG_MUTEXES is not set |
1507 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1508 | # CONFIG_PROVE_LOCKING is not set | ||
1509 | # CONFIG_LOCK_STAT is not set | ||
1545 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1510 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1546 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1511 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1547 | # CONFIG_DEBUG_KOBJECT is not set | 1512 | # CONFIG_DEBUG_KOBJECT is not set |
1548 | CONFIG_DEBUG_BUGVERBOSE=y | 1513 | CONFIG_DEBUG_BUGVERBOSE=y |
1549 | # CONFIG_DEBUG_INFO is not set | 1514 | # CONFIG_DEBUG_INFO is not set |
1550 | # CONFIG_DEBUG_VM is not set | 1515 | # CONFIG_DEBUG_VM is not set |
1516 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1551 | # CONFIG_DEBUG_LIST is not set | 1517 | # CONFIG_DEBUG_LIST is not set |
1552 | # CONFIG_DEBUG_SG is not set | 1518 | # CONFIG_DEBUG_SG is not set |
1553 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1519 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1577,53 +1543,83 @@ CONFIG_VIRQ_DEBUG=y | |||
1577 | # CONFIG_SECURITY is not set | 1543 | # CONFIG_SECURITY is not set |
1578 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1544 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1579 | CONFIG_CRYPTO=y | 1545 | CONFIG_CRYPTO=y |
1546 | |||
1547 | # | ||
1548 | # Crypto core or helper | ||
1549 | # | ||
1580 | CONFIG_CRYPTO_ALGAPI=y | 1550 | CONFIG_CRYPTO_ALGAPI=y |
1581 | CONFIG_CRYPTO_AEAD=m | 1551 | CONFIG_CRYPTO_AEAD=m |
1582 | CONFIG_CRYPTO_BLKCIPHER=y | 1552 | CONFIG_CRYPTO_BLKCIPHER=y |
1583 | CONFIG_CRYPTO_SEQIV=m | ||
1584 | CONFIG_CRYPTO_HASH=y | 1553 | CONFIG_CRYPTO_HASH=y |
1585 | CONFIG_CRYPTO_MANAGER=y | 1554 | CONFIG_CRYPTO_MANAGER=y |
1555 | CONFIG_CRYPTO_GF128MUL=m | ||
1556 | CONFIG_CRYPTO_NULL=m | ||
1557 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1558 | CONFIG_CRYPTO_AUTHENC=m | ||
1559 | CONFIG_CRYPTO_TEST=m | ||
1560 | |||
1561 | # | ||
1562 | # Authenticated Encryption with Associated Data | ||
1563 | # | ||
1564 | CONFIG_CRYPTO_CCM=m | ||
1565 | CONFIG_CRYPTO_GCM=m | ||
1566 | CONFIG_CRYPTO_SEQIV=m | ||
1567 | |||
1568 | # | ||
1569 | # Block modes | ||
1570 | # | ||
1571 | CONFIG_CRYPTO_CBC=y | ||
1572 | CONFIG_CRYPTO_CTR=m | ||
1573 | # CONFIG_CRYPTO_CTS is not set | ||
1574 | CONFIG_CRYPTO_ECB=m | ||
1575 | # CONFIG_CRYPTO_LRW is not set | ||
1576 | CONFIG_CRYPTO_PCBC=m | ||
1577 | # CONFIG_CRYPTO_XTS is not set | ||
1578 | |||
1579 | # | ||
1580 | # Hash modes | ||
1581 | # | ||
1586 | CONFIG_CRYPTO_HMAC=y | 1582 | CONFIG_CRYPTO_HMAC=y |
1587 | # CONFIG_CRYPTO_XCBC is not set | 1583 | # CONFIG_CRYPTO_XCBC is not set |
1588 | CONFIG_CRYPTO_NULL=m | 1584 | |
1585 | # | ||
1586 | # Digest | ||
1587 | # | ||
1588 | CONFIG_CRYPTO_CRC32C=m | ||
1589 | CONFIG_CRYPTO_MD4=m | 1589 | CONFIG_CRYPTO_MD4=m |
1590 | CONFIG_CRYPTO_MD5=y | 1590 | CONFIG_CRYPTO_MD5=y |
1591 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1591 | CONFIG_CRYPTO_SHA1=m | 1592 | CONFIG_CRYPTO_SHA1=m |
1592 | CONFIG_CRYPTO_SHA256=m | 1593 | CONFIG_CRYPTO_SHA256=m |
1593 | CONFIG_CRYPTO_SHA512=m | 1594 | CONFIG_CRYPTO_SHA512=m |
1594 | CONFIG_CRYPTO_WP512=m | ||
1595 | CONFIG_CRYPTO_TGR192=m | 1595 | CONFIG_CRYPTO_TGR192=m |
1596 | CONFIG_CRYPTO_GF128MUL=m | 1596 | CONFIG_CRYPTO_WP512=m |
1597 | CONFIG_CRYPTO_ECB=m | 1597 | |
1598 | CONFIG_CRYPTO_CBC=y | 1598 | # |
1599 | CONFIG_CRYPTO_PCBC=m | 1599 | # Ciphers |
1600 | # CONFIG_CRYPTO_LRW is not set | 1600 | # |
1601 | # CONFIG_CRYPTO_XTS is not set | ||
1602 | CONFIG_CRYPTO_CTR=m | ||
1603 | CONFIG_CRYPTO_GCM=m | ||
1604 | CONFIG_CRYPTO_CCM=m | ||
1605 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1606 | CONFIG_CRYPTO_DES=y | ||
1607 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1608 | CONFIG_CRYPTO_BLOWFISH=m | ||
1609 | CONFIG_CRYPTO_TWOFISH=m | ||
1610 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1611 | CONFIG_CRYPTO_SERPENT=m | ||
1612 | CONFIG_CRYPTO_AES=m | 1601 | CONFIG_CRYPTO_AES=m |
1602 | CONFIG_CRYPTO_ANUBIS=m | ||
1603 | CONFIG_CRYPTO_ARC4=m | ||
1604 | CONFIG_CRYPTO_BLOWFISH=m | ||
1605 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1613 | CONFIG_CRYPTO_CAST5=m | 1606 | CONFIG_CRYPTO_CAST5=m |
1614 | CONFIG_CRYPTO_CAST6=m | 1607 | CONFIG_CRYPTO_CAST6=m |
1615 | CONFIG_CRYPTO_TEA=m | 1608 | CONFIG_CRYPTO_DES=y |
1616 | CONFIG_CRYPTO_ARC4=m | 1609 | # CONFIG_CRYPTO_FCRYPT is not set |
1617 | CONFIG_CRYPTO_KHAZAD=m | 1610 | CONFIG_CRYPTO_KHAZAD=m |
1618 | CONFIG_CRYPTO_ANUBIS=m | ||
1619 | # CONFIG_CRYPTO_SEED is not set | ||
1620 | CONFIG_CRYPTO_SALSA20=m | 1611 | CONFIG_CRYPTO_SALSA20=m |
1612 | # CONFIG_CRYPTO_SEED is not set | ||
1613 | CONFIG_CRYPTO_SERPENT=m | ||
1614 | CONFIG_CRYPTO_TEA=m | ||
1615 | CONFIG_CRYPTO_TWOFISH=m | ||
1616 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1617 | |||
1618 | # | ||
1619 | # Compression | ||
1620 | # | ||
1621 | CONFIG_CRYPTO_DEFLATE=m | 1621 | CONFIG_CRYPTO_DEFLATE=m |
1622 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1623 | CONFIG_CRYPTO_CRC32C=m | ||
1624 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1625 | CONFIG_CRYPTO_TEST=m | ||
1626 | CONFIG_CRYPTO_AUTHENC=m | ||
1627 | CONFIG_CRYPTO_LZO=m | 1622 | CONFIG_CRYPTO_LZO=m |
1628 | # CONFIG_CRYPTO_HW is not set | 1623 | # CONFIG_CRYPTO_HW is not set |
1629 | # CONFIG_PPC_CLOCK is not set | 1624 | # CONFIG_PPC_CLOCK is not set |
1625 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/kernel/init_task.c b/arch/powerpc/kernel/init_task.c index 941043ae040f..4c85b8d56478 100644 --- a/arch/powerpc/kernel/init_task.c +++ b/arch/powerpc/kernel/init_task.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <asm/uaccess.h> | 8 | #include <asm/uaccess.h> |
9 | 9 | ||
10 | static struct fs_struct init_fs = INIT_FS; | 10 | static struct fs_struct init_fs = INIT_FS; |
11 | static struct files_struct init_files = INIT_FILES; | ||
12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 11 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 12 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
14 | struct mm_struct init_mm = INIT_MM(init_mm); | 13 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh index 8e24fc1821e8..31729a9387df 100644 --- a/arch/powerpc/kernel/prom_init_check.sh +++ b/arch/powerpc/kernel/prom_init_check.sh | |||
@@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush | |||
20 | _end enter_prom memcpy memset reloc_offset __secondary_hold | 20 | _end enter_prom memcpy memset reloc_offset __secondary_hold |
21 | __secondary_hold_acknowledge __secondary_hold_spinloop __start | 21 | __secondary_hold_acknowledge __secondary_hold_spinloop __start |
22 | strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 | 22 | strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 |
23 | reloc_got2" | 23 | reloc_got2 kernstart_addr" |
24 | 24 | ||
25 | NM="$1" | 25 | NM="$1" |
26 | OBJ="$2" | 26 | OBJ="$2" |
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S index ddeaf9e38ad5..b9ba7d930801 100644 --- a/arch/powerpc/mm/hash_low_32.S +++ b/arch/powerpc/mm/hash_low_32.S | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: hashtable.S,v 1.6 1999/10/08 01:56:15 paulus Exp $ | ||
3 | * | ||
4 | * PowerPC version | 2 | * PowerPC version |
5 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) | 3 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) |
6 | * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP | 4 | * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP |
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 80d1babb230d..e0ff59f21135 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
@@ -402,7 +402,7 @@ void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags) | |||
402 | return; | 402 | return; |
403 | } | 403 | } |
404 | 404 | ||
405 | map_page(address, phys, flags); | 405 | map_page(address, phys, pgprot_val(flags)); |
406 | fixmaps++; | 406 | fixmaps++; |
407 | } | 407 | } |
408 | 408 | ||
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c index 5b3fb2b321ab..3a58ffabccd9 100644 --- a/arch/powerpc/platforms/ps3/mm.c +++ b/arch/powerpc/platforms/ps3/mm.c | |||
@@ -317,6 +317,9 @@ static int __init ps3_mm_add_memory(void) | |||
317 | return result; | 317 | return result; |
318 | } | 318 | } |
319 | 319 | ||
320 | lmb_add(start_addr, map.r1.size); | ||
321 | lmb_analyze(); | ||
322 | |||
320 | result = online_pages(start_pfn, nr_pages); | 323 | result = online_pages(start_pfn, nr_pages); |
321 | 324 | ||
322 | if (result) | 325 | if (result) |
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 8619f2a3f1f6..7680001676a6 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -1331,6 +1331,9 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) | |||
1331 | unsigned long flags; | 1331 | unsigned long flags; |
1332 | u32 reg; | 1332 | u32 reg; |
1333 | 1333 | ||
1334 | if (!mpic) | ||
1335 | return; | ||
1336 | |||
1334 | spin_lock_irqsave(&mpic_lock, flags); | 1337 | spin_lock_irqsave(&mpic_lock, flags); |
1335 | if (is_ipi) { | 1338 | if (is_ipi) { |
1336 | reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) & | 1339 | reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) & |
@@ -1346,23 +1349,6 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) | |||
1346 | spin_unlock_irqrestore(&mpic_lock, flags); | 1349 | spin_unlock_irqrestore(&mpic_lock, flags); |
1347 | } | 1350 | } |
1348 | 1351 | ||
1349 | unsigned int mpic_irq_get_priority(unsigned int irq) | ||
1350 | { | ||
1351 | unsigned int is_ipi; | ||
1352 | struct mpic *mpic = mpic_find(irq, &is_ipi); | ||
1353 | unsigned int src = mpic_irq_to_hw(irq); | ||
1354 | unsigned long flags; | ||
1355 | u32 reg; | ||
1356 | |||
1357 | spin_lock_irqsave(&mpic_lock, flags); | ||
1358 | if (is_ipi) | ||
1359 | reg = mpic_ipi_read(src = mpic->ipi_vecs[0]); | ||
1360 | else | ||
1361 | reg = mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI)); | ||
1362 | spin_unlock_irqrestore(&mpic_lock, flags); | ||
1363 | return (reg & MPIC_VECPRI_PRIORITY_MASK) >> MPIC_VECPRI_PRIORITY_SHIFT; | ||
1364 | } | ||
1365 | |||
1366 | void mpic_setup_this_cpu(void) | 1352 | void mpic_setup_this_cpu(void) |
1367 | { | 1353 | { |
1368 | #ifdef CONFIG_SMP | 1354 | #ifdef CONFIG_SMP |
diff --git a/arch/s390/kernel/init_task.c b/arch/s390/kernel/init_task.c index d494161b05b4..7ad003969251 100644 --- a/arch/s390/kernel/init_task.c +++ b/arch/s390/kernel/init_task.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
18 | 18 | ||
19 | static struct fs_struct init_fs = INIT_FS; | 19 | static struct fs_struct init_fs = INIT_FS; |
20 | static struct files_struct init_files = INIT_FILES; | ||
21 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 20 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
22 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 21 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
23 | struct mm_struct init_mm = INIT_MM(init_mm); | 22 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c index ab77b0e0fa0e..938817e34e2b 100644 --- a/arch/sh/drivers/heartbeat.c +++ b/arch/sh/drivers/heartbeat.c | |||
@@ -154,4 +154,4 @@ module_exit(heartbeat_exit); | |||
154 | 154 | ||
155 | MODULE_VERSION(DRV_VERSION); | 155 | MODULE_VERSION(DRV_VERSION); |
156 | MODULE_AUTHOR("Paul Mundt"); | 156 | MODULE_AUTHOR("Paul Mundt"); |
157 | MODULE_LICENSE("GPLv2"); | 157 | MODULE_LICENSE("GPL v2"); |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c index 805535aa505e..27fa81bef6a0 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c | |||
@@ -26,7 +26,7 @@ static int pfc_divisors[] = { 1, 1, 1, 1, 1, 1, 1, 18, | |||
26 | 26 | ||
27 | static void master_clk_init(struct clk *clk) | 27 | static void master_clk_init(struct clk *clk) |
28 | { | 28 | { |
29 | clk->rate *= 36; | 29 | clk->rate *= pfc_divisors[ctrl_inl(FRQMR1) & 0x000f]; |
30 | } | 30 | } |
31 | 31 | ||
32 | static struct clk_ops sh7785_master_clk_ops = { | 32 | static struct clk_ops sh7785_master_clk_ops = { |
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 926b2e7b11c1..718bd2356b34 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
@@ -1,9 +1,6 @@ | |||
1 | /* $Id: entry.S,v 1.37 2004/06/11 13:02:46 doyu Exp $ | 1 | /* |
2 | * | ||
3 | * linux/arch/sh/entry.S | ||
4 | * | ||
5 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka | 2 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka |
6 | * Copyright (C) 2003 Paul Mundt | 3 | * Copyright (C) 2003 - 2008 Paul Mundt |
7 | * | 4 | * |
8 | * This file is subject to the terms and conditions of the GNU General Public | 5 | * This file is subject to the terms and conditions of the GNU General Public |
9 | * License. See the file "COPYING" in the main directory of this archive | 6 | * License. See the file "COPYING" in the main directory of this archive |
@@ -262,6 +259,7 @@ __restore_all: | |||
262 | 259 | ||
263 | .align 2 | 260 | .align 2 |
264 | syscall_badsys: ! Bad syscall number | 261 | syscall_badsys: ! Bad syscall number |
262 | get_current_thread_info r8, r0 | ||
265 | mov #-ENOSYS, r0 | 263 | mov #-ENOSYS, r0 |
266 | bra resume_userspace | 264 | bra resume_userspace |
267 | mov.l r0, @(OFF_R0,r15) ! Return value | 265 | mov.l r0, @(OFF_R0,r15) ! Return value |
@@ -281,7 +279,9 @@ debug_trap: | |||
281 | mov.l 1f, r8 | 279 | mov.l 1f, r8 |
282 | add r0, r8 | 280 | add r0, r8 |
283 | mov.l @r8, r8 | 281 | mov.l @r8, r8 |
284 | jmp @r8 | 282 | jsr @r8 |
283 | nop | ||
284 | bra __restore_all | ||
285 | nop | 285 | nop |
286 | 286 | ||
287 | .align 2 | 287 | .align 2 |
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S index d67d7ed09f22..ae0a382a82eb 100644 --- a/arch/sh/kernel/head_32.S +++ b/arch/sh/kernel/head_32.S | |||
@@ -30,8 +30,8 @@ ENTRY(empty_zero_page) | |||
30 | .long 0 /* RAMDISK_FLAGS */ | 30 | .long 0 /* RAMDISK_FLAGS */ |
31 | .long 0x0200 /* ORIG_ROOT_DEV */ | 31 | .long 0x0200 /* ORIG_ROOT_DEV */ |
32 | .long 1 /* LOADER_TYPE */ | 32 | .long 1 /* LOADER_TYPE */ |
33 | .long 0x00360000 /* INITRD_START */ | 33 | .long 0x00000000 /* INITRD_START */ |
34 | .long 0x000a0000 /* INITRD_SIZE */ | 34 | .long 0x00000000 /* INITRD_SIZE */ |
35 | #ifdef CONFIG_32BIT | 35 | #ifdef CONFIG_32BIT |
36 | .long 0x53453f00 + 32 /* "SE?" = 32 bit */ | 36 | .long 0x53453f00 + 32 /* "SE?" = 32 bit */ |
37 | #else | 37 | #else |
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c index f9bcc606127e..b151a25cb14d 100644 --- a/arch/sh/kernel/init_task.c +++ b/arch/sh/kernel/init_task.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <asm/pgtable.h> | 8 | #include <asm/pgtable.h> |
9 | 9 | ||
10 | static struct fs_struct init_fs = INIT_FS; | 10 | static struct fs_struct init_fs = INIT_FS; |
11 | static struct files_struct init_files = INIT_FILES; | ||
12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 11 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 12 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
14 | struct pt_regs fake_swapper_regs; | 13 | struct pt_regs fake_swapper_regs; |
diff --git a/arch/sh/kernel/kgdb_stub.c b/arch/sh/kernel/kgdb_stub.c index 832641bbd47d..bf8ac4c71640 100644 --- a/arch/sh/kernel/kgdb_stub.c +++ b/arch/sh/kernel/kgdb_stub.c | |||
@@ -274,8 +274,7 @@ static char *mem_to_hex(const char *mem, char *buf, const int count) | |||
274 | } | 274 | } |
275 | for (i = 0; i < count; i++) { | 275 | for (i = 0; i < count; i++) { |
276 | ch = *mem++; | 276 | ch = *mem++; |
277 | *buf++ = highhex(ch); | 277 | buf = pack_hex_byte(buf, ch); |
278 | *buf++ = lowhex(ch); | ||
279 | } | 278 | } |
280 | *buf = 0; | 279 | *buf = 0; |
281 | return (buf); | 280 | return (buf); |
@@ -427,8 +426,8 @@ static void put_packet(char *buffer) | |||
427 | 426 | ||
428 | /* '#' Separator, put high and low components of checksum */ | 427 | /* '#' Separator, put high and low components of checksum */ |
429 | put_debug_char('#'); | 428 | put_debug_char('#'); |
430 | put_debug_char(highhex(checksum)); | 429 | put_debug_char(hex_asc_hi(checksum)); |
431 | put_debug_char(lowhex(checksum)); | 430 | put_debug_char(hex_asc_lo(checksum)); |
432 | } | 431 | } |
433 | while ((get_debug_char()) != '+'); /* While no ack */ | 432 | while ((get_debug_char()) != '+'); /* While no ack */ |
434 | } | 433 | } |
@@ -650,8 +649,8 @@ static void undo_single_step(void) | |||
650 | static void send_signal_msg(const int signum) | 649 | static void send_signal_msg(const int signum) |
651 | { | 650 | { |
652 | out_buffer[0] = 'S'; | 651 | out_buffer[0] = 'S'; |
653 | out_buffer[1] = highhex(signum); | 652 | out_buffer[1] = hex_asc_hi(signum); |
654 | out_buffer[2] = lowhex(signum); | 653 | out_buffer[2] = hex_asc_lo(signum); |
655 | out_buffer[3] = 0; | 654 | out_buffer[3] = 0; |
656 | put_packet(out_buffer); | 655 | put_packet(out_buffer); |
657 | } | 656 | } |
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 516bde9c50fa..bca2bbc575db 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -292,6 +292,17 @@ void __init setup_arch(char **cmdline_p) | |||
292 | 292 | ||
293 | ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); | 293 | ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); |
294 | 294 | ||
295 | printk(KERN_NOTICE "Boot params:\n" | ||
296 | "... MOUNT_ROOT_RDONLY - %08lx\n" | ||
297 | "... RAMDISK_FLAGS - %08lx\n" | ||
298 | "... ORIG_ROOT_DEV - %08lx\n" | ||
299 | "... LOADER_TYPE - %08lx\n" | ||
300 | "... INITRD_START - %08lx\n" | ||
301 | "... INITRD_SIZE - %08lx\n", | ||
302 | MOUNT_ROOT_RDONLY, RAMDISK_FLAGS, | ||
303 | ORIG_ROOT_DEV, LOADER_TYPE, | ||
304 | INITRD_START, INITRD_SIZE); | ||
305 | |||
295 | #ifdef CONFIG_BLK_DEV_RAM | 306 | #ifdef CONFIG_BLK_DEV_RAM |
296 | rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; | 307 | rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; |
297 | rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0); | 308 | rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0); |
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index a3bdc68ef02c..438f1ebcc453 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <linux/kdebug.h> | 4 | #include <linux/kdebug.h> |
5 | #include <linux/signal.h> | 5 | #include <linux/signal.h> |
6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
7 | #include <linux/uaccess.h> | ||
7 | #include <asm/system.h> | 8 | #include <asm/system.h> |
8 | 9 | ||
9 | #ifdef CONFIG_BUG | 10 | #ifdef CONFIG_BUG |
@@ -21,7 +22,14 @@ static void handle_BUG(struct pt_regs *regs) | |||
21 | 22 | ||
22 | int is_valid_bugaddr(unsigned long addr) | 23 | int is_valid_bugaddr(unsigned long addr) |
23 | { | 24 | { |
24 | return addr >= PAGE_OFFSET; | 25 | unsigned short opcode; |
26 | |||
27 | if (addr < PAGE_OFFSET) | ||
28 | return 0; | ||
29 | if (probe_kernel_address((u16 *)addr, opcode)) | ||
30 | return 0; | ||
31 | |||
32 | return opcode == TRAPA_BUG_OPCODE; | ||
25 | } | 33 | } |
26 | #endif | 34 | #endif |
27 | 35 | ||
diff --git a/arch/sh/lib/memcpy-sh4.S b/arch/sh/lib/memcpy-sh4.S index 560bc17eebdd..459fa92a7c53 100644 --- a/arch/sh/lib/memcpy-sh4.S +++ b/arch/sh/lib/memcpy-sh4.S | |||
@@ -126,10 +126,10 @@ | |||
126 | 126 | ||
127 | mov.l r3,@-r0 ! 30 LS | 127 | mov.l r3,@-r0 ! 30 LS |
128 | #else | 128 | #else |
129 | 3: mov r1,r3 ! OPQR | 129 | 3: mov r7,r3 ! OPQR |
130 | shlr8 r3 ! xOPQ | 130 | shlr8 r3 ! xOPQ |
131 | mov.l @(r0,r5),r1 ! KLMN | 131 | mov.l @(r0,r5),r7 ! KLMN |
132 | mov r1,r6 | 132 | mov r7,r6 |
133 | shll16 r6 | 133 | shll16 r6 |
134 | shll8 r6 ! Nxxx | 134 | shll8 r6 ! Nxxx |
135 | or r6,r3 ! NOPQ | 135 | or r6,r3 ! NOPQ |
@@ -733,24 +733,24 @@ ENTRY(memcpy) | |||
733 | movca.l r0,@r1 ! 40 LS (latency=3-7) | 733 | movca.l r0,@r1 ! 40 LS (latency=3-7) |
734 | add #-0x1c, r1 ! 50 EX | 734 | add #-0x1c, r1 ! 50 EX |
735 | 735 | ||
736 | mov.l r3, @(0x1c,r1) ! 33 LS | 736 | mov.l r3, @(0x18,r1) ! 33 LS |
737 | xtrct r11, r10 ! 48 EX | 737 | xtrct r11, r10 ! 48 EX |
738 | 738 | ||
739 | mov.l r6, @(0x18,r1) ! 33 LS | 739 | mov.l r6, @(0x14,r1) ! 33 LS |
740 | xtrct r12, r11 ! 48 EX | 740 | xtrct r12, r11 ! 48 EX |
741 | 741 | ||
742 | mov.l r7, @(0x14,r1) ! 33 LS | 742 | mov.l r7, @(0x10,r1) ! 33 LS |
743 | 743 | ||
744 | mov.l r8, @(0x10,r1) ! 33 LS | 744 | mov.l r8, @(0x0c,r1) ! 33 LS |
745 | add #-0x3e, r5 ! 50 EX | 745 | add #-0x1e, r5 ! 50 EX |
746 | 746 | ||
747 | mov.l r9, @(0x0c,r1) ! 33 LS | 747 | mov.l r9, @(0x08,r1) ! 33 LS |
748 | cmp/eq r2,r1 ! 54 MT | 748 | cmp/eq r2,r1 ! 54 MT |
749 | 749 | ||
750 | mov.l r10, @(0x08,r1) ! 33 LS | 750 | mov.l r10, @(0x04,r1) ! 33 LS |
751 | bf/s 2b ! 109 BR | 751 | bf/s 2b ! 109 BR |
752 | 752 | ||
753 | mov.l r11, @(0x04,r1) ! 33 LS | 753 | mov.l r11, @(0x00,r1) ! 33 LS |
754 | #endif | 754 | #endif |
755 | 755 | ||
756 | mov.l @r15+, r12 | 756 | mov.l @r15+, r12 |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index d211fdb24584..789724e61e83 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: config.in,v 1.113 2002/01/24 22:14:44 davem Exp $ | ||
2 | # For a description of the syntax of this configuration file, | 1 | # For a description of the syntax of this configuration file, |
3 | # see Documentation/kbuild/kconfig-language.txt. | 2 | # see Documentation/kbuild/kconfig-language.txt. |
4 | # | 3 | # |
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile index b365084316ac..22d331e1e941 100644 --- a/arch/sparc/boot/Makefile +++ b/arch/sparc/boot/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.10 2000/02/23 08:17:46 jj Exp $ | ||
2 | # Makefile for the Sparc boot stuff. | 1 | # Makefile for the Sparc boot stuff. |
3 | # | 2 | # |
4 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/boot/btfixupprep.c b/arch/sparc/boot/btfixupprep.c index dc7b0546e3bb..52a4208fe4f0 100644 --- a/arch/sparc/boot/btfixupprep.c +++ b/arch/sparc/boot/btfixupprep.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: btfixupprep.c,v 1.6 2001/08/22 15:27:47 davem Exp $ | 1 | /* |
2 | Simple utility to prepare vmlinux image for sparc. | 2 | Simple utility to prepare vmlinux image for sparc. |
3 | Resolves all BTFIXUP uses and settings and creates | 3 | Resolves all BTFIXUP uses and settings and creates |
4 | a special .s object to link to the image. | 4 | a special .s object to link to the image. |
diff --git a/arch/sparc/boot/piggyback.c b/arch/sparc/boot/piggyback.c index 6962cc68ed5b..c9f500c1a8b2 100644 --- a/arch/sparc/boot/piggyback.c +++ b/arch/sparc/boot/piggyback.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: piggyback.c,v 1.4 2000/12/05 00:48:57 anton Exp $ | 1 | /* |
2 | Simple utility to make a single-image install kernel with initial ramdisk | 2 | Simple utility to make a single-image install kernel with initial ramdisk |
3 | for Sparc tftpbooting without need to set up nfs. | 3 | for Sparc tftpbooting without need to set up nfs. |
4 | 4 | ||
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index 96344ff2bbe1..92c6fc07e59c 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ebus.c,v 1.20 2002/01/05 01:13:43 davem Exp $ | 1 | /* |
2 | * ebus.c: PCI to EBus bridge device. | 2 | * ebus.c: PCI to EBus bridge device. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc/kernel/etrap.S b/arch/sparc/kernel/etrap.S index a8b35bed12a2..f37d961d67a6 100644 --- a/arch/sparc/kernel/etrap.S +++ b/arch/sparc/kernel/etrap.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: etrap.S,v 1.31 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
2 | * etrap.S: Sparc trap window preparation for entry into the | 2 | * etrap.S: Sparc trap window preparation for entry into the |
3 | * Linux kernel. | 3 | * Linux kernel. |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S index 8bec05fa5795..3bfd6085a91d 100644 --- a/arch/sparc/kernel/head.S +++ b/arch/sparc/kernel/head.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: head.S,v 1.105 2001/08/12 09:08:56 davem Exp $ | 1 | /* |
2 | * head.S: The initial boot code for the Sparc port of Linux. | 2 | * head.S: The initial boot code for the Sparc port of Linux. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/idprom.c b/arch/sparc/kernel/idprom.c index 3a5bad525394..7220562cdb34 100644 --- a/arch/sparc/kernel/idprom.c +++ b/arch/sparc/kernel/idprom.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: idprom.c,v 1.24 1999/08/31 06:54:20 davem Exp $ | 1 | /* |
2 | * idprom.c: Routines to load the idprom into kernel addresses and | 2 | * idprom.c: Routines to load the idprom into kernel addresses and |
3 | * interpret the data contained within. | 3 | * interpret the data contained within. |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c index d9d4f96360c7..8e64ebc445ef 100644 --- a/arch/sparc/kernel/init_task.c +++ b/arch/sparc/kernel/init_task.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <asm/uaccess.h> | 9 | #include <asm/uaccess.h> |
10 | 10 | ||
11 | static struct fs_struct init_fs = INIT_FS; | 11 | static struct fs_struct init_fs = INIT_FS; |
12 | static struct files_struct init_files = INIT_FILES; | ||
13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
15 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index ad0ede24ca1d..7b17522f59bf 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ioport.c,v 1.45 2001/10/30 04:54:21 davem Exp $ | 1 | /* |
2 | * ioport.c: Simple io mapping allocator. | 2 | * ioport.c: Simple io mapping allocator. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c index 01a6756ba371..087390b092b0 100644 --- a/arch/sparc/kernel/irq.c +++ b/arch/sparc/kernel/irq.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: irq.c,v 1.114 2001/12/11 04:55:51 davem Exp $ | 1 | /* |
2 | * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the | 2 | * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the |
3 | * Sparc the IRQs are basically 'cast in stone' | 3 | * Sparc the IRQs are basically 'cast in stone' |
4 | * and you are supposed to probe the prom's device | 4 | * and you are supposed to probe the prom's device |
diff --git a/arch/sparc/kernel/muldiv.c b/arch/sparc/kernel/muldiv.c index 37b9a4942232..e352239e72c8 100644 --- a/arch/sparc/kernel/muldiv.c +++ b/arch/sparc/kernel/muldiv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: muldiv.c,v 1.5 1997/12/15 20:07:20 ecd Exp $ | 1 | /* |
2 | * muldiv.c: Hardware multiply/division illegal instruction trap | 2 | * muldiv.c: Hardware multiply/division illegal instruction trap |
3 | * for sun4c/sun4 (which do not have those instructions) | 3 | * for sun4c/sun4 (which do not have those instructions) |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S index ab818cdc4cc0..ce30082ab266 100644 --- a/arch/sparc/kernel/rtrap.S +++ b/arch/sparc/kernel/rtrap.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rtrap.S,v 1.58 2002/01/31 03:30:05 davem Exp $ | 1 | /* |
2 | * rtrap.S: Return from Sparc trap low-level code. | 2 | * rtrap.S: Return from Sparc trap low-level code. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 8a55c4f0df84..a0ea0bc6f471 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: setup.c,v 1.126 2001/11/13 00:49:27 davem Exp $ | 1 | /* |
2 | * linux/arch/sparc/kernel/setup.c | 2 | * linux/arch/sparc/kernel/setup.c |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index aa8ee06cf488..b23cea5ca5d1 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sparc_ksyms.c,v 1.107 2001/07/17 16:17:33 anton Exp $ | 1 | /* |
2 | * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. | 2 | * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index e0efab2a6bef..8ac5661cafff 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sun4d_irq.c,v 1.29 2001/12/11 04:55:51 davem Exp $ | 1 | /* |
2 | * arch/sparc/kernel/sun4d_irq.c: | 2 | * arch/sparc/kernel/sun4d_irq.c: |
3 | * SS1000/SC2000 interrupt handling. | 3 | * SS1000/SC2000 interrupt handling. |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S index 2dcdaa1fd8cd..356c56aebc62 100644 --- a/arch/sparc/kernel/trampoline.S +++ b/arch/sparc/kernel/trampoline.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: trampoline.S,v 1.14 2002/01/11 08:45:38 davem Exp $ | 1 | /* |
2 | * trampoline.S: SMP cpu boot-up trampoline code. | 2 | * trampoline.S: SMP cpu boot-up trampoline code. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c index d404e7994527..978e9d85949e 100644 --- a/arch/sparc/kernel/traps.c +++ b/arch/sparc/kernel/traps.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: traps.c,v 1.64 2000/09/03 15:00:49 anton Exp $ | 1 | /* |
2 | * arch/sparc/kernel/traps.c | 2 | * arch/sparc/kernel/traps.c |
3 | * | 3 | * |
4 | * Copyright 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/unaligned.c b/arch/sparc/kernel/unaligned.c index 33857be16661..c2a28c5ad650 100644 --- a/arch/sparc/kernel/unaligned.c +++ b/arch/sparc/kernel/unaligned.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: unaligned.c,v 1.23 2001/12/21 00:54:31 davem Exp $ | 1 | /* |
2 | * unaligned.c: Unaligned load/store trap handling with special | 2 | * unaligned.c: Unaligned load/store trap handling with special |
3 | * cases for the kernel to do them more quickly. | 3 | * cases for the kernel to do them more quickly. |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/wof.S b/arch/sparc/kernel/wof.S index 083b1215d515..4bce38dfe3c5 100644 --- a/arch/sparc/kernel/wof.S +++ b/arch/sparc/kernel/wof.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: wof.S,v 1.40 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
2 | * wof.S: Sparc window overflow handler. | 2 | * wof.S: Sparc window overflow handler. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/wuf.S b/arch/sparc/kernel/wuf.S index d1a266bf103a..82e5145b0f77 100644 --- a/arch/sparc/kernel/wuf.S +++ b/arch/sparc/kernel/wuf.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: wuf.S,v 1.39 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
2 | * wuf.S: Window underflow trap handler for the Sparc. | 2 | * wuf.S: Window underflow trap handler for the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller | 4 | * Copyright (C) 1995 David S. Miller |
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 76effdbea075..6e303e10c3b9 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.35 2000/12/15 00:41:18 davem Exp $ | ||
2 | # Makefile for Sparc library files.. | 1 | # Makefile for Sparc library files.. |
3 | # | 2 | # |
4 | 3 | ||
diff --git a/arch/sparc/lib/ashldi3.S b/arch/sparc/lib/ashldi3.S index 52418a0cb3dd..17912e608716 100644 --- a/arch/sparc/lib/ashldi3.S +++ b/arch/sparc/lib/ashldi3.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ashldi3.S,v 1.2 1999/11/19 04:11:46 davem Exp $ | 1 | /* |
2 | * ashldi3.S: GCC emits these for certain drivers playing | 2 | * ashldi3.S: GCC emits these for certain drivers playing |
3 | * with long longs. | 3 | * with long longs. |
4 | * | 4 | * |
diff --git a/arch/sparc/lib/ashrdi3.S b/arch/sparc/lib/ashrdi3.S index 2848237598a4..85398fd6dcc9 100644 --- a/arch/sparc/lib/ashrdi3.S +++ b/arch/sparc/lib/ashrdi3.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ashrdi3.S,v 1.4 1999/11/19 04:11:49 davem Exp $ | 1 | /* |
2 | * ashrdi3.S: The filesystem code creates all kinds of references to | 2 | * ashrdi3.S: The filesystem code creates all kinds of references to |
3 | * this little routine on the sparc with gcc. | 3 | * this little routine on the sparc with gcc. |
4 | * | 4 | * |
diff --git a/arch/sparc/lib/blockops.S b/arch/sparc/lib/blockops.S index a7c7ffaa4a94..804be87f9a42 100644 --- a/arch/sparc/lib/blockops.S +++ b/arch/sparc/lib/blockops.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: blockops.S,v 1.8 1998/01/30 10:58:44 jj Exp $ | 1 | /* |
2 | * blockops.S: Common block zero optimized routines. | 2 | * blockops.S: Common block zero optimized routines. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/locks.S b/arch/sparc/lib/locks.S index b1df55cb2215..64f53f2b673d 100644 --- a/arch/sparc/lib/locks.S +++ b/arch/sparc/lib/locks.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: locks.S,v 1.16 2000/02/26 11:02:47 anton Exp $ | 1 | /* |
2 | * locks.S: SMP low-level lock primitives on Sparc. | 2 | * locks.S: SMP low-level lock primitives on Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/lshrdi3.S b/arch/sparc/lib/lshrdi3.S index 35abf5b2bd15..47a1354c1602 100644 --- a/arch/sparc/lib/lshrdi3.S +++ b/arch/sparc/lib/lshrdi3.S | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: lshrdi3.S,v 1.1 1999/03/21 06:37:45 davem Exp $ */ | ||
2 | 1 | ||
3 | .globl __lshrdi3 | 2 | .globl __lshrdi3 |
4 | __lshrdi3: | 3 | __lshrdi3: |
diff --git a/arch/sparc/lib/memscan.S b/arch/sparc/lib/memscan.S index 28e78ff090ac..4ff1657dfc24 100644 --- a/arch/sparc/lib/memscan.S +++ b/arch/sparc/lib/memscan.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: memscan.S,v 1.4 1996/09/08 02:01:20 davem Exp $ | 1 | /* |
2 | * memscan.S: Optimized memscan for the Sparc. | 2 | * memscan.S: Optimized memscan for the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/mul.S b/arch/sparc/lib/mul.S index da693560d878..c45470d0b0ce 100644 --- a/arch/sparc/lib/mul.S +++ b/arch/sparc/lib/mul.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mul.S,v 1.4 1996/09/30 02:22:32 davem Exp $ | 1 | /* |
2 | * mul.S: This routine was taken from glibc-1.09 and is covered | 2 | * mul.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/rem.S b/arch/sparc/lib/rem.S index bf015a90d07e..42fb86252815 100644 --- a/arch/sparc/lib/rem.S +++ b/arch/sparc/lib/rem.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rem.S,v 1.7 1996/09/30 02:22:34 davem Exp $ | 1 | /* |
2 | * rem.S: This routine was taken from glibc-1.09 and is covered | 2 | * rem.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/rwsem.S b/arch/sparc/lib/rwsem.S index f406b1f22791..9675268e7fde 100644 --- a/arch/sparc/lib/rwsem.S +++ b/arch/sparc/lib/rwsem.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rwsem.S,v 1.5 2000/05/09 17:40:13 davem Exp $ | 1 | /* |
2 | * Assembly part of rw semaphores. | 2 | * Assembly part of rw semaphores. |
3 | * | 3 | * |
4 | * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) | 4 | * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) |
diff --git a/arch/sparc/lib/sdiv.S b/arch/sparc/lib/sdiv.S index af9451629d0b..f0a0d4e4db78 100644 --- a/arch/sparc/lib/sdiv.S +++ b/arch/sparc/lib/sdiv.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sdiv.S,v 1.6 1996/10/02 17:37:00 davem Exp $ | 1 | /* |
2 | * sdiv.S: This routine was taken from glibc-1.09 and is covered | 2 | * sdiv.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/strncmp.S b/arch/sparc/lib/strncmp.S index 615626805d4b..494ec664537a 100644 --- a/arch/sparc/lib/strncmp.S +++ b/arch/sparc/lib/strncmp.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: strncmp.S,v 1.2 1996/09/09 02:47:20 davem Exp $ | 1 | /* |
2 | * strncmp.S: Hand optimized Sparc assembly of GCC output from GNU libc | 2 | * strncmp.S: Hand optimized Sparc assembly of GCC output from GNU libc |
3 | * generic strncmp routine. | 3 | * generic strncmp routine. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/udiv.S b/arch/sparc/lib/udiv.S index 169e01da6715..2101405bdfcb 100644 --- a/arch/sparc/lib/udiv.S +++ b/arch/sparc/lib/udiv.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: udiv.S,v 1.4 1996/09/30 02:22:38 davem Exp $ | 1 | /* |
2 | * udiv.S: This routine was taken from glibc-1.09 and is covered | 2 | * udiv.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/umul.S b/arch/sparc/lib/umul.S index f0e5b20a2536..1f36ae682529 100644 --- a/arch/sparc/lib/umul.S +++ b/arch/sparc/lib/umul.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: umul.S,v 1.4 1996/09/30 02:22:39 davem Exp $ | 1 | /* |
2 | * umul.S: This routine was taken from glibc-1.09 and is covered | 2 | * umul.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/urem.S b/arch/sparc/lib/urem.S index 6b92bdc8b04c..77123eb83c44 100644 --- a/arch/sparc/lib/urem.S +++ b/arch/sparc/lib/urem.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: urem.S,v 1.4 1996/09/30 02:22:42 davem Exp $ | 1 | /* |
2 | * urem.S: This routine was taken from glibc-1.09 and is covered | 2 | * urem.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/math-emu/ashldi3.S b/arch/sparc/math-emu/ashldi3.S index eab1d097296a..7230ff5c7aa1 100644 --- a/arch/sparc/math-emu/ashldi3.S +++ b/arch/sparc/math-emu/ashldi3.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ashldi3.S,v 1.1 1998/04/06 16:09:28 jj Exp $ | 1 | /* |
2 | * ashldi3.S: Math-emu code creates all kinds of references to | 2 | * ashldi3.S: Math-emu code creates all kinds of references to |
3 | * this little routine on the sparc with gcc. | 3 | * this little routine on the sparc with gcc. |
4 | * | 4 | * |
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile index 16eeba4b991a..109c8b22cb38 100644 --- a/arch/sparc/mm/Makefile +++ b/arch/sparc/mm/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.38 2000/12/15 00:41:22 davem Exp $ | ||
2 | # Makefile for the linux Sparc-specific parts of the memory manager. | 1 | # Makefile for the linux Sparc-specific parts of the memory manager. |
3 | # | 2 | # |
4 | 3 | ||
diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c index abd50795a7b6..0a3cd8f6cfe4 100644 --- a/arch/sparc/mm/fault.c +++ b/arch/sparc/mm/fault.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fault.c,v 1.122 2001/11/17 07:19:26 davem Exp $ | 1 | /* |
2 | * fault.c: Page fault handlers for the Sparc. | 2 | * fault.c: Page fault handlers for the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/generic.c b/arch/sparc/mm/generic.c index 1ef7fa03fefe..a289261da9fd 100644 --- a/arch/sparc/mm/generic.c +++ b/arch/sparc/mm/generic.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: generic.c,v 1.14 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * generic.c: Generic Sparc mm routines that are not dependent upon | 2 | * generic.c: Generic Sparc mm routines that are not dependent upon |
3 | * MMU type but are Sparc specific. | 3 | * MMU type but are Sparc specific. |
4 | * | 4 | * |
diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S index d29cc24c5bba..44aad32eeb4e 100644 --- a/arch/sparc/mm/hypersparc.S +++ b/arch/sparc/mm/hypersparc.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: hypersparc.S,v 1.18 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * hypersparc.S: High speed Hypersparc mmu/cache operations. | 2 | * hypersparc.S: High speed Hypersparc mmu/cache operations. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index b89837accc88..7794ecb896e3 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: init.c,v 1.103 2001/11/19 19:03:08 davem Exp $ | 1 | /* |
2 | * linux/arch/sparc/mm/init.c | 2 | * linux/arch/sparc/mm/init.c |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index b86dfce8eee4..f167835db3df 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: io-unit.c,v 1.24 2001/12/17 07:05:09 davem Exp $ | 1 | /* |
2 | * io-unit.c: IO-UNIT specific routines for memory management. | 2 | * io-unit.c: IO-UNIT specific routines for memory management. |
3 | * | 3 | * |
4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc/mm/loadmmu.c b/arch/sparc/mm/loadmmu.c index 2d9cd65160a4..652be05acbea 100644 --- a/arch/sparc/mm/loadmmu.c +++ b/arch/sparc/mm/loadmmu.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: loadmmu.c,v 1.56 2000/02/08 20:24:21 davem Exp $ | 1 | /* |
2 | * loadmmu.c: This code loads up all the mm function pointers once the | 2 | * loadmmu.c: This code loads up all the mm function pointers once the |
3 | * machine type has been determined. It also sets the static | 3 | * machine type has been determined. It also sets the static |
4 | * mmu values such as PAGE_NONE, etc. | 4 | * mmu values such as PAGE_NONE, etc. |
diff --git a/arch/sparc/mm/nosrmmu.c b/arch/sparc/mm/nosrmmu.c index 9e215659697e..3701f70fc30a 100644 --- a/arch/sparc/mm/nosrmmu.c +++ b/arch/sparc/mm/nosrmmu.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: nosrmmu.c,v 1.5 1999/11/19 04:11:54 davem Exp $ | 1 | /* |
2 | * nosrmmu.c: This file is a bunch of dummies for sun4 compiles, | 2 | * nosrmmu.c: This file is a bunch of dummies for sun4 compiles, |
3 | * so that it does not need srmmu and avoid ifdefs. | 3 | * so that it does not need srmmu and avoid ifdefs. |
4 | * | 4 | * |
diff --git a/arch/sparc/mm/nosun4c.c b/arch/sparc/mm/nosun4c.c index ea2e2105341d..196263f895b7 100644 --- a/arch/sparc/mm/nosun4c.c +++ b/arch/sparc/mm/nosun4c.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: nosun4c.c,v 1.3 2000/02/14 04:52:36 jj Exp $ | 1 | /* |
2 | * nosun4c.c: This file is a bunch of dummies for SMP compiles, | 2 | * nosun4c.c: This file is a bunch of dummies for SMP compiles, |
3 | * so that it does not need sun4c and avoid ifdefs. | 3 | * so that it does not need sun4c and avoid ifdefs. |
4 | * | 4 | * |
diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S index 9f4cd396a0fa..c801c3953a00 100644 --- a/arch/sparc/mm/swift.S +++ b/arch/sparc/mm/swift.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: swift.S,v 1.9 2002/01/08 11:11:59 davem Exp $ | 1 | /* |
2 | * swift.S: MicroSparc-II mmu/cache operations. | 2 | * swift.S: MicroSparc-II mmu/cache operations. |
3 | * | 3 | * |
4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S index 4988e6a310bb..db0d6de33a87 100644 --- a/arch/sparc/mm/tsunami.S +++ b/arch/sparc/mm/tsunami.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: tsunami.S,v 1.7 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * tsunami.S: High speed MicroSparc-I mmu/cache operations. | 2 | * tsunami.S: High speed MicroSparc-I mmu/cache operations. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index 754c622548a5..6dfcc13d3100 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: viking.S,v 1.19 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * viking.S: High speed Viking cache/mmu operations | 2 | * viking.S: High speed Viking cache/mmu operations |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc/prom/Makefile b/arch/sparc/prom/Makefile index 2b217ee40703..7f5eacfcfbcf 100644 --- a/arch/sparc/prom/Makefile +++ b/arch/sparc/prom/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.8 2000/12/15 00:41:22 davem Exp $ | ||
2 | # Makefile for the Sun Boot PROM interface library under | 1 | # Makefile for the Sun Boot PROM interface library under |
3 | # Linux. | 2 | # Linux. |
4 | # | 3 | # |
diff --git a/arch/sparc/prom/bootstr.c b/arch/sparc/prom/bootstr.c index cfdeac2788d1..5a35c768ff7c 100644 --- a/arch/sparc/prom/bootstr.c +++ b/arch/sparc/prom/bootstr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bootstr.c,v 1.20 2000/02/08 20:24:23 davem Exp $ | 1 | /* |
2 | * bootstr.c: Boot string/argument acquisition from the PROM. | 2 | * bootstr.c: Boot string/argument acquisition from the PROM. |
3 | * | 3 | * |
4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c index 2a007a784415..790057a34616 100644 --- a/arch/sparc/prom/console.c +++ b/arch/sparc/prom/console.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: console.c,v 1.25 2001/10/30 04:54:22 davem Exp $ | 1 | /* |
2 | * console.c: Routines that deal with sending and receiving IO | 2 | * console.c: Routines that deal with sending and receiving IO |
3 | * to/from the current console device using the PROM. | 3 | * to/from the current console device using the PROM. |
4 | * | 4 | * |
diff --git a/arch/sparc/prom/devmap.c b/arch/sparc/prom/devmap.c index eb12073578ad..1e517915b0df 100644 --- a/arch/sparc/prom/devmap.c +++ b/arch/sparc/prom/devmap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: devmap.c,v 1.7 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * promdevmap.c: Map device/IO areas to virtual addresses. | 2 | * promdevmap.c: Map device/IO areas to virtual addresses. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/devops.c b/arch/sparc/prom/devops.c index 61919b54f6cc..9f1a95c91ad1 100644 --- a/arch/sparc/prom/devops.c +++ b/arch/sparc/prom/devops.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: devops.c,v 1.13 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * devops.c: Device operations using the PROM. | 2 | * devops.c: Device operations using the PROM. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c index 2fa3a474e3a2..729f87066945 100644 --- a/arch/sparc/prom/init.c +++ b/arch/sparc/prom/init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: init.c,v 1.14 2000/01/29 01:09:12 anton Exp $ | 1 | /* |
2 | * init.c: Initialize internal variables used by the PROM | 2 | * init.c: Initialize internal variables used by the PROM |
3 | * library functions. | 3 | * library functions. |
4 | * | 4 | * |
diff --git a/arch/sparc/prom/misc.c b/arch/sparc/prom/misc.c index d9fb3af41c1f..49b5057b9601 100644 --- a/arch/sparc/prom/misc.c +++ b/arch/sparc/prom/misc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: misc.c,v 1.18 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * misc.c: Miscellaneous prom functions that don't belong | 2 | * misc.c: Miscellaneous prom functions that don't belong |
3 | * anywhere else. | 3 | * anywhere else. |
4 | * | 4 | * |
diff --git a/arch/sparc/prom/mp.c b/arch/sparc/prom/mp.c index 92fe3739fdb8..4c4dc79f65af 100644 --- a/arch/sparc/prom/mp.c +++ b/arch/sparc/prom/mp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mp.c,v 1.12 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * mp.c: OpenBoot Prom Multiprocessor support routines. Don't call | 2 | * mp.c: OpenBoot Prom Multiprocessor support routines. Don't call |
3 | * these on a UP or else you will halt and catch fire. ;) | 3 | * these on a UP or else you will halt and catch fire. ;) |
4 | * | 4 | * |
diff --git a/arch/sparc/prom/palloc.c b/arch/sparc/prom/palloc.c index 84ce8bc54473..20be339cc2ce 100644 --- a/arch/sparc/prom/palloc.c +++ b/arch/sparc/prom/palloc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: palloc.c,v 1.4 1996/04/25 06:09:48 davem Exp $ | 1 | /* |
2 | * palloc.c: Memory allocation from the Sun PROM. | 2 | * palloc.c: Memory allocation from the Sun PROM. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/ranges.c b/arch/sparc/prom/ranges.c index a2920323c900..f9b7def35f6e 100644 --- a/arch/sparc/prom/ranges.c +++ b/arch/sparc/prom/ranges.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ranges.c,v 1.15 2001/12/19 00:29:51 davem Exp $ | 1 | /* |
2 | * ranges.c: Handle ranges in newer proms for obio/sbus. | 2 | * ranges.c: Handle ranges in newer proms for obio/sbus. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/segment.c b/arch/sparc/prom/segment.c index 09d6460165ab..04fd03a7f926 100644 --- a/arch/sparc/prom/segment.c +++ b/arch/sparc/prom/segment.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: segment.c,v 1.7 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * segment.c: Prom routine to map segments in other contexts before | 2 | * segment.c: Prom routine to map segments in other contexts before |
3 | * a standalone is completely mapped. This is for sun4 and | 3 | * a standalone is completely mapped. This is for sun4 and |
4 | * sun4c architectures only. | 4 | * sun4c architectures only. |
diff --git a/arch/sparc/prom/tree.c b/arch/sparc/prom/tree.c index 5ec246573a98..f228fe057b24 100644 --- a/arch/sparc/prom/tree.c +++ b/arch/sparc/prom/tree.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: tree.c,v 1.26 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * tree.c: Basic device tree traversal/scanning for the Linux | 2 | * tree.c: Basic device tree traversal/scanning for the Linux |
3 | * prom library. | 3 | * prom library. |
4 | * | 4 | * |
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index 9cb75c852b45..4b8f2b084c21 100644 --- a/arch/sparc64/Makefile +++ b/arch/sparc64/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.52 2002/02/09 19:49:31 davem Exp $ | ||
2 | # sparc64/Makefile | 1 | # sparc64/Makefile |
3 | # | 2 | # |
4 | # Makefile for the architecture dependent flags and dependencies on the | 3 | # Makefile for the architecture dependent flags and dependencies on the |
diff --git a/arch/sparc64/boot/Makefile b/arch/sparc64/boot/Makefile index 6968a6da57da..0458b5244f09 100644 --- a/arch/sparc64/boot/Makefile +++ b/arch/sparc64/boot/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.4 1997/12/15 20:08:56 ecd Exp $ | ||
2 | # Makefile for the Sparc64 boot stuff. | 1 | # Makefile for the Sparc64 boot stuff. |
3 | # | 2 | # |
4 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/boot/piggyback.c b/arch/sparc64/boot/piggyback.c index 36f907408c60..de364bfed0bb 100644 --- a/arch/sparc64/boot/piggyback.c +++ b/arch/sparc64/boot/piggyback.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: piggyback.c,v 1.2 2000/09/19 14:34:39 anton Exp $ | 1 | /* |
2 | Simple utility to make a single-image install kernel with initial ramdisk | 2 | Simple utility to make a single-image install kernel with initial ramdisk |
3 | for Sparc64 tftpbooting without need to set up nfs. | 3 | for Sparc64 tftpbooting without need to set up nfs. |
4 | 4 | ||
diff --git a/arch/sparc64/kernel/dtlb_prot.S b/arch/sparc64/kernel/dtlb_prot.S index e0a920162604..b2c2c5be281c 100644 --- a/arch/sparc64/kernel/dtlb_prot.S +++ b/arch/sparc64/kernel/dtlb_prot.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: dtlb_prot.S,v 1.22 2001/04/11 23:40:32 davem Exp $ | 1 | /* |
2 | * dtlb_prot.S: DTLB protection trap strategy. | 2 | * dtlb_prot.S: DTLB protection trap strategy. |
3 | * This is included directly into the trap table. | 3 | * This is included directly into the trap table. |
4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index bc2632274840..c49d0388b793 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ebus.c,v 1.64 2001/11/08 04:41:33 davem Exp $ | 1 | /* |
2 | * ebus.c: PCI to EBus bridge device. | 2 | * ebus.c: PCI to EBus bridge device. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S index f25e1da3fd03..29ce489bc188 100644 --- a/arch/sparc64/kernel/etrap.S +++ b/arch/sparc64/kernel/etrap.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: etrap.S,v 1.46 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
2 | * etrap.S: Preparing for entry into the kernel on Sparc V9. | 2 | * etrap.S: Preparing for entry into the kernel on Sparc V9. |
3 | * | 3 | * |
4 | * Copyright (C) 1996, 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996, 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/idprom.c b/arch/sparc64/kernel/idprom.c index 3b6789e09a72..5b45a808c621 100644 --- a/arch/sparc64/kernel/idprom.c +++ b/arch/sparc64/kernel/idprom.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: idprom.c,v 1.3 1999/08/31 06:54:53 davem Exp $ | 1 | /* |
2 | * idprom.c: Routines to load the idprom into kernel addresses and | 2 | * idprom.c: Routines to load the idprom into kernel addresses and |
3 | * interpret the data contained within. | 3 | * interpret the data contained within. |
4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/init_task.c b/arch/sparc64/kernel/init_task.c index 90007cf88bac..d2b312381c19 100644 --- a/arch/sparc64/kernel/init_task.c +++ b/arch/sparc64/kernel/init_task.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <asm/processor.h> | 10 | #include <asm/processor.h> |
11 | 11 | ||
12 | static struct fs_struct init_fs = INIT_FS; | 12 | static struct fs_struct init_fs = INIT_FS; |
13 | static struct files_struct init_files = INIT_FILES; | ||
14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
16 | struct mm_struct init_mm = INIT_MM(init_mm); | 15 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 4129c0449856..2084f81a76e1 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* arch/sparc64/kernel/process.c | 1 | /* arch/sparc64/kernel/process.c |
2 | * | 2 | * |
3 | * Copyright (C) 1995, 1996 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1995, 1996, 2008 David S. Miller (davem@davemloft.net) |
4 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) |
5 | * Copyright (C) 1997, 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 5 | * Copyright (C) 1997, 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
6 | */ | 6 | */ |
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
31 | #include <linux/cpu.h> | 31 | #include <linux/cpu.h> |
32 | #include <linux/elfcore.h> | 32 | #include <linux/elfcore.h> |
33 | #include <linux/sysrq.h> | ||
33 | 34 | ||
34 | #include <asm/oplib.h> | 35 | #include <asm/oplib.h> |
35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
@@ -49,6 +50,8 @@ | |||
49 | #include <asm/sstate.h> | 50 | #include <asm/sstate.h> |
50 | #include <asm/reboot.h> | 51 | #include <asm/reboot.h> |
51 | #include <asm/syscalls.h> | 52 | #include <asm/syscalls.h> |
53 | #include <asm/irq_regs.h> | ||
54 | #include <asm/smp.h> | ||
52 | 55 | ||
53 | /* #define VERBOSE_SHOWREGS */ | 56 | /* #define VERBOSE_SHOWREGS */ |
54 | 57 | ||
@@ -298,6 +301,118 @@ void show_regs(struct pt_regs *regs) | |||
298 | #endif | 301 | #endif |
299 | } | 302 | } |
300 | 303 | ||
304 | #ifdef CONFIG_MAGIC_SYSRQ | ||
305 | struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; | ||
306 | static DEFINE_SPINLOCK(global_reg_snapshot_lock); | ||
307 | |||
308 | static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs, | ||
309 | int this_cpu) | ||
310 | { | ||
311 | flushw_all(); | ||
312 | |||
313 | global_reg_snapshot[this_cpu].tstate = regs->tstate; | ||
314 | global_reg_snapshot[this_cpu].tpc = regs->tpc; | ||
315 | global_reg_snapshot[this_cpu].tnpc = regs->tnpc; | ||
316 | global_reg_snapshot[this_cpu].o7 = regs->u_regs[UREG_I7]; | ||
317 | |||
318 | if (regs->tstate & TSTATE_PRIV) { | ||
319 | struct reg_window *rw; | ||
320 | |||
321 | rw = (struct reg_window *) | ||
322 | (regs->u_regs[UREG_FP] + STACK_BIAS); | ||
323 | global_reg_snapshot[this_cpu].i7 = rw->ins[6]; | ||
324 | } else | ||
325 | global_reg_snapshot[this_cpu].i7 = 0; | ||
326 | |||
327 | global_reg_snapshot[this_cpu].thread = tp; | ||
328 | } | ||
329 | |||
330 | /* In order to avoid hangs we do not try to synchronize with the | ||
331 | * global register dump client cpus. The last store they make is to | ||
332 | * the thread pointer, so do a short poll waiting for that to become | ||
333 | * non-NULL. | ||
334 | */ | ||
335 | static void __global_reg_poll(struct global_reg_snapshot *gp) | ||
336 | { | ||
337 | int limit = 0; | ||
338 | |||
339 | while (!gp->thread && ++limit < 100) { | ||
340 | barrier(); | ||
341 | udelay(1); | ||
342 | } | ||
343 | } | ||
344 | |||
345 | static void sysrq_handle_globreg(int key, struct tty_struct *tty) | ||
346 | { | ||
347 | struct thread_info *tp = current_thread_info(); | ||
348 | struct pt_regs *regs = get_irq_regs(); | ||
349 | #ifdef CONFIG_KALLSYMS | ||
350 | char buffer[KSYM_SYMBOL_LEN]; | ||
351 | #endif | ||
352 | unsigned long flags; | ||
353 | int this_cpu, cpu; | ||
354 | |||
355 | if (!regs) | ||
356 | regs = tp->kregs; | ||
357 | |||
358 | spin_lock_irqsave(&global_reg_snapshot_lock, flags); | ||
359 | |||
360 | memset(global_reg_snapshot, 0, sizeof(global_reg_snapshot)); | ||
361 | |||
362 | this_cpu = raw_smp_processor_id(); | ||
363 | |||
364 | __global_reg_self(tp, regs, this_cpu); | ||
365 | |||
366 | smp_fetch_global_regs(); | ||
367 | |||
368 | for_each_online_cpu(cpu) { | ||
369 | struct global_reg_snapshot *gp = &global_reg_snapshot[cpu]; | ||
370 | struct thread_info *tp; | ||
371 | |||
372 | __global_reg_poll(gp); | ||
373 | |||
374 | tp = gp->thread; | ||
375 | printk("%c CPU[%3d]: TSTATE[%016lx] TPC[%016lx] TNPC[%016lx] TASK[%s:%d]\n", | ||
376 | (cpu == this_cpu ? '*' : ' '), cpu, | ||
377 | gp->tstate, gp->tpc, gp->tnpc, | ||
378 | ((tp && tp->task) ? tp->task->comm : "NULL"), | ||
379 | ((tp && tp->task) ? tp->task->pid : -1)); | ||
380 | #ifdef CONFIG_KALLSYMS | ||
381 | if (gp->tstate & TSTATE_PRIV) { | ||
382 | sprint_symbol(buffer, gp->tpc); | ||
383 | printk(" TPC[%s] ", buffer); | ||
384 | sprint_symbol(buffer, gp->o7); | ||
385 | printk("O7[%s] ", buffer); | ||
386 | sprint_symbol(buffer, gp->i7); | ||
387 | printk("I7[%s]\n", buffer); | ||
388 | } else | ||
389 | #endif | ||
390 | { | ||
391 | printk(" TPC[%lx] O7[%lx] I7[%lx]\n", | ||
392 | gp->tpc, gp->o7, gp->i7); | ||
393 | } | ||
394 | } | ||
395 | |||
396 | memset(global_reg_snapshot, 0, sizeof(global_reg_snapshot)); | ||
397 | |||
398 | spin_unlock_irqrestore(&global_reg_snapshot_lock, flags); | ||
399 | } | ||
400 | |||
401 | static struct sysrq_key_op sparc_globalreg_op = { | ||
402 | .handler = sysrq_handle_globreg, | ||
403 | .help_msg = "Globalregs", | ||
404 | .action_msg = "Show Global CPU Regs", | ||
405 | }; | ||
406 | |||
407 | static int __init sparc_globreg_init(void) | ||
408 | { | ||
409 | return register_sysrq_key('y', &sparc_globalreg_op); | ||
410 | } | ||
411 | |||
412 | core_initcall(sparc_globreg_init); | ||
413 | |||
414 | #endif | ||
415 | |||
301 | unsigned long thread_saved_pc(struct task_struct *tsk) | 416 | unsigned long thread_saved_pc(struct task_struct *tsk) |
302 | { | 417 | { |
303 | struct thread_info *ti = task_thread_info(tsk); | 418 | struct thread_info *ti = task_thread_info(tsk); |
@@ -542,20 +657,39 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
542 | struct task_struct *p, struct pt_regs *regs) | 657 | struct task_struct *p, struct pt_regs *regs) |
543 | { | 658 | { |
544 | struct thread_info *t = task_thread_info(p); | 659 | struct thread_info *t = task_thread_info(p); |
660 | struct sparc_stackf *parent_sf; | ||
661 | unsigned long child_stack_sz; | ||
545 | char *child_trap_frame; | 662 | char *child_trap_frame; |
663 | int kernel_thread; | ||
546 | 664 | ||
547 | /* Calculate offset to stack_frame & pt_regs */ | 665 | kernel_thread = (regs->tstate & TSTATE_PRIV) ? 1 : 0; |
548 | child_trap_frame = task_stack_page(p) + (THREAD_SIZE - (TRACEREG_SZ+STACKFRAME_SZ)); | 666 | parent_sf = ((struct sparc_stackf *) regs) - 1; |
549 | memcpy(child_trap_frame, (((struct sparc_stackf *)regs)-1), (TRACEREG_SZ+STACKFRAME_SZ)); | ||
550 | 667 | ||
551 | t->flags = (t->flags & ~((0xffUL << TI_FLAG_CWP_SHIFT) | (0xffUL << TI_FLAG_CURRENT_DS_SHIFT))) | | 668 | /* Calculate offset to stack_frame & pt_regs */ |
669 | child_stack_sz = ((STACKFRAME_SZ + TRACEREG_SZ) + | ||
670 | (kernel_thread ? STACKFRAME_SZ : 0)); | ||
671 | child_trap_frame = (task_stack_page(p) + | ||
672 | (THREAD_SIZE - child_stack_sz)); | ||
673 | memcpy(child_trap_frame, parent_sf, child_stack_sz); | ||
674 | |||
675 | t->flags = (t->flags & ~((0xffUL << TI_FLAG_CWP_SHIFT) | | ||
676 | (0xffUL << TI_FLAG_CURRENT_DS_SHIFT))) | | ||
552 | (((regs->tstate + 1) & TSTATE_CWP) << TI_FLAG_CWP_SHIFT); | 677 | (((regs->tstate + 1) & TSTATE_CWP) << TI_FLAG_CWP_SHIFT); |
553 | t->new_child = 1; | 678 | t->new_child = 1; |
554 | t->ksp = ((unsigned long) child_trap_frame) - STACK_BIAS; | 679 | t->ksp = ((unsigned long) child_trap_frame) - STACK_BIAS; |
555 | t->kregs = (struct pt_regs *)(child_trap_frame+sizeof(struct sparc_stackf)); | 680 | t->kregs = (struct pt_regs *) (child_trap_frame + |
681 | sizeof(struct sparc_stackf)); | ||
556 | t->fpsaved[0] = 0; | 682 | t->fpsaved[0] = 0; |
557 | 683 | ||
558 | if (regs->tstate & TSTATE_PRIV) { | 684 | if (kernel_thread) { |
685 | struct sparc_stackf *child_sf = (struct sparc_stackf *) | ||
686 | (child_trap_frame + (STACKFRAME_SZ + TRACEREG_SZ)); | ||
687 | |||
688 | /* Zero terminate the stack backtrace. */ | ||
689 | child_sf->fp = NULL; | ||
690 | t->kregs->u_regs[UREG_FP] = | ||
691 | ((unsigned long) child_sf) - STACK_BIAS; | ||
692 | |||
559 | /* Special case, if we are spawning a kernel thread from | 693 | /* Special case, if we are spawning a kernel thread from |
560 | * a userspace task (via KMOD, NFS, or similar) we must | 694 | * a userspace task (via KMOD, NFS, or similar) we must |
561 | * disable performance counters in the child because the | 695 | * disable performance counters in the child because the |
@@ -566,12 +700,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
566 | t->pcr_reg = 0; | 700 | t->pcr_reg = 0; |
567 | t->flags &= ~_TIF_PERFCTR; | 701 | t->flags &= ~_TIF_PERFCTR; |
568 | } | 702 | } |
569 | t->kregs->u_regs[UREG_FP] = t->ksp; | ||
570 | t->flags |= ((long)ASI_P << TI_FLAG_CURRENT_DS_SHIFT); | 703 | t->flags |= ((long)ASI_P << TI_FLAG_CURRENT_DS_SHIFT); |
571 | flush_register_windows(); | ||
572 | memcpy((void *)(t->ksp + STACK_BIAS), | ||
573 | (void *)(regs->u_regs[UREG_FP] + STACK_BIAS), | ||
574 | sizeof(struct sparc_stackf)); | ||
575 | t->kregs->u_regs[UREG_G6] = (unsigned long) t; | 704 | t->kregs->u_regs[UREG_G6] = (unsigned long) t; |
576 | t->kregs->u_regs[UREG_G4] = (unsigned long) t->task; | 705 | t->kregs->u_regs[UREG_G4] = (unsigned long) t->task; |
577 | } else { | 706 | } else { |
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index 16689b2930db..c6fc695fe1fe 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rtrap.S,v 1.61 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * rtrap.S: Preparing for return from trap on Sparc V9. | 2 | * rtrap.S: Preparing for return from trap on Sparc V9. |
3 | * | 3 | * |
4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
@@ -363,6 +363,7 @@ kern_rtt: rdpr %canrestore, %g1 | |||
363 | brz,pn %g1, kern_rtt_fill | 363 | brz,pn %g1, kern_rtt_fill |
364 | nop | 364 | nop |
365 | kern_rtt_restore: | 365 | kern_rtt_restore: |
366 | stw %g0, [%sp + PTREGS_OFF + PT_V9_MAGIC] | ||
366 | restore | 367 | restore |
367 | retry | 368 | retry |
368 | 369 | ||
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index fa2827c4a3ad..e33a8a660e9e 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sbus.c,v 1.19 2002/01/23 11:27:32 davem Exp $ | 1 | /* |
2 | * sbus.c: UltraSparc SBUS controller support. | 2 | * sbus.c: UltraSparc SBUS controller support. |
3 | * | 3 | * |
4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index da5e6ee0c661..c8b03a4f68bf 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: setup.c,v 1.72 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
2 | * linux/arch/sparc64/kernel/setup.c | 2 | * linux/arch/sparc64/kernel/setup.c |
3 | * | 3 | * |
4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 6e4dc67d16af..9667e96fd513 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: signal.c,v 1.60 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * arch/sparc64/kernel/signal.c | 2 | * arch/sparc64/kernel/signal.c |
3 | * | 3 | * |
4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 0d6403a630ac..fa63c68a1819 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
@@ -900,6 +900,9 @@ extern unsigned long xcall_flush_tlb_mm; | |||
900 | extern unsigned long xcall_flush_tlb_pending; | 900 | extern unsigned long xcall_flush_tlb_pending; |
901 | extern unsigned long xcall_flush_tlb_kernel_range; | 901 | extern unsigned long xcall_flush_tlb_kernel_range; |
902 | extern unsigned long xcall_report_regs; | 902 | extern unsigned long xcall_report_regs; |
903 | #ifdef CONFIG_MAGIC_SYSRQ | ||
904 | extern unsigned long xcall_fetch_glob_regs; | ||
905 | #endif | ||
903 | extern unsigned long xcall_receive_signal; | 906 | extern unsigned long xcall_receive_signal; |
904 | extern unsigned long xcall_new_mmu_context_version; | 907 | extern unsigned long xcall_new_mmu_context_version; |
905 | #ifdef CONFIG_KGDB | 908 | #ifdef CONFIG_KGDB |
@@ -1080,6 +1083,13 @@ void smp_report_regs(void) | |||
1080 | smp_cross_call(&xcall_report_regs, 0, 0, 0); | 1083 | smp_cross_call(&xcall_report_regs, 0, 0, 0); |
1081 | } | 1084 | } |
1082 | 1085 | ||
1086 | #ifdef CONFIG_MAGIC_SYSRQ | ||
1087 | void smp_fetch_global_regs(void) | ||
1088 | { | ||
1089 | smp_cross_call(&xcall_fetch_glob_regs, 0, 0, 0); | ||
1090 | } | ||
1091 | #endif | ||
1092 | |||
1083 | /* We know that the window frames of the user have been flushed | 1093 | /* We know that the window frames of the user have been flushed |
1084 | * to the stack before we get here because all callers of us | 1094 | * to the stack before we get here because all callers of us |
1085 | * are flush_tlb_*() routines, and these run after flush_cache_*() | 1095 | * are flush_tlb_*() routines, and these run after flush_cache_*() |
diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c index 01b52f561af4..c73ce3f4197e 100644 --- a/arch/sparc64/kernel/stacktrace.c +++ b/arch/sparc64/kernel/stacktrace.c | |||
@@ -19,7 +19,7 @@ void save_stack_trace(struct stack_trace *trace) | |||
19 | fp = ksp + STACK_BIAS; | 19 | fp = ksp + STACK_BIAS; |
20 | thread_base = (unsigned long) tp; | 20 | thread_base = (unsigned long) tp; |
21 | do { | 21 | do { |
22 | struct reg_window *rw; | 22 | struct sparc_stackf *sf; |
23 | struct pt_regs *regs; | 23 | struct pt_regs *regs; |
24 | unsigned long pc; | 24 | unsigned long pc; |
25 | 25 | ||
@@ -28,15 +28,17 @@ void save_stack_trace(struct stack_trace *trace) | |||
28 | fp >= (thread_base + THREAD_SIZE)) | 28 | fp >= (thread_base + THREAD_SIZE)) |
29 | break; | 29 | break; |
30 | 30 | ||
31 | rw = (struct reg_window *) fp; | 31 | sf = (struct sparc_stackf *) fp; |
32 | regs = (struct pt_regs *) (rw + 1); | 32 | regs = (struct pt_regs *) (sf + 1); |
33 | 33 | ||
34 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { | 34 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { |
35 | if (!(regs->tstate & TSTATE_PRIV)) | ||
36 | break; | ||
35 | pc = regs->tpc; | 37 | pc = regs->tpc; |
36 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; | 38 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; |
37 | } else { | 39 | } else { |
38 | pc = rw->ins[7]; | 40 | pc = sf->callers_pc; |
39 | fp = rw->ins[6] + STACK_BIAS; | 41 | fp = (unsigned long)sf->fp + STACK_BIAS; |
40 | } | 42 | } |
41 | 43 | ||
42 | if (trace->skip > 0) | 44 | if (trace->skip > 0) |
diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c index b930fee7708a..7461581b3bb9 100644 --- a/arch/sparc64/kernel/starfire.c +++ b/arch/sparc64/kernel/starfire.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: starfire.c,v 1.10 2001/04/14 21:13:45 davem Exp $ | 1 | /* |
2 | * starfire.c: Starfire/E10000 support. | 2 | * starfire.c: Starfire/E10000 support. |
3 | * | 3 | * |
4 | * Copyright (C) 1998 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1998 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S index 010a737908ee..ade18ba0c686 100644 --- a/arch/sparc64/kernel/sys32.S +++ b/arch/sparc64/kernel/sys32.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sys32.S,v 1.12 2000/03/24 04:17:37 davem Exp $ | 1 | /* |
2 | * sys32.S: I-cache tricks for 32-bit compatibility layer simple | 2 | * sys32.S: I-cache tricks for 32-bit compatibility layer simple |
3 | * conversions. | 3 | * conversions. |
4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index 56ff55211341..704a3afcfd06 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: trampoline.S,v 1.26 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
2 | * trampoline.S: Jump start slave processors on sparc64. | 2 | * trampoline.S: Jump start slave processors on sparc64. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index d9b8d46707d1..369749262653 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
@@ -2116,7 +2116,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
2116 | printk("\n"); | 2116 | printk("\n"); |
2117 | #endif | 2117 | #endif |
2118 | do { | 2118 | do { |
2119 | struct reg_window *rw; | 2119 | struct sparc_stackf *sf; |
2120 | struct pt_regs *regs; | 2120 | struct pt_regs *regs; |
2121 | unsigned long pc; | 2121 | unsigned long pc; |
2122 | 2122 | ||
@@ -2124,15 +2124,17 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
2124 | if (fp < (thread_base + sizeof(struct thread_info)) || | 2124 | if (fp < (thread_base + sizeof(struct thread_info)) || |
2125 | fp >= (thread_base + THREAD_SIZE)) | 2125 | fp >= (thread_base + THREAD_SIZE)) |
2126 | break; | 2126 | break; |
2127 | rw = (struct reg_window *)fp; | 2127 | sf = (struct sparc_stackf *) fp; |
2128 | regs = (struct pt_regs *) (rw + 1); | 2128 | regs = (struct pt_regs *) (sf + 1); |
2129 | 2129 | ||
2130 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { | 2130 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { |
2131 | if (!(regs->tstate & TSTATE_PRIV)) | ||
2132 | break; | ||
2131 | pc = regs->tpc; | 2133 | pc = regs->tpc; |
2132 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; | 2134 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; |
2133 | } else { | 2135 | } else { |
2134 | pc = rw->ins[7]; | 2136 | pc = sf->callers_pc; |
2135 | fp = rw->ins[6] + STACK_BIAS; | 2137 | fp = (unsigned long)sf->fp + STACK_BIAS; |
2136 | } | 2138 | } |
2137 | 2139 | ||
2138 | printk(" [%016lx] ", pc); | 2140 | printk(" [%016lx] ", pc); |
diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c index 1a511e9f0d3e..afa7fc4f5193 100644 --- a/arch/sparc64/kernel/unaligned.c +++ b/arch/sparc64/kernel/unaligned.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: unaligned.c,v 1.24 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * unaligned.c: Unaligned load/store trap handling with special | 2 | * unaligned.c: Unaligned load/store trap handling with special |
3 | * cases for the kernel to do them more quickly. | 3 | * cases for the kernel to do them more quickly. |
4 | * | 4 | * |
diff --git a/arch/sparc64/lib/PeeCeeI.c b/arch/sparc64/lib/PeeCeeI.c index 3c6cfbb20360..8b313f11bc8d 100644 --- a/arch/sparc64/lib/PeeCeeI.c +++ b/arch/sparc64/lib/PeeCeeI.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: PeeCeeI.c,v 1.4 1999/09/06 01:17:35 davem Exp $ | 1 | /* |
2 | * PeeCeeI.c: The emerging standard... | 2 | * PeeCeeI.c: The emerging standard... |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/lib/VISsave.S b/arch/sparc64/lib/VISsave.S index a0ded5c5aa5c..b320ae9e2e2e 100644 --- a/arch/sparc64/lib/VISsave.S +++ b/arch/sparc64/lib/VISsave.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: VISsave.S,v 1.6 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
2 | * VISsave.S: Code for saving FPU register state for | 2 | * VISsave.S: Code for saving FPU register state for |
3 | * VIS routines. One should not call this directly, | 3 | * VIS routines. One should not call this directly, |
4 | * but use macros provided in <asm/visasm.h>. | 4 | * but use macros provided in <asm/visasm.h>. |
diff --git a/arch/sparc64/lib/memcmp.S b/arch/sparc64/lib/memcmp.S index c90ad96c51b9..d3fdaa898566 100644 --- a/arch/sparc64/lib/memcmp.S +++ b/arch/sparc64/lib/memcmp.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: memcmp.S,v 1.3 2000/03/23 07:51:08 davem Exp $ | 1 | /* |
2 | * Sparc64 optimized memcmp code. | 2 | * Sparc64 optimized memcmp code. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/lib/memscan.S b/arch/sparc64/lib/memscan.S index 5e72d4911417..5686dfa5dc15 100644 --- a/arch/sparc64/lib/memscan.S +++ b/arch/sparc64/lib/memscan.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: memscan.S,v 1.3 2000/01/31 04:59:10 davem Exp $ | 1 | /* |
2 | * memscan.S: Optimized memscan for Sparc64. | 2 | * memscan.S: Optimized memscan for Sparc64. |
3 | * | 3 | * |
4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/lib/strncmp.S b/arch/sparc64/lib/strncmp.S index 6f14f53dbabe..980e83751556 100644 --- a/arch/sparc64/lib/strncmp.S +++ b/arch/sparc64/lib/strncmp.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: strncmp.S,v 1.2 1997/03/11 17:51:44 jj Exp $ | 1 | /* |
2 | * Sparc64 optimized strncmp code. | 2 | * Sparc64 optimized strncmp code. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/lib/strncpy_from_user.S b/arch/sparc64/lib/strncpy_from_user.S index b2f499f79427..511c8f136f95 100644 --- a/arch/sparc64/lib/strncpy_from_user.S +++ b/arch/sparc64/lib/strncpy_from_user.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: strncpy_from_user.S,v 1.6 1999/05/25 16:53:05 jj Exp $ | 1 | /* |
2 | * strncpy_from_user.S: Sparc64 strncpy from userspace. | 2 | * strncpy_from_user.S: Sparc64 strncpy from userspace. |
3 | * | 3 | * |
4 | * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/math-emu/math.c b/arch/sparc64/math-emu/math.c index 6ee496c2864a..add053e0f3b3 100644 --- a/arch/sparc64/math-emu/math.c +++ b/arch/sparc64/math-emu/math.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: math.c,v 1.11 1999/12/20 05:02:25 davem Exp $ | 1 | /* |
2 | * arch/sparc64/math-emu/math.c | 2 | * arch/sparc64/math-emu/math.c |
3 | * | 3 | * |
4 | * Copyright (C) 1997,1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997,1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/math-emu/sfp-util.h b/arch/sparc64/math-emu/sfp-util.h index 31e474738cf6..425d3cf01af4 100644 --- a/arch/sparc64/math-emu/sfp-util.h +++ b/arch/sparc64/math-emu/sfp-util.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sfp-util.h,v 1.5 2001/06/10 06:48:46 davem Exp $ | 1 | /* |
2 | * arch/sparc64/math-emu/sfp-util.h | 2 | * arch/sparc64/math-emu/sfp-util.h |
3 | * | 3 | * |
4 | * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/mm/Makefile b/arch/sparc64/mm/Makefile index e415bf942bcd..68d04c0370f4 100644 --- a/arch/sparc64/mm/Makefile +++ b/arch/sparc64/mm/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.8 2000/12/14 22:57:25 davem Exp $ | ||
2 | # Makefile for the linux Sparc64-specific parts of the memory manager. | 1 | # Makefile for the linux Sparc64-specific parts of the memory manager. |
3 | # | 2 | # |
4 | 3 | ||
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 2650d0d33ac2..236f4d228d2b 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fault.c,v 1.59 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. | 2 | * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/mm/generic.c b/arch/sparc64/mm/generic.c index af9d81db0b38..f362c2037013 100644 --- a/arch/sparc64/mm/generic.c +++ b/arch/sparc64/mm/generic.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: generic.c,v 1.18 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * generic.c: Generic Sparc mm routines that are not dependent upon | 2 | * generic.c: Generic Sparc mm routines that are not dependent upon |
3 | * MMU type but are Sparc specific. | 3 | * MMU type but are Sparc specific. |
4 | * | 4 | * |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 3c7b9471eafb..84898c44dd4d 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: init.c,v 1.209 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * arch/sparc64/mm/init.c | 2 | * arch/sparc64/mm/init.c |
3 | * | 3 | * |
4 | * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index 796e005dad8b..9bb2d90a9df6 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S | |||
@@ -1,7 +1,7 @@ | |||
1 | /* $Id: ultra.S,v 1.72 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * ultra.S: Don't expand these all over the place... | 2 | * ultra.S: Don't expand these all over the place... |
3 | * | 3 | * |
4 | * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1997, 2000, 2008 David S. Miller (davem@davemloft.net) |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
@@ -15,6 +15,7 @@ | |||
15 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
16 | #include <asm/cacheflush.h> | 16 | #include <asm/cacheflush.h> |
17 | #include <asm/hypervisor.h> | 17 | #include <asm/hypervisor.h> |
18 | #include <asm/cpudata.h> | ||
18 | 19 | ||
19 | /* Basically, most of the Spitfire vs. Cheetah madness | 20 | /* Basically, most of the Spitfire vs. Cheetah madness |
20 | * has to do with the fact that Cheetah does not support | 21 | * has to do with the fact that Cheetah does not support |
@@ -514,6 +515,32 @@ xcall_report_regs: | |||
514 | b rtrap_xcall | 515 | b rtrap_xcall |
515 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 | 516 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 |
516 | 517 | ||
518 | #ifdef CONFIG_MAGIC_SYSRQ | ||
519 | .globl xcall_fetch_glob_regs | ||
520 | xcall_fetch_glob_regs: | ||
521 | sethi %hi(global_reg_snapshot), %g1 | ||
522 | or %g1, %lo(global_reg_snapshot), %g1 | ||
523 | __GET_CPUID(%g2) | ||
524 | sllx %g2, 6, %g3 | ||
525 | add %g1, %g3, %g1 | ||
526 | rdpr %tstate, %g7 | ||
527 | stx %g7, [%g1 + GR_SNAP_TSTATE] | ||
528 | rdpr %tpc, %g7 | ||
529 | stx %g7, [%g1 + GR_SNAP_TPC] | ||
530 | rdpr %tnpc, %g7 | ||
531 | stx %g7, [%g1 + GR_SNAP_TNPC] | ||
532 | stx %o7, [%g1 + GR_SNAP_O7] | ||
533 | stx %i7, [%g1 + GR_SNAP_I7] | ||
534 | sethi %hi(trap_block), %g7 | ||
535 | or %g7, %lo(trap_block), %g7 | ||
536 | sllx %g2, TRAP_BLOCK_SZ_SHIFT, %g2 | ||
537 | add %g7, %g2, %g7 | ||
538 | ldx [%g7 + TRAP_PER_CPU_THREAD], %g3 | ||
539 | membar #StoreStore | ||
540 | stx %g3, [%g1 + GR_SNAP_THREAD] | ||
541 | retry | ||
542 | #endif /* CONFIG_MAGIC_SYSRQ */ | ||
543 | |||
517 | #ifdef DCACHE_ALIASING_POSSIBLE | 544 | #ifdef DCACHE_ALIASING_POSSIBLE |
518 | .align 32 | 545 | .align 32 |
519 | .globl xcall_flush_dcache_page_cheetah | 546 | .globl xcall_flush_dcache_page_cheetah |
diff --git a/arch/sparc64/prom/Makefile b/arch/sparc64/prom/Makefile index 3d33ed27bc27..8c94483ca54d 100644 --- a/arch/sparc64/prom/Makefile +++ b/arch/sparc64/prom/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.7 2000/12/14 22:57:25 davem Exp $ | ||
2 | # Makefile for the Sun Boot PROM interface library under | 1 | # Makefile for the Sun Boot PROM interface library under |
3 | # Linux. | 2 | # Linux. |
4 | # | 3 | # |
diff --git a/arch/sparc64/prom/bootstr.c b/arch/sparc64/prom/bootstr.c index a7278614e99d..ab9ccc63b388 100644 --- a/arch/sparc64/prom/bootstr.c +++ b/arch/sparc64/prom/bootstr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bootstr.c,v 1.6 1999/08/31 06:55:01 davem Exp $ | 1 | /* |
2 | * bootstr.c: Boot string/argument acquisition from the PROM. | 2 | * bootstr.c: Boot string/argument acquisition from the PROM. |
3 | * | 3 | * |
4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/prom/devops.c b/arch/sparc64/prom/devops.c index 4641839eb39a..9dbd803e46e1 100644 --- a/arch/sparc64/prom/devops.c +++ b/arch/sparc64/prom/devops.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: devops.c,v 1.3 1997/10/29 07:43:28 ecd Exp $ | 1 | /* |
2 | * devops.c: Device operations using the PROM. | 2 | * devops.c: Device operations using the PROM. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/prom/init.c b/arch/sparc64/prom/init.c index 87e7c7ea0ee6..7b00f89490a4 100644 --- a/arch/sparc64/prom/init.c +++ b/arch/sparc64/prom/init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: init.c,v 1.10 1999/09/21 14:35:59 davem Exp $ | 1 | /* |
2 | * init.c: Initialize internal variables used by the PROM | 2 | * init.c: Initialize internal variables used by the PROM |
3 | * library functions. | 3 | * library functions. |
4 | * | 4 | * |
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 47a877a15abd..9b0c0760901e 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: misc.c,v 1.20 2001/09/21 03:17:07 kanoj Exp $ | 1 | /* |
2 | * misc.c: Miscellaneous prom functions that don't belong | 2 | * misc.c: Miscellaneous prom functions that don't belong |
3 | * anywhere else. | 3 | * anywhere else. |
4 | * | 4 | * |
diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc64/prom/p1275.c index 7fcccc0e19cf..4b7c937bba61 100644 --- a/arch/sparc64/prom/p1275.c +++ b/arch/sparc64/prom/p1275.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: p1275.c,v 1.22 2001/10/18 09:40:00 davem Exp $ | 1 | /* |
2 | * p1275.c: Sun IEEE 1275 PROM low level interface routines | 2 | * p1275.c: Sun IEEE 1275 PROM low level interface routines |
3 | * | 3 | * |
4 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/prom/tree.c b/arch/sparc64/prom/tree.c index a99ccd7fb1b0..281aea44790b 100644 --- a/arch/sparc64/prom/tree.c +++ b/arch/sparc64/prom/tree.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: tree.c,v 1.10 1998/01/10 22:39:00 ecd Exp $ | 1 | /* |
2 | * tree.c: Basic device tree traversal/scanning for the Linux | 2 | * tree.c: Basic device tree traversal/scanning for the Linux |
3 | * prom library. | 3 | * prom library. |
4 | * | 4 | * |
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index dba8e05f0287..6976812cfb18 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -259,6 +259,8 @@ if BROKEN | |||
259 | source "drivers/mtd/Kconfig" | 259 | source "drivers/mtd/Kconfig" |
260 | endif | 260 | endif |
261 | 261 | ||
262 | source "drivers/leds/Kconfig" | ||
263 | |||
262 | #This is just to shut up some Kconfig warnings, so no prompt. | 264 | #This is just to shut up some Kconfig warnings, so no prompt. |
263 | config INPUT | 265 | config INPUT |
264 | bool | 266 | bool |
diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c index e9809356c530..5f903587d69e 100644 --- a/arch/um/drivers/pcap_user.c +++ b/arch/um/drivers/pcap_user.c | |||
@@ -50,7 +50,7 @@ static int pcap_open(void *data) | |||
50 | return -EIO; | 50 | return -EIO; |
51 | } | 51 | } |
52 | 52 | ||
53 | pri->compiled = kmalloc(sizeof(struct bpf_program), | 53 | pri->compiled = uml_kmalloc(sizeof(struct bpf_program), |
54 | UM_GFP_KERNEL); | 54 | UM_GFP_KERNEL); |
55 | if (pri->compiled == NULL) { | 55 | if (pri->compiled == NULL) { |
56 | printk(UM_KERN_ERR "pcap_open : kmalloc failed\n"); | 56 | printk(UM_KERN_ERR "pcap_open : kmalloc failed\n"); |
diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c index dcfceca95052..910eda8fca18 100644 --- a/arch/um/kernel/init_task.c +++ b/arch/um/kernel/init_task.c | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
14 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
15 | static struct files_struct init_files = INIT_FILES; | ||
16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
18 | EXPORT_SYMBOL(init_mm); | 17 | EXPORT_SYMBOL(init_mm); |
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c index 66e2a305a8d6..ccc02a616c22 100644 --- a/arch/um/kernel/ksyms.c +++ b/arch/um/kernel/ksyms.c | |||
@@ -60,6 +60,11 @@ EXPORT_SYMBOL(os_rcv_fd); | |||
60 | EXPORT_SYMBOL(run_helper); | 60 | EXPORT_SYMBOL(run_helper); |
61 | EXPORT_SYMBOL(start_thread); | 61 | EXPORT_SYMBOL(start_thread); |
62 | 62 | ||
63 | EXPORT_SYMBOL(add_sigio_fd); | ||
64 | EXPORT_SYMBOL(ignore_sigio_fd); | ||
65 | EXPORT_SYMBOL(deactivate_fd); | ||
66 | EXPORT_SYMBOL(sigio_broken); | ||
67 | |||
63 | #ifdef CONFIG_SMP | 68 | #ifdef CONFIG_SMP |
64 | 69 | ||
65 | /* required for SMP */ | 70 | /* required for SMP */ |
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c index c6183e7aec3d..b487cbead1bd 100644 --- a/arch/um/os-Linux/sys-i386/registers.c +++ b/arch/um/os-Linux/sys-i386/registers.c | |||
@@ -5,6 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <errno.h> | 7 | #include <errno.h> |
8 | #include <sys/ptrace.h> | ||
8 | #include <asm/user.h> | 9 | #include <asm/user.h> |
9 | #include "kern_constants.h" | 10 | #include "kern_constants.h" |
10 | #include "longjmp.h" | 11 | #include "longjmp.h" |
diff --git a/arch/um/sys-x86_64/ksyms.c b/arch/um/sys-x86_64/ksyms.c index 4d7d1a812d8f..6604673a849d 100644 --- a/arch/um/sys-x86_64/ksyms.c +++ b/arch/um/sys-x86_64/ksyms.c | |||
@@ -1,5 +1,7 @@ | |||
1 | #include "linux/module.h" | 1 | #include <linux/module.h> |
2 | #include "asm/string.h" | 2 | #include <asm/string.h> |
3 | #include <asm/checksum.h> | ||
3 | 4 | ||
4 | /*XXX: we need them because they would be exported by x86_64 */ | 5 | /*XXX: we need them because they would be exported by x86_64 */ |
5 | EXPORT_SYMBOL(__memcpy); | 6 | EXPORT_SYMBOL(__memcpy); |
7 | EXPORT_SYMBOL(csum_partial); | ||
diff --git a/arch/v850/kernel/init_task.c b/arch/v850/kernel/init_task.c index ed2f93cf7c66..44b274dff33f 100644 --- a/arch/v850/kernel/init_task.c +++ b/arch/v850/kernel/init_task.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
22 | 22 | ||
23 | static struct fs_struct init_fs = INIT_FS; | 23 | static struct fs_struct init_fs = INIT_FS; |
24 | static struct files_struct init_files = INIT_FILES; | ||
25 | static struct signal_struct init_signals = INIT_SIGNALS (init_signals); | 24 | static struct signal_struct init_signals = INIT_SIGNALS (init_signals); |
26 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 25 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
27 | struct mm_struct init_mm = INIT_MM (init_mm); | 26 | struct mm_struct init_mm = INIT_MM (init_mm); |
diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c index c1d00c0274c4..50e47cdbdddd 100644 --- a/arch/x86/boot/printf.c +++ b/arch/x86/boot/printf.c | |||
@@ -56,7 +56,7 @@ static char *number(char *str, long num, int base, int size, int precision, | |||
56 | if (type & LEFT) | 56 | if (type & LEFT) |
57 | type &= ~ZEROPAD; | 57 | type &= ~ZEROPAD; |
58 | if (base < 2 || base > 36) | 58 | if (base < 2 || base > 36) |
59 | return 0; | 59 | return NULL; |
60 | c = (type & ZEROPAD) ? '0' : ' '; | 60 | c = (type & ZEROPAD) ? '0' : ' '; |
61 | sign = 0; | 61 | sign = 0; |
62 | if (type & SIGN) { | 62 | if (type & SIGN) { |
diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c index 3d01e47777db..a4f93b4120c1 100644 --- a/arch/x86/kernel/init_task.c +++ b/arch/x86/kernel/init_task.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <asm/desc.h> | 11 | #include <asm/desc.h> |
12 | 12 | ||
13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
14 | static struct files_struct init_files = INIT_FILES; | ||
15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
17 | struct mm_struct init_mm = INIT_MM(init_mm); | 16 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 3324d90038e4..7c077a9d9777 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
@@ -216,7 +216,7 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu) | |||
216 | { | 216 | { |
217 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; | 217 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; |
218 | 218 | ||
219 | if (pit && vcpu->vcpu_id == 0) | 219 | if (pit && vcpu->vcpu_id == 0 && pit->pit_state.inject_pending) |
220 | return atomic_read(&pit->pit_state.pit_timer.pending); | 220 | return atomic_read(&pit->pit_state.pit_timer.pending); |
221 | 221 | ||
222 | return 0; | 222 | return 0; |
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 36809d79788b..c297c50eba63 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c | |||
@@ -957,7 +957,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu) | |||
957 | { | 957 | { |
958 | struct kvm_lapic *lapic = vcpu->arch.apic; | 958 | struct kvm_lapic *lapic = vcpu->arch.apic; |
959 | 959 | ||
960 | if (lapic) | 960 | if (lapic && apic_enabled(lapic) && apic_lvt_enabled(lapic, APIC_LVTT)) |
961 | return atomic_read(&lapic->timer.pending); | 961 | return atomic_read(&lapic->timer.pending); |
962 | 962 | ||
963 | return 0; | 963 | return 0; |
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c index f2a696d6a243..8a96320ab071 100644 --- a/arch/x86/kvm/x86_emulate.c +++ b/arch/x86/kvm/x86_emulate.c | |||
@@ -677,8 +677,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt, | |||
677 | c->use_modrm_ea = 1; | 677 | c->use_modrm_ea = 1; |
678 | 678 | ||
679 | if (c->modrm_mod == 3) { | 679 | if (c->modrm_mod == 3) { |
680 | c->modrm_val = *(unsigned long *) | 680 | c->modrm_ptr = decode_register(c->modrm_rm, |
681 | decode_register(c->modrm_rm, c->regs, c->d & ByteOp); | 681 | c->regs, c->d & ByteOp); |
682 | c->modrm_val = *(unsigned long *)c->modrm_ptr; | ||
682 | return rc; | 683 | return rc; |
683 | } | 684 | } |
684 | 685 | ||
@@ -1005,6 +1006,7 @@ done_prefixes: | |||
1005 | if ((c->d & ModRM) && c->modrm_mod == 3) { | 1006 | if ((c->d & ModRM) && c->modrm_mod == 3) { |
1006 | c->src.type = OP_REG; | 1007 | c->src.type = OP_REG; |
1007 | c->src.val = c->modrm_val; | 1008 | c->src.val = c->modrm_val; |
1009 | c->src.ptr = c->modrm_ptr; | ||
1008 | break; | 1010 | break; |
1009 | } | 1011 | } |
1010 | c->src.type = OP_MEM; | 1012 | c->src.type = OP_MEM; |
@@ -1049,6 +1051,7 @@ done_prefixes: | |||
1049 | if ((c->d & ModRM) && c->modrm_mod == 3) { | 1051 | if ((c->d & ModRM) && c->modrm_mod == 3) { |
1050 | c->dst.type = OP_REG; | 1052 | c->dst.type = OP_REG; |
1051 | c->dst.val = c->dst.orig_val = c->modrm_val; | 1053 | c->dst.val = c->dst.orig_val = c->modrm_val; |
1054 | c->dst.ptr = c->modrm_ptr; | ||
1052 | break; | 1055 | break; |
1053 | } | 1056 | } |
1054 | c->dst.type = OP_MEM; | 1057 | c->dst.type = OP_MEM; |
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 8545c8a9d107..6e64aaf00d1d 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
@@ -302,18 +302,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { | |||
302 | }, | 302 | }, |
303 | { | 303 | { |
304 | .callback = set_bf_sort, | 304 | .callback = set_bf_sort, |
305 | .ident = "HP ProLiant DL385 G2", | 305 | .ident = "HP ProLiant DL360", |
306 | .matches = { | 306 | .matches = { |
307 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 307 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
308 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), | 308 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"), |
309 | }, | 309 | }, |
310 | }, | 310 | }, |
311 | { | 311 | { |
312 | .callback = set_bf_sort, | 312 | .callback = set_bf_sort, |
313 | .ident = "HP ProLiant DL585 G2", | 313 | .ident = "HP ProLiant DL380", |
314 | .matches = { | 314 | .matches = { |
315 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 315 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
316 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), | 316 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"), |
317 | }, | 317 | }, |
318 | }, | 318 | }, |
319 | #ifdef __i386__ | 319 | #ifdef __i386__ |
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c index 021b4f46ff94..3df469dbe814 100644 --- a/arch/xtensa/kernel/init_task.c +++ b/arch/xtensa/kernel/init_task.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
23 | 23 | ||
24 | static struct fs_struct init_fs = INIT_FS; | 24 | static struct fs_struct init_fs = INIT_FS; |
25 | static struct files_struct init_files = INIT_FILES; | ||
26 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 25 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
27 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 26 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
28 | struct mm_struct init_mm = INIT_MM(init_mm); | 27 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c index e48a3ea03117..2509809a36cf 100644 --- a/drivers/acpi/dispatcher/dsmethod.c +++ b/drivers/acpi/dispatcher/dsmethod.c | |||
@@ -565,7 +565,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc, | |||
565 | 565 | ||
566 | acpi_os_release_mutex(method_desc->method. | 566 | acpi_os_release_mutex(method_desc->method. |
567 | mutex->mutex.os_mutex); | 567 | mutex->mutex.os_mutex); |
568 | method_desc->method.mutex->mutex.thread_id = 0; | 568 | method_desc->method.mutex->mutex.thread_id = NULL; |
569 | } | 569 | } |
570 | } | 570 | } |
571 | 571 | ||
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c index c873ab40cd0e..a8bf3d713e28 100644 --- a/drivers/acpi/executer/exmutex.c +++ b/drivers/acpi/executer/exmutex.c | |||
@@ -326,7 +326,7 @@ acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc) | |||
326 | 326 | ||
327 | /* Clear mutex info */ | 327 | /* Clear mutex info */ |
328 | 328 | ||
329 | obj_desc->mutex.thread_id = 0; | 329 | obj_desc->mutex.thread_id = NULL; |
330 | return_ACPI_STATUS(status); | 330 | return_ACPI_STATUS(status); |
331 | } | 331 | } |
332 | 332 | ||
@@ -463,7 +463,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread) | |||
463 | /* Mark mutex unowned */ | 463 | /* Mark mutex unowned */ |
464 | 464 | ||
465 | obj_desc->mutex.owner_thread = NULL; | 465 | obj_desc->mutex.owner_thread = NULL; |
466 | obj_desc->mutex.thread_id = 0; | 466 | obj_desc->mutex.thread_id = NULL; |
467 | 467 | ||
468 | /* Update Thread sync_level (Last mutex is the important one) */ | 468 | /* Update Thread sync_level (Last mutex is the important one) */ |
469 | 469 | ||
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 70b77e0899a8..dbf6ca781f66 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
@@ -118,8 +118,8 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap) | |||
118 | ap->pflags |= ATA_PFLAG_INIT_GTM_VALID; | 118 | ap->pflags |= ATA_PFLAG_INIT_GTM_VALID; |
119 | } | 119 | } |
120 | 120 | ||
121 | static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev, | 121 | static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device |
122 | u32 event) | 122 | *dev, u32 event) |
123 | { | 123 | { |
124 | char event_string[12]; | 124 | char event_string[12]; |
125 | char *envp[] = { event_string, NULL }; | 125 | char *envp[] = { event_string, NULL }; |
@@ -127,6 +127,9 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev, | |||
127 | struct kobject *kobj = NULL; | 127 | struct kobject *kobj = NULL; |
128 | int wait = 0; | 128 | int wait = 0; |
129 | unsigned long flags; | 129 | unsigned long flags; |
130 | acpi_handle handle, tmphandle; | ||
131 | unsigned long sta; | ||
132 | acpi_status status; | ||
130 | 133 | ||
131 | if (!ap) | 134 | if (!ap) |
132 | ap = dev->link->ap; | 135 | ap = dev->link->ap; |
@@ -134,32 +137,57 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev, | |||
134 | 137 | ||
135 | spin_lock_irqsave(ap->lock, flags); | 138 | spin_lock_irqsave(ap->lock, flags); |
136 | 139 | ||
140 | if (dev) | ||
141 | handle = dev->acpi_handle; | ||
142 | else | ||
143 | handle = ap->acpi_handle; | ||
144 | |||
145 | status = acpi_get_handle(handle, "_EJ0", &tmphandle); | ||
146 | if (ACPI_FAILURE(status)) { | ||
147 | /* This device is not ejectable */ | ||
148 | spin_unlock_irqrestore(ap->lock, flags); | ||
149 | return; | ||
150 | } | ||
151 | |||
152 | status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); | ||
153 | if (ACPI_FAILURE(status)) { | ||
154 | printk ("Unable to determine bay status\n"); | ||
155 | spin_unlock_irqrestore(ap->lock, flags); | ||
156 | return; | ||
157 | } | ||
158 | |||
137 | switch (event) { | 159 | switch (event) { |
138 | case ACPI_NOTIFY_BUS_CHECK: | 160 | case ACPI_NOTIFY_BUS_CHECK: |
139 | case ACPI_NOTIFY_DEVICE_CHECK: | 161 | case ACPI_NOTIFY_DEVICE_CHECK: |
140 | ata_ehi_push_desc(ehi, "ACPI event"); | 162 | ata_ehi_push_desc(ehi, "ACPI event"); |
141 | ata_ehi_hotplugged(ehi); | 163 | if (!sta) { |
142 | ata_port_freeze(ap); | 164 | /* Device has been unplugged */ |
143 | break; | 165 | if (dev) |
144 | 166 | dev->flags |= ATA_DFLAG_DETACH; | |
145 | case ACPI_NOTIFY_EJECT_REQUEST: | 167 | else { |
146 | ata_ehi_push_desc(ehi, "ACPI event"); | 168 | struct ata_link *tlink; |
147 | if (dev) | 169 | struct ata_device *tdev; |
148 | dev->flags |= ATA_DFLAG_DETACH; | 170 | |
149 | else { | 171 | ata_port_for_each_link(tlink, ap) { |
150 | struct ata_link *tlink; | 172 | ata_link_for_each_dev(tdev, tlink) { |
151 | struct ata_device *tdev; | 173 | tdev->flags |= |
152 | 174 | ATA_DFLAG_DETACH; | |
153 | ata_port_for_each_link(tlink, ap) | 175 | } |
154 | ata_link_for_each_dev(tdev, tlink) | 176 | } |
155 | tdev->flags |= ATA_DFLAG_DETACH; | 177 | } |
178 | ata_port_schedule_eh(ap); | ||
179 | wait = 1; | ||
180 | } else { | ||
181 | ata_ehi_hotplugged(ehi); | ||
182 | ata_port_freeze(ap); | ||
156 | } | 183 | } |
157 | |||
158 | ata_port_schedule_eh(ap); | ||
159 | wait = 1; | ||
160 | break; | ||
161 | } | 184 | } |
162 | 185 | ||
186 | spin_unlock_irqrestore(ap->lock, flags); | ||
187 | |||
188 | if (wait) | ||
189 | ata_port_wait_eh(ap); | ||
190 | |||
163 | if (dev) { | 191 | if (dev) { |
164 | if (dev->sdev) | 192 | if (dev->sdev) |
165 | kobj = &dev->sdev->sdev_gendev.kobj; | 193 | kobj = &dev->sdev->sdev_gendev.kobj; |
@@ -170,11 +198,6 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev, | |||
170 | sprintf(event_string, "BAY_EVENT=%d", event); | 198 | sprintf(event_string, "BAY_EVENT=%d", event); |
171 | kobject_uevent_env(kobj, KOBJ_CHANGE, envp); | 199 | kobject_uevent_env(kobj, KOBJ_CHANGE, envp); |
172 | } | 200 | } |
173 | |||
174 | spin_unlock_irqrestore(ap->lock, flags); | ||
175 | |||
176 | if (wait) | ||
177 | ata_port_wait_eh(ap); | ||
178 | } | 201 | } |
179 | 202 | ||
180 | static void ata_acpi_dev_notify(acpi_handle handle, u32 event, void *data) | 203 | static void ata_acpi_dev_notify(acpi_handle handle, u32 event, void *data) |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 927b692d723c..3c89f205c83f 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -2126,6 +2126,13 @@ int ata_dev_configure(struct ata_device *dev) | |||
2126 | dev->horkage |= ata_dev_blacklisted(dev); | 2126 | dev->horkage |= ata_dev_blacklisted(dev); |
2127 | ata_force_horkage(dev); | 2127 | ata_force_horkage(dev); |
2128 | 2128 | ||
2129 | if (dev->horkage & ATA_HORKAGE_DISABLE) { | ||
2130 | ata_dev_printk(dev, KERN_INFO, | ||
2131 | "unsupported device, disabling\n"); | ||
2132 | ata_dev_disable(dev); | ||
2133 | return 0; | ||
2134 | } | ||
2135 | |||
2129 | /* let ACPI work its magic */ | 2136 | /* let ACPI work its magic */ |
2130 | rc = ata_acpi_on_devcfg(dev); | 2137 | rc = ata_acpi_on_devcfg(dev); |
2131 | if (rc) | 2138 | if (rc) |
@@ -3490,22 +3497,11 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params, | |||
3490 | if ((rc = sata_link_debounce(link, params, deadline))) | 3497 | if ((rc = sata_link_debounce(link, params, deadline))) |
3491 | return rc; | 3498 | return rc; |
3492 | 3499 | ||
3493 | /* Clear SError. PMP and some host PHYs require this to | 3500 | /* clear SError, some PHYs require this even for SRST to work */ |
3494 | * operate and clearing should be done before checking PHY | ||
3495 | * online status to avoid race condition (hotplugging between | ||
3496 | * link resume and status check). | ||
3497 | */ | ||
3498 | if (!(rc = sata_scr_read(link, SCR_ERROR, &serror))) | 3501 | if (!(rc = sata_scr_read(link, SCR_ERROR, &serror))) |
3499 | rc = sata_scr_write(link, SCR_ERROR, serror); | 3502 | rc = sata_scr_write(link, SCR_ERROR, serror); |
3500 | if (rc == 0 || rc == -EINVAL) { | ||
3501 | unsigned long flags; | ||
3502 | 3503 | ||
3503 | spin_lock_irqsave(link->ap->lock, flags); | 3504 | return rc != -EINVAL ? rc : 0; |
3504 | link->eh_info.serror = 0; | ||
3505 | spin_unlock_irqrestore(link->ap->lock, flags); | ||
3506 | rc = 0; | ||
3507 | } | ||
3508 | return rc; | ||
3509 | } | 3505 | } |
3510 | 3506 | ||
3511 | /** | 3507 | /** |
@@ -3653,9 +3649,13 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing, | |||
3653 | if (check_ready) | 3649 | if (check_ready) |
3654 | rc = ata_wait_ready(link, deadline, check_ready); | 3650 | rc = ata_wait_ready(link, deadline, check_ready); |
3655 | out: | 3651 | out: |
3656 | if (rc && rc != -EAGAIN) | 3652 | if (rc && rc != -EAGAIN) { |
3653 | /* online is set iff link is online && reset succeeded */ | ||
3654 | if (online) | ||
3655 | *online = false; | ||
3657 | ata_link_printk(link, KERN_ERR, | 3656 | ata_link_printk(link, KERN_ERR, |
3658 | "COMRESET failed (errno=%d)\n", rc); | 3657 | "COMRESET failed (errno=%d)\n", rc); |
3658 | } | ||
3659 | DPRINTK("EXIT, rc=%d\n", rc); | 3659 | DPRINTK("EXIT, rc=%d\n", rc); |
3660 | return rc; | 3660 | return rc; |
3661 | } | 3661 | } |
@@ -3700,8 +3700,14 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class, | |||
3700 | */ | 3700 | */ |
3701 | void ata_std_postreset(struct ata_link *link, unsigned int *classes) | 3701 | void ata_std_postreset(struct ata_link *link, unsigned int *classes) |
3702 | { | 3702 | { |
3703 | u32 serror; | ||
3704 | |||
3703 | DPRINTK("ENTER\n"); | 3705 | DPRINTK("ENTER\n"); |
3704 | 3706 | ||
3707 | /* reset complete, clear SError */ | ||
3708 | if (!sata_scr_read(link, SCR_ERROR, &serror)) | ||
3709 | sata_scr_write(link, SCR_ERROR, serror); | ||
3710 | |||
3705 | /* print link status */ | 3711 | /* print link status */ |
3706 | sata_print_link_status(link); | 3712 | sata_print_link_status(link); |
3707 | 3713 | ||
@@ -3894,8 +3900,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { | |||
3894 | { "SAMSUNG CD-ROM SN-124", "N001", ATA_HORKAGE_NODMA }, | 3900 | { "SAMSUNG CD-ROM SN-124", "N001", ATA_HORKAGE_NODMA }, |
3895 | { "Seagate STT20000A", NULL, ATA_HORKAGE_NODMA }, | 3901 | { "Seagate STT20000A", NULL, ATA_HORKAGE_NODMA }, |
3896 | /* Odd clown on sil3726/4726 PMPs */ | 3902 | /* Odd clown on sil3726/4726 PMPs */ |
3897 | { "Config Disk", NULL, ATA_HORKAGE_NODMA | | 3903 | { "Config Disk", NULL, ATA_HORKAGE_DISABLE }, |
3898 | ATA_HORKAGE_SKIP_PM }, | ||
3899 | 3904 | ||
3900 | /* Weird ATAPI devices */ | 3905 | /* Weird ATAPI devices */ |
3901 | { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 }, | 3906 | { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 }, |
@@ -5616,7 +5621,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) | |||
5616 | spin_lock_irqsave(ap->lock, flags); | 5621 | spin_lock_irqsave(ap->lock, flags); |
5617 | 5622 | ||
5618 | ehi->probe_mask |= ATA_ALL_DEVICES; | 5623 | ehi->probe_mask |= ATA_ALL_DEVICES; |
5619 | ehi->action |= ATA_EH_RESET; | 5624 | ehi->action |= ATA_EH_RESET | ATA_EH_LPM; |
5620 | ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; | 5625 | ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; |
5621 | 5626 | ||
5622 | ap->pflags &= ~ATA_PFLAG_INITIALIZING; | 5627 | ap->pflags &= ~ATA_PFLAG_INITIALIZING; |
@@ -5649,7 +5654,6 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) | |||
5649 | struct ata_port *ap = host->ports[i]; | 5654 | struct ata_port *ap = host->ports[i]; |
5650 | 5655 | ||
5651 | ata_scsi_scan_host(ap, 1); | 5656 | ata_scsi_scan_host(ap, 1); |
5652 | ata_lpm_schedule(ap, ap->pm_policy); | ||
5653 | } | 5657 | } |
5654 | 5658 | ||
5655 | return 0; | 5659 | return 0; |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 62e033146bed..7894d83ea1eb 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -1308,12 +1308,7 @@ static void ata_eh_analyze_serror(struct ata_link *link) | |||
1308 | unsigned int err_mask = 0, action = 0; | 1308 | unsigned int err_mask = 0, action = 0; |
1309 | u32 hotplug_mask; | 1309 | u32 hotplug_mask; |
1310 | 1310 | ||
1311 | if (serror & SERR_PERSISTENT) { | 1311 | if (serror & (SERR_PERSISTENT | SERR_DATA)) { |
1312 | err_mask |= AC_ERR_ATA_BUS; | ||
1313 | action |= ATA_EH_RESET; | ||
1314 | } | ||
1315 | if (serror & | ||
1316 | (SERR_DATA_RECOVERED | SERR_COMM_RECOVERED | SERR_DATA)) { | ||
1317 | err_mask |= AC_ERR_ATA_BUS; | 1312 | err_mask |= AC_ERR_ATA_BUS; |
1318 | action |= ATA_EH_RESET; | 1313 | action |= ATA_EH_RESET; |
1319 | } | 1314 | } |
@@ -2047,19 +2042,11 @@ static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset, | |||
2047 | unsigned int *classes, unsigned long deadline) | 2042 | unsigned int *classes, unsigned long deadline) |
2048 | { | 2043 | { |
2049 | struct ata_device *dev; | 2044 | struct ata_device *dev; |
2050 | int rc; | ||
2051 | 2045 | ||
2052 | ata_link_for_each_dev(dev, link) | 2046 | ata_link_for_each_dev(dev, link) |
2053 | classes[dev->devno] = ATA_DEV_UNKNOWN; | 2047 | classes[dev->devno] = ATA_DEV_UNKNOWN; |
2054 | 2048 | ||
2055 | rc = reset(link, classes, deadline); | 2049 | return reset(link, classes, deadline); |
2056 | |||
2057 | /* convert all ATA_DEV_UNKNOWN to ATA_DEV_NONE */ | ||
2058 | ata_link_for_each_dev(dev, link) | ||
2059 | if (classes[dev->devno] == ATA_DEV_UNKNOWN) | ||
2060 | classes[dev->devno] = ATA_DEV_NONE; | ||
2061 | |||
2062 | return rc; | ||
2063 | } | 2050 | } |
2064 | 2051 | ||
2065 | static int ata_eh_followup_srst_needed(struct ata_link *link, | 2052 | static int ata_eh_followup_srst_needed(struct ata_link *link, |
@@ -2096,9 +2083,11 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
2096 | ata_reset_fn_t reset; | 2083 | ata_reset_fn_t reset; |
2097 | unsigned long flags; | 2084 | unsigned long flags; |
2098 | u32 sstatus; | 2085 | u32 sstatus; |
2099 | int rc; | 2086 | int nr_known, rc; |
2100 | 2087 | ||
2101 | /* about to reset */ | 2088 | /* |
2089 | * Prepare to reset | ||
2090 | */ | ||
2102 | spin_lock_irqsave(ap->lock, flags); | 2091 | spin_lock_irqsave(ap->lock, flags); |
2103 | ap->pflags |= ATA_PFLAG_RESETTING; | 2092 | ap->pflags |= ATA_PFLAG_RESETTING; |
2104 | spin_unlock_irqrestore(ap->lock, flags); | 2093 | spin_unlock_irqrestore(ap->lock, flags); |
@@ -2124,16 +2113,8 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
2124 | ap->ops->set_piomode(ap, dev); | 2113 | ap->ops->set_piomode(ap, dev); |
2125 | } | 2114 | } |
2126 | 2115 | ||
2127 | if (!softreset && !hardreset) { | ||
2128 | if (verbose) | ||
2129 | ata_link_printk(link, KERN_INFO, "no reset method " | ||
2130 | "available, skipping reset\n"); | ||
2131 | if (!(lflags & ATA_LFLAG_ASSUME_CLASS)) | ||
2132 | lflags |= ATA_LFLAG_ASSUME_ATA; | ||
2133 | goto done; | ||
2134 | } | ||
2135 | |||
2136 | /* prefer hardreset */ | 2116 | /* prefer hardreset */ |
2117 | reset = NULL; | ||
2137 | ehc->i.action &= ~ATA_EH_RESET; | 2118 | ehc->i.action &= ~ATA_EH_RESET; |
2138 | if (hardreset) { | 2119 | if (hardreset) { |
2139 | reset = hardreset; | 2120 | reset = hardreset; |
@@ -2141,11 +2122,6 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
2141 | } else if (softreset) { | 2122 | } else if (softreset) { |
2142 | reset = softreset; | 2123 | reset = softreset; |
2143 | ehc->i.action = ATA_EH_SOFTRESET; | 2124 | ehc->i.action = ATA_EH_SOFTRESET; |
2144 | } else { | ||
2145 | ata_link_printk(link, KERN_ERR, "BUG: no reset method, " | ||
2146 | "please report to linux-ide@vger.kernel.org\n"); | ||
2147 | dump_stack(); | ||
2148 | return -EINVAL; | ||
2149 | } | 2125 | } |
2150 | 2126 | ||
2151 | if (prereset) { | 2127 | if (prereset) { |
@@ -2165,55 +2141,71 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
2165 | "prereset failed (errno=%d)\n", rc); | 2141 | "prereset failed (errno=%d)\n", rc); |
2166 | goto out; | 2142 | goto out; |
2167 | } | 2143 | } |
2168 | } | ||
2169 | 2144 | ||
2170 | /* prereset() might have cleared ATA_EH_RESET */ | 2145 | /* prereset() might have cleared ATA_EH_RESET. If so, |
2171 | if (!(ehc->i.action & ATA_EH_RESET)) { | 2146 | * bang classes and return. |
2172 | /* prereset told us not to reset, bang classes and return */ | 2147 | */ |
2173 | ata_link_for_each_dev(dev, link) | 2148 | if (reset && !(ehc->i.action & ATA_EH_RESET)) { |
2174 | classes[dev->devno] = ATA_DEV_NONE; | 2149 | ata_link_for_each_dev(dev, link) |
2175 | rc = 0; | 2150 | classes[dev->devno] = ATA_DEV_NONE; |
2176 | goto out; | 2151 | rc = 0; |
2152 | goto out; | ||
2153 | } | ||
2177 | } | 2154 | } |
2178 | 2155 | ||
2179 | retry: | 2156 | retry: |
2157 | /* | ||
2158 | * Perform reset | ||
2159 | */ | ||
2160 | if (ata_is_host_link(link)) | ||
2161 | ata_eh_freeze_port(ap); | ||
2162 | |||
2180 | deadline = jiffies + ata_eh_reset_timeouts[try++]; | 2163 | deadline = jiffies + ata_eh_reset_timeouts[try++]; |
2181 | 2164 | ||
2182 | /* shut up during boot probing */ | 2165 | if (reset) { |
2183 | if (verbose) | 2166 | if (verbose) |
2184 | ata_link_printk(link, KERN_INFO, "%s resetting link\n", | 2167 | ata_link_printk(link, KERN_INFO, "%s resetting link\n", |
2185 | reset == softreset ? "soft" : "hard"); | 2168 | reset == softreset ? "soft" : "hard"); |
2186 | 2169 | ||
2187 | /* mark that this EH session started with reset */ | 2170 | /* mark that this EH session started with reset */ |
2188 | if (reset == hardreset) | 2171 | if (reset == hardreset) |
2189 | ehc->i.flags |= ATA_EHI_DID_HARDRESET; | 2172 | ehc->i.flags |= ATA_EHI_DID_HARDRESET; |
2190 | else | 2173 | else |
2191 | ehc->i.flags |= ATA_EHI_DID_SOFTRESET; | 2174 | ehc->i.flags |= ATA_EHI_DID_SOFTRESET; |
2192 | 2175 | ||
2193 | rc = ata_do_reset(link, reset, classes, deadline); | 2176 | rc = ata_do_reset(link, reset, classes, deadline); |
2194 | 2177 | ||
2195 | if (reset == hardreset && | 2178 | if (reset == hardreset && |
2196 | ata_eh_followup_srst_needed(link, rc, classify, classes)) { | 2179 | ata_eh_followup_srst_needed(link, rc, classify, classes)) { |
2197 | /* okay, let's do follow-up softreset */ | 2180 | /* okay, let's do follow-up softreset */ |
2198 | reset = softreset; | 2181 | reset = softreset; |
2199 | 2182 | ||
2200 | if (!reset) { | 2183 | if (!reset) { |
2201 | ata_link_printk(link, KERN_ERR, | 2184 | ata_link_printk(link, KERN_ERR, |
2202 | "follow-up softreset required " | 2185 | "follow-up softreset required " |
2203 | "but no softreset avaliable\n"); | 2186 | "but no softreset avaliable\n"); |
2204 | rc = -EINVAL; | 2187 | rc = -EINVAL; |
2205 | goto fail; | 2188 | goto fail; |
2189 | } | ||
2190 | |||
2191 | ata_eh_about_to_do(link, NULL, ATA_EH_RESET); | ||
2192 | rc = ata_do_reset(link, reset, classes, deadline); | ||
2206 | } | 2193 | } |
2207 | 2194 | ||
2208 | ata_eh_about_to_do(link, NULL, ATA_EH_RESET); | 2195 | /* -EAGAIN can happen if we skipped followup SRST */ |
2209 | rc = ata_do_reset(link, reset, classes, deadline); | 2196 | if (rc && rc != -EAGAIN) |
2197 | goto fail; | ||
2198 | } else { | ||
2199 | if (verbose) | ||
2200 | ata_link_printk(link, KERN_INFO, "no reset method " | ||
2201 | "available, skipping reset\n"); | ||
2202 | if (!(lflags & ATA_LFLAG_ASSUME_CLASS)) | ||
2203 | lflags |= ATA_LFLAG_ASSUME_ATA; | ||
2210 | } | 2204 | } |
2211 | 2205 | ||
2212 | /* -EAGAIN can happen if we skipped followup SRST */ | 2206 | /* |
2213 | if (rc && rc != -EAGAIN) | 2207 | * Post-reset processing |
2214 | goto fail; | 2208 | */ |
2215 | |||
2216 | done: | ||
2217 | ata_link_for_each_dev(dev, link) { | 2209 | ata_link_for_each_dev(dev, link) { |
2218 | /* After the reset, the device state is PIO 0 and the | 2210 | /* After the reset, the device state is PIO 0 and the |
2219 | * controller state is undefined. Reset also wakes up | 2211 | * controller state is undefined. Reset also wakes up |
@@ -2236,9 +2228,53 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
2236 | if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0) | 2228 | if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0) |
2237 | link->sata_spd = (sstatus >> 4) & 0xf; | 2229 | link->sata_spd = (sstatus >> 4) & 0xf; |
2238 | 2230 | ||
2231 | /* thaw the port */ | ||
2232 | if (ata_is_host_link(link)) | ||
2233 | ata_eh_thaw_port(ap); | ||
2234 | |||
2235 | /* postreset() should clear hardware SError. Although SError | ||
2236 | * is cleared during link resume, clearing SError here is | ||
2237 | * necessary as some PHYs raise hotplug events after SRST. | ||
2238 | * This introduces race condition where hotplug occurs between | ||
2239 | * reset and here. This race is mediated by cross checking | ||
2240 | * link onlineness and classification result later. | ||
2241 | */ | ||
2239 | if (postreset) | 2242 | if (postreset) |
2240 | postreset(link, classes); | 2243 | postreset(link, classes); |
2241 | 2244 | ||
2245 | /* clear cached SError */ | ||
2246 | spin_lock_irqsave(link->ap->lock, flags); | ||
2247 | link->eh_info.serror = 0; | ||
2248 | spin_unlock_irqrestore(link->ap->lock, flags); | ||
2249 | |||
2250 | /* Make sure onlineness and classification result correspond. | ||
2251 | * Hotplug could have happened during reset and some | ||
2252 | * controllers fail to wait while a drive is spinning up after | ||
2253 | * being hotplugged causing misdetection. By cross checking | ||
2254 | * link onlineness and classification result, those conditions | ||
2255 | * can be reliably detected and retried. | ||
2256 | */ | ||
2257 | nr_known = 0; | ||
2258 | ata_link_for_each_dev(dev, link) { | ||
2259 | /* convert all ATA_DEV_UNKNOWN to ATA_DEV_NONE */ | ||
2260 | if (classes[dev->devno] == ATA_DEV_UNKNOWN) | ||
2261 | classes[dev->devno] = ATA_DEV_NONE; | ||
2262 | else | ||
2263 | nr_known++; | ||
2264 | } | ||
2265 | |||
2266 | if (classify && !nr_known && ata_link_online(link)) { | ||
2267 | if (try < max_tries) { | ||
2268 | ata_link_printk(link, KERN_WARNING, "link online but " | ||
2269 | "device misclassified, retrying\n"); | ||
2270 | rc = -EAGAIN; | ||
2271 | goto fail; | ||
2272 | } | ||
2273 | ata_link_printk(link, KERN_WARNING, | ||
2274 | "link online but device misclassified, " | ||
2275 | "device detection might fail\n"); | ||
2276 | } | ||
2277 | |||
2242 | /* reset successful, schedule revalidation */ | 2278 | /* reset successful, schedule revalidation */ |
2243 | ata_eh_done(link, NULL, ATA_EH_RESET); | 2279 | ata_eh_done(link, NULL, ATA_EH_RESET); |
2244 | ehc->i.action |= ATA_EH_REVALIDATE; | 2280 | ehc->i.action |= ATA_EH_REVALIDATE; |
@@ -2587,7 +2623,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
2587 | struct ata_link *link; | 2623 | struct ata_link *link; |
2588 | struct ata_device *dev; | 2624 | struct ata_device *dev; |
2589 | int nr_failed_devs, nr_disabled_devs; | 2625 | int nr_failed_devs, nr_disabled_devs; |
2590 | int reset, rc; | 2626 | int rc; |
2591 | unsigned long flags; | 2627 | unsigned long flags; |
2592 | 2628 | ||
2593 | DPRINTK("ENTER\n"); | 2629 | DPRINTK("ENTER\n"); |
@@ -2630,7 +2666,6 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
2630 | rc = 0; | 2666 | rc = 0; |
2631 | nr_failed_devs = 0; | 2667 | nr_failed_devs = 0; |
2632 | nr_disabled_devs = 0; | 2668 | nr_disabled_devs = 0; |
2633 | reset = 0; | ||
2634 | 2669 | ||
2635 | /* if UNLOADING, finish immediately */ | 2670 | /* if UNLOADING, finish immediately */ |
2636 | if (ap->pflags & ATA_PFLAG_UNLOADING) | 2671 | if (ap->pflags & ATA_PFLAG_UNLOADING) |
@@ -2644,40 +2679,24 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
2644 | if (ata_eh_skip_recovery(link)) | 2679 | if (ata_eh_skip_recovery(link)) |
2645 | ehc->i.action = 0; | 2680 | ehc->i.action = 0; |
2646 | 2681 | ||
2647 | /* do we need to reset? */ | ||
2648 | if (ehc->i.action & ATA_EH_RESET) | ||
2649 | reset = 1; | ||
2650 | |||
2651 | ata_link_for_each_dev(dev, link) | 2682 | ata_link_for_each_dev(dev, link) |
2652 | ehc->classes[dev->devno] = ATA_DEV_UNKNOWN; | 2683 | ehc->classes[dev->devno] = ATA_DEV_UNKNOWN; |
2653 | } | 2684 | } |
2654 | 2685 | ||
2655 | /* reset */ | 2686 | /* reset */ |
2656 | if (reset) { | 2687 | ata_port_for_each_link(link, ap) { |
2657 | /* if PMP is attached, this function only deals with | 2688 | struct ata_eh_context *ehc = &link->eh_context; |
2658 | * downstream links, port should stay thawed. | ||
2659 | */ | ||
2660 | if (!sata_pmp_attached(ap)) | ||
2661 | ata_eh_freeze_port(ap); | ||
2662 | |||
2663 | ata_port_for_each_link(link, ap) { | ||
2664 | struct ata_eh_context *ehc = &link->eh_context; | ||
2665 | 2689 | ||
2666 | if (!(ehc->i.action & ATA_EH_RESET)) | 2690 | if (!(ehc->i.action & ATA_EH_RESET)) |
2667 | continue; | 2691 | continue; |
2668 | 2692 | ||
2669 | rc = ata_eh_reset(link, ata_link_nr_vacant(link), | 2693 | rc = ata_eh_reset(link, ata_link_nr_vacant(link), |
2670 | prereset, softreset, hardreset, | 2694 | prereset, softreset, hardreset, postreset); |
2671 | postreset); | 2695 | if (rc) { |
2672 | if (rc) { | 2696 | ata_link_printk(link, KERN_ERR, |
2673 | ata_link_printk(link, KERN_ERR, | 2697 | "reset failed, giving up\n"); |
2674 | "reset failed, giving up\n"); | 2698 | goto out; |
2675 | goto out; | ||
2676 | } | ||
2677 | } | 2699 | } |
2678 | |||
2679 | if (!sata_pmp_attached(ap)) | ||
2680 | ata_eh_thaw_port(ap); | ||
2681 | } | 2700 | } |
2682 | 2701 | ||
2683 | /* the rest */ | 2702 | /* the rest */ |
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c index ff1822a7da38..0f9386d4a5a0 100644 --- a/drivers/ata/libata-pmp.c +++ b/drivers/ata/libata-pmp.c | |||
@@ -48,7 +48,7 @@ static unsigned int sata_pmp_read(struct ata_link *link, int reg, u32 *r_val) | |||
48 | tf.device = link->pmp; | 48 | tf.device = link->pmp; |
49 | 49 | ||
50 | err_mask = ata_exec_internal(pmp_dev, &tf, NULL, DMA_NONE, NULL, 0, | 50 | err_mask = ata_exec_internal(pmp_dev, &tf, NULL, DMA_NONE, NULL, 0, |
51 | SATA_PMP_SCR_TIMEOUT); | 51 | SATA_PMP_RW_TIMEOUT); |
52 | if (err_mask) | 52 | if (err_mask) |
53 | return err_mask; | 53 | return err_mask; |
54 | 54 | ||
@@ -88,7 +88,7 @@ static unsigned int sata_pmp_write(struct ata_link *link, int reg, u32 val) | |||
88 | tf.lbah = (val >> 24) & 0xff; | 88 | tf.lbah = (val >> 24) & 0xff; |
89 | 89 | ||
90 | return ata_exec_internal(pmp_dev, &tf, NULL, DMA_NONE, NULL, 0, | 90 | return ata_exec_internal(pmp_dev, &tf, NULL, DMA_NONE, NULL, 0, |
91 | SATA_PMP_SCR_TIMEOUT); | 91 | SATA_PMP_RW_TIMEOUT); |
92 | } | 92 | } |
93 | 93 | ||
94 | /** | 94 | /** |
@@ -257,19 +257,6 @@ static int sata_pmp_configure(struct ata_device *dev, int print_info) | |||
257 | goto fail; | 257 | goto fail; |
258 | } | 258 | } |
259 | 259 | ||
260 | /* turn off notification till fan-out ports are reset and configured */ | ||
261 | if (gscr[SATA_PMP_GSCR_FEAT_EN] & SATA_PMP_FEAT_NOTIFY) { | ||
262 | gscr[SATA_PMP_GSCR_FEAT_EN] &= ~SATA_PMP_FEAT_NOTIFY; | ||
263 | |||
264 | err_mask = sata_pmp_write(dev->link, SATA_PMP_GSCR_FEAT_EN, | ||
265 | gscr[SATA_PMP_GSCR_FEAT_EN]); | ||
266 | if (err_mask) { | ||
267 | rc = -EIO; | ||
268 | reason = "failed to write GSCR_FEAT_EN"; | ||
269 | goto fail; | ||
270 | } | ||
271 | } | ||
272 | |||
273 | if (print_info) { | 260 | if (print_info) { |
274 | ata_dev_printk(dev, KERN_INFO, "Port Multiplier %s, " | 261 | ata_dev_printk(dev, KERN_INFO, "Port Multiplier %s, " |
275 | "0x%04x:0x%04x r%d, %d ports, feat 0x%x/0x%x\n", | 262 | "0x%04x:0x%04x r%d, %d ports, feat 0x%x/0x%x\n", |
@@ -700,8 +687,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, | |||
700 | if (ehc->i.action & ATA_EH_RESET) { | 687 | if (ehc->i.action & ATA_EH_RESET) { |
701 | struct ata_link *tlink; | 688 | struct ata_link *tlink; |
702 | 689 | ||
703 | ata_eh_freeze_port(ap); | ||
704 | |||
705 | /* reset */ | 690 | /* reset */ |
706 | rc = ata_eh_reset(link, 0, prereset, softreset, hardreset, | 691 | rc = ata_eh_reset(link, 0, prereset, softreset, hardreset, |
707 | postreset); | 692 | postreset); |
@@ -711,8 +696,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, | |||
711 | goto fail; | 696 | goto fail; |
712 | } | 697 | } |
713 | 698 | ||
714 | ata_eh_thaw_port(ap); | ||
715 | |||
716 | /* PMP is reset, SErrors cannot be trusted, scan all */ | 699 | /* PMP is reset, SErrors cannot be trusted, scan all */ |
717 | ata_port_for_each_link(tlink, ap) { | 700 | ata_port_for_each_link(tlink, ap) { |
718 | struct ata_eh_context *ehc = &tlink->eh_context; | 701 | struct ata_eh_context *ehc = &tlink->eh_context; |
@@ -864,6 +847,7 @@ static int sata_pmp_eh_recover(struct ata_port *ap) | |||
864 | struct ata_link *pmp_link = &ap->link; | 847 | struct ata_link *pmp_link = &ap->link; |
865 | struct ata_device *pmp_dev = pmp_link->device; | 848 | struct ata_device *pmp_dev = pmp_link->device; |
866 | struct ata_eh_context *pmp_ehc = &pmp_link->eh_context; | 849 | struct ata_eh_context *pmp_ehc = &pmp_link->eh_context; |
850 | u32 *gscr = pmp_dev->gscr; | ||
867 | struct ata_link *link; | 851 | struct ata_link *link; |
868 | struct ata_device *dev; | 852 | struct ata_device *dev; |
869 | unsigned int err_mask; | 853 | unsigned int err_mask; |
@@ -901,6 +885,22 @@ static int sata_pmp_eh_recover(struct ata_port *ap) | |||
901 | if (rc) | 885 | if (rc) |
902 | goto pmp_fail; | 886 | goto pmp_fail; |
903 | 887 | ||
888 | /* PHY event notification can disturb reset and other recovery | ||
889 | * operations. Turn it off. | ||
890 | */ | ||
891 | if (gscr[SATA_PMP_GSCR_FEAT_EN] & SATA_PMP_FEAT_NOTIFY) { | ||
892 | gscr[SATA_PMP_GSCR_FEAT_EN] &= ~SATA_PMP_FEAT_NOTIFY; | ||
893 | |||
894 | err_mask = sata_pmp_write(pmp_link, SATA_PMP_GSCR_FEAT_EN, | ||
895 | gscr[SATA_PMP_GSCR_FEAT_EN]); | ||
896 | if (err_mask) { | ||
897 | ata_link_printk(pmp_link, KERN_WARNING, | ||
898 | "failed to disable NOTIFY (err_mask=0x%x)\n", | ||
899 | err_mask); | ||
900 | goto pmp_fail; | ||
901 | } | ||
902 | } | ||
903 | |||
904 | /* handle disabled links */ | 904 | /* handle disabled links */ |
905 | rc = sata_pmp_eh_handle_disabled_links(ap); | 905 | rc = sata_pmp_eh_handle_disabled_links(ap); |
906 | if (rc) | 906 | if (rc) |
@@ -923,10 +923,10 @@ static int sata_pmp_eh_recover(struct ata_port *ap) | |||
923 | 923 | ||
924 | /* enable notification */ | 924 | /* enable notification */ |
925 | if (pmp_dev->flags & ATA_DFLAG_AN) { | 925 | if (pmp_dev->flags & ATA_DFLAG_AN) { |
926 | pmp_dev->gscr[SATA_PMP_GSCR_FEAT_EN] |= SATA_PMP_FEAT_NOTIFY; | 926 | gscr[SATA_PMP_GSCR_FEAT_EN] |= SATA_PMP_FEAT_NOTIFY; |
927 | 927 | ||
928 | err_mask = sata_pmp_write(pmp_dev->link, SATA_PMP_GSCR_FEAT_EN, | 928 | err_mask = sata_pmp_write(pmp_link, SATA_PMP_GSCR_FEAT_EN, |
929 | pmp_dev->gscr[SATA_PMP_GSCR_FEAT_EN]); | 929 | gscr[SATA_PMP_GSCR_FEAT_EN]); |
930 | if (err_mask) { | 930 | if (err_mask) { |
931 | ata_dev_printk(pmp_dev, KERN_ERR, "failed to write " | 931 | ata_dev_printk(pmp_dev, KERN_ERR, "failed to write " |
932 | "PMP_FEAT_EN (Emask=0x%x)\n", err_mask); | 932 | "PMP_FEAT_EN (Emask=0x%x)\n", err_mask); |
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 3ce43920e459..aeb6e01d82ce 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -1082,12 +1082,6 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc) | |||
1082 | if (((cdb[4] >> 4) & 0xf) != 0) | 1082 | if (((cdb[4] >> 4) & 0xf) != 0) |
1083 | goto invalid_fld; /* power conditions not supported */ | 1083 | goto invalid_fld; /* power conditions not supported */ |
1084 | 1084 | ||
1085 | if (qc->dev->horkage & ATA_HORKAGE_SKIP_PM) { | ||
1086 | /* the device lacks PM support, finish without doing anything */ | ||
1087 | scmd->result = SAM_STAT_GOOD; | ||
1088 | return 1; | ||
1089 | } | ||
1090 | |||
1091 | if (cdb[4] & 0x1) { | 1085 | if (cdb[4] & 0x1) { |
1092 | tf->nsect = 1; /* 1 sector, lba=0 */ | 1086 | tf->nsect = 1; /* 1 sector, lba=0 */ |
1093 | 1087 | ||
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index fcabe46f262b..0f3e659db99a 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
@@ -177,11 +177,11 @@ static void ali_program_modes(struct ata_port *ap, struct ata_device *adev, stru | |||
177 | u8 udma; | 177 | u8 udma; |
178 | 178 | ||
179 | if (t != NULL) { | 179 | if (t != NULL) { |
180 | t->setup = FIT(t->setup, 1, 8) & 7; | 180 | t->setup = clamp_val(t->setup, 1, 8) & 7; |
181 | t->act8b = FIT(t->act8b, 1, 8) & 7; | 181 | t->act8b = clamp_val(t->act8b, 1, 8) & 7; |
182 | t->rec8b = FIT(t->rec8b, 1, 16) & 15; | 182 | t->rec8b = clamp_val(t->rec8b, 1, 16) & 15; |
183 | t->active = FIT(t->active, 1, 8) & 7; | 183 | t->active = clamp_val(t->active, 1, 8) & 7; |
184 | t->recover = FIT(t->recover, 1, 16) & 15; | 184 | t->recover = clamp_val(t->recover, 1, 16) & 15; |
185 | 185 | ||
186 | pci_write_config_byte(pdev, cas, t->setup); | 186 | pci_write_config_byte(pdev, cas, t->setup); |
187 | pci_write_config_byte(pdev, cbt, (t->act8b << 4) | t->rec8b); | 187 | pci_write_config_byte(pdev, cbt, (t->act8b << 4) | t->rec8b); |
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 26665c396485..57dd00f463d3 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -84,32 +84,32 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse | |||
84 | 84 | ||
85 | /* Configure the address set up timing */ | 85 | /* Configure the address set up timing */ |
86 | pci_read_config_byte(pdev, offset + 0x0C, &t); | 86 | pci_read_config_byte(pdev, offset + 0x0C, &t); |
87 | t = (t & ~(3 << ((3 - dn) << 1))) | ((FIT(at.setup, 1, 4) - 1) << ((3 - dn) << 1)); | 87 | t = (t & ~(3 << ((3 - dn) << 1))) | ((clamp_val(at.setup, 1, 4) - 1) << ((3 - dn) << 1)); |
88 | pci_write_config_byte(pdev, offset + 0x0C , t); | 88 | pci_write_config_byte(pdev, offset + 0x0C , t); |
89 | 89 | ||
90 | /* Configure the 8bit I/O timing */ | 90 | /* Configure the 8bit I/O timing */ |
91 | pci_write_config_byte(pdev, offset + 0x0E + (1 - (dn >> 1)), | 91 | pci_write_config_byte(pdev, offset + 0x0E + (1 - (dn >> 1)), |
92 | ((FIT(at.act8b, 1, 16) - 1) << 4) | (FIT(at.rec8b, 1, 16) - 1)); | 92 | ((clamp_val(at.act8b, 1, 16) - 1) << 4) | (clamp_val(at.rec8b, 1, 16) - 1)); |
93 | 93 | ||
94 | /* Drive timing */ | 94 | /* Drive timing */ |
95 | pci_write_config_byte(pdev, offset + 0x08 + (3 - dn), | 95 | pci_write_config_byte(pdev, offset + 0x08 + (3 - dn), |
96 | ((FIT(at.active, 1, 16) - 1) << 4) | (FIT(at.recover, 1, 16) - 1)); | 96 | ((clamp_val(at.active, 1, 16) - 1) << 4) | (clamp_val(at.recover, 1, 16) - 1)); |
97 | 97 | ||
98 | switch (clock) { | 98 | switch (clock) { |
99 | case 1: | 99 | case 1: |
100 | t = at.udma ? (0xc0 | (FIT(at.udma, 2, 5) - 2)) : 0x03; | 100 | t = at.udma ? (0xc0 | (clamp_val(at.udma, 2, 5) - 2)) : 0x03; |
101 | break; | 101 | break; |
102 | 102 | ||
103 | case 2: | 103 | case 2: |
104 | t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 2, 10)]) : 0x03; | 104 | t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 2, 10)]) : 0x03; |
105 | break; | 105 | break; |
106 | 106 | ||
107 | case 3: | 107 | case 3: |
108 | t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 1, 10)]) : 0x03; | 108 | t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 1, 10)]) : 0x03; |
109 | break; | 109 | break; |
110 | 110 | ||
111 | case 4: | 111 | case 4: |
112 | t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 1, 15)]) : 0x03; | 112 | t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 1, 15)]) : 0x03; |
113 | break; | 113 | break; |
114 | 114 | ||
115 | default: | 115 | default: |
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c index 5e104385d6a3..82fb6e273169 100644 --- a/drivers/ata/pata_at32.c +++ b/drivers/ata/pata_at32.c | |||
@@ -291,8 +291,6 @@ static int __init pata_at32_probe(struct platform_device *pdev) | |||
291 | if (!info) | 291 | if (!info) |
292 | return -ENOMEM; | 292 | return -ENOMEM; |
293 | 293 | ||
294 | memset(info, 0, sizeof(struct at32_ide_info)); | ||
295 | |||
296 | info->irq = irq; | 294 | info->irq = irq; |
297 | info->cs = board->cs; | 295 | info->cs = board->cs; |
298 | 296 | ||
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index 9ab89732cf94..55516103626a 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c | |||
@@ -911,7 +911,10 @@ static void bfin_bmdma_start(struct ata_queued_cmd *qc) | |||
911 | /* Reset all transfer count */ | 911 | /* Reset all transfer count */ |
912 | ATAPI_SET_CONTROL(base, ATAPI_GET_CONTROL(base) | TFRCNT_RST); | 912 | ATAPI_SET_CONTROL(base, ATAPI_GET_CONTROL(base) | TFRCNT_RST); |
913 | 913 | ||
914 | /* Set transfer length to buffer len */ | 914 | /* Set ATAPI state machine contorl in terminate sequence */ |
915 | ATAPI_SET_CONTROL(base, ATAPI_GET_CONTROL(base) | END_ON_TERM); | ||
916 | |||
917 | /* Set transfer length to buffer len */ | ||
915 | for_each_sg(qc->sg, sg, qc->n_elem, si) { | 918 | for_each_sg(qc->sg, sg, qc->n_elem, si) { |
916 | ATAPI_SET_XFER_LEN(base, (sg_dma_len(sg) >> 1)); | 919 | ATAPI_SET_XFER_LEN(base, (sg_dma_len(sg) >> 1)); |
917 | } | 920 | } |
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c index a9c3218e22fd..2ff62608ae37 100644 --- a/drivers/ata/pata_cypress.c +++ b/drivers/ata/pata_cypress.c | |||
@@ -62,14 +62,14 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
62 | return; | 62 | return; |
63 | } | 63 | } |
64 | 64 | ||
65 | time_16 = FIT(t.recover, 0, 15) | (FIT(t.active, 0, 15) << 4); | 65 | time_16 = clamp_val(t.recover, 0, 15) | (clamp_val(t.active, 0, 15) << 4); |
66 | time_8 = FIT(t.act8b, 0, 15) | (FIT(t.rec8b, 0, 15) << 4); | 66 | time_8 = clamp_val(t.act8b, 0, 15) | (clamp_val(t.rec8b, 0, 15) << 4); |
67 | 67 | ||
68 | if (adev->devno == 0) { | 68 | if (adev->devno == 0) { |
69 | pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr); | 69 | pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr); |
70 | 70 | ||
71 | addr &= ~0x0F; /* Mask bits */ | 71 | addr &= ~0x0F; /* Mask bits */ |
72 | addr |= FIT(t.setup, 0, 15); | 72 | addr |= clamp_val(t.setup, 0, 15); |
73 | 73 | ||
74 | pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr); | 74 | pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr); |
75 | pci_write_config_byte(pdev, CY82_IDE_MASTER_IOR, time_16); | 75 | pci_write_config_byte(pdev, CY82_IDE_MASTER_IOR, time_16); |
@@ -79,7 +79,7 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
79 | pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr); | 79 | pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr); |
80 | 80 | ||
81 | addr &= ~0xF0; /* Mask bits */ | 81 | addr &= ~0xF0; /* Mask bits */ |
82 | addr |= (FIT(t.setup, 0, 15) << 4); | 82 | addr |= (clamp_val(t.setup, 0, 15) << 4); |
83 | 83 | ||
84 | pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr); | 84 | pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr); |
85 | pci_write_config_byte(pdev, CY82_IDE_SLAVE_IOR, time_16); | 85 | pci_write_config_byte(pdev, CY82_IDE_SLAVE_IOR, time_16); |
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index 7af4b29cc422..fe7cc8ed4ea4 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c | |||
@@ -343,8 +343,8 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
343 | /* Get the timing data in cycles. For now play safe at 50Mhz */ | 343 | /* Get the timing data in cycles. For now play safe at 50Mhz */ |
344 | ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000); | 344 | ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000); |
345 | 345 | ||
346 | active = FIT(t.active, 2, 15); | 346 | active = clamp_val(t.active, 2, 15); |
347 | recover = FIT(t.recover, 4, 15); | 347 | recover = clamp_val(t.recover, 4, 15); |
348 | 348 | ||
349 | inb(0x3E6); | 349 | inb(0x3E6); |
350 | inb(0x3E6); | 350 | inb(0x3E6); |
@@ -377,8 +377,8 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
377 | /* Get the timing data in cycles. For now play safe at 50Mhz */ | 377 | /* Get the timing data in cycles. For now play safe at 50Mhz */ |
378 | ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000); | 378 | ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000); |
379 | 379 | ||
380 | active = FIT(t.active, 2, 15); | 380 | active = clamp_val(t.active, 2, 15); |
381 | recover = FIT(t.recover, 2, 16); | 381 | recover = clamp_val(t.recover, 2, 16); |
382 | recover &= 0x15; | 382 | recover &= 0x15; |
383 | 383 | ||
384 | inb(0x3E6); | 384 | inb(0x3E6); |
@@ -462,9 +462,9 @@ static void opti82c611a_set_piomode(struct ata_port *ap, | |||
462 | ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP); | 462 | ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP); |
463 | } | 463 | } |
464 | 464 | ||
465 | active = FIT(t.active, 2, 17) - 2; | 465 | active = clamp_val(t.active, 2, 17) - 2; |
466 | recover = FIT(t.recover, 1, 16) - 1; | 466 | recover = clamp_val(t.recover, 1, 16) - 1; |
467 | setup = FIT(t.setup, 1, 4) - 1; | 467 | setup = clamp_val(t.setup, 1, 4) - 1; |
468 | 468 | ||
469 | /* Select the right timing bank for write timing */ | 469 | /* Select the right timing bank for write timing */ |
470 | rc = ioread8(ap->ioaddr.lbal_addr); | 470 | rc = ioread8(ap->ioaddr.lbal_addr); |
@@ -541,9 +541,9 @@ static void opti82c46x_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
541 | ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP); | 541 | ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP); |
542 | } | 542 | } |
543 | 543 | ||
544 | active = FIT(t.active, 2, 17) - 2; | 544 | active = clamp_val(t.active, 2, 17) - 2; |
545 | recover = FIT(t.recover, 1, 16) - 1; | 545 | recover = clamp_val(t.recover, 1, 16) - 1; |
546 | setup = FIT(t.setup, 1, 4) - 1; | 546 | setup = clamp_val(t.setup, 1, 4) - 1; |
547 | 547 | ||
548 | /* Select the right timing bank for write timing */ | 548 | /* Select the right timing bank for write timing */ |
549 | rc = ioread8(ap->ioaddr.lbal_addr); | 549 | rc = ioread8(ap->ioaddr.lbal_addr); |
@@ -624,11 +624,11 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
624 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); | 624 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); |
625 | 625 | ||
626 | if (ld_qdi->fast) { | 626 | if (ld_qdi->fast) { |
627 | active = 8 - FIT(t.active, 1, 8); | 627 | active = 8 - clamp_val(t.active, 1, 8); |
628 | recovery = 18 - FIT(t.recover, 3, 18); | 628 | recovery = 18 - clamp_val(t.recover, 3, 18); |
629 | } else { | 629 | } else { |
630 | active = 9 - FIT(t.active, 2, 9); | 630 | active = 9 - clamp_val(t.active, 2, 9); |
631 | recovery = 15 - FIT(t.recover, 0, 15); | 631 | recovery = 15 - clamp_val(t.recover, 0, 15); |
632 | } | 632 | } |
633 | timing = (recovery << 4) | active | 0x08; | 633 | timing = (recovery << 4) | active | 0x08; |
634 | 634 | ||
@@ -658,11 +658,11 @@ static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
658 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); | 658 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); |
659 | 659 | ||
660 | if (ld_qdi->fast) { | 660 | if (ld_qdi->fast) { |
661 | active = 8 - FIT(t.active, 1, 8); | 661 | active = 8 - clamp_val(t.active, 1, 8); |
662 | recovery = 18 - FIT(t.recover, 3, 18); | 662 | recovery = 18 - clamp_val(t.recover, 3, 18); |
663 | } else { | 663 | } else { |
664 | active = 9 - FIT(t.active, 2, 9); | 664 | active = 9 - clamp_val(t.active, 2, 9); |
665 | recovery = 15 - FIT(t.recover, 0, 15); | 665 | recovery = 15 - clamp_val(t.recover, 0, 15); |
666 | } | 666 | } |
667 | timing = (recovery << 4) | active | 0x08; | 667 | timing = (recovery << 4) | active | 0x08; |
668 | 668 | ||
@@ -695,11 +695,11 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
695 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); | 695 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); |
696 | 696 | ||
697 | if (ld_qdi->fast) { | 697 | if (ld_qdi->fast) { |
698 | active = 8 - FIT(t.active, 1, 8); | 698 | active = 8 - clamp_val(t.active, 1, 8); |
699 | recovery = 18 - FIT(t.recover, 3, 18); | 699 | recovery = 18 - clamp_val(t.recover, 3, 18); |
700 | } else { | 700 | } else { |
701 | active = 9 - FIT(t.active, 2, 9); | 701 | active = 9 - clamp_val(t.active, 2, 9); |
702 | recovery = 15 - FIT(t.recover, 0, 15); | 702 | recovery = 15 - clamp_val(t.recover, 0, 15); |
703 | } | 703 | } |
704 | timing = (recovery << 4) | active | 0x08; | 704 | timing = (recovery << 4) | active | 0x08; |
705 | ld_qdi->clock[adev->devno] = timing; | 705 | ld_qdi->clock[adev->devno] = timing; |
@@ -830,8 +830,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
830 | else | 830 | else |
831 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); | 831 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); |
832 | 832 | ||
833 | active = (FIT(t.active, 3, 17) - 1) & 0x0F; | 833 | active = (clamp_val(t.active, 3, 17) - 1) & 0x0F; |
834 | recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F; | 834 | recovery = (clamp_val(t.recover, 1, 15) + 1) & 0x0F; |
835 | timing = (active << 4) | recovery; | 835 | timing = (active << 4) | recovery; |
836 | winbond_writecfg(ld_winbond->timing, timing, reg); | 836 | winbond_writecfg(ld_winbond->timing, timing, reg); |
837 | 837 | ||
@@ -842,7 +842,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
842 | reg |= 0x08; /* FIFO off */ | 842 | reg |= 0x08; /* FIFO off */ |
843 | if (!ata_pio_need_iordy(adev)) | 843 | if (!ata_pio_need_iordy(adev)) |
844 | reg |= 0x02; /* IORDY off */ | 844 | reg |= 0x02; /* IORDY off */ |
845 | reg |= (FIT(t.setup, 0, 3) << 6); | 845 | reg |= (clamp_val(t.setup, 0, 3) << 6); |
846 | winbond_writecfg(ld_winbond->timing, timing + 1, reg); | 846 | winbond_writecfg(ld_winbond->timing, timing + 1, reg); |
847 | } | 847 | } |
848 | 848 | ||
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c index 76d2455bc453..be756b7ef07e 100644 --- a/drivers/ata/pata_ns87410.c +++ b/drivers/ata/pata_ns87410.c | |||
@@ -91,9 +91,9 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
91 | return; | 91 | return; |
92 | } | 92 | } |
93 | 93 | ||
94 | at.active = FIT(at.active, 2, 16) - 2; | 94 | at.active = clamp_val(at.active, 2, 16) - 2; |
95 | at.setup = FIT(at.setup, 1, 4) - 1; | 95 | at.setup = clamp_val(at.setup, 1, 4) - 1; |
96 | at.recover = FIT(at.recover, 1, 12) - 1; | 96 | at.recover = clamp_val(at.recover, 1, 12) - 1; |
97 | 97 | ||
98 | idetcr = (at.setup << 6) | (recoverbits[at.recover] << 3) | activebits[at.active]; | 98 | idetcr = (at.setup << 6) | (recoverbits[at.recover] << 3) | activebits[at.active]; |
99 | 99 | ||
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c index ae92b0049bd5..e0aa7eaaee0a 100644 --- a/drivers/ata/pata_ns87415.c +++ b/drivers/ata/pata_ns87415.c | |||
@@ -66,8 +66,8 @@ static void ns87415_set_mode(struct ata_port *ap, struct ata_device *adev, u8 mo | |||
66 | 66 | ||
67 | ata_timing_compute(adev, adev->pio_mode, &t, T, 0); | 67 | ata_timing_compute(adev, adev->pio_mode, &t, T, 0); |
68 | 68 | ||
69 | clocking = 17 - FIT(t.active, 2, 17); | 69 | clocking = 17 - clamp_val(t.active, 2, 17); |
70 | clocking |= (16 - FIT(t.recover, 1, 16)) << 4; | 70 | clocking |= (16 - clamp_val(t.recover, 1, 16)) << 4; |
71 | /* Use the same timing for read and write bytes */ | 71 | /* Use the same timing for read and write bytes */ |
72 | clocking |= (clocking << 8); | 72 | clocking |= (clocking << 8); |
73 | pci_write_config_word(dev, timing, clocking); | 73 | pci_write_config_word(dev, timing, clocking); |
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c index bf45cf017753..97e5b090d7c2 100644 --- a/drivers/ata/pata_qdi.c +++ b/drivers/ata/pata_qdi.c | |||
@@ -60,11 +60,11 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
60 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); | 60 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); |
61 | 61 | ||
62 | if (qdi->fast) { | 62 | if (qdi->fast) { |
63 | active = 8 - FIT(t.active, 1, 8); | 63 | active = 8 - clamp_val(t.active, 1, 8); |
64 | recovery = 18 - FIT(t.recover, 3, 18); | 64 | recovery = 18 - clamp_val(t.recover, 3, 18); |
65 | } else { | 65 | } else { |
66 | active = 9 - FIT(t.active, 2, 9); | 66 | active = 9 - clamp_val(t.active, 2, 9); |
67 | recovery = 15 - FIT(t.recover, 0, 15); | 67 | recovery = 15 - clamp_val(t.recover, 0, 15); |
68 | } | 68 | } |
69 | timing = (recovery << 4) | active | 0x08; | 69 | timing = (recovery << 4) | active | 0x08; |
70 | 70 | ||
@@ -84,11 +84,11 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
84 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); | 84 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); |
85 | 85 | ||
86 | if (qdi->fast) { | 86 | if (qdi->fast) { |
87 | active = 8 - FIT(t.active, 1, 8); | 87 | active = 8 - clamp_val(t.active, 1, 8); |
88 | recovery = 18 - FIT(t.recover, 3, 18); | 88 | recovery = 18 - clamp_val(t.recover, 3, 18); |
89 | } else { | 89 | } else { |
90 | active = 9 - FIT(t.active, 2, 9); | 90 | active = 9 - clamp_val(t.active, 2, 9); |
91 | recovery = 15 - FIT(t.recover, 0, 15); | 91 | recovery = 15 - clamp_val(t.recover, 0, 15); |
92 | } | 92 | } |
93 | timing = (recovery << 4) | active | 0x08; | 93 | timing = (recovery << 4) | active | 0x08; |
94 | 94 | ||
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c index 70d94fb28a5f..69877bd81815 100644 --- a/drivers/ata/pata_sl82c105.c +++ b/drivers/ata/pata_sl82c105.c | |||
@@ -216,7 +216,7 @@ static int sl82c105_qc_defer(struct ata_queued_cmd *qc) | |||
216 | struct ata_port *alt = host->ports[1 ^ qc->ap->port_no]; | 216 | struct ata_port *alt = host->ports[1 ^ qc->ap->port_no]; |
217 | int rc; | 217 | int rc; |
218 | 218 | ||
219 | /* First apply the usual rules */ | 219 | /* First apply the usual rules */ |
220 | rc = ata_std_qc_defer(qc); | 220 | rc = ata_std_qc_defer(qc); |
221 | if (rc != 0) | 221 | if (rc != 0) |
222 | return rc; | 222 | return rc; |
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 2fea6cbe7755..708ed144ede9 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
@@ -259,15 +259,15 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo | |||
259 | 259 | ||
260 | pci_read_config_byte(pdev, 0x4C, &setup); | 260 | pci_read_config_byte(pdev, 0x4C, &setup); |
261 | setup &= ~(3 << shift); | 261 | setup &= ~(3 << shift); |
262 | setup |= FIT(t.setup, 1, 4) << shift; /* 1,4 or 1,4 - 1 FIXME */ | 262 | setup |= clamp_val(t.setup, 1, 4) << shift; /* 1,4 or 1,4 - 1 FIXME */ |
263 | pci_write_config_byte(pdev, 0x4C, setup); | 263 | pci_write_config_byte(pdev, 0x4C, setup); |
264 | } | 264 | } |
265 | 265 | ||
266 | /* Load the PIO mode bits */ | 266 | /* Load the PIO mode bits */ |
267 | pci_write_config_byte(pdev, 0x4F - ap->port_no, | 267 | pci_write_config_byte(pdev, 0x4F - ap->port_no, |
268 | ((FIT(t.act8b, 1, 16) - 1) << 4) | (FIT(t.rec8b, 1, 16) - 1)); | 268 | ((clamp_val(t.act8b, 1, 16) - 1) << 4) | (clamp_val(t.rec8b, 1, 16) - 1)); |
269 | pci_write_config_byte(pdev, 0x48 + offset, | 269 | pci_write_config_byte(pdev, 0x48 + offset, |
270 | ((FIT(t.active, 1, 16) - 1) << 4) | (FIT(t.recover, 1, 16) - 1)); | 270 | ((clamp_val(t.active, 1, 16) - 1) << 4) | (clamp_val(t.recover, 1, 16) - 1)); |
271 | 271 | ||
272 | /* Load the UDMA bits according to type */ | 272 | /* Load the UDMA bits according to type */ |
273 | switch(udma_type) { | 273 | switch(udma_type) { |
@@ -275,16 +275,16 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo | |||
275 | /* BUG() ? */ | 275 | /* BUG() ? */ |
276 | /* fall through */ | 276 | /* fall through */ |
277 | case 33: | 277 | case 33: |
278 | ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 5) - 2)) : 0x03; | 278 | ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 5) - 2)) : 0x03; |
279 | break; | 279 | break; |
280 | case 66: | 280 | case 66: |
281 | ut = t.udma ? (0xe8 | (FIT(t.udma, 2, 9) - 2)) : 0x0f; | 281 | ut = t.udma ? (0xe8 | (clamp_val(t.udma, 2, 9) - 2)) : 0x0f; |
282 | break; | 282 | break; |
283 | case 100: | 283 | case 100: |
284 | ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07; | 284 | ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 9) - 2)) : 0x07; |
285 | break; | 285 | break; |
286 | case 133: | 286 | case 133: |
287 | ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07; | 287 | ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 9) - 2)) : 0x07; |
288 | break; | 288 | break; |
289 | } | 289 | } |
290 | 290 | ||
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c index 6e52a3573fbf..474528f8fe3d 100644 --- a/drivers/ata/pata_winbond.c +++ b/drivers/ata/pata_winbond.c | |||
@@ -75,8 +75,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
75 | else | 75 | else |
76 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); | 76 | ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000); |
77 | 77 | ||
78 | active = (FIT(t.active, 3, 17) - 1) & 0x0F; | 78 | active = (clamp_val(t.active, 3, 17) - 1) & 0x0F; |
79 | recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F; | 79 | recovery = (clamp_val(t.recover, 1, 15) + 1) & 0x0F; |
80 | timing = (active << 4) | recovery; | 80 | timing = (active << 4) | recovery; |
81 | winbond_writecfg(winbond->config, timing, reg); | 81 | winbond_writecfg(winbond->config, timing, reg); |
82 | 82 | ||
@@ -87,7 +87,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
87 | reg |= 0x08; /* FIFO off */ | 87 | reg |= 0x08; /* FIFO off */ |
88 | if (!ata_pio_need_iordy(adev)) | 88 | if (!ata_pio_need_iordy(adev)) |
89 | reg |= 0x02; /* IORDY off */ | 89 | reg |= 0x02; /* IORDY off */ |
90 | reg |= (FIT(t.setup, 0, 3) << 6); | 90 | reg |= (clamp_val(t.setup, 0, 3) << 6); |
91 | winbond_writecfg(winbond->config, timing + 1, reg); | 91 | winbond_writecfg(winbond->config, timing + 1, reg); |
92 | } | 92 | } |
93 | 93 | ||
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index bb73b2222627..fb81f0c7a8c2 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -72,7 +72,7 @@ | |||
72 | #include <linux/libata.h> | 72 | #include <linux/libata.h> |
73 | 73 | ||
74 | #define DRV_NAME "sata_mv" | 74 | #define DRV_NAME "sata_mv" |
75 | #define DRV_VERSION "1.20" | 75 | #define DRV_VERSION "1.21" |
76 | 76 | ||
77 | enum { | 77 | enum { |
78 | /* BAR's are enumerated in terms of pci_resource_start() terms */ | 78 | /* BAR's are enumerated in terms of pci_resource_start() terms */ |
@@ -128,8 +128,13 @@ enum { | |||
128 | MV_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 128 | MV_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
129 | ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI | | 129 | ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI | |
130 | ATA_FLAG_PIO_POLLING, | 130 | ATA_FLAG_PIO_POLLING, |
131 | |||
131 | MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE, | 132 | MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE, |
132 | 133 | ||
134 | MV_GENIIE_FLAGS = MV_COMMON_FLAGS | MV_6XXX_FLAGS | | ||
135 | ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA | | ||
136 | ATA_FLAG_NCQ | ATA_FLAG_AN, | ||
137 | |||
133 | CRQB_FLAG_READ = (1 << 0), | 138 | CRQB_FLAG_READ = (1 << 0), |
134 | CRQB_TAG_SHIFT = 1, | 139 | CRQB_TAG_SHIFT = 1, |
135 | CRQB_IOID_SHIFT = 6, /* CRQB Gen-II/IIE IO Id shift */ | 140 | CRQB_IOID_SHIFT = 6, /* CRQB Gen-II/IIE IO Id shift */ |
@@ -197,13 +202,6 @@ enum { | |||
197 | HC_MAIN_RSVD = (0x7f << 25), /* bits 31-25 */ | 202 | HC_MAIN_RSVD = (0x7f << 25), /* bits 31-25 */ |
198 | HC_MAIN_RSVD_5 = (0x1fff << 19), /* bits 31-19 */ | 203 | HC_MAIN_RSVD_5 = (0x1fff << 19), /* bits 31-19 */ |
199 | HC_MAIN_RSVD_SOC = (0x3fffffb << 6), /* bits 31-9, 7-6 */ | 204 | HC_MAIN_RSVD_SOC = (0x3fffffb << 6), /* bits 31-9, 7-6 */ |
200 | HC_MAIN_MASKED_IRQS = (TRAN_LO_DONE | TRAN_HI_DONE | | ||
201 | PORTS_0_3_COAL_DONE | PORTS_4_7_COAL_DONE | | ||
202 | PORTS_0_7_COAL_DONE | GPIO_INT | TWSI_INT | | ||
203 | HC_MAIN_RSVD), | ||
204 | HC_MAIN_MASKED_IRQS_5 = (PORTS_0_3_COAL_DONE | PORTS_4_7_COAL_DONE | | ||
205 | HC_MAIN_RSVD_5), | ||
206 | HC_MAIN_MASKED_IRQS_SOC = (PORTS_0_3_COAL_DONE | HC_MAIN_RSVD_SOC), | ||
207 | 205 | ||
208 | /* SATAHC registers */ | 206 | /* SATAHC registers */ |
209 | HC_CFG_OFS = 0, | 207 | HC_CFG_OFS = 0, |
@@ -221,6 +219,7 @@ enum { | |||
221 | SATA_STATUS_OFS = 0x300, /* ctrl, err regs follow status */ | 219 | SATA_STATUS_OFS = 0x300, /* ctrl, err regs follow status */ |
222 | SATA_ACTIVE_OFS = 0x350, | 220 | SATA_ACTIVE_OFS = 0x350, |
223 | SATA_FIS_IRQ_CAUSE_OFS = 0x364, | 221 | SATA_FIS_IRQ_CAUSE_OFS = 0x364, |
222 | SATA_FIS_IRQ_AN = (1 << 9), /* async notification */ | ||
224 | 223 | ||
225 | LTMODE_OFS = 0x30c, | 224 | LTMODE_OFS = 0x30c, |
226 | LTMODE_BIT8 = (1 << 8), /* unknown, but necessary */ | 225 | LTMODE_BIT8 = (1 << 8), /* unknown, but necessary */ |
@@ -459,6 +458,7 @@ struct mv_port_signal { | |||
459 | 458 | ||
460 | struct mv_host_priv { | 459 | struct mv_host_priv { |
461 | u32 hp_flags; | 460 | u32 hp_flags; |
461 | u32 main_irq_mask; | ||
462 | struct mv_port_signal signal[8]; | 462 | struct mv_port_signal signal[8]; |
463 | const struct mv_hw_ops *ops; | 463 | const struct mv_hw_ops *ops; |
464 | int n_ports; | 464 | int n_ports; |
@@ -640,25 +640,19 @@ static const struct ata_port_info mv_port_info[] = { | |||
640 | .port_ops = &mv6_ops, | 640 | .port_ops = &mv6_ops, |
641 | }, | 641 | }, |
642 | { /* chip_6042 */ | 642 | { /* chip_6042 */ |
643 | .flags = MV_COMMON_FLAGS | MV_6XXX_FLAGS | | 643 | .flags = MV_GENIIE_FLAGS, |
644 | ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA | | ||
645 | ATA_FLAG_NCQ, | ||
646 | .pio_mask = 0x1f, /* pio0-4 */ | 644 | .pio_mask = 0x1f, /* pio0-4 */ |
647 | .udma_mask = ATA_UDMA6, | 645 | .udma_mask = ATA_UDMA6, |
648 | .port_ops = &mv_iie_ops, | 646 | .port_ops = &mv_iie_ops, |
649 | }, | 647 | }, |
650 | { /* chip_7042 */ | 648 | { /* chip_7042 */ |
651 | .flags = MV_COMMON_FLAGS | MV_6XXX_FLAGS | | 649 | .flags = MV_GENIIE_FLAGS, |
652 | ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA | | ||
653 | ATA_FLAG_NCQ, | ||
654 | .pio_mask = 0x1f, /* pio0-4 */ | 650 | .pio_mask = 0x1f, /* pio0-4 */ |
655 | .udma_mask = ATA_UDMA6, | 651 | .udma_mask = ATA_UDMA6, |
656 | .port_ops = &mv_iie_ops, | 652 | .port_ops = &mv_iie_ops, |
657 | }, | 653 | }, |
658 | { /* chip_soc */ | 654 | { /* chip_soc */ |
659 | .flags = MV_COMMON_FLAGS | MV_6XXX_FLAGS | | 655 | .flags = MV_GENIIE_FLAGS | MV_FLAG_SOC, |
660 | ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA | | ||
661 | ATA_FLAG_NCQ | MV_FLAG_SOC, | ||
662 | .pio_mask = 0x1f, /* pio0-4 */ | 656 | .pio_mask = 0x1f, /* pio0-4 */ |
663 | .udma_mask = ATA_UDMA6, | 657 | .udma_mask = ATA_UDMA6, |
664 | .port_ops = &mv_iie_ops, | 658 | .port_ops = &mv_iie_ops, |
@@ -844,6 +838,33 @@ static void mv_set_edma_ptrs(void __iomem *port_mmio, | |||
844 | port_mmio + EDMA_RSP_Q_OUT_PTR_OFS); | 838 | port_mmio + EDMA_RSP_Q_OUT_PTR_OFS); |
845 | } | 839 | } |
846 | 840 | ||
841 | static void mv_set_main_irq_mask(struct ata_host *host, | ||
842 | u32 disable_bits, u32 enable_bits) | ||
843 | { | ||
844 | struct mv_host_priv *hpriv = host->private_data; | ||
845 | u32 old_mask, new_mask; | ||
846 | |||
847 | old_mask = hpriv->main_irq_mask; | ||
848 | new_mask = (old_mask & ~disable_bits) | enable_bits; | ||
849 | if (new_mask != old_mask) { | ||
850 | hpriv->main_irq_mask = new_mask; | ||
851 | writelfl(new_mask, hpriv->main_irq_mask_addr); | ||
852 | } | ||
853 | } | ||
854 | |||
855 | static void mv_enable_port_irqs(struct ata_port *ap, | ||
856 | unsigned int port_bits) | ||
857 | { | ||
858 | unsigned int shift, hardport, port = ap->port_no; | ||
859 | u32 disable_bits, enable_bits; | ||
860 | |||
861 | MV_PORT_TO_SHIFT_AND_HARDPORT(port, shift, hardport); | ||
862 | |||
863 | disable_bits = (DONE_IRQ | ERR_IRQ) << shift; | ||
864 | enable_bits = port_bits << shift; | ||
865 | mv_set_main_irq_mask(ap->host, disable_bits, enable_bits); | ||
866 | } | ||
867 | |||
847 | /** | 868 | /** |
848 | * mv_start_dma - Enable eDMA engine | 869 | * mv_start_dma - Enable eDMA engine |
849 | * @base: port base address | 870 | * @base: port base address |
@@ -886,9 +907,11 @@ static void mv_start_dma(struct ata_port *ap, void __iomem *port_mmio, | |||
886 | mv_edma_cfg(ap, want_ncq); | 907 | mv_edma_cfg(ap, want_ncq); |
887 | 908 | ||
888 | /* clear FIS IRQ Cause */ | 909 | /* clear FIS IRQ Cause */ |
889 | writelfl(0, port_mmio + SATA_FIS_IRQ_CAUSE_OFS); | 910 | if (IS_GEN_IIE(hpriv)) |
911 | writelfl(0, port_mmio + SATA_FIS_IRQ_CAUSE_OFS); | ||
890 | 912 | ||
891 | mv_set_edma_ptrs(port_mmio, hpriv, pp); | 913 | mv_set_edma_ptrs(port_mmio, hpriv, pp); |
914 | mv_enable_port_irqs(ap, DONE_IRQ|ERR_IRQ); | ||
892 | 915 | ||
893 | writelfl(EDMA_EN, port_mmio + EDMA_CMD_OFS); | 916 | writelfl(EDMA_EN, port_mmio + EDMA_CMD_OFS); |
894 | pp->pp_flags |= MV_PP_FLAG_EDMA_EN; | 917 | pp->pp_flags |= MV_PP_FLAG_EDMA_EN; |
@@ -1341,6 +1364,7 @@ out_port_free_dma_mem: | |||
1341 | static void mv_port_stop(struct ata_port *ap) | 1364 | static void mv_port_stop(struct ata_port *ap) |
1342 | { | 1365 | { |
1343 | mv_stop_edma(ap); | 1366 | mv_stop_edma(ap); |
1367 | mv_enable_port_irqs(ap, 0); | ||
1344 | mv_port_free_dma_mem(ap); | 1368 | mv_port_free_dma_mem(ap); |
1345 | } | 1369 | } |
1346 | 1370 | ||
@@ -1582,6 +1606,7 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc) | |||
1582 | * shadow block, etc registers. | 1606 | * shadow block, etc registers. |
1583 | */ | 1607 | */ |
1584 | mv_stop_edma(ap); | 1608 | mv_stop_edma(ap); |
1609 | mv_enable_port_irqs(ap, ERR_IRQ); | ||
1585 | mv_pmp_select(ap, qc->dev->link->pmp); | 1610 | mv_pmp_select(ap, qc->dev->link->pmp); |
1586 | return ata_sff_qc_issue(qc); | 1611 | return ata_sff_qc_issue(qc); |
1587 | } | 1612 | } |
@@ -1670,6 +1695,18 @@ static void mv_pmp_eh_prep(struct ata_port *ap, unsigned int pmp_map) | |||
1670 | } | 1695 | } |
1671 | } | 1696 | } |
1672 | 1697 | ||
1698 | static int mv_req_q_empty(struct ata_port *ap) | ||
1699 | { | ||
1700 | void __iomem *port_mmio = mv_ap_base(ap); | ||
1701 | u32 in_ptr, out_ptr; | ||
1702 | |||
1703 | in_ptr = (readl(port_mmio + EDMA_REQ_Q_IN_PTR_OFS) | ||
1704 | >> EDMA_REQ_Q_PTR_SHIFT) & MV_MAX_Q_DEPTH_MASK; | ||
1705 | out_ptr = (readl(port_mmio + EDMA_REQ_Q_OUT_PTR_OFS) | ||
1706 | >> EDMA_REQ_Q_PTR_SHIFT) & MV_MAX_Q_DEPTH_MASK; | ||
1707 | return (in_ptr == out_ptr); /* 1 == queue_is_empty */ | ||
1708 | } | ||
1709 | |||
1673 | static int mv_handle_fbs_ncq_dev_err(struct ata_port *ap) | 1710 | static int mv_handle_fbs_ncq_dev_err(struct ata_port *ap) |
1674 | { | 1711 | { |
1675 | struct mv_port_priv *pp = ap->private_data; | 1712 | struct mv_port_priv *pp = ap->private_data; |
@@ -1703,7 +1740,7 @@ static int mv_handle_fbs_ncq_dev_err(struct ata_port *ap) | |||
1703 | ap->qc_active, failed_links, | 1740 | ap->qc_active, failed_links, |
1704 | ap->nr_active_links); | 1741 | ap->nr_active_links); |
1705 | 1742 | ||
1706 | if (ap->nr_active_links <= failed_links) { | 1743 | if (ap->nr_active_links <= failed_links && mv_req_q_empty(ap)) { |
1707 | mv_process_crpb_entries(ap, pp); | 1744 | mv_process_crpb_entries(ap, pp); |
1708 | mv_stop_edma(ap); | 1745 | mv_stop_edma(ap); |
1709 | mv_eh_freeze(ap); | 1746 | mv_eh_freeze(ap); |
@@ -1812,6 +1849,7 @@ static void mv_err_intr(struct ata_port *ap) | |||
1812 | { | 1849 | { |
1813 | void __iomem *port_mmio = mv_ap_base(ap); | 1850 | void __iomem *port_mmio = mv_ap_base(ap); |
1814 | u32 edma_err_cause, eh_freeze_mask, serr = 0; | 1851 | u32 edma_err_cause, eh_freeze_mask, serr = 0; |
1852 | u32 fis_cause = 0; | ||
1815 | struct mv_port_priv *pp = ap->private_data; | 1853 | struct mv_port_priv *pp = ap->private_data; |
1816 | struct mv_host_priv *hpriv = ap->host->private_data; | 1854 | struct mv_host_priv *hpriv = ap->host->private_data; |
1817 | unsigned int action = 0, err_mask = 0; | 1855 | unsigned int action = 0, err_mask = 0; |
@@ -1821,16 +1859,19 @@ static void mv_err_intr(struct ata_port *ap) | |||
1821 | 1859 | ||
1822 | /* | 1860 | /* |
1823 | * Read and clear the SError and err_cause bits. | 1861 | * Read and clear the SError and err_cause bits. |
1862 | * For GenIIe, if EDMA_ERR_TRANS_IRQ_7 is set, we also must read/clear | ||
1863 | * the FIS_IRQ_CAUSE register before clearing edma_err_cause. | ||
1824 | */ | 1864 | */ |
1825 | sata_scr_read(&ap->link, SCR_ERROR, &serr); | 1865 | sata_scr_read(&ap->link, SCR_ERROR, &serr); |
1826 | sata_scr_write_flush(&ap->link, SCR_ERROR, serr); | 1866 | sata_scr_write_flush(&ap->link, SCR_ERROR, serr); |
1827 | 1867 | ||
1828 | edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); | 1868 | edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); |
1869 | if (IS_GEN_IIE(hpriv) && (edma_err_cause & EDMA_ERR_TRANS_IRQ_7)) { | ||
1870 | fis_cause = readl(port_mmio + SATA_FIS_IRQ_CAUSE_OFS); | ||
1871 | writelfl(~fis_cause, port_mmio + SATA_FIS_IRQ_CAUSE_OFS); | ||
1872 | } | ||
1829 | writelfl(~edma_err_cause, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); | 1873 | writelfl(~edma_err_cause, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); |
1830 | 1874 | ||
1831 | ata_port_printk(ap, KERN_INFO, "%s: err_cause=%08x pp_flags=0x%x\n", | ||
1832 | __func__, edma_err_cause, pp->pp_flags); | ||
1833 | |||
1834 | if (edma_err_cause & EDMA_ERR_DEV) { | 1875 | if (edma_err_cause & EDMA_ERR_DEV) { |
1835 | /* | 1876 | /* |
1836 | * Device errors during FIS-based switching operation | 1877 | * Device errors during FIS-based switching operation |
@@ -1844,6 +1885,18 @@ static void mv_err_intr(struct ata_port *ap) | |||
1844 | ata_ehi_clear_desc(ehi); | 1885 | ata_ehi_clear_desc(ehi); |
1845 | ata_ehi_push_desc(ehi, "edma_err_cause=%08x pp_flags=%08x", | 1886 | ata_ehi_push_desc(ehi, "edma_err_cause=%08x pp_flags=%08x", |
1846 | edma_err_cause, pp->pp_flags); | 1887 | edma_err_cause, pp->pp_flags); |
1888 | |||
1889 | if (IS_GEN_IIE(hpriv) && (edma_err_cause & EDMA_ERR_TRANS_IRQ_7)) { | ||
1890 | ata_ehi_push_desc(ehi, "fis_cause=%08x", fis_cause); | ||
1891 | if (fis_cause & SATA_FIS_IRQ_AN) { | ||
1892 | u32 ec = edma_err_cause & | ||
1893 | ~(EDMA_ERR_TRANS_IRQ_7 | EDMA_ERR_IRQ_TRANSIENT); | ||
1894 | sata_async_notification(ap); | ||
1895 | if (!ec) | ||
1896 | return; /* Just an AN; no need for the nukes */ | ||
1897 | ata_ehi_push_desc(ehi, "SDB notify"); | ||
1898 | } | ||
1899 | } | ||
1847 | /* | 1900 | /* |
1848 | * All generations share these EDMA error cause bits: | 1901 | * All generations share these EDMA error cause bits: |
1849 | */ | 1902 | */ |
@@ -2162,20 +2215,20 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance) | |||
2162 | struct ata_host *host = dev_instance; | 2215 | struct ata_host *host = dev_instance; |
2163 | struct mv_host_priv *hpriv = host->private_data; | 2216 | struct mv_host_priv *hpriv = host->private_data; |
2164 | unsigned int handled = 0; | 2217 | unsigned int handled = 0; |
2165 | u32 main_irq_cause, main_irq_mask; | 2218 | u32 main_irq_cause, pending_irqs; |
2166 | 2219 | ||
2167 | spin_lock(&host->lock); | 2220 | spin_lock(&host->lock); |
2168 | main_irq_cause = readl(hpriv->main_irq_cause_addr); | 2221 | main_irq_cause = readl(hpriv->main_irq_cause_addr); |
2169 | main_irq_mask = readl(hpriv->main_irq_mask_addr); | 2222 | pending_irqs = main_irq_cause & hpriv->main_irq_mask; |
2170 | /* | 2223 | /* |
2171 | * Deal with cases where we either have nothing pending, or have read | 2224 | * Deal with cases where we either have nothing pending, or have read |
2172 | * a bogus register value which can indicate HW removal or PCI fault. | 2225 | * a bogus register value which can indicate HW removal or PCI fault. |
2173 | */ | 2226 | */ |
2174 | if ((main_irq_cause & main_irq_mask) && (main_irq_cause != 0xffffffffU)) { | 2227 | if (pending_irqs && main_irq_cause != 0xffffffffU) { |
2175 | if (unlikely((main_irq_cause & PCI_ERR) && HAS_PCI(host))) | 2228 | if (unlikely((pending_irqs & PCI_ERR) && HAS_PCI(host))) |
2176 | handled = mv_pci_error(host, hpriv->base); | 2229 | handled = mv_pci_error(host, hpriv->base); |
2177 | else | 2230 | else |
2178 | handled = mv_host_intr(host, main_irq_cause); | 2231 | handled = mv_host_intr(host, pending_irqs); |
2179 | } | 2232 | } |
2180 | spin_unlock(&host->lock); | 2233 | spin_unlock(&host->lock); |
2181 | return IRQ_RETVAL(handled); | 2234 | return IRQ_RETVAL(handled); |
@@ -2373,7 +2426,6 @@ static void mv_reset_pci_bus(struct ata_host *host, void __iomem *mmio) | |||
2373 | ZERO(MV_PCI_DISC_TIMER); | 2426 | ZERO(MV_PCI_DISC_TIMER); |
2374 | ZERO(MV_PCI_MSI_TRIGGER); | 2427 | ZERO(MV_PCI_MSI_TRIGGER); |
2375 | writel(0x000100ff, mmio + MV_PCI_XBAR_TMOUT_OFS); | 2428 | writel(0x000100ff, mmio + MV_PCI_XBAR_TMOUT_OFS); |
2376 | ZERO(PCI_HC_MAIN_IRQ_MASK_OFS); | ||
2377 | ZERO(MV_PCI_SERR_MASK); | 2429 | ZERO(MV_PCI_SERR_MASK); |
2378 | ZERO(hpriv->irq_cause_ofs); | 2430 | ZERO(hpriv->irq_cause_ofs); |
2379 | ZERO(hpriv->irq_mask_ofs); | 2431 | ZERO(hpriv->irq_mask_ofs); |
@@ -2728,6 +2780,7 @@ static int mv_hardreset(struct ata_link *link, unsigned int *class, | |||
2728 | 2780 | ||
2729 | rc = sata_link_hardreset(link, timing, deadline + extra, | 2781 | rc = sata_link_hardreset(link, timing, deadline + extra, |
2730 | &online, NULL); | 2782 | &online, NULL); |
2783 | rc = online ? -EAGAIN : rc; | ||
2731 | if (rc) | 2784 | if (rc) |
2732 | return rc; | 2785 | return rc; |
2733 | sata_scr_read(link, SCR_STATUS, &sstatus); | 2786 | sata_scr_read(link, SCR_STATUS, &sstatus); |
@@ -2744,32 +2797,18 @@ static int mv_hardreset(struct ata_link *link, unsigned int *class, | |||
2744 | 2797 | ||
2745 | static void mv_eh_freeze(struct ata_port *ap) | 2798 | static void mv_eh_freeze(struct ata_port *ap) |
2746 | { | 2799 | { |
2747 | struct mv_host_priv *hpriv = ap->host->private_data; | ||
2748 | unsigned int shift, hardport, port = ap->port_no; | ||
2749 | u32 main_irq_mask; | ||
2750 | |||
2751 | /* FIXME: handle coalescing completion events properly */ | ||
2752 | |||
2753 | mv_stop_edma(ap); | 2800 | mv_stop_edma(ap); |
2754 | MV_PORT_TO_SHIFT_AND_HARDPORT(port, shift, hardport); | 2801 | mv_enable_port_irqs(ap, 0); |
2755 | |||
2756 | /* disable assertion of portN err, done events */ | ||
2757 | main_irq_mask = readl(hpriv->main_irq_mask_addr); | ||
2758 | main_irq_mask &= ~((DONE_IRQ | ERR_IRQ) << shift); | ||
2759 | writelfl(main_irq_mask, hpriv->main_irq_mask_addr); | ||
2760 | } | 2802 | } |
2761 | 2803 | ||
2762 | static void mv_eh_thaw(struct ata_port *ap) | 2804 | static void mv_eh_thaw(struct ata_port *ap) |
2763 | { | 2805 | { |
2764 | struct mv_host_priv *hpriv = ap->host->private_data; | 2806 | struct mv_host_priv *hpriv = ap->host->private_data; |
2765 | unsigned int shift, hardport, port = ap->port_no; | 2807 | unsigned int port = ap->port_no; |
2808 | unsigned int hardport = mv_hardport_from_port(port); | ||
2766 | void __iomem *hc_mmio = mv_hc_base_from_port(hpriv->base, port); | 2809 | void __iomem *hc_mmio = mv_hc_base_from_port(hpriv->base, port); |
2767 | void __iomem *port_mmio = mv_ap_base(ap); | 2810 | void __iomem *port_mmio = mv_ap_base(ap); |
2768 | u32 main_irq_mask, hc_irq_cause; | 2811 | u32 hc_irq_cause; |
2769 | |||
2770 | /* FIXME: handle coalescing completion events properly */ | ||
2771 | |||
2772 | MV_PORT_TO_SHIFT_AND_HARDPORT(port, shift, hardport); | ||
2773 | 2812 | ||
2774 | /* clear EDMA errors on this port */ | 2813 | /* clear EDMA errors on this port */ |
2775 | writel(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); | 2814 | writel(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); |
@@ -2779,10 +2818,7 @@ static void mv_eh_thaw(struct ata_port *ap) | |||
2779 | hc_irq_cause &= ~((DEV_IRQ | DMA_IRQ) << hardport); | 2818 | hc_irq_cause &= ~((DEV_IRQ | DMA_IRQ) << hardport); |
2780 | writelfl(hc_irq_cause, hc_mmio + HC_IRQ_CAUSE_OFS); | 2819 | writelfl(hc_irq_cause, hc_mmio + HC_IRQ_CAUSE_OFS); |
2781 | 2820 | ||
2782 | /* enable assertion of portN err, done events */ | 2821 | mv_enable_port_irqs(ap, ERR_IRQ); |
2783 | main_irq_mask = readl(hpriv->main_irq_mask_addr); | ||
2784 | main_irq_mask |= ((DONE_IRQ | ERR_IRQ) << shift); | ||
2785 | writelfl(main_irq_mask, hpriv->main_irq_mask_addr); | ||
2786 | } | 2822 | } |
2787 | 2823 | ||
2788 | /** | 2824 | /** |
@@ -3035,7 +3071,7 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx) | |||
3035 | } | 3071 | } |
3036 | 3072 | ||
3037 | /* global interrupt mask: 0 == mask everything */ | 3073 | /* global interrupt mask: 0 == mask everything */ |
3038 | writel(0, hpriv->main_irq_mask_addr); | 3074 | mv_set_main_irq_mask(host, ~0, 0); |
3039 | 3075 | ||
3040 | n_hc = mv_get_hc_count(host->ports[0]->flags); | 3076 | n_hc = mv_get_hc_count(host->ports[0]->flags); |
3041 | 3077 | ||
@@ -3083,25 +3119,12 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx) | |||
3083 | 3119 | ||
3084 | /* and unmask interrupt generation for host regs */ | 3120 | /* and unmask interrupt generation for host regs */ |
3085 | writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs); | 3121 | writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs); |
3086 | if (IS_GEN_I(hpriv)) | 3122 | |
3087 | writelfl(~HC_MAIN_MASKED_IRQS_5, | 3123 | /* |
3088 | hpriv->main_irq_mask_addr); | 3124 | * enable only global host interrupts for now. |
3089 | else | 3125 | * The per-port interrupts get done later as ports are set up. |
3090 | writelfl(~HC_MAIN_MASKED_IRQS, | 3126 | */ |
3091 | hpriv->main_irq_mask_addr); | 3127 | mv_set_main_irq_mask(host, 0, PCI_ERR); |
3092 | |||
3093 | VPRINTK("HC MAIN IRQ cause/mask=0x%08x/0x%08x " | ||
3094 | "PCI int cause/mask=0x%08x/0x%08x\n", | ||
3095 | readl(hpriv->main_irq_cause_addr), | ||
3096 | readl(hpriv->main_irq_mask_addr), | ||
3097 | readl(mmio + hpriv->irq_cause_ofs), | ||
3098 | readl(mmio + hpriv->irq_mask_ofs)); | ||
3099 | } else { | ||
3100 | writelfl(~HC_MAIN_MASKED_IRQS_SOC, | ||
3101 | hpriv->main_irq_mask_addr); | ||
3102 | VPRINTK("HC MAIN IRQ cause/mask=0x%08x/0x%08x\n", | ||
3103 | readl(hpriv->main_irq_cause_addr), | ||
3104 | readl(hpriv->main_irq_mask_addr)); | ||
3105 | } | 3128 | } |
3106 | done: | 3129 | done: |
3107 | return rc; | 3130 | return rc; |
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index 5a10dc5048ad..030665ba76b7 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -53,7 +53,15 @@ enum { | |||
53 | PDC_MMIO_BAR = 3, | 53 | PDC_MMIO_BAR = 3, |
54 | PDC_MAX_PRD = LIBATA_MAX_PRD - 1, /* -1 for ASIC PRD bug workaround */ | 54 | PDC_MAX_PRD = LIBATA_MAX_PRD - 1, /* -1 for ASIC PRD bug workaround */ |
55 | 55 | ||
56 | /* register offsets */ | 56 | /* host register offsets (from host->iomap[PDC_MMIO_BAR]) */ |
57 | PDC_INT_SEQMASK = 0x40, /* Mask of asserted SEQ INTs */ | ||
58 | PDC_FLASH_CTL = 0x44, /* Flash control register */ | ||
59 | PDC_SATA_PLUG_CSR = 0x6C, /* SATA Plug control/status reg */ | ||
60 | PDC2_SATA_PLUG_CSR = 0x60, /* SATAII Plug control/status reg */ | ||
61 | PDC_TBG_MODE = 0x41C, /* TBG mode (not SATAII) */ | ||
62 | PDC_SLEW_CTL = 0x470, /* slew rate control reg (not SATAII) */ | ||
63 | |||
64 | /* per-port ATA register offsets (from ap->ioaddr.cmd_addr) */ | ||
57 | PDC_FEATURE = 0x04, /* Feature/Error reg (per port) */ | 65 | PDC_FEATURE = 0x04, /* Feature/Error reg (per port) */ |
58 | PDC_SECTOR_COUNT = 0x08, /* Sector count reg (per port) */ | 66 | PDC_SECTOR_COUNT = 0x08, /* Sector count reg (per port) */ |
59 | PDC_SECTOR_NUMBER = 0x0C, /* Sector number reg (per port) */ | 67 | PDC_SECTOR_NUMBER = 0x0C, /* Sector number reg (per port) */ |
@@ -63,14 +71,11 @@ enum { | |||
63 | PDC_COMMAND = 0x1C, /* Command/status reg (per port) */ | 71 | PDC_COMMAND = 0x1C, /* Command/status reg (per port) */ |
64 | PDC_ALTSTATUS = 0x38, /* Alternate-status/device-control reg (per port) */ | 72 | PDC_ALTSTATUS = 0x38, /* Alternate-status/device-control reg (per port) */ |
65 | PDC_PKT_SUBMIT = 0x40, /* Command packet pointer addr */ | 73 | PDC_PKT_SUBMIT = 0x40, /* Command packet pointer addr */ |
66 | PDC_INT_SEQMASK = 0x40, /* Mask of asserted SEQ INTs */ | ||
67 | PDC_FLASH_CTL = 0x44, /* Flash control register */ | ||
68 | PDC_GLOBAL_CTL = 0x48, /* Global control/status (per port) */ | 74 | PDC_GLOBAL_CTL = 0x48, /* Global control/status (per port) */ |
69 | PDC_CTLSTAT = 0x60, /* IDE control and status (per port) */ | 75 | PDC_CTLSTAT = 0x60, /* IDE control and status (per port) */ |
70 | PDC_SATA_PLUG_CSR = 0x6C, /* SATA Plug control/status reg */ | 76 | |
71 | PDC2_SATA_PLUG_CSR = 0x60, /* SATAII Plug control/status reg */ | 77 | /* per-port SATA register offsets (from ap->ioaddr.scr_addr) */ |
72 | PDC_TBG_MODE = 0x41C, /* TBG mode (not SATAII) */ | 78 | PDC_PHYMODE4 = 0x14, |
73 | PDC_SLEW_CTL = 0x470, /* slew rate control reg (not SATAII) */ | ||
74 | 79 | ||
75 | /* PDC_GLOBAL_CTL bit definitions */ | 80 | /* PDC_GLOBAL_CTL bit definitions */ |
76 | PDC_PH_ERR = (1 << 8), /* PCI error while loading packet */ | 81 | PDC_PH_ERR = (1 << 8), /* PCI error while loading packet */ |
@@ -134,7 +139,7 @@ struct pdc_port_priv { | |||
134 | 139 | ||
135 | static int pdc_sata_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val); | 140 | static int pdc_sata_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val); |
136 | static int pdc_sata_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val); | 141 | static int pdc_sata_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val); |
137 | static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); | 142 | static int pdc_ata_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); |
138 | static int pdc_common_port_start(struct ata_port *ap); | 143 | static int pdc_common_port_start(struct ata_port *ap); |
139 | static int pdc_sata_port_start(struct ata_port *ap); | 144 | static int pdc_sata_port_start(struct ata_port *ap); |
140 | static void pdc_qc_prep(struct ata_queued_cmd *qc); | 145 | static void pdc_qc_prep(struct ata_queued_cmd *qc); |
@@ -332,12 +337,12 @@ static int pdc_sata_port_start(struct ata_port *ap) | |||
332 | 337 | ||
333 | /* fix up PHYMODE4 align timing */ | 338 | /* fix up PHYMODE4 align timing */ |
334 | if (ap->flags & PDC_FLAG_GEN_II) { | 339 | if (ap->flags & PDC_FLAG_GEN_II) { |
335 | void __iomem *mmio = ap->ioaddr.scr_addr; | 340 | void __iomem *sata_mmio = ap->ioaddr.scr_addr; |
336 | unsigned int tmp; | 341 | unsigned int tmp; |
337 | 342 | ||
338 | tmp = readl(mmio + 0x014); | 343 | tmp = readl(sata_mmio + PDC_PHYMODE4); |
339 | tmp = (tmp & ~3) | 1; /* set bits 1:0 = 0:1 */ | 344 | tmp = (tmp & ~3) | 1; /* set bits 1:0 = 0:1 */ |
340 | writel(tmp, mmio + 0x014); | 345 | writel(tmp, sata_mmio + PDC_PHYMODE4); |
341 | } | 346 | } |
342 | 347 | ||
343 | return 0; | 348 | return 0; |
@@ -345,32 +350,32 @@ static int pdc_sata_port_start(struct ata_port *ap) | |||
345 | 350 | ||
346 | static void pdc_reset_port(struct ata_port *ap) | 351 | static void pdc_reset_port(struct ata_port *ap) |
347 | { | 352 | { |
348 | void __iomem *mmio = ap->ioaddr.cmd_addr + PDC_CTLSTAT; | 353 | void __iomem *ata_ctlstat_mmio = ap->ioaddr.cmd_addr + PDC_CTLSTAT; |
349 | unsigned int i; | 354 | unsigned int i; |
350 | u32 tmp; | 355 | u32 tmp; |
351 | 356 | ||
352 | for (i = 11; i > 0; i--) { | 357 | for (i = 11; i > 0; i--) { |
353 | tmp = readl(mmio); | 358 | tmp = readl(ata_ctlstat_mmio); |
354 | if (tmp & PDC_RESET) | 359 | if (tmp & PDC_RESET) |
355 | break; | 360 | break; |
356 | 361 | ||
357 | udelay(100); | 362 | udelay(100); |
358 | 363 | ||
359 | tmp |= PDC_RESET; | 364 | tmp |= PDC_RESET; |
360 | writel(tmp, mmio); | 365 | writel(tmp, ata_ctlstat_mmio); |
361 | } | 366 | } |
362 | 367 | ||
363 | tmp &= ~PDC_RESET; | 368 | tmp &= ~PDC_RESET; |
364 | writel(tmp, mmio); | 369 | writel(tmp, ata_ctlstat_mmio); |
365 | readl(mmio); /* flush */ | 370 | readl(ata_ctlstat_mmio); /* flush */ |
366 | } | 371 | } |
367 | 372 | ||
368 | static int pdc_pata_cable_detect(struct ata_port *ap) | 373 | static int pdc_pata_cable_detect(struct ata_port *ap) |
369 | { | 374 | { |
370 | u8 tmp; | 375 | u8 tmp; |
371 | void __iomem *mmio = ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; | 376 | void __iomem *ata_mmio = ap->ioaddr.cmd_addr; |
372 | 377 | ||
373 | tmp = readb(mmio); | 378 | tmp = readb(ata_mmio + PDC_CTLSTAT + 3); |
374 | if (tmp & 0x01) | 379 | if (tmp & 0x01) |
375 | return ATA_CBL_PATA40; | 380 | return ATA_CBL_PATA40; |
376 | return ATA_CBL_PATA80; | 381 | return ATA_CBL_PATA80; |
@@ -557,31 +562,25 @@ static void pdc_qc_prep(struct ata_queued_cmd *qc) | |||
557 | switch (qc->tf.protocol) { | 562 | switch (qc->tf.protocol) { |
558 | case ATA_PROT_DMA: | 563 | case ATA_PROT_DMA: |
559 | pdc_fill_sg(qc); | 564 | pdc_fill_sg(qc); |
560 | /* fall through */ | 565 | /*FALLTHROUGH*/ |
561 | |||
562 | case ATA_PROT_NODATA: | 566 | case ATA_PROT_NODATA: |
563 | i = pdc_pkt_header(&qc->tf, qc->ap->prd_dma, | 567 | i = pdc_pkt_header(&qc->tf, qc->ap->prd_dma, |
564 | qc->dev->devno, pp->pkt); | 568 | qc->dev->devno, pp->pkt); |
565 | |||
566 | if (qc->tf.flags & ATA_TFLAG_LBA48) | 569 | if (qc->tf.flags & ATA_TFLAG_LBA48) |
567 | i = pdc_prep_lba48(&qc->tf, pp->pkt, i); | 570 | i = pdc_prep_lba48(&qc->tf, pp->pkt, i); |
568 | else | 571 | else |
569 | i = pdc_prep_lba28(&qc->tf, pp->pkt, i); | 572 | i = pdc_prep_lba28(&qc->tf, pp->pkt, i); |
570 | |||
571 | pdc_pkt_footer(&qc->tf, pp->pkt, i); | 573 | pdc_pkt_footer(&qc->tf, pp->pkt, i); |
572 | break; | 574 | break; |
573 | |||
574 | case ATAPI_PROT_PIO: | 575 | case ATAPI_PROT_PIO: |
575 | pdc_fill_sg(qc); | 576 | pdc_fill_sg(qc); |
576 | break; | 577 | break; |
577 | |||
578 | case ATAPI_PROT_DMA: | 578 | case ATAPI_PROT_DMA: |
579 | pdc_fill_sg(qc); | 579 | pdc_fill_sg(qc); |
580 | /*FALLTHROUGH*/ | 580 | /*FALLTHROUGH*/ |
581 | case ATAPI_PROT_NODATA: | 581 | case ATAPI_PROT_NODATA: |
582 | pdc_atapi_pkt(qc); | 582 | pdc_atapi_pkt(qc); |
583 | break; | 583 | break; |
584 | |||
585 | default: | 584 | default: |
586 | break; | 585 | break; |
587 | } | 586 | } |
@@ -611,7 +610,7 @@ static unsigned int pdc_sata_ata_port_to_ata_no(const struct ata_port *ap) | |||
611 | unsigned int nr_ports = pdc_sata_nr_ports(ap); | 610 | unsigned int nr_ports = pdc_sata_nr_ports(ap); |
612 | unsigned int i; | 611 | unsigned int i; |
613 | 612 | ||
614 | for(i = 0; i < nr_ports && host->ports[i] != ap; ++i) | 613 | for (i = 0; i < nr_ports && host->ports[i] != ap; ++i) |
615 | ; | 614 | ; |
616 | BUG_ON(i >= nr_ports); | 615 | BUG_ON(i >= nr_ports); |
617 | return pdc_port_no_to_ata_no(i, pdc_is_sataii_tx4(ap->flags)); | 616 | return pdc_port_no_to_ata_no(i, pdc_is_sataii_tx4(ap->flags)); |
@@ -624,14 +623,14 @@ static unsigned int pdc_sata_hotplug_offset(const struct ata_port *ap) | |||
624 | 623 | ||
625 | static void pdc_freeze(struct ata_port *ap) | 624 | static void pdc_freeze(struct ata_port *ap) |
626 | { | 625 | { |
627 | void __iomem *mmio = ap->ioaddr.cmd_addr; | 626 | void __iomem *ata_mmio = ap->ioaddr.cmd_addr; |
628 | u32 tmp; | 627 | u32 tmp; |
629 | 628 | ||
630 | tmp = readl(mmio + PDC_CTLSTAT); | 629 | tmp = readl(ata_mmio + PDC_CTLSTAT); |
631 | tmp |= PDC_IRQ_DISABLE; | 630 | tmp |= PDC_IRQ_DISABLE; |
632 | tmp &= ~PDC_DMA_ENABLE; | 631 | tmp &= ~PDC_DMA_ENABLE; |
633 | writel(tmp, mmio + PDC_CTLSTAT); | 632 | writel(tmp, ata_mmio + PDC_CTLSTAT); |
634 | readl(mmio + PDC_CTLSTAT); /* flush */ | 633 | readl(ata_mmio + PDC_CTLSTAT); /* flush */ |
635 | } | 634 | } |
636 | 635 | ||
637 | static void pdc_sata_freeze(struct ata_port *ap) | 636 | static void pdc_sata_freeze(struct ata_port *ap) |
@@ -659,17 +658,17 @@ static void pdc_sata_freeze(struct ata_port *ap) | |||
659 | 658 | ||
660 | static void pdc_thaw(struct ata_port *ap) | 659 | static void pdc_thaw(struct ata_port *ap) |
661 | { | 660 | { |
662 | void __iomem *mmio = ap->ioaddr.cmd_addr; | 661 | void __iomem *ata_mmio = ap->ioaddr.cmd_addr; |
663 | u32 tmp; | 662 | u32 tmp; |
664 | 663 | ||
665 | /* clear IRQ */ | 664 | /* clear IRQ */ |
666 | readl(mmio + PDC_INT_SEQMASK); | 665 | readl(ata_mmio + PDC_COMMAND); |
667 | 666 | ||
668 | /* turn IRQ back on */ | 667 | /* turn IRQ back on */ |
669 | tmp = readl(mmio + PDC_CTLSTAT); | 668 | tmp = readl(ata_mmio + PDC_CTLSTAT); |
670 | tmp &= ~PDC_IRQ_DISABLE; | 669 | tmp &= ~PDC_IRQ_DISABLE; |
671 | writel(tmp, mmio + PDC_CTLSTAT); | 670 | writel(tmp, ata_mmio + PDC_CTLSTAT); |
672 | readl(mmio + PDC_CTLSTAT); /* flush */ | 671 | readl(ata_mmio + PDC_CTLSTAT); /* flush */ |
673 | } | 672 | } |
674 | 673 | ||
675 | static void pdc_sata_thaw(struct ata_port *ap) | 674 | static void pdc_sata_thaw(struct ata_port *ap) |
@@ -743,11 +742,11 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc, | |||
743 | ata_port_abort(ap); | 742 | ata_port_abort(ap); |
744 | } | 743 | } |
745 | 744 | ||
746 | static inline unsigned int pdc_host_intr(struct ata_port *ap, | 745 | static unsigned int pdc_host_intr(struct ata_port *ap, |
747 | struct ata_queued_cmd *qc) | 746 | struct ata_queued_cmd *qc) |
748 | { | 747 | { |
749 | unsigned int handled = 0; | 748 | unsigned int handled = 0; |
750 | void __iomem *port_mmio = ap->ioaddr.cmd_addr; | 749 | void __iomem *ata_mmio = ap->ioaddr.cmd_addr; |
751 | u32 port_status, err_mask; | 750 | u32 port_status, err_mask; |
752 | 751 | ||
753 | err_mask = PDC_ERR_MASK; | 752 | err_mask = PDC_ERR_MASK; |
@@ -755,7 +754,7 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap, | |||
755 | err_mask &= ~PDC1_ERR_MASK; | 754 | err_mask &= ~PDC1_ERR_MASK; |
756 | else | 755 | else |
757 | err_mask &= ~PDC2_ERR_MASK; | 756 | err_mask &= ~PDC2_ERR_MASK; |
758 | port_status = readl(port_mmio + PDC_GLOBAL_CTL); | 757 | port_status = readl(ata_mmio + PDC_GLOBAL_CTL); |
759 | if (unlikely(port_status & err_mask)) { | 758 | if (unlikely(port_status & err_mask)) { |
760 | pdc_error_intr(ap, qc, port_status, err_mask); | 759 | pdc_error_intr(ap, qc, port_status, err_mask); |
761 | return 1; | 760 | return 1; |
@@ -770,7 +769,6 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap, | |||
770 | ata_qc_complete(qc); | 769 | ata_qc_complete(qc); |
771 | handled = 1; | 770 | handled = 1; |
772 | break; | 771 | break; |
773 | |||
774 | default: | 772 | default: |
775 | ap->stats.idle_irq++; | 773 | ap->stats.idle_irq++; |
776 | break; | 774 | break; |
@@ -781,10 +779,9 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap, | |||
781 | 779 | ||
782 | static void pdc_irq_clear(struct ata_port *ap) | 780 | static void pdc_irq_clear(struct ata_port *ap) |
783 | { | 781 | { |
784 | struct ata_host *host = ap->host; | 782 | void __iomem *ata_mmio = ap->ioaddr.cmd_addr; |
785 | void __iomem *mmio = host->iomap[PDC_MMIO_BAR]; | ||
786 | 783 | ||
787 | readl(mmio + PDC_INT_SEQMASK); | 784 | readl(ata_mmio + PDC_COMMAND); |
788 | } | 785 | } |
789 | 786 | ||
790 | static irqreturn_t pdc_interrupt(int irq, void *dev_instance) | 787 | static irqreturn_t pdc_interrupt(int irq, void *dev_instance) |
@@ -794,7 +791,7 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance) | |||
794 | u32 mask = 0; | 791 | u32 mask = 0; |
795 | unsigned int i, tmp; | 792 | unsigned int i, tmp; |
796 | unsigned int handled = 0; | 793 | unsigned int handled = 0; |
797 | void __iomem *mmio_base; | 794 | void __iomem *host_mmio; |
798 | unsigned int hotplug_offset, ata_no; | 795 | unsigned int hotplug_offset, ata_no; |
799 | u32 hotplug_status; | 796 | u32 hotplug_status; |
800 | int is_sataii_tx4; | 797 | int is_sataii_tx4; |
@@ -806,7 +803,7 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance) | |||
806 | return IRQ_NONE; | 803 | return IRQ_NONE; |
807 | } | 804 | } |
808 | 805 | ||
809 | mmio_base = host->iomap[PDC_MMIO_BAR]; | 806 | host_mmio = host->iomap[PDC_MMIO_BAR]; |
810 | 807 | ||
811 | spin_lock(&host->lock); | 808 | spin_lock(&host->lock); |
812 | 809 | ||
@@ -815,26 +812,26 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance) | |||
815 | hotplug_offset = PDC2_SATA_PLUG_CSR; | 812 | hotplug_offset = PDC2_SATA_PLUG_CSR; |
816 | else | 813 | else |
817 | hotplug_offset = PDC_SATA_PLUG_CSR; | 814 | hotplug_offset = PDC_SATA_PLUG_CSR; |
818 | hotplug_status = readl(mmio_base + hotplug_offset); | 815 | hotplug_status = readl(host_mmio + hotplug_offset); |
819 | if (hotplug_status & 0xff) | 816 | if (hotplug_status & 0xff) |
820 | writel(hotplug_status | 0xff, mmio_base + hotplug_offset); | 817 | writel(hotplug_status | 0xff, host_mmio + hotplug_offset); |
821 | hotplug_status &= 0xff; /* clear uninteresting bits */ | 818 | hotplug_status &= 0xff; /* clear uninteresting bits */ |
822 | 819 | ||
823 | /* reading should also clear interrupts */ | 820 | /* reading should also clear interrupts */ |
824 | mask = readl(mmio_base + PDC_INT_SEQMASK); | 821 | mask = readl(host_mmio + PDC_INT_SEQMASK); |
825 | 822 | ||
826 | if (mask == 0xffffffff && hotplug_status == 0) { | 823 | if (mask == 0xffffffff && hotplug_status == 0) { |
827 | VPRINTK("QUICK EXIT 2\n"); | 824 | VPRINTK("QUICK EXIT 2\n"); |
828 | goto done_irq; | 825 | goto done_irq; |
829 | } | 826 | } |
830 | 827 | ||
831 | mask &= 0xffff; /* only 16 tags possible */ | 828 | mask &= 0xffff; /* only 16 SEQIDs possible */ |
832 | if (mask == 0 && hotplug_status == 0) { | 829 | if (mask == 0 && hotplug_status == 0) { |
833 | VPRINTK("QUICK EXIT 3\n"); | 830 | VPRINTK("QUICK EXIT 3\n"); |
834 | goto done_irq; | 831 | goto done_irq; |
835 | } | 832 | } |
836 | 833 | ||
837 | writel(mask, mmio_base + PDC_INT_SEQMASK); | 834 | writel(mask, host_mmio + PDC_INT_SEQMASK); |
838 | 835 | ||
839 | is_sataii_tx4 = pdc_is_sataii_tx4(host->ports[0]->flags); | 836 | is_sataii_tx4 = pdc_is_sataii_tx4(host->ports[0]->flags); |
840 | 837 | ||
@@ -875,23 +872,24 @@ done_irq: | |||
875 | return IRQ_RETVAL(handled); | 872 | return IRQ_RETVAL(handled); |
876 | } | 873 | } |
877 | 874 | ||
878 | static inline void pdc_packet_start(struct ata_queued_cmd *qc) | 875 | static void pdc_packet_start(struct ata_queued_cmd *qc) |
879 | { | 876 | { |
880 | struct ata_port *ap = qc->ap; | 877 | struct ata_port *ap = qc->ap; |
881 | struct pdc_port_priv *pp = ap->private_data; | 878 | struct pdc_port_priv *pp = ap->private_data; |
882 | void __iomem *mmio = ap->host->iomap[PDC_MMIO_BAR]; | 879 | void __iomem *host_mmio = ap->host->iomap[PDC_MMIO_BAR]; |
880 | void __iomem *ata_mmio = ap->ioaddr.cmd_addr; | ||
883 | unsigned int port_no = ap->port_no; | 881 | unsigned int port_no = ap->port_no; |
884 | u8 seq = (u8) (port_no + 1); | 882 | u8 seq = (u8) (port_no + 1); |
885 | 883 | ||
886 | VPRINTK("ENTER, ap %p\n", ap); | 884 | VPRINTK("ENTER, ap %p\n", ap); |
887 | 885 | ||
888 | writel(0x00000001, mmio + (seq * 4)); | 886 | writel(0x00000001, host_mmio + (seq * 4)); |
889 | readl(mmio + (seq * 4)); /* flush */ | 887 | readl(host_mmio + (seq * 4)); /* flush */ |
890 | 888 | ||
891 | pp->pkt[2] = seq; | 889 | pp->pkt[2] = seq; |
892 | wmb(); /* flush PRD, pkt writes */ | 890 | wmb(); /* flush PRD, pkt writes */ |
893 | writel(pp->pkt_dma, ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); | 891 | writel(pp->pkt_dma, ata_mmio + PDC_PKT_SUBMIT); |
894 | readl(ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */ | 892 | readl(ata_mmio + PDC_PKT_SUBMIT); /* flush */ |
895 | } | 893 | } |
896 | 894 | ||
897 | static unsigned int pdc_qc_issue(struct ata_queued_cmd *qc) | 895 | static unsigned int pdc_qc_issue(struct ata_queued_cmd *qc) |
@@ -909,11 +907,9 @@ static unsigned int pdc_qc_issue(struct ata_queued_cmd *qc) | |||
909 | case ATA_PROT_DMA: | 907 | case ATA_PROT_DMA: |
910 | pdc_packet_start(qc); | 908 | pdc_packet_start(qc); |
911 | return 0; | 909 | return 0; |
912 | |||
913 | default: | 910 | default: |
914 | break; | 911 | break; |
915 | } | 912 | } |
916 | |||
917 | return ata_sff_qc_issue(qc); | 913 | return ata_sff_qc_issue(qc); |
918 | } | 914 | } |
919 | 915 | ||
@@ -987,7 +983,7 @@ static void pdc_ata_setup_port(struct ata_port *ap, | |||
987 | 983 | ||
988 | static void pdc_host_init(struct ata_host *host) | 984 | static void pdc_host_init(struct ata_host *host) |
989 | { | 985 | { |
990 | void __iomem *mmio = host->iomap[PDC_MMIO_BAR]; | 986 | void __iomem *host_mmio = host->iomap[PDC_MMIO_BAR]; |
991 | int is_gen2 = host->ports[0]->flags & PDC_FLAG_GEN_II; | 987 | int is_gen2 = host->ports[0]->flags & PDC_FLAG_GEN_II; |
992 | int hotplug_offset; | 988 | int hotplug_offset; |
993 | u32 tmp; | 989 | u32 tmp; |
@@ -1004,38 +1000,38 @@ static void pdc_host_init(struct ata_host *host) | |||
1004 | */ | 1000 | */ |
1005 | 1001 | ||
1006 | /* enable BMR_BURST, maybe change FIFO_SHD to 8 dwords */ | 1002 | /* enable BMR_BURST, maybe change FIFO_SHD to 8 dwords */ |
1007 | tmp = readl(mmio + PDC_FLASH_CTL); | 1003 | tmp = readl(host_mmio + PDC_FLASH_CTL); |
1008 | tmp |= 0x02000; /* bit 13 (enable bmr burst) */ | 1004 | tmp |= 0x02000; /* bit 13 (enable bmr burst) */ |
1009 | if (!is_gen2) | 1005 | if (!is_gen2) |
1010 | tmp |= 0x10000; /* bit 16 (fifo threshold at 8 dw) */ | 1006 | tmp |= 0x10000; /* bit 16 (fifo threshold at 8 dw) */ |
1011 | writel(tmp, mmio + PDC_FLASH_CTL); | 1007 | writel(tmp, host_mmio + PDC_FLASH_CTL); |
1012 | 1008 | ||
1013 | /* clear plug/unplug flags for all ports */ | 1009 | /* clear plug/unplug flags for all ports */ |
1014 | tmp = readl(mmio + hotplug_offset); | 1010 | tmp = readl(host_mmio + hotplug_offset); |
1015 | writel(tmp | 0xff, mmio + hotplug_offset); | 1011 | writel(tmp | 0xff, host_mmio + hotplug_offset); |
1016 | 1012 | ||
1017 | /* unmask plug/unplug ints */ | 1013 | /* unmask plug/unplug ints */ |
1018 | tmp = readl(mmio + hotplug_offset); | 1014 | tmp = readl(host_mmio + hotplug_offset); |
1019 | writel(tmp & ~0xff0000, mmio + hotplug_offset); | 1015 | writel(tmp & ~0xff0000, host_mmio + hotplug_offset); |
1020 | 1016 | ||
1021 | /* don't initialise TBG or SLEW on 2nd generation chips */ | 1017 | /* don't initialise TBG or SLEW on 2nd generation chips */ |
1022 | if (is_gen2) | 1018 | if (is_gen2) |
1023 | return; | 1019 | return; |
1024 | 1020 | ||
1025 | /* reduce TBG clock to 133 Mhz. */ | 1021 | /* reduce TBG clock to 133 Mhz. */ |
1026 | tmp = readl(mmio + PDC_TBG_MODE); | 1022 | tmp = readl(host_mmio + PDC_TBG_MODE); |
1027 | tmp &= ~0x30000; /* clear bit 17, 16*/ | 1023 | tmp &= ~0x30000; /* clear bit 17, 16*/ |
1028 | tmp |= 0x10000; /* set bit 17:16 = 0:1 */ | 1024 | tmp |= 0x10000; /* set bit 17:16 = 0:1 */ |
1029 | writel(tmp, mmio + PDC_TBG_MODE); | 1025 | writel(tmp, host_mmio + PDC_TBG_MODE); |
1030 | 1026 | ||
1031 | readl(mmio + PDC_TBG_MODE); /* flush */ | 1027 | readl(host_mmio + PDC_TBG_MODE); /* flush */ |
1032 | msleep(10); | 1028 | msleep(10); |
1033 | 1029 | ||
1034 | /* adjust slew rate control register. */ | 1030 | /* adjust slew rate control register. */ |
1035 | tmp = readl(mmio + PDC_SLEW_CTL); | 1031 | tmp = readl(host_mmio + PDC_SLEW_CTL); |
1036 | tmp &= 0xFFFFF03F; /* clear bit 11 ~ 6 */ | 1032 | tmp &= 0xFFFFF03F; /* clear bit 11 ~ 6 */ |
1037 | tmp |= 0x00000900; /* set bit 11-9 = 100b , bit 8-6 = 100 */ | 1033 | tmp |= 0x00000900; /* set bit 11-9 = 100b , bit 8-6 = 100 */ |
1038 | writel(tmp, mmio + PDC_SLEW_CTL); | 1034 | writel(tmp, host_mmio + PDC_SLEW_CTL); |
1039 | } | 1035 | } |
1040 | 1036 | ||
1041 | static int pdc_ata_init_one(struct pci_dev *pdev, | 1037 | static int pdc_ata_init_one(struct pci_dev *pdev, |
@@ -1045,7 +1041,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev, | |||
1045 | const struct ata_port_info *pi = &pdc_port_info[ent->driver_data]; | 1041 | const struct ata_port_info *pi = &pdc_port_info[ent->driver_data]; |
1046 | const struct ata_port_info *ppi[PDC_MAX_PORTS]; | 1042 | const struct ata_port_info *ppi[PDC_MAX_PORTS]; |
1047 | struct ata_host *host; | 1043 | struct ata_host *host; |
1048 | void __iomem *base; | 1044 | void __iomem *host_mmio; |
1049 | int n_ports, i, rc; | 1045 | int n_ports, i, rc; |
1050 | int is_sataii_tx4; | 1046 | int is_sataii_tx4; |
1051 | 1047 | ||
@@ -1062,7 +1058,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev, | |||
1062 | pcim_pin_device(pdev); | 1058 | pcim_pin_device(pdev); |
1063 | if (rc) | 1059 | if (rc) |
1064 | return rc; | 1060 | return rc; |
1065 | base = pcim_iomap_table(pdev)[PDC_MMIO_BAR]; | 1061 | host_mmio = pcim_iomap_table(pdev)[PDC_MMIO_BAR]; |
1066 | 1062 | ||
1067 | /* determine port configuration and setup host */ | 1063 | /* determine port configuration and setup host */ |
1068 | n_ports = 2; | 1064 | n_ports = 2; |
@@ -1072,7 +1068,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev, | |||
1072 | ppi[i] = pi; | 1068 | ppi[i] = pi; |
1073 | 1069 | ||
1074 | if (pi->flags & PDC_FLAG_SATA_PATA) { | 1070 | if (pi->flags & PDC_FLAG_SATA_PATA) { |
1075 | u8 tmp = readb(base + PDC_FLASH_CTL+1); | 1071 | u8 tmp = readb(host_mmio + PDC_FLASH_CTL + 1); |
1076 | if (!(tmp & 0x80)) | 1072 | if (!(tmp & 0x80)) |
1077 | ppi[n_ports++] = pi + 1; | 1073 | ppi[n_ports++] = pi + 1; |
1078 | } | 1074 | } |
@@ -1088,13 +1084,13 @@ static int pdc_ata_init_one(struct pci_dev *pdev, | |||
1088 | for (i = 0; i < host->n_ports; i++) { | 1084 | for (i = 0; i < host->n_ports; i++) { |
1089 | struct ata_port *ap = host->ports[i]; | 1085 | struct ata_port *ap = host->ports[i]; |
1090 | unsigned int ata_no = pdc_port_no_to_ata_no(i, is_sataii_tx4); | 1086 | unsigned int ata_no = pdc_port_no_to_ata_no(i, is_sataii_tx4); |
1091 | unsigned int port_offset = 0x200 + ata_no * 0x80; | 1087 | unsigned int ata_offset = 0x200 + ata_no * 0x80; |
1092 | unsigned int scr_offset = 0x400 + ata_no * 0x100; | 1088 | unsigned int scr_offset = 0x400 + ata_no * 0x100; |
1093 | 1089 | ||
1094 | pdc_ata_setup_port(ap, base + port_offset, base + scr_offset); | 1090 | pdc_ata_setup_port(ap, host_mmio + ata_offset, host_mmio + scr_offset); |
1095 | 1091 | ||
1096 | ata_port_pbar_desc(ap, PDC_MMIO_BAR, -1, "mmio"); | 1092 | ata_port_pbar_desc(ap, PDC_MMIO_BAR, -1, "mmio"); |
1097 | ata_port_pbar_desc(ap, PDC_MMIO_BAR, port_offset, "port"); | 1093 | ata_port_pbar_desc(ap, PDC_MMIO_BAR, ata_offset, "ata"); |
1098 | } | 1094 | } |
1099 | 1095 | ||
1100 | /* initialize adapter */ | 1096 | /* initialize adapter */ |
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 27a110110077..8ee6b5b4ede7 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
@@ -899,14 +899,25 @@ static bool sil24_qc_fill_rtf(struct ata_queued_cmd *qc) | |||
899 | 899 | ||
900 | static void sil24_pmp_attach(struct ata_port *ap) | 900 | static void sil24_pmp_attach(struct ata_port *ap) |
901 | { | 901 | { |
902 | u32 *gscr = ap->link.device->gscr; | ||
903 | |||
902 | sil24_config_pmp(ap, 1); | 904 | sil24_config_pmp(ap, 1); |
903 | sil24_init_port(ap); | 905 | sil24_init_port(ap); |
906 | |||
907 | if (sata_pmp_gscr_vendor(gscr) == 0x11ab && | ||
908 | sata_pmp_gscr_devid(gscr) == 0x4140) { | ||
909 | ata_port_printk(ap, KERN_INFO, | ||
910 | "disabling NCQ support due to sil24-mv4140 quirk\n"); | ||
911 | ap->flags &= ~ATA_FLAG_NCQ; | ||
912 | } | ||
904 | } | 913 | } |
905 | 914 | ||
906 | static void sil24_pmp_detach(struct ata_port *ap) | 915 | static void sil24_pmp_detach(struct ata_port *ap) |
907 | { | 916 | { |
908 | sil24_init_port(ap); | 917 | sil24_init_port(ap); |
909 | sil24_config_pmp(ap, 0); | 918 | sil24_config_pmp(ap, 0); |
919 | |||
920 | ap->flags |= ATA_FLAG_NCQ; | ||
910 | } | 921 | } |
911 | 922 | ||
912 | static int sil24_pmp_hardreset(struct ata_link *link, unsigned int *class, | 923 | static int sil24_pmp_hardreset(struct ata_link *link, unsigned int *class, |
diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h index 183841cc8fdf..8dd4aa76c3bd 100644 --- a/drivers/atm/fore200e.h +++ b/drivers/atm/fore200e.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: fore200e.h,v 1.4 2000/04/14 10:10:34 davem Exp $ */ | ||
2 | #ifndef _FORE200E_H | 1 | #ifndef _FORE200E_H |
3 | #define _FORE200E_H | 2 | #define _FORE200E_H |
4 | 3 | ||
diff --git a/drivers/atm/fore200e_mkfirm.c b/drivers/atm/fore200e_mkfirm.c index 2ebe1a1e6f8b..520e14b488ff 100644 --- a/drivers/atm/fore200e_mkfirm.c +++ b/drivers/atm/fore200e_mkfirm.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | $Id: fore200e_mkfirm.c,v 1.1 2000/02/21 16:04:32 davem Exp $ | ||
3 | |||
4 | mkfirm.c: generates a C readable file from a binary firmware image | 2 | mkfirm.c: generates a C readable file from a binary firmware image |
5 | 3 | ||
6 | Christophe Lizzi (lizzi@{csti.fr, cnam.fr}), June 1999. | 4 | Christophe Lizzi (lizzi@{csti.fr, cnam.fr}), June 1999. |
diff --git a/drivers/atm/he.h b/drivers/atm/he.h index 1dc277547a73..fe6cd15a78a4 100644 --- a/drivers/atm/he.h +++ b/drivers/atm/he.h | |||
@@ -1,5 +1,3 @@ | |||
1 | /* $Id: he.h,v 1.4 2003/05/06 22:48:00 chas Exp $ */ | ||
2 | |||
3 | /* | 1 | /* |
4 | 2 | ||
5 | he.h | 3 | he.h |
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 28d77b5195de..3a504e94a4d9 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c | |||
@@ -1,8 +1,4 @@ | |||
1 | /******************************************************************* | 1 | /******************************************************************* |
2 | * ident "$Id: idt77252.c,v 1.2 2001/11/11 08:13:54 ecd Exp $" | ||
3 | * | ||
4 | * $Author: ecd $ | ||
5 | * $Date: 2001/11/11 08:13:54 $ | ||
6 | * | 2 | * |
7 | * Copyright (c) 2000 ATecoM GmbH | 3 | * Copyright (c) 2000 ATecoM GmbH |
8 | * | 4 | * |
@@ -29,9 +25,6 @@ | |||
29 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 25 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
30 | * | 26 | * |
31 | *******************************************************************/ | 27 | *******************************************************************/ |
32 | static char const rcsid[] = | ||
33 | "$Id: idt77252.c,v 1.2 2001/11/11 08:13:54 ecd Exp $"; | ||
34 | |||
35 | 28 | ||
36 | #include <linux/module.h> | 29 | #include <linux/module.h> |
37 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
diff --git a/drivers/atm/idt77252.h b/drivers/atm/idt77252.h index 6f2b4a5875fb..e83eaf120da0 100644 --- a/drivers/atm/idt77252.h +++ b/drivers/atm/idt77252.h | |||
@@ -1,8 +1,4 @@ | |||
1 | /******************************************************************* | 1 | /******************************************************************* |
2 | * ident "$Id: idt77252.h,v 1.2 2001/11/11 08:13:54 ecd Exp $" | ||
3 | * | ||
4 | * $Author: ecd $ | ||
5 | * $Date: 2001/11/11 08:13:54 $ | ||
6 | * | 2 | * |
7 | * Copyright (c) 2000 ATecoM GmbH | 3 | * Copyright (c) 2000 ATecoM GmbH |
8 | * | 4 | * |
diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h index 133eefcc0475..b2cd20f549cb 100644 --- a/drivers/atm/iphase.h +++ b/drivers/atm/iphase.h | |||
@@ -1025,7 +1025,8 @@ typedef struct iadev_t { | |||
1025 | spinlock_t rx_lock, misc_lock; | 1025 | spinlock_t rx_lock, misc_lock; |
1026 | struct atm_vcc **rx_open; /* list of all open VCs */ | 1026 | struct atm_vcc **rx_open; /* list of all open VCs */ |
1027 | u16 num_rx_desc, rx_buf_sz, rxing; | 1027 | u16 num_rx_desc, rx_buf_sz, rxing; |
1028 | u32 rx_pkt_ram, rx_tmp_cnt, rx_tmp_jif; | 1028 | u32 rx_pkt_ram, rx_tmp_cnt; |
1029 | unsigned long rx_tmp_jif; | ||
1029 | void __iomem *RX_DESC_BASE_ADDR; | 1030 | void __iomem *RX_DESC_BASE_ADDR; |
1030 | u32 drop_rxpkt, drop_rxcell, rx_cell_cnt, rx_pkt_cnt; | 1031 | u32 drop_rxpkt, drop_rxcell, rx_cell_cnt, rx_pkt_cnt; |
1031 | struct atm_dev *next_board; /* other iphase devices */ | 1032 | struct atm_dev *next_board; /* other iphase devices */ |
diff --git a/drivers/atm/nicstarmac.copyright b/drivers/atm/nicstarmac.copyright index 2e15b39fac4f..180531a83c62 100644 --- a/drivers/atm/nicstarmac.copyright +++ b/drivers/atm/nicstarmac.copyright | |||
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | * Modified to work with the IDT7721 nicstar -- AAL5 (tested) only. | 14 | * Modified to work with the IDT7721 nicstar -- AAL5 (tested) only. |
15 | * | 15 | * |
16 | * R. D. Rechenmacher <ron@fnal.gov>, Aug. 6, 1997 $Revision: 1.1 $ $Date: 1999/08/20 11:00:11 $ | 16 | * R. D. Rechenmacher <ron@fnal.gov>, Aug. 6, 1997 |
17 | * | 17 | * |
18 | * Linux driver for the IDT77201 NICStAR PCI ATM controller. | 18 | * Linux driver for the IDT77201 NICStAR PCI ATM controller. |
19 | * PHY component is expected to be 155 Mbps S/UNI-Lite or IDT 77155; | 19 | * PHY component is expected to be 155 Mbps S/UNI-Lite or IDT 77155; |
diff --git a/drivers/base/core.c b/drivers/base/core.c index be288b5e4180..72eccae4904b 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -1084,11 +1084,13 @@ static void device_create_release(struct device *dev) | |||
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | /** | 1086 | /** |
1087 | * device_create - creates a device and registers it with sysfs | 1087 | * device_create_vargs - creates a device and registers it with sysfs |
1088 | * @class: pointer to the struct class that this device should be registered to | 1088 | * @class: pointer to the struct class that this device should be registered to |
1089 | * @parent: pointer to the parent struct device of this new device, if any | 1089 | * @parent: pointer to the parent struct device of this new device, if any |
1090 | * @devt: the dev_t for the char device to be added | 1090 | * @devt: the dev_t for the char device to be added |
1091 | * @drvdata: the data to be added to the device for callbacks | ||
1091 | * @fmt: string for the device's name | 1092 | * @fmt: string for the device's name |
1093 | * @args: va_list for the device's name | ||
1092 | * | 1094 | * |
1093 | * This function can be used by char device classes. A struct device | 1095 | * This function can be used by char device classes. A struct device |
1094 | * will be created in sysfs, registered to the specified class. | 1096 | * will be created in sysfs, registered to the specified class. |
@@ -1104,10 +1106,10 @@ static void device_create_release(struct device *dev) | |||
1104 | * Note: the struct class passed to this function must have previously | 1106 | * Note: the struct class passed to this function must have previously |
1105 | * been created with a call to class_create(). | 1107 | * been created with a call to class_create(). |
1106 | */ | 1108 | */ |
1107 | struct device *device_create(struct class *class, struct device *parent, | 1109 | struct device *device_create_vargs(struct class *class, struct device *parent, |
1108 | dev_t devt, const char *fmt, ...) | 1110 | dev_t devt, void *drvdata, const char *fmt, |
1111 | va_list args) | ||
1109 | { | 1112 | { |
1110 | va_list args; | ||
1111 | struct device *dev = NULL; | 1113 | struct device *dev = NULL; |
1112 | int retval = -ENODEV; | 1114 | int retval = -ENODEV; |
1113 | 1115 | ||
@@ -1124,10 +1126,9 @@ struct device *device_create(struct class *class, struct device *parent, | |||
1124 | dev->class = class; | 1126 | dev->class = class; |
1125 | dev->parent = parent; | 1127 | dev->parent = parent; |
1126 | dev->release = device_create_release; | 1128 | dev->release = device_create_release; |
1129 | dev_set_drvdata(dev, drvdata); | ||
1127 | 1130 | ||
1128 | va_start(args, fmt); | ||
1129 | vsnprintf(dev->bus_id, BUS_ID_SIZE, fmt, args); | 1131 | vsnprintf(dev->bus_id, BUS_ID_SIZE, fmt, args); |
1130 | va_end(args); | ||
1131 | retval = device_register(dev); | 1132 | retval = device_register(dev); |
1132 | if (retval) | 1133 | if (retval) |
1133 | goto error; | 1134 | goto error; |
@@ -1138,6 +1139,78 @@ error: | |||
1138 | kfree(dev); | 1139 | kfree(dev); |
1139 | return ERR_PTR(retval); | 1140 | return ERR_PTR(retval); |
1140 | } | 1141 | } |
1142 | EXPORT_SYMBOL_GPL(device_create_vargs); | ||
1143 | |||
1144 | /** | ||
1145 | * device_create_drvdata - creates a device and registers it with sysfs | ||
1146 | * @class: pointer to the struct class that this device should be registered to | ||
1147 | * @parent: pointer to the parent struct device of this new device, if any | ||
1148 | * @devt: the dev_t for the char device to be added | ||
1149 | * @drvdata: the data to be added to the device for callbacks | ||
1150 | * @fmt: string for the device's name | ||
1151 | * | ||
1152 | * This function can be used by char device classes. A struct device | ||
1153 | * will be created in sysfs, registered to the specified class. | ||
1154 | * | ||
1155 | * A "dev" file will be created, showing the dev_t for the device, if | ||
1156 | * the dev_t is not 0,0. | ||
1157 | * If a pointer to a parent struct device is passed in, the newly created | ||
1158 | * struct device will be a child of that device in sysfs. | ||
1159 | * The pointer to the struct device will be returned from the call. | ||
1160 | * Any further sysfs files that might be required can be created using this | ||
1161 | * pointer. | ||
1162 | * | ||
1163 | * Note: the struct class passed to this function must have previously | ||
1164 | * been created with a call to class_create(). | ||
1165 | */ | ||
1166 | struct device *device_create_drvdata(struct class *class, | ||
1167 | struct device *parent, | ||
1168 | dev_t devt, | ||
1169 | void *drvdata, | ||
1170 | const char *fmt, ...) | ||
1171 | { | ||
1172 | va_list vargs; | ||
1173 | struct device *dev; | ||
1174 | |||
1175 | va_start(vargs, fmt); | ||
1176 | dev = device_create_vargs(class, parent, devt, drvdata, fmt, vargs); | ||
1177 | va_end(vargs); | ||
1178 | return dev; | ||
1179 | } | ||
1180 | EXPORT_SYMBOL_GPL(device_create_drvdata); | ||
1181 | |||
1182 | /** | ||
1183 | * device_create - creates a device and registers it with sysfs | ||
1184 | * @class: pointer to the struct class that this device should be registered to | ||
1185 | * @parent: pointer to the parent struct device of this new device, if any | ||
1186 | * @devt: the dev_t for the char device to be added | ||
1187 | * @fmt: string for the device's name | ||
1188 | * | ||
1189 | * This function can be used by char device classes. A struct device | ||
1190 | * will be created in sysfs, registered to the specified class. | ||
1191 | * | ||
1192 | * A "dev" file will be created, showing the dev_t for the device, if | ||
1193 | * the dev_t is not 0,0. | ||
1194 | * If a pointer to a parent struct device is passed in, the newly created | ||
1195 | * struct device will be a child of that device in sysfs. | ||
1196 | * The pointer to the struct device will be returned from the call. | ||
1197 | * Any further sysfs files that might be required can be created using this | ||
1198 | * pointer. | ||
1199 | * | ||
1200 | * Note: the struct class passed to this function must have previously | ||
1201 | * been created with a call to class_create(). | ||
1202 | */ | ||
1203 | struct device *device_create(struct class *class, struct device *parent, | ||
1204 | dev_t devt, const char *fmt, ...) | ||
1205 | { | ||
1206 | va_list vargs; | ||
1207 | struct device *dev; | ||
1208 | |||
1209 | va_start(vargs, fmt); | ||
1210 | dev = device_create_vargs(class, parent, devt, NULL, fmt, vargs); | ||
1211 | va_end(vargs); | ||
1212 | return dev; | ||
1213 | } | ||
1141 | EXPORT_SYMBOL_GPL(device_create); | 1214 | EXPORT_SYMBOL_GPL(device_create); |
1142 | 1215 | ||
1143 | static int __match_devt(struct device *dev, void *data) | 1216 | static int __match_devt(struct device *dev, void *data) |
@@ -1218,13 +1291,11 @@ int device_rename(struct device *dev, char *new_name) | |||
1218 | } | 1291 | } |
1219 | #else | 1292 | #else |
1220 | if (dev->class) { | 1293 | if (dev->class) { |
1221 | sysfs_remove_link(&dev->class->subsys.kobj, old_device_name); | ||
1222 | error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj, | 1294 | error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj, |
1223 | dev->bus_id); | 1295 | dev->bus_id); |
1224 | if (error) { | 1296 | if (error) |
1225 | dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n", | 1297 | goto out; |
1226 | __func__, error); | 1298 | sysfs_remove_link(&dev->class->subsys.kobj, old_device_name); |
1227 | } | ||
1228 | } | 1299 | } |
1229 | #endif | 1300 | #endif |
1230 | 1301 | ||
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index ebfe038d859e..f1c8feb5510b 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Authors: Dave Boutcher <boutcher@us.ibm.com> | 3 | * Authors: Dave Boutcher <boutcher@us.ibm.com> |
4 | * Ryan Arnold <ryanarn@us.ibm.com> | 4 | * Ryan Arnold <ryanarn@us.ibm.com> |
5 | * Colin Devilbiss <devilbis@us.ibm.com> | 5 | * Colin Devilbiss <devilbis@us.ibm.com> |
6 | * Stephen Rothwell <sfr@au1.ibm.com> | 6 | * Stephen Rothwell |
7 | * | 7 | * |
8 | * (C) Copyright 2000-2004 IBM Corporation | 8 | * (C) Copyright 2000-2004 IBM Corporation |
9 | * | 9 | * |
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 5245a4a0ba74..9d0dfe6e0d63 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Authors: Dave Boutcher <boutcher@us.ibm.com> | 6 | * Authors: Dave Boutcher <boutcher@us.ibm.com> |
7 | * Ryan Arnold <ryanarn@us.ibm.com> | 7 | * Ryan Arnold <ryanarn@us.ibm.com> |
8 | * Colin Devilbiss <devilbis@us.ibm.com> | 8 | * Colin Devilbiss <devilbis@us.ibm.com> |
9 | * Stephen Rothwell <sfr@au1.ibm.com> | 9 | * Stephen Rothwell |
10 | * | 10 | * |
11 | * (C) Copyright 2000-2004 IBM Corporation | 11 | * (C) Copyright 2000-2004 IBM Corporation |
12 | * | 12 | * |
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c index 9a32169e88fb..af211a0ef179 100644 --- a/drivers/char/drm/drm_sysfs.c +++ b/drivers/char/drm/drm_sysfs.c | |||
@@ -34,8 +34,6 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state) | |||
34 | struct drm_minor *drm_minor = to_drm_minor(dev); | 34 | struct drm_minor *drm_minor = to_drm_minor(dev); |
35 | struct drm_device *drm_dev = drm_minor->dev; | 35 | struct drm_device *drm_dev = drm_minor->dev; |
36 | 36 | ||
37 | printk(KERN_ERR "%s\n", __func__); | ||
38 | |||
39 | if (drm_dev->driver->suspend) | 37 | if (drm_dev->driver->suspend) |
40 | return drm_dev->driver->suspend(drm_dev, state); | 38 | return drm_dev->driver->suspend(drm_dev, state); |
41 | 39 | ||
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 9e9bad8bdcf4..dbce1263bdff 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
@@ -402,6 +402,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { | |||
402 | &sysrq_showstate_blocked_op, /* w */ | 402 | &sysrq_showstate_blocked_op, /* w */ |
403 | /* x: May be registered on ppc/powerpc for xmon */ | 403 | /* x: May be registered on ppc/powerpc for xmon */ |
404 | NULL, /* x */ | 404 | NULL, /* x */ |
405 | /* y: May be registered on sparc64 for global register dump */ | ||
405 | NULL, /* y */ | 406 | NULL, /* y */ |
406 | NULL /* z */ | 407 | NULL /* z */ |
407 | }; | 408 | }; |
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 3d3e1c2b310f..65fb848e1cce 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Authors: Dave Boutcher <boutcher@us.ibm.com> | 7 | * Authors: Dave Boutcher <boutcher@us.ibm.com> |
8 | * Ryan Arnold <ryanarn@us.ibm.com> | 8 | * Ryan Arnold <ryanarn@us.ibm.com> |
9 | * Colin Devilbiss <devilbis@us.ibm.com> | 9 | * Colin Devilbiss <devilbis@us.ibm.com> |
10 | * Stephen Rothwell <sfr@au1.ibm.com> | 10 | * Stephen Rothwell |
11 | * | 11 | * |
12 | * (C) Copyright 2000, 2001, 2002, 2003, 2004 IBM Corporation | 12 | * (C) Copyright 2000, 2001, 2002, 2003, 2004 IBM Corporation |
13 | * | 13 | * |
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 58aad63831f4..c39ddaff5e8f 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Authors: Dave Boutcher <boutcher@us.ibm.com> | 6 | * Authors: Dave Boutcher <boutcher@us.ibm.com> |
7 | * Ryan Arnold <ryanarn@us.ibm.com> | 7 | * Ryan Arnold <ryanarn@us.ibm.com> |
8 | * Colin Devilbiss <devilbis@us.ibm.com> | 8 | * Colin Devilbiss <devilbis@us.ibm.com> |
9 | * Stephen Rothwell <sfr@au1.ibm.com> | 9 | * Stephen Rothwell |
10 | * | 10 | * |
11 | * (C) Copyright 2000-2004 IBM Corporation | 11 | * (C) Copyright 2000-2004 IBM Corporation |
12 | * | 12 | * |
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 762b729672e0..0ec0f431e6a1 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
@@ -821,10 +821,10 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) | |||
821 | 821 | ||
822 | dev_dbg(device->common.dev, "%s\n", __func__); | 822 | dev_dbg(device->common.dev, "%s\n", __func__); |
823 | 823 | ||
824 | src = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL); | 824 | src = kmalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL); |
825 | if (!src) | 825 | if (!src) |
826 | return -ENOMEM; | 826 | return -ENOMEM; |
827 | dest = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL); | 827 | dest = kzalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL); |
828 | if (!dest) { | 828 | if (!dest) { |
829 | kfree(src); | 829 | kfree(src); |
830 | return -ENOMEM; | 830 | return -ENOMEM; |
@@ -834,8 +834,6 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) | |||
834 | for (i = 0; i < IOP_ADMA_TEST_SIZE; i++) | 834 | for (i = 0; i < IOP_ADMA_TEST_SIZE; i++) |
835 | ((u8 *) src)[i] = (u8)i; | 835 | ((u8 *) src)[i] = (u8)i; |
836 | 836 | ||
837 | memset(dest, 0, IOP_ADMA_TEST_SIZE); | ||
838 | |||
839 | /* Start copy, using first DMA channel */ | 837 | /* Start copy, using first DMA channel */ |
840 | dma_chan = container_of(device->common.channels.next, | 838 | dma_chan = container_of(device->common.channels.next, |
841 | struct dma_chan, | 839 | struct dma_chan, |
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c index 4a541921a14a..dda14015e873 100644 --- a/drivers/firewire/fw-cdev.c +++ b/drivers/firewire/fw-cdev.c | |||
@@ -113,6 +113,11 @@ static int fw_device_op_open(struct inode *inode, struct file *file) | |||
113 | if (device == NULL) | 113 | if (device == NULL) |
114 | return -ENODEV; | 114 | return -ENODEV; |
115 | 115 | ||
116 | if (fw_device_is_shutdown(device)) { | ||
117 | fw_device_put(device); | ||
118 | return -ENODEV; | ||
119 | } | ||
120 | |||
116 | client = kzalloc(sizeof(*client), GFP_KERNEL); | 121 | client = kzalloc(sizeof(*client), GFP_KERNEL); |
117 | if (client == NULL) { | 122 | if (client == NULL) { |
118 | fw_device_put(device); | 123 | fw_device_put(device); |
@@ -901,6 +906,9 @@ fw_device_op_ioctl(struct file *file, | |||
901 | { | 906 | { |
902 | struct client *client = file->private_data; | 907 | struct client *client = file->private_data; |
903 | 908 | ||
909 | if (fw_device_is_shutdown(client->device)) | ||
910 | return -ENODEV; | ||
911 | |||
904 | return dispatch_ioctl(client, cmd, (void __user *) arg); | 912 | return dispatch_ioctl(client, cmd, (void __user *) arg); |
905 | } | 913 | } |
906 | 914 | ||
@@ -911,6 +919,9 @@ fw_device_op_compat_ioctl(struct file *file, | |||
911 | { | 919 | { |
912 | struct client *client = file->private_data; | 920 | struct client *client = file->private_data; |
913 | 921 | ||
922 | if (fw_device_is_shutdown(client->device)) | ||
923 | return -ENODEV; | ||
924 | |||
914 | return dispatch_ioctl(client, cmd, compat_ptr(arg)); | 925 | return dispatch_ioctl(client, cmd, compat_ptr(arg)); |
915 | } | 926 | } |
916 | #endif | 927 | #endif |
@@ -922,6 +933,9 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma) | |||
922 | unsigned long size; | 933 | unsigned long size; |
923 | int page_count, retval; | 934 | int page_count, retval; |
924 | 935 | ||
936 | if (fw_device_is_shutdown(client->device)) | ||
937 | return -ENODEV; | ||
938 | |||
925 | /* FIXME: We could support multiple buffers, but we don't. */ | 939 | /* FIXME: We could support multiple buffers, but we don't. */ |
926 | if (client->buffer.pages != NULL) | 940 | if (client->buffer.pages != NULL) |
927 | return -EBUSY; | 941 | return -EBUSY; |
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index f88714b06000..47ac1a7d66e1 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: hid-debug.h,v 1.8 2001/09/25 09:37:57 vojtech Exp $ | ||
3 | * | ||
4 | * (c) 1999 Andreas Gal <gal@cs.uni-magdeburg.de> | 2 | * (c) 1999 Andreas Gal <gal@cs.uni-magdeburg.de> |
5 | * (c) 2000-2001 Vojtech Pavlik <vojtech@ucw.cz> | 3 | * (c) 2000-2001 Vojtech Pavlik <vojtech@ucw.cz> |
6 | * (c) 2007 Jiri Kosina | 4 | * (c) 2007 Jiri Kosina |
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index c3eb3f13e2ca..5c52a20ad344 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: hid-input.c,v 1.2 2002/04/23 00:59:25 rdamazio Exp $ | ||
3 | * | ||
4 | * Copyright (c) 2000-2001 Vojtech Pavlik | 2 | * Copyright (c) 2000-2001 Vojtech Pavlik |
5 | * Copyright (c) 2006-2007 Jiri Kosina | 3 | * Copyright (c) 2006-2007 Jiri Kosina |
6 | * | 4 | * |
@@ -218,8 +216,9 @@ int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, | |||
218 | } | 216 | } |
219 | } | 217 | } |
220 | 218 | ||
221 | if (test_bit(usage->code, hid->pb_pressed_numlock) || | 219 | if (hid->quirks & HID_QUIRK_APPLE_NUMLOCK_EMULATION && ( |
222 | test_bit(LED_NUML, input->led)) { | 220 | test_bit(usage->code, hid->pb_pressed_numlock) || |
221 | test_bit(LED_NUML, input->led))) { | ||
223 | trans = find_translation(powerbook_numlock_keys, usage->code); | 222 | trans = find_translation(powerbook_numlock_keys, usage->code); |
224 | 223 | ||
225 | if (trans) { | 224 | if (trans) { |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index d3f8d9194f30..1df832a8fcbc 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -325,6 +325,10 @@ | |||
325 | #define USB_DEVICE_ID_MGE_UPS 0xffff | 325 | #define USB_DEVICE_ID_MGE_UPS 0xffff |
326 | #define USB_DEVICE_ID_MGE_UPS1 0x0001 | 326 | #define USB_DEVICE_ID_MGE_UPS1 0x0001 |
327 | 327 | ||
328 | #define USB_VENDOR_ID_MICROCHIP 0x04d8 | ||
329 | #define USB_DEVICE_ID_PICKIT1 0x0032 | ||
330 | #define USB_DEVICE_ID_PICKIT2 0x0033 | ||
331 | |||
328 | #define USB_VENDOR_ID_MICROSOFT 0x045e | 332 | #define USB_VENDOR_ID_MICROSOFT 0x045e |
329 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b | 333 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b |
330 | #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d | 334 | #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d |
@@ -371,6 +375,9 @@ | |||
371 | #define USB_VENDOR_ID_SONY 0x054c | 375 | #define USB_VENDOR_ID_SONY 0x054c |
372 | #define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 | 376 | #define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 |
373 | 377 | ||
378 | #define USB_VENDOR_ID_SOUNDGRAPH 0x15c2 | ||
379 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD 0x0038 | ||
380 | |||
374 | #define USB_VENDOR_ID_SUN 0x0430 | 381 | #define USB_VENDOR_ID_SUN 0x0430 |
375 | #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab | 382 | #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab |
376 | 383 | ||
@@ -567,6 +574,7 @@ static const struct hid_blacklist { | |||
567 | { USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE }, | 574 | { USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE }, |
568 | { USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE }, | 575 | { USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE }, |
569 | { USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE }, | 576 | { USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE }, |
577 | { USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD, HID_QUIRK_IGNORE }, | ||
570 | { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE }, | 578 | { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE }, |
571 | { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE }, | 579 | { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE }, |
572 | { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE }, | 580 | { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE }, |
@@ -580,6 +588,9 @@ static const struct hid_blacklist { | |||
580 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE }, | 588 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE }, |
581 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE }, | 589 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE }, |
582 | 590 | ||
591 | { USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1, HID_QUIRK_IGNORE }, | ||
592 | { USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2, HID_QUIRK_IGNORE }, | ||
593 | |||
583 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP }, | 594 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP }, |
584 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP }, | 595 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP }, |
585 | 596 | ||
@@ -611,28 +622,28 @@ static const struct hid_blacklist { | |||
611 | 622 | ||
612 | { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, | 623 | { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, |
613 | 624 | ||
614 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 625 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
615 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 626 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
616 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 627 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
617 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD}, | 628 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD}, |
618 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 629 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
619 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 630 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
620 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD}, | 631 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD}, |
621 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 632 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
622 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 633 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
623 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD}, | 634 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD}, |
624 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 635 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
625 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN }, | 636 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN }, |
626 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, | 637 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, |
627 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN }, | 638 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN }, |
628 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 639 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
629 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 640 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
630 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 641 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
631 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN }, | 642 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, |
632 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, | 643 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, |
633 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_HAS_FN }, | 644 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, |
634 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 645 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
635 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, | 646 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, |
636 | 647 | ||
637 | { USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS }, | 648 | { USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS }, |
638 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD, HID_QUIRK_RESET_LEDS }, | 649 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD, HID_QUIRK_RESET_LEDS }, |
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c index 5d9dbb47e4a8..3cd46d2e53c1 100644 --- a/drivers/hid/usbhid/usbkbd.c +++ b/drivers/hid/usbhid/usbkbd.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: usbkbd.c,v 1.27 2001/12/27 10:37:41 vojtech Exp $ | ||
3 | * | ||
4 | * Copyright (c) 1999-2001 Vojtech Pavlik | 2 | * Copyright (c) 1999-2001 Vojtech Pavlik |
5 | * | 3 | * |
6 | * USB HIDBP Keyboard support | 4 | * USB HIDBP Keyboard support |
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c index df0d96d989de..703e9d0e8714 100644 --- a/drivers/hid/usbhid/usbmouse.c +++ b/drivers/hid/usbhid/usbmouse.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: usbmouse.c,v 1.15 2001/12/27 10:37:41 vojtech Exp $ | ||
3 | * | ||
4 | * Copyright (c) 1999-2001 Vojtech Pavlik | 2 | * Copyright (c) 1999-2001 Vojtech Pavlik |
5 | * | 3 | * |
6 | * USB HIDBP Mouse support | 4 | * USB HIDBP Mouse support |
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 34b0d4f26b58..655ec7ef568a 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -648,13 +648,12 @@ static int ide_register_port(ide_hwif_t *hwif) | |||
648 | 648 | ||
649 | get_device(&hwif->gendev); | 649 | get_device(&hwif->gendev); |
650 | 650 | ||
651 | hwif->portdev = device_create(ide_port_class, &hwif->gendev, | 651 | hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev, |
652 | MKDEV(0, 0), hwif->name); | 652 | MKDEV(0, 0), hwif, hwif->name); |
653 | if (IS_ERR(hwif->portdev)) { | 653 | if (IS_ERR(hwif->portdev)) { |
654 | ret = PTR_ERR(hwif->portdev); | 654 | ret = PTR_ERR(hwif->portdev); |
655 | device_unregister(&hwif->gendev); | 655 | device_unregister(&hwif->gendev); |
656 | } | 656 | } |
657 | dev_set_drvdata(hwif->portdev, hwif); | ||
658 | out: | 657 | out: |
659 | return ret; | 658 | return ret; |
660 | } | 659 | } |
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 16b9d0ad154e..a5ceff287a28 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
@@ -1539,15 +1539,13 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb, | |||
1539 | 1539 | ||
1540 | static void sbp2_create_command_orb(struct sbp2_lu *lu, | 1540 | static void sbp2_create_command_orb(struct sbp2_lu *lu, |
1541 | struct sbp2_command_info *cmd, | 1541 | struct sbp2_command_info *cmd, |
1542 | unchar *scsi_cmd, | 1542 | struct scsi_cmnd *SCpnt) |
1543 | unsigned int scsi_use_sg, | ||
1544 | unsigned int scsi_request_bufflen, | ||
1545 | struct scatterlist *sg, | ||
1546 | enum dma_data_direction dma_dir) | ||
1547 | { | 1543 | { |
1548 | struct sbp2_fwhost_info *hi = lu->hi; | 1544 | struct sbp2_fwhost_info *hi = lu->hi; |
1549 | struct sbp2_command_orb *orb = &cmd->command_orb; | 1545 | struct sbp2_command_orb *orb = &cmd->command_orb; |
1550 | u32 orb_direction; | 1546 | u32 orb_direction; |
1547 | unsigned int scsi_request_bufflen = scsi_bufflen(SCpnt); | ||
1548 | enum dma_data_direction dma_dir = SCpnt->sc_data_direction; | ||
1551 | 1549 | ||
1552 | /* | 1550 | /* |
1553 | * Set-up our command ORB. | 1551 | * Set-up our command ORB. |
@@ -1580,13 +1578,14 @@ static void sbp2_create_command_orb(struct sbp2_lu *lu, | |||
1580 | orb->data_descriptor_lo = 0x0; | 1578 | orb->data_descriptor_lo = 0x0; |
1581 | orb->misc |= ORB_SET_DIRECTION(1); | 1579 | orb->misc |= ORB_SET_DIRECTION(1); |
1582 | } else | 1580 | } else |
1583 | sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_use_sg, sg, | 1581 | sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_sg_count(SCpnt), |
1582 | scsi_sglist(SCpnt), | ||
1584 | orb_direction, dma_dir); | 1583 | orb_direction, dma_dir); |
1585 | 1584 | ||
1586 | sbp2util_cpu_to_be32_buffer(orb, sizeof(*orb)); | 1585 | sbp2util_cpu_to_be32_buffer(orb, sizeof(*orb)); |
1587 | 1586 | ||
1588 | memset(orb->cdb, 0, 12); | 1587 | memset(orb->cdb, 0, sizeof(orb->cdb)); |
1589 | memcpy(orb->cdb, scsi_cmd, COMMAND_SIZE(*scsi_cmd)); | 1588 | memcpy(orb->cdb, SCpnt->cmnd, SCpnt->cmd_len); |
1590 | } | 1589 | } |
1591 | 1590 | ||
1592 | static void sbp2_link_orb_command(struct sbp2_lu *lu, | 1591 | static void sbp2_link_orb_command(struct sbp2_lu *lu, |
@@ -1669,16 +1668,13 @@ static void sbp2_link_orb_command(struct sbp2_lu *lu, | |||
1669 | static int sbp2_send_command(struct sbp2_lu *lu, struct scsi_cmnd *SCpnt, | 1668 | static int sbp2_send_command(struct sbp2_lu *lu, struct scsi_cmnd *SCpnt, |
1670 | void (*done)(struct scsi_cmnd *)) | 1669 | void (*done)(struct scsi_cmnd *)) |
1671 | { | 1670 | { |
1672 | unchar *scsi_cmd = (unchar *)SCpnt->cmnd; | ||
1673 | struct sbp2_command_info *cmd; | 1671 | struct sbp2_command_info *cmd; |
1674 | 1672 | ||
1675 | cmd = sbp2util_allocate_command_orb(lu, SCpnt, done); | 1673 | cmd = sbp2util_allocate_command_orb(lu, SCpnt, done); |
1676 | if (!cmd) | 1674 | if (!cmd) |
1677 | return -EIO; | 1675 | return -EIO; |
1678 | 1676 | ||
1679 | sbp2_create_command_orb(lu, cmd, scsi_cmd, scsi_sg_count(SCpnt), | 1677 | sbp2_create_command_orb(lu, cmd, SCpnt); |
1680 | scsi_bufflen(SCpnt), scsi_sglist(SCpnt), | ||
1681 | SCpnt->sc_data_direction); | ||
1682 | sbp2_link_orb_command(lu, cmd); | 1678 | sbp2_link_orb_command(lu, cmd); |
1683 | 1679 | ||
1684 | return 0; | 1680 | return 0; |
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 3aa2db54eae4..840ede9ae965 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c | |||
@@ -1005,8 +1005,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, | |||
1005 | if (cdev_add(port->cdev, base_dev + port->dev_num, 1)) | 1005 | if (cdev_add(port->cdev, base_dev + port->dev_num, 1)) |
1006 | goto err_cdev; | 1006 | goto err_cdev; |
1007 | 1007 | ||
1008 | port->dev = device_create(umad_class, device->dma_device, | 1008 | port->dev = device_create_drvdata(umad_class, device->dma_device, |
1009 | port->cdev->dev, "umad%d", port->dev_num); | 1009 | port->cdev->dev, port, |
1010 | "umad%d", port->dev_num); | ||
1010 | if (IS_ERR(port->dev)) | 1011 | if (IS_ERR(port->dev)) |
1011 | goto err_cdev; | 1012 | goto err_cdev; |
1012 | 1013 | ||
@@ -1024,15 +1025,12 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, | |||
1024 | if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1)) | 1025 | if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1)) |
1025 | goto err_sm_cdev; | 1026 | goto err_sm_cdev; |
1026 | 1027 | ||
1027 | port->sm_dev = device_create(umad_class, device->dma_device, | 1028 | port->sm_dev = device_create_drvdata(umad_class, device->dma_device, |
1028 | port->sm_cdev->dev, | 1029 | port->sm_cdev->dev, port, |
1029 | "issm%d", port->dev_num); | 1030 | "issm%d", port->dev_num); |
1030 | if (IS_ERR(port->sm_dev)) | 1031 | if (IS_ERR(port->sm_dev)) |
1031 | goto err_sm_cdev; | 1032 | goto err_sm_cdev; |
1032 | 1033 | ||
1033 | dev_set_drvdata(port->dev, port); | ||
1034 | dev_set_drvdata(port->sm_dev, port); | ||
1035 | |||
1036 | if (device_create_file(port->sm_dev, &dev_attr_ibdev)) | 1034 | if (device_create_file(port->sm_dev, &dev_attr_ibdev)) |
1037 | goto err_sm_dev; | 1035 | goto err_sm_dev; |
1038 | if (device_create_file(port->sm_dev, &dev_attr_port)) | 1036 | if (device_create_file(port->sm_dev, &dev_attr_port)) |
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index cc1afa28c181..f806da184b51 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c | |||
@@ -755,14 +755,15 @@ static void ib_uverbs_add_one(struct ib_device *device) | |||
755 | if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1)) | 755 | if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1)) |
756 | goto err_cdev; | 756 | goto err_cdev; |
757 | 757 | ||
758 | uverbs_dev->dev = device_create(uverbs_class, device->dma_device, | 758 | uverbs_dev->dev = device_create_drvdata(uverbs_class, |
759 | uverbs_dev->cdev->dev, | 759 | device->dma_device, |
760 | "uverbs%d", uverbs_dev->devnum); | 760 | uverbs_dev->cdev->dev, |
761 | uverbs_dev, | ||
762 | "uverbs%d", | ||
763 | uverbs_dev->devnum); | ||
761 | if (IS_ERR(uverbs_dev->dev)) | 764 | if (IS_ERR(uverbs_dev->dev)) |
762 | goto err_cdev; | 765 | goto err_cdev; |
763 | 766 | ||
764 | dev_set_drvdata(uverbs_dev->dev, uverbs_dev); | ||
765 | |||
766 | if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev)) | 767 | if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev)) |
767 | goto err_class; | 768 | goto err_class; |
768 | if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version)) | 769 | if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version)) |
diff --git a/drivers/input/keyboard/aaed2000_kbd.c b/drivers/input/keyboard/aaed2000_kbd.c index a293e8b3f508..8a77bfcd05bc 100644 --- a/drivers/input/keyboard/aaed2000_kbd.c +++ b/drivers/input/keyboard/aaed2000_kbd.c | |||
@@ -183,4 +183,4 @@ module_exit(aaedkbd_exit); | |||
183 | 183 | ||
184 | MODULE_AUTHOR("Nicolas Bellido Y Ortega"); | 184 | MODULE_AUTHOR("Nicolas Bellido Y Ortega"); |
185 | MODULE_DESCRIPTION("AAED-2000 Keyboard Driver"); | 185 | MODULE_DESCRIPTION("AAED-2000 Keyboard Driver"); |
186 | MODULE_LICENSE("GPLv2"); | 186 | MODULE_LICENSE("GPL v2"); |
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c index 29fbec6218b9..1aa46ae12630 100644 --- a/drivers/input/keyboard/corgikbd.c +++ b/drivers/input/keyboard/corgikbd.c | |||
@@ -412,5 +412,5 @@ module_exit(corgikbd_exit); | |||
412 | 412 | ||
413 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); | 413 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); |
414 | MODULE_DESCRIPTION("Corgi Keyboard Driver"); | 414 | MODULE_DESCRIPTION("Corgi Keyboard Driver"); |
415 | MODULE_LICENSE("GPLv2"); | 415 | MODULE_LICENSE("GPL v2"); |
416 | MODULE_ALIAS("platform:corgi-keyboard"); | 416 | MODULE_ALIAS("platform:corgi-keyboard"); |
diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c index 9387da343f97..781fc6102860 100644 --- a/drivers/input/keyboard/jornada680_kbd.c +++ b/drivers/input/keyboard/jornada680_kbd.c | |||
@@ -275,5 +275,5 @@ module_exit(jornada680kbd_exit); | |||
275 | 275 | ||
276 | MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); | 276 | MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); |
277 | MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver"); | 277 | MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver"); |
278 | MODULE_LICENSE("GPLv2"); | 278 | MODULE_LICENSE("GPL v2"); |
279 | MODULE_ALIAS("platform:jornada680_kbd"); | 279 | MODULE_ALIAS("platform:jornada680_kbd"); |
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c index a1164a0c7736..ce650af6d649 100644 --- a/drivers/input/keyboard/jornada720_kbd.c +++ b/drivers/input/keyboard/jornada720_kbd.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>"); | 30 | MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>"); |
31 | MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver"); | 31 | MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver"); |
32 | MODULE_LICENSE("GPLv2"); | 32 | MODULE_LICENSE("GPL v2"); |
33 | 33 | ||
34 | static unsigned short jornada_std_keymap[128] = { /* ROW */ | 34 | static unsigned short jornada_std_keymap[128] = { /* ROW */ |
35 | 0, KEY_ESC, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, /* #1 */ | 35 | 0, KEY_ESC, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, /* #1 */ |
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c index 61e401bc9109..1aa37181c40f 100644 --- a/drivers/input/keyboard/spitzkbd.c +++ b/drivers/input/keyboard/spitzkbd.c | |||
@@ -494,5 +494,5 @@ module_exit(spitzkbd_exit); | |||
494 | 494 | ||
495 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); | 495 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); |
496 | MODULE_DESCRIPTION("Spitz Keyboard Driver"); | 496 | MODULE_DESCRIPTION("Spitz Keyboard Driver"); |
497 | MODULE_LICENSE("GPLv2"); | 497 | MODULE_LICENSE("GPL v2"); |
498 | MODULE_ALIAS("platform:spitz-keyboard"); | 498 | MODULE_ALIAS("platform:spitz-keyboard"); |
diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c index 742242111bf1..1aca108b1031 100644 --- a/drivers/input/touchscreen/jornada720_ts.c +++ b/drivers/input/touchscreen/jornada720_ts.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); | 25 | MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); |
26 | MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver"); | 26 | MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver"); |
27 | MODULE_LICENSE("GPLv2"); | 27 | MODULE_LICENSE("GPL v2"); |
28 | 28 | ||
29 | struct jornada_ts { | 29 | struct jornada_ts { |
30 | struct input_dev *dev; | 30 | struct input_dev *dev; |
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c index ebef4ce1b00c..29419a8d31dc 100644 --- a/drivers/isdn/capi/capiutil.c +++ b/drivers/isdn/capi/capiutil.c | |||
@@ -948,17 +948,17 @@ int __init cdebug_init(void) | |||
948 | { | 948 | { |
949 | g_cmsg= kmalloc(sizeof(_cmsg), GFP_KERNEL); | 949 | g_cmsg= kmalloc(sizeof(_cmsg), GFP_KERNEL); |
950 | if (!g_cmsg) | 950 | if (!g_cmsg) |
951 | return ENOMEM; | 951 | return -ENOMEM; |
952 | g_debbuf = kmalloc(sizeof(_cdebbuf), GFP_KERNEL); | 952 | g_debbuf = kmalloc(sizeof(_cdebbuf), GFP_KERNEL); |
953 | if (!g_debbuf) { | 953 | if (!g_debbuf) { |
954 | kfree(g_cmsg); | 954 | kfree(g_cmsg); |
955 | return ENOMEM; | 955 | return -ENOMEM; |
956 | } | 956 | } |
957 | g_debbuf->buf = kmalloc(CDEBUG_GSIZE, GFP_KERNEL); | 957 | g_debbuf->buf = kmalloc(CDEBUG_GSIZE, GFP_KERNEL); |
958 | if (!g_debbuf->buf) { | 958 | if (!g_debbuf->buf) { |
959 | kfree(g_cmsg); | 959 | kfree(g_cmsg); |
960 | kfree(g_debbuf); | 960 | kfree(g_debbuf); |
961 | return ENOMEM;; | 961 | return -ENOMEM;; |
962 | } | 962 | } |
963 | g_debbuf->size = CDEBUG_GSIZE; | 963 | g_debbuf->size = CDEBUG_GSIZE; |
964 | g_debbuf->buf[0] = 0; | 964 | g_debbuf->buf[0] = 0; |
diff --git a/drivers/isdn/hysdn/Kconfig b/drivers/isdn/hysdn/Kconfig index c6d8a7042988..c9e4231968ef 100644 --- a/drivers/isdn/hysdn/Kconfig +++ b/drivers/isdn/hysdn/Kconfig | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | config HYSDN | 4 | config HYSDN |
5 | tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)" | 5 | tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)" |
6 | depends on m && PROC_FS && PCI && BROKEN_ON_SMP | 6 | depends on m && PROC_FS && PCI |
7 | help | 7 | help |
8 | Say Y here if you have one of Hypercope's active PCI ISDN cards | 8 | Say Y here if you have one of Hypercope's active PCI ISDN cards |
9 | Champ, Ergo and Metro. You will then get a module called hysdn. | 9 | Champ, Ergo and Metro. You will then get a module called hysdn. |
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c index 6cdbad3a9926..3eb096f0ae1b 100644 --- a/drivers/isdn/hysdn/boardergo.c +++ b/drivers/isdn/hysdn/boardergo.c | |||
@@ -64,10 +64,11 @@ ergo_interrupt(int intno, void *dev_id) | |||
64 | } /* ergo_interrupt */ | 64 | } /* ergo_interrupt */ |
65 | 65 | ||
66 | /******************************************************************************/ | 66 | /******************************************************************************/ |
67 | /* ergo_irq_bh is the function called by the immediate kernel task list after */ | 67 | /* ergo_irq_bh will be called as part of the kernel clearing its shared work */ |
68 | /* being activated with queue_task and no interrupts active. This task is the */ | 68 | /* queue sometime after a call to schedule_work has been made passing our */ |
69 | /* only one handling data transfer from or to the card after booting. The task */ | 69 | /* work_struct. This task is the only one handling data transfer from or to */ |
70 | /* may be queued from everywhere (interrupts included). */ | 70 | /* the card after booting. The task may be queued from everywhere */ |
71 | /* (interrupts included). */ | ||
71 | /******************************************************************************/ | 72 | /******************************************************************************/ |
72 | static void | 73 | static void |
73 | ergo_irq_bh(struct work_struct *ugli_api) | 74 | ergo_irq_bh(struct work_struct *ugli_api) |
@@ -90,7 +91,6 @@ ergo_irq_bh(struct work_struct *ugli_api) | |||
90 | card->hw_lock = 1; /* we now lock the hardware */ | 91 | card->hw_lock = 1; /* we now lock the hardware */ |
91 | 92 | ||
92 | do { | 93 | do { |
93 | sti(); /* reenable other ints */ | ||
94 | again = 0; /* assume loop not to be repeated */ | 94 | again = 0; /* assume loop not to be repeated */ |
95 | 95 | ||
96 | if (!dpr->ToHyFlag) { | 96 | if (!dpr->ToHyFlag) { |
@@ -110,7 +110,6 @@ ergo_irq_bh(struct work_struct *ugli_api) | |||
110 | again = 1; /* restart loop */ | 110 | again = 1; /* restart loop */ |
111 | } | 111 | } |
112 | } /* a message has arrived for us */ | 112 | } /* a message has arrived for us */ |
113 | cli(); /* no further ints */ | ||
114 | if (again) { | 113 | if (again) { |
115 | dpr->ToHyInt = 1; | 114 | dpr->ToHyInt = 1; |
116 | dpr->ToPcInt = 1; /* interrupt to E1 for all cards */ | 115 | dpr->ToPcInt = 1; /* interrupt to E1 for all cards */ |
@@ -242,7 +241,6 @@ ergo_writebootimg(struct HYSDN_CARD *card, unsigned char *buf, | |||
242 | byteout(card->iobase + PCI9050_USER_IO, PCI9050_E1_RUN); /* start E1 processor */ | 241 | byteout(card->iobase + PCI9050_USER_IO, PCI9050_E1_RUN); /* start E1 processor */ |
243 | /* the interrupts are still masked */ | 242 | /* the interrupts are still masked */ |
244 | 243 | ||
245 | sti(); | ||
246 | msleep_interruptible(20); /* Timeout 20ms */ | 244 | msleep_interruptible(20); /* Timeout 20ms */ |
247 | 245 | ||
248 | if (((tDpramBootSpooler *) card->dpram)->Len != DPRAM_SPOOLER_DATA_SIZE) { | 246 | if (((tDpramBootSpooler *) card->dpram)->Len != DPRAM_SPOOLER_DATA_SIZE) { |
@@ -276,7 +274,6 @@ ergo_writebootseq(struct HYSDN_CARD *card, unsigned char *buf, int len) | |||
276 | dst = sp->Data; /* point to data in spool structure */ | 274 | dst = sp->Data; /* point to data in spool structure */ |
277 | buflen = sp->Len; /* maximum len of spooled data */ | 275 | buflen = sp->Len; /* maximum len of spooled data */ |
278 | wr_mirror = sp->WrPtr; /* only once read */ | 276 | wr_mirror = sp->WrPtr; /* only once read */ |
279 | sti(); | ||
280 | 277 | ||
281 | /* try until all bytes written or error */ | 278 | /* try until all bytes written or error */ |
282 | i = 0x1000; /* timeout value */ | 279 | i = 0x1000; /* timeout value */ |
@@ -380,7 +377,6 @@ ergo_waitpofready(struct HYSDN_CARD *card) | |||
380 | #endif /* CONFIG_HYSDN_CAPI */ | 377 | #endif /* CONFIG_HYSDN_CAPI */ |
381 | return (0); /* success */ | 378 | return (0); /* success */ |
382 | } /* data has arrived */ | 379 | } /* data has arrived */ |
383 | sti(); | ||
384 | msleep_interruptible(50); /* Timeout 50ms */ | 380 | msleep_interruptible(50); /* Timeout 50ms */ |
385 | } /* wait until timeout */ | 381 | } /* wait until timeout */ |
386 | 382 | ||
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index d3999a8e9f88..53f6ad1235db 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c | |||
@@ -462,11 +462,11 @@ static int hycapi_read_proc(char *page, char **start, off_t off, | |||
462 | default: s = "???"; break; | 462 | default: s = "???"; break; |
463 | } | 463 | } |
464 | len += sprintf(page+len, "%-16s %s\n", "type", s); | 464 | len += sprintf(page+len, "%-16s %s\n", "type", s); |
465 | if ((s = cinfo->version[VER_DRIVER]) != 0) | 465 | if ((s = cinfo->version[VER_DRIVER]) != NULL) |
466 | len += sprintf(page+len, "%-16s %s\n", "ver_driver", s); | 466 | len += sprintf(page+len, "%-16s %s\n", "ver_driver", s); |
467 | if ((s = cinfo->version[VER_CARDTYPE]) != 0) | 467 | if ((s = cinfo->version[VER_CARDTYPE]) != NULL) |
468 | len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s); | 468 | len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s); |
469 | if ((s = cinfo->version[VER_SERIAL]) != 0) | 469 | if ((s = cinfo->version[VER_SERIAL]) != NULL) |
470 | len += sprintf(page+len, "%-16s %s\n", "ver_serial", s); | 470 | len += sprintf(page+len, "%-16s %s\n", "ver_serial", s); |
471 | 471 | ||
472 | len += sprintf(page+len, "%-16s %s\n", "cardname", cinfo->cardname); | 472 | len += sprintf(page+len, "%-16s %s\n", "cardname", cinfo->cardname); |
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index b3c54be74556..559a40861c39 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c | |||
@@ -103,13 +103,11 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) | |||
103 | { | 103 | { |
104 | int rc; | 104 | int rc; |
105 | 105 | ||
106 | led_cdev->dev = device_create(leds_class, parent, 0, "%s", | 106 | led_cdev->dev = device_create_drvdata(leds_class, parent, 0, led_cdev, |
107 | led_cdev->name); | 107 | "%s", led_cdev->name); |
108 | if (IS_ERR(led_cdev->dev)) | 108 | if (IS_ERR(led_cdev->dev)) |
109 | return PTR_ERR(led_cdev->dev); | 109 | return PTR_ERR(led_cdev->dev); |
110 | 110 | ||
111 | dev_set_drvdata(led_cdev->dev, led_cdev); | ||
112 | |||
113 | /* register the attributes */ | 111 | /* register the attributes */ |
114 | rc = device_create_file(led_cdev->dev, &dev_attr_brightness); | 112 | rc = device_create_file(led_cdev->dev, &dev_attr_brightness); |
115 | if (rc) | 113 | if (rc) |
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 89d8d37838a3..3b26fbd3e558 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -901,7 +901,7 @@ endif # V4L_USB_DRIVERS | |||
901 | 901 | ||
902 | config SOC_CAMERA | 902 | config SOC_CAMERA |
903 | tristate "SoC camera support" | 903 | tristate "SoC camera support" |
904 | depends on VIDEO_V4L2 | 904 | depends on VIDEO_V4L2 && HAS_DMA |
905 | select VIDEOBUF_DMA_SG | 905 | select VIDEOBUF_DMA_SG |
906 | help | 906 | help |
907 | SoC Camera is a common API to several cameras, not connecting | 907 | SoC Camera is a common API to several cameras, not connecting |
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 2ca3e9cfb2bb..0165aac533bf 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -2613,7 +2613,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) | |||
2613 | struct bttv_fh *fh = priv; | 2613 | struct bttv_fh *fh = priv; |
2614 | 2614 | ||
2615 | mutex_lock(&fh->cap.vb_lock); | 2615 | mutex_lock(&fh->cap.vb_lock); |
2616 | retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, | 2616 | retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, |
2617 | V4L2_MEMORY_MMAP); | 2617 | V4L2_MEMORY_MMAP); |
2618 | if (retval < 0) { | 2618 | if (retval < 0) { |
2619 | mutex_unlock(&fh->cap.vb_lock); | 2619 | mutex_unlock(&fh->cap.vb_lock); |
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index 982f4463896c..0a88c44ace00 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c | |||
@@ -331,7 +331,7 @@ int videobuf_mmap_free(struct videobuf_queue *q) | |||
331 | } | 331 | } |
332 | 332 | ||
333 | /* Locking: Caller holds q->vb_lock */ | 333 | /* Locking: Caller holds q->vb_lock */ |
334 | static int __videobuf_mmap_setup(struct videobuf_queue *q, | 334 | int __videobuf_mmap_setup(struct videobuf_queue *q, |
335 | unsigned int bcount, unsigned int bsize, | 335 | unsigned int bcount, unsigned int bsize, |
336 | enum v4l2_memory memory) | 336 | enum v4l2_memory memory) |
337 | { | 337 | { |
@@ -1129,6 +1129,7 @@ EXPORT_SYMBOL_GPL(videobuf_read_stream); | |||
1129 | EXPORT_SYMBOL_GPL(videobuf_read_one); | 1129 | EXPORT_SYMBOL_GPL(videobuf_read_one); |
1130 | EXPORT_SYMBOL_GPL(videobuf_poll_stream); | 1130 | EXPORT_SYMBOL_GPL(videobuf_poll_stream); |
1131 | 1131 | ||
1132 | EXPORT_SYMBOL_GPL(__videobuf_mmap_setup); | ||
1132 | EXPORT_SYMBOL_GPL(videobuf_mmap_setup); | 1133 | EXPORT_SYMBOL_GPL(videobuf_mmap_setup); |
1133 | EXPORT_SYMBOL_GPL(videobuf_mmap_free); | 1134 | EXPORT_SYMBOL_GPL(videobuf_mmap_free); |
1134 | EXPORT_SYMBOL_GPL(videobuf_mmap_mapper); | 1135 | EXPORT_SYMBOL_GPL(videobuf_mmap_mapper); |
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 2566479937c9..ae96bd6242f2 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -24,7 +24,7 @@ config MFD_ASIC3 | |||
24 | 24 | ||
25 | config HTC_EGPIO | 25 | config HTC_EGPIO |
26 | bool "HTC EGPIO support" | 26 | bool "HTC EGPIO support" |
27 | depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB | 27 | depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM |
28 | help | 28 | help |
29 | This driver supports the CPLD egpio chip present on | 29 | This driver supports the CPLD egpio chip present on |
30 | several HTC phones. It provides basic support for input | 30 | several HTC phones. It provides basic support for input |
diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig index aa8a4e461942..dd0f398ee2f5 100644 --- a/drivers/mmc/card/Kconfig +++ b/drivers/mmc/card/Kconfig | |||
@@ -39,3 +39,15 @@ config SDIO_UART | |||
39 | SDIO function driver for SDIO cards that implements the UART | 39 | SDIO function driver for SDIO cards that implements the UART |
40 | class, as well as the GPS class which appears like a UART. | 40 | class, as well as the GPS class which appears like a UART. |
41 | 41 | ||
42 | config MMC_TEST | ||
43 | tristate "MMC host test driver" | ||
44 | default n | ||
45 | help | ||
46 | Development driver that performs a series of reads and writes | ||
47 | to a memory card in order to expose certain well known bugs | ||
48 | in host controllers. The tests are executed by writing to the | ||
49 | "test" file in sysfs under each card. Note that whatever is | ||
50 | on your card will be overwritten by these tests. | ||
51 | |||
52 | This driver is only of interest to those developing or | ||
53 | testing a host driver. Most people should say N here. | ||
diff --git a/drivers/mmc/card/Makefile b/drivers/mmc/card/Makefile index fc5a784cfa1a..0d407514f67d 100644 --- a/drivers/mmc/card/Makefile +++ b/drivers/mmc/card/Makefile | |||
@@ -8,6 +8,7 @@ endif | |||
8 | 8 | ||
9 | obj-$(CONFIG_MMC_BLOCK) += mmc_block.o | 9 | obj-$(CONFIG_MMC_BLOCK) += mmc_block.o |
10 | mmc_block-objs := block.o queue.o | 10 | mmc_block-objs := block.o queue.o |
11 | obj-$(CONFIG_MMC_TEST) += mmc_test.o | ||
11 | 12 | ||
12 | obj-$(CONFIG_SDIO_UART) += sdio_uart.o | 13 | obj-$(CONFIG_SDIO_UART) += sdio_uart.o |
13 | 14 | ||
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c new file mode 100644 index 000000000000..ffadee549a41 --- /dev/null +++ b/drivers/mmc/card/mmc_test.c | |||
@@ -0,0 +1,892 @@ | |||
1 | /* | ||
2 | * linux/drivers/mmc/card/mmc_test.c | ||
3 | * | ||
4 | * Copyright 2007 Pierre Ossman | ||
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 (at | ||
9 | * your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #include <linux/mmc/core.h> | ||
13 | #include <linux/mmc/card.h> | ||
14 | #include <linux/mmc/host.h> | ||
15 | #include <linux/mmc/mmc.h> | ||
16 | |||
17 | #include <linux/scatterlist.h> | ||
18 | |||
19 | #define RESULT_OK 0 | ||
20 | #define RESULT_FAIL 1 | ||
21 | #define RESULT_UNSUP_HOST 2 | ||
22 | #define RESULT_UNSUP_CARD 3 | ||
23 | |||
24 | #define BUFFER_SIZE (PAGE_SIZE * 4) | ||
25 | |||
26 | struct mmc_test_card { | ||
27 | struct mmc_card *card; | ||
28 | |||
29 | u8 *buffer; | ||
30 | }; | ||
31 | |||
32 | /*******************************************************************/ | ||
33 | /* Helper functions */ | ||
34 | /*******************************************************************/ | ||
35 | |||
36 | static int mmc_test_set_blksize(struct mmc_test_card *test, unsigned size) | ||
37 | { | ||
38 | struct mmc_command cmd; | ||
39 | int ret; | ||
40 | |||
41 | cmd.opcode = MMC_SET_BLOCKLEN; | ||
42 | cmd.arg = size; | ||
43 | cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; | ||
44 | ret = mmc_wait_for_cmd(test->card->host, &cmd, 0); | ||
45 | if (ret) | ||
46 | return ret; | ||
47 | |||
48 | return 0; | ||
49 | } | ||
50 | |||
51 | static int __mmc_test_transfer(struct mmc_test_card *test, int write, | ||
52 | unsigned broken_xfer, u8 *buffer, unsigned addr, | ||
53 | unsigned blocks, unsigned blksz) | ||
54 | { | ||
55 | int ret, busy; | ||
56 | |||
57 | struct mmc_request mrq; | ||
58 | struct mmc_command cmd; | ||
59 | struct mmc_command stop; | ||
60 | struct mmc_data data; | ||
61 | |||
62 | struct scatterlist sg; | ||
63 | |||
64 | memset(&mrq, 0, sizeof(struct mmc_request)); | ||
65 | |||
66 | mrq.cmd = &cmd; | ||
67 | mrq.data = &data; | ||
68 | |||
69 | memset(&cmd, 0, sizeof(struct mmc_command)); | ||
70 | |||
71 | if (broken_xfer) { | ||
72 | if (blocks > 1) { | ||
73 | cmd.opcode = write ? | ||
74 | MMC_WRITE_BLOCK : MMC_READ_SINGLE_BLOCK; | ||
75 | } else { | ||
76 | cmd.opcode = MMC_SEND_STATUS; | ||
77 | } | ||
78 | } else { | ||
79 | if (blocks > 1) { | ||
80 | cmd.opcode = write ? | ||
81 | MMC_WRITE_MULTIPLE_BLOCK : MMC_READ_MULTIPLE_BLOCK; | ||
82 | } else { | ||
83 | cmd.opcode = write ? | ||
84 | MMC_WRITE_BLOCK : MMC_READ_SINGLE_BLOCK; | ||
85 | } | ||
86 | } | ||
87 | |||
88 | if (broken_xfer && blocks == 1) | ||
89 | cmd.arg = test->card->rca << 16; | ||
90 | else | ||
91 | cmd.arg = addr; | ||
92 | cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC; | ||
93 | |||
94 | memset(&stop, 0, sizeof(struct mmc_command)); | ||
95 | |||
96 | if (!broken_xfer && (blocks > 1)) { | ||
97 | stop.opcode = MMC_STOP_TRANSMISSION; | ||
98 | stop.arg = 0; | ||
99 | stop.flags = MMC_RSP_R1B | MMC_CMD_AC; | ||
100 | |||
101 | mrq.stop = &stop; | ||
102 | } | ||
103 | |||
104 | memset(&data, 0, sizeof(struct mmc_data)); | ||
105 | |||
106 | data.blksz = blksz; | ||
107 | data.blocks = blocks; | ||
108 | data.flags = write ? MMC_DATA_WRITE : MMC_DATA_READ; | ||
109 | data.sg = &sg; | ||
110 | data.sg_len = 1; | ||
111 | |||
112 | sg_init_one(&sg, buffer, blocks * blksz); | ||
113 | |||
114 | mmc_set_data_timeout(&data, test->card); | ||
115 | |||
116 | mmc_wait_for_req(test->card->host, &mrq); | ||
117 | |||
118 | ret = 0; | ||
119 | |||
120 | if (broken_xfer) { | ||
121 | if (!ret && cmd.error) | ||
122 | ret = cmd.error; | ||
123 | if (!ret && data.error == 0) | ||
124 | ret = RESULT_FAIL; | ||
125 | if (!ret && data.error != -ETIMEDOUT) | ||
126 | ret = data.error; | ||
127 | if (!ret && stop.error) | ||
128 | ret = stop.error; | ||
129 | if (blocks > 1) { | ||
130 | if (!ret && data.bytes_xfered > blksz) | ||
131 | ret = RESULT_FAIL; | ||
132 | } else { | ||
133 | if (!ret && data.bytes_xfered > 0) | ||
134 | ret = RESULT_FAIL; | ||
135 | } | ||
136 | } else { | ||
137 | if (!ret && cmd.error) | ||
138 | ret = cmd.error; | ||
139 | if (!ret && data.error) | ||
140 | ret = data.error; | ||
141 | if (!ret && stop.error) | ||
142 | ret = stop.error; | ||
143 | if (!ret && data.bytes_xfered != blocks * blksz) | ||
144 | ret = RESULT_FAIL; | ||
145 | } | ||
146 | |||
147 | if (ret == -EINVAL) | ||
148 | ret = RESULT_UNSUP_HOST; | ||
149 | |||
150 | busy = 0; | ||
151 | do { | ||
152 | int ret2; | ||
153 | |||
154 | memset(&cmd, 0, sizeof(struct mmc_command)); | ||
155 | |||
156 | cmd.opcode = MMC_SEND_STATUS; | ||
157 | cmd.arg = test->card->rca << 16; | ||
158 | cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; | ||
159 | |||
160 | ret2 = mmc_wait_for_cmd(test->card->host, &cmd, 0); | ||
161 | if (ret2) | ||
162 | break; | ||
163 | |||
164 | if (!busy && !(cmd.resp[0] & R1_READY_FOR_DATA)) { | ||
165 | busy = 1; | ||
166 | printk(KERN_INFO "%s: Warning: Host did not " | ||
167 | "wait for busy state to end.\n", | ||
168 | mmc_hostname(test->card->host)); | ||
169 | } | ||
170 | } while (!(cmd.resp[0] & R1_READY_FOR_DATA)); | ||
171 | |||
172 | return ret; | ||
173 | } | ||
174 | |||
175 | static int mmc_test_transfer(struct mmc_test_card *test, int write, | ||
176 | u8 *buffer, unsigned addr, unsigned blocks, unsigned blksz) | ||
177 | { | ||
178 | return __mmc_test_transfer(test, write, 0, buffer, | ||
179 | addr, blocks, blksz); | ||
180 | } | ||
181 | |||
182 | static int mmc_test_prepare_verify(struct mmc_test_card *test, int write) | ||
183 | { | ||
184 | int ret, i; | ||
185 | |||
186 | ret = mmc_test_set_blksize(test, 512); | ||
187 | if (ret) | ||
188 | return ret; | ||
189 | |||
190 | if (write) | ||
191 | memset(test->buffer, 0xDF, BUFFER_SIZE); | ||
192 | else { | ||
193 | for (i = 0;i < BUFFER_SIZE;i++) | ||
194 | test->buffer[i] = i; | ||
195 | } | ||
196 | |||
197 | for (i = 0;i < BUFFER_SIZE / 512;i++) { | ||
198 | ret = mmc_test_transfer(test, 1, test->buffer + i * 512, | ||
199 | i * 512, 1, 512); | ||
200 | if (ret) | ||
201 | return ret; | ||
202 | } | ||
203 | |||
204 | return 0; | ||
205 | } | ||
206 | |||
207 | static int mmc_test_prepare_verify_write(struct mmc_test_card *test) | ||
208 | { | ||
209 | return mmc_test_prepare_verify(test, 1); | ||
210 | } | ||
211 | |||
212 | static int mmc_test_prepare_verify_read(struct mmc_test_card *test) | ||
213 | { | ||
214 | return mmc_test_prepare_verify(test, 0); | ||
215 | } | ||
216 | |||
217 | static int mmc_test_verified_transfer(struct mmc_test_card *test, int write, | ||
218 | u8 *buffer, unsigned addr, unsigned blocks, unsigned blksz) | ||
219 | { | ||
220 | int ret, i, sectors; | ||
221 | |||
222 | /* | ||
223 | * It is assumed that the above preparation has been done. | ||
224 | */ | ||
225 | |||
226 | memset(test->buffer, 0, BUFFER_SIZE); | ||
227 | |||
228 | if (write) { | ||
229 | for (i = 0;i < blocks * blksz;i++) | ||
230 | buffer[i] = i; | ||
231 | } | ||
232 | |||
233 | ret = mmc_test_set_blksize(test, blksz); | ||
234 | if (ret) | ||
235 | return ret; | ||
236 | |||
237 | ret = mmc_test_transfer(test, write, buffer, addr, blocks, blksz); | ||
238 | if (ret) | ||
239 | return ret; | ||
240 | |||
241 | if (write) { | ||
242 | ret = mmc_test_set_blksize(test, 512); | ||
243 | if (ret) | ||
244 | return ret; | ||
245 | |||
246 | sectors = (blocks * blksz + 511) / 512; | ||
247 | if ((sectors * 512) == (blocks * blksz)) | ||
248 | sectors++; | ||
249 | |||
250 | if ((sectors * 512) > BUFFER_SIZE) | ||
251 | return -EINVAL; | ||
252 | |||
253 | memset(test->buffer, 0, sectors * 512); | ||
254 | |||
255 | for (i = 0;i < sectors;i++) { | ||
256 | ret = mmc_test_transfer(test, 0, | ||
257 | test->buffer + i * 512, | ||
258 | addr + i * 512, 1, 512); | ||
259 | if (ret) | ||
260 | return ret; | ||
261 | } | ||
262 | |||
263 | for (i = 0;i < blocks * blksz;i++) { | ||
264 | if (test->buffer[i] != (u8)i) | ||
265 | return RESULT_FAIL; | ||
266 | } | ||
267 | |||
268 | for (;i < sectors * 512;i++) { | ||
269 | if (test->buffer[i] != 0xDF) | ||
270 | return RESULT_FAIL; | ||
271 | } | ||
272 | } else { | ||
273 | for (i = 0;i < blocks * blksz;i++) { | ||
274 | if (buffer[i] != (u8)i) | ||
275 | return RESULT_FAIL; | ||
276 | } | ||
277 | } | ||
278 | |||
279 | return 0; | ||
280 | } | ||
281 | |||
282 | static int mmc_test_cleanup_verify(struct mmc_test_card *test) | ||
283 | { | ||
284 | int ret, i; | ||
285 | |||
286 | ret = mmc_test_set_blksize(test, 512); | ||
287 | if (ret) | ||
288 | return ret; | ||
289 | |||
290 | memset(test->buffer, 0, BUFFER_SIZE); | ||
291 | |||
292 | for (i = 0;i < BUFFER_SIZE / 512;i++) { | ||
293 | ret = mmc_test_transfer(test, 1, test->buffer + i * 512, | ||
294 | i * 512, 1, 512); | ||
295 | if (ret) | ||
296 | return ret; | ||
297 | } | ||
298 | |||
299 | return 0; | ||
300 | } | ||
301 | |||
302 | /*******************************************************************/ | ||
303 | /* Tests */ | ||
304 | /*******************************************************************/ | ||
305 | |||
306 | struct mmc_test_case { | ||
307 | const char *name; | ||
308 | |||
309 | int (*prepare)(struct mmc_test_card *); | ||
310 | int (*run)(struct mmc_test_card *); | ||
311 | int (*cleanup)(struct mmc_test_card *); | ||
312 | }; | ||
313 | |||
314 | static int mmc_test_basic_write(struct mmc_test_card *test) | ||
315 | { | ||
316 | int ret; | ||
317 | |||
318 | ret = mmc_test_set_blksize(test, 512); | ||
319 | if (ret) | ||
320 | return ret; | ||
321 | |||
322 | ret = mmc_test_transfer(test, 1, test->buffer, 0, 1, 512); | ||
323 | if (ret) | ||
324 | return ret; | ||
325 | |||
326 | return 0; | ||
327 | } | ||
328 | |||
329 | static int mmc_test_basic_read(struct mmc_test_card *test) | ||
330 | { | ||
331 | int ret; | ||
332 | |||
333 | ret = mmc_test_set_blksize(test, 512); | ||
334 | if (ret) | ||
335 | return ret; | ||
336 | |||
337 | ret = mmc_test_transfer(test, 0, test->buffer, 0, 1, 512); | ||
338 | if (ret) | ||
339 | return ret; | ||
340 | |||
341 | return 0; | ||
342 | } | ||
343 | |||
344 | static int mmc_test_verify_write(struct mmc_test_card *test) | ||
345 | { | ||
346 | int ret; | ||
347 | |||
348 | ret = mmc_test_verified_transfer(test, 1, test->buffer, 0, 1, 512); | ||
349 | if (ret) | ||
350 | return ret; | ||
351 | |||
352 | return 0; | ||
353 | } | ||
354 | |||
355 | static int mmc_test_verify_read(struct mmc_test_card *test) | ||
356 | { | ||
357 | int ret; | ||
358 | |||
359 | ret = mmc_test_verified_transfer(test, 0, test->buffer, 0, 1, 512); | ||
360 | if (ret) | ||
361 | return ret; | ||
362 | |||
363 | return 0; | ||
364 | } | ||
365 | |||
366 | static int mmc_test_multi_write(struct mmc_test_card *test) | ||
367 | { | ||
368 | int ret; | ||
369 | unsigned int size; | ||
370 | |||
371 | if (test->card->host->max_blk_count == 1) | ||
372 | return RESULT_UNSUP_HOST; | ||
373 | |||
374 | size = PAGE_SIZE * 2; | ||
375 | size = min(size, test->card->host->max_req_size); | ||
376 | size = min(size, test->card->host->max_seg_size); | ||
377 | size = min(size, test->card->host->max_blk_count * 512); | ||
378 | |||
379 | if (size < 1024) | ||
380 | return RESULT_UNSUP_HOST; | ||
381 | |||
382 | ret = mmc_test_verified_transfer(test, 1, test->buffer, 0, | ||
383 | size / 512, 512); | ||
384 | if (ret) | ||
385 | return ret; | ||
386 | |||
387 | return 0; | ||
388 | } | ||
389 | |||
390 | static int mmc_test_multi_read(struct mmc_test_card *test) | ||
391 | { | ||
392 | int ret; | ||
393 | unsigned int size; | ||
394 | |||
395 | if (test->card->host->max_blk_count == 1) | ||
396 | return RESULT_UNSUP_HOST; | ||
397 | |||
398 | size = PAGE_SIZE * 2; | ||
399 | size = min(size, test->card->host->max_req_size); | ||
400 | size = min(size, test->card->host->max_seg_size); | ||
401 | size = min(size, test->card->host->max_blk_count * 512); | ||
402 | |||
403 | if (size < 1024) | ||
404 | return RESULT_UNSUP_HOST; | ||
405 | |||
406 | ret = mmc_test_verified_transfer(test, 0, test->buffer, 0, | ||
407 | size / 512, 512); | ||
408 | if (ret) | ||
409 | return ret; | ||
410 | |||
411 | return 0; | ||
412 | } | ||
413 | |||
414 | static int mmc_test_pow2_write(struct mmc_test_card *test) | ||
415 | { | ||
416 | int ret, i; | ||
417 | |||
418 | if (!test->card->csd.write_partial) | ||
419 | return RESULT_UNSUP_CARD; | ||
420 | |||
421 | for (i = 1; i < 512;i <<= 1) { | ||
422 | ret = mmc_test_verified_transfer(test, 1, | ||
423 | test->buffer, 0, 1, i); | ||
424 | if (ret) | ||
425 | return ret; | ||
426 | } | ||
427 | |||
428 | return 0; | ||
429 | } | ||
430 | |||
431 | static int mmc_test_pow2_read(struct mmc_test_card *test) | ||
432 | { | ||
433 | int ret, i; | ||
434 | |||
435 | if (!test->card->csd.read_partial) | ||
436 | return RESULT_UNSUP_CARD; | ||
437 | |||
438 | for (i = 1; i < 512;i <<= 1) { | ||
439 | ret = mmc_test_verified_transfer(test, 0, | ||
440 | test->buffer, 0, 1, i); | ||
441 | if (ret) | ||
442 | return ret; | ||
443 | } | ||
444 | |||
445 | return 0; | ||
446 | } | ||
447 | |||
448 | static int mmc_test_weird_write(struct mmc_test_card *test) | ||
449 | { | ||
450 | int ret, i; | ||
451 | |||
452 | if (!test->card->csd.write_partial) | ||
453 | return RESULT_UNSUP_CARD; | ||
454 | |||
455 | for (i = 3; i < 512;i += 7) { | ||
456 | ret = mmc_test_verified_transfer(test, 1, | ||
457 | test->buffer, 0, 1, i); | ||
458 | if (ret) | ||
459 | return ret; | ||
460 | } | ||
461 | |||
462 | return 0; | ||
463 | } | ||
464 | |||
465 | static int mmc_test_weird_read(struct mmc_test_card *test) | ||
466 | { | ||
467 | int ret, i; | ||
468 | |||
469 | if (!test->card->csd.read_partial) | ||
470 | return RESULT_UNSUP_CARD; | ||
471 | |||
472 | for (i = 3; i < 512;i += 7) { | ||
473 | ret = mmc_test_verified_transfer(test, 0, | ||
474 | test->buffer, 0, 1, i); | ||
475 | if (ret) | ||
476 | return ret; | ||
477 | } | ||
478 | |||
479 | return 0; | ||
480 | } | ||
481 | |||
482 | static int mmc_test_align_write(struct mmc_test_card *test) | ||
483 | { | ||
484 | int ret, i; | ||
485 | |||
486 | for (i = 1;i < 4;i++) { | ||
487 | ret = mmc_test_verified_transfer(test, 1, test->buffer + i, | ||
488 | 0, 1, 512); | ||
489 | if (ret) | ||
490 | return ret; | ||
491 | } | ||
492 | |||
493 | return 0; | ||
494 | } | ||
495 | |||
496 | static int mmc_test_align_read(struct mmc_test_card *test) | ||
497 | { | ||
498 | int ret, i; | ||
499 | |||
500 | for (i = 1;i < 4;i++) { | ||
501 | ret = mmc_test_verified_transfer(test, 0, test->buffer + i, | ||
502 | 0, 1, 512); | ||
503 | if (ret) | ||
504 | return ret; | ||
505 | } | ||
506 | |||
507 | return 0; | ||
508 | } | ||
509 | |||
510 | static int mmc_test_align_multi_write(struct mmc_test_card *test) | ||
511 | { | ||
512 | int ret, i; | ||
513 | unsigned int size; | ||
514 | |||
515 | if (test->card->host->max_blk_count == 1) | ||
516 | return RESULT_UNSUP_HOST; | ||
517 | |||
518 | size = PAGE_SIZE * 2; | ||
519 | size = min(size, test->card->host->max_req_size); | ||
520 | size = min(size, test->card->host->max_seg_size); | ||
521 | size = min(size, test->card->host->max_blk_count * 512); | ||
522 | |||
523 | if (size < 1024) | ||
524 | return RESULT_UNSUP_HOST; | ||
525 | |||
526 | for (i = 1;i < 4;i++) { | ||
527 | ret = mmc_test_verified_transfer(test, 1, test->buffer + i, | ||
528 | 0, size / 512, 512); | ||
529 | if (ret) | ||
530 | return ret; | ||
531 | } | ||
532 | |||
533 | return 0; | ||
534 | } | ||
535 | |||
536 | static int mmc_test_align_multi_read(struct mmc_test_card *test) | ||
537 | { | ||
538 | int ret, i; | ||
539 | unsigned int size; | ||
540 | |||
541 | if (test->card->host->max_blk_count == 1) | ||
542 | return RESULT_UNSUP_HOST; | ||
543 | |||
544 | size = PAGE_SIZE * 2; | ||
545 | size = min(size, test->card->host->max_req_size); | ||
546 | size = min(size, test->card->host->max_seg_size); | ||
547 | size = min(size, test->card->host->max_blk_count * 512); | ||
548 | |||
549 | if (size < 1024) | ||
550 | return RESULT_UNSUP_HOST; | ||
551 | |||
552 | for (i = 1;i < 4;i++) { | ||
553 | ret = mmc_test_verified_transfer(test, 0, test->buffer + i, | ||
554 | 0, size / 512, 512); | ||
555 | if (ret) | ||
556 | return ret; | ||
557 | } | ||
558 | |||
559 | return 0; | ||
560 | } | ||
561 | |||
562 | static int mmc_test_xfersize_write(struct mmc_test_card *test) | ||
563 | { | ||
564 | int ret; | ||
565 | |||
566 | ret = mmc_test_set_blksize(test, 512); | ||
567 | if (ret) | ||
568 | return ret; | ||
569 | |||
570 | ret = __mmc_test_transfer(test, 1, 1, test->buffer, 0, 1, 512); | ||
571 | if (ret) | ||
572 | return ret; | ||
573 | |||
574 | return 0; | ||
575 | } | ||
576 | |||
577 | static int mmc_test_xfersize_read(struct mmc_test_card *test) | ||
578 | { | ||
579 | int ret; | ||
580 | |||
581 | ret = mmc_test_set_blksize(test, 512); | ||
582 | if (ret) | ||
583 | return ret; | ||
584 | |||
585 | ret = __mmc_test_transfer(test, 0, 1, test->buffer, 0, 1, 512); | ||
586 | if (ret) | ||
587 | return ret; | ||
588 | |||
589 | return 0; | ||
590 | } | ||
591 | |||
592 | static int mmc_test_multi_xfersize_write(struct mmc_test_card *test) | ||
593 | { | ||
594 | int ret; | ||
595 | |||
596 | if (test->card->host->max_blk_count == 1) | ||
597 | return RESULT_UNSUP_HOST; | ||
598 | |||
599 | ret = mmc_test_set_blksize(test, 512); | ||
600 | if (ret) | ||
601 | return ret; | ||
602 | |||
603 | ret = __mmc_test_transfer(test, 1, 1, test->buffer, 0, 2, 512); | ||
604 | if (ret) | ||
605 | return ret; | ||
606 | |||
607 | return 0; | ||
608 | } | ||
609 | |||
610 | static int mmc_test_multi_xfersize_read(struct mmc_test_card *test) | ||
611 | { | ||
612 | int ret; | ||
613 | |||
614 | if (test->card->host->max_blk_count == 1) | ||
615 | return RESULT_UNSUP_HOST; | ||
616 | |||
617 | ret = mmc_test_set_blksize(test, 512); | ||
618 | if (ret) | ||
619 | return ret; | ||
620 | |||
621 | ret = __mmc_test_transfer(test, 0, 1, test->buffer, 0, 2, 512); | ||
622 | if (ret) | ||
623 | return ret; | ||
624 | |||
625 | return 0; | ||
626 | } | ||
627 | |||
628 | static const struct mmc_test_case mmc_test_cases[] = { | ||
629 | { | ||
630 | .name = "Basic write (no data verification)", | ||
631 | .run = mmc_test_basic_write, | ||
632 | }, | ||
633 | |||
634 | { | ||
635 | .name = "Basic read (no data verification)", | ||
636 | .run = mmc_test_basic_read, | ||
637 | }, | ||
638 | |||
639 | { | ||
640 | .name = "Basic write (with data verification)", | ||
641 | .prepare = mmc_test_prepare_verify_write, | ||
642 | .run = mmc_test_verify_write, | ||
643 | .cleanup = mmc_test_cleanup_verify, | ||
644 | }, | ||
645 | |||
646 | { | ||
647 | .name = "Basic read (with data verification)", | ||
648 | .prepare = mmc_test_prepare_verify_read, | ||
649 | .run = mmc_test_verify_read, | ||
650 | .cleanup = mmc_test_cleanup_verify, | ||
651 | }, | ||
652 | |||
653 | { | ||
654 | .name = "Multi-block write", | ||
655 | .prepare = mmc_test_prepare_verify_write, | ||
656 | .run = mmc_test_multi_write, | ||
657 | .cleanup = mmc_test_cleanup_verify, | ||
658 | }, | ||
659 | |||
660 | { | ||
661 | .name = "Multi-block read", | ||
662 | .prepare = mmc_test_prepare_verify_read, | ||
663 | .run = mmc_test_multi_read, | ||
664 | .cleanup = mmc_test_cleanup_verify, | ||
665 | }, | ||
666 | |||
667 | { | ||
668 | .name = "Power of two block writes", | ||
669 | .prepare = mmc_test_prepare_verify_write, | ||
670 | .run = mmc_test_pow2_write, | ||
671 | .cleanup = mmc_test_cleanup_verify, | ||
672 | }, | ||
673 | |||
674 | { | ||
675 | .name = "Power of two block reads", | ||
676 | .prepare = mmc_test_prepare_verify_read, | ||
677 | .run = mmc_test_pow2_read, | ||
678 | .cleanup = mmc_test_cleanup_verify, | ||
679 | }, | ||
680 | |||
681 | { | ||
682 | .name = "Weird sized block writes", | ||
683 | .prepare = mmc_test_prepare_verify_write, | ||
684 | .run = mmc_test_weird_write, | ||
685 | .cleanup = mmc_test_cleanup_verify, | ||
686 | }, | ||
687 | |||
688 | { | ||
689 | .name = "Weird sized block reads", | ||
690 | .prepare = mmc_test_prepare_verify_read, | ||
691 | .run = mmc_test_weird_read, | ||
692 | .cleanup = mmc_test_cleanup_verify, | ||
693 | }, | ||
694 | |||
695 | { | ||
696 | .name = "Badly aligned write", | ||
697 | .prepare = mmc_test_prepare_verify_write, | ||
698 | .run = mmc_test_align_write, | ||
699 | .cleanup = mmc_test_cleanup_verify, | ||
700 | }, | ||
701 | |||
702 | { | ||
703 | .name = "Badly aligned read", | ||
704 | .prepare = mmc_test_prepare_verify_read, | ||
705 | .run = mmc_test_align_read, | ||
706 | .cleanup = mmc_test_cleanup_verify, | ||
707 | }, | ||
708 | |||
709 | { | ||
710 | .name = "Badly aligned multi-block write", | ||
711 | .prepare = mmc_test_prepare_verify_write, | ||
712 | .run = mmc_test_align_multi_write, | ||
713 | .cleanup = mmc_test_cleanup_verify, | ||
714 | }, | ||
715 | |||
716 | { | ||
717 | .name = "Badly aligned multi-block read", | ||
718 | .prepare = mmc_test_prepare_verify_read, | ||
719 | .run = mmc_test_align_multi_read, | ||
720 | .cleanup = mmc_test_cleanup_verify, | ||
721 | }, | ||
722 | |||
723 | { | ||
724 | .name = "Correct xfer_size at write (start failure)", | ||
725 | .run = mmc_test_xfersize_write, | ||
726 | }, | ||
727 | |||
728 | { | ||
729 | .name = "Correct xfer_size at read (start failure)", | ||
730 | .run = mmc_test_xfersize_read, | ||
731 | }, | ||
732 | |||
733 | { | ||
734 | .name = "Correct xfer_size at write (midway failure)", | ||
735 | .run = mmc_test_multi_xfersize_write, | ||
736 | }, | ||
737 | |||
738 | { | ||
739 | .name = "Correct xfer_size at read (midway failure)", | ||
740 | .run = mmc_test_multi_xfersize_read, | ||
741 | }, | ||
742 | }; | ||
743 | |||
744 | static struct mutex mmc_test_lock; | ||
745 | |||
746 | static void mmc_test_run(struct mmc_test_card *test) | ||
747 | { | ||
748 | int i, ret; | ||
749 | |||
750 | printk(KERN_INFO "%s: Starting tests of card %s...\n", | ||
751 | mmc_hostname(test->card->host), mmc_card_id(test->card)); | ||
752 | |||
753 | mmc_claim_host(test->card->host); | ||
754 | |||
755 | for (i = 0;i < ARRAY_SIZE(mmc_test_cases);i++) { | ||
756 | printk(KERN_INFO "%s: Test case %d. %s...\n", | ||
757 | mmc_hostname(test->card->host), i + 1, | ||
758 | mmc_test_cases[i].name); | ||
759 | |||
760 | if (mmc_test_cases[i].prepare) { | ||
761 | ret = mmc_test_cases[i].prepare(test); | ||
762 | if (ret) { | ||
763 | printk(KERN_INFO "%s: Result: Prepare " | ||
764 | "stage failed! (%d)\n", | ||
765 | mmc_hostname(test->card->host), | ||
766 | ret); | ||
767 | continue; | ||
768 | } | ||
769 | } | ||
770 | |||
771 | ret = mmc_test_cases[i].run(test); | ||
772 | switch (ret) { | ||
773 | case RESULT_OK: | ||
774 | printk(KERN_INFO "%s: Result: OK\n", | ||
775 | mmc_hostname(test->card->host)); | ||
776 | break; | ||
777 | case RESULT_FAIL: | ||
778 | printk(KERN_INFO "%s: Result: FAILED\n", | ||
779 | mmc_hostname(test->card->host)); | ||
780 | break; | ||
781 | case RESULT_UNSUP_HOST: | ||
782 | printk(KERN_INFO "%s: Result: UNSUPPORTED " | ||
783 | "(by host)\n", | ||
784 | mmc_hostname(test->card->host)); | ||
785 | break; | ||
786 | case RESULT_UNSUP_CARD: | ||
787 | printk(KERN_INFO "%s: Result: UNSUPPORTED " | ||
788 | "(by card)\n", | ||
789 | mmc_hostname(test->card->host)); | ||
790 | break; | ||
791 | default: | ||
792 | printk(KERN_INFO "%s: Result: ERROR (%d)\n", | ||
793 | mmc_hostname(test->card->host), ret); | ||
794 | } | ||
795 | |||
796 | if (mmc_test_cases[i].cleanup) { | ||
797 | ret = mmc_test_cases[i].cleanup(test); | ||
798 | if (ret) { | ||
799 | printk(KERN_INFO "%s: Warning: Cleanup " | ||
800 | "stage failed! (%d)\n", | ||
801 | mmc_hostname(test->card->host), | ||
802 | ret); | ||
803 | } | ||
804 | } | ||
805 | } | ||
806 | |||
807 | mmc_release_host(test->card->host); | ||
808 | |||
809 | printk(KERN_INFO "%s: Tests completed.\n", | ||
810 | mmc_hostname(test->card->host)); | ||
811 | } | ||
812 | |||
813 | static ssize_t mmc_test_show(struct device *dev, | ||
814 | struct device_attribute *attr, char *buf) | ||
815 | { | ||
816 | mutex_lock(&mmc_test_lock); | ||
817 | mutex_unlock(&mmc_test_lock); | ||
818 | |||
819 | return 0; | ||
820 | } | ||
821 | |||
822 | static ssize_t mmc_test_store(struct device *dev, | ||
823 | struct device_attribute *attr, const char *buf, size_t count) | ||
824 | { | ||
825 | struct mmc_card *card; | ||
826 | struct mmc_test_card *test; | ||
827 | |||
828 | card = container_of(dev, struct mmc_card, dev); | ||
829 | |||
830 | test = kzalloc(sizeof(struct mmc_test_card), GFP_KERNEL); | ||
831 | if (!test) | ||
832 | return -ENOMEM; | ||
833 | |||
834 | test->card = card; | ||
835 | |||
836 | test->buffer = kzalloc(BUFFER_SIZE, GFP_KERNEL); | ||
837 | if (test->buffer) { | ||
838 | mutex_lock(&mmc_test_lock); | ||
839 | mmc_test_run(test); | ||
840 | mutex_unlock(&mmc_test_lock); | ||
841 | } | ||
842 | |||
843 | kfree(test->buffer); | ||
844 | kfree(test); | ||
845 | |||
846 | return count; | ||
847 | } | ||
848 | |||
849 | static DEVICE_ATTR(test, S_IWUSR | S_IRUGO, mmc_test_show, mmc_test_store); | ||
850 | |||
851 | static int mmc_test_probe(struct mmc_card *card) | ||
852 | { | ||
853 | int ret; | ||
854 | |||
855 | mutex_init(&mmc_test_lock); | ||
856 | |||
857 | ret = device_create_file(&card->dev, &dev_attr_test); | ||
858 | if (ret) | ||
859 | return ret; | ||
860 | |||
861 | return 0; | ||
862 | } | ||
863 | |||
864 | static void mmc_test_remove(struct mmc_card *card) | ||
865 | { | ||
866 | device_remove_file(&card->dev, &dev_attr_test); | ||
867 | } | ||
868 | |||
869 | static struct mmc_driver mmc_driver = { | ||
870 | .drv = { | ||
871 | .name = "mmc_test", | ||
872 | }, | ||
873 | .probe = mmc_test_probe, | ||
874 | .remove = mmc_test_remove, | ||
875 | }; | ||
876 | |||
877 | static int __init mmc_test_init(void) | ||
878 | { | ||
879 | return mmc_register_driver(&mmc_driver); | ||
880 | } | ||
881 | |||
882 | static void __exit mmc_test_exit(void) | ||
883 | { | ||
884 | mmc_unregister_driver(&mmc_driver); | ||
885 | } | ||
886 | |||
887 | module_init(mmc_test_init); | ||
888 | module_exit(mmc_test_exit); | ||
889 | |||
890 | MODULE_LICENSE("GPL"); | ||
891 | MODULE_DESCRIPTION("Multimedia Card (MMC) host test driver"); | ||
892 | MODULE_AUTHOR("Pierre Ossman"); | ||
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 3b3cd0e74715..dead61754ad7 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -119,7 +119,7 @@ config MMC_TIFM_SD | |||
119 | 119 | ||
120 | config MMC_SPI | 120 | config MMC_SPI |
121 | tristate "MMC/SD over SPI" | 121 | tristate "MMC/SD over SPI" |
122 | depends on MMC && SPI_MASTER && !HIGHMEM | 122 | depends on MMC && SPI_MASTER && !HIGHMEM && HAS_DMA |
123 | select CRC7 | 123 | select CRC7 |
124 | select CRC_ITU_T | 124 | select CRC_ITU_T |
125 | help | 125 | help |
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index a28fc2f68ce2..8979ad330a4d 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
@@ -663,9 +663,12 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
663 | gpio_set_value(host->board->vcc_pin, 0); | 663 | gpio_set_value(host->board->vcc_pin, 0); |
664 | break; | 664 | break; |
665 | case MMC_POWER_UP: | 665 | case MMC_POWER_UP: |
666 | case MMC_POWER_ON: | ||
667 | gpio_set_value(host->board->vcc_pin, 1); | 666 | gpio_set_value(host->board->vcc_pin, 1); |
668 | break; | 667 | break; |
668 | case MMC_POWER_ON: | ||
669 | break; | ||
670 | default: | ||
671 | WARN_ON(1); | ||
669 | } | 672 | } |
670 | } | 673 | } |
671 | } | 674 | } |
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 14759e9f42ad..549517c35675 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -1003,7 +1003,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data) | |||
1003 | 1003 | ||
1004 | static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data *data) | 1004 | static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data *data) |
1005 | { | 1005 | { |
1006 | const char *dev_name; | 1006 | const char *dma_dev_name; |
1007 | int sync_dev, dma_ch, is_read, r; | 1007 | int sync_dev, dma_ch, is_read, r; |
1008 | 1008 | ||
1009 | is_read = !(data->flags & MMC_DATA_WRITE); | 1009 | is_read = !(data->flags & MMC_DATA_WRITE); |
@@ -1018,21 +1018,21 @@ static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data | |||
1018 | if (is_read) { | 1018 | if (is_read) { |
1019 | if (host->id == 1) { | 1019 | if (host->id == 1) { |
1020 | sync_dev = OMAP_DMA_MMC_RX; | 1020 | sync_dev = OMAP_DMA_MMC_RX; |
1021 | dev_name = "MMC1 read"; | 1021 | dma_dev_name = "MMC1 read"; |
1022 | } else { | 1022 | } else { |
1023 | sync_dev = OMAP_DMA_MMC2_RX; | 1023 | sync_dev = OMAP_DMA_MMC2_RX; |
1024 | dev_name = "MMC2 read"; | 1024 | dma_dev_name = "MMC2 read"; |
1025 | } | 1025 | } |
1026 | } else { | 1026 | } else { |
1027 | if (host->id == 1) { | 1027 | if (host->id == 1) { |
1028 | sync_dev = OMAP_DMA_MMC_TX; | 1028 | sync_dev = OMAP_DMA_MMC_TX; |
1029 | dev_name = "MMC1 write"; | 1029 | dma_dev_name = "MMC1 write"; |
1030 | } else { | 1030 | } else { |
1031 | sync_dev = OMAP_DMA_MMC2_TX; | 1031 | sync_dev = OMAP_DMA_MMC2_TX; |
1032 | dev_name = "MMC2 write"; | 1032 | dma_dev_name = "MMC2 write"; |
1033 | } | 1033 | } |
1034 | } | 1034 | } |
1035 | r = omap_request_dma(sync_dev, dev_name, mmc_omap_dma_cb, | 1035 | r = omap_request_dma(sync_dev, dma_dev_name, mmc_omap_dma_cb, |
1036 | host, &dma_ch); | 1036 | host, &dma_ch); |
1037 | if (r != 0) { | 1037 | if (r != 0) { |
1038 | dev_dbg(mmc_dev(host->mmc), "omap_request_dma() failed with %d\n", r); | 1038 | dev_dbg(mmc_dev(host->mmc), "omap_request_dma() failed with %d\n", r); |
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index e6c545fe5f58..87d8795823d7 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -413,7 +413,7 @@ static int __devinit el3_pnp_probe(struct pnp_dev *pdev, | |||
413 | { | 413 | { |
414 | short i; | 414 | short i; |
415 | int ioaddr, irq, if_port; | 415 | int ioaddr, irq, if_port; |
416 | u16 phys_addr[3]; | 416 | __be16 phys_addr[3]; |
417 | struct net_device *dev = NULL; | 417 | struct net_device *dev = NULL; |
418 | int err; | 418 | int err; |
419 | 419 | ||
@@ -605,7 +605,7 @@ static int __init el3_mca_probe(struct device *device) | |||
605 | 605 | ||
606 | short i; | 606 | short i; |
607 | int ioaddr, irq, if_port; | 607 | int ioaddr, irq, if_port; |
608 | u16 phys_addr[3]; | 608 | __be16 phys_addr[3]; |
609 | struct net_device *dev = NULL; | 609 | struct net_device *dev = NULL; |
610 | u_char pos4, pos5; | 610 | u_char pos4, pos5; |
611 | struct mca_device *mdev = to_mca_device(device); | 611 | struct mca_device *mdev = to_mca_device(device); |
@@ -635,14 +635,13 @@ static int __init el3_mca_probe(struct device *device) | |||
635 | printk(KERN_DEBUG "3c529: irq %d ioaddr 0x%x ifport %d\n", irq, ioaddr, if_port); | 635 | printk(KERN_DEBUG "3c529: irq %d ioaddr 0x%x ifport %d\n", irq, ioaddr, if_port); |
636 | } | 636 | } |
637 | EL3WINDOW(0); | 637 | EL3WINDOW(0); |
638 | for (i = 0; i < 3; i++) { | 638 | for (i = 0; i < 3; i++) |
639 | phys_addr[i] = htons(read_eeprom(ioaddr, i)); | 639 | phys_addr[i] = htons(read_eeprom(ioaddr, i)); |
640 | } | ||
641 | 640 | ||
642 | dev = alloc_etherdev(sizeof (struct el3_private)); | 641 | dev = alloc_etherdev(sizeof (struct el3_private)); |
643 | if (dev == NULL) { | 642 | if (dev == NULL) { |
644 | release_region(ioaddr, EL3_IO_EXTENT); | 643 | release_region(ioaddr, EL3_IO_EXTENT); |
645 | return -ENOMEM; | 644 | return -ENOMEM; |
646 | } | 645 | } |
647 | 646 | ||
648 | netdev_boot_setup_check(dev); | 647 | netdev_boot_setup_check(dev); |
@@ -668,7 +667,7 @@ static int __init el3_eisa_probe (struct device *device) | |||
668 | { | 667 | { |
669 | short i; | 668 | short i; |
670 | int ioaddr, irq, if_port; | 669 | int ioaddr, irq, if_port; |
671 | u16 phys_addr[3]; | 670 | __be16 phys_addr[3]; |
672 | struct net_device *dev = NULL; | 671 | struct net_device *dev = NULL; |
673 | struct eisa_device *edev; | 672 | struct eisa_device *edev; |
674 | int err; | 673 | int err; |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9f6cc8a56073..dd0ec9ebc939 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -1353,7 +1353,7 @@ config APRICOT | |||
1353 | 1353 | ||
1354 | config B44 | 1354 | config B44 |
1355 | tristate "Broadcom 440x/47xx ethernet support" | 1355 | tristate "Broadcom 440x/47xx ethernet support" |
1356 | depends on SSB_POSSIBLE | 1356 | depends on SSB_POSSIBLE && HAS_DMA |
1357 | select SSB | 1357 | select SSB |
1358 | select MII | 1358 | select MII |
1359 | help | 1359 | help |
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 9c2394d49428..6e4c80d41b08 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -2135,7 +2135,7 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb, | |||
2135 | return -1; | 2135 | return -1; |
2136 | } | 2136 | } |
2137 | 2137 | ||
2138 | if (skb->protocol == ntohs(ETH_P_IP)) { | 2138 | if (skb->protocol == htons(ETH_P_IP)) { |
2139 | struct iphdr *iph = ip_hdr(skb); | 2139 | struct iphdr *iph = ip_hdr(skb); |
2140 | 2140 | ||
2141 | real_len = (((unsigned char *)iph - skb->data) + | 2141 | real_len = (((unsigned char *)iph - skb->data) + |
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 68c41a00d93d..08f3d396bcd6 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
@@ -1437,8 +1437,16 @@ int bond_create_sysfs(void) | |||
1437 | * configure multiple bonding devices. | 1437 | * configure multiple bonding devices. |
1438 | */ | 1438 | */ |
1439 | if (ret == -EEXIST) { | 1439 | if (ret == -EEXIST) { |
1440 | netdev_class = NULL; | 1440 | /* Is someone being kinky and naming a device bonding_master? */ |
1441 | return 0; | 1441 | if (__dev_get_by_name(&init_net, |
1442 | class_attr_bonding_masters.attr.name)) | ||
1443 | printk(KERN_ERR | ||
1444 | "network device named %s already exists in sysfs", | ||
1445 | class_attr_bonding_masters.attr.name); | ||
1446 | else { | ||
1447 | netdev_class = NULL; | ||
1448 | return 0; | ||
1449 | } | ||
1442 | } | 1450 | } |
1443 | 1451 | ||
1444 | return ret; | 1452 | return ret; |
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 93e13636f8dd..83768df27806 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -142,8 +142,8 @@ | |||
142 | 142 | ||
143 | #define DRV_MODULE_NAME "cassini" | 143 | #define DRV_MODULE_NAME "cassini" |
144 | #define PFX DRV_MODULE_NAME ": " | 144 | #define PFX DRV_MODULE_NAME ": " |
145 | #define DRV_MODULE_VERSION "1.5" | 145 | #define DRV_MODULE_VERSION "1.6" |
146 | #define DRV_MODULE_RELDATE "4 Jan 2008" | 146 | #define DRV_MODULE_RELDATE "21 May 2008" |
147 | 147 | ||
148 | #define CAS_DEF_MSG_ENABLE \ | 148 | #define CAS_DEF_MSG_ENABLE \ |
149 | (NETIF_MSG_DRV | \ | 149 | (NETIF_MSG_DRV | \ |
@@ -2136,9 +2136,12 @@ end_copy_pkt: | |||
2136 | if (addr) | 2136 | if (addr) |
2137 | cas_page_unmap(addr); | 2137 | cas_page_unmap(addr); |
2138 | } | 2138 | } |
2139 | skb->csum = csum_unfold(~csum); | ||
2140 | skb->ip_summed = CHECKSUM_COMPLETE; | ||
2141 | skb->protocol = eth_type_trans(skb, cp->dev); | 2139 | skb->protocol = eth_type_trans(skb, cp->dev); |
2140 | if (skb->protocol == htons(ETH_P_IP)) { | ||
2141 | skb->csum = csum_unfold(~csum); | ||
2142 | skb->ip_summed = CHECKSUM_COMPLETE; | ||
2143 | } else | ||
2144 | skb->ip_summed = CHECKSUM_NONE; | ||
2142 | return len; | 2145 | return len; |
2143 | } | 2146 | } |
2144 | 2147 | ||
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index 9081234ab458..6f50ed7b183f 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c | |||
@@ -1120,7 +1120,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self) | |||
1120 | } | 1120 | } |
1121 | } | 1121 | } |
1122 | 1122 | ||
1123 | if (self->usbdev->descriptor.bcdDevice == fw_version) { | 1123 | if (self->usbdev->descriptor.bcdDevice == cpu_to_le16(fw_version)) { |
1124 | /* | 1124 | /* |
1125 | * If we're here, we've found a correct patch | 1125 | * If we're here, we've found a correct patch |
1126 | * The actual image starts after the "STMP" keyword | 1126 | * The actual image starts after the "STMP" keyword |
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h index e846c38224a3..a0ca9c1fe196 100644 --- a/drivers/net/irda/irda-usb.h +++ b/drivers/net/irda/irda-usb.h | |||
@@ -117,11 +117,11 @@ | |||
117 | struct irda_class_desc { | 117 | struct irda_class_desc { |
118 | __u8 bLength; | 118 | __u8 bLength; |
119 | __u8 bDescriptorType; | 119 | __u8 bDescriptorType; |
120 | __u16 bcdSpecRevision; | 120 | __le16 bcdSpecRevision; |
121 | __u8 bmDataSize; | 121 | __u8 bmDataSize; |
122 | __u8 bmWindowSize; | 122 | __u8 bmWindowSize; |
123 | __u8 bmMinTurnaroundTime; | 123 | __u8 bmMinTurnaroundTime; |
124 | __u16 wBaudRate; | 124 | __le16 wBaudRate; |
125 | __u8 bmAdditionalBOFs; | 125 | __u8 bmAdditionalBOFs; |
126 | __u8 bIrdaRateSniff; | 126 | __u8 bIrdaRateSniff; |
127 | __u8 bMaxUnicastList; | 127 | __u8 bMaxUnicastList; |
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index 79359919335b..8db342f2fdc9 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c | |||
@@ -980,6 +980,8 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb) | |||
980 | __wsum csum = 0; | 980 | __wsum csum = 0; |
981 | struct udphdr *uh; | 981 | struct udphdr *uh; |
982 | unsigned int len; | 982 | unsigned int len; |
983 | int old_headroom; | ||
984 | int new_headroom; | ||
983 | 985 | ||
984 | if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED)) | 986 | if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED)) |
985 | goto abort; | 987 | goto abort; |
@@ -1001,16 +1003,18 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb) | |||
1001 | 1003 | ||
1002 | /* Check that there's enough headroom in the skb to insert IP, | 1004 | /* Check that there's enough headroom in the skb to insert IP, |
1003 | * UDP and L2TP and PPP headers. If not enough, expand it to | 1005 | * UDP and L2TP and PPP headers. If not enough, expand it to |
1004 | * make room. Note that a new skb (or a clone) is | 1006 | * make room. Adjust truesize. |
1005 | * allocated. If we return an error from this point on, make | ||
1006 | * sure we free the new skb but do not free the original skb | ||
1007 | * since that is done by the caller for the error case. | ||
1008 | */ | 1007 | */ |
1009 | headroom = NET_SKB_PAD + sizeof(struct iphdr) + | 1008 | headroom = NET_SKB_PAD + sizeof(struct iphdr) + |
1010 | sizeof(struct udphdr) + hdr_len + sizeof(ppph); | 1009 | sizeof(struct udphdr) + hdr_len + sizeof(ppph); |
1010 | old_headroom = skb_headroom(skb); | ||
1011 | if (skb_cow_head(skb, headroom)) | 1011 | if (skb_cow_head(skb, headroom)) |
1012 | goto abort; | 1012 | goto abort; |
1013 | 1013 | ||
1014 | new_headroom = skb_headroom(skb); | ||
1015 | skb_orphan(skb); | ||
1016 | skb->truesize += new_headroom - old_headroom; | ||
1017 | |||
1014 | /* Setup PPP header */ | 1018 | /* Setup PPP header */ |
1015 | __skb_push(skb, sizeof(ppph)); | 1019 | __skb_push(skb, sizeof(ppph)); |
1016 | skb->data[0] = ppph[0]; | 1020 | skb->data[0] = ppph[0]; |
@@ -1065,7 +1069,6 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb) | |||
1065 | /* Get routing info from the tunnel socket */ | 1069 | /* Get routing info from the tunnel socket */ |
1066 | dst_release(skb->dst); | 1070 | dst_release(skb->dst); |
1067 | skb->dst = dst_clone(__sk_dst_get(sk_tun)); | 1071 | skb->dst = dst_clone(__sk_dst_get(sk_tun)); |
1068 | skb_orphan(skb); | ||
1069 | skb->sk = sk_tun; | 1072 | skb->sk = sk_tun; |
1070 | 1073 | ||
1071 | /* Queue the packet to IP for output */ | 1074 | /* Queue the packet to IP for output */ |
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 76752d84a30f..22c17bbacb69 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c | |||
@@ -423,7 +423,10 @@ static int catc_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
423 | 423 | ||
424 | catc->tx_ptr = (((catc->tx_ptr - 1) >> 6) + 1) << 6; | 424 | catc->tx_ptr = (((catc->tx_ptr - 1) >> 6) + 1) << 6; |
425 | tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr; | 425 | tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr; |
426 | *((u16*)tx_buf) = (catc->is_f5u011) ? cpu_to_be16((u16)skb->len) : cpu_to_le16((u16)skb->len); | 426 | if (catc->is_f5u011) |
427 | *(__be16 *)tx_buf = cpu_to_be16(skb->len); | ||
428 | else | ||
429 | *(__le16 *)tx_buf = cpu_to_le16(skb->len); | ||
427 | skb_copy_from_linear_data(skb, tx_buf + 2, skb->len); | 430 | skb_copy_from_linear_data(skb, tx_buf + 2, skb->len); |
428 | catc->tx_ptr += skb->len + 2; | 431 | catc->tx_ptr += skb->len + 2; |
429 | 432 | ||
diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c index 0ec7936cbe21..c66b9c324f54 100644 --- a/drivers/net/usb/cdc_subset.c +++ b/drivers/net/usb/cdc_subset.c | |||
@@ -218,7 +218,7 @@ static const struct driver_info blob_info = { | |||
218 | /*-------------------------------------------------------------------------*/ | 218 | /*-------------------------------------------------------------------------*/ |
219 | 219 | ||
220 | #ifndef HAVE_HARDWARE | 220 | #ifndef HAVE_HARDWARE |
221 | #error You need to configure some hardware for this driver | 221 | #warning You need to configure some hardware for this driver |
222 | #endif | 222 | #endif |
223 | 223 | ||
224 | /* | 224 | /* |
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 21a7785cb8b6..3969b7a2b8e6 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
@@ -283,8 +283,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
283 | struct rndis_set_c *set_c; | 283 | struct rndis_set_c *set_c; |
284 | struct rndis_halt *halt; | 284 | struct rndis_halt *halt; |
285 | } u; | 285 | } u; |
286 | u32 tmp, phym_unspec; | 286 | u32 tmp; |
287 | __le32 *phym; | 287 | __le32 phym_unspec, *phym; |
288 | int reply_len; | 288 | int reply_len; |
289 | unsigned char *bp; | 289 | unsigned char *bp; |
290 | 290 | ||
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 45f47c1c0a35..4e1c690ff45f 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(struct airo_info *ai, | |||
2668 | dev->irq = ethdev->irq; | 2668 | dev->irq = ethdev->irq; |
2669 | dev->base_addr = ethdev->base_addr; | 2669 | dev->base_addr = ethdev->base_addr; |
2670 | dev->wireless_data = ethdev->wireless_data; | 2670 | dev->wireless_data = ethdev->wireless_data; |
2671 | SET_NETDEV_DEV(dev, ethdev->dev.parent); | ||
2671 | memcpy(dev->dev_addr, ethdev->dev_addr, dev->addr_len); | 2672 | memcpy(dev->dev_addr, ethdev->dev_addr, dev->addr_len); |
2672 | err = register_netdev(dev); | 2673 | err = register_netdev(dev); |
2673 | if (err<0) { | 2674 | if (err<0) { |
@@ -2904,7 +2905,7 @@ EXPORT_SYMBOL(init_airo_card); | |||
2904 | 2905 | ||
2905 | static int waitbusy (struct airo_info *ai) { | 2906 | static int waitbusy (struct airo_info *ai) { |
2906 | int delay = 0; | 2907 | int delay = 0; |
2907 | while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) & (delay < 10000)) { | 2908 | while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) { |
2908 | udelay (10); | 2909 | udelay (10); |
2909 | if ((++delay % 20) == 0) | 2910 | if ((++delay % 20) == 0) |
2910 | OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); | 2911 | OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); |
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 4e5c8fc35200..635b9ac9aaa1 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -1787,6 +1787,8 @@ ath5k_tasklet_rx(unsigned long data) | |||
1787 | 1787 | ||
1788 | spin_lock(&sc->rxbuflock); | 1788 | spin_lock(&sc->rxbuflock); |
1789 | do { | 1789 | do { |
1790 | rxs.flag = 0; | ||
1791 | |||
1790 | if (unlikely(list_empty(&sc->rxbuf))) { | 1792 | if (unlikely(list_empty(&sc->rxbuf))) { |
1791 | ATH5K_WARN(sc, "empty rx buf pool\n"); | 1793 | ATH5K_WARN(sc, "empty rx buf pool\n"); |
1792 | break; | 1794 | break; |
diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c index 5fb1ae6ad3e2..77990b56860b 100644 --- a/drivers/net/wireless/ath5k/hw.c +++ b/drivers/net/wireless/ath5k/hw.c | |||
@@ -4119,6 +4119,7 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah, | |||
4119 | rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1, | 4119 | rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1, |
4120 | AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP); | 4120 | AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP); |
4121 | rs->rs_status = 0; | 4121 | rs->rs_status = 0; |
4122 | rs->rs_phyerr = 0; | ||
4122 | 4123 | ||
4123 | /* | 4124 | /* |
4124 | * Key table status | 4125 | * Key table status |
@@ -4145,7 +4146,7 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah, | |||
4145 | if (rx_status->rx_status_1 & | 4146 | if (rx_status->rx_status_1 & |
4146 | AR5K_5210_RX_DESC_STATUS1_PHY_ERROR) { | 4147 | AR5K_5210_RX_DESC_STATUS1_PHY_ERROR) { |
4147 | rs->rs_status |= AR5K_RXERR_PHY; | 4148 | rs->rs_status |= AR5K_RXERR_PHY; |
4148 | rs->rs_phyerr = AR5K_REG_MS(rx_status->rx_status_1, | 4149 | rs->rs_phyerr |= AR5K_REG_MS(rx_status->rx_status_1, |
4149 | AR5K_5210_RX_DESC_STATUS1_PHY_ERROR); | 4150 | AR5K_5210_RX_DESC_STATUS1_PHY_ERROR); |
4150 | } | 4151 | } |
4151 | 4152 | ||
@@ -4193,6 +4194,7 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah, | |||
4193 | rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1, | 4194 | rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1, |
4194 | AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP); | 4195 | AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP); |
4195 | rs->rs_status = 0; | 4196 | rs->rs_status = 0; |
4197 | rs->rs_phyerr = 0; | ||
4196 | 4198 | ||
4197 | /* | 4199 | /* |
4198 | * Key table status | 4200 | * Key table status |
@@ -4215,7 +4217,7 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah, | |||
4215 | if (rx_status->rx_status_1 & | 4217 | if (rx_status->rx_status_1 & |
4216 | AR5K_5212_RX_DESC_STATUS1_PHY_ERROR) { | 4218 | AR5K_5212_RX_DESC_STATUS1_PHY_ERROR) { |
4217 | rs->rs_status |= AR5K_RXERR_PHY; | 4219 | rs->rs_status |= AR5K_RXERR_PHY; |
4218 | rs->rs_phyerr = AR5K_REG_MS(rx_err->rx_error_1, | 4220 | rs->rs_phyerr |= AR5K_REG_MS(rx_err->rx_error_1, |
4219 | AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE); | 4221 | AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE); |
4220 | } | 4222 | } |
4221 | 4223 | ||
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig index f51b2d9b085b..1fa043d1802c 100644 --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config B43 | 1 | config B43 |
2 | tristate "Broadcom 43xx wireless support (mac80211 stack)" | 2 | tristate "Broadcom 43xx wireless support (mac80211 stack)" |
3 | depends on SSB_POSSIBLE && MAC80211 && WLAN_80211 | 3 | depends on SSB_POSSIBLE && MAC80211 && WLAN_80211 && HAS_DMA |
4 | select SSB | 4 | select SSB |
5 | select FW_LOADER | 5 | select FW_LOADER |
6 | select HW_RANDOM | 6 | select HW_RANDOM |
diff --git a/drivers/net/wireless/b43legacy/Kconfig b/drivers/net/wireless/b43legacy/Kconfig index 13c65faf0247..aef2298d37ac 100644 --- a/drivers/net/wireless/b43legacy/Kconfig +++ b/drivers/net/wireless/b43legacy/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config B43LEGACY | 1 | config B43LEGACY |
2 | tristate "Broadcom 43xx-legacy wireless support (mac80211 stack)" | 2 | tristate "Broadcom 43xx-legacy wireless support (mac80211 stack)" |
3 | depends on SSB_POSSIBLE && MAC80211 && WLAN_80211 | 3 | depends on SSB_POSSIBLE && MAC80211 && WLAN_80211 && HAS_DMA |
4 | select SSB | 4 | select SSB |
5 | select FW_LOADER | 5 | select FW_LOADER |
6 | select HW_RANDOM | 6 | select HW_RANDOM |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 437a9bcc9bd3..ed4317a17cbb 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
@@ -833,6 +833,7 @@ static struct pcmcia_device_id hostap_cs_ids[] = { | |||
833 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), | 833 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), |
834 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), | 834 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), |
835 | /* PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), conflict with pcnet_cs */ | 835 | /* PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), conflict with pcnet_cs */ |
836 | PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002), | ||
836 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), | 837 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), |
837 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), | 838 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), |
838 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), | 839 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), |
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index 7be68db6f300..cdf90c40f11b 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
@@ -3276,11 +3276,6 @@ while (0) | |||
3276 | } | 3276 | } |
3277 | printk(KERN_INFO "%s: Registered netdevice %s\n", dev_info, dev->name); | 3277 | printk(KERN_INFO "%s: Registered netdevice %s\n", dev_info, dev->name); |
3278 | 3278 | ||
3279 | #ifndef PRISM2_NO_PROCFS_DEBUG | ||
3280 | create_proc_read_entry("registers", 0, local->proc, | ||
3281 | prism2_registers_proc_read, local); | ||
3282 | #endif /* PRISM2_NO_PROCFS_DEBUG */ | ||
3283 | |||
3284 | hostap_init_data(local); | 3279 | hostap_init_data(local); |
3285 | return dev; | 3280 | return dev; |
3286 | 3281 | ||
@@ -3307,6 +3302,10 @@ static int hostap_hw_ready(struct net_device *dev) | |||
3307 | netif_carrier_off(local->ddev); | 3302 | netif_carrier_off(local->ddev); |
3308 | } | 3303 | } |
3309 | hostap_init_proc(local); | 3304 | hostap_init_proc(local); |
3305 | #ifndef PRISM2_NO_PROCFS_DEBUG | ||
3306 | create_proc_read_entry("registers", 0, local->proc, | ||
3307 | prism2_registers_proc_read, local); | ||
3308 | #endif /* PRISM2_NO_PROCFS_DEBUG */ | ||
3310 | hostap_init_ap_proc(local); | 3309 | hostap_init_ap_proc(local); |
3311 | return 0; | 3310 | return 0; |
3312 | } | 3311 | } |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index fa87c5c2ae0b..d74c061994ae 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -11584,6 +11584,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv) | |||
11584 | priv->prom_net_dev->hard_start_xmit = ipw_prom_hard_start_xmit; | 11584 | priv->prom_net_dev->hard_start_xmit = ipw_prom_hard_start_xmit; |
11585 | 11585 | ||
11586 | priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR; | 11586 | priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR; |
11587 | SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev); | ||
11587 | 11588 | ||
11588 | rc = register_netdev(priv->prom_net_dev); | 11589 | rc = register_netdev(priv->prom_net_dev); |
11589 | if (rc) { | 11590 | if (rc) { |
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c index dcfdb404678b..688d60de55cb 100644 --- a/drivers/net/wireless/libertas/ethtool.c +++ b/drivers/net/wireless/libertas/ethtool.c | |||
@@ -73,8 +73,8 @@ out: | |||
73 | return ret; | 73 | return ret; |
74 | } | 74 | } |
75 | 75 | ||
76 | static void lbs_ethtool_get_stats(struct net_device * dev, | 76 | static void lbs_ethtool_get_stats(struct net_device *dev, |
77 | struct ethtool_stats * stats, u64 * data) | 77 | struct ethtool_stats *stats, uint64_t *data) |
78 | { | 78 | { |
79 | struct lbs_private *priv = dev->priv; | 79 | struct lbs_private *priv = dev->priv; |
80 | struct cmd_ds_mesh_access mesh_access; | 80 | struct cmd_ds_mesh_access mesh_access; |
@@ -83,12 +83,12 @@ static void lbs_ethtool_get_stats(struct net_device * dev, | |||
83 | lbs_deb_enter(LBS_DEB_ETHTOOL); | 83 | lbs_deb_enter(LBS_DEB_ETHTOOL); |
84 | 84 | ||
85 | /* Get Mesh Statistics */ | 85 | /* Get Mesh Statistics */ |
86 | ret = lbs_prepare_and_send_command(priv, | 86 | ret = lbs_mesh_access(priv, CMD_ACT_MESH_GET_STATS, &mesh_access); |
87 | CMD_MESH_ACCESS, CMD_ACT_MESH_GET_STATS, | ||
88 | CMD_OPTION_WAITFORRSP, 0, &mesh_access); | ||
89 | 87 | ||
90 | if (ret) | 88 | if (ret) { |
89 | memset(data, 0, MESH_STATS_NUM*(sizeof(uint64_t))); | ||
91 | return; | 90 | return; |
91 | } | ||
92 | 92 | ||
93 | priv->mstats.fwd_drop_rbt = le32_to_cpu(mesh_access.data[0]); | 93 | priv->mstats.fwd_drop_rbt = le32_to_cpu(mesh_access.data[0]); |
94 | priv->mstats.fwd_drop_ttl = le32_to_cpu(mesh_access.data[1]); | 94 | priv->mstats.fwd_drop_ttl = le32_to_cpu(mesh_access.data[1]); |
@@ -111,19 +111,18 @@ static void lbs_ethtool_get_stats(struct net_device * dev, | |||
111 | lbs_deb_enter(LBS_DEB_ETHTOOL); | 111 | lbs_deb_enter(LBS_DEB_ETHTOOL); |
112 | } | 112 | } |
113 | 113 | ||
114 | static int lbs_ethtool_get_sset_count(struct net_device * dev, int sset) | 114 | static int lbs_ethtool_get_sset_count(struct net_device *dev, int sset) |
115 | { | 115 | { |
116 | switch (sset) { | 116 | struct lbs_private *priv = dev->priv; |
117 | case ETH_SS_STATS: | 117 | |
118 | if (sset == ETH_SS_STATS && dev == priv->mesh_dev) | ||
118 | return MESH_STATS_NUM; | 119 | return MESH_STATS_NUM; |
119 | default: | 120 | |
120 | return -EOPNOTSUPP; | 121 | return -EOPNOTSUPP; |
121 | } | ||
122 | } | 122 | } |
123 | 123 | ||
124 | static void lbs_ethtool_get_strings(struct net_device *dev, | 124 | static void lbs_ethtool_get_strings(struct net_device *dev, |
125 | u32 stringset, | 125 | uint32_t stringset, uint8_t *s) |
126 | u8 * s) | ||
127 | { | 126 | { |
128 | int i; | 127 | int i; |
129 | 128 | ||
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 406f54d40956..e1f066068590 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -756,6 +756,7 @@ static int lbs_thread(void *data) | |||
756 | priv->nr_retries = 0; | 756 | priv->nr_retries = 0; |
757 | } else { | 757 | } else { |
758 | priv->cur_cmd = NULL; | 758 | priv->cur_cmd = NULL; |
759 | priv->dnld_sent = DNLD_RES_RECEIVED; | ||
759 | lbs_pr_info("requeueing command %x due to timeout (#%d)\n", | 760 | lbs_pr_info("requeueing command %x due to timeout (#%d)\n", |
760 | le16_to_cpu(cmdnode->cmdbuf->command), priv->nr_retries); | 761 | le16_to_cpu(cmdnode->cmdbuf->command), priv->nr_retries); |
761 | 762 | ||
@@ -1564,6 +1565,7 @@ static int lbs_add_rtap(struct lbs_private *priv) | |||
1564 | rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit; | 1565 | rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit; |
1565 | rtap_dev->set_multicast_list = lbs_set_multicast_list; | 1566 | rtap_dev->set_multicast_list = lbs_set_multicast_list; |
1566 | rtap_dev->priv = priv; | 1567 | rtap_dev->priv = priv; |
1568 | SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent); | ||
1567 | 1569 | ||
1568 | ret = register_netdev(rtap_dev); | 1570 | ret = register_netdev(rtap_dev); |
1569 | if (ret) { | 1571 | if (ret) { |
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index 8b7f5768a103..1c216e015f64 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c | |||
@@ -461,6 +461,7 @@ static struct pcmcia_device_id orinoco_cs_ids[] = { | |||
461 | PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), /* Linksys WCF12 Wireless CompactFlash Card */ | 461 | PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), /* Linksys WCF12 Wireless CompactFlash Card */ |
462 | PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), /* ASUS SpaceLink WL-100 */ | 462 | PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), /* ASUS SpaceLink WL-100 */ |
463 | PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), /* SpeedStream SS1021 Wireless Adapter */ | 463 | PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), /* SpeedStream SS1021 Wireless Adapter */ |
464 | PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x3021), /* SpeedStream Wireless Adapter */ | ||
464 | PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), /* PLANEX RoadLannerWave GW-NS11H */ | 465 | PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), /* PLANEX RoadLannerWave GW-NS11H */ |
465 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), /* Airvast WN-100 */ | 466 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), /* Airvast WN-100 */ |
466 | PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), /* Adaptec Ultra Wireless ANW-8030 */ | 467 | PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), /* Adaptec Ultra Wireless ANW-8030 */ |
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index d5787b37e1fb..9223ada5f00e 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c | |||
@@ -92,6 +92,7 @@ static void rtl8187_iowrite_async(struct rtl8187_priv *priv, __le16 addr, | |||
92 | u8 data[4]; | 92 | u8 data[4]; |
93 | struct usb_ctrlrequest dr; | 93 | struct usb_ctrlrequest dr; |
94 | } *buf; | 94 | } *buf; |
95 | int rc; | ||
95 | 96 | ||
96 | buf = kmalloc(sizeof(*buf), GFP_ATOMIC); | 97 | buf = kmalloc(sizeof(*buf), GFP_ATOMIC); |
97 | if (!buf) | 98 | if (!buf) |
@@ -116,7 +117,11 @@ static void rtl8187_iowrite_async(struct rtl8187_priv *priv, __le16 addr, | |||
116 | usb_fill_control_urb(urb, priv->udev, usb_sndctrlpipe(priv->udev, 0), | 117 | usb_fill_control_urb(urb, priv->udev, usb_sndctrlpipe(priv->udev, 0), |
117 | (unsigned char *)dr, buf, len, | 118 | (unsigned char *)dr, buf, len, |
118 | rtl8187_iowrite_async_cb, buf); | 119 | rtl8187_iowrite_async_cb, buf); |
119 | usb_submit_urb(urb, GFP_ATOMIC); | 120 | rc = usb_submit_urb(urb, GFP_ATOMIC); |
121 | if (rc < 0) { | ||
122 | kfree(buf); | ||
123 | usb_free_urb(urb); | ||
124 | } | ||
120 | } | 125 | } |
121 | 126 | ||
122 | static inline void rtl818x_iowrite32_async(struct rtl8187_priv *priv, | 127 | static inline void rtl818x_iowrite32_async(struct rtl8187_priv *priv, |
@@ -169,6 +174,7 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb, | |||
169 | struct urb *urb; | 174 | struct urb *urb; |
170 | __le16 rts_dur = 0; | 175 | __le16 rts_dur = 0; |
171 | u32 flags; | 176 | u32 flags; |
177 | int rc; | ||
172 | 178 | ||
173 | urb = usb_alloc_urb(0, GFP_ATOMIC); | 179 | urb = usb_alloc_urb(0, GFP_ATOMIC); |
174 | if (!urb) { | 180 | if (!urb) { |
@@ -208,7 +214,11 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb, | |||
208 | info->dev = dev; | 214 | info->dev = dev; |
209 | usb_fill_bulk_urb(urb, priv->udev, usb_sndbulkpipe(priv->udev, 2), | 215 | usb_fill_bulk_urb(urb, priv->udev, usb_sndbulkpipe(priv->udev, 2), |
210 | hdr, skb->len, rtl8187_tx_cb, skb); | 216 | hdr, skb->len, rtl8187_tx_cb, skb); |
211 | usb_submit_urb(urb, GFP_ATOMIC); | 217 | rc = usb_submit_urb(urb, GFP_ATOMIC); |
218 | if (rc < 0) { | ||
219 | usb_free_urb(urb); | ||
220 | kfree_skb(skb); | ||
221 | } | ||
212 | 222 | ||
213 | return 0; | 223 | return 0; |
214 | } | 224 | } |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 69c45ca99051..6424e5a2c83d 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -805,7 +805,7 @@ void zd_process_intr(struct work_struct *work) | |||
805 | u16 int_status; | 805 | u16 int_status; |
806 | struct zd_mac *mac = container_of(work, struct zd_mac, process_intr); | 806 | struct zd_mac *mac = container_of(work, struct zd_mac, process_intr); |
807 | 807 | ||
808 | int_status = le16_to_cpu(*(u16 *)(mac->intr_buffer+4)); | 808 | int_status = le16_to_cpu(*(__le16 *)(mac->intr_buffer+4)); |
809 | if (int_status & INT_CFG_NEXT_BCN) { | 809 | if (int_status & INT_CFG_NEXT_BCN) { |
810 | if (net_ratelimit()) | 810 | if (net_ratelimit()) |
811 | dev_dbg_f(zd_mac_dev(mac), "INT_CFG_NEXT_BCN\n"); | 811 | dev_dbg_f(zd_mac_dev(mac), "INT_CFG_NEXT_BCN\n"); |
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c index 12e24f04dddf..8941f5eb96c2 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zd1211rw/zd_usb.c | |||
@@ -342,7 +342,7 @@ static inline void handle_regs_int(struct urb *urb) | |||
342 | ZD_ASSERT(in_interrupt()); | 342 | ZD_ASSERT(in_interrupt()); |
343 | spin_lock(&intr->lock); | 343 | spin_lock(&intr->lock); |
344 | 344 | ||
345 | int_num = le16_to_cpu(*(u16 *)(urb->transfer_buffer+2)); | 345 | int_num = le16_to_cpu(*(__le16 *)(urb->transfer_buffer+2)); |
346 | if (int_num == CR_INTERRUPT) { | 346 | if (int_num == CR_INTERRUPT) { |
347 | struct zd_mac *mac = zd_hw_mac(zd_usb_to_hw(urb->context)); | 347 | struct zd_mac *mac = zd_hw_mac(zd_usb_to_hw(urb->context)); |
348 | memcpy(&mac->intr_buffer, urb->transfer_buffer, | 348 | memcpy(&mac->intr_buffer, urb->transfer_buffer, |
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 138dd76ee347..af1633eb3b70 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c | |||
@@ -91,15 +91,13 @@ int power_supply_register(struct device *parent, struct power_supply *psy) | |||
91 | { | 91 | { |
92 | int rc = 0; | 92 | int rc = 0; |
93 | 93 | ||
94 | psy->dev = device_create(power_supply_class, parent, 0, | 94 | psy->dev = device_create_drvdata(power_supply_class, parent, 0, |
95 | "%s", psy->name); | 95 | psy, "%s", psy->name); |
96 | if (IS_ERR(psy->dev)) { | 96 | if (IS_ERR(psy->dev)) { |
97 | rc = PTR_ERR(psy->dev); | 97 | rc = PTR_ERR(psy->dev); |
98 | goto dev_create_failed; | 98 | goto dev_create_failed; |
99 | } | 99 | } |
100 | 100 | ||
101 | dev_set_drvdata(psy->dev, psy); | ||
102 | |||
103 | INIT_WORK(&psy->changed_work, power_supply_changed_work); | 101 | INIT_WORK(&psy->changed_work, power_supply_changed_work); |
104 | 102 | ||
105 | rc = power_supply_create_attrs(psy); | 103 | rc = power_supply_create_attrs(psy); |
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index e8487347e4d4..2c2428cc05d8 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c | |||
@@ -762,10 +762,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) | |||
762 | device_unregister(dev); | 762 | device_unregister(dev); |
763 | return ret; | 763 | return ret; |
764 | } | 764 | } |
765 | priv->class_device = device_create(vmlogrdr_class, dev, | 765 | priv->class_device = device_create_drvdata(vmlogrdr_class, dev, |
766 | MKDEV(vmlogrdr_major, | 766 | MKDEV(vmlogrdr_major, |
767 | priv->minor_num), | 767 | priv->minor_num), |
768 | "%s", dev->bus_id); | 768 | priv, "%s", dev->bus_id); |
769 | if (IS_ERR(priv->class_device)) { | 769 | if (IS_ERR(priv->class_device)) { |
770 | ret = PTR_ERR(priv->class_device); | 770 | ret = PTR_ERR(priv->class_device); |
771 | priv->class_device=NULL; | 771 | priv->class_device=NULL; |
@@ -773,7 +773,6 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) | |||
773 | device_unregister(dev); | 773 | device_unregister(dev); |
774 | return ret; | 774 | return ret; |
775 | } | 775 | } |
776 | dev->driver_data = priv; | ||
777 | priv->device = dev; | 776 | priv->device = dev; |
778 | return 0; | 777 | return 0; |
779 | } | 778 | } |
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c index 47a7e6200b26..9f55ce6f3c78 100644 --- a/drivers/s390/kvm/kvm_virtio.c +++ b/drivers/s390/kvm/kvm_virtio.c | |||
@@ -78,27 +78,32 @@ static unsigned desc_size(const struct kvm_device_desc *desc) | |||
78 | + desc->config_len; | 78 | + desc->config_len; |
79 | } | 79 | } |
80 | 80 | ||
81 | /* | 81 | /* This gets the device's feature bits. */ |
82 | * This tests (and acknowleges) a feature bit. | 82 | static u32 kvm_get_features(struct virtio_device *vdev) |
83 | */ | ||
84 | static bool kvm_feature(struct virtio_device *vdev, unsigned fbit) | ||
85 | { | 83 | { |
84 | unsigned int i; | ||
85 | u32 features = 0; | ||
86 | struct kvm_device_desc *desc = to_kvmdev(vdev)->desc; | 86 | struct kvm_device_desc *desc = to_kvmdev(vdev)->desc; |
87 | u8 *features; | 87 | u8 *in_features = kvm_vq_features(desc); |
88 | 88 | ||
89 | if (fbit / 8 > desc->feature_len) | 89 | for (i = 0; i < min(desc->feature_len * 8, 32); i++) |
90 | return false; | 90 | if (in_features[i / 8] & (1 << (i % 8))) |
91 | features |= (1 << i); | ||
92 | return features; | ||
93 | } | ||
91 | 94 | ||
92 | features = kvm_vq_features(desc); | 95 | static void kvm_set_features(struct virtio_device *vdev, u32 features) |
93 | if (!(features[fbit / 8] & (1 << (fbit % 8)))) | 96 | { |
94 | return false; | 97 | unsigned int i; |
98 | struct kvm_device_desc *desc = to_kvmdev(vdev)->desc; | ||
99 | /* Second half of bitmap is features we accept. */ | ||
100 | u8 *out_features = kvm_vq_features(desc) + desc->feature_len; | ||
95 | 101 | ||
96 | /* | 102 | memset(out_features, 0, desc->feature_len); |
97 | * We set the matching bit in the other half of the bitmap to tell the | 103 | for (i = 0; i < min(desc->feature_len * 8, 32); i++) { |
98 | * Host we want to use this feature. | 104 | if (features & (1 << i)) |
99 | */ | 105 | out_features[i / 8] |= (1 << (i % 8)); |
100 | features[desc->feature_len + fbit / 8] |= (1 << (fbit % 8)); | 106 | } |
101 | return true; | ||
102 | } | 107 | } |
103 | 108 | ||
104 | /* | 109 | /* |
@@ -221,7 +226,8 @@ static void kvm_del_vq(struct virtqueue *vq) | |||
221 | * The config ops structure as defined by virtio config | 226 | * The config ops structure as defined by virtio config |
222 | */ | 227 | */ |
223 | static struct virtio_config_ops kvm_vq_configspace_ops = { | 228 | static struct virtio_config_ops kvm_vq_configspace_ops = { |
224 | .feature = kvm_feature, | 229 | .get_features = kvm_get_features, |
230 | .set_features = kvm_set_features, | ||
225 | .get = kvm_get, | 231 | .get = kvm_get, |
226 | .set = kvm_set, | 232 | .set = kvm_set, |
227 | .get_status = kvm_get_status, | 233 | .get_status = kvm_get_status, |
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index b87037ec9805..03c966059471 100644 --- a/drivers/sbus/char/bpp.c +++ b/drivers/sbus/char/bpp.c | |||
@@ -869,7 +869,7 @@ static void probeLptPort(unsigned idx) | |||
869 | instances[idx].mode = COMPATIBILITY; | 869 | instances[idx].mode = COMPATIBILITY; |
870 | instances[idx].run_length = 0; | 870 | instances[idx].run_length = 0; |
871 | instances[idx].run_flag = 0; | 871 | instances[idx].run_flag = 0; |
872 | if (!request_region(lpAddr,3, dev_name)) return; | 872 | if (!request_region(lpAddr,3, bpp_dev_name)) return; |
873 | 873 | ||
874 | /* | 874 | /* |
875 | * First, make sure the instance exists. Do this by writing to | 875 | * First, make sure the instance exists. Do this by writing to |
@@ -1021,7 +1021,7 @@ static int __init bpp_init(void) | |||
1021 | if (rc == 0) | 1021 | if (rc == 0) |
1022 | return -ENODEV; | 1022 | return -ENODEV; |
1023 | 1023 | ||
1024 | rc = register_chrdev(BPP_MAJOR, dev_name, &bpp_fops); | 1024 | rc = register_chrdev(BPP_MAJOR, bpp_dev_name, &bpp_fops); |
1025 | if (rc < 0) | 1025 | if (rc < 0) |
1026 | return rc; | 1026 | return rc; |
1027 | 1027 | ||
@@ -1037,7 +1037,7 @@ static void __exit bpp_cleanup(void) | |||
1037 | { | 1037 | { |
1038 | unsigned idx; | 1038 | unsigned idx; |
1039 | 1039 | ||
1040 | unregister_chrdev(BPP_MAJOR, dev_name); | 1040 | unregister_chrdev(BPP_MAJOR, bpp_dev_name); |
1041 | 1041 | ||
1042 | for (idx = 0; idx < BPP_NO; idx++) { | 1042 | for (idx = 0; idx < BPP_NO; idx++) { |
1043 | if (instances[idx].present) | 1043 | if (instances[idx].present) |
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index b31faeccb9cd..867f6fd5c2c0 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c | |||
@@ -1278,7 +1278,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance) | |||
1278 | error = 0; | 1278 | error = 0; |
1279 | /* Check for command packet errors */ | 1279 | /* Check for command packet errors */ |
1280 | if (full_command_packet->command.newcommand.status != 0) { | 1280 | if (full_command_packet->command.newcommand.status != 0) { |
1281 | if (tw_dev->srb[request_id] != 0) { | 1281 | if (tw_dev->srb[request_id] != NULL) { |
1282 | error = twa_fill_sense(tw_dev, request_id, 1, 1); | 1282 | error = twa_fill_sense(tw_dev, request_id, 1, 1); |
1283 | } else { | 1283 | } else { |
1284 | /* Skip ioctl error prints */ | 1284 | /* Skip ioctl error prints */ |
@@ -1290,7 +1290,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance) | |||
1290 | 1290 | ||
1291 | /* Check for correct state */ | 1291 | /* Check for correct state */ |
1292 | if (tw_dev->state[request_id] != TW_S_POSTED) { | 1292 | if (tw_dev->state[request_id] != TW_S_POSTED) { |
1293 | if (tw_dev->srb[request_id] != 0) { | 1293 | if (tw_dev->srb[request_id] != NULL) { |
1294 | TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Received a request id that wasn't posted"); | 1294 | TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Received a request id that wasn't posted"); |
1295 | TW_CLEAR_ALL_INTERRUPTS(tw_dev); | 1295 | TW_CLEAR_ALL_INTERRUPTS(tw_dev); |
1296 | goto twa_interrupt_bail; | 1296 | goto twa_interrupt_bail; |
@@ -1298,7 +1298,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance) | |||
1298 | } | 1298 | } |
1299 | 1299 | ||
1300 | /* Check for internal command completion */ | 1300 | /* Check for internal command completion */ |
1301 | if (tw_dev->srb[request_id] == 0) { | 1301 | if (tw_dev->srb[request_id] == NULL) { |
1302 | if (request_id != tw_dev->chrdev_request_id) { | 1302 | if (request_id != tw_dev->chrdev_request_id) { |
1303 | if (twa_aen_complete(tw_dev, request_id)) | 1303 | if (twa_aen_complete(tw_dev, request_id)) |
1304 | TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1b, "Error completing AEN during attention interrupt"); | 1304 | TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1b, "Error completing AEN during attention interrupt"); |
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index 1dca1775f4b1..0899cb61e3dd 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c | |||
@@ -3582,7 +3582,7 @@ static int checksetup(struct aha152x_setup *setup) | |||
3582 | if (i == ARRAY_SIZE(ports)) | 3582 | if (i == ARRAY_SIZE(ports)) |
3583 | return 0; | 3583 | return 0; |
3584 | 3584 | ||
3585 | if ( request_region(setup->io_port, IO_RANGE, "aha152x")==0 ) { | 3585 | if (!request_region(setup->io_port, IO_RANGE, "aha152x")) { |
3586 | printk(KERN_ERR "aha152x: io port 0x%x busy.\n", setup->io_port); | 3586 | printk(KERN_ERR "aha152x: io port 0x%x busy.\n", setup->io_port); |
3587 | return 0; | 3587 | return 0; |
3588 | } | 3588 | } |
@@ -3842,7 +3842,7 @@ static int __init aha152x_init(void) | |||
3842 | if ((setup_count == 1) && (setup[0].io_port == ports[i])) | 3842 | if ((setup_count == 1) && (setup[0].io_port == ports[i])) |
3843 | continue; | 3843 | continue; |
3844 | 3844 | ||
3845 | if ( request_region(ports[i], IO_RANGE, "aha152x")==0 ) { | 3845 | if (!request_region(ports[i], IO_RANGE, "aha152x")) { |
3846 | printk(KERN_ERR "aha152x: io port 0x%x busy.\n", ports[i]); | 3846 | printk(KERN_ERR "aha152x: io port 0x%x busy.\n", ports[i]); |
3847 | continue; | 3847 | continue; |
3848 | } | 3848 | } |
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index db6de5e6afb3..7d311541c76c 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c | |||
@@ -747,7 +747,7 @@ static void send_s870(struct atp_unit *dev,unsigned char c) | |||
747 | dev->quhd[c] = 0; | 747 | dev->quhd[c] = 0; |
748 | } | 748 | } |
749 | workreq = dev->quereq[c][dev->quhd[c]]; | 749 | workreq = dev->quereq[c][dev->quhd[c]]; |
750 | if (dev->id[c][scmd_id(workreq)].curr_req == 0) { | 750 | if (dev->id[c][scmd_id(workreq)].curr_req == NULL) { |
751 | dev->id[c][scmd_id(workreq)].curr_req = workreq; | 751 | dev->id[c][scmd_id(workreq)].curr_req = workreq; |
752 | dev->last_cmd[c] = scmd_id(workreq); | 752 | dev->last_cmd[c] = scmd_id(workreq); |
753 | goto cmd_subp; | 753 | goto cmd_subp; |
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index 75c84d7b9ce8..c4b938bc30d3 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
@@ -910,9 +910,9 @@ static int ch_probe(struct device *dev) | |||
910 | ch->minor = minor; | 910 | ch->minor = minor; |
911 | sprintf(ch->name,"ch%d",ch->minor); | 911 | sprintf(ch->name,"ch%d",ch->minor); |
912 | 912 | ||
913 | class_dev = device_create(ch_sysfs_class, dev, | 913 | class_dev = device_create_drvdata(ch_sysfs_class, dev, |
914 | MKDEV(SCSI_CHANGER_MAJOR,ch->minor), | 914 | MKDEV(SCSI_CHANGER_MAJOR, ch->minor), |
915 | "s%s", ch->name); | 915 | ch, "s%s", ch->name); |
916 | if (IS_ERR(class_dev)) { | 916 | if (IS_ERR(class_dev)) { |
917 | printk(KERN_WARNING "ch%d: device_create failed\n", | 917 | printk(KERN_WARNING "ch%d: device_create failed\n", |
918 | ch->minor); | 918 | ch->minor); |
@@ -926,7 +926,6 @@ static int ch_probe(struct device *dev) | |||
926 | if (init) | 926 | if (init) |
927 | ch_init_elem(ch); | 927 | ch_init_elem(ch); |
928 | 928 | ||
929 | dev_set_drvdata(dev, ch); | ||
930 | sdev_printk(KERN_INFO, sd, "Attached scsi changer %s\n", ch->name); | 929 | sdev_printk(KERN_INFO, sd, "Attached scsi changer %s\n", ch->name); |
931 | 930 | ||
932 | return 0; | 931 | return 0; |
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c index aaa48e0c8ed0..da876d3924be 100644 --- a/drivers/scsi/hptiop.c +++ b/drivers/scsi/hptiop.c | |||
@@ -444,7 +444,7 @@ static void __iomem *hptiop_map_pci_bar(struct hptiop_hba *hba, int index) | |||
444 | if (!(pci_resource_flags(pcidev, index) & IORESOURCE_MEM)) { | 444 | if (!(pci_resource_flags(pcidev, index) & IORESOURCE_MEM)) { |
445 | printk(KERN_ERR "scsi%d: pci resource invalid\n", | 445 | printk(KERN_ERR "scsi%d: pci resource invalid\n", |
446 | hba->host->host_no); | 446 | hba->host->host_no); |
447 | return 0; | 447 | return NULL; |
448 | } | 448 | } |
449 | 449 | ||
450 | mem_base_phy = pci_resource_start(pcidev, index); | 450 | mem_base_phy = pci_resource_start(pcidev, index); |
@@ -454,7 +454,7 @@ static void __iomem *hptiop_map_pci_bar(struct hptiop_hba *hba, int index) | |||
454 | if (!mem_base_virt) { | 454 | if (!mem_base_virt) { |
455 | printk(KERN_ERR "scsi%d: Fail to ioremap memory space\n", | 455 | printk(KERN_ERR "scsi%d: Fail to ioremap memory space\n", |
456 | hba->host->host_no); | 456 | hba->host->host_no); |
457 | return 0; | 457 | return NULL; |
458 | } | 458 | } |
459 | return mem_base_virt; | 459 | return mem_base_virt; |
460 | } | 460 | } |
@@ -476,11 +476,11 @@ static void hptiop_unmap_pci_bar_itl(struct hptiop_hba *hba) | |||
476 | static int hptiop_map_pci_bar_mv(struct hptiop_hba *hba) | 476 | static int hptiop_map_pci_bar_mv(struct hptiop_hba *hba) |
477 | { | 477 | { |
478 | hba->u.mv.regs = hptiop_map_pci_bar(hba, 0); | 478 | hba->u.mv.regs = hptiop_map_pci_bar(hba, 0); |
479 | if (hba->u.mv.regs == 0) | 479 | if (hba->u.mv.regs == NULL) |
480 | return -1; | 480 | return -1; |
481 | 481 | ||
482 | hba->u.mv.mu = hptiop_map_pci_bar(hba, 2); | 482 | hba->u.mv.mu = hptiop_map_pci_bar(hba, 2); |
483 | if (hba->u.mv.mu == 0) { | 483 | if (hba->u.mv.mu == NULL) { |
484 | iounmap(hba->u.mv.regs); | 484 | iounmap(hba->u.mv.regs); |
485 | return -1; | 485 | return -1; |
486 | } | 486 | } |
@@ -1210,8 +1210,8 @@ static void hptiop_remove(struct pci_dev *pcidev) | |||
1210 | 1210 | ||
1211 | static struct hptiop_adapter_ops hptiop_itl_ops = { | 1211 | static struct hptiop_adapter_ops hptiop_itl_ops = { |
1212 | .iop_wait_ready = iop_wait_ready_itl, | 1212 | .iop_wait_ready = iop_wait_ready_itl, |
1213 | .internal_memalloc = 0, | 1213 | .internal_memalloc = NULL, |
1214 | .internal_memfree = 0, | 1214 | .internal_memfree = NULL, |
1215 | .map_pci_bar = hptiop_map_pci_bar_itl, | 1215 | .map_pci_bar = hptiop_map_pci_bar_itl, |
1216 | .unmap_pci_bar = hptiop_unmap_pci_bar_itl, | 1216 | .unmap_pci_bar = hptiop_unmap_pci_bar_itl, |
1217 | .enable_intr = hptiop_enable_intr_itl, | 1217 | .enable_intr = hptiop_enable_intr_itl, |
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index cd37bd69a115..887682a24e36 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c | |||
@@ -650,7 +650,7 @@ static void __exit mac_esp_exit(void) | |||
650 | 650 | ||
651 | MODULE_DESCRIPTION("Mac ESP SCSI driver"); | 651 | MODULE_DESCRIPTION("Mac ESP SCSI driver"); |
652 | MODULE_AUTHOR("Finn Thain <fthain@telegraphics.com.au>"); | 652 | MODULE_AUTHOR("Finn Thain <fthain@telegraphics.com.au>"); |
653 | MODULE_LICENSE("GPLv2"); | 653 | MODULE_LICENSE("GPL v2"); |
654 | MODULE_VERSION(DRV_VERSION); | 654 | MODULE_VERSION(DRV_VERSION); |
655 | 655 | ||
656 | module_init(mac_esp_init); | 656 | module_init(mac_esp_init); |
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 31f7aec44d90..243d8becd30f 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
@@ -5695,13 +5695,12 @@ static int osst_sysfs_add(dev_t dev, struct device *device, struct osst_tape * S | |||
5695 | struct device *osst_member; | 5695 | struct device *osst_member; |
5696 | int err; | 5696 | int err; |
5697 | 5697 | ||
5698 | osst_member = device_create(osst_sysfs_class, device, dev, "%s", name); | 5698 | osst_member = device_create_drvdata(osst_sysfs_class, device, dev, STp, "%s", name); |
5699 | if (IS_ERR(osst_member)) { | 5699 | if (IS_ERR(osst_member)) { |
5700 | printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name); | 5700 | printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name); |
5701 | return PTR_ERR(osst_member); | 5701 | return PTR_ERR(osst_member); |
5702 | } | 5702 | } |
5703 | 5703 | ||
5704 | dev_set_drvdata(osst_member, STp); | ||
5705 | err = device_create_file(osst_member, &dev_attr_ADR_rev); | 5704 | err = device_create_file(osst_member, &dev_attr_ADR_rev); |
5706 | if (err) | 5705 | if (err) |
5707 | goto err_out; | 5706 | goto err_out; |
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 51e2f299dbbb..3754ab87f89a 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
@@ -2811,7 +2811,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp) | |||
2811 | 2811 | ||
2812 | /* Check for room in outstanding command list. */ | 2812 | /* Check for room in outstanding command list. */ |
2813 | for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS && | 2813 | for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS && |
2814 | ha->outstanding_cmds[cnt] != 0; cnt++); | 2814 | ha->outstanding_cmds[cnt] != NULL; cnt++); |
2815 | 2815 | ||
2816 | if (cnt >= MAX_OUTSTANDING_COMMANDS) { | 2816 | if (cnt >= MAX_OUTSTANDING_COMMANDS) { |
2817 | status = 1; | 2817 | status = 1; |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index c9d7f721b9e2..ea0edd1b2e76 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -1441,17 +1441,18 @@ sg_add(struct device *cl_dev, struct class_interface *cl_intf) | |||
1441 | if (sg_sysfs_valid) { | 1441 | if (sg_sysfs_valid) { |
1442 | struct device *sg_class_member; | 1442 | struct device *sg_class_member; |
1443 | 1443 | ||
1444 | sg_class_member = device_create(sg_sysfs_class, cl_dev->parent, | 1444 | sg_class_member = device_create_drvdata(sg_sysfs_class, |
1445 | MKDEV(SCSI_GENERIC_MAJOR, | 1445 | cl_dev->parent, |
1446 | sdp->index), | 1446 | MKDEV(SCSI_GENERIC_MAJOR, |
1447 | "%s", disk->disk_name); | 1447 | sdp->index), |
1448 | sdp, | ||
1449 | "%s", disk->disk_name); | ||
1448 | if (IS_ERR(sg_class_member)) { | 1450 | if (IS_ERR(sg_class_member)) { |
1449 | printk(KERN_ERR "sg_add: " | 1451 | printk(KERN_ERR "sg_add: " |
1450 | "device_create failed\n"); | 1452 | "device_create failed\n"); |
1451 | error = PTR_ERR(sg_class_member); | 1453 | error = PTR_ERR(sg_class_member); |
1452 | goto cdev_add_err; | 1454 | goto cdev_add_err; |
1453 | } | 1455 | } |
1454 | dev_set_drvdata(sg_class_member, sdp); | ||
1455 | error = sysfs_create_link(&scsidp->sdev_gendev.kobj, | 1456 | error = sysfs_create_link(&scsidp->sdev_gendev.kobj, |
1456 | &sg_class_member->kobj, "generic"); | 1457 | &sg_class_member->kobj, "generic"); |
1457 | if (error) | 1458 | if (error) |
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index e8db66ad0bde..6e5a5bb31311 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -4424,17 +4424,19 @@ static int do_create_class_files(struct scsi_tape *STp, int dev_num, int mode) | |||
4424 | snprintf(name, 10, "%s%s%s", rew ? "n" : "", | 4424 | snprintf(name, 10, "%s%s%s", rew ? "n" : "", |
4425 | STp->disk->disk_name, st_formats[i]); | 4425 | STp->disk->disk_name, st_formats[i]); |
4426 | st_class_member = | 4426 | st_class_member = |
4427 | device_create(st_sysfs_class, &STp->device->sdev_gendev, | 4427 | device_create_drvdata(st_sysfs_class, |
4428 | MKDEV(SCSI_TAPE_MAJOR, | 4428 | &STp->device->sdev_gendev, |
4429 | TAPE_MINOR(dev_num, mode, rew)), | 4429 | MKDEV(SCSI_TAPE_MAJOR, |
4430 | "%s", name); | 4430 | TAPE_MINOR(dev_num, |
4431 | mode, rew)), | ||
4432 | &STp->modes[mode], | ||
4433 | "%s", name); | ||
4431 | if (IS_ERR(st_class_member)) { | 4434 | if (IS_ERR(st_class_member)) { |
4432 | printk(KERN_WARNING "st%d: device_create failed\n", | 4435 | printk(KERN_WARNING "st%d: device_create failed\n", |
4433 | dev_num); | 4436 | dev_num); |
4434 | error = PTR_ERR(st_class_member); | 4437 | error = PTR_ERR(st_class_member); |
4435 | goto out; | 4438 | goto out; |
4436 | } | 4439 | } |
4437 | dev_set_drvdata(st_class_member, &STp->modes[mode]); | ||
4438 | 4440 | ||
4439 | error = device_create_file(st_class_member, | 4441 | error = device_create_file(st_class_member, |
4440 | &dev_attr_defined); | 4442 | &dev_attr_defined); |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index a1ca9b7bf2d5..1400ea6a2491 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -43,6 +43,7 @@ | |||
43 | 43 | ||
44 | #include <asm/io.h> | 44 | #include <asm/io.h> |
45 | #include <asm/irq.h> | 45 | #include <asm/irq.h> |
46 | #include <asm/serial.h> | ||
46 | 47 | ||
47 | #include "8250.h" | 48 | #include "8250.h" |
48 | 49 | ||
@@ -92,8 +93,6 @@ static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS; | |||
92 | */ | 93 | */ |
93 | #define CONFIG_HUB6 1 | 94 | #define CONFIG_HUB6 1 |
94 | 95 | ||
95 | #include <asm/serial.h> | ||
96 | |||
97 | /* | 96 | /* |
98 | * SERIAL_PORT_DFNS tells us about built-in ports that have no | 97 | * SERIAL_PORT_DFNS tells us about built-in ports that have no |
99 | * standard enumeration mechanism. Platforms that can find all | 98 | * standard enumeration mechanism. Platforms that can find all |
@@ -1548,6 +1547,8 @@ static int serial_link_irq_chain(struct uart_8250_port *up) | |||
1548 | i->head = &up->list; | 1547 | i->head = &up->list; |
1549 | spin_unlock_irq(&i->lock); | 1548 | spin_unlock_irq(&i->lock); |
1550 | 1549 | ||
1550 | irq_flags |= SERIAL_EXTRA_IRQ_FLAGS; | ||
1551 | |||
1551 | ret = request_irq(up->port.irq, serial8250_interrupt, | 1552 | ret = request_irq(up->port.irq, serial8250_interrupt, |
1552 | irq_flags, "serial", i); | 1553 | irq_flags, "serial", i); |
1553 | if (ret < 0) | 1554 | if (ret < 0) |
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h index 91bd28f2bb47..a10a40cc0d9e 100644 --- a/drivers/serial/8250.h +++ b/drivers/serial/8250.h | |||
@@ -78,3 +78,8 @@ struct serial8250_config { | |||
78 | #else | 78 | #else |
79 | #define ALPHA_KLUDGE_MCR 0 | 79 | #define ALPHA_KLUDGE_MCR 0 |
80 | #endif | 80 | #endif |
81 | |||
82 | #ifndef SERIAL_EXTRA_IRQ_FLAGS | ||
83 | #define SERIAL_EXTRA_IRQ_FLAGS 0 | ||
84 | #endif | ||
85 | |||
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 62e6eb136a3c..9bc42763623c 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -1361,7 +1361,7 @@ config SERIAL_SC26XX_CONSOLE | |||
1361 | 1361 | ||
1362 | config SERIAL_BFIN_SPORT | 1362 | config SERIAL_BFIN_SPORT |
1363 | tristate "Blackfin SPORT emulate UART (EXPERIMENTAL)" | 1363 | tristate "Blackfin SPORT emulate UART (EXPERIMENTAL)" |
1364 | depends on BFIN && EXPERIMENTAL | 1364 | depends on BLACKFIN && EXPERIMENTAL |
1365 | select SERIAL_CORE | 1365 | select SERIAL_CORE |
1366 | help | 1366 | help |
1367 | Enble support SPORT emulate UART on Blackfin series. | 1367 | Enble support SPORT emulate UART on Blackfin series. |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 8fdafc27fce8..ce6ee92b3a1b 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -184,15 +184,15 @@ static void put_string(struct sci_port *sci_port, const char *buffer, int count) | |||
184 | int h, l; | 184 | int h, l; |
185 | 185 | ||
186 | c = *p++; | 186 | c = *p++; |
187 | h = highhex(c); | 187 | h = hex_asc_hi(c); |
188 | l = lowhex(c); | 188 | l = hex_asc_lo(c); |
189 | put_char(port, h); | 189 | put_char(port, h); |
190 | put_char(port, l); | 190 | put_char(port, l); |
191 | checksum += h + l; | 191 | checksum += h + l; |
192 | } | 192 | } |
193 | put_char(port, '#'); | 193 | put_char(port, '#'); |
194 | put_char(port, highhex(checksum)); | 194 | put_char(port, hex_asc_hi(checksum)); |
195 | put_char(port, lowhex(checksum)); | 195 | put_char(port, hex_asc_lo(checksum)); |
196 | } while (get_char(port) != '+'); | 196 | } while (get_char(port) != '+'); |
197 | } else | 197 | } else |
198 | #endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */ | 198 | #endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */ |
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index 145c0281495d..2847336742d7 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c | |||
@@ -499,7 +499,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig | |||
499 | } else | 499 | } else |
500 | spin_lock(&port->lock); | 500 | spin_lock(&port->lock); |
501 | 501 | ||
502 | spin_lock_irqsave(&port->lock, flags); | ||
503 | for (i = 0; i < n; i++) { | 502 | for (i = 0; i < n; i++) { |
504 | if (*s == '\n') | 503 | if (*s == '\n') |
505 | sunhv_console_putchar(port, '\r'); | 504 | sunhv_console_putchar(port, '\r'); |
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index 55cc7b80422a..0a12e90ad416 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c | |||
@@ -649,15 +649,14 @@ int __uio_register_device(struct module *owner, | |||
649 | if (ret) | 649 | if (ret) |
650 | goto err_get_minor; | 650 | goto err_get_minor; |
651 | 651 | ||
652 | idev->dev = device_create(uio_class->class, parent, | 652 | idev->dev = device_create_drvdata(uio_class->class, parent, |
653 | MKDEV(uio_major, idev->minor), | 653 | MKDEV(uio_major, idev->minor), idev, |
654 | "uio%d", idev->minor); | 654 | "uio%d", idev->minor); |
655 | if (IS_ERR(idev->dev)) { | 655 | if (IS_ERR(idev->dev)) { |
656 | printk(KERN_ERR "UIO: device register failed\n"); | 656 | printk(KERN_ERR "UIO: device register failed\n"); |
657 | ret = PTR_ERR(idev->dev); | 657 | ret = PTR_ERR(idev->dev); |
658 | goto err_device_create; | 658 | goto err_device_create; |
659 | } | 659 | } |
660 | dev_set_drvdata(idev->dev, idev); | ||
661 | 660 | ||
662 | ret = uio_dev_add_attributes(idev); | 661 | ret = uio_dev_add_attributes(idev); |
663 | if (ret) | 662 | if (ret) |
diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig index 3a9102d2591b..66f17ed88cb5 100644 --- a/drivers/usb/class/Kconfig +++ b/drivers/usb/class/Kconfig | |||
@@ -29,3 +29,14 @@ config USB_PRINTER | |||
29 | To compile this driver as a module, choose M here: the | 29 | To compile this driver as a module, choose M here: the |
30 | module will be called usblp. | 30 | module will be called usblp. |
31 | 31 | ||
32 | config USB_WDM | ||
33 | tristate "USB Wireless Device Management support" | ||
34 | depends on USB | ||
35 | ---help--- | ||
36 | This driver supports the WMC Device Management functionality | ||
37 | of cell phones compliant to the CDC WMC specification. You can use | ||
38 | AT commands over this device. | ||
39 | |||
40 | To compile this driver as a module, choose M here: the | ||
41 | module will be called cdc-wdm. | ||
42 | |||
diff --git a/drivers/usb/class/Makefile b/drivers/usb/class/Makefile index cc391e6c2af8..535d59a30600 100644 --- a/drivers/usb/class/Makefile +++ b/drivers/usb/class/Makefile | |||
@@ -5,3 +5,4 @@ | |||
5 | 5 | ||
6 | obj-$(CONFIG_USB_ACM) += cdc-acm.o | 6 | obj-$(CONFIG_USB_ACM) += cdc-acm.o |
7 | obj-$(CONFIG_USB_PRINTER) += usblp.o | 7 | obj-$(CONFIG_USB_PRINTER) += usblp.o |
8 | obj-$(CONFIG_USB_WDM) += cdc-wdm.o | ||
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c new file mode 100644 index 000000000000..107666d4e2ec --- /dev/null +++ b/drivers/usb/class/cdc-wdm.c | |||
@@ -0,0 +1,740 @@ | |||
1 | /* | ||
2 | * cdc-wdm.c | ||
3 | * | ||
4 | * This driver supports USB CDC WCM Device Management. | ||
5 | * | ||
6 | * Copyright (c) 2007-2008 Oliver Neukum | ||
7 | * | ||
8 | * Some code taken from cdc-acm.c | ||
9 | * | ||
10 | * Released under the GPLv2. | ||
11 | * | ||
12 | * Many thanks to Carl Nordbeck | ||
13 | */ | ||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/errno.h> | ||
16 | #include <linux/slab.h> | ||
17 | #include <linux/module.h> | ||
18 | #include <linux/smp_lock.h> | ||
19 | #include <linux/mutex.h> | ||
20 | #include <linux/uaccess.h> | ||
21 | #include <linux/bitops.h> | ||
22 | #include <linux/poll.h> | ||
23 | #include <linux/usb.h> | ||
24 | #include <linux/usb/cdc.h> | ||
25 | #include <asm/byteorder.h> | ||
26 | #include <asm/unaligned.h> | ||
27 | |||
28 | /* | ||
29 | * Version Information | ||
30 | */ | ||
31 | #define DRIVER_VERSION "v0.02" | ||
32 | #define DRIVER_AUTHOR "Oliver Neukum" | ||
33 | |||
34 | static struct usb_device_id wdm_ids[] = { | ||
35 | { | ||
36 | .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS | | ||
37 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
38 | .bInterfaceClass = USB_CLASS_COMM, | ||
39 | .bInterfaceSubClass = USB_CDC_SUBCLASS_DMM | ||
40 | }, | ||
41 | { } | ||
42 | }; | ||
43 | |||
44 | #define WDM_MINOR_BASE 176 | ||
45 | |||
46 | |||
47 | #define WDM_IN_USE 1 | ||
48 | #define WDM_DISCONNECTING 2 | ||
49 | #define WDM_RESULT 3 | ||
50 | #define WDM_READ 4 | ||
51 | #define WDM_INT_STALL 5 | ||
52 | #define WDM_POLL_RUNNING 6 | ||
53 | |||
54 | |||
55 | #define WDM_MAX 16 | ||
56 | |||
57 | |||
58 | static DEFINE_MUTEX(wdm_mutex); | ||
59 | |||
60 | /* --- method tables --- */ | ||
61 | |||
62 | struct wdm_device { | ||
63 | u8 *inbuf; /* buffer for response */ | ||
64 | u8 *outbuf; /* buffer for command */ | ||
65 | u8 *sbuf; /* buffer for status */ | ||
66 | u8 *ubuf; /* buffer for copy to user space */ | ||
67 | |||
68 | struct urb *command; | ||
69 | struct urb *response; | ||
70 | struct urb *validity; | ||
71 | struct usb_interface *intf; | ||
72 | struct usb_ctrlrequest *orq; | ||
73 | struct usb_ctrlrequest *irq; | ||
74 | spinlock_t iuspin; | ||
75 | |||
76 | unsigned long flags; | ||
77 | u16 bufsize; | ||
78 | u16 wMaxCommand; | ||
79 | u16 wMaxPacketSize; | ||
80 | u16 bMaxPacketSize0; | ||
81 | __le16 inum; | ||
82 | int reslength; | ||
83 | int length; | ||
84 | int read; | ||
85 | int count; | ||
86 | dma_addr_t shandle; | ||
87 | dma_addr_t ihandle; | ||
88 | struct mutex wlock; | ||
89 | struct mutex rlock; | ||
90 | wait_queue_head_t wait; | ||
91 | struct work_struct rxwork; | ||
92 | int werr; | ||
93 | int rerr; | ||
94 | }; | ||
95 | |||
96 | static struct usb_driver wdm_driver; | ||
97 | |||
98 | /* --- callbacks --- */ | ||
99 | static void wdm_out_callback(struct urb *urb) | ||
100 | { | ||
101 | struct wdm_device *desc; | ||
102 | desc = urb->context; | ||
103 | spin_lock(&desc->iuspin); | ||
104 | desc->werr = urb->status; | ||
105 | spin_unlock(&desc->iuspin); | ||
106 | clear_bit(WDM_IN_USE, &desc->flags); | ||
107 | kfree(desc->outbuf); | ||
108 | wake_up(&desc->wait); | ||
109 | } | ||
110 | |||
111 | static void wdm_in_callback(struct urb *urb) | ||
112 | { | ||
113 | struct wdm_device *desc = urb->context; | ||
114 | int status = urb->status; | ||
115 | |||
116 | spin_lock(&desc->iuspin); | ||
117 | |||
118 | if (status) { | ||
119 | switch (status) { | ||
120 | case -ENOENT: | ||
121 | dev_dbg(&desc->intf->dev, | ||
122 | "nonzero urb status received: -ENOENT"); | ||
123 | break; | ||
124 | case -ECONNRESET: | ||
125 | dev_dbg(&desc->intf->dev, | ||
126 | "nonzero urb status received: -ECONNRESET"); | ||
127 | break; | ||
128 | case -ESHUTDOWN: | ||
129 | dev_dbg(&desc->intf->dev, | ||
130 | "nonzero urb status received: -ESHUTDOWN"); | ||
131 | break; | ||
132 | case -EPIPE: | ||
133 | err("nonzero urb status received: -EPIPE"); | ||
134 | break; | ||
135 | default: | ||
136 | err("Unexpected error %d", status); | ||
137 | break; | ||
138 | } | ||
139 | } | ||
140 | |||
141 | desc->rerr = status; | ||
142 | desc->reslength = urb->actual_length; | ||
143 | memmove(desc->ubuf + desc->length, desc->inbuf, desc->reslength); | ||
144 | desc->length += desc->reslength; | ||
145 | wake_up(&desc->wait); | ||
146 | |||
147 | set_bit(WDM_READ, &desc->flags); | ||
148 | spin_unlock(&desc->iuspin); | ||
149 | } | ||
150 | |||
151 | static void wdm_int_callback(struct urb *urb) | ||
152 | { | ||
153 | int rv = 0; | ||
154 | int status = urb->status; | ||
155 | struct wdm_device *desc; | ||
156 | struct usb_ctrlrequest *req; | ||
157 | struct usb_cdc_notification *dr; | ||
158 | |||
159 | desc = urb->context; | ||
160 | req = desc->irq; | ||
161 | dr = (struct usb_cdc_notification *)desc->sbuf; | ||
162 | |||
163 | if (status) { | ||
164 | switch (status) { | ||
165 | case -ESHUTDOWN: | ||
166 | case -ENOENT: | ||
167 | case -ECONNRESET: | ||
168 | return; /* unplug */ | ||
169 | case -EPIPE: | ||
170 | set_bit(WDM_INT_STALL, &desc->flags); | ||
171 | err("Stall on int endpoint"); | ||
172 | goto sw; /* halt is cleared in work */ | ||
173 | default: | ||
174 | err("nonzero urb status received: %d", status); | ||
175 | break; | ||
176 | } | ||
177 | } | ||
178 | |||
179 | if (urb->actual_length < sizeof(struct usb_cdc_notification)) { | ||
180 | err("wdm_int_callback - %d bytes", urb->actual_length); | ||
181 | goto exit; | ||
182 | } | ||
183 | |||
184 | switch (dr->bNotificationType) { | ||
185 | case USB_CDC_NOTIFY_RESPONSE_AVAILABLE: | ||
186 | dev_dbg(&desc->intf->dev, | ||
187 | "NOTIFY_RESPONSE_AVAILABLE received: index %d len %d", | ||
188 | dr->wIndex, dr->wLength); | ||
189 | break; | ||
190 | |||
191 | case USB_CDC_NOTIFY_NETWORK_CONNECTION: | ||
192 | |||
193 | dev_dbg(&desc->intf->dev, | ||
194 | "NOTIFY_NETWORK_CONNECTION %s network", | ||
195 | dr->wValue ? "connected to" : "disconnected from"); | ||
196 | goto exit; | ||
197 | default: | ||
198 | clear_bit(WDM_POLL_RUNNING, &desc->flags); | ||
199 | err("unknown notification %d received: index %d len %d", | ||
200 | dr->bNotificationType, dr->wIndex, dr->wLength); | ||
201 | goto exit; | ||
202 | } | ||
203 | |||
204 | req->bRequestType = (USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE); | ||
205 | req->bRequest = USB_CDC_GET_ENCAPSULATED_RESPONSE; | ||
206 | req->wValue = 0; | ||
207 | req->wIndex = desc->inum; | ||
208 | req->wLength = cpu_to_le16(desc->bMaxPacketSize0); | ||
209 | |||
210 | usb_fill_control_urb( | ||
211 | desc->response, | ||
212 | interface_to_usbdev(desc->intf), | ||
213 | /* using common endpoint 0 */ | ||
214 | usb_rcvctrlpipe(interface_to_usbdev(desc->intf), 0), | ||
215 | (unsigned char *)req, | ||
216 | desc->inbuf, | ||
217 | desc->bMaxPacketSize0, | ||
218 | wdm_in_callback, | ||
219 | desc | ||
220 | ); | ||
221 | desc->response->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
222 | spin_lock(&desc->iuspin); | ||
223 | clear_bit(WDM_READ, &desc->flags); | ||
224 | if (!test_bit(WDM_DISCONNECTING, &desc->flags)) { | ||
225 | rv = usb_submit_urb(desc->response, GFP_ATOMIC); | ||
226 | dev_dbg(&desc->intf->dev, "%s: usb_submit_urb %d", | ||
227 | __func__, rv); | ||
228 | } | ||
229 | spin_unlock(&desc->iuspin); | ||
230 | if (rv < 0) { | ||
231 | if (rv == -EPERM) | ||
232 | return; | ||
233 | if (rv == -ENOMEM) { | ||
234 | sw: | ||
235 | rv = schedule_work(&desc->rxwork); | ||
236 | if (rv) | ||
237 | err("Cannot schedule work"); | ||
238 | } | ||
239 | } | ||
240 | exit: | ||
241 | rv = usb_submit_urb(urb, GFP_ATOMIC); | ||
242 | if (rv) | ||
243 | err("%s - usb_submit_urb failed with result %d", | ||
244 | __func__, rv); | ||
245 | |||
246 | } | ||
247 | |||
248 | static void kill_urbs(struct wdm_device *desc) | ||
249 | { | ||
250 | usb_kill_urb(desc->command); | ||
251 | usb_kill_urb(desc->validity); | ||
252 | usb_kill_urb(desc->response); | ||
253 | } | ||
254 | |||
255 | static void free_urbs(struct wdm_device *desc) | ||
256 | { | ||
257 | usb_free_urb(desc->validity); | ||
258 | usb_free_urb(desc->response); | ||
259 | usb_free_urb(desc->command); | ||
260 | } | ||
261 | |||
262 | static void cleanup(struct wdm_device *desc) | ||
263 | { | ||
264 | usb_buffer_free(interface_to_usbdev(desc->intf), | ||
265 | desc->wMaxPacketSize, | ||
266 | desc->sbuf, | ||
267 | desc->validity->transfer_dma); | ||
268 | usb_buffer_free(interface_to_usbdev(desc->intf), | ||
269 | desc->wMaxPacketSize, | ||
270 | desc->inbuf, | ||
271 | desc->response->transfer_dma); | ||
272 | kfree(desc->orq); | ||
273 | kfree(desc->irq); | ||
274 | kfree(desc->ubuf); | ||
275 | free_urbs(desc); | ||
276 | kfree(desc); | ||
277 | } | ||
278 | |||
279 | static ssize_t wdm_write | ||
280 | (struct file *file, const char __user *buffer, size_t count, loff_t *ppos) | ||
281 | { | ||
282 | u8 *buf; | ||
283 | int rv = -EMSGSIZE, r, we; | ||
284 | struct wdm_device *desc = file->private_data; | ||
285 | struct usb_ctrlrequest *req; | ||
286 | |||
287 | if (count > desc->wMaxCommand) | ||
288 | count = desc->wMaxCommand; | ||
289 | |||
290 | spin_lock_irq(&desc->iuspin); | ||
291 | we = desc->werr; | ||
292 | desc->werr = 0; | ||
293 | spin_unlock_irq(&desc->iuspin); | ||
294 | if (we < 0) | ||
295 | return -EIO; | ||
296 | |||
297 | r = mutex_lock_interruptible(&desc->wlock); /* concurrent writes */ | ||
298 | rv = -ERESTARTSYS; | ||
299 | if (r) | ||
300 | goto outnl; | ||
301 | |||
302 | r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE, | ||
303 | &desc->flags)); | ||
304 | if (r < 0) | ||
305 | goto out; | ||
306 | |||
307 | if (test_bit(WDM_DISCONNECTING, &desc->flags)) { | ||
308 | rv = -ENODEV; | ||
309 | goto out; | ||
310 | } | ||
311 | |||
312 | desc->outbuf = buf = kmalloc(count, GFP_KERNEL); | ||
313 | if (!buf) { | ||
314 | rv = -ENOMEM; | ||
315 | goto out; | ||
316 | } | ||
317 | |||
318 | r = copy_from_user(buf, buffer, count); | ||
319 | if (r > 0) { | ||
320 | kfree(buf); | ||
321 | rv = -EFAULT; | ||
322 | goto out; | ||
323 | } | ||
324 | |||
325 | req = desc->orq; | ||
326 | usb_fill_control_urb( | ||
327 | desc->command, | ||
328 | interface_to_usbdev(desc->intf), | ||
329 | /* using common endpoint 0 */ | ||
330 | usb_sndctrlpipe(interface_to_usbdev(desc->intf), 0), | ||
331 | (unsigned char *)req, | ||
332 | buf, | ||
333 | count, | ||
334 | wdm_out_callback, | ||
335 | desc | ||
336 | ); | ||
337 | |||
338 | req->bRequestType = (USB_DIR_OUT | USB_TYPE_CLASS | | ||
339 | USB_RECIP_INTERFACE); | ||
340 | req->bRequest = USB_CDC_SEND_ENCAPSULATED_COMMAND; | ||
341 | req->wValue = 0; | ||
342 | req->wIndex = desc->inum; | ||
343 | req->wLength = cpu_to_le16(count); | ||
344 | set_bit(WDM_IN_USE, &desc->flags); | ||
345 | |||
346 | rv = usb_submit_urb(desc->command, GFP_KERNEL); | ||
347 | if (rv < 0) { | ||
348 | kfree(buf); | ||
349 | clear_bit(WDM_IN_USE, &desc->flags); | ||
350 | } else { | ||
351 | dev_dbg(&desc->intf->dev, "Tx URB has been submitted index=%d", | ||
352 | req->wIndex); | ||
353 | } | ||
354 | out: | ||
355 | mutex_unlock(&desc->wlock); | ||
356 | outnl: | ||
357 | return rv < 0 ? rv : count; | ||
358 | } | ||
359 | |||
360 | static ssize_t wdm_read | ||
361 | (struct file *file, char __user *buffer, size_t count, loff_t *ppos) | ||
362 | { | ||
363 | int rv, cntr; | ||
364 | int i = 0; | ||
365 | struct wdm_device *desc = file->private_data; | ||
366 | |||
367 | |||
368 | rv = mutex_lock_interruptible(&desc->rlock); /*concurrent reads */ | ||
369 | if (rv < 0) | ||
370 | return -ERESTARTSYS; | ||
371 | |||
372 | if (desc->length == 0) { | ||
373 | desc->read = 0; | ||
374 | retry: | ||
375 | i++; | ||
376 | rv = wait_event_interruptible(desc->wait, | ||
377 | test_bit(WDM_READ, &desc->flags)); | ||
378 | |||
379 | if (rv < 0) { | ||
380 | rv = -ERESTARTSYS; | ||
381 | goto err; | ||
382 | } | ||
383 | |||
384 | spin_lock_irq(&desc->iuspin); | ||
385 | |||
386 | if (desc->rerr) { /* read completed, error happened */ | ||
387 | int t = desc->rerr; | ||
388 | desc->rerr = 0; | ||
389 | spin_unlock_irq(&desc->iuspin); | ||
390 | err("reading had resulted in %d", t); | ||
391 | rv = -EIO; | ||
392 | goto err; | ||
393 | } | ||
394 | /* | ||
395 | * recheck whether we've lost the race | ||
396 | * against the completion handler | ||
397 | */ | ||
398 | if (!test_bit(WDM_READ, &desc->flags)) { /* lost race */ | ||
399 | spin_unlock_irq(&desc->iuspin); | ||
400 | goto retry; | ||
401 | } | ||
402 | if (!desc->reslength) { /* zero length read */ | ||
403 | spin_unlock_irq(&desc->iuspin); | ||
404 | goto retry; | ||
405 | } | ||
406 | clear_bit(WDM_READ, &desc->flags); | ||
407 | spin_unlock_irq(&desc->iuspin); | ||
408 | } | ||
409 | |||
410 | cntr = count > desc->length ? desc->length : count; | ||
411 | rv = copy_to_user(buffer, desc->ubuf, cntr); | ||
412 | if (rv > 0) { | ||
413 | rv = -EFAULT; | ||
414 | goto err; | ||
415 | } | ||
416 | |||
417 | for (i = 0; i < desc->length - cntr; i++) | ||
418 | desc->ubuf[i] = desc->ubuf[i + cntr]; | ||
419 | |||
420 | desc->length -= cntr; | ||
421 | rv = cntr; | ||
422 | |||
423 | err: | ||
424 | mutex_unlock(&desc->rlock); | ||
425 | if (rv < 0) | ||
426 | err("wdm_read: exit error"); | ||
427 | return rv; | ||
428 | } | ||
429 | |||
430 | static int wdm_flush(struct file *file, fl_owner_t id) | ||
431 | { | ||
432 | struct wdm_device *desc = file->private_data; | ||
433 | |||
434 | wait_event(desc->wait, !test_bit(WDM_IN_USE, &desc->flags)); | ||
435 | if (desc->werr < 0) | ||
436 | err("Error in flush path: %d", desc->werr); | ||
437 | |||
438 | return desc->werr; | ||
439 | } | ||
440 | |||
441 | static unsigned int wdm_poll(struct file *file, struct poll_table_struct *wait) | ||
442 | { | ||
443 | struct wdm_device *desc = file->private_data; | ||
444 | unsigned long flags; | ||
445 | unsigned int mask = 0; | ||
446 | |||
447 | spin_lock_irqsave(&desc->iuspin, flags); | ||
448 | if (test_bit(WDM_DISCONNECTING, &desc->flags)) { | ||
449 | mask = POLLERR; | ||
450 | spin_unlock_irqrestore(&desc->iuspin, flags); | ||
451 | goto desc_out; | ||
452 | } | ||
453 | if (test_bit(WDM_READ, &desc->flags)) | ||
454 | mask = POLLIN | POLLRDNORM; | ||
455 | if (desc->rerr || desc->werr) | ||
456 | mask |= POLLERR; | ||
457 | if (!test_bit(WDM_IN_USE, &desc->flags)) | ||
458 | mask |= POLLOUT | POLLWRNORM; | ||
459 | spin_unlock_irqrestore(&desc->iuspin, flags); | ||
460 | |||
461 | poll_wait(file, &desc->wait, wait); | ||
462 | |||
463 | desc_out: | ||
464 | return mask; | ||
465 | } | ||
466 | |||
467 | static int wdm_open(struct inode *inode, struct file *file) | ||
468 | { | ||
469 | int minor = iminor(inode); | ||
470 | int rv = -ENODEV; | ||
471 | struct usb_interface *intf; | ||
472 | struct wdm_device *desc; | ||
473 | |||
474 | mutex_lock(&wdm_mutex); | ||
475 | intf = usb_find_interface(&wdm_driver, minor); | ||
476 | if (!intf) | ||
477 | goto out; | ||
478 | |||
479 | desc = usb_get_intfdata(intf); | ||
480 | if (test_bit(WDM_DISCONNECTING, &desc->flags)) | ||
481 | goto out; | ||
482 | |||
483 | desc->count++; | ||
484 | file->private_data = desc; | ||
485 | |||
486 | rv = usb_submit_urb(desc->validity, GFP_KERNEL); | ||
487 | |||
488 | if (rv < 0) { | ||
489 | desc->count--; | ||
490 | err("Error submitting int urb - %d", rv); | ||
491 | goto out; | ||
492 | } | ||
493 | rv = 0; | ||
494 | |||
495 | out: | ||
496 | mutex_unlock(&wdm_mutex); | ||
497 | return rv; | ||
498 | } | ||
499 | |||
500 | static int wdm_release(struct inode *inode, struct file *file) | ||
501 | { | ||
502 | struct wdm_device *desc = file->private_data; | ||
503 | |||
504 | mutex_lock(&wdm_mutex); | ||
505 | desc->count--; | ||
506 | if (!desc->count) { | ||
507 | dev_dbg(&desc->intf->dev, "wdm_release: cleanup"); | ||
508 | kill_urbs(desc); | ||
509 | } | ||
510 | mutex_unlock(&wdm_mutex); | ||
511 | return 0; | ||
512 | } | ||
513 | |||
514 | static const struct file_operations wdm_fops = { | ||
515 | .owner = THIS_MODULE, | ||
516 | .read = wdm_read, | ||
517 | .write = wdm_write, | ||
518 | .open = wdm_open, | ||
519 | .flush = wdm_flush, | ||
520 | .release = wdm_release, | ||
521 | .poll = wdm_poll | ||
522 | }; | ||
523 | |||
524 | static struct usb_class_driver wdm_class = { | ||
525 | .name = "cdc-wdm%d", | ||
526 | .fops = &wdm_fops, | ||
527 | .minor_base = WDM_MINOR_BASE, | ||
528 | }; | ||
529 | |||
530 | /* --- error handling --- */ | ||
531 | static void wdm_rxwork(struct work_struct *work) | ||
532 | { | ||
533 | struct wdm_device *desc = container_of(work, struct wdm_device, rxwork); | ||
534 | unsigned long flags; | ||
535 | int rv; | ||
536 | |||
537 | spin_lock_irqsave(&desc->iuspin, flags); | ||
538 | if (test_bit(WDM_DISCONNECTING, &desc->flags)) { | ||
539 | spin_unlock_irqrestore(&desc->iuspin, flags); | ||
540 | } else { | ||
541 | spin_unlock_irqrestore(&desc->iuspin, flags); | ||
542 | rv = usb_submit_urb(desc->response, GFP_KERNEL); | ||
543 | if (rv < 0 && rv != -EPERM) { | ||
544 | spin_lock_irqsave(&desc->iuspin, flags); | ||
545 | if (!test_bit(WDM_DISCONNECTING, &desc->flags)) | ||
546 | schedule_work(&desc->rxwork); | ||
547 | spin_unlock_irqrestore(&desc->iuspin, flags); | ||
548 | } | ||
549 | } | ||
550 | } | ||
551 | |||
552 | /* --- hotplug --- */ | ||
553 | |||
554 | static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) | ||
555 | { | ||
556 | int rv = -EINVAL; | ||
557 | struct usb_device *udev = interface_to_usbdev(intf); | ||
558 | struct wdm_device *desc; | ||
559 | struct usb_host_interface *iface; | ||
560 | struct usb_endpoint_descriptor *ep; | ||
561 | struct usb_cdc_dmm_desc *dmhd; | ||
562 | u8 *buffer = intf->altsetting->extra; | ||
563 | int buflen = intf->altsetting->extralen; | ||
564 | u16 maxcom = 0; | ||
565 | |||
566 | if (!buffer) | ||
567 | goto out; | ||
568 | |||
569 | while (buflen > 0) { | ||
570 | if (buffer [1] != USB_DT_CS_INTERFACE) { | ||
571 | err("skipping garbage"); | ||
572 | goto next_desc; | ||
573 | } | ||
574 | |||
575 | switch (buffer [2]) { | ||
576 | case USB_CDC_HEADER_TYPE: | ||
577 | break; | ||
578 | case USB_CDC_DMM_TYPE: | ||
579 | dmhd = (struct usb_cdc_dmm_desc *)buffer; | ||
580 | maxcom = le16_to_cpu(dmhd->wMaxCommand); | ||
581 | dev_dbg(&intf->dev, | ||
582 | "Finding maximum buffer length: %d", maxcom); | ||
583 | break; | ||
584 | default: | ||
585 | err("Ignoring extra header, type %d, length %d", | ||
586 | buffer[2], buffer[0]); | ||
587 | break; | ||
588 | } | ||
589 | next_desc: | ||
590 | buflen -= buffer[0]; | ||
591 | buffer += buffer[0]; | ||
592 | } | ||
593 | |||
594 | rv = -ENOMEM; | ||
595 | desc = kzalloc(sizeof(struct wdm_device), GFP_KERNEL); | ||
596 | if (!desc) | ||
597 | goto out; | ||
598 | mutex_init(&desc->wlock); | ||
599 | mutex_init(&desc->rlock); | ||
600 | spin_lock_init(&desc->iuspin); | ||
601 | init_waitqueue_head(&desc->wait); | ||
602 | desc->wMaxCommand = maxcom; | ||
603 | desc->inum = cpu_to_le16((u16)intf->cur_altsetting->desc.bInterfaceNumber); | ||
604 | desc->intf = intf; | ||
605 | INIT_WORK(&desc->rxwork, wdm_rxwork); | ||
606 | |||
607 | iface = &intf->altsetting[0]; | ||
608 | ep = &iface->endpoint[0].desc; | ||
609 | if (!usb_endpoint_is_int_in(ep)) { | ||
610 | rv = -EINVAL; | ||
611 | goto err; | ||
612 | } | ||
613 | |||
614 | desc->wMaxPacketSize = ep->wMaxPacketSize; | ||
615 | desc->bMaxPacketSize0 = cpu_to_le16(udev->descriptor.bMaxPacketSize0); | ||
616 | |||
617 | desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); | ||
618 | if (!desc->orq) | ||
619 | goto err; | ||
620 | desc->irq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); | ||
621 | if (!desc->irq) | ||
622 | goto err; | ||
623 | |||
624 | desc->validity = usb_alloc_urb(0, GFP_KERNEL); | ||
625 | if (!desc->validity) | ||
626 | goto err; | ||
627 | |||
628 | desc->response = usb_alloc_urb(0, GFP_KERNEL); | ||
629 | if (!desc->response) | ||
630 | goto err; | ||
631 | |||
632 | desc->command = usb_alloc_urb(0, GFP_KERNEL); | ||
633 | if (!desc->command) | ||
634 | goto err; | ||
635 | |||
636 | desc->ubuf = kmalloc(desc->wMaxCommand, GFP_KERNEL); | ||
637 | if (!desc->ubuf) | ||
638 | goto err; | ||
639 | |||
640 | desc->sbuf = usb_buffer_alloc(interface_to_usbdev(intf), | ||
641 | desc->wMaxPacketSize, | ||
642 | GFP_KERNEL, | ||
643 | &desc->validity->transfer_dma); | ||
644 | if (!desc->sbuf) | ||
645 | goto err; | ||
646 | |||
647 | desc->inbuf = usb_buffer_alloc(interface_to_usbdev(intf), | ||
648 | desc->bMaxPacketSize0, | ||
649 | GFP_KERNEL, | ||
650 | &desc->response->transfer_dma); | ||
651 | if (!desc->inbuf) | ||
652 | goto err2; | ||
653 | |||
654 | usb_fill_int_urb( | ||
655 | desc->validity, | ||
656 | interface_to_usbdev(intf), | ||
657 | usb_rcvintpipe(interface_to_usbdev(intf), ep->bEndpointAddress), | ||
658 | desc->sbuf, | ||
659 | desc->wMaxPacketSize, | ||
660 | wdm_int_callback, | ||
661 | desc, | ||
662 | ep->bInterval | ||
663 | ); | ||
664 | desc->validity->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
665 | |||
666 | usb_set_intfdata(intf, desc); | ||
667 | rv = usb_register_dev(intf, &wdm_class); | ||
668 | dev_info(&intf->dev, "cdc-wdm%d: USB WDM device\n", | ||
669 | intf->minor - WDM_MINOR_BASE); | ||
670 | if (rv < 0) | ||
671 | goto err; | ||
672 | out: | ||
673 | return rv; | ||
674 | err2: | ||
675 | usb_buffer_free(interface_to_usbdev(desc->intf), | ||
676 | desc->wMaxPacketSize, | ||
677 | desc->sbuf, | ||
678 | desc->validity->transfer_dma); | ||
679 | err: | ||
680 | free_urbs(desc); | ||
681 | kfree(desc->ubuf); | ||
682 | kfree(desc->orq); | ||
683 | kfree(desc->irq); | ||
684 | kfree(desc); | ||
685 | return rv; | ||
686 | } | ||
687 | |||
688 | static void wdm_disconnect(struct usb_interface *intf) | ||
689 | { | ||
690 | struct wdm_device *desc; | ||
691 | unsigned long flags; | ||
692 | |||
693 | usb_deregister_dev(intf, &wdm_class); | ||
694 | mutex_lock(&wdm_mutex); | ||
695 | desc = usb_get_intfdata(intf); | ||
696 | |||
697 | /* the spinlock makes sure no new urbs are generated in the callbacks */ | ||
698 | spin_lock_irqsave(&desc->iuspin, flags); | ||
699 | set_bit(WDM_DISCONNECTING, &desc->flags); | ||
700 | set_bit(WDM_READ, &desc->flags); | ||
701 | clear_bit(WDM_IN_USE, &desc->flags); | ||
702 | spin_unlock_irqrestore(&desc->iuspin, flags); | ||
703 | cancel_work_sync(&desc->rxwork); | ||
704 | kill_urbs(desc); | ||
705 | wake_up_all(&desc->wait); | ||
706 | if (!desc->count) | ||
707 | cleanup(desc); | ||
708 | mutex_unlock(&wdm_mutex); | ||
709 | } | ||
710 | |||
711 | static struct usb_driver wdm_driver = { | ||
712 | .name = "cdc_wdm", | ||
713 | .probe = wdm_probe, | ||
714 | .disconnect = wdm_disconnect, | ||
715 | .id_table = wdm_ids, | ||
716 | }; | ||
717 | |||
718 | /* --- low level module stuff --- */ | ||
719 | |||
720 | static int __init wdm_init(void) | ||
721 | { | ||
722 | int rv; | ||
723 | |||
724 | rv = usb_register(&wdm_driver); | ||
725 | |||
726 | return rv; | ||
727 | } | ||
728 | |||
729 | static void __exit wdm_exit(void) | ||
730 | { | ||
731 | usb_deregister(&wdm_driver); | ||
732 | } | ||
733 | |||
734 | module_init(wdm_init); | ||
735 | module_exit(wdm_exit); | ||
736 | |||
737 | MODULE_AUTHOR(DRIVER_AUTHOR); | ||
738 | MODULE_DESCRIPTION("USB Abstract Control Model driver for " | ||
739 | "USB WCM Device Management"); | ||
740 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index bf10e9c4195e..09a53e7f3327 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -818,12 +818,12 @@ static int usb_register_bus(struct usb_bus *bus) | |||
818 | set_bit (busnum, busmap.busmap); | 818 | set_bit (busnum, busmap.busmap); |
819 | bus->busnum = busnum; | 819 | bus->busnum = busnum; |
820 | 820 | ||
821 | bus->dev = device_create(usb_host_class, bus->controller, MKDEV(0, 0), | 821 | bus->dev = device_create_drvdata(usb_host_class, bus->controller, |
822 | "usb_host%d", busnum); | 822 | MKDEV(0, 0), bus, |
823 | "usb_host%d", busnum); | ||
823 | result = PTR_ERR(bus->dev); | 824 | result = PTR_ERR(bus->dev); |
824 | if (IS_ERR(bus->dev)) | 825 | if (IS_ERR(bus->dev)) |
825 | goto error_create_class_dev; | 826 | goto error_create_class_dev; |
826 | dev_set_drvdata(bus->dev, bus); | ||
827 | 827 | ||
828 | /* Add it to the local list of buses */ | 828 | /* Add it to the local list of buses */ |
829 | list_add (&bus->bus_list, &usb_bus_list); | 829 | list_add (&bus->bus_list, &usb_bus_list); |
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 499b7a23f351..e02bfd4df3a6 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -1526,7 +1526,8 @@ static void udc_disable(struct pxa_udc *udc) | |||
1526 | 1526 | ||
1527 | ep0_idle(udc); | 1527 | ep0_idle(udc); |
1528 | udc->gadget.speed = USB_SPEED_UNKNOWN; | 1528 | udc->gadget.speed = USB_SPEED_UNKNOWN; |
1529 | udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT); | 1529 | if (udc->mach->udc_command) |
1530 | udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT); | ||
1530 | } | 1531 | } |
1531 | 1532 | ||
1532 | /** | 1533 | /** |
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index d187d0313742..3adfda813a7b 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
@@ -115,6 +115,8 @@ static int ehci_orion_setup(struct usb_hcd *hcd) | |||
115 | if (retval) | 115 | if (retval) |
116 | return retval; | 116 | return retval; |
117 | 117 | ||
118 | hcd->has_tt = 1; | ||
119 | |||
118 | ehci_reset(ehci); | 120 | ehci_reset(ehci); |
119 | ehci_port_power(ehci, 0); | 121 | ehci_port_power(ehci, 0); |
120 | 122 | ||
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c index 24230c638b8e..4cfa25b0f44e 100644 --- a/drivers/usb/misc/phidgetkit.c +++ b/drivers/usb/misc/phidgetkit.c | |||
@@ -595,14 +595,14 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic | |||
595 | } while(value); | 595 | } while(value); |
596 | kit->dev_no = bit; | 596 | kit->dev_no = bit; |
597 | 597 | ||
598 | kit->dev = device_create(phidget_class, &kit->udev->dev, 0, | 598 | kit->dev = device_create_drvdata(phidget_class, &kit->udev->dev, |
599 | "interfacekit%d", kit->dev_no); | 599 | MKDEV(0, 0), kit, |
600 | "interfacekit%d", kit->dev_no); | ||
600 | if (IS_ERR(kit->dev)) { | 601 | if (IS_ERR(kit->dev)) { |
601 | rc = PTR_ERR(kit->dev); | 602 | rc = PTR_ERR(kit->dev); |
602 | kit->dev = NULL; | 603 | kit->dev = NULL; |
603 | goto out; | 604 | goto out; |
604 | } | 605 | } |
605 | dev_set_drvdata(kit->dev, kit); | ||
606 | 606 | ||
607 | if (usb_submit_urb(kit->irq, GFP_KERNEL)) { | 607 | if (usb_submit_urb(kit->irq, GFP_KERNEL)) { |
608 | rc = -EIO; | 608 | rc = -EIO; |
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c index f0113c17cc5a..9b4696f21b22 100644 --- a/drivers/usb/misc/phidgetmotorcontrol.c +++ b/drivers/usb/misc/phidgetmotorcontrol.c | |||
@@ -365,16 +365,15 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic | |||
365 | } while(value); | 365 | } while(value); |
366 | mc->dev_no = bit; | 366 | mc->dev_no = bit; |
367 | 367 | ||
368 | mc->dev = device_create(phidget_class, &mc->udev->dev, 0, | 368 | mc->dev = device_create_drvdata(phidget_class, &mc->udev->dev, |
369 | "motorcontrol%d", mc->dev_no); | 369 | MKDEV(0, 0), mc, |
370 | "motorcontrol%d", mc->dev_no); | ||
370 | if (IS_ERR(mc->dev)) { | 371 | if (IS_ERR(mc->dev)) { |
371 | rc = PTR_ERR(mc->dev); | 372 | rc = PTR_ERR(mc->dev); |
372 | mc->dev = NULL; | 373 | mc->dev = NULL; |
373 | goto out; | 374 | goto out; |
374 | } | 375 | } |
375 | 376 | ||
376 | dev_set_drvdata(mc->dev, mc); | ||
377 | |||
378 | if (usb_submit_urb(mc->irq, GFP_KERNEL)) { | 377 | if (usb_submit_urb(mc->irq, GFP_KERNEL)) { |
379 | rc = -EIO; | 378 | rc = -EIO; |
380 | goto out; | 379 | goto out; |
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c index 7d590c09434a..1ca7ddb41d4d 100644 --- a/drivers/usb/misc/phidgetservo.c +++ b/drivers/usb/misc/phidgetservo.c | |||
@@ -275,14 +275,14 @@ servo_probe(struct usb_interface *interface, const struct usb_device_id *id) | |||
275 | } while (value); | 275 | } while (value); |
276 | dev->dev_no = bit; | 276 | dev->dev_no = bit; |
277 | 277 | ||
278 | dev->dev = device_create(phidget_class, &dev->udev->dev, 0, | 278 | dev->dev = device_create_drvdata(phidget_class, &dev->udev->dev, |
279 | "servo%d", dev->dev_no); | 279 | MKDEV(0, 0), dev, |
280 | "servo%d", dev->dev_no); | ||
280 | if (IS_ERR(dev->dev)) { | 281 | if (IS_ERR(dev->dev)) { |
281 | rc = PTR_ERR(dev->dev); | 282 | rc = PTR_ERR(dev->dev); |
282 | dev->dev = NULL; | 283 | dev->dev = NULL; |
283 | goto out; | 284 | goto out; |
284 | } | 285 | } |
285 | dev_set_drvdata(dev->dev, dev); | ||
286 | 286 | ||
287 | servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1; | 287 | servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1; |
288 | 288 | ||
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index ba28fdc9ccd2..1f7c86bd8297 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
@@ -28,6 +28,7 @@ static int debug; | |||
28 | 28 | ||
29 | static struct usb_device_id id_table [] = { | 29 | static struct usb_device_id id_table [] = { |
30 | { USB_DEVICE(0x4348, 0x5523) }, | 30 | { USB_DEVICE(0x4348, 0x5523) }, |
31 | { USB_DEVICE(0x1a86, 0x7523) }, | ||
31 | { }, | 32 | { }, |
32 | }; | 33 | }; |
33 | MODULE_DEVICE_TABLE(usb, id_table); | 34 | MODULE_DEVICE_TABLE(usb, id_table); |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 5b349ece7247..3cee6feac174 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -374,6 +374,7 @@ static struct usb_device_id id_table_combined [] = { | |||
374 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 374 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
375 | { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), | 375 | { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), |
376 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 376 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
377 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, | ||
377 | { }, /* Optional parameter entry */ | 378 | { }, /* Optional parameter entry */ |
378 | { } /* Terminating entry */ | 379 | { } /* Terminating entry */ |
379 | }; | 380 | }; |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 504edf8c3a3f..a72f2c81d664 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -592,6 +592,12 @@ | |||
592 | #define FIC_NEO1973_DEBUG_PID 0x5118 | 592 | #define FIC_NEO1973_DEBUG_PID 0x5118 |
593 | 593 | ||
594 | /* | 594 | /* |
595 | * RATOC REX-USB60F | ||
596 | */ | ||
597 | #define RATOC_VENDOR_ID 0x0584 | ||
598 | #define RATOC_PRODUCT_ID_USB60F 0xb020 | ||
599 | |||
600 | /* | ||
595 | * BmRequestType: 1100 0000b | 601 | * BmRequestType: 1100 0000b |
596 | * bRequest: FTDI_E2_READ | 602 | * bRequest: FTDI_E2_READ |
597 | * wValue: 0 | 603 | * wValue: 0 |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index e7e016e60333..6cecd2c12b1d 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -183,6 +183,7 @@ static int option_send_setup(struct usb_serial_port *port); | |||
183 | #define AXESSTEL_PRODUCT_MV110H 0x1000 | 183 | #define AXESSTEL_PRODUCT_MV110H 0x1000 |
184 | 184 | ||
185 | #define ONDA_VENDOR_ID 0x19d2 | 185 | #define ONDA_VENDOR_ID 0x19d2 |
186 | #define ONDA_PRODUCT_MSA501HS 0x0001 | ||
186 | #define ONDA_PRODUCT_ET502HS 0x0002 | 187 | #define ONDA_PRODUCT_ET502HS 0x0002 |
187 | 188 | ||
188 | #define BANDRICH_VENDOR_ID 0x1A8D | 189 | #define BANDRICH_VENDOR_ID 0x1A8D |
@@ -196,6 +197,9 @@ static int option_send_setup(struct usb_serial_port *port); | |||
196 | 197 | ||
197 | #define MAXON_VENDOR_ID 0x16d8 | 198 | #define MAXON_VENDOR_ID 0x16d8 |
198 | 199 | ||
200 | #define TELIT_VENDOR_ID 0x1bc7 | ||
201 | #define TELIT_PRODUCT_UC864E 0x1003 | ||
202 | |||
199 | static struct usb_device_id option_ids[] = { | 203 | static struct usb_device_id option_ids[] = { |
200 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, | 204 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, |
201 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, | 205 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, |
@@ -297,13 +301,14 @@ static struct usb_device_id option_ids[] = { | |||
297 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, | 301 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, |
298 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, | 302 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, |
299 | { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, | 303 | { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, |
304 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) }, | ||
300 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, | 305 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, |
301 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, | 306 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, |
302 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, | 307 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, |
303 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, | 308 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, |
304 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ | 309 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ |
305 | { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ | 310 | { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ |
306 | { USB_DEVICE(0x19d2, 0x0001) }, /* Telstra NextG CDMA */ | 311 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, |
307 | { } /* Terminating entry */ | 312 | { } /* Terminating entry */ |
308 | }; | 313 | }; |
309 | MODULE_DEVICE_TABLE(usb, option_ids); | 314 | MODULE_DEVICE_TABLE(usb, option_ids); |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index c605fb68f807..234c5eea95a2 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -66,7 +66,6 @@ static struct usb_device_id id_table [] = { | |||
66 | { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) }, | 66 | { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) }, |
67 | { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) }, | 67 | { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) }, |
68 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, | 68 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, |
69 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, | ||
70 | { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, | 69 | { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, |
71 | { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, | 70 | { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, |
72 | { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, | 71 | { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, |
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index 10cf872e5ecb..3bdefe020501 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
@@ -36,7 +36,6 @@ | |||
36 | 36 | ||
37 | #define RATOC_VENDOR_ID 0x0584 | 37 | #define RATOC_VENDOR_ID 0x0584 |
38 | #define RATOC_PRODUCT_ID 0xb000 | 38 | #define RATOC_PRODUCT_ID 0xb000 |
39 | #define RATOC_PRODUCT_ID_USB60F 0xb020 | ||
40 | 39 | ||
41 | #define TRIPP_VENDOR_ID 0x2478 | 40 | #define TRIPP_VENDOR_ID 0x2478 |
42 | #define TRIPP_PRODUCT_ID 0x2008 | 41 | #define TRIPP_PRODUCT_ID 0x2008 |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index e4bcf5376a99..bd4ac0bafecb 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -3356,7 +3356,7 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *i | |||
3356 | 3356 | ||
3357 | info->fix.mmio_start = raddr; | 3357 | info->fix.mmio_start = raddr; |
3358 | par->ati_regbase = ioremap(info->fix.mmio_start, 0x1000); | 3358 | par->ati_regbase = ioremap(info->fix.mmio_start, 0x1000); |
3359 | if (par->ati_regbase == 0) | 3359 | if (par->ati_regbase == NULL) |
3360 | return -ENOMEM; | 3360 | return -ENOMEM; |
3361 | 3361 | ||
3362 | info->fix.mmio_start += par->aux_start ? 0x400 : 0xc00; | 3362 | info->fix.mmio_start += par->aux_start ? 0x400 : 0xc00; |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 72cd0d2f14ec..400e9264e456 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -2277,8 +2277,8 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev, | |||
2277 | do { | 2277 | do { |
2278 | rinfo->fb_base = ioremap (rinfo->fb_base_phys, | 2278 | rinfo->fb_base = ioremap (rinfo->fb_base_phys, |
2279 | rinfo->mapped_vram); | 2279 | rinfo->mapped_vram); |
2280 | } while ( rinfo->fb_base == 0 && | 2280 | } while (rinfo->fb_base == NULL && |
2281 | ((rinfo->mapped_vram /=2) >= MIN_MAPPED_VRAM) ); | 2281 | ((rinfo->mapped_vram /= 2) >= MIN_MAPPED_VRAM)); |
2282 | 2282 | ||
2283 | if (rinfo->fb_base == NULL) { | 2283 | if (rinfo->fb_base == NULL) { |
2284 | printk (KERN_ERR "radeonfb (%s): cannot map FB\n", | 2284 | printk (KERN_ERR "radeonfb (%s): cannot map FB\n", |
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c index 35477177bef4..6ef800bdf482 100644 --- a/drivers/video/display/display-sysfs.c +++ b/drivers/video/display/display-sysfs.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/ctype.h> | 26 | #include <linux/ctype.h> |
27 | #include <linux/idr.h> | 27 | #include <linux/idr.h> |
28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
29 | #include <linux/kdev_t.h> | ||
29 | 30 | ||
30 | static ssize_t display_show_name(struct device *dev, | 31 | static ssize_t display_show_name(struct device *dev, |
31 | struct device_attribute *attr, char *buf) | 32 | struct device_attribute *attr, char *buf) |
@@ -152,10 +153,13 @@ struct display_device *display_device_register(struct display_driver *driver, | |||
152 | mutex_unlock(&allocated_dsp_lock); | 153 | mutex_unlock(&allocated_dsp_lock); |
153 | 154 | ||
154 | if (!ret) { | 155 | if (!ret) { |
155 | new_dev->dev = device_create(display_class, parent, 0, | 156 | new_dev->dev = device_create_drvdata(display_class, |
156 | "display%d", new_dev->idx); | 157 | parent, |
158 | MKDEV(0,0), | ||
159 | new_dev, | ||
160 | "display%d", | ||
161 | new_dev->idx); | ||
157 | if (!IS_ERR(new_dev->dev)) { | 162 | if (!IS_ERR(new_dev->dev)) { |
158 | dev_set_drvdata(new_dev->dev, new_dev); | ||
159 | new_dev->parent = parent; | 163 | new_dev->parent = parent; |
160 | new_dev->driver = driver; | 164 | new_dev->driver = driver; |
161 | mutex_init(&new_dev->lock); | 165 | mutex_init(&new_dev->lock); |
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h index f3107ad7e545..95883236c0cd 100644 --- a/drivers/video/matrox/matroxfb_base.h +++ b/drivers/video/matrox/matroxfb_base.h | |||
@@ -200,7 +200,7 @@ static inline int mga_ioremap(unsigned long phys, unsigned long size, int flags, | |||
200 | virt->vaddr = ioremap_nocache(phys, size); | 200 | virt->vaddr = ioremap_nocache(phys, size); |
201 | else | 201 | else |
202 | virt->vaddr = ioremap(phys, size); | 202 | virt->vaddr = ioremap(phys, size); |
203 | return (virt->vaddr == 0); /* 0, !0... 0, error_code in future */ | 203 | return (virt->vaddr == NULL); /* 0, !0... 0, error_code in future */ |
204 | } | 204 | } |
205 | 205 | ||
206 | static inline void mga_iounmap(vaddr_t va) { | 206 | static inline void mga_iounmap(vaddr_t va) { |
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 73803624c131..b9343844cd1f 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
@@ -5787,7 +5787,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
5787 | } else { | 5787 | } else { |
5788 | struct sis_video_info *countvideo = card_list; | 5788 | struct sis_video_info *countvideo = card_list; |
5789 | ivideo->cardnumber = 1; | 5789 | ivideo->cardnumber = 1; |
5790 | while((countvideo = countvideo->next) != 0) | 5790 | while((countvideo = countvideo->next) != NULL) |
5791 | ivideo->cardnumber++; | 5791 | ivideo->cardnumber++; |
5792 | } | 5792 | } |
5793 | 5793 | ||
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index b25707fee2cc..0fa95b198e6e 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
@@ -256,7 +256,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, | |||
256 | return -EFAULT; | 256 | return -EFAULT; |
257 | len = strnlen_user((void __user *)p, MAX_ARG_STRLEN); | 257 | len = strnlen_user((void __user *)p, MAX_ARG_STRLEN); |
258 | if (!len || len > MAX_ARG_STRLEN) | 258 | if (!len || len > MAX_ARG_STRLEN) |
259 | return 0; | 259 | return -EINVAL; |
260 | p += len; | 260 | p += len; |
261 | } | 261 | } |
262 | if (__put_user(0, argv)) | 262 | if (__put_user(0, argv)) |
@@ -268,7 +268,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, | |||
268 | return -EFAULT; | 268 | return -EFAULT; |
269 | len = strnlen_user((void __user *)p, MAX_ARG_STRLEN); | 269 | len = strnlen_user((void __user *)p, MAX_ARG_STRLEN); |
270 | if (!len || len > MAX_ARG_STRLEN) | 270 | if (!len || len > MAX_ARG_STRLEN) |
271 | return 0; | 271 | return -EINVAL; |
272 | p += len; | 272 | p += len; |
273 | } | 273 | } |
274 | if (__put_user(0, envp)) | 274 | if (__put_user(0, envp)) |
@@ -1900,7 +1900,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un | |||
1900 | /* alloc memory for large data structures: too large to be on stack */ | 1900 | /* alloc memory for large data structures: too large to be on stack */ |
1901 | elf = kmalloc(sizeof(*elf), GFP_KERNEL); | 1901 | elf = kmalloc(sizeof(*elf), GFP_KERNEL); |
1902 | if (!elf) | 1902 | if (!elf) |
1903 | goto cleanup; | 1903 | goto out; |
1904 | 1904 | ||
1905 | segs = current->mm->map_count; | 1905 | segs = current->mm->map_count; |
1906 | #ifdef ELF_CORE_EXTRA_PHDRS | 1906 | #ifdef ELF_CORE_EXTRA_PHDRS |
@@ -2034,8 +2034,9 @@ end_coredump: | |||
2034 | set_fs(fs); | 2034 | set_fs(fs); |
2035 | 2035 | ||
2036 | cleanup: | 2036 | cleanup: |
2037 | kfree(elf); | ||
2038 | free_note_info(&info); | 2037 | free_note_info(&info); |
2038 | kfree(elf); | ||
2039 | out: | ||
2039 | return has_dumped; | 2040 | return has_dumped; |
2040 | } | 2041 | } |
2041 | 2042 | ||
diff --git a/fs/cifs/AUTHORS b/fs/cifs/AUTHORS index 8848e4dfa026..9c136d7803d9 100644 --- a/fs/cifs/AUTHORS +++ b/fs/cifs/AUTHORS | |||
@@ -36,6 +36,7 @@ Miklos Szeredi | |||
36 | Kazeon team for various fixes especially for 2.4 version. | 36 | Kazeon team for various fixes especially for 2.4 version. |
37 | Asser Ferno (Change Notify support) | 37 | Asser Ferno (Change Notify support) |
38 | Shaggy (Dave Kleikamp) for inumerable small fs suggestions and some good cleanup | 38 | Shaggy (Dave Kleikamp) for inumerable small fs suggestions and some good cleanup |
39 | Igor Mammedov (DFS support) | ||
39 | 40 | ||
40 | Test case and Bug Report contributors | 41 | Test case and Bug Report contributors |
41 | ------------------------------------- | 42 | ------------------------------------- |
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index 8355e918fddf..28e3d5c5fcac 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES | |||
@@ -1,5 +1,7 @@ | |||
1 | Version 1.53 | 1 | Version 1.53 |
2 | ------------ | 2 | ------------ |
3 | DFS support added (Microsoft Distributed File System client support needed | ||
4 | for referrals which enable a hierarchical name space among servers). | ||
3 | 5 | ||
4 | Version 1.52 | 6 | Version 1.52 |
5 | ------------ | 7 | ------------ |
@@ -12,7 +14,8 @@ Add ability to modify cifs acls for handling chmod (when mounted with | |||
12 | cifsacl flag). Fix prefixpath path separator so we can handle mounts | 14 | cifsacl flag). Fix prefixpath path separator so we can handle mounts |
13 | with prefixpaths longer than one directory (one path component) when | 15 | with prefixpaths longer than one directory (one path component) when |
14 | mounted to Windows servers. Fix slow file open when cifsacl | 16 | mounted to Windows servers. Fix slow file open when cifsacl |
15 | enabled. | 17 | enabled. Fix memory leak in FindNext when the SMB call returns -EBADF. |
18 | |||
16 | 19 | ||
17 | Version 1.51 | 20 | Version 1.51 |
18 | ------------ | 21 | ------------ |
diff --git a/fs/cifs/README b/fs/cifs/README index 621aa1a85971..2bd6fe556f88 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
@@ -483,6 +483,11 @@ A partial list of the supported mount options follows: | |||
483 | sign Must use packet signing (helps avoid unwanted data modification | 483 | sign Must use packet signing (helps avoid unwanted data modification |
484 | by intermediate systems in the route). Note that signing | 484 | by intermediate systems in the route). Note that signing |
485 | does not work with lanman or plaintext authentication. | 485 | does not work with lanman or plaintext authentication. |
486 | seal Must seal (encrypt) all data on this mounted share before | ||
487 | sending on the network. Requires support for Unix Extensions. | ||
488 | Note that this differs from the sign mount option in that it | ||
489 | causes encryption of data sent over this mounted share but other | ||
490 | shares mounted to the same server are unaffected. | ||
486 | sec Security mode. Allowed values are: | 491 | sec Security mode. Allowed values are: |
487 | none attempt to connection as a null user (no name) | 492 | none attempt to connection as a null user (no name) |
488 | krb5 Use Kerberos version 5 authentication | 493 | krb5 Use Kerberos version 5 authentication |
diff --git a/fs/cifs/TODO b/fs/cifs/TODO index 92c9feac440f..5aff46c61e52 100644 --- a/fs/cifs/TODO +++ b/fs/cifs/TODO | |||
@@ -1,4 +1,4 @@ | |||
1 | Version 1.52 January 3, 2008 | 1 | Version 1.53 May 20, 2008 |
2 | 2 | ||
3 | A Partial List of Missing Features | 3 | A Partial List of Missing Features |
4 | ================================== | 4 | ================================== |
@@ -20,20 +20,21 @@ d) Cleanup now unneeded SessSetup code in | |||
20 | fs/cifs/connect.c and add back in NTLMSSP code if any servers | 20 | fs/cifs/connect.c and add back in NTLMSSP code if any servers |
21 | need it | 21 | need it |
22 | 22 | ||
23 | e) ms-dfs and ms-dfs host name resolution cleanup | 23 | e) fix NTLMv2 signing when two mounts with different users to same |
24 | |||
25 | f) fix NTLMv2 signing when two mounts with different users to same | ||
26 | server. | 24 | server. |
27 | 25 | ||
28 | g) Directory entry caching relies on a 1 second timer, rather than | 26 | f) Directory entry caching relies on a 1 second timer, rather than |
29 | using FindNotify or equivalent. - (started) | 27 | using FindNotify or equivalent. - (started) |
30 | 28 | ||
31 | h) quota support (needs minor kernel change since quota calls | 29 | g) quota support (needs minor kernel change since quota calls |
32 | to make it to network filesystems or deviceless filesystems) | 30 | to make it to network filesystems or deviceless filesystems) |
33 | 31 | ||
34 | i) investigate sync behavior (including syncpage) and check | 32 | h) investigate sync behavior (including syncpage) and check |
35 | for proper behavior of intr/nointr | 33 | for proper behavior of intr/nointr |
36 | 34 | ||
35 | i) improve support for very old servers (OS/2 and Win9x for example) | ||
36 | Including support for changing the time remotely (utimes command). | ||
37 | |||
37 | j) hook lower into the sockets api (as NFS/SunRPC does) to avoid the | 38 | j) hook lower into the sockets api (as NFS/SunRPC does) to avoid the |
38 | extra copy in/out of the socket buffers in some cases. | 39 | extra copy in/out of the socket buffers in some cases. |
39 | 40 | ||
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index f6fdecf6598c..d82374c9e329 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
@@ -219,53 +219,6 @@ static struct vfsmount *cifs_dfs_do_refmount(const struct vfsmount *mnt_parent, | |||
219 | 219 | ||
220 | } | 220 | } |
221 | 221 | ||
222 | static char *build_full_dfs_path_from_dentry(struct dentry *dentry) | ||
223 | { | ||
224 | char *full_path = NULL; | ||
225 | char *search_path; | ||
226 | char *tmp_path; | ||
227 | size_t l_max_len; | ||
228 | struct cifs_sb_info *cifs_sb; | ||
229 | |||
230 | if (dentry->d_inode == NULL) | ||
231 | return NULL; | ||
232 | |||
233 | cifs_sb = CIFS_SB(dentry->d_inode->i_sb); | ||
234 | |||
235 | if (cifs_sb->tcon == NULL) | ||
236 | return NULL; | ||
237 | |||
238 | search_path = build_path_from_dentry(dentry); | ||
239 | if (search_path == NULL) | ||
240 | return NULL; | ||
241 | |||
242 | if (cifs_sb->tcon->Flags & SMB_SHARE_IS_IN_DFS) { | ||
243 | int i; | ||
244 | /* we should use full path name for correct working with DFS */ | ||
245 | l_max_len = strnlen(cifs_sb->tcon->treeName, MAX_TREE_SIZE+1) + | ||
246 | strnlen(search_path, MAX_PATHCONF) + 1; | ||
247 | tmp_path = kmalloc(l_max_len, GFP_KERNEL); | ||
248 | if (tmp_path == NULL) { | ||
249 | kfree(search_path); | ||
250 | return NULL; | ||
251 | } | ||
252 | strncpy(tmp_path, cifs_sb->tcon->treeName, l_max_len); | ||
253 | tmp_path[l_max_len-1] = 0; | ||
254 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) | ||
255 | for (i = 0; i < l_max_len; i++) { | ||
256 | if (tmp_path[i] == '\\') | ||
257 | tmp_path[i] = '/'; | ||
258 | } | ||
259 | strncat(tmp_path, search_path, l_max_len - strlen(tmp_path)); | ||
260 | |||
261 | full_path = tmp_path; | ||
262 | kfree(search_path); | ||
263 | } else { | ||
264 | full_path = search_path; | ||
265 | } | ||
266 | return full_path; | ||
267 | } | ||
268 | |||
269 | static int add_mount_helper(struct vfsmount *newmnt, struct nameidata *nd, | 222 | static int add_mount_helper(struct vfsmount *newmnt, struct nameidata *nd, |
270 | struct list_head *mntlist) | 223 | struct list_head *mntlist) |
271 | { | 224 | { |
@@ -333,7 +286,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) | |||
333 | goto out_err; | 286 | goto out_err; |
334 | } | 287 | } |
335 | 288 | ||
336 | full_path = build_full_dfs_path_from_dentry(dentry); | 289 | full_path = build_path_from_dentry(dentry); |
337 | if (full_path == NULL) { | 290 | if (full_path == NULL) { |
338 | rc = -ENOMEM; | 291 | rc = -ENOMEM; |
339 | goto out_err; | 292 | goto out_err; |
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h index 8ad2330ba061..877c85409f1f 100644 --- a/fs/cifs/cifs_fs_sb.h +++ b/fs/cifs/cifs_fs_sb.h | |||
@@ -30,6 +30,7 @@ | |||
30 | #define CIFS_MOUNT_CIFS_ACL 0x200 /* send ACL requests to non-POSIX srv */ | 30 | #define CIFS_MOUNT_CIFS_ACL 0x200 /* send ACL requests to non-POSIX srv */ |
31 | #define CIFS_MOUNT_OVERR_UID 0x400 /* override uid returned from server */ | 31 | #define CIFS_MOUNT_OVERR_UID 0x400 /* override uid returned from server */ |
32 | #define CIFS_MOUNT_OVERR_GID 0x800 /* override gid returned from server */ | 32 | #define CIFS_MOUNT_OVERR_GID 0x800 /* override gid returned from server */ |
33 | #define CIFS_MOUNT_DYNPERM 0x1000 /* allow in-memory only mode setting */ | ||
33 | 34 | ||
34 | struct cifs_sb_info { | 35 | struct cifs_sb_info { |
35 | struct cifsTconInfo *tcon; /* primary mount */ | 36 | struct cifsTconInfo *tcon; /* primary mount */ |
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 6653e29637a7..7013aaff6aed 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c | |||
@@ -119,6 +119,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) | |||
119 | dp = description + strlen(description); | 119 | dp = description + strlen(description); |
120 | sprintf(dp, ";uid=0x%x", sesInfo->linux_uid); | 120 | sprintf(dp, ";uid=0x%x", sesInfo->linux_uid); |
121 | 121 | ||
122 | dp = description + strlen(description); | ||
123 | sprintf(dp, ";user=%s", sesInfo->userName); | ||
124 | |||
122 | cFYI(1, ("key description = %s", description)); | 125 | cFYI(1, ("key description = %s", description)); |
123 | spnego_key = request_key(&cifs_spnego_key_type, description, ""); | 126 | spnego_key = request_key(&cifs_spnego_key_type, description, ""); |
124 | 127 | ||
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 427a7c695896..5df93fd6303f 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * fs/cifs/cifsfs.c | 2 | * fs/cifs/cifsfs.c |
3 | * | 3 | * |
4 | * Copyright (C) International Business Machines Corp., 2002,2007 | 4 | * Copyright (C) International Business Machines Corp., 2002,2008 |
5 | * Author(s): Steve French (sfrench@us.ibm.com) | 5 | * Author(s): Steve French (sfrench@us.ibm.com) |
6 | * | 6 | * |
7 | * Common Internet FileSystem (CIFS) client | 7 | * Common Internet FileSystem (CIFS) client |
@@ -353,9 +353,41 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) | |||
353 | if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) || | 353 | if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) || |
354 | !(cifs_sb->tcon->unix_ext)) | 354 | !(cifs_sb->tcon->unix_ext)) |
355 | seq_printf(s, ",gid=%d", cifs_sb->mnt_gid); | 355 | seq_printf(s, ",gid=%d", cifs_sb->mnt_gid); |
356 | if (!cifs_sb->tcon->unix_ext) { | ||
357 | seq_printf(s, ",file_mode=0%o,dir_mode=0%o", | ||
358 | cifs_sb->mnt_file_mode, | ||
359 | cifs_sb->mnt_dir_mode); | ||
360 | } | ||
361 | if (cifs_sb->tcon->seal) | ||
362 | seq_printf(s, ",seal"); | ||
363 | if (cifs_sb->tcon->nocase) | ||
364 | seq_printf(s, ",nocase"); | ||
365 | if (cifs_sb->tcon->retry) | ||
366 | seq_printf(s, ",hard"); | ||
356 | } | 367 | } |
357 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) | 368 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) |
358 | seq_printf(s, ",posixpaths"); | 369 | seq_printf(s, ",posixpaths"); |
370 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) | ||
371 | seq_printf(s, ",setuids"); | ||
372 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) | ||
373 | seq_printf(s, ",serverino"); | ||
374 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) | ||
375 | seq_printf(s, ",directio"); | ||
376 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR) | ||
377 | seq_printf(s, ",nouser_xattr"); | ||
378 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR) | ||
379 | seq_printf(s, ",mapchars"); | ||
380 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) | ||
381 | seq_printf(s, ",sfu"); | ||
382 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) | ||
383 | seq_printf(s, ",nobrl"); | ||
384 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) | ||
385 | seq_printf(s, ",cifsacl"); | ||
386 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) | ||
387 | seq_printf(s, ",dynperm"); | ||
388 | if (m->mnt_sb->s_flags & MS_POSIXACL) | ||
389 | seq_printf(s, ",acl"); | ||
390 | |||
359 | seq_printf(s, ",rsize=%d", cifs_sb->rsize); | 391 | seq_printf(s, ",rsize=%d", cifs_sb->rsize); |
360 | seq_printf(s, ",wsize=%d", cifs_sb->wsize); | 392 | seq_printf(s, ",wsize=%d", cifs_sb->wsize); |
361 | } | 393 | } |
@@ -657,7 +689,7 @@ const struct file_operations cifs_file_ops = { | |||
657 | .splice_read = generic_file_splice_read, | 689 | .splice_read = generic_file_splice_read, |
658 | .llseek = cifs_llseek, | 690 | .llseek = cifs_llseek, |
659 | #ifdef CONFIG_CIFS_POSIX | 691 | #ifdef CONFIG_CIFS_POSIX |
660 | .ioctl = cifs_ioctl, | 692 | .unlocked_ioctl = cifs_ioctl, |
661 | #endif /* CONFIG_CIFS_POSIX */ | 693 | #endif /* CONFIG_CIFS_POSIX */ |
662 | 694 | ||
663 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 695 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
@@ -677,7 +709,7 @@ const struct file_operations cifs_file_direct_ops = { | |||
677 | .flush = cifs_flush, | 709 | .flush = cifs_flush, |
678 | .splice_read = generic_file_splice_read, | 710 | .splice_read = generic_file_splice_read, |
679 | #ifdef CONFIG_CIFS_POSIX | 711 | #ifdef CONFIG_CIFS_POSIX |
680 | .ioctl = cifs_ioctl, | 712 | .unlocked_ioctl = cifs_ioctl, |
681 | #endif /* CONFIG_CIFS_POSIX */ | 713 | #endif /* CONFIG_CIFS_POSIX */ |
682 | .llseek = cifs_llseek, | 714 | .llseek = cifs_llseek, |
683 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 715 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
@@ -697,7 +729,7 @@ const struct file_operations cifs_file_nobrl_ops = { | |||
697 | .splice_read = generic_file_splice_read, | 729 | .splice_read = generic_file_splice_read, |
698 | .llseek = cifs_llseek, | 730 | .llseek = cifs_llseek, |
699 | #ifdef CONFIG_CIFS_POSIX | 731 | #ifdef CONFIG_CIFS_POSIX |
700 | .ioctl = cifs_ioctl, | 732 | .unlocked_ioctl = cifs_ioctl, |
701 | #endif /* CONFIG_CIFS_POSIX */ | 733 | #endif /* CONFIG_CIFS_POSIX */ |
702 | 734 | ||
703 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 735 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
@@ -716,7 +748,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { | |||
716 | .flush = cifs_flush, | 748 | .flush = cifs_flush, |
717 | .splice_read = generic_file_splice_read, | 749 | .splice_read = generic_file_splice_read, |
718 | #ifdef CONFIG_CIFS_POSIX | 750 | #ifdef CONFIG_CIFS_POSIX |
719 | .ioctl = cifs_ioctl, | 751 | .unlocked_ioctl = cifs_ioctl, |
720 | #endif /* CONFIG_CIFS_POSIX */ | 752 | #endif /* CONFIG_CIFS_POSIX */ |
721 | .llseek = cifs_llseek, | 753 | .llseek = cifs_llseek, |
722 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 754 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
@@ -731,7 +763,7 @@ const struct file_operations cifs_dir_ops = { | |||
731 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 763 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
732 | .dir_notify = cifs_dir_notify, | 764 | .dir_notify = cifs_dir_notify, |
733 | #endif /* CONFIG_CIFS_EXPERIMENTAL */ | 765 | #endif /* CONFIG_CIFS_EXPERIMENTAL */ |
734 | .ioctl = cifs_ioctl, | 766 | .unlocked_ioctl = cifs_ioctl, |
735 | }; | 767 | }; |
736 | 768 | ||
737 | static void | 769 | static void |
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index cd1301a09b3b..25a6cbd15529 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
@@ -95,8 +95,7 @@ extern int cifs_setxattr(struct dentry *, const char *, const void *, | |||
95 | size_t, int); | 95 | size_t, int); |
96 | extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); | 96 | extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); |
97 | extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); | 97 | extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); |
98 | extern int cifs_ioctl(struct inode *inode, struct file *filep, | 98 | extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); |
99 | unsigned int command, unsigned long arg); | ||
100 | 99 | ||
101 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 100 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
102 | extern const struct export_operations cifs_export_ops; | 101 | extern const struct export_operations cifs_export_ops; |
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index b7d9f698e63e..08914053242b 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
@@ -281,6 +281,7 @@ struct cifsTconInfo { | |||
281 | bool ipc:1; /* set if connection to IPC$ eg for RPC/PIPES */ | 281 | bool ipc:1; /* set if connection to IPC$ eg for RPC/PIPES */ |
282 | bool retry:1; | 282 | bool retry:1; |
283 | bool nocase:1; | 283 | bool nocase:1; |
284 | bool seal:1; /* transport encryption for this mounted share */ | ||
284 | bool unix_ext:1; /* if false disable Linux extensions to CIFS protocol | 285 | bool unix_ext:1; /* if false disable Linux extensions to CIFS protocol |
285 | for this mount even if server would support */ | 286 | for this mount even if server would support */ |
286 | /* BB add field for back pointer to sb struct(s)? */ | 287 | /* BB add field for back pointer to sb struct(s)? */ |
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index c43bf4b7a556..65d58b4e6a61 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h | |||
@@ -1904,19 +1904,26 @@ typedef struct smb_com_transaction2_get_dfs_refer_req { | |||
1904 | char RequestFileName[1]; | 1904 | char RequestFileName[1]; |
1905 | } __attribute__((packed)) TRANSACTION2_GET_DFS_REFER_REQ; | 1905 | } __attribute__((packed)) TRANSACTION2_GET_DFS_REFER_REQ; |
1906 | 1906 | ||
1907 | #define DFS_VERSION cpu_to_le16(0x0003) | ||
1908 | |||
1909 | /* DFS server target type */ | ||
1910 | #define DFS_TYPE_LINK 0x0000 /* also for sysvol targets */ | ||
1911 | #define DFS_TYPE_ROOT 0x0001 | ||
1912 | |||
1913 | /* Referral Entry Flags */ | ||
1914 | #define DFS_NAME_LIST_REF 0x0200 | ||
1915 | |||
1907 | typedef struct dfs_referral_level_3 { | 1916 | typedef struct dfs_referral_level_3 { |
1908 | __le16 VersionNumber; | 1917 | __le16 VersionNumber; |
1909 | __le16 ReferralSize; | 1918 | __le16 Size; |
1910 | __le16 ServerType; /* 0x0001 = CIFS server */ | 1919 | __le16 ServerType; /* 0x0001 = root targets; 0x0000 = link targets */ |
1911 | __le16 ReferralFlags; /* or proximity - not clear which since it is | 1920 | __le16 ReferralEntryFlags; /* 0x0200 bit set only for domain |
1912 | always set to zero - SNIA spec says 0x01 | 1921 | or DC referral responce */ |
1913 | means strip off PathConsumed chars before | 1922 | __le32 TimeToLive; |
1914 | submitting RequestFileName to remote node */ | ||
1915 | __le16 TimeToLive; | ||
1916 | __le16 Proximity; | ||
1917 | __le16 DfsPathOffset; | 1923 | __le16 DfsPathOffset; |
1918 | __le16 DfsAlternatePathOffset; | 1924 | __le16 DfsAlternatePathOffset; |
1919 | __le16 NetworkAddressOffset; | 1925 | __le16 NetworkAddressOffset; /* offset of the link target */ |
1926 | __le16 ServiceSiteGuid; | ||
1920 | } __attribute__((packed)) REFERRAL3; | 1927 | } __attribute__((packed)) REFERRAL3; |
1921 | 1928 | ||
1922 | typedef struct smb_com_transaction_get_dfs_refer_rsp { | 1929 | typedef struct smb_com_transaction_get_dfs_refer_rsp { |
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index d481f6c5a2be..b9f5e935f821 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
@@ -93,7 +93,7 @@ extern struct timespec cnvrtDosUnixTm(__u16 date, __u16 time); | |||
93 | 93 | ||
94 | extern int cifs_get_inode_info(struct inode **pinode, | 94 | extern int cifs_get_inode_info(struct inode **pinode, |
95 | const unsigned char *search_path, | 95 | const unsigned char *search_path, |
96 | FILE_ALL_INFO * pfile_info, | 96 | FILE_ALL_INFO *pfile_info, |
97 | struct super_block *sb, int xid, const __u16 *pfid); | 97 | struct super_block *sb, int xid, const __u16 *pfid); |
98 | extern int cifs_get_inode_info_unix(struct inode **pinode, | 98 | extern int cifs_get_inode_info_unix(struct inode **pinode, |
99 | const unsigned char *search_path, | 99 | const unsigned char *search_path, |
@@ -130,7 +130,7 @@ extern int CIFSFindClose(const int, struct cifsTconInfo *tcon, | |||
130 | 130 | ||
131 | extern int CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon, | 131 | extern int CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon, |
132 | const unsigned char *searchName, | 132 | const unsigned char *searchName, |
133 | FILE_ALL_INFO * findData, | 133 | FILE_ALL_INFO *findData, |
134 | int legacy /* whether to use old info level */, | 134 | int legacy /* whether to use old info level */, |
135 | const struct nls_table *nls_codepage, int remap); | 135 | const struct nls_table *nls_codepage, int remap); |
136 | extern int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon, | 136 | extern int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon, |
@@ -141,18 +141,15 @@ extern int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon, | |||
141 | extern int CIFSSMBUnixQPathInfo(const int xid, | 141 | extern int CIFSSMBUnixQPathInfo(const int xid, |
142 | struct cifsTconInfo *tcon, | 142 | struct cifsTconInfo *tcon, |
143 | const unsigned char *searchName, | 143 | const unsigned char *searchName, |
144 | FILE_UNIX_BASIC_INFO * pFindData, | 144 | FILE_UNIX_BASIC_INFO *pFindData, |
145 | const struct nls_table *nls_codepage, int remap); | 145 | const struct nls_table *nls_codepage, int remap); |
146 | 146 | ||
147 | extern int CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, | 147 | extern int CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, |
148 | const unsigned char *searchName, | 148 | const unsigned char *searchName, |
149 | unsigned char **targetUNCs, | 149 | struct dfs_info3_param **target_nodes, |
150 | unsigned int *number_of_UNC_in_array, | 150 | unsigned int *number_of_nodes_in_array, |
151 | const struct nls_table *nls_codepage, int remap); | 151 | const struct nls_table *nls_codepage, int remap); |
152 | 152 | ||
153 | extern int connect_to_dfs_path(int xid, struct cifsSesInfo *pSesInfo, | ||
154 | const char *old_path, | ||
155 | const struct nls_table *nls_codepage, int remap); | ||
156 | extern int get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, | 153 | extern int get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, |
157 | const char *old_path, | 154 | const char *old_path, |
158 | const struct nls_table *nls_codepage, | 155 | const struct nls_table *nls_codepage, |
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 95fbba4ea7d4..9b8b4cfdf993 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
@@ -81,6 +81,40 @@ 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 | |||
84 | 118 | ||
85 | /* Mark as invalid, all open files on tree connections since they | 119 | /* Mark as invalid, all open files on tree connections since they |
86 | were closed when session to server was lost */ | 120 | were closed when session to server was lost */ |
@@ -1166,6 +1200,20 @@ static __u16 convert_disposition(int disposition) | |||
1166 | return ofun; | 1200 | return ofun; |
1167 | } | 1201 | } |
1168 | 1202 | ||
1203 | static int | ||
1204 | access_flags_to_smbopen_mode(const int access_flags) | ||
1205 | { | ||
1206 | int masked_flags = access_flags & (GENERIC_READ | GENERIC_WRITE); | ||
1207 | |||
1208 | if (masked_flags == GENERIC_READ) | ||
1209 | return SMBOPEN_READ; | ||
1210 | else if (masked_flags == GENERIC_WRITE) | ||
1211 | return SMBOPEN_WRITE; | ||
1212 | |||
1213 | /* just go for read/write */ | ||
1214 | return SMBOPEN_READWRITE; | ||
1215 | } | ||
1216 | |||
1169 | int | 1217 | int |
1170 | SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon, | 1218 | SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon, |
1171 | const char *fileName, const int openDisposition, | 1219 | const char *fileName, const int openDisposition, |
@@ -1207,13 +1255,7 @@ OldOpenRetry: | |||
1207 | pSMB->OpenFlags = cpu_to_le16(REQ_BATCHOPLOCK); | 1255 | pSMB->OpenFlags = cpu_to_le16(REQ_BATCHOPLOCK); |
1208 | 1256 | ||
1209 | pSMB->OpenFlags |= cpu_to_le16(REQ_MORE_INFO); | 1257 | pSMB->OpenFlags |= cpu_to_le16(REQ_MORE_INFO); |
1210 | /* BB fixme add conversion for access_flags to bits 0 - 2 of mode */ | 1258 | pSMB->Mode = cpu_to_le16(access_flags_to_smbopen_mode(access_flags)); |
1211 | /* 0 = read | ||
1212 | 1 = write | ||
1213 | 2 = rw | ||
1214 | 3 = execute | ||
1215 | */ | ||
1216 | pSMB->Mode = cpu_to_le16(2); | ||
1217 | pSMB->Mode |= cpu_to_le16(0x40); /* deny none */ | 1259 | pSMB->Mode |= cpu_to_le16(0x40); /* deny none */ |
1218 | /* set file as system file if special file such | 1260 | /* set file as system file if special file such |
1219 | as fifo and server expecting SFU style and | 1261 | as fifo and server expecting SFU style and |
@@ -1247,7 +1289,7 @@ OldOpenRetry: | |||
1247 | } else { | 1289 | } else { |
1248 | /* BB verify if wct == 15 */ | 1290 | /* BB verify if wct == 15 */ |
1249 | 1291 | ||
1250 | /* *pOplock = pSMBr->OplockLevel; */ /* BB take from action field BB */ | 1292 | /* *pOplock = pSMBr->OplockLevel; */ /* BB take from action field*/ |
1251 | 1293 | ||
1252 | *netfid = pSMBr->Fid; /* cifs fid stays in le */ | 1294 | *netfid = pSMBr->Fid; /* cifs fid stays in le */ |
1253 | /* Let caller know file was created so we can set the mode. */ | 1295 | /* Let caller know file was created so we can set the mode. */ |
@@ -1767,7 +1809,7 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon, | |||
1767 | cFYI(1, ("Posix Lock")); | 1809 | cFYI(1, ("Posix Lock")); |
1768 | 1810 | ||
1769 | if (pLockData == NULL) | 1811 | if (pLockData == NULL) |
1770 | return EINVAL; | 1812 | return -EINVAL; |
1771 | 1813 | ||
1772 | rc = small_smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB); | 1814 | rc = small_smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB); |
1773 | 1815 | ||
@@ -1944,7 +1986,7 @@ renameRetry: | |||
1944 | /* protocol requires ASCII signature byte on Unicode string */ | 1986 | /* protocol requires ASCII signature byte on Unicode string */ |
1945 | pSMB->OldFileName[name_len + 1] = 0x00; | 1987 | pSMB->OldFileName[name_len + 1] = 0x00; |
1946 | name_len2 = | 1988 | name_len2 = |
1947 | cifsConvertToUCS((__le16 *) &pSMB->OldFileName[name_len + 2], | 1989 | cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2], |
1948 | toName, PATH_MAX, nls_codepage, remap); | 1990 | toName, PATH_MAX, nls_codepage, remap); |
1949 | name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; | 1991 | name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; |
1950 | name_len2 *= 2; /* convert to bytes */ | 1992 | name_len2 *= 2; /* convert to bytes */ |
@@ -2117,8 +2159,7 @@ copyRetry: | |||
2117 | cFYI(1, ("Send error in copy = %d with %d files copied", | 2159 | cFYI(1, ("Send error in copy = %d with %d files copied", |
2118 | rc, le16_to_cpu(pSMBr->CopyCount))); | 2160 | rc, le16_to_cpu(pSMBr->CopyCount))); |
2119 | } | 2161 | } |
2120 | if (pSMB) | 2162 | cifs_buf_release(pSMB); |
2121 | cifs_buf_release(pSMB); | ||
2122 | 2163 | ||
2123 | if (rc == -EAGAIN) | 2164 | if (rc == -EAGAIN) |
2124 | goto copyRetry; | 2165 | goto copyRetry; |
@@ -2207,8 +2248,7 @@ createSymLinkRetry: | |||
2207 | if (rc) | 2248 | if (rc) |
2208 | cFYI(1, ("Send error in SetPathInfo create symlink = %d", rc)); | 2249 | cFYI(1, ("Send error in SetPathInfo create symlink = %d", rc)); |
2209 | 2250 | ||
2210 | if (pSMB) | 2251 | cifs_buf_release(pSMB); |
2211 | cifs_buf_release(pSMB); | ||
2212 | 2252 | ||
2213 | if (rc == -EAGAIN) | 2253 | if (rc == -EAGAIN) |
2214 | goto createSymLinkRetry; | 2254 | goto createSymLinkRetry; |
@@ -2925,7 +2965,8 @@ setAclRetry: | |||
2925 | } | 2965 | } |
2926 | params = 6 + name_len; | 2966 | params = 6 + name_len; |
2927 | pSMB->MaxParameterCount = cpu_to_le16(2); | 2967 | pSMB->MaxParameterCount = cpu_to_le16(2); |
2928 | pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB size from sess */ | 2968 | /* BB find max SMB size from sess */ |
2969 | pSMB->MaxDataCount = cpu_to_le16(1000); | ||
2929 | pSMB->MaxSetupCount = 0; | 2970 | pSMB->MaxSetupCount = 0; |
2930 | pSMB->Reserved = 0; | 2971 | pSMB->Reserved = 0; |
2931 | pSMB->Flags = 0; | 2972 | pSMB->Flags = 0; |
@@ -3322,7 +3363,8 @@ QPathInfoRetry: | |||
3322 | params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */; | 3363 | params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */; |
3323 | pSMB->TotalDataCount = 0; | 3364 | pSMB->TotalDataCount = 0; |
3324 | pSMB->MaxParameterCount = cpu_to_le16(2); | 3365 | pSMB->MaxParameterCount = cpu_to_le16(2); |
3325 | pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */ | 3366 | /* BB find exact max SMB PDU from sess structure BB */ |
3367 | pSMB->MaxDataCount = cpu_to_le16(4000); | ||
3326 | pSMB->MaxSetupCount = 0; | 3368 | pSMB->MaxSetupCount = 0; |
3327 | pSMB->Reserved = 0; | 3369 | pSMB->Reserved = 0; |
3328 | pSMB->Flags = 0; | 3370 | pSMB->Flags = 0; |
@@ -3388,7 +3430,7 @@ QPathInfoRetry: | |||
3388 | int | 3430 | int |
3389 | CIFSSMBUnixQPathInfo(const int xid, struct cifsTconInfo *tcon, | 3431 | CIFSSMBUnixQPathInfo(const int xid, struct cifsTconInfo *tcon, |
3390 | const unsigned char *searchName, | 3432 | const unsigned char *searchName, |
3391 | FILE_UNIX_BASIC_INFO * pFindData, | 3433 | FILE_UNIX_BASIC_INFO *pFindData, |
3392 | const struct nls_table *nls_codepage, int remap) | 3434 | const struct nls_table *nls_codepage, int remap) |
3393 | { | 3435 | { |
3394 | /* SMB_QUERY_FILE_UNIX_BASIC */ | 3436 | /* SMB_QUERY_FILE_UNIX_BASIC */ |
@@ -3679,6 +3721,7 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon, | |||
3679 | if (rc) { | 3721 | if (rc) { |
3680 | if (rc == -EBADF) { | 3722 | if (rc == -EBADF) { |
3681 | psrch_inf->endOfSearch = true; | 3723 | psrch_inf->endOfSearch = true; |
3724 | cifs_buf_release(pSMB); | ||
3682 | rc = 0; /* search probably was closed at end of search*/ | 3725 | rc = 0; /* search probably was closed at end of search*/ |
3683 | } else | 3726 | } else |
3684 | cFYI(1, ("FindNext returned = %d", rc)); | 3727 | cFYI(1, ("FindNext returned = %d", rc)); |
@@ -3856,25 +3899,112 @@ GetInodeNumOut: | |||
3856 | return rc; | 3899 | return rc; |
3857 | } | 3900 | } |
3858 | 3901 | ||
3902 | /* parses DFS refferal V3 structure | ||
3903 | * caller is responsible for freeing target_nodes | ||
3904 | * returns: | ||
3905 | * on success - 0 | ||
3906 | * on failure - errno | ||
3907 | */ | ||
3908 | static int | ||
3909 | parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, | ||
3910 | unsigned int *num_of_nodes, | ||
3911 | struct dfs_info3_param **target_nodes, | ||
3912 | const struct nls_table *nls_codepage) | ||
3913 | { | ||
3914 | int i, rc = 0; | ||
3915 | char *data_end; | ||
3916 | bool is_unicode; | ||
3917 | struct dfs_referral_level_3 *ref; | ||
3918 | |||
3919 | is_unicode = pSMBr->hdr.Flags2 & SMBFLG2_UNICODE; | ||
3920 | *num_of_nodes = le16_to_cpu(pSMBr->NumberOfReferrals); | ||
3921 | |||
3922 | if (*num_of_nodes < 1) { | ||
3923 | cERROR(1, ("num_referrals: must be at least > 0," | ||
3924 | "but we get num_referrals = %d\n", *num_of_nodes)); | ||
3925 | rc = -EINVAL; | ||
3926 | goto parse_DFS_referrals_exit; | ||
3927 | } | ||
3928 | |||
3929 | ref = (struct dfs_referral_level_3 *) &(pSMBr->referrals); | ||
3930 | if (ref->VersionNumber != 3) { | ||
3931 | cERROR(1, ("Referrals of V%d version are not supported," | ||
3932 | "should be V3", ref->VersionNumber)); | ||
3933 | rc = -EINVAL; | ||
3934 | goto parse_DFS_referrals_exit; | ||
3935 | } | ||
3936 | |||
3937 | /* get the upper boundary of the resp buffer */ | ||
3938 | data_end = (char *)(&(pSMBr->PathConsumed)) + | ||
3939 | le16_to_cpu(pSMBr->t2.DataCount); | ||
3940 | |||
3941 | cFYI(1, ("num_referrals: %d dfs flags: 0x%x ... \n", | ||
3942 | *num_of_nodes, | ||
3943 | le16_to_cpu(pSMBr->DFSFlags))); | ||
3944 | |||
3945 | *target_nodes = kzalloc(sizeof(struct dfs_info3_param) * | ||
3946 | *num_of_nodes, GFP_KERNEL); | ||
3947 | if (*target_nodes == NULL) { | ||
3948 | cERROR(1, ("Failed to allocate buffer for target_nodes\n")); | ||
3949 | rc = -ENOMEM; | ||
3950 | goto parse_DFS_referrals_exit; | ||
3951 | } | ||
3952 | |||
3953 | /* collect neccessary data from referrals */ | ||
3954 | for (i = 0; i < *num_of_nodes; i++) { | ||
3955 | char *temp; | ||
3956 | int max_len; | ||
3957 | struct dfs_info3_param *node = (*target_nodes)+i; | ||
3958 | |||
3959 | node->flags = le16_to_cpu(pSMBr->DFSFlags); | ||
3960 | node->path_consumed = le16_to_cpu(pSMBr->PathConsumed); | ||
3961 | node->server_type = le16_to_cpu(ref->ServerType); | ||
3962 | node->ref_flag = le16_to_cpu(ref->ReferralEntryFlags); | ||
3963 | |||
3964 | /* copy DfsPath */ | ||
3965 | temp = (char *)ref + le16_to_cpu(ref->DfsPathOffset); | ||
3966 | max_len = data_end - temp; | ||
3967 | rc = cifs_strncpy_to_host(&(node->path_name), temp, | ||
3968 | max_len, is_unicode, nls_codepage); | ||
3969 | if (rc) | ||
3970 | goto parse_DFS_referrals_exit; | ||
3971 | |||
3972 | /* copy link target UNC */ | ||
3973 | temp = (char *)ref + le16_to_cpu(ref->NetworkAddressOffset); | ||
3974 | max_len = data_end - temp; | ||
3975 | rc = cifs_strncpy_to_host(&(node->node_name), temp, | ||
3976 | max_len, is_unicode, nls_codepage); | ||
3977 | if (rc) | ||
3978 | goto parse_DFS_referrals_exit; | ||
3979 | |||
3980 | ref += ref->Size; | ||
3981 | } | ||
3982 | |||
3983 | parse_DFS_referrals_exit: | ||
3984 | if (rc) { | ||
3985 | free_dfs_info_array(*target_nodes, *num_of_nodes); | ||
3986 | *target_nodes = NULL; | ||
3987 | *num_of_nodes = 0; | ||
3988 | } | ||
3989 | return rc; | ||
3990 | } | ||
3991 | |||
3859 | int | 3992 | int |
3860 | CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, | 3993 | CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, |
3861 | const unsigned char *searchName, | 3994 | const unsigned char *searchName, |
3862 | unsigned char **targetUNCs, | 3995 | struct dfs_info3_param **target_nodes, |
3863 | unsigned int *number_of_UNC_in_array, | 3996 | unsigned int *num_of_nodes, |
3864 | const struct nls_table *nls_codepage, int remap) | 3997 | const struct nls_table *nls_codepage, int remap) |
3865 | { | 3998 | { |
3866 | /* TRANS2_GET_DFS_REFERRAL */ | 3999 | /* TRANS2_GET_DFS_REFERRAL */ |
3867 | TRANSACTION2_GET_DFS_REFER_REQ *pSMB = NULL; | 4000 | TRANSACTION2_GET_DFS_REFER_REQ *pSMB = NULL; |
3868 | TRANSACTION2_GET_DFS_REFER_RSP *pSMBr = NULL; | 4001 | TRANSACTION2_GET_DFS_REFER_RSP *pSMBr = NULL; |
3869 | struct dfs_referral_level_3 *referrals = NULL; | ||
3870 | int rc = 0; | 4002 | int rc = 0; |
3871 | int bytes_returned; | 4003 | int bytes_returned; |
3872 | int name_len; | 4004 | int name_len; |
3873 | unsigned int i; | ||
3874 | char *temp; | ||
3875 | __u16 params, byte_count; | 4005 | __u16 params, byte_count; |
3876 | *number_of_UNC_in_array = 0; | 4006 | *num_of_nodes = 0; |
3877 | *targetUNCs = NULL; | 4007 | *target_nodes = NULL; |
3878 | 4008 | ||
3879 | cFYI(1, ("In GetDFSRefer the path %s", searchName)); | 4009 | cFYI(1, ("In GetDFSRefer the path %s", searchName)); |
3880 | if (ses == NULL) | 4010 | if (ses == NULL) |
@@ -3921,7 +4051,8 @@ getDFSRetry: | |||
3921 | pSMB->DataCount = 0; | 4051 | pSMB->DataCount = 0; |
3922 | pSMB->DataOffset = 0; | 4052 | pSMB->DataOffset = 0; |
3923 | pSMB->MaxParameterCount = 0; | 4053 | pSMB->MaxParameterCount = 0; |
3924 | pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */ | 4054 | /* BB find exact max SMB PDU from sess structure BB */ |
4055 | pSMB->MaxDataCount = cpu_to_le16(4000); | ||
3925 | pSMB->MaxSetupCount = 0; | 4056 | pSMB->MaxSetupCount = 0; |
3926 | pSMB->Reserved = 0; | 4057 | pSMB->Reserved = 0; |
3927 | pSMB->Flags = 0; | 4058 | pSMB->Flags = 0; |
@@ -3943,103 +4074,26 @@ getDFSRetry: | |||
3943 | (struct smb_hdr *) pSMBr, &bytes_returned, 0); | 4074 | (struct smb_hdr *) pSMBr, &bytes_returned, 0); |
3944 | if (rc) { | 4075 | if (rc) { |
3945 | cFYI(1, ("Send error in GetDFSRefer = %d", rc)); | 4076 | cFYI(1, ("Send error in GetDFSRefer = %d", rc)); |
3946 | } else { /* decode response */ | 4077 | goto GetDFSRefExit; |
3947 | /* BB Add logic to parse referrals here */ | 4078 | } |
3948 | rc = validate_t2((struct smb_t2_rsp *)pSMBr); | 4079 | rc = validate_t2((struct smb_t2_rsp *)pSMBr); |
3949 | 4080 | ||
3950 | /* BB Also check if enough total bytes returned? */ | 4081 | /* BB Also check if enough total bytes returned? */ |
3951 | if (rc || (pSMBr->ByteCount < 17)) | 4082 | if (rc || (pSMBr->ByteCount < 17)) { |
3952 | rc = -EIO; /* bad smb */ | 4083 | rc = -EIO; /* bad smb */ |
3953 | else { | 4084 | goto GetDFSRefExit; |
3954 | __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset); | 4085 | } |
3955 | __u16 data_count = le16_to_cpu(pSMBr->t2.DataCount); | ||
3956 | 4086 | ||
3957 | cFYI(1, | 4087 | cFYI(1, ("Decoding GetDFSRefer response BCC: %d Offset %d", |
3958 | ("Decoding GetDFSRefer response BCC: %d Offset %d", | 4088 | pSMBr->ByteCount, |
3959 | pSMBr->ByteCount, data_offset)); | 4089 | le16_to_cpu(pSMBr->t2.DataOffset))); |
3960 | referrals = | ||
3961 | (struct dfs_referral_level_3 *) | ||
3962 | (8 /* sizeof start of data block */ + | ||
3963 | data_offset + | ||
3964 | (char *) &pSMBr->hdr.Protocol); | ||
3965 | cFYI(1, ("num_referrals: %d dfs flags: 0x%x ... \n" | ||
3966 | "for referral one refer size: 0x%x srv " | ||
3967 | "type: 0x%x refer flags: 0x%x ttl: 0x%x", | ||
3968 | le16_to_cpu(pSMBr->NumberOfReferrals), | ||
3969 | le16_to_cpu(pSMBr->DFSFlags), | ||
3970 | le16_to_cpu(referrals->ReferralSize), | ||
3971 | le16_to_cpu(referrals->ServerType), | ||
3972 | le16_to_cpu(referrals->ReferralFlags), | ||
3973 | le16_to_cpu(referrals->TimeToLive))); | ||
3974 | /* BB This field is actually two bytes in from start of | ||
3975 | data block so we could do safety check that DataBlock | ||
3976 | begins at address of pSMBr->NumberOfReferrals */ | ||
3977 | *number_of_UNC_in_array = | ||
3978 | le16_to_cpu(pSMBr->NumberOfReferrals); | ||
3979 | |||
3980 | /* BB Fix below so can return more than one referral */ | ||
3981 | if (*number_of_UNC_in_array > 1) | ||
3982 | *number_of_UNC_in_array = 1; | ||
3983 | |||
3984 | /* get the length of the strings describing refs */ | ||
3985 | name_len = 0; | ||
3986 | for (i = 0; i < *number_of_UNC_in_array; i++) { | ||
3987 | /* make sure that DfsPathOffset not past end */ | ||
3988 | __u16 offset = | ||
3989 | le16_to_cpu(referrals->DfsPathOffset); | ||
3990 | if (offset > data_count) { | ||
3991 | /* if invalid referral, stop here and do | ||
3992 | not try to copy any more */ | ||
3993 | *number_of_UNC_in_array = i; | ||
3994 | break; | ||
3995 | } | ||
3996 | temp = ((char *)referrals) + offset; | ||
3997 | 4090 | ||
3998 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { | 4091 | /* parse returned result into more usable form */ |
3999 | name_len += UniStrnlen((wchar_t *)temp, | 4092 | rc = parse_DFS_referrals(pSMBr, num_of_nodes, |
4000 | data_count); | 4093 | target_nodes, nls_codepage); |
4001 | } else { | ||
4002 | name_len += strnlen(temp, data_count); | ||
4003 | } | ||
4004 | referrals++; | ||
4005 | /* BB add check that referral pointer does | ||
4006 | not fall off end PDU */ | ||
4007 | } | ||
4008 | /* BB add check for name_len bigger than bcc */ | ||
4009 | *targetUNCs = | ||
4010 | kmalloc(name_len+1+(*number_of_UNC_in_array), | ||
4011 | GFP_KERNEL); | ||
4012 | if (*targetUNCs == NULL) { | ||
4013 | rc = -ENOMEM; | ||
4014 | goto GetDFSRefExit; | ||
4015 | } | ||
4016 | /* copy the ref strings */ | ||
4017 | referrals = (struct dfs_referral_level_3 *) | ||
4018 | (8 /* sizeof data hdr */ + data_offset + | ||
4019 | (char *) &pSMBr->hdr.Protocol); | ||
4020 | |||
4021 | for (i = 0; i < *number_of_UNC_in_array; i++) { | ||
4022 | temp = ((char *)referrals) + | ||
4023 | le16_to_cpu(referrals->DfsPathOffset); | ||
4024 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { | ||
4025 | cifs_strfromUCS_le(*targetUNCs, | ||
4026 | (__le16 *) temp, | ||
4027 | name_len, | ||
4028 | nls_codepage); | ||
4029 | } else { | ||
4030 | strncpy(*targetUNCs, temp, name_len); | ||
4031 | } | ||
4032 | /* BB update target_uncs pointers */ | ||
4033 | referrals++; | ||
4034 | } | ||
4035 | temp = *targetUNCs; | ||
4036 | temp[name_len] = 0; | ||
4037 | } | ||
4038 | 4094 | ||
4039 | } | ||
4040 | GetDFSRefExit: | 4095 | GetDFSRefExit: |
4041 | if (pSMB) | 4096 | cifs_buf_release(pSMB); |
4042 | cifs_buf_release(pSMB); | ||
4043 | 4097 | ||
4044 | if (rc == -EAGAIN) | 4098 | if (rc == -EAGAIN) |
4045 | goto getDFSRetry; | 4099 | goto getDFSRetry; |
@@ -4229,7 +4283,8 @@ QFSAttributeRetry: | |||
4229 | params = 2; /* level */ | 4283 | params = 2; /* level */ |
4230 | pSMB->TotalDataCount = 0; | 4284 | pSMB->TotalDataCount = 0; |
4231 | pSMB->MaxParameterCount = cpu_to_le16(2); | 4285 | pSMB->MaxParameterCount = cpu_to_le16(2); |
4232 | pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ | 4286 | /* BB find exact max SMB PDU from sess structure BB */ |
4287 | pSMB->MaxDataCount = cpu_to_le16(1000); | ||
4233 | pSMB->MaxSetupCount = 0; | 4288 | pSMB->MaxSetupCount = 0; |
4234 | pSMB->Reserved = 0; | 4289 | pSMB->Reserved = 0; |
4235 | pSMB->Flags = 0; | 4290 | pSMB->Flags = 0; |
@@ -4298,7 +4353,8 @@ QFSDeviceRetry: | |||
4298 | params = 2; /* level */ | 4353 | params = 2; /* level */ |
4299 | pSMB->TotalDataCount = 0; | 4354 | pSMB->TotalDataCount = 0; |
4300 | pSMB->MaxParameterCount = cpu_to_le16(2); | 4355 | pSMB->MaxParameterCount = cpu_to_le16(2); |
4301 | pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ | 4356 | /* BB find exact max SMB PDU from sess structure BB */ |
4357 | pSMB->MaxDataCount = cpu_to_le16(1000); | ||
4302 | pSMB->MaxSetupCount = 0; | 4358 | pSMB->MaxSetupCount = 0; |
4303 | pSMB->Reserved = 0; | 4359 | pSMB->Reserved = 0; |
4304 | pSMB->Flags = 0; | 4360 | pSMB->Flags = 0; |
@@ -4369,7 +4425,8 @@ QFSUnixRetry: | |||
4369 | pSMB->DataCount = 0; | 4425 | pSMB->DataCount = 0; |
4370 | pSMB->DataOffset = 0; | 4426 | pSMB->DataOffset = 0; |
4371 | pSMB->MaxParameterCount = cpu_to_le16(2); | 4427 | pSMB->MaxParameterCount = cpu_to_le16(2); |
4372 | pSMB->MaxDataCount = cpu_to_le16(100); /* BB find exact max SMB PDU from sess structure BB */ | 4428 | /* BB find exact max SMB PDU from sess structure BB */ |
4429 | pSMB->MaxDataCount = cpu_to_le16(100); | ||
4373 | pSMB->MaxSetupCount = 0; | 4430 | pSMB->MaxSetupCount = 0; |
4374 | pSMB->Reserved = 0; | 4431 | pSMB->Reserved = 0; |
4375 | pSMB->Flags = 0; | 4432 | pSMB->Flags = 0; |
@@ -4444,7 +4501,8 @@ SETFSUnixRetry: | |||
4444 | offset = param_offset + params; | 4501 | offset = param_offset + params; |
4445 | 4502 | ||
4446 | pSMB->MaxParameterCount = cpu_to_le16(4); | 4503 | pSMB->MaxParameterCount = cpu_to_le16(4); |
4447 | pSMB->MaxDataCount = cpu_to_le16(100); /* BB find exact max SMB PDU from sess structure BB */ | 4504 | /* BB find exact max SMB PDU from sess structure BB */ |
4505 | pSMB->MaxDataCount = cpu_to_le16(100); | ||
4448 | pSMB->SetupCount = 1; | 4506 | pSMB->SetupCount = 1; |
4449 | pSMB->Reserved3 = 0; | 4507 | pSMB->Reserved3 = 0; |
4450 | pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FS_INFORMATION); | 4508 | pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FS_INFORMATION); |
@@ -4512,7 +4570,8 @@ QFSPosixRetry: | |||
4512 | pSMB->DataCount = 0; | 4570 | pSMB->DataCount = 0; |
4513 | pSMB->DataOffset = 0; | 4571 | pSMB->DataOffset = 0; |
4514 | pSMB->MaxParameterCount = cpu_to_le16(2); | 4572 | pSMB->MaxParameterCount = cpu_to_le16(2); |
4515 | pSMB->MaxDataCount = cpu_to_le16(100); /* BB find exact max SMB PDU from sess structure BB */ | 4573 | /* BB find exact max SMB PDU from sess structure BB */ |
4574 | pSMB->MaxDataCount = cpu_to_le16(100); | ||
4516 | pSMB->MaxSetupCount = 0; | 4575 | pSMB->MaxSetupCount = 0; |
4517 | pSMB->Reserved = 0; | 4576 | pSMB->Reserved = 0; |
4518 | pSMB->Flags = 0; | 4577 | pSMB->Flags = 0; |
@@ -4702,7 +4761,8 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, | |||
4702 | 4761 | ||
4703 | count = sizeof(struct file_end_of_file_info); | 4762 | count = sizeof(struct file_end_of_file_info); |
4704 | pSMB->MaxParameterCount = cpu_to_le16(2); | 4763 | pSMB->MaxParameterCount = cpu_to_le16(2); |
4705 | pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB PDU from sess */ | 4764 | /* BB find exact max SMB PDU from sess structure BB */ |
4765 | pSMB->MaxDataCount = cpu_to_le16(1000); | ||
4706 | pSMB->SetupCount = 1; | 4766 | pSMB->SetupCount = 1; |
4707 | pSMB->Reserved3 = 0; | 4767 | pSMB->Reserved3 = 0; |
4708 | pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION); | 4768 | pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION); |
@@ -4789,7 +4849,8 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, | |||
4789 | 4849 | ||
4790 | count = sizeof(FILE_BASIC_INFO); | 4850 | count = sizeof(FILE_BASIC_INFO); |
4791 | pSMB->MaxParameterCount = cpu_to_le16(2); | 4851 | pSMB->MaxParameterCount = cpu_to_le16(2); |
4792 | pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB PDU from sess */ | 4852 | /* BB find max SMB PDU from sess */ |
4853 | pSMB->MaxDataCount = cpu_to_le16(1000); | ||
4793 | pSMB->SetupCount = 1; | 4854 | pSMB->SetupCount = 1; |
4794 | pSMB->Reserved3 = 0; | 4855 | pSMB->Reserved3 = 0; |
4795 | pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION); | 4856 | pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION); |
@@ -4856,7 +4917,8 @@ SetTimesRetry: | |||
4856 | params = 6 + name_len; | 4917 | params = 6 + name_len; |
4857 | count = sizeof(FILE_BASIC_INFO); | 4918 | count = sizeof(FILE_BASIC_INFO); |
4858 | pSMB->MaxParameterCount = cpu_to_le16(2); | 4919 | pSMB->MaxParameterCount = cpu_to_le16(2); |
4859 | pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ | 4920 | /* BB find max SMB PDU from sess structure BB */ |
4921 | pSMB->MaxDataCount = cpu_to_le16(1000); | ||
4860 | pSMB->MaxSetupCount = 0; | 4922 | pSMB->MaxSetupCount = 0; |
4861 | pSMB->Reserved = 0; | 4923 | pSMB->Reserved = 0; |
4862 | pSMB->Flags = 0; | 4924 | pSMB->Flags = 0; |
@@ -4986,7 +5048,8 @@ setPermsRetry: | |||
4986 | params = 6 + name_len; | 5048 | params = 6 + name_len; |
4987 | count = sizeof(FILE_UNIX_BASIC_INFO); | 5049 | count = sizeof(FILE_UNIX_BASIC_INFO); |
4988 | pSMB->MaxParameterCount = cpu_to_le16(2); | 5050 | pSMB->MaxParameterCount = cpu_to_le16(2); |
4989 | pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ | 5051 | /* BB find max SMB PDU from sess structure BB */ |
5052 | pSMB->MaxDataCount = cpu_to_le16(1000); | ||
4990 | pSMB->MaxSetupCount = 0; | 5053 | pSMB->MaxSetupCount = 0; |
4991 | pSMB->Reserved = 0; | 5054 | pSMB->Reserved = 0; |
4992 | pSMB->Flags = 0; | 5055 | pSMB->Flags = 0; |
@@ -5051,8 +5114,7 @@ setPermsRetry: | |||
5051 | if (rc) | 5114 | if (rc) |
5052 | cFYI(1, ("SetPathInfo (perms) returned %d", rc)); | 5115 | cFYI(1, ("SetPathInfo (perms) returned %d", rc)); |
5053 | 5116 | ||
5054 | if (pSMB) | 5117 | cifs_buf_release(pSMB); |
5055 | cifs_buf_release(pSMB); | ||
5056 | if (rc == -EAGAIN) | 5118 | if (rc == -EAGAIN) |
5057 | goto setPermsRetry; | 5119 | goto setPermsRetry; |
5058 | return rc; | 5120 | return rc; |
@@ -5169,7 +5231,8 @@ QAllEAsRetry: | |||
5169 | params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */; | 5231 | params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */; |
5170 | pSMB->TotalDataCount = 0; | 5232 | pSMB->TotalDataCount = 0; |
5171 | pSMB->MaxParameterCount = cpu_to_le16(2); | 5233 | pSMB->MaxParameterCount = cpu_to_le16(2); |
5172 | pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */ | 5234 | /* BB find exact max SMB PDU from sess structure BB */ |
5235 | pSMB->MaxDataCount = cpu_to_le16(4000); | ||
5173 | pSMB->MaxSetupCount = 0; | 5236 | pSMB->MaxSetupCount = 0; |
5174 | pSMB->Reserved = 0; | 5237 | pSMB->Reserved = 0; |
5175 | pSMB->Flags = 0; | 5238 | pSMB->Flags = 0; |
@@ -5273,8 +5336,7 @@ QAllEAsRetry: | |||
5273 | } | 5336 | } |
5274 | } | 5337 | } |
5275 | } | 5338 | } |
5276 | if (pSMB) | 5339 | cifs_buf_release(pSMB); |
5277 | cifs_buf_release(pSMB); | ||
5278 | if (rc == -EAGAIN) | 5340 | if (rc == -EAGAIN) |
5279 | goto QAllEAsRetry; | 5341 | goto QAllEAsRetry; |
5280 | 5342 | ||
@@ -5317,7 +5379,8 @@ QEARetry: | |||
5317 | params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */; | 5379 | params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */; |
5318 | pSMB->TotalDataCount = 0; | 5380 | pSMB->TotalDataCount = 0; |
5319 | pSMB->MaxParameterCount = cpu_to_le16(2); | 5381 | pSMB->MaxParameterCount = cpu_to_le16(2); |
5320 | pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */ | 5382 | /* BB find exact max SMB PDU from sess structure BB */ |
5383 | pSMB->MaxDataCount = cpu_to_le16(4000); | ||
5321 | pSMB->MaxSetupCount = 0; | 5384 | pSMB->MaxSetupCount = 0; |
5322 | pSMB->Reserved = 0; | 5385 | pSMB->Reserved = 0; |
5323 | pSMB->Flags = 0; | 5386 | pSMB->Flags = 0; |
@@ -5422,8 +5485,7 @@ QEARetry: | |||
5422 | } | 5485 | } |
5423 | } | 5486 | } |
5424 | } | 5487 | } |
5425 | if (pSMB) | 5488 | cifs_buf_release(pSMB); |
5426 | cifs_buf_release(pSMB); | ||
5427 | if (rc == -EAGAIN) | 5489 | if (rc == -EAGAIN) |
5428 | goto QEARetry; | 5490 | goto QEARetry; |
5429 | 5491 | ||
@@ -5475,7 +5537,8 @@ SetEARetry: | |||
5475 | 5537 | ||
5476 | count = sizeof(*parm_data) + ea_value_len + name_len; | 5538 | count = sizeof(*parm_data) + ea_value_len + name_len; |
5477 | pSMB->MaxParameterCount = cpu_to_le16(2); | 5539 | pSMB->MaxParameterCount = cpu_to_le16(2); |
5478 | pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB size from sess */ | 5540 | /* BB find max SMB PDU from sess */ |
5541 | pSMB->MaxDataCount = cpu_to_le16(1000); | ||
5479 | pSMB->MaxSetupCount = 0; | 5542 | pSMB->MaxSetupCount = 0; |
5480 | pSMB->Reserved = 0; | 5543 | pSMB->Reserved = 0; |
5481 | pSMB->Flags = 0; | 5544 | pSMB->Flags = 0; |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index f428bf3bf1a9..023434f72c15 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -60,7 +60,7 @@ struct smb_vol { | |||
60 | char *domainname; | 60 | char *domainname; |
61 | char *UNC; | 61 | char *UNC; |
62 | char *UNCip; | 62 | char *UNCip; |
63 | char *in6_addr; /* ipv6 address as human readable form of in6_addr */ | 63 | char *in6_addr; /* ipv6 address as human readable form of in6_addr */ |
64 | char *iocharset; /* local code page for mapping to and from Unicode */ | 64 | char *iocharset; /* local code page for mapping to and from Unicode */ |
65 | char source_rfc1001_name[16]; /* netbios name of client */ | 65 | char source_rfc1001_name[16]; /* netbios name of client */ |
66 | char target_rfc1001_name[16]; /* netbios name of server for Win9x/ME */ | 66 | char target_rfc1001_name[16]; /* netbios name of server for Win9x/ME */ |
@@ -75,19 +75,21 @@ struct smb_vol { | |||
75 | bool setuids:1; | 75 | bool setuids:1; |
76 | bool override_uid:1; | 76 | bool override_uid:1; |
77 | bool override_gid:1; | 77 | bool override_gid:1; |
78 | bool dynperm:1; | ||
78 | bool noperm:1; | 79 | bool noperm:1; |
79 | bool no_psx_acl:1; /* set if posix acl support should be disabled */ | 80 | bool no_psx_acl:1; /* set if posix acl support should be disabled */ |
80 | bool cifs_acl:1; | 81 | bool cifs_acl:1; |
81 | bool no_xattr:1; /* set if xattr (EA) support should be disabled*/ | 82 | bool no_xattr:1; /* set if xattr (EA) support should be disabled*/ |
82 | bool server_ino:1; /* use inode numbers from server ie UniqueId */ | 83 | bool server_ino:1; /* use inode numbers from server ie UniqueId */ |
83 | bool direct_io:1; | 84 | bool direct_io:1; |
84 | bool remap:1; /* set to remap seven reserved chars in filenames */ | 85 | bool remap:1; /* set to remap seven reserved chars in filenames */ |
85 | bool posix_paths:1; /* unset to not ask for posix pathnames. */ | 86 | bool posix_paths:1; /* unset to not ask for posix pathnames. */ |
86 | bool no_linux_ext:1; | 87 | bool no_linux_ext:1; |
87 | bool sfu_emul:1; | 88 | bool sfu_emul:1; |
88 | bool nullauth:1; /* attempt to authenticate with null user */ | 89 | bool nullauth:1; /* attempt to authenticate with null user */ |
89 | unsigned nocase; /* request case insensitive filenames */ | 90 | bool nocase:1; /* request case insensitive filenames */ |
90 | unsigned nobrl; /* disable sending byte range locks to srv */ | 91 | bool nobrl:1; /* disable sending byte range locks to srv */ |
92 | bool seal:1; /* request transport encryption on share */ | ||
91 | unsigned int rsize; | 93 | unsigned int rsize; |
92 | unsigned int wsize; | 94 | unsigned int wsize; |
93 | unsigned int sockopt; | 95 | unsigned int sockopt; |
@@ -1246,6 +1248,10 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
1246 | vol->setuids = 1; | 1248 | vol->setuids = 1; |
1247 | } else if (strnicmp(data, "nosetuids", 9) == 0) { | 1249 | } else if (strnicmp(data, "nosetuids", 9) == 0) { |
1248 | vol->setuids = 0; | 1250 | vol->setuids = 0; |
1251 | } else if (strnicmp(data, "dynperm", 7) == 0) { | ||
1252 | vol->dynperm = true; | ||
1253 | } else if (strnicmp(data, "nodynperm", 9) == 0) { | ||
1254 | vol->dynperm = false; | ||
1249 | } else if (strnicmp(data, "nohard", 6) == 0) { | 1255 | } else if (strnicmp(data, "nohard", 6) == 0) { |
1250 | vol->retry = 0; | 1256 | vol->retry = 0; |
1251 | } else if (strnicmp(data, "nosoft", 6) == 0) { | 1257 | } else if (strnicmp(data, "nosoft", 6) == 0) { |
@@ -1268,8 +1274,12 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
1268 | vol->no_psx_acl = 1; | 1274 | vol->no_psx_acl = 1; |
1269 | } else if (strnicmp(data, "sign", 4) == 0) { | 1275 | } else if (strnicmp(data, "sign", 4) == 0) { |
1270 | vol->secFlg |= CIFSSEC_MUST_SIGN; | 1276 | vol->secFlg |= CIFSSEC_MUST_SIGN; |
1271 | /* } else if (strnicmp(data, "seal",4) == 0) { | 1277 | } else if (strnicmp(data, "seal", 4) == 0) { |
1272 | vol->secFlg |= CIFSSEC_MUST_SEAL; */ | 1278 | /* we do not do the following in secFlags because seal |
1279 | is a per tree connection (mount) not a per socket | ||
1280 | or per-smb connection option in the protocol */ | ||
1281 | /* vol->secFlg |= CIFSSEC_MUST_SEAL; */ | ||
1282 | vol->seal = 1; | ||
1273 | } else if (strnicmp(data, "direct", 6) == 0) { | 1283 | } else if (strnicmp(data, "direct", 6) == 0) { |
1274 | vol->direct_io = 1; | 1284 | vol->direct_io = 1; |
1275 | } else if (strnicmp(data, "forcedirectio", 13) == 0) { | 1285 | } else if (strnicmp(data, "forcedirectio", 13) == 0) { |
@@ -1414,34 +1424,12 @@ find_unc(__be32 new_target_ip_addr, char *uncName, char *userName) | |||
1414 | } | 1424 | } |
1415 | 1425 | ||
1416 | int | 1426 | int |
1417 | connect_to_dfs_path(int xid, struct cifsSesInfo *pSesInfo, | ||
1418 | const char *old_path, const struct nls_table *nls_codepage, | ||
1419 | int remap) | ||
1420 | { | ||
1421 | struct dfs_info3_param *referrals = NULL; | ||
1422 | unsigned int num_referrals; | ||
1423 | int rc = 0; | ||
1424 | |||
1425 | rc = get_dfs_path(xid, pSesInfo, old_path, nls_codepage, | ||
1426 | &num_referrals, &referrals, remap); | ||
1427 | |||
1428 | /* BB Add in code to: if valid refrl, if not ip address contact | ||
1429 | the helper that resolves tcp names, mount to it, try to | ||
1430 | tcon to it unmount it if fail */ | ||
1431 | |||
1432 | kfree(referrals); | ||
1433 | |||
1434 | return rc; | ||
1435 | } | ||
1436 | |||
1437 | int | ||
1438 | get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, const char *old_path, | 1427 | get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, const char *old_path, |
1439 | const struct nls_table *nls_codepage, unsigned int *pnum_referrals, | 1428 | const struct nls_table *nls_codepage, unsigned int *pnum_referrals, |
1440 | struct dfs_info3_param **preferrals, int remap) | 1429 | struct dfs_info3_param **preferrals, int remap) |
1441 | { | 1430 | { |
1442 | char *temp_unc; | 1431 | char *temp_unc; |
1443 | int rc = 0; | 1432 | int rc = 0; |
1444 | unsigned char *targetUNCs; | ||
1445 | 1433 | ||
1446 | *pnum_referrals = 0; | 1434 | *pnum_referrals = 0; |
1447 | *preferrals = NULL; | 1435 | *preferrals = NULL; |
@@ -1464,7 +1452,7 @@ get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, const char *old_path, | |||
1464 | kfree(temp_unc); | 1452 | kfree(temp_unc); |
1465 | } | 1453 | } |
1466 | if (rc == 0) | 1454 | if (rc == 0) |
1467 | rc = CIFSGetDFSRefer(xid, pSesInfo, old_path, &targetUNCs, | 1455 | rc = CIFSGetDFSRefer(xid, pSesInfo, old_path, preferrals, |
1468 | pnum_referrals, nls_codepage, remap); | 1456 | pnum_referrals, nls_codepage, remap); |
1469 | /* BB map targetUNCs to dfs_info3 structures, here or | 1457 | /* BB map targetUNCs to dfs_info3 structures, here or |
1470 | in CIFSGetDFSRefer BB */ | 1458 | in CIFSGetDFSRefer BB */ |
@@ -1815,7 +1803,7 @@ convert_delimiter(char *path, char delim) | |||
1815 | if (path == NULL) | 1803 | if (path == NULL) |
1816 | return; | 1804 | return; |
1817 | 1805 | ||
1818 | if (delim == '/') | 1806 | if (delim == '/') |
1819 | old_delim = '\\'; | 1807 | old_delim = '\\'; |
1820 | else | 1808 | else |
1821 | old_delim = '/'; | 1809 | old_delim = '/'; |
@@ -2125,6 +2113,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
2125 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_UID; | 2113 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_UID; |
2126 | if (volume_info.override_gid) | 2114 | if (volume_info.override_gid) |
2127 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_GID; | 2115 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_GID; |
2116 | if (volume_info.dynperm) | ||
2117 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DYNPERM; | ||
2128 | if (volume_info.direct_io) { | 2118 | if (volume_info.direct_io) { |
2129 | cFYI(1, ("mounting share using direct i/o")); | 2119 | cFYI(1, ("mounting share using direct i/o")); |
2130 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; | 2120 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; |
@@ -2141,6 +2131,9 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
2141 | for the retry flag is used */ | 2131 | for the retry flag is used */ |
2142 | tcon->retry = volume_info.retry; | 2132 | tcon->retry = volume_info.retry; |
2143 | tcon->nocase = volume_info.nocase; | 2133 | tcon->nocase = volume_info.nocase; |
2134 | if (tcon->seal != volume_info.seal) | ||
2135 | cERROR(1, ("transport encryption setting " | ||
2136 | "conflicts with existing tid")); | ||
2144 | } else { | 2137 | } else { |
2145 | tcon = tconInfoAlloc(); | 2138 | tcon = tconInfoAlloc(); |
2146 | if (tcon == NULL) | 2139 | if (tcon == NULL) |
@@ -2154,10 +2147,11 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
2154 | if ((strchr(volume_info.UNC + 3, '\\') == NULL) | 2147 | if ((strchr(volume_info.UNC + 3, '\\') == NULL) |
2155 | && (strchr(volume_info.UNC + 3, '/') == | 2148 | && (strchr(volume_info.UNC + 3, '/') == |
2156 | NULL)) { | 2149 | NULL)) { |
2157 | rc = connect_to_dfs_path(xid, pSesInfo, | 2150 | /* rc = connect_to_dfs_path(xid, pSesInfo, |
2158 | "", cifs_sb->local_nls, | 2151 | "", cifs_sb->local_nls, |
2159 | cifs_sb->mnt_cifs_flags & | 2152 | cifs_sb->mnt_cifs_flags & |
2160 | CIFS_MOUNT_MAP_SPECIAL_CHR); | 2153 | CIFS_MOUNT_MAP_SPECIAL_CHR);*/ |
2154 | cFYI(1, ("DFS root not supported")); | ||
2161 | rc = -ENODEV; | 2155 | rc = -ENODEV; |
2162 | goto out; | 2156 | goto out; |
2163 | } else { | 2157 | } else { |
@@ -2173,6 +2167,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
2173 | atomic_inc(&pSesInfo->inUse); | 2167 | atomic_inc(&pSesInfo->inUse); |
2174 | tcon->retry = volume_info.retry; | 2168 | tcon->retry = volume_info.retry; |
2175 | tcon->nocase = volume_info.nocase; | 2169 | tcon->nocase = volume_info.nocase; |
2170 | tcon->seal = volume_info.seal; | ||
2176 | } | 2171 | } |
2177 | } | 2172 | } |
2178 | } | 2173 | } |
@@ -2314,9 +2309,10 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, | |||
2314 | user = ses->userName; | 2309 | user = ses->userName; |
2315 | domain = ses->domainName; | 2310 | domain = ses->domainName; |
2316 | smb_buffer = cifs_buf_get(); | 2311 | smb_buffer = cifs_buf_get(); |
2317 | if (smb_buffer == NULL) { | 2312 | |
2313 | if (smb_buffer == NULL) | ||
2318 | return -ENOMEM; | 2314 | return -ENOMEM; |
2319 | } | 2315 | |
2320 | smb_buffer_response = smb_buffer; | 2316 | smb_buffer_response = smb_buffer; |
2321 | pSMBr = pSMB = (SESSION_SETUP_ANDX *) smb_buffer; | 2317 | pSMBr = pSMB = (SESSION_SETUP_ANDX *) smb_buffer; |
2322 | 2318 | ||
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index e4e0078a0526..f0b5b5f3dd2e 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
@@ -49,18 +49,25 @@ build_path_from_dentry(struct dentry *direntry) | |||
49 | struct dentry *temp; | 49 | struct dentry *temp; |
50 | int namelen; | 50 | int namelen; |
51 | int pplen; | 51 | int pplen; |
52 | int dfsplen; | ||
52 | char *full_path; | 53 | char *full_path; |
53 | char dirsep; | 54 | char dirsep; |
55 | struct cifs_sb_info *cifs_sb; | ||
54 | 56 | ||
55 | if (direntry == NULL) | 57 | if (direntry == NULL) |
56 | return NULL; /* not much we can do if dentry is freed and | 58 | return NULL; /* not much we can do if dentry is freed and |
57 | we need to reopen the file after it was closed implicitly | 59 | we need to reopen the file after it was closed implicitly |
58 | when the server crashed */ | 60 | when the server crashed */ |
59 | 61 | ||
60 | dirsep = CIFS_DIR_SEP(CIFS_SB(direntry->d_sb)); | 62 | cifs_sb = CIFS_SB(direntry->d_sb); |
61 | pplen = CIFS_SB(direntry->d_sb)->prepathlen; | 63 | dirsep = CIFS_DIR_SEP(cifs_sb); |
64 | pplen = cifs_sb->prepathlen; | ||
65 | if (cifs_sb->tcon && (cifs_sb->tcon->Flags & SMB_SHARE_IS_IN_DFS)) | ||
66 | dfsplen = strnlen(cifs_sb->tcon->treeName, MAX_TREE_SIZE + 1); | ||
67 | else | ||
68 | dfsplen = 0; | ||
62 | cifs_bp_rename_retry: | 69 | cifs_bp_rename_retry: |
63 | namelen = pplen; | 70 | namelen = pplen + dfsplen; |
64 | for (temp = direntry; !IS_ROOT(temp);) { | 71 | for (temp = direntry; !IS_ROOT(temp);) { |
65 | namelen += (1 + temp->d_name.len); | 72 | namelen += (1 + temp->d_name.len); |
66 | temp = temp->d_parent; | 73 | temp = temp->d_parent; |
@@ -91,7 +98,7 @@ cifs_bp_rename_retry: | |||
91 | return NULL; | 98 | return NULL; |
92 | } | 99 | } |
93 | } | 100 | } |
94 | if (namelen != pplen) { | 101 | if (namelen != pplen + dfsplen) { |
95 | cERROR(1, | 102 | cERROR(1, |
96 | ("did not end path lookup where expected namelen is %d", | 103 | ("did not end path lookup where expected namelen is %d", |
97 | namelen)); | 104 | namelen)); |
@@ -107,7 +114,18 @@ cifs_bp_rename_retry: | |||
107 | since the '\' is a valid posix character so we can not switch | 114 | since the '\' is a valid posix character so we can not switch |
108 | those safely to '/' if any are found in the middle of the prepath */ | 115 | those safely to '/' if any are found in the middle of the prepath */ |
109 | /* BB test paths to Windows with '/' in the midst of prepath */ | 116 | /* BB test paths to Windows with '/' in the midst of prepath */ |
110 | strncpy(full_path, CIFS_SB(direntry->d_sb)->prepath, pplen); | 117 | |
118 | if (dfsplen) { | ||
119 | strncpy(full_path, cifs_sb->tcon->treeName, dfsplen); | ||
120 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) { | ||
121 | int i; | ||
122 | for (i = 0; i < dfsplen; i++) { | ||
123 | if (full_path[i] == '\\') | ||
124 | full_path[i] = '/'; | ||
125 | } | ||
126 | } | ||
127 | } | ||
128 | strncpy(full_path + dfsplen, CIFS_SB(direntry->d_sb)->prepath, pplen); | ||
111 | return full_path; | 129 | return full_path; |
112 | } | 130 | } |
113 | 131 | ||
@@ -590,7 +608,7 @@ static int cifs_ci_compare(struct dentry *dentry, struct qstr *a, | |||
590 | * case take precedence. If a is not a negative dentry, this | 608 | * case take precedence. If a is not a negative dentry, this |
591 | * should have no side effects | 609 | * should have no side effects |
592 | */ | 610 | */ |
593 | memcpy(a->name, b->name, a->len); | 611 | memcpy((void *)a->name, b->name, a->len); |
594 | return 0; | 612 | return 0; |
595 | } | 613 | } |
596 | return 1; | 614 | return 1; |
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c index 939e256f8497..f730ef35499e 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/cifs/dns_resolve.c | |||
@@ -134,10 +134,6 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) | |||
134 | rkey = request_key(&key_type_dns_resolver, name, ""); | 134 | rkey = request_key(&key_type_dns_resolver, name, ""); |
135 | if (!IS_ERR(rkey)) { | 135 | if (!IS_ERR(rkey)) { |
136 | data = rkey->payload.data; | 136 | data = rkey->payload.data; |
137 | cFYI(1, ("%s: resolved: %s to %s", __func__, | ||
138 | rkey->description, | ||
139 | *ip_addr | ||
140 | )); | ||
141 | } else { | 137 | } else { |
142 | cERROR(1, ("%s: unable to resolve: %s", __func__, name)); | 138 | cERROR(1, ("%s: unable to resolve: %s", __func__, name)); |
143 | goto out; | 139 | goto out; |
@@ -150,6 +146,11 @@ skip_upcall: | |||
150 | if (*ip_addr) { | 146 | if (*ip_addr) { |
151 | memcpy(*ip_addr, data, len); | 147 | memcpy(*ip_addr, data, len); |
152 | (*ip_addr)[len] = '\0'; | 148 | (*ip_addr)[len] = '\0'; |
149 | if (!IS_ERR(rkey)) | ||
150 | cFYI(1, ("%s: resolved: %s to %s", __func__, | ||
151 | name, | ||
152 | *ip_addr | ||
153 | )); | ||
153 | rc = 0; | 154 | rc = 0; |
154 | } else { | 155 | } else { |
155 | rc = -ENOMEM; | 156 | rc = -ENOMEM; |
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 31a0a33b9d95..8636cec2642c 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -75,7 +75,11 @@ static inline int cifs_convert_flags(unsigned int flags) | |||
75 | return (GENERIC_READ | GENERIC_WRITE); | 75 | return (GENERIC_READ | GENERIC_WRITE); |
76 | } | 76 | } |
77 | 77 | ||
78 | return 0x20197; | 78 | return (READ_CONTROL | FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES | |
79 | FILE_WRITE_EA | FILE_APPEND_DATA | FILE_WRITE_DATA | | ||
80 | FILE_READ_DATA); | ||
81 | |||
82 | |||
79 | } | 83 | } |
80 | 84 | ||
81 | static inline int cifs_get_disposition(unsigned int flags) | 85 | static inline int cifs_get_disposition(unsigned int flags) |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index fcbdbb6ad7bf..129dbfe4dca7 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -161,118 +161,115 @@ static void cifs_unix_info_to_inode(struct inode *inode, | |||
161 | spin_unlock(&inode->i_lock); | 161 | spin_unlock(&inode->i_lock); |
162 | } | 162 | } |
163 | 163 | ||
164 | static const unsigned char *cifs_get_search_path(struct cifs_sb_info *cifs_sb, | ||
165 | const char *search_path) | ||
166 | { | ||
167 | int tree_len; | ||
168 | int path_len; | ||
169 | int i; | ||
170 | char *tmp_path; | ||
171 | struct cifsTconInfo *pTcon = cifs_sb->tcon; | ||
172 | |||
173 | if (!(pTcon->Flags & SMB_SHARE_IS_IN_DFS)) | ||
174 | return search_path; | ||
175 | 164 | ||
176 | /* use full path name for working with DFS */ | 165 | /* |
177 | tree_len = strnlen(pTcon->treeName, MAX_TREE_SIZE + 1); | 166 | * Needed to setup inode data for the directory which is the |
178 | path_len = strnlen(search_path, MAX_PATHCONF); | 167 | * junction to the new submount (ie to setup the fake directory |
179 | 168 | * which represents a DFS referral) | |
180 | tmp_path = kmalloc(tree_len+path_len+1, GFP_KERNEL); | 169 | */ |
181 | if (tmp_path == NULL) | 170 | static void fill_fake_finddataunix(FILE_UNIX_BASIC_INFO *pfnd_dat, |
182 | return search_path; | 171 | struct super_block *sb) |
172 | { | ||
173 | struct inode *pinode = NULL; | ||
174 | |||
175 | memset(pfnd_dat, 0, sizeof(FILE_UNIX_BASIC_INFO)); | ||
176 | |||
177 | /* __le64 pfnd_dat->EndOfFile = cpu_to_le64(0); | ||
178 | __le64 pfnd_dat->NumOfBytes = cpu_to_le64(0); | ||
179 | __u64 UniqueId = 0; */ | ||
180 | pfnd_dat->LastStatusChange = | ||
181 | cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME)); | ||
182 | pfnd_dat->LastAccessTime = | ||
183 | cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME)); | ||
184 | pfnd_dat->LastModificationTime = | ||
185 | cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME)); | ||
186 | pfnd_dat->Type = cpu_to_le32(UNIX_DIR); | ||
187 | pfnd_dat->Permissions = cpu_to_le64(S_IXUGO | S_IRWXU); | ||
188 | pfnd_dat->Nlinks = cpu_to_le64(2); | ||
189 | if (sb->s_root) | ||
190 | pinode = sb->s_root->d_inode; | ||
191 | if (pinode == NULL) | ||
192 | return; | ||
183 | 193 | ||
184 | strncpy(tmp_path, pTcon->treeName, tree_len); | 194 | /* fill in default values for the remaining based on root |
185 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) | 195 | inode since we can not query the server for this inode info */ |
186 | for (i = 0; i < tree_len; i++) { | 196 | pfnd_dat->DevMajor = cpu_to_le64(MAJOR(pinode->i_rdev)); |
187 | if (tmp_path[i] == '\\') | 197 | pfnd_dat->DevMinor = cpu_to_le64(MINOR(pinode->i_rdev)); |
188 | tmp_path[i] = '/'; | 198 | pfnd_dat->Uid = cpu_to_le64(pinode->i_uid); |
189 | } | 199 | pfnd_dat->Gid = cpu_to_le64(pinode->i_gid); |
190 | strncpy(tmp_path+tree_len, search_path, path_len); | ||
191 | tmp_path[tree_len+path_len] = 0; | ||
192 | return tmp_path; | ||
193 | } | 200 | } |
194 | 201 | ||
195 | int cifs_get_inode_info_unix(struct inode **pinode, | 202 | int cifs_get_inode_info_unix(struct inode **pinode, |
196 | const unsigned char *search_path, struct super_block *sb, int xid) | 203 | const unsigned char *full_path, struct super_block *sb, int xid) |
197 | { | 204 | { |
198 | int rc = 0; | 205 | int rc = 0; |
199 | FILE_UNIX_BASIC_INFO findData; | 206 | FILE_UNIX_BASIC_INFO find_data; |
200 | struct cifsTconInfo *pTcon; | 207 | struct cifsTconInfo *pTcon; |
201 | struct inode *inode; | 208 | struct inode *inode; |
202 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | 209 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); |
203 | const unsigned char *full_path; | ||
204 | bool is_dfs_referral = false; | 210 | bool is_dfs_referral = false; |
211 | struct cifsInodeInfo *cifsInfo; | ||
212 | __u64 num_of_bytes; | ||
213 | __u64 end_of_file; | ||
205 | 214 | ||
206 | pTcon = cifs_sb->tcon; | 215 | pTcon = cifs_sb->tcon; |
207 | cFYI(1, ("Getting info on %s", search_path)); | 216 | cFYI(1, ("Getting info on %s", full_path)); |
208 | 217 | ||
209 | full_path = cifs_get_search_path(cifs_sb, search_path); | ||
210 | |||
211 | try_again_CIFSSMBUnixQPathInfo: | ||
212 | /* could have done a find first instead but this returns more info */ | 218 | /* could have done a find first instead but this returns more info */ |
213 | rc = CIFSSMBUnixQPathInfo(xid, pTcon, full_path, &findData, | 219 | rc = CIFSSMBUnixQPathInfo(xid, pTcon, full_path, &find_data, |
214 | cifs_sb->local_nls, cifs_sb->mnt_cifs_flags & | 220 | cifs_sb->local_nls, cifs_sb->mnt_cifs_flags & |
215 | CIFS_MOUNT_MAP_SPECIAL_CHR); | 221 | CIFS_MOUNT_MAP_SPECIAL_CHR); |
216 | /* dump_mem("\nUnixQPathInfo return data", &findData, | ||
217 | sizeof(findData)); */ | ||
218 | if (rc) { | 222 | if (rc) { |
219 | if (rc == -EREMOTE && !is_dfs_referral) { | 223 | if (rc == -EREMOTE && !is_dfs_referral) { |
220 | is_dfs_referral = true; | 224 | is_dfs_referral = true; |
221 | if (full_path != search_path) { | 225 | cFYI(DBG2, ("DFS ref")); |
222 | kfree(full_path); | 226 | /* for DFS, server does not give us real inode data */ |
223 | full_path = search_path; | 227 | fill_fake_finddataunix(&find_data, sb); |
224 | } | 228 | rc = 0; |
225 | goto try_again_CIFSSMBUnixQPathInfo; | ||
226 | } | 229 | } |
227 | goto cgiiu_exit; | 230 | } |
228 | } else { | 231 | num_of_bytes = le64_to_cpu(find_data.NumOfBytes); |
229 | struct cifsInodeInfo *cifsInfo; | 232 | end_of_file = le64_to_cpu(find_data.EndOfFile); |
230 | __u64 num_of_bytes = le64_to_cpu(findData.NumOfBytes); | ||
231 | __u64 end_of_file = le64_to_cpu(findData.EndOfFile); | ||
232 | 233 | ||
233 | /* get new inode */ | 234 | /* get new inode */ |
235 | if (*pinode == NULL) { | ||
236 | *pinode = new_inode(sb); | ||
234 | if (*pinode == NULL) { | 237 | if (*pinode == NULL) { |
235 | *pinode = new_inode(sb); | 238 | rc = -ENOMEM; |
236 | if (*pinode == NULL) { | 239 | goto cgiiu_exit; |
237 | rc = -ENOMEM; | ||
238 | goto cgiiu_exit; | ||
239 | } | ||
240 | /* Is an i_ino of zero legal? */ | ||
241 | /* Are there sanity checks we can use to ensure that | ||
242 | the server is really filling in that field? */ | ||
243 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) { | ||
244 | (*pinode)->i_ino = | ||
245 | (unsigned long)findData.UniqueId; | ||
246 | } /* note ino incremented to unique num in new_inode */ | ||
247 | if (sb->s_flags & MS_NOATIME) | ||
248 | (*pinode)->i_flags |= S_NOATIME | S_NOCMTIME; | ||
249 | |||
250 | insert_inode_hash(*pinode); | ||
251 | } | 240 | } |
241 | /* Is an i_ino of zero legal? */ | ||
242 | /* note ino incremented to unique num in new_inode */ | ||
243 | /* Are there sanity checks we can use to ensure that | ||
244 | the server is really filling in that field? */ | ||
245 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) | ||
246 | (*pinode)->i_ino = (unsigned long)find_data.UniqueId; | ||
252 | 247 | ||
253 | inode = *pinode; | 248 | if (sb->s_flags & MS_NOATIME) |
254 | cifsInfo = CIFS_I(inode); | 249 | (*pinode)->i_flags |= S_NOATIME | S_NOCMTIME; |
255 | 250 | ||
256 | cFYI(1, ("Old time %ld", cifsInfo->time)); | 251 | insert_inode_hash(*pinode); |
257 | cifsInfo->time = jiffies; | 252 | } |
258 | cFYI(1, ("New time %ld", cifsInfo->time)); | ||
259 | /* this is ok to set on every inode revalidate */ | ||
260 | atomic_set(&cifsInfo->inUse, 1); | ||
261 | 253 | ||
262 | cifs_unix_info_to_inode(inode, &findData, 0); | 254 | inode = *pinode; |
255 | cifsInfo = CIFS_I(inode); | ||
263 | 256 | ||
257 | cFYI(1, ("Old time %ld", cifsInfo->time)); | ||
258 | cifsInfo->time = jiffies; | ||
259 | cFYI(1, ("New time %ld", cifsInfo->time)); | ||
260 | /* this is ok to set on every inode revalidate */ | ||
261 | atomic_set(&cifsInfo->inUse, 1); | ||
264 | 262 | ||
265 | if (num_of_bytes < end_of_file) | 263 | cifs_unix_info_to_inode(inode, &find_data, 0); |
266 | cFYI(1, ("allocation size less than end of file")); | ||
267 | cFYI(1, ("Size %ld and blocks %llu", | ||
268 | (unsigned long) inode->i_size, | ||
269 | (unsigned long long)inode->i_blocks)); | ||
270 | 264 | ||
271 | cifs_set_ops(inode, is_dfs_referral); | 265 | if (num_of_bytes < end_of_file) |
272 | } | 266 | cFYI(1, ("allocation size less than end of file")); |
267 | cFYI(1, ("Size %ld and blocks %llu", | ||
268 | (unsigned long) inode->i_size, | ||
269 | (unsigned long long)inode->i_blocks)); | ||
270 | |||
271 | cifs_set_ops(inode, is_dfs_referral); | ||
273 | cgiiu_exit: | 272 | cgiiu_exit: |
274 | if (full_path != search_path) | ||
275 | kfree(full_path); | ||
276 | return rc; | 273 | return rc; |
277 | } | 274 | } |
278 | 275 | ||
@@ -379,21 +376,51 @@ static int get_sfu_mode(struct inode *inode, | |||
379 | #endif | 376 | #endif |
380 | } | 377 | } |
381 | 378 | ||
379 | /* | ||
380 | * Needed to setup inode data for the directory which is the | ||
381 | * junction to the new submount (ie to setup the fake directory | ||
382 | * which represents a DFS referral) | ||
383 | */ | ||
384 | static void fill_fake_finddata(FILE_ALL_INFO *pfnd_dat, | ||
385 | struct super_block *sb) | ||
386 | { | ||
387 | memset(pfnd_dat, 0, sizeof(FILE_ALL_INFO)); | ||
388 | |||
389 | /* __le64 pfnd_dat->AllocationSize = cpu_to_le64(0); | ||
390 | __le64 pfnd_dat->EndOfFile = cpu_to_le64(0); | ||
391 | __u8 pfnd_dat->DeletePending = 0; | ||
392 | __u8 pfnd_data->Directory = 0; | ||
393 | __le32 pfnd_dat->EASize = 0; | ||
394 | __u64 pfnd_dat->IndexNumber = 0; | ||
395 | __u64 pfnd_dat->IndexNumber1 = 0; */ | ||
396 | pfnd_dat->CreationTime = | ||
397 | cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME)); | ||
398 | pfnd_dat->LastAccessTime = | ||
399 | cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME)); | ||
400 | pfnd_dat->LastWriteTime = | ||
401 | cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME)); | ||
402 | pfnd_dat->ChangeTime = | ||
403 | cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME)); | ||
404 | pfnd_dat->Attributes = cpu_to_le32(ATTR_DIRECTORY); | ||
405 | pfnd_dat->NumberOfLinks = cpu_to_le32(2); | ||
406 | } | ||
407 | |||
382 | int cifs_get_inode_info(struct inode **pinode, | 408 | int cifs_get_inode_info(struct inode **pinode, |
383 | const unsigned char *search_path, FILE_ALL_INFO *pfindData, | 409 | const unsigned char *full_path, FILE_ALL_INFO *pfindData, |
384 | struct super_block *sb, int xid, const __u16 *pfid) | 410 | struct super_block *sb, int xid, const __u16 *pfid) |
385 | { | 411 | { |
386 | int rc = 0; | 412 | int rc = 0; |
413 | __u32 attr; | ||
414 | struct cifsInodeInfo *cifsInfo; | ||
387 | struct cifsTconInfo *pTcon; | 415 | struct cifsTconInfo *pTcon; |
388 | struct inode *inode; | 416 | struct inode *inode; |
389 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | 417 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); |
390 | const unsigned char *full_path = NULL; | ||
391 | char *buf = NULL; | 418 | char *buf = NULL; |
392 | bool adjustTZ = false; | 419 | bool adjustTZ = false; |
393 | bool is_dfs_referral = false; | 420 | bool is_dfs_referral = false; |
394 | 421 | ||
395 | pTcon = cifs_sb->tcon; | 422 | pTcon = cifs_sb->tcon; |
396 | cFYI(1, ("Getting info on %s", search_path)); | 423 | cFYI(1, ("Getting info on %s", full_path)); |
397 | 424 | ||
398 | if ((pfindData == NULL) && (*pinode != NULL)) { | 425 | if ((pfindData == NULL) && (*pinode != NULL)) { |
399 | if (CIFS_I(*pinode)->clientCanCacheRead) { | 426 | if (CIFS_I(*pinode)->clientCanCacheRead) { |
@@ -409,9 +436,6 @@ int cifs_get_inode_info(struct inode **pinode, | |||
409 | return -ENOMEM; | 436 | return -ENOMEM; |
410 | pfindData = (FILE_ALL_INFO *)buf; | 437 | pfindData = (FILE_ALL_INFO *)buf; |
411 | 438 | ||
412 | full_path = cifs_get_search_path(cifs_sb, search_path); | ||
413 | |||
414 | try_again_CIFSSMBQPathInfo: | ||
415 | /* could do find first instead but this returns more info */ | 439 | /* could do find first instead but this returns more info */ |
416 | rc = CIFSSMBQPathInfo(xid, pTcon, full_path, pfindData, | 440 | rc = CIFSSMBQPathInfo(xid, pTcon, full_path, pfindData, |
417 | 0 /* not legacy */, | 441 | 0 /* not legacy */, |
@@ -429,178 +453,168 @@ try_again_CIFSSMBQPathInfo: | |||
429 | } | 453 | } |
430 | } | 454 | } |
431 | /* dump_mem("\nQPathInfo return data",&findData, sizeof(findData)); */ | 455 | /* dump_mem("\nQPathInfo return data",&findData, sizeof(findData)); */ |
432 | if (rc) { | 456 | if (rc == -EREMOTE) { |
433 | if (rc == -EREMOTE && !is_dfs_referral) { | 457 | is_dfs_referral = true; |
434 | is_dfs_referral = true; | 458 | fill_fake_finddata(pfindData, sb); |
435 | if (full_path != search_path) { | 459 | rc = 0; |
436 | kfree(full_path); | 460 | } else if (rc) |
437 | full_path = search_path; | ||
438 | } | ||
439 | goto try_again_CIFSSMBQPathInfo; | ||
440 | } | ||
441 | goto cgii_exit; | 461 | goto cgii_exit; |
442 | } else { | ||
443 | struct cifsInodeInfo *cifsInfo; | ||
444 | __u32 attr = le32_to_cpu(pfindData->Attributes); | ||
445 | 462 | ||
446 | /* get new inode */ | 463 | attr = le32_to_cpu(pfindData->Attributes); |
447 | if (*pinode == NULL) { | ||
448 | *pinode = new_inode(sb); | ||
449 | if (*pinode == NULL) { | ||
450 | rc = -ENOMEM; | ||
451 | goto cgii_exit; | ||
452 | } | ||
453 | /* Is an i_ino of zero legal? Can we use that to check | ||
454 | if the server supports returning inode numbers? Are | ||
455 | there other sanity checks we can use to ensure that | ||
456 | the server is really filling in that field? */ | ||
457 | 464 | ||
458 | /* We can not use the IndexNumber field by default from | 465 | /* get new inode */ |
459 | Windows or Samba (in ALL_INFO buf) but we can request | 466 | if (*pinode == NULL) { |
460 | it explicitly. It may not be unique presumably if | 467 | *pinode = new_inode(sb); |
461 | the server has multiple devices mounted under one | 468 | if (*pinode == NULL) { |
462 | share */ | 469 | rc = -ENOMEM; |
463 | 470 | goto cgii_exit; | |
464 | /* There may be higher info levels that work but are | 471 | } |
465 | there Windows server or network appliances for which | 472 | /* Is an i_ino of zero legal? Can we use that to check |
466 | IndexNumber field is not guaranteed unique? */ | 473 | if the server supports returning inode numbers? Are |
467 | 474 | there other sanity checks we can use to ensure that | |
468 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) { | 475 | the server is really filling in that field? */ |
469 | int rc1 = 0; | 476 | |
470 | __u64 inode_num; | 477 | /* We can not use the IndexNumber field by default from |
471 | 478 | Windows or Samba (in ALL_INFO buf) but we can request | |
472 | rc1 = CIFSGetSrvInodeNumber(xid, pTcon, | 479 | it explicitly. It may not be unique presumably if |
473 | search_path, &inode_num, | 480 | the server has multiple devices mounted under one share */ |
481 | |||
482 | /* There may be higher info levels that work but are | ||
483 | there Windows server or network appliances for which | ||
484 | IndexNumber field is not guaranteed unique? */ | ||
485 | |||
486 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) { | ||
487 | int rc1 = 0; | ||
488 | __u64 inode_num; | ||
489 | |||
490 | rc1 = CIFSGetSrvInodeNumber(xid, pTcon, | ||
491 | full_path, &inode_num, | ||
474 | cifs_sb->local_nls, | 492 | cifs_sb->local_nls, |
475 | cifs_sb->mnt_cifs_flags & | 493 | cifs_sb->mnt_cifs_flags & |
476 | CIFS_MOUNT_MAP_SPECIAL_CHR); | 494 | CIFS_MOUNT_MAP_SPECIAL_CHR); |
477 | if (rc1) { | 495 | if (rc1) { |
478 | cFYI(1, ("GetSrvInodeNum rc %d", rc1)); | 496 | cFYI(1, ("GetSrvInodeNum rc %d", rc1)); |
479 | /* BB EOPNOSUPP disable SERVER_INUM? */ | 497 | /* BB EOPNOSUPP disable SERVER_INUM? */ |
480 | } else /* do we need cast or hash to ino? */ | 498 | } else /* do we need cast or hash to ino? */ |
481 | (*pinode)->i_ino = inode_num; | 499 | (*pinode)->i_ino = inode_num; |
482 | } /* else ino incremented to unique num in new_inode*/ | 500 | } /* else ino incremented to unique num in new_inode*/ |
483 | if (sb->s_flags & MS_NOATIME) | 501 | if (sb->s_flags & MS_NOATIME) |
484 | (*pinode)->i_flags |= S_NOATIME | S_NOCMTIME; | 502 | (*pinode)->i_flags |= S_NOATIME | S_NOCMTIME; |
485 | insert_inode_hash(*pinode); | 503 | insert_inode_hash(*pinode); |
486 | } | 504 | } |
487 | inode = *pinode; | 505 | inode = *pinode; |
488 | cifsInfo = CIFS_I(inode); | 506 | cifsInfo = CIFS_I(inode); |
489 | cifsInfo->cifsAttrs = attr; | 507 | cifsInfo->cifsAttrs = attr; |
490 | cFYI(1, ("Old time %ld", cifsInfo->time)); | 508 | cFYI(1, ("Old time %ld", cifsInfo->time)); |
491 | cifsInfo->time = jiffies; | 509 | cifsInfo->time = jiffies; |
492 | cFYI(1, ("New time %ld", cifsInfo->time)); | 510 | cFYI(1, ("New time %ld", cifsInfo->time)); |
493 | 511 | ||
494 | /* blksize needs to be multiple of two. So safer to default to | 512 | /* blksize needs to be multiple of two. So safer to default to |
495 | blksize and blkbits set in superblock so 2**blkbits and blksize | 513 | blksize and blkbits set in superblock so 2**blkbits and blksize |
496 | will match rather than setting to: | 514 | will match rather than setting to: |
497 | (pTcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFE00;*/ | 515 | (pTcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFE00;*/ |
498 | 516 | ||
499 | /* Linux can not store file creation time so ignore it */ | 517 | /* Linux can not store file creation time so ignore it */ |
500 | if (pfindData->LastAccessTime) | 518 | if (pfindData->LastAccessTime) |
501 | inode->i_atime = cifs_NTtimeToUnix | 519 | inode->i_atime = cifs_NTtimeToUnix |
502 | (le64_to_cpu(pfindData->LastAccessTime)); | 520 | (le64_to_cpu(pfindData->LastAccessTime)); |
503 | else /* do not need to use current_fs_time - time not stored */ | 521 | else /* do not need to use current_fs_time - time not stored */ |
504 | inode->i_atime = CURRENT_TIME; | 522 | inode->i_atime = CURRENT_TIME; |
505 | inode->i_mtime = | 523 | inode->i_mtime = |
506 | cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastWriteTime)); | 524 | cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastWriteTime)); |
507 | inode->i_ctime = | 525 | inode->i_ctime = |
508 | cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime)); | 526 | cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime)); |
509 | cFYI(0, ("Attributes came in as 0x%x", attr)); | 527 | cFYI(DBG2, ("Attributes came in as 0x%x", attr)); |
510 | if (adjustTZ && (pTcon->ses) && (pTcon->ses->server)) { | 528 | if (adjustTZ && (pTcon->ses) && (pTcon->ses->server)) { |
511 | inode->i_ctime.tv_sec += pTcon->ses->server->timeAdj; | 529 | inode->i_ctime.tv_sec += pTcon->ses->server->timeAdj; |
512 | inode->i_mtime.tv_sec += pTcon->ses->server->timeAdj; | 530 | inode->i_mtime.tv_sec += pTcon->ses->server->timeAdj; |
513 | } | 531 | } |
514 | 532 | ||
515 | /* set default mode. will override for dirs below */ | 533 | /* set default mode. will override for dirs below */ |
516 | if (atomic_read(&cifsInfo->inUse) == 0) | 534 | if (atomic_read(&cifsInfo->inUse) == 0) |
517 | /* new inode, can safely set these fields */ | 535 | /* new inode, can safely set these fields */ |
518 | inode->i_mode = cifs_sb->mnt_file_mode; | 536 | inode->i_mode = cifs_sb->mnt_file_mode; |
519 | else /* since we set the inode type below we need to mask off | 537 | else /* since we set the inode type below we need to mask off |
520 | to avoid strange results if type changes and both | 538 | to avoid strange results if type changes and both |
521 | get orred in */ | 539 | get orred in */ |
522 | inode->i_mode &= ~S_IFMT; | 540 | inode->i_mode &= ~S_IFMT; |
523 | /* if (attr & ATTR_REPARSE) */ | 541 | /* if (attr & ATTR_REPARSE) */ |
524 | /* We no longer handle these as symlinks because we could not | 542 | /* We no longer handle these as symlinks because we could not |
525 | follow them due to the absolute path with drive letter */ | 543 | follow them due to the absolute path with drive letter */ |
526 | if (attr & ATTR_DIRECTORY) { | 544 | if (attr & ATTR_DIRECTORY) { |
527 | /* override default perms since we do not do byte range locking | 545 | /* override default perms since we do not do byte range locking |
528 | on dirs */ | 546 | on dirs */ |
529 | inode->i_mode = cifs_sb->mnt_dir_mode; | 547 | inode->i_mode = cifs_sb->mnt_dir_mode; |
530 | inode->i_mode |= S_IFDIR; | 548 | inode->i_mode |= S_IFDIR; |
531 | } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && | 549 | } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && |
532 | (cifsInfo->cifsAttrs & ATTR_SYSTEM) && | 550 | (cifsInfo->cifsAttrs & ATTR_SYSTEM) && |
533 | /* No need to le64 convert size of zero */ | 551 | /* No need to le64 convert size of zero */ |
534 | (pfindData->EndOfFile == 0)) { | 552 | (pfindData->EndOfFile == 0)) { |
535 | inode->i_mode = cifs_sb->mnt_file_mode; | 553 | inode->i_mode = cifs_sb->mnt_file_mode; |
536 | inode->i_mode |= S_IFIFO; | 554 | inode->i_mode |= S_IFIFO; |
537 | /* BB Finish for SFU style symlinks and devices */ | 555 | /* BB Finish for SFU style symlinks and devices */ |
538 | } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && | 556 | } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && |
539 | (cifsInfo->cifsAttrs & ATTR_SYSTEM)) { | 557 | (cifsInfo->cifsAttrs & ATTR_SYSTEM)) { |
540 | if (decode_sfu_inode(inode, | 558 | if (decode_sfu_inode(inode, le64_to_cpu(pfindData->EndOfFile), |
541 | le64_to_cpu(pfindData->EndOfFile), | 559 | full_path, cifs_sb, xid)) |
542 | search_path, | 560 | cFYI(1, ("Unrecognized sfu inode type")); |
543 | cifs_sb, xid)) | ||
544 | cFYI(1, ("Unrecognized sfu inode type")); | ||
545 | |||
546 | cFYI(1, ("sfu mode 0%o", inode->i_mode)); | ||
547 | } else { | ||
548 | inode->i_mode |= S_IFREG; | ||
549 | /* treat the dos attribute of read-only as read-only | ||
550 | mode e.g. 555 */ | ||
551 | if (cifsInfo->cifsAttrs & ATTR_READONLY) | ||
552 | inode->i_mode &= ~(S_IWUGO); | ||
553 | else if ((inode->i_mode & S_IWUGO) == 0) | ||
554 | /* the ATTR_READONLY flag may have been */ | ||
555 | /* changed on server -- set any w bits */ | ||
556 | /* allowed by mnt_file_mode */ | ||
557 | inode->i_mode |= (S_IWUGO & | ||
558 | cifs_sb->mnt_file_mode); | ||
559 | /* BB add code here - | ||
560 | validate if device or weird share or device type? */ | ||
561 | } | ||
562 | 561 | ||
563 | spin_lock(&inode->i_lock); | 562 | cFYI(1, ("sfu mode 0%o", inode->i_mode)); |
564 | if (is_size_safe_to_change(cifsInfo, | 563 | } else { |
565 | le64_to_cpu(pfindData->EndOfFile))) { | 564 | inode->i_mode |= S_IFREG; |
566 | /* can not safely shrink the file size here if the | 565 | /* treat dos attribute of read-only as read-only mode eg 555 */ |
567 | client is writing to it due to potential races */ | 566 | if (cifsInfo->cifsAttrs & ATTR_READONLY) |
568 | i_size_write(inode, le64_to_cpu(pfindData->EndOfFile)); | 567 | inode->i_mode &= ~(S_IWUGO); |
569 | 568 | else if ((inode->i_mode & S_IWUGO) == 0) | |
570 | /* 512 bytes (2**9) is the fake blocksize that must be | 569 | /* the ATTR_READONLY flag may have been */ |
571 | used for this calculation */ | 570 | /* changed on server -- set any w bits */ |
572 | inode->i_blocks = (512 - 1 + le64_to_cpu( | 571 | /* allowed by mnt_file_mode */ |
573 | pfindData->AllocationSize)) >> 9; | 572 | inode->i_mode |= (S_IWUGO & cifs_sb->mnt_file_mode); |
574 | } | 573 | /* BB add code to validate if device or weird share or device type? */ |
575 | spin_unlock(&inode->i_lock); | 574 | } |
575 | |||
576 | spin_lock(&inode->i_lock); | ||
577 | if (is_size_safe_to_change(cifsInfo, | ||
578 | le64_to_cpu(pfindData->EndOfFile))) { | ||
579 | /* can not safely shrink the file size here if the | ||
580 | client is writing to it due to potential races */ | ||
581 | i_size_write(inode, le64_to_cpu(pfindData->EndOfFile)); | ||
582 | |||
583 | /* 512 bytes (2**9) is the fake blocksize that must be | ||
584 | used for this calculation */ | ||
585 | inode->i_blocks = (512 - 1 + le64_to_cpu( | ||
586 | pfindData->AllocationSize)) >> 9; | ||
587 | } | ||
588 | spin_unlock(&inode->i_lock); | ||
576 | 589 | ||
577 | inode->i_nlink = le32_to_cpu(pfindData->NumberOfLinks); | 590 | inode->i_nlink = le32_to_cpu(pfindData->NumberOfLinks); |
578 | 591 | ||
579 | /* BB fill in uid and gid here? with help from winbind? | 592 | /* BB fill in uid and gid here? with help from winbind? |
580 | or retrieve from NTFS stream extended attribute */ | 593 | or retrieve from NTFS stream extended attribute */ |
581 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 594 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
582 | /* fill in 0777 bits from ACL */ | 595 | /* fill in 0777 bits from ACL */ |
583 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) { | 596 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) { |
584 | cFYI(1, ("Getting mode bits from ACL")); | 597 | cFYI(1, ("Getting mode bits from ACL")); |
585 | acl_to_uid_mode(inode, search_path, pfid); | 598 | acl_to_uid_mode(inode, full_path, pfid); |
586 | } | 599 | } |
587 | #endif | 600 | #endif |
588 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) { | 601 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) { |
589 | /* fill in remaining high mode bits e.g. SUID, VTX */ | 602 | /* fill in remaining high mode bits e.g. SUID, VTX */ |
590 | get_sfu_mode(inode, search_path, cifs_sb, xid); | 603 | get_sfu_mode(inode, full_path, cifs_sb, xid); |
591 | } else if (atomic_read(&cifsInfo->inUse) == 0) { | 604 | } else if (atomic_read(&cifsInfo->inUse) == 0) { |
592 | inode->i_uid = cifs_sb->mnt_uid; | 605 | inode->i_uid = cifs_sb->mnt_uid; |
593 | inode->i_gid = cifs_sb->mnt_gid; | 606 | inode->i_gid = cifs_sb->mnt_gid; |
594 | /* set so we do not keep refreshing these fields with | 607 | /* set so we do not keep refreshing these fields with |
595 | bad data after user has changed them in memory */ | 608 | bad data after user has changed them in memory */ |
596 | atomic_set(&cifsInfo->inUse, 1); | 609 | atomic_set(&cifsInfo->inUse, 1); |
597 | } | ||
598 | |||
599 | cifs_set_ops(inode, is_dfs_referral); | ||
600 | } | 610 | } |
611 | |||
612 | cifs_set_ops(inode, is_dfs_referral); | ||
613 | |||
614 | |||
615 | |||
616 | |||
601 | cgii_exit: | 617 | cgii_exit: |
602 | if (full_path != search_path) | ||
603 | kfree(full_path); | ||
604 | kfree(buf); | 618 | kfree(buf); |
605 | return rc; | 619 | return rc; |
606 | } | 620 | } |
@@ -1502,8 +1516,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
1502 | int oplock = 0; | 1516 | int oplock = 0; |
1503 | 1517 | ||
1504 | rc = SMBLegacyOpen(xid, pTcon, full_path, | 1518 | rc = SMBLegacyOpen(xid, pTcon, full_path, |
1505 | FILE_OPEN, | 1519 | FILE_OPEN, GENERIC_WRITE, |
1506 | SYNCHRONIZE | FILE_WRITE_ATTRIBUTES, | ||
1507 | CREATE_NOT_DIR, &netfid, &oplock, | 1520 | CREATE_NOT_DIR, &netfid, &oplock, |
1508 | NULL, cifs_sb->local_nls, | 1521 | NULL, cifs_sb->local_nls, |
1509 | cifs_sb->mnt_cifs_flags & | 1522 | cifs_sb->mnt_cifs_flags & |
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index 5c792df13d62..0088a5b52564 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c | |||
@@ -30,9 +30,9 @@ | |||
30 | 30 | ||
31 | #define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2) | 31 | #define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2) |
32 | 32 | ||
33 | int cifs_ioctl(struct inode *inode, struct file *filep, | 33 | long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) |
34 | unsigned int command, unsigned long arg) | ||
35 | { | 34 | { |
35 | struct inode *inode = filep->f_dentry->d_inode; | ||
36 | int rc = -ENOTTY; /* strange error - but the precedent */ | 36 | int rc = -ENOTTY; /* strange error - but the precedent */ |
37 | int xid; | 37 | int xid; |
38 | struct cifs_sb_info *cifs_sb; | 38 | struct cifs_sb_info *cifs_sb; |
diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 1c2c3ce5020b..63f644000ce5 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c | |||
@@ -234,7 +234,6 @@ cifs_readlink(struct dentry *direntry, char __user *pBuffer, int buflen) | |||
234 | struct cifs_sb_info *cifs_sb; | 234 | struct cifs_sb_info *cifs_sb; |
235 | struct cifsTconInfo *pTcon; | 235 | struct cifsTconInfo *pTcon; |
236 | char *full_path = NULL; | 236 | char *full_path = NULL; |
237 | char *tmp_path = NULL; | ||
238 | char *tmpbuffer; | 237 | char *tmpbuffer; |
239 | int len; | 238 | int len; |
240 | __u16 fid; | 239 | __u16 fid; |
@@ -295,45 +294,9 @@ cifs_readlink(struct dentry *direntry, char __user *pBuffer, int buflen) | |||
295 | cFYI(1, ("Error closing junction point " | 294 | cFYI(1, ("Error closing junction point " |
296 | "(open for ioctl)")); | 295 | "(open for ioctl)")); |
297 | } | 296 | } |
298 | /* BB unwind this long, nested function, or remove BB */ | 297 | /* If it is a DFS junction earlier we would have gotten |
299 | if (rc == -EIO) { | 298 | PATH_NOT_COVERED returned from server so we do |
300 | /* Query if DFS Junction */ | 299 | not need to request the DFS info here */ |
301 | unsigned int num_referrals = 0; | ||
302 | struct dfs_info3_param *refs = NULL; | ||
303 | tmp_path = | ||
304 | kmalloc(MAX_TREE_SIZE + MAX_PATHCONF + 1, | ||
305 | GFP_KERNEL); | ||
306 | if (tmp_path) { | ||
307 | strncpy(tmp_path, pTcon->treeName, | ||
308 | MAX_TREE_SIZE); | ||
309 | strncat(tmp_path, full_path, | ||
310 | MAX_PATHCONF); | ||
311 | rc = get_dfs_path(xid, pTcon->ses, | ||
312 | tmp_path, | ||
313 | cifs_sb->local_nls, | ||
314 | &num_referrals, &refs, | ||
315 | cifs_sb->mnt_cifs_flags & | ||
316 | CIFS_MOUNT_MAP_SPECIAL_CHR); | ||
317 | cFYI(1, ("Get DFS for %s rc = %d ", | ||
318 | tmp_path, rc)); | ||
319 | if ((num_referrals == 0) && (rc == 0)) | ||
320 | rc = -EACCES; | ||
321 | else { | ||
322 | cFYI(1, ("num referral: %d", | ||
323 | num_referrals)); | ||
324 | if (refs && refs->path_name) { | ||
325 | strncpy(tmpbuffer, | ||
326 | refs->path_name, | ||
327 | len-1); | ||
328 | } | ||
329 | } | ||
330 | kfree(refs); | ||
331 | kfree(tmp_path); | ||
332 | } | ||
333 | /* BB add code like else decode referrals | ||
334 | then memcpy to tmpbuffer and free referrals | ||
335 | string array BB */ | ||
336 | } | ||
337 | } | 300 | } |
338 | } | 301 | } |
339 | /* BB Anything else to do to handle recursive links? */ | 302 | /* BB Anything else to do to handle recursive links? */ |
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index 00f4cff400b3..8703d68f5b20 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c | |||
@@ -141,11 +141,11 @@ cifs_inet_pton(const int address_family, const char *cp, void *dst) | |||
141 | int ret = 0; | 141 | int ret = 0; |
142 | 142 | ||
143 | /* calculate length by finding first slash or NULL */ | 143 | /* calculate length by finding first slash or NULL */ |
144 | if (address_family == AF_INET) { | 144 | if (address_family == AF_INET) |
145 | ret = in4_pton(cp, -1 /* len */, dst, '\\', NULL); | 145 | ret = in4_pton(cp, -1 /* len */, dst, '\\', NULL); |
146 | } else if (address_family == AF_INET6) { | 146 | else if (address_family == AF_INET6) |
147 | ret = in6_pton(cp, -1 /* len */, dst , '\\', NULL); | 147 | ret = in6_pton(cp, -1 /* len */, dst , '\\', NULL); |
148 | } | 148 | |
149 | cFYI(DBG2, ("address conversion returned %d for %s", ret, cp)); | 149 | cFYI(DBG2, ("address conversion returned %d for %s", ret, cp)); |
150 | if (ret > 0) | 150 | if (ret > 0) |
151 | ret = 1; | 151 | ret = 1; |
diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h index 7170a9b70f1e..c377d8065d99 100644 --- a/fs/cifs/ntlmssp.h +++ b/fs/cifs/ntlmssp.h | |||
@@ -64,7 +64,7 @@ typedef struct _SECURITY_BUFFER { | |||
64 | } __attribute__((packed)) SECURITY_BUFFER; | 64 | } __attribute__((packed)) SECURITY_BUFFER; |
65 | 65 | ||
66 | typedef struct _NEGOTIATE_MESSAGE { | 66 | typedef struct _NEGOTIATE_MESSAGE { |
67 | __u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; | 67 | __u8 Signature[sizeof(NTLMSSP_SIGNATURE)]; |
68 | __le32 MessageType; /* 1 */ | 68 | __le32 MessageType; /* 1 */ |
69 | __le32 NegotiateFlags; | 69 | __le32 NegotiateFlags; |
70 | SECURITY_BUFFER DomainName; /* RFC 1001 style and ASCII */ | 70 | SECURITY_BUFFER DomainName; /* RFC 1001 style and ASCII */ |
@@ -74,7 +74,7 @@ typedef struct _NEGOTIATE_MESSAGE { | |||
74 | } __attribute__((packed)) NEGOTIATE_MESSAGE, *PNEGOTIATE_MESSAGE; | 74 | } __attribute__((packed)) NEGOTIATE_MESSAGE, *PNEGOTIATE_MESSAGE; |
75 | 75 | ||
76 | typedef struct _CHALLENGE_MESSAGE { | 76 | typedef struct _CHALLENGE_MESSAGE { |
77 | __u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; | 77 | __u8 Signature[sizeof(NTLMSSP_SIGNATURE)]; |
78 | __le32 MessageType; /* 2 */ | 78 | __le32 MessageType; /* 2 */ |
79 | SECURITY_BUFFER TargetName; | 79 | SECURITY_BUFFER TargetName; |
80 | __le32 NegotiateFlags; | 80 | __le32 NegotiateFlags; |
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 34ec32100c72..713c25110197 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
@@ -670,8 +670,11 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, | |||
670 | (index_to_find < first_entry_in_buffer)) { | 670 | (index_to_find < first_entry_in_buffer)) { |
671 | /* close and restart search */ | 671 | /* close and restart search */ |
672 | cFYI(1, ("search backing up - close and restart search")); | 672 | cFYI(1, ("search backing up - close and restart search")); |
673 | cifsFile->invalidHandle = true; | 673 | if (!cifsFile->srch_inf.endOfSearch && |
674 | CIFSFindClose(xid, pTcon, cifsFile->netfid); | 674 | !cifsFile->invalidHandle) { |
675 | cifsFile->invalidHandle = true; | ||
676 | CIFSFindClose(xid, pTcon, cifsFile->netfid); | ||
677 | } | ||
675 | kfree(cifsFile->search_resume_name); | 678 | kfree(cifsFile->search_resume_name); |
676 | cifsFile->search_resume_name = NULL; | 679 | cifsFile->search_resume_name = NULL; |
677 | if (cifsFile->srch_inf.ntwrk_buf_start) { | 680 | if (cifsFile->srch_inf.ntwrk_buf_start) { |
diff --git a/fs/compat.c b/fs/compat.c index 332a869d2c53..ed43e17a5dc6 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -1405,7 +1405,7 @@ int compat_do_execve(char * filename, | |||
1405 | /* execve success */ | 1405 | /* execve success */ |
1406 | security_bprm_free(bprm); | 1406 | security_bprm_free(bprm); |
1407 | acct_update_integrals(current); | 1407 | acct_update_integrals(current); |
1408 | kfree(bprm); | 1408 | free_bprm(bprm); |
1409 | return retval; | 1409 | return retval; |
1410 | } | 1410 | } |
1411 | 1411 | ||
@@ -1424,7 +1424,7 @@ out_file: | |||
1424 | } | 1424 | } |
1425 | 1425 | ||
1426 | out_kfree: | 1426 | out_kfree: |
1427 | kfree(bprm); | 1427 | free_bprm(bprm); |
1428 | 1428 | ||
1429 | out_ret: | 1429 | out_ret: |
1430 | return retval; | 1430 | return retval; |
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 7c1e5e5cccd8..637018c891ef 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <linux/pagemap.h> | 50 | #include <linux/pagemap.h> |
51 | #include <linux/idr.h> | 51 | #include <linux/idr.h> |
52 | #include <linux/file.h> | 52 | #include <linux/file.h> |
53 | #include <linux/mutex.h> | ||
53 | #include <linux/sctp.h> | 54 | #include <linux/sctp.h> |
54 | #include <net/sctp/user.h> | 55 | #include <net/sctp/user.h> |
55 | 56 | ||
@@ -138,7 +139,7 @@ static struct workqueue_struct *recv_workqueue; | |||
138 | static struct workqueue_struct *send_workqueue; | 139 | static struct workqueue_struct *send_workqueue; |
139 | 140 | ||
140 | static DEFINE_IDR(connections_idr); | 141 | static DEFINE_IDR(connections_idr); |
141 | static DECLARE_MUTEX(connections_lock); | 142 | static DEFINE_MUTEX(connections_lock); |
142 | static int max_nodeid; | 143 | static int max_nodeid; |
143 | static struct kmem_cache *con_cache; | 144 | static struct kmem_cache *con_cache; |
144 | 145 | ||
@@ -205,9 +206,9 @@ static struct connection *nodeid2con(int nodeid, gfp_t allocation) | |||
205 | { | 206 | { |
206 | struct connection *con; | 207 | struct connection *con; |
207 | 208 | ||
208 | down(&connections_lock); | 209 | mutex_lock(&connections_lock); |
209 | con = __nodeid2con(nodeid, allocation); | 210 | con = __nodeid2con(nodeid, allocation); |
210 | up(&connections_lock); | 211 | mutex_unlock(&connections_lock); |
211 | 212 | ||
212 | return con; | 213 | return con; |
213 | } | 214 | } |
@@ -218,15 +219,15 @@ static struct connection *assoc2con(int assoc_id) | |||
218 | int i; | 219 | int i; |
219 | struct connection *con; | 220 | struct connection *con; |
220 | 221 | ||
221 | down(&connections_lock); | 222 | mutex_lock(&connections_lock); |
222 | for (i=0; i<=max_nodeid; i++) { | 223 | for (i=0; i<=max_nodeid; i++) { |
223 | con = __nodeid2con(i, 0); | 224 | con = __nodeid2con(i, 0); |
224 | if (con && con->sctp_assoc == assoc_id) { | 225 | if (con && con->sctp_assoc == assoc_id) { |
225 | up(&connections_lock); | 226 | mutex_unlock(&connections_lock); |
226 | return con; | 227 | return con; |
227 | } | 228 | } |
228 | } | 229 | } |
229 | up(&connections_lock); | 230 | mutex_unlock(&connections_lock); |
230 | return NULL; | 231 | return NULL; |
231 | } | 232 | } |
232 | 233 | ||
@@ -381,7 +382,7 @@ static void sctp_init_failed(void) | |||
381 | int i; | 382 | int i; |
382 | struct connection *con; | 383 | struct connection *con; |
383 | 384 | ||
384 | down(&connections_lock); | 385 | mutex_lock(&connections_lock); |
385 | for (i=1; i<=max_nodeid; i++) { | 386 | for (i=1; i<=max_nodeid; i++) { |
386 | con = __nodeid2con(i, 0); | 387 | con = __nodeid2con(i, 0); |
387 | if (!con) | 388 | if (!con) |
@@ -393,7 +394,7 @@ static void sctp_init_failed(void) | |||
393 | } | 394 | } |
394 | } | 395 | } |
395 | } | 396 | } |
396 | up(&connections_lock); | 397 | mutex_unlock(&connections_lock); |
397 | } | 398 | } |
398 | 399 | ||
399 | /* Something happened to an association */ | 400 | /* Something happened to an association */ |
@@ -930,7 +931,7 @@ out_err: | |||
930 | * errors we try again until the max number of retries is reached. | 931 | * errors we try again until the max number of retries is reached. |
931 | */ | 932 | */ |
932 | if (result != -EHOSTUNREACH && result != -ENETUNREACH && | 933 | if (result != -EHOSTUNREACH && result != -ENETUNREACH && |
933 | result != -ENETDOWN && result != EINVAL | 934 | result != -ENETDOWN && result != -EINVAL |
934 | && result != -EPROTONOSUPPORT) { | 935 | && result != -EPROTONOSUPPORT) { |
935 | lowcomms_connect_sock(con); | 936 | lowcomms_connect_sock(con); |
936 | result = 0; | 937 | result = 0; |
@@ -1417,7 +1418,7 @@ void dlm_lowcomms_stop(void) | |||
1417 | /* Set all the flags to prevent any | 1418 | /* Set all the flags to prevent any |
1418 | socket activity. | 1419 | socket activity. |
1419 | */ | 1420 | */ |
1420 | down(&connections_lock); | 1421 | mutex_lock(&connections_lock); |
1421 | for (i = 0; i <= max_nodeid; i++) { | 1422 | for (i = 0; i <= max_nodeid; i++) { |
1422 | con = __nodeid2con(i, 0); | 1423 | con = __nodeid2con(i, 0); |
1423 | if (con) { | 1424 | if (con) { |
@@ -1426,11 +1427,11 @@ void dlm_lowcomms_stop(void) | |||
1426 | con->sock->sk->sk_user_data = NULL; | 1427 | con->sock->sk->sk_user_data = NULL; |
1427 | } | 1428 | } |
1428 | } | 1429 | } |
1429 | up(&connections_lock); | 1430 | mutex_unlock(&connections_lock); |
1430 | 1431 | ||
1431 | work_stop(); | 1432 | work_stop(); |
1432 | 1433 | ||
1433 | down(&connections_lock); | 1434 | mutex_lock(&connections_lock); |
1434 | clean_writequeues(); | 1435 | clean_writequeues(); |
1435 | 1436 | ||
1436 | for (i = 0; i <= max_nodeid; i++) { | 1437 | for (i = 0; i <= max_nodeid; i++) { |
@@ -1443,7 +1444,7 @@ void dlm_lowcomms_stop(void) | |||
1443 | } | 1444 | } |
1444 | } | 1445 | } |
1445 | max_nodeid = 0; | 1446 | max_nodeid = 0; |
1446 | up(&connections_lock); | 1447 | mutex_unlock(&connections_lock); |
1447 | kmem_cache_destroy(con_cache); | 1448 | kmem_cache_destroy(con_cache); |
1448 | idr_init(&connections_idr); | 1449 | idr_init(&connections_idr); |
1449 | } | 1450 | } |
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c index 714593621f4f..18bda83cc892 100644 --- a/fs/dlm/netlink.c +++ b/fs/dlm/netlink.c | |||
@@ -95,7 +95,7 @@ int __init dlm_netlink_init(void) | |||
95 | return rv; | 95 | return rv; |
96 | } | 96 | } |
97 | 97 | ||
98 | void __exit dlm_netlink_exit(void) | 98 | void dlm_netlink_exit(void) |
99 | { | 99 | { |
100 | genl_unregister_ops(&family, &dlm_nl_ops); | 100 | genl_unregister_ops(&family, &dlm_nl_ops); |
101 | genl_unregister_family(&family); | 101 | genl_unregister_family(&family); |
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index d6d6e370f89c..78878c5781ca 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c | |||
@@ -379,7 +379,7 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count, | |||
379 | struct plock_xop *xop; | 379 | struct plock_xop *xop; |
380 | xop = (struct plock_xop *)op; | 380 | xop = (struct plock_xop *)op; |
381 | if (xop->callback) | 381 | if (xop->callback) |
382 | count = dlm_plock_callback(op); | 382 | dlm_plock_callback(op); |
383 | else | 383 | else |
384 | wake_up(&recv_wq); | 384 | wake_up(&recv_wq); |
385 | } else | 385 | } else |
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index 6560da1a58ce..50c994a249a5 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c | |||
@@ -243,7 +243,6 @@ ecryptfs_miscdev_read(struct file *file, char __user *buf, size_t count, | |||
243 | struct ecryptfs_daemon *daemon; | 243 | struct ecryptfs_daemon *daemon; |
244 | struct ecryptfs_msg_ctx *msg_ctx; | 244 | struct ecryptfs_msg_ctx *msg_ctx; |
245 | size_t packet_length_size; | 245 | size_t packet_length_size; |
246 | u32 counter_nbo; | ||
247 | char packet_length[3]; | 246 | char packet_length[3]; |
248 | size_t i; | 247 | size_t i; |
249 | size_t total_length; | 248 | size_t total_length; |
@@ -328,20 +327,18 @@ check_list: | |||
328 | "pending message\n", __func__, count, total_length); | 327 | "pending message\n", __func__, count, total_length); |
329 | goto out_unlock_msg_ctx; | 328 | goto out_unlock_msg_ctx; |
330 | } | 329 | } |
331 | i = 0; | 330 | rc = -EFAULT; |
332 | buf[i++] = msg_ctx->type; | 331 | if (put_user(msg_ctx->type, buf)) |
333 | counter_nbo = cpu_to_be32(msg_ctx->counter); | 332 | goto out_unlock_msg_ctx; |
334 | memcpy(&buf[i], (char *)&counter_nbo, 4); | 333 | if (put_user(cpu_to_be32(msg_ctx->counter), (__be32 __user *)(buf + 1))) |
335 | i += 4; | 334 | goto out_unlock_msg_ctx; |
335 | i = 5; | ||
336 | if (msg_ctx->msg) { | 336 | if (msg_ctx->msg) { |
337 | memcpy(&buf[i], packet_length, packet_length_size); | 337 | if (copy_to_user(&buf[i], packet_length, packet_length_size)) |
338 | goto out_unlock_msg_ctx; | ||
338 | i += packet_length_size; | 339 | i += packet_length_size; |
339 | rc = copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size); | 340 | if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size)) |
340 | if (rc) { | ||
341 | printk(KERN_ERR "%s: copy_to_user returned error " | ||
342 | "[%d]\n", __func__, rc); | ||
343 | goto out_unlock_msg_ctx; | 341 | goto out_unlock_msg_ctx; |
344 | } | ||
345 | i += msg_ctx->msg_size; | 342 | i += msg_ctx->msg_size; |
346 | } | 343 | } |
347 | rc = i; | 344 | rc = i; |
@@ -452,7 +449,8 @@ static ssize_t | |||
452 | ecryptfs_miscdev_write(struct file *file, const char __user *buf, | 449 | ecryptfs_miscdev_write(struct file *file, const char __user *buf, |
453 | size_t count, loff_t *ppos) | 450 | size_t count, loff_t *ppos) |
454 | { | 451 | { |
455 | u32 counter_nbo, seq; | 452 | __be32 counter_nbo; |
453 | u32 seq; | ||
456 | size_t packet_size, packet_size_length, i; | 454 | size_t packet_size, packet_size_length, i; |
457 | ssize_t sz = 0; | 455 | ssize_t sz = 0; |
458 | char *data; | 456 | char *data; |
@@ -485,7 +483,7 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf, | |||
485 | count); | 483 | count); |
486 | goto out_free; | 484 | goto out_free; |
487 | } | 485 | } |
488 | memcpy((char *)&counter_nbo, &data[i], 4); | 486 | memcpy(&counter_nbo, &data[i], 4); |
489 | seq = be32_to_cpu(counter_nbo); | 487 | seq = be32_to_cpu(counter_nbo); |
490 | i += 4; | 488 | i += 4; |
491 | rc = ecryptfs_parse_packet_length(&data[i], &packet_size, | 489 | rc = ecryptfs_parse_packet_length(&data[i], &packet_size, |
@@ -1251,6 +1251,12 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | |||
1251 | 1251 | ||
1252 | EXPORT_SYMBOL(search_binary_handler); | 1252 | EXPORT_SYMBOL(search_binary_handler); |
1253 | 1253 | ||
1254 | void free_bprm(struct linux_binprm *bprm) | ||
1255 | { | ||
1256 | free_arg_pages(bprm); | ||
1257 | kfree(bprm); | ||
1258 | } | ||
1259 | |||
1254 | /* | 1260 | /* |
1255 | * sys_execve() executes a new program. | 1261 | * sys_execve() executes a new program. |
1256 | */ | 1262 | */ |
@@ -1320,17 +1326,15 @@ int do_execve(char * filename, | |||
1320 | retval = search_binary_handler(bprm,regs); | 1326 | retval = search_binary_handler(bprm,regs); |
1321 | if (retval >= 0) { | 1327 | if (retval >= 0) { |
1322 | /* execve success */ | 1328 | /* execve success */ |
1323 | free_arg_pages(bprm); | ||
1324 | security_bprm_free(bprm); | 1329 | security_bprm_free(bprm); |
1325 | acct_update_integrals(current); | 1330 | acct_update_integrals(current); |
1326 | kfree(bprm); | 1331 | free_bprm(bprm); |
1327 | if (displaced) | 1332 | if (displaced) |
1328 | put_files_struct(displaced); | 1333 | put_files_struct(displaced); |
1329 | return retval; | 1334 | return retval; |
1330 | } | 1335 | } |
1331 | 1336 | ||
1332 | out: | 1337 | out: |
1333 | free_arg_pages(bprm); | ||
1334 | if (bprm->security) | 1338 | if (bprm->security) |
1335 | security_bprm_free(bprm); | 1339 | security_bprm_free(bprm); |
1336 | 1340 | ||
@@ -1344,7 +1348,7 @@ out_file: | |||
1344 | fput(bprm->file); | 1348 | fput(bprm->file); |
1345 | } | 1349 | } |
1346 | out_kfree: | 1350 | out_kfree: |
1347 | kfree(bprm); | 1351 | free_bprm(bprm); |
1348 | 1352 | ||
1349 | out_files: | 1353 | out_files: |
1350 | if (displaced) | 1354 | if (displaced) |
@@ -26,6 +26,8 @@ struct fdtable_defer { | |||
26 | }; | 26 | }; |
27 | 27 | ||
28 | int sysctl_nr_open __read_mostly = 1024*1024; | 28 | int sysctl_nr_open __read_mostly = 1024*1024; |
29 | int sysctl_nr_open_min = BITS_PER_LONG; | ||
30 | int sysctl_nr_open_max = 1024 * 1024; /* raised later */ | ||
29 | 31 | ||
30 | /* | 32 | /* |
31 | * We use this list to defer free fdtables that have vmalloced | 33 | * We use this list to defer free fdtables that have vmalloced |
@@ -119,8 +121,6 @@ static void copy_fdtable(struct fdtable *nfdt, struct fdtable *ofdt) | |||
119 | unsigned int cpy, set; | 121 | unsigned int cpy, set; |
120 | 122 | ||
121 | BUG_ON(nfdt->max_fds < ofdt->max_fds); | 123 | BUG_ON(nfdt->max_fds < ofdt->max_fds); |
122 | if (ofdt->max_fds == 0) | ||
123 | return; | ||
124 | 124 | ||
125 | cpy = ofdt->max_fds * sizeof(struct file *); | 125 | cpy = ofdt->max_fds * sizeof(struct file *); |
126 | set = (nfdt->max_fds - ofdt->max_fds) * sizeof(struct file *); | 126 | set = (nfdt->max_fds - ofdt->max_fds) * sizeof(struct file *); |
@@ -261,6 +261,139 @@ int expand_files(struct files_struct *files, int nr) | |||
261 | return expand_fdtable(files, nr); | 261 | return expand_fdtable(files, nr); |
262 | } | 262 | } |
263 | 263 | ||
264 | static int count_open_files(struct fdtable *fdt) | ||
265 | { | ||
266 | int size = fdt->max_fds; | ||
267 | int i; | ||
268 | |||
269 | /* Find the last open fd */ | ||
270 | for (i = size/(8*sizeof(long)); i > 0; ) { | ||
271 | if (fdt->open_fds->fds_bits[--i]) | ||
272 | break; | ||
273 | } | ||
274 | i = (i+1) * 8 * sizeof(long); | ||
275 | return i; | ||
276 | } | ||
277 | |||
278 | /* | ||
279 | * Allocate a new files structure and copy contents from the | ||
280 | * passed in files structure. | ||
281 | * errorp will be valid only when the returned files_struct is NULL. | ||
282 | */ | ||
283 | struct files_struct *dup_fd(struct files_struct *oldf, int *errorp) | ||
284 | { | ||
285 | struct files_struct *newf; | ||
286 | struct file **old_fds, **new_fds; | ||
287 | int open_files, size, i; | ||
288 | struct fdtable *old_fdt, *new_fdt; | ||
289 | |||
290 | *errorp = -ENOMEM; | ||
291 | newf = kmem_cache_alloc(files_cachep, GFP_KERNEL); | ||
292 | if (!newf) | ||
293 | goto out; | ||
294 | |||
295 | atomic_set(&newf->count, 1); | ||
296 | |||
297 | spin_lock_init(&newf->file_lock); | ||
298 | newf->next_fd = 0; | ||
299 | new_fdt = &newf->fdtab; | ||
300 | new_fdt->max_fds = NR_OPEN_DEFAULT; | ||
301 | new_fdt->close_on_exec = (fd_set *)&newf->close_on_exec_init; | ||
302 | new_fdt->open_fds = (fd_set *)&newf->open_fds_init; | ||
303 | new_fdt->fd = &newf->fd_array[0]; | ||
304 | INIT_RCU_HEAD(&new_fdt->rcu); | ||
305 | new_fdt->next = NULL; | ||
306 | |||
307 | spin_lock(&oldf->file_lock); | ||
308 | old_fdt = files_fdtable(oldf); | ||
309 | open_files = count_open_files(old_fdt); | ||
310 | |||
311 | /* | ||
312 | * Check whether we need to allocate a larger fd array and fd set. | ||
313 | */ | ||
314 | while (unlikely(open_files > new_fdt->max_fds)) { | ||
315 | spin_unlock(&oldf->file_lock); | ||
316 | |||
317 | if (new_fdt != &newf->fdtab) { | ||
318 | free_fdarr(new_fdt); | ||
319 | free_fdset(new_fdt); | ||
320 | kfree(new_fdt); | ||
321 | } | ||
322 | |||
323 | new_fdt = alloc_fdtable(open_files - 1); | ||
324 | if (!new_fdt) { | ||
325 | *errorp = -ENOMEM; | ||
326 | goto out_release; | ||
327 | } | ||
328 | |||
329 | /* beyond sysctl_nr_open; nothing to do */ | ||
330 | if (unlikely(new_fdt->max_fds < open_files)) { | ||
331 | free_fdarr(new_fdt); | ||
332 | free_fdset(new_fdt); | ||
333 | kfree(new_fdt); | ||
334 | *errorp = -EMFILE; | ||
335 | goto out_release; | ||
336 | } | ||
337 | |||
338 | /* | ||
339 | * Reacquire the oldf lock and a pointer to its fd table | ||
340 | * who knows it may have a new bigger fd table. We need | ||
341 | * the latest pointer. | ||
342 | */ | ||
343 | spin_lock(&oldf->file_lock); | ||
344 | old_fdt = files_fdtable(oldf); | ||
345 | open_files = count_open_files(old_fdt); | ||
346 | } | ||
347 | |||
348 | old_fds = old_fdt->fd; | ||
349 | new_fds = new_fdt->fd; | ||
350 | |||
351 | memcpy(new_fdt->open_fds->fds_bits, | ||
352 | old_fdt->open_fds->fds_bits, open_files/8); | ||
353 | memcpy(new_fdt->close_on_exec->fds_bits, | ||
354 | old_fdt->close_on_exec->fds_bits, open_files/8); | ||
355 | |||
356 | for (i = open_files; i != 0; i--) { | ||
357 | struct file *f = *old_fds++; | ||
358 | if (f) { | ||
359 | get_file(f); | ||
360 | } else { | ||
361 | /* | ||
362 | * The fd may be claimed in the fd bitmap but not yet | ||
363 | * instantiated in the files array if a sibling thread | ||
364 | * is partway through open(). So make sure that this | ||
365 | * fd is available to the new process. | ||
366 | */ | ||
367 | FD_CLR(open_files - i, new_fdt->open_fds); | ||
368 | } | ||
369 | rcu_assign_pointer(*new_fds++, f); | ||
370 | } | ||
371 | spin_unlock(&oldf->file_lock); | ||
372 | |||
373 | /* compute the remainder to be cleared */ | ||
374 | size = (new_fdt->max_fds - open_files) * sizeof(struct file *); | ||
375 | |||
376 | /* This is long word aligned thus could use a optimized version */ | ||
377 | memset(new_fds, 0, size); | ||
378 | |||
379 | if (new_fdt->max_fds > open_files) { | ||
380 | int left = (new_fdt->max_fds-open_files)/8; | ||
381 | int start = open_files / (8 * sizeof(unsigned long)); | ||
382 | |||
383 | memset(&new_fdt->open_fds->fds_bits[start], 0, left); | ||
384 | memset(&new_fdt->close_on_exec->fds_bits[start], 0, left); | ||
385 | } | ||
386 | |||
387 | rcu_assign_pointer(newf->fdt, new_fdt); | ||
388 | |||
389 | return newf; | ||
390 | |||
391 | out_release: | ||
392 | kmem_cache_free(files_cachep, newf); | ||
393 | out: | ||
394 | return NULL; | ||
395 | } | ||
396 | |||
264 | static void __devinit fdtable_defer_list_init(int cpu) | 397 | static void __devinit fdtable_defer_list_init(int cpu) |
265 | { | 398 | { |
266 | struct fdtable_defer *fddef = &per_cpu(fdtable_defer_list, cpu); | 399 | struct fdtable_defer *fddef = &per_cpu(fdtable_defer_list, cpu); |
@@ -274,4 +407,19 @@ void __init files_defer_init(void) | |||
274 | int i; | 407 | int i; |
275 | for_each_possible_cpu(i) | 408 | for_each_possible_cpu(i) |
276 | fdtable_defer_list_init(i); | 409 | fdtable_defer_list_init(i); |
410 | sysctl_nr_open_max = min((size_t)INT_MAX, ~(size_t)0/sizeof(void *)) & | ||
411 | -BITS_PER_LONG; | ||
277 | } | 412 | } |
413 | |||
414 | struct files_struct init_files = { | ||
415 | .count = ATOMIC_INIT(1), | ||
416 | .fdt = &init_files.fdtab, | ||
417 | .fdtab = { | ||
418 | .max_fds = NR_OPEN_DEFAULT, | ||
419 | .fd = &init_files.fd_array[0], | ||
420 | .close_on_exec = (fd_set *)&init_files.close_on_exec_init, | ||
421 | .open_fds = (fd_set *)&init_files.open_fds_init, | ||
422 | .rcu = RCU_HEAD_INIT, | ||
423 | }, | ||
424 | .file_lock = __SPIN_LOCK_UNLOCKED(init_task.file_lock), | ||
425 | }; | ||
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index d31badadef8f..07d84d16cda4 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c | |||
@@ -249,7 +249,7 @@ static int inode_go_lock(struct gfs2_holder *gh) | |||
249 | struct gfs2_inode *ip = gl->gl_object; | 249 | struct gfs2_inode *ip = gl->gl_object; |
250 | int error = 0; | 250 | int error = 0; |
251 | 251 | ||
252 | if (!ip) | 252 | if (!ip || (gh->gh_flags & GL_SKIP)) |
253 | return 0; | 253 | return 0; |
254 | 254 | ||
255 | if (test_bit(GIF_INVALID, &ip->i_flags)) { | 255 | if (test_bit(GIF_INVALID, &ip->i_flags)) { |
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 9c2c0b90b22a..eabe5eac41da 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -236,6 +236,7 @@ enum { | |||
236 | GIF_INVALID = 0, | 236 | GIF_INVALID = 0, |
237 | GIF_QD_LOCKED = 1, | 237 | GIF_QD_LOCKED = 1, |
238 | GIF_SW_PAGED = 3, | 238 | GIF_SW_PAGED = 3, |
239 | GIF_USER = 4, /* user inode, not metadata addr space */ | ||
239 | }; | 240 | }; |
240 | 241 | ||
241 | struct gfs2_dinode_host { | 242 | struct gfs2_dinode_host { |
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 3a9ef526c308..09453d057e41 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
@@ -47,8 +47,7 @@ static int iget_test(struct inode *inode, void *opaque) | |||
47 | struct gfs2_inode *ip = GFS2_I(inode); | 47 | struct gfs2_inode *ip = GFS2_I(inode); |
48 | u64 *no_addr = opaque; | 48 | u64 *no_addr = opaque; |
49 | 49 | ||
50 | if (ip->i_no_addr == *no_addr && | 50 | if (ip->i_no_addr == *no_addr && test_bit(GIF_USER, &ip->i_flags)) |
51 | inode->i_private != NULL) | ||
52 | return 1; | 51 | return 1; |
53 | 52 | ||
54 | return 0; | 53 | return 0; |
@@ -61,6 +60,7 @@ static int iget_set(struct inode *inode, void *opaque) | |||
61 | 60 | ||
62 | inode->i_ino = (unsigned long)*no_addr; | 61 | inode->i_ino = (unsigned long)*no_addr; |
63 | ip->i_no_addr = *no_addr; | 62 | ip->i_no_addr = *no_addr; |
63 | set_bit(GIF_USER, &ip->i_flags); | ||
64 | return 0; | 64 | return 0; |
65 | } | 65 | } |
66 | 66 | ||
@@ -86,7 +86,7 @@ static int iget_skip_test(struct inode *inode, void *opaque) | |||
86 | struct gfs2_inode *ip = GFS2_I(inode); | 86 | struct gfs2_inode *ip = GFS2_I(inode); |
87 | struct gfs2_skip_data *data = opaque; | 87 | struct gfs2_skip_data *data = opaque; |
88 | 88 | ||
89 | if (ip->i_no_addr == data->no_addr && inode->i_private != NULL){ | 89 | if (ip->i_no_addr == data->no_addr && test_bit(GIF_USER, &ip->i_flags)){ |
90 | if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)){ | 90 | if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)){ |
91 | data->skipped = 1; | 91 | data->skipped = 1; |
92 | return 0; | 92 | return 0; |
@@ -105,6 +105,7 @@ static int iget_skip_set(struct inode *inode, void *opaque) | |||
105 | return 1; | 105 | return 1; |
106 | inode->i_ino = (unsigned long)(data->no_addr); | 106 | inode->i_ino = (unsigned long)(data->no_addr); |
107 | ip->i_no_addr = data->no_addr; | 107 | ip->i_no_addr = data->no_addr; |
108 | set_bit(GIF_USER, &ip->i_flags); | ||
108 | return 0; | 109 | return 0; |
109 | } | 110 | } |
110 | 111 | ||
@@ -166,7 +167,7 @@ void gfs2_set_iop(struct inode *inode) | |||
166 | * Returns: A VFS inode, or an error | 167 | * Returns: A VFS inode, or an error |
167 | */ | 168 | */ |
168 | 169 | ||
169 | struct inode *gfs2_inode_lookup(struct super_block *sb, | 170 | struct inode *gfs2_inode_lookup(struct super_block *sb, |
170 | unsigned int type, | 171 | unsigned int type, |
171 | u64 no_addr, | 172 | u64 no_addr, |
172 | u64 no_formal_ino, int skip_freeing) | 173 | u64 no_formal_ino, int skip_freeing) |
@@ -187,7 +188,6 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, | |||
187 | 188 | ||
188 | if (inode->i_state & I_NEW) { | 189 | if (inode->i_state & I_NEW) { |
189 | struct gfs2_sbd *sdp = GFS2_SB(inode); | 190 | struct gfs2_sbd *sdp = GFS2_SB(inode); |
190 | inode->i_private = ip; | ||
191 | ip->i_no_formal_ino = no_formal_ino; | 191 | ip->i_no_formal_ino = no_formal_ino; |
192 | 192 | ||
193 | error = gfs2_glock_get(sdp, no_addr, &gfs2_inode_glops, CREATE, &ip->i_gl); | 193 | error = gfs2_glock_get(sdp, no_addr, &gfs2_inode_glops, CREATE, &ip->i_gl); |
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c index 85aea27b4a86..78d75f892f82 100644 --- a/fs/gfs2/meta_io.c +++ b/fs/gfs2/meta_io.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. | 2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. |
3 | * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. | 3 | * Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. |
4 | * | 4 | * |
5 | * This copyrighted material is made available to anyone wishing to use, | 5 | * This copyrighted material is made available to anyone wishing to use, |
6 | * modify, copy, or redistribute it subject to the terms and conditions | 6 | * modify, copy, or redistribute it subject to the terms and conditions |
@@ -69,13 +69,15 @@ static const struct address_space_operations aspace_aops = { | |||
69 | struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp) | 69 | struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp) |
70 | { | 70 | { |
71 | struct inode *aspace; | 71 | struct inode *aspace; |
72 | struct gfs2_inode *ip; | ||
72 | 73 | ||
73 | aspace = new_inode(sdp->sd_vfs); | 74 | aspace = new_inode(sdp->sd_vfs); |
74 | if (aspace) { | 75 | if (aspace) { |
75 | mapping_set_gfp_mask(aspace->i_mapping, GFP_NOFS); | 76 | mapping_set_gfp_mask(aspace->i_mapping, GFP_NOFS); |
76 | aspace->i_mapping->a_ops = &aspace_aops; | 77 | aspace->i_mapping->a_ops = &aspace_aops; |
77 | aspace->i_size = ~0ULL; | 78 | aspace->i_size = ~0ULL; |
78 | aspace->i_private = NULL; | 79 | ip = GFS2_I(aspace); |
80 | clear_bit(GIF_USER, &ip->i_flags); | ||
79 | insert_inode_hash(aspace); | 81 | insert_inode_hash(aspace); |
80 | } | 82 | } |
81 | return aspace; | 83 | return aspace; |
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index ef9c6c4f80f6..b2028c82e8d1 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
@@ -142,8 +142,8 @@ static int init_names(struct gfs2_sbd *sdp, int silent) | |||
142 | if (!table[0]) | 142 | if (!table[0]) |
143 | table = sdp->sd_vfs->s_id; | 143 | table = sdp->sd_vfs->s_id; |
144 | 144 | ||
145 | snprintf(sdp->sd_proto_name, GFS2_FSNAME_LEN, "%s", proto); | 145 | strlcpy(sdp->sd_proto_name, proto, GFS2_FSNAME_LEN); |
146 | snprintf(sdp->sd_table_name, GFS2_FSNAME_LEN, "%s", table); | 146 | strlcpy(sdp->sd_table_name, table, GFS2_FSNAME_LEN); |
147 | 147 | ||
148 | table = sdp->sd_table_name; | 148 | table = sdp->sd_table_name; |
149 | while ((table = strchr(table, '/'))) | 149 | while ((table = strchr(table, '/'))) |
diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c index 2278c68b7e35..0b7cc920eb89 100644 --- a/fs/gfs2/ops_super.c +++ b/fs/gfs2/ops_super.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. | 2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. |
3 | * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. | 3 | * Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. |
4 | * | 4 | * |
5 | * This copyrighted material is made available to anyone wishing to use, | 5 | * This copyrighted material is made available to anyone wishing to use, |
6 | * modify, copy, or redistribute it subject to the terms and conditions | 6 | * modify, copy, or redistribute it subject to the terms and conditions |
@@ -52,7 +52,7 @@ static int gfs2_write_inode(struct inode *inode, int sync) | |||
52 | struct gfs2_inode *ip = GFS2_I(inode); | 52 | struct gfs2_inode *ip = GFS2_I(inode); |
53 | 53 | ||
54 | /* Check this is a "normal" inode */ | 54 | /* Check this is a "normal" inode */ |
55 | if (inode->i_private) { | 55 | if (test_bit(GIF_USER, &ip->i_flags)) { |
56 | if (current->flags & PF_MEMALLOC) | 56 | if (current->flags & PF_MEMALLOC) |
57 | return 0; | 57 | return 0; |
58 | if (sync) | 58 | if (sync) |
@@ -297,8 +297,9 @@ static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data) | |||
297 | */ | 297 | */ |
298 | static void gfs2_drop_inode(struct inode *inode) | 298 | static void gfs2_drop_inode(struct inode *inode) |
299 | { | 299 | { |
300 | if (inode->i_private && inode->i_nlink) { | 300 | struct gfs2_inode *ip = GFS2_I(inode); |
301 | struct gfs2_inode *ip = GFS2_I(inode); | 301 | |
302 | if (test_bit(GIF_USER, &ip->i_flags) && inode->i_nlink) { | ||
302 | struct gfs2_glock *gl = ip->i_iopen_gh.gh_gl; | 303 | struct gfs2_glock *gl = ip->i_iopen_gh.gh_gl; |
303 | if (gl && test_bit(GLF_DEMOTE, &gl->gl_flags)) | 304 | if (gl && test_bit(GLF_DEMOTE, &gl->gl_flags)) |
304 | clear_nlink(inode); | 305 | clear_nlink(inode); |
@@ -314,12 +315,13 @@ static void gfs2_drop_inode(struct inode *inode) | |||
314 | 315 | ||
315 | static void gfs2_clear_inode(struct inode *inode) | 316 | static void gfs2_clear_inode(struct inode *inode) |
316 | { | 317 | { |
318 | struct gfs2_inode *ip = GFS2_I(inode); | ||
319 | |||
317 | /* This tells us its a "real" inode and not one which only | 320 | /* This tells us its a "real" inode and not one which only |
318 | * serves to contain an address space (see rgrp.c, meta_io.c) | 321 | * serves to contain an address space (see rgrp.c, meta_io.c) |
319 | * which therefore doesn't have its own glocks. | 322 | * which therefore doesn't have its own glocks. |
320 | */ | 323 | */ |
321 | if (inode->i_private) { | 324 | if (test_bit(GIF_USER, &ip->i_flags)) { |
322 | struct gfs2_inode *ip = GFS2_I(inode); | ||
323 | ip->i_gl->gl_object = NULL; | 325 | ip->i_gl->gl_object = NULL; |
324 | gfs2_glock_schedule_for_reclaim(ip->i_gl); | 326 | gfs2_glock_schedule_for_reclaim(ip->i_gl); |
325 | gfs2_glock_put(ip->i_gl); | 327 | gfs2_glock_put(ip->i_gl); |
@@ -419,7 +421,7 @@ static void gfs2_delete_inode(struct inode *inode) | |||
419 | struct gfs2_holder gh; | 421 | struct gfs2_holder gh; |
420 | int error; | 422 | int error; |
421 | 423 | ||
422 | if (!inode->i_private) | 424 | if (!test_bit(GIF_USER, &ip->i_flags)) |
423 | goto out; | 425 | goto out; |
424 | 426 | ||
425 | error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh); | 427 | error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh); |
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 7e8f0b1d6c6e..6387523a3153 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
@@ -1495,7 +1495,7 @@ u64 gfs2_alloc_block(struct gfs2_inode *ip, unsigned int *n) | |||
1495 | 1495 | ||
1496 | al->al_alloced += *n; | 1496 | al->al_alloced += *n; |
1497 | 1497 | ||
1498 | gfs2_statfs_change(sdp, 0, -*n, 0); | 1498 | gfs2_statfs_change(sdp, 0, -(s64)*n, 0); |
1499 | gfs2_quota_change(ip, *n, ip->i_inode.i_uid, ip->i_inode.i_gid); | 1499 | gfs2_quota_change(ip, *n, ip->i_inode.i_uid, ip->i_inode.i_gid); |
1500 | 1500 | ||
1501 | spin_lock(&sdp->sd_rindex_spin); | 1501 | spin_lock(&sdp->sd_rindex_spin); |
diff --git a/fs/hppfs/Makefile b/fs/hppfs/Makefile index 8a1f50344368..3a982bd975d2 100644 --- a/fs/hppfs/Makefile +++ b/fs/hppfs/Makefile | |||
@@ -3,7 +3,4 @@ | |||
3 | # Licensed under the GPL | 3 | # Licensed under the GPL |
4 | # | 4 | # |
5 | 5 | ||
6 | hppfs-objs := hppfs.o | 6 | obj-$(CONFIG_HPPFS) += hppfs.o |
7 | |||
8 | obj-y = | ||
9 | obj-$(CONFIG_HPPFS) += $(hppfs-objs) | ||
diff --git a/fs/namei.c b/fs/namei.c index 32fd9655485b..c7e43536c49a 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -2003,18 +2003,22 @@ struct dentry *lookup_create(struct nameidata *nd, int is_dir) | |||
2003 | if (IS_ERR(dentry)) | 2003 | if (IS_ERR(dentry)) |
2004 | goto fail; | 2004 | goto fail; |
2005 | 2005 | ||
2006 | if (dentry->d_inode) | ||
2007 | goto eexist; | ||
2006 | /* | 2008 | /* |
2007 | * Special case - lookup gave negative, but... we had foo/bar/ | 2009 | * Special case - lookup gave negative, but... we had foo/bar/ |
2008 | * From the vfs_mknod() POV we just have a negative dentry - | 2010 | * From the vfs_mknod() POV we just have a negative dentry - |
2009 | * all is fine. Let's be bastards - you had / on the end, you've | 2011 | * all is fine. Let's be bastards - you had / on the end, you've |
2010 | * been asking for (non-existent) directory. -ENOENT for you. | 2012 | * been asking for (non-existent) directory. -ENOENT for you. |
2011 | */ | 2013 | */ |
2012 | if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode) | 2014 | if (unlikely(!is_dir && nd->last.name[nd->last.len])) { |
2013 | goto enoent; | 2015 | dput(dentry); |
2016 | dentry = ERR_PTR(-ENOENT); | ||
2017 | } | ||
2014 | return dentry; | 2018 | return dentry; |
2015 | enoent: | 2019 | eexist: |
2016 | dput(dentry); | 2020 | dput(dentry); |
2017 | dentry = ERR_PTR(-ENOENT); | 2021 | dentry = ERR_PTR(-EEXIST); |
2018 | fail: | 2022 | fail: |
2019 | return dentry; | 2023 | return dentry; |
2020 | } | 2024 | } |
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 0b3ffa9840c2..4d4760e687c3 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c | |||
@@ -419,9 +419,9 @@ static int do_probe_callback(void *data) | |||
419 | out_release_client: | 419 | out_release_client: |
420 | rpc_shutdown_client(client); | 420 | rpc_shutdown_client(client); |
421 | out_err: | 421 | out_err: |
422 | put_nfs4_client(clp); | ||
423 | dprintk("NFSD: warning: no callback path to client %.*s\n", | 422 | dprintk("NFSD: warning: no callback path to client %.*s\n", |
424 | (int)clp->cl_name.len, clp->cl_name.data); | 423 | (int)clp->cl_name.len, clp->cl_name.data); |
424 | put_nfs4_client(clp); | ||
425 | return status; | 425 | return status; |
426 | } | 426 | } |
427 | 427 | ||
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 41f84c92094f..10bfb466e068 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
@@ -2788,7 +2788,7 @@ static int ocfs2_merge_rec_right(struct inode *inode, | |||
2788 | BUG_ON(index >= le16_to_cpu(el->l_next_free_rec)); | 2788 | BUG_ON(index >= le16_to_cpu(el->l_next_free_rec)); |
2789 | left_rec = &el->l_recs[index]; | 2789 | left_rec = &el->l_recs[index]; |
2790 | 2790 | ||
2791 | if (index == le16_to_cpu(el->l_next_free_rec - 1) && | 2791 | if (index == le16_to_cpu(el->l_next_free_rec) - 1 && |
2792 | le16_to_cpu(el->l_next_free_rec) == le16_to_cpu(el->l_count)) { | 2792 | le16_to_cpu(el->l_next_free_rec) == le16_to_cpu(el->l_count)) { |
2793 | /* we meet with a cross extent block merge. */ | 2793 | /* we meet with a cross extent block merge. */ |
2794 | ret = ocfs2_get_right_path(inode, left_path, &right_path); | 2794 | ret = ocfs2_get_right_path(inode, left_path, &right_path); |
@@ -2802,7 +2802,7 @@ static int ocfs2_merge_rec_right(struct inode *inode, | |||
2802 | BUG_ON(next_free <= 0); | 2802 | BUG_ON(next_free <= 0); |
2803 | right_rec = &right_el->l_recs[0]; | 2803 | right_rec = &right_el->l_recs[0]; |
2804 | if (ocfs2_is_empty_extent(right_rec)) { | 2804 | if (ocfs2_is_empty_extent(right_rec)) { |
2805 | BUG_ON(le16_to_cpu(next_free) <= 1); | 2805 | BUG_ON(next_free <= 1); |
2806 | right_rec = &right_el->l_recs[1]; | 2806 | right_rec = &right_el->l_recs[1]; |
2807 | } | 2807 | } |
2808 | 2808 | ||
diff --git a/fs/proc/base.c b/fs/proc/base.c index 808cbdc193d3..c447e0743a3c 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -2441,7 +2441,7 @@ static const struct pid_entry tgid_base_stuff[] = { | |||
2441 | REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust), | 2441 | REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust), |
2442 | #ifdef CONFIG_AUDITSYSCALL | 2442 | #ifdef CONFIG_AUDITSYSCALL |
2443 | REG("loginuid", S_IWUSR|S_IRUGO, loginuid), | 2443 | REG("loginuid", S_IWUSR|S_IRUGO, loginuid), |
2444 | REG("sessionid", S_IRUSR, sessionid), | 2444 | REG("sessionid", S_IRUGO, sessionid), |
2445 | #endif | 2445 | #endif |
2446 | #ifdef CONFIG_FAULT_INJECTION | 2446 | #ifdef CONFIG_FAULT_INJECTION |
2447 | REG("make-it-fail", S_IRUGO|S_IWUSR, fault_inject), | 2447 | REG("make-it-fail", S_IRUGO|S_IWUSR, fault_inject), |
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index a1c3a1fab7f0..8c0e4b92574f 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c | |||
@@ -419,12 +419,8 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt, | |||
419 | */ | 419 | */ |
420 | int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd) | 420 | int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd) |
421 | { | 421 | { |
422 | if (sysfs_find_dirent(acxt->parent_sd, sd->s_name)) { | 422 | if (sysfs_find_dirent(acxt->parent_sd, sd->s_name)) |
423 | printk(KERN_WARNING "sysfs: duplicate filename '%s' " | ||
424 | "can not be created\n", sd->s_name); | ||
425 | WARN_ON(1); | ||
426 | return -EEXIST; | 423 | return -EEXIST; |
427 | } | ||
428 | 424 | ||
429 | sd->s_parent = sysfs_get(acxt->parent_sd); | 425 | sd->s_parent = sysfs_get(acxt->parent_sd); |
430 | 426 | ||
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index 5105015a75ad..98e0e86093b4 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c | |||
@@ -387,6 +387,8 @@ _xfs_buf_lookup_pages( | |||
387 | if (unlikely(page == NULL)) { | 387 | if (unlikely(page == NULL)) { |
388 | if (flags & XBF_READ_AHEAD) { | 388 | if (flags & XBF_READ_AHEAD) { |
389 | bp->b_page_count = i; | 389 | bp->b_page_count = i; |
390 | for (i = 0; i < bp->b_page_count; i++) | ||
391 | unlock_page(bp->b_pages[i]); | ||
390 | return -ENOMEM; | 392 | return -ENOMEM; |
391 | } | 393 | } |
392 | 394 | ||
@@ -416,17 +418,24 @@ _xfs_buf_lookup_pages( | |||
416 | ASSERT(!PagePrivate(page)); | 418 | ASSERT(!PagePrivate(page)); |
417 | if (!PageUptodate(page)) { | 419 | if (!PageUptodate(page)) { |
418 | page_count--; | 420 | page_count--; |
419 | if (blocksize < PAGE_CACHE_SIZE && !PagePrivate(page)) { | 421 | if (blocksize >= PAGE_CACHE_SIZE) { |
422 | if (flags & XBF_READ) | ||
423 | bp->b_flags |= _XBF_PAGE_LOCKED; | ||
424 | } else if (!PagePrivate(page)) { | ||
420 | if (test_page_region(page, offset, nbytes)) | 425 | if (test_page_region(page, offset, nbytes)) |
421 | page_count++; | 426 | page_count++; |
422 | } | 427 | } |
423 | } | 428 | } |
424 | 429 | ||
425 | unlock_page(page); | ||
426 | bp->b_pages[i] = page; | 430 | bp->b_pages[i] = page; |
427 | offset = 0; | 431 | offset = 0; |
428 | } | 432 | } |
429 | 433 | ||
434 | if (!(bp->b_flags & _XBF_PAGE_LOCKED)) { | ||
435 | for (i = 0; i < bp->b_page_count; i++) | ||
436 | unlock_page(bp->b_pages[i]); | ||
437 | } | ||
438 | |||
430 | if (page_count == bp->b_page_count) | 439 | if (page_count == bp->b_page_count) |
431 | bp->b_flags |= XBF_DONE; | 440 | bp->b_flags |= XBF_DONE; |
432 | 441 | ||
@@ -746,6 +755,7 @@ xfs_buf_associate_memory( | |||
746 | bp->b_count_desired = len; | 755 | bp->b_count_desired = len; |
747 | bp->b_buffer_length = buflen; | 756 | bp->b_buffer_length = buflen; |
748 | bp->b_flags |= XBF_MAPPED; | 757 | bp->b_flags |= XBF_MAPPED; |
758 | bp->b_flags &= ~_XBF_PAGE_LOCKED; | ||
749 | 759 | ||
750 | return 0; | 760 | return 0; |
751 | } | 761 | } |
@@ -1093,8 +1103,10 @@ _xfs_buf_ioend( | |||
1093 | xfs_buf_t *bp, | 1103 | xfs_buf_t *bp, |
1094 | int schedule) | 1104 | int schedule) |
1095 | { | 1105 | { |
1096 | if (atomic_dec_and_test(&bp->b_io_remaining) == 1) | 1106 | if (atomic_dec_and_test(&bp->b_io_remaining) == 1) { |
1107 | bp->b_flags &= ~_XBF_PAGE_LOCKED; | ||
1097 | xfs_buf_ioend(bp, schedule); | 1108 | xfs_buf_ioend(bp, schedule); |
1109 | } | ||
1098 | } | 1110 | } |
1099 | 1111 | ||
1100 | STATIC void | 1112 | STATIC void |
@@ -1125,6 +1137,9 @@ xfs_buf_bio_end_io( | |||
1125 | 1137 | ||
1126 | if (--bvec >= bio->bi_io_vec) | 1138 | if (--bvec >= bio->bi_io_vec) |
1127 | prefetchw(&bvec->bv_page->flags); | 1139 | prefetchw(&bvec->bv_page->flags); |
1140 | |||
1141 | if (bp->b_flags & _XBF_PAGE_LOCKED) | ||
1142 | unlock_page(page); | ||
1128 | } while (bvec >= bio->bi_io_vec); | 1143 | } while (bvec >= bio->bi_io_vec); |
1129 | 1144 | ||
1130 | _xfs_buf_ioend(bp, 1); | 1145 | _xfs_buf_ioend(bp, 1); |
@@ -1163,7 +1178,8 @@ _xfs_buf_ioapply( | |||
1163 | * filesystem block size is not smaller than the page size. | 1178 | * filesystem block size is not smaller than the page size. |
1164 | */ | 1179 | */ |
1165 | if ((bp->b_buffer_length < PAGE_CACHE_SIZE) && | 1180 | if ((bp->b_buffer_length < PAGE_CACHE_SIZE) && |
1166 | (bp->b_flags & XBF_READ) && | 1181 | ((bp->b_flags & (XBF_READ|_XBF_PAGE_LOCKED)) == |
1182 | (XBF_READ|_XBF_PAGE_LOCKED)) && | ||
1167 | (blocksize >= PAGE_CACHE_SIZE)) { | 1183 | (blocksize >= PAGE_CACHE_SIZE)) { |
1168 | bio = bio_alloc(GFP_NOIO, 1); | 1184 | bio = bio_alloc(GFP_NOIO, 1); |
1169 | 1185 | ||
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h index 841d7883528d..f948ec7ba9a4 100644 --- a/fs/xfs/linux-2.6/xfs_buf.h +++ b/fs/xfs/linux-2.6/xfs_buf.h | |||
@@ -66,6 +66,25 @@ typedef enum { | |||
66 | _XBF_PAGES = (1 << 18), /* backed by refcounted pages */ | 66 | _XBF_PAGES = (1 << 18), /* backed by refcounted pages */ |
67 | _XBF_RUN_QUEUES = (1 << 19),/* run block device task queue */ | 67 | _XBF_RUN_QUEUES = (1 << 19),/* run block device task queue */ |
68 | _XBF_DELWRI_Q = (1 << 21), /* buffer on delwri queue */ | 68 | _XBF_DELWRI_Q = (1 << 21), /* buffer on delwri queue */ |
69 | |||
70 | /* | ||
71 | * Special flag for supporting metadata blocks smaller than a FSB. | ||
72 | * | ||
73 | * In this case we can have multiple xfs_buf_t on a single page and | ||
74 | * need to lock out concurrent xfs_buf_t readers as they only | ||
75 | * serialise access to the buffer. | ||
76 | * | ||
77 | * If the FSB size >= PAGE_CACHE_SIZE case, we have no serialisation | ||
78 | * between reads of the page. Hence we can have one thread read the | ||
79 | * page and modify it, but then race with another thread that thinks | ||
80 | * the page is not up-to-date and hence reads it again. | ||
81 | * | ||
82 | * The result is that the first modifcation to the page is lost. | ||
83 | * This sort of AGF/AGI reading race can happen when unlinking inodes | ||
84 | * that require truncation and results in the AGI unlinked list | ||
85 | * modifications being lost. | ||
86 | */ | ||
87 | _XBF_PAGE_LOCKED = (1 << 22), | ||
69 | } xfs_buf_flags_t; | 88 | } xfs_buf_flags_t; |
70 | 89 | ||
71 | typedef enum { | 90 | typedef enum { |
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index 65e78c13d4ae..5f60363b9343 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c | |||
@@ -184,19 +184,24 @@ xfs_file_release( | |||
184 | return -xfs_release(XFS_I(inode)); | 184 | return -xfs_release(XFS_I(inode)); |
185 | } | 185 | } |
186 | 186 | ||
187 | /* | ||
188 | * We ignore the datasync flag here because a datasync is effectively | ||
189 | * identical to an fsync. That is, datasync implies that we need to write | ||
190 | * only the metadata needed to be able to access the data that is written | ||
191 | * if we crash after the call completes. Hence if we are writing beyond | ||
192 | * EOF we have to log the inode size change as well, which makes it a | ||
193 | * full fsync. If we don't write beyond EOF, the inode core will be | ||
194 | * clean in memory and so we don't need to log the inode, just like | ||
195 | * fsync. | ||
196 | */ | ||
187 | STATIC int | 197 | STATIC int |
188 | xfs_file_fsync( | 198 | xfs_file_fsync( |
189 | struct file *filp, | 199 | struct file *filp, |
190 | struct dentry *dentry, | 200 | struct dentry *dentry, |
191 | int datasync) | 201 | int datasync) |
192 | { | 202 | { |
193 | int flags = FSYNC_WAIT; | ||
194 | |||
195 | if (datasync) | ||
196 | flags |= FSYNC_DATA; | ||
197 | xfs_iflags_clear(XFS_I(dentry->d_inode), XFS_ITRUNCATED); | 203 | xfs_iflags_clear(XFS_I(dentry->d_inode), XFS_ITRUNCATED); |
198 | return -xfs_fsync(XFS_I(dentry->d_inode), flags, | 204 | return -xfs_fsync(XFS_I(dentry->d_inode)); |
199 | (xfs_off_t)0, (xfs_off_t)-1); | ||
200 | } | 205 | } |
201 | 206 | ||
202 | /* | 207 | /* |
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h index 9d73cb5c0fc7..25eb2a9e8d9b 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.h +++ b/fs/xfs/linux-2.6/xfs_vnode.h | |||
@@ -230,14 +230,6 @@ static inline void vn_atime_to_time_t(bhv_vnode_t *vp, time_t *tt) | |||
230 | #define ATTR_NOSIZETOK 0x400 /* Don't get the SIZE token */ | 230 | #define ATTR_NOSIZETOK 0x400 /* Don't get the SIZE token */ |
231 | 231 | ||
232 | /* | 232 | /* |
233 | * Flags to vop_fsync/reclaim. | ||
234 | */ | ||
235 | #define FSYNC_NOWAIT 0 /* asynchronous flush */ | ||
236 | #define FSYNC_WAIT 0x1 /* synchronous fsync or forced reclaim */ | ||
237 | #define FSYNC_INVAL 0x2 /* flush and invalidate cached data */ | ||
238 | #define FSYNC_DATA 0x4 /* synchronous fsync of data only */ | ||
239 | |||
240 | /* | ||
241 | * Tracking vnode activity. | 233 | * Tracking vnode activity. |
242 | */ | 234 | */ |
243 | #if defined(XFS_INODE_TRACE) | 235 | #if defined(XFS_INODE_TRACE) |
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index cf0bb9c1d621..e569bf5d6cf0 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -2974,6 +2974,7 @@ xfs_iflush_cluster( | |||
2974 | xfs_mount_t *mp = ip->i_mount; | 2974 | xfs_mount_t *mp = ip->i_mount; |
2975 | xfs_perag_t *pag = xfs_get_perag(mp, ip->i_ino); | 2975 | xfs_perag_t *pag = xfs_get_perag(mp, ip->i_ino); |
2976 | unsigned long first_index, mask; | 2976 | unsigned long first_index, mask; |
2977 | unsigned long inodes_per_cluster; | ||
2977 | int ilist_size; | 2978 | int ilist_size; |
2978 | xfs_inode_t **ilist; | 2979 | xfs_inode_t **ilist; |
2979 | xfs_inode_t *iq; | 2980 | xfs_inode_t *iq; |
@@ -2985,8 +2986,9 @@ xfs_iflush_cluster( | |||
2985 | ASSERT(pag->pagi_inodeok); | 2986 | ASSERT(pag->pagi_inodeok); |
2986 | ASSERT(pag->pag_ici_init); | 2987 | ASSERT(pag->pag_ici_init); |
2987 | 2988 | ||
2988 | ilist_size = XFS_INODE_CLUSTER_SIZE(mp) * sizeof(xfs_inode_t *); | 2989 | inodes_per_cluster = XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog; |
2989 | ilist = kmem_alloc(ilist_size, KM_MAYFAIL); | 2990 | ilist_size = inodes_per_cluster * sizeof(xfs_inode_t *); |
2991 | ilist = kmem_alloc(ilist_size, KM_MAYFAIL|KM_NOFS); | ||
2990 | if (!ilist) | 2992 | if (!ilist) |
2991 | return 0; | 2993 | return 0; |
2992 | 2994 | ||
@@ -2995,8 +2997,7 @@ xfs_iflush_cluster( | |||
2995 | read_lock(&pag->pag_ici_lock); | 2997 | read_lock(&pag->pag_ici_lock); |
2996 | /* really need a gang lookup range call here */ | 2998 | /* really need a gang lookup range call here */ |
2997 | nr_found = radix_tree_gang_lookup(&pag->pag_ici_root, (void**)ilist, | 2999 | nr_found = radix_tree_gang_lookup(&pag->pag_ici_root, (void**)ilist, |
2998 | first_index, | 3000 | first_index, inodes_per_cluster); |
2999 | XFS_INODE_CLUSTER_SIZE(mp)); | ||
3000 | if (nr_found == 0) | 3001 | if (nr_found == 0) |
3001 | goto out_free; | 3002 | goto out_free; |
3002 | 3003 | ||
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 70702a60b4bb..e475e3717eb3 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -856,18 +856,14 @@ xfs_readlink( | |||
856 | /* | 856 | /* |
857 | * xfs_fsync | 857 | * xfs_fsync |
858 | * | 858 | * |
859 | * This is called to sync the inode and its data out to disk. | 859 | * This is called to sync the inode and its data out to disk. We need to hold |
860 | * We need to hold the I/O lock while flushing the data, and | 860 | * the I/O lock while flushing the data, and the inode lock while flushing the |
861 | * the inode lock while flushing the inode. The inode lock CANNOT | 861 | * inode. The inode lock CANNOT be held while flushing the data, so acquire |
862 | * be held while flushing the data, so acquire after we're done | 862 | * after we're done with that. |
863 | * with that. | ||
864 | */ | 863 | */ |
865 | int | 864 | int |
866 | xfs_fsync( | 865 | xfs_fsync( |
867 | xfs_inode_t *ip, | 866 | xfs_inode_t *ip) |
868 | int flag, | ||
869 | xfs_off_t start, | ||
870 | xfs_off_t stop) | ||
871 | { | 867 | { |
872 | xfs_trans_t *tp; | 868 | xfs_trans_t *tp; |
873 | int error; | 869 | int error; |
@@ -875,103 +871,79 @@ xfs_fsync( | |||
875 | 871 | ||
876 | xfs_itrace_entry(ip); | 872 | xfs_itrace_entry(ip); |
877 | 873 | ||
878 | ASSERT(start >= 0 && stop >= -1); | ||
879 | |||
880 | if (XFS_FORCED_SHUTDOWN(ip->i_mount)) | 874 | if (XFS_FORCED_SHUTDOWN(ip->i_mount)) |
881 | return XFS_ERROR(EIO); | 875 | return XFS_ERROR(EIO); |
882 | 876 | ||
883 | if (flag & FSYNC_DATA) | 877 | /* capture size updates in I/O completion before writing the inode. */ |
884 | filemap_fdatawait(vn_to_inode(XFS_ITOV(ip))->i_mapping); | 878 | error = filemap_fdatawait(vn_to_inode(XFS_ITOV(ip))->i_mapping); |
879 | if (error) | ||
880 | return XFS_ERROR(error); | ||
885 | 881 | ||
886 | /* | 882 | /* |
887 | * We always need to make sure that the required inode state | 883 | * We always need to make sure that the required inode state is safe on |
888 | * is safe on disk. The vnode might be clean but because | 884 | * disk. The vnode might be clean but we still might need to force the |
889 | * of committed transactions that haven't hit the disk yet. | 885 | * log because of committed transactions that haven't hit the disk yet. |
890 | * Likewise, there could be unflushed non-transactional | 886 | * Likewise, there could be unflushed non-transactional changes to the |
891 | * changes to the inode core that have to go to disk. | 887 | * inode core that have to go to disk and this requires us to issue |
888 | * a synchronous transaction to capture these changes correctly. | ||
892 | * | 889 | * |
893 | * The following code depends on one assumption: that | 890 | * This code relies on the assumption that if the update_* fields |
894 | * any transaction that changes an inode logs the core | 891 | * of the inode are clear and the inode is unpinned then it is clean |
895 | * because it has to change some field in the inode core | 892 | * and no action is required. |
896 | * (typically nextents or nblocks). That assumption | ||
897 | * implies that any transactions against an inode will | ||
898 | * catch any non-transactional updates. If inode-altering | ||
899 | * transactions exist that violate this assumption, the | ||
900 | * code breaks. Right now, it figures that if the involved | ||
901 | * update_* field is clear and the inode is unpinned, the | ||
902 | * inode is clean. Either it's been flushed or it's been | ||
903 | * committed and the commit has hit the disk unpinning the inode. | ||
904 | * (Note that xfs_inode_item_format() called at commit clears | ||
905 | * the update_* fields.) | ||
906 | */ | 893 | */ |
907 | xfs_ilock(ip, XFS_ILOCK_SHARED); | 894 | xfs_ilock(ip, XFS_ILOCK_SHARED); |
908 | 895 | ||
909 | /* If we are flushing data then we care about update_size | 896 | if (!(ip->i_update_size || ip->i_update_core)) { |
910 | * being set, otherwise we care about update_core | ||
911 | */ | ||
912 | if ((flag & FSYNC_DATA) ? | ||
913 | (ip->i_update_size == 0) : | ||
914 | (ip->i_update_core == 0)) { | ||
915 | /* | 897 | /* |
916 | * Timestamps/size haven't changed since last inode | 898 | * Timestamps/size haven't changed since last inode flush or |
917 | * flush or inode transaction commit. That means | 899 | * inode transaction commit. That means either nothing got |
918 | * either nothing got written or a transaction | 900 | * written or a transaction committed which caught the updates. |
919 | * committed which caught the updates. If the | 901 | * If the latter happened and the transaction hasn't hit the |
920 | * latter happened and the transaction hasn't | 902 | * disk yet, the inode will be still be pinned. If it is, |
921 | * hit the disk yet, the inode will be still | 903 | * force the log. |
922 | * be pinned. If it is, force the log. | ||
923 | */ | 904 | */ |
924 | 905 | ||
925 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | 906 | xfs_iunlock(ip, XFS_ILOCK_SHARED); |
926 | 907 | ||
927 | if (xfs_ipincount(ip)) { | 908 | if (xfs_ipincount(ip)) { |
928 | _xfs_log_force(ip->i_mount, (xfs_lsn_t)0, | 909 | error = _xfs_log_force(ip->i_mount, (xfs_lsn_t)0, |
929 | XFS_LOG_FORCE | | 910 | XFS_LOG_FORCE | XFS_LOG_SYNC, |
930 | ((flag & FSYNC_WAIT) | ||
931 | ? XFS_LOG_SYNC : 0), | ||
932 | &log_flushed); | 911 | &log_flushed); |
933 | } else { | 912 | } else { |
934 | /* | 913 | /* |
935 | * If the inode is not pinned and nothing | 914 | * If the inode is not pinned and nothing has changed |
936 | * has changed we don't need to flush the | 915 | * we don't need to flush the cache. |
937 | * cache. | ||
938 | */ | 916 | */ |
939 | changed = 0; | 917 | changed = 0; |
940 | } | 918 | } |
941 | error = 0; | ||
942 | } else { | 919 | } else { |
943 | /* | 920 | /* |
944 | * Kick off a transaction to log the inode | 921 | * Kick off a transaction to log the inode core to get the |
945 | * core to get the updates. Make it | 922 | * updates. The sync transaction will also force the log. |
946 | * sync if FSYNC_WAIT is passed in (which | ||
947 | * is done by everybody but specfs). The | ||
948 | * sync transaction will also force the log. | ||
949 | */ | 923 | */ |
950 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | 924 | xfs_iunlock(ip, XFS_ILOCK_SHARED); |
951 | tp = xfs_trans_alloc(ip->i_mount, XFS_TRANS_FSYNC_TS); | 925 | tp = xfs_trans_alloc(ip->i_mount, XFS_TRANS_FSYNC_TS); |
952 | if ((error = xfs_trans_reserve(tp, 0, | 926 | error = xfs_trans_reserve(tp, 0, |
953 | XFS_FSYNC_TS_LOG_RES(ip->i_mount), | 927 | XFS_FSYNC_TS_LOG_RES(ip->i_mount), 0, 0, 0); |
954 | 0, 0, 0))) { | 928 | if (error) { |
955 | xfs_trans_cancel(tp, 0); | 929 | xfs_trans_cancel(tp, 0); |
956 | return error; | 930 | return error; |
957 | } | 931 | } |
958 | xfs_ilock(ip, XFS_ILOCK_EXCL); | 932 | xfs_ilock(ip, XFS_ILOCK_EXCL); |
959 | 933 | ||
960 | /* | 934 | /* |
961 | * Note - it's possible that we might have pushed | 935 | * Note - it's possible that we might have pushed ourselves out |
962 | * ourselves out of the way during trans_reserve | 936 | * of the way during trans_reserve which would flush the inode. |
963 | * which would flush the inode. But there's no | 937 | * But there's no guarantee that the inode buffer has actually |
964 | * guarantee that the inode buffer has actually | 938 | * gone out yet (it's delwri). Plus the buffer could be pinned |
965 | * gone out yet (it's delwri). Plus the buffer | 939 | * anyway if it's part of an inode in another recent |
966 | * could be pinned anyway if it's part of an | 940 | * transaction. So we play it safe and fire off the |
967 | * inode in another recent transaction. So we | 941 | * transaction anyway. |
968 | * play it safe and fire off the transaction anyway. | ||
969 | */ | 942 | */ |
970 | xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); | 943 | xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); |
971 | xfs_trans_ihold(tp, ip); | 944 | xfs_trans_ihold(tp, ip); |
972 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); | 945 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); |
973 | if (flag & FSYNC_WAIT) | 946 | xfs_trans_set_sync(tp); |
974 | xfs_trans_set_sync(tp); | ||
975 | error = _xfs_trans_commit(tp, 0, &log_flushed); | 947 | error = _xfs_trans_commit(tp, 0, &log_flushed); |
976 | 948 | ||
977 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | 949 | xfs_iunlock(ip, XFS_ILOCK_EXCL); |
diff --git a/fs/xfs/xfs_vnodeops.h b/fs/xfs/xfs_vnodeops.h index 8abe8f186e20..57335ba4ce53 100644 --- a/fs/xfs/xfs_vnodeops.h +++ b/fs/xfs/xfs_vnodeops.h | |||
@@ -18,8 +18,7 @@ int xfs_open(struct xfs_inode *ip); | |||
18 | int xfs_setattr(struct xfs_inode *ip, struct bhv_vattr *vap, int flags, | 18 | int xfs_setattr(struct xfs_inode *ip, struct bhv_vattr *vap, int flags, |
19 | struct cred *credp); | 19 | struct cred *credp); |
20 | int xfs_readlink(struct xfs_inode *ip, char *link); | 20 | int xfs_readlink(struct xfs_inode *ip, char *link); |
21 | int xfs_fsync(struct xfs_inode *ip, int flag, xfs_off_t start, | 21 | int xfs_fsync(struct xfs_inode *ip); |
22 | xfs_off_t stop); | ||
23 | int xfs_release(struct xfs_inode *ip); | 22 | int xfs_release(struct xfs_inode *ip); |
24 | int xfs_inactive(struct xfs_inode *ip); | 23 | int xfs_inactive(struct xfs_inode *ip); |
25 | int xfs_lookup(struct xfs_inode *dp, struct xfs_name *name, | 24 | int xfs_lookup(struct xfs_inode *dp, struct xfs_name *name, |
diff --git a/include/asm-blackfin/bfin-global.h b/include/asm-blackfin/bfin-global.h index 716df7c85923..a9248d883675 100644 --- a/include/asm-blackfin/bfin-global.h +++ b/include/asm-blackfin/bfin-global.h | |||
@@ -37,7 +37,9 @@ | |||
37 | #include <linux/linkage.h> | 37 | #include <linux/linkage.h> |
38 | #include <linux/types.h> | 38 | #include <linux/types.h> |
39 | 39 | ||
40 | #if defined(CONFIG_DMA_UNCACHED_2M) | 40 | #if defined(CONFIG_DMA_UNCACHED_4M) |
41 | # define DMA_UNCACHED_REGION (4 * 1024 * 1024) | ||
42 | #elif defined(CONFIG_DMA_UNCACHED_2M) | ||
41 | # define DMA_UNCACHED_REGION (2 * 1024 * 1024) | 43 | # define DMA_UNCACHED_REGION (2 * 1024 * 1024) |
42 | #elif defined(CONFIG_DMA_UNCACHED_1M) | 44 | #elif defined(CONFIG_DMA_UNCACHED_1M) |
43 | # define DMA_UNCACHED_REGION (1024 * 1024) | 45 | # define DMA_UNCACHED_REGION (1024 * 1024) |
diff --git a/include/asm-blackfin/checksum.h b/include/asm-blackfin/checksum.h index 2638f2586d2f..6f6af2b8e9e0 100644 --- a/include/asm-blackfin/checksum.h +++ b/include/asm-blackfin/checksum.h | |||
@@ -15,7 +15,7 @@ | |||
15 | * | 15 | * |
16 | * it's best to have buff aligned on a 32-bit boundary | 16 | * it's best to have buff aligned on a 32-bit boundary |
17 | */ | 17 | */ |
18 | unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum); | 18 | __wsum csum_partial(const void *buff, int len, __wsum sum); |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * the same as csum_partial, but copies from src while it | 21 | * the same as csum_partial, but copies from src while it |
@@ -25,8 +25,8 @@ unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum); | |||
25 | * better 64-bit) boundary | 25 | * better 64-bit) boundary |
26 | */ | 26 | */ |
27 | 27 | ||
28 | unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst, | 28 | __wsum csum_partial_copy(const void *src, void *dst, |
29 | int len, int sum); | 29 | int len, __wsum sum); |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * the same as csum_partial_copy, but copies from user space. | 32 | * the same as csum_partial_copy, but copies from user space. |
@@ -35,20 +35,19 @@ unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst, | |||
35 | * better 64-bit) boundary | 35 | * better 64-bit) boundary |
36 | */ | 36 | */ |
37 | 37 | ||
38 | extern unsigned int csum_partial_copy_from_user(const unsigned char *src, | 38 | extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst, |
39 | unsigned char *dst, int len, | 39 | int len, __wsum sum, int *csum_err); |
40 | int sum, int *csum_err); | ||
41 | 40 | ||
42 | #define csum_partial_copy_nocheck(src, dst, len, sum) \ | 41 | #define csum_partial_copy_nocheck(src, dst, len, sum) \ |
43 | csum_partial_copy((src), (dst), (len), (sum)) | 42 | csum_partial_copy((src), (dst), (len), (sum)) |
44 | 43 | ||
45 | unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl); | 44 | __sum16 ip_fast_csum(unsigned char *iph, unsigned int ihl); |
46 | 45 | ||
47 | /* | 46 | /* |
48 | * Fold a partial checksum | 47 | * Fold a partial checksum |
49 | */ | 48 | */ |
50 | 49 | ||
51 | static inline unsigned int csum_fold(unsigned int sum) | 50 | static inline __sum16 csum_fold(__wsum sum) |
52 | { | 51 | { |
53 | while (sum >> 16) | 52 | while (sum >> 16) |
54 | sum = (sum & 0xffff) + (sum >> 16); | 53 | sum = (sum & 0xffff) + (sum >> 16); |
@@ -60,9 +59,9 @@ static inline unsigned int csum_fold(unsigned int sum) | |||
60 | * returns a 16-bit checksum, already complemented | 59 | * returns a 16-bit checksum, already complemented |
61 | */ | 60 | */ |
62 | 61 | ||
63 | static inline unsigned int | 62 | static inline __wsum |
64 | csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr, unsigned short len, | 63 | csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len, |
65 | unsigned short proto, unsigned int sum) | 64 | unsigned short proto, __wsum sum) |
66 | { | 65 | { |
67 | 66 | ||
68 | __asm__ ("%0 = %0 + %1;\n\t" | 67 | __asm__ ("%0 = %0 + %1;\n\t" |
@@ -84,9 +83,9 @@ csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr, unsigned short len, | |||
84 | return (sum); | 83 | return (sum); |
85 | } | 84 | } |
86 | 85 | ||
87 | static inline unsigned short int | 86 | static inline __sum16 |
88 | csum_tcpudp_magic(unsigned long saddr, unsigned long daddr, unsigned short len, | 87 | csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len, |
89 | unsigned short proto, unsigned int sum) | 88 | unsigned short proto, __wsum sum) |
90 | { | 89 | { |
91 | return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum)); | 90 | return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum)); |
92 | } | 91 | } |
@@ -96,6 +95,6 @@ csum_tcpudp_magic(unsigned long saddr, unsigned long daddr, unsigned short len, | |||
96 | * in icmp.c | 95 | * in icmp.c |
97 | */ | 96 | */ |
98 | 97 | ||
99 | extern unsigned short ip_compute_csum(const unsigned char *buff, int len); | 98 | extern __sum16 ip_compute_csum(const void *buff, int len); |
100 | 99 | ||
101 | #endif /* _BFIN_CHECKSUM_H */ | 100 | #endif /* _BFIN_CHECKSUM_H */ |
diff --git a/include/asm-blackfin/gpio.h b/include/asm-blackfin/gpio.h index 27ff532a806c..ff95e9d88342 100644 --- a/include/asm-blackfin/gpio.h +++ b/include/asm-blackfin/gpio.h | |||
@@ -437,7 +437,6 @@ void gpio_set_value(unsigned gpio, int arg); | |||
437 | int gpio_get_value(unsigned gpio); | 437 | int gpio_get_value(unsigned gpio); |
438 | 438 | ||
439 | #ifndef BF548_FAMILY | 439 | #ifndef BF548_FAMILY |
440 | #define gpio_get_value(gpio) get_gpio_data(gpio) | ||
441 | #define gpio_set_value(gpio, value) set_gpio_data(gpio, value) | 440 | #define gpio_set_value(gpio, value) set_gpio_data(gpio, value) |
442 | #endif | 441 | #endif |
443 | 442 | ||
diff --git a/include/asm-blackfin/io.h b/include/asm-blackfin/io.h index 574fe56989d1..cbbf7ffdbbff 100644 --- a/include/asm-blackfin/io.h +++ b/include/asm-blackfin/io.h | |||
@@ -117,10 +117,12 @@ static inline unsigned int readl(const volatile void __iomem *addr) | |||
117 | 117 | ||
118 | extern void outsb(unsigned long port, const void *addr, unsigned long count); | 118 | extern void outsb(unsigned long port, const void *addr, unsigned long count); |
119 | extern void outsw(unsigned long port, const void *addr, unsigned long count); | 119 | extern void outsw(unsigned long port, const void *addr, unsigned long count); |
120 | extern void outsw_8(unsigned long port, const void *addr, unsigned long count); | ||
120 | extern void outsl(unsigned long port, const void *addr, unsigned long count); | 121 | extern void outsl(unsigned long port, const void *addr, unsigned long count); |
121 | 122 | ||
122 | extern void insb(unsigned long port, void *addr, unsigned long count); | 123 | extern void insb(unsigned long port, void *addr, unsigned long count); |
123 | extern void insw(unsigned long port, void *addr, unsigned long count); | 124 | extern void insw(unsigned long port, void *addr, unsigned long count); |
125 | extern void insw_8(unsigned long port, void *addr, unsigned long count); | ||
124 | extern void insl(unsigned long port, void *addr, unsigned long count); | 126 | extern void insl(unsigned long port, void *addr, unsigned long count); |
125 | extern void insl_16(unsigned long port, void *addr, unsigned long count); | 127 | extern void insl_16(unsigned long port, void *addr, unsigned long count); |
126 | 128 | ||
diff --git a/include/asm-blackfin/mach-bf527/blackfin.h b/include/asm-blackfin/mach-bf527/blackfin.h index 2891727b6176..297821e2d79a 100644 --- a/include/asm-blackfin/mach-bf527/blackfin.h +++ b/include/asm-blackfin/mach-bf527/blackfin.h | |||
@@ -39,22 +39,22 @@ | |||
39 | #include "defBF522.h" | 39 | #include "defBF522.h" |
40 | #include "anomaly.h" | 40 | #include "anomaly.h" |
41 | 41 | ||
42 | #if defined(CONFIG_BF527) | 42 | #if defined(CONFIG_BF527) || defined(CONFIG_BF526) |
43 | #include "defBF527.h" | 43 | #include "defBF527.h" |
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | #if defined(CONFIG_BF525) | 46 | #if defined(CONFIG_BF525) || defined(CONFIG_BF524) |
47 | #include "defBF525.h" | 47 | #include "defBF525.h" |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #if !defined(__ASSEMBLY__) | 50 | #if !defined(__ASSEMBLY__) |
51 | #include "cdefBF522.h" | 51 | #include "cdefBF522.h" |
52 | 52 | ||
53 | #if defined(CONFIG_BF527) | 53 | #if defined(CONFIG_BF527) || defined(CONFIG_BF526) |
54 | #include "cdefBF527.h" | 54 | #include "cdefBF527.h" |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | #if defined(CONFIG_BF525) | 57 | #if defined(CONFIG_BF525) || defined(CONFIG_BF524) |
58 | #include "cdefBF525.h" | 58 | #include "cdefBF525.h" |
59 | #endif | 59 | #endif |
60 | #endif | 60 | #endif |
diff --git a/include/asm-blackfin/mach-bf561/dma.h b/include/asm-blackfin/mach-bf561/dma.h index 21d982003e75..8bc46cd89a02 100644 --- a/include/asm-blackfin/mach-bf561/dma.h +++ b/include/asm-blackfin/mach-bf561/dma.h | |||
@@ -25,11 +25,11 @@ | |||
25 | #define CH_MEM_STREAM1_SRC 27 /* RX */ | 25 | #define CH_MEM_STREAM1_SRC 27 /* RX */ |
26 | #define CH_MEM_STREAM2_DEST 28 | 26 | #define CH_MEM_STREAM2_DEST 28 |
27 | #define CH_MEM_STREAM2_SRC 29 | 27 | #define CH_MEM_STREAM2_SRC 29 |
28 | #define CH_MEM_STREAM3_SRC 30 | 28 | #define CH_MEM_STREAM3_DEST 30 |
29 | #define CH_MEM_STREAM3_DEST 31 | 29 | #define CH_MEM_STREAM3_SRC 31 |
30 | #define CH_IMEM_STREAM0_DEST 32 | 30 | #define CH_IMEM_STREAM0_DEST 32 |
31 | #define CH_IMEM_STREAM0_SRC 33 | 31 | #define CH_IMEM_STREAM0_SRC 33 |
32 | #define CH_IMEM_STREAM1_SRC 34 | 32 | #define CH_IMEM_STREAM1_DEST 34 |
33 | #define CH_IMEM_STREAM1_DEST 35 | 33 | #define CH_IMEM_STREAM1_SRC 35 |
34 | 34 | ||
35 | #endif | 35 | #endif |
diff --git a/include/asm-blackfin/serial.h b/include/asm-blackfin/serial.h new file mode 100644 index 000000000000..994dd869558c --- /dev/null +++ b/include/asm-blackfin/serial.h | |||
@@ -0,0 +1,5 @@ | |||
1 | /* | ||
2 | * include/asm-blackfin/serial.h | ||
3 | */ | ||
4 | |||
5 | #define SERIAL_EXTRA_IRQ_FLAGS IRQF_TRIGGER_HIGH | ||
diff --git a/include/asm-ia64/kvm.h b/include/asm-ia64/kvm.h index eb2d3559d089..3f6a090cbd9a 100644 --- a/include/asm-ia64/kvm.h +++ b/include/asm-ia64/kvm.h | |||
@@ -22,14 +22,13 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <asm/types.h> | 24 | #include <asm/types.h> |
25 | #include <asm/fpu.h> | ||
26 | 25 | ||
27 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
28 | 27 | ||
29 | /* Architectural interrupt line count. */ | 28 | /* Architectural interrupt line count. */ |
30 | #define KVM_NR_INTERRUPTS 256 | 29 | #define KVM_NR_INTERRUPTS 256 |
31 | 30 | ||
32 | #define KVM_IOAPIC_NUM_PINS 24 | 31 | #define KVM_IOAPIC_NUM_PINS 48 |
33 | 32 | ||
34 | struct kvm_ioapic_state { | 33 | struct kvm_ioapic_state { |
35 | __u64 base_address; | 34 | __u64 base_address; |
@@ -61,6 +60,13 @@ struct kvm_ioapic_state { | |||
61 | 60 | ||
62 | #define KVM_CONTEXT_SIZE 8*1024 | 61 | #define KVM_CONTEXT_SIZE 8*1024 |
63 | 62 | ||
63 | struct kvm_fpreg { | ||
64 | union { | ||
65 | unsigned long bits[2]; | ||
66 | long double __dummy; /* force 16-byte alignment */ | ||
67 | } u; | ||
68 | }; | ||
69 | |||
64 | union context { | 70 | union context { |
65 | /* 8K size */ | 71 | /* 8K size */ |
66 | char dummy[KVM_CONTEXT_SIZE]; | 72 | char dummy[KVM_CONTEXT_SIZE]; |
@@ -77,7 +83,7 @@ union context { | |||
77 | unsigned long ibr[8]; | 83 | unsigned long ibr[8]; |
78 | unsigned long dbr[8]; | 84 | unsigned long dbr[8]; |
79 | unsigned long pkr[8]; | 85 | unsigned long pkr[8]; |
80 | struct ia64_fpreg fr[128]; | 86 | struct kvm_fpreg fr[128]; |
81 | }; | 87 | }; |
82 | }; | 88 | }; |
83 | 89 | ||
diff --git a/include/asm-powerpc/mpic.h b/include/asm-powerpc/mpic.h index 943c5a3fac8a..a4d0f876b427 100644 --- a/include/asm-powerpc/mpic.h +++ b/include/asm-powerpc/mpic.h | |||
@@ -428,12 +428,11 @@ extern void mpic_init(struct mpic *mpic); | |||
428 | */ | 428 | */ |
429 | 429 | ||
430 | 430 | ||
431 | /* Change/Read the priority of an interrupt. Default is 8 for irqs and | 431 | /* Change the priority of an interrupt. Default is 8 for irqs and |
432 | * 10 for IPIs. You can call this on both IPIs and IRQ numbers, but the | 432 | * 10 for IPIs. You can call this on both IPIs and IRQ numbers, but the |
433 | * IPI number is then the offset'ed (linux irq number mapped to the IPI) | 433 | * IPI number is then the offset'ed (linux irq number mapped to the IPI) |
434 | */ | 434 | */ |
435 | extern void mpic_irq_set_priority(unsigned int irq, unsigned int pri); | 435 | extern void mpic_irq_set_priority(unsigned int irq, unsigned int pri); |
436 | extern unsigned int mpic_irq_get_priority(unsigned int irq); | ||
437 | 436 | ||
438 | /* Setup a non-boot CPU */ | 437 | /* Setup a non-boot CPU */ |
439 | extern void mpic_setup_this_cpu(void); | 438 | extern void mpic_setup_this_cpu(void); |
diff --git a/include/asm-sh/kgdb.h b/include/asm-sh/kgdb.h index 4bc8cb187d11..24e42078f36f 100644 --- a/include/asm-sh/kgdb.h +++ b/include/asm-sh/kgdb.h | |||
@@ -66,18 +66,4 @@ extern int setjmp(jmp_buf __jmpb); | |||
66 | /* Forced breakpoint */ | 66 | /* Forced breakpoint */ |
67 | #define breakpoint() __asm__ __volatile__("trapa #0x3c") | 67 | #define breakpoint() __asm__ __volatile__("trapa #0x3c") |
68 | 68 | ||
69 | /* Taken from sh-stub.c of GDB 4.18 */ | ||
70 | static const char hexchars[] = "0123456789abcdef"; | ||
71 | |||
72 | /* Get high hex bits */ | ||
73 | static inline char highhex(const int x) | ||
74 | { | ||
75 | return hexchars[(x >> 4) & 0xf]; | ||
76 | } | ||
77 | |||
78 | /* Get low hex bits */ | ||
79 | static inline char lowhex(const int x) | ||
80 | { | ||
81 | return hexchars[x & 0xf]; | ||
82 | } | ||
83 | #endif | 69 | #endif |
diff --git a/include/asm-sparc/asi.h b/include/asm-sparc/asi.h index 58c3754da926..158f9b00d43f 100644 --- a/include/asm-sparc/asi.h +++ b/include/asm-sparc/asi.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: asi.h,v 1.18 1998/03/09 14:04:46 jj Exp $ */ | ||
2 | #ifndef _SPARC_ASI_H | 1 | #ifndef _SPARC_ASI_H |
3 | #define _SPARC_ASI_H | 2 | #define _SPARC_ASI_H |
4 | 3 | ||
diff --git a/include/asm-sparc/auxio.h b/include/asm-sparc/auxio.h index ee83aefb20dc..e552b8d68450 100644 --- a/include/asm-sparc/auxio.h +++ b/include/asm-sparc/auxio.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: auxio.h,v 1.18 1997/11/07 15:01:45 jj Exp $ | 1 | /* |
2 | * auxio.h: Definitions and code for the Auxiliary I/O register. | 2 | * auxio.h: Definitions and code for the Auxiliary I/O register. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/bitops.h b/include/asm-sparc/bitops.h index cb3cefab6e09..68b98a7e6454 100644 --- a/include/asm-sparc/bitops.h +++ b/include/asm-sparc/bitops.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bitops.h,v 1.67 2001/11/19 18:36:34 davem Exp $ | 1 | /* |
2 | * bitops.h: Bit string operations on the Sparc. | 2 | * bitops.h: Bit string operations on the Sparc. |
3 | * | 3 | * |
4 | * Copyright 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/btfixup.h b/include/asm-sparc/btfixup.h index c2868d0f60b6..08277e6fb4cd 100644 --- a/include/asm-sparc/btfixup.h +++ b/include/asm-sparc/btfixup.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: btfixup.h,v 1.4 1998/03/09 14:04:43 jj Exp $ | 1 | /* |
2 | * asm-sparc/btfixup.h: Macros for boot time linking. | 2 | * asm-sparc/btfixup.h: Macros for boot time linking. |
3 | * | 3 | * |
4 | * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/include/asm-sparc/checksum.h b/include/asm-sparc/checksum.h index 34518ea7bf1b..d044ddb5a3cf 100644 --- a/include/asm-sparc/checksum.h +++ b/include/asm-sparc/checksum.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: checksum.h,v 1.33 2002/02/01 22:01:05 davem Exp $ */ | ||
2 | #ifndef __SPARC_CHECKSUM_H | 1 | #ifndef __SPARC_CHECKSUM_H |
3 | #define __SPARC_CHECKSUM_H | 2 | #define __SPARC_CHECKSUM_H |
4 | 3 | ||
diff --git a/include/asm-sparc/clock.h b/include/asm-sparc/clock.h index e708e6b50d2b..2cf99dadec56 100644 --- a/include/asm-sparc/clock.h +++ b/include/asm-sparc/clock.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: clock.h,v 1.3 1995/11/25 02:31:25 davem Exp $ | 1 | /* |
2 | * clock.h: Definitions for clock operations on the Sparc. | 2 | * clock.h: Definitions for clock operations on the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/contregs.h b/include/asm-sparc/contregs.h index 0e05afe02d44..48fa8a4ef357 100644 --- a/include/asm-sparc/contregs.h +++ b/include/asm-sparc/contregs.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: contregs.h,v 1.8 2000/12/28 22:49:11 davem Exp $ */ | ||
2 | #ifndef _SPARC_CONTREGS_H | 1 | #ifndef _SPARC_CONTREGS_H |
3 | #define _SPARC_CONTREGS_H | 2 | #define _SPARC_CONTREGS_H |
4 | 3 | ||
diff --git a/include/asm-sparc/cypress.h b/include/asm-sparc/cypress.h index 99599533efbc..95e9772ea394 100644 --- a/include/asm-sparc/cypress.h +++ b/include/asm-sparc/cypress.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: cypress.h,v 1.6 1996/08/29 09:48:09 davem Exp $ | 1 | /* |
2 | * cypress.h: Cypress module specific definitions and defines. | 2 | * cypress.h: Cypress module specific definitions and defines. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/delay.h b/include/asm-sparc/delay.h index 48aa70eef997..bc9aba2bead6 100644 --- a/include/asm-sparc/delay.h +++ b/include/asm-sparc/delay.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: delay.h,v 1.11 2001/01/01 01:46:15 davem Exp $ | 1 | /* |
2 | * delay.h: Linux delay routines on the Sparc. | 2 | * delay.h: Linux delay routines on the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu). | 4 | * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu). |
diff --git a/include/asm-sparc/ebus.h b/include/asm-sparc/ebus.h index 54652887c127..491f85d662df 100644 --- a/include/asm-sparc/ebus.h +++ b/include/asm-sparc/ebus.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ebus.h,v 1.2 1999/09/11 23:05:55 zaitcev Exp $ | 1 | /* |
2 | * ebus.h: PCI to Ebus pseudo driver software state. | 2 | * ebus.h: PCI to Ebus pseudo driver software state. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/include/asm-sparc/ecc.h b/include/asm-sparc/ecc.h index 8e27ceccb76d..ccb84b66fef1 100644 --- a/include/asm-sparc/ecc.h +++ b/include/asm-sparc/ecc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ecc.h,v 1.3 1996/04/25 06:12:57 davem Exp $ | 1 | /* |
2 | * ecc.h: Definitions and defines for the external cache/memory | 2 | * ecc.h: Definitions and defines for the external cache/memory |
3 | * controller on the sun4m. | 3 | * controller on the sun4m. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/eeprom.h b/include/asm-sparc/eeprom.h index a8ff7496ddf5..e17beeceb405 100644 --- a/include/asm-sparc/eeprom.h +++ b/include/asm-sparc/eeprom.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: eeprom.h,v 1.3 1995/11/25 02:31:38 davem Exp $ | 1 | /* |
2 | * eeprom.h: Definitions for the Sun eeprom. | 2 | * eeprom.h: Definitions for the Sun eeprom. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h index d2516eed3a38..d043f80bc2fd 100644 --- a/include/asm-sparc/elf.h +++ b/include/asm-sparc/elf.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: elf.h,v 1.22 2000/07/12 01:27:08 davem Exp $ */ | ||
2 | #ifndef __ASMSPARC_ELF_H | 1 | #ifndef __ASMSPARC_ELF_H |
3 | #define __ASMSPARC_ELF_H | 2 | #define __ASMSPARC_ELF_H |
4 | 3 | ||
diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h index 5ec546349fc8..07bd2d80257f 100644 --- a/include/asm-sparc/fcntl.h +++ b/include/asm-sparc/fcntl.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: fcntl.h,v 1.16 2001/09/20 00:35:33 davem Exp $ */ | ||
2 | #ifndef _SPARC_FCNTL_H | 1 | #ifndef _SPARC_FCNTL_H |
3 | #define _SPARC_FCNTL_H | 2 | #define _SPARC_FCNTL_H |
4 | 3 | ||
diff --git a/include/asm-sparc/head.h b/include/asm-sparc/head.h index e6532c3e09c9..7c35491a8b53 100644 --- a/include/asm-sparc/head.h +++ b/include/asm-sparc/head.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: head.h,v 1.39 2000/05/26 22:18:45 ecd Exp $ */ | ||
2 | #ifndef __SPARC_HEAD_H | 1 | #ifndef __SPARC_HEAD_H |
3 | #define __SPARC_HEAD_H | 2 | #define __SPARC_HEAD_H |
4 | 3 | ||
diff --git a/include/asm-sparc/idprom.h b/include/asm-sparc/idprom.h index 59083ed85232..41adb417a4e5 100644 --- a/include/asm-sparc/idprom.h +++ b/include/asm-sparc/idprom.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: idprom.h,v 1.6 1996/08/04 10:35:07 ecd Exp $ | 1 | /* |
2 | * idprom.h: Macros and defines for idprom routines | 2 | * idprom.h: Macros and defines for idprom routines |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h index 243bf8e9a058..3a3e7bdb06b3 100644 --- a/include/asm-sparc/io.h +++ b/include/asm-sparc/io.h | |||
@@ -1,6 +1,3 @@ | |||
1 | /* | ||
2 | * $Id: io.h,v 1.30 2001/12/21 01:23:21 davem Exp $ | ||
3 | */ | ||
4 | #ifndef __SPARC_IO_H | 1 | #ifndef __SPARC_IO_H |
5 | #define __SPARC_IO_H | 2 | #define __SPARC_IO_H |
6 | 3 | ||
diff --git a/include/asm-sparc/ioctl.h b/include/asm-sparc/ioctl.h index e6fc4de19940..7d6bd51321b9 100644 --- a/include/asm-sparc/ioctl.h +++ b/include/asm-sparc/ioctl.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: ioctl.h,v 1.6 1999/12/01 23:58:36 davem Exp $ */ | ||
2 | #ifndef _SPARC_IOCTL_H | 1 | #ifndef _SPARC_IOCTL_H |
3 | #define _SPARC_IOCTL_H | 2 | #define _SPARC_IOCTL_H |
4 | 3 | ||
diff --git a/include/asm-sparc/kdebug.h b/include/asm-sparc/kdebug.h index 631f15ffef73..f69fe7d84b3c 100644 --- a/include/asm-sparc/kdebug.h +++ b/include/asm-sparc/kdebug.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: kdebug.h,v 1.11 2000/06/04 06:23:53 anton Exp $ | 1 | /* |
2 | * kdebug.h: Defines and definitions for debugging the Linux kernel | 2 | * kdebug.h: Defines and definitions for debugging the Linux kernel |
3 | * under various kernel debuggers. | 3 | * under various kernel debuggers. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/machines.h b/include/asm-sparc/machines.h index d831350f5428..d6c6bf836206 100644 --- a/include/asm-sparc/machines.h +++ b/include/asm-sparc/machines.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: machines.h,v 1.4 1995/11/25 02:31:58 davem Exp $ | 1 | /* |
2 | * machines.h: Defines for taking apart the machine type value in the | 2 | * machines.h: Defines for taking apart the machine type value in the |
3 | * idprom and determining the kind of machine we are on. | 3 | * idprom and determining the kind of machine we are on. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/mbus.h b/include/asm-sparc/mbus.h index ecacdf4075d7..bb5ae614b166 100644 --- a/include/asm-sparc/mbus.h +++ b/include/asm-sparc/mbus.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mbus.h,v 1.9 1997/06/24 15:48:12 jj Exp $ | 1 | /* |
2 | * mbus.h: Various defines for MBUS modules. | 2 | * mbus.h: Various defines for MBUS modules. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/memreg.h b/include/asm-sparc/memreg.h index 5fb95c828da6..845ad2b39183 100644 --- a/include/asm-sparc/memreg.h +++ b/include/asm-sparc/memreg.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: memreg.h,v 1.8 1996/08/29 09:48:23 davem Exp $ */ | ||
2 | #ifndef _SPARC_MEMREG_H | 1 | #ifndef _SPARC_MEMREG_H |
3 | #define _SPARC_MEMREG_H | 2 | #define _SPARC_MEMREG_H |
4 | /* memreg.h: Definitions of the values found in the synchronous | 3 | /* memreg.h: Definitions of the values found in the synchronous |
diff --git a/include/asm-sparc/mman.h b/include/asm-sparc/mman.h index 3d16b40bb8ef..fdfbbf0a4736 100644 --- a/include/asm-sparc/mman.h +++ b/include/asm-sparc/mman.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: mman.h,v 1.9 2000/03/15 02:44:23 davem Exp $ */ | ||
2 | #ifndef __SPARC_MMAN_H__ | 1 | #ifndef __SPARC_MMAN_H__ |
3 | #define __SPARC_MMAN_H__ | 2 | #define __SPARC_MMAN_H__ |
4 | 3 | ||
diff --git a/include/asm-sparc/mostek.h b/include/asm-sparc/mostek.h index 958d0513a6d4..29aad11b8f00 100644 --- a/include/asm-sparc/mostek.h +++ b/include/asm-sparc/mostek.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mostek.h,v 1.13 2001/01/11 15:07:09 davem Exp $ | 1 | /* |
2 | * mostek.h: Describes the various Mostek time of day clock registers. | 2 | * mostek.h: Describes the various Mostek time of day clock registers. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/mpmbox.h b/include/asm-sparc/mpmbox.h index 0e1bc5801d8a..f8423039b242 100644 --- a/include/asm-sparc/mpmbox.h +++ b/include/asm-sparc/mpmbox.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mpmbox.h,v 1.4 1996/04/25 06:13:19 davem Exp $ | 1 | /* |
2 | * mpmbox.h: Interface and defines for the OpenProm mailbox | 2 | * mpmbox.h: Interface and defines for the OpenProm mailbox |
3 | * facilities for MP machines under Linux. | 3 | * facilities for MP machines under Linux. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/msi.h b/include/asm-sparc/msi.h index ff72cbd946a4..724ca5667052 100644 --- a/include/asm-sparc/msi.h +++ b/include/asm-sparc/msi.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: msi.h,v 1.3 1996/08/29 09:48:25 davem Exp $ | 1 | /* |
2 | * msi.h: Defines specific to the MBus - Sbus - Interface. | 2 | * msi.h: Defines specific to the MBus - Sbus - Interface. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/mxcc.h b/include/asm-sparc/mxcc.h index 128fe9708135..c0517bd05bde 100644 --- a/include/asm-sparc/mxcc.h +++ b/include/asm-sparc/mxcc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mxcc.h,v 1.7 1997/04/20 14:11:46 ecd Exp $ | 1 | /* |
2 | * mxcc.h: Definitions of the Viking MXCC registers | 2 | * mxcc.h: Definitions of the Viking MXCC registers |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/namei.h b/include/asm-sparc/namei.h index 618344d89cc4..0646102fb020 100644 --- a/include/asm-sparc/namei.h +++ b/include/asm-sparc/namei.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: namei.h,v 1.16 2000/04/13 00:55:54 davem Exp $ | 1 | /* |
2 | * linux/include/asm-sparc/namei.h | 2 | * linux/include/asm-sparc/namei.h |
3 | * | 3 | * |
4 | * Routines to handle famous /usr/gnemul/s*. | 4 | * Routines to handle famous /usr/gnemul/s*. |
diff --git a/include/asm-sparc/obio.h b/include/asm-sparc/obio.h index 47854a2a12cf..1a7544ceb574 100644 --- a/include/asm-sparc/obio.h +++ b/include/asm-sparc/obio.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: obio.h,v 1.4 1998/03/09 14:04:55 jj Exp $ | 1 | /* |
2 | * obio.h: Some useful locations in 0xFXXXXXXXX PA obio space on sun4d. | 2 | * obio.h: Some useful locations in 0xFXXXXXXXX PA obio space on sun4d. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Jakub Jelinek <jj@sunsite.mff.cuni.cz> | 4 | * Copyright (C) 1997 Jakub Jelinek <jj@sunsite.mff.cuni.cz> |
diff --git a/include/asm-sparc/openprom.h b/include/asm-sparc/openprom.h index 12929a20f536..ed4b6bc2b102 100644 --- a/include/asm-sparc/openprom.h +++ b/include/asm-sparc/openprom.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: openprom.h,v 1.24 2000/06/04 06:23:53 anton Exp $ */ | ||
2 | #ifndef __SPARC_OPENPROM_H | 1 | #ifndef __SPARC_OPENPROM_H |
3 | #define __SPARC_OPENPROM_H | 2 | #define __SPARC_OPENPROM_H |
4 | 3 | ||
diff --git a/include/asm-sparc/oplib.h b/include/asm-sparc/oplib.h index 7becc846544a..61c3ca6a8ac3 100644 --- a/include/asm-sparc/oplib.h +++ b/include/asm-sparc/oplib.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: oplib.h,v 1.23 2001/12/21 00:54:31 davem Exp $ | 1 | /* |
2 | * oplib.h: Describes the interface and available routines in the | 2 | * oplib.h: Describes the interface and available routines in the |
3 | * Linux Prom library. | 3 | * Linux Prom library. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h index 1625a8c3e0d2..6aa9e4c910cf 100644 --- a/include/asm-sparc/page.h +++ b/include/asm-sparc/page.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: page.h,v 1.55 2000/10/30 21:01:41 davem Exp $ | 1 | /* |
2 | * page.h: Various defines and such for MMU operations on the Sparc for | 2 | * page.h: Various defines and such for MMU operations on the Sparc for |
3 | * the Linux kernel. | 3 | * the Linux kernel. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/param.h b/include/asm-sparc/param.h index 86ba59af9d2c..9836d9a3cb9a 100644 --- a/include/asm-sparc/param.h +++ b/include/asm-sparc/param.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: param.h,v 1.4 2000/10/30 21:01:41 davem Exp $ */ | ||
2 | #ifndef _ASMSPARC_PARAM_H | 1 | #ifndef _ASMSPARC_PARAM_H |
3 | #define _ASMSPARC_PARAM_H | 2 | #define _ASMSPARC_PARAM_H |
4 | 3 | ||
diff --git a/include/asm-sparc/pbm.h b/include/asm-sparc/pbm.h index fedd9c6e875c..458a4916d14d 100644 --- a/include/asm-sparc/pbm.h +++ b/include/asm-sparc/pbm.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: pbm.h,v 1.3 1999/12/20 17:06:35 zaitcev Exp $ | 1 | /* |
2 | * | 2 | * |
3 | * pbm.h: PCI bus module pseudo driver software state | 3 | * pbm.h: PCI bus module pseudo driver software state |
4 | * Adopted from sparc64 by V. Roganov and G. Raiko | 4 | * Adopted from sparc64 by V. Roganov and G. Raiko |
diff --git a/include/asm-sparc/pcic.h b/include/asm-sparc/pcic.h index dedea14d87c8..f20ef562b265 100644 --- a/include/asm-sparc/pcic.h +++ b/include/asm-sparc/pcic.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: pcic.h,v 1.4 1999/11/17 07:34:20 zaitcev Exp $ | 1 | /* |
2 | * pcic.h: JavaEngine 1 specific PCI definitions. | 2 | * pcic.h: JavaEngine 1 specific PCI definitions. |
3 | * | 3 | * |
4 | * Copyright (C) 1998 V. Roganov and G. Raiko | 4 | * Copyright (C) 1998 V. Roganov and G. Raiko |
diff --git a/include/asm-sparc/pgalloc.h b/include/asm-sparc/pgalloc.h index 6292cd00e5af..681582d26969 100644 --- a/include/asm-sparc/pgalloc.h +++ b/include/asm-sparc/pgalloc.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: pgalloc.h,v 1.16 2001/12/21 04:56:17 davem Exp $ */ | ||
2 | #ifndef _SPARC_PGALLOC_H | 1 | #ifndef _SPARC_PGALLOC_H |
3 | #define _SPARC_PGALLOC_H | 2 | #define _SPARC_PGALLOC_H |
4 | 3 | ||
diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h index d84af6d95f5c..60512296b2ca 100644 --- a/include/asm-sparc/pgtable.h +++ b/include/asm-sparc/pgtable.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: pgtable.h,v 1.110 2001/12/21 04:56:17 davem Exp $ */ | ||
2 | #ifndef _SPARC_PGTABLE_H | 1 | #ifndef _SPARC_PGTABLE_H |
3 | #define _SPARC_PGTABLE_H | 2 | #define _SPARC_PGTABLE_H |
4 | 3 | ||
diff --git a/include/asm-sparc/pgtsrmmu.h b/include/asm-sparc/pgtsrmmu.h index edeb9811e728..808555fc1d58 100644 --- a/include/asm-sparc/pgtsrmmu.h +++ b/include/asm-sparc/pgtsrmmu.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: pgtsrmmu.h,v 1.31 2000/07/16 21:48:52 anton Exp $ | 1 | /* |
2 | * pgtsrmmu.h: SRMMU page table defines and code. | 2 | * pgtsrmmu.h: SRMMU page table defines and code. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/pgtsun4.h b/include/asm-sparc/pgtsun4.h index 60bda107f206..5a0d661fb82e 100644 --- a/include/asm-sparc/pgtsun4.h +++ b/include/asm-sparc/pgtsun4.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: pgtsun4.h,v 1.5 2000/06/05 06:08:46 anton Exp $ | 1 | /* |
2 | * pgtsun4.h: Sun4 specific pgtable.h defines and code. | 2 | * pgtsun4.h: Sun4 specific pgtable.h defines and code. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/pgtsun4c.h b/include/asm-sparc/pgtsun4c.h index f53b6dbc5fe3..aeb25e912179 100644 --- a/include/asm-sparc/pgtsun4c.h +++ b/include/asm-sparc/pgtsun4c.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: pgtsun4c.h,v 1.37 2000/06/05 06:08:46 anton Exp $ | 1 | /* |
2 | * pgtsun4c.h: Sun4c specific pgtable.h defines and code. | 2 | * pgtsun4c.h: Sun4c specific pgtable.h defines and code. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/psr.h b/include/asm-sparc/psr.h index 213970477a24..b8c0e5f0a66b 100644 --- a/include/asm-sparc/psr.h +++ b/include/asm-sparc/psr.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: psr.h,v 1.15 1997/10/04 08:54:22 ecd Exp $ | 1 | /* |
2 | * psr.h: This file holds the macros for masking off various parts of | 2 | * psr.h: This file holds the macros for masking off various parts of |
3 | * the processor status register on the Sparc. This is valid | 3 | * the processor status register on the Sparc. This is valid |
4 | * for Version 8. On the V9 this is renamed to the PSTATE | 4 | * for Version 8. On the V9 this is renamed to the PSTATE |
diff --git a/include/asm-sparc/ptrace.h b/include/asm-sparc/ptrace.h index 0afb867d6c1b..11f3bc2bb3f5 100644 --- a/include/asm-sparc/ptrace.h +++ b/include/asm-sparc/ptrace.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: ptrace.h,v 1.25 1997/03/04 16:27:25 jj Exp $ */ | ||
2 | #ifndef _SPARC_PTRACE_H | 1 | #ifndef _SPARC_PTRACE_H |
3 | #define _SPARC_PTRACE_H | 2 | #define _SPARC_PTRACE_H |
4 | 3 | ||
diff --git a/include/asm-sparc/resource.h b/include/asm-sparc/resource.h index 0514c304e130..985948a41299 100644 --- a/include/asm-sparc/resource.h +++ b/include/asm-sparc/resource.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: resource.h,v 1.12 2000/09/23 02:09:21 davem Exp $ | 1 | /* |
2 | * resource.h: Resource definitions. | 2 | * resource.h: Resource definitions. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/ross.h b/include/asm-sparc/ross.h index f2c14b5080ed..ecb6e81786a6 100644 --- a/include/asm-sparc/ross.h +++ b/include/asm-sparc/ross.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ross.h,v 1.13 1998/01/07 06:49:11 baccala Exp $ | 1 | /* |
2 | * ross.h: Ross module specific definitions and defines. | 2 | * ross.h: Ross module specific definitions and defines. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/rtc.h b/include/asm-sparc/rtc.h index f4f261dde699..f9ecb1fe2ecd 100644 --- a/include/asm-sparc/rtc.h +++ b/include/asm-sparc/rtc.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* $Id: rtc.h,v 1.2 1996/08/21 23:17:39 ecd Exp $ | 1 | /* |
2 | * | ||
3 | * rtc.h: Definitions for access to the Mostek real time clock | 2 | * rtc.h: Definitions for access to the Mostek real time clock |
4 | * | 3 | * |
5 | * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) | 4 | * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) |
diff --git a/include/asm-sparc/sbi.h b/include/asm-sparc/sbi.h index 86a603ac7b20..5eb7f1965d33 100644 --- a/include/asm-sparc/sbi.h +++ b/include/asm-sparc/sbi.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sbi.h,v 1.2 1998/03/09 14:04:48 jj Exp $ | 1 | /* |
2 | * sbi.h: SBI (Sbus Interface on sun4d) definitions | 2 | * sbi.h: SBI (Sbus Interface on sun4d) definitions |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Jakub Jelinek <jj@sunsite.mff.cuni.cz> | 4 | * Copyright (C) 1997 Jakub Jelinek <jj@sunsite.mff.cuni.cz> |
diff --git a/include/asm-sparc/sbus.h b/include/asm-sparc/sbus.h index 27d076c46964..f1d2fe1c9a30 100644 --- a/include/asm-sparc/sbus.h +++ b/include/asm-sparc/sbus.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sbus.h,v 1.22 2000/02/18 13:50:50 davem Exp $ | 1 | /* |
2 | * sbus.h: Defines for the Sun SBus. | 2 | * sbus.h: Defines for the Sun SBus. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/scatterlist.h b/include/asm-sparc/scatterlist.h index e08d3d775b08..c82609ca1d0f 100644 --- a/include/asm-sparc/scatterlist.h +++ b/include/asm-sparc/scatterlist.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: scatterlist.h,v 1.8 2001/12/17 07:05:15 davem Exp $ */ | ||
2 | #ifndef _SPARC_SCATTERLIST_H | 1 | #ifndef _SPARC_SCATTERLIST_H |
3 | #define _SPARC_SCATTERLIST_H | 2 | #define _SPARC_SCATTERLIST_H |
4 | 3 | ||
diff --git a/include/asm-sparc/shmparam.h b/include/asm-sparc/shmparam.h index bb93a6f74a38..59a1243c12f3 100644 --- a/include/asm-sparc/shmparam.h +++ b/include/asm-sparc/shmparam.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: shmparam.h,v 1.6 1999/12/09 10:32:41 davem Exp $ */ | ||
2 | #ifndef _ASMSPARC_SHMPARAM_H | 1 | #ifndef _ASMSPARC_SHMPARAM_H |
3 | #define _ASMSPARC_SHMPARAM_H | 2 | #define _ASMSPARC_SHMPARAM_H |
4 | 3 | ||
diff --git a/include/asm-sparc/sigcontext.h b/include/asm-sparc/sigcontext.h index 7fa2c7d01ab4..c5fb60dcbd75 100644 --- a/include/asm-sparc/sigcontext.h +++ b/include/asm-sparc/sigcontext.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: sigcontext.h,v 1.14 1999/09/06 08:22:05 jj Exp $ */ | ||
2 | #ifndef __SPARC_SIGCONTEXT_H | 1 | #ifndef __SPARC_SIGCONTEXT_H |
3 | #define __SPARC_SIGCONTEXT_H | 2 | #define __SPARC_SIGCONTEXT_H |
4 | 3 | ||
diff --git a/include/asm-sparc/siginfo.h b/include/asm-sparc/siginfo.h index 2c3ea8b22448..3c71af135c52 100644 --- a/include/asm-sparc/siginfo.h +++ b/include/asm-sparc/siginfo.h | |||
@@ -1,7 +1,3 @@ | |||
1 | /* $Id: siginfo.h,v 1.9 2002/02/08 03:57:18 davem Exp $ | ||
2 | * siginfo.c: | ||
3 | */ | ||
4 | |||
5 | #ifndef _SPARC_SIGINFO_H | 1 | #ifndef _SPARC_SIGINFO_H |
6 | #define _SPARC_SIGINFO_H | 2 | #define _SPARC_SIGINFO_H |
7 | 3 | ||
diff --git a/include/asm-sparc/signal.h b/include/asm-sparc/signal.h index 94071c75701f..683657d6e685 100644 --- a/include/asm-sparc/signal.h +++ b/include/asm-sparc/signal.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: signal.h,v 1.35 1999/09/06 08:22:04 jj Exp $ */ | ||
2 | #ifndef _ASMSPARC_SIGNAL_H | 1 | #ifndef _ASMSPARC_SIGNAL_H |
3 | #define _ASMSPARC_SIGNAL_H | 2 | #define _ASMSPARC_SIGNAL_H |
4 | 3 | ||
diff --git a/include/asm-sparc/smpprim.h b/include/asm-sparc/smpprim.h index e7b6d346ae10..eb849d862c64 100644 --- a/include/asm-sparc/smpprim.h +++ b/include/asm-sparc/smpprim.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: smpprim.h,v 1.5 1996/08/29 09:48:49 davem Exp $ | 1 | /* |
2 | * smpprim.h: SMP locking primitives on the Sparc | 2 | * smpprim.h: SMP locking primitives on the Sparc |
3 | * | 3 | * |
4 | * God knows we won't be actually using this code for some time | 4 | * God knows we won't be actually using this code for some time |
diff --git a/include/asm-sparc/socket.h b/include/asm-sparc/socket.h index a00e15df227c..bf50d0c2d583 100644 --- a/include/asm-sparc/socket.h +++ b/include/asm-sparc/socket.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: socket.h,v 1.17 2001/06/13 16:25:03 davem Exp $ */ | ||
2 | #ifndef _ASM_SOCKET_H | 1 | #ifndef _ASM_SOCKET_H |
3 | #define _ASM_SOCKET_H | 2 | #define _ASM_SOCKET_H |
4 | 3 | ||
diff --git a/include/asm-sparc/stat.h b/include/asm-sparc/stat.h index a5b4272f2894..2299e1d5d94c 100644 --- a/include/asm-sparc/stat.h +++ b/include/asm-sparc/stat.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: stat.h,v 1.12 2000/08/04 05:35:55 davem Exp $ */ | ||
2 | #ifndef _SPARC_STAT_H | 1 | #ifndef _SPARC_STAT_H |
3 | #define _SPARC_STAT_H | 2 | #define _SPARC_STAT_H |
4 | 3 | ||
diff --git a/include/asm-sparc/statfs.h b/include/asm-sparc/statfs.h index d623f144247d..304520fa8863 100644 --- a/include/asm-sparc/statfs.h +++ b/include/asm-sparc/statfs.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: statfs.h,v 1.4 1996/06/07 00:41:05 ecd Exp $ */ | ||
2 | #ifndef _SPARC_STATFS_H | 1 | #ifndef _SPARC_STATFS_H |
3 | #define _SPARC_STATFS_H | 2 | #define _SPARC_STATFS_H |
4 | 3 | ||
diff --git a/include/asm-sparc/string.h b/include/asm-sparc/string.h index cb1e923356c6..8d7c0dd4f299 100644 --- a/include/asm-sparc/string.h +++ b/include/asm-sparc/string.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: string.h,v 1.36 2001/12/21 00:54:31 davem Exp $ | 1 | /* |
2 | * string.h: External definitions for optimized assembly string | 2 | * string.h: External definitions for optimized assembly string |
3 | * routines for the Linux Kernel. | 3 | * routines for the Linux Kernel. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/sun4paddr.h b/include/asm-sparc/sun4paddr.h index d863bfd5f09a..d52985f19f42 100644 --- a/include/asm-sparc/sun4paddr.h +++ b/include/asm-sparc/sun4paddr.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sun4paddr.h,v 1.3 1998/07/28 16:53:27 jj Exp $ | 1 | /* |
2 | * sun4paddr.h: Various physical addresses on sun4 machines | 2 | * sun4paddr.h: Various physical addresses on sun4 machines |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au) | 4 | * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au) |
diff --git a/include/asm-sparc/sunbpp.h b/include/asm-sparc/sunbpp.h index 568db79b730d..92ee1a8ff3a2 100644 --- a/include/asm-sparc/sunbpp.h +++ b/include/asm-sparc/sunbpp.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sunbpp.h,v 1.1 1999/08/08 14:09:49 shadow Exp $ | 1 | /* |
2 | * include/asm-sparc/sunbpp.h | 2 | * include/asm-sparc/sunbpp.h |
3 | */ | 3 | */ |
4 | 4 | ||
diff --git a/include/asm-sparc/sysen.h b/include/asm-sparc/sysen.h index 692fa6f2296a..6af34abde6e7 100644 --- a/include/asm-sparc/sysen.h +++ b/include/asm-sparc/sysen.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sysen.h,v 1.3 1995/11/25 02:32:58 davem Exp $ | 1 | /* |
2 | * sysen.h: Bit fields within the "System Enable" register accessed via | 2 | * sysen.h: Bit fields within the "System Enable" register accessed via |
3 | * the ASI_CONTROL address space at address AC_SYSENABLE. | 3 | * the ASI_CONTROL address space at address AC_SYSENABLE. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/termios.h b/include/asm-sparc/termios.h index 733d40504e1e..f7b4409c35ff 100644 --- a/include/asm-sparc/termios.h +++ b/include/asm-sparc/termios.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: termios.h,v 1.32 2001/06/01 08:12:11 davem Exp $ */ | ||
2 | #ifndef _SPARC_TERMIOS_H | 1 | #ifndef _SPARC_TERMIOS_H |
3 | #define _SPARC_TERMIOS_H | 2 | #define _SPARC_TERMIOS_H |
4 | 3 | ||
diff --git a/include/asm-sparc/timer.h b/include/asm-sparc/timer.h index cb1fa1d1f184..d909565f9410 100644 --- a/include/asm-sparc/timer.h +++ b/include/asm-sparc/timer.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: timer.h,v 1.21 1999/04/20 13:22:51 anton Exp $ | 1 | /* |
2 | * timer.h: Definitions for the timer chips on the Sparc. | 2 | * timer.h: Definitions for the timer chips on the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/traps.h b/include/asm-sparc/traps.h index f62c7f878ee1..bebdbf8f43a8 100644 --- a/include/asm-sparc/traps.h +++ b/include/asm-sparc/traps.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: traps.h,v 1.9 1998/03/09 14:04:53 jj Exp $ | 1 | /* |
2 | * traps.h: Format of entries for the Sparc trap table. | 2 | * traps.h: Format of entries for the Sparc trap table. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/tsunami.h b/include/asm-sparc/tsunami.h index 887add5c466b..5bbd1d523baa 100644 --- a/include/asm-sparc/tsunami.h +++ b/include/asm-sparc/tsunami.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: tsunami.h,v 1.5 1996/08/29 09:49:03 davem Exp $ | 1 | /* |
2 | * tsunami.h: Module specific definitions for Tsunami V8 Sparcs | 2 | * tsunami.h: Module specific definitions for Tsunami V8 Sparcs |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/turbosparc.h b/include/asm-sparc/turbosparc.h index 31d2350a5818..17c73282db0a 100644 --- a/include/asm-sparc/turbosparc.h +++ b/include/asm-sparc/turbosparc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: turbosparc.h,v 1.4 1998/08/16 16:02:42 ecd Exp $ | 1 | /* |
2 | * turbosparc.h: Defines specific to the TurboSparc module. | 2 | * turbosparc.h: Defines specific to the TurboSparc module. |
3 | * This is SRMMU stuff. | 3 | * This is SRMMU stuff. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h index 1b08ef860a66..07734f942405 100644 --- a/include/asm-sparc/types.h +++ b/include/asm-sparc/types.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: types.h,v 1.13 2001/12/21 01:22:59 davem Exp $ */ | ||
2 | #ifndef _SPARC_TYPES_H | 1 | #ifndef _SPARC_TYPES_H |
3 | #define _SPARC_TYPES_H | 2 | #define _SPARC_TYPES_H |
4 | 3 | ||
diff --git a/include/asm-sparc/uaccess.h b/include/asm-sparc/uaccess.h index 366b11696ee3..47d5619d43fa 100644 --- a/include/asm-sparc/uaccess.h +++ b/include/asm-sparc/uaccess.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: uaccess.h,v 1.24 2001/10/30 04:32:24 davem Exp $ | 1 | /* |
2 | * uaccess.h: User space memore access functions. | 2 | * uaccess.h: User space memore access functions. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc/vac-ops.h b/include/asm-sparc/vac-ops.h index ab6f53b913ea..d10527611f11 100644 --- a/include/asm-sparc/vac-ops.h +++ b/include/asm-sparc/vac-ops.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: vac-ops.h,v 1.13 1998/01/30 10:59:59 jj Exp $ */ | ||
2 | #ifndef _SPARC_VAC_OPS_H | 1 | #ifndef _SPARC_VAC_OPS_H |
3 | #define _SPARC_VAC_OPS_H | 2 | #define _SPARC_VAC_OPS_H |
4 | 3 | ||
diff --git a/include/asm-sparc/vaddrs.h b/include/asm-sparc/vaddrs.h index 91097392c8cc..f6ca4779056c 100644 --- a/include/asm-sparc/vaddrs.h +++ b/include/asm-sparc/vaddrs.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: vaddrs.h,v 1.27 2001/07/04 00:18:18 davem Exp $ */ | ||
2 | #ifndef _SPARC_VADDRS_H | 1 | #ifndef _SPARC_VADDRS_H |
3 | #define _SPARC_VADDRS_H | 2 | #define _SPARC_VADDRS_H |
4 | 3 | ||
diff --git a/include/asm-sparc/viking.h b/include/asm-sparc/viking.h index 7541da71b9d6..989930aeb093 100644 --- a/include/asm-sparc/viking.h +++ b/include/asm-sparc/viking.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: viking.h,v 1.19 1997/04/20 14:11:48 ecd Exp $ | 1 | /* |
2 | * viking.h: Defines specific to the GNU/Viking MBUS module. | 2 | * viking.h: Defines specific to the GNU/Viking MBUS module. |
3 | * This is SRMMU stuff. | 3 | * This is SRMMU stuff. |
4 | * | 4 | * |
diff --git a/include/asm-sparc/winmacro.h b/include/asm-sparc/winmacro.h index 096f3d3d90c3..5b0a06dc3bcb 100644 --- a/include/asm-sparc/winmacro.h +++ b/include/asm-sparc/winmacro.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: winmacro.h,v 1.22 2000/05/09 17:40:15 davem Exp $ | 1 | /* |
2 | * winmacro.h: Window loading-unloading macros. | 2 | * winmacro.h: Window loading-unloading macros. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/apb.h b/include/asm-sparc64/apb.h index 80f0df289a66..8f3b57db810f 100644 --- a/include/asm-sparc64/apb.h +++ b/include/asm-sparc64/apb.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: apb.h,v 1.2 1998/04/01 20:41:49 ecd Exp $ | 1 | /* |
2 | * apb.h: Advanced PCI Bridge Configuration Registers and Bits | 2 | * apb.h: Advanced PCI Bridge Configuration Registers and Bits |
3 | * | 3 | * |
4 | * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) |
diff --git a/include/asm-sparc64/asi.h b/include/asm-sparc64/asi.h index 662a21107ae6..bc57c405e7d3 100644 --- a/include/asm-sparc64/asi.h +++ b/include/asm-sparc64/asi.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: asi.h,v 1.5 2001/03/29 11:47:47 davem Exp $ */ | ||
2 | #ifndef _SPARC64_ASI_H | 1 | #ifndef _SPARC64_ASI_H |
3 | #define _SPARC64_ASI_H | 2 | #define _SPARC64_ASI_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/auxio.h b/include/asm-sparc64/auxio.h index 81a590a50a1f..c4100494c7a5 100644 --- a/include/asm-sparc64/auxio.h +++ b/include/asm-sparc64/auxio.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: auxio.h,v 1.3 2001/06/05 08:16:34 davem Exp $ | 1 | /* |
2 | * auxio.h: Definitions and code for the Auxiliary I/O registers. | 2 | * auxio.h: Definitions and code for the Auxiliary I/O registers. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/bbc.h b/include/asm-sparc64/bbc.h index 368fce4eedba..423a85800aae 100644 --- a/include/asm-sparc64/bbc.h +++ b/include/asm-sparc64/bbc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bbc.h,v 1.2 2001/03/26 23:47:18 davem Exp $ | 1 | /* |
2 | * bbc.h: Defines for BootBus Controller found on UltraSPARC-III | 2 | * bbc.h: Defines for BootBus Controller found on UltraSPARC-III |
3 | * systems. | 3 | * systems. |
4 | * | 4 | * |
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h index 11f9d8146cdf..bb87b8080220 100644 --- a/include/asm-sparc64/bitops.h +++ b/include/asm-sparc64/bitops.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bitops.h,v 1.39 2002/01/30 01:40:00 davem Exp $ | 1 | /* |
2 | * bitops.h: Bit string operations on the V9. | 2 | * bitops.h: Bit string operations on the V9. |
3 | * | 3 | * |
4 | * Copyright 1996, 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright 1996, 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/chafsr.h b/include/asm-sparc64/chafsr.h index fd1688335ace..85c69b38220b 100644 --- a/include/asm-sparc64/chafsr.h +++ b/include/asm-sparc64/chafsr.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: chafsr.h,v 1.1 2001/03/28 10:56:34 davem Exp $ */ | ||
2 | #ifndef _SPARC64_CHAFSR_H | 1 | #ifndef _SPARC64_CHAFSR_H |
3 | #define _SPARC64_CHAFSR_H | 2 | #define _SPARC64_CHAFSR_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/checksum.h b/include/asm-sparc64/checksum.h index 70a006da7634..b290564c8ce0 100644 --- a/include/asm-sparc64/checksum.h +++ b/include/asm-sparc64/checksum.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: checksum.h,v 1.19 2002/02/09 19:49:31 davem Exp $ */ | ||
2 | #ifndef __SPARC64_CHECKSUM_H | 1 | #ifndef __SPARC64_CHECKSUM_H |
3 | #define __SPARC64_CHECKSUM_H | 2 | #define __SPARC64_CHECKSUM_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/chmctrl.h b/include/asm-sparc64/chmctrl.h index 53047f9f6423..859b4a4b0d30 100644 --- a/include/asm-sparc64/chmctrl.h +++ b/include/asm-sparc64/chmctrl.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: chmctrl.h,v 1.1 2001/03/29 11:43:28 davem Exp $ */ | ||
2 | #ifndef _SPARC64_CHMCTRL_H | 1 | #ifndef _SPARC64_CHMCTRL_H |
3 | #define _SPARC64_CHMCTRL_H | 2 | #define _SPARC64_CHMCTRL_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/dcr.h b/include/asm-sparc64/dcr.h index e9a3f305815d..620c9ba642e9 100644 --- a/include/asm-sparc64/dcr.h +++ b/include/asm-sparc64/dcr.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: dcr.h,v 1.4 2001/03/09 17:56:37 davem Exp $ */ | ||
2 | #ifndef _SPARC64_DCR_H | 1 | #ifndef _SPARC64_DCR_H |
3 | #define _SPARC64_DCR_H | 2 | #define _SPARC64_DCR_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/display7seg.h b/include/asm-sparc64/display7seg.h index 955a3502218e..c066a8964eab 100644 --- a/include/asm-sparc64/display7seg.h +++ b/include/asm-sparc64/display7seg.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: display7seg.h,v 1.2 2000/08/02 06:22:35 davem Exp $ | 1 | /* |
2 | * | 2 | * |
3 | * display7seg - Driver interface for the 7-segment display | 3 | * display7seg - Driver interface for the 7-segment display |
4 | * present on Sun Microsystems CP1400 and CP1500 | 4 | * present on Sun Microsystems CP1400 and CP1500 |
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h index a9fd06183972..9d4c024bd3b3 100644 --- a/include/asm-sparc64/dma.h +++ b/include/asm-sparc64/dma.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: dma.h,v 1.21 2001/12/13 04:16:52 davem Exp $ | 1 | /* |
2 | * include/asm-sparc64/dma.h | 2 | * include/asm-sparc64/dma.h |
3 | * | 3 | * |
4 | * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/ebus.h b/include/asm-sparc64/ebus.h index 9c1c6db2a790..fcc62b97ced5 100644 --- a/include/asm-sparc64/ebus.h +++ b/include/asm-sparc64/ebus.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ebus.h,v 1.10 2001/03/14 05:00:55 davem Exp $ | 1 | /* |
2 | * ebus.h: PCI to Ebus pseudo driver software state. | 2 | * ebus.h: PCI to Ebus pseudo driver software state. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h index 11c8e68d712a..0818a1308f4e 100644 --- a/include/asm-sparc64/elf.h +++ b/include/asm-sparc64/elf.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: elf.h,v 1.32 2002/02/09 19:49:31 davem Exp $ */ | ||
2 | #ifndef __ASM_SPARC64_ELF_H | 1 | #ifndef __ASM_SPARC64_ELF_H |
3 | #define __ASM_SPARC64_ELF_H | 2 | #define __ASM_SPARC64_ELF_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/envctrl.h b/include/asm-sparc64/envctrl.h index 53a6653815eb..a5668a082b14 100644 --- a/include/asm-sparc64/envctrl.h +++ b/include/asm-sparc64/envctrl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: envctrl.h,v 1.3 2000/11/03 00:37:40 davem Exp $ | 1 | /* |
2 | * | 2 | * |
3 | * envctrl.h: Definitions for access to the i2c environment | 3 | * envctrl.h: Definitions for access to the i2c environment |
4 | * monitoring on Ultrasparc systems. | 4 | * monitoring on Ultrasparc systems. |
diff --git a/include/asm-sparc64/estate.h b/include/asm-sparc64/estate.h index a719c3d2f6b1..520c08560d1b 100644 --- a/include/asm-sparc64/estate.h +++ b/include/asm-sparc64/estate.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: estate.h,v 1.1 2001/03/28 10:56:34 davem Exp $ */ | ||
2 | #ifndef _SPARC64_ESTATE_H | 1 | #ifndef _SPARC64_ESTATE_H |
3 | #define _SPARC64_ESTATE_H | 2 | #define _SPARC64_ESTATE_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h index 111f6b3b8925..8a09ca7aa2f2 100644 --- a/include/asm-sparc64/fcntl.h +++ b/include/asm-sparc64/fcntl.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: fcntl.h,v 1.12 2001/09/20 00:35:34 davem Exp $ */ | ||
2 | #ifndef _SPARC64_FCNTL_H | 1 | #ifndef _SPARC64_FCNTL_H |
3 | #define _SPARC64_FCNTL_H | 2 | #define _SPARC64_FCNTL_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/fhc.h b/include/asm-sparc64/fhc.h index 9e7f1b0d78b9..ddffcdfbc984 100644 --- a/include/asm-sparc64/fhc.h +++ b/include/asm-sparc64/fhc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fhc.h,v 1.5 1999/09/21 14:39:29 davem Exp $ | 1 | /* |
2 | * fhc.h: Structures for central/fhc pseudo driver on Sunfire/Starfire/Wildfire. | 2 | * fhc.h: Structures for central/fhc pseudo driver on Sunfire/Starfire/Wildfire. |
3 | * | 3 | * |
4 | * Copyright (C) 1997, 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1997, 1999 David S. Miller (davem@redhat.com) |
diff --git a/include/asm-sparc64/head.h b/include/asm-sparc64/head.h index 67960a751f4d..10e9dabc4c41 100644 --- a/include/asm-sparc64/head.h +++ b/include/asm-sparc64/head.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: head.h,v 1.30 1997/08/08 08:34:33 jj Exp $ */ | ||
2 | #ifndef _SPARC64_HEAD_H | 1 | #ifndef _SPARC64_HEAD_H |
3 | #define _SPARC64_HEAD_H | 2 | #define _SPARC64_HEAD_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h index c5fdabe0b42d..1282676da1cd 100644 --- a/include/asm-sparc64/ide.h +++ b/include/asm-sparc64/ide.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ide.h,v 1.21 2001/09/25 20:21:48 kanoj Exp $ | 1 | /* |
2 | * ide.h: Ultra/PCI specific IDE glue. | 2 | * ide.h: Ultra/PCI specific IDE glue. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h index 77fbf987385f..a363fa0a112a 100644 --- a/include/asm-sparc64/idprom.h +++ b/include/asm-sparc64/idprom.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: idprom.h,v 1.2 1997/04/04 00:50:16 davem Exp $ | 1 | /* |
2 | * idprom.h: Macros and defines for idprom routines | 2 | * idprom.h: Macros and defines for idprom routines |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/ioctl.h b/include/asm-sparc64/ioctl.h index 253d0b57b316..d634c21b4724 100644 --- a/include/asm-sparc64/ioctl.h +++ b/include/asm-sparc64/ioctl.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: ioctl.h,v 1.2 1998/10/15 05:40:38 jj Exp $ */ | ||
2 | #ifndef _SPARC64_IOCTL_H | 1 | #ifndef _SPARC64_IOCTL_H |
3 | #define _SPARC64_IOCTL_H | 2 | #define _SPARC64_IOCTL_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/ioctls.h b/include/asm-sparc64/ioctls.h index c1be40647c99..94d1b75e512b 100644 --- a/include/asm-sparc64/ioctls.h +++ b/include/asm-sparc64/ioctls.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: ioctls.h,v 1.7 1998/02/23 02:49:41 davem Exp $ */ | ||
2 | #ifndef _ASM_SPARC64_IOCTLS_H | 1 | #ifndef _ASM_SPARC64_IOCTLS_H |
3 | #define _ASM_SPARC64_IOCTLS_H | 2 | #define _ASM_SPARC64_IOCTLS_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/lsu.h b/include/asm-sparc64/lsu.h index 79f109840c39..7190f8de90a0 100644 --- a/include/asm-sparc64/lsu.h +++ b/include/asm-sparc64/lsu.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: lsu.h,v 1.2 1997/04/04 00:50:22 davem Exp $ */ | ||
2 | #ifndef _SPARC64_LSU_H | 1 | #ifndef _SPARC64_LSU_H |
3 | #define _SPARC64_LSU_H | 2 | #define _SPARC64_LSU_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h index 625be4d61baf..d2ae67cd1bdc 100644 --- a/include/asm-sparc64/mman.h +++ b/include/asm-sparc64/mman.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: mman.h,v 1.2 2000/03/15 02:44:26 davem Exp $ */ | ||
2 | #ifndef __SPARC64_MMAN_H__ | 1 | #ifndef __SPARC64_MMAN_H__ |
3 | #define __SPARC64_MMAN_H__ | 2 | #define __SPARC64_MMAN_H__ |
4 | 3 | ||
diff --git a/include/asm-sparc64/mmu_context.h b/include/asm-sparc64/mmu_context.h index 9fc225ed5500..5693ab482606 100644 --- a/include/asm-sparc64/mmu_context.h +++ b/include/asm-sparc64/mmu_context.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: mmu_context.h,v 1.54 2002/02/09 19:49:31 davem Exp $ */ | ||
2 | #ifndef __SPARC64_MMU_CONTEXT_H | 1 | #ifndef __SPARC64_MMU_CONTEXT_H |
3 | #define __SPARC64_MMU_CONTEXT_H | 2 | #define __SPARC64_MMU_CONTEXT_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/namei.h b/include/asm-sparc64/namei.h index 275161f21213..cbc1b4c06891 100644 --- a/include/asm-sparc64/namei.h +++ b/include/asm-sparc64/namei.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: namei.h,v 1.17 2000/04/13 00:55:54 davem Exp $ | 1 | /* |
2 | * linux/include/asm-sparc64/namei.h | 2 | * linux/include/asm-sparc64/namei.h |
3 | * | 3 | * |
4 | * Routines to handle famous /usr/gnemul/s*. | 4 | * Routines to handle famous /usr/gnemul/s*. |
diff --git a/include/asm-sparc64/openprom.h b/include/asm-sparc64/openprom.h index 26ec046715c8..b69e4a8c9170 100644 --- a/include/asm-sparc64/openprom.h +++ b/include/asm-sparc64/openprom.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: openprom.h,v 1.9 2001/03/16 10:22:02 davem Exp $ */ | ||
2 | #ifndef __SPARC64_OPENPROM_H | 1 | #ifndef __SPARC64_OPENPROM_H |
3 | #define __SPARC64_OPENPROM_H | 2 | #define __SPARC64_OPENPROM_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h index 618117def0dc..93f0881b766e 100644 --- a/include/asm-sparc64/page.h +++ b/include/asm-sparc64/page.h | |||
@@ -1,5 +1,3 @@ | |||
1 | /* $Id: page.h,v 1.39 2002/02/09 19:49:31 davem Exp $ */ | ||
2 | |||
3 | #ifndef _SPARC64_PAGE_H | 1 | #ifndef _SPARC64_PAGE_H |
4 | #define _SPARC64_PAGE_H | 2 | #define _SPARC64_PAGE_H |
5 | 3 | ||
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h index 3ee2d406373b..326de104d014 100644 --- a/include/asm-sparc64/pgalloc.h +++ b/include/asm-sparc64/pgalloc.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: pgalloc.h,v 1.30 2001/12/21 04:56:17 davem Exp $ */ | ||
2 | #ifndef _SPARC64_PGALLOC_H | 1 | #ifndef _SPARC64_PGALLOC_H |
3 | #define _SPARC64_PGALLOC_H | 2 | #define _SPARC64_PGALLOC_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index 0e200e7acec7..b87017747b5d 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: pgtable.h,v 1.156 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * pgtable.h: SpitFire page table operations. | 2 | * pgtable.h: SpitFire page table operations. |
3 | * | 3 | * |
4 | * Copyright 1996,1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright 1996,1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/pil.h b/include/asm-sparc64/pil.h index 2f5d126f7163..eaac842d88c3 100644 --- a/include/asm-sparc64/pil.h +++ b/include/asm-sparc64/pil.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: pil.h,v 1.1 2002/01/23 11:27:36 davem Exp $ */ | ||
2 | #ifndef _SPARC64_PIL_H | 1 | #ifndef _SPARC64_PIL_H |
3 | #define _SPARC64_PIL_H | 2 | #define _SPARC64_PIL_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h index 885b6a1dcae4..26b4e5255761 100644 --- a/include/asm-sparc64/processor.h +++ b/include/asm-sparc64/processor.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: processor.h,v 1.83 2002/02/10 06:04:33 davem Exp $ | 1 | /* |
2 | * include/asm-sparc64/processor.h | 2 | * include/asm-sparc64/processor.h |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/psrcompat.h b/include/asm-sparc64/psrcompat.h index 3614ca04753f..44b6327dbbf5 100644 --- a/include/asm-sparc64/psrcompat.h +++ b/include/asm-sparc64/psrcompat.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: psrcompat.h,v 1.5 1998/10/06 09:28:39 jj Exp $ */ | ||
2 | #ifndef _SPARC64_PSRCOMPAT_H | 1 | #ifndef _SPARC64_PSRCOMPAT_H |
3 | #define _SPARC64_PSRCOMPAT_H | 2 | #define _SPARC64_PSRCOMPAT_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/pstate.h b/include/asm-sparc64/pstate.h index 949aebaf991d..a26a53777bb0 100644 --- a/include/asm-sparc64/pstate.h +++ b/include/asm-sparc64/pstate.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: pstate.h,v 1.6 1997/06/25 07:39:45 jj Exp $ */ | ||
2 | #ifndef _SPARC64_PSTATE_H | 1 | #ifndef _SPARC64_PSTATE_H |
3 | #define _SPARC64_PSTATE_H | 2 | #define _SPARC64_PSTATE_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h index 90972a5ada59..d8a56cddf7f2 100644 --- a/include/asm-sparc64/ptrace.h +++ b/include/asm-sparc64/ptrace.h | |||
@@ -126,6 +126,17 @@ struct sparc_trapf { | |||
126 | #define TRACEREG32_SZ sizeof(struct pt_regs32) | 126 | #define TRACEREG32_SZ sizeof(struct pt_regs32) |
127 | #define STACKFRAME32_SZ sizeof(struct sparc_stackf32) | 127 | #define STACKFRAME32_SZ sizeof(struct sparc_stackf32) |
128 | 128 | ||
129 | struct global_reg_snapshot { | ||
130 | unsigned long tstate; | ||
131 | unsigned long tpc; | ||
132 | unsigned long tnpc; | ||
133 | unsigned long o7; | ||
134 | unsigned long i7; | ||
135 | struct thread_info *thread; | ||
136 | unsigned long pad1; | ||
137 | unsigned long pad2; | ||
138 | }; | ||
139 | |||
129 | #ifdef __KERNEL__ | 140 | #ifdef __KERNEL__ |
130 | 141 | ||
131 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | 142 | #define __ARCH_WANT_COMPAT_SYS_PTRACE |
@@ -295,6 +306,16 @@ extern void __show_regs(struct pt_regs *); | |||
295 | #define SF_XARG5 0x58 | 306 | #define SF_XARG5 0x58 |
296 | #define SF_XXARG 0x5c | 307 | #define SF_XXARG 0x5c |
297 | 308 | ||
309 | /* global_reg_snapshot offsets */ | ||
310 | #define GR_SNAP_TSTATE 0x00 | ||
311 | #define GR_SNAP_TPC 0x08 | ||
312 | #define GR_SNAP_TNPC 0x10 | ||
313 | #define GR_SNAP_O7 0x18 | ||
314 | #define GR_SNAP_I7 0x20 | ||
315 | #define GR_SNAP_THREAD 0x28 | ||
316 | #define GR_SNAP_PAD1 0x30 | ||
317 | #define GR_SNAP_PAD2 0x38 | ||
318 | |||
298 | /* Stuff for the ptrace system call */ | 319 | /* Stuff for the ptrace system call */ |
299 | #define PTRACE_SPARC_DETACH 11 | 320 | #define PTRACE_SPARC_DETACH 11 |
300 | #define PTRACE_GETREGS 12 | 321 | #define PTRACE_GETREGS 12 |
diff --git a/include/asm-sparc64/reg.h b/include/asm-sparc64/reg.h index fc68f90181b3..77aa4804a60d 100644 --- a/include/asm-sparc64/reg.h +++ b/include/asm-sparc64/reg.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: reg.h,v 1.6 1999/09/06 08:22:10 jj Exp $ | 1 | /* |
2 | * linux/asm-sparc64/reg.h | 2 | * linux/asm-sparc64/reg.h |
3 | * Layout of the registers as expected by gdb on the Sparc | 3 | * Layout of the registers as expected by gdb on the Sparc |
4 | * we should replace the user.h definitions with those in | 4 | * we should replace the user.h definitions with those in |
diff --git a/include/asm-sparc64/resource.h b/include/asm-sparc64/resource.h index aa469795a6b0..4f08fb5e4ca4 100644 --- a/include/asm-sparc64/resource.h +++ b/include/asm-sparc64/resource.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: resource.h,v 1.8 2000/09/23 02:09:21 davem Exp $ | 1 | /* |
2 | * resource.h: Resource definitions. | 2 | * resource.h: Resource definitions. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/rtc.h b/include/asm-sparc64/rtc.h index cb17334595c9..f9ecb1fe2ecd 100644 --- a/include/asm-sparc64/rtc.h +++ b/include/asm-sparc64/rtc.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* $Id: rtc.h,v 1.1 1996/12/26 14:22:35 davem Exp $ | 1 | /* |
2 | * | ||
3 | * rtc.h: Definitions for access to the Mostek real time clock | 2 | * rtc.h: Definitions for access to the Mostek real time clock |
4 | * | 3 | * |
5 | * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) | 4 | * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) |
diff --git a/include/asm-sparc64/rwsem.h b/include/asm-sparc64/rwsem.h index 1294b7ce5d06..1dc129ac2feb 100644 --- a/include/asm-sparc64/rwsem.h +++ b/include/asm-sparc64/rwsem.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rwsem.h,v 1.5 2001/11/18 00:12:56 davem Exp $ | 1 | /* |
2 | * rwsem.h: R/W semaphores implemented using CAS | 2 | * rwsem.h: R/W semaphores implemented using CAS |
3 | * | 3 | * |
4 | * Written by David S. Miller (davem@redhat.com), 2001. | 4 | * Written by David S. Miller (davem@redhat.com), 2001. |
diff --git a/include/asm-sparc64/scatterlist.h b/include/asm-sparc64/scatterlist.h index 6df23f070b1a..81bd058f9382 100644 --- a/include/asm-sparc64/scatterlist.h +++ b/include/asm-sparc64/scatterlist.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: scatterlist.h,v 1.11 2001/12/17 07:05:15 davem Exp $ */ | ||
2 | #ifndef _SPARC64_SCATTERLIST_H | 1 | #ifndef _SPARC64_SCATTERLIST_H |
3 | #define _SPARC64_SCATTERLIST_H | 2 | #define _SPARC64_SCATTERLIST_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h index 8c66fded8a32..1ed0d6701a9b 100644 --- a/include/asm-sparc64/shmparam.h +++ b/include/asm-sparc64/shmparam.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: shmparam.h,v 1.5 2001/09/24 21:17:57 kanoj Exp $ */ | ||
2 | #ifndef _ASMSPARC64_SHMPARAM_H | 1 | #ifndef _ASMSPARC64_SHMPARAM_H |
3 | #define _ASMSPARC64_SHMPARAM_H | 2 | #define _ASMSPARC64_SHMPARAM_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/sigcontext.h b/include/asm-sparc64/sigcontext.h index d8073373db8c..1c868d680cfc 100644 --- a/include/asm-sparc64/sigcontext.h +++ b/include/asm-sparc64/sigcontext.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: sigcontext.h,v 1.12 1999/09/06 08:22:09 jj Exp $ */ | ||
2 | #ifndef __SPARC64_SIGCONTEXT_H | 1 | #ifndef __SPARC64_SIGCONTEXT_H |
3 | #define __SPARC64_SIGCONTEXT_H | 2 | #define __SPARC64_SIGCONTEXT_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h index c49f32d38707..2a7c7934ac0a 100644 --- a/include/asm-sparc64/signal.h +++ b/include/asm-sparc64/signal.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: signal.h,v 1.9 1999/09/06 08:22:11 jj Exp $ */ | ||
2 | #ifndef _ASMSPARC64_SIGNAL_H | 1 | #ifndef _ASMSPARC64_SIGNAL_H |
3 | #define _ASMSPARC64_SIGNAL_H | 2 | #define _ASMSPARC64_SIGNAL_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h index 1c1c5ea5cea5..cd0311b2e19d 100644 --- a/include/asm-sparc64/smp.h +++ b/include/asm-sparc64/smp.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* smp.h: Sparc64 specific SMP stuff. | 1 | /* smp.h: Sparc64 specific SMP stuff. |
2 | * | 2 | * |
3 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1996, 2008 David S. Miller (davem@davemloft.net) |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #ifndef _SPARC64_SMP_H | 6 | #ifndef _SPARC64_SMP_H |
@@ -44,6 +44,8 @@ extern int hard_smp_processor_id(void); | |||
44 | extern void smp_fill_in_sib_core_maps(void); | 44 | extern void smp_fill_in_sib_core_maps(void); |
45 | extern void cpu_play_dead(void); | 45 | extern void cpu_play_dead(void); |
46 | 46 | ||
47 | extern void smp_fetch_global_regs(void); | ||
48 | |||
47 | #ifdef CONFIG_HOTPLUG_CPU | 49 | #ifdef CONFIG_HOTPLUG_CPU |
48 | extern int __cpu_disable(void); | 50 | extern int __cpu_disable(void); |
49 | extern void __cpu_die(unsigned int cpu); | 51 | extern void __cpu_die(unsigned int cpu); |
@@ -55,6 +57,7 @@ extern void __cpu_die(unsigned int cpu); | |||
55 | 57 | ||
56 | #define hard_smp_processor_id() 0 | 58 | #define hard_smp_processor_id() 0 |
57 | #define smp_fill_in_sib_core_maps() do { } while (0) | 59 | #define smp_fill_in_sib_core_maps() do { } while (0) |
60 | #define smp_fetch_global_regs() do { } while (0) | ||
58 | 61 | ||
59 | #endif /* !(CONFIG_SMP) */ | 62 | #endif /* !(CONFIG_SMP) */ |
60 | 63 | ||
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h index 8cf071fae3eb..5af688f56716 100644 --- a/include/asm-sparc64/socket.h +++ b/include/asm-sparc64/socket.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: socket.h,v 1.10 2001/06/13 16:25:03 davem Exp $ */ | ||
2 | #ifndef _ASM_SOCKET_H | 1 | #ifndef _ASM_SOCKET_H |
3 | #define _ASM_SOCKET_H | 2 | #define _ASM_SOCKET_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/starfire.h b/include/asm-sparc64/starfire.h index 48b50b5e35b0..07bafd31e33c 100644 --- a/include/asm-sparc64/starfire.h +++ b/include/asm-sparc64/starfire.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: starfire.h,v 1.2 2001/07/04 00:18:18 davem Exp $ | 1 | /* |
2 | * starfire.h: Group all starfire specific code together. | 2 | * starfire.h: Group all starfire specific code together. |
3 | * | 3 | * |
4 | * Copyright (C) 2000 Anton Blanchard (anton@samba.org) | 4 | * Copyright (C) 2000 Anton Blanchard (anton@samba.org) |
diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h index 128c27e57f0b..9650fdea847f 100644 --- a/include/asm-sparc64/stat.h +++ b/include/asm-sparc64/stat.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: stat.h,v 1.7 2000/08/04 05:35:55 davem Exp $ */ | ||
2 | #ifndef _SPARC64_STAT_H | 1 | #ifndef _SPARC64_STAT_H |
3 | #define _SPARC64_STAT_H | 2 | #define _SPARC64_STAT_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/statfs.h b/include/asm-sparc64/statfs.h index 185b6c481b24..79b3c890a5fa 100644 --- a/include/asm-sparc64/statfs.h +++ b/include/asm-sparc64/statfs.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: statfs.h,v 1.2 1997/04/14 17:05:22 jj Exp $ */ | ||
2 | #ifndef _SPARC64_STATFS_H | 1 | #ifndef _SPARC64_STATFS_H |
3 | #define _SPARC64_STATFS_H | 2 | #define _SPARC64_STATFS_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/string.h b/include/asm-sparc64/string.h index c7d88622cb27..43161f2d17eb 100644 --- a/include/asm-sparc64/string.h +++ b/include/asm-sparc64/string.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: string.h,v 1.20 2001/09/27 04:36:24 kanoj Exp $ | 1 | /* |
2 | * string.h: External definitions for optimized assembly string | 2 | * string.h: External definitions for optimized assembly string |
3 | * routines for the Linux Kernel. | 3 | * routines for the Linux Kernel. |
4 | * | 4 | * |
diff --git a/include/asm-sparc64/sunbpp.h b/include/asm-sparc64/sunbpp.h index b441cc9c426c..8e171b7a9f4f 100644 --- a/include/asm-sparc64/sunbpp.h +++ b/include/asm-sparc64/sunbpp.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sunbpp.h,v 1.1 1999/08/13 06:21:44 shadow Exp $ | 1 | /* |
2 | * include/asm-sparc64/sunbpp.h | 2 | * include/asm-sparc64/sunbpp.h |
3 | */ | 3 | */ |
4 | 4 | ||
diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h index cacbea171ad7..1f5dab25dda5 100644 --- a/include/asm-sparc64/termios.h +++ b/include/asm-sparc64/termios.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: termios.h,v 1.11 2001/06/01 08:12:11 davem Exp $ */ | ||
2 | #ifndef _SPARC64_TERMIOS_H | 1 | #ifndef _SPARC64_TERMIOS_H |
3 | #define _SPARC64_TERMIOS_H | 2 | #define _SPARC64_TERMIOS_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h index 52d67d394107..0ba199587e07 100644 --- a/include/asm-sparc64/ttable.h +++ b/include/asm-sparc64/ttable.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: ttable.h,v 1.18 2002/02/09 19:49:32 davem Exp $ */ | ||
2 | #ifndef _SPARC64_TTABLE_H | 1 | #ifndef _SPARC64_TTABLE_H |
3 | #define _SPARC64_TTABLE_H | 2 | #define _SPARC64_TTABLE_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h index 5dbe04f4044a..b27ccc85202f 100644 --- a/include/asm-sparc64/types.h +++ b/include/asm-sparc64/types.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: types.h,v 1.4 2001/10/09 02:24:35 davem Exp $ */ | ||
2 | #ifndef _SPARC64_TYPES_H | 1 | #ifndef _SPARC64_TYPES_H |
3 | #define _SPARC64_TYPES_H | 2 | #define _SPARC64_TYPES_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h index d8547b87e730..5fcbaf68c3f6 100644 --- a/include/asm-sparc64/uaccess.h +++ b/include/asm-sparc64/uaccess.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: uaccess.h,v 1.35 2002/02/09 19:49:31 davem Exp $ */ | ||
2 | #ifndef _ASM_UACCESS_H | 1 | #ifndef _ASM_UACCESS_H |
3 | #define _ASM_UACCESS_H | 2 | #define _ASM_UACCESS_H |
4 | 3 | ||
diff --git a/include/asm-sparc64/uctx.h b/include/asm-sparc64/uctx.h index 6eaf16ef23f6..dc937c75ffdd 100644 --- a/include/asm-sparc64/uctx.h +++ b/include/asm-sparc64/uctx.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: uctx.h,v 1.1 1997/06/18 16:51:58 davem Exp $ | 1 | /* |
2 | * uctx.h: Sparc64 {set,get}context() register state layouts. | 2 | * uctx.h: Sparc64 {set,get}context() register state layouts. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/include/asm-sparc64/utrap.h b/include/asm-sparc64/utrap.h index 81b0ebf3736c..e49e5c46ad68 100644 --- a/include/asm-sparc64/utrap.h +++ b/include/asm-sparc64/utrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: utrap.h,v 1.1 1997/10/14 16:21:31 jj Exp $ | 1 | /* |
2 | * include/asm-sparc64/utrap.h | 2 | * include/asm-sparc64/utrap.h |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/include/asm-sparc64/watchdog.h b/include/asm-sparc64/watchdog.h index 4d5b03b60e4d..5baf2d3919cf 100644 --- a/include/asm-sparc64/watchdog.h +++ b/include/asm-sparc64/watchdog.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: watchdog.h,v 1.1 2001/01/18 04:47:44 davem Exp $ | 1 | /* |
2 | * | 2 | * |
3 | * watchdog - Driver interface for the hardware watchdog timers | 3 | * watchdog - Driver interface for the hardware watchdog timers |
4 | * present on Sun Microsystems boardsets | 4 | * present on Sun Microsystems boardsets |
diff --git a/include/asm-x86/kvm_x86_emulate.h b/include/asm-x86/kvm_x86_emulate.h index d6337f941c98..b877bbd2d3a7 100644 --- a/include/asm-x86/kvm_x86_emulate.h +++ b/include/asm-x86/kvm_x86_emulate.h | |||
@@ -135,6 +135,7 @@ struct decode_cache { | |||
135 | u8 modrm_rm; | 135 | u8 modrm_rm; |
136 | u8 use_modrm_ea; | 136 | u8 use_modrm_ea; |
137 | unsigned long modrm_ea; | 137 | unsigned long modrm_ea; |
138 | void *modrm_ptr; | ||
138 | unsigned long modrm_val; | 139 | unsigned long modrm_val; |
139 | struct fetch_cache fetch; | 140 | struct fetch_cache fetch; |
140 | }; | 141 | }; |
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index b381f4a5a0bd..dc936dddf161 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h | |||
@@ -10,8 +10,16 @@ | |||
10 | 10 | ||
11 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
12 | 12 | ||
13 | #define PHYSICAL_PAGE_MASK (PAGE_MASK & __PHYSICAL_MASK) | 13 | #define __PHYSICAL_MASK ((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1) |
14 | #define PTE_MASK (_AT(long, PHYSICAL_PAGE_MASK)) | 14 | #define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1) |
15 | |||
16 | /* Cast PAGE_MASK to a signed type so that it is sign-extended if | ||
17 | virtual addresses are 32-bits but physical addresses are larger | ||
18 | (ie, 32-bit PAE). */ | ||
19 | #define PHYSICAL_PAGE_MASK (((signed long)PAGE_MASK) & __PHYSICAL_MASK) | ||
20 | |||
21 | /* PTE_MASK extracts the PFN from a (pte|pmd|pud|pgd)val_t */ | ||
22 | #define PTE_MASK ((pteval_t)PHYSICAL_PAGE_MASK) | ||
15 | 23 | ||
16 | #define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT) | 24 | #define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT) |
17 | #define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1)) | 25 | #define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1)) |
@@ -24,9 +32,6 @@ | |||
24 | /* to align the pointer to the (next) page boundary */ | 32 | /* to align the pointer to the (next) page boundary */ |
25 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | 33 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) |
26 | 34 | ||
27 | #define __PHYSICAL_MASK _AT(phys_addr_t, (_AC(1,ULL) << __PHYSICAL_MASK_SHIFT) - 1) | ||
28 | #define __VIRTUAL_MASK ((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1) | ||
29 | |||
30 | #ifndef __ASSEMBLY__ | 35 | #ifndef __ASSEMBLY__ |
31 | #include <linux/types.h> | 36 | #include <linux/types.h> |
32 | #endif | 37 | #endif |
diff --git a/include/asm-x86/pgtable-3level.h b/include/asm-x86/pgtable-3level.h index 8b4a9d44b7f4..c93dbb6c2624 100644 --- a/include/asm-x86/pgtable-3level.h +++ b/include/asm-x86/pgtable-3level.h | |||
@@ -120,9 +120,9 @@ static inline void pud_clear(pud_t *pudp) | |||
120 | write_cr3(pgd); | 120 | write_cr3(pgd); |
121 | } | 121 | } |
122 | 122 | ||
123 | #define pud_page(pud) ((struct page *) __va(pud_val(pud) & PAGE_MASK)) | 123 | #define pud_page(pud) ((struct page *) __va(pud_val(pud) & PTE_MASK)) |
124 | 124 | ||
125 | #define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK)) | 125 | #define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_MASK)) |
126 | 126 | ||
127 | 127 | ||
128 | /* Find an entry in the second-level page table.. */ | 128 | /* Find an entry in the second-level page table.. */ |
@@ -160,7 +160,7 @@ static inline int pte_none(pte_t pte) | |||
160 | 160 | ||
161 | static inline unsigned long pte_pfn(pte_t pte) | 161 | static inline unsigned long pte_pfn(pte_t pte) |
162 | { | 162 | { |
163 | return (pte_val(pte) & ~_PAGE_NX) >> PAGE_SHIFT; | 163 | return (pte_val(pte) & PTE_MASK) >> PAGE_SHIFT; |
164 | } | 164 | } |
165 | 165 | ||
166 | /* | 166 | /* |
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 55c3a0e3a8ce..97c271b2910b 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h | |||
@@ -57,6 +57,7 @@ | |||
57 | #define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | \ | 57 | #define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | \ |
58 | _PAGE_DIRTY) | 58 | _PAGE_DIRTY) |
59 | 59 | ||
60 | /* Set of bits not changed in pte_modify */ | ||
60 | #define _PAGE_CHG_MASK (PTE_MASK | _PAGE_PCD | _PAGE_PWT | \ | 61 | #define _PAGE_CHG_MASK (PTE_MASK | _PAGE_PCD | _PAGE_PWT | \ |
61 | _PAGE_ACCESSED | _PAGE_DIRTY) | 62 | _PAGE_ACCESSED | _PAGE_DIRTY) |
62 | 63 | ||
@@ -304,7 +305,7 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot) | |||
304 | return __pgprot(preservebits | addbits); | 305 | return __pgprot(preservebits | addbits); |
305 | } | 306 | } |
306 | 307 | ||
307 | #define pte_pgprot(x) __pgprot(pte_val(x) & (0xfff | _PAGE_NX)) | 308 | #define pte_pgprot(x) __pgprot(pte_val(x) & ~PTE_MASK) |
308 | 309 | ||
309 | #define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask) | 310 | #define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask) |
310 | 311 | ||
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h index d7f0403bbecb..32ca03109a4c 100644 --- a/include/asm-x86/pgtable_32.h +++ b/include/asm-x86/pgtable_32.h | |||
@@ -88,7 +88,7 @@ extern unsigned long pg0[]; | |||
88 | /* To avoid harmful races, pmd_none(x) should check only the lower when PAE */ | 88 | /* To avoid harmful races, pmd_none(x) should check only the lower when PAE */ |
89 | #define pmd_none(x) (!(unsigned long)pmd_val((x))) | 89 | #define pmd_none(x) (!(unsigned long)pmd_val((x))) |
90 | #define pmd_present(x) (pmd_val((x)) & _PAGE_PRESENT) | 90 | #define pmd_present(x) (pmd_val((x)) & _PAGE_PRESENT) |
91 | #define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) | 91 | #define pmd_bad(x) ((pmd_val(x) & (~PTE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) |
92 | 92 | ||
93 | #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) | 93 | #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) |
94 | 94 | ||
@@ -159,7 +159,7 @@ static inline int pud_large(pud_t pud) { return 0; } | |||
159 | #define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT)) | 159 | #define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT)) |
160 | 160 | ||
161 | #define pmd_page_vaddr(pmd) \ | 161 | #define pmd_page_vaddr(pmd) \ |
162 | ((unsigned long)__va(pmd_val((pmd)) & PAGE_MASK)) | 162 | ((unsigned long)__va(pmd_val((pmd)) & PTE_MASK)) |
163 | 163 | ||
164 | #if defined(CONFIG_HIGHPTE) | 164 | #if defined(CONFIG_HIGHPTE) |
165 | #define pte_offset_map(dir, address) \ | 165 | #define pte_offset_map(dir, address) \ |
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index efe83dcbd412..1cc50d22d735 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h | |||
@@ -151,19 +151,19 @@ static inline void native_pgd_clear(pgd_t *pgd) | |||
151 | 151 | ||
152 | #ifndef __ASSEMBLY__ | 152 | #ifndef __ASSEMBLY__ |
153 | 153 | ||
154 | static inline unsigned long pgd_bad(pgd_t pgd) | 154 | static inline int pgd_bad(pgd_t pgd) |
155 | { | 155 | { |
156 | return pgd_val(pgd) & ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER); | 156 | return (pgd_val(pgd) & ~(PTE_MASK | _PAGE_USER)) != _KERNPG_TABLE; |
157 | } | 157 | } |
158 | 158 | ||
159 | static inline unsigned long pud_bad(pud_t pud) | 159 | static inline int pud_bad(pud_t pud) |
160 | { | 160 | { |
161 | return pud_val(pud) & ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER); | 161 | return (pud_val(pud) & ~(PTE_MASK | _PAGE_USER)) != _KERNPG_TABLE; |
162 | } | 162 | } |
163 | 163 | ||
164 | static inline unsigned long pmd_bad(pmd_t pmd) | 164 | static inline int pmd_bad(pmd_t pmd) |
165 | { | 165 | { |
166 | return pmd_val(pmd) & ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER); | 166 | return (pmd_val(pmd) & ~(PTE_MASK | _PAGE_USER)) != _KERNPG_TABLE; |
167 | } | 167 | } |
168 | 168 | ||
169 | #define pte_none(x) (!pte_val((x))) | 169 | #define pte_none(x) (!pte_val((x))) |
diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h index 01799305f02a..baf3a4dce28c 100644 --- a/include/asm-x86/xen/page.h +++ b/include/asm-x86/xen/page.h | |||
@@ -127,7 +127,7 @@ static inline void set_phys_to_machine(unsigned long pfn, unsigned long mfn) | |||
127 | 127 | ||
128 | static inline unsigned long pte_mfn(pte_t pte) | 128 | static inline unsigned long pte_mfn(pte_t pte) |
129 | { | 129 | { |
130 | return (pte.pte & ~_PAGE_NX) >> PAGE_SHIFT; | 130 | return (pte.pte & PTE_MASK) >> PAGE_SHIFT; |
131 | } | 131 | } |
132 | 132 | ||
133 | static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot) | 133 | static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot) |
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index b7d81b2a9041..93b98856007a 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -92,7 +92,6 @@ header-y += if_slip.h | |||
92 | header-y += if_strip.h | 92 | header-y += if_strip.h |
93 | header-y += if_tun.h | 93 | header-y += if_tun.h |
94 | header-y += if_tunnel.h | 94 | header-y += if_tunnel.h |
95 | header-y += in6.h | ||
96 | header-y += in_route.h | 95 | header-y += in_route.h |
97 | header-y += ioctl.h | 96 | header-y += ioctl.h |
98 | header-y += ip6_tunnel.h | 97 | header-y += ip6_tunnel.h |
@@ -105,7 +104,6 @@ header-y += ixjuser.h | |||
105 | header-y += jffs2.h | 104 | header-y += jffs2.h |
106 | header-y += keyctl.h | 105 | header-y += keyctl.h |
107 | header-y += limits.h | 106 | header-y += limits.h |
108 | header-y += dlm_plock.h | ||
109 | header-y += magic.h | 107 | header-y += magic.h |
110 | header-y += major.h | 108 | header-y += major.h |
111 | header-y += matroxfb.h | 109 | header-y += matroxfb.h |
@@ -190,6 +188,7 @@ unifdef-y += cyclades.h | |||
190 | unifdef-y += dccp.h | 188 | unifdef-y += dccp.h |
191 | unifdef-y += dirent.h | 189 | unifdef-y += dirent.h |
192 | unifdef-y += dlm.h | 190 | unifdef-y += dlm.h |
191 | unifdef-y += dlm_plock.h | ||
193 | unifdef-y += edd.h | 192 | unifdef-y += edd.h |
194 | unifdef-y += elf.h | 193 | unifdef-y += elf.h |
195 | unifdef-y += elfcore.h | 194 | unifdef-y += elfcore.h |
@@ -236,6 +235,7 @@ unifdef-y += if_vlan.h | |||
236 | unifdef-y += igmp.h | 235 | unifdef-y += igmp.h |
237 | unifdef-y += inet_diag.h | 236 | unifdef-y += inet_diag.h |
238 | unifdef-y += in.h | 237 | unifdef-y += in.h |
238 | unifdef-y += in6.h | ||
239 | unifdef-y += inotify.h | 239 | unifdef-y += inotify.h |
240 | unifdef-y += input.h | 240 | unifdef-y += input.h |
241 | unifdef-y += ip.h | 241 | unifdef-y += ip.h |
diff --git a/include/linux/atm.h b/include/linux/atm.h index 60136684e0af..c791ddd96939 100644 --- a/include/linux/atm.h +++ b/include/linux/atm.h | |||
@@ -16,14 +16,11 @@ | |||
16 | * documentation. Do not change them. | 16 | * documentation. Do not change them. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #ifdef __KERNEL__ | ||
20 | #include <linux/socket.h> | ||
21 | #include <linux/types.h> | ||
22 | #endif | ||
23 | #include <linux/compiler.h> | 19 | #include <linux/compiler.h> |
24 | #include <linux/atmapi.h> | 20 | #include <linux/atmapi.h> |
25 | #include <linux/atmsap.h> | 21 | #include <linux/atmsap.h> |
26 | #include <linux/atmioc.h> | 22 | #include <linux/atmioc.h> |
23 | #include <linux/types.h> | ||
27 | 24 | ||
28 | 25 | ||
29 | /* general ATM constants */ | 26 | /* general ATM constants */ |
@@ -212,7 +209,7 @@ struct sockaddr_atmsvc { | |||
212 | char pub[ATM_E164_LEN+1]; /* public address (E.164) */ | 209 | char pub[ATM_E164_LEN+1]; /* public address (E.164) */ |
213 | /* unused addresses must be bzero'ed */ | 210 | /* unused addresses must be bzero'ed */ |
214 | char lij_type; /* role in LIJ call; one of ATM_LIJ* */ | 211 | char lij_type; /* role in LIJ call; one of ATM_LIJ* */ |
215 | uint32_t lij_id; /* LIJ call identifier */ | 212 | __u32 lij_id; /* LIJ call identifier */ |
216 | } sas_addr __ATM_API_ALIGN; /* SVC address */ | 213 | } sas_addr __ATM_API_ALIGN; /* SVC address */ |
217 | }; | 214 | }; |
218 | 215 | ||
diff --git a/include/linux/atm_tcp.h b/include/linux/atm_tcp.h index 18787f9b2f19..375638f8554b 100644 --- a/include/linux/atm_tcp.h +++ b/include/linux/atm_tcp.h | |||
@@ -8,11 +8,9 @@ | |||
8 | #define LINUX_ATM_TCP_H | 8 | #define LINUX_ATM_TCP_H |
9 | 9 | ||
10 | #include <linux/atmapi.h> | 10 | #include <linux/atmapi.h> |
11 | 11 | #include <linux/atm.h> | |
12 | #ifdef __KERNEL__ | ||
13 | #include <linux/types.h> | ||
14 | #endif | ||
15 | #include <linux/atmioc.h> | 12 | #include <linux/atmioc.h> |
13 | #include <linux/types.h> | ||
16 | 14 | ||
17 | 15 | ||
18 | /* | 16 | /* |
@@ -20,9 +18,9 @@ | |||
20 | */ | 18 | */ |
21 | 19 | ||
22 | struct atmtcp_hdr { | 20 | struct atmtcp_hdr { |
23 | uint16_t vpi; | 21 | __u16 vpi; |
24 | uint16_t vci; | 22 | __u16 vci; |
25 | uint32_t length; /* ... of data part */ | 23 | __u32 length; /* ... of data part */ |
26 | }; | 24 | }; |
27 | 25 | ||
28 | /* | 26 | /* |
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index b512e48f6d8e..ee0ed48e8348 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h | |||
@@ -99,6 +99,7 @@ extern int copy_strings_kernel(int argc,char ** argv,struct linux_binprm *bprm); | |||
99 | extern void compute_creds(struct linux_binprm *binprm); | 99 | extern void compute_creds(struct linux_binprm *binprm); |
100 | extern int do_coredump(long signr, int exit_code, struct pt_regs * regs); | 100 | extern int do_coredump(long signr, int exit_code, struct pt_regs * regs); |
101 | extern int set_binfmt(struct linux_binfmt *new); | 101 | extern int set_binfmt(struct linux_binfmt *new); |
102 | extern void free_bprm(struct linux_binprm *); | ||
102 | 103 | ||
103 | #endif /* __KERNEL__ */ | 104 | #endif /* __KERNEL__ */ |
104 | #endif /* _LINUX_BINFMTS_H */ | 105 | #endif /* _LINUX_BINFMTS_H */ |
diff --git a/include/linux/device.h b/include/linux/device.h index 15e9fa3ad3af..14616e80213c 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -449,9 +449,21 @@ extern int __must_check device_reprobe(struct device *dev); | |||
449 | /* | 449 | /* |
450 | * Easy functions for dynamically creating devices on the fly | 450 | * Easy functions for dynamically creating devices on the fly |
451 | */ | 451 | */ |
452 | extern struct device *device_create_vargs(struct class *cls, | ||
453 | struct device *parent, | ||
454 | dev_t devt, | ||
455 | void *drvdata, | ||
456 | const char *fmt, | ||
457 | va_list vargs); | ||
452 | extern struct device *device_create(struct class *cls, struct device *parent, | 458 | extern struct device *device_create(struct class *cls, struct device *parent, |
453 | dev_t devt, const char *fmt, ...) | 459 | dev_t devt, const char *fmt, ...) |
454 | __attribute__((format(printf, 4, 5))); | 460 | __attribute__((format(printf, 4, 5))); |
461 | extern struct device *device_create_drvdata(struct class *cls, | ||
462 | struct device *parent, | ||
463 | dev_t devt, | ||
464 | void *drvdata, | ||
465 | const char *fmt, ...) | ||
466 | __attribute__((format(printf, 5, 6))); | ||
455 | extern void device_destroy(struct class *cls, dev_t devt); | 467 | extern void device_destroy(struct class *cls, dev_t devt); |
456 | 468 | ||
457 | /* | 469 | /* |
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index a118f3c0b240..4aab6f12cfab 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h | |||
@@ -93,6 +93,7 @@ struct files_struct *get_files_struct(struct task_struct *); | |||
93 | void put_files_struct(struct files_struct *fs); | 93 | void put_files_struct(struct files_struct *fs); |
94 | void reset_files_struct(struct files_struct *); | 94 | void reset_files_struct(struct files_struct *); |
95 | int unshare_files(struct files_struct **); | 95 | int unshare_files(struct files_struct **); |
96 | struct files_struct *dup_fd(struct files_struct *, int *); | ||
96 | 97 | ||
97 | extern struct kmem_cache *files_cachep; | 98 | extern struct kmem_cache *files_cachep; |
98 | 99 | ||
diff --git a/include/linux/hid.h b/include/linux/hid.h index 4ce3b7a979ba..fe56b86f2c67 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -2,8 +2,6 @@ | |||
2 | #define __HID_H | 2 | #define __HID_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * $Id: hid.h,v 1.24 2001/12/27 10:37:41 vojtech Exp $ | ||
6 | * | ||
7 | * Copyright (c) 1999 Andreas Gal | 5 | * Copyright (c) 1999 Andreas Gal |
8 | * Copyright (c) 2000-2001 Vojtech Pavlik | 6 | * Copyright (c) 2000-2001 Vojtech Pavlik |
9 | * Copyright (c) 2006-2007 Jiri Kosina | 7 | * Copyright (c) 2006-2007 Jiri Kosina |
@@ -285,6 +283,7 @@ struct hid_item { | |||
285 | #define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000 | 283 | #define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000 |
286 | #define HID_QUIRK_MICROSOFT_KEYS 0x08000000 | 284 | #define HID_QUIRK_MICROSOFT_KEYS 0x08000000 |
287 | #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 | 285 | #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 |
286 | #define HID_QUIRK_APPLE_NUMLOCK_EMULATION 0x20000000 | ||
288 | 287 | ||
289 | /* | 288 | /* |
290 | * Separate quirks for runtime report descriptor fixup | 289 | * Separate quirks for runtime report descriptor fixup |
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h index acbdae6d7ae1..a416b904ba90 100644 --- a/include/linux/hiddev.h +++ b/include/linux/hiddev.h | |||
@@ -2,8 +2,6 @@ | |||
2 | #define _HIDDEV_H | 2 | #define _HIDDEV_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * $Id: hiddev.h,v 1.2 2001/04/26 11:26:09 vojtech Exp $ | ||
6 | * | ||
7 | * Copyright (c) 1999-2000 Vojtech Pavlik | 5 | * Copyright (c) 1999-2000 Vojtech Pavlik |
8 | * | 6 | * |
9 | * Sponsored by SuSE | 7 | * Sponsored by SuSE |
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index b24c2875aa05..9927a88674a3 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX__INIT_TASK_H | 1 | #ifndef _LINUX__INIT_TASK_H |
2 | #define _LINUX__INIT_TASK_H | 2 | #define _LINUX__INIT_TASK_H |
3 | 3 | ||
4 | #include <linux/fdtable.h> | ||
5 | #include <linux/rcupdate.h> | 4 | #include <linux/rcupdate.h> |
6 | #include <linux/irqflags.h> | 5 | #include <linux/irqflags.h> |
7 | #include <linux/utsname.h> | 6 | #include <linux/utsname.h> |
@@ -12,27 +11,7 @@ | |||
12 | #include <linux/securebits.h> | 11 | #include <linux/securebits.h> |
13 | #include <net/net_namespace.h> | 12 | #include <net/net_namespace.h> |
14 | 13 | ||
15 | #define INIT_FDTABLE \ | 14 | extern struct files_struct init_files; |
16 | { \ | ||
17 | .max_fds = NR_OPEN_DEFAULT, \ | ||
18 | .fd = &init_files.fd_array[0], \ | ||
19 | .close_on_exec = (fd_set *)&init_files.close_on_exec_init, \ | ||
20 | .open_fds = (fd_set *)&init_files.open_fds_init, \ | ||
21 | .rcu = RCU_HEAD_INIT, \ | ||
22 | .next = NULL, \ | ||
23 | } | ||
24 | |||
25 | #define INIT_FILES \ | ||
26 | { \ | ||
27 | .count = ATOMIC_INIT(1), \ | ||
28 | .fdt = &init_files.fdtab, \ | ||
29 | .fdtab = INIT_FDTABLE, \ | ||
30 | .file_lock = __SPIN_LOCK_UNLOCKED(init_task.file_lock), \ | ||
31 | .next_fd = 0, \ | ||
32 | .close_on_exec_init = { { 0, } }, \ | ||
33 | .open_fds_init = { { 0, } }, \ | ||
34 | .fd_array = { NULL, } \ | ||
35 | } | ||
36 | 15 | ||
37 | #define INIT_KIOCTX(name, which_mm) \ | 16 | #define INIT_KIOCTX(name, which_mm) \ |
38 | { \ | 17 | { \ |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 0f17643e0a6e..4a92fbafce9d 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -341,7 +341,7 @@ enum { | |||
341 | ATA_EH_PMP_TRIES = 5, | 341 | ATA_EH_PMP_TRIES = 5, |
342 | ATA_EH_PMP_LINK_TRIES = 3, | 342 | ATA_EH_PMP_LINK_TRIES = 3, |
343 | 343 | ||
344 | SATA_PMP_SCR_TIMEOUT = 250, | 344 | SATA_PMP_RW_TIMEOUT = 3000, /* PMP read/write timeout */ |
345 | 345 | ||
346 | /* Horkage types. May be set by libata or controller on drives | 346 | /* Horkage types. May be set by libata or controller on drives |
347 | (some horkage may be drive/controller pair dependant */ | 347 | (some horkage may be drive/controller pair dependant */ |
@@ -351,7 +351,7 @@ enum { | |||
351 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ | 351 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ |
352 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ | 352 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ |
353 | ATA_HORKAGE_BROKEN_HPA = (1 << 4), /* Broken HPA */ | 353 | ATA_HORKAGE_BROKEN_HPA = (1 << 4), /* Broken HPA */ |
354 | ATA_HORKAGE_SKIP_PM = (1 << 5), /* Skip PM operations */ | 354 | ATA_HORKAGE_DISABLE = (1 << 5), /* Disable it */ |
355 | ATA_HORKAGE_HPA_SIZE = (1 << 6), /* native size off by one */ | 355 | ATA_HORKAGE_HPA_SIZE = (1 << 6), /* native size off by one */ |
356 | ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */ | 356 | ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */ |
357 | ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */ | 357 | ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */ |
@@ -821,8 +821,6 @@ struct ata_timing { | |||
821 | unsigned short udma; /* t2CYCTYP/2 */ | 821 | unsigned short udma; /* t2CYCTYP/2 */ |
822 | }; | 822 | }; |
823 | 823 | ||
824 | #define FIT(v, vmin, vmax) max_t(short, min_t(short, v, vmax), vmin) | ||
825 | |||
826 | /* | 824 | /* |
827 | * Core layer - drivers/ata/libata-core.c | 825 | * Core layer - drivers/ata/libata-core.c |
828 | */ | 826 | */ |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b11e6e19e96c..2b0266484c84 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -514,10 +514,12 @@ struct net_device | |||
514 | #define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */ | 514 | #define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */ |
515 | #define NETIF_F_MULTI_QUEUE 16384 /* Has multiple TX/RX queues */ | 515 | #define NETIF_F_MULTI_QUEUE 16384 /* Has multiple TX/RX queues */ |
516 | #define NETIF_F_LRO 32768 /* large receive offload */ | 516 | #define NETIF_F_LRO 32768 /* large receive offload */ |
517 | #define NETIF_F_VLAN_TSO 65536 /* Supports TSO for VLANs */ | ||
518 | #define NETIF_F_VLAN_CSUM 131072 /* Supports TX checksumming for VLANs */ | ||
517 | 519 | ||
518 | /* Segmentation offload features */ | 520 | /* Segmentation offload features */ |
519 | #define NETIF_F_GSO_SHIFT 16 | 521 | #define NETIF_F_GSO_SHIFT 20 |
520 | #define NETIF_F_GSO_MASK 0xffff0000 | 522 | #define NETIF_F_GSO_MASK 0xfff00000 |
521 | #define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT) | 523 | #define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT) |
522 | #define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT) | 524 | #define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT) |
523 | #define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT) | 525 | #define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT) |
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index e4c66593b5c6..0c5eb7ed8b3f 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | #include <linux/init.h> | 5 | #include <linux/init.h> |
6 | #include <linux/types.h> | ||
7 | #include <linux/skbuff.h> | 6 | #include <linux/skbuff.h> |
8 | #include <linux/net.h> | 7 | #include <linux/net.h> |
9 | #include <linux/netdevice.h> | 8 | #include <linux/netdevice.h> |
@@ -14,6 +13,7 @@ | |||
14 | #include <linux/list.h> | 13 | #include <linux/list.h> |
15 | #include <net/net_namespace.h> | 14 | #include <net/net_namespace.h> |
16 | #endif | 15 | #endif |
16 | #include <linux/types.h> | ||
17 | #include <linux/compiler.h> | 17 | #include <linux/compiler.h> |
18 | 18 | ||
19 | /* Responses from hook functions. */ | 19 | /* Responses from hook functions. */ |
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index dd9c97f2d436..590ac3d6d5d6 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h | |||
@@ -11,11 +11,11 @@ | |||
11 | 11 | ||
12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
13 | #include <linux/if.h> | 13 | #include <linux/if.h> |
14 | #include <linux/types.h> | ||
15 | #include <linux/in.h> | 14 | #include <linux/in.h> |
16 | #include <linux/if_arp.h> | 15 | #include <linux/if_arp.h> |
17 | #include <linux/skbuff.h> | 16 | #include <linux/skbuff.h> |
18 | #endif | 17 | #endif |
18 | #include <linux/types.h> | ||
19 | #include <linux/compiler.h> | 19 | #include <linux/compiler.h> |
20 | #include <linux/netfilter_arp.h> | 20 | #include <linux/netfilter_arp.h> |
21 | 21 | ||
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index bfc889f90276..092bd50581a9 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h | |||
@@ -17,11 +17,11 @@ | |||
17 | 17 | ||
18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
19 | #include <linux/if.h> | 19 | #include <linux/if.h> |
20 | #include <linux/types.h> | ||
21 | #include <linux/in.h> | 20 | #include <linux/in.h> |
22 | #include <linux/ip.h> | 21 | #include <linux/ip.h> |
23 | #include <linux/skbuff.h> | 22 | #include <linux/skbuff.h> |
24 | #endif | 23 | #endif |
24 | #include <linux/types.h> | ||
25 | #include <linux/compiler.h> | 25 | #include <linux/compiler.h> |
26 | #include <linux/netfilter_ipv4.h> | 26 | #include <linux/netfilter_ipv4.h> |
27 | 27 | ||
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index f2507dcc5750..1089e33cf633 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h | |||
@@ -17,11 +17,11 @@ | |||
17 | 17 | ||
18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
19 | #include <linux/if.h> | 19 | #include <linux/if.h> |
20 | #include <linux/types.h> | ||
21 | #include <linux/in6.h> | 20 | #include <linux/in6.h> |
22 | #include <linux/ipv6.h> | 21 | #include <linux/ipv6.h> |
23 | #include <linux/skbuff.h> | 22 | #include <linux/skbuff.h> |
24 | #endif | 23 | #endif |
24 | #include <linux/types.h> | ||
25 | #include <linux/compiler.h> | 25 | #include <linux/compiler.h> |
26 | #include <linux/netfilter_ipv6.h> | 26 | #include <linux/netfilter_ipv6.h> |
27 | 27 | ||
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h index c11bbcc081f9..05eb4664d0dd 100644 --- a/include/linux/sunrpc/svc_rdma.h +++ b/include/linux/sunrpc/svc_rdma.h | |||
@@ -71,7 +71,8 @@ extern atomic_t rdma_stat_sq_prod; | |||
71 | * completes. | 71 | * completes. |
72 | */ | 72 | */ |
73 | struct svc_rdma_op_ctxt { | 73 | struct svc_rdma_op_ctxt { |
74 | struct svc_rdma_op_ctxt *next; | 74 | struct svc_rdma_op_ctxt *read_hdr; |
75 | struct list_head free_list; | ||
75 | struct xdr_buf arg; | 76 | struct xdr_buf arg; |
76 | struct list_head dto_q; | 77 | struct list_head dto_q; |
77 | enum ib_wr_opcode wr_op; | 78 | enum ib_wr_opcode wr_op; |
@@ -85,7 +86,6 @@ struct svc_rdma_op_ctxt { | |||
85 | struct page *pages[RPCSVC_MAXPAGES]; | 86 | struct page *pages[RPCSVC_MAXPAGES]; |
86 | }; | 87 | }; |
87 | 88 | ||
88 | #define RDMACTXT_F_READ_DONE 1 | ||
89 | #define RDMACTXT_F_LAST_CTXT 2 | 89 | #define RDMACTXT_F_LAST_CTXT 2 |
90 | 90 | ||
91 | struct svcxprt_rdma { | 91 | struct svcxprt_rdma { |
@@ -104,7 +104,8 @@ struct svcxprt_rdma { | |||
104 | 104 | ||
105 | struct ib_pd *sc_pd; | 105 | struct ib_pd *sc_pd; |
106 | 106 | ||
107 | struct svc_rdma_op_ctxt *sc_ctxt_head; | 107 | atomic_t sc_ctxt_used; |
108 | struct list_head sc_ctxt_free; | ||
108 | int sc_ctxt_cnt; | 109 | int sc_ctxt_cnt; |
109 | int sc_ctxt_bump; | 110 | int sc_ctxt_bump; |
110 | int sc_ctxt_max; | 111 | int sc_ctxt_max; |
@@ -123,6 +124,7 @@ struct svcxprt_rdma { | |||
123 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ | 124 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ |
124 | struct list_head sc_read_complete_q; | 125 | struct list_head sc_read_complete_q; |
125 | spinlock_t sc_read_complete_lock; | 126 | spinlock_t sc_read_complete_lock; |
127 | struct work_struct sc_work; | ||
126 | }; | 128 | }; |
127 | /* sc_flags */ | 129 | /* sc_flags */ |
128 | #define RDMAXPRT_RQ_PENDING 1 | 130 | #define RDMAXPRT_RQ_PENDING 1 |
@@ -164,8 +166,8 @@ extern int svc_rdma_sendto(struct svc_rqst *); | |||
164 | 166 | ||
165 | /* svc_rdma_transport.c */ | 167 | /* svc_rdma_transport.c */ |
166 | extern int svc_rdma_send(struct svcxprt_rdma *, struct ib_send_wr *); | 168 | extern int svc_rdma_send(struct svcxprt_rdma *, struct ib_send_wr *); |
167 | extern int svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *, | 169 | extern void svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *, |
168 | enum rpcrdma_errcode); | 170 | enum rpcrdma_errcode); |
169 | struct page *svc_rdma_get_page(void); | 171 | struct page *svc_rdma_get_page(void); |
170 | extern int svc_rdma_post_recv(struct svcxprt_rdma *); | 172 | extern int svc_rdma_post_recv(struct svcxprt_rdma *); |
171 | extern int svc_rdma_create_listen(struct svc_serv *, int, struct sockaddr *); | 173 | extern int svc_rdma_create_listen(struct svc_serv *, int, struct sockaddr *); |
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index d96d9b122304..18e62e3d406f 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
@@ -355,7 +355,7 @@ struct tcp_sock { | |||
355 | u32 lost_retrans_low; /* Sent seq after any rxmit (lowest) */ | 355 | u32 lost_retrans_low; /* Sent seq after any rxmit (lowest) */ |
356 | 356 | ||
357 | u16 advmss; /* Advertised MSS */ | 357 | u16 advmss; /* Advertised MSS */ |
358 | u16 prior_ssthresh; /* ssthresh saved at recovery start */ | 358 | u32 prior_ssthresh; /* ssthresh saved at recovery start */ |
359 | u32 lost_out; /* Lost packets */ | 359 | u32 lost_out; /* Lost packets */ |
360 | u32 sacked_out; /* SACK'd packets */ | 360 | u32 sacked_out; /* SACK'd packets */ |
361 | u32 fackets_out; /* FACK'd packets */ | 361 | u32 fackets_out; /* FACK'd packets */ |
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h index 71e52f2f6a38..ca228bb94218 100644 --- a/include/linux/usb/cdc.h +++ b/include/linux/usb/cdc.h | |||
@@ -130,6 +130,15 @@ struct usb_cdc_ether_desc { | |||
130 | __u8 bNumberPowerFilters; | 130 | __u8 bNumberPowerFilters; |
131 | } __attribute__ ((packed)); | 131 | } __attribute__ ((packed)); |
132 | 132 | ||
133 | /* "Telephone Control Model Functional Descriptor" from CDC WMC spec 6.3..3 */ | ||
134 | struct usb_cdc_dmm_desc { | ||
135 | __u8 bFunctionLength; | ||
136 | __u8 bDescriptorType; | ||
137 | __u8 bDescriptorSubtype; | ||
138 | __u16 bcdVersion; | ||
139 | __le16 wMaxCommand; | ||
140 | } __attribute__ ((packed)); | ||
141 | |||
133 | /* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */ | 142 | /* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */ |
134 | struct usb_cdc_mdlm_desc { | 143 | struct usb_cdc_mdlm_desc { |
135 | __u8 bLength; | 144 | __u8 bLength; |
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 5b39a22533fe..874f1340d049 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
@@ -237,6 +237,9 @@ unsigned int videobuf_poll_stream(struct file *file, | |||
237 | int videobuf_mmap_setup(struct videobuf_queue *q, | 237 | int videobuf_mmap_setup(struct videobuf_queue *q, |
238 | unsigned int bcount, unsigned int bsize, | 238 | unsigned int bcount, unsigned int bsize, |
239 | enum v4l2_memory memory); | 239 | enum v4l2_memory memory); |
240 | int __videobuf_mmap_setup(struct videobuf_queue *q, | ||
241 | unsigned int bcount, unsigned int bsize, | ||
242 | enum v4l2_memory memory); | ||
240 | int videobuf_mmap_free(struct videobuf_queue *q); | 243 | int videobuf_mmap_free(struct videobuf_queue *q); |
241 | int videobuf_mmap_mapper(struct videobuf_queue *q, | 244 | int videobuf_mmap_mapper(struct videobuf_queue *q, |
242 | struct vm_area_struct *vma); | 245 | struct vm_area_struct *vma); |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 4a80d74975e8..dae3f9ec1154 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -1594,13 +1594,16 @@ void ieee80211_wake_queues(struct ieee80211_hw *hw); | |||
1594 | void ieee80211_scan_completed(struct ieee80211_hw *hw); | 1594 | void ieee80211_scan_completed(struct ieee80211_hw *hw); |
1595 | 1595 | ||
1596 | /** | 1596 | /** |
1597 | * ieee80211_iterate_active_interfaces - iterate active interfaces | 1597 | * ieee80211_iterate_active_interfaces- iterate active interfaces |
1598 | * | 1598 | * |
1599 | * This function iterates over the interfaces associated with a given | 1599 | * This function iterates over the interfaces associated with a given |
1600 | * hardware that are currently active and calls the callback for them. | 1600 | * hardware that are currently active and calls the callback for them. |
1601 | * This function allows the iterator function to sleep, when the iterator | ||
1602 | * function is atomic @ieee80211_iterate_active_interfaces_atomic can | ||
1603 | * be used. | ||
1601 | * | 1604 | * |
1602 | * @hw: the hardware struct of which the interfaces should be iterated over | 1605 | * @hw: the hardware struct of which the interfaces should be iterated over |
1603 | * @iterator: the iterator function to call, cannot sleep | 1606 | * @iterator: the iterator function to call |
1604 | * @data: first argument of the iterator function | 1607 | * @data: first argument of the iterator function |
1605 | */ | 1608 | */ |
1606 | void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, | 1609 | void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, |
@@ -1609,6 +1612,24 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, | |||
1609 | void *data); | 1612 | void *data); |
1610 | 1613 | ||
1611 | /** | 1614 | /** |
1615 | * ieee80211_iterate_active_interfaces_atomic - iterate active interfaces | ||
1616 | * | ||
1617 | * This function iterates over the interfaces associated with a given | ||
1618 | * hardware that are currently active and calls the callback for them. | ||
1619 | * This function requires the iterator callback function to be atomic, | ||
1620 | * if that is not desired, use @ieee80211_iterate_active_interfaces instead. | ||
1621 | * | ||
1622 | * @hw: the hardware struct of which the interfaces should be iterated over | ||
1623 | * @iterator: the iterator function to call, cannot sleep | ||
1624 | * @data: first argument of the iterator function | ||
1625 | */ | ||
1626 | void ieee80211_iterate_active_interfaces_atomic(struct ieee80211_hw *hw, | ||
1627 | void (*iterator)(void *data, | ||
1628 | u8 *mac, | ||
1629 | struct ieee80211_vif *vif), | ||
1630 | void *data); | ||
1631 | |||
1632 | /** | ||
1612 | * ieee80211_start_tx_ba_session - Start a tx Block Ack session. | 1633 | * ieee80211_start_tx_ba_session - Start a tx Block Ack session. |
1613 | * @hw: pointer as obtained from ieee80211_alloc_hw(). | 1634 | * @hw: pointer as obtained from ieee80211_alloc_hw(). |
1614 | * @ra: receiver address of the BA session recipient | 1635 | * @ra: receiver address of the BA session recipient |
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 9c451ff2f4f4..a01b7c4dc763 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h | |||
@@ -129,6 +129,10 @@ extern int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, | |||
129 | void __user *buffer, | 129 | void __user *buffer, |
130 | size_t *lenp, | 130 | size_t *lenp, |
131 | loff_t *ppos); | 131 | loff_t *ppos); |
132 | int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name, | ||
133 | int nlen, void __user *oldval, | ||
134 | size_t __user *oldlenp, | ||
135 | void __user *newval, size_t newlen); | ||
132 | #endif | 136 | #endif |
133 | 137 | ||
134 | extern void inet6_ifinfo_notify(int event, | 138 | extern void inet6_ifinfo_notify(int event, |
diff --git a/kernel/audit.c b/kernel/audit.c index b7d3709cc452..e8692a5748c2 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -572,16 +572,17 @@ void audit_send_reply(int pid, int seq, int type, int done, int multi, | |||
572 | 572 | ||
573 | skb = audit_make_reply(pid, seq, type, done, multi, payload, size); | 573 | skb = audit_make_reply(pid, seq, type, done, multi, payload, size); |
574 | if (!skb) | 574 | if (!skb) |
575 | return; | 575 | goto out; |
576 | 576 | ||
577 | reply->pid = pid; | 577 | reply->pid = pid; |
578 | reply->skb = skb; | 578 | reply->skb = skb; |
579 | 579 | ||
580 | tsk = kthread_run(audit_send_reply_thread, reply, "audit_send_reply"); | 580 | tsk = kthread_run(audit_send_reply_thread, reply, "audit_send_reply"); |
581 | if (IS_ERR(tsk)) { | 581 | if (!IS_ERR(tsk)) |
582 | kfree(reply); | 582 | return; |
583 | kfree_skb(skb); | 583 | kfree_skb(skb); |
584 | } | 584 | out: |
585 | kfree(reply); | ||
585 | } | 586 | } |
586 | 587 | ||
587 | /* | 588 | /* |
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 9ef5e0aacc3c..f7921a2ecf16 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -172,10 +172,9 @@ static void insert_hash(struct audit_chunk *chunk) | |||
172 | struct audit_chunk *audit_tree_lookup(const struct inode *inode) | 172 | struct audit_chunk *audit_tree_lookup(const struct inode *inode) |
173 | { | 173 | { |
174 | struct list_head *list = chunk_hash(inode); | 174 | struct list_head *list = chunk_hash(inode); |
175 | struct list_head *pos; | 175 | struct audit_chunk *p; |
176 | 176 | ||
177 | list_for_each_rcu(pos, list) { | 177 | list_for_each_entry_rcu(p, list, hash) { |
178 | struct audit_chunk *p = container_of(pos, struct audit_chunk, hash); | ||
179 | if (p->watch.inode == inode) { | 178 | if (p->watch.inode == inode) { |
180 | get_inotify_watch(&p->watch); | 179 | get_inotify_watch(&p->watch); |
181 | return p; | 180 | return p; |
diff --git a/kernel/fork.c b/kernel/fork.c index 933e60ebccae..19908b26cf80 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -660,136 +660,6 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk) | |||
660 | return 0; | 660 | return 0; |
661 | } | 661 | } |
662 | 662 | ||
663 | static int count_open_files(struct fdtable *fdt) | ||
664 | { | ||
665 | int size = fdt->max_fds; | ||
666 | int i; | ||
667 | |||
668 | /* Find the last open fd */ | ||
669 | for (i = size/(8*sizeof(long)); i > 0; ) { | ||
670 | if (fdt->open_fds->fds_bits[--i]) | ||
671 | break; | ||
672 | } | ||
673 | i = (i+1) * 8 * sizeof(long); | ||
674 | return i; | ||
675 | } | ||
676 | |||
677 | static struct files_struct *alloc_files(void) | ||
678 | { | ||
679 | struct files_struct *newf; | ||
680 | struct fdtable *fdt; | ||
681 | |||
682 | newf = kmem_cache_alloc(files_cachep, GFP_KERNEL); | ||
683 | if (!newf) | ||
684 | goto out; | ||
685 | |||
686 | atomic_set(&newf->count, 1); | ||
687 | |||
688 | spin_lock_init(&newf->file_lock); | ||
689 | newf->next_fd = 0; | ||
690 | fdt = &newf->fdtab; | ||
691 | fdt->max_fds = NR_OPEN_DEFAULT; | ||
692 | fdt->close_on_exec = (fd_set *)&newf->close_on_exec_init; | ||
693 | fdt->open_fds = (fd_set *)&newf->open_fds_init; | ||
694 | fdt->fd = &newf->fd_array[0]; | ||
695 | INIT_RCU_HEAD(&fdt->rcu); | ||
696 | fdt->next = NULL; | ||
697 | rcu_assign_pointer(newf->fdt, fdt); | ||
698 | out: | ||
699 | return newf; | ||
700 | } | ||
701 | |||
702 | /* | ||
703 | * Allocate a new files structure and copy contents from the | ||
704 | * passed in files structure. | ||
705 | * errorp will be valid only when the returned files_struct is NULL. | ||
706 | */ | ||
707 | static struct files_struct *dup_fd(struct files_struct *oldf, int *errorp) | ||
708 | { | ||
709 | struct files_struct *newf; | ||
710 | struct file **old_fds, **new_fds; | ||
711 | int open_files, size, i; | ||
712 | struct fdtable *old_fdt, *new_fdt; | ||
713 | |||
714 | *errorp = -ENOMEM; | ||
715 | newf = alloc_files(); | ||
716 | if (!newf) | ||
717 | goto out; | ||
718 | |||
719 | spin_lock(&oldf->file_lock); | ||
720 | old_fdt = files_fdtable(oldf); | ||
721 | new_fdt = files_fdtable(newf); | ||
722 | open_files = count_open_files(old_fdt); | ||
723 | |||
724 | /* | ||
725 | * Check whether we need to allocate a larger fd array and fd set. | ||
726 | * Note: we're not a clone task, so the open count won't change. | ||
727 | */ | ||
728 | if (open_files > new_fdt->max_fds) { | ||
729 | new_fdt->max_fds = 0; | ||
730 | spin_unlock(&oldf->file_lock); | ||
731 | spin_lock(&newf->file_lock); | ||
732 | *errorp = expand_files(newf, open_files-1); | ||
733 | spin_unlock(&newf->file_lock); | ||
734 | if (*errorp < 0) | ||
735 | goto out_release; | ||
736 | new_fdt = files_fdtable(newf); | ||
737 | /* | ||
738 | * Reacquire the oldf lock and a pointer to its fd table | ||
739 | * who knows it may have a new bigger fd table. We need | ||
740 | * the latest pointer. | ||
741 | */ | ||
742 | spin_lock(&oldf->file_lock); | ||
743 | old_fdt = files_fdtable(oldf); | ||
744 | } | ||
745 | |||
746 | old_fds = old_fdt->fd; | ||
747 | new_fds = new_fdt->fd; | ||
748 | |||
749 | memcpy(new_fdt->open_fds->fds_bits, | ||
750 | old_fdt->open_fds->fds_bits, open_files/8); | ||
751 | memcpy(new_fdt->close_on_exec->fds_bits, | ||
752 | old_fdt->close_on_exec->fds_bits, open_files/8); | ||
753 | |||
754 | for (i = open_files; i != 0; i--) { | ||
755 | struct file *f = *old_fds++; | ||
756 | if (f) { | ||
757 | get_file(f); | ||
758 | } else { | ||
759 | /* | ||
760 | * The fd may be claimed in the fd bitmap but not yet | ||
761 | * instantiated in the files array if a sibling thread | ||
762 | * is partway through open(). So make sure that this | ||
763 | * fd is available to the new process. | ||
764 | */ | ||
765 | FD_CLR(open_files - i, new_fdt->open_fds); | ||
766 | } | ||
767 | rcu_assign_pointer(*new_fds++, f); | ||
768 | } | ||
769 | spin_unlock(&oldf->file_lock); | ||
770 | |||
771 | /* compute the remainder to be cleared */ | ||
772 | size = (new_fdt->max_fds - open_files) * sizeof(struct file *); | ||
773 | |||
774 | /* This is long word aligned thus could use a optimized version */ | ||
775 | memset(new_fds, 0, size); | ||
776 | |||
777 | if (new_fdt->max_fds > open_files) { | ||
778 | int left = (new_fdt->max_fds-open_files)/8; | ||
779 | int start = open_files / (8 * sizeof(unsigned long)); | ||
780 | |||
781 | memset(&new_fdt->open_fds->fds_bits[start], 0, left); | ||
782 | memset(&new_fdt->close_on_exec->fds_bits[start], 0, left); | ||
783 | } | ||
784 | |||
785 | return newf; | ||
786 | |||
787 | out_release: | ||
788 | kmem_cache_free(files_cachep, newf); | ||
789 | out: | ||
790 | return NULL; | ||
791 | } | ||
792 | |||
793 | static int copy_files(unsigned long clone_flags, struct task_struct * tsk) | 663 | static int copy_files(unsigned long clone_flags, struct task_struct * tsk) |
794 | { | 664 | { |
795 | struct files_struct *oldf, *newf; | 665 | struct files_struct *oldf, *newf; |
diff --git a/kernel/module.c b/kernel/module.c index f5e9491ef7ac..5f80478b746d 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -1337,7 +1337,19 @@ out_unreg: | |||
1337 | kobject_put(&mod->mkobj.kobj); | 1337 | kobject_put(&mod->mkobj.kobj); |
1338 | return err; | 1338 | return err; |
1339 | } | 1339 | } |
1340 | #endif | 1340 | |
1341 | static void mod_sysfs_fini(struct module *mod) | ||
1342 | { | ||
1343 | kobject_put(&mod->mkobj.kobj); | ||
1344 | } | ||
1345 | |||
1346 | #else /* CONFIG_SYSFS */ | ||
1347 | |||
1348 | static void mod_sysfs_fini(struct module *mod) | ||
1349 | { | ||
1350 | } | ||
1351 | |||
1352 | #endif /* CONFIG_SYSFS */ | ||
1341 | 1353 | ||
1342 | static void mod_kobject_remove(struct module *mod) | 1354 | static void mod_kobject_remove(struct module *mod) |
1343 | { | 1355 | { |
@@ -1345,7 +1357,7 @@ static void mod_kobject_remove(struct module *mod) | |||
1345 | module_param_sysfs_remove(mod); | 1357 | module_param_sysfs_remove(mod); |
1346 | kobject_put(mod->mkobj.drivers_dir); | 1358 | kobject_put(mod->mkobj.drivers_dir); |
1347 | kobject_put(mod->holders_dir); | 1359 | kobject_put(mod->holders_dir); |
1348 | kobject_put(&mod->mkobj.kobj); | 1360 | mod_sysfs_fini(mod); |
1349 | } | 1361 | } |
1350 | 1362 | ||
1351 | /* | 1363 | /* |
@@ -1780,7 +1792,7 @@ static struct module *load_module(void __user *umod, | |||
1780 | 1792 | ||
1781 | /* Sanity checks against insmoding binaries or wrong arch, | 1793 | /* Sanity checks against insmoding binaries or wrong arch, |
1782 | weird elf version */ | 1794 | weird elf version */ |
1783 | if (memcmp(hdr->e_ident, ELFMAG, 4) != 0 | 1795 | if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) != 0 |
1784 | || hdr->e_type != ET_REL | 1796 | || hdr->e_type != ET_REL |
1785 | || !elf_check_arch(hdr) | 1797 | || !elf_check_arch(hdr) |
1786 | || hdr->e_shentsize != sizeof(*sechdrs)) { | 1798 | || hdr->e_shentsize != sizeof(*sechdrs)) { |
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 0101aeef7ed7..b7350bbfb076 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
@@ -62,8 +62,7 @@ static int stopmachine(void *cpu) | |||
62 | * help our sisters onto their CPUs. */ | 62 | * help our sisters onto their CPUs. */ |
63 | if (!prepared && !irqs_disabled) | 63 | if (!prepared && !irqs_disabled) |
64 | yield(); | 64 | yield(); |
65 | else | 65 | cpu_relax(); |
66 | cpu_relax(); | ||
67 | } | 66 | } |
68 | 67 | ||
69 | /* Ack: we are exiting. */ | 68 | /* Ack: we are exiting. */ |
@@ -106,8 +105,10 @@ static int stop_machine(void) | |||
106 | } | 105 | } |
107 | 106 | ||
108 | /* Wait for them all to come to life. */ | 107 | /* Wait for them all to come to life. */ |
109 | while (atomic_read(&stopmachine_thread_ack) != stopmachine_num_threads) | 108 | while (atomic_read(&stopmachine_thread_ack) != stopmachine_num_threads) { |
110 | yield(); | 109 | yield(); |
110 | cpu_relax(); | ||
111 | } | ||
111 | 112 | ||
112 | /* If some failed, kill them all. */ | 113 | /* If some failed, kill them all. */ |
113 | if (ret < 0) { | 114 | if (ret < 0) { |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index d7ffdc59816a..29116652dca8 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -81,6 +81,7 @@ extern int compat_log; | |||
81 | extern int maps_protect; | 81 | extern int maps_protect; |
82 | extern int sysctl_stat_interval; | 82 | extern int sysctl_stat_interval; |
83 | extern int latencytop_enabled; | 83 | extern int latencytop_enabled; |
84 | extern int sysctl_nr_open_min, sysctl_nr_open_max; | ||
84 | 85 | ||
85 | /* Constants used for minimum and maximum */ | 86 | /* Constants used for minimum and maximum */ |
86 | #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM) | 87 | #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM) |
@@ -1190,7 +1191,9 @@ static struct ctl_table fs_table[] = { | |||
1190 | .data = &sysctl_nr_open, | 1191 | .data = &sysctl_nr_open, |
1191 | .maxlen = sizeof(int), | 1192 | .maxlen = sizeof(int), |
1192 | .mode = 0644, | 1193 | .mode = 0644, |
1193 | .proc_handler = &proc_dointvec, | 1194 | .proc_handler = &proc_dointvec_minmax, |
1195 | .extra1 = &sysctl_nr_open_min, | ||
1196 | .extra2 = &sysctl_nr_open_max, | ||
1194 | }, | 1197 | }, |
1195 | { | 1198 | { |
1196 | .ctl_name = FS_DENTRY, | 1199 | .ctl_name = FS_DENTRY, |
@@ -48,7 +48,8 @@ void lmb_dump_all(void) | |||
48 | } | 48 | } |
49 | 49 | ||
50 | pr_info(" reserved.cnt = 0x%lx\n", lmb.reserved.cnt); | 50 | pr_info(" reserved.cnt = 0x%lx\n", lmb.reserved.cnt); |
51 | pr_info(" reserved.size = 0x%lx\n", lmb.reserved.size); | 51 | pr_info(" reserved.size = 0x%llx\n", |
52 | (unsigned long long)lmb.memory.size); | ||
52 | for (i=0; i < lmb.reserved.cnt ;i++) { | 53 | for (i=0; i < lmb.reserved.cnt ;i++) { |
53 | pr_info(" reserved.region[0x%lx].base = 0x%llx\n", | 54 | pr_info(" reserved.region[0x%lx].base = 0x%llx\n", |
54 | i, (unsigned long long)lmb.reserved.region[i].base); | 55 | i, (unsigned long long)lmb.reserved.region[i].base); |
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 7c4f9e097095..f2e574dbc300 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c | |||
@@ -172,30 +172,22 @@ postcore_initcall(bdi_class_init); | |||
172 | int bdi_register(struct backing_dev_info *bdi, struct device *parent, | 172 | int bdi_register(struct backing_dev_info *bdi, struct device *parent, |
173 | const char *fmt, ...) | 173 | const char *fmt, ...) |
174 | { | 174 | { |
175 | char *name; | ||
176 | va_list args; | 175 | va_list args; |
177 | int ret = 0; | 176 | int ret = 0; |
178 | struct device *dev; | 177 | struct device *dev; |
179 | 178 | ||
180 | va_start(args, fmt); | 179 | va_start(args, fmt); |
181 | name = kvasprintf(GFP_KERNEL, fmt, args); | 180 | dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args); |
182 | va_end(args); | 181 | va_end(args); |
183 | |||
184 | if (!name) | ||
185 | return -ENOMEM; | ||
186 | |||
187 | dev = device_create(bdi_class, parent, MKDEV(0, 0), name); | ||
188 | if (IS_ERR(dev)) { | 182 | if (IS_ERR(dev)) { |
189 | ret = PTR_ERR(dev); | 183 | ret = PTR_ERR(dev); |
190 | goto exit; | 184 | goto exit; |
191 | } | 185 | } |
192 | 186 | ||
193 | bdi->dev = dev; | 187 | bdi->dev = dev; |
194 | dev_set_drvdata(bdi->dev, bdi); | 188 | bdi_debug_register(bdi, dev_name(dev)); |
195 | bdi_debug_register(bdi, name); | ||
196 | 189 | ||
197 | exit: | 190 | exit: |
198 | kfree(name); | ||
199 | return ret; | 191 | return ret; |
200 | } | 192 | } |
201 | EXPORT_SYMBOL(bdi_register); | 193 | EXPORT_SYMBOL(bdi_register); |
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 2a739adaa92b..51961300b586 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -382,6 +382,24 @@ static void vlan_sync_address(struct net_device *dev, | |||
382 | memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN); | 382 | memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN); |
383 | } | 383 | } |
384 | 384 | ||
385 | static void vlan_transfer_features(struct net_device *dev, | ||
386 | struct net_device *vlandev) | ||
387 | { | ||
388 | unsigned long old_features = vlandev->features; | ||
389 | |||
390 | if (dev->features & NETIF_F_VLAN_TSO) { | ||
391 | vlandev->features &= ~VLAN_TSO_FEATURES; | ||
392 | vlandev->features |= dev->features & VLAN_TSO_FEATURES; | ||
393 | } | ||
394 | if (dev->features & NETIF_F_VLAN_CSUM) { | ||
395 | vlandev->features &= ~NETIF_F_ALL_CSUM; | ||
396 | vlandev->features |= dev->features & NETIF_F_ALL_CSUM; | ||
397 | } | ||
398 | |||
399 | if (old_features != vlandev->features) | ||
400 | netdev_features_change(vlandev); | ||
401 | } | ||
402 | |||
385 | static void __vlan_device_event(struct net_device *dev, unsigned long event) | 403 | static void __vlan_device_event(struct net_device *dev, unsigned long event) |
386 | { | 404 | { |
387 | switch (event) { | 405 | switch (event) { |
@@ -410,10 +428,8 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, | |||
410 | int i, flgs; | 428 | int i, flgs; |
411 | struct net_device *vlandev; | 429 | struct net_device *vlandev; |
412 | 430 | ||
413 | if (is_vlan_dev(dev)) { | 431 | if (is_vlan_dev(dev)) |
414 | __vlan_device_event(dev, event); | 432 | __vlan_device_event(dev, event); |
415 | goto out; | ||
416 | } | ||
417 | 433 | ||
418 | grp = __vlan_find_group(dev); | 434 | grp = __vlan_find_group(dev); |
419 | if (!grp) | 435 | if (!grp) |
@@ -450,6 +466,18 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, | |||
450 | } | 466 | } |
451 | break; | 467 | break; |
452 | 468 | ||
469 | case NETDEV_FEAT_CHANGE: | ||
470 | /* Propagate device features to underlying device */ | ||
471 | for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) { | ||
472 | vlandev = vlan_group_get_device(grp, i); | ||
473 | if (!vlandev) | ||
474 | continue; | ||
475 | |||
476 | vlan_transfer_features(dev, vlandev); | ||
477 | } | ||
478 | |||
479 | break; | ||
480 | |||
453 | case NETDEV_DOWN: | 481 | case NETDEV_DOWN: |
454 | /* Put all VLANs for this dev in the down state too. */ | 482 | /* Put all VLANs for this dev in the down state too. */ |
455 | for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) { | 483 | for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) { |
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index 5229a72c7ea1..79625696e86a 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h | |||
@@ -7,6 +7,8 @@ | |||
7 | #define VLAN_GRP_HASH_SIZE (1 << VLAN_GRP_HASH_SHIFT) | 7 | #define VLAN_GRP_HASH_SIZE (1 << VLAN_GRP_HASH_SHIFT) |
8 | #define VLAN_GRP_HASH_MASK (VLAN_GRP_HASH_SIZE - 1) | 8 | #define VLAN_GRP_HASH_MASK (VLAN_GRP_HASH_SIZE - 1) |
9 | 9 | ||
10 | #define VLAN_TSO_FEATURES (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG) | ||
11 | |||
10 | /* Find a VLAN device by the MAC address of its Ethernet device, and | 12 | /* Find a VLAN device by the MAC address of its Ethernet device, and |
11 | * it's VLAN ID. The default configuration is to have VLAN's scope | 13 | * it's VLAN ID. The default configuration is to have VLAN's scope |
12 | * to be box-wide, so the MAC will be ignored. The mac will only be | 14 | * to be box-wide, so the MAC will be ignored. The mac will only be |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index c961f0826005..b1cfbaa88db2 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -663,6 +663,11 @@ static int vlan_dev_init(struct net_device *dev) | |||
663 | (1<<__LINK_STATE_DORMANT))) | | 663 | (1<<__LINK_STATE_DORMANT))) | |
664 | (1<<__LINK_STATE_PRESENT); | 664 | (1<<__LINK_STATE_PRESENT); |
665 | 665 | ||
666 | if (real_dev->features & NETIF_F_VLAN_TSO) | ||
667 | dev->features |= real_dev->features & VLAN_TSO_FEATURES; | ||
668 | if (real_dev->features & NETIF_F_VLAN_CSUM) | ||
669 | dev->features |= real_dev->features & NETIF_F_ALL_CSUM; | ||
670 | |||
666 | /* ipv6 shared card related stuff */ | 671 | /* ipv6 shared card related stuff */ |
667 | dev->dev_id = real_dev->dev_id; | 672 | dev->dev_id = real_dev->dev_id; |
668 | 673 | ||
diff --git a/net/core/dev.c b/net/core/dev.c index a1607bc0cd4c..582963077877 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -903,7 +903,11 @@ int dev_change_name(struct net_device *dev, char *newname) | |||
903 | strlcpy(dev->name, newname, IFNAMSIZ); | 903 | strlcpy(dev->name, newname, IFNAMSIZ); |
904 | 904 | ||
905 | rollback: | 905 | rollback: |
906 | device_rename(&dev->dev, dev->name); | 906 | err = device_rename(&dev->dev, dev->name); |
907 | if (err) { | ||
908 | memcpy(dev->name, oldname, IFNAMSIZ); | ||
909 | return err; | ||
910 | } | ||
907 | 911 | ||
908 | write_lock_bh(&dev_base_lock); | 912 | write_lock_bh(&dev_base_lock); |
909 | hlist_del(&dev->name_hlist); | 913 | hlist_del(&dev->name_hlist); |
@@ -3137,7 +3141,7 @@ int dev_change_flags(struct net_device *dev, unsigned flags) | |||
3137 | * Load in the correct multicast list now the flags have changed. | 3141 | * Load in the correct multicast list now the flags have changed. |
3138 | */ | 3142 | */ |
3139 | 3143 | ||
3140 | if (dev->change_rx_flags && (dev->flags ^ flags) & IFF_MULTICAST) | 3144 | if (dev->change_rx_flags && (old_flags ^ flags) & IFF_MULTICAST) |
3141 | dev->change_rx_flags(dev, IFF_MULTICAST); | 3145 | dev->change_rx_flags(dev, IFF_MULTICAST); |
3142 | 3146 | ||
3143 | dev_set_rx_mode(dev); | 3147 | dev_set_rx_mode(dev); |
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 8dca21110493..fdf537707e51 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -390,6 +390,7 @@ struct pktgen_thread { | |||
390 | int cpu; | 390 | int cpu; |
391 | 391 | ||
392 | wait_queue_head_t queue; | 392 | wait_queue_head_t queue; |
393 | struct completion start_done; | ||
393 | }; | 394 | }; |
394 | 395 | ||
395 | #define REMOVE 1 | 396 | #define REMOVE 1 |
@@ -3414,6 +3415,7 @@ static int pktgen_thread_worker(void *arg) | |||
3414 | BUG_ON(smp_processor_id() != cpu); | 3415 | BUG_ON(smp_processor_id() != cpu); |
3415 | 3416 | ||
3416 | init_waitqueue_head(&t->queue); | 3417 | init_waitqueue_head(&t->queue); |
3418 | complete(&t->start_done); | ||
3417 | 3419 | ||
3418 | pr_debug("pktgen: starting pktgen/%d: pid=%d\n", cpu, task_pid_nr(current)); | 3420 | pr_debug("pktgen: starting pktgen/%d: pid=%d\n", cpu, task_pid_nr(current)); |
3419 | 3421 | ||
@@ -3615,6 +3617,7 @@ static int __init pktgen_create_thread(int cpu) | |||
3615 | INIT_LIST_HEAD(&t->if_list); | 3617 | INIT_LIST_HEAD(&t->if_list); |
3616 | 3618 | ||
3617 | list_add_tail(&t->th_list, &pktgen_threads); | 3619 | list_add_tail(&t->th_list, &pktgen_threads); |
3620 | init_completion(&t->start_done); | ||
3618 | 3621 | ||
3619 | p = kthread_create(pktgen_thread_worker, t, "kpktgend_%d", cpu); | 3622 | p = kthread_create(pktgen_thread_worker, t, "kpktgend_%d", cpu); |
3620 | if (IS_ERR(p)) { | 3623 | if (IS_ERR(p)) { |
@@ -3639,6 +3642,7 @@ static int __init pktgen_create_thread(int cpu) | |||
3639 | } | 3642 | } |
3640 | 3643 | ||
3641 | wake_up_process(p); | 3644 | wake_up_process(p); |
3645 | wait_for_completion(&t->start_done); | ||
3642 | 3646 | ||
3643 | return 0; | 3647 | return 0; |
3644 | } | 3648 | } |
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 418862f1bf22..9b539fa9fe18 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -1288,7 +1288,6 @@ static void arp_format_neigh_entry(struct seq_file *seq, | |||
1288 | struct neighbour *n) | 1288 | struct neighbour *n) |
1289 | { | 1289 | { |
1290 | char hbuffer[HBUFFERLEN]; | 1290 | char hbuffer[HBUFFERLEN]; |
1291 | const char hexbuf[] = "0123456789ABCDEF"; | ||
1292 | int k, j; | 1291 | int k, j; |
1293 | char tbuf[16]; | 1292 | char tbuf[16]; |
1294 | struct net_device *dev = n->dev; | 1293 | struct net_device *dev = n->dev; |
@@ -1302,8 +1301,8 @@ static void arp_format_neigh_entry(struct seq_file *seq, | |||
1302 | else { | 1301 | else { |
1303 | #endif | 1302 | #endif |
1304 | for (k = 0, j = 0; k < HBUFFERLEN - 3 && j < dev->addr_len; j++) { | 1303 | for (k = 0, j = 0; k < HBUFFERLEN - 3 && j < dev->addr_len; j++) { |
1305 | hbuffer[k++] = hexbuf[(n->ha[j] >> 4) & 15]; | 1304 | hbuffer[k++] = hex_asc_hi(n->ha[j]); |
1306 | hbuffer[k++] = hexbuf[n->ha[j] & 15]; | 1305 | hbuffer[k++] = hex_asc_lo(n->ha[j]); |
1307 | hbuffer[k++] = ':'; | 1306 | hbuffer[k++] = ':'; |
1308 | } | 1307 | } |
1309 | hbuffer[--k] = 0; | 1308 | hbuffer[--k] = 0; |
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 2ada033406de..4342cba4ff82 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -313,9 +313,8 @@ static void ipgre_tunnel_uninit(struct net_device *dev) | |||
313 | 313 | ||
314 | static void ipgre_err(struct sk_buff *skb, u32 info) | 314 | static void ipgre_err(struct sk_buff *skb, u32 info) |
315 | { | 315 | { |
316 | #ifndef I_WISH_WORLD_WERE_PERFECT | ||
317 | 316 | ||
318 | /* It is not :-( All the routers (except for Linux) return only | 317 | /* All the routers (except for Linux) return only |
319 | 8 bytes of packet payload. It means, that precise relaying of | 318 | 8 bytes of packet payload. It means, that precise relaying of |
320 | ICMP in the real Internet is absolutely infeasible. | 319 | ICMP in the real Internet is absolutely infeasible. |
321 | 320 | ||
@@ -398,149 +397,6 @@ static void ipgre_err(struct sk_buff *skb, u32 info) | |||
398 | out: | 397 | out: |
399 | read_unlock(&ipgre_lock); | 398 | read_unlock(&ipgre_lock); |
400 | return; | 399 | return; |
401 | #else | ||
402 | struct iphdr *iph = (struct iphdr*)dp; | ||
403 | struct iphdr *eiph; | ||
404 | __be16 *p = (__be16*)(dp+(iph->ihl<<2)); | ||
405 | const int type = icmp_hdr(skb)->type; | ||
406 | const int code = icmp_hdr(skb)->code; | ||
407 | int rel_type = 0; | ||
408 | int rel_code = 0; | ||
409 | __be32 rel_info = 0; | ||
410 | __u32 n = 0; | ||
411 | __be16 flags; | ||
412 | int grehlen = (iph->ihl<<2) + 4; | ||
413 | struct sk_buff *skb2; | ||
414 | struct flowi fl; | ||
415 | struct rtable *rt; | ||
416 | |||
417 | if (p[1] != htons(ETH_P_IP)) | ||
418 | return; | ||
419 | |||
420 | flags = p[0]; | ||
421 | if (flags&(GRE_CSUM|GRE_KEY|GRE_SEQ|GRE_ROUTING|GRE_VERSION)) { | ||
422 | if (flags&(GRE_VERSION|GRE_ROUTING)) | ||
423 | return; | ||
424 | if (flags&GRE_CSUM) | ||
425 | grehlen += 4; | ||
426 | if (flags&GRE_KEY) | ||
427 | grehlen += 4; | ||
428 | if (flags&GRE_SEQ) | ||
429 | grehlen += 4; | ||
430 | } | ||
431 | if (len < grehlen + sizeof(struct iphdr)) | ||
432 | return; | ||
433 | eiph = (struct iphdr*)(dp + grehlen); | ||
434 | |||
435 | switch (type) { | ||
436 | default: | ||
437 | return; | ||
438 | case ICMP_PARAMETERPROB: | ||
439 | n = ntohl(icmp_hdr(skb)->un.gateway) >> 24; | ||
440 | if (n < (iph->ihl<<2)) | ||
441 | return; | ||
442 | |||
443 | /* So... This guy found something strange INSIDE encapsulated | ||
444 | packet. Well, he is fool, but what can we do ? | ||
445 | */ | ||
446 | rel_type = ICMP_PARAMETERPROB; | ||
447 | n -= grehlen; | ||
448 | rel_info = htonl(n << 24); | ||
449 | break; | ||
450 | |||
451 | case ICMP_DEST_UNREACH: | ||
452 | switch (code) { | ||
453 | case ICMP_SR_FAILED: | ||
454 | case ICMP_PORT_UNREACH: | ||
455 | /* Impossible event. */ | ||
456 | return; | ||
457 | case ICMP_FRAG_NEEDED: | ||
458 | /* And it is the only really necessary thing :-) */ | ||
459 | n = ntohs(icmp_hdr(skb)->un.frag.mtu); | ||
460 | if (n < grehlen+68) | ||
461 | return; | ||
462 | n -= grehlen; | ||
463 | /* BSD 4.2 MORE DOES NOT EXIST IN NATURE. */ | ||
464 | if (n > ntohs(eiph->tot_len)) | ||
465 | return; | ||
466 | rel_info = htonl(n); | ||
467 | break; | ||
468 | default: | ||
469 | /* All others are translated to HOST_UNREACH. | ||
470 | rfc2003 contains "deep thoughts" about NET_UNREACH, | ||
471 | I believe, it is just ether pollution. --ANK | ||
472 | */ | ||
473 | rel_type = ICMP_DEST_UNREACH; | ||
474 | rel_code = ICMP_HOST_UNREACH; | ||
475 | break; | ||
476 | } | ||
477 | break; | ||
478 | case ICMP_TIME_EXCEEDED: | ||
479 | if (code != ICMP_EXC_TTL) | ||
480 | return; | ||
481 | break; | ||
482 | } | ||
483 | |||
484 | /* Prepare fake skb to feed it to icmp_send */ | ||
485 | skb2 = skb_clone(skb, GFP_ATOMIC); | ||
486 | if (skb2 == NULL) | ||
487 | return; | ||
488 | dst_release(skb2->dst); | ||
489 | skb2->dst = NULL; | ||
490 | skb_pull(skb2, skb->data - (u8*)eiph); | ||
491 | skb_reset_network_header(skb2); | ||
492 | |||
493 | /* Try to guess incoming interface */ | ||
494 | memset(&fl, 0, sizeof(fl)); | ||
495 | fl.fl4_dst = eiph->saddr; | ||
496 | fl.fl4_tos = RT_TOS(eiph->tos); | ||
497 | fl.proto = IPPROTO_GRE; | ||
498 | if (ip_route_output_key(dev_net(skb->dev), &rt, &fl)) { | ||
499 | kfree_skb(skb2); | ||
500 | return; | ||
501 | } | ||
502 | skb2->dev = rt->u.dst.dev; | ||
503 | |||
504 | /* route "incoming" packet */ | ||
505 | if (rt->rt_flags&RTCF_LOCAL) { | ||
506 | ip_rt_put(rt); | ||
507 | rt = NULL; | ||
508 | fl.fl4_dst = eiph->daddr; | ||
509 | fl.fl4_src = eiph->saddr; | ||
510 | fl.fl4_tos = eiph->tos; | ||
511 | if (ip_route_output_key(dev_net(skb->dev), &rt, &fl) || | ||
512 | rt->u.dst.dev->type != ARPHRD_IPGRE) { | ||
513 | ip_rt_put(rt); | ||
514 | kfree_skb(skb2); | ||
515 | return; | ||
516 | } | ||
517 | } else { | ||
518 | ip_rt_put(rt); | ||
519 | if (ip_route_input(skb2, eiph->daddr, eiph->saddr, eiph->tos, skb2->dev) || | ||
520 | skb2->dst->dev->type != ARPHRD_IPGRE) { | ||
521 | kfree_skb(skb2); | ||
522 | return; | ||
523 | } | ||
524 | } | ||
525 | |||
526 | /* change mtu on this route */ | ||
527 | if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { | ||
528 | if (n > dst_mtu(skb2->dst)) { | ||
529 | kfree_skb(skb2); | ||
530 | return; | ||
531 | } | ||
532 | skb2->dst->ops->update_pmtu(skb2->dst, n); | ||
533 | } else if (type == ICMP_TIME_EXCEEDED) { | ||
534 | struct ip_tunnel *t = netdev_priv(skb2->dev); | ||
535 | if (t->parms.iph.ttl) { | ||
536 | rel_type = ICMP_DEST_UNREACH; | ||
537 | rel_code = ICMP_HOST_UNREACH; | ||
538 | } | ||
539 | } | ||
540 | |||
541 | icmp_send(skb2, rel_type, rel_code, rel_info); | ||
542 | kfree_skb(skb2); | ||
543 | #endif | ||
544 | } | 400 | } |
545 | 401 | ||
546 | static inline void ipgre_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb) | 402 | static inline void ipgre_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb) |
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 149111f08e8d..af5cb53da5cc 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -278,9 +278,8 @@ static void ipip_tunnel_uninit(struct net_device *dev) | |||
278 | 278 | ||
279 | static int ipip_err(struct sk_buff *skb, u32 info) | 279 | static int ipip_err(struct sk_buff *skb, u32 info) |
280 | { | 280 | { |
281 | #ifndef I_WISH_WORLD_WERE_PERFECT | ||
282 | 281 | ||
283 | /* It is not :-( All the routers (except for Linux) return only | 282 | /* All the routers (except for Linux) return only |
284 | 8 bytes of packet payload. It means, that precise relaying of | 283 | 8 bytes of packet payload. It means, that precise relaying of |
285 | ICMP in the real Internet is absolutely infeasible. | 284 | ICMP in the real Internet is absolutely infeasible. |
286 | */ | 285 | */ |
@@ -337,133 +336,6 @@ static int ipip_err(struct sk_buff *skb, u32 info) | |||
337 | out: | 336 | out: |
338 | read_unlock(&ipip_lock); | 337 | read_unlock(&ipip_lock); |
339 | return err; | 338 | return err; |
340 | #else | ||
341 | struct iphdr *iph = (struct iphdr*)dp; | ||
342 | int hlen = iph->ihl<<2; | ||
343 | struct iphdr *eiph; | ||
344 | const int type = icmp_hdr(skb)->type; | ||
345 | const int code = icmp_hdr(skb)->code; | ||
346 | int rel_type = 0; | ||
347 | int rel_code = 0; | ||
348 | __be32 rel_info = 0; | ||
349 | __u32 n = 0; | ||
350 | struct sk_buff *skb2; | ||
351 | struct flowi fl; | ||
352 | struct rtable *rt; | ||
353 | |||
354 | if (len < hlen + sizeof(struct iphdr)) | ||
355 | return 0; | ||
356 | eiph = (struct iphdr*)(dp + hlen); | ||
357 | |||
358 | switch (type) { | ||
359 | default: | ||
360 | return 0; | ||
361 | case ICMP_PARAMETERPROB: | ||
362 | n = ntohl(icmp_hdr(skb)->un.gateway) >> 24; | ||
363 | if (n < hlen) | ||
364 | return 0; | ||
365 | |||
366 | /* So... This guy found something strange INSIDE encapsulated | ||
367 | packet. Well, he is fool, but what can we do ? | ||
368 | */ | ||
369 | rel_type = ICMP_PARAMETERPROB; | ||
370 | rel_info = htonl((n - hlen) << 24); | ||
371 | break; | ||
372 | |||
373 | case ICMP_DEST_UNREACH: | ||
374 | switch (code) { | ||
375 | case ICMP_SR_FAILED: | ||
376 | case ICMP_PORT_UNREACH: | ||
377 | /* Impossible event. */ | ||
378 | return 0; | ||
379 | case ICMP_FRAG_NEEDED: | ||
380 | /* And it is the only really necessary thing :-) */ | ||
381 | n = ntohs(icmp_hdr(skb)->un.frag.mtu); | ||
382 | if (n < hlen+68) | ||
383 | return 0; | ||
384 | n -= hlen; | ||
385 | /* BSD 4.2 MORE DOES NOT EXIST IN NATURE. */ | ||
386 | if (n > ntohs(eiph->tot_len)) | ||
387 | return 0; | ||
388 | rel_info = htonl(n); | ||
389 | break; | ||
390 | default: | ||
391 | /* All others are translated to HOST_UNREACH. | ||
392 | rfc2003 contains "deep thoughts" about NET_UNREACH, | ||
393 | I believe, it is just ether pollution. --ANK | ||
394 | */ | ||
395 | rel_type = ICMP_DEST_UNREACH; | ||
396 | rel_code = ICMP_HOST_UNREACH; | ||
397 | break; | ||
398 | } | ||
399 | break; | ||
400 | case ICMP_TIME_EXCEEDED: | ||
401 | if (code != ICMP_EXC_TTL) | ||
402 | return 0; | ||
403 | break; | ||
404 | } | ||
405 | |||
406 | /* Prepare fake skb to feed it to icmp_send */ | ||
407 | skb2 = skb_clone(skb, GFP_ATOMIC); | ||
408 | if (skb2 == NULL) | ||
409 | return 0; | ||
410 | dst_release(skb2->dst); | ||
411 | skb2->dst = NULL; | ||
412 | skb_pull(skb2, skb->data - (u8*)eiph); | ||
413 | skb_reset_network_header(skb2); | ||
414 | |||
415 | /* Try to guess incoming interface */ | ||
416 | memset(&fl, 0, sizeof(fl)); | ||
417 | fl.fl4_daddr = eiph->saddr; | ||
418 | fl.fl4_tos = RT_TOS(eiph->tos); | ||
419 | fl.proto = IPPROTO_IPIP; | ||
420 | if (ip_route_output_key(dev_net(skb->dev), &rt, &key)) { | ||
421 | kfree_skb(skb2); | ||
422 | return 0; | ||
423 | } | ||
424 | skb2->dev = rt->u.dst.dev; | ||
425 | |||
426 | /* route "incoming" packet */ | ||
427 | if (rt->rt_flags&RTCF_LOCAL) { | ||
428 | ip_rt_put(rt); | ||
429 | rt = NULL; | ||
430 | fl.fl4_daddr = eiph->daddr; | ||
431 | fl.fl4_src = eiph->saddr; | ||
432 | fl.fl4_tos = eiph->tos; | ||
433 | if (ip_route_output_key(dev_net(skb->dev), &rt, &fl) || | ||
434 | rt->u.dst.dev->type != ARPHRD_TUNNEL) { | ||
435 | ip_rt_put(rt); | ||
436 | kfree_skb(skb2); | ||
437 | return 0; | ||
438 | } | ||
439 | } else { | ||
440 | ip_rt_put(rt); | ||
441 | if (ip_route_input(skb2, eiph->daddr, eiph->saddr, eiph->tos, skb2->dev) || | ||
442 | skb2->dst->dev->type != ARPHRD_TUNNEL) { | ||
443 | kfree_skb(skb2); | ||
444 | return 0; | ||
445 | } | ||
446 | } | ||
447 | |||
448 | /* change mtu on this route */ | ||
449 | if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { | ||
450 | if (n > dst_mtu(skb2->dst)) { | ||
451 | kfree_skb(skb2); | ||
452 | return 0; | ||
453 | } | ||
454 | skb2->dst->ops->update_pmtu(skb2->dst, n); | ||
455 | } else if (type == ICMP_TIME_EXCEEDED) { | ||
456 | struct ip_tunnel *t = netdev_priv(skb2->dev); | ||
457 | if (t->parms.iph.ttl) { | ||
458 | rel_type = ICMP_DEST_UNREACH; | ||
459 | rel_code = ICMP_HOST_UNREACH; | ||
460 | } | ||
461 | } | ||
462 | |||
463 | icmp_send(skb2, rel_type, rel_code, rel_info); | ||
464 | kfree_skb(skb2); | ||
465 | return 0; | ||
466 | #endif | ||
467 | } | 339 | } |
468 | 340 | ||
469 | static inline void ipip_ecn_decapsulate(const struct iphdr *outer_iph, | 341 | static inline void ipip_ecn_decapsulate(const struct iphdr *outer_iph, |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 92f90ae46f4a..df41026b60db 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -160,7 +160,7 @@ static struct dst_ops ipv4_dst_ops = { | |||
160 | .negative_advice = ipv4_negative_advice, | 160 | .negative_advice = ipv4_negative_advice, |
161 | .link_failure = ipv4_link_failure, | 161 | .link_failure = ipv4_link_failure, |
162 | .update_pmtu = ip_rt_update_pmtu, | 162 | .update_pmtu = ip_rt_update_pmtu, |
163 | .local_out = ip_local_out, | 163 | .local_out = __ip_local_out, |
164 | .entry_size = sizeof(struct rtable), | 164 | .entry_size = sizeof(struct rtable), |
165 | .entries = ATOMIC_INIT(0), | 165 | .entries = ATOMIC_INIT(0), |
166 | }; | 166 | }; |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index debf23581606..e399bde7813a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1836,7 +1836,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) | |||
1836 | { | 1836 | { |
1837 | struct tcp_sock *tp = tcp_sk(sk); | 1837 | struct tcp_sock *tp = tcp_sk(sk); |
1838 | struct inet_connection_sock *icsk = inet_csk(sk); | 1838 | struct inet_connection_sock *icsk = inet_csk(sk); |
1839 | unsigned int cur_mss = tcp_current_mss(sk, 0); | 1839 | unsigned int cur_mss; |
1840 | int err; | 1840 | int err; |
1841 | 1841 | ||
1842 | /* Inconslusive MTU probe */ | 1842 | /* Inconslusive MTU probe */ |
@@ -1858,6 +1858,11 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) | |||
1858 | return -ENOMEM; | 1858 | return -ENOMEM; |
1859 | } | 1859 | } |
1860 | 1860 | ||
1861 | if (inet_csk(sk)->icsk_af_ops->rebuild_header(sk)) | ||
1862 | return -EHOSTUNREACH; /* Routing failure or similar. */ | ||
1863 | |||
1864 | cur_mss = tcp_current_mss(sk, 0); | ||
1865 | |||
1861 | /* If receiver has shrunk his window, and skb is out of | 1866 | /* If receiver has shrunk his window, and skb is out of |
1862 | * new window, do not retransmit it. The exception is the | 1867 | * new window, do not retransmit it. The exception is the |
1863 | * case, when window is shrunk to zero. In this case | 1868 | * case, when window is shrunk to zero. In this case |
@@ -1884,9 +1889,6 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) | |||
1884 | (sysctl_tcp_retrans_collapse != 0)) | 1889 | (sysctl_tcp_retrans_collapse != 0)) |
1885 | tcp_retrans_try_collapse(sk, skb, cur_mss); | 1890 | tcp_retrans_try_collapse(sk, skb, cur_mss); |
1886 | 1891 | ||
1887 | if (inet_csk(sk)->icsk_af_ops->rebuild_header(sk)) | ||
1888 | return -EHOSTUNREACH; /* Routing failure or similar. */ | ||
1889 | |||
1890 | /* Some Solaris stacks overoptimize and ignore the FIN on a | 1892 | /* Some Solaris stacks overoptimize and ignore the FIN on a |
1891 | * retransmit when old data is attached. So strip it off | 1893 | * retransmit when old data is attached. So strip it off |
1892 | * since it is cheap to do so and saves bytes on the network. | 1894 | * since it is cheap to do so and saves bytes on the network. |
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index e591e09e5e4e..3a835578fd1c 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -1764,14 +1764,16 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len) | |||
1764 | * 2) Configure prefixes with the auto flag set | 1764 | * 2) Configure prefixes with the auto flag set |
1765 | */ | 1765 | */ |
1766 | 1766 | ||
1767 | /* Avoid arithmetic overflow. Really, we could | 1767 | if (valid_lft == INFINITY_LIFE_TIME) |
1768 | save rt_expires in seconds, likely valid_lft, | 1768 | rt_expires = ~0UL; |
1769 | but it would require division in fib gc, that it | 1769 | else if (valid_lft >= 0x7FFFFFFF/HZ) { |
1770 | not good. | 1770 | /* Avoid arithmetic overflow. Really, we could |
1771 | */ | 1771 | * save rt_expires in seconds, likely valid_lft, |
1772 | if (valid_lft >= 0x7FFFFFFF/HZ) | 1772 | * but it would require division in fib gc, that it |
1773 | * not good. | ||
1774 | */ | ||
1773 | rt_expires = 0x7FFFFFFF - (0x7FFFFFFF % HZ); | 1775 | rt_expires = 0x7FFFFFFF - (0x7FFFFFFF % HZ); |
1774 | else | 1776 | } else |
1775 | rt_expires = valid_lft * HZ; | 1777 | rt_expires = valid_lft * HZ; |
1776 | 1778 | ||
1777 | /* | 1779 | /* |
@@ -1779,7 +1781,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len) | |||
1779 | * Avoid arithmetic overflow there as well. | 1781 | * Avoid arithmetic overflow there as well. |
1780 | * Overflow can happen only if HZ < USER_HZ. | 1782 | * Overflow can happen only if HZ < USER_HZ. |
1781 | */ | 1783 | */ |
1782 | if (HZ < USER_HZ && rt_expires > 0x7FFFFFFF / USER_HZ) | 1784 | if (HZ < USER_HZ && ~rt_expires && rt_expires > 0x7FFFFFFF / USER_HZ) |
1783 | rt_expires = 0x7FFFFFFF / USER_HZ; | 1785 | rt_expires = 0x7FFFFFFF / USER_HZ; |
1784 | 1786 | ||
1785 | if (pinfo->onlink) { | 1787 | if (pinfo->onlink) { |
@@ -1788,17 +1790,28 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len) | |||
1788 | dev->ifindex, 1); | 1790 | dev->ifindex, 1); |
1789 | 1791 | ||
1790 | if (rt && ((rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0)) { | 1792 | if (rt && ((rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0)) { |
1791 | if (rt->rt6i_flags&RTF_EXPIRES) { | 1793 | /* Autoconf prefix route */ |
1792 | if (valid_lft == 0) { | 1794 | if (valid_lft == 0) { |
1793 | ip6_del_rt(rt); | 1795 | ip6_del_rt(rt); |
1794 | rt = NULL; | 1796 | rt = NULL; |
1795 | } else { | 1797 | } else if (~rt_expires) { |
1796 | rt->rt6i_expires = jiffies + rt_expires; | 1798 | /* not infinity */ |
1797 | } | 1799 | rt->rt6i_expires = jiffies + rt_expires; |
1800 | rt->rt6i_flags |= RTF_EXPIRES; | ||
1801 | } else { | ||
1802 | rt->rt6i_flags &= ~RTF_EXPIRES; | ||
1803 | rt->rt6i_expires = 0; | ||
1798 | } | 1804 | } |
1799 | } else if (valid_lft) { | 1805 | } else if (valid_lft) { |
1806 | int flags = RTF_ADDRCONF | RTF_PREFIX_RT; | ||
1807 | clock_t expires = 0; | ||
1808 | if (~rt_expires) { | ||
1809 | /* not infinity */ | ||
1810 | flags |= RTF_EXPIRES; | ||
1811 | expires = jiffies_to_clock_t(rt_expires); | ||
1812 | } | ||
1800 | addrconf_prefix_route(&pinfo->prefix, pinfo->prefix_len, | 1813 | addrconf_prefix_route(&pinfo->prefix, pinfo->prefix_len, |
1801 | dev, jiffies_to_clock_t(rt_expires), RTF_ADDRCONF|RTF_EXPIRES|RTF_PREFIX_RT); | 1814 | dev, expires, flags); |
1802 | } | 1815 | } |
1803 | if (rt) | 1816 | if (rt) |
1804 | dst_release(&rt->u.dst); | 1817 | dst_release(&rt->u.dst); |
@@ -2021,7 +2034,8 @@ static int inet6_addr_add(struct net *net, int ifindex, struct in6_addr *pfx, | |||
2021 | struct inet6_dev *idev; | 2034 | struct inet6_dev *idev; |
2022 | struct net_device *dev; | 2035 | struct net_device *dev; |
2023 | int scope; | 2036 | int scope; |
2024 | u32 flags = RTF_EXPIRES; | 2037 | u32 flags; |
2038 | clock_t expires; | ||
2025 | 2039 | ||
2026 | ASSERT_RTNL(); | 2040 | ASSERT_RTNL(); |
2027 | 2041 | ||
@@ -2041,8 +2055,13 @@ static int inet6_addr_add(struct net *net, int ifindex, struct in6_addr *pfx, | |||
2041 | if (valid_lft == INFINITY_LIFE_TIME) { | 2055 | if (valid_lft == INFINITY_LIFE_TIME) { |
2042 | ifa_flags |= IFA_F_PERMANENT; | 2056 | ifa_flags |= IFA_F_PERMANENT; |
2043 | flags = 0; | 2057 | flags = 0; |
2044 | } else if (valid_lft >= 0x7FFFFFFF/HZ) | 2058 | expires = 0; |
2045 | valid_lft = 0x7FFFFFFF/HZ; | 2059 | } else { |
2060 | if (valid_lft >= 0x7FFFFFFF/HZ) | ||
2061 | valid_lft = 0x7FFFFFFF/HZ; | ||
2062 | flags = RTF_EXPIRES; | ||
2063 | expires = jiffies_to_clock_t(valid_lft * HZ); | ||
2064 | } | ||
2046 | 2065 | ||
2047 | if (prefered_lft == 0) | 2066 | if (prefered_lft == 0) |
2048 | ifa_flags |= IFA_F_DEPRECATED; | 2067 | ifa_flags |= IFA_F_DEPRECATED; |
@@ -2060,7 +2079,7 @@ static int inet6_addr_add(struct net *net, int ifindex, struct in6_addr *pfx, | |||
2060 | spin_unlock_bh(&ifp->lock); | 2079 | spin_unlock_bh(&ifp->lock); |
2061 | 2080 | ||
2062 | addrconf_prefix_route(&ifp->addr, ifp->prefix_len, dev, | 2081 | addrconf_prefix_route(&ifp->addr, ifp->prefix_len, dev, |
2063 | jiffies_to_clock_t(valid_lft * HZ), flags); | 2082 | expires, flags); |
2064 | /* | 2083 | /* |
2065 | * Note that section 3.1 of RFC 4429 indicates | 2084 | * Note that section 3.1 of RFC 4429 indicates |
2066 | * that the Optimistic flag should not be set for | 2085 | * that the Optimistic flag should not be set for |
@@ -3148,7 +3167,8 @@ inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
3148 | static int inet6_addr_modify(struct inet6_ifaddr *ifp, u8 ifa_flags, | 3167 | static int inet6_addr_modify(struct inet6_ifaddr *ifp, u8 ifa_flags, |
3149 | u32 prefered_lft, u32 valid_lft) | 3168 | u32 prefered_lft, u32 valid_lft) |
3150 | { | 3169 | { |
3151 | u32 flags = RTF_EXPIRES; | 3170 | u32 flags; |
3171 | clock_t expires; | ||
3152 | 3172 | ||
3153 | if (!valid_lft || (prefered_lft > valid_lft)) | 3173 | if (!valid_lft || (prefered_lft > valid_lft)) |
3154 | return -EINVAL; | 3174 | return -EINVAL; |
@@ -3156,8 +3176,13 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, u8 ifa_flags, | |||
3156 | if (valid_lft == INFINITY_LIFE_TIME) { | 3176 | if (valid_lft == INFINITY_LIFE_TIME) { |
3157 | ifa_flags |= IFA_F_PERMANENT; | 3177 | ifa_flags |= IFA_F_PERMANENT; |
3158 | flags = 0; | 3178 | flags = 0; |
3159 | } else if (valid_lft >= 0x7FFFFFFF/HZ) | 3179 | expires = 0; |
3160 | valid_lft = 0x7FFFFFFF/HZ; | 3180 | } else { |
3181 | if (valid_lft >= 0x7FFFFFFF/HZ) | ||
3182 | valid_lft = 0x7FFFFFFF/HZ; | ||
3183 | flags = RTF_EXPIRES; | ||
3184 | expires = jiffies_to_clock_t(valid_lft * HZ); | ||
3185 | } | ||
3161 | 3186 | ||
3162 | if (prefered_lft == 0) | 3187 | if (prefered_lft == 0) |
3163 | ifa_flags |= IFA_F_DEPRECATED; | 3188 | ifa_flags |= IFA_F_DEPRECATED; |
@@ -3176,7 +3201,7 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, u8 ifa_flags, | |||
3176 | ipv6_ifa_notify(0, ifp); | 3201 | ipv6_ifa_notify(0, ifp); |
3177 | 3202 | ||
3178 | addrconf_prefix_route(&ifp->addr, ifp->prefix_len, ifp->idev->dev, | 3203 | addrconf_prefix_route(&ifp->addr, ifp->prefix_len, ifp->idev->dev, |
3179 | jiffies_to_clock_t(valid_lft * HZ), flags); | 3204 | expires, flags); |
3180 | addrconf_verify(0); | 3205 | addrconf_verify(0); |
3181 | 3206 | ||
3182 | return 0; | 3207 | return 0; |
@@ -4242,7 +4267,7 @@ static void addrconf_sysctl_register(struct inet6_dev *idev) | |||
4242 | neigh_sysctl_register(idev->dev, idev->nd_parms, NET_IPV6, | 4267 | neigh_sysctl_register(idev->dev, idev->nd_parms, NET_IPV6, |
4243 | NET_IPV6_NEIGH, "ipv6", | 4268 | NET_IPV6_NEIGH, "ipv6", |
4244 | &ndisc_ifinfo_sysctl_change, | 4269 | &ndisc_ifinfo_sysctl_change, |
4245 | NULL); | 4270 | ndisc_ifinfo_sysctl_strategy); |
4246 | __addrconf_sysctl_register(dev_net(idev->dev), idev->dev->name, | 4271 | __addrconf_sysctl_register(dev_net(idev->dev), idev->dev->name, |
4247 | idev->dev->ifindex, idev, &idev->cnf); | 4272 | idev->dev->ifindex, idev, &idev->cnf); |
4248 | } | 4273 | } |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index a55fc05b8125..282fdb31f8ed 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -1727,10 +1727,10 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * f | |||
1727 | return ret; | 1727 | return ret; |
1728 | } | 1728 | } |
1729 | 1729 | ||
1730 | static int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name, | 1730 | int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name, |
1731 | int nlen, void __user *oldval, | 1731 | int nlen, void __user *oldval, |
1732 | size_t __user *oldlenp, | 1732 | size_t __user *oldlenp, |
1733 | void __user *newval, size_t newlen) | 1733 | void __user *newval, size_t newlen) |
1734 | { | 1734 | { |
1735 | struct net_device *dev = ctl->extra1; | 1735 | struct net_device *dev = ctl->extra1; |
1736 | struct inet6_dev *idev; | 1736 | struct inet6_dev *idev; |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 12bba0880345..48534c6c0735 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -109,7 +109,7 @@ static struct dst_ops ip6_dst_ops_template = { | |||
109 | .negative_advice = ip6_negative_advice, | 109 | .negative_advice = ip6_negative_advice, |
110 | .link_failure = ip6_link_failure, | 110 | .link_failure = ip6_link_failure, |
111 | .update_pmtu = ip6_rt_update_pmtu, | 111 | .update_pmtu = ip6_rt_update_pmtu, |
112 | .local_out = ip6_local_out, | 112 | .local_out = __ip6_local_out, |
113 | .entry_size = sizeof(struct rt6_info), | 113 | .entry_size = sizeof(struct rt6_info), |
114 | .entries = ATOMIC_INIT(0), | 114 | .entries = ATOMIC_INIT(0), |
115 | }; | 115 | }; |
@@ -475,7 +475,7 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, | |||
475 | lifetime = ntohl(rinfo->lifetime); | 475 | lifetime = ntohl(rinfo->lifetime); |
476 | if (lifetime == 0xffffffff) { | 476 | if (lifetime == 0xffffffff) { |
477 | /* infinity */ | 477 | /* infinity */ |
478 | } else if (lifetime > 0x7fffffff/HZ) { | 478 | } else if (lifetime > 0x7fffffff/HZ - 1) { |
479 | /* Avoid arithmetic overflow */ | 479 | /* Avoid arithmetic overflow */ |
480 | lifetime = 0x7fffffff/HZ - 1; | 480 | lifetime = 0x7fffffff/HZ - 1; |
481 | } | 481 | } |
@@ -1106,7 +1106,9 @@ int ip6_route_add(struct fib6_config *cfg) | |||
1106 | } | 1106 | } |
1107 | 1107 | ||
1108 | rt->u.dst.obsolete = -1; | 1108 | rt->u.dst.obsolete = -1; |
1109 | rt->rt6i_expires = jiffies + clock_t_to_jiffies(cfg->fc_expires); | 1109 | rt->rt6i_expires = (cfg->fc_flags & RTF_EXPIRES) ? |
1110 | jiffies + clock_t_to_jiffies(cfg->fc_expires) : | ||
1111 | 0; | ||
1110 | 1112 | ||
1111 | if (cfg->fc_protocol == RTPROT_UNSPEC) | 1113 | if (cfg->fc_protocol == RTPROT_UNSPEC) |
1112 | cfg->fc_protocol = RTPROT_BOOT; | 1114 | cfg->fc_protocol = RTPROT_BOOT; |
@@ -2200,7 +2202,9 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt, | |||
2200 | 2202 | ||
2201 | NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric); | 2203 | NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric); |
2202 | 2204 | ||
2203 | expires = rt->rt6i_expires ? rt->rt6i_expires - jiffies : 0; | 2205 | expires = (rt->rt6i_flags & RTF_EXPIRES) ? |
2206 | rt->rt6i_expires - jiffies : 0; | ||
2207 | |||
2204 | if (rtnl_put_cacheinfo(skb, &rt->u.dst, 0, 0, 0, | 2208 | if (rtnl_put_cacheinfo(skb, &rt->u.dst, 0, 0, 0, |
2205 | expires, rt->u.dst.error) < 0) | 2209 | expires, rt->u.dst.error) < 0) |
2206 | goto nla_put_failure; | 2210 | goto nla_put_failure; |
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 5a6fab95569f..3de6ffdaedf2 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -403,9 +403,8 @@ static void ipip6_tunnel_uninit(struct net_device *dev) | |||
403 | 403 | ||
404 | static int ipip6_err(struct sk_buff *skb, u32 info) | 404 | static int ipip6_err(struct sk_buff *skb, u32 info) |
405 | { | 405 | { |
406 | #ifndef I_WISH_WORLD_WERE_PERFECT | ||
407 | 406 | ||
408 | /* It is not :-( All the routers (except for Linux) return only | 407 | /* All the routers (except for Linux) return only |
409 | 8 bytes of packet payload. It means, that precise relaying of | 408 | 8 bytes of packet payload. It means, that precise relaying of |
410 | ICMP in the real Internet is absolutely infeasible. | 409 | ICMP in the real Internet is absolutely infeasible. |
411 | */ | 410 | */ |
@@ -462,92 +461,6 @@ static int ipip6_err(struct sk_buff *skb, u32 info) | |||
462 | out: | 461 | out: |
463 | read_unlock(&ipip6_lock); | 462 | read_unlock(&ipip6_lock); |
464 | return err; | 463 | return err; |
465 | #else | ||
466 | struct iphdr *iph = (struct iphdr*)dp; | ||
467 | int hlen = iph->ihl<<2; | ||
468 | struct ipv6hdr *iph6; | ||
469 | const int type = icmp_hdr(skb)->type; | ||
470 | const int code = icmp_hdr(skb)->code; | ||
471 | int rel_type = 0; | ||
472 | int rel_code = 0; | ||
473 | int rel_info = 0; | ||
474 | struct sk_buff *skb2; | ||
475 | struct rt6_info *rt6i; | ||
476 | |||
477 | if (len < hlen + sizeof(struct ipv6hdr)) | ||
478 | return; | ||
479 | iph6 = (struct ipv6hdr*)(dp + hlen); | ||
480 | |||
481 | switch (type) { | ||
482 | default: | ||
483 | return; | ||
484 | case ICMP_PARAMETERPROB: | ||
485 | if (icmp_hdr(skb)->un.gateway < hlen) | ||
486 | return; | ||
487 | |||
488 | /* So... This guy found something strange INSIDE encapsulated | ||
489 | packet. Well, he is fool, but what can we do ? | ||
490 | */ | ||
491 | rel_type = ICMPV6_PARAMPROB; | ||
492 | rel_info = icmp_hdr(skb)->un.gateway - hlen; | ||
493 | break; | ||
494 | |||
495 | case ICMP_DEST_UNREACH: | ||
496 | switch (code) { | ||
497 | case ICMP_SR_FAILED: | ||
498 | case ICMP_PORT_UNREACH: | ||
499 | /* Impossible event. */ | ||
500 | return; | ||
501 | case ICMP_FRAG_NEEDED: | ||
502 | /* Too complicated case ... */ | ||
503 | return; | ||
504 | default: | ||
505 | /* All others are translated to HOST_UNREACH. | ||
506 | rfc2003 contains "deep thoughts" about NET_UNREACH, | ||
507 | I believe, it is just ether pollution. --ANK | ||
508 | */ | ||
509 | rel_type = ICMPV6_DEST_UNREACH; | ||
510 | rel_code = ICMPV6_ADDR_UNREACH; | ||
511 | break; | ||
512 | } | ||
513 | break; | ||
514 | case ICMP_TIME_EXCEEDED: | ||
515 | if (code != ICMP_EXC_TTL) | ||
516 | return; | ||
517 | rel_type = ICMPV6_TIME_EXCEED; | ||
518 | rel_code = ICMPV6_EXC_HOPLIMIT; | ||
519 | break; | ||
520 | } | ||
521 | |||
522 | /* Prepare fake skb to feed it to icmpv6_send */ | ||
523 | skb2 = skb_clone(skb, GFP_ATOMIC); | ||
524 | if (skb2 == NULL) | ||
525 | return 0; | ||
526 | dst_release(skb2->dst); | ||
527 | skb2->dst = NULL; | ||
528 | skb_pull(skb2, skb->data - (u8*)iph6); | ||
529 | skb_reset_network_header(skb2); | ||
530 | |||
531 | /* Try to guess incoming interface */ | ||
532 | rt6i = rt6_lookup(dev_net(skb->dev), &iph6->saddr, NULL, NULL, 0); | ||
533 | if (rt6i && rt6i->rt6i_dev) { | ||
534 | skb2->dev = rt6i->rt6i_dev; | ||
535 | |||
536 | rt6i = rt6_lookup(dev_net(skb->dev), | ||
537 | &iph6->daddr, &iph6->saddr, NULL, 0); | ||
538 | |||
539 | if (rt6i && rt6i->rt6i_dev && rt6i->rt6i_dev->type == ARPHRD_SIT) { | ||
540 | struct ip_tunnel *t = netdev_priv(rt6i->rt6i_dev); | ||
541 | if (rel_type == ICMPV6_TIME_EXCEED && t->parms.iph.ttl) { | ||
542 | rel_type = ICMPV6_DEST_UNREACH; | ||
543 | rel_code = ICMPV6_ADDR_UNREACH; | ||
544 | } | ||
545 | icmpv6_send(skb2, rel_type, rel_code, rel_info, skb2->dev); | ||
546 | } | ||
547 | } | ||
548 | kfree_skb(skb2); | ||
549 | return 0; | ||
550 | #endif | ||
551 | } | 464 | } |
552 | 465 | ||
553 | static inline void ipip6_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb) | 466 | static inline void ipip6_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb) |
diff --git a/net/key/af_key.c b/net/key/af_key.c index 9e7236ff6bcc..9bba7ac5fee0 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -1251,7 +1251,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr, | |||
1251 | x->sel.prefixlen_s = addr->sadb_address_prefixlen; | 1251 | x->sel.prefixlen_s = addr->sadb_address_prefixlen; |
1252 | } | 1252 | } |
1253 | 1253 | ||
1254 | if (x->props.mode == XFRM_MODE_TRANSPORT) | 1254 | if (!x->sel.family) |
1255 | x->sel.family = x->props.family; | 1255 | x->sel.family = x->props.family; |
1256 | 1256 | ||
1257 | if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) { | 1257 | if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) { |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 4adba09e80ca..7cfd12e0d1e2 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -730,7 +730,17 @@ static void ieee80211_send_assoc(struct net_device *dev, | |||
730 | if (bss->wmm_ie) { | 730 | if (bss->wmm_ie) { |
731 | wmm = 1; | 731 | wmm = 1; |
732 | } | 732 | } |
733 | |||
734 | /* get all rates supported by the device and the AP as | ||
735 | * some APs don't like getting a superset of their rates | ||
736 | * in the association request (e.g. D-Link DAP 1353 in | ||
737 | * b-only mode) */ | ||
738 | rates_len = ieee80211_compatible_rates(bss, sband, &rates); | ||
739 | |||
733 | ieee80211_rx_bss_put(dev, bss); | 740 | ieee80211_rx_bss_put(dev, bss); |
741 | } else { | ||
742 | rates = ~0; | ||
743 | rates_len = sband->n_bitrates; | ||
734 | } | 744 | } |
735 | 745 | ||
736 | mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24); | 746 | mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24); |
@@ -761,10 +771,7 @@ static void ieee80211_send_assoc(struct net_device *dev, | |||
761 | *pos++ = ifsta->ssid_len; | 771 | *pos++ = ifsta->ssid_len; |
762 | memcpy(pos, ifsta->ssid, ifsta->ssid_len); | 772 | memcpy(pos, ifsta->ssid, ifsta->ssid_len); |
763 | 773 | ||
764 | /* all supported rates should be added here but some APs | 774 | /* add all rates which were marked to be used above */ |
765 | * (e.g. D-Link DAP 1353 in b-only mode) don't like that | ||
766 | * Therefore only add rates the AP supports */ | ||
767 | rates_len = ieee80211_compatible_rates(bss, sband, &rates); | ||
768 | supp_rates_len = rates_len; | 775 | supp_rates_len = rates_len; |
769 | if (supp_rates_len > 8) | 776 | if (supp_rates_len > 8) |
770 | supp_rates_len = 8; | 777 | supp_rates_len = 8; |
@@ -3446,21 +3453,17 @@ static int ieee80211_sta_config_auth(struct net_device *dev, | |||
3446 | struct ieee80211_sta_bss *bss, *selected = NULL; | 3453 | struct ieee80211_sta_bss *bss, *selected = NULL; |
3447 | int top_rssi = 0, freq; | 3454 | int top_rssi = 0, freq; |
3448 | 3455 | ||
3449 | if (!(ifsta->flags & (IEEE80211_STA_AUTO_SSID_SEL | | ||
3450 | IEEE80211_STA_AUTO_BSSID_SEL | IEEE80211_STA_AUTO_CHANNEL_SEL))) { | ||
3451 | ifsta->state = IEEE80211_AUTHENTICATE; | ||
3452 | ieee80211_sta_reset_auth(dev, ifsta); | ||
3453 | return 0; | ||
3454 | } | ||
3455 | |||
3456 | spin_lock_bh(&local->sta_bss_lock); | 3456 | spin_lock_bh(&local->sta_bss_lock); |
3457 | freq = local->oper_channel->center_freq; | 3457 | freq = local->oper_channel->center_freq; |
3458 | list_for_each_entry(bss, &local->sta_bss_list, list) { | 3458 | list_for_each_entry(bss, &local->sta_bss_list, list) { |
3459 | if (!(bss->capability & WLAN_CAPABILITY_ESS)) | 3459 | if (!(bss->capability & WLAN_CAPABILITY_ESS)) |
3460 | continue; | 3460 | continue; |
3461 | 3461 | ||
3462 | if (!!(bss->capability & WLAN_CAPABILITY_PRIVACY) ^ | 3462 | if ((ifsta->flags & (IEEE80211_STA_AUTO_SSID_SEL | |
3463 | !!sdata->default_key) | 3463 | IEEE80211_STA_AUTO_BSSID_SEL | |
3464 | IEEE80211_STA_AUTO_CHANNEL_SEL)) && | ||
3465 | (!!(bss->capability & WLAN_CAPABILITY_PRIVACY) ^ | ||
3466 | !!sdata->default_key)) | ||
3464 | continue; | 3467 | continue; |
3465 | 3468 | ||
3466 | if (!(ifsta->flags & IEEE80211_STA_AUTO_CHANNEL_SEL) && | 3469 | if (!(ifsta->flags & IEEE80211_STA_AUTO_CHANNEL_SEL) && |
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 24a465c4df09..131e9e6c8a32 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -389,6 +389,41 @@ void ieee80211_iterate_active_interfaces( | |||
389 | struct ieee80211_local *local = hw_to_local(hw); | 389 | struct ieee80211_local *local = hw_to_local(hw); |
390 | struct ieee80211_sub_if_data *sdata; | 390 | struct ieee80211_sub_if_data *sdata; |
391 | 391 | ||
392 | rtnl_lock(); | ||
393 | |||
394 | list_for_each_entry(sdata, &local->interfaces, list) { | ||
395 | switch (sdata->vif.type) { | ||
396 | case IEEE80211_IF_TYPE_INVALID: | ||
397 | case IEEE80211_IF_TYPE_MNTR: | ||
398 | case IEEE80211_IF_TYPE_VLAN: | ||
399 | continue; | ||
400 | case IEEE80211_IF_TYPE_AP: | ||
401 | case IEEE80211_IF_TYPE_STA: | ||
402 | case IEEE80211_IF_TYPE_IBSS: | ||
403 | case IEEE80211_IF_TYPE_WDS: | ||
404 | case IEEE80211_IF_TYPE_MESH_POINT: | ||
405 | break; | ||
406 | } | ||
407 | if (sdata->dev == local->mdev) | ||
408 | continue; | ||
409 | if (netif_running(sdata->dev)) | ||
410 | iterator(data, sdata->dev->dev_addr, | ||
411 | &sdata->vif); | ||
412 | } | ||
413 | |||
414 | rtnl_unlock(); | ||
415 | } | ||
416 | EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); | ||
417 | |||
418 | void ieee80211_iterate_active_interfaces_atomic( | ||
419 | struct ieee80211_hw *hw, | ||
420 | void (*iterator)(void *data, u8 *mac, | ||
421 | struct ieee80211_vif *vif), | ||
422 | void *data) | ||
423 | { | ||
424 | struct ieee80211_local *local = hw_to_local(hw); | ||
425 | struct ieee80211_sub_if_data *sdata; | ||
426 | |||
392 | rcu_read_lock(); | 427 | rcu_read_lock(); |
393 | 428 | ||
394 | list_for_each_entry_rcu(sdata, &local->interfaces, list) { | 429 | list_for_each_entry_rcu(sdata, &local->interfaces, list) { |
@@ -413,4 +448,4 @@ void ieee80211_iterate_active_interfaces( | |||
413 | 448 | ||
414 | rcu_read_unlock(); | 449 | rcu_read_unlock(); |
415 | } | 450 | } |
416 | EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); | 451 | EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic); |
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 76e1de1dc735..457ebf9e85ae 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
@@ -209,7 +209,6 @@ static int ieee80211_ioctl_giwrange(struct net_device *dev, | |||
209 | range->num_frequency = c; | 209 | range->num_frequency = c; |
210 | 210 | ||
211 | IW_EVENT_CAPA_SET_KERNEL(range->event_capa); | 211 | IW_EVENT_CAPA_SET_KERNEL(range->event_capa); |
212 | IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWTHRSPY); | ||
213 | IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP); | 212 | IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP); |
214 | IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN); | 213 | IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN); |
215 | 214 | ||
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 1086df7478bc..9360fc81e8c7 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
@@ -220,7 +220,7 @@ replay: | |||
220 | tp = kzalloc(sizeof(*tp), GFP_KERNEL); | 220 | tp = kzalloc(sizeof(*tp), GFP_KERNEL); |
221 | if (tp == NULL) | 221 | if (tp == NULL) |
222 | goto errout; | 222 | goto errout; |
223 | err = -EINVAL; | 223 | err = -ENOENT; |
224 | tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND]); | 224 | tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND]); |
225 | if (tp_ops == NULL) { | 225 | if (tp_ops == NULL) { |
226 | #ifdef CONFIG_KMOD | 226 | #ifdef CONFIG_KMOD |
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index d8e8d79a8451..e46c825f4954 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c | |||
@@ -6,30 +6,9 @@ | |||
6 | 6 | ||
7 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
8 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
9 | #include <linux/fcntl.h> | ||
10 | #include <linux/net.h> | ||
11 | #include <linux/in.h> | ||
12 | #include <linux/inet.h> | ||
13 | #include <linux/udp.h> | ||
14 | #include <linux/tcp.h> | ||
15 | #include <linux/unistd.h> | ||
16 | #include <linux/slab.h> | ||
17 | #include <linux/netdevice.h> | ||
18 | #include <linux/skbuff.h> | ||
19 | #include <linux/file.h> | ||
20 | #include <linux/freezer.h> | 9 | #include <linux/freezer.h> |
21 | #include <linux/kthread.h> | 10 | #include <linux/kthread.h> |
22 | #include <net/sock.h> | 11 | #include <net/sock.h> |
23 | #include <net/checksum.h> | ||
24 | #include <net/ip.h> | ||
25 | #include <net/ipv6.h> | ||
26 | #include <net/tcp_states.h> | ||
27 | #include <linux/uaccess.h> | ||
28 | #include <asm/ioctls.h> | ||
29 | |||
30 | #include <linux/sunrpc/types.h> | ||
31 | #include <linux/sunrpc/clnt.h> | ||
32 | #include <linux/sunrpc/xdr.h> | ||
33 | #include <linux/sunrpc/stats.h> | 12 | #include <linux/sunrpc/stats.h> |
34 | #include <linux/sunrpc/svc_xprt.h> | 13 | #include <linux/sunrpc/svc_xprt.h> |
35 | 14 | ||
@@ -296,8 +275,6 @@ void svc_xprt_enqueue(struct svc_xprt *xprt) | |||
296 | if (!(xprt->xpt_flags & | 275 | if (!(xprt->xpt_flags & |
297 | ((1<<XPT_CONN)|(1<<XPT_DATA)|(1<<XPT_CLOSE)|(1<<XPT_DEFERRED)))) | 276 | ((1<<XPT_CONN)|(1<<XPT_DATA)|(1<<XPT_CLOSE)|(1<<XPT_DEFERRED)))) |
298 | return; | 277 | return; |
299 | if (test_bit(XPT_DEAD, &xprt->xpt_flags)) | ||
300 | return; | ||
301 | 278 | ||
302 | cpu = get_cpu(); | 279 | cpu = get_cpu(); |
303 | pool = svc_pool_for_cpu(xprt->xpt_server, cpu); | 280 | pool = svc_pool_for_cpu(xprt->xpt_server, cpu); |
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index 3f30ee6006ae..f24800f2c098 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/net/sunrpc/svcauth_unix.c | |||
@@ -278,7 +278,7 @@ static int ip_map_show(struct seq_file *m, | |||
278 | dom = im->m_client->h.name; | 278 | dom = im->m_client->h.name; |
279 | 279 | ||
280 | if (ipv6_addr_v4mapped(&addr)) { | 280 | if (ipv6_addr_v4mapped(&addr)) { |
281 | seq_printf(m, "%s" NIPQUAD_FMT "%s\n", | 281 | seq_printf(m, "%s " NIPQUAD_FMT " %s\n", |
282 | im->m_class, | 282 | im->m_class, |
283 | ntohl(addr.s6_addr32[3]) >> 24 & 0xff, | 283 | ntohl(addr.s6_addr32[3]) >> 24 & 0xff, |
284 | ntohl(addr.s6_addr32[3]) >> 16 & 0xff, | 284 | ntohl(addr.s6_addr32[3]) >> 16 & 0xff, |
@@ -286,7 +286,7 @@ static int ip_map_show(struct seq_file *m, | |||
286 | ntohl(addr.s6_addr32[3]) >> 0 & 0xff, | 286 | ntohl(addr.s6_addr32[3]) >> 0 & 0xff, |
287 | dom); | 287 | dom); |
288 | } else { | 288 | } else { |
289 | seq_printf(m, "%s" NIP6_FMT "%s\n", | 289 | seq_printf(m, "%s " NIP6_FMT " %s\n", |
290 | im->m_class, NIP6(addr), dom); | 290 | im->m_class, NIP6(addr), dom); |
291 | } | 291 | } |
292 | return 0; | 292 | return 0; |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index c22d6b6f2db4..06ab4841537b 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |||
@@ -260,11 +260,16 @@ static int rdma_read_max_sge(struct svcxprt_rdma *xprt, int sge_count) | |||
260 | * On our side, we need to read into a pagelist. The first page immediately | 260 | * On our side, we need to read into a pagelist. The first page immediately |
261 | * follows the RPC header. | 261 | * follows the RPC header. |
262 | * | 262 | * |
263 | * This function returns 1 to indicate success. The data is not yet in | 263 | * This function returns: |
264 | * 0 - No error and no read-list found. | ||
265 | * | ||
266 | * 1 - Successful read-list processing. The data is not yet in | ||
264 | * the pagelist and therefore the RPC request must be deferred. The | 267 | * the pagelist and therefore the RPC request must be deferred. The |
265 | * I/O completion will enqueue the transport again and | 268 | * I/O completion will enqueue the transport again and |
266 | * svc_rdma_recvfrom will complete the request. | 269 | * svc_rdma_recvfrom will complete the request. |
267 | * | 270 | * |
271 | * <0 - Error processing/posting read-list. | ||
272 | * | ||
268 | * NOTE: The ctxt must not be touched after the last WR has been posted | 273 | * NOTE: The ctxt must not be touched after the last WR has been posted |
269 | * because the I/O completion processing may occur on another | 274 | * because the I/O completion processing may occur on another |
270 | * processor and free / modify the context. Ne touche pas! | 275 | * processor and free / modify the context. Ne touche pas! |
@@ -284,7 +289,6 @@ static int rdma_read_xdr(struct svcxprt_rdma *xprt, | |||
284 | u64 sgl_offset; | 289 | u64 sgl_offset; |
285 | struct rpcrdma_read_chunk *ch; | 290 | struct rpcrdma_read_chunk *ch; |
286 | struct svc_rdma_op_ctxt *ctxt = NULL; | 291 | struct svc_rdma_op_ctxt *ctxt = NULL; |
287 | struct svc_rdma_op_ctxt *head; | ||
288 | struct svc_rdma_op_ctxt *tmp_sge_ctxt; | 292 | struct svc_rdma_op_ctxt *tmp_sge_ctxt; |
289 | struct svc_rdma_op_ctxt *tmp_ch_ctxt; | 293 | struct svc_rdma_op_ctxt *tmp_ch_ctxt; |
290 | struct chunk_sge *ch_sge_ary; | 294 | struct chunk_sge *ch_sge_ary; |
@@ -302,25 +306,19 @@ static int rdma_read_xdr(struct svcxprt_rdma *xprt, | |||
302 | ch_sge_ary = (struct chunk_sge *)tmp_ch_ctxt->sge; | 306 | ch_sge_ary = (struct chunk_sge *)tmp_ch_ctxt->sge; |
303 | 307 | ||
304 | svc_rdma_rcl_chunk_counts(ch, &ch_count, &byte_count); | 308 | svc_rdma_rcl_chunk_counts(ch, &ch_count, &byte_count); |
309 | if (ch_count > RPCSVC_MAXPAGES) | ||
310 | return -EINVAL; | ||
305 | sge_count = rdma_rcl_to_sge(xprt, rqstp, hdr_ctxt, rmsgp, | 311 | sge_count = rdma_rcl_to_sge(xprt, rqstp, hdr_ctxt, rmsgp, |
306 | sge, ch_sge_ary, | 312 | sge, ch_sge_ary, |
307 | ch_count, byte_count); | 313 | ch_count, byte_count); |
308 | head = svc_rdma_get_context(xprt); | ||
309 | sgl_offset = 0; | 314 | sgl_offset = 0; |
310 | ch_no = 0; | 315 | ch_no = 0; |
311 | 316 | ||
312 | for (ch = (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0]; | 317 | for (ch = (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0]; |
313 | ch->rc_discrim != 0; ch++, ch_no++) { | 318 | ch->rc_discrim != 0; ch++, ch_no++) { |
314 | next_sge: | 319 | next_sge: |
315 | if (!ctxt) | 320 | ctxt = svc_rdma_get_context(xprt); |
316 | ctxt = head; | ||
317 | else { | ||
318 | ctxt->next = svc_rdma_get_context(xprt); | ||
319 | ctxt = ctxt->next; | ||
320 | } | ||
321 | ctxt->next = NULL; | ||
322 | ctxt->direction = DMA_FROM_DEVICE; | 321 | ctxt->direction = DMA_FROM_DEVICE; |
323 | clear_bit(RDMACTXT_F_READ_DONE, &ctxt->flags); | ||
324 | clear_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags); | 322 | clear_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags); |
325 | 323 | ||
326 | /* Prepare READ WR */ | 324 | /* Prepare READ WR */ |
@@ -347,20 +345,15 @@ next_sge: | |||
347 | * the client and the RPC needs to be enqueued. | 345 | * the client and the RPC needs to be enqueued. |
348 | */ | 346 | */ |
349 | set_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags); | 347 | set_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags); |
350 | ctxt->next = hdr_ctxt; | 348 | ctxt->read_hdr = hdr_ctxt; |
351 | hdr_ctxt->next = head; | ||
352 | } | 349 | } |
353 | /* Post the read */ | 350 | /* Post the read */ |
354 | err = svc_rdma_send(xprt, &read_wr); | 351 | err = svc_rdma_send(xprt, &read_wr); |
355 | if (err) { | 352 | if (err) { |
356 | printk(KERN_ERR "svcrdma: Error posting send = %d\n", | 353 | printk(KERN_ERR "svcrdma: Error %d posting RDMA_READ\n", |
357 | err); | 354 | err); |
358 | /* | 355 | set_bit(XPT_CLOSE, &xprt->sc_xprt.xpt_flags); |
359 | * Break the circular list so free knows when | 356 | svc_rdma_put_context(ctxt, 0); |
360 | * to stop if the error happened to occur on | ||
361 | * the last read | ||
362 | */ | ||
363 | ctxt->next = NULL; | ||
364 | goto out; | 357 | goto out; |
365 | } | 358 | } |
366 | atomic_inc(&rdma_stat_read); | 359 | atomic_inc(&rdma_stat_read); |
@@ -371,7 +364,7 @@ next_sge: | |||
371 | goto next_sge; | 364 | goto next_sge; |
372 | } | 365 | } |
373 | sgl_offset = 0; | 366 | sgl_offset = 0; |
374 | err = 0; | 367 | err = 1; |
375 | } | 368 | } |
376 | 369 | ||
377 | out: | 370 | out: |
@@ -389,25 +382,12 @@ next_sge: | |||
389 | while (rqstp->rq_resused) | 382 | while (rqstp->rq_resused) |
390 | rqstp->rq_respages[--rqstp->rq_resused] = NULL; | 383 | rqstp->rq_respages[--rqstp->rq_resused] = NULL; |
391 | 384 | ||
392 | if (err) { | 385 | return err; |
393 | printk(KERN_ERR "svcrdma : RDMA_READ error = %d\n", err); | ||
394 | set_bit(XPT_CLOSE, &xprt->sc_xprt.xpt_flags); | ||
395 | /* Free the linked list of read contexts */ | ||
396 | while (head != NULL) { | ||
397 | ctxt = head->next; | ||
398 | svc_rdma_put_context(head, 1); | ||
399 | head = ctxt; | ||
400 | } | ||
401 | return 0; | ||
402 | } | ||
403 | |||
404 | return 1; | ||
405 | } | 386 | } |
406 | 387 | ||
407 | static int rdma_read_complete(struct svc_rqst *rqstp, | 388 | static int rdma_read_complete(struct svc_rqst *rqstp, |
408 | struct svc_rdma_op_ctxt *data) | 389 | struct svc_rdma_op_ctxt *head) |
409 | { | 390 | { |
410 | struct svc_rdma_op_ctxt *head = data->next; | ||
411 | int page_no; | 391 | int page_no; |
412 | int ret; | 392 | int ret; |
413 | 393 | ||
@@ -433,21 +413,12 @@ static int rdma_read_complete(struct svc_rqst *rqstp, | |||
433 | rqstp->rq_arg.len = head->arg.len; | 413 | rqstp->rq_arg.len = head->arg.len; |
434 | rqstp->rq_arg.buflen = head->arg.buflen; | 414 | rqstp->rq_arg.buflen = head->arg.buflen; |
435 | 415 | ||
416 | /* Free the context */ | ||
417 | svc_rdma_put_context(head, 0); | ||
418 | |||
436 | /* XXX: What should this be? */ | 419 | /* XXX: What should this be? */ |
437 | rqstp->rq_prot = IPPROTO_MAX; | 420 | rqstp->rq_prot = IPPROTO_MAX; |
438 | 421 | svc_xprt_copy_addrs(rqstp, rqstp->rq_xprt); | |
439 | /* | ||
440 | * Free the contexts we used to build the RDMA_READ. We have | ||
441 | * to be careful here because the context list uses the same | ||
442 | * next pointer used to chain the contexts associated with the | ||
443 | * RDMA_READ | ||
444 | */ | ||
445 | data->next = NULL; /* terminate circular list */ | ||
446 | do { | ||
447 | data = head->next; | ||
448 | svc_rdma_put_context(head, 0); | ||
449 | head = data; | ||
450 | } while (head != NULL); | ||
451 | 422 | ||
452 | ret = rqstp->rq_arg.head[0].iov_len | 423 | ret = rqstp->rq_arg.head[0].iov_len |
453 | + rqstp->rq_arg.page_len | 424 | + rqstp->rq_arg.page_len |
@@ -457,8 +428,6 @@ static int rdma_read_complete(struct svc_rqst *rqstp, | |||
457 | ret, rqstp->rq_arg.len, rqstp->rq_arg.head[0].iov_base, | 428 | ret, rqstp->rq_arg.len, rqstp->rq_arg.head[0].iov_base, |
458 | rqstp->rq_arg.head[0].iov_len); | 429 | rqstp->rq_arg.head[0].iov_len); |
459 | 430 | ||
460 | /* Indicate that we've consumed an RQ credit */ | ||
461 | rqstp->rq_xprt_ctxt = rqstp->rq_xprt; | ||
462 | svc_xprt_received(rqstp->rq_xprt); | 431 | svc_xprt_received(rqstp->rq_xprt); |
463 | return ret; | 432 | return ret; |
464 | } | 433 | } |
@@ -480,13 +449,6 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) | |||
480 | 449 | ||
481 | dprintk("svcrdma: rqstp=%p\n", rqstp); | 450 | dprintk("svcrdma: rqstp=%p\n", rqstp); |
482 | 451 | ||
483 | /* | ||
484 | * The rq_xprt_ctxt indicates if we've consumed an RQ credit | ||
485 | * or not. It is used in the rdma xpo_release_rqst function to | ||
486 | * determine whether or not to return an RQ WQE to the RQ. | ||
487 | */ | ||
488 | rqstp->rq_xprt_ctxt = NULL; | ||
489 | |||
490 | spin_lock_bh(&rdma_xprt->sc_read_complete_lock); | 452 | spin_lock_bh(&rdma_xprt->sc_read_complete_lock); |
491 | if (!list_empty(&rdma_xprt->sc_read_complete_q)) { | 453 | if (!list_empty(&rdma_xprt->sc_read_complete_q)) { |
492 | ctxt = list_entry(rdma_xprt->sc_read_complete_q.next, | 454 | ctxt = list_entry(rdma_xprt->sc_read_complete_q.next, |
@@ -537,21 +499,22 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) | |||
537 | /* If the request is invalid, reply with an error */ | 499 | /* If the request is invalid, reply with an error */ |
538 | if (len < 0) { | 500 | if (len < 0) { |
539 | if (len == -ENOSYS) | 501 | if (len == -ENOSYS) |
540 | (void)svc_rdma_send_error(rdma_xprt, rmsgp, ERR_VERS); | 502 | svc_rdma_send_error(rdma_xprt, rmsgp, ERR_VERS); |
541 | goto close_out; | 503 | goto close_out; |
542 | } | 504 | } |
543 | 505 | ||
544 | /* Read read-list data. If we would need to wait, defer | 506 | /* Read read-list data. */ |
545 | * it. Not that in this case, we don't return the RQ credit | 507 | ret = rdma_read_xdr(rdma_xprt, rmsgp, rqstp, ctxt); |
546 | * until after the read completes. | 508 | if (ret > 0) { |
547 | */ | 509 | /* read-list posted, defer until data received from client. */ |
548 | if (rdma_read_xdr(rdma_xprt, rmsgp, rqstp, ctxt)) { | ||
549 | svc_xprt_received(xprt); | 510 | svc_xprt_received(xprt); |
550 | return 0; | 511 | return 0; |
551 | } | 512 | } |
552 | 513 | if (ret < 0) { | |
553 | /* Indicate we've consumed an RQ credit */ | 514 | /* Post of read-list failed, free context. */ |
554 | rqstp->rq_xprt_ctxt = rqstp->rq_xprt; | 515 | svc_rdma_put_context(ctxt, 1); |
516 | return 0; | ||
517 | } | ||
555 | 518 | ||
556 | ret = rqstp->rq_arg.head[0].iov_len | 519 | ret = rqstp->rq_arg.head[0].iov_len |
557 | + rqstp->rq_arg.page_len | 520 | + rqstp->rq_arg.page_len |
@@ -569,11 +532,8 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) | |||
569 | return ret; | 532 | return ret; |
570 | 533 | ||
571 | close_out: | 534 | close_out: |
572 | if (ctxt) { | 535 | if (ctxt) |
573 | svc_rdma_put_context(ctxt, 1); | 536 | svc_rdma_put_context(ctxt, 1); |
574 | /* Indicate we've consumed an RQ credit */ | ||
575 | rqstp->rq_xprt_ctxt = rqstp->rq_xprt; | ||
576 | } | ||
577 | dprintk("svcrdma: transport %p is closing\n", xprt); | 537 | dprintk("svcrdma: transport %p is closing\n", xprt); |
578 | /* | 538 | /* |
579 | * Set the close bit and enqueue it. svc_recv will see the | 539 | * Set the close bit and enqueue it. svc_recv will see the |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index 981f190c1b39..fb82b1b683f8 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c | |||
@@ -389,6 +389,17 @@ static int send_reply(struct svcxprt_rdma *rdma, | |||
389 | int page_no; | 389 | int page_no; |
390 | int ret; | 390 | int ret; |
391 | 391 | ||
392 | /* Post a recv buffer to handle another request. */ | ||
393 | ret = svc_rdma_post_recv(rdma); | ||
394 | if (ret) { | ||
395 | printk(KERN_INFO | ||
396 | "svcrdma: could not post a receive buffer, err=%d." | ||
397 | "Closing transport %p.\n", ret, rdma); | ||
398 | set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags); | ||
399 | svc_rdma_put_context(ctxt, 0); | ||
400 | return -ENOTCONN; | ||
401 | } | ||
402 | |||
392 | /* Prepare the context */ | 403 | /* Prepare the context */ |
393 | ctxt->pages[0] = page; | 404 | ctxt->pages[0] = page; |
394 | ctxt->count = 1; | 405 | ctxt->count = 1; |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index af408fc12634..e132509d1db0 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
@@ -103,8 +103,8 @@ static int rdma_bump_context_cache(struct svcxprt_rdma *xprt) | |||
103 | spin_lock_bh(&xprt->sc_ctxt_lock); | 103 | spin_lock_bh(&xprt->sc_ctxt_lock); |
104 | if (ctxt) { | 104 | if (ctxt) { |
105 | at_least_one = 1; | 105 | at_least_one = 1; |
106 | ctxt->next = xprt->sc_ctxt_head; | 106 | INIT_LIST_HEAD(&ctxt->free_list); |
107 | xprt->sc_ctxt_head = ctxt; | 107 | list_add(&ctxt->free_list, &xprt->sc_ctxt_free); |
108 | } else { | 108 | } else { |
109 | /* kmalloc failed...give up for now */ | 109 | /* kmalloc failed...give up for now */ |
110 | xprt->sc_ctxt_cnt--; | 110 | xprt->sc_ctxt_cnt--; |
@@ -123,7 +123,7 @@ struct svc_rdma_op_ctxt *svc_rdma_get_context(struct svcxprt_rdma *xprt) | |||
123 | 123 | ||
124 | while (1) { | 124 | while (1) { |
125 | spin_lock_bh(&xprt->sc_ctxt_lock); | 125 | spin_lock_bh(&xprt->sc_ctxt_lock); |
126 | if (unlikely(xprt->sc_ctxt_head == NULL)) { | 126 | if (unlikely(list_empty(&xprt->sc_ctxt_free))) { |
127 | /* Try to bump my cache. */ | 127 | /* Try to bump my cache. */ |
128 | spin_unlock_bh(&xprt->sc_ctxt_lock); | 128 | spin_unlock_bh(&xprt->sc_ctxt_lock); |
129 | 129 | ||
@@ -136,12 +136,15 @@ struct svc_rdma_op_ctxt *svc_rdma_get_context(struct svcxprt_rdma *xprt) | |||
136 | schedule_timeout_uninterruptible(msecs_to_jiffies(500)); | 136 | schedule_timeout_uninterruptible(msecs_to_jiffies(500)); |
137 | continue; | 137 | continue; |
138 | } | 138 | } |
139 | ctxt = xprt->sc_ctxt_head; | 139 | ctxt = list_entry(xprt->sc_ctxt_free.next, |
140 | xprt->sc_ctxt_head = ctxt->next; | 140 | struct svc_rdma_op_ctxt, |
141 | free_list); | ||
142 | list_del_init(&ctxt->free_list); | ||
141 | spin_unlock_bh(&xprt->sc_ctxt_lock); | 143 | spin_unlock_bh(&xprt->sc_ctxt_lock); |
142 | ctxt->xprt = xprt; | 144 | ctxt->xprt = xprt; |
143 | INIT_LIST_HEAD(&ctxt->dto_q); | 145 | INIT_LIST_HEAD(&ctxt->dto_q); |
144 | ctxt->count = 0; | 146 | ctxt->count = 0; |
147 | atomic_inc(&xprt->sc_ctxt_used); | ||
145 | break; | 148 | break; |
146 | } | 149 | } |
147 | return ctxt; | 150 | return ctxt; |
@@ -159,14 +162,15 @@ void svc_rdma_put_context(struct svc_rdma_op_ctxt *ctxt, int free_pages) | |||
159 | put_page(ctxt->pages[i]); | 162 | put_page(ctxt->pages[i]); |
160 | 163 | ||
161 | for (i = 0; i < ctxt->count; i++) | 164 | for (i = 0; i < ctxt->count; i++) |
162 | dma_unmap_single(xprt->sc_cm_id->device->dma_device, | 165 | ib_dma_unmap_single(xprt->sc_cm_id->device, |
163 | ctxt->sge[i].addr, | 166 | ctxt->sge[i].addr, |
164 | ctxt->sge[i].length, | 167 | ctxt->sge[i].length, |
165 | ctxt->direction); | 168 | ctxt->direction); |
169 | |||
166 | spin_lock_bh(&xprt->sc_ctxt_lock); | 170 | spin_lock_bh(&xprt->sc_ctxt_lock); |
167 | ctxt->next = xprt->sc_ctxt_head; | 171 | list_add(&ctxt->free_list, &xprt->sc_ctxt_free); |
168 | xprt->sc_ctxt_head = ctxt; | ||
169 | spin_unlock_bh(&xprt->sc_ctxt_lock); | 172 | spin_unlock_bh(&xprt->sc_ctxt_lock); |
173 | atomic_dec(&xprt->sc_ctxt_used); | ||
170 | } | 174 | } |
171 | 175 | ||
172 | /* ib_cq event handler */ | 176 | /* ib_cq event handler */ |
@@ -228,23 +232,8 @@ static void dto_tasklet_func(unsigned long data) | |||
228 | list_del_init(&xprt->sc_dto_q); | 232 | list_del_init(&xprt->sc_dto_q); |
229 | spin_unlock_irqrestore(&dto_lock, flags); | 233 | spin_unlock_irqrestore(&dto_lock, flags); |
230 | 234 | ||
231 | if (test_and_clear_bit(RDMAXPRT_RQ_PENDING, &xprt->sc_flags)) { | 235 | rq_cq_reap(xprt); |
232 | ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP); | 236 | sq_cq_reap(xprt); |
233 | rq_cq_reap(xprt); | ||
234 | set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); | ||
235 | /* | ||
236 | * If data arrived before established event, | ||
237 | * don't enqueue. This defers RPC I/O until the | ||
238 | * RDMA connection is complete. | ||
239 | */ | ||
240 | if (!test_bit(RDMAXPRT_CONN_PENDING, &xprt->sc_flags)) | ||
241 | svc_xprt_enqueue(&xprt->sc_xprt); | ||
242 | } | ||
243 | |||
244 | if (test_and_clear_bit(RDMAXPRT_SQ_PENDING, &xprt->sc_flags)) { | ||
245 | ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP); | ||
246 | sq_cq_reap(xprt); | ||
247 | } | ||
248 | 237 | ||
249 | svc_xprt_put(&xprt->sc_xprt); | 238 | svc_xprt_put(&xprt->sc_xprt); |
250 | spin_lock_irqsave(&dto_lock, flags); | 239 | spin_lock_irqsave(&dto_lock, flags); |
@@ -263,11 +252,15 @@ static void rq_comp_handler(struct ib_cq *cq, void *cq_context) | |||
263 | struct svcxprt_rdma *xprt = cq_context; | 252 | struct svcxprt_rdma *xprt = cq_context; |
264 | unsigned long flags; | 253 | unsigned long flags; |
265 | 254 | ||
255 | /* Guard against unconditional flush call for destroyed QP */ | ||
256 | if (atomic_read(&xprt->sc_xprt.xpt_ref.refcount)==0) | ||
257 | return; | ||
258 | |||
266 | /* | 259 | /* |
267 | * Set the bit regardless of whether or not it's on the list | 260 | * Set the bit regardless of whether or not it's on the list |
268 | * because it may be on the list already due to an SQ | 261 | * because it may be on the list already due to an SQ |
269 | * completion. | 262 | * completion. |
270 | */ | 263 | */ |
271 | set_bit(RDMAXPRT_RQ_PENDING, &xprt->sc_flags); | 264 | set_bit(RDMAXPRT_RQ_PENDING, &xprt->sc_flags); |
272 | 265 | ||
273 | /* | 266 | /* |
@@ -290,6 +283,8 @@ static void rq_comp_handler(struct ib_cq *cq, void *cq_context) | |||
290 | * | 283 | * |
291 | * Take all completing WC off the CQE and enqueue the associated DTO | 284 | * Take all completing WC off the CQE and enqueue the associated DTO |
292 | * context on the dto_q for the transport. | 285 | * context on the dto_q for the transport. |
286 | * | ||
287 | * Note that caller must hold a transport reference. | ||
293 | */ | 288 | */ |
294 | static void rq_cq_reap(struct svcxprt_rdma *xprt) | 289 | static void rq_cq_reap(struct svcxprt_rdma *xprt) |
295 | { | 290 | { |
@@ -297,29 +292,47 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt) | |||
297 | struct ib_wc wc; | 292 | struct ib_wc wc; |
298 | struct svc_rdma_op_ctxt *ctxt = NULL; | 293 | struct svc_rdma_op_ctxt *ctxt = NULL; |
299 | 294 | ||
295 | if (!test_and_clear_bit(RDMAXPRT_RQ_PENDING, &xprt->sc_flags)) | ||
296 | return; | ||
297 | |||
298 | ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP); | ||
300 | atomic_inc(&rdma_stat_rq_poll); | 299 | atomic_inc(&rdma_stat_rq_poll); |
301 | 300 | ||
302 | spin_lock_bh(&xprt->sc_rq_dto_lock); | ||
303 | while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) { | 301 | while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) { |
304 | ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id; | 302 | ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id; |
305 | ctxt->wc_status = wc.status; | 303 | ctxt->wc_status = wc.status; |
306 | ctxt->byte_len = wc.byte_len; | 304 | ctxt->byte_len = wc.byte_len; |
307 | if (wc.status != IB_WC_SUCCESS) { | 305 | if (wc.status != IB_WC_SUCCESS) { |
308 | /* Close the transport */ | 306 | /* Close the transport */ |
307 | dprintk("svcrdma: transport closing putting ctxt %p\n", ctxt); | ||
309 | set_bit(XPT_CLOSE, &xprt->sc_xprt.xpt_flags); | 308 | set_bit(XPT_CLOSE, &xprt->sc_xprt.xpt_flags); |
310 | svc_rdma_put_context(ctxt, 1); | 309 | svc_rdma_put_context(ctxt, 1); |
310 | svc_xprt_put(&xprt->sc_xprt); | ||
311 | continue; | 311 | continue; |
312 | } | 312 | } |
313 | spin_lock_bh(&xprt->sc_rq_dto_lock); | ||
313 | list_add_tail(&ctxt->dto_q, &xprt->sc_rq_dto_q); | 314 | list_add_tail(&ctxt->dto_q, &xprt->sc_rq_dto_q); |
315 | spin_unlock_bh(&xprt->sc_rq_dto_lock); | ||
316 | svc_xprt_put(&xprt->sc_xprt); | ||
314 | } | 317 | } |
315 | spin_unlock_bh(&xprt->sc_rq_dto_lock); | ||
316 | 318 | ||
317 | if (ctxt) | 319 | if (ctxt) |
318 | atomic_inc(&rdma_stat_rq_prod); | 320 | atomic_inc(&rdma_stat_rq_prod); |
321 | |||
322 | set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); | ||
323 | /* | ||
324 | * If data arrived before established event, | ||
325 | * don't enqueue. This defers RPC I/O until the | ||
326 | * RDMA connection is complete. | ||
327 | */ | ||
328 | if (!test_bit(RDMAXPRT_CONN_PENDING, &xprt->sc_flags)) | ||
329 | svc_xprt_enqueue(&xprt->sc_xprt); | ||
319 | } | 330 | } |
320 | 331 | ||
321 | /* | 332 | /* |
322 | * Send Queue Completion Handler - potentially called on interrupt context. | 333 | * Send Queue Completion Handler - potentially called on interrupt context. |
334 | * | ||
335 | * Note that caller must hold a transport reference. | ||
323 | */ | 336 | */ |
324 | static void sq_cq_reap(struct svcxprt_rdma *xprt) | 337 | static void sq_cq_reap(struct svcxprt_rdma *xprt) |
325 | { | 338 | { |
@@ -328,6 +341,11 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt) | |||
328 | struct ib_cq *cq = xprt->sc_sq_cq; | 341 | struct ib_cq *cq = xprt->sc_sq_cq; |
329 | int ret; | 342 | int ret; |
330 | 343 | ||
344 | |||
345 | if (!test_and_clear_bit(RDMAXPRT_SQ_PENDING, &xprt->sc_flags)) | ||
346 | return; | ||
347 | |||
348 | ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP); | ||
331 | atomic_inc(&rdma_stat_sq_poll); | 349 | atomic_inc(&rdma_stat_sq_poll); |
332 | while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) { | 350 | while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) { |
333 | ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id; | 351 | ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id; |
@@ -349,14 +367,16 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt) | |||
349 | 367 | ||
350 | case IB_WR_RDMA_READ: | 368 | case IB_WR_RDMA_READ: |
351 | if (test_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags)) { | 369 | if (test_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags)) { |
370 | struct svc_rdma_op_ctxt *read_hdr = ctxt->read_hdr; | ||
371 | BUG_ON(!read_hdr); | ||
352 | set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); | 372 | set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); |
353 | set_bit(RDMACTXT_F_READ_DONE, &ctxt->flags); | ||
354 | spin_lock_bh(&xprt->sc_read_complete_lock); | 373 | spin_lock_bh(&xprt->sc_read_complete_lock); |
355 | list_add_tail(&ctxt->dto_q, | 374 | list_add_tail(&read_hdr->dto_q, |
356 | &xprt->sc_read_complete_q); | 375 | &xprt->sc_read_complete_q); |
357 | spin_unlock_bh(&xprt->sc_read_complete_lock); | 376 | spin_unlock_bh(&xprt->sc_read_complete_lock); |
358 | svc_xprt_enqueue(&xprt->sc_xprt); | 377 | svc_xprt_enqueue(&xprt->sc_xprt); |
359 | } | 378 | } |
379 | svc_rdma_put_context(ctxt, 0); | ||
360 | break; | 380 | break; |
361 | 381 | ||
362 | default: | 382 | default: |
@@ -365,6 +385,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt) | |||
365 | wc.opcode, wc.status); | 385 | wc.opcode, wc.status); |
366 | break; | 386 | break; |
367 | } | 387 | } |
388 | svc_xprt_put(&xprt->sc_xprt); | ||
368 | } | 389 | } |
369 | 390 | ||
370 | if (ctxt) | 391 | if (ctxt) |
@@ -376,11 +397,15 @@ static void sq_comp_handler(struct ib_cq *cq, void *cq_context) | |||
376 | struct svcxprt_rdma *xprt = cq_context; | 397 | struct svcxprt_rdma *xprt = cq_context; |
377 | unsigned long flags; | 398 | unsigned long flags; |
378 | 399 | ||
400 | /* Guard against unconditional flush call for destroyed QP */ | ||
401 | if (atomic_read(&xprt->sc_xprt.xpt_ref.refcount)==0) | ||
402 | return; | ||
403 | |||
379 | /* | 404 | /* |
380 | * Set the bit regardless of whether or not it's on the list | 405 | * Set the bit regardless of whether or not it's on the list |
381 | * because it may be on the list already due to an RQ | 406 | * because it may be on the list already due to an RQ |
382 | * completion. | 407 | * completion. |
383 | */ | 408 | */ |
384 | set_bit(RDMAXPRT_SQ_PENDING, &xprt->sc_flags); | 409 | set_bit(RDMAXPRT_SQ_PENDING, &xprt->sc_flags); |
385 | 410 | ||
386 | /* | 411 | /* |
@@ -407,28 +432,29 @@ static void create_context_cache(struct svcxprt_rdma *xprt, | |||
407 | xprt->sc_ctxt_max = ctxt_max; | 432 | xprt->sc_ctxt_max = ctxt_max; |
408 | xprt->sc_ctxt_bump = ctxt_bump; | 433 | xprt->sc_ctxt_bump = ctxt_bump; |
409 | xprt->sc_ctxt_cnt = 0; | 434 | xprt->sc_ctxt_cnt = 0; |
410 | xprt->sc_ctxt_head = NULL; | 435 | atomic_set(&xprt->sc_ctxt_used, 0); |
436 | |||
437 | INIT_LIST_HEAD(&xprt->sc_ctxt_free); | ||
411 | for (i = 0; i < ctxt_count; i++) { | 438 | for (i = 0; i < ctxt_count; i++) { |
412 | ctxt = kmalloc(sizeof(*ctxt), GFP_KERNEL); | 439 | ctxt = kmalloc(sizeof(*ctxt), GFP_KERNEL); |
413 | if (ctxt) { | 440 | if (ctxt) { |
414 | ctxt->next = xprt->sc_ctxt_head; | 441 | INIT_LIST_HEAD(&ctxt->free_list); |
415 | xprt->sc_ctxt_head = ctxt; | 442 | list_add(&ctxt->free_list, &xprt->sc_ctxt_free); |
416 | xprt->sc_ctxt_cnt++; | 443 | xprt->sc_ctxt_cnt++; |
417 | } | 444 | } |
418 | } | 445 | } |
419 | } | 446 | } |
420 | 447 | ||
421 | static void destroy_context_cache(struct svc_rdma_op_ctxt *ctxt) | 448 | static void destroy_context_cache(struct svcxprt_rdma *xprt) |
422 | { | 449 | { |
423 | struct svc_rdma_op_ctxt *next; | 450 | while (!list_empty(&xprt->sc_ctxt_free)) { |
424 | if (!ctxt) | 451 | struct svc_rdma_op_ctxt *ctxt; |
425 | return; | 452 | ctxt = list_entry(xprt->sc_ctxt_free.next, |
426 | 453 | struct svc_rdma_op_ctxt, | |
427 | do { | 454 | free_list); |
428 | next = ctxt->next; | 455 | list_del_init(&ctxt->free_list); |
429 | kfree(ctxt); | 456 | kfree(ctxt); |
430 | ctxt = next; | 457 | } |
431 | } while (next); | ||
432 | } | 458 | } |
433 | 459 | ||
434 | static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv, | 460 | static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv, |
@@ -465,7 +491,7 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv, | |||
465 | reqs + | 491 | reqs + |
466 | cma_xprt->sc_sq_depth + | 492 | cma_xprt->sc_sq_depth + |
467 | RPCRDMA_MAX_THREADS + 1); /* max */ | 493 | RPCRDMA_MAX_THREADS + 1); /* max */ |
468 | if (!cma_xprt->sc_ctxt_head) { | 494 | if (list_empty(&cma_xprt->sc_ctxt_free)) { |
469 | kfree(cma_xprt); | 495 | kfree(cma_xprt); |
470 | return NULL; | 496 | return NULL; |
471 | } | 497 | } |
@@ -520,7 +546,12 @@ int svc_rdma_post_recv(struct svcxprt_rdma *xprt) | |||
520 | recv_wr.num_sge = ctxt->count; | 546 | recv_wr.num_sge = ctxt->count; |
521 | recv_wr.wr_id = (u64)(unsigned long)ctxt; | 547 | recv_wr.wr_id = (u64)(unsigned long)ctxt; |
522 | 548 | ||
549 | svc_xprt_get(&xprt->sc_xprt); | ||
523 | ret = ib_post_recv(xprt->sc_qp, &recv_wr, &bad_recv_wr); | 550 | ret = ib_post_recv(xprt->sc_qp, &recv_wr, &bad_recv_wr); |
551 | if (ret) { | ||
552 | svc_xprt_put(&xprt->sc_xprt); | ||
553 | svc_rdma_put_context(ctxt, 1); | ||
554 | } | ||
524 | return ret; | 555 | return ret; |
525 | } | 556 | } |
526 | 557 | ||
@@ -539,6 +570,7 @@ static void handle_connect_req(struct rdma_cm_id *new_cma_id) | |||
539 | { | 570 | { |
540 | struct svcxprt_rdma *listen_xprt = new_cma_id->context; | 571 | struct svcxprt_rdma *listen_xprt = new_cma_id->context; |
541 | struct svcxprt_rdma *newxprt; | 572 | struct svcxprt_rdma *newxprt; |
573 | struct sockaddr *sa; | ||
542 | 574 | ||
543 | /* Create a new transport */ | 575 | /* Create a new transport */ |
544 | newxprt = rdma_create_xprt(listen_xprt->sc_xprt.xpt_server, 0); | 576 | newxprt = rdma_create_xprt(listen_xprt->sc_xprt.xpt_server, 0); |
@@ -551,6 +583,12 @@ static void handle_connect_req(struct rdma_cm_id *new_cma_id) | |||
551 | dprintk("svcrdma: Creating newxprt=%p, cm_id=%p, listenxprt=%p\n", | 583 | dprintk("svcrdma: Creating newxprt=%p, cm_id=%p, listenxprt=%p\n", |
552 | newxprt, newxprt->sc_cm_id, listen_xprt); | 584 | newxprt, newxprt->sc_cm_id, listen_xprt); |
553 | 585 | ||
586 | /* Set the local and remote addresses in the transport */ | ||
587 | sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr; | ||
588 | svc_xprt_set_remote(&newxprt->sc_xprt, sa, svc_addr_len(sa)); | ||
589 | sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr; | ||
590 | svc_xprt_set_local(&newxprt->sc_xprt, sa, svc_addr_len(sa)); | ||
591 | |||
554 | /* | 592 | /* |
555 | * Enqueue the new transport on the accept queue of the listening | 593 | * Enqueue the new transport on the accept queue of the listening |
556 | * transport | 594 | * transport |
@@ -627,6 +665,7 @@ static int rdma_cma_handler(struct rdma_cm_id *cma_id, | |||
627 | if (xprt) { | 665 | if (xprt) { |
628 | set_bit(XPT_CLOSE, &xprt->xpt_flags); | 666 | set_bit(XPT_CLOSE, &xprt->xpt_flags); |
629 | svc_xprt_enqueue(xprt); | 667 | svc_xprt_enqueue(xprt); |
668 | svc_xprt_put(xprt); | ||
630 | } | 669 | } |
631 | break; | 670 | break; |
632 | case RDMA_CM_EVENT_DEVICE_REMOVAL: | 671 | case RDMA_CM_EVENT_DEVICE_REMOVAL: |
@@ -661,31 +700,27 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv, | |||
661 | 700 | ||
662 | cma_xprt = rdma_create_xprt(serv, 1); | 701 | cma_xprt = rdma_create_xprt(serv, 1); |
663 | if (!cma_xprt) | 702 | if (!cma_xprt) |
664 | return ERR_PTR(ENOMEM); | 703 | return ERR_PTR(-ENOMEM); |
665 | xprt = &cma_xprt->sc_xprt; | 704 | xprt = &cma_xprt->sc_xprt; |
666 | 705 | ||
667 | listen_id = rdma_create_id(rdma_listen_handler, cma_xprt, RDMA_PS_TCP); | 706 | listen_id = rdma_create_id(rdma_listen_handler, cma_xprt, RDMA_PS_TCP); |
668 | if (IS_ERR(listen_id)) { | 707 | if (IS_ERR(listen_id)) { |
669 | svc_xprt_put(&cma_xprt->sc_xprt); | 708 | ret = PTR_ERR(listen_id); |
670 | dprintk("svcrdma: rdma_create_id failed = %ld\n", | 709 | dprintk("svcrdma: rdma_create_id failed = %d\n", ret); |
671 | PTR_ERR(listen_id)); | 710 | goto err0; |
672 | return (void *)listen_id; | ||
673 | } | 711 | } |
712 | |||
674 | ret = rdma_bind_addr(listen_id, sa); | 713 | ret = rdma_bind_addr(listen_id, sa); |
675 | if (ret) { | 714 | if (ret) { |
676 | rdma_destroy_id(listen_id); | ||
677 | svc_xprt_put(&cma_xprt->sc_xprt); | ||
678 | dprintk("svcrdma: rdma_bind_addr failed = %d\n", ret); | 715 | dprintk("svcrdma: rdma_bind_addr failed = %d\n", ret); |
679 | return ERR_PTR(ret); | 716 | goto err1; |
680 | } | 717 | } |
681 | cma_xprt->sc_cm_id = listen_id; | 718 | cma_xprt->sc_cm_id = listen_id; |
682 | 719 | ||
683 | ret = rdma_listen(listen_id, RPCRDMA_LISTEN_BACKLOG); | 720 | ret = rdma_listen(listen_id, RPCRDMA_LISTEN_BACKLOG); |
684 | if (ret) { | 721 | if (ret) { |
685 | rdma_destroy_id(listen_id); | ||
686 | svc_xprt_put(&cma_xprt->sc_xprt); | ||
687 | dprintk("svcrdma: rdma_listen failed = %d\n", ret); | 722 | dprintk("svcrdma: rdma_listen failed = %d\n", ret); |
688 | return ERR_PTR(ret); | 723 | goto err1; |
689 | } | 724 | } |
690 | 725 | ||
691 | /* | 726 | /* |
@@ -696,6 +731,12 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv, | |||
696 | svc_xprt_set_local(&cma_xprt->sc_xprt, sa, salen); | 731 | svc_xprt_set_local(&cma_xprt->sc_xprt, sa, salen); |
697 | 732 | ||
698 | return &cma_xprt->sc_xprt; | 733 | return &cma_xprt->sc_xprt; |
734 | |||
735 | err1: | ||
736 | rdma_destroy_id(listen_id); | ||
737 | err0: | ||
738 | kfree(cma_xprt); | ||
739 | return ERR_PTR(ret); | ||
699 | } | 740 | } |
700 | 741 | ||
701 | /* | 742 | /* |
@@ -716,7 +757,6 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) | |||
716 | struct rdma_conn_param conn_param; | 757 | struct rdma_conn_param conn_param; |
717 | struct ib_qp_init_attr qp_attr; | 758 | struct ib_qp_init_attr qp_attr; |
718 | struct ib_device_attr devattr; | 759 | struct ib_device_attr devattr; |
719 | struct sockaddr *sa; | ||
720 | int ret; | 760 | int ret; |
721 | int i; | 761 | int i; |
722 | 762 | ||
@@ -826,7 +866,6 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) | |||
826 | newxprt->sc_sq_depth = qp_attr.cap.max_send_wr; | 866 | newxprt->sc_sq_depth = qp_attr.cap.max_send_wr; |
827 | newxprt->sc_max_requests = qp_attr.cap.max_recv_wr; | 867 | newxprt->sc_max_requests = qp_attr.cap.max_recv_wr; |
828 | } | 868 | } |
829 | svc_xprt_get(&newxprt->sc_xprt); | ||
830 | newxprt->sc_qp = newxprt->sc_cm_id->qp; | 869 | newxprt->sc_qp = newxprt->sc_cm_id->qp; |
831 | 870 | ||
832 | /* Register all of physical memory */ | 871 | /* Register all of physical memory */ |
@@ -850,6 +889,13 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) | |||
850 | /* Swap out the handler */ | 889 | /* Swap out the handler */ |
851 | newxprt->sc_cm_id->event_handler = rdma_cma_handler; | 890 | newxprt->sc_cm_id->event_handler = rdma_cma_handler; |
852 | 891 | ||
892 | /* | ||
893 | * Arm the CQs for the SQ and RQ before accepting so we can't | ||
894 | * miss the first message | ||
895 | */ | ||
896 | ib_req_notify_cq(newxprt->sc_sq_cq, IB_CQ_NEXT_COMP); | ||
897 | ib_req_notify_cq(newxprt->sc_rq_cq, IB_CQ_NEXT_COMP); | ||
898 | |||
853 | /* Accept Connection */ | 899 | /* Accept Connection */ |
854 | set_bit(RDMAXPRT_CONN_PENDING, &newxprt->sc_flags); | 900 | set_bit(RDMAXPRT_CONN_PENDING, &newxprt->sc_flags); |
855 | memset(&conn_param, 0, sizeof conn_param); | 901 | memset(&conn_param, 0, sizeof conn_param); |
@@ -886,58 +932,26 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) | |||
886 | newxprt->sc_max_requests, | 932 | newxprt->sc_max_requests, |
887 | newxprt->sc_ord); | 933 | newxprt->sc_ord); |
888 | 934 | ||
889 | /* Set the local and remote addresses in the transport */ | ||
890 | sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr; | ||
891 | svc_xprt_set_remote(&newxprt->sc_xprt, sa, svc_addr_len(sa)); | ||
892 | sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr; | ||
893 | svc_xprt_set_local(&newxprt->sc_xprt, sa, svc_addr_len(sa)); | ||
894 | |||
895 | ib_req_notify_cq(newxprt->sc_sq_cq, IB_CQ_NEXT_COMP); | ||
896 | ib_req_notify_cq(newxprt->sc_rq_cq, IB_CQ_NEXT_COMP); | ||
897 | return &newxprt->sc_xprt; | 935 | return &newxprt->sc_xprt; |
898 | 936 | ||
899 | errout: | 937 | errout: |
900 | dprintk("svcrdma: failure accepting new connection rc=%d.\n", ret); | 938 | dprintk("svcrdma: failure accepting new connection rc=%d.\n", ret); |
901 | /* Take a reference in case the DTO handler runs */ | 939 | /* Take a reference in case the DTO handler runs */ |
902 | svc_xprt_get(&newxprt->sc_xprt); | 940 | svc_xprt_get(&newxprt->sc_xprt); |
903 | if (newxprt->sc_qp && !IS_ERR(newxprt->sc_qp)) { | 941 | if (newxprt->sc_qp && !IS_ERR(newxprt->sc_qp)) |
904 | ib_destroy_qp(newxprt->sc_qp); | 942 | ib_destroy_qp(newxprt->sc_qp); |
905 | svc_xprt_put(&newxprt->sc_xprt); | ||
906 | } | ||
907 | rdma_destroy_id(newxprt->sc_cm_id); | 943 | rdma_destroy_id(newxprt->sc_cm_id); |
908 | /* This call to put will destroy the transport */ | 944 | /* This call to put will destroy the transport */ |
909 | svc_xprt_put(&newxprt->sc_xprt); | 945 | svc_xprt_put(&newxprt->sc_xprt); |
910 | return NULL; | 946 | return NULL; |
911 | } | 947 | } |
912 | 948 | ||
913 | /* | ||
914 | * Post an RQ WQE to the RQ when the rqst is being released. This | ||
915 | * effectively returns an RQ credit to the client. The rq_xprt_ctxt | ||
916 | * will be null if the request is deferred due to an RDMA_READ or the | ||
917 | * transport had no data ready (EAGAIN). Note that an RPC deferred in | ||
918 | * svc_process will still return the credit, this is because the data | ||
919 | * is copied and no longer consume a WQE/WC. | ||
920 | */ | ||
921 | static void svc_rdma_release_rqst(struct svc_rqst *rqstp) | 949 | static void svc_rdma_release_rqst(struct svc_rqst *rqstp) |
922 | { | 950 | { |
923 | int err; | ||
924 | struct svcxprt_rdma *rdma = | ||
925 | container_of(rqstp->rq_xprt, struct svcxprt_rdma, sc_xprt); | ||
926 | if (rqstp->rq_xprt_ctxt) { | ||
927 | BUG_ON(rqstp->rq_xprt_ctxt != rdma); | ||
928 | err = svc_rdma_post_recv(rdma); | ||
929 | if (err) | ||
930 | dprintk("svcrdma: failed to post an RQ WQE error=%d\n", | ||
931 | err); | ||
932 | } | ||
933 | rqstp->rq_xprt_ctxt = NULL; | ||
934 | } | 951 | } |
935 | 952 | ||
936 | /* | 953 | /* |
937 | * When connected, an svc_xprt has at least three references: | 954 | * When connected, an svc_xprt has at least two references: |
938 | * | ||
939 | * - A reference held by the QP. We still hold that here because this | ||
940 | * code deletes the QP and puts the reference. | ||
941 | * | 955 | * |
942 | * - A reference held by the cm_id between the ESTABLISHED and | 956 | * - A reference held by the cm_id between the ESTABLISHED and |
943 | * DISCONNECTED events. If the remote peer disconnected first, this | 957 | * DISCONNECTED events. If the remote peer disconnected first, this |
@@ -946,7 +960,7 @@ static void svc_rdma_release_rqst(struct svc_rqst *rqstp) | |||
946 | * - A reference held by the svc_recv code that called this function | 960 | * - A reference held by the svc_recv code that called this function |
947 | * as part of close processing. | 961 | * as part of close processing. |
948 | * | 962 | * |
949 | * At a minimum two references should still be held. | 963 | * At a minimum one references should still be held. |
950 | */ | 964 | */ |
951 | static void svc_rdma_detach(struct svc_xprt *xprt) | 965 | static void svc_rdma_detach(struct svc_xprt *xprt) |
952 | { | 966 | { |
@@ -956,23 +970,53 @@ static void svc_rdma_detach(struct svc_xprt *xprt) | |||
956 | 970 | ||
957 | /* Disconnect and flush posted WQE */ | 971 | /* Disconnect and flush posted WQE */ |
958 | rdma_disconnect(rdma->sc_cm_id); | 972 | rdma_disconnect(rdma->sc_cm_id); |
959 | |||
960 | /* Destroy the QP if present (not a listener) */ | ||
961 | if (rdma->sc_qp && !IS_ERR(rdma->sc_qp)) { | ||
962 | ib_destroy_qp(rdma->sc_qp); | ||
963 | svc_xprt_put(xprt); | ||
964 | } | ||
965 | |||
966 | /* Destroy the CM ID */ | ||
967 | rdma_destroy_id(rdma->sc_cm_id); | ||
968 | } | 973 | } |
969 | 974 | ||
970 | static void svc_rdma_free(struct svc_xprt *xprt) | 975 | static void __svc_rdma_free(struct work_struct *work) |
971 | { | 976 | { |
972 | struct svcxprt_rdma *rdma = (struct svcxprt_rdma *)xprt; | 977 | struct svcxprt_rdma *rdma = |
978 | container_of(work, struct svcxprt_rdma, sc_work); | ||
973 | dprintk("svcrdma: svc_rdma_free(%p)\n", rdma); | 979 | dprintk("svcrdma: svc_rdma_free(%p)\n", rdma); |
980 | |||
974 | /* We should only be called from kref_put */ | 981 | /* We should only be called from kref_put */ |
975 | BUG_ON(atomic_read(&xprt->xpt_ref.refcount) != 0); | 982 | BUG_ON(atomic_read(&rdma->sc_xprt.xpt_ref.refcount) != 0); |
983 | |||
984 | /* | ||
985 | * Destroy queued, but not processed read completions. Note | ||
986 | * that this cleanup has to be done before destroying the | ||
987 | * cm_id because the device ptr is needed to unmap the dma in | ||
988 | * svc_rdma_put_context. | ||
989 | */ | ||
990 | spin_lock_bh(&rdma->sc_read_complete_lock); | ||
991 | while (!list_empty(&rdma->sc_read_complete_q)) { | ||
992 | struct svc_rdma_op_ctxt *ctxt; | ||
993 | ctxt = list_entry(rdma->sc_read_complete_q.next, | ||
994 | struct svc_rdma_op_ctxt, | ||
995 | dto_q); | ||
996 | list_del_init(&ctxt->dto_q); | ||
997 | svc_rdma_put_context(ctxt, 1); | ||
998 | } | ||
999 | spin_unlock_bh(&rdma->sc_read_complete_lock); | ||
1000 | |||
1001 | /* Destroy queued, but not processed recv completions */ | ||
1002 | spin_lock_bh(&rdma->sc_rq_dto_lock); | ||
1003 | while (!list_empty(&rdma->sc_rq_dto_q)) { | ||
1004 | struct svc_rdma_op_ctxt *ctxt; | ||
1005 | ctxt = list_entry(rdma->sc_rq_dto_q.next, | ||
1006 | struct svc_rdma_op_ctxt, | ||
1007 | dto_q); | ||
1008 | list_del_init(&ctxt->dto_q); | ||
1009 | svc_rdma_put_context(ctxt, 1); | ||
1010 | } | ||
1011 | spin_unlock_bh(&rdma->sc_rq_dto_lock); | ||
1012 | |||
1013 | /* Warn if we leaked a resource or under-referenced */ | ||
1014 | WARN_ON(atomic_read(&rdma->sc_ctxt_used) != 0); | ||
1015 | |||
1016 | /* Destroy the QP if present (not a listener) */ | ||
1017 | if (rdma->sc_qp && !IS_ERR(rdma->sc_qp)) | ||
1018 | ib_destroy_qp(rdma->sc_qp); | ||
1019 | |||
976 | if (rdma->sc_sq_cq && !IS_ERR(rdma->sc_sq_cq)) | 1020 | if (rdma->sc_sq_cq && !IS_ERR(rdma->sc_sq_cq)) |
977 | ib_destroy_cq(rdma->sc_sq_cq); | 1021 | ib_destroy_cq(rdma->sc_sq_cq); |
978 | 1022 | ||
@@ -985,10 +1029,21 @@ static void svc_rdma_free(struct svc_xprt *xprt) | |||
985 | if (rdma->sc_pd && !IS_ERR(rdma->sc_pd)) | 1029 | if (rdma->sc_pd && !IS_ERR(rdma->sc_pd)) |
986 | ib_dealloc_pd(rdma->sc_pd); | 1030 | ib_dealloc_pd(rdma->sc_pd); |
987 | 1031 | ||
988 | destroy_context_cache(rdma->sc_ctxt_head); | 1032 | /* Destroy the CM ID */ |
1033 | rdma_destroy_id(rdma->sc_cm_id); | ||
1034 | |||
1035 | destroy_context_cache(rdma); | ||
989 | kfree(rdma); | 1036 | kfree(rdma); |
990 | } | 1037 | } |
991 | 1038 | ||
1039 | static void svc_rdma_free(struct svc_xprt *xprt) | ||
1040 | { | ||
1041 | struct svcxprt_rdma *rdma = | ||
1042 | container_of(xprt, struct svcxprt_rdma, sc_xprt); | ||
1043 | INIT_WORK(&rdma->sc_work, __svc_rdma_free); | ||
1044 | schedule_work(&rdma->sc_work); | ||
1045 | } | ||
1046 | |||
992 | static int svc_rdma_has_wspace(struct svc_xprt *xprt) | 1047 | static int svc_rdma_has_wspace(struct svc_xprt *xprt) |
993 | { | 1048 | { |
994 | struct svcxprt_rdma *rdma = | 1049 | struct svcxprt_rdma *rdma = |
@@ -1018,7 +1073,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr) | |||
1018 | int ret; | 1073 | int ret; |
1019 | 1074 | ||
1020 | if (test_bit(XPT_CLOSE, &xprt->sc_xprt.xpt_flags)) | 1075 | if (test_bit(XPT_CLOSE, &xprt->sc_xprt.xpt_flags)) |
1021 | return 0; | 1076 | return -ENOTCONN; |
1022 | 1077 | ||
1023 | BUG_ON(wr->send_flags != IB_SEND_SIGNALED); | 1078 | BUG_ON(wr->send_flags != IB_SEND_SIGNALED); |
1024 | BUG_ON(((struct svc_rdma_op_ctxt *)(unsigned long)wr->wr_id)->wr_op != | 1079 | BUG_ON(((struct svc_rdma_op_ctxt *)(unsigned long)wr->wr_id)->wr_op != |
@@ -1029,7 +1084,8 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr) | |||
1029 | if (xprt->sc_sq_depth == atomic_read(&xprt->sc_sq_count)) { | 1084 | if (xprt->sc_sq_depth == atomic_read(&xprt->sc_sq_count)) { |
1030 | spin_unlock_bh(&xprt->sc_lock); | 1085 | spin_unlock_bh(&xprt->sc_lock); |
1031 | atomic_inc(&rdma_stat_sq_starve); | 1086 | atomic_inc(&rdma_stat_sq_starve); |
1032 | /* See if we can reap some SQ WR */ | 1087 | |
1088 | /* See if we can opportunistically reap SQ WR to make room */ | ||
1033 | sq_cq_reap(xprt); | 1089 | sq_cq_reap(xprt); |
1034 | 1090 | ||
1035 | /* Wait until SQ WR available if SQ still full */ | 1091 | /* Wait until SQ WR available if SQ still full */ |
@@ -1041,22 +1097,25 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr) | |||
1041 | continue; | 1097 | continue; |
1042 | } | 1098 | } |
1043 | /* Bumped used SQ WR count and post */ | 1099 | /* Bumped used SQ WR count and post */ |
1100 | svc_xprt_get(&xprt->sc_xprt); | ||
1044 | ret = ib_post_send(xprt->sc_qp, wr, &bad_wr); | 1101 | ret = ib_post_send(xprt->sc_qp, wr, &bad_wr); |
1045 | if (!ret) | 1102 | if (!ret) |
1046 | atomic_inc(&xprt->sc_sq_count); | 1103 | atomic_inc(&xprt->sc_sq_count); |
1047 | else | 1104 | else { |
1105 | svc_xprt_put(&xprt->sc_xprt); | ||
1048 | dprintk("svcrdma: failed to post SQ WR rc=%d, " | 1106 | dprintk("svcrdma: failed to post SQ WR rc=%d, " |
1049 | "sc_sq_count=%d, sc_sq_depth=%d\n", | 1107 | "sc_sq_count=%d, sc_sq_depth=%d\n", |
1050 | ret, atomic_read(&xprt->sc_sq_count), | 1108 | ret, atomic_read(&xprt->sc_sq_count), |
1051 | xprt->sc_sq_depth); | 1109 | xprt->sc_sq_depth); |
1110 | } | ||
1052 | spin_unlock_bh(&xprt->sc_lock); | 1111 | spin_unlock_bh(&xprt->sc_lock); |
1053 | break; | 1112 | break; |
1054 | } | 1113 | } |
1055 | return ret; | 1114 | return ret; |
1056 | } | 1115 | } |
1057 | 1116 | ||
1058 | int svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp, | 1117 | void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp, |
1059 | enum rpcrdma_errcode err) | 1118 | enum rpcrdma_errcode err) |
1060 | { | 1119 | { |
1061 | struct ib_send_wr err_wr; | 1120 | struct ib_send_wr err_wr; |
1062 | struct ib_sge sge; | 1121 | struct ib_sge sge; |
@@ -1094,9 +1153,8 @@ int svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp, | |||
1094 | /* Post It */ | 1153 | /* Post It */ |
1095 | ret = svc_rdma_send(xprt, &err_wr); | 1154 | ret = svc_rdma_send(xprt, &err_wr); |
1096 | if (ret) { | 1155 | if (ret) { |
1097 | dprintk("svcrdma: Error posting send = %d\n", ret); | 1156 | dprintk("svcrdma: Error %d posting send for protocol error\n", |
1157 | ret); | ||
1098 | svc_rdma_put_context(ctxt, 1); | 1158 | svc_rdma_put_context(ctxt, 1); |
1099 | } | 1159 | } |
1100 | |||
1101 | return ret; | ||
1102 | } | 1160 | } |
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index a1b0fbe3ea35..b976d9ed10e4 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
@@ -50,19 +50,8 @@ static int verify_one_alg(struct nlattr **attrs, enum xfrm_attr_type_t type) | |||
50 | 50 | ||
51 | switch (type) { | 51 | switch (type) { |
52 | case XFRMA_ALG_AUTH: | 52 | case XFRMA_ALG_AUTH: |
53 | if (!algp->alg_key_len && | ||
54 | strcmp(algp->alg_name, "digest_null") != 0) | ||
55 | return -EINVAL; | ||
56 | break; | ||
57 | |||
58 | case XFRMA_ALG_CRYPT: | 53 | case XFRMA_ALG_CRYPT: |
59 | if (!algp->alg_key_len && | ||
60 | strcmp(algp->alg_name, "cipher_null") != 0) | ||
61 | return -EINVAL; | ||
62 | break; | ||
63 | |||
64 | case XFRMA_ALG_COMP: | 54 | case XFRMA_ALG_COMP: |
65 | /* Zero length keys are legal. */ | ||
66 | break; | 55 | break; |
67 | 56 | ||
68 | default: | 57 | default: |
diff --git a/sound/core/sound.c b/sound/core/sound.c index 812f91b3de5b..6c8ab48c689a 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c | |||
@@ -259,8 +259,9 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev, | |||
259 | return minor; | 259 | return minor; |
260 | } | 260 | } |
261 | snd_minors[minor] = preg; | 261 | snd_minors[minor] = preg; |
262 | preg->dev = device_create(sound_class, device, MKDEV(major, minor), | 262 | preg->dev = device_create_drvdata(sound_class, device, |
263 | "%s", name); | 263 | MKDEV(major, minor), |
264 | private_data, "%s", name); | ||
264 | if (IS_ERR(preg->dev)) { | 265 | if (IS_ERR(preg->dev)) { |
265 | snd_minors[minor] = NULL; | 266 | snd_minors[minor] = NULL; |
266 | mutex_unlock(&sound_mutex); | 267 | mutex_unlock(&sound_mutex); |
@@ -269,9 +270,6 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev, | |||
269 | return minor; | 270 | return minor; |
270 | } | 271 | } |
271 | 272 | ||
272 | if (preg->dev) | ||
273 | dev_set_drvdata(preg->dev, private_data); | ||
274 | |||
275 | mutex_unlock(&sound_mutex); | 273 | mutex_unlock(&sound_mutex); |
276 | return 0; | 274 | return 0; |
277 | } | 275 | } |
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c index 54a1f9036c66..1899cf0685bc 100644 --- a/sound/drivers/pcsp/pcsp.c +++ b/sound/drivers/pcsp/pcsp.c | |||
@@ -96,7 +96,7 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev) | |||
96 | return -EINVAL; | 96 | return -EINVAL; |
97 | 97 | ||
98 | hrtimer_init(&pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); | 98 | hrtimer_init(&pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
99 | pcsp_chip.timer.cb_mode = HRTIMER_CB_IRQSAFE; | 99 | pcsp_chip.timer.cb_mode = HRTIMER_CB_SOFTIRQ; |
100 | pcsp_chip.timer.function = pcsp_do_timer; | 100 | pcsp_chip.timer.function = pcsp_do_timer; |
101 | 101 | ||
102 | card = snd_card_new(index, id, THIS_MODULE, 0); | 102 | card = snd_card_new(index, id, THIS_MODULE, 0); |
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c index 7ad4a1534b2b..e341f3f83b6a 100644 --- a/sound/drivers/pcsp/pcsp_lib.c +++ b/sound/drivers/pcsp/pcsp_lib.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/moduleparam.h> | 10 | #include <linux/moduleparam.h> |
11 | #include <sound/pcm.h> | 11 | #include <sound/pcm.h> |
12 | #include <linux/interrupt.h> | ||
13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
14 | #include "pcsp.h" | 13 | #include "pcsp.h" |
15 | 14 | ||
@@ -20,34 +19,8 @@ MODULE_PARM_DESC(nforce_wa, "Apply NForce chipset workaround " | |||
20 | 19 | ||
21 | #define DMIX_WANTS_S16 1 | 20 | #define DMIX_WANTS_S16 1 |
22 | 21 | ||
23 | static void pcsp_start_timer(unsigned long dummy) | ||
24 | { | ||
25 | hrtimer_start(&pcsp_chip.timer, ktime_set(0, 0), HRTIMER_MODE_REL); | ||
26 | } | ||
27 | |||
28 | /* | ||
29 | * We need the hrtimer_start as a tasklet to avoid | ||
30 | * the nasty locking problem. :( | ||
31 | * The problem: | ||
32 | * - The timer handler is called with the cpu_base->lock | ||
33 | * already held by hrtimer code. | ||
34 | * - snd_pcm_period_elapsed() takes the | ||
35 | * substream->self_group.lock. | ||
36 | * So far so good. | ||
37 | * But the snd_pcsp_trigger() is called with the | ||
38 | * substream->self_group.lock held, and it calls | ||
39 | * hrtimer_start(), which takes the cpu_base->lock. | ||
40 | * You see the problem. We have the code pathes | ||
41 | * which take two locks in a reverse order. This | ||
42 | * can deadlock and the lock validator complains. | ||
43 | * The only solution I could find was to move the | ||
44 | * hrtimer_start() into a tasklet. -stsp | ||
45 | */ | ||
46 | static DECLARE_TASKLET(pcsp_start_timer_tasklet, pcsp_start_timer, 0); | ||
47 | |||
48 | enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) | 22 | enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) |
49 | { | 23 | { |
50 | unsigned long flags; | ||
51 | unsigned char timer_cnt, val; | 24 | unsigned char timer_cnt, val; |
52 | int fmt_size, periods_elapsed; | 25 | int fmt_size, periods_elapsed; |
53 | u64 ns; | 26 | u64 ns; |
@@ -66,9 +39,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) | |||
66 | return HRTIMER_RESTART; | 39 | return HRTIMER_RESTART; |
67 | } | 40 | } |
68 | 41 | ||
69 | /* hrtimer calls us from both hardirq and softirq contexts, | 42 | spin_lock_irq(&chip->substream_lock); |
70 | * so irqsave :( */ | ||
71 | spin_lock_irqsave(&chip->substream_lock, flags); | ||
72 | /* Takashi Iwai says regarding this extra lock: | 43 | /* Takashi Iwai says regarding this extra lock: |
73 | 44 | ||
74 | If the irq handler handles some data on the DMA buffer, it should | 45 | If the irq handler handles some data on the DMA buffer, it should |
@@ -139,7 +110,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) | |||
139 | chip->period_ptr %= buffer_bytes; | 110 | chip->period_ptr %= buffer_bytes; |
140 | } | 111 | } |
141 | 112 | ||
142 | spin_unlock_irqrestore(&chip->substream_lock, flags); | 113 | spin_unlock_irq(&chip->substream_lock); |
143 | 114 | ||
144 | if (!atomic_read(&chip->timer_active)) | 115 | if (!atomic_read(&chip->timer_active)) |
145 | return HRTIMER_NORESTART; | 116 | return HRTIMER_NORESTART; |
@@ -153,7 +124,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) | |||
153 | exit_nr_unlock2: | 124 | exit_nr_unlock2: |
154 | snd_pcm_stream_unlock(substream); | 125 | snd_pcm_stream_unlock(substream); |
155 | exit_nr_unlock1: | 126 | exit_nr_unlock1: |
156 | spin_unlock_irqrestore(&chip->substream_lock, flags); | 127 | spin_unlock_irq(&chip->substream_lock); |
157 | return HRTIMER_NORESTART; | 128 | return HRTIMER_NORESTART; |
158 | } | 129 | } |
159 | 130 | ||
@@ -174,7 +145,7 @@ static void pcsp_start_playing(struct snd_pcsp *chip) | |||
174 | atomic_set(&chip->timer_active, 1); | 145 | atomic_set(&chip->timer_active, 1); |
175 | chip->thalf = 0; | 146 | chip->thalf = 0; |
176 | 147 | ||
177 | tasklet_schedule(&pcsp_start_timer_tasklet); | 148 | hrtimer_start(&pcsp_chip.timer, ktime_set(0, 0), HRTIMER_MODE_REL); |
178 | } | 149 | } |
179 | 150 | ||
180 | static void pcsp_stop_playing(struct snd_pcsp *chip) | 151 | static void pcsp_stop_playing(struct snd_pcsp *chip) |
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 857008bb7167..3be2dc1025b5 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
@@ -79,7 +79,7 @@ config SOUND_TRIDENT | |||
79 | 79 | ||
80 | config SOUND_MSNDCLAS | 80 | config SOUND_MSNDCLAS |
81 | tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey" | 81 | tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey" |
82 | depends on SOUND_PRIME && (m || !STANDALONE) | 82 | depends on SOUND_PRIME && (m || !STANDALONE) && ISA |
83 | help | 83 | help |
84 | Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or | 84 | Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or |
85 | Monterey (not for the Pinnacle or Fiji). | 85 | Monterey (not for the Pinnacle or Fiji). |
@@ -143,7 +143,7 @@ config MSNDCLAS_IO | |||
143 | 143 | ||
144 | config SOUND_MSNDPIN | 144 | config SOUND_MSNDPIN |
145 | tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji" | 145 | tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji" |
146 | depends on SOUND_PRIME && (m || !STANDALONE) | 146 | depends on SOUND_PRIME && (m || !STANDALONE) && ISA |
147 | help | 147 | help |
148 | Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji. | 148 | Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji. |
149 | See <file:Documentation/sound/oss/MultiSound> for important information | 149 | See <file:Documentation/sound/oss/MultiSound> for important information |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6d4df45e81e0..864b2f598c38 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -2981,7 +2981,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = { | |||
2981 | /* SND_PCI_QUIRK(0x1043, 0x1964, "ASUS", ALC880_ASUS_DIG), */ | 2981 | /* SND_PCI_QUIRK(0x1043, 0x1964, "ASUS", ALC880_ASUS_DIG), */ |
2982 | SND_PCI_QUIRK(0x1043, 0x1973, "ASUS", ALC880_ASUS_DIG), | 2982 | SND_PCI_QUIRK(0x1043, 0x1973, "ASUS", ALC880_ASUS_DIG), |
2983 | SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS", ALC880_ASUS_DIG), | 2983 | SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS", ALC880_ASUS_DIG), |
2984 | SND_PCI_QUIRK(0x1043, 0x814e, "ASUS", ALC880_ASUS), | 2984 | SND_PCI_QUIRK(0x1043, 0x814e, "ASUS P5GD1 w/SPDIF", ALC880_6ST_DIG), |
2985 | SND_PCI_QUIRK(0x1043, 0x8181, "ASUS P4GPL", ALC880_ASUS_DIG), | 2985 | SND_PCI_QUIRK(0x1043, 0x8181, "ASUS P4GPL", ALC880_ASUS_DIG), |
2986 | SND_PCI_QUIRK(0x1043, 0x8196, "ASUS P5GD1", ALC880_6ST), | 2986 | SND_PCI_QUIRK(0x1043, 0x8196, "ASUS P5GD1", ALC880_6ST), |
2987 | SND_PCI_QUIRK(0x1043, 0x81b4, "ASUS", ALC880_6ST), | 2987 | SND_PCI_QUIRK(0x1043, 0x81b4, "ASUS", ALC880_6ST), |
@@ -8757,35 +8757,39 @@ static struct hda_input_mux alc262_HP_D7000_capture_source = { | |||
8757 | }, | 8757 | }, |
8758 | }; | 8758 | }; |
8759 | 8759 | ||
8760 | /* mute/unmute internal speaker according to the hp jack and mute state */ | 8760 | /* mute/unmute internal speaker according to the hp jacks and mute state */ |
8761 | static void alc262_fujitsu_automute(struct hda_codec *codec, int force) | 8761 | static void alc262_fujitsu_automute(struct hda_codec *codec, int force) |
8762 | { | 8762 | { |
8763 | struct alc_spec *spec = codec->spec; | 8763 | struct alc_spec *spec = codec->spec; |
8764 | unsigned int mute; | 8764 | unsigned int mute; |
8765 | 8765 | ||
8766 | if (force || !spec->sense_updated) { | 8766 | if (force || !spec->sense_updated) { |
8767 | unsigned int present_int_hp, present_dock_hp; | 8767 | unsigned int present; |
8768 | /* need to execute and sync at first */ | 8768 | /* need to execute and sync at first */ |
8769 | snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0); | 8769 | snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0); |
8770 | present_int_hp = snd_hda_codec_read(codec, 0x14, 0, | 8770 | /* check laptop HP jack */ |
8771 | AC_VERB_GET_PIN_SENSE, 0); | 8771 | present = snd_hda_codec_read(codec, 0x14, 0, |
8772 | snd_hda_codec_read(codec, 0x1B, 0, AC_VERB_SET_PIN_SENSE, 0); | 8772 | AC_VERB_GET_PIN_SENSE, 0); |
8773 | present_dock_hp = snd_hda_codec_read(codec, 0x1b, 0, | 8773 | /* need to execute and sync at first */ |
8774 | AC_VERB_GET_PIN_SENSE, 0); | 8774 | snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0); |
8775 | spec->jack_present = (present_int_hp & 0x80000000) != 0; | 8775 | /* check docking HP jack */ |
8776 | spec->jack_present |= (present_dock_hp & 0x80000000) != 0; | 8776 | present |= snd_hda_codec_read(codec, 0x1b, 0, |
8777 | AC_VERB_GET_PIN_SENSE, 0); | ||
8778 | if (present & AC_PINSENSE_PRESENCE) | ||
8779 | spec->jack_present = 1; | ||
8780 | else | ||
8781 | spec->jack_present = 0; | ||
8777 | spec->sense_updated = 1; | 8782 | spec->sense_updated = 1; |
8778 | } | 8783 | } |
8779 | if (spec->jack_present) { | 8784 | /* unmute internal speaker only if both HPs are unplugged and |
8780 | /* mute internal speaker */ | 8785 | * master switch is on |
8781 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | 8786 | */ |
8782 | HDA_AMP_MUTE, HDA_AMP_MUTE); | 8787 | if (spec->jack_present) |
8783 | } else { | 8788 | mute = HDA_AMP_MUTE; |
8784 | /* unmute internal speaker if necessary */ | 8789 | else |
8785 | mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0); | 8790 | mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0); |
8786 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | 8791 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, |
8787 | HDA_AMP_MUTE, mute); | 8792 | HDA_AMP_MUTE, mute); |
8788 | } | ||
8789 | } | 8793 | } |
8790 | 8794 | ||
8791 | /* unsolicited event for HP jack sensing */ | 8795 | /* unsolicited event for HP jack sensing */ |
@@ -8797,6 +8801,11 @@ static void alc262_fujitsu_unsol_event(struct hda_codec *codec, | |||
8797 | alc262_fujitsu_automute(codec, 1); | 8801 | alc262_fujitsu_automute(codec, 1); |
8798 | } | 8802 | } |
8799 | 8803 | ||
8804 | static void alc262_fujitsu_init_hook(struct hda_codec *codec) | ||
8805 | { | ||
8806 | alc262_fujitsu_automute(codec, 1); | ||
8807 | } | ||
8808 | |||
8800 | /* bind volumes of both NID 0x0c and 0x0d */ | 8809 | /* bind volumes of both NID 0x0c and 0x0d */ |
8801 | static struct hda_bind_ctls alc262_fujitsu_bind_master_vol = { | 8810 | static struct hda_bind_ctls alc262_fujitsu_bind_master_vol = { |
8802 | .ops = &snd_hda_bind_vol, | 8811 | .ops = &snd_hda_bind_vol, |
@@ -9570,6 +9579,7 @@ static struct alc_config_preset alc262_presets[] = { | |||
9570 | .channel_mode = alc262_modes, | 9579 | .channel_mode = alc262_modes, |
9571 | .input_mux = &alc262_fujitsu_capture_source, | 9580 | .input_mux = &alc262_fujitsu_capture_source, |
9572 | .unsol_event = alc262_fujitsu_unsol_event, | 9581 | .unsol_event = alc262_fujitsu_unsol_event, |
9582 | .init_hook = alc262_fujitsu_init_hook, | ||
9573 | }, | 9583 | }, |
9574 | [ALC262_HP_BPC] = { | 9584 | [ALC262_HP_BPC] = { |
9575 | .mixers = { alc262_HP_BPC_mixer }, | 9585 | .mixers = { alc262_HP_BPC_mixer }, |
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c index e97d8b2ac16a..a972f77bd785 100644 --- a/sound/usb/caiaq/caiaq-device.c +++ b/sound/usb/caiaq/caiaq-device.c | |||
@@ -351,8 +351,8 @@ static struct snd_card* create_card(struct usb_device* usb_dev) | |||
351 | dev = caiaqdev(card); | 351 | dev = caiaqdev(card); |
352 | dev->chip.dev = usb_dev; | 352 | dev->chip.dev = usb_dev; |
353 | dev->chip.card = card; | 353 | dev->chip.card = card; |
354 | dev->chip.usb_id = USB_ID(usb_dev->descriptor.idVendor, | 354 | dev->chip.usb_id = USB_ID(le16_to_cpu(usb_dev->descriptor.idVendor), |
355 | usb_dev->descriptor.idProduct); | 355 | le16_to_cpu(usb_dev->descriptor.idProduct)); |
356 | spin_lock_init(&dev->spinlock); | 356 | spin_lock_init(&dev->spinlock); |
357 | snd_card_set_dev(card, &usb_dev->dev); | 357 | snd_card_set_dev(card, &usb_dev->dev); |
358 | 358 | ||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index f7ba099049ea..2d29e260da3d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -758,25 +758,26 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn) | |||
758 | */ | 758 | */ |
759 | void kvm_vcpu_block(struct kvm_vcpu *vcpu) | 759 | void kvm_vcpu_block(struct kvm_vcpu *vcpu) |
760 | { | 760 | { |
761 | DECLARE_WAITQUEUE(wait, current); | 761 | DEFINE_WAIT(wait); |
762 | 762 | ||
763 | add_wait_queue(&vcpu->wq, &wait); | 763 | for (;;) { |
764 | 764 | prepare_to_wait(&vcpu->wq, &wait, TASK_INTERRUPTIBLE); | |
765 | /* | 765 | |
766 | * We will block until either an interrupt or a signal wakes us up | 766 | if (kvm_cpu_has_interrupt(vcpu)) |
767 | */ | 767 | break; |
768 | while (!kvm_cpu_has_interrupt(vcpu) | 768 | if (kvm_cpu_has_pending_timer(vcpu)) |
769 | && !kvm_cpu_has_pending_timer(vcpu) | 769 | break; |
770 | && !signal_pending(current) | 770 | if (kvm_arch_vcpu_runnable(vcpu)) |
771 | && !kvm_arch_vcpu_runnable(vcpu)) { | 771 | break; |
772 | set_current_state(TASK_INTERRUPTIBLE); | 772 | if (signal_pending(current)) |
773 | break; | ||
774 | |||
773 | vcpu_put(vcpu); | 775 | vcpu_put(vcpu); |
774 | schedule(); | 776 | schedule(); |
775 | vcpu_load(vcpu); | 777 | vcpu_load(vcpu); |
776 | } | 778 | } |
777 | 779 | ||
778 | __set_current_state(TASK_RUNNING); | 780 | finish_wait(&vcpu->wq, &wait); |
779 | remove_wait_queue(&vcpu->wq, &wait); | ||
780 | } | 781 | } |
781 | 782 | ||
782 | void kvm_resched(struct kvm_vcpu *vcpu) | 783 | void kvm_resched(struct kvm_vcpu *vcpu) |