Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d649dafd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3508/1: Update collie defconfig
  [ARM] Fix thread struct allocator for SMP case
  [ARM] Update mach-types
  [ARM] Update versatile_defconfig
parents 2bf9d6d0 41b11afb

arch/arm/configs/collie_defconfig

+256 −174
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.14-rc3

# Sun Oct  9 16:55:14 2005

# Linux kernel version: 2.6.17-rc1

# Fri Apr 14 19:09:52 2006

#

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_UID16=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_MTD_XIP=y

CONFIG_VECTORS_BASE=0xffff0000



#

# Code maturity level options

#

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#
@@ -23,45 +23,58 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
#

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

# CONFIG_POSIX_MQUEUE is not set

CONFIG_BSD_PROCESS_ACCT=y

# CONFIG_BSD_PROCESS_ACCT_V3 is not set

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_UID16=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EMBEDDED=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_ELF_CORE=y

# CONFIG_BASE_FULL is not set

CONFIG_FUTEX=y

CONFIG_EPOLL=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

# CONFIG_EPOLL is not set

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

# CONFIG_SLAB is not set

CONFIG_DOUBLEFAULT=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_BASE_SMALL=1

CONFIG_SLOB=y

CONFIG_OBSOLETE_INTERMODULE=y



#

# Loadable module support

#

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_OBSOLETE_MODPARM=y

CONFIG_MODVERSIONS=y

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y

# CONFIG_MODULES is not set



#

# Block layer

#

# CONFIG_BLK_DEV_IO_TRACE is not set



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_DEFAULT_AS=y

# CONFIG_DEFAULT_DEADLINE is not set

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"



#

# System Type
@@ -70,11 +83,13 @@ CONFIG_KMOD=y 
# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP23XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set
@@ -84,9 +99,11 @@ CONFIG_ARCH_SA1100=y 
# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_AT91RM9200 is not set



#

# SA11x0 Implementations
@@ -128,20 +145,32 @@ CONFIG_SHARP_SCOOP=y 
# Bus support

#

CONFIG_ISA=y

CONFIG_ISA_DMA_API=y



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set

CONFIG_PCCARD=y

CONFIG_PCMCIA_DEBUG=y

CONFIG_PCMCIA=y

CONFIG_PCMCIA_LOAD_CIS=y

CONFIG_PCMCIA_IOCTL=y



#

# PC-card bridges

#

# CONFIG_I82365 is not set

# CONFIG_TCIC is not set

CONFIG_PCMCIA_SA1100=y



#

# Kernel Features

#

# CONFIG_SMP is not set

CONFIG_PREEMPT=y

# CONFIG_PREEMPT is not set

# CONFIG_NO_IDLE_HZ is not set

CONFIG_HZ=100

# CONFIG_AEABI is not set

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_NODES_SHIFT=2

CONFIG_SELECT_MEMORY_MODEL=y

# CONFIG_FLATMEM_MANUAL is not set

CONFIG_DISCONTIGMEM_MANUAL=y
@@ -150,6 +179,7 @@ CONFIG_DISCONTIGMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_NEED_MULTIPLE_NODES=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

# CONFIG_LEDS is not set

CONFIG_ALIGNMENT_TRAP=y
@@ -158,7 +188,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   debug"

CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1"

# CONFIG_XIP_KERNEL is not set



#
@@ -181,14 +211,16 @@ CONFIG_FPE_NWFPE=y 
# Userspace binary formats

#

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_BINFMT_AOUT is not set

# CONFIG_BINFMT_MISC is not set

# CONFIG_ARTHUR is not set



#

# Power management options

#

CONFIG_PM=y

CONFIG_PM_LEGACY=y

# CONFIG_PM_DEBUG is not set

CONFIG_APM=y



#
@@ -199,6 +231,7 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y
@@ -211,16 +244,19 @@ CONFIG_IP_FIB_HASH=y 
# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_ARPD is not set

