From d35bad03e31bd861e231c8c68799c62752b56fa8 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 7 Nov 2008 08:44:56 +0000 Subject: update to 2.6.25.19, and refresh patches SVN-Revision: 13137 --- target/linux/avr32/Makefile | 2 +- target/linux/avr32/patches/100-git_sync.patch | 568 ++++++++++----------- .../linux/avr32/patches/110-openwrt_flashmap.patch | 2 +- 3 files changed, 286 insertions(+), 286 deletions(-) (limited to 'target/linux/avr32') diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 6d24ecffb3..7d1b8418a5 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -10,7 +10,7 @@ ARCH:=avr32 BOARD:=avr32 BOARDNAME:=Atmel AVR32 FEATURES:=squashfs -LINUX_VERSION:=2.6.25.17 +LINUX_VERSION:=2.6.25.19 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/patches/100-git_sync.patch b/target/linux/avr32/patches/100-git_sync.patch index 2f6291a7db..6c9fe1eb66 100644 --- a/target/linux/avr32/patches/100-git_sync.patch +++ b/target/linux/avr32/patches/100-git_sync.patch @@ -1,6 +1,6 @@ --- a/Documentation/serial/driver +++ b/Documentation/serial/driver -@@ -186,6 +186,17 @@ +@@ -186,6 +186,17 @@ hardware. Locking: port_sem taken. Interrupts: caller dependent. @@ -20,7 +20,7 @@ bits. Update read_status_mask and ignore_status_mask to indicate --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig -@@ -47,6 +47,9 @@ +@@ -47,6 +47,9 @@ config RWSEM_GENERIC_SPINLOCK config GENERIC_TIME def_bool y @@ -30,7 +30,7 @@ config RWSEM_XCHGADD_ALGORITHM def_bool n -@@ -70,6 +73,8 @@ +@@ -70,6 +73,8 @@ source "init/Kconfig" menu "System Type and features" @@ -39,7 +39,7 @@ config SUBARCH_AVR32B bool config MMU -@@ -83,6 +88,7 @@ +@@ -83,6 +88,7 @@ config PLATFORM_AT32AP select MMU select PERFORMANCE_COUNTERS select HAVE_GPIO_LIB @@ -47,7 +47,7 @@ # # CPU types -@@ -117,6 +123,9 @@ +@@ -117,6 +123,9 @@ endchoice if BOARD_ATSTK1000 source "arch/avr32/boards/atstk1000/Kconfig" endif @@ -57,7 +57,7 @@ choice prompt "Boot loader type" -@@ -142,6 +151,9 @@ +@@ -142,6 +151,9 @@ config PHYS_OFFSET source "kernel/Kconfig.preempt" @@ -67,7 +67,7 @@ config HAVE_ARCH_BOOTMEM_NODE def_bool n -@@ -180,6 +192,10 @@ +@@ -180,6 +192,10 @@ config NMI_DEBUGGING be dumped to the console when a Non-Maskable Interrupt happens. @@ -78,7 +78,7 @@ # FPU emulation goes here source "kernel/Kconfig.hz" -@@ -196,6 +212,11 @@ +@@ -196,6 +212,11 @@ endmenu menu "Power management options" @@ -92,7 +92,7 @@ source "drivers/cpufreq/Kconfig" --- a/arch/avr32/Makefile +++ b/arch/avr32/Makefile -@@ -32,6 +32,7 @@ +@@ -32,6 +32,7 @@ core-$(CONFIG_LOADER_U_BOOT) += arch/av core-y += arch/avr32/kernel/ core-y += arch/avr32/mm/ drivers-$(CONFIG_OPROFILE) += arch/avr32/oprofile/ @@ -131,7 +131,7 @@ /* Initialized by bootloader-specific startup code. */ struct tag *bootloader_tags __initdata; -@@ -37,11 +44,16 @@ +@@ -37,11 +44,16 @@ static struct eth_platform_data __initda static struct spi_board_info spi0_board_info[] __initdata = { { .modalias = "mtd_dataflash", @@ -149,7 +149,7 @@ /* * The next two functions should go away as the boot loader is * supposed to initialize the macb address registers with a valid -@@ -124,6 +136,7 @@ +@@ -124,6 +136,7 @@ static struct platform_device ngw_gpio_l } }; @@ -157,7 +157,7 @@ static struct i2c_gpio_platform_data i2c_gpio_data = { .sda_pin = GPIO_PIN_PA(6), .scl_pin = GPIO_PIN_PA(7), -@@ -139,6 +152,7 @@ +@@ -139,6 +152,7 @@ static struct platform_device i2c_gpio_d .platform_data = &i2c_gpio_data, }, }; @@ -165,7 +165,7 @@ static int __init atngw100_init(void) { -@@ -157,6 +171,7 @@ +@@ -157,6 +171,7 @@ static int __init atngw100_init(void) set_hw_addr(at32_add_device_eth(1, ð_data[1])); at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info)); @@ -173,7 +173,7 @@ at32_add_device_usba(0, NULL); for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) { -@@ -165,11 +180,15 @@ +@@ -165,11 +180,15 @@ static int __init atngw100_init(void) } platform_device_register(&ngw_gpio_leds); @@ -191,7 +191,7 @@ } --- a/arch/avr32/boards/atstk1000/Kconfig +++ b/arch/avr32/boards/atstk1000/Kconfig -@@ -18,6 +18,10 @@ +@@ -18,6 +18,10 @@ config BOARD_ATSTK1004 bool "ATSTK1004" select CPU_AT32AP7002 @@ -202,7 +202,7 @@ endchoice -@@ -102,4 +106,60 @@ +@@ -102,4 +106,60 @@ config BOARD_ATSTK1000_EXTDAC depends on !BOARD_ATSTK100X_SW1_CUSTOM && !BOARD_ATSTK100X_SW3_CUSTOM default y @@ -265,7 +265,7 @@ endif # stk 1000 --- a/arch/avr32/boards/atstk1000/Makefile +++ b/arch/avr32/boards/atstk1000/Makefile -@@ -2,3 +2,4 @@ +@@ -2,3 +2,4 @@ obj-y += setup.o flash.o obj-$(CONFIG_BOARD_ATSTK1002) += atstk1002.o obj-$(CONFIG_BOARD_ATSTK1003) += atstk1003.o obj-$(CONFIG_BOARD_ATSTK1004) += atstk1004.o @@ -363,7 +363,7 @@ struct eth_addr { u8 addr[6]; -@@ -83,6 +157,19 @@ +@@ -83,6 +157,19 @@ static struct spi_board_info spi1_board_ } }; #endif @@ -383,7 +383,7 @@ /* * The next two functions should go away as the boot loader is * supposed to initialize the macb address registers with a valid -@@ -212,6 +299,12 @@ +@@ -212,6 +299,12 @@ static int __init atstk1002_init(void) at32_add_system_devices(); @@ -396,7 +396,7 @@ #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM at32_add_device_usart(1); #else -@@ -228,16 +321,30 @@ +@@ -228,16 +321,30 @@ static int __init atstk1002_init(void) #ifdef CONFIG_BOARD_ATSTK100X_SPI1 at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); #endif @@ -444,7 +444,7 @@ #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC static struct at73c213_board_info at73c213_data = { .ssc_id = 0, -@@ -59,6 +66,19 @@ +@@ -59,6 +66,19 @@ static struct spi_board_info spi1_board_ } }; #endif @@ -464,7 +464,7 @@ #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC static void __init atstk1003_setup_extdac(void) { -@@ -147,12 +167,22 @@ +@@ -147,12 +167,22 @@ static int __init atstk1003_init(void) at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); #endif #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM @@ -504,7 +504,7 @@ #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC static struct at73c213_board_info at73c213_data = { .ssc_id = 0, -@@ -130,14 +137,23 @@ +@@ -130,14 +137,23 @@ static int __init atstk1004_init(void) at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); #endif #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM @@ -542,7 +542,7 @@ # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y -@@ -13,10 +13,10 @@ +@@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y @@ -554,7 +554,7 @@ CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y -@@ -37,17 +37,15 @@ +@@ -37,17 +37,15 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_TASKSTATS is not set @@ -575,7 +575,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y -@@ -61,11 +59,13 @@ +@@ -61,11 +59,13 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -589,7 +589,7 @@ CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y -@@ -73,6 +73,14 @@ +@@ -73,6 +73,14 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set @@ -604,7 +604,7 @@ CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set -@@ -101,10 +109,15 @@ +@@ -101,10 +109,15 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" @@ -620,7 +620,7 @@ CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y -@@ -113,6 +126,7 @@ +@@ -113,6 +126,7 @@ CONFIG_CPU_AT32AP700X=y CONFIG_CPU_AT32AP7000=y # CONFIG_BOARD_ATSTK1000 is not set CONFIG_BOARD_ATNGW100=y @@ -628,7 +628,7 @@ CONFIG_LOADER_U_BOOT=y # -@@ -121,6 +135,7 @@ +@@ -121,6 +135,7 @@ CONFIG_LOADER_U_BOOT=y # CONFIG_AP700X_32_BIT_SMC is not set CONFIG_AP700X_16_BIT_SMC=y # CONFIG_AP700X_8_BIT_SMC is not set @@ -636,7 +636,7 @@ CONFIG_LOAD_ADDRESS=0x10000000 CONFIG_ENTRY_ADDRESS=0x90000000 CONFIG_PHYS_OFFSET=0x10000000 -@@ -146,16 +161,26 @@ +@@ -146,16 +161,26 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_OWNERSHIP_TRACE is not set @@ -663,7 +663,7 @@ # # CPU Frequency scaling -@@ -164,9 +189,9 @@ +@@ -164,9 +189,9 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set # CONFIG_CPU_FREQ_STAT is not set @@ -675,7 +675,7 @@ # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set -@@ -202,6 +227,7 @@ +@@ -202,6 +227,7 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set @@ -683,7 +683,7 @@ CONFIG_NET_KEY=y # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y -@@ -260,82 +286,33 @@ +@@ -260,82 +286,33 @@ CONFIG_IPV6_SIT=y # CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set @@ -770,7 +770,7 @@ CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m -@@ -343,54 +320,25 @@ +@@ -343,54 +320,25 @@ CONFIG_IP_NF_TARGET_LOG=m CONFIG_NF_NAT=m CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -830,7 +830,7 @@ # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set -@@ -407,7 +355,6 @@ +@@ -407,7 +355,6 @@ CONFIG_LLC=m # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set @@ -838,7 +838,7 @@ # # Network testing -@@ -415,6 +362,7 @@ +@@ -415,6 +362,7 @@ CONFIG_NET_CLS_ROUTE=y # CONFIG_NET_PKTGEN is not set # CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set @@ -846,7 +846,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -@@ -531,11 +479,18 @@ +@@ -531,11 +479,18 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 @@ -868,7 +868,7 @@ # # SCSI device support -@@ -568,11 +523,13 @@ +@@ -568,11 +523,13 @@ CONFIG_PHYLIB=y # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set @@ -882,7 +882,7 @@ # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set -@@ -599,7 +556,6 @@ +@@ -599,7 +556,6 @@ CONFIG_PPPOE=m # CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m @@ -890,7 +890,7 @@ # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -@@ -633,6 +589,7 @@ +@@ -633,6 +589,7 @@ CONFIG_SLHC=m # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y @@ -898,7 +898,7 @@ # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -@@ -640,8 +597,6 @@ +@@ -640,8 +597,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -907,7 +907,7 @@ # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -@@ -659,6 +614,7 @@ +@@ -659,6 +614,7 @@ CONFIG_I2C_ALGOBIT=m # # I2C Hardware Bus support # @@ -915,7 +915,7 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set -@@ -669,13 +625,12 @@ +@@ -669,13 +625,12 @@ CONFIG_I2C_GPIO=m # # Miscellaneous I2C Chip support # @@ -931,7 +931,7 @@ # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set -@@ -702,9 +657,27 @@ +@@ -702,9 +657,27 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT25 is not set CONFIG_SPI_SPIDEV=m # CONFIG_SPI_TLE62X0 is not set @@ -959,7 +959,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set -@@ -757,10 +730,6 @@ +@@ -757,10 +730,6 @@ CONFIG_USB_SUPPORT=y # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # @@ -970,7 +970,7 @@ CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set -@@ -787,21 +756,24 @@ +@@ -787,21 +756,24 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set @@ -997,7 +997,7 @@ CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y -@@ -844,19 +816,22 @@ +@@ -844,19 +816,22 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set @@ -1022,7 +1022,7 @@ # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set -@@ -874,25 +849,23 @@ +@@ -874,25 +849,23 @@ CONFIG_RTC_DRV_AT32AP700X=y # # File systems # @@ -1052,7 +1052,7 @@ # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m -@@ -923,7 +896,7 @@ +@@ -923,7 +896,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set @@ -1061,7 +1061,7 @@ # # Miscellaneous filesystems -@@ -948,8 +921,10 @@ +@@ -948,8 +921,10 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set @@ -1072,7 +1072,7 @@ # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -@@ -1030,11 +1005,6 @@ +@@ -1030,11 +1005,6 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m # CONFIG_DLM is not set @@ -1084,7 +1084,7 @@ # # Kernel hacking -@@ -1053,6 +1023,7 @@ +@@ -1053,6 +1023,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_SLUB_DEBUG_ON is not set @@ -1092,7 +1092,7 @@ # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set -@@ -1069,9 +1040,10 @@ +@@ -1069,9 +1040,10 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y @@ -1104,7 +1104,7 @@ # CONFIG_LKDTM is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set -@@ -1084,7 +1056,9 @@ +@@ -1084,7 +1056,9 @@ CONFIG_FRAME_POINTER=y # CONFIG_SECURITY_FILE_CAPABILITIES is not set CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y @@ -1114,7 +1114,7 @@ CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y -@@ -1103,6 +1077,9 @@ +@@ -1103,6 +1077,9 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_PCBC=m # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_XTS is not set @@ -1124,7 +1124,7 @@ # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_FCRYPT is not set -@@ -1117,12 +1094,14 @@ +@@ -1117,12 +1094,14 @@ CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_SEED is not set @@ -1140,7 +1140,7 @@ CONFIG_CRYPTO_HW=y # -@@ -1137,10 +1116,7 @@ +@@ -1137,10 +1116,7 @@ CONFIG_CRC7=m # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y @@ -1164,7 +1164,7 @@ # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y -@@ -13,10 +13,10 @@ +@@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y @@ -1176,7 +1176,7 @@ CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y -@@ -36,15 +36,15 @@ +@@ -36,15 +36,15 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set @@ -1195,7 +1195,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y -@@ -58,11 +58,13 @@ +@@ -58,11 +58,13 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -1209,7 +1209,7 @@ CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y -@@ -70,6 +72,14 @@ +@@ -70,6 +72,14 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set @@ -1224,7 +1224,7 @@ CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set -@@ -98,10 +108,15 @@ +@@ -98,10 +108,15 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" @@ -1240,7 +1240,7 @@ CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y -@@ -113,12 +128,16 @@ +@@ -113,12 +128,16 @@ CONFIG_BOARD_ATSTK1000=y CONFIG_BOARD_ATSTK1002=y # CONFIG_BOARD_ATSTK1003 is not set # CONFIG_BOARD_ATSTK1004 is not set @@ -1257,7 +1257,7 @@ CONFIG_LOADER_U_BOOT=y # -@@ -127,6 +146,7 @@ +@@ -127,6 +146,7 @@ CONFIG_LOADER_U_BOOT=y # CONFIG_AP700X_32_BIT_SMC is not set CONFIG_AP700X_16_BIT_SMC=y # CONFIG_AP700X_8_BIT_SMC is not set @@ -1265,7 +1265,7 @@ CONFIG_LOAD_ADDRESS=0x10000000 CONFIG_ENTRY_ADDRESS=0x90000000 CONFIG_PHYS_OFFSET=0x10000000 -@@ -152,16 +172,26 @@ +@@ -152,16 +172,26 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_OWNERSHIP_TRACE is not set @@ -1292,7 +1292,7 @@ # # CPU Frequency scaling -@@ -170,9 +200,9 @@ +@@ -170,9 +200,9 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set # CONFIG_CPU_FREQ_STAT is not set @@ -1304,7 +1304,7 @@ # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set -@@ -208,6 +238,7 @@ +@@ -208,6 +238,7 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set @@ -1312,7 +1312,7 @@ CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y -@@ -279,6 +310,7 @@ +@@ -279,6 +310,7 @@ CONFIG_LLC=m # CONFIG_NET_PKTGEN is not set # CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set @@ -1320,7 +1320,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -@@ -395,13 +427,18 @@ +@@ -395,13 +427,18 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 @@ -1341,7 +1341,7 @@ # # SCSI device support -@@ -444,6 +481,7 @@ +@@ -444,6 +481,7 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_LOWLEVEL is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set @@ -1349,7 +1349,7 @@ CONFIG_PATA_AT32=m # CONFIG_PATA_PLATFORM is not set # CONFIG_MD is not set -@@ -469,11 +507,13 @@ +@@ -469,11 +507,13 @@ CONFIG_PHYLIB=y # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set @@ -1363,7 +1363,7 @@ # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set -@@ -500,7 +540,6 @@ +@@ -500,7 +540,6 @@ CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m @@ -1371,7 +1371,7 @@ # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -@@ -568,6 +607,7 @@ +@@ -568,6 +607,7 @@ CONFIG_MOUSE_GPIO=m # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y @@ -1379,7 +1379,7 @@ # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -@@ -575,8 +615,6 @@ +@@ -575,8 +615,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -1388,7 +1388,7 @@ # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -@@ -594,6 +632,7 @@ +@@ -594,6 +632,7 @@ CONFIG_I2C_ALGOBIT=m # # I2C Hardware Bus support # @@ -1396,7 +1396,7 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set -@@ -604,13 +643,12 @@ +@@ -604,13 +643,12 @@ CONFIG_I2C_GPIO=m # # Miscellaneous I2C Chip support # @@ -1412,7 +1412,7 @@ # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set -@@ -637,9 +675,27 @@ +@@ -637,9 +675,27 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT25 is not set CONFIG_SPI_SPIDEV=m # CONFIG_SPI_TLE62X0 is not set @@ -1440,7 +1440,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set -@@ -732,12 +788,18 @@ +@@ -732,12 +788,18 @@ CONFIG_SND_PCM_OSS_PLUGINS=y # # Generic devices # @@ -1459,7 +1459,7 @@ # SPI devices # CONFIG_SND_AT73C213=m -@@ -753,9 +815,14 @@ +@@ -753,9 +815,14 @@ CONFIG_SND_AT73C213_TARGET_BITRATE=48000 # # @@ -1474,7 +1474,7 @@ # CONFIG_HID_SUPPORT is not set CONFIG_USB_SUPPORT=y # CONFIG_USB_ARCH_HAS_HCD is not set -@@ -765,10 +832,6 @@ +@@ -765,10 +832,6 @@ CONFIG_USB_SUPPORT=y # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # @@ -1485,7 +1485,7 @@ CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set -@@ -796,27 +859,31 @@ +@@ -796,27 +859,31 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set @@ -1519,7 +1519,7 @@ CONFIG_LEDS_GPIO=m # -@@ -853,19 +920,22 @@ +@@ -853,19 +920,22 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set @@ -1544,7 +1544,7 @@ # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set -@@ -883,13 +953,13 @@ +@@ -883,13 +953,13 @@ CONFIG_RTC_DRV_AT32AP700X=y # # File systems # @@ -1561,7 +1561,7 @@ # CONFIG_JBD_DEBUG is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -@@ -897,12 +967,10 @@ +@@ -897,12 +967,10 @@ CONFIG_JBD=m # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set @@ -1575,7 +1575,7 @@ # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m -@@ -933,7 +1001,7 @@ +@@ -933,7 +1001,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set @@ -1584,7 +1584,7 @@ # # Miscellaneous filesystems -@@ -957,8 +1025,10 @@ +@@ -957,8 +1025,10 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set @@ -1595,7 +1595,7 @@ # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -@@ -1028,11 +1098,6 @@ +@@ -1028,11 +1098,6 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m # CONFIG_DLM is not set @@ -1607,7 +1607,7 @@ # # Kernel hacking -@@ -1051,6 +1116,7 @@ +@@ -1051,6 +1116,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_SLUB_DEBUG_ON is not set @@ -1615,7 +1615,7 @@ # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set -@@ -1067,9 +1133,10 @@ +@@ -1067,9 +1133,10 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y @@ -1627,7 +1627,7 @@ # CONFIG_LKDTM is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set -@@ -1082,7 +1149,9 @@ +@@ -1082,7 +1149,9 @@ CONFIG_FORCED_INLINING=y # CONFIG_SECURITY_FILE_CAPABILITIES is not set CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=m @@ -1637,7 +1637,7 @@ CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=m -@@ -1101,6 +1170,9 @@ +@@ -1101,6 +1170,9 @@ CONFIG_CRYPTO_CBC=m # CONFIG_CRYPTO_PCBC is not set # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_XTS is not set @@ -1647,7 +1647,7 @@ # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set -@@ -1115,12 +1187,14 @@ +@@ -1115,12 +1187,14 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_SEED is not set @@ -1663,7 +1663,7 @@ # CONFIG_CRYPTO_HW is not set # -@@ -1135,6 +1209,7 @@ +@@ -1135,6 +1209,7 @@ CONFIG_CRC7=m # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y @@ -1683,7 +1683,7 @@ # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y -@@ -13,10 +13,10 @@ +@@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y @@ -1695,7 +1695,7 @@ CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y -@@ -39,17 +39,15 @@ +@@ -39,17 +39,15 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y # CONFIG_TASK_XACCT is not set @@ -1716,7 +1716,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y -@@ -63,11 +61,13 @@ +@@ -63,11 +61,13 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -1730,7 +1730,7 @@ CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y -@@ -75,6 +75,14 @@ +@@ -75,6 +75,14 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set @@ -1745,7 +1745,7 @@ CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set -@@ -103,10 +111,15 @@ +@@ -103,10 +111,15 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" @@ -1761,7 +1761,7 @@ CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y -@@ -118,12 +131,16 @@ +@@ -118,12 +131,16 @@ CONFIG_BOARD_ATSTK1000=y # CONFIG_BOARD_ATSTK1002 is not set CONFIG_BOARD_ATSTK1003=y # CONFIG_BOARD_ATSTK1004 is not set @@ -1778,7 +1778,7 @@ CONFIG_LOADER_U_BOOT=y # -@@ -132,6 +149,7 @@ +@@ -132,6 +149,7 @@ CONFIG_LOADER_U_BOOT=y # CONFIG_AP700X_32_BIT_SMC is not set CONFIG_AP700X_16_BIT_SMC=y # CONFIG_AP700X_8_BIT_SMC is not set @@ -1786,7 +1786,7 @@ CONFIG_LOAD_ADDRESS=0x10000000 CONFIG_ENTRY_ADDRESS=0x90000000 CONFIG_PHYS_OFFSET=0x10000000 -@@ -157,16 +175,26 @@ +@@ -157,16 +175,26 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_OWNERSHIP_TRACE is not set @@ -1813,7 +1813,7 @@ # # CPU Frequency scaling -@@ -175,9 +203,9 @@ +@@ -175,9 +203,9 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set # CONFIG_CPU_FREQ_STAT is not set @@ -1825,7 +1825,7 @@ # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set -@@ -260,6 +288,7 @@ +@@ -260,6 +288,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NET_PKTGEN is not set # CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set @@ -1833,7 +1833,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -@@ -376,13 +405,18 @@ +@@ -376,13 +405,18 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 @@ -1854,7 +1854,7 @@ # # SCSI device support -@@ -427,6 +461,7 @@ +@@ -427,6 +461,7 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_DEBUG is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set @@ -1862,7 +1862,7 @@ CONFIG_PATA_AT32=m # CONFIG_PATA_PLATFORM is not set # CONFIG_MD is not set -@@ -460,7 +495,6 @@ +@@ -460,7 +495,6 @@ CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m @@ -1870,7 +1870,7 @@ # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -@@ -528,6 +562,7 @@ +@@ -528,6 +562,7 @@ CONFIG_MOUSE_GPIO=m # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y @@ -1878,7 +1878,7 @@ # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -@@ -535,8 +570,6 @@ +@@ -535,8 +570,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -1887,7 +1887,7 @@ # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -@@ -554,6 +587,7 @@ +@@ -554,6 +587,7 @@ CONFIG_I2C_ALGOBIT=m # # I2C Hardware Bus support # @@ -1895,7 +1895,7 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set -@@ -564,13 +598,12 @@ +@@ -564,13 +598,12 @@ CONFIG_I2C_GPIO=m # # Miscellaneous I2C Chip support # @@ -1911,7 +1911,7 @@ # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set -@@ -597,9 +630,27 @@ +@@ -597,9 +630,27 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT25 is not set CONFIG_SPI_SPIDEV=m # CONFIG_SPI_TLE62X0 is not set @@ -1939,7 +1939,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set -@@ -665,12 +716,18 @@ +@@ -665,12 +716,18 @@ CONFIG_SND_VERBOSE_PROCFS=y # # Generic devices # @@ -1958,7 +1958,7 @@ # SPI devices # CONFIG_SND_AT73C213=m -@@ -686,9 +743,14 @@ +@@ -686,9 +743,14 @@ CONFIG_SND_AT73C213_TARGET_BITRATE=48000 # # @@ -1973,7 +1973,7 @@ # CONFIG_HID_SUPPORT is not set CONFIG_USB_SUPPORT=y # CONFIG_USB_ARCH_HAS_HCD is not set -@@ -698,10 +760,6 @@ +@@ -698,10 +760,6 @@ CONFIG_USB_SUPPORT=y # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # @@ -1984,7 +1984,7 @@ CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set -@@ -729,27 +787,31 @@ +@@ -729,27 +787,31 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set @@ -2018,7 +2018,7 @@ CONFIG_LEDS_GPIO=y # -@@ -786,19 +848,22 @@ +@@ -786,19 +848,22 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set @@ -2043,7 +2043,7 @@ # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set -@@ -816,13 +881,13 @@ +@@ -816,13 +881,13 @@ CONFIG_UIO=m # # File systems # @@ -2060,7 +2060,7 @@ # CONFIG_JBD_DEBUG is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -@@ -830,12 +895,10 @@ +@@ -830,12 +895,10 @@ CONFIG_JBD=m # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set @@ -2074,7 +2074,7 @@ # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m -@@ -866,7 +929,7 @@ +@@ -866,7 +929,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set @@ -2083,7 +2083,7 @@ # # Miscellaneous filesystems -@@ -891,8 +954,10 @@ +@@ -891,8 +954,10 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set @@ -2094,7 +2094,7 @@ # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # CONFIG_NETWORK_FILESYSTEMS is not set -@@ -943,11 +1008,6 @@ +@@ -943,11 +1008,6 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m # CONFIG_DLM is not set @@ -2106,7 +2106,7 @@ # # Kernel hacking -@@ -965,6 +1025,7 @@ +@@ -965,6 +1025,7 @@ CONFIG_DETECT_SOFTLOCKUP=y CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set @@ -2114,7 +2114,7 @@ # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set -@@ -981,9 +1042,10 @@ +@@ -981,9 +1042,10 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y @@ -2126,7 +2126,7 @@ # CONFIG_LKDTM is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set -@@ -1009,6 +1071,7 @@ +@@ -1009,6 +1071,7 @@ CONFIG_CRC7=m CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y @@ -2146,7 +2146,7 @@ # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y -@@ -13,10 +13,10 @@ +@@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y @@ -2158,7 +2158,7 @@ CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y -@@ -34,15 +34,15 @@ +@@ -34,15 +34,15 @@ CONFIG_LOCALVERSION="" # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set @@ -2177,7 +2177,7 @@ # CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y -@@ -54,24 +54,37 @@ +@@ -54,24 +54,37 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -2215,7 +2215,7 @@ CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y -@@ -83,10 +96,14 @@ +@@ -83,10 +96,14 @@ CONFIG_BOARD_ATSTK1000=y # CONFIG_BOARD_ATSTK1002 is not set # CONFIG_BOARD_ATSTK1003 is not set CONFIG_BOARD_ATSTK1004=y @@ -2230,7 +2230,7 @@ CONFIG_LOADER_U_BOOT=y # -@@ -95,6 +112,7 @@ +@@ -95,6 +112,7 @@ CONFIG_LOADER_U_BOOT=y # CONFIG_AP700X_32_BIT_SMC is not set CONFIG_AP700X_16_BIT_SMC=y # CONFIG_AP700X_8_BIT_SMC is not set @@ -2238,7 +2238,7 @@ CONFIG_LOAD_ADDRESS=0x10000000 CONFIG_ENTRY_ADDRESS=0x90000000 CONFIG_PHYS_OFFSET=0x10000000 -@@ -120,34 +138,26 @@ +@@ -120,34 +138,26 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_OWNERSHIP_TRACE is not set @@ -2279,7 +2279,7 @@ # # Bus options -@@ -222,6 +232,7 @@ +@@ -222,6 +232,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set @@ -2287,7 +2287,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -@@ -321,6 +332,7 @@ +@@ -321,6 +332,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set # CONFIG_MISC_DEVICES is not set @@ -2295,7 +2295,7 @@ # # SCSI device support -@@ -358,6 +370,7 @@ +@@ -358,6 +370,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y @@ -2303,7 +2303,7 @@ # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -@@ -365,8 +378,6 @@ +@@ -365,8 +378,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -2312,7 +2312,7 @@ # CONFIG_R3964 is not set # CONFIG_TCG_TPM is not set # CONFIG_I2C is not set -@@ -389,9 +400,24 @@ +@@ -389,9 +400,24 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT25 is not set # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set @@ -2337,7 +2337,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set -@@ -471,10 +497,6 @@ +@@ -471,10 +497,6 @@ CONFIG_USB_SUPPORT=y # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # @@ -2348,7 +2348,7 @@ CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y -@@ -499,7 +521,9 @@ +@@ -499,7 +521,9 @@ CONFIG_USB_ETH=y # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set @@ -2358,7 +2358,7 @@ # CONFIG_NEW_LEDS is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -@@ -519,15 +543,17 @@ +@@ -519,15 +543,17 @@ CONFIG_RTC_INTF_DEV=y # # SPI RTC drivers # @@ -2378,7 +2378,7 @@ # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set -@@ -545,9 +571,9 @@ +@@ -545,9 +571,9 @@ CONFIG_RTC_DRV_AT32AP700X=y # # File systems # @@ -2389,7 +2389,7 @@ # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set -@@ -580,7 +606,6 @@ +@@ -580,7 +606,6 @@ CONFIG_JFFS2_RTIME=y # CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NLS is not set # CONFIG_DLM is not set @@ -2397,7 +2397,7 @@ # # Kernel hacking -@@ -616,6 +641,7 @@ +@@ -616,6 +641,7 @@ CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y @@ -4458,7 +4458,7 @@ +#endif /* __AVR32_DW_DMAC_H__ */ --- a/arch/avr32/kernel/Makefile +++ b/arch/avr32/kernel/Makefile -@@ -9,6 +9,7 @@ +@@ -9,6 +9,7 @@ obj-y += syscall_table.o syscall-stub obj-y += setup.o traps.o semaphore.o ocd.o ptrace.o obj-y += signal.o sys_avr32.o process.o time.o obj-y += init_task.o switch_to.o cpu.o @@ -4468,7 +4468,7 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o --- a/arch/avr32/kernel/avr32_ksyms.c +++ b/arch/avr32/kernel/avr32_ksyms.c -@@ -29,7 +29,9 @@ +@@ -29,7 +29,9 @@ EXPORT_SYMBOL(__avr32_asr64); */ EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memcpy); @@ -4478,7 +4478,7 @@ /* * Userspace access stuff. -@@ -41,6 +43,8 @@ +@@ -41,6 +43,8 @@ EXPORT_SYMBOL(strncpy_from_user); EXPORT_SYMBOL(__strncpy_from_user); EXPORT_SYMBOL(clear_user); EXPORT_SYMBOL(__clear_user); @@ -4526,7 +4526,7 @@ +EXPORT_SYMBOL(find_dma_controller); --- a/arch/avr32/kernel/entry-avr32b.S +++ b/arch/avr32/kernel/entry-avr32b.S -@@ -74,50 +74,41 @@ +@@ -74,50 +74,41 @@ exception_vectors: .align 2 bral do_dtlb_modified @@ -4588,7 +4588,7 @@ /* Second level lookup */ ld.w r2, r3[r1 << 2] -@@ -148,16 +139,55 @@ +@@ -148,16 +139,55 @@ pgtbl_lookup: tlbmiss_restore rete @@ -4647,7 +4647,7 @@ system_call: #ifdef CONFIG_PREEMPT mask_interrupts -@@ -266,18 +296,6 @@ +@@ -266,18 +296,6 @@ syscall_exit_work: brcc syscall_exit_cont rjmp enter_monitor_mode @@ -4666,7 +4666,7 @@ /* This function expects to find offending PC in SYSREG_RAR_EX */ .type save_full_context_ex, @function .align 2 -@@ -741,26 +759,6 @@ +@@ -741,26 +759,6 @@ irq_level\level: .section .irq.text,"ax",@progbits @@ -4709,7 +4709,7 @@ /* * This file handles the architecture-dependent parts of process handling.. */ -@@ -54,6 +54,8 @@ +@@ -54,6 +54,8 @@ void machine_halt(void) void machine_power_off(void) { @@ -4720,7 +4720,7 @@ void machine_restart(char *cmd) --- a/arch/avr32/kernel/setup.c +++ b/arch/avr32/kernel/setup.c -@@ -274,6 +274,8 @@ +@@ -274,6 +274,8 @@ static int __init early_parse_fbmem(char printk(KERN_WARNING "Failed to allocate framebuffer memory\n"); fbmem_size = 0; @@ -4731,7 +4731,7 @@ --- a/arch/avr32/kernel/signal.c +++ b/arch/avr32/kernel/signal.c -@@ -93,6 +93,9 @@ +@@ -93,6 +93,9 @@ asmlinkage int sys_rt_sigreturn(struct p if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) goto badframe; @@ -5067,7 +5067,7 @@ -device_initcall(init_timer_sysfs); --- a/arch/avr32/kernel/vmlinux.lds.S +++ b/arch/avr32/kernel/vmlinux.lds.S -@@ -68,14 +68,6 @@ +@@ -68,14 +68,6 @@ SECTIONS _evba = .; _text = .; *(.ex.text) @@ -5082,7 +5082,7 @@ *(.irq.text) KPROBES_TEXT TEXT_TEXT -@@ -107,6 +99,10 @@ +@@ -107,6 +99,10 @@ SECTIONS */ *(.data.init_task) @@ -5095,7 +5095,7 @@ *(.data.cacheline_aligned) --- a/arch/avr32/lib/io-readsb.S +++ b/arch/avr32/lib/io-readsb.S -@@ -41,7 +41,7 @@ +@@ -41,7 +41,7 @@ __raw_readsb: 2: sub r10, -4 reteq r12 @@ -5106,7 +5106,7 @@ brne 3b --- a/arch/avr32/mach-at32ap/Kconfig +++ b/arch/avr32/mach-at32ap/Kconfig -@@ -26,6 +26,13 @@ +@@ -26,6 +26,13 @@ config AP700X_8_BIT_SMC endchoice @@ -5218,7 +5218,7 @@ #include