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

Commit 83928e17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Minor manual fixups for gfp_t clashes.
parents 9be16a03 50f4c001

arch/arm/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ config ARCH_H720X 


config ARCH_AAEC2000

	bool "Agilent AAEC-2000 based"

	select ARM_AMBA

	help

	  This enables support for systems based on the Agilent AAEC-2000
@@ -687,7 +688,8 @@ source "drivers/acorn/block/Kconfig" 


if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \

	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \

	|| MACH_MP1000

source "drivers/ide/Kconfig"

endif

arch/arm/boot/compressed/head.S

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 
    defined(CONFIG_ARCH_IXP4XX) || \

    defined(CONFIG_ARCH_IXP2000) || \

    defined(CONFIG_ARCH_LH7A40X) || \

    defined(CONFIG_ARCH_OMAP)

    defined(CONFIG_ARCH_OMAP) || \

    defined(CONFIG_MACH_MP1000)

		.macro	loadsp,	rb

		addruart \rb

		.endm

arch/arm/configs/mp1000_defconfig

0 → 100644
+897 −0
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.14-rc1

# Fri Sep 16 15:48:13 2005

#

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_UID16=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_CALIBRATE_DELAY=y



#

# Code maturity level options

#

CONFIG_EXPERIMENTAL=y

# CONFIG_CLEAN_COMPILE is not set

CONFIG_BROKEN=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup

#

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_POSIX_MQUEUE is not set

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

# CONFIG_HOTPLUG is not set

CONFIG_KOBJECT_UEVENT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_EMBEDDED=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0



#

# Loadable module support

#

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y



#

# System Type

#

# CONFIG_ARCH_CLPS7500 is not set

CONFIG_ARCH_CLPS711X=y

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_CAMELOT 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_L7200 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set



#

# CLPS711X/EP721X Implementations

#

# CONFIG_ARCH_AUTCPU12 is not set

# CONFIG_ARCH_CDB89712 is not set

# CONFIG_ARCH_CEIVA is not set

# CONFIG_ARCH_CLEP7312 is not set

# CONFIG_ARCH_EDB7211 is not set

# CONFIG_ARCH_P720T is not set

# CONFIG_ARCH_FORTUNET is not set

CONFIG_MACH_MP1000=y

CONFIG_MP1000_90MHZ=y



#

# Processor Type

#

CONFIG_CPU_32=y

CONFIG_CPU_ARM720T=y

CONFIG_CPU_32v4=y

CONFIG_CPU_ABRT_LV4T=y

CONFIG_CPU_CACHE_V4=y

CONFIG_CPU_CACHE_VIVT=y

CONFIG_CPU_COPY_V4WT=y

CONFIG_CPU_TLB_V4WT=y



#

# Processor Features

#

CONFIG_ARM_THUMB=y



#

# Bus support

#

CONFIG_ISA_DMA_API=y



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set



#

# Kernel Features

#

# CONFIG_SMP is not set

CONFIG_PREEMPT=y

# CONFIG_NO_IDLE_HZ is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_ALIGNMENT_TRAP=y



#

# Boot options

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyCL,38400 root=/dev/discs/disc0/part1 ip=any cs89x0_media=rj45"

# CONFIG_XIP_KERNEL is not set



#

# Floating point emulation

#



#

# At least one emulation must be selected

#

CONFIG_FPE_NWFPE=y

# CONFIG_FPE_NWFPE_XP is not set

# CONFIG_FPE_FASTFPE is not set



#

# Userspace binary formats

#

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_AOUT is not set

CONFIG_BINFMT_MISC=y

# CONFIG_ARTHUR is not set



#

# Power management options

#

# CONFIG_PM is not set



#

# Networking

#

CONFIG_NET=y



#

# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_ARPD is not set

# 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_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=y

# CONFIG_IPV6_PRIVACY is not set

# CONFIG_INET6_AH is not set

# CONFIG_INET6_ESP is not set

# CONFIG_INET6_IPCOMP is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_IPV6_TUNNEL is not set

# CONFIG_NETFILTER is not set



#

# DCCP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_DCCP is not set