CONFIG_SYN_COOKIES=y

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETFILTER is not set



#
@@ -232,6 +268,11 @@ CONFIG_TCP_CONG_BIC=y 
# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set



#

# TIPC Configuration (EXPERIMENTAL)

#

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set
@@ -244,8 +285,11 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing
@@ -265,9 +309,14 @@ CONFIG_TCP_CONG_BIC=y 
#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m

CONFIG_FW_LOADER=y

# CONFIG_DEBUG_DRIVER is not set



#

# Connector - unified userspace <-> kernelspace linker

#

# CONFIG_CONNECTOR is not set



#

# Memory Technology Devices (MTD)

#
@@ -287,32 +336,49 @@ CONFIG_MTD_BLOCK=y 
# CONFIG_FTL is not set

# CONFIG_NFTL is not set

# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set



#

# RAM/ROM/Flash chip drivers

#

# CONFIG_MTD_CFI is not set

# CONFIG_MTD_JEDECPROBE is not set

CONFIG_MTD_MAP_BANK_WIDTH_1=y

CONFIG_MTD_MAP_BANK_WIDTH_2=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_GEN_PROBE=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_NOSWAP=y

# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set

# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set

CONFIG_MTD_CFI_GEOMETRY=y

# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set

CONFIG_MTD_MAP_BANK_WIDTH_4=y

# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set

CONFIG_MTD_CFI_I1=y

CONFIG_MTD_CFI_I2=y

# CONFIG_MTD_CFI_I4 is not set

# CONFIG_MTD_CFI_I1 is not set

# CONFIG_MTD_CFI_I2 is not set

CONFIG_MTD_CFI_I4=y

# CONFIG_MTD_CFI_I8 is not set

# CONFIG_MTD_OTP is not set

CONFIG_MTD_CFI_INTELEXT=y

# CONFIG_MTD_CFI_AMDSTD is not set

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=y

# CONFIG_MTD_RAM is not set

# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ABSENT is not set

CONFIG_MTD_OBSOLETE_CHIPS=y

CONFIG_MTD_SHARP=y

# CONFIG_MTD_XIP is not set



#

# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

# CONFIG_MTD_PHYSMAP is not set

# CONFIG_MTD_ARM_INTEGRATOR is not set

CONFIG_MTD_SA1100=y

# CONFIG_MTD_IMPA7 is not set

# CONFIG_MTD_PLATRAM is not set



#
@@ -321,7 +387,6 @@ CONFIG_MTD_SHARP=y 
# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLKMTD is not set

# CONFIG_MTD_BLOCK2MTD is not set



#
@@ -336,6 +401,11 @@ CONFIG_MTD_SHARP=y 
#

# CONFIG_MTD_NAND is not set



#

# OneNAND Flash Device Drivers

#

# CONFIG_MTD_ONENAND is not set



#

# Parallel port support

#
@@ -349,7 +419,6 @@ CONFIG_MTD_SHARP=y 
#

# Block devices

#

# CONFIG_BLK_DEV_XD is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -359,20 +428,35 @@ CONFIG_BLK_DEV_RAM_COUNT=16 
CONFIG_BLK_DEV_RAM_SIZE=1024

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# IO Schedulers

# ATA/ATAPI/MFM/RLL support

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_ATA_OVER_ETH=m

CONFIG_IDE=y

CONFIG_BLK_DEV_IDE=y



#

# ATA/ATAPI/MFM/RLL support

# Please see Documentation/ide.txt for help/info on IDE drives

#

# CONFIG_BLK_DEV_IDE_SATA is not set

CONFIG_BLK_DEV_IDEDISK=y

CONFIG_IDEDISK_MULTI_MODE=y

CONFIG_BLK_DEV_IDECS=y

# CONFIG_BLK_DEV_IDECD is not set

# CONFIG_BLK_DEV_IDETAPE is not set

