diff options
-rw-r--r-- | arch/arm/configs/ep93xx_defconfig | 79 | ||||
-rw-r--r-- | arch/arm/configs/ixp2000_defconfig | 59 | ||||
-rw-r--r-- | arch/arm/configs/ixp23xx_defconfig | 58 | ||||
-rw-r--r-- | arch/arm/kernel/setup.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 2 | ||||
-rw-r--r-- | drivers/net/sungem_phy.c | 11 | ||||
-rw-r--r-- | include/linux/skbuff.h | 7 | ||||
-rw-r--r-- | include/net/sock.h | 1 | ||||
-rw-r--r-- | net/bridge/netfilter/ebtables.c | 20 | ||||
-rw-r--r-- | net/core/skbuff.c | 8 | ||||
-rw-r--r-- | net/core/stream.c | 1 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 10 | ||||
-rw-r--r-- | net/llc/llc_input.c | 3 | ||||
-rw-r--r-- | net/socket.c | 1 |
14 files changed, 170 insertions, 98 deletions
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig index 8dcc8e8ec813..b69e88bbc909 100644 --- a/arch/arm/configs/ep93xx_defconfig +++ b/arch/arm/configs/ep93xx_defconfig | |||
@@ -1,12 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.16 | 3 | # Linux kernel version: 2.6.17-rc2 |
4 | # Mon Mar 20 14:54:51 2006 | 4 | # Wed Apr 19 21:21:01 2006 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | CONFIG_GENERIC_HWEIGHT=y | ||
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 10 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
11 | CONFIG_VECTORS_BASE=0xffff0000 | ||
10 | 12 | ||
11 | # | 13 | # |
12 | # Code maturity level options | 14 | # Code maturity level options |
@@ -28,6 +30,7 @@ CONFIG_SYSCTL=y | |||
28 | # CONFIG_AUDIT is not set | 30 | # CONFIG_AUDIT is not set |
29 | CONFIG_IKCONFIG=y | 31 | CONFIG_IKCONFIG=y |
30 | CONFIG_IKCONFIG_PROC=y | 32 | CONFIG_IKCONFIG_PROC=y |
33 | # CONFIG_RELAY is not set | ||
31 | CONFIG_INITRAMFS_SOURCE="" | 34 | CONFIG_INITRAMFS_SOURCE="" |
32 | CONFIG_UID16=y | 35 | CONFIG_UID16=y |
33 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 36 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -43,10 +46,6 @@ CONFIG_BASE_FULL=y | |||
43 | CONFIG_FUTEX=y | 46 | CONFIG_FUTEX=y |
44 | CONFIG_EPOLL=y | 47 | CONFIG_EPOLL=y |
45 | CONFIG_SHMEM=y | 48 | CONFIG_SHMEM=y |
46 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
47 | CONFIG_CC_ALIGN_LABELS=0 | ||
48 | CONFIG_CC_ALIGN_LOOPS=0 | ||
49 | CONFIG_CC_ALIGN_JUMPS=0 | ||
50 | CONFIG_SLAB=y | 49 | CONFIG_SLAB=y |
51 | # CONFIG_TINY_SHMEM is not set | 50 | # CONFIG_TINY_SHMEM is not set |
52 | CONFIG_BASE_SMALL=0 | 51 | CONFIG_BASE_SMALL=0 |
@@ -59,7 +58,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
59 | CONFIG_MODULES=y | 58 | CONFIG_MODULES=y |
60 | CONFIG_MODULE_UNLOAD=y | 59 | CONFIG_MODULE_UNLOAD=y |
61 | CONFIG_MODULE_FORCE_UNLOAD=y | 60 | CONFIG_MODULE_FORCE_UNLOAD=y |
62 | CONFIG_OBSOLETE_MODPARM=y | ||
63 | # CONFIG_MODVERSIONS is not set | 61 | # CONFIG_MODVERSIONS is not set |
64 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 62 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
65 | CONFIG_KMOD=y | 63 | CONFIG_KMOD=y |
@@ -67,6 +65,7 @@ CONFIG_KMOD=y | |||
67 | # | 65 | # |
68 | # Block layer | 66 | # Block layer |
69 | # | 67 | # |
68 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
70 | 69 | ||
71 | # | 70 | # |
72 | # IO Schedulers | 71 | # IO Schedulers |
@@ -94,6 +93,7 @@ CONFIG_ARCH_EP93XX=y | |||
94 | # CONFIG_ARCH_IOP3XX is not set | 93 | # CONFIG_ARCH_IOP3XX is not set |
95 | # CONFIG_ARCH_IXP4XX is not set | 94 | # CONFIG_ARCH_IXP4XX is not set |
96 | # CONFIG_ARCH_IXP2000 is not set | 95 | # CONFIG_ARCH_IXP2000 is not set |
96 | # CONFIG_ARCH_IXP23XX is not set | ||
97 | # CONFIG_ARCH_L7200 is not set | 97 | # CONFIG_ARCH_L7200 is not set |
98 | # CONFIG_ARCH_PXA is not set | 98 | # CONFIG_ARCH_PXA is not set |
99 | # CONFIG_ARCH_RPC is not set | 99 | # CONFIG_ARCH_RPC is not set |
@@ -112,7 +112,6 @@ CONFIG_ARCH_EP93XX=y | |||
112 | # | 112 | # |
113 | # Cirrus EP93xx Implementation Options | 113 | # Cirrus EP93xx Implementation Options |
114 | # | 114 | # |
115 | CONFIG_CRUNCH=y | ||
116 | 115 | ||
117 | # | 116 | # |
118 | # EP93xx Platforms | 117 | # EP93xx Platforms |
@@ -232,12 +231,15 @@ CONFIG_SYN_COOKIES=y | |||
232 | # CONFIG_INET_AH is not set | 231 | # CONFIG_INET_AH is not set |
233 | # CONFIG_INET_ESP is not set | 232 | # CONFIG_INET_ESP is not set |
234 | # CONFIG_INET_IPCOMP is not set | 233 | # CONFIG_INET_IPCOMP is not set |
234 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
235 | # CONFIG_INET_TUNNEL is not set | 235 | # CONFIG_INET_TUNNEL is not set |
236 | CONFIG_INET_DIAG=y | 236 | CONFIG_INET_DIAG=y |
237 | CONFIG_INET_TCP_DIAG=y | 237 | CONFIG_INET_TCP_DIAG=y |
238 | # CONFIG_TCP_CONG_ADVANCED is not set | 238 | # CONFIG_TCP_CONG_ADVANCED is not set |
239 | CONFIG_TCP_CONG_BIC=y | 239 | CONFIG_TCP_CONG_BIC=y |
240 | # CONFIG_IPV6 is not set | 240 | # CONFIG_IPV6 is not set |
241 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
242 | # CONFIG_INET6_TUNNEL is not set | ||
241 | # CONFIG_NETFILTER is not set | 243 | # CONFIG_NETFILTER is not set |
242 | 244 | ||
243 | # | 245 | # |
@@ -346,7 +348,6 @@ CONFIG_MTD_CFI_I2=y | |||
346 | # CONFIG_MTD_OTP is not set | 348 | # CONFIG_MTD_OTP is not set |
347 | CONFIG_MTD_CFI_INTELEXT=y | 349 | CONFIG_MTD_CFI_INTELEXT=y |
348 | CONFIG_MTD_CFI_AMDSTD=y | 350 | CONFIG_MTD_CFI_AMDSTD=y |
349 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
350 | CONFIG_MTD_CFI_STAA=y | 351 | CONFIG_MTD_CFI_STAA=y |
351 | CONFIG_MTD_CFI_UTIL=y | 352 | CONFIG_MTD_CFI_UTIL=y |
352 | # CONFIG_MTD_RAM is not set | 353 | # CONFIG_MTD_RAM is not set |
@@ -371,7 +372,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
371 | # CONFIG_MTD_SLRAM is not set | 372 | # CONFIG_MTD_SLRAM is not set |
372 | # CONFIG_MTD_PHRAM is not set | 373 | # CONFIG_MTD_PHRAM is not set |
373 | # CONFIG_MTD_MTDRAM is not set | 374 | # CONFIG_MTD_MTDRAM is not set |
374 | # CONFIG_MTD_BLKMTD is not set | ||
375 | # CONFIG_MTD_BLOCK2MTD is not set | 375 | # CONFIG_MTD_BLOCK2MTD is not set |
376 | 376 | ||
377 | # | 377 | # |
@@ -412,7 +412,7 @@ CONFIG_MTD_NAND_IDS=y | |||
412 | # CONFIG_BLK_DEV_NBD is not set | 412 | # CONFIG_BLK_DEV_NBD is not set |
413 | # CONFIG_BLK_DEV_UB is not set | 413 | # CONFIG_BLK_DEV_UB is not set |
414 | # CONFIG_BLK_DEV_RAM is not set | 414 | # CONFIG_BLK_DEV_RAM is not set |
415 | CONFIG_BLK_DEV_RAM_COUNT=16 | 415 | # CONFIG_BLK_DEV_INITRD is not set |
416 | # CONFIG_CDROM_PKTCDVD is not set | 416 | # CONFIG_CDROM_PKTCDVD is not set |
417 | # CONFIG_ATA_OVER_ETH is not set | 417 | # CONFIG_ATA_OVER_ETH is not set |
418 | 418 | ||
@@ -576,13 +576,13 @@ CONFIG_WATCHDOG=y | |||
576 | # Watchdog Device Drivers | 576 | # Watchdog Device Drivers |
577 | # | 577 | # |
578 | # CONFIG_SOFT_WATCHDOG is not set | 578 | # CONFIG_SOFT_WATCHDOG is not set |
579 | CONFIG_EP93XX_WATCHDOG=y | ||
579 | 580 | ||
580 | # | 581 | # |
581 | # USB-based Watchdog Cards | 582 | # USB-based Watchdog Cards |
582 | # | 583 | # |
583 | # CONFIG_USBPCWATCHDOG is not set | 584 | # CONFIG_USBPCWATCHDOG is not set |
584 | # CONFIG_NVRAM is not set | 585 | # CONFIG_NVRAM is not set |
585 | # CONFIG_RTC is not set | ||
586 | # CONFIG_DTLK is not set | 586 | # CONFIG_DTLK is not set |
587 | # CONFIG_R3964 is not set | 587 | # CONFIG_R3964 is not set |
588 | 588 | ||
@@ -626,9 +626,7 @@ CONFIG_I2C_ALGOBIT=y | |||
626 | # CONFIG_SENSORS_PCF8574 is not set | 626 | # CONFIG_SENSORS_PCF8574 is not set |
627 | # CONFIG_SENSORS_PCA9539 is not set | 627 | # CONFIG_SENSORS_PCA9539 is not set |
628 | # CONFIG_SENSORS_PCF8591 is not set | 628 | # CONFIG_SENSORS_PCF8591 is not set |
629 | # CONFIG_SENSORS_RTC8564 is not set | ||
630 | # CONFIG_SENSORS_MAX6875 is not set | 629 | # CONFIG_SENSORS_MAX6875 is not set |
631 | # CONFIG_RTC_X1205_I2C is not set | ||
632 | CONFIG_I2C_DEBUG_CORE=y | 630 | CONFIG_I2C_DEBUG_CORE=y |
633 | CONFIG_I2C_DEBUG_ALGO=y | 631 | CONFIG_I2C_DEBUG_ALGO=y |
634 | CONFIG_I2C_DEBUG_BUS=y | 632 | CONFIG_I2C_DEBUG_BUS=y |
@@ -690,7 +688,16 @@ CONFIG_HWMON=y | |||
690 | # | 688 | # |
691 | 689 | ||
692 | # | 690 | # |
693 | # Multimedia Capabilities Port drivers | 691 | # LED devices |
692 | # | ||
693 | # CONFIG_NEW_LEDS is not set | ||
694 | |||
695 | # | ||
696 | # LED drivers | ||
697 | # | ||
698 | |||
699 | # | ||
700 | # LED Triggers | ||
694 | # | 701 | # |
695 | 702 | ||
696 | # | 703 | # |
@@ -702,6 +709,7 @@ CONFIG_HWMON=y | |||
702 | # Digital Video Broadcasting Devices | 709 | # Digital Video Broadcasting Devices |
703 | # | 710 | # |
704 | # CONFIG_DVB is not set | 711 | # CONFIG_DVB is not set |
712 | # CONFIG_USB_DABUSB is not set | ||
705 | 713 | ||
706 | # | 714 | # |
707 | # Graphics support | 715 | # Graphics support |
@@ -718,6 +726,7 @@ CONFIG_HWMON=y | |||
718 | # | 726 | # |
719 | CONFIG_USB_ARCH_HAS_HCD=y | 727 | CONFIG_USB_ARCH_HAS_HCD=y |
720 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 728 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
729 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
721 | CONFIG_USB=y | 730 | CONFIG_USB=y |
722 | CONFIG_USB_DEBUG=y | 731 | CONFIG_USB_DEBUG=y |
723 | 732 | ||
@@ -776,15 +785,6 @@ CONFIG_USB_STORAGE=y | |||
776 | # CONFIG_USB_MICROTEK is not set | 785 | # CONFIG_USB_MICROTEK is not set |
777 | 786 | ||
778 | # | 787 | # |
779 | # USB Multimedia devices | ||
780 | # | ||
781 | # CONFIG_USB_DABUSB is not set | ||
782 | |||
783 | # | ||
784 | # Video4Linux support is needed for USB Multimedia device support | ||
785 | # | ||
786 | |||
787 | # | ||
788 | # USB Network Adapters | 788 | # USB Network Adapters |
789 | # | 789 | # |
790 | # CONFIG_USB_CATC is not set | 790 | # CONFIG_USB_CATC is not set |
@@ -813,6 +813,7 @@ CONFIG_USB_SERIAL_CONSOLE=y | |||
813 | # CONFIG_USB_SERIAL_CYPRESS_M8 is not set | 813 | # CONFIG_USB_SERIAL_CYPRESS_M8 is not set |
814 | # CONFIG_USB_SERIAL_EMPEG is not set | 814 | # CONFIG_USB_SERIAL_EMPEG is not set |
815 | # CONFIG_USB_SERIAL_FTDI_SIO is not set | 815 | # CONFIG_USB_SERIAL_FTDI_SIO is not set |
816 | # CONFIG_USB_SERIAL_FUNSOFT is not set | ||
816 | # CONFIG_USB_SERIAL_VISOR is not set | 817 | # CONFIG_USB_SERIAL_VISOR is not set |
817 | # CONFIG_USB_SERIAL_IPAQ is not set | 818 | # CONFIG_USB_SERIAL_IPAQ is not set |
818 | # CONFIG_USB_SERIAL_IR is not set | 819 | # CONFIG_USB_SERIAL_IR is not set |
@@ -825,6 +826,7 @@ CONFIG_USB_SERIAL_CONSOLE=y | |||
825 | # CONFIG_USB_SERIAL_KLSI is not set | 826 | # CONFIG_USB_SERIAL_KLSI is not set |
826 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set | 827 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set |
827 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 828 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
829 | # CONFIG_USB_SERIAL_NAVMAN is not set | ||
828 | CONFIG_USB_SERIAL_PL2303=y | 830 | CONFIG_USB_SERIAL_PL2303=y |
829 | # CONFIG_USB_SERIAL_HP4X is not set | 831 | # CONFIG_USB_SERIAL_HP4X is not set |
830 | # CONFIG_USB_SERIAL_SAFE is not set | 832 | # CONFIG_USB_SERIAL_SAFE is not set |
@@ -865,6 +867,32 @@ CONFIG_USB_SERIAL_PL2303=y | |||
865 | # CONFIG_MMC is not set | 867 | # CONFIG_MMC is not set |
866 | 868 | ||
867 | # | 869 | # |
870 | # Real Time Clock | ||
871 | # | ||
872 | CONFIG_RTC_LIB=y | ||
873 | CONFIG_RTC_CLASS=y | ||
874 | CONFIG_RTC_HCTOSYS=y | ||
875 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
876 | |||
877 | # | ||
878 | # RTC interfaces | ||
879 | # | ||
880 | CONFIG_RTC_INTF_SYSFS=y | ||
881 | CONFIG_RTC_INTF_PROC=y | ||
882 | CONFIG_RTC_INTF_DEV=y | ||
883 | |||
884 | # | ||
885 | # RTC drivers | ||
886 | # | ||
887 | # CONFIG_RTC_DRV_X1205 is not set | ||
888 | # CONFIG_RTC_DRV_DS1672 is not set | ||
889 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
890 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
891 | CONFIG_RTC_DRV_M48T86=y | ||
892 | CONFIG_RTC_DRV_EP93XX=y | ||
893 | # CONFIG_RTC_DRV_TEST is not set | ||
894 | |||
895 | # | ||
868 | # File systems | 896 | # File systems |
869 | # | 897 | # |
870 | CONFIG_EXT2_FS=y | 898 | CONFIG_EXT2_FS=y |
@@ -912,7 +940,6 @@ CONFIG_SYSFS=y | |||
912 | CONFIG_TMPFS=y | 940 | CONFIG_TMPFS=y |
913 | # CONFIG_HUGETLB_PAGE is not set | 941 | # CONFIG_HUGETLB_PAGE is not set |
914 | CONFIG_RAMFS=y | 942 | CONFIG_RAMFS=y |
915 | # CONFIG_RELAYFS_FS is not set | ||
916 | # CONFIG_CONFIGFS_FS is not set | 943 | # CONFIG_CONFIGFS_FS is not set |
917 | 944 | ||
918 | # | 945 | # |
@@ -1044,6 +1071,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
1044 | CONFIG_DETECT_SOFTLOCKUP=y | 1071 | CONFIG_DETECT_SOFTLOCKUP=y |
1045 | # CONFIG_SCHEDSTATS is not set | 1072 | # CONFIG_SCHEDSTATS is not set |
1046 | CONFIG_DEBUG_SLAB=y | 1073 | CONFIG_DEBUG_SLAB=y |
1074 | # CONFIG_DEBUG_SLAB_LEAK is not set | ||
1047 | CONFIG_DEBUG_MUTEXES=y | 1075 | CONFIG_DEBUG_MUTEXES=y |
1048 | CONFIG_DEBUG_SPINLOCK=y | 1076 | CONFIG_DEBUG_SPINLOCK=y |
1049 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1077 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
@@ -1053,6 +1081,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1053 | # CONFIG_DEBUG_FS is not set | 1081 | # CONFIG_DEBUG_FS is not set |
1054 | # CONFIG_DEBUG_VM is not set | 1082 | # CONFIG_DEBUG_VM is not set |
1055 | CONFIG_FRAME_POINTER=y | 1083 | CONFIG_FRAME_POINTER=y |
1084 | # CONFIG_UNWIND_INFO is not set | ||
1056 | CONFIG_FORCED_INLINING=y | 1085 | CONFIG_FORCED_INLINING=y |
1057 | # CONFIG_RCU_TORTURE_TEST is not set | 1086 | # CONFIG_RCU_TORTURE_TEST is not set |
1058 | CONFIG_DEBUG_USER=y | 1087 | CONFIG_DEBUG_USER=y |
diff --git a/arch/arm/configs/ixp2000_defconfig b/arch/arm/configs/ixp2000_defconfig index 7b02ca04c3ee..e6f3e4873d6c 100644 --- a/arch/arm/configs/ixp2000_defconfig +++ b/arch/arm/configs/ixp2000_defconfig | |||
@@ -1,18 +1,19 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.16-rc2 | 3 | # Linux kernel version: 2.6.17-rc2 |
4 | # Wed Feb 8 04:49:11 2006 | 4 | # Wed Apr 19 21:12:49 2006 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | CONFIG_GENERIC_HWEIGHT=y | ||
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 10 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
11 | CONFIG_VECTORS_BASE=0xffff0000 | ||
10 | 12 | ||
11 | # | 13 | # |
12 | # Code maturity level options | 14 | # Code maturity level options |
13 | # | 15 | # |
14 | CONFIG_EXPERIMENTAL=y | 16 | CONFIG_EXPERIMENTAL=y |
15 | CONFIG_CLEAN_COMPILE=y | ||
16 | CONFIG_BROKEN_ON_SMP=y | 17 | CONFIG_BROKEN_ON_SMP=y |
17 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 18 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
18 | 19 | ||
@@ -29,6 +30,7 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
29 | CONFIG_SYSCTL=y | 30 | CONFIG_SYSCTL=y |
30 | # CONFIG_AUDIT is not set | 31 | # CONFIG_AUDIT is not set |
31 | # CONFIG_IKCONFIG is not set | 32 | # CONFIG_IKCONFIG is not set |
33 | # CONFIG_RELAY is not set | ||
32 | CONFIG_INITRAMFS_SOURCE="" | 34 | CONFIG_INITRAMFS_SOURCE="" |
33 | CONFIG_UID16=y | 35 | CONFIG_UID16=y |
34 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 36 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -44,10 +46,6 @@ CONFIG_BASE_FULL=y | |||
44 | CONFIG_FUTEX=y | 46 | CONFIG_FUTEX=y |
45 | CONFIG_EPOLL=y | 47 | CONFIG_EPOLL=y |
46 | CONFIG_SHMEM=y | 48 | CONFIG_SHMEM=y |
47 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
48 | CONFIG_CC_ALIGN_LABELS=0 | ||
49 | CONFIG_CC_ALIGN_LOOPS=0 | ||
50 | CONFIG_CC_ALIGN_JUMPS=0 | ||
51 | CONFIG_SLAB=y | 49 | CONFIG_SLAB=y |
52 | # CONFIG_TINY_SHMEM is not set | 50 | # CONFIG_TINY_SHMEM is not set |
53 | CONFIG_BASE_SMALL=0 | 51 | CONFIG_BASE_SMALL=0 |
@@ -60,7 +58,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
60 | CONFIG_MODULES=y | 58 | CONFIG_MODULES=y |
61 | CONFIG_MODULE_UNLOAD=y | 59 | CONFIG_MODULE_UNLOAD=y |
62 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 60 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
63 | CONFIG_OBSOLETE_MODPARM=y | ||
64 | # CONFIG_MODVERSIONS is not set | 61 | # CONFIG_MODVERSIONS is not set |
65 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 62 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
66 | CONFIG_KMOD=y | 63 | CONFIG_KMOD=y |
@@ -68,6 +65,7 @@ CONFIG_KMOD=y | |||
68 | # | 65 | # |
69 | # Block layer | 66 | # Block layer |
70 | # | 67 | # |
68 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
71 | 69 | ||
72 | # | 70 | # |
73 | # IO Schedulers | 71 | # IO Schedulers |
@@ -89,11 +87,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
89 | # CONFIG_ARCH_CLPS711X is not set | 87 | # CONFIG_ARCH_CLPS711X is not set |
90 | # CONFIG_ARCH_CO285 is not set | 88 | # CONFIG_ARCH_CO285 is not set |
91 | # CONFIG_ARCH_EBSA110 is not set | 89 | # CONFIG_ARCH_EBSA110 is not set |
90 | # CONFIG_ARCH_EP93XX is not set | ||
92 | # CONFIG_ARCH_FOOTBRIDGE is not set | 91 | # CONFIG_ARCH_FOOTBRIDGE is not set |
93 | # CONFIG_ARCH_INTEGRATOR is not set | 92 | # CONFIG_ARCH_INTEGRATOR is not set |
94 | # CONFIG_ARCH_IOP3XX is not set | 93 | # CONFIG_ARCH_IOP3XX is not set |
95 | # CONFIG_ARCH_IXP4XX is not set | 94 | # CONFIG_ARCH_IXP4XX is not set |
96 | CONFIG_ARCH_IXP2000=y | 95 | CONFIG_ARCH_IXP2000=y |
96 | # CONFIG_ARCH_IXP23XX is not set | ||
97 | # CONFIG_ARCH_L7200 is not set | 97 | # CONFIG_ARCH_L7200 is not set |
98 | # CONFIG_ARCH_PXA is not set | 98 | # CONFIG_ARCH_PXA is not set |
99 | # CONFIG_ARCH_RPC is not set | 99 | # CONFIG_ARCH_RPC is not set |
@@ -123,6 +123,7 @@ CONFIG_ARCH_IXDP2800=y | |||
123 | CONFIG_ARCH_IXDP2X00=y | 123 | CONFIG_ARCH_IXDP2X00=y |
124 | CONFIG_ARCH_IXDP2401=y | 124 | CONFIG_ARCH_IXDP2401=y |
125 | CONFIG_ARCH_IXDP2801=y | 125 | CONFIG_ARCH_IXDP2801=y |
126 | CONFIG_MACH_IXDP28X5=y | ||
126 | CONFIG_ARCH_IXDP2X01=y | 127 | CONFIG_ARCH_IXDP2X01=y |
127 | # CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set | 128 | # CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set |
128 | 129 | ||
@@ -147,7 +148,6 @@ CONFIG_XSCALE_PMU=y | |||
147 | # Bus support | 148 | # Bus support |
148 | # | 149 | # |
149 | CONFIG_PCI=y | 150 | CONFIG_PCI=y |
150 | CONFIG_PCI_LEGACY_PROC=y | ||
151 | # CONFIG_PCI_DEBUG is not set | 151 | # CONFIG_PCI_DEBUG is not set |
152 | 152 | ||
153 | # | 153 | # |
@@ -160,6 +160,7 @@ CONFIG_PCI_LEGACY_PROC=y | |||
160 | # | 160 | # |
161 | # CONFIG_PREEMPT is not set | 161 | # CONFIG_PREEMPT is not set |
162 | # CONFIG_NO_IDLE_HZ is not set | 162 | # CONFIG_NO_IDLE_HZ is not set |
163 | CONFIG_HZ=100 | ||
163 | # CONFIG_AEABI is not set | 164 | # CONFIG_AEABI is not set |
164 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 165 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
165 | CONFIG_SELECT_MEMORY_MODEL=y | 166 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -213,6 +214,7 @@ CONFIG_NET=y | |||
213 | # | 214 | # |
214 | # Networking options | 215 | # Networking options |
215 | # | 216 | # |
217 | # CONFIG_NETDEBUG is not set | ||
216 | CONFIG_PACKET=y | 218 | CONFIG_PACKET=y |
217 | CONFIG_PACKET_MMAP=y | 219 | CONFIG_PACKET_MMAP=y |
218 | CONFIG_UNIX=y | 220 | CONFIG_UNIX=y |
@@ -232,12 +234,15 @@ CONFIG_SYN_COOKIES=y | |||
232 | # CONFIG_INET_AH is not set | 234 | # CONFIG_INET_AH is not set |
233 | # CONFIG_INET_ESP is not set | 235 | # CONFIG_INET_ESP is not set |
234 | # CONFIG_INET_IPCOMP is not set | 236 | # CONFIG_INET_IPCOMP is not set |
237 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
235 | # CONFIG_INET_TUNNEL is not set | 238 | # CONFIG_INET_TUNNEL is not set |
236 | CONFIG_INET_DIAG=y | 239 | CONFIG_INET_DIAG=y |
237 | CONFIG_INET_TCP_DIAG=y | 240 | CONFIG_INET_TCP_DIAG=y |
238 | # CONFIG_TCP_CONG_ADVANCED is not set | 241 | # CONFIG_TCP_CONG_ADVANCED is not set |
239 | CONFIG_TCP_CONG_BIC=y | 242 | CONFIG_TCP_CONG_BIC=y |
240 | # CONFIG_IPV6 is not set | 243 | # CONFIG_IPV6 is not set |
244 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
245 | # CONFIG_INET6_TUNNEL is not set | ||
241 | # CONFIG_NETFILTER is not set | 246 | # CONFIG_NETFILTER is not set |
242 | 247 | ||
243 | # | 248 | # |
@@ -347,7 +352,6 @@ CONFIG_MTD_CFI_UTIL=y | |||
347 | # CONFIG_MTD_ROM is not set | 352 | # CONFIG_MTD_ROM is not set |
348 | # CONFIG_MTD_ABSENT is not set | 353 | # CONFIG_MTD_ABSENT is not set |
349 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | 354 | # CONFIG_MTD_OBSOLETE_CHIPS is not set |
350 | # CONFIG_MTD_XIP is not set | ||
351 | 355 | ||
352 | # | 356 | # |
353 | # Mapping drivers for chip access | 357 | # Mapping drivers for chip access |
@@ -366,7 +370,6 @@ CONFIG_MTD_IXP2000=y | |||
366 | # CONFIG_MTD_SLRAM is not set | 370 | # CONFIG_MTD_SLRAM is not set |
367 | # CONFIG_MTD_PHRAM is not set | 371 | # CONFIG_MTD_PHRAM is not set |
368 | # CONFIG_MTD_MTDRAM is not set | 372 | # CONFIG_MTD_MTDRAM is not set |
369 | # CONFIG_MTD_BLKMTD is not set | ||
370 | # CONFIG_MTD_BLOCK2MTD is not set | 373 | # CONFIG_MTD_BLOCK2MTD is not set |
371 | 374 | ||
372 | # | 375 | # |
@@ -614,8 +617,9 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
614 | # | 617 | # |
615 | CONFIG_SERIAL_8250=y | 618 | CONFIG_SERIAL_8250=y |
616 | CONFIG_SERIAL_8250_CONSOLE=y | 619 | CONFIG_SERIAL_8250_CONSOLE=y |
620 | CONFIG_SERIAL_8250_PCI=y | ||
617 | CONFIG_SERIAL_8250_NR_UARTS=3 | 621 | CONFIG_SERIAL_8250_NR_UARTS=3 |
618 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 622 | CONFIG_SERIAL_8250_RUNTIME_UARTS=3 |
619 | # CONFIG_SERIAL_8250_EXTENDED is not set | 623 | # CONFIG_SERIAL_8250_EXTENDED is not set |
620 | 624 | ||
621 | # | 625 | # |
@@ -623,6 +627,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
623 | # | 627 | # |
624 | CONFIG_SERIAL_CORE=y | 628 | CONFIG_SERIAL_CORE=y |
625 | CONFIG_SERIAL_CORE_CONSOLE=y | 629 | CONFIG_SERIAL_CORE_CONSOLE=y |
630 | # CONFIG_SERIAL_JSM is not set | ||
626 | CONFIG_UNIX98_PTYS=y | 631 | CONFIG_UNIX98_PTYS=y |
627 | CONFIG_LEGACY_PTYS=y | 632 | CONFIG_LEGACY_PTYS=y |
628 | CONFIG_LEGACY_PTY_COUNT=256 | 633 | CONFIG_LEGACY_PTY_COUNT=256 |
@@ -650,7 +655,6 @@ CONFIG_IXP2000_WATCHDOG=y | |||
650 | # CONFIG_PCIPCWATCHDOG is not set | 655 | # CONFIG_PCIPCWATCHDOG is not set |
651 | # CONFIG_WDTPCI is not set | 656 | # CONFIG_WDTPCI is not set |
652 | # CONFIG_NVRAM is not set | 657 | # CONFIG_NVRAM is not set |
653 | # CONFIG_RTC is not set | ||
654 | # CONFIG_DTLK is not set | 658 | # CONFIG_DTLK is not set |
655 | # CONFIG_R3964 is not set | 659 | # CONFIG_R3964 is not set |
656 | # CONFIG_APPLICOM is not set | 660 | # CONFIG_APPLICOM is not set |
@@ -696,7 +700,6 @@ CONFIG_I2C_IXP2000=y | |||
696 | # CONFIG_I2C_PARPORT_LIGHT is not set | 700 | # CONFIG_I2C_PARPORT_LIGHT is not set |
697 | # CONFIG_I2C_PROSAVAGE is not set | 701 | # CONFIG_I2C_PROSAVAGE is not set |
698 | # CONFIG_I2C_SAVAGE4 is not set | 702 | # CONFIG_I2C_SAVAGE4 is not set |
699 | # CONFIG_SCx200_ACB is not set | ||
700 | # CONFIG_I2C_SIS5595 is not set | 703 | # CONFIG_I2C_SIS5595 is not set |
701 | # CONFIG_I2C_SIS630 is not set | 704 | # CONFIG_I2C_SIS630 is not set |
702 | # CONFIG_I2C_SIS96X is not set | 705 | # CONFIG_I2C_SIS96X is not set |
@@ -715,9 +718,7 @@ CONFIG_SENSORS_EEPROM=y | |||
715 | # CONFIG_SENSORS_PCF8574 is not set | 718 | # CONFIG_SENSORS_PCF8574 is not set |
716 | # CONFIG_SENSORS_PCA9539 is not set | 719 | # CONFIG_SENSORS_PCA9539 is not set |
717 | # CONFIG_SENSORS_PCF8591 is not set | 720 | # CONFIG_SENSORS_PCF8591 is not set |
718 | # CONFIG_SENSORS_RTC8564 is not set | ||
719 | # CONFIG_SENSORS_MAX6875 is not set | 721 | # CONFIG_SENSORS_MAX6875 is not set |
720 | # CONFIG_RTC_X1205_I2C is not set | ||
721 | # CONFIG_I2C_DEBUG_CORE is not set | 722 | # CONFIG_I2C_DEBUG_CORE is not set |
722 | # CONFIG_I2C_DEBUG_ALGO is not set | 723 | # CONFIG_I2C_DEBUG_ALGO is not set |
723 | # CONFIG_I2C_DEBUG_BUS is not set | 724 | # CONFIG_I2C_DEBUG_BUS is not set |
@@ -730,6 +731,11 @@ CONFIG_SENSORS_EEPROM=y | |||
730 | # CONFIG_SPI_MASTER is not set | 731 | # CONFIG_SPI_MASTER is not set |
731 | 732 | ||
732 | # | 733 | # |
734 | # Dallas's 1-wire bus | ||
735 | # | ||
736 | # CONFIG_W1 is not set | ||
737 | |||
738 | # | ||
733 | # Hardware Monitoring support | 739 | # Hardware Monitoring support |
734 | # | 740 | # |
735 | CONFIG_HWMON=y | 741 | CONFIG_HWMON=y |
@@ -742,6 +748,7 @@ CONFIG_HWMON=y | |||
742 | # CONFIG_SENSORS_ASB100 is not set | 748 | # CONFIG_SENSORS_ASB100 is not set |
743 | # CONFIG_SENSORS_ATXP1 is not set | 749 | # CONFIG_SENSORS_ATXP1 is not set |
744 | # CONFIG_SENSORS_DS1621 is not set | 750 | # CONFIG_SENSORS_DS1621 is not set |
751 | # CONFIG_SENSORS_F71805F is not set | ||
745 | # CONFIG_SENSORS_FSCHER is not set | 752 | # CONFIG_SENSORS_FSCHER is not set |
746 | # CONFIG_SENSORS_FSCPOS is not set | 753 | # CONFIG_SENSORS_FSCPOS is not set |
747 | # CONFIG_SENSORS_GL518SM is not set | 754 | # CONFIG_SENSORS_GL518SM is not set |
@@ -776,7 +783,16 @@ CONFIG_HWMON=y | |||
776 | # | 783 | # |
777 | 784 | ||
778 | # | 785 | # |
779 | # Multimedia Capabilities Port drivers | 786 | # LED devices |
787 | # | ||
788 | # CONFIG_NEW_LEDS is not set | ||
789 | |||
790 | # | ||
791 | # LED drivers | ||
792 | # | ||
793 | |||
794 | # | ||
795 | # LED Triggers | ||
780 | # | 796 | # |
781 | 797 | ||
782 | # | 798 | # |
@@ -804,6 +820,7 @@ CONFIG_HWMON=y | |||
804 | # | 820 | # |
805 | CONFIG_USB_ARCH_HAS_HCD=y | 821 | CONFIG_USB_ARCH_HAS_HCD=y |
806 | CONFIG_USB_ARCH_HAS_OHCI=y | 822 | CONFIG_USB_ARCH_HAS_OHCI=y |
823 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
807 | # CONFIG_USB is not set | 824 | # CONFIG_USB is not set |
808 | 825 | ||
809 | # | 826 | # |
@@ -821,6 +838,12 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
821 | # CONFIG_MMC is not set | 838 | # CONFIG_MMC is not set |
822 | 839 | ||
823 | # | 840 | # |
841 | # Real Time Clock | ||
842 | # | ||
843 | CONFIG_RTC_LIB=y | ||
844 | # CONFIG_RTC_CLASS is not set | ||
845 | |||
846 | # | ||
824 | # File systems | 847 | # File systems |
825 | # | 848 | # |
826 | CONFIG_EXT2_FS=y | 849 | CONFIG_EXT2_FS=y |
@@ -870,7 +893,6 @@ CONFIG_SYSFS=y | |||
870 | CONFIG_TMPFS=y | 893 | CONFIG_TMPFS=y |
871 | # CONFIG_HUGETLB_PAGE is not set | 894 | # CONFIG_HUGETLB_PAGE is not set |
872 | CONFIG_RAMFS=y | 895 | CONFIG_RAMFS=y |
873 | # CONFIG_RELAYFS_FS is not set | ||
874 | # CONFIG_CONFIGFS_FS is not set | 896 | # CONFIG_CONFIGFS_FS is not set |
875 | 897 | ||
876 | # | 898 | # |
@@ -972,6 +994,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
972 | # CONFIG_DEBUG_FS is not set | 994 | # CONFIG_DEBUG_FS is not set |
973 | # CONFIG_DEBUG_VM is not set | 995 | # CONFIG_DEBUG_VM is not set |
974 | CONFIG_FRAME_POINTER=y | 996 | CONFIG_FRAME_POINTER=y |
997 | # CONFIG_UNWIND_INFO is not set | ||
975 | CONFIG_FORCED_INLINING=y | 998 | CONFIG_FORCED_INLINING=y |
976 | # CONFIG_RCU_TORTURE_TEST is not set | 999 | # CONFIG_RCU_TORTURE_TEST is not set |
977 | CONFIG_DEBUG_USER=y | 1000 | CONFIG_DEBUG_USER=y |
diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig index 1a2751e9ab05..9ce898a6cf87 100644 --- a/arch/arm/configs/ixp23xx_defconfig +++ b/arch/arm/configs/ixp23xx_defconfig | |||
@@ -1,12 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.16 | 3 | # Linux kernel version: 2.6.17-rc2 |
4 | # Tue Mar 21 03:27:20 2006 | 4 | # Wed Apr 19 21:13:50 2006 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | CONFIG_GENERIC_HWEIGHT=y | ||
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 10 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
11 | CONFIG_VECTORS_BASE=0xffff0000 | ||
10 | 12 | ||
11 | # | 13 | # |
12 | # Code maturity level options | 14 | # Code maturity level options |
@@ -28,6 +30,7 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
28 | CONFIG_SYSCTL=y | 30 | CONFIG_SYSCTL=y |
29 | # CONFIG_AUDIT is not set | 31 | # CONFIG_AUDIT is not set |
30 | # CONFIG_IKCONFIG is not set | 32 | # CONFIG_IKCONFIG is not set |
33 | # CONFIG_RELAY is not set | ||
31 | CONFIG_INITRAMFS_SOURCE="" | 34 | CONFIG_INITRAMFS_SOURCE="" |
32 | CONFIG_UID16=y | 35 | CONFIG_UID16=y |
33 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 36 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -43,10 +46,6 @@ CONFIG_BASE_FULL=y | |||
43 | CONFIG_FUTEX=y | 46 | CONFIG_FUTEX=y |
44 | CONFIG_EPOLL=y | 47 | CONFIG_EPOLL=y |
45 | CONFIG_SHMEM=y | 48 | CONFIG_SHMEM=y |
46 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
47 | CONFIG_CC_ALIGN_LABELS=0 | ||
48 | CONFIG_CC_ALIGN_LOOPS=0 | ||
49 | CONFIG_CC_ALIGN_JUMPS=0 | ||
50 | CONFIG_SLAB=y | 49 | CONFIG_SLAB=y |
51 | # CONFIG_TINY_SHMEM is not set | 50 | # CONFIG_TINY_SHMEM is not set |
52 | CONFIG_BASE_SMALL=0 | 51 | CONFIG_BASE_SMALL=0 |
@@ -59,7 +58,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
59 | CONFIG_MODULES=y | 58 | CONFIG_MODULES=y |
60 | CONFIG_MODULE_UNLOAD=y | 59 | CONFIG_MODULE_UNLOAD=y |
61 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 60 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
62 | CONFIG_OBSOLETE_MODPARM=y | ||
63 | # CONFIG_MODVERSIONS is not set | 61 | # CONFIG_MODVERSIONS is not set |
64 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 62 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
65 | CONFIG_KMOD=y | 63 | CONFIG_KMOD=y |
@@ -67,6 +65,7 @@ CONFIG_KMOD=y | |||
67 | # | 65 | # |
68 | # Block layer | 66 | # Block layer |
69 | # | 67 | # |
68 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
70 | 69 | ||
71 | # | 70 | # |
72 | # IO Schedulers | 71 | # IO Schedulers |
@@ -143,7 +142,6 @@ CONFIG_CPU_BIG_ENDIAN=y | |||
143 | # Bus support | 142 | # Bus support |
144 | # | 143 | # |
145 | CONFIG_PCI=y | 144 | CONFIG_PCI=y |
146 | CONFIG_PCI_LEGACY_PROC=y | ||
147 | # CONFIG_PCI_DEBUG is not set | 145 | # CONFIG_PCI_DEBUG is not set |
148 | 146 | ||
149 | # | 147 | # |
@@ -230,12 +228,15 @@ CONFIG_SYN_COOKIES=y | |||
230 | # CONFIG_INET_AH is not set | 228 | # CONFIG_INET_AH is not set |
231 | # CONFIG_INET_ESP is not set | 229 | # CONFIG_INET_ESP is not set |
232 | # CONFIG_INET_IPCOMP is not set | 230 | # CONFIG_INET_IPCOMP is not set |
231 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
233 | # CONFIG_INET_TUNNEL is not set | 232 | # CONFIG_INET_TUNNEL is not set |
234 | CONFIG_INET_DIAG=y | 233 | CONFIG_INET_DIAG=y |
235 | CONFIG_INET_TCP_DIAG=y | 234 | CONFIG_INET_TCP_DIAG=y |
236 | # CONFIG_TCP_CONG_ADVANCED is not set | 235 | # CONFIG_TCP_CONG_ADVANCED is not set |
237 | CONFIG_TCP_CONG_BIC=y | 236 | CONFIG_TCP_CONG_BIC=y |
238 | # CONFIG_IPV6 is not set | 237 | # CONFIG_IPV6 is not set |
238 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
239 | # CONFIG_INET6_TUNNEL is not set | ||
239 | # CONFIG_NETFILTER is not set | 240 | # CONFIG_NETFILTER is not set |
240 | 241 | ||
241 | # | 242 | # |
@@ -365,7 +366,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
365 | # CONFIG_MTD_SLRAM is not set | 366 | # CONFIG_MTD_SLRAM is not set |
366 | # CONFIG_MTD_PHRAM is not set | 367 | # CONFIG_MTD_PHRAM is not set |
367 | # CONFIG_MTD_MTDRAM is not set | 368 | # CONFIG_MTD_MTDRAM is not set |
368 | # CONFIG_MTD_BLKMTD is not set | ||
369 | # CONFIG_MTD_BLOCK2MTD is not set | 369 | # CONFIG_MTD_BLOCK2MTD is not set |
370 | 370 | ||
371 | # | 371 | # |
@@ -527,7 +527,6 @@ CONFIG_BLK_DEV_SD=y | |||
527 | # CONFIG_SCSI_INIA100 is not set | 527 | # CONFIG_SCSI_INIA100 is not set |
528 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 528 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
529 | # CONFIG_SCSI_IPR is not set | 529 | # CONFIG_SCSI_IPR is not set |
530 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
531 | # CONFIG_SCSI_QLOGIC_1280 is not set | 530 | # CONFIG_SCSI_QLOGIC_1280 is not set |
532 | # CONFIG_SCSI_QLA_FC is not set | 531 | # CONFIG_SCSI_QLA_FC is not set |
533 | # CONFIG_SCSI_LPFC is not set | 532 | # CONFIG_SCSI_LPFC is not set |
@@ -735,6 +734,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
735 | # | 734 | # |
736 | CONFIG_SERIAL_8250=y | 735 | CONFIG_SERIAL_8250=y |
737 | CONFIG_SERIAL_8250_CONSOLE=y | 736 | CONFIG_SERIAL_8250_CONSOLE=y |
737 | CONFIG_SERIAL_8250_PCI=y | ||
738 | CONFIG_SERIAL_8250_NR_UARTS=4 | 738 | CONFIG_SERIAL_8250_NR_UARTS=4 |
739 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 739 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
740 | # CONFIG_SERIAL_8250_EXTENDED is not set | 740 | # CONFIG_SERIAL_8250_EXTENDED is not set |
@@ -776,7 +776,6 @@ CONFIG_WATCHDOG=y | |||
776 | # | 776 | # |
777 | # CONFIG_USBPCWATCHDOG is not set | 777 | # CONFIG_USBPCWATCHDOG is not set |
778 | # CONFIG_NVRAM is not set | 778 | # CONFIG_NVRAM is not set |
779 | # CONFIG_RTC is not set | ||
780 | # CONFIG_DTLK is not set | 779 | # CONFIG_DTLK is not set |
781 | # CONFIG_R3964 is not set | 780 | # CONFIG_R3964 is not set |
782 | # CONFIG_APPLICOM is not set | 781 | # CONFIG_APPLICOM is not set |
@@ -821,7 +820,6 @@ CONFIG_I2C_ALGOBIT=y | |||
821 | # CONFIG_I2C_PARPORT_LIGHT is not set | 820 | # CONFIG_I2C_PARPORT_LIGHT is not set |
822 | # CONFIG_I2C_PROSAVAGE is not set | 821 | # CONFIG_I2C_PROSAVAGE is not set |
823 | # CONFIG_I2C_SAVAGE4 is not set | 822 | # CONFIG_I2C_SAVAGE4 is not set |
824 | # CONFIG_SCx200_ACB is not set | ||
825 | # CONFIG_I2C_SIS5595 is not set | 823 | # CONFIG_I2C_SIS5595 is not set |
826 | # CONFIG_I2C_SIS630 is not set | 824 | # CONFIG_I2C_SIS630 is not set |
827 | # CONFIG_I2C_SIS96X is not set | 825 | # CONFIG_I2C_SIS96X is not set |
@@ -840,9 +838,7 @@ CONFIG_SENSORS_EEPROM=y | |||
840 | # CONFIG_SENSORS_PCF8574 is not set | 838 | # CONFIG_SENSORS_PCF8574 is not set |
841 | # CONFIG_SENSORS_PCA9539 is not set | 839 | # CONFIG_SENSORS_PCA9539 is not set |
842 | # CONFIG_SENSORS_PCF8591 is not set | 840 | # CONFIG_SENSORS_PCF8591 is not set |
843 | # CONFIG_SENSORS_RTC8564 is not set | ||
844 | # CONFIG_SENSORS_MAX6875 is not set | 841 | # CONFIG_SENSORS_MAX6875 is not set |
845 | # CONFIG_RTC_X1205_I2C is not set | ||
846 | # CONFIG_I2C_DEBUG_CORE is not set | 842 | # CONFIG_I2C_DEBUG_CORE is not set |
847 | # CONFIG_I2C_DEBUG_ALGO is not set | 843 | # CONFIG_I2C_DEBUG_ALGO is not set |
848 | # CONFIG_I2C_DEBUG_BUS is not set | 844 | # CONFIG_I2C_DEBUG_BUS is not set |
@@ -907,7 +903,16 @@ CONFIG_HWMON=y | |||
907 | # | 903 | # |
908 | 904 | ||
909 | # | 905 | # |
910 | # Multimedia Capabilities Port drivers | 906 | # LED devices |
907 | # | ||
908 | # CONFIG_NEW_LEDS is not set | ||
909 | |||
910 | # | ||
911 | # LED drivers | ||
912 | # | ||
913 | |||
914 | # | ||
915 | # LED Triggers | ||
911 | # | 916 | # |
912 | 917 | ||
913 | # | 918 | # |
@@ -919,6 +924,7 @@ CONFIG_HWMON=y | |||
919 | # Digital Video Broadcasting Devices | 924 | # Digital Video Broadcasting Devices |
920 | # | 925 | # |
921 | # CONFIG_DVB is not set | 926 | # CONFIG_DVB is not set |
927 | # CONFIG_USB_DABUSB is not set | ||
922 | 928 | ||
923 | # | 929 | # |
924 | # Graphics support | 930 | # Graphics support |
@@ -935,6 +941,7 @@ CONFIG_HWMON=y | |||
935 | # | 941 | # |
936 | CONFIG_USB_ARCH_HAS_HCD=y | 942 | CONFIG_USB_ARCH_HAS_HCD=y |
937 | CONFIG_USB_ARCH_HAS_OHCI=y | 943 | CONFIG_USB_ARCH_HAS_OHCI=y |
944 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
938 | CONFIG_USB=y | 945 | CONFIG_USB=y |
939 | # CONFIG_USB_DEBUG is not set | 946 | # CONFIG_USB_DEBUG is not set |
940 | 947 | ||
@@ -1000,9 +1007,7 @@ CONFIG_USB_STORAGE=y | |||
1000 | # CONFIG_USB_ACECAD is not set | 1007 | # CONFIG_USB_ACECAD is not set |
1001 | # CONFIG_USB_KBTAB is not set | 1008 | # CONFIG_USB_KBTAB is not set |
1002 | # CONFIG_USB_POWERMATE is not set | 1009 | # CONFIG_USB_POWERMATE is not set |
1003 | # CONFIG_USB_MTOUCH is not set | 1010 | # CONFIG_USB_TOUCHSCREEN is not set |
1004 | # CONFIG_USB_ITMTOUCH is not set | ||
1005 | # CONFIG_USB_EGALAX is not set | ||
1006 | # CONFIG_USB_YEALINK is not set | 1011 | # CONFIG_USB_YEALINK is not set |
1007 | # CONFIG_USB_XPAD is not set | 1012 | # CONFIG_USB_XPAD is not set |
1008 | # CONFIG_USB_ATI_REMOTE is not set | 1013 | # CONFIG_USB_ATI_REMOTE is not set |
@@ -1017,15 +1022,6 @@ CONFIG_USB_STORAGE=y | |||
1017 | # CONFIG_USB_MICROTEK is not set | 1022 | # CONFIG_USB_MICROTEK is not set |
1018 | 1023 | ||
1019 | # | 1024 | # |
1020 | # USB Multimedia devices | ||
1021 | # | ||
1022 | # CONFIG_USB_DABUSB is not set | ||
1023 | |||
1024 | # | ||
1025 | # Video4Linux support is needed for USB Multimedia device support | ||
1026 | # | ||
1027 | |||
1028 | # | ||
1029 | # USB Network Adapters | 1025 | # USB Network Adapters |
1030 | # | 1026 | # |
1031 | # CONFIG_USB_CATC is not set | 1027 | # CONFIG_USB_CATC is not set |
@@ -1076,6 +1072,12 @@ CONFIG_USB_MON=y | |||
1076 | # CONFIG_MMC is not set | 1072 | # CONFIG_MMC is not set |
1077 | 1073 | ||
1078 | # | 1074 | # |
1075 | # Real Time Clock | ||
1076 | # | ||
1077 | CONFIG_RTC_LIB=y | ||
1078 | # CONFIG_RTC_CLASS is not set | ||
1079 | |||
1080 | # | ||
1079 | # File systems | 1081 | # File systems |
1080 | # | 1082 | # |
1081 | CONFIG_EXT2_FS=y | 1083 | CONFIG_EXT2_FS=y |
@@ -1127,7 +1129,6 @@ CONFIG_SYSFS=y | |||
1127 | CONFIG_TMPFS=y | 1129 | CONFIG_TMPFS=y |
1128 | # CONFIG_HUGETLB_PAGE is not set | 1130 | # CONFIG_HUGETLB_PAGE is not set |
1129 | CONFIG_RAMFS=y | 1131 | CONFIG_RAMFS=y |
1130 | # CONFIG_RELAYFS_FS is not set | ||
1131 | # CONFIG_CONFIGFS_FS is not set | 1132 | # CONFIG_CONFIGFS_FS is not set |
1132 | 1133 | ||
1133 | # | 1134 | # |
@@ -1268,6 +1269,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1268 | # CONFIG_DEBUG_FS is not set | 1269 | # CONFIG_DEBUG_FS is not set |
1269 | # CONFIG_DEBUG_VM is not set | 1270 | # CONFIG_DEBUG_VM is not set |
1270 | CONFIG_FRAME_POINTER=y | 1271 | CONFIG_FRAME_POINTER=y |
1272 | # CONFIG_UNWIND_INFO is not set | ||
1271 | CONFIG_FORCED_INLINING=y | 1273 | CONFIG_FORCED_INLINING=y |
1272 | # CONFIG_RCU_TORTURE_TEST is not set | 1274 | # CONFIG_RCU_TORTURE_TEST is not set |
1273 | CONFIG_DEBUG_USER=y | 1275 | CONFIG_DEBUG_USER=y |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 8cff73e668b3..9fc9af88c60c 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -407,7 +407,7 @@ static void __init early_initrd(char **p) | |||
407 | } | 407 | } |
408 | __early_param("initrd=", early_initrd); | 408 | __early_param("initrd=", early_initrd); |
409 | 409 | ||
410 | static void __init add_memory(unsigned long start, unsigned long size) | 410 | static void __init arm_add_memory(unsigned long start, unsigned long size) |
411 | { | 411 | { |
412 | /* | 412 | /* |
413 | * Ensure that start/size are aligned to a page boundary. | 413 | * Ensure that start/size are aligned to a page boundary. |
@@ -445,7 +445,7 @@ static void __init early_mem(char **p) | |||
445 | if (**p == '@') | 445 | if (**p == '@') |
446 | start = memparse(*p + 1, p); | 446 | start = memparse(*p + 1, p); |
447 | 447 | ||
448 | add_memory(start, size); | 448 | arm_add_memory(start, size); |
449 | } | 449 | } |
450 | __early_param("mem=", early_mem); | 450 | __early_param("mem=", early_mem); |
451 | 451 | ||
@@ -587,7 +587,7 @@ static int __init parse_tag_mem32(const struct tag *tag) | |||
587 | tag->u.mem.start, tag->u.mem.size / 1024); | 587 | tag->u.mem.start, tag->u.mem.size / 1024); |
588 | return -EINVAL; | 588 | return -EINVAL; |
589 | } | 589 | } |
590 | add_memory(tag->u.mem.start, tag->u.mem.size); | 590 | arm_add_memory(tag->u.mem.start, tag->u.mem.size); |
591 | return 0; | 591 | return 0; |
592 | } | 592 | } |
593 | 593 | ||
@@ -807,7 +807,7 @@ static int __init topology_init(void) | |||
807 | { | 807 | { |
808 | int cpu; | 808 | int cpu; |
809 | 809 | ||
810 | for_each_cpu(cpu) | 810 | for_each_possible_cpu(cpu) |
811 | register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu, NULL); | 811 | register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu, NULL); |
812 | 812 | ||
813 | return 0; | 813 | return 0; |
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index a0888e160e3b..00b761ff0f9c 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -91,7 +91,7 @@ static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type); | |||
91 | /* | 91 | /* |
92 | * IRQ -> GPIO mapping table | 92 | * IRQ -> GPIO mapping table |
93 | */ | 93 | */ |
94 | static char irq2gpio[32] = { | 94 | static signed char irq2gpio[32] = { |
95 | -1, -1, -1, -1, -1, -1, 0, 1, | 95 | -1, -1, -1, -1, -1, -1, 0, 1, |
96 | -1, -1, -1, -1, -1, -1, -1, -1, | 96 | -1, -1, -1, -1, -1, -1, -1, -1, |
97 | -1, -1, -1, 2, 3, 4, 5, 6, | 97 | -1, -1, -1, 2, 3, 4, 5, 6, |
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index cb0aba95d4e3..046371ee5bbe 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
@@ -275,7 +275,7 @@ static int bcm5411_init(struct mii_phy* phy) | |||
275 | return 0; | 275 | return 0; |
276 | } | 276 | } |
277 | 277 | ||
278 | static int bcm5411_suspend(struct mii_phy* phy) | 278 | static int generic_suspend(struct mii_phy* phy) |
279 | { | 279 | { |
280 | phy_write(phy, MII_BMCR, BMCR_PDOWN); | 280 | phy_write(phy, MII_BMCR, BMCR_PDOWN); |
281 | 281 | ||
@@ -738,7 +738,7 @@ static struct mii_phy_def bcm5401_phy_def = { | |||
738 | /* Broadcom BCM 5411 */ | 738 | /* Broadcom BCM 5411 */ |
739 | static struct mii_phy_ops bcm5411_phy_ops = { | 739 | static struct mii_phy_ops bcm5411_phy_ops = { |
740 | .init = bcm5411_init, | 740 | .init = bcm5411_init, |
741 | .suspend = bcm5411_suspend, | 741 | .suspend = generic_suspend, |
742 | .setup_aneg = bcm54xx_setup_aneg, | 742 | .setup_aneg = bcm54xx_setup_aneg, |
743 | .setup_forced = bcm54xx_setup_forced, | 743 | .setup_forced = bcm54xx_setup_forced, |
744 | .poll_link = genmii_poll_link, | 744 | .poll_link = genmii_poll_link, |
@@ -757,7 +757,7 @@ static struct mii_phy_def bcm5411_phy_def = { | |||
757 | /* Broadcom BCM 5421 */ | 757 | /* Broadcom BCM 5421 */ |
758 | static struct mii_phy_ops bcm5421_phy_ops = { | 758 | static struct mii_phy_ops bcm5421_phy_ops = { |
759 | .init = bcm5421_init, | 759 | .init = bcm5421_init, |
760 | .suspend = bcm5411_suspend, | 760 | .suspend = generic_suspend, |
761 | .setup_aneg = bcm54xx_setup_aneg, | 761 | .setup_aneg = bcm54xx_setup_aneg, |
762 | .setup_forced = bcm54xx_setup_forced, | 762 | .setup_forced = bcm54xx_setup_forced, |
763 | .poll_link = genmii_poll_link, | 763 | .poll_link = genmii_poll_link, |
@@ -776,7 +776,7 @@ static struct mii_phy_def bcm5421_phy_def = { | |||
776 | /* Broadcom BCM 5421 built-in K2 */ | 776 | /* Broadcom BCM 5421 built-in K2 */ |
777 | static struct mii_phy_ops bcm5421k2_phy_ops = { | 777 | static struct mii_phy_ops bcm5421k2_phy_ops = { |
778 | .init = bcm5421_init, | 778 | .init = bcm5421_init, |
779 | .suspend = bcm5411_suspend, | 779 | .suspend = generic_suspend, |
780 | .setup_aneg = bcm54xx_setup_aneg, | 780 | .setup_aneg = bcm54xx_setup_aneg, |
781 | .setup_forced = bcm54xx_setup_forced, | 781 | .setup_forced = bcm54xx_setup_forced, |
782 | .poll_link = genmii_poll_link, | 782 | .poll_link = genmii_poll_link, |
@@ -795,7 +795,7 @@ static struct mii_phy_def bcm5421k2_phy_def = { | |||
795 | /* Broadcom BCM 5462 built-in Vesta */ | 795 | /* Broadcom BCM 5462 built-in Vesta */ |
796 | static struct mii_phy_ops bcm5462V_phy_ops = { | 796 | static struct mii_phy_ops bcm5462V_phy_ops = { |
797 | .init = bcm5421_init, | 797 | .init = bcm5421_init, |
798 | .suspend = bcm5411_suspend, | 798 | .suspend = generic_suspend, |
799 | .setup_aneg = bcm54xx_setup_aneg, | 799 | .setup_aneg = bcm54xx_setup_aneg, |
800 | .setup_forced = bcm54xx_setup_forced, | 800 | .setup_forced = bcm54xx_setup_forced, |
801 | .poll_link = genmii_poll_link, | 801 | .poll_link = genmii_poll_link, |
@@ -816,6 +816,7 @@ static struct mii_phy_def bcm5462V_phy_def = { | |||
816 | * would be useful here) --BenH. | 816 | * would be useful here) --BenH. |
817 | */ | 817 | */ |
818 | static struct mii_phy_ops marvell_phy_ops = { | 818 | static struct mii_phy_ops marvell_phy_ops = { |
819 | .suspend = generic_suspend, | ||
819 | .setup_aneg = marvell_setup_aneg, | 820 | .setup_aneg = marvell_setup_aneg, |
820 | .setup_forced = marvell_setup_forced, | 821 | .setup_forced = marvell_setup_forced, |
821 | .poll_link = genmii_poll_link, | 822 | .poll_link = genmii_poll_link, |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c4619a428d9b..f8f234708b98 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -344,6 +344,13 @@ extern void skb_over_panic(struct sk_buff *skb, int len, | |||
344 | void *here); | 344 | void *here); |
345 | extern void skb_under_panic(struct sk_buff *skb, int len, | 345 | extern void skb_under_panic(struct sk_buff *skb, int len, |
346 | void *here); | 346 | void *here); |
347 | extern void skb_truesize_bug(struct sk_buff *skb); | ||
348 | |||
349 | static inline void skb_truesize_check(struct sk_buff *skb) | ||
350 | { | ||
351 | if (unlikely((int)skb->truesize < sizeof(struct sk_buff) + skb->len)) | ||
352 | skb_truesize_bug(skb); | ||
353 | } | ||
347 | 354 | ||
348 | extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | 355 | extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, |
349 | int getfrag(void *from, char *to, int offset, | 356 | int getfrag(void *from, char *to, int offset, |
diff --git a/include/net/sock.h b/include/net/sock.h index af2b0544586e..ff8b0dad7b0f 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -454,6 +454,7 @@ static inline void sk_stream_set_owner_r(struct sk_buff *skb, struct sock *sk) | |||
454 | 454 | ||
455 | static inline void sk_stream_free_skb(struct sock *sk, struct sk_buff *skb) | 455 | static inline void sk_stream_free_skb(struct sock *sk, struct sk_buff *skb) |
456 | { | 456 | { |
457 | skb_truesize_check(skb); | ||
457 | sock_set_flag(sk, SOCK_QUEUE_SHRUNK); | 458 | sock_set_flag(sk, SOCK_QUEUE_SHRUNK); |
458 | sk->sk_wmem_queued -= skb->truesize; | 459 | sk->sk_wmem_queued -= skb->truesize; |
459 | sk->sk_forward_alloc += skb->truesize; | 460 | sk->sk_forward_alloc += skb->truesize; |
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 84b9af76f0a2..3a13ed643459 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c | |||
@@ -831,7 +831,7 @@ static int translate_table(struct ebt_replace *repl, | |||
831 | return -ENOMEM; | 831 | return -ENOMEM; |
832 | for_each_possible_cpu(i) { | 832 | for_each_possible_cpu(i) { |
833 | newinfo->chainstack[i] = | 833 | newinfo->chainstack[i] = |
834 | vmalloc(udc_cnt * sizeof(struct ebt_chainstack)); | 834 | vmalloc(udc_cnt * sizeof(*(newinfo->chainstack[0]))); |
835 | if (!newinfo->chainstack[i]) { | 835 | if (!newinfo->chainstack[i]) { |
836 | while (i) | 836 | while (i) |
837 | vfree(newinfo->chainstack[--i]); | 837 | vfree(newinfo->chainstack[--i]); |
@@ -841,8 +841,7 @@ static int translate_table(struct ebt_replace *repl, | |||
841 | } | 841 | } |
842 | } | 842 | } |
843 | 843 | ||
844 | cl_s = (struct ebt_cl_stack *) | 844 | cl_s = vmalloc(udc_cnt * sizeof(*cl_s)); |
845 | vmalloc(udc_cnt * sizeof(struct ebt_cl_stack)); | ||
846 | if (!cl_s) | 845 | if (!cl_s) |
847 | return -ENOMEM; | 846 | return -ENOMEM; |
848 | i = 0; /* the i'th udc */ | 847 | i = 0; /* the i'th udc */ |
@@ -944,8 +943,7 @@ static int do_replace(void __user *user, unsigned int len) | |||
944 | 943 | ||
945 | countersize = COUNTER_OFFSET(tmp.nentries) * | 944 | countersize = COUNTER_OFFSET(tmp.nentries) * |
946 | (highest_possible_processor_id()+1); | 945 | (highest_possible_processor_id()+1); |
947 | newinfo = (struct ebt_table_info *) | 946 | newinfo = vmalloc(sizeof(*newinfo) + countersize); |
948 | vmalloc(sizeof(struct ebt_table_info) + countersize); | ||
949 | if (!newinfo) | 947 | if (!newinfo) |
950 | return -ENOMEM; | 948 | return -ENOMEM; |
951 | 949 | ||
@@ -967,8 +965,7 @@ static int do_replace(void __user *user, unsigned int len) | |||
967 | /* the user wants counters back | 965 | /* the user wants counters back |
968 | the check on the size is done later, when we have the lock */ | 966 | the check on the size is done later, when we have the lock */ |
969 | if (tmp.num_counters) { | 967 | if (tmp.num_counters) { |
970 | counterstmp = (struct ebt_counter *) | 968 | counterstmp = vmalloc(tmp.num_counters * sizeof(*counterstmp)); |
971 | vmalloc(tmp.num_counters * sizeof(struct ebt_counter)); | ||
972 | if (!counterstmp) { | 969 | if (!counterstmp) { |
973 | ret = -ENOMEM; | 970 | ret = -ENOMEM; |
974 | goto free_entries; | 971 | goto free_entries; |
@@ -1148,8 +1145,7 @@ int ebt_register_table(struct ebt_table *table) | |||
1148 | 1145 | ||
1149 | countersize = COUNTER_OFFSET(table->table->nentries) * | 1146 | countersize = COUNTER_OFFSET(table->table->nentries) * |
1150 | (highest_possible_processor_id()+1); | 1147 | (highest_possible_processor_id()+1); |
1151 | newinfo = (struct ebt_table_info *) | 1148 | newinfo = vmalloc(sizeof(*newinfo) + countersize); |
1152 | vmalloc(sizeof(struct ebt_table_info) + countersize); | ||
1153 | ret = -ENOMEM; | 1149 | ret = -ENOMEM; |
1154 | if (!newinfo) | 1150 | if (!newinfo) |
1155 | return -ENOMEM; | 1151 | return -ENOMEM; |
@@ -1247,8 +1243,7 @@ static int update_counters(void __user *user, unsigned int len) | |||
1247 | if (hlp.num_counters == 0) | 1243 | if (hlp.num_counters == 0) |
1248 | return -EINVAL; | 1244 | return -EINVAL; |
1249 | 1245 | ||
1250 | if ( !(tmp = (struct ebt_counter *) | 1246 | if (!(tmp = vmalloc(hlp.num_counters * sizeof(*tmp)))) { |
1251 | vmalloc(hlp.num_counters * sizeof(struct ebt_counter))) ){ | ||
1252 | MEMPRINT("Update_counters && nomemory\n"); | 1247 | MEMPRINT("Update_counters && nomemory\n"); |
1253 | return -ENOMEM; | 1248 | return -ENOMEM; |
1254 | } | 1249 | } |
@@ -1377,8 +1372,7 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user, | |||
1377 | BUGPRINT("Num_counters wrong\n"); | 1372 | BUGPRINT("Num_counters wrong\n"); |
1378 | return -EINVAL; | 1373 | return -EINVAL; |
1379 | } | 1374 | } |
1380 | counterstmp = (struct ebt_counter *) | 1375 | counterstmp = vmalloc(nentries * sizeof(*counterstmp)); |
1381 | vmalloc(nentries * sizeof(struct ebt_counter)); | ||
1382 | if (!counterstmp) { | 1376 | if (!counterstmp) { |
1383 | MEMPRINT("Couldn't copy counters, out of memory\n"); | 1377 | MEMPRINT("Couldn't copy counters, out of memory\n"); |
1384 | return -ENOMEM; | 1378 | return -ENOMEM; |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 09464fa8d72f..fb3770f9c094 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -112,6 +112,14 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here) | |||
112 | BUG(); | 112 | BUG(); |
113 | } | 113 | } |
114 | 114 | ||
115 | void skb_truesize_bug(struct sk_buff *skb) | ||
116 | { | ||
117 | printk(KERN_ERR "SKB BUG: Invalid truesize (%u) " | ||
118 | "len=%u, sizeof(sk_buff)=%Zd\n", | ||
119 | skb->truesize, skb->len, sizeof(struct sk_buff)); | ||
120 | } | ||
121 | EXPORT_SYMBOL(skb_truesize_bug); | ||
122 | |||
115 | /* Allocate a new skbuff. We do this ourselves so we can fill in a few | 123 | /* Allocate a new skbuff. We do this ourselves so we can fill in a few |
116 | * 'private' fields and also do memory statistics to find all the | 124 | * 'private' fields and also do memory statistics to find all the |
117 | * [BEEP] leaks. | 125 | * [BEEP] leaks. |
diff --git a/net/core/stream.c b/net/core/stream.c index 35e25259fd95..e9489696f694 100644 --- a/net/core/stream.c +++ b/net/core/stream.c | |||
@@ -176,6 +176,7 @@ void sk_stream_rfree(struct sk_buff *skb) | |||
176 | { | 176 | { |
177 | struct sock *sk = skb->sk; | 177 | struct sock *sk = skb->sk; |
178 | 178 | ||
179 | skb_truesize_check(skb); | ||
179 | atomic_sub(skb->truesize, &sk->sk_rmem_alloc); | 180 | atomic_sub(skb->truesize, &sk->sk_rmem_alloc); |
180 | sk->sk_forward_alloc += skb->truesize; | 181 | sk->sk_forward_alloc += skb->truesize; |
181 | } | 182 | } |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 44df1db726a3..a28ae593b976 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -533,6 +533,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss | |||
533 | struct tcp_sock *tp = tcp_sk(sk); | 533 | struct tcp_sock *tp = tcp_sk(sk); |
534 | struct sk_buff *buff; | 534 | struct sk_buff *buff; |
535 | int nsize, old_factor; | 535 | int nsize, old_factor; |
536 | int nlen; | ||
536 | u16 flags; | 537 | u16 flags; |
537 | 538 | ||
538 | BUG_ON(len > skb->len); | 539 | BUG_ON(len > skb->len); |
@@ -552,8 +553,10 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss | |||
552 | if (buff == NULL) | 553 | if (buff == NULL) |
553 | return -ENOMEM; /* We'll just try again later. */ | 554 | return -ENOMEM; /* We'll just try again later. */ |
554 | 555 | ||
555 | buff->truesize = skb->len - len; | 556 | sk_charge_skb(sk, buff); |
556 | skb->truesize -= buff->truesize; | 557 | nlen = skb->len - len - nsize; |
558 | buff->truesize += nlen; | ||
559 | skb->truesize -= nlen; | ||
557 | 560 | ||
558 | /* Correct the sequence numbers. */ | 561 | /* Correct the sequence numbers. */ |
559 | TCP_SKB_CB(buff)->seq = TCP_SKB_CB(skb)->seq + len; | 562 | TCP_SKB_CB(buff)->seq = TCP_SKB_CB(skb)->seq + len; |
@@ -1039,7 +1042,8 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, | |||
1039 | if (unlikely(buff == NULL)) | 1042 | if (unlikely(buff == NULL)) |
1040 | return -ENOMEM; | 1043 | return -ENOMEM; |
1041 | 1044 | ||
1042 | buff->truesize = nlen; | 1045 | sk_charge_skb(sk, buff); |
1046 | buff->truesize += nlen; | ||
1043 | skb->truesize -= nlen; | 1047 | skb->truesize -= nlen; |
1044 | 1048 | ||
1045 | /* Correct the sequence numbers. */ | 1049 | /* Correct the sequence numbers. */ |
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c index 8f3addf0724c..d62e0f9b9da3 100644 --- a/net/llc/llc_input.c +++ b/net/llc/llc_input.c | |||
@@ -118,7 +118,8 @@ static inline int llc_fixup_skb(struct sk_buff *skb) | |||
118 | u16 pdulen = eth_hdr(skb)->h_proto, | 118 | u16 pdulen = eth_hdr(skb)->h_proto, |
119 | data_size = ntohs(pdulen) - llc_len; | 119 | data_size = ntohs(pdulen) - llc_len; |
120 | 120 | ||
121 | skb_trim(skb, data_size); | 121 | if (unlikely(pskb_trim_rcsum(skb, data_size))) |
122 | return 0; | ||
122 | } | 123 | } |
123 | return 1; | 124 | return 1; |
124 | } | 125 | } |
diff --git a/net/socket.c b/net/socket.c index 23898f45f713..0ce12dfc7a71 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -490,6 +490,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed) | |||
490 | struct file *file; | 490 | struct file *file; |
491 | struct socket *sock; | 491 | struct socket *sock; |
492 | 492 | ||
493 | *err = -EBADF; | ||
493 | file = fget_light(fd, fput_needed); | 494 | file = fget_light(fd, fput_needed); |
494 | if (file) { | 495 | if (file) { |
495 | sock = sock_from_file(file, err); | 496 | sock = sock_from_file(file, err); |