#

# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_IEEE80211 is not set



#

# Device Drivers

#



#

# Generic Driver Options

#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set



#

# Memory Technology Devices (MTD)

#

CONFIG_MTD=y

CONFIG_MTD_DEBUG=y

CONFIG_MTD_DEBUG_VERBOSE=3

# CONFIG_MTD_CONCAT is not set

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_REDBOOT_PARTS=m

CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2

CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y

# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_AFS_PARTS is not set



#

# User Modules And Translation Layers

#

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

# CONFIG_FTL is not set

# CONFIG_NFTL is not set

# CONFIG_INFTL is not set



#

# RAM/ROM/Flash chip drivers

#

CONFIG_MTD_CFI=m

# CONFIG_MTD_JEDECPROBE is not set

CONFIG_MTD_GEN_PROBE=m

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 is not set

CONFIG_MTD_CFI_I2=y

# CONFIG_MTD_CFI_I4 is not set

# CONFIG_MTD_CFI_I8 is not set

# CONFIG_MTD_OTP is not set

CONFIG_MTD_CFI_INTELEXT=m

# CONFIG_MTD_CFI_AMDSTD is not set

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=m

# CONFIG_MTD_RAM is not set

# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ABSENT is not set

# CONFIG_MTD_OBSOLETE_CHIPS is not set

# CONFIG_MTD_XIP is not set



#

# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=m

CONFIG_MTD_PHYSMAP_START=0x0000000

CONFIG_MTD_PHYSMAP_LEN=0x4000000

CONFIG_MTD_PHYSMAP_BANKWIDTH=2

# CONFIG_MTD_ARM_INTEGRATOR is not set

CONFIG_MTD_EDB7312=m

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers

#

# 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



#

# Disk-On-Chip Device Drivers

#

# CONFIG_MTD_DOC2000 is not set

# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set



#

# NAND Flash Device Drivers

#

CONFIG_MTD_NAND=y

# CONFIG_MTD_NAND_VERIFY_WRITE is not set

CONFIG_MTD_NAND_MP1000=y

CONFIG_MTD_NAND_IDS=y

# CONFIG_MTD_NAND_DISKONCHIP is not set

# CONFIG_MTD_NAND_NANDSIM is not set



#

# Parallel port support

#

# CONFIG_PARPORT is not set



#

# Plug and Play support

#



#

# Block devices

#

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=m

# CONFIG_BLK_DEV_CRYPTOLOOP is not set

# CONFIG_BLK_DEV_NBD is not set

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=2

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CDROM_PKTCDVD is not set



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_ATA_OVER_ETH is not set



#

# ATA/ATAPI/MFM/RLL support

#

CONFIG_IDE=y

CONFIG_BLK_DEV_IDE=y



#

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

#

# CONFIG_BLK_DEV_IDE_SATA is not set

# CONFIG_BLK_DEV_HD_IDE is not set

CONFIG_BLK_DEV_IDEDISK=y

# CONFIG_IDEDISK_MULTI_MODE is not set

# 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_GENERIC is not set

CONFIG_IDE_ARM=y

CONFIG_BLK_DEV_IDE_MP1000=y

# CONFIG_BLK_DEV_IDEDMA is not set

# CONFIG_IDEDMA_AUTO is not set

# CONFIG_BLK_DEV_HD is not set



#

# SCSI device support

#

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set



#

# Multi-device support (RAID and LVM)

#

CONFIG_MD=y

# CONFIG_BLK_DEV_MD is not set

CONFIG_BLK_DEV_DM=y

# CONFIG_DM_CRYPT is not set

# CONFIG_DM_SNAPSHOT is not set

# CONFIG_DM_MIRROR is not set

# CONFIG_DM_ZERO is not set

# CONFIG_DM_MULTIPATH is not set



#

# Fusion MPT device support

#

# CONFIG_FUSION is not set



#

# IEEE 1394 (FireWire) support

#

# CONFIG_IEEE1394 is not set



#

# I2O device support

#



#

# Network device support

#

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set



#

# PHY device support

#

# CONFIG_PHYLIB is not set