# CONFIG_BLK_DEV_IDEFLOPPY is not set

# CONFIG_IDE_TASK_IOCTL is not set



#

# IDE chipset support/bugfixes

#

# CONFIG_IDE is not set

CONFIG_IDE_GENERIC=y

# CONFIG_IDE_ARM is not set

# CONFIG_IDE_CHIPSETS is not set

# CONFIG_BLK_DEV_IDEDMA is not set

# CONFIG_IDEDMA_AUTO is not set

# CONFIG_BLK_DEV_HD is not set



#

# SCSI device support
@@ -402,6 +486,39 @@ CONFIG_ATA_OVER_ETH=m 
# Network device support

#

# CONFIG_NETDEVICES is not set

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set



#

# PHY device support

#



#

# Ethernet (10 or 100Mbit)

#

# CONFIG_NET_ETHERNET is not set



#

# Ethernet (1000 Mbit)

#



#

# Ethernet (10000 Mbit)

#

CONFIG_PPP=y

# CONFIG_PPP_MULTILINK is not set

# CONFIG_PPP_FILTER is not set

CONFIG_PPP_ASYNC=y

# CONFIG_PPP_SYNC_TTY is not set

# CONFIG_PPP_DEFLATE is not set

# CONFIG_PPP_BSDCOMP is not set

# CONFIG_PPP_MPPE is not set

# CONFIG_PPPOE is not set

# CONFIG_SLIP is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set
@@ -424,7 +541,7 @@ CONFIG_INPUT_TSDEV=y 
CONFIG_INPUT_TSDEV_SCREEN_X=240

CONFIG_INPUT_TSDEV_SCREEN_Y=320

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=y

# CONFIG_INPUT_EVBUG is not set



#

# Input Device Drivers
@@ -438,7 +555,11 @@ CONFIG_KEYBOARD_LOCOMO=y 
# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set

# CONFIG_TOUCHSCREEN_MTOUCH is not set

# CONFIG_TOUCHSCREEN_MK712 is not set

# CONFIG_INPUT_MISC is not set



#
@@ -461,7 +582,16 @@ CONFIG_HW_CONSOLE=y 
#

# Serial drivers

#

# CONFIG_SERIAL_8250 is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_CONSOLE is not set

CONFIG_SERIAL_8250_CS=y

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_EXTENDED=y

# CONFIG_SERIAL_8250_MANY_PORTS is not set

# CONFIG_SERIAL_8250_SHARE_IRQ is not set

# CONFIG_SERIAL_8250_DETECT_IRQ is not set

# CONFIG_SERIAL_8250_RSA is not set



#

# Non-8250 serial port support
@@ -483,94 +613,48 @@ CONFIG_UNIX98_PTYS=y 
#

# CONFIG_WATCHDOG is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set



#

# Ftape, the floppy tape device driver

#

# CONFIG_RAW_DRIVER is not set



#

# TPM devices

# PCMCIA character devices

#

# CONFIG_SYNCLINK_CS is not set

# CONFIG_CARDMAN_4000 is not set

# CONFIG_CARDMAN_4040 is not set

# CONFIG_RAW_DRIVER is not set



#

# I2C support

# TPM devices

#

CONFIG_I2C=m

# CONFIG_I2C_CHARDEV is not set

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C Algorithms

# I2C support

#

CONFIG_I2C_ALGOBIT=m

# CONFIG_I2C_ALGOPCF is not set

# CONFIG_I2C_ALGOPCA is not set

# CONFIG_I2C is not set



#

# I2C Hardware Bus support

# SPI support

#

# CONFIG_I2C_ELEKTOR is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_STUB is not set

# CONFIG_I2C_PCA_ISA is not set

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set



#

# Miscellaneous I2C Chip support

# Dallas's 1-wire bus

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_W1 is not set



#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON is not set

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_LM63 is not set

# CONFIG_SENSORS_LM75 is not set

# CONFIG_SENSORS_LM77 is not set

# CONFIG_SENSORS_LM78 is not set

# CONFIG_SENSORS_LM80 is not set

# CONFIG_SENSORS_LM83 is not set

# CONFIG_SENSORS_LM85 is not set

# CONFIG_SENSORS_LM87 is not set

# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Misc devices
@@ -579,42 +663,33 @@ CONFIG_HWMON=y 
#

# Multimedia Capabilities Port drivers

#

# CONFIG_MCP_SA11X0 is not set

CONFIG_MCP=y

CONFIG_MCP_SA11X0=y

CONFIG_MCP_UCB1200=y

CONFIG_MCP_UCB1200_TS=y



#

# Multimedia devices

# LED devices

#

CONFIG_VIDEO_DEV=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y



#

# Video For Linux

# LED drivers

#

CONFIG_LEDS_LOCOMO=y



#

# Video Adapters

# LED Triggers

#

# CONFIG_VIDEO_PMS is not set

# CONFIG_VIDEO_CPIA is not set

# CONFIG_VIDEO_SAA5246A is not set

# CONFIG_VIDEO_SAA5249 is not set

# CONFIG_TUNER_3036 is not set

# CONFIG_VIDEO_OVCAMCHIP is not set

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_IDE_DISK=y



#

# Radio Adapters

# Multimedia devices

#

# CONFIG_RADIO_CADET is not set

# CONFIG_RADIO_RTRACK is not set

# CONFIG_RADIO_RTRACK2 is not set

# CONFIG_RADIO_AZTECH is not set

# CONFIG_RADIO_GEMTEK is not set

# CONFIG_RADIO_MAESTRO is not set

# CONFIG_RADIO_SF16FMI is not set

# CONFIG_RADIO_SF16FMR2 is not set

# CONFIG_RADIO_TERRATEC is not set

# CONFIG_RADIO_TRUST is not set

# CONFIG_RADIO_TYPHOON is not set

# CONFIG_RADIO_ZOLTRIX is not set

# CONFIG_VIDEO_DEV is not set



#

# Digital Video Broadcasting Devices
@@ -628,8 +703,8 @@ CONFIG_FB=y 
CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_SOFT_CURSOR=y

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_FIRMWARE_EDID is not set

CONFIG_FB_MODE_HELPERS=y

# CONFIG_FB_TILEBLITTING is not set

CONFIG_FB_SA1100=y
@@ -643,14 +718,15 @@ CONFIG_FB_SA1100=y 
# CONFIG_MDA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

# CONFIG_FONT_8x8 is not set

# CONFIG_FONT_8x16 is not set

# CONFIG_FONT_6x11 is not set

# CONFIG_FONT_7x14 is not set

# CONFIG_FONT_PEARL_8x8 is not set

# CONFIG_FONT_ACORN_8x8 is not set

# CONFIG_FONT_MINI_4x6 is not set

CONFIG_FONT_MINI_4x6=y

# CONFIG_FONT_SUN8x16 is not set

# CONFIG_FONT_SUN12x22 is not set

# CONFIG_FONT_10x18 is not set
@@ -659,7 +735,11 @@ CONFIG_FONT_8x8=y 
# Logo configuration

#

# CONFIG_LOGO is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_DEVICE=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_DEVICE=y



#

# Sound
@@ -671,44 +751,42 @@ CONFIG_FONT_8x8=y 
#

CONFIG_USB_ARCH_HAS_HCD=y

# CONFIG_USB_ARCH_HAS_OHCI is not set

# CONFIG_USB_ARCH_HAS_EHCI is not set

# CONFIG_USB is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#



#

# USB Gadget Support

#

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG_FILES is not set

# CONFIG_USB_GADGET_NET2280 is not set

# CONFIG_USB_GADGET_PXA2XX is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_LH7A40X is not set

# CONFIG_USB_GADGET_OMAP is not set