#

# Ethernet (10 or 100Mbit)

#

CONFIG_NET_ETHERNET=y

# CONFIG_MII is not set

# CONFIG_SMC91X is not set

# CONFIG_DM9000 is not set

CONFIG_CS89x0=y



#

# Ethernet (1000 Mbit)

#



#

# Ethernet (10000 Mbit)

#



#

# Token Ring devices

#



#

# Wireless LAN (non-hamradio)

#

# CONFIG_NET_RADIO is not set



#

# Wan interfaces

#

# CONFIG_WAN is not set

# CONFIG_PPP 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



#

# ISDN subsystem

#

# CONFIG_ISDN is not set



#

# Input device support

#

CONFIG_INPUT=y



#

# Userland interfaces

#

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

# CONFIG_INPUT_EVDEV is not set

CONFIG_INPUT_EVBUG=y



#

# Input Device Drivers

#

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set



#

# Hardware I/O ports

#

CONFIG_SERIO=y

CONFIG_SERIO_SERPORT=y

# CONFIG_SERIO_LIBPS2 is not set

# CONFIG_SERIO_RAW is not set

# CONFIG_GAMEPORT is not set



#

# Character devices

#

CONFIG_VT=y

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_SERIAL_NONSTANDARD is not set



#

# Serial drivers

#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=2

# CONFIG_SERIAL_8250_EXTENDED is not set



#

# Non-8250 serial port support

#

CONFIG_SERIAL_CLPS711X=y

CONFIG_SERIAL_CLPS711X_CONSOLE=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256



#

# IPMI

#

# CONFIG_IPMI_HANDLER is not set



#

# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

CONFIG_NVRAM=y

CONFIG_RTC=y

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set



#

# Ftape, the floppy tape device driver

#

# CONFIG_RAW_DRIVER is not set



#

# TPM devices

#



#

# I2C support

#

# CONFIG_I2C is not set



#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Misc devices

#



#

# Multimedia Capabilities Port drivers

#



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set



#

# Digital Video Broadcasting Devices

#

# CONFIG_DVB is not set



#

# Graphics support

#

# CONFIG_FB is not set



#

# Console display driver support

#

# CONFIG_VGA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y



#

# Sound

#

# CONFIG_SOUND is not set



#

# USB support

#

CONFIG_USB_ARCH_HAS_HCD=y

# CONFIG_USB_ARCH_HAS_OHCI is not set

# CONFIG_USB is not set



#

# USB Gadget Support

#

# CONFIG_USB_GADGET is not set



#

# MMC/SD Card support

#

# CONFIG_MMC is not set



#

# File systems

#

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

# CONFIG_EXT2_FS_POSIX_ACL is not set

# CONFIG_EXT2_FS_SECURITY is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

CONFIG_FS_MBCACHE=y

CONFIG_REISERFS_FS=m

# CONFIG_REISERFS_CHECK is not set

# CONFIG_REISERFS_PROC_INFO is not set

# CONFIG_REISERFS_FS_XATTR is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y

CONFIG_QUOTA=y

# CONFIG_QFMT_V1 is not set

# CONFIG_QFMT_V2 is not set

CONFIG_QUOTACTL=y

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# CD-ROM/DVD Filesystems

#

# CONFIG_ISO9660_FS is not set

# CONFIG_UDF_FS is not set



#

# DOS/FAT/NT Filesystems

#

# CONFIG_MSDOS_FS is not set

# CONFIG_VFAT_FS is not set

# CONFIG_NTFS_FS is not set



#

# Pseudo filesystems

#

CONFIG_PROC_FS=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_HUGETLBFS is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set



#

# Miscellaneous filesystems

#

# CONFIG_ADFS_FS is not set

# CONFIG_AFFS_FS is not set

# CONFIG_HFS_FS is not set

# CONFIG_HFSPLUS_FS is not set

# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_JFFS_FS is not set

CONFIG_JFFS2_FS=m

CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

CONFIG_CRAMFS=m

# CONFIG_VXFS_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

CONFIG_NFS_V4=y

# CONFIG_NFS_DIRECTIO is not set

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

# CONFIG_NFSD_V3_ACL is not set

CONFIG_NFSD_V4=y

CONFIG_NFSD_TCP=y

CONFIG_ROOT_NFS=y

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_EXPORTFS=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

CONFIG_SMB_FS=m

# CONFIG_SMB_NLS_DEFAULT is not set

CONFIG_CIFS=m

# CONFIG_CIFS_STATS is not set

# CONFIG_CIFS_XATTR is not set

# CONFIG_CIFS_EXPERIMENTAL is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set

# CONFIG_9P_FS is not set



#

# Partition Types

#

# CONFIG_PARTITION_ADVANCED is not set

CONFIG_MSDOS_PARTITION=y



#

# Native Language Support

#

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

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

# CONFIG_NLS_CODEPAGE_852 is not set

# CONFIG_NLS_CODEPAGE_855 is not set

# CONFIG_NLS_CODEPAGE_857 is not set

# CONFIG_NLS_CODEPAGE_860 is not set

# CONFIG_NLS_CODEPAGE_861 is not set

# CONFIG_NLS_CODEPAGE_862 is not set

# CONFIG_NLS_CODEPAGE_863 is not set

# CONFIG_NLS_CODEPAGE_864 is not set

# CONFIG_NLS_CODEPAGE_865 is not set

# CONFIG_NLS_CODEPAGE_866 is not set

# CONFIG_NLS_CODEPAGE_869 is not set

# CONFIG_NLS_CODEPAGE_936 is not set

# CONFIG_NLS_CODEPAGE_950 is not set

# CONFIG_NLS_CODEPAGE_932 is not set

# CONFIG_NLS_CODEPAGE_949 is not set

# CONFIG_NLS_CODEPAGE_874 is not set

# CONFIG_NLS_ISO8859_8 is not set

# CONFIG_NLS_CODEPAGE_1250 is not set

# CONFIG_NLS_CODEPAGE_1251 is not set

# CONFIG_NLS_ASCII is not set

# CONFIG_NLS_ISO8859_1 is not set

# CONFIG_NLS_ISO8859_2 is not set

# CONFIG_NLS_ISO8859_3 is not set

# CONFIG_NLS_ISO8859_4 is not set

# CONFIG_NLS_ISO8859_5 is not set

# CONFIG_NLS_ISO8859_6 is not set

# CONFIG_NLS_ISO8859_7 is not set

# CONFIG_NLS_ISO8859_9 is not set

# CONFIG_NLS_ISO8859_13 is not set

# CONFIG_NLS_ISO8859_14 is not set

# CONFIG_NLS_ISO8859_15 is not set

# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set



#

# Profiling support

#

# CONFIG_PROFILING is not set



#

# Kernel hacking

#

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_MAGIC_SYSRQ is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_PREEMPT=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=y

# CONFIG_DEBUG_FS is not set

CONFIG_FRAME_POINTER=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_WAITQ=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

# CONFIG_DEBUG_ICEDCC is not set

# CONFIG_DEBUG_CLPS711X_UART2 is not set



#

# Security options

#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set



#

# Cryptographic options

#

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_AES is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_TEST is not set



#

# Hardware crypto devices

#



#

# Library routines

#

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=m

CONFIG_ZLIB_DEFLATE=m

arch/arm/kernel/module.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */

#include <linux/config.h>

#include <linux/module.h>

#include <linux/moduleloader.h>

#include <linux/kernel.h>

#include <linux/elf.h>

#include <linux/vmalloc.h>

arch/arm/kernel/traps.c

+3 −1
Original line number Diff line number Diff line
@@ -345,7 +345,9 @@ static int bad_syscall(int n, struct pt_regs *regs) 
	struct thread_info *thread = current_thread_info();

	siginfo_t info;



	if (current->personality != PER_LINUX && thread->exec_domain->handler) {

	if (current->personality != PER_LINUX &&

	    current->personality != PER_LINUX_32BIT &&

	    thread->exec_domain->handler) {

		thread->exec_domain->handler(n, regs);

		return regs->ARM_r0;

	}