# CONFIG_USB_GADGET_DUMMY_HCD is not set

# CONFIG_USB_GADGET_DUALSPEED is not set

# CONFIG_USB_GADGET is not set



#

# MMC/SD Card support

#

# CONFIG_MMC is not set



#

# Real Time Clock

#

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set



#

# File systems

#

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

# CONFIG_EXT2_FS_XIP is not set

# CONFIG_EXT2_FS is not set

# CONFIG_EXT3_FS is not set

# CONFIG_JBD is not set

CONFIG_FS_MBCACHE=y

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

# CONFIG_FS_POSIX_ACL is not set

# CONFIG_XFS_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

CONFIG_ROMFS_FS=y

CONFIG_INOTIFY=y

# CONFIG_INOTIFY is not set

# CONFIG_QUOTA is not set

# CONFIG_DNOTIFY is not set

# CONFIG_AUTOFS_FS is not set
@@ -725,7 +803,7 @@ CONFIG_INOTIFY=y 
# DOS/FAT/NT Filesystems

#

CONFIG_FAT_FS=y

CONFIG_MSDOS_FS=y

# CONFIG_MSDOS_FS is not set

CONFIG_VFAT_FS=y

CONFIG_FAT_DEFAULT_CODEPAGE=437

CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -739,7 +817,7 @@ CONFIG_SYSFS=y 
CONFIG_TMPFS=y

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems
@@ -755,11 +833,12 @@ CONFIG_RAMFS=y 
CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_SUMMARY is not set

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

CONFIG_CRAMFS=y

# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set
@@ -789,7 +868,7 @@ CONFIG_MSDOS_PARTITION=y 
#

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="cp437"

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_CODEPAGE_437=y

# CONFIG_NLS_CODEPAGE_737 is not set

# CONFIG_NLS_CODEPAGE_775 is not set

# CONFIG_NLS_CODEPAGE_850 is not set
@@ -813,7 +892,7 @@ CONFIG_NLS_CODEPAGE_437=m 
# CONFIG_NLS_CODEPAGE_1250 is not set

# CONFIG_NLS_CODEPAGE_1251 is not set

# CONFIG_NLS_ASCII is not set

CONFIG_NLS_ISO8859_1=m

CONFIG_NLS_ISO8859_1=y

# CONFIG_NLS_ISO8859_2 is not set

# CONFIG_NLS_ISO8859_3 is not set

# CONFIG_NLS_ISO8859_4 is not set
@@ -826,7 +905,7 @@ CONFIG_NLS_ISO8859_1=m 
# CONFIG_NLS_ISO8859_15 is not set

# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

CONFIG_NLS_UTF8=m

# CONFIG_NLS_UTF8 is not set



#

# Profiling support
@@ -837,20 +916,23 @@ CONFIG_NLS_UTF8=m 
# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_DETECT_SOFTLOCKUP is not set

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_PREEMPT=y

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

CONFIG_FRAME_POINTER=y

# CONFIG_UNWIND_INFO is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_DEBUG_USER is not set

# CONFIG_DEBUG_WAITQ is not set

CONFIG_DEBUG_ERRORS=y
@@ -874,7 +956,7 @@ CONFIG_DEBUG_ERRORS=y 
#

# Library routines

#

# CONFIG_CRC_CCITT is not set

CONFIG_CRC_CCITT=y

# CONFIG_CRC16 is not set

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

arch/arm/configs/versatile_defconfig

+246 −144

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/kernel/process.c

+25 −12
Original line number Diff line number Diff line
@@ -264,8 +264,12 @@ void show_fpregs(struct user_fp *regs) 
/*

 * Task structure and kernel stack allocation.

 */

static unsigned long *thread_info_head;

static unsigned int nr_thread_info;

struct thread_info_list {

	unsigned long *head;

	unsigned int nr;

};



static DEFINE_PER_CPU(struct thread_info_list, thread_info_list) = { NULL, 0 };



#define EXTRA_TASK_STRUCT	4
@@ -274,12 +278,15 @@ struct thread_info *alloc_thread_info(struct task_struct *task) 
	struct thread_info *thread = NULL;



	if (EXTRA_TASK_STRUCT) {

		unsigned long *p = thread_info_head;

		struct thread_info_list *th = &get_cpu_var(thread_info_list);

		unsigned long *p = th->head;



		if (p) {

			thread_info_head = (unsigned long *)p[0];

			nr_thread_info -= 1;

			th->head = (unsigned long *)p[0];

			th->nr -= 1;

		}

		put_cpu_var(thread_info_list);



		thread = (struct thread_info *)p;

	}
@@ -300,12 +307,18 @@ struct thread_info *alloc_thread_info(struct task_struct *task) 


void free_thread_info(struct thread_info *thread)

{

	if (EXTRA_TASK_STRUCT && nr_thread_info < EXTRA_TASK_STRUCT) {

	if (EXTRA_TASK_STRUCT) {

		struct thread_info_list *th = &get_cpu_var(thread_info_list);

		if (th->nr < EXTRA_TASK_STRUCT) {

			unsigned long *p = (unsigned long *)thread;

		p[0] = (unsigned long)thread_info_head;

		thread_info_head = p;

		nr_thread_info += 1;

	} else

			p[0] = th->head;

			th->head = p;

			th->nr += 1;

			put_cpu_var(thread_info_list);

			return;

		}

		put_cpu_var(thread_info_list);

	}

	free_pages((unsigned long)thread, THREAD_SIZE_ORDER);

}

arch/arm/tools/mach-types

+80 −9
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#

#   http://www.arm.linux.org.uk/developer/machines/?action=new

#

# Last update: Mon Feb 20 10:18:02 2006

# Last update: Mon May 8 20:11:05 2006

#

# machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number

#
@@ -566,8 +566,8 @@ switchgrass MACH_SWITCHGRASS SWITCHGRASS 549 
ens_cmu			MACH_ENS_CMU		ENS_CMU			550

mm6_sdb			MACH_MM6_SDB		MM6_SDB			551

saturn			MACH_SATURN		SATURN			552

argonplusevb		MACH_ARGONPLUSEVB	ARGONPLUSEVB		553

scma11evb		MACH_SCMA11EVB		SCMA11EVB		554

i30030evb		MACH_ARGONPLUSEVB	ARGONPLUSEVB		553

mxc27530evb		MACH_SCMA11EVB		SCMA11EVB		554

smdk2800		MACH_SMDK2800		SMDK2800		555

mtwilson		MACH_MTWILSON		MTWILSON		556

ziti			MACH_ZITI		ZITI			557
@@ -647,7 +647,7 @@ sendt MACH_SENDT SENDT 630 
mx2jazz			MACH_MX2JAZZ		MX2JAZZ			631

multiio			MACH_MULTIIO		MULTIIO			632

hrdisplay		MACH_HRDISPLAY		HRDISPLAY		633

scma11bb		MACH_SCMA11BB		SCMA11BB		634

mxc27530ads		MACH_SCMA11BB		SCMA11BB		634

trizeps3		MACH_TRIZEPS3		TRIZEPS3		635

zefeerdza		MACH_ZEFEERDZA		ZEFEERDZA		636

zefeerdzb		MACH_ZEFEERDZB		ZEFEERDZB		637
@@ -721,7 +721,7 @@ gp32 MACH_GP32 GP32 706 
gem			MACH_GEM		GEM			707

i858			MACH_I858		I858			708

hx2750			MACH_HX2750		HX2750			709

zeusevb			MACH_ZEUSEVB		ZEUSEVB			710

mxc91131evb		MACH_ZEUSEVB		ZEUSEVB			710

p700			MACH_P700		P700			711

cpe			MACH_CPE		CPE			712

spitz			MACH_SPITZ		SPITZ			713
@@ -802,7 +802,7 @@ cpuat91 MACH_CPUAT91 CPUAT91 787 
rea9200			MACH_REA9200		REA9200			788

acts_pune_sa1110	MACH_ACTS_PUNE_SA1110	ACTS_PUNE_SA1110	789

ixp425			MACH_IXP425		IXP425			790

argonplusodyssey	MACH_ARGONPLUSODYSSEY	ARGONPLUSODYSSEY	791

i30030ads		MACH_ARGONPLUSODYSSEY	ARGONPLUSODYSSEY	791

perch			MACH_PERCH		PERCH			792

eis05r1			MACH_EIS05R1		EIS05R1			793

pepperpad		MACH_PEPPERPAD		PEPPERPAD		794
@@ -827,7 +827,7 @@ micro9l MACH_MICRO9L MICRO9L 812 
uc5471dsp		MACH_UC5471DSP		UC5471DSP		813

sj5471eng		MACH_SJ5471ENG		SJ5471ENG		814

none			MACH_CMPXA26X		CMPXA26X		815

nc			MACH_NC			NC			816

nc1			MACH_NC			NC			816

omap_palmte		MACH_OMAP_PALMTE	OMAP_PALMTE		817

ajax52x			MACH_AJAX52X		AJAX52X			818

siriustar		MACH_SIRIUSTAR		SIRIUSTAR		819
@@ -930,7 +930,7 @@ netclient MACH_NETCLIENT NETCLIENT 916 
xscale_palmtt5		MACH_XSCALE_PALMTT5	XSCALE_PALMTT5		917

xscale_palmtc		MACH_OMAP_PALMTC	OMAP_PALMTC		918

omap_apollon		MACH_OMAP_APOLLON	OMAP_APOLLON		919

argonlvevb		MACH_ARGONLVEVB		ARGONLVEVB		920

mxc30030evb		MACH_ARGONLVEVB		ARGONLVEVB		920

rea_2d			MACH_REA_2D		REA_2D			921

eti3e524		MACH_TI3E524		TI3E524			922

ateb9200		MACH_ATEB9200		ATEB9200		923
@@ -965,7 +965,78 @@ sisteron MACH_SISTERON SISTERON 951 
rx1950			MACH_RX1950		RX1950			952

tsc_venus		MACH_TSC_VENUS		TSC_VENUS		953

ds101j			MACH_DS101J		DS101J			954

mxc300_30ads		MACH_MXC30030ADS	MXC30030ADS		955

mxc30030ads		MACH_MXC30030ADS	MXC30030ADS		955

fujitsu_wimaxsoc	MACH_FUJITSU_WIMAXSOC	FUJITSU_WIMAXSOC	956

dualpcmodem		MACH_DUALPCMODEM	DUALPCMODEM		957

gesbc9312		MACH_GESBC9312		GESBC9312		958

htcapache		MACH_HTCAPACHE		HTCAPACHE		959

ixdp435			MACH_IXDP435		IXDP435			960

catprovt100		MACH_CATPROVT100	CATPROVT100		961

picotux1xx		MACH_PICOTUX1XX		PICOTUX1XX		962

picotux2xx		MACH_PICOTUX2XX		PICOTUX2XX		963

dsmg600			MACH_DSMG600		DSMG600			964

empc2			MACH_EMPC2		EMPC2			965

ventura			MACH_VENTURA		VENTURA			966

phidget_sbc		MACH_PHIDGET_SBC	PHIDGET_SBC		967

ij3k			MACH_IJ3K		IJ3K			968

pisgah			MACH_PISGAH		PISGAH			969

omap_fsample		MACH_OMAP_FSAMPLE	OMAP_FSAMPLE		970

sg720			MACH_SG720		SG720			971

redfox			MACH_REDFOX		REDFOX			972

mysh_ep9315_1		MACH_MYSH_EP9315_1	MYSH_EP9315_1		973

tpf106			MACH_TPF106		TPF106			974

at91rm9200kg		MACH_AT91RM9200KG	AT91RM9200KG		975

racemt2			MACH_SLEDB		SLEDB			976

ontrack			MACH_ONTRACK		ONTRACK			977

pm1200			MACH_PM1200		PM1200			978

ess24562		MACH_ESS24XXX		ESS24XXX		979

coremp7			MACH_COREMP7		COREMP7			980

nexcoder_6446		MACH_NEXCODER_6446	NEXCODER_6446		981

stvc8380		MACH_STVC8380		STVC8380		982

teklynx			MACH_TEKLYNX		TEKLYNX			983

carbonado		MACH_CARBONADO		CARBONADO		984

sysmos_mp730		MACH_SYSMOS_MP730	SYSMOS_MP730		985

snapper_cl15		MACH_SNAPPER_CL15	SNAPPER_CL15		986

pgigim			MACH_PGIGIM		PGIGIM			987

ptx9160p2		MACH_PTX9160P2		PTX9160P2		988

dcore1			MACH_DCORE1		DCORE1			989

victorpxa		MACH_VICTORPXA		VICTORPXA		990

mx2dtb			MACH_MX2DTB		MX2DTB			991

pxa_irex_er0100		MACH_PXA_IREX_ER0100	PXA_IREX_ER0100		992

omap_palmz71		MACH_OMAP_PALMZ71	OMAP_PALMZ71		993

bartec_deg		MACH_BARTEC_DEG		BARTEC_DEG		994

hw50251			MACH_HW50251		HW50251			995

ibox			MACH_IBOX		IBOX			996

atlaslh7a404		MACH_ATLASLH7A404	ATLASLH7A404		997

pt2026			MACH_PT2026		PT2026			998

htcalpine		MACH_HTCALPINE		HTCALPINE		999

bartec_vtu		MACH_BARTEC_VTU		BARTEC_VTU		1000

vcoreii			MACH_VCOREII		VCOREII			1001

pdnb3			MACH_PDNB3		PDNB3			1002

htcbeetles		MACH_HTCBEETLES		HTCBEETLES		1003

s3c6400			MACH_S3C6400		S3C6400			1004

s3c2443			MACH_S3C2443		S3C2443			1005

omap_ldk		MACH_OMAP_LDK		OMAP_LDK		1006

smdk2460		MACH_SMDK2460		SMDK2460		1007

smdk2440		MACH_SMDK2440		SMDK2440		1008

smdk2412		MACH_SMDK2412		SMDK2412		1009

webbox			MACH_WEBBOX		WEBBOX			1010

cwwndp			MACH_CWWNDP		CWWNDP			1011

dragon			MACH_DRAGON		DRAGON			1012

opendo_cpu_board	MACH_OPENDO_CPU_BOARD	OPENDO_CPU_BOARD	1013

ccm2200			MACH_CCM2200		CCM2200			1014

etwarm			MACH_ETWARM		ETWARM			1015

m93030			MACH_M93030		M93030			1016

cc7u			MACH_CC7U		CC7U			1017

mtt_ranger		MACH_MTT_RANGER		MTT_RANGER		1018

nexus			MACH_NEXUS		NEXUS			1019

desman			MACH_DESMAN		DESMAN			1020

bkde303			MACH_BKDE303		BKDE303			1021

smdk2413		MACH_SMDK2413		SMDK2413		1022

aml_m7200		MACH_AML_M7200		AML_M7200		1023

aml_m5900		MACH_AML_M5900		AML_M5900		1024

sg640			MACH_SG640		SG640			1025

edg79524		MACH_EDG79524		EDG79524		1026

ai2410			MACH_AI2410		AI2410			1027

ixp465			MACH_IXP465		IXP465			1028

balloon3		MACH_BALLOON3		BALLOON3		1029